openplanr 2.2641.2 → 3.0.1

package/dist/services/runtime-manager-service.js

@@ -24,7 +24,7 @@ import { classifyComponentDrift as classifyRuntimeComponentDrift, diagnoseManage
 import { migrateLegacyGlobalRuntimeState, } from './runtime-manager/global-state.js';
 import { inventoryManagedSkillFiles, planCodexUserBundleTransition, } from './runtime-manager/install-plan.js';
 import { detectInstalledRuntimes, inspectRuntimeProjectContext, listInstalledRuntimeAdapters, planningFolderConflict, } from './runtime-manager/inventory.js';
-import { inspectRuntimeLocator, inspectRuntimePackage, inspectThinRule, runtimeLocator, thinDiscoveryMetadata, thinSkillEntry, } from './runtime-manager/runtime-package.js';
+import { caseVariantOf, describePackageDrift, inspectRuntimeLocator, inspectRuntimePackage, inspectThinRule, retainedPackageDrift, runtimeLocator, thinDiscoveryMetadata, thinSkillEntry, } from './runtime-manager/runtime-package.js';
 export { classifyComponentDrift } from './runtime-manager/doctor.js';
 const runtimeLockSchema = JSON.parse(readFileSync(new URL('../../lib/runtime-lock.schema.json', import.meta.url), 'utf8'));
 // Setup and global help remain available when the optional pipeline package is absent.
@@ -663,13 +663,22 @@ function duplicateClaudePluginDiagnostic(inspection) {
             .join(' && ')}`,
     };
 }
-function bundledRuntimePackage(runtime, inspectInstalled = false) {
+function bundledRuntimePackage(runtime) {
     const host = runtime === 'claude-code' ? 'claude' : runtime === 'codex' ? 'openai' : 'cursor';
     try {
-        return inspectRuntimePackage(path.join(bundledHostRoot(host), 'openplanr'), path.join(runtimeRoot(), 'packages'), host, readRegistry().pluginVersion, inspectInstalled);
+        return inspectRuntimePackage(path.join(bundledHostRoot(host), 'openplanr'), path.join(runtimeRoot(), 'packages'), host, readRegistry().pluginVersion, false);
     }
     catch (cause) {
-        throw new RuntimeManagerError('E_RUNTIME_PACKAGE_INVALID', `The exact ${runtime} runtime package could not be verified: ${cause instanceof Error ? cause.message : String(cause)}`, 'Preserve changed cached files and reinstall the reviewed CLI package; setup never rewrites an immutable runtime.');
+        throw new RuntimeManagerError('E_RUNTIME_PACKAGE_INVALID', `The exact ${runtime} runtime package could not be verified: ${cause instanceof Error ? cause.message : String(cause)}`, 'Reinstall the OpenPlanr CLI or regenerate its host packages.');
+    }
+}
+/** Compares the retained copy of the bundled package with its reviewed bytes. */
+function retainedRuntimePackageDrift(runtime, runtimePackage) {
+    try {
+        return retainedPackageDrift(runtimePackage);
+    }
+    catch (cause) {
+        throw new RuntimeManagerError('E_RUNTIME_PACKAGE_INVALID', `The ${runtime} runtime package ${runtimePackage.version} at ${runtimePackage.root} could not be inspected: ${cause instanceof Error ? cause.message : String(cause)}`, 'Remove the symbolic link or other unsupported entry it names, then rerun the command.');
     }
 }
 function bundledSkillAssets(runtime, runtimePackage = bundledRuntimePackage(runtime)) {
@@ -826,7 +835,7 @@ function buildRuntimeLock(options, runtimes, runtimeScopes, registry, pipelineVe
     }
     return Buffer.from(`${JSON.stringify(lock, null, 2)}\n`);
 }
-function buildActions(options, runtimes, runtimeScopes, retainedProject) {
+function buildActions(options, runtimes, runtimeScopes, retainedProject, packageRestores = []) {
     if (options.minimal)
         return [];
     const { version, registry } = readRegistry();
@@ -850,8 +859,32 @@ function buildActions(options, runtimes, runtimeScopes, retainedProject) {
         let skillAssets;
         let runtimePackage;
         try {
-            runtimePackage = bundledRuntimePackage(runtime, usesThinEntries);
-            for (const file of usesThinEntries ? runtimePackage.files : []) {
+            runtimePackage = bundledRuntimePackage(runtime);
+            skillAssets = bundledSkillAssets(runtime, runtimePackage);
+        }
+        catch (cause) {
+            throw new RuntimeManagerError('E_SKILL_DISTRIBUTION_INVALID', `The generated ${runtime} skill distribution is invalid: ${cause instanceof Error ? cause.message : String(cause)}`, 'Reinstall the OpenPlanr utility CLI or regenerate the host packages.');
+        }
+        if (usesThinEntries) {
+            const drift = retainedRuntimePackageDrift(runtime, runtimePackage);
+            if (drift.changed.length > 0 || drift.unexpected.length > 0) {
+                if (!options.restoreRuntimePackages) {
+                    throw new RuntimeManagerError('E_RUNTIME_PACKAGE_CHANGED', `Files in the ${runtime} runtime package ${runtimePackage.version} were changed outside OpenPlanr: ${describePackageDrift(drift)}.`, `Run \`${CLI_COMMAND} doctor --fix\` to restore the package from this CLI; the changed files are backed up first.`);
+                }
+                // A restore never deletes a name that could open a packaged file.
+                const reviewed = runtimePackage.files.map((file) => file.relativePath);
+                const caseVariants = drift.unexpected.filter((file) => caseVariantOf(file, reviewed));
+                if (caseVariants.length > 0) {
+                    throw new RuntimeManagerError('E_RUNTIME_PACKAGE_CHANGED', `Files in the ${runtime} runtime package ${runtimePackage.version} differ from packaged files only by letter case: ${caseVariants.join(', ')}.`, `OpenPlanr does not delete them. Remove them by hand, then rerun \`${CLI_COMMAND} doctor --fix\`.`);
+                }
+                packageRestores.push({
+                    runtime,
+                    version: runtimePackage.version,
+                    root: runtimePackage.root,
+                    ...drift,
+                });
+            }
+            for (const file of runtimePackage.files) {
                 actions.push({
                     runtime: 'core',
                     scope: 'user',
@@ -862,10 +895,6 @@ function buildActions(options, runtimes, runtimeScopes, retainedProject) {
                     description: `Retain exact ${runtime} runtime package ${file.relativePath}`,
                 });
             }
-            skillAssets = bundledSkillAssets(runtime, runtimePackage);
-        }
-        catch (cause) {
-            throw new RuntimeManagerError('E_SKILL_DISTRIBUTION_INVALID', `The generated ${runtime} skill distribution is invalid: ${cause instanceof Error ? cause.message : String(cause)}`, 'Reinstall the OpenPlanr utility CLI or regenerate the host packages.');
         }
         if (installUser) {
             if (runtime === 'codex') {
@@ -1041,6 +1070,21 @@ function planRetiredCursorProjectRules(projectDir, runtimes, runtimeScopes) {
         ];
     });
 }
+/** Files added to a retained runtime package; a restore removes them after the backup. */
+function planPackageRetirements(restores) {
+    return restores.flatMap((restore) => restore.unexpected.map((file) => {
+        const target = path.join(restore.root, file);
+        return {
+            runtime: 'core',
+            scope: 'user',
+            target,
+            content: readFileSync(target),
+            kind: 'file',
+            custody: 'runtime-package',
+            description: `Remove ${file}, which was added to the exact ${restore.runtime} runtime package`,
+        };
+    }));
+}
 function inventoryRegularFiles(root) {
     return inventoryManagedSkillFiles(root, (message, recovery) => {
         throw new RuntimeManagerError('E_MIGRATION_CONFLICT', message, recovery);
@@ -1407,8 +1451,10 @@ export async function previewSetup(options) {
     const retainedProject = options.preserveExistingScopes
         ? (await loadState()).projects[projectKey(options.projectDir)]
         : undefined;
-    const actions = buildActions(options, runtimes, runtimeScopes, retainedProject);
-    assertActionCustody(actions, options.projectDir);
+    const packageRestores = [];
+    const actions = buildActions(options, runtimes, runtimeScopes, retainedProject, packageRestores);
+    const packageRetirements = planPackageRetirements(packageRestores);
+    assertActionCustody([...actions, ...packageRetirements], options.projectDir);
     const scopeRetirements = planScopeRetirements(options, (await loadState()).projects[projectKey(options.projectDir)], runtimes, actions);
     const retiredProjectRules = planRetiredCursorProjectRules(options.projectDir, runtimes, runtimeScopes);
     const needsTransitionState = runtimes.includes('codex') ||
@@ -1556,6 +1602,13 @@ export async function previewSetup(options) {
                 operation: operationFor(action),
                 description: action.description,
             })),
+            ...packageRetirements.map((action) => ({
+                runtime: action.runtime,
+                scope: action.scope,
+                target: action.target,
+                operation: 'retire',
+                description: action.description,
+            })),
             ...retiredProjectRules.map((action) => ({
                 runtime: action.runtime,
                 scope: action.scope,
@@ -1585,6 +1638,7 @@ export async function previewSetup(options) {
             ...(codexInspection?.operations ?? []),
         ],
         runtimeDiagnostics,
+        ...(packageRestores.length > 0 ? { runtimePackageRestores: packageRestores } : {}),
     };
 }
 export async function applySetup(options) {
@@ -1621,8 +1675,11 @@ export async function applySetup(options) {
         const retainedProject = options.preserveExistingScopes
             ? state.projects[projectKey(options.projectDir)]
             : undefined;
-        const actions = buildActions(options, preview.runtimes, preview.runtimeScopes, retainedProject);
-        assertActionCustody(actions, options.projectDir);
+        const packageRestores = [];
+        const actions = buildActions(options, preview.runtimes, preview.runtimeScopes, retainedProject, packageRestores);
+        const packageRetirements = planPackageRetirements(packageRestores);
+        assertActionCustody([...actions, ...packageRetirements], options.projectDir);
+        const restoredPackageTargets = new Set(packageRestores.flatMap((restore) => restore.changed.map((file) => path.join(restore.root, file))));
         const scopeRetirements = planScopeRetirements(options, state.projects[projectKey(options.projectDir)], preview.runtimes, actions);
         const retiredProjectRules = planRetiredCursorProjectRules(options.projectDir, preview.runtimes, preview.runtimeScopes);
         const previousCodexMode = state.userBundles?.codex?.installMode ??
@@ -1672,6 +1729,7 @@ export async function applySetup(options) {
             ...changed,
             ...retirementActions,
             ...retiredProjectRules,
+            ...packageRetirements,
             ...scopeRetirements,
             stateAction,
         ].filter((action, index, list) => list.findIndex((candidate) => candidate.target === action.target) === index);
@@ -1697,6 +1755,7 @@ export async function applySetup(options) {
                 verifyCurrent();
                 const content = actionBytes(action);
                 if (action.custody === 'runtime-package' &&
+                    !restoredPackageTargets.has(action.target) &&
                     existsSync(action.target) &&
                     !readFileSync(action.target).equals(content)) {
                     throw new RuntimeManagerError('E_MIGRATION_CONFLICT', `Immutable runtime bytes changed during setup: ${action.target}.`, 'Preserve the changed cache; rerun with the reviewed package after resolving its custody.');
@@ -1771,6 +1830,19 @@ export async function applySetup(options) {
                 await unlink(retired.target);
                 retiredTargets.add(retired.target);
             }
+            for (const retired of packageRetirements) {
+                assertMutableOwnedTarget(retired.target, options.projectDir, 'E_MIGRATION_CONFLICT');
+                if (!existsSync(retired.target))
+                    continue;
+                const metadata = lstatSync(retired.target);
+                if (metadata.isSymbolicLink() ||
+                    !metadata.isFile() ||
+                    hash(readFileSync(retired.target)) !== hash(retired.content)) {
+                    throw new RuntimeManagerError('E_MIGRATION_CONFLICT', `Runtime package bytes changed during setup: ${retired.target}.`, 'The concurrent edit was preserved; inspect it before rerunning setup.');
+                }
+                await unlink(retired.target);
+                retiredTargets.add(retired.target);
+            }
             const updatedAt = new Date().toISOString();
             state.schemaVersion = '2.0.0';
             state.userBundles ??= {};
@@ -2526,7 +2598,7 @@ export async function runtimeDoctor(projectDir, options = {}) {
                 : 'Pinned runtime packages match their complete content inventories',
             ...(closureFailures.length
                 ? {
-                    fix: `Run \`${CLI_COMMAND} doctor --fix\` to preview exact-package repair; preserve modified cache bytes for inspection.`,
+                    fix: `Run \`${CLI_COMMAND} doctor --fix\` to preview the repair; changed package files are backed up before anything is replaced.`,
                 }
                 : {}),
         });