@alessandroraffa/tangyr 3.0.0 → 3.0.2

package/dist/index.js

@@ -1372,8 +1372,8 @@ var require_command = __commonJS({
     "use strict";
     var EventEmitter = __require("events").EventEmitter;
     var childProcess = __require("child_process");
-    var path50 = __require("path");
-    var fs49 = __require("fs");
+    var path51 = __require("path");
+    var fs50 = __require("fs");
     var process5 = __require("process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -2367,7 +2367,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} subcommandName
        */
       _checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-        if (fs49.existsSync(executableFile)) return;
+        if (fs50.existsSync(executableFile)) return;
         const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : "no directory for search for local subcommand, use .executableDir() to supply a custom directory";
         const executableMissing = `'${executableFile}' does not exist
  - if '${subcommandName}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead
@@ -2385,11 +2385,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path50.resolve(baseDir, baseName);
-          if (fs49.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path50.extname(baseName))) return void 0;
+          const localBin = path51.resolve(baseDir, baseName);
+          if (fs50.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path51.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs49.existsSync(`${localBin}${ext}`)
+            (ext) => fs50.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -2401,21 +2401,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs49.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs50.realpathSync(this._scriptPath);
           } catch {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path50.resolve(
-            path50.dirname(resolvedScriptPath),
+          executableDir = path51.resolve(
+            path51.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path50.basename(
+            const legacyName = path51.basename(
               this._scriptPath,
-              path50.extname(this._scriptPath)
+              path51.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -2426,7 +2426,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path50.extname(executableFile));
+        launchWithNode = sourceExt.includes(path51.extname(executableFile));
         let proc;
         if (process5.platform !== "win32") {
           if (launchWithNode) {
@@ -3341,7 +3341,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path50.basename(filename, path50.extname(filename));
+        this._name = path51.basename(filename, path51.extname(filename));
         return this;
       }
       /**
@@ -3355,9 +3355,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path51) {
-        if (path51 === void 0) return this._executableDir;
-        this._executableDir = path51;
+      executableDir(path52) {
+        if (path52 === void 0) return this._executableDir;
+        this._executableDir = path52;
         return this;
       }
       /**
@@ -3713,17 +3713,17 @@ var require_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function visit_(key, node, visitor, path50) {
-      const ctrl = callVisitor(key, node, visitor, path50);
+    function visit_(key, node, visitor, path51) {
+      const ctrl = callVisitor(key, node, visitor, path51);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path50, ctrl);
-        return visit_(key, ctrl, visitor, path50);
+        replaceNode(key, path51, ctrl);
+        return visit_(key, ctrl, visitor, path51);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path50 = Object.freeze(path50.concat(node));
+          path51 = Object.freeze(path51.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            const ci2 = visit_(i, node.items[i], visitor, path50);
+            const ci2 = visit_(i, node.items[i], visitor, path51);
             if (typeof ci2 === "number")
               i = ci2 - 1;
             else if (ci2 === BREAK)
@@ -3734,13 +3734,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path50 = Object.freeze(path50.concat(node));
-          const ck = visit_("key", node.key, visitor, path50);
+          path51 = Object.freeze(path51.concat(node));
+          const ck = visit_("key", node.key, visitor, path51);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = visit_("value", node.value, visitor, path50);
+          const cv = visit_("value", node.value, visitor, path51);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -3761,17 +3761,17 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node, visitor, path50) {
-      const ctrl = await callVisitor(key, node, visitor, path50);
+    async function visitAsync_(key, node, visitor, path51) {
+      const ctrl = await callVisitor(key, node, visitor, path51);
       if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-        replaceNode(key, path50, ctrl);
-        return visitAsync_(key, ctrl, visitor, path50);
+        replaceNode(key, path51, ctrl);
+        return visitAsync_(key, ctrl, visitor, path51);
       }
       if (typeof ctrl !== "symbol") {
         if (identity.isCollection(node)) {
-          path50 = Object.freeze(path50.concat(node));
+          path51 = Object.freeze(path51.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            const ci2 = await visitAsync_(i, node.items[i], visitor, path50);
+            const ci2 = await visitAsync_(i, node.items[i], visitor, path51);
             if (typeof ci2 === "number")
               i = ci2 - 1;
             else if (ci2 === BREAK)
@@ -3782,13 +3782,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity.isPair(node)) {
-          path50 = Object.freeze(path50.concat(node));
-          const ck = await visitAsync_("key", node.key, visitor, path50);
+          path51 = Object.freeze(path51.concat(node));
+          const ck = await visitAsync_("key", node.key, visitor, path51);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = await visitAsync_("value", node.value, visitor, path50);
+          const cv = await visitAsync_("value", node.value, visitor, path51);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -3815,23 +3815,23 @@ var require_visit = __commonJS({
       }
       return visitor;
     }
-    function callVisitor(key, node, visitor, path50) {
+    function callVisitor(key, node, visitor, path51) {
       if (typeof visitor === "function")
-        return visitor(key, node, path50);
+        return visitor(key, node, path51);
       if (identity.isMap(node))
-        return visitor.Map?.(key, node, path50);
+        return visitor.Map?.(key, node, path51);
       if (identity.isSeq(node))
-        return visitor.Seq?.(key, node, path50);
+        return visitor.Seq?.(key, node, path51);
       if (identity.isPair(node))
-        return visitor.Pair?.(key, node, path50);
+        return visitor.Pair?.(key, node, path51);
       if (identity.isScalar(node))
-        return visitor.Scalar?.(key, node, path50);
+        return visitor.Scalar?.(key, node, path51);
       if (identity.isAlias(node))
-        return visitor.Alias?.(key, node, path50);
+        return visitor.Alias?.(key, node, path51);
       return void 0;
     }
-    function replaceNode(key, path50, node) {
-      const parent = path50[path50.length - 1];
+    function replaceNode(key, path51, node) {
+      const parent = path51[path51.length - 1];
       if (identity.isCollection(parent)) {
         parent.items[key] = node;
       } else if (identity.isPair(parent)) {
@@ -4439,10 +4439,10 @@ var require_Collection = __commonJS({
     var createNode = require_createNode();
     var identity = require_identity();
     var Node = require_Node();
-    function collectionFromPath(schema, path50, value) {
+    function collectionFromPath(schema, path51, value) {
       let v2 = value;
-      for (let i = path50.length - 1; i >= 0; --i) {
-        const k2 = path50[i];
+      for (let i = path51.length - 1; i >= 0; --i) {
+        const k2 = path51[i];
         if (typeof k2 === "number" && Number.isInteger(k2) && k2 >= 0) {
           const a = [];
           a[k2] = v2;
@@ -4461,7 +4461,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path50) => path50 == null || typeof path50 === "object" && !!path50[Symbol.iterator]().next().done;
+    var isEmptyPath = (path51) => path51 == null || typeof path51 === "object" && !!path51[Symbol.iterator]().next().done;
     var Collection = class extends Node.NodeBase {
       constructor(type, schema) {
         super(type);
@@ -4491,11 +4491,11 @@ var require_Collection = __commonJS({
        * be a Pair instance or a `{ key, value }` object, which may not have a key
        * that already exists in the map.
        */
-      addIn(path50, value) {
-        if (isEmptyPath(path50))
+      addIn(path51, value) {
+        if (isEmptyPath(path51))
           this.add(value);
         else {
-          const [key, ...rest] = path50;
+          const [key, ...rest] = path51;
           const node = this.get(key, true);
           if (identity.isCollection(node))
             node.addIn(rest, value);
@@ -4509,8 +4509,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path50) {
-        const [key, ...rest] = path50;
+      deleteIn(path51) {
+        const [key, ...rest] = path51;
         if (rest.length === 0)
           return this.delete(key);
         const node = this.get(key, true);
@@ -4524,8 +4524,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path50, keepScalar) {
-        const [key, ...rest] = path50;
+      getIn(path51, keepScalar) {
+        const [key, ...rest] = path51;
         const node = this.get(key, true);
         if (rest.length === 0)
           return !keepScalar && identity.isScalar(node) ? node.value : node;
@@ -4543,8 +4543,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path50) {
-        const [key, ...rest] = path50;
+      hasIn(path51) {
+        const [key, ...rest] = path51;
         if (rest.length === 0)
           return this.has(key);
         const node = this.get(key, true);
@@ -4554,8 +4554,8 @@ var require_Collection = __commonJS({
        * Sets a value in this collection. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path50, value) {
-        const [key, ...rest] = path50;
+      setIn(path51, value) {
+        const [key, ...rest] = path51;
         if (rest.length === 0) {
           this.set(key, value);
         } else {
@@ -7067,9 +7067,9 @@ var require_Document = __commonJS({
           this.contents.add(value);
       }
       /** Adds a value to the document. */
-      addIn(path50, value) {
+      addIn(path51, value) {
         if (assertCollection(this.contents))
-          this.contents.addIn(path50, value);
+          this.contents.addIn(path51, value);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -7144,14 +7144,14 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path50) {
-        if (Collection.isEmptyPath(path50)) {
+      deleteIn(path51) {
+        if (Collection.isEmptyPath(path51)) {
           if (this.contents == null)
             return false;
           this.contents = null;
           return true;
         }
-        return assertCollection(this.contents) ? this.contents.deleteIn(path50) : false;
+        return assertCollection(this.contents) ? this.contents.deleteIn(path51) : false;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -7166,10 +7166,10 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path50, keepScalar) {
-        if (Collection.isEmptyPath(path50))
+      getIn(path51, keepScalar) {
+        if (Collection.isEmptyPath(path51))
           return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity.isCollection(this.contents) ? this.contents.getIn(path50, keepScalar) : void 0;
+        return identity.isCollection(this.contents) ? this.contents.getIn(path51, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -7180,10 +7180,10 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path50) {
-        if (Collection.isEmptyPath(path50))
+      hasIn(path51) {
+        if (Collection.isEmptyPath(path51))
           return this.contents !== void 0;
-        return identity.isCollection(this.contents) ? this.contents.hasIn(path50) : false;
+        return identity.isCollection(this.contents) ? this.contents.hasIn(path51) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -7200,13 +7200,13 @@ var require_Document = __commonJS({
        * Sets a value in this document. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path50, value) {
-        if (Collection.isEmptyPath(path50)) {
+      setIn(path51, value) {
+        if (Collection.isEmptyPath(path51)) {
           this.contents = value;
         } else if (this.contents == null) {
-          this.contents = Collection.collectionFromPath(this.schema, Array.from(path50), value);
+          this.contents = Collection.collectionFromPath(this.schema, Array.from(path51), value);
         } else if (assertCollection(this.contents)) {
-          this.contents.setIn(path50, value);
+          this.contents.setIn(path51, value);
         }
       }
       /**
@@ -9163,9 +9163,9 @@ var require_cst_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    visit.itemAtPath = (cst, path50) => {
+    visit.itemAtPath = (cst, path51) => {
       let item = cst;
-      for (const [field, index] of path50) {
+      for (const [field, index] of path51) {
         const tok = item?.[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
@@ -9174,23 +9174,23 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit.parentCollection = (cst, path50) => {
-      const parent = visit.itemAtPath(cst, path50.slice(0, -1));
-      const field = path50[path50.length - 1][0];
+    visit.parentCollection = (cst, path51) => {
+      const parent = visit.itemAtPath(cst, path51.slice(0, -1));
+      const field = path51[path51.length - 1][0];
       const coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path50, item, visitor) {
-      let ctrl = visitor(item, path50);
+    function _visit(path51, item, visitor) {
+      let ctrl = visitor(item, path51);
       if (typeof ctrl === "symbol")
         return ctrl;
       for (const field of ["key", "value"]) {
         const token = item[field];
         if (token && "items" in token) {
           for (let i = 0; i < token.items.length; ++i) {
-            const ci2 = _visit(Object.freeze(path50.concat([[field, i]])), token.items[i], visitor);
+            const ci2 = _visit(Object.freeze(path51.concat([[field, i]])), token.items[i], visitor);
             if (typeof ci2 === "number")
               i = ci2 - 1;
             else if (ci2 === BREAK)
@@ -9201,10 +9201,10 @@ var require_cst_visit = __commonJS({
             }
           }
           if (typeof ctrl === "function" && field === "key")
-            ctrl = ctrl(item, path50);
+            ctrl = ctrl(item, path51);
         }
       }
-      return typeof ctrl === "function" ? ctrl(item, path50) : ctrl;
+      return typeof ctrl === "function" ? ctrl(item, path51) : ctrl;
     }
     exports2.visit = visit;
   }
@@ -10489,14 +10489,14 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs49 = this.flowScalar(this.type);
+              const fs50 = this.flowScalar(this.type);
               if (atNextItem || it2.value) {
-                map.items.push({ start, key: fs49, sep: [] });
+                map.items.push({ start, key: fs50, sep: [] });
                 this.onKeyLine = true;
               } else if (it2.sep) {
-                this.stack.push(fs49);
+                this.stack.push(fs50);
               } else {
-                Object.assign(it2, { key: fs49, sep: [] });
+                Object.assign(it2, { key: fs50, sep: [] });
                 this.onKeyLine = true;
               }
               return;
@@ -10624,13 +10624,13 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs49 = this.flowScalar(this.type);
+              const fs50 = this.flowScalar(this.type);
               if (!it2 || it2.value)
-                fc.items.push({ start: [], key: fs49, sep: [] });
+                fc.items.push({ start: [], key: fs50, sep: [] });
               else if (it2.sep)
-                this.stack.push(fs49);
+                this.stack.push(fs50);
               else
-                Object.assign(it2, { key: fs49, sep: [] });
+                Object.assign(it2, { key: fs50, sep: [] });
               return;
             }
             case "flow-map-end":
@@ -16114,6 +16114,12 @@ function addManagedLink(manifest, link) {
     manifest.managedLinks.push(link);
   }
 }
+function parkConflictingPath(destination, scopePath) {
+  const backupPath = resolveBackupPath(destination, scopePath);
+  fs6.mkdirSync(path6.dirname(backupPath), { recursive: true });
+  fs6.renameSync(destination, backupPath);
+  return backupPath;
+}
 
 // src/core/exit.ts
 var EXIT_FAILURE = 1;
@@ -25152,8 +25158,8 @@ function toConflictPolicy2(value) {
 }
 
 // src/commands/install.ts
-import fs43 from "fs";
-import path43 from "path";
+import fs44 from "fs";
+import path44 from "path";
 
 // src/core/channel-state.ts
 import fs32 from "fs";
@@ -26059,9 +26065,91 @@ function sleep(ms2) {
   });
 }
 
+// src/core/contested-instructions.ts
+import fs34 from "fs";
+import path31 from "path";
+var FOLDS_RULES_INTO_INSTRUCTIONS = {
+  codex: "its own rules slot takes only exec-policy rules, so guidance rules are folded in",
+  opencode: "it has no rules slot of its own, so every rule is folded in"
+};
+function markerTarget(destination) {
+  try {
+    if (fs34.lstatSync(destination).isSymbolicLink()) {
+      return null;
+    }
+    const firstNonEmpty = fs34.readFileSync(destination, "utf8").split("\n").find((line) => line.trim().length > 0) ?? "";
+    return extractProvenanceMarker(firstNonEmpty)?.target ?? null;
+  } catch {
+    return null;
+  }
+}
+function findContestedInstructions(instructionsByTarget) {
+  const byPath = /* @__PURE__ */ new Map();
+  for (const [target, destination] of instructionsByTarget) {
+    const resolved = path31.resolve(destination);
+    byPath.set(resolved, [...byPath.get(resolved) ?? [], target]);
+  }
+  const contested = [];
+  for (const [destination, claimants] of byPath) {
+    if (claimants.length < 2) {
+      continue;
+    }
+    const losers = claimants.filter(
+      (target) => target in FOLDS_RULES_INTO_INSTRUCTIONS
+    );
+    contested.push({
+      destination,
+      claimants: [...claimants].sort(),
+      losers: losers.sort(),
+      survivor: markerTarget(destination)
+    });
+  }
+  return contested;
+}
+function reportContestedInstructions(instructionsByTarget, kitDeclaresRules, logger) {
+  if (!kitDeclaresRules) {
+    return;
+  }
+  for (const contested of findContestedInstructions(instructionsByTarget)) {
+    if (contested.losers.length === 0) {
+      continue;
+    }
+    logger.warn(
+      `
+${contested.destination} is the instructions file for ${contested.claimants.join(", ")} at once, and they write it in turn.`
+    );
+    if (contested.survivor) {
+      logger.warn(`  The content on disk is ${contested.survivor}'s.`);
+    }
+    for (const target of contested.losers) {
+      logger.warn(
+        `  ${target} does NOT get its rules: ${FOLDS_RULES_INTO_INSTRUCTIONS[target]}, and that content is overwritten here.`
+      );
+    }
+    logger.warn(
+      `  Give those targets an instructions path of their own, or disable them. Their own rules slot, where they have one, is unaffected.`
+    );
+  }
+}
+function instructionsByActiveTarget(tools, scope, projectRoot, mappings) {
+  const byTarget = /* @__PURE__ */ new Map();
+  const resolved = resolveTargetPaths({
+    scope,
+    projectRoot,
+    mappings: mappings.platformPaths
+  });
+  for (const tool of tools) {
+    const instructions = resolved[tool]?.instructions;
+    if (typeof instructions === "string" && instructions.length > 0) {
+      byTarget.set(tool, instructions);
+    }
+  }
+  return byTarget;
+}
+
 // src/adapters/claude-code.ts
-import fs36 from "fs";
-import path34 from "path";
+import fs37 from "fs";
+import path35 from "path";
 
 // src/core/shim.ts
 import crypto4 from "crypto";
@@ -26083,8 +26171,8 @@ ${SHIM_BODY}`;
 }
 
 // src/core/skills-slot.ts
-import fs34 from "fs";
-import path31 from "path";
+import fs35 from "fs";
+import path32 from "path";
 function isForeignSkillsSlotSymlink(destination, config, sourceRoot, source) {
   if (!isSymlinkPath(destination)) {
     return false;
@@ -26097,7 +26185,7 @@ function isForeignSkillsSlotSymlink(destination, config, sourceRoot, source) {
 }
 function syncSkillsSlot(sync) {
   const { source, destination, logger } = sync;
-  if (!fs34.existsSync(source)) {
+  if (!fs35.existsSync(source)) {
     return [
       {
         component: "skills",
@@ -26125,7 +26213,7 @@ function syncSkillsSlot(sync) {
     if (isLegacyWholesaleSymlink) {
       for (const name of foreignSkillNames(source, declaredNames)) {
         logger.info(
-          `[dry-run] skills: migrate foreign skill ${path31.join(source, name)} -> ${path31.join(destination, name)}`
+          `[dry-run] skills: migrate foreign skill ${path32.join(source, name)} -> ${path32.join(destination, name)}`
         );
       }
       logger.info(
@@ -26133,9 +26221,9 @@ function syncSkillsSlot(sync) {
       );
     }
     for (const name of declaredNames ?? listSkillDirNames(source)) {
-      const skillDestination = path31.join(destination, name);
+      const skillDestination = path32.join(destination, name);
       logger.info(
-        `[dry-run] skills: symlink ${path31.join(source, name)} -> ${skillDestination}`
+        `[dry-run] skills: symlink ${path32.join(source, name)} -> ${skillDestination}`
       );
       outcomes2.push({
         component: "skills",
@@ -26162,9 +26250,9 @@ function syncSkillsSlot(sync) {
 }
 function syncSingleSkill(sync, name) {
   const { config, sourceRoot, source, destination } = sync;
-  const skillSource = path31.join(source, name);
-  const skillDestination = path31.join(destination, name);
-  if (!fs34.existsSync(skillSource)) {
+  const skillSource = path32.join(source, name);
+  const skillDestination = path32.join(destination, name);
+  if (!fs35.existsSync(skillSource)) {
     return {
       component: "skills",
       status: "skipped",
@@ -26180,29 +26268,29 @@ function syncSingleSkill(sync, name) {
     };
   }
   if (artifactClass === "managed-stale" && isOurStaleSymlink(skillDestination, /* @__PURE__ */ new Set([skillDestination]), config)) {
-    fs34.unlinkSync(skillDestination);
+    fs35.unlinkSync(skillDestination);
   } else if (artifactClass === "unmanaged-conflict" && !sync.onUnmanagedConflict(skillDestination)) {
     return { component: "skills", status: "conflict", path: skillDestination };
   } else if (artifactClass === "managed-symlink") {
-    fs34.unlinkSync(skillDestination);
+    fs35.unlinkSync(skillDestination);
   }
   createRelativeSymlink(skillSource, skillDestination, "dir");
   return { component: "skills", status: "success", path: skillDestination };
 }
 function migrateWholesaleSkillsSymlink(source, destination, declaredNames, logger) {
   const foreignNames = foreignSkillNames(source, declaredNames);
-  fs34.unlinkSync(destination);
+  fs35.unlinkSync(destination);
   ensureDir(destination);
   for (const name of foreignNames) {
-    const from = path31.join(source, name);
-    const to = path31.join(destination, name);
-    if (fs34.existsSync(to)) {
+    const from = path32.join(source, name);
+    const to = path32.join(destination, name);
+    if (fs35.existsSync(to)) {
       logger.warn(
         `skills migration: ${to} already exists \u2014 skipping ${from} to avoid overwrite. Nothing in the kit was changed.`
       );
       continue;
     }
-    fs34.cpSync(from, to, { recursive: true, verbatimSymlinks: true });
+    fs35.cpSync(from, to, { recursive: true, verbatimSymlinks: true });
     logger.warn(
       `skills migration: '${name}' is present under the kit's skills/ but is not declared in its manifest. Copied ${from} -> ${to} so the harness can read it. The original is left in the kit deliberately: this command does not modify a kit. Remove ${from} yourself if it does not belong there, or declare it in tangyr-kit.yaml if it does.`
     );
@@ -26216,44 +26304,44 @@ function foreignSkillNames(source, declaredNames) {
   return listSkillDirNames(source).filter((name) => !declaredSet.has(name));
 }
 function listSkillDirNames(dir) {
-  if (!fs34.existsSync(dir)) {
+  if (!fs35.existsSync(dir)) {
     return [];
   }
-  return fs34.readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
+  return fs35.readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
 }
 function isSymlinkPath(filePath) {
   try {
-    return fs34.lstatSync(filePath).isSymbolicLink();
+    return fs35.lstatSync(filePath).isSymbolicLink();
   } catch {
     return false;
   }
 }
 function isSymlinkTo2(linkPath, source) {
   try {
-    return fs34.realpathSync(linkPath) === fs34.realpathSync(source);
+    return fs35.realpathSync(linkPath) === fs35.realpathSync(source);
   } catch {
     return false;
   }
 }
 
 // src/core/hook-scripts.ts
-import path32 from "path";
+import path33 from "path";
 function hookScriptsDir(bridge, target, projectRoot) {
   const globalBridge = resolveTargetPath("~/.agents/hooks");
-  if (path32.resolve(bridge) === path32.resolve(globalBridge)) {
+  if (path33.resolve(bridge) === path33.resolve(globalBridge)) {
     return { prefix: GLOBAL_HOOK_SCRIPTS_DIR, machineLocal: false };
   }
-  const relative = path32.relative(projectRoot ?? process.cwd(), bridge);
-  const insideProject = !relative.startsWith("..") && !path32.isAbsolute(relative) && relative !== "";
+  const relative = path33.relative(projectRoot ?? process.cwd(), bridge);
+  const insideProject = !relative.startsWith("..") && !path33.isAbsolute(relative) && relative !== "";
   const variable = PROJECT_DIR_VARIABLE[target];
   if (insideProject && variable) {
-    const posix = path32.posix.join(
-      relative.split(path32.sep).join("/"),
+    const posix = path33.posix.join(
+      relative.split(path33.sep).join("/"),
       "scripts"
     );
     return { prefix: `$${variable.slice(1)}/${posix}`, machineLocal: false };
   }
-  return { prefix: path32.join(bridge, "scripts"), machineLocal: true };
+  return { prefix: path33.join(bridge, "scripts"), machineLocal: true };
 }
 var PROJECT_DIR_VARIABLE = {
   "claude-code": "$CLAUDE_PROJECT_DIR"
@@ -26263,19 +26351,19 @@ function machineLocalScriptPathNotice(target, prefix) {
 }
 
 // src/core/instructions-source.ts
-import fs35 from "fs";
-import path33 from "path";
+import fs36 from "fs";
+import path34 from "path";
 var PORTABLE_INSTRUCTIONS_NAME = "AGENTS.md";
 var InstructionsSourceMissingError = class extends Error {
   constructor(kitRoot, expected, declaredBy) {
     super(
-      `${path33.join(kitRoot, expected)}: instructions source not found (declared by ${declaredBy}). To fix: create that file, or point '${declaredBy}' at the file this kit actually carries. With neither declaration, the kit's ${DEFAULT_ENTRYPOINT} or ${PORTABLE_INSTRUCTIONS_NAME} is used.`
+      `${path34.join(kitRoot, expected)}: instructions source not found (declared by ${declaredBy}). To fix: create that file, or point '${declaredBy}' at the file this kit actually carries. With neither declaration, the kit's ${DEFAULT_ENTRYPOINT} or ${PORTABLE_INSTRUCTIONS_NAME} is used.`
     );
     this.name = "InstructionsSourceMissingError";
   }
 };
 function normalizeLabel(kitRoot, file) {
-  return path33.relative(kitRoot, file).split(path33.sep).join("/");
+  return path34.relative(kitRoot, file).split(path34.sep).join("/");
 }
 function isExplicitOverride(configured) {
   const normalize = (value) => value.replace(/\\/gu, "/").replace(/^\.\//u, "");
@@ -26284,8 +26372,8 @@ function isExplicitOverride(configured) {
 function resolveInstructionsSource(kitRoot, config) {
   const configured = config.source.instructions;
   if (isExplicitOverride(configured)) {
-    const file = path33.resolve(kitRoot, configured);
-    if (!fs35.existsSync(file)) {
+    const file = path34.resolve(kitRoot, configured);
+    if (!fs36.existsSync(file)) {
       throw new InstructionsSourceMissingError(
         kitRoot,
         configured,
@@ -26300,8 +26388,8 @@ function resolveInstructionsSource(kitRoot, config) {
   }
   const declared = resolveKitEntrypointName(kitRoot);
   if (declared !== void 0) {
-    const file = path33.resolve(kitRoot, declared);
-    if (!fs35.existsSync(file)) {
+    const file = path34.resolve(kitRoot, declared);
+    if (!fs36.existsSync(file)) {
       throw new InstructionsSourceMissingError(
         kitRoot,
         declared,
@@ -26315,13 +26403,13 @@ function resolveInstructionsSource(kitRoot, config) {
     };
   }
   for (const name of [DEFAULT_ENTRYPOINT, PORTABLE_INSTRUCTIONS_NAME]) {
-    const file = path33.resolve(kitRoot, name);
-    if (fs35.existsSync(file)) {
+    const file = path34.resolve(kitRoot, name);
+    if (fs36.existsSync(file)) {
       return { file, label: name, origin: "convention" };
     }
   }
-  const legacy = path33.resolve(kitRoot, LEGACY_ENTRYPOINT);
-  if (fs35.existsSync(legacy)) {
+  const legacy = path34.resolve(kitRoot, LEGACY_ENTRYPOINT);
+  if (fs36.existsSync(legacy)) {
     return {
       file: legacy,
       label: LEGACY_ENTRYPOINT,
@@ -26333,7 +26421,7 @@ function resolveInstructionsSource(kitRoot, config) {
 }
 function instructionsSourcePath(kitRoot, config) {
   const resolved = resolveInstructionsSource(kitRoot, config);
-  return resolved ? resolved.file : path33.resolve(kitRoot, config.source.instructions);
+  return resolved ? resolved.file : path34.resolve(kitRoot, config.source.instructions);
 }
 function instructionsSourceLabel(kitRoot, config) {
   const resolved = resolveInstructionsSource(kitRoot, config);
@@ -26454,7 +26542,7 @@ function syncClaudeCode(config, sourceRoot, options, logger, mappings, manifest,
   if (!shouldSkipComponent(options, "hooks")) {
     outcomes.push(
       syncHookScriptsBridge({
-        source: path34.resolve(sourceRoot, config.source.hooks),
+        source: path35.resolve(sourceRoot, config.source.hooks),
         destination: profile.hook_scripts,
         config,
         sourceRoot,
@@ -26506,13 +26594,13 @@ function syncClaudeCode(config, sourceRoot, options, logger, mappings, manifest,
 }
 function syncProviderLoss(config, sourceRoot, mappings, lossReport) {
   if (!mappings.modelTiers.custom_provider) return;
-  const agentsDir = path34.join(sourceRoot, config.source.agents);
-  if (!fs36.existsSync(agentsDir)) return;
-  for (const agentFile of ts(path34.join(agentsDir, "*.md")).sort()) {
+  const agentsDir = path35.join(sourceRoot, config.source.agents);
+  if (!fs37.existsSync(agentsDir)) return;
+  for (const agentFile of ts(path35.join(agentsDir, "*.md")).sort()) {
     const { data } = parseMarkdownFrontmatter(agentFile);
     const hasProvider = typeof data.provider === "string" || typeof data.provider === "object" && data.provider !== null && Object.keys(data.provider).length > 0;
     if (hasProvider) {
-      const basename = path34.basename(agentFile);
+      const basename = path35.basename(agentFile);
       addLoss(lossReport, "claude-code", "agents", {
         source: `agents/${basename}`,
         fields: [
@@ -26537,7 +26625,7 @@ function shouldSkipComponent(options, component) {
 var SHIM_MANIFEST_KEY = "claude-code/instructions_shim";
 function lstatOrNull(p) {
   try {
-    return fs36.lstatSync(p);
+    return fs37.lstatSync(p);
   } catch {
     return null;
   }
@@ -26549,12 +26637,12 @@ function applyClaudeCodeShimUpgrade(shimPath, agentsMdPath, manifest, scopePath,
   if (shimLink?.isSymbolicLink()) {
     backupFile(shimPath, manifest, scopePath);
     writeManifest(scopePath, manifest);
-    fs36.unlinkSync(shimPath);
+    fs37.unlinkSync(shimPath);
     logger?.verbose(
       `instructions-shim: replaced an unmanaged symlink at ${shimPath}`
     );
   }
-  if (!fs36.existsSync(shimPath)) {
+  if (!fs37.existsSync(shimPath)) {
     addArtifactToManifest(manifest, {
       relativePath: SHIM_MANIFEST_KEY,
       path: shimPath,
@@ -26562,12 +26650,12 @@ function applyClaudeCodeShimUpgrade(shimPath, agentsMdPath, manifest, scopePath,
       origin: "tangyr-managed"
     });
     writeManifest(scopePath, manifest);
-    fs36.mkdirSync(path34.dirname(shimPath), { recursive: true });
-    fs36.writeFileSync(shimPath, shimContent);
+    fs37.mkdirSync(path35.dirname(shimPath), { recursive: true });
+    fs37.writeFileSync(shimPath, shimContent);
     logger?.verbose(`instructions-shim: wrote @AGENTS.md shim -> ${shimPath}`);
     return;
   }
-  const existing = fs36.readFileSync(shimPath, "utf8");
+  const existing = fs37.readFileSync(shimPath, "utf8");
   const firstNonEmptyLine = existing.split("\n").find((l) => l.trim().length > 0) ?? "";
   const marker = extractProvenanceMarker(firstNonEmptyLine);
   if (marker !== null && marker.hash === expectedBodyHash) {
@@ -26584,7 +26672,7 @@ function applyClaudeCodeShimUpgrade(shimPath, agentsMdPath, manifest, scopePath,
   }
   backupFile(shimPath, manifest, scopePath);
   writeManifest(scopePath, manifest);
-  fs36.writeFileSync(shimPath, shimContent);
+  fs37.writeFileSync(shimPath, shimContent);
   addArtifactToManifest(manifest, {
     relativePath: SHIM_MANIFEST_KEY,
     path: shimPath,
@@ -26594,10 +26682,10 @@ function applyClaudeCodeShimUpgrade(shimPath, agentsMdPath, manifest, scopePath,
   logger?.verbose(`instructions-shim: backed up and replaced -> ${shimPath}`);
 }
 function syncDirectComponent(config, sourceRoot, options, logger, directComponent, manifest, scopePath) {
-  const source = directComponent.sourceKey === "instructions" ? instructionsSourcePath(sourceRoot, config) : path34.resolve(sourceRoot, config.source[directComponent.sourceKey]);
+  const source = directComponent.sourceKey === "instructions" ? instructionsSourcePath(sourceRoot, config) : path35.resolve(sourceRoot, config.source[directComponent.sourceKey]);
   const sourceLabel = directComponent.sourceKey === "instructions" ? instructionsSourceLabel(sourceRoot, config) : config.source[directComponent.sourceKey];
   const destination = directComponent.destination;
-  if (!fs36.existsSync(source)) {
+  if (!fs37.existsSync(source)) {
     return skippedMissingSource(directComponent.component, source);
   }
   if (options.dryRun) {
@@ -26619,7 +26707,7 @@ function syncDirectComponent(config, sourceRoot, options, logger, directComponen
     };
   }
   if (artifactClass === "managed-stale" && isOurStaleSymlink(destination, /* @__PURE__ */ new Set([destination]), config)) {
-    fs36.unlinkSync(destination);
+    fs37.unlinkSync(destination);
   } else if (artifactClass === "unmanaged-conflict" && !handleConflict(destination, config, options, logger, manifest, scopePath)) {
     return {
       component: directComponent.component,
@@ -26627,14 +26715,11 @@ function syncDirectComponent(config, sourceRoot, options, logger, directComponen
       path: destination
     };
   } else if (artifactClass === "managed-symlink") {
-    fs36.unlinkSync(destination);
+    fs37.unlinkSync(destination);
   } else if (artifactClass === "managed-compiled") {
-    logger.warn(
-      `${destination}: replacing another target's compiled instructions file with a link to the kit. A target that appends its rules here (opencode has no rules slot of its own) does not get them. Give it its own instructions path, or disable it.`
-    );
-    fs36.unlinkSync(destination);
+    fs37.unlinkSync(destination);
   }
-  ensureDir(path34.dirname(destination));
+  ensureDir(path35.dirname(destination));
   createRelativeSymlink(source, destination, directComponent.type, {
     logger,
     provenanceMarker: directComponent.type === "file" ? formatProvenanceMarker(
@@ -26654,7 +26739,7 @@ function syncClaudeCodeSkills(config, sourceRoot, options, logger, destination,
   return syncSkillsSlot({
     config,
     sourceRoot,
-    source: path34.resolve(sourceRoot, config.source.skills),
+    source: path35.resolve(sourceRoot, config.source.skills),
     destination,
     dryRun: options.dryRun,
     logger,
@@ -26688,7 +26773,7 @@ function syncHooks(config, sourceRoot, options, logger, destination, scriptsBrid
     destination,
     settings,
     stringifyJson2,
-    !fs36.existsSync(destination),
+    !fs37.existsSync(destination),
     logger
   );
   return {
@@ -26698,8 +26783,8 @@ function syncHooks(config, sourceRoot, options, logger, destination, scriptsBrid
   };
 }
 function syncMcp(config, sourceRoot, options, logger, destination) {
-  const source = path34.resolve(sourceRoot, config.source.mcp);
-  if (!fs36.existsSync(source)) {
+  const source = path35.resolve(sourceRoot, config.source.mcp);
+  if (!fs37.existsSync(source)) {
     return skippedMissingSource("mcp", source);
   }
   if (options.dryRun) {
@@ -26724,7 +26809,7 @@ function syncMcp(config, sourceRoot, options, logger, destination) {
     destination,
     hostConfig,
     stringifyJson2,
-    !fs36.existsSync(destination),
+    !fs37.existsSync(destination),
     logger
   );
   return {
@@ -26734,8 +26819,8 @@ function syncMcp(config, sourceRoot, options, logger, destination) {
   };
 }
 function syncSettings(config, sourceRoot, options, logger, destination) {
-  const source = path34.resolve(sourceRoot, config.source.settings);
-  if (!fs36.existsSync(source)) {
+  const source = path35.resolve(sourceRoot, config.source.settings);
+  if (!fs37.existsSync(source)) {
     return skippedMissingSource("settings", source);
   }
   if (options.dryRun) {
@@ -26753,7 +26838,7 @@ function syncSettings(config, sourceRoot, options, logger, destination) {
     destination,
     settings,
     stringifyJson2,
-    !fs36.existsSync(destination),
+    !fs37.existsSync(destination),
     logger
   );
   return {
@@ -26777,13 +26862,22 @@ function handleConflict(destination, config, options, logger, manifest, scopePat
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs36.rmSync(destination, { recursive: true, force: true });
+      fs37.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs36.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs36.rmSync(destination, { recursive: true, force: true });
+  fs37.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function skippedMissingSource(component, source) {
@@ -26795,16 +26889,16 @@ function skippedMissingSource(component, source) {
 }
 function isSymlinkTo3(linkPath, source) {
   try {
-    return fs36.realpathSync(linkPath) === fs36.realpathSync(source);
+    return fs37.realpathSync(linkPath) === fs37.realpathSync(source);
   } catch {
     return false;
   }
 }
 function readJsonObject3(filePath) {
-  if (!fs36.existsSync(filePath)) {
+  if (!fs37.existsSync(filePath)) {
     return {};
   }
-  const parsed = JSON.parse(fs36.readFileSync(filePath, "utf8"));
+  const parsed = JSON.parse(fs37.readFileSync(filePath, "utf8"));
   return isRecord3(parsed) ? parsed : {};
 }
 function markManaged(value) {
@@ -26831,13 +26925,13 @@ function isRecord3(value) {
 // src/adapters/codex.ts
 var TOML3 = __toESM(require_toml(), 1);
 import crypto6 from "crypto";
-import fs38 from "fs";
-import path37 from "path";
+import fs39 from "fs";
+import path38 from "path";
 
 // src/compiler/agents.ts
 var TOML = __toESM(require_toml(), 1);
 var import_yaml8 = __toESM(require_dist(), 1);
-import path35 from "path";
+import path36 from "path";
 var writeCapabilityClasses = /* @__PURE__ */ new Set(["filesystem-write", "shell-execution"]);
 var copilotToolAliasesByClass = {
   delegation: "agent",
@@ -26849,7 +26943,7 @@ var copilotToolAliasesByClass = {
 };
 function compileAgent(sourceFile, target, mappings, extensions, lossReport) {
   const { data, body } = parseMarkdownFrontmatter(sourceFile);
-  const relativeSource = `agents/${path35.basename(sourceFile)}`;
+  const relativeSource = `agents/${path36.basename(sourceFile)}`;
   if (target === "opencode") {
     return compileOpenCodeAgent(
       sourceFile,
@@ -26890,7 +26984,7 @@ function compileAgent(sourceFile, target, mappings, extensions, lossReport) {
     mappings,
     lossReport
   );
-  const overlayKey = `agents/${path35.basename(sourceFile, ".md")}.${target}.yaml`;
+  const overlayKey = `agents/${path36.basename(sourceFile, ".md")}.${target}.yaml`;
   const targetFields = {
     ...translated.fields,
     ...extensions[overlayKey] ?? {}
@@ -26924,7 +27018,7 @@ ${TOML.stringify({
 function compileOpenCodeAgent(sourceFile, data, body, relativeSource, lossReport) {
   if (typeof data.description !== "string" || data.description.trim() === "") {
     throw new Error(
-      `${path35.basename(sourceFile)}: OpenCode agent requires a non-empty description field`
+      `${path36.basename(sourceFile)}: OpenCode agent requires a non-empty description field`
     );
   }
   const frontmatter = {
@@ -26978,7 +27072,7 @@ function compileOpenCodeAgent(sourceFile, data, body, relativeSource, lossReport
                 "permission",
                 "permission-coarsening"
               ),
-              detail: `${path35.basename(sourceFile)}: per-tool permission '${tool}' mapped to coarse allow|deny action`
+              detail: `${path36.basename(sourceFile)}: per-tool permission '${tool}' mapped to coarse allow|deny action`
             }
           ]
         });
@@ -27003,7 +27097,7 @@ ${(0, import_yaml8.stringify)(frontmatter).trim()}
 function compileCursorAgent(sourceFile, data, body, relativeSource, lossReport) {
   if (typeof data.description !== "string" || data.description.trim() === "") {
     throw new Error(
-      `${path35.basename(sourceFile)}: Cursor agent requires a non-empty description field`
+      `${path36.basename(sourceFile)}: Cursor agent requires a non-empty description field`
     );
   }
   const frontmatter = {
@@ -27040,7 +27134,7 @@ function compileCursorAgent(sourceFile, data, body, relativeSource, lossReport)
             "permission",
             "permission-coarsening"
           ),
-          detail: `${path35.basename(sourceFile)}: per-agent tool allow set coarsened to readonly=${readonly} boolean (Cursor only exposes readonly control)`
+          detail: `${path36.basename(sourceFile)}: per-agent tool allow set coarsened to readonly=${readonly} boolean (Cursor only exposes readonly control)`
         }
       ]
     });
@@ -27059,7 +27153,7 @@ function compileCursorAgent(sourceFile, data, body, relativeSource, lossReport)
             "provider",
             "provider-not-representable"
           ),
-          detail: `${path35.basename(sourceFile)}: custom provider cannot be expressed in Cursor subagent frontmatter \u2014 configure manually via Cursor settings`
+          detail: `${path36.basename(sourceFile)}: custom provider cannot be expressed in Cursor subagent frontmatter \u2014 configure manually via Cursor settings`
         }
       ]
     });
@@ -27091,7 +27185,7 @@ function compileClineAgent(sourceFile, _data, _body, relativeSource, lossReport)
           "persona",
           "persona-not-representable"
         ),
-        detail: `${path35.basename(sourceFile)}: Cline has no committable per-agent persona file for the VSCode extension target; configure the agent through Cline Settings \u2192 Agent.`
+        detail: `${path36.basename(sourceFile)}: Cline has no committable per-agent persona file for the VSCode extension target; configure the agent through Cline Settings \u2192 Agent.`
       }
     ]
   });
@@ -27139,7 +27233,7 @@ function applyFieldAction(sourceFile, field, value, action, target, mappings, tr
           field,
           "model-not-representable"
         ),
-        detail: `${path35.basename(sourceFile)}: model tier '${String(value)}' has no stable Copilot model literal; omitted so VS Code uses the selected model.`
+        detail: `${path36.basename(sourceFile)}: model tier '${String(value)}' has no stable Copilot model literal; omitted so VS Code uses the selected model.`
       });
       return;
     }
@@ -27157,9 +27251,9 @@ function applyFieldAction(sourceFile, field, value, action, target, mappings, tr
       lossReport,
       target,
       "agents",
-      `agents/${path35.basename(sourceFile)}`,
+      `agents/${path36.basename(sourceFile)}`,
       "info",
-      `${path35.basename(sourceFile)}: ${field} is delivered through another managed surface.`
+      `${path36.basename(sourceFile)}: ${field} is delivered through another managed surface.`
     );
     return;
   }
@@ -27168,7 +27262,7 @@ function applyFieldAction(sourceFile, field, value, action, target, mappings, tr
     field,
     action: entryType,
     severity: resolveLossSeverity("agent-field", field, entryType),
-    detail: `${path35.basename(sourceFile)}: ${field} has no emitted field for this target.`
+    detail: `${path36.basename(sourceFile)}: ${field} has no emitted field for this target.`
   });
 }
 function mapToolsToCapabilities(value, mappings) {
@@ -27909,9 +28003,9 @@ function compileOpenCodeMcp(sourceMcpJson, lossReport, sourceLabel) {
 }
 
 // src/compiler/rules.ts
-import path36 from "path";
+import path37 from "path";
 var import_yaml9 = __toESM(require_dist(), 1);
-import fs37 from "fs";
+import fs38 from "fs";
 function compileRules(sourceRulesDir, target, _mappings, lossReport) {
   if (target === "copilot") {
     addLoss(lossReport, "copilot", "rules", {
@@ -27948,13 +28042,13 @@ function compileRules(sourceRulesDir, target, _mappings, lossReport) {
   }
   const appendixParts = [];
   const dotRulesFiles = [];
-  for (const ruleFile of ts(path36.join(sourceRulesDir, "*.md")).sort()) {
+  for (const ruleFile of ts(path37.join(sourceRulesDir, "*.md")).sort()) {
     const parsed = parseRule(ruleFile);
-    const name = path36.basename(ruleFile, ".md");
+    const name = path37.basename(ruleFile, ".md");
     if (parsed.mode === "exec-policy") {
       dotRulesFiles.push({
         name: `${name}.rules`,
-        content: `${formatProvenanceMarker("toml", `rules/${path36.basename(ruleFile)}`, computeSourceHash(ruleFile), "codex")}
+        content: `${formatProvenanceMarker("toml", `rules/${path37.basename(ruleFile)}`, computeSourceHash(ruleFile), "codex")}
 ${parsed.body}`
       });
       continue;
@@ -27963,7 +28057,7 @@ ${parsed.body}`
 
 ${parsed.body.trim()}`);
     addLoss(lossReport, "codex", "rules", {
-      source: `rules/${path36.basename(ruleFile)}`,
+      source: `rules/${path37.basename(ruleFile)}`,
       fields: [
         {
           field: "mode",
@@ -27973,7 +28067,7 @@ ${parsed.body.trim()}`);
             "mode",
             "rule-as-instruction"
           ),
-          detail: `${path36.basename(ruleFile)} is appended to the managed Codex instructions file as guidance.`
+          detail: `${path37.basename(ruleFile)} is appended to the managed Codex instructions file as guidance.`
         }
       ]
     });
@@ -27981,7 +28075,7 @@ ${parsed.body.trim()}`);
   return { agentsAppendix: appendixParts.join("\n\n"), dotRulesFiles };
 }
 function parseRule(ruleFile) {
-  const content = fs37.readFileSync(ruleFile, "utf8");
+  const content = fs38.readFileSync(ruleFile, "utf8");
   if (!content.startsWith("---\n")) {
     return { mode: "guidance", body: content };
   }
@@ -28005,14 +28099,14 @@ function isRuleMode(value) {
 }
 function compileOpenCodeRules(sourceRulesDir, lossReport) {
   const appendixParts = [];
-  for (const ruleFile of ts(path36.join(sourceRulesDir, "*.md")).sort()) {
+  for (const ruleFile of ts(path37.join(sourceRulesDir, "*.md")).sort()) {
     const parsed = parseRule(ruleFile);
-    const name = path36.basename(ruleFile, ".md");
+    const name = path37.basename(ruleFile, ".md");
     appendixParts.push(`## ${name}
 
 ${parsed.body.trim()}`);
     addLoss(lossReport, "opencode", "rules", {
-      source: `rules/${path36.basename(ruleFile)}`,
+      source: `rules/${path37.basename(ruleFile)}`,
       fields: [
         {
           field: "rule",
@@ -28022,7 +28116,7 @@ ${parsed.body.trim()}`);
             "rule",
             "rule-path-scoping"
           ),
-          detail: `${path36.basename(ruleFile)}: OpenCode has no per-agent rule scoping \u2014 rule appended to AGENTS.md instructions`
+          detail: `${path37.basename(ruleFile)}: OpenCode has no per-agent rule scoping \u2014 rule appended to AGENTS.md instructions`
         }
       ]
     });
@@ -28031,9 +28125,9 @@ ${parsed.body.trim()}`);
 }
 function compileCursorRules(sourceRulesDir, _lossReport) {
   const dotRulesFiles = [];
-  for (const ruleFile of ts(path36.join(sourceRulesDir, "*.md")).sort()) {
-    const content = fs37.readFileSync(ruleFile, "utf8");
-    const name = path36.basename(ruleFile, ".md");
+  for (const ruleFile of ts(path37.join(sourceRulesDir, "*.md")).sort()) {
+    const content = fs38.readFileSync(ruleFile, "utf8");
+    const name = path37.basename(ruleFile, ".md");
     let frontmatterData = {};
     let body = content;
     if (content.startsWith("---\n")) {
@@ -28062,7 +28156,7 @@ function compileCursorRules(sourceRulesDir, _lossReport) {
     }
     const marker = formatProvenanceMarker(
       "markdown",
-      `rules/${path36.basename(ruleFile)}`,
+      `rules/${path37.basename(ruleFile)}`,
       computeSourceHash(ruleFile),
       "cursor"
     );
@@ -28078,9 +28172,9 @@ ${body}`;
 }
 function compileClineRules(sourceRulesDir, lossReport) {
   const dotRulesFiles = [];
-  for (const ruleFile of ts(path36.join(sourceRulesDir, "*.md")).sort()) {
-    const content = fs37.readFileSync(ruleFile, "utf8");
-    const name = path36.basename(ruleFile, ".md");
+  for (const ruleFile of ts(path37.join(sourceRulesDir, "*.md")).sort()) {
+    const content = fs38.readFileSync(ruleFile, "utf8");
+    const name = path37.basename(ruleFile, ".md");
     let frontmatterData = {};
     let body = content;
     if (content.startsWith("---\n")) {
@@ -28097,13 +28191,13 @@ function compileClineRules(sourceRulesDir, lossReport) {
     }
     const marker = formatProvenanceMarker(
       "markdown",
-      `rules/${path36.basename(ruleFile)}`,
+      `rules/${path37.basename(ruleFile)}`,
       computeSourceHash(ruleFile),
       "cline"
     );
     if (frontmatterData.mode === "exec-policy") {
       addLoss(lossReport, "cline", "rules", {
-        source: `rules/${path36.basename(ruleFile)}`,
+        source: `rules/${path37.basename(ruleFile)}`,
         fields: [
           {
             field: "mode",
@@ -28113,7 +28207,7 @@ function compileClineRules(sourceRulesDir, lossReport) {
               "mode",
               "rule-mode-downgrade"
             ),
-            detail: `${path36.basename(ruleFile)}: Cline rules have no exec-policy mode; rule emitted as guidance.`
+            detail: `${path37.basename(ruleFile)}: Cline rules have no exec-policy mode; rule emitted as guidance.`
           }
         ]
       });
@@ -28159,7 +28253,7 @@ function syncCodex(config, sourceRoot, mappings, extensions, options, lossReport
     rules: profile.rules
   };
   const rules = compileRules(
-    path37.join(sourceRoot, config.source.rules),
+    path38.join(sourceRoot, config.source.rules),
     "codex",
     mappings,
     lossReport
@@ -28225,7 +28319,7 @@ function syncCodex(config, sourceRoot, mappings, extensions, options, lossReport
   if (!shouldSkipComponent2(options, "hooks")) {
     outcomes.push(
       syncHookScriptsBridge({
-        source: path37.resolve(sourceRoot, config.source.hooks),
+        source: path38.resolve(sourceRoot, config.source.hooks),
         destination: resolveTargetPath(paths.hook_scripts),
         config,
         sourceRoot,
@@ -28324,9 +28418,9 @@ function syncCodex(config, sourceRoot, mappings, extensions, options, lossReport
 function buildProviderTomlSection(config, sourceRoot, mappings, scope, lossReport) {
   const cp = mappings.modelTiers.custom_provider;
   if (!cp) return "";
-  const agentsDir = path37.join(sourceRoot, config.source.agents);
-  if (!fs38.existsSync(agentsDir)) return "";
-  const agentFiles = ts(path37.join(agentsDir, "*.md")).sort();
+  const agentsDir = path38.join(sourceRoot, config.source.agents);
+  if (!fs39.existsSync(agentsDir)) return "";
+  const agentFiles = ts(path38.join(agentsDir, "*.md")).sort();
   const hasProviderAgent = agentFiles.some((agentFile) => {
     const { data } = parseMarkdownFrontmatter(agentFile);
     return typeof data.provider === "string" || typeof data.provider === "object" && data.provider !== null && Object.keys(data.provider).length > 0;
@@ -28391,7 +28485,7 @@ function syncRules(config, sourceRoot, paths, rules, options, logger, manifest,
     }
   ];
   for (const ruleFile of rules.dotRulesFiles) {
-    const destination = path37.join(rulesRoot, ruleFile.name);
+    const destination = path38.join(rulesRoot, ruleFile.name);
     if (options.dryRun) {
       logger.info(`[dry-run] rules: write ${destination}`);
       outcomes.push({
@@ -28421,16 +28515,16 @@ function syncRules(config, sourceRoot, paths, rules, options, logger, manifest,
 function syncInstructions(config, sourceRoot, paths, agentsAppendix, options, logger, manifest, scopePath) {
   const source = instructionsSourcePath(sourceRoot, config);
   const destination = resolveTargetPath(paths.instructions);
-  if (!fs38.existsSync(source)) {
+  if (!fs39.existsSync(source)) {
     return skippedMissingSource2("instructions", source);
   }
-  const composed = `${fs38.readFileSync(source, "utf8").trim()}
+  const composed = `${fs39.readFileSync(source, "utf8").trim()}
 
 --- tangyr managed rules ---
 ${agentsAppendix}`.trim();
   const marker = formatProvenanceMarker(
     "markdown",
-    path37.basename(instructionsSourceLabel(sourceRoot, config)),
+    path38.basename(instructionsSourceLabel(sourceRoot, config)),
     hashString(composed),
     "codex"
   );
@@ -28457,9 +28551,9 @@ ${composed}
   );
 }
 function syncSkills(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const source = path37.resolve(sourceRoot, config.source.skills);
+  const source = path38.resolve(sourceRoot, config.source.skills);
   const destination = resolveTargetPath(paths.skills);
-  if (!fs38.existsSync(source)) {
+  if (!fs39.existsSync(source)) {
     return skippedMissingSource2("skills", source);
   }
   if (options.dryRun) {
@@ -28475,29 +28569,29 @@ function syncSkills(config, sourceRoot, paths, options, logger, manifest, scopeP
     };
   }
   if (artifactClass === "managed-stale" && isOurStaleSymlink(destination, /* @__PURE__ */ new Set([destination]), config)) {
-    fs38.unlinkSync(destination);
+    fs39.unlinkSync(destination);
     logger.verbose(`Skills: created skills path ${destination}`);
   } else if (artifactClass === "unmanaged-conflict" && !handleConflict2(destination, config, options, logger, manifest, scopePath)) {
     return { component: "skills", status: "conflict", path: destination };
   } else if (artifactClass === "managed-symlink") {
-    fs38.unlinkSync(destination);
+    fs39.unlinkSync(destination);
   }
-  ensureDir(path37.dirname(destination));
+  ensureDir(path38.dirname(destination));
   createRelativeSymlink(source, destination, "dir");
   logger.verbose(`Skills: created skills path ${destination}`);
   return { component: "skills", status: "success", path: destination };
 }
 function syncAgents(config, sourceRoot, paths, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
-  const sourceAgentsRoot = path37.join(sourceRoot, config.source.agents);
-  if (!fs38.existsSync(sourceAgentsRoot)) {
+  const sourceAgentsRoot = path38.join(sourceRoot, config.source.agents);
+  if (!fs39.existsSync(sourceAgentsRoot)) {
     return [skippedMissingSource2("agents", sourceAgentsRoot)];
   }
-  const sourceAgents = ts(path37.join(sourceAgentsRoot, "*.md")).sort();
+  const sourceAgents = ts(path38.join(sourceAgentsRoot, "*.md")).sort();
   const agentsRoot = resolveTargetPath(paths.agents);
   return sourceAgents.map((agentFile) => {
-    const destination = path37.join(
+    const destination = path38.join(
       agentsRoot,
-      `${path37.basename(agentFile, ".md")}.toml`
+      `${path38.basename(agentFile, ".md")}.toml`
     );
     const compiled = compileAgent(
       agentFile,
@@ -28575,7 +28669,7 @@ function syncHooks2(config, sourceRoot, paths, mappings, options, lossReport, lo
     destination,
     hostHooks,
     stringifyJson3,
-    !fs38.existsSync(destination),
+    !fs39.existsSync(destination),
     logger
   );
   return {
@@ -28588,7 +28682,7 @@ function syncMcp2(config, sourceRoot, paths, options, lossReport, logger, provid
   const source = resolveMcpSourceFile(sourceRoot, config);
   const sourceLabel = mcpSourceLabel(config);
   const destination = resolveTargetPath(paths.mcp_shared_file);
-  if (!fs38.existsSync(source)) {
+  if (!fs39.existsSync(source)) {
     if (providerToml && !options.dryRun) {
       const changed2 = writeTomlManagedSection(
         destination,
@@ -28603,7 +28697,7 @@ function syncMcp2(config, sourceRoot, paths, options, lossReport, logger, provid
     }
     return skippedMissingSource2("mcp", source);
   }
-  const sourceMcpJson = JSON.parse(fs38.readFileSync(source, "utf8"));
+  const sourceMcpJson = JSON.parse(fs39.readFileSync(source, "utf8"));
   const compiled = compileMcp(sourceMcpJson, "codex", lossReport, sourceLabel);
   const managedContent = providerToml ? `${compiled.trimEnd()}${providerToml}` : compiled;
   if (options.dryRun) {
@@ -28625,18 +28719,18 @@ function writeCompiledArtifact(component, destination, content, expectedHash, co
   if (artifactClass === "unmanaged-conflict" && !handleConflict2(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path37.dirname(destination));
+  ensureDir(path38.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs38.writeFileSync(destination, content);
+  fs39.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function writeTomlManagedSection(destination, managedContent, logger) {
-  const current = fs38.existsSync(destination) ? fs38.readFileSync(destination, "utf8") : "";
+  const current = fs39.existsSync(destination) ? fs39.readFileSync(destination, "utf8") : "";
   const isFirstWrite = current.length > 0 && !current.includes(managedMcpStart);
   if (isFirstWrite) {
     logger.warn(
@@ -28652,8 +28746,8 @@ ${managedMcpEnd}
   if (current === next.trimStart()) {
     return false;
   }
-  ensureDir(path37.dirname(destination));
-  fs38.writeFileSync(destination, next.trimStart());
+  ensureDir(path38.dirname(destination));
+  fs39.writeFileSync(destination, next.trimStart());
   return true;
 }
 function removeManagedTomlSection(content) {
@@ -28679,18 +28773,27 @@ function handleConflict2(destination, config, options, logger, manifest, scopePa
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs38.rmSync(destination, { recursive: true, force: true });
+      fs39.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs38.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs38.rmSync(destination, { recursive: true, force: true });
+  fs39.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function isCompiledCurrent(destination, expectedContent, expectedHash) {
   try {
-    const current = fs38.readFileSync(destination, "utf8");
+    const current = fs39.readFileSync(destination, "utf8");
     const marker = extractProvenanceMarker(current);
     return expectedHash ? marker?.hash === expectedHash && marker.target === "codex" && current === expectedContent : current === expectedContent;
   } catch {
@@ -28709,16 +28812,16 @@ function shouldSkipComponent2(options, component) {
 }
 function isSymlinkTo4(linkPath, source) {
   try {
-    return fs38.realpathSync(linkPath) === fs38.realpathSync(source);
+    return fs39.realpathSync(linkPath) === fs39.realpathSync(source);
   } catch {
     return false;
   }
 }
 function readJsonObject4(filePath) {
-  if (!fs38.existsSync(filePath)) {
+  if (!fs39.existsSync(filePath)) {
     return {};
   }
-  const parsed = JSON.parse(fs38.readFileSync(filePath, "utf8"));
+  const parsed = JSON.parse(fs39.readFileSync(filePath, "utf8"));
   return isRecord5(parsed) ? parsed : {};
 }
 function stringifyJson3(value) {
@@ -28734,16 +28837,16 @@ function hashString(value) {
 
 // src/adapters/copilot.ts
 import crypto7 from "crypto";
-import fs39 from "fs";
-import path39 from "path";
+import fs40 from "fs";
+import path40 from "path";
 
 // src/compiler/commands.ts
 var import_yaml10 = __toESM(require_dist(), 1);
-import path38 from "path";
+import path39 from "path";
 function compileCommandPrompt(sourceFile) {
   const { data, body } = parseMarkdownFrontmatter(sourceFile);
-  const relativeSource = `commands/${path38.basename(sourceFile)}`;
-  const fields = promptFrontmatter(data, path38.basename(sourceFile, ".md"));
+  const relativeSource = `commands/${path39.basename(sourceFile)}`;
+  const fields = promptFrontmatter(data, path39.basename(sourceFile, ".md"));
   const marker = formatProvenanceMarker(
     "markdown",
     relativeSource,
@@ -28858,7 +28961,7 @@ function syncCopilot(config, sourceRoot, mappings, extensions, options, lossRepo
   if (!shouldSkipComponent3(options, "hooks")) {
     outcomes.push(
       syncHookScriptsBridge({
-        source: path39.resolve(sourceRoot, config.source.hooks),
+        source: path40.resolve(sourceRoot, config.source.hooks),
         destination: resolveTargetPath(paths.hook_scripts),
         config,
         sourceRoot,
@@ -28939,13 +29042,13 @@ function syncCopilot(config, sourceRoot, mappings, extensions, options, lossRepo
 }
 function syncProviderLoss2(config, sourceRoot, mappings, lossReport) {
   if (!mappings.modelTiers.custom_provider) return;
-  const agentsDir = path39.join(sourceRoot, config.source.agents);
-  if (!fs39.existsSync(agentsDir)) return;
-  for (const agentFile of ts(path39.join(agentsDir, "*.md")).sort()) {
+  const agentsDir = path40.join(sourceRoot, config.source.agents);
+  if (!fs40.existsSync(agentsDir)) return;
+  for (const agentFile of ts(path40.join(agentsDir, "*.md")).sort()) {
     const { data } = parseMarkdownFrontmatter(agentFile);
     const hasProvider = typeof data.provider === "string" || typeof data.provider === "object" && data.provider !== null && Object.keys(data.provider).length > 0;
     if (hasProvider) {
-      const basename = path39.basename(agentFile);
+      const basename = path40.basename(agentFile);
       addLoss(lossReport, "copilot", "agents", {
         source: `agents/${basename}`,
         fields: [
@@ -28971,22 +29074,22 @@ function syncCopilotInstructions(config, sourceRoot, options, lossReport, logger
     return [{ component: "instructions", status: "skipped", path: message }];
   }
   const source = instructionsSourcePath(sourceRoot, config);
-  if (!fs39.existsSync(source)) {
+  if (!fs40.existsSync(source)) {
     return [skippedMissingSource3("instructions", source)];
   }
-  const rawContent = fs39.readFileSync(source, "utf8");
+  const rawContent = fs40.readFileSync(source, "utf8");
   const contentHash = hashString2(rawContent);
   const marker = formatProvenanceMarker(
     "markdown",
-    path39.basename(instructionsSourceLabel(sourceRoot, config)),
+    path40.basename(instructionsSourceLabel(sourceRoot, config)),
     contentHash,
     "copilot"
   );
   const composedContent = `${marker}
 ${rawContent}`;
   const projectRoot = options.projectRoot ?? process.cwd();
-  const agentsMdDest = path39.resolve(projectRoot, "AGENTS.md");
-  const mirrorDest = path39.resolve(
+  const agentsMdDest = path40.resolve(projectRoot, "AGENTS.md");
+  const mirrorDest = path40.resolve(
     projectRoot,
     ".github",
     "copilot-instructions.md"
@@ -29040,14 +29143,14 @@ function writeInstructionsFile(component, destination, content, contentHash, con
   if (artifactClass === "unmanaged-conflict" && !handleConflict3(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path39.dirname(destination));
+  ensureDir(path40.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs39.writeFileSync(destination, content);
+  fs40.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function hashString2(value) {
@@ -29057,7 +29160,7 @@ function syncSkills2(config, sourceRoot, paths, options, logger, manifest, scope
   return syncSkillsSlot({
     config,
     sourceRoot,
-    source: path39.resolve(sourceRoot, config.source.skills),
+    source: path40.resolve(sourceRoot, config.source.skills),
     destination: resolveTargetPath(paths.skills),
     dryRun: options.dryRun,
     logger,
@@ -29072,16 +29175,16 @@ function syncSkills2(config, sourceRoot, paths, options, logger, manifest, scope
   });
 }
 function syncAgents2(config, sourceRoot, paths, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
-  const sourceAgentsRoot = path39.join(sourceRoot, config.source.agents);
-  if (!fs39.existsSync(sourceAgentsRoot)) {
+  const sourceAgentsRoot = path40.join(sourceRoot, config.source.agents);
+  if (!fs40.existsSync(sourceAgentsRoot)) {
     return [skippedMissingSource3("agents", sourceAgentsRoot)];
   }
-  const sourceAgents = ts(path39.join(sourceAgentsRoot, "*.md")).sort();
+  const sourceAgents = ts(path40.join(sourceAgentsRoot, "*.md")).sort();
   const agentsRoot = resolveTargetPath(paths.agents);
   return sourceAgents.map((agentFile) => {
-    const destination = path39.join(
+    const destination = path40.join(
       agentsRoot,
-      `${path39.basename(agentFile, ".md")}.agent.md`
+      `${path40.basename(agentFile, ".md")}.agent.md`
     );
     const compiled = compileAgent(
       agentFile,
@@ -29109,16 +29212,16 @@ function syncAgents2(config, sourceRoot, paths, mappings, extensions, options, l
   });
 }
 function syncCommands(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const sourceCommandsRoot = path39.join(sourceRoot, config.source.commands);
-  if (!fs39.existsSync(sourceCommandsRoot)) {
+  const sourceCommandsRoot = path40.join(sourceRoot, config.source.commands);
+  if (!fs40.existsSync(sourceCommandsRoot)) {
     return [skippedMissingSource3("commands", sourceCommandsRoot)];
   }
-  const sourceCommands = ts(path39.join(sourceCommandsRoot, "*.md")).sort();
+  const sourceCommands = ts(path40.join(sourceCommandsRoot, "*.md")).sort();
   const promptsRoot = resolveTargetPath(paths.prompts);
   return sourceCommands.map((commandFile) => {
-    const destination = path39.join(
+    const destination = path40.join(
       promptsRoot,
-      `${path39.basename(commandFile, ".md")}.prompt.md`
+      `${path40.basename(commandFile, ".md")}.prompt.md`
     );
     const compiled = compileCommandPrompt(commandFile);
     if (options.dryRun) {
@@ -29142,7 +29245,7 @@ function syncCommands(config, sourceRoot, paths, options, logger, manifest, scop
   });
 }
 function syncHooks3(config, sourceRoot, paths, mappings, options, lossReport, logger) {
-  const destination = path39.join(
+  const destination = path40.join(
     resolveTargetPath(paths.hooks),
     "tangyr-managed.json"
   );
@@ -29205,10 +29308,10 @@ function syncMcp3(config, sourceRoot, paths, options, lossReport, logger) {
   const source = resolveMcpSourceFile(sourceRoot, config);
   const sourceLabel = mcpSourceLabel(config);
   const destination = resolveTargetPath(paths.mcp_shared_file);
-  if (!fs39.existsSync(source)) {
+  if (!fs40.existsSync(source)) {
     return skippedMissingSource3("mcp", source);
   }
-  const sourceMcpJson = JSON.parse(fs39.readFileSync(source, "utf8"));
+  const sourceMcpJson = JSON.parse(fs40.readFileSync(source, "utf8"));
   const compiled = compileMcp(
     sourceMcpJson,
     "copilot",
@@ -29238,19 +29341,19 @@ function writeCompiledArtifact2(component, destination, content, expectedHash, c
   if (artifactClass === "unmanaged-conflict" && !handleConflict3(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path39.dirname(destination));
+  ensureDir(path40.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs39.writeFileSync(destination, content);
+  fs40.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function isCompiledCurrent2(destination, expectedContent, expectedHash) {
   try {
-    const current = fs39.readFileSync(destination, "utf8");
+    const current = fs40.readFileSync(destination, "utf8");
     const marker = extractProvenanceMarker(current);
     return expectedHash ? marker?.hash === expectedHash && marker.target === "copilot" && current === expectedContent : current === expectedContent;
   } catch {
@@ -29272,13 +29375,22 @@ function handleConflict3(destination, config, options, logger, manifest, scopePa
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs39.rmSync(destination, { recursive: true, force: true });
+      fs40.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs39.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs39.rmSync(destination, { recursive: true, force: true });
+  fs40.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function shouldSkipComponent3(options, component) {
@@ -29287,12 +29399,12 @@ function shouldSkipComponent3(options, component) {
 function cleanupLegacyAgents(paths, options, logger) {
   const currentAgentsRoot = resolveTargetPath(paths.agents);
   const legacyAgentsRoot = resolveTargetPath(legacyCopilotAgentsPath);
-  if (path39.resolve(currentAgentsRoot) === path39.resolve(legacyAgentsRoot)) {
+  if (path40.resolve(currentAgentsRoot) === path40.resolve(legacyAgentsRoot)) {
     return [];
   }
   const outcomes = [];
   for (const filePath of ts(
-    path39.join(legacyAgentsRoot, "*.agent.md")
+    path40.join(legacyAgentsRoot, "*.agent.md")
   ).sort()) {
     if (!isCopilotManagedCompiledFile(filePath)) {
       continue;
@@ -29302,14 +29414,14 @@ function cleanupLegacyAgents(paths, options, logger) {
       outcomes.push({ component: "agents", status: "dry-run", path: filePath });
       continue;
     }
-    fs39.rmSync(filePath, { force: true });
+    fs40.rmSync(filePath, { force: true });
     outcomes.push({ component: "agents", status: "success", path: filePath });
   }
   return outcomes;
 }
 function isCopilotManagedCompiledFile(filePath) {
   try {
-    return extractProvenanceMarker(fs39.readFileSync(filePath, "utf8"))?.target === "copilot";
+    return extractProvenanceMarker(fs40.readFileSync(filePath, "utf8"))?.target === "copilot";
   } catch {
     return false;
   }
@@ -29324,8 +29436,8 @@ function skippedMissingSource3(component, source) {
 
 // src/adapters/cursor.ts
 import crypto8 from "crypto";
-import fs40 from "fs";
-import path40 from "path";
+import fs41 from "fs";
+import path41 from "path";
 function syncCursor(config, sourceRoot, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
   const scope = options.scope ?? "global";
   const profile = resolveTargetPaths({
@@ -29437,7 +29549,7 @@ function syncCursor(config, sourceRoot, mappings, extensions, options, lossRepor
   if (!shouldSkipComponent4(options, "hooks")) {
     outcomes.push(
       syncHookScriptsBridge({
-        source: path40.resolve(sourceRoot, config.source.hooks),
+        source: path41.resolve(sourceRoot, config.source.hooks),
         destination: resolveTargetPath(paths.hook_scripts),
         config,
         sourceRoot,
@@ -29502,7 +29614,7 @@ function syncInstructions2(config, sourceRoot, paths, options, lossReport, logge
   const composed = composeCursorInstructions(config, sourceRoot, lossReport);
   const marker = formatProvenanceMarker(
     "markdown",
-    path40.basename(instructionsSourceLabel(sourceRoot, config)),
+    path41.basename(instructionsSourceLabel(sourceRoot, config)),
     hashString3(composed),
     "cursor"
   );
@@ -29528,7 +29640,7 @@ ${composed}
 }
 function composeCursorInstructions(config, sourceRoot, lossReport) {
   const source = instructionsSourcePath(sourceRoot, config);
-  const baseContent = fs40.existsSync(source) ? fs40.readFileSync(source, "utf8").trim() : "";
+  const baseContent = fs41.existsSync(source) ? fs41.readFileSync(source, "utf8").trim() : "";
   const personaContent = extractPrimaryPersonaContent(
     config,
     sourceRoot,
@@ -29541,11 +29653,11 @@ function composeCursorInstructions(config, sourceRoot, lossReport) {
 ${personaContent}`.trim() : baseContent;
 }
 function extractPrimaryPersonaContent(config, sourceRoot, lossReport) {
-  const agentsDir = path40.join(sourceRoot, config.source.agents);
-  if (!fs40.existsSync(agentsDir)) {
+  const agentsDir = path41.join(sourceRoot, config.source.agents);
+  if (!fs41.existsSync(agentsDir)) {
     return null;
   }
-  const agentFiles = ts(path40.join(agentsDir, "*.md")).sort();
+  const agentFiles = ts(path41.join(agentsDir, "*.md")).sort();
   if (agentFiles.length === 0) {
     return null;
   }
@@ -29568,7 +29680,7 @@ function extractPrimaryPersonaContent(config, sourceRoot, lossReport) {
     return null;
   }
   addLoss(lossReport, "cursor", "instructions", {
-    source: `agents/${path40.basename(primaryFile)}`,
+    source: `agents/${path41.basename(primaryFile)}`,
     fields: [
       {
         field: "persona",
@@ -29578,23 +29690,23 @@ function extractPrimaryPersonaContent(config, sourceRoot, lossReport) {
           "persona",
           "instructions-shim"
         ),
-        detail: `Primary persona from ${path40.basename(primaryFile)} folded into AGENTS.md (Cursor has no custom modes surface)`
+        detail: `Primary persona from ${path41.basename(primaryFile)} folded into AGENTS.md (Cursor has no custom modes surface)`
       }
     ]
   });
   return body.trim();
 }
 function syncAgents3(config, sourceRoot, paths, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
-  const sourceAgentsRoot = path40.join(sourceRoot, config.source.agents);
-  if (!fs40.existsSync(sourceAgentsRoot)) {
+  const sourceAgentsRoot = path41.join(sourceRoot, config.source.agents);
+  if (!fs41.existsSync(sourceAgentsRoot)) {
     return [skippedMissingSource4("agents", sourceAgentsRoot)];
   }
-  const sourceAgents = ts(path40.join(sourceAgentsRoot, "*.md")).sort();
+  const sourceAgents = ts(path41.join(sourceAgentsRoot, "*.md")).sort();
   const agentsRoot = resolveTargetPath(paths.agents);
   return sourceAgents.map((agentFile) => {
-    const destination = path40.join(
+    const destination = path41.join(
       agentsRoot,
-      `${path40.basename(agentFile, ".md")}.md`
+      `${path41.basename(agentFile, ".md")}.md`
     );
     let compiled;
     try {
@@ -29635,14 +29747,14 @@ function syncAgents3(config, sourceRoot, paths, mappings, extensions, options, l
   });
 }
 function syncRules2(config, sourceRoot, paths, mappings, options, lossReport, logger, manifest, scopePath) {
-  const sourceRulesDir = path40.join(sourceRoot, config.source.rules);
-  if (!fs40.existsSync(sourceRulesDir)) {
+  const sourceRulesDir = path41.join(sourceRoot, config.source.rules);
+  if (!fs41.existsSync(sourceRulesDir)) {
     return [skippedMissingSource4("rules", sourceRulesDir)];
   }
   const compiled = compileRules(sourceRulesDir, "cursor", mappings, lossReport);
   const rulesDir = resolveTargetPath(paths.rules);
   return compiled.dotRulesFiles.map(({ name, content }) => {
-    const destination = path40.join(rulesDir, name);
+    const destination = path41.join(rulesDir, name);
     if (options.dryRun) {
       logger.info(`[dry-run] rules: write ${destination}`);
       return {
@@ -29666,17 +29778,17 @@ function syncRules2(config, sourceRoot, paths, mappings, options, lossReport, lo
   });
 }
 function syncCommands2(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const sourceCommandsRoot = path40.join(sourceRoot, config.source.commands);
-  if (!fs40.existsSync(sourceCommandsRoot)) {
+  const sourceCommandsRoot = path41.join(sourceRoot, config.source.commands);
+  if (!fs41.existsSync(sourceCommandsRoot)) {
     return [skippedMissingSource4("commands", sourceCommandsRoot)];
   }
-  const sourceCommands = ts(path40.join(sourceCommandsRoot, "*.md")).sort();
+  const sourceCommands = ts(path41.join(sourceCommandsRoot, "*.md")).sort();
   const skillsRoot = resolveTargetPath(paths.skills);
   return sourceCommands.map((commandFile) => {
-    const baseName = path40.basename(commandFile, ".md");
-    const destination = path40.join(skillsRoot, baseName, "SKILL.md");
-    const commandContent = fs40.readFileSync(commandFile, "utf8");
-    const relativeSource = `commands/${path40.basename(commandFile)}`;
+    const baseName = path41.basename(commandFile, ".md");
+    const destination = path41.join(skillsRoot, baseName, "SKILL.md");
+    const commandContent = fs41.readFileSync(commandFile, "utf8");
+    const relativeSource = `commands/${path41.basename(commandFile)}`;
     const marker = formatProvenanceMarker(
       "markdown",
       relativeSource,
@@ -29715,8 +29827,8 @@ ${commandContent.trim()}
   });
 }
 function syncSkills3(config, sourceRoot, options, logger, manifest, scopePath, component = "skills", destination = "", asSymlink = false) {
-  const source = path40.resolve(sourceRoot, config.source.skills);
-  if (!fs40.existsSync(source)) {
+  const source = path41.resolve(sourceRoot, config.source.skills);
+  if (!fs41.existsSync(source)) {
     return skippedMissingSource4(component, source);
   }
   if (options.dryRun) {
@@ -29730,18 +29842,18 @@ function syncSkills3(config, sourceRoot, options, logger, manifest, scopePath, c
       return { component, status: "skipped-current", path: destination };
     }
     if (artifactClass === "managed-stale" && isOurStaleSymlink(destination, /* @__PURE__ */ new Set([destination]), config)) {
-      fs40.unlinkSync(destination);
+      fs41.unlinkSync(destination);
     } else if (artifactClass === "unmanaged-conflict" && !handleConflict4(destination, config, options, logger, manifest, scopePath)) {
       return { component, status: "conflict", path: destination };
     } else if (artifactClass === "managed-symlink") {
-      fs40.unlinkSync(destination);
+      fs41.unlinkSync(destination);
     }
-    ensureDir(path40.dirname(destination));
+    ensureDir(path41.dirname(destination));
     createRelativeSymlink(source, destination, "dir");
     logger.verbose(`Skills: created shared skills symlink ${destination}`);
     return { component, status: "success", path: destination };
   }
-  if (fs40.existsSync(destination)) {
+  if (fs41.existsSync(destination)) {
     return { component, status: "skipped-current", path: destination };
   }
   ensureDir(destination);
@@ -29782,18 +29894,18 @@ function syncHooks4(config, sourceRoot, paths, mappings, options, lossReport, lo
   }
   const hooksFileContent = `${JSON.stringify({ version: 1, hooks: compiled.payload }, null, 2)}
 `;
-  ensureDir(path40.dirname(destination));
-  fs40.writeFileSync(destination, hooksFileContent);
+  ensureDir(path41.dirname(destination));
+  fs41.writeFileSync(destination, hooksFileContent);
   return { component: "hooks", status: "success", path: destination };
 }
 function syncMcp4(config, sourceRoot, paths, options, lossReport, logger, manifest, scopePath) {
   const source = resolveMcpSourceFile(sourceRoot, config);
   const sourceLabel = mcpSourceLabel(config);
   const destination = resolveTargetPath(paths.mcp_file);
-  if (!fs40.existsSync(source)) {
+  if (!fs41.existsSync(source)) {
     return skippedMissingSource4("mcp", source);
   }
-  const sourceMcpJson = JSON.parse(fs40.readFileSync(source, "utf8"));
+  const sourceMcpJson = JSON.parse(fs41.readFileSync(source, "utf8"));
   const mcpJson = compileMcp(sourceMcpJson, "cursor", lossReport, sourceLabel);
   if (options.dryRun) {
     logger.info(`[dry-run] mcp: compile ${source} -> ${destination}`);
@@ -29846,13 +29958,13 @@ function syncPermissions(config, paths, options, _lossReport, logger, manifest,
   );
 }
 function syncProviderPin(config, sourceRoot, lossReport) {
-  const agentsDir = path40.join(sourceRoot, config.source.agents);
-  if (!fs40.existsSync(agentsDir)) return;
-  for (const agentFile of ts(path40.join(agentsDir, "*.md")).sort()) {
+  const agentsDir = path41.join(sourceRoot, config.source.agents);
+  if (!fs41.existsSync(agentsDir)) return;
+  for (const agentFile of ts(path41.join(agentsDir, "*.md")).sort()) {
     const { data } = parseMarkdownFrontmatter(agentFile);
     const hasCustomProvider = typeof data.provider === "string" || typeof data.provider === "object" && data.provider !== null && Object.keys(data.provider).length > 0;
     if (hasCustomProvider) {
-      const relativeSource = `agents/${path40.basename(agentFile)}`;
+      const relativeSource = `agents/${path41.basename(agentFile)}`;
       addLoss(lossReport, "cursor", "agents", {
         source: relativeSource,
         fields: [
@@ -29864,7 +29976,7 @@ function syncProviderPin(config, sourceRoot, lossReport) {
               "provider",
               "provider-not-representable"
             ),
-            detail: `${path40.basename(agentFile)}: custom provider cannot be expressed in Cursor subagent frontmatter \u2014 configure manually via Cursor settings`
+            detail: `${path41.basename(agentFile)}: custom provider cannot be expressed in Cursor subagent frontmatter \u2014 configure manually via Cursor settings`
           }
         ]
       });
@@ -29879,14 +29991,14 @@ function writeCompiledArtifact3(component, destination, content, expectedHash, c
   if (artifactClass === "unmanaged-conflict" && !handleConflict4(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path40.dirname(destination));
+  ensureDir(path41.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs40.writeFileSync(destination, content);
+  fs41.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function handleConflict4(destination, config, options, logger, manifest, scopePath) {
@@ -29904,18 +30016,27 @@ function handleConflict4(destination, config, options, logger, manifest, scopePa
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs40.rmSync(destination, { recursive: true, force: true });
+      fs41.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs40.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs40.rmSync(destination, { recursive: true, force: true });
+  fs41.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function isCompiledCurrent3(destination, expectedContent, expectedHash) {
   try {
-    const current = fs40.readFileSync(destination, "utf8");
+    const current = fs41.readFileSync(destination, "utf8");
     const marker = extractProvenanceMarker(current);
     return expectedHash ? marker?.hash === expectedHash && marker.target === "cursor" && current === expectedContent : current === expectedContent;
   } catch {
@@ -29934,7 +30055,7 @@ function shouldSkipComponent4(options, component) {
 }
 function isSymlinkTo5(linkPath, source) {
   try {
-    return fs40.realpathSync(linkPath) === fs40.realpathSync(source);
+    return fs41.realpathSync(linkPath) === fs41.realpathSync(source);
   } catch {
     return false;
   }
@@ -29945,8 +30066,8 @@ function hashString3(value) {
 
 // src/adapters/cline.ts
 import crypto9 from "crypto";
-import fs41 from "fs";
-import path41 from "path";
+import fs42 from "fs";
+import path42 from "path";
 function syncCline(config, sourceRoot, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
   const scope = options.scope ?? "global";
   const profile = resolveTargetPaths({
@@ -30059,7 +30180,7 @@ function syncCline(config, sourceRoot, mappings, extensions, options, lossReport
 function syncInstructions3(config, sourceRoot, paths, scope, options, lossReport, logger, manifest, scopePath) {
   if (scope === "global" || paths.instructions === null) {
     addLoss(lossReport, "cline", "instructions", {
-      source: path41.basename(instructionsSourceLabel(sourceRoot, config)),
+      source: path42.basename(instructionsSourceLabel(sourceRoot, config)),
       fields: [
         {
           field: "instructions",
@@ -30081,10 +30202,10 @@ function syncInstructions3(config, sourceRoot, paths, scope, options, lossReport
   }
   const source = instructionsSourcePath(sourceRoot, config);
   const destination = resolveTargetPath(paths.instructions);
-  const baseContent = fs41.existsSync(source) ? fs41.readFileSync(source, "utf8").trim() : "";
+  const baseContent = fs42.existsSync(source) ? fs42.readFileSync(source, "utf8").trim() : "";
   const marker = formatProvenanceMarker(
     "markdown",
-    path41.basename(instructionsSourceLabel(sourceRoot, config)),
+    path42.basename(instructionsSourceLabel(sourceRoot, config)),
     hashString4(baseContent),
     "cline"
   );
@@ -30109,11 +30230,11 @@ ${baseContent}
   );
 }
 function syncAgents4(config, sourceRoot, mappings, extensions, options, lossReport, logger) {
-  const sourceAgentsRoot = path41.join(sourceRoot, config.source.agents);
-  if (!fs41.existsSync(sourceAgentsRoot)) {
+  const sourceAgentsRoot = path42.join(sourceRoot, config.source.agents);
+  if (!fs42.existsSync(sourceAgentsRoot)) {
     return [skippedMissingSource5("agents", sourceAgentsRoot)];
   }
-  const sourceAgents = ts(path41.join(sourceAgentsRoot, "*.md")).sort();
+  const sourceAgents = ts(path42.join(sourceAgentsRoot, "*.md")).sort();
   return sourceAgents.map((agentFile) => {
     compileAgent(agentFile, "cline", mappings, extensions, lossReport);
     if (options.dryRun) {
@@ -30129,14 +30250,14 @@ function syncAgents4(config, sourceRoot, mappings, extensions, options, lossRepo
   });
 }
 function syncRules3(config, sourceRoot, paths, mappings, options, lossReport, logger, manifest, scopePath) {
-  const sourceRulesDir = path41.join(sourceRoot, config.source.rules);
-  if (!fs41.existsSync(sourceRulesDir)) {
+  const sourceRulesDir = path42.join(sourceRoot, config.source.rules);
+  if (!fs42.existsSync(sourceRulesDir)) {
     return [skippedMissingSource5("rules", sourceRulesDir)];
   }
   const compiled = compileRules(sourceRulesDir, "cline", mappings, lossReport);
   const rulesDir = resolveTargetPath(paths.rules);
   return compiled.dotRulesFiles.map(({ name, content }) => {
-    const destination = path41.join(rulesDir, name);
+    const destination = path42.join(rulesDir, name);
     if (options.dryRun) {
       logger.info(`[dry-run] rules: write ${destination}`);
       return {
@@ -30160,17 +30281,17 @@ function syncRules3(config, sourceRoot, paths, mappings, options, lossReport, lo
   });
 }
 function syncCommands3(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const sourceCommandsRoot = path41.join(sourceRoot, config.source.commands);
-  if (!fs41.existsSync(sourceCommandsRoot)) {
+  const sourceCommandsRoot = path42.join(sourceRoot, config.source.commands);
+  if (!fs42.existsSync(sourceCommandsRoot)) {
     return [skippedMissingSource5("commands", sourceCommandsRoot)];
   }
-  const sourceCommands = ts(path41.join(sourceCommandsRoot, "*.md")).sort();
+  const sourceCommands = ts(path42.join(sourceCommandsRoot, "*.md")).sort();
   const workflowsRoot = resolveTargetPath(paths.workflows);
   return sourceCommands.map((commandFile) => {
-    const baseName = path41.basename(commandFile);
-    const destination = path41.join(workflowsRoot, baseName);
-    const commandContent = fs41.readFileSync(commandFile, "utf8");
-    const relativeSource = `commands/${path41.basename(commandFile)}`;
+    const baseName = path42.basename(commandFile);
+    const destination = path42.join(workflowsRoot, baseName);
+    const commandContent = fs42.readFileSync(commandFile, "utf8");
+    const relativeSource = `commands/${path42.basename(commandFile)}`;
     const marker = formatProvenanceMarker(
       "markdown",
       relativeSource,
@@ -30205,9 +30326,9 @@ ${commandContent.trim()}
   });
 }
 function syncSkills4(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const source = path41.resolve(sourceRoot, config.source.skills);
+  const source = path42.resolve(sourceRoot, config.source.skills);
   const destination = resolveTargetPath(paths.skills);
-  if (!fs41.existsSync(source)) {
+  if (!fs42.existsSync(source)) {
     return skippedMissingSource5("skills", source);
   }
   if (options.dryRun) {
@@ -30231,15 +30352,15 @@ function syncSkills4(config, sourceRoot, paths, options, logger, manifest, scope
     // unsynced.
     artifactClass === "managed-stale" && isOurStaleSymlink(destination, /* @__PURE__ */ new Set([destination]), config)
   ) {
-    fs41.unlinkSync(destination);
+    fs42.unlinkSync(destination);
   } else if (artifactClass === "unmanaged-conflict") {
     if (!handleConflict5(destination, config, options, logger, manifest, scopePath)) {
       return { component: "skills", status: "conflict", path: destination };
     }
   } else if (artifactClass === "managed-symlink") {
-    fs41.unlinkSync(destination);
+    fs42.unlinkSync(destination);
   }
-  ensureDir(path41.dirname(destination));
+  ensureDir(path42.dirname(destination));
   createRelativeSymlink(source, destination, "dir");
   logger.verbose(`Skills: created Cline skills symlink ${destination}`);
   return { component: "skills", status: "success", path: destination };
@@ -30263,10 +30384,10 @@ function syncMcp5(config, sourceRoot, paths, options, lossReport, logger, manife
   const source = resolveMcpSourceFile(sourceRoot, config);
   const sourceLabel = mcpSourceLabel(config);
   const destination = resolveTargetPath(paths.mcp_file);
-  if (!fs41.existsSync(source)) {
+  if (!fs42.existsSync(source)) {
     return skippedMissingSource5("mcp", source);
   }
-  const sourceMcpJson = JSON.parse(fs41.readFileSync(source, "utf8"));
+  const sourceMcpJson = JSON.parse(fs42.readFileSync(source, "utf8"));
   const mcpJson = compileMcp(sourceMcpJson, "cline", lossReport, sourceLabel);
   if (options.dryRun) {
     logger.info(`[dry-run] mcp: compile ${source} -> ${destination}`);
@@ -30309,11 +30430,11 @@ function syncSettings2(lossReport) {
   };
 }
 function syncProviderAndModel(config, sourceRoot, lossReport) {
-  const agentsDir = path41.join(sourceRoot, config.source.agents);
-  if (!fs41.existsSync(agentsDir)) return;
-  for (const agentFile of ts(path41.join(agentsDir, "*.md")).sort()) {
+  const agentsDir = path42.join(sourceRoot, config.source.agents);
+  if (!fs42.existsSync(agentsDir)) return;
+  for (const agentFile of ts(path42.join(agentsDir, "*.md")).sort()) {
     const { data } = parseMarkdownFrontmatter(agentFile);
-    const relativeSource = `agents/${path41.basename(agentFile)}`;
+    const relativeSource = `agents/${path42.basename(agentFile)}`;
     const hasCustomProvider = typeof data.provider === "string" || typeof data.provider === "object" && data.provider !== null && Object.keys(data.provider).length > 0;
     if (hasCustomProvider) {
       addLoss(lossReport, "cline", "agents", {
@@ -30327,7 +30448,7 @@ function syncProviderAndModel(config, sourceRoot, lossReport) {
               "provider",
               "provider-not-representable"
             ),
-            detail: `${path41.basename(agentFile)}: Cline provider is interface-only (Settings \u2192 API Provider); configure manually.`
+            detail: `${path42.basename(agentFile)}: Cline provider is interface-only (Settings \u2192 API Provider); configure manually.`
           }
         ]
       });
@@ -30345,7 +30466,7 @@ function syncProviderAndModel(config, sourceRoot, lossReport) {
               "model",
               "model-not-representable"
             ),
-            detail: `${path41.basename(agentFile)}: Cline model pin is interface-only (Settings \u2192 Model); configure manually.`
+            detail: `${path42.basename(agentFile)}: Cline model pin is interface-only (Settings \u2192 Model); configure manually.`
           }
         ]
       });
@@ -30360,14 +30481,14 @@ function writeCompiledArtifact4(component, destination, content, expectedHash, c
   if (artifactClass === "unmanaged-conflict" && !handleConflict5(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path41.dirname(destination));
+  ensureDir(path42.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs41.writeFileSync(destination, content);
+  fs42.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function handleConflict5(destination, config, options, logger, manifest, scopePath) {
@@ -30385,18 +30506,27 @@ function handleConflict5(destination, config, options, logger, manifest, scopePa
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs41.rmSync(destination, { recursive: true, force: true });
+      fs42.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs41.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs41.rmSync(destination, { recursive: true, force: true });
+  fs42.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function isCompiledCurrent4(destination, expectedContent, expectedHash) {
   try {
-    const current = fs41.readFileSync(destination, "utf8");
+    const current = fs42.readFileSync(destination, "utf8");
     const marker = extractProvenanceMarker(current);
     return expectedHash ? marker?.hash === expectedHash && marker.target === "cline" && current === expectedContent : current === expectedContent;
   } catch {
@@ -30415,7 +30545,7 @@ function shouldSkipComponent5(options, component) {
 }
 function isSymlinkTo6(linkPath, source) {
   try {
-    return fs41.realpathSync(linkPath) === fs41.realpathSync(source);
+    return fs42.realpathSync(linkPath) === fs42.realpathSync(source);
   } catch {
     return false;
   }
@@ -30426,9 +30556,9 @@ function hashString4(value) {
 
 // src/adapters/opencode.ts
 import crypto10 from "crypto";
-import fs42 from "fs";
+import fs43 from "fs";
 import os6 from "os";
-import path42 from "path";
+import path43 from "path";
 var import_yaml11 = __toESM(require_dist(), 1);
 function syncOpenCode(config, sourceRoot, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
   const scope = options.scope ?? "global";
@@ -30446,7 +30576,7 @@ function syncOpenCode(config, sourceRoot, mappings, extensions, options, lossRep
     config_doc: profile.config_doc
   };
   const rules = compileRules(
-    path42.join(sourceRoot, config.source.rules),
+    path43.join(sourceRoot, config.source.rules),
     "opencode",
     mappings,
     lossReport
@@ -30550,14 +30680,14 @@ function syncOpenCode(config, sourceRoot, mappings, extensions, options, lossRep
 function syncInstructions4(config, sourceRoot, paths, agentsAppendix, options, logger, manifest, scopePath) {
   const source = instructionsSourcePath(sourceRoot, config);
   const destination = resolveTargetPath(paths.instructions);
-  const baseContent = fs42.existsSync(source) ? fs42.readFileSync(source, "utf8").trim() : "";
+  const baseContent = fs43.existsSync(source) ? fs43.readFileSync(source, "utf8").trim() : "";
   const composed = agentsAppendix ? `${baseContent}
 
 --- tangyr managed rules ---
 ${agentsAppendix}`.trim() : baseContent;
   const marker = formatProvenanceMarker(
     "markdown",
-    path42.basename(instructionsSourceLabel(sourceRoot, config)),
+    path43.basename(instructionsSourceLabel(sourceRoot, config)),
     hashString5(composed),
     "opencode"
   );
@@ -30584,16 +30714,16 @@ ${composed}
   );
 }
 function syncAgents5(config, sourceRoot, paths, mappings, extensions, options, lossReport, logger, manifest, scopePath) {
-  const sourceAgentsRoot = path42.join(sourceRoot, config.source.agents);
-  if (!fs42.existsSync(sourceAgentsRoot)) {
+  const sourceAgentsRoot = path43.join(sourceRoot, config.source.agents);
+  if (!fs43.existsSync(sourceAgentsRoot)) {
     return [skippedMissingSource6("agents", sourceAgentsRoot)];
   }
-  const sourceAgents = ts(path42.join(sourceAgentsRoot, "*.md")).sort();
+  const sourceAgents = ts(path43.join(sourceAgentsRoot, "*.md")).sort();
   const agentsRoot = resolveTargetPath(paths.agents);
   return sourceAgents.map((agentFile) => {
-    const destination = path42.join(
+    const destination = path43.join(
       agentsRoot,
-      `${path42.basename(agentFile, ".md")}.md`
+      `${path43.basename(agentFile, ".md")}.md`
     );
     let compiled;
     try {
@@ -30657,11 +30787,11 @@ function applyProviderModelBinding(compiled, mappings) {
   return `${before}${(0, import_yaml11.stringify)(fields).trim()}${after}`;
 }
 function syncCommands4(config, sourceRoot, paths, options, logger, manifest, scopePath) {
-  const sourceCommandsRoot = path42.join(sourceRoot, config.source.commands);
-  if (!fs42.existsSync(sourceCommandsRoot)) {
+  const sourceCommandsRoot = path43.join(sourceRoot, config.source.commands);
+  if (!fs43.existsSync(sourceCommandsRoot)) {
     return [skippedMissingSource6("commands", sourceCommandsRoot)];
   }
-  const sourceCommands = ts(path42.join(sourceCommandsRoot, "*.md")).sort();
+  const sourceCommands = ts(path43.join(sourceCommandsRoot, "*.md")).sort();
   const commandsRoot = resolveTargetPath(paths.commands);
   return sourceCommands.map((commandFile) => {
     const { data, body } = parseCommandFile(commandFile);
@@ -30675,7 +30805,7 @@ function syncCommands4(config, sourceRoot, paths, options, logger, manifest, sco
     if (typeof data.model === "string") {
       frontmatter.model = data.model;
     }
-    const relativeSource = `commands/${path42.basename(commandFile)}`;
+    const relativeSource = `commands/${path43.basename(commandFile)}`;
     const marker = formatProvenanceMarker(
       "markdown",
       relativeSource,
@@ -30691,9 +30821,9 @@ ${body.trimEnd()}
 ` : `${marker}
 ${body.trimEnd()}
 `;
-    const destination = path42.join(
+    const destination = path43.join(
       commandsRoot,
-      `${path42.basename(commandFile, ".md")}.md`
+      `${path43.basename(commandFile, ".md")}.md`
     );
     if (options.dryRun) {
       logger.info(
@@ -30720,8 +30850,8 @@ ${body.trimEnd()}
   });
 }
 function syncSkills5(config, sourceRoot, _paths, options, logger, manifest, scopePath, component = "skills", destination = "") {
-  const source = path42.resolve(sourceRoot, config.source.skills);
-  if (!fs42.existsSync(source)) {
+  const source = path43.resolve(sourceRoot, config.source.skills);
+  if (!fs43.existsSync(source)) {
     return skippedMissingSource6(component, source);
   }
   if (options.dryRun) {
@@ -30733,13 +30863,13 @@ function syncSkills5(config, sourceRoot, _paths, options, logger, manifest, scop
     return { component, status: "skipped-current", path: destination };
   }
   if (artifactClass === "managed-stale" && isOurStaleSymlink(destination, /* @__PURE__ */ new Set([destination]), config)) {
-    fs42.unlinkSync(destination);
+    fs43.unlinkSync(destination);
   } else if (artifactClass === "unmanaged-conflict" && !handleConflict6(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   } else if (artifactClass === "managed-symlink") {
-    fs42.unlinkSync(destination);
+    fs43.unlinkSync(destination);
   }
-  ensureDir(path42.dirname(destination));
+  ensureDir(path43.dirname(destination));
   createRelativeSymlink(source, destination, "dir");
   logger.verbose(`Skills: created skills path ${destination}`);
   return { component, status: "success", path: destination };
@@ -30748,13 +30878,13 @@ function syncMcp6(config, sourceRoot, paths, mappings, options, lossReport, logg
   const source = resolveMcpSourceFile(sourceRoot, config);
   const sourceLabel = mcpSourceLabel(config);
   const destination = resolveTargetPath(paths.config_doc);
-  if (!fs42.existsSync(source)) {
+  if (!fs43.existsSync(source)) {
     if (!options.dryRun) {
       syncConfigDoc(paths, {}, lossReport, {}, mappings);
     }
     return skippedMissingSource6("mcp", source);
   }
-  const sourceMcpJson = JSON.parse(fs42.readFileSync(source, "utf8"));
+  const sourceMcpJson = JSON.parse(fs43.readFileSync(source, "utf8"));
   const mcpJson = compileMcp(
     sourceMcpJson,
     "opencode",
@@ -30820,9 +30950,9 @@ function syncProviderBlock(mappings) {
 function syncConfigDoc(paths, mcpEntries, _lossReport, permissionMap, mappings) {
   const destination = resolveTargetPath(paths.config_doc);
   let existing = {};
-  if (fs42.existsSync(destination)) {
+  if (fs43.existsSync(destination)) {
     try {
-      existing = JSON.parse(fs42.readFileSync(destination, "utf8"));
+      existing = JSON.parse(fs43.readFileSync(destination, "utf8"));
     } catch {
       existing = {};
     }
@@ -30847,8 +30977,8 @@ function syncConfigDoc(paths, mcpEntries, _lossReport, permissionMap, mappings)
       };
     }
   }
-  ensureDir(path42.dirname(destination));
-  fs42.writeFileSync(destination, `${JSON.stringify(config, null, 2)}
+  ensureDir(path43.dirname(destination));
+  fs43.writeFileSync(destination, `${JSON.stringify(config, null, 2)}
 `);
 }
 function writeCompiledArtifact5(component, destination, content, expectedHash, config, sourceRoot, options, logger, manifest, scopePath) {
@@ -30859,14 +30989,14 @@ function writeCompiledArtifact5(component, destination, content, expectedHash, c
   if (artifactClass === "unmanaged-conflict" && !handleConflict6(destination, config, options, logger, manifest, scopePath)) {
     return { component, status: "conflict", path: destination };
   }
-  ensureDir(path42.dirname(destination));
+  ensureDir(path43.dirname(destination));
   const clearedLink = clearSymlinkAtDestination(destination);
   if (clearedLink !== null) {
     logger.verbose(
       `  ${destination}: replaced a symlink to ${clearedLink} with generated content`
     );
   }
-  fs42.writeFileSync(destination, content);
+  fs43.writeFileSync(destination, content);
   return { component, status: "success", path: destination };
 }
 function handleConflict6(destination, config, options, logger, manifest, scopePath) {
@@ -30884,18 +31014,27 @@ function handleConflict6(destination, config, options, logger, manifest, scopePa
     if (manifest && scopePath) {
       backupFile(destination, manifest, scopePath);
       writeManifest(scopePath, manifest);
-      fs42.rmSync(destination, { recursive: true, force: true });
+      fs43.rmSync(destination, { recursive: true, force: true });
     } else {
-      fs42.renameSync(destination, `${destination}.bak.${Date.now()}`);
+      const parked = parkConflictingPath(
+        destination,
+        resolveScopePath(
+          options.scope ?? "global",
+          options.scope === "project" ? options.projectRoot : void 0
+        )
+      );
+      logger.warn(
+        `${destination}: moved to ${parked} (unrecorded: this run has no manifest to note it in, so uninstall will not restore it)`
+      );
     }
     return true;
   }
-  fs42.rmSync(destination, { recursive: true, force: true });
+  fs43.rmSync(destination, { recursive: true, force: true });
   return true;
 }
 function isCompiledCurrent5(destination, expectedContent, expectedHash) {
   try {
-    const current = fs42.readFileSync(destination, "utf8");
+    const current = fs43.readFileSync(destination, "utf8");
     const marker = extractProvenanceMarker(current);
     return expectedHash ? marker?.hash === expectedHash && marker.target === "opencode" && current === expectedContent : current === expectedContent;
   } catch {
@@ -30914,7 +31053,7 @@ function shouldSkipComponent6(options, component) {
 }
 function isSymlinkTo7(linkPath, source) {
   try {
-    return fs42.realpathSync(linkPath) === fs42.realpathSync(source);
+    return fs43.realpathSync(linkPath) === fs43.realpathSync(source);
   } catch {
     return false;
   }
@@ -30923,7 +31062,7 @@ function hashString5(value) {
   return `sha256:${crypto10.createHash("sha256").update(value).digest("hex")}`;
 }
 function parseCommandFile(commandFile) {
-  const content = fs42.readFileSync(commandFile, "utf8");
+  const content = fs43.readFileSync(commandFile, "utf8");
   if (!content.startsWith("---\n")) {
     return { data: {}, body: content };
   }
@@ -30943,7 +31082,7 @@ function parseCommandFile(commandFile) {
 // src/commands/install.ts
 function isBackupablePath(targetPath) {
   try {
-    const lstat = fs43.lstatSync(targetPath);
+    const lstat = fs44.lstatSync(targetPath);
     return lstat.isSymbolicLink() || lstat.isFile() || lstat.isDirectory();
   } catch {
     return false;
@@ -30980,7 +31119,7 @@ async function runInstallCommand(options, logger) {
     );
   }
   const kitName = resolvedKitName ?? config.kit;
-  const kitPath = kitPathOverride ?? (options.kitPath ? path43.resolve(options.kitPath) : config.kitPath);
+  const kitPath = kitPathOverride ?? (options.kitPath ? path44.resolve(options.kitPath) : config.kitPath);
   if (!kitName && !kitPath) {
     logger.error(
       "No kit specified. Use --kit <name>, --kit-path <path>, or set 'kit'/'kitPath' in tangyr.config.yaml."
@@ -31085,8 +31224,8 @@ async function runInstallCommand(options, logger) {
     config: options.config,
     scope
   });
-  const skillsSource = path43.resolve(kitInfo.path, config.source.skills);
-  const isPerSkillSkillsSlot = (f) => (f.tool === "claude-code" || f.tool === "copilot") && path43.basename(f.path) === "skills";
+  const skillsSource = path44.resolve(kitInfo.path, config.source.skills);
+  const isPerSkillSkillsSlot = (f) => (f.tool === "claude-code" || f.tool === "copilot") && path44.basename(f.path) === "skills";
   const foreignSkillsSlots = new Set(
     assessResult.findings.filter(
       (f) => isPerSkillSkillsSlot(f) && isForeignSkillsSlotSymlink(
@@ -31124,7 +31263,7 @@ async function runInstallCommand(options, logger) {
     let instructionsLabel;
     try {
       const resolved = resolveInstructionsSource(kitInfo.path, config);
-      instructionsLabel = resolved ? path43.relative(kitInfo.path, resolved.file) : "(none \u2014 no instructions file resolves in this kit)";
+      instructionsLabel = resolved ? path44.relative(kitInfo.path, resolved.file) : "(none \u2014 no instructions file resolves in this kit)";
     } catch (err) {
       logger.error(
         `[dry-run] ${err instanceof Error ? err.message : String(err)}`
@@ -31152,7 +31291,7 @@ async function runInstallCommand(options, logger) {
       }
     }
     logger.info(
-      `[dry-run] Total: ${plannedTotal} destination(s); manifest at ${path43.join(scopePath, "manifest.json")}`
+      `[dry-run] Total: ${plannedTotal} destination(s); manifest at ${path44.join(scopePath, "manifest.json")}`
     );
     return;
   }
@@ -31211,7 +31350,7 @@ ACCEPTED CONFLICTS (posture: ${posture}; ${replaceable.length} target(s)):`
           logger.info(`  - ${finding.path}`);
           logger.info(`    source: ${sources}`);
           logger.info(
-            `    action: backup-and-replace${fs43.lstatSync(finding.path).isDirectory() ? " (directory)" : ""}`
+            `    action: backup-and-replace${fs44.lstatSync(finding.path).isDirectory() ? " (directory)" : ""}`
           );
           logger.info(`    backup: ${backupLocation}`);
           continue;
@@ -31319,6 +31458,11 @@ SKIPPED CONFLICTS (${skippedTargetPaths.size} target(s) left unchanged):`
       installLossReport
     );
   }
+  reportContestedInstructions(
+    instructionsByActiveTarget(tools, scope, projectRoot, mappings),
+    (kitInfo.components.rules?.declared.length ?? 0) > 0,
+    logger
+  );
   for (const [relativePath, sourcePath] of collectAllFiles(kitInfo, config)) {
     addFileToManifest(manifest, {
       relativePath,
@@ -31330,20 +31474,20 @@ SKIPPED CONFLICTS (${skippedTargetPaths.size} target(s) left unchanged):`
   writeManifest(scopePath, manifest);
   logger.info(`
 Installation complete: ${installedCount} files installed.`);
-  logger.info(`Manifest written to ${path43.join(scopePath, "manifest.json")}`);
+  logger.info(`Manifest written to ${path44.join(scopePath, "manifest.json")}`);
   logger.info(`Kit: ${kitInfo.name} (archetype: ${kitInfo.archetype})`);
   logger.info(`Scope: ${scope}`);
   logger.info(`Tools: ${tools.join(", ")}`);
   reportHookRejections(
     installLossReport,
     tools,
-    path43.resolve(kitInfo.path, "hooks"),
+    path44.resolve(kitInfo.path, "hooks"),
     kitInfo.components.hooks.declared
   );
   const hooksConflict = reportHooksSourceConflict(
     installLossReport,
     tools,
-    path43.resolve(kitInfo.path, "hooks"),
+    path44.resolve(kitInfo.path, "hooks"),
     kitInfo.components.hooks.declared
   );
   if (hooksConflict) {
@@ -31702,7 +31846,7 @@ function installClaudeCodeSkills(config, kitInfo, manifest, options, logger, sco
     return 0;
   }
   try {
-    const stat = fs43.lstatSync(destination);
+    const stat = fs44.lstatSync(destination);
     if (stat.isFile() && !stat.isSymbolicLink()) {
       logger.warn(
         `${destination}: a regular file occupies the skills slot \u2014 skipping skills. Move or remove it, then re-run install.`
@@ -31730,17 +31874,17 @@ function installClaudeCodeSkills(config, kitInfo, manifest, options, logger, sco
     manifest,
     scopePath
   );
-  const skillsSource = path43.resolve(kitInfo.path, config.source.skills);
+  const skillsSource = path44.resolve(kitInfo.path, config.source.skills);
   let count = 0;
   for (const outcome of outcomes) {
     if (outcome.status !== "success" && outcome.status !== "skipped-current") {
       continue;
     }
-    const skillName = path43.basename(outcome.path);
+    const skillName = path44.basename(outcome.path);
     addArtifactToManifest(manifest, {
       relativePath: `claude-code/skills/${skillName}`,
       path: outcome.path,
-      hash: describeArtifactState(outcome.path) ?? `dir:${path43.join(skillsSource, skillName)}`,
+      hash: describeArtifactState(outcome.path) ?? `dir:${path44.join(skillsSource, skillName)}`,
       origin: "tangyr-managed"
     });
     count++;
@@ -31754,10 +31898,10 @@ function applyClaudeCodePlacements(placements, manifest, skippedTargetPaths, log
       logger.verbose(`  skipped (operator choice): ${placement.destination}`);
       continue;
     }
-    const destDir = path43.dirname(placement.destination);
-    fs43.mkdirSync(destDir, { recursive: true });
+    const destDir = path44.dirname(placement.destination);
+    fs44.mkdirSync(destDir, { recursive: true });
     if (placement.type === "symlink") {
-      if (fs43.existsSync(placement.destination) || isSymlink2(placement.destination)) {
+      if (fs44.existsSync(placement.destination) || isSymlink2(placement.destination)) {
         removeManagedPath(placement.destination);
       }
       createRelativeSymlink(
@@ -31774,7 +31918,7 @@ function applyClaudeCodePlacements(placements, manifest, skippedTargetPaths, log
         `  symlink: ${placement.source} \u2192 ${placement.destination}`
       );
     } else {
-      fs43.copyFileSync(placement.source, placement.destination);
+      fs44.copyFileSync(placement.source, placement.destination);
       logger.verbose(`  copy: ${placement.source} \u2192 ${placement.destination}`);
     }
     addArtifactToManifest(manifest, {
@@ -32056,11 +32200,11 @@ function syncOutcomeToManifestKey(tool, outcome, mappings, scope = "global", pro
     if (outcome.path === mcpFile2) {
       return "cline/mcp.json";
     }
-    if (outcome.path.startsWith(`${workflowsRoot}${path43.sep}`)) {
-      return `cline/workflows/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${workflowsRoot}${path44.sep}`)) {
+      return `cline/workflows/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${rulesRoot2}${path43.sep}`)) {
-      return `cline/rules/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${rulesRoot2}${path44.sep}`)) {
+      return `cline/rules/${path44.basename(outcome.path)}`;
     }
     return null;
   }
@@ -32096,14 +32240,14 @@ function syncOutcomeToManifestKey(tool, outcome, mappings, scope = "global", pro
     if (outcome.path === permissionsFile) {
       return "cursor/permissions.json";
     }
-    if (outcome.path.startsWith(`${agentsRoot2}${path43.sep}`)) {
-      return `cursor/agents/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${agentsRoot2}${path44.sep}`)) {
+      return `cursor/agents/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${rulesRoot2}${path43.sep}`)) {
-      return `cursor/rules/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${rulesRoot2}${path44.sep}`)) {
+      return `cursor/rules/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${skillsRoot2}${path43.sep}`)) {
-      const rel = path43.relative(skillsRoot2, outcome.path);
+    if (outcome.path.startsWith(`${skillsRoot2}${path44.sep}`)) {
+      const rel = path44.relative(skillsRoot2, outcome.path);
       return `cursor/skills/${rel}`;
     }
     return null;
@@ -32129,14 +32273,14 @@ function syncOutcomeToManifestKey(tool, outcome, mappings, scope = "global", pro
     if (outcome.path === skillsSharedRoot) {
       return "opencode/skills_shared";
     }
-    if (outcome.path.startsWith(`${agentsRoot2}${path43.sep}`)) {
-      return `opencode/agents/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${agentsRoot2}${path44.sep}`)) {
+      return `opencode/agents/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${commandsRoot}${path43.sep}`)) {
-      return `opencode/commands/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${commandsRoot}${path44.sep}`)) {
+      return `opencode/commands/${path44.basename(outcome.path)}`;
     }
     if (outcome.path === configDocFile) {
-      return `opencode/${path43.basename(outcome.path)}`;
+      return `opencode/${path44.basename(outcome.path)}`;
     }
     return null;
   }
@@ -32153,26 +32297,26 @@ function syncOutcomeToManifestKey(tool, outcome, mappings, scope = "global", pro
     const hooksRoot = resolveTargetPath(copilot.hooks);
     const mcpFile2 = resolveTargetPath(copilot.mcp_shared_file);
     const instructionsMirror = copilot.instructions !== null ? resolveTargetPath(copilot.instructions) : null;
-    if (outcome.path.startsWith(`${skillsRoot2}${path43.sep}`)) {
-      return `copilot/skills/${path43.relative(skillsRoot2, outcome.path)}`;
+    if (outcome.path.startsWith(`${skillsRoot2}${path44.sep}`)) {
+      return `copilot/skills/${path44.relative(skillsRoot2, outcome.path)}`;
     }
     if (outcome.path === skillsRoot2) {
       return "copilot/skills";
     }
     if (instructionsMirror !== null && outcome.path === instructionsMirror) {
-      return `copilot/${path43.basename(outcome.path)}`;
+      return `copilot/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${agentsRoot2}${path43.sep}`)) {
-      return `copilot/agents/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${agentsRoot2}${path44.sep}`)) {
+      return `copilot/agents/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${promptsRoot}${path43.sep}`)) {
-      return `copilot/prompts/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${promptsRoot}${path44.sep}`)) {
+      return `copilot/prompts/${path44.basename(outcome.path)}`;
     }
-    if (outcome.path.startsWith(`${hooksRoot}${path43.sep}`)) {
-      return `copilot/hooks/${path43.basename(outcome.path)}`;
+    if (outcome.path.startsWith(`${hooksRoot}${path44.sep}`)) {
+      return `copilot/hooks/${path44.basename(outcome.path)}`;
     }
     if (outcome.path === mcpFile2) {
-      return `copilot/${path43.basename(outcome.path)}`;
+      return `copilot/${path44.basename(outcome.path)}`;
     }
     return null;
   }
@@ -32189,17 +32333,17 @@ function syncOutcomeToManifestKey(tool, outcome, mappings, scope = "global", pro
   if (outcome.path === skillsRoot) {
     return "codex/skills";
   }
-  if (outcome.path.startsWith(`${agentsRoot}${path43.sep}`)) {
-    return `codex/agents/${path43.basename(outcome.path)}`;
+  if (outcome.path.startsWith(`${agentsRoot}${path44.sep}`)) {
+    return `codex/agents/${path44.basename(outcome.path)}`;
   }
-  if (outcome.path.startsWith(`${rulesRoot}${path43.sep}`)) {
-    return `codex/rules/${path43.basename(outcome.path)}`;
+  if (outcome.path.startsWith(`${rulesRoot}${path44.sep}`)) {
+    return `codex/rules/${path44.basename(outcome.path)}`;
   }
   if (outcome.path === hooksFile) {
-    return `codex/${path43.basename(outcome.path)}`;
+    return `codex/${path44.basename(outcome.path)}`;
   }
   if (outcome.path === mcpFile) {
-    return `codex/${path43.basename(outcome.path)}`;
+    return `codex/${path44.basename(outcome.path)}`;
   }
   return null;
 }
@@ -32268,8 +32412,8 @@ function getClaudeCodePlacements(kitInfo, config, scope = "global", projectRoot,
     rules: resolvedPaths.rules
   };
   for (const [component, targetPath] of Object.entries(componentDirMap)) {
-    const componentDir = path43.join(kitInfo.path, component);
-    if (fs43.existsSync(componentDir) && fs43.statSync(componentDir).isDirectory()) {
+    const componentDir = path44.join(kitInfo.path, component);
+    if (fs44.existsSync(componentDir) && fs44.statSync(componentDir).isDirectory()) {
       placements.push({
         source: componentDir,
         destination: targetPath,
@@ -32299,8 +32443,8 @@ function getClaudeCodePlacementsFromProfile(kitInfo, profile, config) {
     rules: profile.rules
   };
   for (const [component, targetPath] of Object.entries(componentDirMap)) {
-    const componentDir = path43.join(kitInfo.path, component);
-    if (fs43.existsSync(componentDir) && fs43.statSync(componentDir).isDirectory()) {
+    const componentDir = path44.join(kitInfo.path, component);
+    if (fs44.existsSync(componentDir) && fs44.statSync(componentDir).isDirectory()) {
       placements.push({
         source: componentDir,
         destination: targetPath,
@@ -32316,7 +32460,7 @@ function collectAllFiles(kitInfo, config) {
   const files = /* @__PURE__ */ new Map();
   const entrypoint = resolveInstructionsSource(kitInfo.path, config);
   if (entrypoint) {
-    files.set(path43.basename(entrypoint.file), entrypoint.file);
+    files.set(path44.basename(entrypoint.file), entrypoint.file);
   }
   for (const [component, reconciliation] of Object.entries(
     kitInfo.components
@@ -32325,22 +32469,22 @@ function collectAllFiles(kitInfo, config) {
     const missingSet = new Set(reconciliation.missing);
     for (const entry of reconciliation.declared) {
       if (missingSet.has(entry)) continue;
-      const relPath = isSkills ? path43.join(component, entry) : path43.join(component, `${entry}.md`);
-      files.set(relPath, path43.join(kitInfo.path, relPath));
+      const relPath = isSkills ? path44.join(component, entry) : path44.join(component, `${entry}.md`);
+      files.set(relPath, path44.join(kitInfo.path, relPath));
     }
   }
   return files;
 }
 function readLinkTarget(p) {
   try {
-    return fs43.readlinkSync(p);
+    return fs44.readlinkSync(p);
   } catch {
     return null;
   }
 }
 function isSymlink2(p) {
   try {
-    return fs43.lstatSync(p).isSymbolicLink();
+    return fs44.lstatSync(p).isSymbolicLink();
   } catch {
     return false;
   }
@@ -32385,14 +32529,14 @@ async function runKitUpdateCommand(options, logger) {
 }
 
 // src/commands/list.ts
-import path44 from "path";
+import path45 from "path";
 function runListCommand(options, logger) {
   let searchPaths = [];
-  let directKitPath = options.kitPath ? path44.resolve(options.kitPath) : void 0;
+  let directKitPath = options.kitPath ? path45.resolve(options.kitPath) : void 0;
   try {
     const { config, configDir } = resolveConfig(options.config);
     searchPaths = config.kitSearchPaths ?? [
-      path44.join(configDir, "operating-kits")
+      path45.join(configDir, "operating-kits")
     ];
     directKitPath = directKitPath ?? config.kitPath;
   } catch (err) {
@@ -32467,7 +32611,7 @@ function withDirectKit(kits, directKitPath) {
     return kits;
   }
   const directKit = loadKit(directKitPath);
-  if (kits.some((kit) => path44.resolve(kit.path) === directKit.path)) {
+  if (kits.some((kit) => path45.resolve(kit.path) === directKit.path)) {
     return kits;
   }
   return [...kits, directKit];
@@ -32475,8 +32619,8 @@ function withDirectKit(kits, directKitPath) {
 
 // src/commands/probe.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import fs44 from "fs";
-import path45 from "path";
+import fs45 from "fs";
+import path46 from "path";
 function runProbeCommand(options, logger) {
   const { config, configDir, configSource, sourceRoot } = resolveRuntime(
     options,
@@ -32504,7 +32648,7 @@ function runProbeCommand(options, logger) {
         toProbeRow(
           target,
           key,
-          scope === "project" ? path45.resolve(projectRoot ?? process.cwd(), rawPath) : rawPath
+          scope === "project" ? path46.resolve(projectRoot ?? process.cwd(), rawPath) : rawPath
         )
       );
     }
@@ -32526,7 +32670,7 @@ function toProbeRow(target, key, rawPath) {
   const resolved = resolveTargetPath(rawPath);
   let accessible = false;
   try {
-    fs44.accessSync(resolved);
+    fs45.accessSync(resolved);
     accessible = true;
   } catch {
     accessible = false;
@@ -32535,7 +32679,7 @@ function toProbeRow(target, key, rawPath) {
     target,
     key,
     path: resolved,
-    exists: fs44.existsSync(resolved),
+    exists: fs45.existsSync(resolved),
     accessible
   };
 }
@@ -32553,7 +32697,7 @@ function codexRuntimeProbeRows() {
     ["binary_snap", "/snap/bin/codex"],
     ["binary_flatpak", "/var/lib/flatpak/exports/bin/codex"]
   ]) {
-    if (fs44.existsSync(candidatePath)) {
+    if (fs45.existsSync(candidatePath)) {
       rows.push(toProbeRow("codex", key, candidatePath));
     }
   }
@@ -32569,8 +32713,8 @@ function commandProbeRows(target, key, command, args) {
 
 // src/commands/status.ts
 import crypto11 from "crypto";
-import fs45 from "fs";
-import path46 from "path";
+import fs46 from "fs";
+import path47 from "path";
 function runStatusCommand(options, logger) {
   const { config, configDir, configSource, sourceRoot } = resolveRuntime(
     options,
@@ -32676,11 +32820,11 @@ function classifyTargetRows(target, config, sourceRoot, configDir, scope, projec
   }
 }
 function sourceMarkdownFiles(sourceRoot, componentPath) {
-  const root = path46.join(sourceRoot, componentPath);
-  if (!fs45.existsSync(root)) {
+  const root = path47.join(sourceRoot, componentPath);
+  if (!fs46.existsSync(root)) {
     return [];
   }
-  return ts(path46.join(root, "*.md")).sort();
+  return ts(path47.join(root, "*.md")).sort();
 }
 function notRepresentableRow(component, detail) {
   return {
@@ -32691,11 +32835,11 @@ function notRepresentableRow(component, detail) {
   };
 }
 function readTargetJson(filePath) {
-  if (!fs45.existsSync(filePath)) {
+  if (!fs46.existsSync(filePath)) {
     return { kind: "missing" };
   }
   try {
-    const parsed = JSON.parse(fs45.readFileSync(filePath, "utf8"));
+    const parsed = JSON.parse(fs46.readFileSync(filePath, "utf8"));
     return { kind: "object", value: isRecord(parsed) ? parsed : {} };
   } catch (err) {
     return {
@@ -32784,7 +32928,7 @@ function classifyInstructions(filePath, target, expectedHash, config, sourceRoot
 }
 function compiledMcpDocument(config, sourceRoot, target) {
   const source = resolveMcpSourceFile(sourceRoot, config);
-  if (!fs45.existsSync(source)) {
+  if (!fs46.existsSync(source)) {
     return {};
   }
   const compiled = compileMcp(
@@ -32797,7 +32941,7 @@ function compiledMcpDocument(config, sourceRoot, target) {
   return isRecord(parsed) ? parsed : {};
 }
 function classifyMcpDocument(config, sourceRoot, target, filePath) {
-  if (!fs45.existsSync(resolveMcpSourceFile(sourceRoot, config))) {
+  if (!fs46.existsSync(resolveMcpSourceFile(sourceRoot, config))) {
     return notConfiguredRow("mcp", filePath);
   }
   return classifyJsonDocument(
@@ -32827,12 +32971,12 @@ function classifyOpenCodeFiles(config, sourceRoot, configDir, scope, projectRoot
   const rows = [];
   const instructionsSource = instructionsSourcePath(sourceRoot, config);
   const rules = compileRules(
-    path46.join(sourceRoot, config.source.rules),
+    path47.join(sourceRoot, config.source.rules),
     "opencode",
     mappings,
     createLossReport()
   );
-  const baseInstructions = fs45.existsSync(instructionsSource) ? fs45.readFileSync(instructionsSource, "utf8").trim() : "";
+  const baseInstructions = fs46.existsSync(instructionsSource) ? fs46.readFileSync(instructionsSource, "utf8").trim() : "";
   const composedInstructions = rules.agentsAppendix ? `${baseInstructions}
 
 --- tangyr managed rules ---
@@ -32854,10 +32998,10 @@ ${rules.agentsAppendix}`.trim() : baseInstructions;
   )) {
     rows.push(
       classifyCompiledFile(
-        `agents/${path46.basename(agentFile, ".md")}`,
-        path46.join(
+        `agents/${path47.basename(agentFile, ".md")}`,
+        path47.join(
           resolveTargetPath(paths.agents),
-          `${path46.basename(agentFile, ".md")}.md`
+          `${path47.basename(agentFile, ".md")}.md`
         ),
         "opencode",
         computeSourceHash(agentFile),
@@ -32872,10 +33016,10 @@ ${rules.agentsAppendix}`.trim() : baseInstructions;
   )) {
     rows.push(
       classifyCompiledFile(
-        `commands/${path46.basename(commandFile, ".md")}`,
-        path46.join(
+        `commands/${path47.basename(commandFile, ".md")}`,
+        path47.join(
           resolveTargetPath(paths.commands),
-          `${path46.basename(commandFile, ".md")}.md`
+          `${path47.basename(commandFile, ".md")}.md`
         ),
         "opencode",
         computeSourceHash(commandFile),
@@ -32957,10 +33101,10 @@ function classifyCursorFiles(config, sourceRoot, configDir, scope, projectRoot)
   )) {
     rows.push(
       classifyCompiledFile(
-        `agents/${path46.basename(agentFile, ".md")}`,
-        path46.join(
+        `agents/${path47.basename(agentFile, ".md")}`,
+        path47.join(
           resolveTargetPath(paths.agents),
-          `${path46.basename(agentFile, ".md")}.md`
+          `${path47.basename(agentFile, ".md")}.md`
         ),
         "cursor",
         computeSourceHash(agentFile),
@@ -32977,7 +33121,7 @@ function classifyCursorFiles(config, sourceRoot, configDir, scope, projectRoot)
       rows.push(
         classifyCompiledFile(
           `rules/${ruleFile.name}`,
-          path46.join(resolveTargetPath(paths.rules), ruleFile.name),
+          path47.join(resolveTargetPath(paths.rules), ruleFile.name),
           "cursor",
           void 0,
           config,
@@ -32991,11 +33135,11 @@ function classifyCursorFiles(config, sourceRoot, configDir, scope, projectRoot)
     sourceRoot,
     config.source.commands
   )) {
-    const baseName = path46.basename(commandFile, ".md");
+    const baseName = path47.basename(commandFile, ".md");
     rows.push(
       classifyCompiledFile(
         `commands/${baseName}`,
-        path46.join(resolveTargetPath(paths.skills), baseName, "SKILL.md"),
+        path47.join(resolveTargetPath(paths.skills), baseName, "SKILL.md"),
         "cursor",
         computeSourceHash(commandFile),
         config,
@@ -33078,7 +33222,7 @@ function classifyClineFiles(config, sourceRoot, configDir, scope, projectRoot) {
       rows.push(
         classifyCompiledFile(
           `rules/${ruleFile.name}`,
-          path46.join(resolveTargetPath(paths.rules), ruleFile.name),
+          path47.join(resolveTargetPath(paths.rules), ruleFile.name),
           "cline",
           void 0,
           config,
@@ -33094,10 +33238,10 @@ function classifyClineFiles(config, sourceRoot, configDir, scope, projectRoot) {
   )) {
     rows.push(
       classifyCompiledFile(
-        `commands/${path46.basename(commandFile, ".md")}`,
-        path46.join(
+        `commands/${path47.basename(commandFile, ".md")}`,
+        path47.join(
           resolveTargetPath(paths.workflows),
-          path46.basename(commandFile)
+          path47.basename(commandFile)
         ),
         "cline",
         computeSourceHash(commandFile),
@@ -33138,14 +33282,14 @@ function classifyClineFiles(config, sourceRoot, configDir, scope, projectRoot) {
   return rows;
 }
 function compileRulesFiles(config, sourceRoot, target, mappings) {
-  const rulesSource = path46.join(sourceRoot, config.source.rules);
-  if (!fs45.existsSync(rulesSource)) {
+  const rulesSource = path47.join(sourceRoot, config.source.rules);
+  if (!fs46.existsSync(rulesSource)) {
     return [];
   }
   return compileRules(rulesSource, target, mappings, createLossReport()).dotRulesFiles;
 }
 function classifyDirectoryPresence(component, dirPath) {
-  const present = fs45.existsSync(dirPath) && fs45.statSync(dirPath).isDirectory();
+  const present = fs46.existsSync(dirPath) && fs46.statSync(dirPath).isDirectory();
   return {
     component,
     className: present ? "current" : "missing",
@@ -33164,7 +33308,7 @@ function slotsForScope2(scopeMap, scope, projectRoot) {
   const root = projectRoot ?? process.cwd();
   const resolved = {};
   for (const [slot, value] of Object.entries(projectSlots)) {
-    resolved[slot] = typeof value === "string" ? path46.resolve(root, value) : value;
+    resolved[slot] = typeof value === "string" ? path47.resolve(root, value) : value;
   }
   return resolved;
 }
@@ -33184,21 +33328,21 @@ function classifyCodexFiles(config, sourceRoot, configDir, scope, projectRoot) {
     rules: paths.rules
   };
   const rules = compileRules(
-    path46.join(sourceRoot, config.source.rules),
+    path47.join(sourceRoot, config.source.rules),
     "codex",
     mappings,
     createLossReport()
   );
-  const instructionsSource = fs45.readFileSync(instructionsSourcePath(sourceRoot, config), "utf8").trim();
+  const instructionsSource = fs46.readFileSync(instructionsSourcePath(sourceRoot, config), "utf8").trim();
   const composedInstructions = `${instructionsSource}
 
 --- tangyr managed rules ---
 ${rules.agentsAppendix}`.trim();
   const agentFiles = ts(
-    path46.join(sourceRoot, config.source.agents, "*.md")
+    path47.join(sourceRoot, config.source.agents, "*.md")
   ).sort();
   const hooksPresent = hooksSourceExists(sourceRoot, config);
-  const mcpSource = path46.join(sourceRoot, config.source.mcp);
+  const mcpSource = path47.join(sourceRoot, config.source.mcp);
   const ruleRows = rules.dotRulesFiles.length === 0 ? [
     {
       component: "rules",
@@ -33209,7 +33353,7 @@ ${rules.agentsAppendix}`.trim();
   ] : rules.dotRulesFiles.map(
     (ruleFile) => classifyCompiledFile(
       `rules/${ruleFile.name}`,
-      path46.join(resolveTargetPath(codexPaths.rules), ruleFile.name),
+      path47.join(resolveTargetPath(codexPaths.rules), ruleFile.name),
       "codex",
       void 0,
       config,
@@ -33227,10 +33371,10 @@ ${rules.agentsAppendix}`.trim();
     ),
     ...agentFiles.map(
       (agentFile) => classifyCompiledFile(
-        `agents/${path46.basename(agentFile, ".md")}`,
-        path46.join(
+        `agents/${path47.basename(agentFile, ".md")}`,
+        path47.join(
           resolveTargetPath(codexPaths.agents),
-          `${path46.basename(agentFile, ".md")}.toml`
+          `${path47.basename(agentFile, ".md")}.toml`
         ),
         "codex",
         computeSourceHash(agentFile),
@@ -33258,7 +33402,7 @@ ${rules.agentsAppendix}`.trim();
       "hooks",
       resolveTargetPath(codexPaths.hooksSharedFile)
     ),
-    fs45.existsSync(mcpSource) ? classifyCompiledFile(
+    fs46.existsSync(mcpSource) ? classifyCompiledFile(
       "mcp",
       resolveTargetPath(codexPaths.mcpSharedFile),
       "codex",
@@ -33324,20 +33468,20 @@ function classifyCopilotFiles(config, sourceRoot, configDir, scope, projectRoot)
     mcpSharedFile: paths.mcp_shared_file
   };
   const agentFiles = ts(
-    path46.join(sourceRoot, config.source.agents, "*.md")
+    path47.join(sourceRoot, config.source.agents, "*.md")
   ).sort();
   const commandFiles = ts(
-    path46.join(sourceRoot, config.source.commands, "*.md")
+    path47.join(sourceRoot, config.source.commands, "*.md")
   ).sort();
   const hooksPresent = hooksSourceExists(sourceRoot, config);
-  const mcpSource = path46.join(sourceRoot, config.source.mcp);
+  const mcpSource = path47.join(sourceRoot, config.source.mcp);
   return [
     ...agentFiles.map(
       (agentFile) => classifyCompiledFile(
-        `agents/${path46.basename(agentFile, ".md")}`,
-        path46.join(
+        `agents/${path47.basename(agentFile, ".md")}`,
+        path47.join(
           resolveTargetPath(copilotPaths.agents),
-          `${path46.basename(agentFile, ".md")}.agent.md`
+          `${path47.basename(agentFile, ".md")}.agent.md`
         ),
         "copilot",
         computeSourceHash(agentFile),
@@ -33354,10 +33498,10 @@ function classifyCopilotFiles(config, sourceRoot, configDir, scope, projectRoot)
     ),
     ...commandFiles.map(
       (commandFile) => classifyCompiledFile(
-        `commands/${path46.basename(commandFile, ".md")}`,
-        path46.join(
+        `commands/${path47.basename(commandFile, ".md")}`,
+        path47.join(
           resolveTargetPath(copilotPaths.prompts),
-          `${path46.basename(commandFile, ".md")}.prompt.md`
+          `${path47.basename(commandFile, ".md")}.prompt.md`
         ),
         "copilot",
         computeSourceHash(commandFile),
@@ -33376,19 +33520,19 @@ function classifyCopilotFiles(config, sourceRoot, configDir, scope, projectRoot)
       sourceRoot
     ),
     hooksPresent ? classifyCompiledHooksByProvenance(
-      path46.join(
+      path47.join(
         resolveTargetPath(copilotPaths.hooks),
         "tangyr-managed.json"
       ),
       "copilot"
     ) : notConfiguredRow(
       "hooks",
-      path46.join(
+      path47.join(
         resolveTargetPath(copilotPaths.hooks),
         "tangyr-managed.json"
       )
     ),
-    fs45.existsSync(mcpSource) ? classifyCompiledFile(
+    fs46.existsSync(mcpSource) ? classifyCompiledFile(
       "mcp",
       resolveTargetPath(copilotPaths.mcpSharedFile),
       "copilot",
@@ -33408,7 +33552,7 @@ function notConfiguredRow(component, filePath) {
 }
 function classifyDirectArtifact(artifact, config, sourceRoot) {
   const artifactClass = classifyArtifact(artifact.path, config, sourceRoot);
-  const sourcePath = artifact.sourceKey === "instructions" ? instructionsSourcePath(sourceRoot, config) : artifact.sourceKey ? path46.resolve(sourceRoot, config.source[artifact.sourceKey]) : void 0;
+  const sourcePath = artifact.sourceKey === "instructions" ? instructionsSourcePath(sourceRoot, config) : artifact.sourceKey ? path47.resolve(sourceRoot, config.source[artifact.sourceKey]) : void 0;
   if (artifact.sourceKey === "skills" && artifactClass === "unmanaged-conflict") {
     const perSkill = classifyPerSkillSlot(artifact.path, sourceRoot);
     if (perSkill) {
@@ -33504,11 +33648,11 @@ function classifyClaudeCodeRows(sourceRoot, config, configDir, scope, projectRoo
 function classifyPerSkillSlot(slotPath, sourceRoot) {
   let entries;
   try {
-    const stat = fs45.lstatSync(slotPath);
+    const stat = fs46.lstatSync(slotPath);
     if (!stat.isDirectory() || stat.isSymbolicLink()) {
       return null;
     }
-    entries = fs45.readdirSync(slotPath, { withFileTypes: true });
+    entries = fs46.readdirSync(slotPath, { withFileTypes: true });
   } catch {
     return null;
   }
@@ -33517,7 +33661,7 @@ function classifyPerSkillSlot(slotPath, sourceRoot) {
     return null;
   }
   const ours = links.filter(
-    (entry) => isOurSymlink(path46.join(slotPath, entry.name), sourceRoot)
+    (entry) => isOurSymlink(path47.join(slotPath, entry.name), sourceRoot)
   );
   if (ours.length === 0) {
     return null;
@@ -33529,9 +33673,9 @@ function classifyClaudeSharedFiles(config, sourceRoot, settingsPath, claudeJsonP
     classifyHooks(settingsPath),
     classifySettings(
       settingsPath,
-      path46.resolve(sourceRoot, config.source.settings)
+      path47.resolve(sourceRoot, config.source.settings)
     ),
-    classifyMcp(claudeJsonPath, path46.resolve(sourceRoot, config.source.mcp))
+    classifyMcp(claudeJsonPath, path47.resolve(sourceRoot, config.source.mcp))
   ];
 }
 function claudeSharedFileRows(config, sourceRoot, configDir, scope, projectRoot) {
@@ -33628,14 +33772,14 @@ function classifyMcp(filePath, sourcePath) {
 }
 function isSymlinkCurrent(linkPath, sourcePath) {
   try {
-    return fs45.realpathSync(linkPath) === fs45.realpathSync(sourcePath);
+    return fs46.realpathSync(linkPath) === fs46.realpathSync(sourcePath);
   } catch {
     return false;
   }
 }
 function isCompiledCurrent6(filePath, sourcePath) {
   try {
-    const marker = extractProvenanceMarker(fs45.readFileSync(filePath, "utf8"));
+    const marker = extractProvenanceMarker(fs46.readFileSync(filePath, "utf8"));
     return marker?.hash === computeSourceHash(sourcePath) && marker.target === "claude-code";
   } catch {
     return false;
@@ -33665,7 +33809,7 @@ function classifyCompiledFile(component, filePath, target, expectedHash, config,
 }
 function readCompiledContent(filePath) {
   try {
-    return fs45.readFileSync(filePath, "utf8");
+    return fs46.readFileSync(filePath, "utf8");
   } catch {
     return null;
   }
@@ -33696,8 +33840,8 @@ function hashString6(value) {
 }
 
 // src/commands/sync.ts
-import fs46 from "fs";
-import path47 from "path";
+import fs47 from "fs";
+import path48 from "path";
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -34367,18 +34511,30 @@ async function runSyncCommand(options, logger) {
     reportHookRejections(
       lossReport,
       targets,
-      path47.resolve(kitInfo.path, "hooks"),
+      path48.resolve(kitInfo.path, "hooks"),
       kitInfo.components.hooks.declared
     );
     const hooksConflict = reportHooksSourceConflict(
       lossReport,
       targets,
-      path47.resolve(kitInfo.path, "hooks"),
+      path48.resolve(kitInfo.path, "hooks"),
       kitInfo.components.hooks.declared
     );
     if (hooksConflict) {
       logger.warn(hooksConflict);
     }
+    if (allMappings) {
+      reportContestedInstructions(
+        instructionsByActiveTarget(
+          targets,
+          syncOptions.scope,
+          syncOptions.projectRoot,
+          allMappings
+        ),
+        kitInfo.components.rules.declared.length > 0,
+        logger
+      );
+    }
   }
   writeLossReport(options.lossReport, lossReport);
   printOutcomeTable(results);
@@ -34564,8 +34720,8 @@ function reconcileSyncedArtifacts(manifest, results, mappings, scope, projectRoo
   }
 }
 function resolveKitFilePath(kitPath, relativePath) {
-  const fullPath = path47.join(kitPath, relativePath);
-  return fs46.existsSync(fullPath) ? fullPath : null;
+  const fullPath = path48.join(kitPath, relativePath);
+  return fs47.existsSync(fullPath) ? fullPath : null;
 }
 function cleanupRemovedManagedArtifacts(config, mappings, targets, options, removedSourcePaths, logger) {
   if (removedSourcePaths.length === 0 || !mappings) {
@@ -34628,9 +34784,9 @@ function cleanupRemovedCopilotArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("agents/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.agents ?? ""),
-        `${path47.parse(relativePath).name}.agent.md`
+        `${path48.parse(relativePath).name}.agent.md`
       ),
       "copilot",
       relativePath,
@@ -34640,9 +34796,9 @@ function cleanupRemovedCopilotArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("commands/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.prompts ?? ""),
-        `${path47.parse(relativePath).name}.prompt.md`
+        `${path48.parse(relativePath).name}.prompt.md`
       ),
       "copilot",
       relativePath,
@@ -34652,7 +34808,7 @@ function cleanupRemovedCopilotArtifact(relativePath, paths, logger) {
   }
   if (relativePath.endsWith("hooks.json")) {
     removeManagedCompiledArtifact2(
-      path47.join(resolveTargetPath(paths.hooks ?? ""), "tangyr-managed.json"),
+      path48.join(resolveTargetPath(paths.hooks ?? ""), "tangyr-managed.json"),
       "copilot",
       relativePath,
       logger
@@ -34682,9 +34838,9 @@ function cleanupRemovedCodexArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("agents/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.agents ?? ""),
-        `${path47.parse(relativePath).name}.toml`
+        `${path48.parse(relativePath).name}.toml`
       ),
       "codex",
       relativePath,
@@ -34694,9 +34850,9 @@ function cleanupRemovedCodexArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("rules/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.rules ?? ""),
-        `${path47.parse(relativePath).name}.rules`
+        `${path48.parse(relativePath).name}.rules`
       ),
       "codex",
       relativePath,
@@ -34735,9 +34891,9 @@ function cleanupRemovedOpenCodeArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("agents/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.agents ?? ""),
-        `${path47.parse(relativePath).name}.md`
+        `${path48.parse(relativePath).name}.md`
       ),
       "opencode",
       relativePath,
@@ -34747,9 +34903,9 @@ function cleanupRemovedOpenCodeArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("commands/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.commands ?? ""),
-        `${path47.parse(relativePath).name}.md`
+        `${path48.parse(relativePath).name}.md`
       ),
       "opencode",
       relativePath,
@@ -34781,9 +34937,9 @@ function cleanupRemovedCursorArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("agents/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.agents ?? ""),
-        `${path47.parse(relativePath).name}.md`
+        `${path48.parse(relativePath).name}.md`
       ),
       "cursor",
       relativePath,
@@ -34793,9 +34949,9 @@ function cleanupRemovedCursorArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("rules/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.rules ?? ""),
-        `${path47.parse(relativePath).name}.mdc`
+        `${path48.parse(relativePath).name}.mdc`
       ),
       "cursor",
       relativePath,
@@ -34805,9 +34961,9 @@ function cleanupRemovedCursorArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("commands/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.skills ?? ""),
-        path47.parse(relativePath).name,
+        path48.parse(relativePath).name,
         "SKILL.md"
       ),
       "cursor",
@@ -34851,9 +35007,9 @@ function cleanupRemovedClineArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("rules/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.rules ?? ""),
-        `${path47.parse(relativePath).name}.md`
+        `${path48.parse(relativePath).name}.md`
       ),
       "cline",
       relativePath,
@@ -34863,9 +35019,9 @@ function cleanupRemovedClineArtifact(relativePath, paths, logger) {
   }
   if (relativePath.startsWith("commands/")) {
     removeManagedCompiledArtifact2(
-      path47.join(
+      path48.join(
         resolveTargetPath(paths.workflows ?? ""),
-        path47.basename(relativePath)
+        path48.basename(relativePath)
       ),
       "cline",
       relativePath,
@@ -34883,17 +35039,17 @@ function cleanupRemovedClineArtifact(relativePath, paths, logger) {
   }
 }
 function removeManagedCompiledArtifact2(artifactPath, expectedTarget, expectedSource, logger) {
-  if (!fs46.existsSync(artifactPath)) {
+  if (!fs47.existsSync(artifactPath)) {
     return;
   }
-  if (!fs46.statSync(artifactPath).isFile()) {
+  if (!fs47.statSync(artifactPath).isFile()) {
     return;
   }
-  const marker = extractProvenanceMarker(fs46.readFileSync(artifactPath, "utf8"));
+  const marker = extractProvenanceMarker(fs47.readFileSync(artifactPath, "utf8"));
   if (marker?.source !== expectedSource || marker.target !== expectedTarget) {
     return;
   }
-  fs46.rmSync(artifactPath, { force: true });
+  fs47.rmSync(artifactPath, { force: true });
   logger.verbose(`  removed stale target artifact: ${artifactPath}`);
 }
 function removeManagedCopilotMcpArtifact2(artifactPath, expectedSource, logger) {
@@ -34924,10 +35080,10 @@ function removeManagedCodexHooksArtifact2(artifactPath, expectedSource, logger)
   logger.verbose(`  removed stale target artifact: ${artifactPath}`);
 }
 function removeManagedCodexMcpArtifact2(artifactPath, expectedSource, logger) {
-  if (!fs46.existsSync(artifactPath)) {
+  if (!fs47.existsSync(artifactPath)) {
     return;
   }
-  const content = fs46.readFileSync(artifactPath, "utf8");
+  const content = fs47.readFileSync(artifactPath, "utf8");
   const startMarker = "# tangyr: managed mcp start";
   const endMarker = "# tangyr: managed mcp end";
   const startIndex = content.indexOf(startMarker);
@@ -34944,19 +35100,19 @@ function removeManagedCodexMcpArtifact2(artifactPath, expectedSource, logger) {
   const after = content.slice(endIndex + endMarker.length).trimStart();
   const cleaned = [before, after].filter((entry) => entry.length > 0).join("\n\n");
   if (cleaned.length === 0) {
-    fs46.rmSync(artifactPath, { force: true });
+    fs47.rmSync(artifactPath, { force: true });
   } else {
-    fs46.writeFileSync(artifactPath, `${cleaned}
+    fs47.writeFileSync(artifactPath, `${cleaned}
 `);
   }
   logger.verbose(`  removed stale target artifact: ${artifactPath}`);
 }
 function readJsonObject5(filePath) {
-  if (!fs46.existsSync(filePath)) {
+  if (!fs47.existsSync(filePath)) {
     return null;
   }
   try {
-    const parsed = JSON.parse(fs46.readFileSync(filePath, "utf8"));
+    const parsed = JSON.parse(fs47.readFileSync(filePath, "utf8"));
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
     return null;
@@ -34970,10 +35126,10 @@ function readJsonMetadata(value) {
 }
 function writeJsonOrRemove2(filePath, parsed) {
   if (isEmptyJsonValue2(parsed)) {
-    fs46.rmSync(filePath, { force: true });
+    fs47.rmSync(filePath, { force: true });
     return;
   }
-  fs46.writeFileSync(filePath, `${JSON.stringify(parsed, null, 2)}
+  fs47.writeFileSync(filePath, `${JSON.stringify(parsed, null, 2)}
 `);
 }
 function isEmptyJsonValue2(value) {
@@ -35033,8 +35189,8 @@ function removeManagedHookEntries(value, expectedSource) {
 }
 
 // src/commands/validate.ts
-import fs47 from "fs";
-import path48 from "path";
+import fs48 from "fs";
+import path49 from "path";
 var SUPPORTED_KIT_FORMATS2 = [1];
 var SUPPORTED_DISCIPLINE_VERSIONS = [
   "0.14.0",
@@ -35149,12 +35305,12 @@ function checkArchetype(kit) {
 }
 function checkHookScriptsExist(kit) {
   const violations = [];
-  const hooksDir = path48.join(kit.path, "hooks");
+  const hooksDir = path49.join(kit.path, "hooks");
   const missingSet = new Set(kit.components.hooks.missing);
   for (const name of kit.components.hooks.declared) {
     if (missingSet.has(name)) continue;
-    const declarationPath = path48.join(hooksDir, `${name}.md`);
-    if (!fs47.existsSync(declarationPath)) continue;
+    const declarationPath = path49.join(hooksDir, `${name}.md`);
+    if (!fs48.existsSync(declarationPath)) continue;
     let data;
     try {
       ({ data } = parseMarkdownFrontmatter(declarationPath));
@@ -35164,8 +35320,8 @@ function checkHookScriptsExist(kit) {
     if (typeof data.command === "string" && data.command.trim().length > 0) {
       continue;
     }
-    const scriptPath = path48.join(hooksDir, "scripts", `${name}.ts`);
-    if (!fs47.existsSync(scriptPath)) {
+    const scriptPath = path49.join(hooksDir, "scripts", `${name}.ts`);
+    if (!fs48.existsSync(scriptPath)) {
       violations.push({
         code: "hook-script-missing",
         location: `hooks/scripts/${name}.ts`,
@@ -35178,10 +35334,10 @@ function checkHookScriptsExist(kit) {
 function checkOptionalSourceDocuments(kit) {
   const violations = [];
   for (const name of [".mcp.json", "settings.json", ".lsp.json"]) {
-    const filePath = path48.join(kit.path, name);
-    if (!fs47.existsSync(filePath)) continue;
+    const filePath = path49.join(kit.path, name);
+    if (!fs48.existsSync(filePath)) continue;
     try {
-      const parsed = JSON.parse(fs47.readFileSync(filePath, "utf8"));
+      const parsed = JSON.parse(fs48.readFileSync(filePath, "utf8"));
       if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
         violations.push({
           code: "optional-source-malformed",
@@ -35203,10 +35359,10 @@ function checkSkillSubfolderNames(kit) {
   const notices = [];
   const canonical = new Set(CANONICAL_SKILL_SUBFOLDERS);
   for (const name of kit.components.skills.declared) {
-    const skillDir = path48.join(kit.path, "skills", name);
+    const skillDir = path49.join(kit.path, "skills", name);
     let entries;
     try {
-      entries = fs47.readdirSync(skillDir, { withFileTypes: true });
+      entries = fs48.readdirSync(skillDir, { withFileTypes: true });
     } catch {
       continue;
     }
@@ -35224,7 +35380,7 @@ function checkSkillSubfolderNames(kit) {
   return notices;
 }
 function checkHooksSourceForm(kit) {
-  const hooksDir = path48.join(kit.path, "hooks");
+  const hooksDir = path49.join(kit.path, "hooks");
   const message = describeHooksSourceConflict(
     hooksDir,
     kit.components.hooks.declared
@@ -35236,12 +35392,12 @@ function checkHooksSourceForm(kit) {
   } : null;
 }
 function checkHookDeclarations(kit) {
-  const hooksDir = path48.join(kit.path, "hooks");
+  const hooksDir = path49.join(kit.path, "hooks");
   return collectHookRejections(hooksDir, kit.components.hooks.declared).map(
     (r) => ({
       code: "hook-declaration-invalid",
-      location: `hooks/${path48.basename(r.file)}`,
-      message: `hooks: '${path48.basename(r.file, ".md")}' was rejected at '${r.field}' \u2014 ${r.reason}. Until this is fixed the hook is not installed on any target; install and sync report it as an error-severity loss and exit 3. To fix: correct the field named above in this file.`
+      location: `hooks/${path49.basename(r.file)}`,
+      message: `hooks: '${path49.basename(r.file, ".md")}' was rejected at '${r.field}' \u2014 ${r.reason}. Until this is fixed the hook is not installed on any target; install and sync report it as an error-severity loss and exit 3. To fix: correct the field named above in this file.`
     })
   );
 }
@@ -35261,11 +35417,11 @@ function checkKitFormatSupported(kit) {
 function checkEntrypointExists(kit) {
   const declared = kit.entrypoint;
   const entrypoint = declared ?? DEFAULT_ENTRYPOINT;
-  const entrypointPath = path48.join(kit.path, entrypoint);
-  if (fs47.existsSync(entrypointPath)) {
+  const entrypointPath = path49.join(kit.path, entrypoint);
+  if (fs48.existsSync(entrypointPath)) {
     return null;
   }
-  const legacyPresent = declared === void 0 && fs47.existsSync(path48.join(kit.path, LEGACY_ENTRYPOINT));
+  const legacyPresent = declared === void 0 && fs48.existsSync(path49.join(kit.path, LEGACY_ENTRYPOINT));
   const remedy = legacyPresent ? `This kit has '${LEGACY_ENTRYPOINT}' but not '${DEFAULT_ENTRYPOINT}'. Until now validate looked for '${LEGACY_ENTRYPOINT}' unconditionally; it now reads the manifest's 'entrypoint', defaulting to '${DEFAULT_ENTRYPOINT}' \u2014 the contract's canonical orientation document, of which '${LEGACY_ENTRYPOINT}' is a target translation. To fix: either add "entrypoint: ${LEGACY_ENTRYPOINT}" to tangyr-kit.yaml to keep the current filename, or rename '${LEGACY_ENTRYPOINT}' to '${DEFAULT_ENTRYPOINT}'.` : declared === void 0 ? `No 'entrypoint' is declared in tangyr-kit.yaml, so '${DEFAULT_ENTRYPOINT}' is expected at the kit root. To fix: create it, or declare the file you use with "entrypoint: <filename>".` : `tangyr-kit.yaml declares "entrypoint: ${declared}", and no such file exists at the kit root. To fix: create it, or correct the declaration.`;
   return {
     code: "entrypoint-missing",
@@ -35324,9 +35480,9 @@ function checkComponentFrontmatter(kit) {
     const missingSet = new Set(kit.components[cat].missing);
     for (const name of kit.components[cat].declared) {
       if (missingSet.has(name)) continue;
-      const filePath = cat === "skills" ? path48.join(kit.path, cat, name, "SKILL.md") : path48.join(kit.path, cat, `${name}.md`);
-      if (!fs47.existsSync(filePath)) continue;
-      const relPath = path48.relative(kit.path, filePath);
+      const filePath = cat === "skills" ? path49.join(kit.path, cat, name, "SKILL.md") : path49.join(kit.path, cat, `${name}.md`);
+      if (!fs48.existsSync(filePath)) continue;
+      const relPath = path49.relative(kit.path, filePath);
       try {
         const { data } = parseMarkdownFrontmatter(filePath);
         for (const field of requiredFields) {
@@ -35351,10 +35507,10 @@ function checkComponentFrontmatter(kit) {
 }
 function checkReservedRootNames(kit) {
   const violations = [];
-  if (!fs47.existsSync(kit.path) || !fs47.statSync(kit.path).isDirectory()) {
+  if (!fs48.existsSync(kit.path) || !fs48.statSync(kit.path).isDirectory()) {
     return violations;
   }
-  const entries = fs47.readdirSync(kit.path, { withFileTypes: true });
+  const entries = fs48.readdirSync(kit.path, { withFileTypes: true });
   for (const entry of entries) {
     if (RESERVED_ROOT_NAMES.includes(entry.name)) {
       violations.push({
@@ -35371,8 +35527,8 @@ function checkHumanOnlyCommandInvocation(kit) {
   const missingSet = new Set(kit.components.commands.missing);
   for (const name of kit.components.commands.declared) {
     if (missingSet.has(name)) continue;
-    const filePath = path48.join(kit.path, "commands", `${name}.md`);
-    if (!fs47.existsSync(filePath)) continue;
+    const filePath = path49.join(kit.path, "commands", `${name}.md`);
+    if (!fs48.existsSync(filePath)) continue;
     let data;
     try {
       ({ data } = parseMarkdownFrontmatter(filePath));
@@ -35385,7 +35541,7 @@ function checkHumanOnlyCommandInvocation(kit) {
     if (!barred) {
       violations.push({
         code: "command-human-only-model-invocable",
-        location: path48.relative(kit.path, filePath),
+        location: path49.relative(kit.path, filePath),
         message: "commands: 'launch: human-only' requires 'disable-model-invocation: true' so the model cannot start the command; only a Human-typed launch may"
       });
     }
@@ -35394,8 +35550,8 @@ function checkHumanOnlyCommandInvocation(kit) {
 }
 
 // src/commands/verify.ts
-import fs48 from "fs";
-import path49 from "path";
+import fs49 from "fs";
+import path50 from "path";
 function runVerifyCommand(options, logger) {
   if (options.target && !isKnownTarget(options.target)) {
     throwUnrecognizedTarget(options.target);
@@ -35576,8 +35732,8 @@ function verifyClaudeCodeGlobalRoots(roots, manifestKeys, mappings) {
       if (!slotPath) {
         continue;
       }
-      const fullPath = subPath ? path49.join(slotPath, subPath) : slotPath;
-      if (!fs48.existsSync(fullPath)) {
+      const fullPath = subPath ? path50.join(slotPath, subPath) : slotPath;
+      if (!fs49.existsSync(fullPath)) {
         failures.push(
           `claude-code/${slot}${subPath ? `/${subPath}` : ""} missing in root ${root}: ${fullPath}`
         );