mirror of
https://github.com/affaan-m/ECC.git
synced 2026-08-28 18:59:47 +02:00
fix(scripts): auto-detect legacy sync-ecc-to-codex.sh installs in uninstall
When no install-state is found for the current context, `ecc uninstall` now checks for the legacy `sync-ecc-to-codex.sh` ownership manifest under `~/.codex/ecc/legacy-sync-state.json` and, if present, rolls back the managed Codex artifacts it recorded. It restores previous `config.toml` and `AGENTS.md` content instead of deleting them, removes generated prompts/docs/copies, and leaves unrelated Codex conversation history and user config keys untouched. A fallback `--legacy-codex-sync` flag still forces the legacy path explicitly, and `--dry-run` previews the cleanup. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
committed by
haelyra
co-authored by
Paperclip
parent
5bc86f4e32
commit
09d6d22c09
+70
-26
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const os = require('os');
|
||||
const path = require('path');
|
||||
const { uninstallInstalledStates } = require('./lib/install-lifecycle');
|
||||
const { SUPPORTED_INSTALL_TARGETS } = require('./lib/install-manifests');
|
||||
const { exitFeedbackLines } = require('./lib/feedback-links');
|
||||
@@ -11,7 +12,9 @@ function showHelp(exitCode = 0) {
|
||||
Usage: node scripts/uninstall.js [--target <${SUPPORTED_INSTALL_TARGETS.join('|')}>] [--legacy-codex-sync] [--dry-run] [--json]
|
||||
|
||||
Remove ECC-managed files recorded in install-state for the current context.
|
||||
Use --legacy-codex-sync explicitly for the older sync-ecc-to-codex.sh installation.
|
||||
When no install-state is found, the uninstaller also detects and removes
|
||||
artifacts left by the older scripts/sync-ecc-to-codex.sh installer.
|
||||
Use --legacy-codex-sync to force the legacy path explicitly.
|
||||
`);
|
||||
process.exit(exitCode);
|
||||
}
|
||||
@@ -87,6 +90,34 @@ function printHuman(result) {
|
||||
}
|
||||
}
|
||||
|
||||
function detectLegacyCodexSync(codexHome) {
|
||||
const probe = uninstallLegacyCodexSync({
|
||||
codexHome,
|
||||
dryRun: true,
|
||||
});
|
||||
return probe.status !== 'not-found';
|
||||
}
|
||||
|
||||
function printLegacy(result, dryRun) {
|
||||
console.log('Legacy Codex sync cleanup summary:\n');
|
||||
console.log(`Status: ${result.status.toUpperCase()}`);
|
||||
const paths = dryRun ? result.plannedRemovals : result.removedPaths;
|
||||
console.log(`${dryRun ? 'Planned changes' : 'Removed paths'}: ${paths.length}`);
|
||||
if (result.retainedPaths.length > 0) {
|
||||
console.log(`Retained paths: ${result.retainedPaths.length}`);
|
||||
for (const retainedPath of result.retainedPaths) console.log(` - ${retainedPath}`);
|
||||
}
|
||||
for (const warning of result.warnings) console.log(`Warning: ${warning}`);
|
||||
}
|
||||
|
||||
function codexHomePath() {
|
||||
return process.env.CODEX_HOME || path.join(process.env.HOME || os.homedir(), '.codex');
|
||||
}
|
||||
|
||||
function includesCodexTarget(targets) {
|
||||
return targets.length === 0 || targets.includes('codex');
|
||||
}
|
||||
|
||||
async function main() {
|
||||
try {
|
||||
const options = parseArgs(process.argv);
|
||||
@@ -97,41 +128,54 @@ async function main() {
|
||||
if (options.legacyCodexSync && options.targets.length > 0) {
|
||||
throw new Error('--legacy-codex-sync cannot be combined with --target');
|
||||
}
|
||||
const result = options.legacyCodexSync
|
||||
? uninstallLegacyCodexSync({
|
||||
codexHome: process.env.CODEX_HOME,
|
||||
dryRun: options.dryRun,
|
||||
})
|
||||
: uninstallInstalledStates({
|
||||
homeDir: process.env.HOME || os.homedir(),
|
||||
projectRoot: process.cwd(),
|
||||
targets: options.targets,
|
||||
dryRun: options.dryRun,
|
||||
});
|
||||
if (!options.dryRun && !options.legacyCodexSync) {
|
||||
const { reconcileCanonicalInstallStates } = require('./lib/install-state-store-sync');
|
||||
result.installStateProjection = await reconcileCanonicalInstallStates({
|
||||
|
||||
let result;
|
||||
let mode = 'install-state';
|
||||
|
||||
if (options.legacyCodexSync) {
|
||||
result = uninstallLegacyCodexSync({
|
||||
codexHome: codexHomePath(),
|
||||
dryRun: options.dryRun,
|
||||
});
|
||||
mode = 'legacy-codex-sync';
|
||||
} else {
|
||||
result = uninstallInstalledStates({
|
||||
homeDir: process.env.HOME || os.homedir(),
|
||||
projectRoot: process.cwd(),
|
||||
targets: options.targets,
|
||||
dryRun: options.dryRun,
|
||||
});
|
||||
|
||||
if (
|
||||
result.results.length === 0
|
||||
&& includesCodexTarget(options.targets)
|
||||
&& detectLegacyCodexSync(codexHomePath())
|
||||
) {
|
||||
result = uninstallLegacyCodexSync({
|
||||
codexHome: codexHomePath(),
|
||||
dryRun: options.dryRun,
|
||||
});
|
||||
mode = 'legacy-codex-sync';
|
||||
}
|
||||
|
||||
if (mode === 'install-state' && !options.dryRun) {
|
||||
const { reconcileCanonicalInstallStates } = require('./lib/install-state-store-sync');
|
||||
result.installStateProjection = await reconcileCanonicalInstallStates({
|
||||
homeDir: process.env.HOME || os.homedir(),
|
||||
projectRoot: process.cwd(),
|
||||
targets: options.targets,
|
||||
});
|
||||
}
|
||||
}
|
||||
const hasErrors = options.legacyCodexSync
|
||||
|
||||
const hasErrors = mode === 'legacy-codex-sync'
|
||||
? result.status === 'partial'
|
||||
: result.summary.errorCount > 0 || result.summary.partialCount > 0;
|
||||
|
||||
if (options.json) {
|
||||
console.log(JSON.stringify(result, null, 2));
|
||||
} else if (options.legacyCodexSync) {
|
||||
console.log('Legacy Codex sync cleanup summary:\n');
|
||||
console.log(`Status: ${result.status.toUpperCase()}`);
|
||||
const paths = options.dryRun ? result.plannedRemovals : result.removedPaths;
|
||||
console.log(`${options.dryRun ? 'Planned changes' : 'Removed paths'}: ${paths.length}`);
|
||||
if (result.retainedPaths.length > 0) {
|
||||
console.log(`Retained paths: ${result.retainedPaths.length}`);
|
||||
for (const retainedPath of result.retainedPaths) console.log(` - ${retainedPath}`);
|
||||
}
|
||||
for (const warning of result.warnings) console.log(`Warning: ${warning}`);
|
||||
} else if (mode === 'legacy-codex-sync') {
|
||||
printLegacy(result, options.dryRun);
|
||||
} else {
|
||||
printHuman(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user