@kaitranntt/ccs 8.8.1-dev.21 → 8.8.1-dev.22

package/dist/management/shared-manager/canonical-first-file-reconciler.d.ts

@@ -0,0 +1,15 @@
+interface CanonicalFirstRoots {
+    claudeDir: string;
+    sharedDir: string;
+    instancesDir: string;
+}
+/**
+ * Reconcile a canonical-first shared file before any seed or symlink mutation.
+ * Existing canonical content always wins. With no canonical, one unique byte
+ * variant is adopted; conflicting variants are all quarantined for recovery.
+ */
+export declare function reconcileCanonicalFirstFile(roots: CanonicalFirstRoots, fileName: string): void;
+/** Preserve a later divergent copy without allowing it to replace canonical content. */
+export declare function preserveCanonicalFirstDivergence(divergedPath: string, canonicalPath: string): boolean;
+export {};
+//# sourceMappingURL=canonical-first-file-reconciler.d.ts.map

package/dist/management/shared-manager/canonical-first-file-reconciler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical-first-file-reconciler.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/canonical-first-file-reconciler.ts"],"names":[],"mappings":"AAmBA,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AA6CD;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAiD9F;AAED,wFAAwF;AACxF,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,OAAO,CAaT"}

package/dist/management/shared-manager/canonical-first-file-reconciler.js

@@ -0,0 +1,131 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preserveCanonicalFirstDivergence = exports.reconcileCanonicalFirstFile = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const ui_1 = require("../../utils/ui");
+const profile_registry_1 = __importDefault(require("../../auth/profile-registry"));
+const shared_resource_policy_1 = require("../../auth/shared-resource-policy");
+const instance_directory_1 = require("../instance-directory");
+const diverged_file_adopter_1 = require("./diverged-file-adopter");
+const fs_helpers_1 = require("./fs-helpers");
+const canonical_first_file_claims_1 = require("./canonical-first-file-claims");
+function candidatePaths(roots, fileName) {
+    const profiles = new profile_registry_1.default().getAllProfilesMerged();
+    const profilesByInstanceName = new Map();
+    for (const [profileName, profile] of Object.entries(profiles)) {
+        const instanceName = (0, instance_directory_1.normalizeAccountInstanceName)(profileName);
+        const matches = profilesByInstanceName.get(instanceName) ?? [];
+        matches.push(profile);
+        profilesByInstanceName.set(instanceName, matches);
+    }
+    return [
+        path.join(roots.sharedDir, fileName),
+        ...(0, instance_directory_1.listAccountInstancePaths)(roots.instancesDir)
+            .filter((instancePath) => {
+            const instanceName = (0, instance_directory_1.normalizeAccountInstanceName)(path.basename(instancePath));
+            const matches = profilesByInstanceName.get(instanceName) ?? [];
+            if (matches.length > 1)
+                return false;
+            return matches.length === 0 || !(0, shared_resource_policy_1.isProfileLocalSharedResourceMode)(matches[0]);
+        })
+            .map((instancePath) => path.join(instancePath, fileName)),
+    ];
+}
+function reconcileCandidatesAgainstCanonical(canonicalPath, candidates) {
+    let canonicalContent = null;
+    try {
+        canonicalContent = fs.readFileSync(canonicalPath);
+    }
+    catch {
+        // A present but unreadable or dangling canonical path still owns precedence.
+    }
+    for (const candidatePath of candidates) {
+        (0, canonical_first_file_claims_1.claimCanonicalFirstCopy)(candidatePath, canonicalContent, `Canonical ${path.basename(canonicalPath)} wins over divergent copy at ${candidatePath}`);
+    }
+}
+/**
+ * Reconcile a canonical-first shared file before any seed or symlink mutation.
+ * Existing canonical content always wins. With no canonical, one unique byte
+ * variant is adopted; conflicting variants are all quarantined for recovery.
+ */
+function reconcileCanonicalFirstFile(roots, fileName) {
+    const canonicalPath = path.join(roots.claudeDir, fileName);
+    const candidates = candidatePaths(roots, fileName);
+    for (const candidatePath of candidates) {
+        if (candidatePath !== path.join(roots.sharedDir, fileName)) {
+            const instancePath = path.dirname(candidatePath);
+            if (!(0, instance_directory_1.isSafeAccountInstancePath)(roots.instancesDir, instancePath))
+                continue;
+        }
+        (0, canonical_first_file_claims_1.recoverInterruptedClaims)(candidatePath);
+    }
+    if ((0, fs_helpers_1.getLstatSync)(canonicalPath)) {
+        reconcileCandidatesAgainstCanonical(canonicalPath, candidates);
+        return;
+    }
+    const variants = [];
+    for (const candidatePath of candidates) {
+        const content = (0, canonical_first_file_claims_1.readRegularFileContent)(candidatePath);
+        if (content)
+            variants.push({ path: candidatePath, content });
+    }
+    if (variants.length === 0)
+        return;
+    const uniqueContents = [];
+    for (const variant of variants) {
+        if (!uniqueContents.some((content) => content.equals(variant.content))) {
+            uniqueContents.push(variant.content);
+        }
+    }
+    if (uniqueContents.length === 1) {
+        (0, diverged_file_adopter_1.adoptDivergedFileContent)(variants[0].path, canonicalPath);
+        reconcileCandidatesAgainstCanonical(canonicalPath, candidates);
+        console.log((0, ui_1.info)(`Adopted the only existing ${fileName} variant as canonical content`));
+        return;
+    }
+    for (const variant of variants) {
+        (0, canonical_first_file_claims_1.claimCanonicalFirstCopy)(variant.path, null, `Conflicting ${fileName} variants found while no canonical file exists`);
+    }
+    console.log((0, ui_1.warn)(`No ${fileName} variant was selected; recover one of the .ccs-shared-conflict files explicitly`));
+}
+exports.reconcileCanonicalFirstFile = reconcileCanonicalFirstFile;
+/** Preserve a later divergent copy without allowing it to replace canonical content. */
+function preserveCanonicalFirstDivergence(divergedPath, canonicalPath) {
+    let canonicalContent = null;
+    try {
+        canonicalContent = fs.readFileSync(canonicalPath);
+    }
+    catch {
+        // Preserve the divergence when canonical cannot be compared safely.
+    }
+    return (0, canonical_first_file_claims_1.claimCanonicalFirstCopy)(divergedPath, canonicalContent, `Canonical ${path.basename(canonicalPath)} wins over divergent copy at ${divergedPath}`);
+}
+exports.preserveCanonicalFirstDivergence = preserveCanonicalFirstDivergence;
+//# sourceMappingURL=canonical-first-file-reconciler.js.map

package/dist/management/shared-manager/canonical-first-file-reconciler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical-first-file-reconciler.js","sourceRoot":"","sources":["../../../src/management/shared-manager/canonical-first-file-reconciler.ts"],"names":[],"mappings":"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"}

package/dist/management/shared-manager/plugin-layout-internals.d.ts

@@ -25,7 +25,7 @@ export declare function ensureSharedPluginLayoutDefaults(claudeDir: string): voi
  * Link shared plugins directory entries into an instance, creating the
  * instance plugins directory first if needed.
  */
-export declare function linkInstancePlugins(roots: PluginLayoutRoots, instancePath: string): void;
+export declare function linkInstancePlugins(roots: PluginLayoutRoots, instancePath: string, assertInstanceIdentity?: () => void): void;
 /**
  * Build the list of plugin entries to link from the shared plugins dir.
  * Always includes the default SHARED_PLUGIN_ENTRIES; adds any additional

package/dist/management/shared-manager/plugin-layout-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-layout-internals.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAOxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEpD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAyBxE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAmExF;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE,CAyCxE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAgD9F"}
+{"version":3,"file":"plugin-layout-internals.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAiBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAOxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAcpD;;;;GAIG;AACH,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAyBxE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,MAAM,EACpB,sBAAsB,CAAC,EAAE,MAAM,IAAI,GAClC,IAAI,CAsFN;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,EAAE,CAyCxE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAgD9F"}

package/dist/management/shared-manager/plugin-layout-internals.js

@@ -42,6 +42,15 @@ const diverged_file_adopter_1 = require("./diverged-file-adopter");
 const fs_helpers_1 = require("./fs-helpers");
 const plugin_metadata_normalizer_1 = require("./plugin-metadata-normalizer");
 const types_1 = require("./types");
+function runGuardedInstanceMutation(assertInstanceIdentity, operation) {
+    assertInstanceIdentity?.();
+    try {
+        return operation();
+    }
+    finally {
+        assertInstanceIdentity?.();
+    }
+}
 /**
  * Ensure the plugin layout default directories (cache, marketplaces) and
  * registry files (installed_plugins.json, known_marketplaces.json) exist
@@ -74,7 +83,7 @@ exports.ensureSharedPluginLayoutDefaults = ensureSharedPluginLayoutDefaults;
  * Link shared plugins directory entries into an instance, creating the
  * instance plugins directory first if needed.
  */
-function linkInstancePlugins(roots, instancePath) {
+function linkInstancePlugins(roots, instancePath, assertInstanceIdentity) {
     const linkPath = path.join(instancePath, 'plugins');
     const targetPath = path.join(roots.sharedDir, 'plugins');
     let linkStats = null;
@@ -86,35 +95,41 @@ function linkInstancePlugins(roots, instancePath) {
             throw err;
         }
     }
+    assertInstanceIdentity?.();
     if (linkStats?.isSymbolicLink() || (linkStats && !linkStats.isDirectory())) {
-        (0, fs_helpers_1.removeExistingPath)(linkPath, linkStats.isDirectory() ? 'directory' : 'file');
+        const existingType = linkStats.isDirectory() ? 'directory' : 'file';
+        runGuardedInstanceMutation(assertInstanceIdentity, () => (0, fs_helpers_1.removeExistingPath)(linkPath, existingType));
     }
     if (!linkStats || !linkStats.isDirectory()) {
-        fs.mkdirSync(linkPath, { recursive: true, mode: 0o700 });
+        runGuardedInstanceMutation(assertInstanceIdentity, () => fs.mkdirSync(linkPath, { recursive: true, mode: 0o700 }));
     }
-    for (const item of getSharedPluginLinkItems(roots.sharedDir)) {
+    const linkItems = getSharedPluginLinkItems(roots.sharedDir);
+    assertInstanceIdentity?.();
+    for (const item of linkItems) {
         const targetEntryPath = path.join(targetPath, item.name);
         const linkEntryPath = path.join(linkPath, item.name);
         let adoption = 'not-claimed';
         if (item.type === 'file') {
-            adoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkEntryPath, path.join(roots.claudeDir, 'plugins', item.name));
+            adoption = runGuardedInstanceMutation(assertInstanceIdentity, () => (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkEntryPath, path.join(roots.claudeDir, 'plugins', item.name)));
             if (adoption === 'not-claimed') {
-                (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type);
+                runGuardedInstanceMutation(assertInstanceIdentity, () => (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type));
             }
         }
         else {
-            (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type);
+            runGuardedInstanceMutation(assertInstanceIdentity, () => (0, fs_helpers_1.removeExistingPath)(linkEntryPath, item.type));
         }
         (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkEntryPath, adoption);
         if ((0, fs_helpers_1.getLstatSync)(linkEntryPath)) {
             console.log((0, ui_1.warn)(`Skipping plugins/${item.name}: path reappeared during reconciliation`));
             continue;
         }
+        assertInstanceIdentity?.();
         try {
             const symlinkType = item.type === 'directory' ? 'dir' : 'file';
             fs.symlinkSync(targetEntryPath, linkEntryPath, symlinkType);
         }
         catch (_err) {
+            assertInstanceIdentity?.();
             (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkEntryPath, adoption);
             if ((0, fs_helpers_1.getLstatSync)(linkEntryPath)) {
                 console.log((0, ui_1.warn)(`Skipping plugins/${item.name}: path reappeared during reconciliation`));
@@ -122,10 +137,10 @@ function linkInstancePlugins(roots, instancePath) {
             }
             if (process.platform === 'win32') {
                 if (item.type === 'directory') {
-                    (0, fs_helpers_1.copyDirectoryFallback)(targetEntryPath, linkEntryPath);
+                    runGuardedInstanceMutation(assertInstanceIdentity, () => (0, fs_helpers_1.copyDirectoryFallback)(targetEntryPath, linkEntryPath));
                 }
                 else {
-                    fs.copyFileSync(targetEntryPath, linkEntryPath, fs.constants.COPYFILE_EXCL);
+                    runGuardedInstanceMutation(assertInstanceIdentity, () => fs.copyFileSync(targetEntryPath, linkEntryPath, fs.constants.COPYFILE_EXCL));
                 }
                 console.log((0, ui_1.warn)(`Symlink failed for plugins/${item.name}, copied instead (enable Developer Mode)`));
             }
@@ -133,6 +148,7 @@ function linkInstancePlugins(roots, instancePath) {
                 throw _err;
             }
         }
+        assertInstanceIdentity?.();
     }
 }
 exports.linkInstancePlugins = linkInstancePlugins;

package/dist/management/shared-manager/plugin-layout-internals.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-layout-internals.js","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAE7B,uCAAsC;AACtC,mEAIiC;AACjC,6CAKsB;AAEtB,6EAAiF;AACjF,mCAIiB;AAQjB;;;;GAIG;AACH,SAAgB,gCAAgC,CAAC,SAAiB;IAChE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACnD,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAE3D,KAAK,MAAM,KAAK,IAAI,6BAAqB,EAAE,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,IAAA,qDAA6B,EAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC/B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,SAAS;QACX,CAAC;QAED,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,yCAAiC,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;IACjF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC5C,EAAE,CAAC,aAAa,CAAC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAzBD,4EAyBC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,KAAwB,EAAE,YAAoB;IAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACzD,IAAI,SAAS,GAAoB,IAAI,CAAC;IAEtC,IAAI,CAAC;QACH,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,IAAI,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC3E,IAAA,+BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QAC3C,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,QAAQ,GAAgD,aAAa,CAAC;QAE1E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,QAAQ,GAAG,IAAA,gDAAwB,EACjC,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CACjD,CAAC;YACF,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC/B,IAAA,+BAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAA,+BAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QACD,IAAA,gDAAwB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAElD,IAAI,IAAA,yBAAY,EAAC,aAAa,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,oBAAoB,IAAI,CAAC,IAAI,yCAAyC,CAAC,CAAC,CAAC;YAC1F,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/D,EAAE,CAAC,WAAW,CAAC,eAAe,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,IAAA,gDAAwB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,IAAA,yBAAY,EAAC,aAAa,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,IAAA,SAAI,EAAC,oBAAoB,IAAI,CAAC,IAAI,yCAAyC,CAAC,CAAC,CAAC;gBAC1F,SAAS;YACX,CAAC;YACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAC9B,IAAA,kCAAqB,EAAC,eAAe,EAAE,aAAa,CAAC,CAAC;gBACxD,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;gBAC9E,CAAC;gBACD,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EAAC,8BAA8B,IAAI,CAAC,IAAI,0CAA0C,CAAC,CACxF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC;YACb,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAnED,kDAmEC;AAED;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,SAAiB;IACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,6BAAqB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,CACjE,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/E,IACE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YACrB,4CAAoC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAClC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,yBAAyB,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAClC,CAAC;YACD,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC;YACH,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,GAAI,GAA6B,CAAC,IAAI,CAAC;YACjD,OAAO,CAAC,GAAG,CACT,IAAA,SAAI,EACF,oBAAoB,KAAK,CAAC,IAAI,0CAA0C,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnG,CACF,CAAC;YACF,SAAS;QACX,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;SACjD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AAC7B,CAAC;AAzCD,4DAyCC;AAED;;;;;GAKG;AACH,SAAgB,yBAAyB,CAAC,KAAwB,EAAE,YAAoB;IACtF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEhE,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;QAC3B,IAAI,IAAA,4BAAe,EAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAC;YACpD,IAAA,+BAAkB,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;QACzB,OAAO;IACT,CAAC;IAED,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,wBAAwB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,CAAC;YACjC,SAAS;QACX,CAAC;QAED,IAAI,IAAA,4BAAe,EAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9E,IAAA,+BAAkB,EAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,qBAAqB,GAAG,IAAI,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IAED,IAAA,8DAAiC,EAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAEvD,IAAI,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AAhDD,8DAgDC"}
+{"version":3,"file":"plugin-layout-internals.js","sourceRoot":"","sources":["../../../src/management/shared-manager/plugin-layout-internals.ts"],"names":[],"mappings":"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"}

package/dist/management/shared-manager/shared-dir-linker.d.ts

@@ -28,7 +28,7 @@ export declare function detectCircularSymlink(target: string, sharedDir: string)
  * Ensure shared directories exist as symlinks to ~/.claude/ and that the
  * plugin layout default directories and registry files are present.
  */
-export declare function ensureSharedDirectories(roots: LinkerRoots): void;
+export declare function ensureSharedDirectories(roots: LinkerRoots, assertInstanceIdentity?: () => void): void;
 /**
  * Link shared directories into a specific instance path.
  */

package/dist/management/shared-manager/shared-dir-linker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared-dir-linker.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAmBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAYxE;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAsChF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CA6FhE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CA2DpF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAyBtF"}
+{"version":3,"file":"shared-dir-linker.d.ts","sourceRoot":"","sources":["../../../src/management/shared-manager/shared-dir-linker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAuBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAgBxE;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAc9C;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAsChF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,WAAW,EAClB,sBAAsB,CAAC,EAAE,MAAM,IAAI,GAClC,IAAI,CA2GN;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CA0EpF;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAyBtF"}

package/dist/management/shared-manager/shared-dir-linker.js

@@ -42,11 +42,22 @@ exports.detachSharedDirectories = exports.linkSharedDirectories = exports.ensure
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ui_1 = require("../../utils/ui");
+const instance_directory_1 = require("../instance-directory");
 const diverged_file_adopter_1 = require("./diverged-file-adopter");
 const fs_helpers_1 = require("./fs-helpers");
 const plugin_metadata_normalizer_1 = require("./plugin-metadata-normalizer");
 const plugin_layout_internals_1 = require("./plugin-layout-internals");
+const canonical_first_file_reconciler_1 = require("./canonical-first-file-reconciler");
 const types_1 = require("./types");
+function runInstanceMutationStage(assertInstanceIdentity, operation) {
+    assertInstanceIdentity?.();
+    try {
+        return operation();
+    }
+    finally {
+        assertInstanceIdentity?.();
+    }
+}
 /**
  * Detect a circular symlink before creation. A symlink is circular when its
  * target (raw or canonical) points back inside the shared root.
@@ -91,90 +102,102 @@ exports.detectCircularSymlink = detectCircularSymlink;
  * Ensure shared directories exist as symlinks to ~/.claude/ and that the
  * plugin layout default directories and registry files are present.
  */
-function ensureSharedDirectories(roots) {
+function ensureSharedDirectories(roots, assertInstanceIdentity) {
     const claudeDir = roots.claudeDir;
     const sharedDir = roots.sharedDir;
-    if (!(0, fs_helpers_1.getLstatSync)(claudeDir)) {
-        console.log((0, ui_1.info)('Creating ~/.claude/ directory structure'));
-        fs.mkdirSync(claudeDir, { recursive: true, mode: 0o700 });
-    }
-    if (!(0, fs_helpers_1.getLstatSync)(sharedDir)) {
-        fs.mkdirSync(sharedDir, { recursive: true, mode: 0o700 });
-    }
-    (0, plugin_layout_internals_1.ensureSharedPluginLayoutDefaults)(claudeDir);
-    for (const item of types_1.SHARED_ITEMS) {
-        const claudePath = path.join(claudeDir, item.name);
-        const sharedPath = path.join(sharedDir, item.name);
-        if (item.type === 'file') {
-            (0, diverged_file_adopter_1.recoverOrphanedCanonicalClaim)(claudePath);
+    runInstanceMutationStage(assertInstanceIdentity, () => {
+        if (!(0, fs_helpers_1.getLstatSync)(claudeDir)) {
+            console.log((0, ui_1.info)('Creating ~/.claude/ directory structure'));
+            fs.mkdirSync(claudeDir, { recursive: true, mode: 0o700 });
         }
-        if (!(0, fs_helpers_1.getLstatSync)(claudePath)) {
-            if (item.type === 'directory') {
-                fs.mkdirSync(claudePath, { recursive: true, mode: 0o700 });
-            }
-            else if (item.type === 'file') {
-                fs.writeFileSync(claudePath, JSON.stringify({}, null, 2), 'utf8');
-            }
+    });
+    runInstanceMutationStage(assertInstanceIdentity, () => {
+        if (!(0, fs_helpers_1.getLstatSync)(sharedDir)) {
+            fs.mkdirSync(sharedDir, { recursive: true, mode: 0o700 });
         }
-        if (detectCircularSymlink(claudePath, sharedDir)) {
-            console.log((0, ui_1.warn)(`Skipping ${item.name}: circular symlink detected`));
-            continue;
-        }
-        let sharedAdoption = 'not-claimed';
-        if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
-            let removeExisting = true;
-            try {
-                const stats = fs.lstatSync(sharedPath);
-                if (stats.isSymbolicLink()) {
-                    const currentTarget = fs.readlinkSync(sharedPath);
-                    const resolvedTarget = path.resolve(path.dirname(sharedPath), currentTarget);
-                    if (resolvedTarget === claudePath) {
-                        continue;
-                    }
-                }
+    });
+    runInstanceMutationStage(assertInstanceIdentity, () => (0, plugin_layout_internals_1.ensureSharedPluginLayoutDefaults)(claudeDir));
+    for (const item of types_1.SHARED_ITEMS) {
+        runInstanceMutationStage(assertInstanceIdentity, () => {
+            const claudePath = path.join(claudeDir, item.name);
+            const sharedPath = path.join(sharedDir, item.name);
+            if (item.type === 'file') {
+                (0, diverged_file_adopter_1.recoverOrphanedCanonicalClaim)(claudePath);
             }
-            catch (_err) {
-                // Continue to recreate
+            if (item.type === 'file' && item.divergencePolicy === 'canonical-first') {
+                (0, canonical_first_file_reconciler_1.reconcileCanonicalFirstFile)(roots, item.name);
             }
-            if (item.type === 'file') {
-                sharedAdoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(sharedPath, claudePath);
-                removeExisting = sharedAdoption === 'not-claimed';
+            if (!(0, fs_helpers_1.getLstatSync)(claudePath)) {
+                if (item.type === 'directory') {
+                    fs.mkdirSync(claudePath, { recursive: true, mode: 0o700 });
+                }
+                else if (item.type === 'file') {
+                    fs.writeFileSync(claudePath, item.seedContent, 'utf8');
+                }
             }
-            if (item.type === 'directory' && removeExisting) {
-                fs.rmSync(sharedPath, { recursive: true, force: true });
+            if (detectCircularSymlink(claudePath, sharedDir)) {
+                console.log((0, ui_1.warn)(`Skipping ${item.name}: circular symlink detected`));
+                return;
             }
-            else if (removeExisting) {
-                fs.unlinkSync(sharedPath);
+            let sharedAdoption = 'not-claimed';
+            if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
+                let removeExisting = true;
+                try {
+                    const stats = fs.lstatSync(sharedPath);
+                    if (stats.isSymbolicLink()) {
+                        const currentTarget = fs.readlinkSync(sharedPath);
+                        const resolvedTarget = path.resolve(path.dirname(sharedPath), currentTarget);
+                        if (resolvedTarget === claudePath) {
+                            return;
+                        }
+                    }
+                }
+                catch (_err) {
+                    // Continue to recreate
+                }
+                if (item.type === 'file' && item.divergencePolicy === 'canonical-first') {
+                    removeExisting = !(0, canonical_first_file_reconciler_1.preserveCanonicalFirstDivergence)(sharedPath, claudePath);
+                }
+                else if (item.type === 'file') {
+                    sharedAdoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(sharedPath, claudePath);
+                    removeExisting = sharedAdoption === 'not-claimed';
+                }
+                if (item.type === 'directory' && removeExisting) {
+                    fs.rmSync(sharedPath, { recursive: true, force: true });
+                }
+                else if (removeExisting) {
+                    fs.unlinkSync(sharedPath);
+                }
+                (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
             }
-            (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
-        }
-        if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
-            console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
-            continue;
-        }
-        try {
-            const symlinkType = item.type === 'directory' ? 'dir' : 'file';
-            fs.symlinkSync(claudePath, sharedPath, symlinkType);
-        }
-        catch (_err) {
-            (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
             if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
                 console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
-                continue;
+                return;
             }
-            if (process.platform === 'win32') {
-                if (item.type === 'directory') {
-                    (0, fs_helpers_1.copyDirectoryFallback)(claudePath, sharedPath);
+            try {
+                const symlinkType = item.type === 'directory' ? 'dir' : 'file';
+                fs.symlinkSync(claudePath, sharedPath, symlinkType);
+            }
+            catch (_err) {
+                (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(sharedPath, sharedAdoption);
+                if ((0, fs_helpers_1.getLstatSync)(sharedPath)) {
+                    console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
+                    return;
                 }
-                else if (item.type === 'file') {
-                    fs.copyFileSync(claudePath, sharedPath, fs.constants.COPYFILE_EXCL);
+                if (process.platform === 'win32') {
+                    if (item.type === 'directory') {
+                        (0, fs_helpers_1.copyDirectoryFallback)(claudePath, sharedPath);
+                    }
+                    else if (item.type === 'file') {
+                        fs.copyFileSync(claudePath, sharedPath, fs.constants.COPYFILE_EXCL);
+                    }
+                    console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
+                }
+                else {
+                    throw _err;
                 }
-                console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
-            }
-            else {
-                throw _err;
             }
-        }
+        });
     }
 }
 exports.ensureSharedDirectories = ensureSharedDirectories;
@@ -182,59 +205,69 @@ exports.ensureSharedDirectories = ensureSharedDirectories;
  * Link shared directories into a specific instance path.
  */
 function linkSharedDirectories(roots, instancePath) {
-    ensureSharedDirectories(roots);
+    const instanceIdentity = (0, instance_directory_1.captureSafeAccountInstanceIdentity)(roots.instancesDir, instancePath);
+    const assertInstanceIdentity = () => (0, instance_directory_1.assertAccountInstanceIdentity)(roots.instancesDir, instancePath, instanceIdentity);
+    ensureSharedDirectories(roots, assertInstanceIdentity);
+    assertInstanceIdentity();
     const sharedDir = roots.sharedDir;
     for (const item of types_1.SHARED_ITEMS) {
-        if (item.name === 'plugins') {
-            (0, plugin_layout_internals_1.linkInstancePlugins)(roots, instancePath);
-            continue;
-        }
-        const linkPath = path.join(instancePath, item.name);
-        const targetPath = path.join(sharedDir, item.name);
-        let adoption = 'not-claimed';
-        if (item.type === 'file') {
-            adoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkPath, path.join(roots.claudeDir, item.name));
-            if (adoption === 'not-claimed') {
+        runInstanceMutationStage(assertInstanceIdentity, () => {
+            if (item.name === 'plugins') {
+                (0, plugin_layout_internals_1.linkInstancePlugins)(roots, instancePath, assertInstanceIdentity);
+                return;
+            }
+            const linkPath = path.join(instancePath, item.name);
+            const targetPath = path.join(sharedDir, item.name);
+            let adoption = 'not-claimed';
+            if (item.type === 'file' && item.divergencePolicy === 'canonical-first') {
+                if (!(0, canonical_first_file_reconciler_1.preserveCanonicalFirstDivergence)(linkPath, path.join(roots.claudeDir, item.name))) {
+                    (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
+                }
+            }
+            else if (item.type === 'file') {
+                adoption = (0, diverged_file_adopter_1.adoptDivergedFileContent)(linkPath, path.join(roots.claudeDir, item.name));
+                if (adoption === 'not-claimed') {
+                    (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
+                }
+            }
+            else {
                 (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
             }
-        }
-        else {
-            (0, fs_helpers_1.removeExistingPath)(linkPath, item.type);
-        }
-        (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkPath, adoption);
-        if ((0, fs_helpers_1.getLstatSync)(linkPath)) {
-            console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
-            continue;
-        }
-        try {
-            const symlinkType = item.type === 'directory' ? 'dir' : 'file';
-            fs.symlinkSync(targetPath, linkPath, symlinkType);
-        }
-        catch (_err) {
             (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkPath, adoption);
             if ((0, fs_helpers_1.getLstatSync)(linkPath)) {
                 console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
-                continue;
+                return;
             }
-            if (process.platform === 'win32') {
-                if (item.type === 'directory') {
-                    (0, fs_helpers_1.copyDirectoryFallback)(targetPath, linkPath);
+            try {
+                const symlinkType = item.type === 'directory' ? 'dir' : 'file';
+                fs.symlinkSync(targetPath, linkPath, symlinkType);
+            }
+            catch (_err) {
+                (0, diverged_file_adopter_1.assertAdoptionPathAbsent)(linkPath, adoption);
+                if ((0, fs_helpers_1.getLstatSync)(linkPath)) {
+                    console.log((0, ui_1.warn)(`Skipping ${item.name}: path reappeared during reconciliation`));
+                    return;
                 }
-                else if (item.type === 'file') {
-                    fs.copyFileSync(targetPath, linkPath, fs.constants.COPYFILE_EXCL);
+                if (process.platform === 'win32') {
+                    if (item.type === 'directory') {
+                        (0, fs_helpers_1.copyDirectoryFallback)(targetPath, linkPath);
+                    }
+                    else if (item.type === 'file') {
+                        fs.copyFileSync(targetPath, linkPath, fs.constants.COPYFILE_EXCL);
+                    }
+                    console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
+                }
+                else {
+                    throw _err;
                 }
-                console.log((0, ui_1.warn)(`Symlink failed for ${item.name}, copied instead (enable Developer Mode)`));
-            }
-            else {
-                throw _err;
             }
-        }
+        });
     }
     // Preserve original behavior: linkSharedDirectories always concludes by
     // normalizing plugin + marketplace metadata for the freshly linked
     // instance. migrateFromV311 relies on this side effect.
-    (0, plugin_metadata_normalizer_1.normalizePluginRegistryPaths)(roots, instancePath);
-    (0, plugin_metadata_normalizer_1.normalizeMarketplaceRegistryPaths)(roots, instancePath);
+    runInstanceMutationStage(assertInstanceIdentity, () => (0, plugin_metadata_normalizer_1.normalizePluginRegistryPaths)(roots, instancePath));
+    runInstanceMutationStage(assertInstanceIdentity, () => (0, plugin_metadata_normalizer_1.normalizeMarketplaceRegistryPaths)(roots, instancePath));
 }
 exports.linkSharedDirectories = linkSharedDirectories;
 /**