claudekit-cli 4.5.0-dev.7 → 4.5.0-dev.8

package/dist/index.js

@@ -15561,8 +15561,9 @@ var init_types2 = __esm(() => {
 });
 
 // src/domains/installation/plugin/install-mode-detector.ts
+import { createHash as createHash4 } from "node:crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { join as join6, relative as relative3, resolve as resolve5 } from "node:path";
 function readJsonSafe(filePath) {
   try {
     return JSON.parse(readFileSync3(filePath, "utf-8"));
@@ -15665,14 +15666,12 @@ function hasTrackedPluginSuppliedLegacyFiles(claudeDir = PathResolver.getGlobalK
   if (!isRecord(metadata))
     return false;
   for (const file of collectTrackedFiles(metadata)) {
-    if (file.ownership === "user")
+    const resolvedPath = resolveSafePluginSuppliedLegacyPath(claudeDir, file.path);
+    if (!resolvedPath || !existsSync6(resolvedPath))
       continue;
-    const normalized = file.path.replace(/\\/g, "/").replace(/^\.claude\//, "");
-    if (!PLUGIN_SUPPLIED_LEGACY_PREFIXES.some((prefix) => normalized.startsWith(prefix))) {
+    if (file.ownership === "user" && !checksumMatches(resolvedPath, file.checksum))
       continue;
-    }
-    if (existsSync6(join6(claudeDir, normalized)))
-      return true;
+    return true;
   }
   return false;
 }
@@ -15685,7 +15684,11 @@ function collectTrackedFiles(metadata) {
       if (!isRecord(file) || typeof file.path !== "string")
         continue;
       const ownership = file.ownership === "user" || file.ownership === "ck-modified" ? file.ownership : "ck";
-      tracked.push({ path: file.path, ownership });
+      tracked.push({
+        path: file.path,
+        ownership,
+        checksum: typeof file.checksum === "string" ? file.checksum : undefined
+      });
     }
   };
   if (isRecord(metadata.kits)) {
@@ -15697,6 +15700,54 @@ function collectTrackedFiles(metadata) {
   }
   return tracked;
 }
+function resolveSafePluginSuppliedLegacyPath(claudeDir, pathValue) {
+  const normalized = normalizeLegacyPath(pathValue).replace(/^\.\/+/, "");
+  if (!isPluginSuppliedLegacyPath(normalized))
+    return null;
+  const safe = resolveSafeChildPath(claudeDir, normalized);
+  if (!safe)
+    return null;
+  const relativePath = normalizeLegacyPath(relative3(resolve5(claudeDir), safe));
+  if (!isPluginSuppliedLegacyPath(relativePath))
+    return null;
+  return safe;
+}
+function resolveSafeChildPath(baseDir, pathValue) {
+  const normalized = normalizeLegacyPath(pathValue);
+  if (!normalized || hasPathTraversal(normalized) || isAbsoluteLike(normalized))
+    return null;
+  const resolvedBase = resolve5(baseDir);
+  const resolvedTarget = resolve5(resolvedBase, normalized);
+  const relativePath = normalizeLegacyPath(relative3(resolvedBase, resolvedTarget));
+  if (!relativePath || relativePath === ".." || relativePath.startsWith("../"))
+    return null;
+  if (isAbsoluteLike(relativePath))
+    return null;
+  return resolvedTarget;
+}
+function isPluginSuppliedLegacyPath(pathValue) {
+  const normalized = normalizeLegacyPath(pathValue).replace(/^\.claude\//, "");
+  return PLUGIN_SUPPLIED_LEGACY_PREFIXES.some((prefix) => normalized.startsWith(prefix));
+}
+function checksumMatches(filePath, expected) {
+  if (!expected || !/^[a-f0-9]{64}$/i.test(expected))
+    return false;
+  try {
+    const actual = createHash4("sha256").update(readFileSync3(filePath)).digest("hex");
+    return actual.toLowerCase() === expected.toLowerCase();
+  } catch {
+    return false;
+  }
+}
+function hasPathTraversal(pathValue) {
+  return pathValue.split("/").some((segment) => segment === "..");
+}
+function isAbsoluteLike(pathValue) {
+  return pathValue.startsWith("/") || pathValue.startsWith("//") || /^[A-Za-z]:/.test(pathValue);
+}
+function normalizeLegacyPath(pathValue) {
+  return pathValue.replace(/\\/g, "/");
+}
 function safeReaddir(dir) {
   try {
     return readdirSync2(dir);
@@ -15865,7 +15916,8 @@ var init_commands = __esm(() => {
     sync: exports_external.boolean().default(false),
     useGit: exports_external.boolean().default(false),
     archive: exports_external.string().optional(),
-    kitPath: exports_external.string().optional()
+    kitPath: exports_external.string().optional(),
+    installMode: exports_external.enum(["auto", "plugin", "legacy"]).default("auto")
   }).merge(GlobalOutputOptionsSchema);
   VersionCommandOptionsSchema = exports_external.object({
     kit: KitType.optional(),
@@ -19941,8 +19993,8 @@ var require_universalify = __commonJS((exports) => {
       if (typeof args[args.length - 1] === "function")
         fn.apply(this, args);
       else {
-        return new Promise((resolve5, reject) => {
-          args.push((err, res) => err != null ? reject(err) : resolve5(res));
+        return new Promise((resolve6, reject) => {
+          args.push((err, res) => err != null ? reject(err) : resolve6(res));
           fn.apply(this, args);
         });
       }
@@ -20015,19 +20067,19 @@ var require_fs = __commonJS((exports) => {
     if (typeof callback === "function") {
       return fs.exists(filename, callback);
     }
-    return new Promise((resolve5) => {
-      return fs.exists(filename, resolve5);
+    return new Promise((resolve6) => {
+      return fs.exists(filename, resolve6);
     });
   };
   exports.read = function(fd, buffer, offset, length, position, callback) {
     if (typeof callback === "function") {
       return fs.read(fd, buffer, offset, length, position, callback);
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       fs.read(fd, buffer, offset, length, position, (err, bytesRead, buffer2) => {
         if (err)
           return reject(err);
-        resolve5({ bytesRead, buffer: buffer2 });
+        resolve6({ bytesRead, buffer: buffer2 });
       });
     });
   };
@@ -20035,11 +20087,11 @@ var require_fs = __commonJS((exports) => {
     if (typeof args[args.length - 1] === "function") {
       return fs.write(fd, buffer, ...args);
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       fs.write(fd, buffer, ...args, (err, bytesWritten, buffer2) => {
         if (err)
           return reject(err);
-        resolve5({ bytesWritten, buffer: buffer2 });
+        resolve6({ bytesWritten, buffer: buffer2 });
       });
     });
   };
@@ -20047,11 +20099,11 @@ var require_fs = __commonJS((exports) => {
     if (typeof args[args.length - 1] === "function") {
       return fs.readv(fd, buffers, ...args);
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       fs.readv(fd, buffers, ...args, (err, bytesRead, buffers2) => {
         if (err)
           return reject(err);
-        resolve5({ bytesRead, buffers: buffers2 });
+        resolve6({ bytesRead, buffers: buffers2 });
       });
     });
   };
@@ -20059,11 +20111,11 @@ var require_fs = __commonJS((exports) => {
     if (typeof args[args.length - 1] === "function") {
       return fs.writev(fd, buffers, ...args);
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       fs.writev(fd, buffers, ...args, (err, bytesWritten, buffers2) => {
         if (err)
           return reject(err);
-        resolve5({ bytesWritten, buffers: buffers2 });
+        resolve6({ bytesWritten, buffers: buffers2 });
       });
     });
   };
@@ -20896,9 +20948,9 @@ var require_symlink = __commonJS((exports, module) => {
       if (areIdentical(srcStat, dstStat))
         return;
     }
-    const relative3 = await symlinkPaths(srcpath, dstpath);
-    srcpath = relative3.toDst;
-    const toType = await symlinkType(relative3.toCwd, type);
+    const relative4 = await symlinkPaths(srcpath, dstpath);
+    srcpath = relative4.toDst;
+    const toType = await symlinkType(relative4.toCwd, type);
     const dir = path3.dirname(dstpath);
     if (!await pathExists(dir)) {
       await mkdirs(dir);
@@ -20916,9 +20968,9 @@ var require_symlink = __commonJS((exports, module) => {
       if (areIdentical(srcStat, dstStat))
         return;
     }
-    const relative3 = symlinkPathsSync(srcpath, dstpath);
-    srcpath = relative3.toDst;
-    type = symlinkTypeSync(relative3.toCwd, type);
+    const relative4 = symlinkPathsSync(srcpath, dstpath);
+    srcpath = relative4.toDst;
+    type = symlinkTypeSync(relative4.toCwd, type);
     const dir = path3.dirname(dstpath);
     const exists = fs.existsSync(dir);
     if (exists)
@@ -21323,7 +21375,7 @@ var init_safe_prompts = __esm(() => {
 // src/commands/commands/commands-discovery.ts
 import { readdir as readdir4 } from "node:fs/promises";
 import { homedir as homedir9 } from "node:os";
-import { join as join17, relative as relative3 } from "node:path";
+import { join as join17, relative as relative4 } from "node:path";
 function getCommandSourcePath(globalOnly = false) {
   const globalPath = join17(homedir9(), ".claude/commands");
   if (globalOnly) {
@@ -21348,7 +21400,7 @@ async function scanCommandDir(dir, rootDir) {
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
         try {
           const { frontmatter, body } = await parseFrontmatterFile(fullPath);
-          const relPath = relative3(rootDir, fullPath);
+          const relPath = relative4(rootDir, fullPath);
           const segments = relPath.replace(/\.md$/, "").split(/[/\\]/);
           const name = segments.join("/");
           const displayName = segments.join(":");
@@ -22130,7 +22182,7 @@ var require_depd = __commonJS((exports, module) => {
    * Copyright(c) 2014-2018 Douglas Christopher Wilson
    * MIT Licensed
    */
-  var relative5 = __require("path").relative;
+  var relative6 = __require("path").relative;
   module.exports = depd;
   var basePath = process.cwd();
   function containsNamespace(str2, namespace) {
@@ -22326,7 +22378,7 @@ var require_depd = __commonJS((exports, module) => {
     return formatted;
   }
   function formatLocation(callSite) {
-    return relative5(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
+    return relative6(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
   }
   function getStack() {
     var limit = Error.stackTraceLimit;
@@ -26663,11 +26715,11 @@ var require_raw_body = __commonJS((exports, module) => {
     if (done) {
       return readStream(stream, encoding, length, limit, wrap2(done));
     }
-    return new Promise(function executor(resolve9, reject) {
+    return new Promise(function executor(resolve10, reject) {
       readStream(stream, encoding, length, limit, function onRead(err, buf) {
         if (err)
           return reject(err);
-        resolve9(buf);
+        resolve10(buf);
       });
     });
   }
@@ -39773,7 +39825,7 @@ var require_view = __commonJS((exports, module) => {
   var basename6 = path3.basename;
   var extname2 = path3.extname;
   var join19 = path3.join;
-  var resolve9 = path3.resolve;
+  var resolve10 = path3.resolve;
   module.exports = View;
   function View(name, options2) {
     var opts = options2 || {};
@@ -39807,7 +39859,7 @@ var require_view = __commonJS((exports, module) => {
     debug('lookup "%s"', name);
     for (var i = 0;i < roots.length && !path4; i++) {
       var root = roots[i];
-      var loc = resolve9(root, name);
+      var loc = resolve10(root, name);
       var dir = dirname7(loc);
       var file = basename6(loc);
       path4 = this.resolve(dir, file);
@@ -41991,7 +42043,7 @@ var require_application = __commonJS((exports, module) => {
   var compileETag = require_utils6().compileETag;
   var compileQueryParser = require_utils6().compileQueryParser;
   var compileTrust = require_utils6().compileTrust;
-  var resolve9 = __require("node:path").resolve;
+  var resolve10 = __require("node:path").resolve;
   var once = require_once();
   var Router = require_router();
   var slice = Array.prototype.slice;
@@ -42045,7 +42097,7 @@ var require_application = __commonJS((exports, module) => {
     this.mountpath = "/";
     this.locals.settings = this.settings;
     this.set("view", View);
-    this.set("views", resolve9("views"));
+    this.set("views", resolve10("views"));
     this.set("jsonp callback name", "callback");
     if (env2 === "production") {
       this.enable("view cache");
@@ -43536,7 +43588,7 @@ var require_send = __commonJS((exports, module) => {
   var extname2 = path3.extname;
   var join19 = path3.join;
   var normalize3 = path3.normalize;
-  var resolve9 = path3.resolve;
+  var resolve10 = path3.resolve;
   var sep5 = path3.sep;
   var BYTES_RANGE_REGEXP = /^ *bytes=/;
   var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1000;
@@ -43565,7 +43617,7 @@ var require_send = __commonJS((exports, module) => {
     this._maxage = opts.maxAge || opts.maxage;
     this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
     this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
-    this._root = opts.root ? resolve9(opts.root) : null;
+    this._root = opts.root ? resolve10(opts.root) : null;
   }
   util3.inherits(SendStream, Stream);
   SendStream.prototype.error = function error(status, err) {
@@ -43714,7 +43766,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = normalize3(path4).split(sep5);
-      path4 = resolve9(path4);
+      path4 = resolve10(path4);
     }
     if (containsDotFile(parts)) {
       debug('%s dotfile "%s"', this._dotfiles, path4);
@@ -44117,7 +44169,7 @@ var require_response = __commonJS((exports, module) => {
   var cookie = require_cookie();
   var send = require_send();
   var extname2 = path3.extname;
-  var resolve9 = path3.resolve;
+  var resolve10 = path3.resolve;
   var vary = require_vary();
   var { Buffer: Buffer2 } = __require("node:buffer");
   var res = Object.create(http.ServerResponse.prototype);
@@ -44326,7 +44378,7 @@ var require_response = __commonJS((exports, module) => {
     }
     opts = Object.create(opts);
     opts.headers = headers;
-    var fullPath = !opts.root ? resolve9(path4) : path4;
+    var fullPath = !opts.root ? resolve10(path4) : path4;
     return this.sendFile(fullPath, opts, done);
   };
   res.contentType = res.type = function contentType(type) {
@@ -44587,7 +44639,7 @@ var require_serve_static = __commonJS((exports, module) => {
   var encodeUrl = require_encodeurl();
   var escapeHtml = require_escape_html();
   var parseUrl = require_parseurl();
-  var resolve9 = __require("path").resolve;
+  var resolve10 = __require("path").resolve;
   var send = require_send();
   var url = __require("url");
   module.exports = serveStatic;
@@ -44606,7 +44658,7 @@ var require_serve_static = __commonJS((exports, module) => {
       throw new TypeError("option setHeaders must be function");
     }
     opts.maxage = opts.maxage || opts.maxAge || 0;
-    opts.root = resolve9(root);
+    opts.root = resolve10(root);
     var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
     return function serveStatic(req, res, next) {
       if (req.method !== "GET" && req.method !== "HEAD") {
@@ -44817,14 +44869,14 @@ var Locked, lockedPorts, releaseOldLockedPortsIntervalMs, timeout, getLocalHosts
     }
   }
   return results;
-}, checkAvailablePort = (options2) => new Promise((resolve9, reject) => {
+}, checkAvailablePort = (options2) => new Promise((resolve10, reject) => {
   const server = net.createServer();
   server.unref();
   server.on("error", reject);
   server.listen(options2, () => {
     const { port } = server.address();
     server.close(() => {
-      resolve9(port);
+      resolve10(port);
     });
   });
 }), getAvailablePort = async (options2, hosts) => {
@@ -45397,19 +45449,19 @@ var fallbackAttemptSymbol, __dirname2, localXdgOpenPath, platform3, arch, tryEac
   }
   const subprocess = childProcess3.spawn(command, cliArguments, childProcessOptions);
   if (options2.wait) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       subprocess.once("error", reject);
       subprocess.once("close", (exitCode) => {
         if (!options2.allowNonzeroExitCode && exitCode !== 0) {
           reject(new Error(`Exited with code ${exitCode}`));
           return;
         }
-        resolve9(subprocess);
+        resolve10(subprocess);
       });
     });
   }
   if (isFallbackAttempt) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       subprocess.once("error", reject);
       subprocess.once("spawn", () => {
         subprocess.once("close", (exitCode) => {
@@ -45419,17 +45471,17 @@ var fallbackAttemptSymbol, __dirname2, localXdgOpenPath, platform3, arch, tryEac
             return;
           }
           subprocess.unref();
-          resolve9(subprocess);
+          resolve10(subprocess);
         });
       });
     });
   }
   subprocess.unref();
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     subprocess.once("error", reject);
     subprocess.once("spawn", () => {
       subprocess.off("error", reject);
-      resolve9(subprocess);
+      resolve10(subprocess);
     });
   });
 }, open = (target, options2) => {
@@ -46782,8 +46834,11 @@ var init_config_generator = __esm(() => {
 });
 
 // src/domains/config/config-validator.ts
+function normalizeApiKeyInput(value) {
+  return value.replace(/\u200B|\u200C|\u200D|\uFEFF/g, "").trim();
+}
 function validateApiKey2(value, pattern) {
-  return pattern.test(value);
+  return pattern.test(normalizeApiKeyInput(value));
 }
 var VALIDATION_PATTERNS;
 var init_config_validator = __esm(() => {
@@ -47225,7 +47280,7 @@ class NodeFsHandler {
         this._addToNodeFs(path4, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve11, reject) => {
       if (!stream)
         return reject();
       stream.once(STR_END, () => {
@@ -47234,7 +47289,7 @@ class NodeFsHandler {
           return;
         }
         const wasThrottled = throttler ? throttler.clear() : false;
-        resolve10(undefined);
+        resolve11(undefined);
         previous.getChildren().filter((item) => {
           return item !== directory && !current.has(item);
         }).forEach((item) => {
@@ -47763,11 +47818,11 @@ function createPattern(matcher) {
       if (matcher.path === string)
         return true;
       if (matcher.recursive) {
-        const relative7 = sp2.relative(matcher.path, string);
-        if (!relative7) {
+        const relative8 = sp2.relative(matcher.path, string);
+        if (!relative8) {
           return false;
         }
-        return !relative7.startsWith("..") && !sp2.isAbsolute(relative7);
+        return !relative8.startsWith("..") && !sp2.isAbsolute(relative8);
       }
       return false;
     };
@@ -48601,7 +48656,7 @@ __export(exports_projects_registry, {
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { existsSync as existsSync13, statSync as statSync3 } from "node:fs";
 import { copyFile, mkdir as mkdir8, open as open3, readFile as readFile10, unlink as unlink5, writeFile as writeFile9 } from "node:fs/promises";
-import { basename as basename8, dirname as dirname10, resolve as resolve11 } from "node:path";
+import { basename as basename8, dirname as dirname10, resolve as resolve12 } from "node:path";
 
 class ProjectsRegistryManager {
   static registry = null;
@@ -48719,7 +48774,7 @@ class ProjectsRegistryManager {
     if (projectPath.includes("..") || projectPath.startsWith("~")) {
       throw new Error("Invalid path: path traversal patterns not allowed");
     }
-    const absolutePath = resolve11(projectPath);
+    const absolutePath = resolve12(projectPath);
     if (!existsSync13(absolutePath)) {
       throw new Error(`Path does not exist: ${absolutePath}`);
     }
@@ -48850,7 +48905,7 @@ class ProjectsRegistryManager {
     return projects;
   }
   static async isRegistered(projectPath) {
-    const absolutePath = resolve11(projectPath);
+    const absolutePath = resolve12(projectPath);
     const registry = await ProjectsRegistryManager.load();
     return registry.projects.some((p) => p.path === absolutePath);
   }
@@ -48966,7 +49021,7 @@ var init_claudekit_data2 = __esm(() => {
 import { spawn, spawnSync } from "node:child_process";
 import { existsSync as existsSync15 } from "node:fs";
 import { homedir as homedir13 } from "node:os";
-import { join as join28, resolve as resolve12, sep as sep5 } from "node:path";
+import { join as join28, resolve as resolve13, sep as sep5 } from "node:path";
 function getWindowsPaths(...relativePaths) {
   const roots = [
     WINDOWS_PATHS.localAppData,
@@ -49225,8 +49280,8 @@ function buildOsaScriptCommand(scriptLines, argv = []) {
   return { command: "osascript", args };
 }
 function isPathInsideBase(path4, base) {
-  const normalizedPath = resolve12(path4);
-  const normalizedBase = resolve12(base);
+  const normalizedPath = resolve13(path4);
+  const normalizedBase = resolve13(base);
   if (normalizedPath === normalizedBase)
     return true;
   return normalizedPath.startsWith(`${normalizedBase}${sep5}`);
@@ -49236,19 +49291,19 @@ async function isActionPathAllowed(dirPath, projectId) {
     const project = await ProjectsRegistryManager.getProject(projectId);
     if (!project)
       return false;
-    return resolve12(project.path) === dirPath;
+    return resolve13(project.path) === dirPath;
   }
   if (projectId?.startsWith("discovered-")) {
     try {
       const encodedPath = projectId.slice("discovered-".length);
-      const discoveredPath = resolve12(Buffer.from(encodedPath, "base64url").toString("utf-8"));
+      const discoveredPath = resolve13(Buffer.from(encodedPath, "base64url").toString("utf-8"));
       if (discoveredPath === dirPath && (isPathInsideBase(discoveredPath, process.cwd()) || isPathInsideBase(discoveredPath, homedir13()))) {
         return true;
       }
     } catch {}
   }
   const registeredProjects = await ProjectsRegistryManager.listProjects();
-  if (registeredProjects.some((project) => resolve12(project.path) === dirPath)) {
+  if (registeredProjects.some((project) => resolve13(project.path) === dirPath)) {
     return true;
   }
   if (isPathInsideBase(dirPath, process.cwd())) {
@@ -49498,7 +49553,7 @@ function registerActionRoutes(app) {
         return;
       }
       const { action, path: rawPath, appId, projectId } = validation.data;
-      const dirPath = resolve12(rawPath);
+      const dirPath = resolve13(rawPath);
       if (!existsSync15(dirPath)) {
         res.status(400).json({ error: "Path does not exist" });
         return;
@@ -49540,7 +49595,7 @@ function registerActionRoutes(app) {
       } else {
         commandToRun = buildLaunchCommand(dirPath);
       }
-      const spawnCwd = resolve12(commandToRun.cwd || dirPath);
+      const spawnCwd = resolve13(commandToRun.cwd || dirPath);
       if (spawnCwd !== dirPath) {
         const spawnCwdAllowed = await isActionPathAllowed(spawnCwd, typeof projectId === "string" ? projectId : undefined);
         if (!spawnCwdAllowed) {
@@ -49884,13 +49939,13 @@ var init_action_routes = __esm(() => {
 // src/domains/web-server/routes/agents-routes.ts
 import { readdir as readdir7 } from "node:fs/promises";
 import { homedir as homedir14 } from "node:os";
-import { isAbsolute as isAbsolute4, join as join29, relative as relative7 } from "node:path";
+import { isAbsolute as isAbsolute4, join as join29, relative as relative8 } from "node:path";
 function resolveAgentDirs() {
   const dirs = [];
   const projectCandidates = getProjectLayoutCandidates(process.cwd(), "agents");
   for (const candidate of projectCandidates) {
     if (candidate) {
-      const rel = relative7(process.cwd(), candidate);
+      const rel = relative8(process.cwd(), candidate);
       dirs.push({ path: candidate, label: rel });
     }
   }
@@ -49928,7 +49983,7 @@ async function scanAgentDir(dirPath, dirLabel) {
           color: frontmatter.color || null,
           skillCount: countSkills(frontmatter.tools),
           dirLabel,
-          relativePath: relative7(homedir14(), filePath)
+          relativePath: relative8(homedir14(), filePath)
         });
       } catch {}
     }
@@ -49958,7 +50013,7 @@ function registerAgentsBrowserRoutes(app) {
     const dirs = resolveAgentDirs();
     for (const dir of dirs) {
       const filePath = join29(dir.path, `${slug}.md`);
-      const rel = relative7(dir.path, filePath);
+      const rel = relative8(dir.path, filePath);
       if (rel.startsWith("..") || isAbsolute4(rel)) {
         continue;
       }
@@ -49972,7 +50027,7 @@ function registerAgentsBrowserRoutes(app) {
           color: frontmatter.color || null,
           skillCount: countSkills(frontmatter.tools),
           dirLabel: dir.label,
-          relativePath: relative7(homedir14(), filePath),
+          relativePath: relative8(homedir14(), filePath),
           frontmatter,
           body
         };
@@ -50837,7 +50892,7 @@ var init_ck_config_routes = __esm(() => {
 import { existsSync as existsSync17 } from "node:fs";
 import { readFile as readFile12, readdir as readdir8 } from "node:fs/promises";
 import { homedir as homedir15 } from "node:os";
-import { basename as basename9, isAbsolute as isAbsolute5, join as join31, relative as relative8, resolve as resolve13 } from "node:path";
+import { basename as basename9, isAbsolute as isAbsolute5, join as join31, relative as relative9, resolve as resolve14 } from "node:path";
 async function buildCommandTree(dir, baseDir) {
   let dirents;
   try {
@@ -50857,7 +50912,7 @@ async function buildCommandTree(dir, baseDir) {
     const name = entry.name;
     const isDir2 = entry.isDirectory();
     const fullPath = join31(dir, name);
-    const relPath = relative8(baseDir, fullPath);
+    const relPath = relative9(baseDir, fullPath);
     if (isDir2) {
       const children = await buildCommandTree(fullPath, baseDir);
       if (children.length > 0) {
@@ -50902,8 +50957,8 @@ function registerCommandRoutes(app) {
       return;
     }
     const commandsDir = join31(homedir15(), ".claude", "commands");
-    const safePath = resolve13(commandsDir, rawPath);
-    const rel = relative8(commandsDir, safePath);
+    const safePath = resolve14(commandsDir, rawPath);
+    const rel = relative9(commandsDir, safePath);
     if (rel.startsWith("..") || isAbsolute5(rel)) {
       res.status(403).json({ error: "Access denied" });
       return;
@@ -52023,7 +52078,7 @@ var init_hook_log_routes = __esm(() => {
 import { existsSync as existsSync22 } from "node:fs";
 import { readFile as readFile18 } from "node:fs/promises";
 import { homedir as homedir22 } from "node:os";
-import { basename as basename12, join as join40, resolve as resolve14 } from "node:path";
+import { basename as basename12, join as join40, resolve as resolve15 } from "node:path";
 function parseMcpServers(raw, source, sourceLabel) {
   const entries = [];
   for (const [name, value] of Object.entries(raw)) {
@@ -52073,7 +52128,7 @@ function isSafeProjectPath(projectPath) {
     return false;
   const home3 = homedir22();
   try {
-    const resolved = resolve14(projectPath);
+    const resolved = resolve15(projectPath);
     if (!resolved.startsWith(home3))
       return false;
     return existsSync22(resolved);
@@ -52213,23 +52268,23 @@ var init_migrate_provider_scopes = __esm(() => {
 // src/commands/migrate/skill-directory-installer.ts
 import { existsSync as existsSync23 } from "node:fs";
 import { cp, mkdir as mkdir10, readFile as readFile19, realpath as realpath6, rename as rename6, rm as rm5, writeFile as writeFile11 } from "node:fs/promises";
-import { dirname as dirname11, join as join41, resolve as resolve15 } from "node:path";
+import { dirname as dirname11, join as join41, resolve as resolve16 } from "node:path";
 async function canonicalize(path4) {
   try {
     return await realpath6(path4);
   } catch {
     const parent = dirname11(path4);
     if (parent === path4) {
-      return resolve15(path4);
+      return resolve16(path4);
     }
     try {
       const canonicalParent = await realpath6(parent);
-      const absPath = resolve15(path4);
-      const absParent = resolve15(parent);
+      const absPath = resolve16(path4);
+      const absParent = resolve16(parent);
       const basename13 = absPath.slice(absParent.length + 1) || "";
       return join41(canonicalParent, basename13);
     } catch {
-      return resolve15(path4);
+      return resolve16(path4);
     }
   }
 }
@@ -52274,7 +52329,7 @@ async function installSkillDirectories(skills, targetProviders, options2) {
     const sourceRoot = skills.length > 0 ? dirname11(skills[0].path) : null;
     const canonicalBase = existsSync23(basePath) ? await canonicalize(basePath) : null;
     const canonicalSourceRoot = sourceRoot ? await canonicalize(sourceRoot) : null;
-    const basePathIsSymlinkedToSource = canonicalBase !== null && canonicalSourceRoot !== null && canonicalBase === canonicalSourceRoot && resolve15(basePath) !== resolve15(sourceRoot ?? "");
+    const basePathIsSymlinkedToSource = canonicalBase !== null && canonicalSourceRoot !== null && canonicalBase === canonicalSourceRoot && resolve16(basePath) !== resolve16(sourceRoot ?? "");
     if (basePathIsSymlinkedToSource) {
       for (const skill of skills) {
         results.push({
@@ -52370,14 +52425,14 @@ var init_skill_directory_installer = __esm(() => {
 import { existsSync as existsSync24, readFileSync as readFileSync7 } from "node:fs";
 import { cp as cp2, mkdir as mkdir11, readFile as readFile20, readdir as readdir12, stat as stat8 } from "node:fs/promises";
 import { homedir as homedir23 } from "node:os";
-import { basename as basename13, dirname as dirname12, extname as extname3, join as join42, relative as relative9, resolve as resolve16, sep as sep6 } from "node:path";
+import { basename as basename13, dirname as dirname12, extname as extname3, join as join42, relative as relative10, resolve as resolve17, sep as sep6 } from "node:path";
 async function copyHooksCompanionDirs(sourceDir, targetDir) {
   const result = {
     copiedDirs: [],
     copiedDotfiles: [],
     errors: []
   };
-  if (resolve16(sourceDir) === resolve16(targetDir)) {
+  if (resolve17(sourceDir) === resolve17(targetDir)) {
     return result;
   }
   if (!existsSync24(sourceDir)) {
@@ -52398,8 +52453,8 @@ async function copyHooksCompanionDirs(sourceDir, targetDir) {
     });
     return result;
   }
-  const sourceParent = resolve16(sourceDir, "..");
-  const targetParent = resolve16(targetDir, "..");
+  const sourceParent = resolve17(sourceDir, "..");
+  const targetParent = resolve17(targetDir, "..");
   if (sourceParent !== targetParent) {
     for (const dotfile of HOOKS_COMPANION_DOTFILES) {
       const srcPath = join42(sourceParent, dotfile);
@@ -52428,7 +52483,7 @@ async function copyHooksCompanionDirs(sourceDir, targetDir) {
       continue;
     const srcDir = join42(sourceDir, entry.name);
     const dstDir = join42(targetDir, entry.name);
-    if (resolve16(srcDir) === resolve16(dstDir))
+    if (resolve17(srcDir) === resolve17(dstDir))
       continue;
     try {
       const s = await stat8(srcDir);
@@ -52658,7 +52713,7 @@ async function collectHookFiles(dir, baseDir = dir) {
   }
   for (const entry of entries) {
     const fullPath = join42(dir, entry.name);
-    const relPath = relative9(baseDir, fullPath).split(/[/\\]/).join("/");
+    const relPath = relative10(baseDir, fullPath).split(/[/\\]/).join("/");
     if (entry.isSymbolicLink())
       continue;
     if (entry.isDirectory()) {
@@ -52751,7 +52806,7 @@ async function discoverPortableFiles(dir, baseDir, options2) {
     const extension = extname3(entry.name).toLowerCase();
     if (!options2.includeExtensions.has(extension))
       continue;
-    const relPath = relative9(baseDir, fullPath);
+    const relPath = relative10(baseDir, fullPath);
     const normalizedPath = relPath.split(/[/\\]/).join("/");
     const name = options2.stripExtension ? normalizedPath.replace(/\.[^.]+$/, "") : normalizedPath;
     try {
@@ -54712,17 +54767,17 @@ var init_codex_capabilities = __esm(() => {
 import { existsSync as existsSync25 } from "node:fs";
 import { mkdir as mkdir12, realpath as realpath7 } from "node:fs/promises";
 import { homedir as homedir24 } from "node:os";
-import { dirname as dirname13, join as join43, resolve as resolve17, sep as sep7 } from "node:path";
+import { dirname as dirname13, join as join43, resolve as resolve18, sep as sep7 } from "node:path";
 function isPathWithinBoundary3(targetPath, boundaryPath) {
-  const resolvedTarget = resolve17(targetPath);
-  const resolvedBoundary = resolve17(boundaryPath);
+  const resolvedTarget = resolve18(targetPath);
+  const resolvedBoundary = resolve18(boundaryPath);
   return resolvedTarget === resolvedBoundary || resolvedTarget.startsWith(`${resolvedBoundary}${sep7}`);
 }
 async function resolveRealPathSafe2(path4) {
   try {
     return await realpath7(path4);
   } catch {
-    return resolve17(path4);
+    return resolve18(path4);
   }
 }
 async function isCanonicalPathWithinBoundary2(targetPath, boundaryPath) {
@@ -54731,10 +54786,10 @@ async function isCanonicalPathWithinBoundary2(targetPath, boundaryPath) {
   return isPathWithinBoundary3(canonicalTarget, canonicalBoundary);
 }
 function getCodexLockPath2(targetFilePath) {
-  return join43(dirname13(resolve17(targetFilePath)), ".config.toml.ck-codex.lock");
+  return join43(dirname13(resolve18(targetFilePath)), ".config.toml.ck-codex.lock");
 }
 async function withCodexTargetLock2(targetFilePath, operation) {
-  const resolvedTargetPath = resolve17(targetFilePath);
+  const resolvedTargetPath = resolve18(targetFilePath);
   const dir = dirname13(resolvedTargetPath);
   if (!existsSync25(dir)) {
     await mkdir12(dir, { recursive: true });
@@ -54768,10 +54823,10 @@ var init_codex_path_safety = __esm(() => {
 // src/commands/portable/codex-features-flag.ts
 import { existsSync as existsSync26 } from "node:fs";
 import { readFile as readFile21, rename as rename7, unlink as unlink6, writeFile as writeFile12 } from "node:fs/promises";
-import { dirname as dirname14, resolve as resolve18 } from "node:path";
+import { dirname as dirname14, resolve as resolve19 } from "node:path";
 async function ensureCodexHooksFeatureFlag(configTomlPath, isGlobal = false) {
-  const boundary = isGlobal ? getCodexGlobalBoundary() : dirname14(resolve18(configTomlPath));
-  if (!await isCanonicalPathWithinBoundary2(dirname14(resolve18(configTomlPath)), boundary)) {
+  const boundary = isGlobal ? getCodexGlobalBoundary() : dirname14(resolve19(configTomlPath));
+  if (!await isCanonicalPathWithinBoundary2(dirname14(resolve19(configTomlPath)), boundary)) {
     return {
       status: "failed",
       configPath: configTomlPath,
@@ -54935,18 +54990,18 @@ ${SENTINEL_END2}`;
 });
 
 // src/commands/portable/codex-hook-wrapper.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import { mkdirSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { dirname as dirname15, join as join44, resolve as resolve19 } from "node:path";
+import { dirname as dirname15, join as join44, resolve as resolve20 } from "node:path";
 function wrapperFilename(originalPath) {
-  const abs = resolve19(originalPath);
-  const hash = createHash5("sha256").update(abs).digest("hex").slice(0, 8);
+  const abs = resolve20(originalPath);
+  const hash = createHash6("sha256").update(abs).digest("hex").slice(0, 8);
   const base = abs.split(/[\\/]/).pop() ?? "hook.cjs";
   return `${hash}-${base}`;
 }
 function generateCodexHookWrappers(originalPaths, wrapperDir, capabilities, timeoutsByPath) {
   const results = [];
-  const resolvedWrapperDir = resolve19(wrapperDir);
+  const resolvedWrapperDir = resolve20(wrapperDir);
   for (const originalPath of originalPaths) {
     const filename = wrapperFilename(originalPath);
     const wrapperPath = join44(resolvedWrapperDir, filename);
@@ -54961,7 +55016,7 @@ function generateCodexHookWrappers(originalPaths, wrapperDir, capabilities, time
     }
     try {
       mkdirSync(dirname15(wrapperPath), { recursive: true });
-      const resolvedPath = resolve19(originalPath);
+      const resolvedPath = resolve20(originalPath);
       const hookTimeoutMs = timeoutsByPath?.[resolvedPath] ?? timeoutsByPath?.[originalPath];
       const content = buildWrapperScript(originalPath, capabilities, hookTimeoutMs);
       writeFileSync2(wrapperPath, content, { mode: 493 });
@@ -55366,7 +55421,7 @@ var init_gemini_hook_event_map = __esm(() => {
 import { existsSync as existsSync27, readFileSync as readFileSync8 } from "node:fs";
 import { mkdir as mkdir13, readFile as readFile22, rename as rename8, rm as rm6, writeFile as writeFile13 } from "node:fs/promises";
 import { homedir as homedir26 } from "node:os";
-import { basename as basename14, dirname as dirname16, extname as extname4, isAbsolute as isAbsolute6, join as join45, resolve as resolve20 } from "node:path";
+import { basename as basename14, dirname as dirname16, extname as extname4, isAbsolute as isAbsolute6, join as join45, resolve as resolve21 } from "node:path";
 function resolveSettingsPath(pathValue, isGlobal) {
   if (isGlobal || isAbsolute6(pathValue))
     return pathValue;
@@ -55988,7 +56043,7 @@ async function migrateHooksSettingsForCodex(options2) {
           addKey(`./${join45(targetHooksDir, base)}`);
         }
         for (const commandSourceHooksDir of sourceHookCommandDirs) {
-          const sourceAbs = join45(resolve20(commandSourceHooksDir), base);
+          const sourceAbs = join45(resolve21(commandSourceHooksDir), base);
           addKey(sourceAbs);
           addKey(join45(commandSourceHooksDir, base));
           addKey(`./${join45(commandSourceHooksDir, base)}`);
@@ -56152,7 +56207,7 @@ var init_generated_context_hooks = __esm(() => {
 // src/commands/portable/migrated-hook-settings-cleanup.ts
 import { existsSync as existsSync28, realpathSync } from "node:fs";
 import { readFile as readFile23, rename as rename9, rm as rm7, unlink as unlink7, writeFile as writeFile14 } from "node:fs/promises";
-import { basename as basename16, isAbsolute as isAbsolute7, relative as relative10, resolve as resolve21 } from "node:path";
+import { basename as basename16, isAbsolute as isAbsolute7, relative as relative11, resolve as resolve22 } from "node:path";
 async function pruneSettingsHooks(settingsPath, hooksDir) {
   const filesToRemove = new Set;
   const warnings = [];
@@ -56236,9 +56291,9 @@ function hookFilesFromCommand(command, hooksDir) {
     if (!name || !isGeneratedContextHookName(name))
       continue;
     if (isAbsolute7(cleaned) && isPathWithin(cleaned, hooksDir))
-      files.add(resolve21(cleaned));
+      files.add(resolve22(cleaned));
     else if (referencesHooksDir(cleaned, hooksDir) || cleaned.includes(".claude/hooks/")) {
-      files.add(resolve21(hooksDir, name));
+      files.add(resolve22(hooksDir, name));
     }
   }
   return Array.from(files);
@@ -56249,14 +56304,14 @@ function referencesHooksDir(command, hooksDir) {
   return normalized.includes(normalizedDir) || normalized.includes(".claude/hooks/") || normalized.includes(".codex/hooks/") || normalized.includes(".gemini/hooks/") || normalized.includes(".factory/hooks/");
 }
 function isPathWithin(filePath, parentDir) {
-  const rel = relative10(resolvePathForContainment(parentDir), resolvePathForContainment(filePath));
+  const rel = relative11(resolvePathForContainment(parentDir), resolvePathForContainment(filePath));
   return rel === "" || !!rel && !rel.startsWith("..") && !isAbsolute7(rel);
 }
 function resolvePathForContainment(pathValue) {
   try {
     return realpathSync.native(pathValue);
   } catch {
-    return resolve21(pathValue);
+    return resolve22(pathValue);
   }
 }
 async function atomicWrite2(filePath, content) {
@@ -56283,7 +56338,7 @@ __export(exports_migrated_hooks_cleanup, {
   isGeneratedContextHookName: () => isGeneratedContextHookName,
   cleanupMigratedHooksForProviders: () => cleanupMigratedHooksForProviders
 });
-import { isAbsolute as isAbsolute8, resolve as resolve22 } from "node:path";
+import { isAbsolute as isAbsolute8, resolve as resolve23 } from "node:path";
 async function cleanupMigratedHooksForProviders(providerIds, options2) {
   const uniqueProviders = Array.from(new Set(providerIds));
   const results = [];
@@ -56337,7 +56392,7 @@ async function cleanupMigratedHooksForProvider(provider, options2) {
 function resolveProviderPath(pathValue) {
   if (!pathValue)
     return null;
-  return isAbsolute8(pathValue) ? pathValue : resolve22(process.cwd(), pathValue);
+  return isAbsolute8(pathValue) ? pathValue : resolve23(process.cwd(), pathValue);
 }
 var init_migrated_hooks_cleanup = __esm(() => {
   init_generated_context_hooks();
@@ -56702,7 +56757,7 @@ function normalizePortablePath(value) {
     return "";
   return normalized.replace(/^\.\/+/, "");
 }
-function isAbsoluteLike(value) {
+function isAbsoluteLike2(value) {
   return path5.isAbsolute(value) || /^[a-zA-Z]:[\\/]/.test(value) || /^\\\\/.test(value);
 }
 function hasDotDotSegment(value) {
@@ -57259,7 +57314,7 @@ function detectRenames(input) {
   const actions = [];
   const activeProviderConfigs = dedupeProviderConfigs(input.providerConfigs);
   for (const rename10 of applicable) {
-    if (hasDotDotSegment(rename10.from) || hasDotDotSegment(rename10.to) || isAbsoluteLike(rename10.from) || isAbsoluteLike(rename10.to)) {
+    if (hasDotDotSegment(rename10.from) || hasDotDotSegment(rename10.to) || isAbsoluteLike2(rename10.from) || isAbsoluteLike2(rename10.to)) {
       console.warn(`[!] Skipping suspicious manifest rename: ${rename10.from} -> ${rename10.to}`);
       continue;
     }
@@ -57777,7 +57832,7 @@ var init_migration_result_utils = __esm(() => {
 import { existsSync as existsSync31 } from "node:fs";
 import { readFile as readFile27, rm as rm8 } from "node:fs/promises";
 import { homedir as homedir28 } from "node:os";
-import { basename as basename17, join as join47, resolve as resolve23 } from "node:path";
+import { basename as basename17, join as join47, resolve as resolve24 } from "node:path";
 function resolveRegistryDeps(deps) {
   return {
     ...defaultRegistryDeps,
@@ -57933,8 +57988,8 @@ function parseConfigSource(input) {
   if (!trimmed) {
     return { ok: true, value: undefined };
   }
-  const projectSourcePath = resolve23(process.cwd(), "CLAUDE.md");
-  const globalSourcePath = resolve23(getGlobalConfigSourcePath());
+  const projectSourcePath = resolve24(process.cwd(), "CLAUDE.md");
+  const globalSourcePath = resolve24(getGlobalConfigSourcePath());
   const sourceMap = {
     default: undefined,
     global: globalSourcePath,
@@ -57945,7 +58000,7 @@ function parseConfigSource(input) {
   if (normalizedKey in sourceMap) {
     return { ok: true, value: sourceMap[normalizedKey] };
   }
-  const resolved = resolve23(trimmed);
+  const resolved = resolve24(trimmed);
   if (resolved === globalSourcePath || resolved === projectSourcePath) {
     return { ok: true, value: resolved };
   }
@@ -58013,7 +58068,7 @@ function shouldExecuteAction(action) {
 }
 async function executePlanDeleteAction(action, options2) {
   const preservePaths = options2?.preservePaths ?? new Set;
-  const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve23(action.targetPath));
+  const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve24(action.targetPath));
   try {
     if (!shouldPreserveTarget && action.targetPath && existsSync31(action.targetPath)) {
       await rm8(action.targetPath, { recursive: true, force: true });
@@ -58038,7 +58093,7 @@ async function executePlanDeleteAction(action, options2) {
   }
 }
 function hasSuccessfulReplacementWriteForDelete(action, results) {
-  return results.some((result) => result.success && !result.skipped && result.provider === action.provider && replacementTypeMatchesForDelete(action.type, result.portableType) && replacementItemMatchesForDelete(action, result) && result.path.length > 0 && resolve23(result.path) !== resolve23(action.targetPath));
+  return results.some((result) => result.success && !result.skipped && result.provider === action.provider && replacementTypeMatchesForDelete(action.type, result.portableType) && replacementItemMatchesForDelete(action, result) && result.path.length > 0 && resolve24(result.path) !== resolve24(action.targetPath));
 }
 function replacementTypeMatchesForDelete(actionType, resultType) {
   return resultType === actionType || actionType === "command" && resultType === "skill";
@@ -58986,7 +59041,7 @@ function registerMigrationRoutes(app, deps) {
               successfulHookFiles2.set(provider, entry);
               if (result.path.length > 0) {
                 const absEntry = successfulHookAbsPaths2.get(provider) ?? [];
-                absEntry.push(resolve23(result.path));
+                absEntry.push(resolve24(result.path));
                 successfulHookAbsPaths2.set(provider, absEntry);
               }
             }
@@ -59035,7 +59090,7 @@ function registerMigrationRoutes(app, deps) {
             }
           }
         }
-        const writtenPaths = new Set(allResults.filter((r2) => r2.success && !r2.skipped && r2.path.length > 0).map((r2) => resolve23(r2.path)));
+        const writtenPaths = new Set(allResults.filter((r2) => r2.success && !r2.skipped && r2.path.length > 0).map((r2) => resolve24(r2.path)));
         for (const deleteAction of deleteActions) {
           if (!shouldRunPlanDeleteAction(deleteAction, allResults)) {
             const skippedDelete = createSkippedPathMigrationCleanupResult({
@@ -59084,7 +59139,7 @@ function registerMigrationRoutes(app, deps) {
           const agentSrc = getAgentSourcePath();
           const cmdSrc = getCommandSourcePath();
           const skillSrc = getSkillSourcePath();
-          const kitRoot = (agentSrc ? resolve23(agentSrc, "..") : null) ?? (cmdSrc ? resolve23(cmdSrc, "..") : null) ?? (skillSrc ? resolve23(skillSrc, "..") : null) ?? null;
+          const kitRoot = (agentSrc ? resolve24(agentSrc, "..") : null) ?? (cmdSrc ? resolve24(cmdSrc, "..") : null) ?? (skillSrc ? resolve24(skillSrc, "..") : null) ?? null;
           const manifest = kitRoot ? await loadPortableManifest(kitRoot) : null;
           if (manifest?.cliVersion) {
             await registryDeps.updateAppliedManifestVersion(manifest.cliVersion);
@@ -59241,7 +59296,7 @@ function registerMigrationRoutes(app, deps) {
               successfulHookFiles.set(result.provider, existing);
               if (result.path.length > 0) {
                 const absExisting = successfulHookAbsPaths.get(result.provider) ?? [];
-                absExisting.push(resolve23(result.path));
+                absExisting.push(resolve24(result.path));
                 successfulHookAbsPaths.set(result.provider, absExisting);
               }
             }
@@ -59504,7 +59559,7 @@ var init_plan_metadata = __esm(() => {
 
 // src/domains/plan-parser/plan-table-parser.ts
 import { readFileSync as readFileSync10 } from "node:fs";
-import { dirname as dirname18, resolve as resolve24 } from "node:path";
+import { dirname as dirname18, resolve as resolve25 } from "node:path";
 function normalizeStatus(raw) {
   const s = raw.toLowerCase().trim();
   if (s.includes("complete") || s.includes("done") || s.includes("✓") || s.includes("✅")) {
@@ -59587,7 +59642,7 @@ function parseHeaderAwareTable(content, dir, options2) {
         hasLinks = true;
         linkText = linkMatch[1].trim();
         name = filenameToTitle(linkText);
-        file = resolve24(dir, linkMatch[2]);
+        file = resolve25(dir, linkMatch[2]);
       } else {
         name = nameRaw.replace(/\[.*?\]\(.*?\)/g, "").trim() || `Phase ${phaseId}`;
         linkText = name;
@@ -59627,7 +59682,7 @@ function parseFormat1(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: linkText.trim(),
       anchor
     });
@@ -59647,7 +59702,7 @@ function parseFormat2(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText,
       anchor
     });
@@ -59666,7 +59721,7 @@ function parseFormat2b(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: name.trim(),
       anchor
     });
@@ -59765,7 +59820,7 @@ function parseFormat4(content, planFilePath, options2) {
       current = { name, status: hasCheck ? "completed" : "pending" };
     } else if (fileMatch && current) {
       const planDir = dirname18(planFilePath);
-      current.file = resolve24(planDir, fileMatch[1].trim());
+      current.file = resolve25(planDir, fileMatch[1].trim());
     } else if (statusMatch && current) {
       current.status = normalizeStatus(statusMatch[2]);
     }
@@ -59831,7 +59886,7 @@ function parseFormat6(content, dir, options2) {
       phaseId,
       name: phaseName,
       status: checked.toLowerCase() === "x" ? "completed" : "pending",
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: phaseName,
       anchor
     });
@@ -59885,7 +59940,7 @@ var init_plan_table_parser = __esm(() => {
 // src/domains/plan-parser/activity-tracker.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
 import { readdirSync as readdirSync5, statSync as statSync8 } from "node:fs";
-import { join as join48, relative as relative11 } from "node:path";
+import { join as join48, relative as relative12 } from "node:path";
 function startOfDay(date) {
   const copy2 = new Date(date);
   copy2.setHours(0, 0, 0, 0);
@@ -59943,7 +59998,7 @@ function getMtimeSamples(dir, samples) {
     if (!sample)
       continue;
     sample.fileModCount += 1;
-    sample.files.add(relative11(process.cwd(), file));
+    sample.files.add(relative12(process.cwd(), file));
   }
 }
 function computeLevel(value, max) {
@@ -60016,13 +60071,13 @@ var init_plan_scanner = () => {};
 
 // src/domains/plan-parser/plan-scope.ts
 import { homedir as homedir29 } from "node:os";
-import { isAbsolute as isAbsolute9, join as join50, relative as relative12, resolve as resolve25 } from "node:path";
+import { isAbsolute as isAbsolute9, join as join50, relative as relative13, resolve as resolve26 } from "node:path";
 function resolveConfiguredDir(configuredPath, baseDir) {
   const trimmed = configuredPath?.trim();
   if (!trimmed) {
     return join50(baseDir, DEFAULT_PLANS_DIRNAME);
   }
-  return isAbsolute9(trimmed) ? resolve25(trimmed) : resolve25(baseDir, trimmed);
+  return isAbsolute9(trimmed) ? resolve26(trimmed) : resolve26(baseDir, trimmed);
 }
 function resolveProjectPlansDir(projectRoot, config) {
   return resolveConfiguredDir(config?.paths?.plans, projectRoot);
@@ -60034,9 +60089,9 @@ function resolvePlanDirForScope(scope, projectRoot, config) {
   return scope === "global" ? resolveGlobalPlansDir(config) : resolveProjectPlansDir(projectRoot, config);
 }
 function isWithinDir(targetPath, baseDir) {
-  const resolvedTarget = resolve25(targetPath);
-  const resolvedBase = resolve25(baseDir);
-  const relativePath = relative12(resolvedBase, resolvedTarget);
+  const resolvedTarget = resolve26(targetPath);
+  const resolvedBase = resolve26(baseDir);
+  const relativePath = relative13(resolvedBase, resolvedTarget);
   return relativePath === "" || !relativePath.startsWith("..") && relativePath !== ".." && !isAbsolute9(relativePath);
 }
 function inferPlanScopeForDir(planDir, config) {
@@ -60827,7 +60882,7 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync4
 } from "node:fs";
-import { dirname as dirname22, isAbsolute as isAbsolute10, join as join53, parse as parse2, relative as relative13, resolve as resolve26 } from "node:path";
+import { dirname as dirname22, isAbsolute as isAbsolute10, join as join53, parse as parse2, relative as relative14, resolve as resolve27 } from "node:path";
 function createEmptyRegistry() {
   return {
     version: 1,
@@ -60882,8 +60937,8 @@ function migrateFromProjectLocal(cwd2, globalPath) {
   }
 }
 function normalizeRegistryDir(cwd2, dir) {
-  const absoluteDir = isAbsolute10(dir) ? dir : resolve26(cwd2, dir);
-  const relativeDir = relative13(cwd2, absoluteDir) || dir;
+  const absoluteDir = isAbsolute10(dir) ? dir : resolve27(cwd2, dir);
+  const relativeDir = relative14(cwd2, absoluteDir) || dir;
   return relativeDir.replace(/\\/g, "/");
 }
 function findProjectRoot(startDir) {
@@ -61237,24 +61292,24 @@ function pLimit(concurrency) {
     activeCount--;
     resumeNext();
   };
-  const run = async (function_, resolve27, arguments_) => {
+  const run = async (function_, resolve28, arguments_) => {
     const result = (async () => function_(...arguments_))();
-    resolve27(result);
+    resolve28(result);
     try {
       await result;
     } catch {}
     next();
   };
-  const enqueue = (function_, resolve27, arguments_) => {
+  const enqueue = (function_, resolve28, arguments_) => {
     new Promise((internalResolve) => {
       queue.enqueue(internalResolve);
-    }).then(run.bind(undefined, function_, resolve27, arguments_));
+    }).then(run.bind(undefined, function_, resolve28, arguments_));
     if (activeCount < concurrency) {
       resumeNext();
     }
   };
-  const generator = (function_, ...arguments_) => new Promise((resolve27) => {
-    enqueue(function_, resolve27, arguments_);
+  const generator = (function_, ...arguments_) => new Promise((resolve28) => {
+    enqueue(function_, resolve28, arguments_);
   });
   Object.defineProperties(generator, {
     activeCount: {
@@ -61301,7 +61356,7 @@ var init_p_limit = __esm(() => {
 // src/domains/web-server/routes/plan-routes.ts
 import { existsSync as existsSync37, readFileSync as readFileSync14, realpathSync as realpathSync2 } from "node:fs";
 import { homedir as homedir30 } from "node:os";
-import { basename as basename20, dirname as dirname24, join as join55, relative as relative14, resolve as resolve27, sep as sep8 } from "node:path";
+import { basename as basename20, dirname as dirname24, join as join55, relative as relative15, resolve as resolve28, sep as sep8 } from "node:path";
 function sanitizeError(err) {
   if (err instanceof Error) {
     if (/^(ENOENT|EACCES|EPERM|EISDIR)/.test(err.message))
@@ -61316,8 +61371,8 @@ function hasBasePrefix(targetPath, baseDir) {
   return targetPath === baseDir || targetPath.startsWith(basePrefix);
 }
 function isWithinBase(targetPath, baseDir) {
-  const resolvedTarget = resolve27(targetPath);
-  const resolvedBase = resolve27(baseDir);
+  const resolvedTarget = resolve28(targetPath);
+  const resolvedBase = resolve28(baseDir);
   const logicalMatch = hasBasePrefix(resolvedTarget, resolvedBase);
   if (existsSync37(resolvedTarget)) {
     try {
@@ -61401,7 +61456,7 @@ async function getAllowedRoots(projectId) {
     roots.push(projectPlansDir);
     roots.push(getGlobalPlanRoot());
   } catch {}
-  return Array.from(new Set(roots.map((root) => resolve27(root))));
+  return Array.from(new Set(roots.map((root) => resolve28(root))));
 }
 async function isWithinAllowedRoots(targetPath, projectId) {
   const allowedRoots = await getAllowedRoots(projectId);
@@ -61423,7 +61478,7 @@ async function getSafePath(value, kind, res, projectId) {
     return null;
   }
   try {
-    return realpathSync2(resolve27(value));
+    return realpathSync2(resolve28(value));
   } catch {
     res.status(403).json({ error: "Cannot resolve path" });
     return null;
@@ -61436,7 +61491,7 @@ function getPlanFilePath(value, res, projectId) {
   return getSafePath(value, "file", res, projectId);
 }
 function toProjectPathKey(projectPath) {
-  const resolvedPath = resolve27(projectPath);
+  const resolvedPath = resolve28(projectPath);
   if (!existsSync37(resolvedPath)) {
     return resolvedPath;
   }
@@ -61451,13 +61506,13 @@ function createDiscoveredProjectId(projectPath) {
 }
 function toProjectPlanListItem(summary, plansDir) {
   return {
-    file: relative14(plansDir, summary.planFile),
+    file: relative15(plansDir, summary.planFile),
     name: basename20(dirname24(summary.planFile)),
     slug: basename20(dirname24(summary.planFile)),
     summary: {
       ...summary,
-      planDir: relative14(plansDir, summary.planDir),
-      planFile: relative14(plansDir, summary.planFile)
+      planDir: relative15(plansDir, summary.planDir),
+      planFile: relative15(plansDir, summary.planFile)
     }
   };
 }
@@ -61507,7 +61562,7 @@ function registerPlanRoutes(app) {
       return;
     try {
       const { frontmatter, phases } = parsePlanFile(file);
-      res.json({ file: relative14(process.cwd(), file), frontmatter, phases });
+      res.json({ file: relative15(process.cwd(), file), frontmatter, phases });
     } catch (err) {
       res.status(500).json({ error: sanitizeError(err) });
     }
@@ -61534,17 +61589,17 @@ function registerPlanRoutes(app) {
       const entries = (await Promise.all(scanPlanDir(dir).map(async (planFile) => await isWithinAllowedRoots(planFile, projectId) ? planFile : null))).filter((planFile) => planFile !== null);
       const summaries = buildPlanSummaries(entries.slice(offset, offset + limit));
       const plans = summaries.map((summary) => ({
-        file: relative14(process.cwd(), summary.planFile),
+        file: relative15(process.cwd(), summary.planFile),
         name: basename20(dirname24(summary.planFile)),
         slug: basename20(dirname24(summary.planFile)),
         summary: {
           ...summary,
-          planDir: relative14(process.cwd(), summary.planDir),
-          planFile: relative14(process.cwd(), summary.planFile)
+          planDir: relative15(process.cwd(), summary.planDir),
+          planFile: relative15(process.cwd(), summary.planFile)
         }
       }));
       res.json({
-        dir: relative14(process.cwd(), dir),
+        dir: relative15(process.cwd(), dir),
         total: entries.length,
         limit,
         offset,
@@ -61560,7 +61615,7 @@ function registerPlanRoutes(app) {
       const seenProjectKeys = new Set;
       const scanTargets = [];
       for (const project of await ProjectsRegistryManager.listProjects()) {
-        if (!existsSync37(resolve27(project.path)))
+        if (!existsSync37(resolve28(project.path)))
           continue;
         const projectKey = toProjectPathKey(project.path);
         if (projectKey === globalProjectKey || seenProjectKeys.has(projectKey))
@@ -61583,7 +61638,7 @@ function registerPlanRoutes(app) {
           path: project.path
         });
       }
-      const currentPath = resolve27(process.cwd());
+      const currentPath = resolve28(process.cwd());
       const currentProjectKey = toProjectPathKey(currentPath);
       if (isCurrentProjectFallbackCandidate(currentPath, globalProjectKey) && !seenProjectKeys.has(currentProjectKey)) {
         scanTargets.push({
@@ -61672,7 +61727,7 @@ function registerPlanRoutes(app) {
     const file = await getPlanFilePath(String(req.query.file ?? ""), res, projectId);
     if (!file)
       return;
-    const dir = req.query.dir ? resolve27(String(req.query.dir)) : null;
+    const dir = req.query.dir ? resolve28(String(req.query.dir)) : null;
     if (dir && (!await isWithinAllowedRoots(dir, projectId) || !isWithinBase(file, dir))) {
       res.status(403).json({ error: "File must stay within the selected plan directory" });
       return;
@@ -61681,7 +61736,7 @@ function registerPlanRoutes(app) {
       const raw = readFileSync14(file, "utf8");
       const parsed = import_gray_matter10.default(raw);
       res.json({
-        file: relative14(process.cwd(), file),
+        file: relative15(process.cwd(), file),
         frontmatter: parsed.data,
         content: parsed.content,
         raw
@@ -61804,7 +61859,7 @@ var init_project_plan_data = __esm(() => {
 import { existsSync as existsSync38 } from "node:fs";
 import { readFile as readFile28 } from "node:fs/promises";
 import { homedir as homedir31 } from "node:os";
-import { basename as basename21, join as join56, resolve as resolve28 } from "node:path";
+import { basename as basename21, join as join56, resolve as resolve29 } from "node:path";
 function registerProjectRoutes(app) {
   app.get("/api/projects", async (req, res) => {
     try {
@@ -61916,7 +61971,7 @@ function registerProjectRoutes(app) {
       } else if (projectPath.startsWith("~\\")) {
         projectPath = join56(homedir31(), projectPath.slice(1));
       }
-      projectPath = resolve28(projectPath);
+      projectPath = resolve29(projectPath);
       const homeDir = homedir31();
       if (projectPath.includes("..") || !projectPath.startsWith(homeDir)) {
         res.status(400).json({ error: "Invalid path after expansion" });
@@ -62622,7 +62677,7 @@ var init_settings_routes = __esm(() => {
 // src/domains/skills/skill-catalog-generator.ts
 import { mkdir as mkdir14, readFile as readFile30, readdir as readdir15, rename as rename10, stat as stat11, writeFile as writeFile15 } from "node:fs/promises";
 import { homedir as homedir34 } from "node:os";
-import { dirname as dirname25, join as join58, relative as relative15 } from "node:path";
+import { dirname as dirname25, join as join58, relative as relative16 } from "node:path";
 async function hasScripts(skillPath) {
   try {
     const entries = await readdir15(skillPath, { withFileTypes: true });
@@ -62658,7 +62713,7 @@ async function hasReferences(skillPath) {
 class SkillCatalogGenerator {
   async generate(enrichedSkills, basePath) {
     const entries = await Promise.all(enrichedSkills.map(async (skill) => {
-      const relPath = relative15(basePath, join58(skill.path, "SKILL.md"));
+      const relPath = relative16(basePath, join58(skill.path, "SKILL.md"));
       const [scripts, refs] = await Promise.all([
         hasScripts(skill.path),
         hasReferences(skill.path)
@@ -63421,10 +63476,10 @@ var init_skills_registry = __esm(() => {
 import { existsSync as existsSync42 } from "node:fs";
 import { cp as cp3, mkdir as mkdir16, readFile as readFile33, rm as rm9, stat as stat12, writeFile as writeFile17 } from "node:fs/promises";
 import { homedir as homedir38 } from "node:os";
-import { dirname as dirname27, join as join62, resolve as resolve30 } from "node:path";
+import { dirname as dirname27, join as join62, resolve as resolve31 } from "node:path";
 function isSamePath2(path1, path22) {
   try {
-    return resolve30(path1) === resolve30(path22);
+    return resolve31(path1) === resolve31(path22);
   } catch {
     return false;
   }
@@ -63577,10 +63632,10 @@ var init_skills_installer = __esm(() => {
 // src/commands/skills/skills-uninstaller.ts
 import { existsSync as existsSync43 } from "node:fs";
 import { rm as rm10 } from "node:fs/promises";
-import { join as join63, resolve as resolve31 } from "node:path";
+import { join as join63, resolve as resolve32 } from "node:path";
 function isSamePath3(path1, path22) {
   try {
-    return resolve31(path1) === resolve31(path22);
+    return resolve32(path1) === resolve32(path22);
   } catch {
     return false;
   }
@@ -64518,7 +64573,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.5.0-dev.7",
+    version: "4.5.0-dev.8",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -65020,7 +65075,7 @@ var init_package_manager_runner = __esm(() => {
 // src/domains/installation/merger/zombie-wirings-pruner.ts
 import { existsSync as existsSync45, readdirSync as readdirSync8 } from "node:fs";
 import { homedir as homedir39 } from "node:os";
-import { basename as basename23, dirname as dirname28, isAbsolute as isAbsolute11, resolve as resolve32, sep as sep10 } from "node:path";
+import { basename as basename23, dirname as dirname28, isAbsolute as isAbsolute11, resolve as resolve33, sep as sep10 } from "node:path";
 function pruneZombieEngineerWirings(settings, hookDir, preserveCommands = new Set) {
   const pruned = [];
   const normalizedPreserveCommands = new Set(Array.from(preserveCommands).map((command) => normalizeCommand(command)));
@@ -65118,7 +65173,7 @@ function extractHookFilePath(command, hookDir) {
     const bashMatch = command.match(/^bash\s+["']([^"']+\.sh)["']/);
     if (bashMatch) {
       const rawPath = bashMatch[1].replace(/\\/g, "/");
-      const resolved = isAbsolute11(rawPath) || /^[A-Za-z]:[\\/]/.test(rawPath) ? rawPath : resolve32(hookDir, rawPath);
+      const resolved = isAbsolute11(rawPath) || /^[A-Za-z]:[\\/]/.test(rawPath) ? rawPath : resolve33(hookDir, rawPath);
       return process.platform === "win32" ? resolved.replace(/\//g, sep10) : resolved;
     }
     return null;
@@ -65143,7 +65198,7 @@ function extractHookFilePath(command, hookDir) {
     if (isAbsolute11(tildeResolved) || /^[A-Za-z]:[\\/]/.test(tildeResolved)) {
       return process.platform === "win32" ? tildeResolved.replace(/\//g, sep10) : tildeResolved;
     }
-    return resolve32(hookDir, tildeResolved);
+    return resolve33(hookDir, tildeResolved);
   }
   const unquotedMatch = command.match(/(?:^|\s)node\s+(\S+\.(?:cjs|sh|mjs|js))/);
   if (unquotedMatch) {
@@ -65157,7 +65212,7 @@ function extractHookFilePath(command, hookDir) {
     if (isAbsolute11(tildeResolved) || /^[A-Za-z]:[\\/]/.test(tildeResolved)) {
       return process.platform === "win32" ? tildeResolved.replace(/\//g, sep10) : tildeResolved;
     }
-    return resolve32(hookDir, tildeResolved);
+    return resolve33(hookDir, tildeResolved);
   }
   return null;
 }
@@ -65180,7 +65235,7 @@ import { spawnSync as spawnSync3 } from "node:child_process";
 import { existsSync as existsSync46, readFileSync as readFileSync15, readdirSync as readdirSync9, statSync as statSync10, writeFileSync as writeFileSync5 } from "node:fs";
 import { readdir as readdir17 } from "node:fs/promises";
 import { homedir as homedir40, tmpdir } from "node:os";
-import { dirname as dirname29, join as join65, resolve as resolve33, sep as sep11 } from "node:path";
+import { dirname as dirname29, join as join65, resolve as resolve34, sep as sep11 } from "node:path";
 function resolveDoctorCkExecutable(platformName = process.platform) {
   return platformName === "win32" ? "ck.cmd" : "ck";
 }
@@ -65196,8 +65251,8 @@ function parseDoctorCliVersionOutput(output2) {
   return bareMatch?.[1] ?? null;
 }
 function getHooksDir(projectDir) {
-  const projectHooksDir = resolve33(projectDir, ".claude", "hooks");
-  const globalHooksDir = resolve33(PathResolver.getGlobalKitDir(), "hooks");
+  const projectHooksDir = resolve34(projectDir, ".claude", "hooks");
+  const globalHooksDir = resolve34(PathResolver.getGlobalKitDir(), "hooks");
   if (existsSync46(projectHooksDir))
     return projectHooksDir;
   if (existsSync46(globalHooksDir))
@@ -65205,7 +65260,7 @@ function getHooksDir(projectDir) {
   return null;
 }
 function isPathWithin2(filePath, parentDir) {
-  return resolve33(filePath).startsWith(resolve33(parentDir));
+  return resolve34(filePath).startsWith(resolve34(parentDir));
 }
 function getCanonicalGlobalCommandRoot() {
   const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
@@ -65231,23 +65286,23 @@ function getClaudeSettingsFiles(projectDir) {
   const ccsSettingsDir = join65(process.env.CK_TEST_HOME ?? homedir40(), ".ccs");
   const candidates = [
     {
-      path: resolve33(projectDir, ".claude", "settings.json"),
+      path: resolve34(projectDir, ".claude", "settings.json"),
       label: "project settings.json",
       root: "$CLAUDE_PROJECT_DIR"
     },
     {
-      path: resolve33(projectDir, ".claude", "settings.local.json"),
+      path: resolve34(projectDir, ".claude", "settings.local.json"),
       label: "project settings.local.json",
       root: "$CLAUDE_PROJECT_DIR"
     },
     {
-      path: resolve33(globalClaudeDir, "settings.json"),
+      path: resolve34(globalClaudeDir, "settings.json"),
       label: "global settings.json",
       root: getCanonicalGlobalCommandRoot(),
       managedHookNames: globalManagedHookNames
     },
     {
-      path: resolve33(globalClaudeDir, "settings.local.json"),
+      path: resolve34(globalClaudeDir, "settings.local.json"),
       label: "global settings.local.json",
       root: getCanonicalGlobalCommandRoot(),
       managedHookNames: globalManagedHookNames
@@ -65258,7 +65313,7 @@ function getClaudeSettingsFiles(projectDir) {
       if (!dirent.isFile() || !dirent.name.endsWith(".settings.json"))
         continue;
       candidates.push({
-        path: resolve33(ccsSettingsDir, dirent.name),
+        path: resolve34(ccsSettingsDir, dirent.name),
         label: `.ccs/${dirent.name}`,
         root: "$HOME"
       });
@@ -65988,7 +66043,7 @@ function resolveHookScriptPath(scriptPath, projectDir) {
   if (resolved.startsWith(".claude/") || resolved === ".claude") {
     resolved = join65(projectDir, resolved);
   }
-  return resolve33(resolved);
+  return resolve34(resolved);
 }
 function collectMissingHookReferences(settings, settingsFile, projectDir) {
   const findings = [];
@@ -66183,10 +66238,10 @@ async function countMissingHookFileReferences(projectDir = process.cwd()) {
   return count;
 }
 async function countMissingHookFileReferencesForClaudeDir(claudeDir3, projectRoot = dirname29(claudeDir3)) {
-  const hooksDirPrefix = `${resolve33(claudeDir3, "hooks")}${sep11}`;
+  const hooksDirPrefix = `${resolve34(claudeDir3, "hooks")}${sep11}`;
   let count = 0;
   for (const fileName of ["settings.json", "settings.local.json"]) {
-    const filePath = resolve33(claudeDir3, fileName);
+    const filePath = resolve34(claudeDir3, fileName);
     if (!existsSync46(filePath))
       continue;
     const settings = await SettingsMerger.readSettingsFile(filePath);
@@ -66704,11 +66759,24 @@ This is a bug. Please open an issue at https://github.com/mrgoonie/claudekit-cli
 // src/domains/installation/plugin/codex-plugin-installer.ts
 import { execFile as execFile8 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
-function resolveCodexExecutable(platformName = process.platform) {
-  return platformName === "win32" ? "codex.cmd" : "codex";
+function resolveCodexExecutable(_platformName = process.platform) {
+  return "codex";
 }
-function shouldRunCodexInShell(platformName = process.platform) {
-  return platformName === "win32";
+function shouldRunCodexInShell(_platformName = process.platform) {
+  return false;
+}
+function resolveCodexExecutableCandidates(platformName = process.platform) {
+  if (platformName === "win32") {
+    return [
+      { command: "codex", argsPrefix: [] },
+      { command: "cmd.exe", argsPrefix: ["/d", "/s", "/c", "codex.cmd"] }
+    ];
+  }
+  return [{ command: resolveCodexExecutable(platformName), argsPrefix: [] }];
+}
+function isSpawnResolutionError(err) {
+  const code = err?.code;
+  return code === "ENOENT" || code === "EACCES" || code === "EINVAL";
 }
 
 class CodexPluginInstaller {
@@ -66731,24 +66799,41 @@ class CodexPluginInstaller {
   async marketplaceAdd(source) {
     return this.run(["plugin", "marketplace", "add", source], this.opts());
   }
+  async marketplaceRemove(name = CK_MARKETPLACE_NAME) {
+    return this.run(["plugin", "marketplace", "remove", name], this.opts());
+  }
   async add() {
     return this.run(["plugin", "add", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`], this.opts());
   }
+  async remove() {
+    return this.run(["plugin", "remove", `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`], this.opts());
+  }
   async listJson() {
     return this.run(["plugin", "list", "--json"], this.opts(15000));
   }
+  async listText() {
+    return this.run(["plugin", "list"], this.opts(15000));
+  }
   async verifyInstalled() {
     const r2 = await this.listJson();
-    if (!r2.ok)
-      return false;
+    if (!r2.ok) {
+      const text = await this.listText();
+      return text.ok && parseTextPluginList(text.stdout + text.stderr);
+    }
     try {
       const parsed = JSON.parse(r2.stdout);
       return (parsed.installed ?? []).some((plugin) => plugin.pluginId === `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}` && plugin.installed === true && plugin.enabled === true);
     } catch {
-      return false;
+      const text = await this.listText();
+      return text.ok && parseTextPluginList(text.stdout + text.stderr);
     }
   }
 }
+function parseTextPluginList(output2) {
+  const pluginId = `${CK_PLUGIN_NAME}@${CK_MARKETPLACE_NAME}`.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const row = new RegExp(`^\\s*${pluginId}\\s+.*\\binstalled\\b.*\\benabled\\b`, "im");
+  return row.test(output2);
+}
 async function installCodexPlugin(opts) {
   const installer = opts.installer ?? new CodexPluginInstaller(undefined, opts.codexHome);
   if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
@@ -66780,6 +66865,18 @@ async function installCodexPlugin(opts) {
   }
   return { action: "installed", pluginVerified: true };
 }
+async function removeCodexPlugin(opts = {}) {
+  const installer = opts.installer ?? new CodexPluginInstaller(undefined, opts.codexHome);
+  if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
+    return { removed: false, marketplaceRemoved: false };
+  }
+  const removed = await installer.remove();
+  const marketplaceRemoved = await installer.marketplaceRemove();
+  return {
+    removed: removed.ok,
+    marketplaceRemoved: marketplaceRemoved.ok
+  };
+}
 async function shouldRefreshCodexPlugin(installer = new CodexPluginInstaller) {
   if (!await installer.isCodexAvailable() || !await installer.isPluginSupported()) {
     return false;
@@ -66790,23 +66887,32 @@ var execFileAsync6, DEFAULT_TIMEOUT_MS2 = 120000, defaultCodexRunner = async (ar
   const env2 = { ...process.env };
   if (opts?.codexHome)
     env2.CODEX_HOME = opts.codexHome;
-  try {
-    const { stdout, stderr } = await execFileAsync6(resolveCodexExecutable(), args, {
-      env: env2,
-      shell: shouldRunCodexInShell(),
-      timeout: opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS2,
-      maxBuffer: 10 * 1024 * 1024
-    });
-    return { ok: true, stdout: String(stdout), stderr: String(stderr), code: 0 };
-  } catch (err) {
-    const e2 = err;
-    return {
-      ok: false,
-      stdout: e2.stdout ? String(e2.stdout) : "",
-      stderr: e2.stderr ? String(e2.stderr) : e2.message ?? "",
-      code: typeof e2.code === "number" ? e2.code : null
-    };
+  let lastError = null;
+  const candidates = resolveCodexExecutableCandidates();
+  for (const [index, candidate] of candidates.entries()) {
+    try {
+      const { stdout, stderr } = await execFileAsync6(candidate.command, [...candidate.argsPrefix, ...args], {
+        env: env2,
+        shell: shouldRunCodexInShell(),
+        timeout: opts?.timeoutMs ?? DEFAULT_TIMEOUT_MS2,
+        maxBuffer: 10 * 1024 * 1024
+      });
+      return { ok: true, stdout: String(stdout), stderr: String(stderr), code: 0 };
+    } catch (err) {
+      lastError = err;
+      if (index < candidates.length - 1 && isSpawnResolutionError(err)) {
+        continue;
+      }
+      break;
+    }
   }
+  const e2 = lastError;
+  return {
+    ok: false,
+    stdout: e2?.stdout ? String(e2.stdout) : "",
+    stderr: e2?.stderr ? String(e2.stderr) : e2?.message ?? "",
+    code: typeof e2?.code === "number" ? e2.code : null
+  };
 };
 var init_codex_plugin_installer = __esm(() => {
   init_install_mode_detector();
@@ -67083,7 +67189,7 @@ var init_claudekit_scanner = __esm(() => {
 
 // src/ui/ck-cli-design/tokens.ts
 import { homedir as homedir41, platform as platform7 } from "node:os";
-import { resolve as resolve34, win32 } from "node:path";
+import { resolve as resolve35, win32 } from "node:path";
 function createCliDesignContext(options2 = {}) {
   const env2 = options2.env ?? process.env;
   const isTTY2 = options2.isTTY ?? process.stdout.isTTY === true;
@@ -67232,7 +67338,7 @@ function formatCdHint(value, currentPlatform = platform7()) {
     const absolutePath2 = win32.resolve(value);
     return `cd /d "${absolutePath2}"`;
   }
-  const absolutePath = resolve34(value);
+  const absolutePath = resolve35(value);
   const displayPath = formatDisplayPath(absolutePath);
   if (displayPath.includes(" ")) {
     return `cd "${displayPath}"`;
@@ -68985,13 +69091,13 @@ async function promptKitUpdate(beta, yes, deps) {
         args.push("--beta");
       const displayCmd = `ck ${args.join(" ")}`;
       logger.info(`Running: ${displayCmd}`);
-      const spawnFn = deps?.spawnInitFn ?? ((spawnArgs) => new Promise((resolve35) => {
+      const spawnFn = deps?.spawnInitFn ?? ((spawnArgs) => new Promise((resolve36) => {
         const initCommand = resolveCkInitSpawnCommand(spawnArgs);
         const child = spawn2(initCommand.command, initCommand.args, { stdio: "inherit" });
-        child.on("close", (code) => resolve35(code ?? 1));
+        child.on("close", (code) => resolve36(code ?? 1));
         child.on("error", (err) => {
           logger.verbose(`Failed to spawn ck init: ${err.message}`);
-          resolve35(1);
+          resolve36(1);
         });
       }));
       const exitCode = await spawnFn(args);
@@ -69465,7 +69571,7 @@ class ConfigVersionChecker {
           return null;
         }
         const delay = baseBackoff * 2 ** attempt;
-        await new Promise((resolve35) => setTimeout(resolve35, delay));
+        await new Promise((resolve36) => setTimeout(resolve36, delay));
       }
     }
     return null;
@@ -69571,12 +69677,12 @@ import { readFile as readFile40 } from "node:fs/promises";
 import { cpus, homedir as homedir42, totalmem } from "node:os";
 import { join as join71 } from "node:path";
 function runCommand(cmd, args, fallback2) {
-  return new Promise((resolve35) => {
+  return new Promise((resolve36) => {
     execFile9(cmd, args, { timeout: 5000 }, (err, stdout) => {
       if (err) {
-        resolve35(fallback2);
+        resolve36(fallback2);
       } else {
-        resolve35(stdout.trim() || fallback2);
+        resolve36(stdout.trim() || fallback2);
       }
     });
   });
@@ -70013,7 +70119,7 @@ var init_routes = __esm(() => {
 
 // src/domains/web-server/static-server.ts
 import { existsSync as existsSync50 } from "node:fs";
-import { basename as basename24, dirname as dirname31, join as join72, resolve as resolve35 } from "node:path";
+import { basename as basename24, dirname as dirname31, join as join72, resolve as resolve36 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!runtimePath) {
@@ -70023,7 +70129,7 @@ function addRuntimeUiCandidate(candidates, runtimePath) {
   if (!looksLikePath) {
     return;
   }
-  const entryDir = dirname31(resolve35(runtimePath));
+  const entryDir = dirname31(resolve36(runtimePath));
   if (basename24(entryDir) === "dist") {
     candidates.add(join72(entryDir, "ui"));
   }
@@ -71726,7 +71832,7 @@ var require_websocket = __commonJS((exports, module) => {
   var http = __require("http");
   var net2 = __require("net");
   var tls = __require("tls");
-  var { randomBytes, createHash: createHash6 } = __require("crypto");
+  var { randomBytes, createHash: createHash7 } = __require("crypto");
   var { Duplex, Readable: Readable2 } = __require("stream");
   var { URL: URL2 } = __require("url");
   var PerMessageDeflate = require_permessage_deflate();
@@ -72261,7 +72367,7 @@ var require_websocket = __commonJS((exports, module) => {
         abortHandshake(websocket, socket, "Invalid Upgrade header");
         return;
       }
-      const digest = createHash6("sha1").update(key + GUID).digest("base64");
+      const digest = createHash7("sha1").update(key + GUID).digest("base64");
       if (res.headers["sec-websocket-accept"] !== digest) {
         abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
         return;
@@ -72634,7 +72740,7 @@ var require_websocket_server = __commonJS((exports, module) => {
   var EventEmitter3 = __require("events");
   var http = __require("http");
   var { Duplex } = __require("stream");
-  var { createHash: createHash6 } = __require("crypto");
+  var { createHash: createHash7 } = __require("crypto");
   var extension = require_extension();
   var PerMessageDeflate = require_permessage_deflate();
   var subprotocol = require_subprotocol();
@@ -72843,7 +72949,7 @@ var require_websocket_server = __commonJS((exports, module) => {
       }
       if (this._state > RUNNING)
         return abortHandshake(socket, 503);
-      const digest = createHash6("sha1").update(key + GUID).digest("base64");
+      const digest = createHash7("sha1").update(key + GUID).digest("base64");
       const headers = [
         "HTTP/1.1 101 Switching Protocols",
         "Upgrade: websocket",
@@ -73055,10 +73161,10 @@ async function createAppServer(options2 = {}) {
     wsManager = new WebSocketManager(server);
     fileWatcher = new FileWatcher({ wsManager });
     fileWatcher.start();
-    await new Promise((resolve36, reject) => {
+    await new Promise((resolve37, reject) => {
       const onListening = () => {
         server.off("error", onError);
-        resolve36();
+        resolve37();
       };
       const onError = (error) => {
         server.off("listening", onListening);
@@ -73095,16 +73201,16 @@ async function createAppServer(options2 = {}) {
   };
 }
 async function closeHttpServer(server) {
-  await new Promise((resolve36) => {
+  await new Promise((resolve37) => {
     if (!server.listening) {
-      resolve36();
+      resolve37();
       return;
     }
     server.close((err) => {
       if (err) {
         logger.debug(`Server close error: ${err.message}`);
       }
-      resolve36();
+      resolve37();
     });
   });
 }
@@ -74840,7 +74946,7 @@ var require_picomatch2 = __commonJS((exports, module) => {
 import { exec as exec7, execFile as execFile10, spawn as spawn4 } from "node:child_process";
 import { promisify as promisify15 } from "node:util";
 function executeInteractiveScript(command, args, options2) {
-  return new Promise((resolve38, reject) => {
+  return new Promise((resolve39, reject) => {
     const child = spawn4(command, args, {
       stdio: ["ignore", "inherit", "inherit"],
       cwd: options2?.cwd,
@@ -74861,7 +74967,7 @@ function executeInteractiveScript(command, args, options2) {
       } else if (code !== 0) {
         reject(new Error(`Command exited with code ${code}`));
       } else {
-        resolve38();
+        resolve39();
       }
     });
     child.on("error", (error) => {
@@ -75040,7 +75146,7 @@ var init_opencode_installer = __esm(() => {
 var PARTIAL_INSTALL_VERSION = "partial", EXIT_CODE_CRITICAL_FAILURE = 1, EXIT_CODE_PARTIAL_SUCCESS = 2;
 
 // src/services/package-installer/validators.ts
-import { resolve as resolve38 } from "node:path";
+import { resolve as resolve39 } from "node:path";
 function validatePackageName(packageName) {
   if (!packageName || typeof packageName !== "string") {
     throw new Error("Package name must be a non-empty string");
@@ -75053,8 +75159,8 @@ function validatePackageName(packageName) {
   }
 }
 function validateScriptPath(skillsDir2, scriptPath) {
-  const skillsDirResolved = resolve38(skillsDir2);
-  const scriptPathResolved = resolve38(scriptPath);
+  const skillsDirResolved = resolve39(skillsDir2);
+  const scriptPathResolved = resolve39(scriptPath);
   const skillsDirNormalized = isWindows() ? skillsDirResolved.toLowerCase() : skillsDirResolved;
   const scriptPathNormalized = isWindows() ? scriptPathResolved.toLowerCase() : scriptPathResolved;
   if (!scriptPathNormalized.startsWith(skillsDirNormalized)) {
@@ -75872,10 +75978,10 @@ __export(exports_agy_mcp_linker, {
   checkExistingAgyConfig: () => checkExistingAgyConfig,
   addAgyToGitignore: () => addAgyToGitignore
 });
-import { resolve as resolve39 } from "node:path";
+import { resolve as resolve40 } from "node:path";
 async function linkAgyMcpConfig(projectDir, options2 = {}) {
   const { skipGitignore = false, isGlobal = false } = options2;
-  const resolvedProjectDir = resolve39(projectDir);
+  const resolvedProjectDir = resolve40(projectDir);
   const agyConfigPath = getAgyMcpConfigPath(resolvedProjectDir, isGlobal);
   const mcpConfigPath = findMcpConfigPath(resolvedProjectDir);
   if (!mcpConfigPath) {
@@ -76524,7 +76630,7 @@ var require_get_stream = __commonJS((exports, module) => {
     };
     const { maxBuffer } = options2;
     let stream;
-    await new Promise((resolve41, reject) => {
+    await new Promise((resolve42, reject) => {
       const rejectPromise = (error) => {
         if (error && stream.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
           error.bufferedData = stream.getBufferedValue();
@@ -76536,7 +76642,7 @@ var require_get_stream = __commonJS((exports, module) => {
           rejectPromise(error);
           return;
         }
-        resolve41();
+        resolve42();
       });
       stream.on("data", () => {
         if (stream.getBufferedLength() > maxBuffer) {
@@ -77897,7 +78003,7 @@ var require_extract_zip = __commonJS((exports, module) => {
       debug("opening", this.zipPath, "with opts", this.opts);
       this.zipfile = await openZip(this.zipPath, { lazyEntries: true });
       this.canceled = false;
-      return new Promise((resolve41, reject) => {
+      return new Promise((resolve42, reject) => {
         this.zipfile.on("error", (err) => {
           this.canceled = true;
           reject(err);
@@ -77906,7 +78012,7 @@ var require_extract_zip = __commonJS((exports, module) => {
         this.zipfile.on("close", () => {
           if (!this.canceled) {
             debug("zip extraction complete");
-            resolve41();
+            resolve42();
           }
         });
         this.zipfile.on("entry", async (entry) => {
@@ -78225,7 +78331,7 @@ async function restoreOriginalBranch(branchName, cwd2, issueNumber) {
   }
 }
 function spawnAndCollect(command, args, cwd2) {
-  return new Promise((resolve57, reject) => {
+  return new Promise((resolve59, reject) => {
     const child = spawn5(command, args, { ...cwd2 && { cwd: cwd2 }, stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -78238,7 +78344,7 @@ function spawnAndCollect(command, args, cwd2) {
         reject(new Error(`${command} ${args[0] ?? ""} exited with code ${code2}: ${stderr}`));
         return;
       }
-      resolve57(Buffer.concat(chunks).toString("utf-8"));
+      resolve59(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
@@ -78422,8 +78528,8 @@ var init_content_validator = __esm(() => {
 });
 
 // src/commands/content/phases/context-cache-manager.ts
-import { createHash as createHash9 } from "node:crypto";
-import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync23, readdirSync as readdirSync14, statSync as statSync15 } from "node:fs";
+import { createHash as createHash11 } from "node:crypto";
+import { existsSync as existsSync83, mkdirSync as mkdirSync7, readFileSync as readFileSync23, readdirSync as readdirSync15, statSync as statSync15 } from "node:fs";
 import { rename as rename16, writeFile as writeFile43 } from "node:fs/promises";
 import { homedir as homedir54 } from "node:os";
 import { basename as basename34, join as join167 } from "node:path";
@@ -78455,7 +78561,7 @@ async function saveCachedContext(repoPath, cache5) {
   await rename16(tmpPath, cachePath);
 }
 function computeSourceHash(repoPath) {
-  const hash = createHash9("sha256");
+  const hash = createHash11("sha256");
   const paths = getDocSourcePaths(repoPath);
   for (const filePath of paths) {
     try {
@@ -78472,7 +78578,7 @@ function getDocSourcePaths(repoPath) {
   const docsDir = join167(repoPath, "docs");
   if (existsSync83(docsDir)) {
     try {
-      const files = readdirSync14(docsDir);
+      const files = readdirSync15(docsDir);
       for (const f3 of files) {
         if (f3.endsWith(".md"))
           paths.push(join167(docsDir, f3));
@@ -78485,7 +78591,7 @@ function getDocSourcePaths(repoPath) {
   const stylesDir = join167(repoPath, "assets", "writing-styles");
   if (existsSync83(stylesDir)) {
     try {
-      const files = readdirSync14(stylesDir);
+      const files = readdirSync15(stylesDir);
       for (const f3 of files) {
         paths.push(join167(stylesDir, f3));
       }
@@ -78495,7 +78601,7 @@ function getDocSourcePaths(repoPath) {
 }
 function getCacheFilePath(repoPath) {
   const repoName = basename34(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
-  const pathHash = createHash9("sha256").update(repoPath).digest("hex").slice(0, 8);
+  const pathHash = createHash11("sha256").update(repoPath).digest("hex").slice(0, 8);
   return join167(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
 }
 var CACHE_DIR, CACHE_TTL_MS5;
@@ -78680,7 +78786,7 @@ function extractContentFromResponse(response) {
 
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync7 } from "node:child_process";
-import { existsSync as existsSync84, readFileSync as readFileSync24, readdirSync as readdirSync15 } from "node:fs";
+import { existsSync as existsSync84, readFileSync as readFileSync24, readdirSync as readdirSync16 } from "node:fs";
 import { join as join168 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
@@ -78738,7 +78844,7 @@ function collectRawDocs(repoPath) {
   const docsDir = join168(repoPath, "docs");
   if (existsSync84(docsDir)) {
     try {
-      const files = readdirSync15(docsDir).filter((f3) => f3.endsWith(".md")).sort();
+      const files = readdirSync16(docsDir).filter((f3) => f3.endsWith(".md")).sort();
       for (const f3 of files) {
         const content = readCapped(join168(docsDir, f3), 5000);
         if (content) {
@@ -78762,7 +78868,7 @@ ${content}`);
   const stylesDir = join168(repoPath, "assets", "writing-styles");
   if (existsSync84(stylesDir)) {
     try {
-      const files = readdirSync15(stylesDir).slice(0, 3);
+      const files = readdirSync16(stylesDir).slice(0, 3);
       styles3 = files.map((f3) => readCapped(join168(stylesDir, f3), 1000)).filter(Boolean).join(`
 
 `);
@@ -78953,7 +79059,7 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 
 // src/commands/content/phases/photo-generator.ts
 import { execSync as execSync8 } from "node:child_process";
-import { existsSync as existsSync85, mkdirSync as mkdirSync8, readdirSync as readdirSync16 } from "node:fs";
+import { existsSync as existsSync85, mkdirSync as mkdirSync8, readdirSync as readdirSync17 } from "node:fs";
 import { homedir as homedir55 } from "node:os";
 import { join as join169 } from "node:path";
 async function generatePhoto(_content, context, config, platform18, contentId, contentLogger) {
@@ -78978,7 +79084,7 @@ async function generatePhoto(_content, context, config, platform18, contentId, c
         return { path: imagePath, ...dimensions, format: "png" };
       }
     }
-    const files = readdirSync16(mediaDir);
+    const files = readdirSync17(mediaDir);
     const imageFile = files.find((f3) => /\.(png|jpg|jpeg|webp)$/i.test(f3));
     if (imageFile) {
       const ext2 = imageFile.split(".").pop() ?? "png";
@@ -79410,7 +79516,7 @@ function isNoiseCommit(title, author) {
 
 // src/commands/content/phases/change-detector.ts
 import { execSync as execSync10, spawnSync as spawnSync9 } from "node:child_process";
-import { existsSync as existsSync88, readFileSync as readFileSync25, readdirSync as readdirSync17, statSync as statSync17 } from "node:fs";
+import { existsSync as existsSync88, readFileSync as readFileSync25, readdirSync as readdirSync18, statSync as statSync17 } from "node:fs";
 import { join as join171 } from "node:path";
 function detectCommits(repo, since) {
   try {
@@ -79526,7 +79632,7 @@ function detectCompletedPlans(repo, since) {
   const sinceMs = new Date(since).getTime();
   const events = [];
   try {
-    const entries = readdirSync17(plansDir, { withFileTypes: true });
+    const entries = readdirSync18(plansDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
@@ -79607,7 +79713,7 @@ function classifyCommit(event) {
 
 // src/commands/content/phases/repo-discoverer.ts
 import { execSync as execSync11 } from "node:child_process";
-import { readdirSync as readdirSync18 } from "node:fs";
+import { readdirSync as readdirSync19 } from "node:fs";
 import { join as join172 } from "node:path";
 function discoverRepos2(cwd2) {
   const repos = [];
@@ -79617,7 +79723,7 @@ function discoverRepos2(cwd2) {
       repos.push(info);
   }
   try {
-    const entries = readdirSync18(cwd2, { withFileTypes: true });
+    const entries = readdirSync19(cwd2, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("."))
         continue;
@@ -81085,8 +81191,8 @@ function shouldRunCleanup(lastAt) {
   return Date.now() - new Date(lastAt).getTime() >= 86400000;
 }
 function sleep2(ms) {
-  return new Promise((resolve57) => {
-    setTimeout(resolve57, ms);
+  return new Promise((resolve59) => {
+    setTimeout(resolve59, ms);
   });
 }
 var LOCK_DIR2, LOCK_FILE, MAX_CREATION_RETRIES = 3, MAX_PUBLISH_RETRIES_PER_CYCLE = 3, PUBLISH_RETRY_WINDOW_HOURS = 24;
@@ -82174,6 +82280,10 @@ var init_init_command_help = __esm(() => {
             flags: "--sync",
             description: "Sync config files from upstream with interactive hunk-by-hunk merge"
           },
+          {
+            flags: "--install-mode <mode>",
+            description: "Engineer global install mode: auto, plugin, or legacy (default: auto)"
+          },
           {
             flags: "--archive <path>",
             description: "Use local archive file instead of downloading (zip/tar.gz)"
@@ -83340,7 +83450,7 @@ function getPagerArgs(pagerCmd) {
   return [];
 }
 async function trySystemPager(content) {
-  return new Promise((resolve57) => {
+  return new Promise((resolve59) => {
     const pagerCmd = process.env.PAGER || "less";
     const pagerArgs = getPagerArgs(pagerCmd);
     try {
@@ -83350,20 +83460,20 @@ async function trySystemPager(content) {
       });
       const timeout2 = setTimeout(() => {
         pager.kill();
-        resolve57(false);
+        resolve59(false);
       }, 30000);
       pager.stdin.write(content);
       pager.stdin.end();
       pager.on("close", (code2) => {
         clearTimeout(timeout2);
-        resolve57(code2 === 0);
+        resolve59(code2 === 0);
       });
       pager.on("error", () => {
         clearTimeout(timeout2);
-        resolve57(false);
+        resolve59(false);
       });
     } catch {
-      resolve57(false);
+      resolve59(false);
     }
   });
 }
@@ -83390,16 +83500,16 @@ async function basicPager(content) {
       break;
     }
     const remaining = lines.length - currentLine;
-    await new Promise((resolve57) => {
+    await new Promise((resolve59) => {
       rl.question(`-- More (${remaining} lines) [Enter/q] --`, (answer) => {
         if (answer.toLowerCase() === "q") {
           rl.close();
           process.exitCode = 0;
-          resolve57();
+          resolve59();
           return;
         }
         process.stdout.write("\x1B[1A\x1B[2K");
-        resolve57();
+        resolve59();
       });
     });
   }
@@ -85314,7 +85424,7 @@ class ClaudekitHttpClient {
     } catch (error) {
       if (error instanceof CkApiError && error.code === "RATE_LIMIT_EXCEEDED" && error.retryAfter) {
         const delayMs = error.retryAfter * 1000;
-        await new Promise((resolve5) => setTimeout(resolve5, delayMs));
+        await new Promise((resolve6) => setTimeout(resolve6, delayMs));
         return fn();
       }
       throw error;
@@ -86228,7 +86338,7 @@ function showApiHelp() {
 }
 // src/services/file-operations/destructive-operation-backup-manager.ts
 import { readdir as readdir3, stat } from "node:fs/promises";
-import { basename as basename4, join as join14, resolve as resolve6, sep as sep3 } from "node:path";
+import { basename as basename4, join as join14, resolve as resolve7, sep as sep3 } from "node:path";
 
 // src/services/file-operations/destructive-operation-backup.ts
 init_logger();
@@ -86236,7 +86346,7 @@ init_path_resolver();
 init_zod();
 var import_fs_extra = __toESM(require_lib(), 1);
 import { mkdir as mkdir4, readdir as readdir2, readlink, rename as rename2, symlink } from "node:fs/promises";
-import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute2, join as join13, normalize as normalize2, resolve as resolve5, sep as sep2 } from "node:path";
+import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute2, join as join13, normalize as normalize2, resolve as resolve6, sep as sep2 } from "node:path";
 var SNAPSHOT_DIR = "snapshot";
 var MANIFEST_FILE = "manifest.json";
 function normalizeRelativePath(rootDir, inputPath) {
@@ -86244,21 +86354,21 @@ function normalizeRelativePath(rootDir, inputPath) {
     throw new Error(`Unsafe backup path: ${inputPath}`);
   }
   const normalized = normalize2(inputPath).replaceAll("\\", "/");
-  const resolvedRoot = resolve5(rootDir);
-  const resolvedPath = resolve5(rootDir, normalized);
+  const resolvedRoot = resolve6(rootDir);
+  const resolvedPath = resolve6(rootDir, normalized);
   if (normalized === ".." || normalized.startsWith("../") || !resolvedPath.startsWith(`${resolvedRoot}${sep2}`) && resolvedPath !== resolvedRoot) {
     throw new Error(`Path escapes installation root: ${inputPath}`);
   }
   return normalized;
 }
 function getManagedBackupRoot() {
-  return resolve5(PathResolver.getConfigDir(false), "backups");
+  return resolve6(PathResolver.getConfigDir(false), "backups");
 }
 async function getExistingRealpath(pathToResolve) {
   if (await import_fs_extra.pathExists(pathToResolve)) {
-    return resolve5(await import_fs_extra.realpath(pathToResolve));
+    return resolve6(await import_fs_extra.realpath(pathToResolve));
   }
-  return resolve5(pathToResolve);
+  return resolve6(pathToResolve);
 }
 async function assertManagedBackupDir(backupDir) {
   const resolvedBackupDir = await getExistingRealpath(backupDir);
@@ -86303,13 +86413,13 @@ function buildTargets(sourceRoot, deletePaths, mutatePaths) {
   });
 }
 async function snapshotItem(sourceRoot, backupDir, target) {
-  const sourcePath = resolve5(sourceRoot, target.path);
+  const sourcePath = resolve6(sourceRoot, target.path);
   if (!await import_fs_extra.pathExists(sourcePath)) {
     return null;
   }
   const stats = await import_fs_extra.lstat(sourcePath);
   if (stats.isSymbolicLink()) {
-    const realTargetPath = resolve5(await import_fs_extra.realpath(sourcePath));
+    const realTargetPath = resolve6(await import_fs_extra.realpath(sourcePath));
     const resolvedSourceRoot = await getExistingRealpath(sourceRoot);
     if (!realTargetPath.startsWith(`${resolvedSourceRoot}${sep2}`) && realTargetPath !== resolvedSourceRoot) {
       throw new Error(`Symlink target escapes installation root: ${target.path}`);
@@ -86349,7 +86459,7 @@ async function copyDirectorySnapshot(sourceDir, destDir, rootDir) {
     const sourceEntry = join13(sourceDir, entry.name);
     const destEntry = join13(destDir, entry.name);
     if (entry.isSymbolicLink()) {
-      const realTargetPath = resolve5(await import_fs_extra.realpath(sourceEntry));
+      const realTargetPath = resolve6(await import_fs_extra.realpath(sourceEntry));
       const resolvedRoot = await getExistingRealpath(rootDir);
       if (!realTargetPath.startsWith(`${resolvedRoot}${sep2}`) && realTargetPath !== resolvedRoot) {
         throw new Error(`Nested symlink target escapes installation root: ${sourceEntry}`);
@@ -86372,10 +86482,10 @@ function buildRestoreTempPath(sourcePath, suffix) {
 }
 async function assertSafeRestoreDestination(targetPath, rootDir) {
   const resolvedRoot = await getExistingRealpath(rootDir);
-  const lexicalRoot = resolve5(rootDir);
+  const lexicalRoot = resolve6(rootDir);
   let currentPath = dirname5(targetPath);
   while (true) {
-    const resolvedCurrent = resolve5(currentPath);
+    const resolvedCurrent = resolve6(currentPath);
     if (!resolvedCurrent.startsWith(`${lexicalRoot}${sep2}`) && resolvedCurrent !== lexicalRoot) {
       throw new Error(`Restore target escapes installation root: ${targetPath}`);
     }
@@ -86403,8 +86513,8 @@ async function copySnapshotDirectoryForRestore(snapshotDir, destDir, rootDir) {
     const destEntry = join13(destDir, entry.name);
     if (entry.isSymbolicLink()) {
       const linkTarget = await readlink(sourceEntry);
-      const resolvedTarget = resolve5(dirname5(destEntry), linkTarget);
-      const lexicalRoot = resolve5(rootDir);
+      const resolvedTarget = resolve6(dirname5(destEntry), linkTarget);
+      const lexicalRoot = resolve6(rootDir);
       if (!resolvedTarget.startsWith(`${lexicalRoot}${sep2}`) && resolvedTarget !== lexicalRoot) {
         throw new Error(`Nested restore symlink escapes installation root: ${destEntry}`);
       }
@@ -86479,7 +86589,7 @@ async function createDestructiveOperationBackup(request) {
       version: 1,
       operation: request.operation,
       createdAt: new Date().toISOString(),
-      sourceRoot: resolve5(request.sourceRoot),
+      sourceRoot: resolve6(request.sourceRoot),
       scope: request.scope,
       kit: request.kit,
       items,
@@ -86503,7 +86613,7 @@ async function loadDestructiveOperationBackup(backupDir) {
   if (!isAbsolute2(manifest.sourceRoot)) {
     throw new Error(`Backup manifest source root must be absolute: ${manifest.sourceRoot}`);
   }
-  const resolvedSourceRoot = resolve5(manifest.sourceRoot);
+  const resolvedSourceRoot = resolve6(manifest.sourceRoot);
   for (const item of manifest.items) {
     normalizeRelativePath(resolvedSourceRoot, item.path);
     const normalizedSnapshotPath = normalizeRelativePath(resolvedBackupDir, item.snapshotPath);
@@ -86523,8 +86633,8 @@ async function loadDestructiveOperationBackup(backupDir) {
 async function restoreDestructiveOperationBackup(backup) {
   const restorePlans = [];
   for (const item of backup.manifest.items) {
-    const sourcePath = resolve5(backup.manifest.sourceRoot, normalizeRelativePath(backup.manifest.sourceRoot, item.path));
-    const snapshotPath = resolve5(backup.backupDir, normalizeRelativePath(backup.backupDir, item.snapshotPath));
+    const sourcePath = resolve6(backup.manifest.sourceRoot, normalizeRelativePath(backup.manifest.sourceRoot, item.path));
+    const snapshotPath = resolve6(backup.backupDir, normalizeRelativePath(backup.backupDir, item.snapshotPath));
     try {
       await import_fs_extra.lstat(snapshotPath);
     } catch {
@@ -86566,7 +86676,7 @@ init_path_resolver();
 var import_fs_extra2 = __toESM(require_lib(), 1);
 var DEFAULT_DESTRUCTIVE_BACKUP_KEEP_COUNT = 10;
 function getBackupsRoot() {
-  return resolve6(PathResolver.getConfigDir(false), "backups");
+  return resolve7(PathResolver.getConfigDir(false), "backups");
 }
 function validateBackupId(backupId) {
   if (!backupId || !/^[A-Za-z0-9._:-]+$/.test(backupId) || backupId.includes("..")) {
@@ -86576,7 +86686,7 @@ function validateBackupId(backupId) {
 function resolveBackupDir(backupId) {
   validateBackupId(backupId);
   const backupsRoot = getBackupsRoot();
-  const backupDir = resolve6(backupsRoot, backupId);
+  const backupDir = resolve7(backupsRoot, backupId);
   if (!backupDir.startsWith(`${backupsRoot}${sep3}`) && backupDir !== backupsRoot) {
     throw new Error(`Backup id escapes backup root: ${backupId}`);
   }
@@ -86949,8 +87059,8 @@ init_logger();
 init_path_resolver();
 var import_fs_extra3 = __toESM(require_lib(), 1);
 var import_proper_lockfile5 = __toESM(require_proper_lockfile(), 1);
-import { createHash as createHash4 } from "node:crypto";
-import { join as join16, resolve as resolve7 } from "node:path";
+import { createHash as createHash5 } from "node:crypto";
+import { join as join16, resolve as resolve8 } from "node:path";
 var LOCK_OPTIONS = {
   realpath: false,
   retries: { retries: 5, minTimeout: 100, maxTimeout: 1000 },
@@ -86958,13 +87068,13 @@ var LOCK_OPTIONS = {
 };
 async function getCanonicalInstallationRoot(installationRoot) {
   if (await import_fs_extra3.pathExists(installationRoot)) {
-    return resolve7(await import_fs_extra3.realpath(installationRoot));
+    return resolve8(await import_fs_extra3.realpath(installationRoot));
   }
-  return resolve7(installationRoot);
+  return resolve8(installationRoot);
 }
 async function getInstallationStateLockPath(installationRoot) {
   const normalizedRoot = await getCanonicalInstallationRoot(installationRoot);
-  const hash = createHash4("sha256").update(normalizedRoot).digest("hex").slice(0, 16);
+  const hash = createHash5("sha256").update(normalizedRoot).digest("hex").slice(0, 16);
   return join16(PathResolver.getConfigDir(false), "locks", `installation-${hash}.lock`);
 }
 async function acquireInstallationStateLock(installationRoot) {
@@ -87082,7 +87192,7 @@ init_portable_registry();
 init_provider_registry();
 import { existsSync as existsSync10 } from "node:fs";
 import { lstat as lstat3, rm as rm2 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname6, join as join18, relative as relative4, resolve as resolve8, sep as sep4 } from "node:path";
+import { basename as basename5, dirname as dirname6, join as join18, relative as relative5, resolve as resolve9, sep as sep4 } from "node:path";
 var defaultCommandRegistryDeps = {
   readPortableRegistry,
   removePortableInstallation
@@ -87094,8 +87204,8 @@ function resolveCommandRegistryDeps(deps) {
   };
 }
 function isPathWithinBase(targetPath, basePath) {
-  const resolvedTarget = resolve8(targetPath);
-  const resolvedBase = resolve8(basePath);
+  const resolvedTarget = resolve9(targetPath);
+  const resolvedBase = resolve9(basePath);
   return resolvedTarget === resolvedBase || resolvedTarget.startsWith(`${resolvedBase}${sep4}`);
 }
 function isWindowsAbsolutePath2(path3) {
@@ -87131,8 +87241,8 @@ function getSafeCommandNameSegments(commandName) {
 }
 function isCodexCommandSkillPath(targetPath, basePath) {
   const targetDir = dirname6(targetPath);
-  const resolvedTargetDir = resolve8(targetDir);
-  const resolvedBase = resolve8(basePath);
+  const resolvedTargetDir = resolve9(targetDir);
+  const resolvedBase = resolve9(basePath);
   return basename5(targetPath) === CODEX_COMMAND_SKILL_FILENAME && basename5(targetDir).startsWith("source-command-") && resolvedTargetDir !== resolvedBase && isPathWithinBase(targetDir, basePath);
 }
 function getCodexLegacyPromptBasePath(basePath) {
@@ -87171,8 +87281,8 @@ function validateCommandTargetPath(targetPath, basePath) {
   if (!basePath) {
     return "Provider command base path is unavailable";
   }
-  const resolvedTarget = resolve8(targetPath);
-  const resolvedBase = resolve8(basePath);
+  const resolvedTarget = resolve9(targetPath);
+  const resolvedBase = resolve9(basePath);
   if (resolvedTarget === resolvedBase) {
     return "Unsafe path: refusing to remove provider command base directory";
   }
@@ -87182,12 +87292,12 @@ function validateCommandTargetPath(targetPath, basePath) {
   return null;
 }
 async function validateNoSymlinkComponents2(targetPath, boundaryPath) {
-  const resolvedTarget = resolve8(targetPath);
-  const resolvedBoundary = resolve8(boundaryPath);
+  const resolvedTarget = resolve9(targetPath);
+  const resolvedBoundary = resolve9(boundaryPath);
   if (!isPathWithinBase(resolvedTarget, resolvedBoundary)) {
     return `Unsafe path: target escapes ${resolvedBoundary}`;
   }
-  const segments = relative4(resolvedBoundary, resolvedTarget).split(/[\\/]+/).filter(Boolean);
+  const segments = relative5(resolvedBoundary, resolvedTarget).split(/[\\/]+/).filter(Boolean);
   let cursor = resolvedBoundary;
   for (const segment of segments) {
     cursor = join18(cursor, segment);
@@ -87852,12 +87962,12 @@ async function configUICommand(options2 = {}) {
     console.log();
     console.log(import_picocolors15.default.dim("  Press Ctrl+C to stop"));
     console.log();
-    await new Promise((resolve36) => {
+    await new Promise((resolve37) => {
       const shutdown = async () => {
         console.log();
         logger.info("Shutting down...");
         await server.close();
-        resolve36();
+        resolve37();
       };
       process.on("SIGINT", shutdown);
       process.on("SIGTERM", shutdown);
@@ -87878,12 +87988,12 @@ async function configUICommand(options2 = {}) {
 }
 async function checkPort(port, host) {
   const { createServer: createServer2 } = await import("node:net");
-  return new Promise((resolve36) => {
+  return new Promise((resolve37) => {
     const server = createServer2();
-    server.once("error", () => resolve36(false));
+    server.once("error", () => resolve37(false));
     server.once("listening", () => {
       server.close();
-      resolve36(true);
+      resolve37(true);
     });
     server.listen(port, host);
   });
@@ -89237,13 +89347,13 @@ function checkComponentCounts(setup) {
 }
 // src/domains/health-checks/checkers/skill-budget-checker.ts
 init_path_resolver();
-import { join as join77, resolve as resolve36 } from "node:path";
+import { join as join77, resolve as resolve37 } from "node:path";
 
 // src/domains/health-checks/checkers/skill-budget-scanner.ts
 var import_gray_matter11 = __toESM(require_gray_matter(), 1);
 import { existsSync as existsSync55 } from "node:fs";
 import { readFile as readFile41, readdir as readdir20 } from "node:fs/promises";
-import { basename as basename25, join as join76, relative as relative16 } from "node:path";
+import { basename as basename25, join as join76, relative as relative17 } from "node:path";
 var SKIP_DIRS5 = new Set([".git", ".venv", "__pycache__", "node_modules", "scripts", "common"]);
 async function scanSkills2(skillsDir2) {
   if (!existsSync55(skillsDir2))
@@ -89256,7 +89366,7 @@ async function scanSkills2(skillsDir2) {
       const content = await readFile41(file, "utf8");
       const { data } = import_gray_matter11.default(content, { engines: { javascript: { parse: () => ({}) } } });
       const rawName = typeof data.name === "string" ? data.name : "";
-      const fallbackId = relative16(skillsDir2, dir).replace(/\\/g, "/") || basename25(dir);
+      const fallbackId = relative17(skillsDir2, dir).replace(/\\/g, "/") || basename25(dir);
       skills.push({
         id: normalizeSkillId(rawName, fallbackId),
         description: typeof data.description === "string" ? data.description : "",
@@ -89356,8 +89466,8 @@ async function applyBudgetDefaults(settingsPath, projectClaudeDir, requiredFract
 // src/domains/health-checks/checkers/skill-budget-checker.ts
 var ENGINEER_SKILL_COUNT_THRESHOLD = 20;
 async function checkSkillBudget(setup, projectDir) {
-  const projectClaudeDir = resolve36(projectDir, ".claude");
-  const globalClaudeDir = resolve36(PathResolver.getGlobalKitDir());
+  const projectClaudeDir = resolve37(projectDir, ".claude");
+  const globalClaudeDir = resolve37(PathResolver.getGlobalKitDir());
   const projectScopeAliasesGlobal = projectClaudeDir === globalClaudeDir;
   const [projectSkills, globalSkills] = await Promise.all([
     projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join77(projectClaudeDir, "skills")),
@@ -89757,7 +89867,7 @@ init_path_resolver();
 import { existsSync as existsSync59 } from "node:fs";
 import { readFile as readFile44 } from "node:fs/promises";
 import { homedir as homedir43 } from "node:os";
-import { dirname as dirname32, join as join81, normalize as normalize6, resolve as resolve37 } from "node:path";
+import { dirname as dirname32, join as join81, normalize as normalize6, resolve as resolve38 } from "node:path";
 async function checkPathRefsValid(projectDir) {
   const globalClaudeMd = join81(PathResolver.getGlobalKitDir(), "CLAUDE.md");
   const projectClaudeMd = join81(projectDir, ".claude", "CLAUDE.md");
@@ -89804,7 +89914,7 @@ async function checkPathRefsValid(projectDir) {
       } else if (/^[A-Za-z]:/.test(ref)) {
         refPath = normalize6(ref);
       } else {
-        refPath = resolve37(baseDir, ref);
+        refPath = resolve38(baseDir, ref);
       }
       const normalizedPath = normalize6(refPath);
       const isWithinHome = normalizedPath.startsWith(home5);
@@ -90094,7 +90204,8 @@ async function parseEnvFile(path7) {
         if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
           value = value.slice(1, -1);
         }
-        env2[key.trim()] = value.trim();
+        const normalizedKey = key.trim();
+        env2[normalizedKey] = normalizeParsedEnvValue(normalizedKey, value);
       }
     }
     return env2;
@@ -90103,6 +90214,13 @@ async function parseEnvFile(path7) {
     return {};
   }
 }
+function normalizeParsedEnvValue(key, value) {
+  const trimmed = value.trim();
+  if (key === "GEMINI_API_KEY" || key.startsWith("GEMINI_API_KEY_") || key === "OPENROUTER_API_KEY" || key === "MINIMAX_API_KEY") {
+    return normalizeApiKeyInput(trimmed);
+  }
+  return trimmed;
+}
 async function checkGlobalConfig() {
   const globalEnvPath = join83(PathResolver.getGlobalKitDir(), ".env");
   if (!await import_fs_extra9.pathExists(globalEnvPath))
@@ -90166,8 +90284,10 @@ async function runSetupWizard(options2) {
       f2.warning("Setup cancelled");
       return false;
     }
-    if (typeof result === "string" && result) {
-      values[config.key] = result;
+    if (typeof result === "string") {
+      const normalized = normalizeApiKeyInput(result);
+      if (normalized)
+        values[config.key] = normalized;
     }
   }
   const configuredProviders = getConfiguredImageProviders(values);
@@ -90240,7 +90360,7 @@ async function promptForAdditionalGeminiKeys(primaryKey) {
       validate: (value) => {
         if (!value)
           return;
-        const trimmed = value.trim();
+        const trimmed = normalizeApiKeyInput(value);
         if (!trimmed)
           return;
         if (!validateApiKey2(trimmed, VALIDATION_PATTERNS.GEMINI_API_KEY)) {
@@ -90255,12 +90375,12 @@ async function promptForAdditionalGeminiKeys(primaryKey) {
     if (lD(result)) {
       break;
     }
-    if (!result || result.trim() === "") {
+    const normalized = typeof result === "string" ? normalizeApiKeyInput(result) : "";
+    if (!normalized) {
       break;
     }
-    const trimmedKey = result.trim();
-    additionalKeys.push(trimmedKey);
-    allKeys.add(trimmedKey);
+    additionalKeys.push(normalized);
+    allKeys.add(normalized);
     keyNumber++;
   }
   return additionalKeys;
@@ -91314,17 +91434,17 @@ function createDefaultDns() {
 }
 function createDefaultTcp() {
   return {
-    connect: ({ host, port, timeoutMs }) => new Promise((resolve38) => {
+    connect: ({ host, port, timeoutMs }) => new Promise((resolve39) => {
       const start = Date.now();
       const socket = net2.createConnection({ host, port });
       const timer = setTimeout(() => {
         socket.destroy();
-        resolve38({ ok: false, layer: "tcp", detail: "timeout", latencyMs: Date.now() - start });
+        resolve39({ ok: false, layer: "tcp", detail: "timeout", latencyMs: Date.now() - start });
       }, timeoutMs);
       socket.on("connect", () => {
         clearTimeout(timer);
         socket.destroy();
-        resolve38({
+        resolve39({
           ok: true,
           layer: "tcp",
           detail: "connected",
@@ -91333,7 +91453,7 @@ function createDefaultTcp() {
       });
       socket.on("error", (err) => {
         clearTimeout(timer);
-        resolve38({
+        resolve39({
           ok: false,
           layer: "tcp",
           detail: err.message,
@@ -91345,11 +91465,11 @@ function createDefaultTcp() {
 }
 function createDefaultTls() {
   return {
-    get: (url, timeoutMs) => new Promise((resolve38) => {
+    get: (url, timeoutMs) => new Promise((resolve39) => {
       const start = Date.now();
       const timer = setTimeout(() => {
         req.destroy();
-        resolve38({ ok: false, layer: "tls", detail: "timeout", latencyMs: Date.now() - start });
+        resolve39({ ok: false, layer: "tls", detail: "timeout", latencyMs: Date.now() - start });
       }, timeoutMs);
       const req = https.get(url, {
         headers: {
@@ -91361,14 +91481,14 @@ function createDefaultTls() {
         const status = res.statusCode ?? 0;
         const latencyMs = Date.now() - start;
         if (status === 200) {
-          resolve38({ ok: true, layer: "tls", detail: `HTTP ${status}`, latencyMs });
+          resolve39({ ok: true, layer: "tls", detail: `HTTP ${status}`, latencyMs });
         } else {
-          resolve38({ ok: false, layer: "tls", detail: `HTTP ${status}`, latencyMs });
+          resolve39({ ok: false, layer: "tls", detail: `HTTP ${status}`, latencyMs });
         }
       });
       req.on("error", (err) => {
         clearTimeout(timer);
-        resolve38({
+        resolve39({
           ok: false,
           layer: "tls",
           detail: err.message,
@@ -91489,7 +91609,7 @@ async function checkGitHubReachability(deps) {
   };
 }
 function raceTimeout(promise, ms) {
-  return new Promise((resolve38, reject) => {
+  return new Promise((resolve39, reject) => {
     let settled = false;
     const timer = setTimeout(() => {
       setImmediate(() => {
@@ -91504,7 +91624,7 @@ function raceTimeout(promise, ms) {
         return;
       settled = true;
       clearTimeout(timer);
-      resolve38(v2);
+      resolve39(v2);
     }, (e2) => {
       if (settled)
         return;
@@ -92172,13 +92292,13 @@ init_config_version_checker();
 
 // src/domains/sync/sync-engine.ts
 import { lstat as lstat6, readFile as readFile48, readlink as readlink2, realpath as realpath8, stat as stat14 } from "node:fs/promises";
-import { isAbsolute as isAbsolute12, join as join89, normalize as normalize8, relative as relative18 } from "node:path";
+import { isAbsolute as isAbsolute12, join as join89, normalize as normalize8, relative as relative19 } from "node:path";
 
 // src/services/file-operations/ownership-checker.ts
 init_metadata_migration();
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 import { readFile as readFile47, stat as stat13 } from "node:fs/promises";
-import { relative as relative17 } from "node:path";
+import { relative as relative18 } from "node:path";
 
 // src/shared/concurrent-file-ops.ts
 init_p_limit();
@@ -92192,7 +92312,7 @@ async function mapWithLimit(items, fn, concurrency = DEFAULT_CONCURRENCY) {
 class OwnershipChecker {
   static async calculateChecksum(filePath) {
     try {
-      return createHash6("sha256").update(await readFile47(filePath)).digest("hex");
+      return createHash7("sha256").update(await readFile47(filePath)).digest("hex");
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       throw new Error(operationError("Checksum calculation", filePath, message));
@@ -92208,7 +92328,7 @@ class OwnershipChecker {
     if (!metadata || allTrackedFiles.length === 0) {
       return { path: filePath, ownership: "user", exists: true };
     }
-    const relativePath = relative17(claudeDir3, filePath).replace(/\\/g, "/");
+    const relativePath = relative18(claudeDir3, filePath).replace(/\\/g, "/");
     const tracked = allTrackedFiles.find((f3) => f3.path.replace(/\\/g, "/") === relativePath);
     if (!tracked) {
       return { path: filePath, ownership: "user", exists: true };
@@ -93389,7 +93509,7 @@ async function validateSymlinkChain(path8, basePath, maxDepth = MAX_SYMLINK_DEPT
       const target = await readlink2(current);
       const resolvedTarget = isAbsolute12(target) ? target : join89(current, "..", target);
       const normalizedTarget = normalize8(resolvedTarget);
-      const rel = relative18(basePath, normalizedTarget);
+      const rel = relative19(basePath, normalizedTarget);
       if (rel.startsWith("..") || isAbsolute12(rel)) {
         throw new Error(`Symlink chain escapes base directory at depth ${depth}: ${path8}`);
       }
@@ -93424,7 +93544,7 @@ async function validateSyncPath(basePath, filePath) {
     throw new Error(`Path traversal not allowed: ${filePath}`);
   }
   const fullPath = join89(basePath, normalized);
-  const rel = relative18(basePath, fullPath);
+  const rel = relative19(basePath, fullPath);
   if (rel.startsWith("..") || isAbsolute12(rel)) {
     throw new Error(`Path escapes base directory: ${filePath}`);
   }
@@ -93432,7 +93552,7 @@ async function validateSyncPath(basePath, filePath) {
   try {
     const resolvedBase = await realpath8(basePath);
     const resolvedFull = await realpath8(fullPath);
-    const resolvedRel = relative18(resolvedBase, resolvedFull);
+    const resolvedRel = relative19(resolvedBase, resolvedFull);
     if (resolvedRel.startsWith("..") || isAbsolute12(resolvedRel)) {
       throw new Error(`Symlink escapes base directory: ${filePath}`);
     }
@@ -93442,7 +93562,7 @@ async function validateSyncPath(basePath, filePath) {
       try {
         const resolvedBase = await realpath8(basePath);
         const resolvedParent = await realpath8(parentPath);
-        const resolvedRel = relative18(resolvedBase, resolvedParent);
+        const resolvedRel = relative19(resolvedBase, resolvedParent);
         if (resolvedRel.startsWith("..") || isAbsolute12(resolvedRel)) {
           throw new Error(`Parent symlink escapes base directory: ${filePath}`);
         }
@@ -94971,10 +95091,10 @@ init_types3();
 // src/domains/installation/utils/path-security.ts
 init_types3();
 import { lstatSync as lstatSync2, realpathSync as realpathSync4 } from "node:fs";
-import { relative as relative19, resolve as resolve40 } from "node:path";
+import { relative as relative20, resolve as resolve41 } from "node:path";
 var MAX_EXTRACTION_SIZE = 500 * 1024 * 1024;
 function isPathSafe(basePath, targetPath) {
-  const resolvedBase = resolve40(basePath);
+  const resolvedBase = resolve41(basePath);
   try {
     const stat15 = lstatSync2(targetPath);
     if (stat15.isSymbolicLink()) {
@@ -94984,8 +95104,8 @@ function isPathSafe(basePath, targetPath) {
       }
     }
   } catch {}
-  const resolvedTarget = resolve40(targetPath);
-  const relativePath = relative19(resolvedBase, resolvedTarget);
+  const resolvedTarget = resolve41(targetPath);
+  const relativePath = relative20(resolvedBase, resolvedTarget);
   return !relativePath.startsWith("..") && !relativePath.startsWith("/") && resolvedTarget.startsWith(resolvedBase);
 }
 
@@ -95072,7 +95192,7 @@ class FileDownloader {
         }
         if (downloadedSize !== totalSize) {
           fileStream.end();
-          await new Promise((resolve41) => fileStream.once("close", resolve41));
+          await new Promise((resolve42) => fileStream.once("close", resolve42));
           try {
             rmSync(destPath, { force: true });
           } catch (cleanupError) {
@@ -95086,7 +95206,7 @@ class FileDownloader {
         return destPath;
       } catch (error) {
         fileStream.end();
-        await new Promise((resolve41) => fileStream.once("close", resolve41));
+        await new Promise((resolve42) => fileStream.once("close", resolve42));
         try {
           rmSync(destPath, { force: true });
         } catch (cleanupError) {
@@ -95152,7 +95272,7 @@ class FileDownloader {
       const expectedSize = Number(response.headers.get("content-length"));
       if (expectedSize > 0 && downloadedSize !== expectedSize) {
         fileStream.end();
-        await new Promise((resolve41) => fileStream.once("close", resolve41));
+        await new Promise((resolve42) => fileStream.once("close", resolve42));
         try {
           rmSync(destPath, { force: true });
         } catch (cleanupError) {
@@ -95170,7 +95290,7 @@ class FileDownloader {
       return destPath;
     } catch (error) {
       fileStream.end();
-      await new Promise((resolve41) => fileStream.once("close", resolve41));
+      await new Promise((resolve42) => fileStream.once("close", resolve42));
       try {
         rmSync(destPath, { force: true });
       } catch (cleanupError) {
@@ -95789,10 +95909,10 @@ class Minipass extends EventEmitter3 {
     return this[ENCODING] ? buf.join("") : Buffer.concat(buf, buf.dataLength);
   }
   async promise() {
-    return new Promise((resolve41, reject) => {
+    return new Promise((resolve42, reject) => {
       this.on(DESTROYED, () => reject(new Error("stream destroyed")));
       this.on("error", (er) => reject(er));
-      this.on("end", () => resolve41());
+      this.on("end", () => resolve42());
     });
   }
   [Symbol.asyncIterator]() {
@@ -95811,7 +95931,7 @@ class Minipass extends EventEmitter3 {
         return Promise.resolve({ done: false, value: res });
       if (this[EOF])
         return stop();
-      let resolve41;
+      let resolve42;
       let reject;
       const onerr = (er) => {
         this.off("data", ondata);
@@ -95825,19 +95945,19 @@ class Minipass extends EventEmitter3 {
         this.off("end", onend);
         this.off(DESTROYED, ondestroy);
         this.pause();
-        resolve41({ value, done: !!this[EOF] });
+        resolve42({ value, done: !!this[EOF] });
       };
       const onend = () => {
         this.off("error", onerr);
         this.off("data", ondata);
         this.off(DESTROYED, ondestroy);
         stop();
-        resolve41({ done: true, value: undefined });
+        resolve42({ done: true, value: undefined });
       };
       const ondestroy = () => onerr(new Error("stream destroyed"));
       return new Promise((res2, rej) => {
         reject = rej;
-        resolve41 = res2;
+        resolve42 = res2;
         this.once(DESTROYED, ondestroy);
         this.once("error", onerr);
         this.once("end", onend);
@@ -96943,10 +97063,10 @@ class Minipass2 extends EventEmitter4 {
     return this[ENCODING2] ? buf.join("") : Buffer.concat(buf, buf.dataLength);
   }
   async promise() {
-    return new Promise((resolve41, reject) => {
+    return new Promise((resolve42, reject) => {
       this.on(DESTROYED2, () => reject(new Error("stream destroyed")));
       this.on("error", (er) => reject(er));
-      this.on("end", () => resolve41());
+      this.on("end", () => resolve42());
     });
   }
   [Symbol.asyncIterator]() {
@@ -96965,7 +97085,7 @@ class Minipass2 extends EventEmitter4 {
         return Promise.resolve({ done: false, value: res });
       if (this[EOF2])
         return stop();
-      let resolve41;
+      let resolve42;
       let reject;
       const onerr = (er) => {
         this.off("data", ondata);
@@ -96979,19 +97099,19 @@ class Minipass2 extends EventEmitter4 {
         this.off("end", onend);
         this.off(DESTROYED2, ondestroy);
         this.pause();
-        resolve41({ value, done: !!this[EOF2] });
+        resolve42({ value, done: !!this[EOF2] });
       };
       const onend = () => {
         this.off("error", onerr);
         this.off("data", ondata);
         this.off(DESTROYED2, ondestroy);
         stop();
-        resolve41({ done: true, value: undefined });
+        resolve42({ done: true, value: undefined });
       };
       const ondestroy = () => onerr(new Error("stream destroyed"));
       return new Promise((res2, rej) => {
         reject = rej;
-        resolve41 = res2;
+        resolve42 = res2;
         this.once(DESTROYED2, ondestroy);
         this.once("error", onerr);
         this.once("end", onend);
@@ -98419,10 +98539,10 @@ class Minipass3 extends EventEmitter5 {
     return this[ENCODING3] ? buf.join("") : Buffer.concat(buf, buf.dataLength);
   }
   async promise() {
-    return new Promise((resolve41, reject) => {
+    return new Promise((resolve42, reject) => {
       this.on(DESTROYED3, () => reject(new Error("stream destroyed")));
       this.on("error", (er) => reject(er));
-      this.on("end", () => resolve41());
+      this.on("end", () => resolve42());
     });
   }
   [Symbol.asyncIterator]() {
@@ -98441,7 +98561,7 @@ class Minipass3 extends EventEmitter5 {
         return Promise.resolve({ done: false, value: res });
       if (this[EOF3])
         return stop();
-      let resolve41;
+      let resolve42;
       let reject;
       const onerr = (er) => {
         this.off("data", ondata);
@@ -98455,19 +98575,19 @@ class Minipass3 extends EventEmitter5 {
         this.off("end", onend);
         this.off(DESTROYED3, ondestroy);
         this.pause();
-        resolve41({ value, done: !!this[EOF3] });
+        resolve42({ value, done: !!this[EOF3] });
       };
       const onend = () => {
         this.off("error", onerr);
         this.off("data", ondata);
         this.off(DESTROYED3, ondestroy);
         stop();
-        resolve41({ done: true, value: undefined });
+        resolve42({ done: true, value: undefined });
       };
       const ondestroy = () => onerr(new Error("stream destroyed"));
       return new Promise((res2, rej) => {
         reject = rej;
-        resolve41 = res2;
+        resolve42 = res2;
         this.once(DESTROYED3, ondestroy);
         this.once("error", onerr);
         this.once("end", onend);
@@ -99238,9 +99358,9 @@ var listFile = (opt, _files) => {
   const parse5 = new Parser(opt);
   const readSize = opt.maxReadSize || 16 * 1024 * 1024;
   const file = opt.file;
-  const p = new Promise((resolve41, reject) => {
+  const p = new Promise((resolve42, reject) => {
     parse5.on("error", reject);
-    parse5.on("end", resolve41);
+    parse5.on("end", resolve42);
     fs10.stat(file, (er, stat15) => {
       if (er) {
         reject(er);
@@ -101820,9 +101940,9 @@ var extractFile = (opt, _3) => {
   const u = new Unpack(opt);
   const readSize = opt.maxReadSize || 16 * 1024 * 1024;
   const file = opt.file;
-  const p = new Promise((resolve41, reject) => {
+  const p = new Promise((resolve42, reject) => {
     u.on("error", reject);
-    u.on("close", resolve41);
+    u.on("close", resolve42);
     fs17.stat(file, (er, stat15) => {
       if (er) {
         reject(er);
@@ -101955,7 +102075,7 @@ var replaceAsync = (opt, files) => {
     };
     fs18.read(fd, headBuf, 0, 512, position, onread);
   };
-  const promise = new Promise((resolve41, reject) => {
+  const promise = new Promise((resolve42, reject) => {
     p.on("error", reject);
     let flag = "r+";
     const onopen = (er, fd) => {
@@ -101980,7 +102100,7 @@ var replaceAsync = (opt, files) => {
           });
           p.pipe(stream);
           stream.on("error", reject);
-          stream.on("close", resolve41);
+          stream.on("close", resolve42);
           addFilesAsync2(p, files);
         });
       });
@@ -102110,7 +102230,7 @@ function decodeFilePath(path15) {
 init_logger();
 init_types3();
 import { copyFile as copyFile3, lstat as lstat7, mkdir as mkdir27, readdir as readdir24 } from "node:fs/promises";
-import { join as join102, relative as relative20 } from "node:path";
+import { join as join102, relative as relative21 } from "node:path";
 async function withRetry(fn, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -102134,7 +102254,7 @@ async function moveDirectoryContents(sourceDir, destDir, shouldExclude, sizeTrac
   for (const entry of entries) {
     const sourcePath = join102(sourceDir, entry);
     const destPath = join102(destDir, entry);
-    const relativePath = relative20(sourceDir, sourcePath);
+    const relativePath = relative21(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
       throw new ExtractionError(`Path traversal attempt detected: ${relativePath}`);
@@ -102162,7 +102282,7 @@ async function copyDirectory(sourceDir, destDir, shouldExclude, sizeTracker) {
   for (const entry of entries) {
     const sourcePath = join102(sourceDir, entry);
     const destPath = join102(destDir, entry);
-    const relativePath = relative20(sourceDir, sourcePath);
+    const relativePath = relative21(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
       throw new ExtractionError(`Path traversal attempt detected: ${relativePath}`);
@@ -102937,7 +103057,7 @@ import { join as join123 } from "node:path";
 
 // src/domains/installation/deletion-handler.ts
 import { existsSync as existsSync66, lstatSync as lstatSync3, readdirSync as readdirSync10, rmSync as rmSync2, rmdirSync, unlinkSync as unlinkSync4 } from "node:fs";
-import { dirname as dirname38, join as join108, relative as relative21, resolve as resolve42, sep as sep12 } from "node:path";
+import { dirname as dirname38, join as join108, relative as relative22, resolve as resolve43, sep as sep12 } from "node:path";
 
 // src/services/file-operations/manifest/manifest-reader.ts
 init_metadata_migration();
@@ -103133,7 +103253,7 @@ function collectFilesRecursively(dir, baseDir) {
     const entries = readdirSync10(dir, { withFileTypes: true });
     for (const entry of entries) {
       const fullPath = join108(dir, entry.name);
-      const relativePath = relative21(baseDir, fullPath);
+      const relativePath = relative22(baseDir, fullPath);
       if (entry.isDirectory()) {
         results.push(...collectFilesRecursively(fullPath, baseDir));
       } else {
@@ -103162,8 +103282,8 @@ function expandGlobPatterns(patterns, claudeDir3) {
 }
 var MAX_CLEANUP_ITERATIONS = 50;
 function cleanupEmptyDirectories(filePath, claudeDir3) {
-  const normalizedClaudeDir = resolve42(claudeDir3);
-  let currentDir = resolve42(dirname38(filePath));
+  const normalizedClaudeDir = resolve43(claudeDir3);
+  let currentDir = resolve43(dirname38(filePath));
   let iterations = 0;
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir) && iterations < MAX_CLEANUP_ITERATIONS) {
     iterations++;
@@ -103172,7 +103292,7 @@ function cleanupEmptyDirectories(filePath, claudeDir3) {
       if (entries.length === 0) {
         rmdirSync(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve42(dirname38(currentDir));
+        currentDir = resolve43(dirname38(currentDir));
       } else {
         break;
       }
@@ -103182,8 +103302,8 @@ function cleanupEmptyDirectories(filePath, claudeDir3) {
   }
 }
 function deletePath(fullPath, claudeDir3) {
-  const normalizedPath = resolve42(fullPath);
-  const normalizedClaudeDir = resolve42(claudeDir3);
+  const normalizedPath = resolve43(fullPath);
+  const normalizedClaudeDir = resolve43(claudeDir3);
   if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep12}`) && normalizedPath !== normalizedClaudeDir) {
     throw new Error(`Path traversal detected: ${fullPath}`);
   }
@@ -103256,8 +103376,8 @@ async function handleDeletions(sourceMetadata, claudeDir3, kitType) {
   const result = { deletedPaths: [], preservedPaths: [], errors: [] };
   for (const path16 of deletions) {
     const fullPath = join108(claudeDir3, path16);
-    const normalizedPath = resolve42(fullPath);
-    const normalizedClaudeDir = resolve42(claudeDir3);
+    const normalizedPath = resolve43(fullPath);
+    const normalizedClaudeDir = resolve43(claudeDir3);
     if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep12}`)) {
       logger.warning(`Skipping invalid path: ${path16}`);
       result.errors.push(path16);
@@ -103295,7 +103415,7 @@ init_logger();
 init_types3();
 var import_fs_extra16 = __toESM(require_lib(), 1);
 var import_ignore3 = __toESM(require_ignore(), 1);
-import { dirname as dirname42, join as join113, relative as relative24 } from "node:path";
+import { dirname as dirname42, join as join113, relative as relative25 } from "node:path";
 
 // src/domains/installation/selective-merger.ts
 import { stat as stat18 } from "node:fs/promises";
@@ -103471,7 +103591,7 @@ class SelectiveMerger {
 
 // src/domains/installation/merger/deleted-skill-preservation.ts
 init_metadata_migration();
-import { dirname as dirname39, join as join109, relative as relative22 } from "node:path";
+import { dirname as dirname39, join as join109, relative as relative23 } from "node:path";
 var import_fs_extra13 = __toESM(require_lib(), 1);
 async function findIgnoredSkillDirectories({
   files,
@@ -103516,7 +103636,7 @@ function shouldSkipIgnoredSkill(normalizedRelativePath, ignoredSkillDirectories)
 function findSourceSkillRoots(files, sourceDir) {
   const sourceSkillRoots = new Map;
   for (const file of files) {
-    const normalizedPath = relative22(sourceDir, file).replace(/\\/g, "/");
+    const normalizedPath = relative23(sourceDir, file).replace(/\\/g, "/");
     const metadataPath = toMetadataPath(normalizedPath);
     if (!metadataPath?.endsWith("/SKILL.md"))
       continue;
@@ -103548,7 +103668,7 @@ function findSkillRoot(path16, skillRoots) {
 init_logger();
 var import_fs_extra14 = __toESM(require_lib(), 1);
 var import_ignore2 = __toESM(require_ignore(), 1);
-import { relative as relative23 } from "node:path";
+import { relative as relative24 } from "node:path";
 import { join as join110 } from "node:path";
 
 // node_modules/@isaacs/balanced-match/dist/esm/index.js
@@ -105006,7 +105126,7 @@ class FileScanner {
     const entries = await import_fs_extra14.readdir(dir, { encoding: "utf8" });
     for (const entry of entries) {
       const fullPath = join110(dir, entry);
-      const relativePath = relative23(baseDir, fullPath);
+      const relativePath = relative24(baseDir, fullPath);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
       const stats = await import_fs_extra14.lstat(fullPath);
       if (stats.isSymbolicLink()) {
@@ -105977,7 +106097,7 @@ class CopyExecutor {
     const conflicts = [];
     const files = await this.fileScanner.getFiles(sourceDir, sourceDir);
     for (const file of files) {
-      const relativePath = relative24(sourceDir, file);
+      const relativePath = relative25(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
       const destPath = join113(destDir, relativePath);
       if (await import_fs_extra16.pathExists(destPath)) {
@@ -106001,7 +106121,7 @@ class CopyExecutor {
     let skippedCount = 0;
     let ignoredSkillSkipped = 0;
     for (const file of files) {
-      const relativePath = relative24(sourceDir, file);
+      const relativePath = relative25(sourceDir, file);
       const normalizedRelativePath = relativePath.replace(/\\/g, "/");
       const destPath = join113(destDir, relativePath);
       if (this.fileScanner.shouldNeverCopy(normalizedRelativePath)) {
@@ -106215,7 +106335,7 @@ class FileMerger {
 
 // src/domains/migration/legacy-migration.ts
 import { readdir as readdir28, stat as stat19 } from "node:fs/promises";
-import { join as join117, relative as relative25 } from "node:path";
+import { join as join117, relative as relative26 } from "node:path";
 // src/services/file-operations/manifest/manifest-tracker.ts
 import { join as join116 } from "node:path";
 
@@ -106688,7 +106808,7 @@ class LegacyMigration {
   static async classifyFiles(claudeDir3, manifest) {
     const files = await LegacyMigration.scanFiles(claudeDir3);
     const relevantFiles = files.filter((file) => {
-      const relativePath = relative25(claudeDir3, file);
+      const relativePath = relative26(claudeDir3, file);
       return !hasSkippedDirectorySegment(relativePath);
     });
     const skippedRuntimeArtifacts = files.length - relevantFiles.length;
@@ -106703,7 +106823,7 @@ class LegacyMigration {
     };
     const filesInManifest = [];
     for (const file of relevantFiles) {
-      const relativePath = relative25(claudeDir3, file).replace(/\\/g, "/");
+      const relativePath = relative26(claudeDir3, file).replace(/\\/g, "/");
       const manifestEntry = ReleaseManifestLoader.findFile(manifest, relativePath);
       if (!manifestEntry) {
         preview.userCreated.push(relativePath);
@@ -106899,7 +107019,7 @@ function buildConflictSummary(fileConflicts, hookConflicts, mcpConflicts) {
 init_logger();
 init_skip_directories();
 var import_fs_extra20 = __toESM(require_lib(), 1);
-import { join as join118, relative as relative26, resolve as resolve43 } from "node:path";
+import { join as join118, relative as relative27, resolve as resolve44 } from "node:path";
 
 class FileScanner2 {
   static async getFiles(dirPath, relativeTo) {
@@ -106938,7 +107058,7 @@ class FileScanner2 {
           const subFiles = await FileScanner2.getFiles(fullPath, basePath);
           files.push(...subFiles);
         } else if (stats.isFile()) {
-          const relativePath = relative26(basePath, fullPath);
+          const relativePath = relative27(basePath, fullPath);
           files.push(FileScanner2.toPosixPath(relativePath));
         }
       }
@@ -106979,8 +107099,8 @@ class FileScanner2 {
     return customFiles;
   }
   static isSafePath(basePath, targetPath) {
-    const resolvedBase = resolve43(basePath);
-    const resolvedTarget = resolve43(targetPath);
+    const resolvedBase = resolve44(basePath);
+    const resolvedTarget = resolve44(targetPath);
     return resolvedTarget.startsWith(resolvedBase);
   }
   static toPosixPath(path17) {
@@ -107605,9 +107725,9 @@ init_logger();
 init_skip_directories();
 init_types3();
 var import_fs_extra25 = __toESM(require_lib(), 1);
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 import { readFile as readFile58, readdir as readdir34, writeFile as writeFile32 } from "node:fs/promises";
-import { join as join124, relative as relative27 } from "node:path";
+import { join as join124, relative as relative28 } from "node:path";
 
 class SkillsManifestManager {
   static MANIFEST_FILENAME = ".skills-manifest.json";
@@ -107707,11 +107827,11 @@ class SkillsManifestManager {
     return skills.sort((a3, b3) => a3.name.localeCompare(b3.name));
   }
   static async hashDirectory(dirPath) {
-    const hash = createHash7("sha256");
+    const hash = createHash8("sha256");
     const files = await SkillsManifestManager.getAllFiles(dirPath);
     files.sort();
     for (const file of files) {
-      const relativePath = relative27(dirPath, file);
+      const relativePath = relative28(dirPath, file);
       const content = await readFile58(file);
       hash.update(relativePath);
       hash.update(content);
@@ -108446,14 +108566,14 @@ init_logger();
 
 // src/domains/skills/customization/comparison-engine.ts
 var import_fs_extra30 = __toESM(require_lib(), 1);
-import { relative as relative29 } from "node:path";
+import { relative as relative30 } from "node:path";
 
 // src/domains/skills/customization/hash-calculator.ts
 init_skip_directories();
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { readFile as readFile59, readdir as readdir38 } from "node:fs/promises";
-import { join as join128, relative as relative28 } from "node:path";
+import { join as join128, relative as relative29 } from "node:path";
 async function getAllFiles(dirPath) {
   const files = [];
   const entries = await readdir38(dirPath, { withFileTypes: true });
@@ -108472,12 +108592,12 @@ async function getAllFiles(dirPath) {
   return files;
 }
 async function hashFile(filePath) {
-  return new Promise((resolve44, reject) => {
-    const hash = createHash8("sha256");
+  return new Promise((resolve45, reject) => {
+    const hash = createHash9("sha256");
     const stream = createReadStream2(filePath);
     stream.on("data", (chunk) => hash.update(chunk));
     stream.on("end", () => {
-      resolve44(hash.digest("hex"));
+      resolve45(hash.digest("hex"));
     });
     stream.on("error", (error) => {
       stream.destroy();
@@ -108486,11 +108606,11 @@ async function hashFile(filePath) {
   });
 }
 async function hashDirectory(dirPath) {
-  const hash = createHash8("sha256");
+  const hash = createHash9("sha256");
   const files = await getAllFiles(dirPath);
   files.sort();
   for (const file of files) {
-    const relativePath = relative28(dirPath, file);
+    const relativePath = relative29(dirPath, file);
     const content = await readFile59(file);
     hash.update(relativePath);
     hash.update(content);
@@ -108524,8 +108644,8 @@ async function compareDirectories(dir1, dir2) {
   if (files1.length !== files2.length) {
     return true;
   }
-  const relFiles1 = files1.map((f3) => relative29(dir1, f3)).sort();
-  const relFiles2 = files2.map((f3) => relative29(dir2, f3)).sort();
+  const relFiles1 = files1.map((f3) => relative30(dir1, f3)).sort();
+  const relFiles2 = files2.map((f3) => relative30(dir2, f3)).sort();
   if (JSON.stringify(relFiles1) !== JSON.stringify(relFiles2)) {
     return true;
   }
@@ -108543,12 +108663,12 @@ async function detectFileChanges(currentSkillPath, baselineSkillPath) {
   const currentFiles = await getAllFiles(currentSkillPath);
   const baselineFiles = await import_fs_extra30.pathExists(baselineSkillPath) ? await getAllFiles(baselineSkillPath) : [];
   const currentFileMap = new Map(await Promise.all(currentFiles.map(async (f3) => {
-    const relPath = relative29(currentSkillPath, f3);
+    const relPath = relative30(currentSkillPath, f3);
     const hash = await hashFile(f3);
     return [relPath, hash];
   })));
   const baselineFileMap = new Map(await Promise.all(baselineFiles.map(async (f3) => {
-    const relPath = relative29(baselineSkillPath, f3);
+    const relPath = relative30(baselineSkillPath, f3);
     const hash = await hashFile(f3);
     return [relPath, hash];
   })));
@@ -108995,7 +109115,8 @@ async function resolveOptions(ctx) {
     sync: parsed.sync ?? false,
     useGit: parsed.useGit ?? false,
     archive: parsed.archive,
-    kitPath: parsed.kitPath
+    kitPath: parsed.kitPath,
+    installMode: parsed.installMode ?? "auto"
   };
   ConfigManager.setGlobalFlag(validOptions.global);
   if (validOptions.global) {
@@ -109125,13 +109246,22 @@ async function handlePostInstall(ctx) {
 }
 // src/commands/init/phases/plugin-install-handler.ts
 init_codex_plugin_installer();
-import { cpSync as cpSync2, existsSync as existsSync69, mkdirSync as mkdirSync6, readFileSync as readFileSync22, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join136 } from "node:path";
+import { cpSync as cpSync2, existsSync as existsSync70, mkdirSync as mkdirSync6, readFileSync as readFileSync22, rmSync as rmSync5, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join137 } from "node:path";
 
 // src/domains/installation/plugin/migrate-legacy-to-plugin.ts
 init_install_mode_detector();
-import { cpSync, existsSync as existsSync68, mkdirSync as mkdirSync5, readFileSync as readFileSync21, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
-import { dirname as dirname43, join as join135 } from "node:path";
+import { createHash as createHash10 } from "node:crypto";
+import {
+  cpSync,
+  existsSync as existsSync68,
+  mkdirSync as mkdirSync5,
+  readFileSync as readFileSync21,
+  readdirSync as readdirSync11,
+  rmSync as rmSync3,
+  writeFileSync as writeFileSync7
+} from "node:fs";
+import { dirname as dirname43, join as join135, relative as relative31, resolve as resolve45 } from "node:path";
 
 // src/domains/installation/plugin/plugin-installer.ts
 init_install_mode_detector();
@@ -109239,18 +109369,11 @@ async function migrateLegacyToPlugin(opts) {
   if (!await installer.isClaudeAvailable() || !await installer.isPluginSupported()) {
     return base("skipped-cc-unsupported", before.mode, false);
   }
-  const added = await installer.marketplaceAdd(opts.pluginSourceDir);
-  if (!added.ok) {
+  const prepared = before.plugin.installed ? await refreshExistingPlugin(installer, opts.pluginSourceDir, before.plugin.enabled) : await installPlugin(installer, opts.pluginSourceDir);
+  if (!prepared.ok) {
     return {
       ...base("install-failed", before.mode, false),
-      error: `marketplace add failed: ${added.stderr.trim()}`
-    };
-  }
-  const installed = await installer.install("user");
-  if (!installed.ok) {
-    return {
-      ...base("install-failed", before.mode, false),
-      error: `plugin install failed: ${installed.stderr.trim()}`
+      error: prepared.error
     };
   }
   const verified = await installer.verifyInstalled();
@@ -109296,30 +109419,172 @@ function base(action, modeBefore, pluginVerified) {
   };
 }
 var PLUGIN_SUPPLIED_LEGACY_PREFIXES2 = ["agents/", "skills/"];
+var LEGACY_SENTINEL_FILENAMES = new Set([".gitignore"]);
 function defaultLegacyRemover(claudeDir3, backupDir) {
   const meta = readJsonSafe3(join135(claudeDir3, "metadata.json"));
   const files = collectTrackedFiles2(meta);
   const removed = [];
   for (const file of files) {
-    if (file.ownership === "user")
+    const legacyPath = resolveSafePluginSuppliedLegacyPath2(claudeDir3, file.path);
+    if (!legacyPath)
       continue;
-    if (!isPluginSuppliedLegacyPath(file.path))
+    if (!existsSync68(legacyPath.absolutePath))
       continue;
-    const abs = join135(claudeDir3, file.path);
-    if (!existsSync68(abs))
+    if (!isSafeToRemovePluginSuppliedLegacyFile(file, legacyPath.absolutePath))
       continue;
-    const backupTarget = join135(backupDir, file.path);
-    mkdirSync5(dirname43(backupTarget), { recursive: true });
-    cpSync(abs, backupTarget, { recursive: true });
-    rmSync3(abs, { recursive: true, force: true });
-    removed.push(file.path);
+    if (!backupAndRemove(backupDir, legacyPath.relativePath, legacyPath.absolutePath))
+      continue;
+    removed.push(legacyPath.relativePath);
   }
+  removed.push(...removeOrphanLegacySentinels(claudeDir3, backupDir, removed));
   return removed;
 }
-function isPluginSuppliedLegacyPath(pathValue) {
-  const normalized = pathValue.replace(/\\/g, "/").replace(/^\.claude\//, "");
+function backupAndRemove(backupDir, relativePath, abs) {
+  const backupTarget = resolveSafeChildPath2(backupDir, relativePath);
+  if (!backupTarget)
+    return false;
+  mkdirSync5(dirname43(backupTarget), { recursive: true });
+  cpSync(abs, backupTarget, { recursive: true });
+  rmSync3(abs, { recursive: true, force: true });
+  return true;
+}
+function removeOrphanLegacySentinels(claudeDir3, backupDir, removedTrackedPaths) {
+  const normalizedRemoved = removedTrackedPaths.map(normalizeLegacyPath2);
+  const rootsToSweep = new Set;
+  for (const pathValue of normalizedRemoved) {
+    const [root] = pathValue.split("/");
+    if (root && PLUGIN_SUPPLIED_LEGACY_PREFIXES2.includes(`${root}/`)) {
+      rootsToSweep.add(root);
+    }
+  }
+  const removed = [];
+  for (const root of [...rootsToSweep].sort(compareLegacyPaths)) {
+    const rootAbs = join135(claudeDir3, root);
+    if (!existsSync68(rootAbs))
+      continue;
+    const sentinels = findLegacySentinels(rootAbs).sort((a3, b3) => compareLegacyPaths(relative31(claudeDir3, a3), relative31(claudeDir3, b3)));
+    for (const sentinelAbs of sentinels) {
+      const sentinelPath = normalizeLegacyPath2(relative31(claudeDir3, sentinelAbs));
+      if (!isSafeToRemoveLegacySentinel(sentinelPath, sentinelAbs, normalizedRemoved))
+        continue;
+      if (!backupAndRemove(backupDir, sentinelPath, sentinelAbs))
+        continue;
+      removed.push(sentinelPath);
+    }
+  }
+  return removed;
+}
+function findLegacySentinels(dir) {
+  const out = [];
+  let entries;
+  try {
+    entries = readdirSync11(dir, { withFileTypes: true });
+  } catch {
+    return out;
+  }
+  for (const entry of entries.sort((a3, b3) => compareLegacyPaths(a3.name, b3.name))) {
+    const abs = join135(dir, entry.name);
+    if (entry.isDirectory()) {
+      out.push(...findLegacySentinels(abs));
+    } else if (entry.isFile() && LEGACY_SENTINEL_FILENAMES.has(entry.name)) {
+      out.push(abs);
+    }
+  }
+  return out;
+}
+function isSafeToRemoveLegacySentinel(sentinelPath, sentinelAbs, removedTrackedPaths) {
+  if (!isPluginSuppliedLegacyPath2(sentinelPath))
+    return false;
+  if (!LEGACY_SENTINEL_FILENAMES.has(sentinelPath.split("/").pop() ?? ""))
+    return false;
+  const sentinelDir = dirname43(sentinelPath).replace(/\\/g, "/");
+  if (!removedTrackedPaths.some((removedPath) => removedPath.startsWith(`${sentinelDir}/`))) {
+    return false;
+  }
+  return directoryContainsOnlySentinels(dirname43(sentinelAbs));
+}
+function directoryContainsOnlySentinels(dir) {
+  let entries;
+  try {
+    entries = readdirSync11(dir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  for (const entry of entries) {
+    const abs = join135(dir, entry.name);
+    if (entry.isDirectory()) {
+      if (!directoryContainsOnlySentinels(abs))
+        return false;
+    } else if (!entry.isFile() || !LEGACY_SENTINEL_FILENAMES.has(entry.name)) {
+      return false;
+    }
+  }
+  return true;
+}
+function isSafeToRemovePluginSuppliedLegacyFile(file, abs) {
+  if (file.ownership !== "user") {
+    return true;
+  }
+  return checksumMatches2(abs, file.checksum);
+}
+function checksumMatches2(filePath, expected) {
+  if (!expected || !/^[a-f0-9]{64}$/i.test(expected)) {
+    return false;
+  }
+  try {
+    const actual = createHash10("sha256").update(readFileSync21(filePath)).digest("hex");
+    return actual.toLowerCase() === expected.toLowerCase();
+  } catch {
+    return false;
+  }
+}
+function isPluginSuppliedLegacyPath2(pathValue) {
+  const normalized = normalizeLegacyPath2(pathValue).replace(/^\.claude\//, "");
   return PLUGIN_SUPPLIED_LEGACY_PREFIXES2.some((prefix) => normalized.startsWith(prefix));
 }
+function resolveSafePluginSuppliedLegacyPath2(claudeDir3, pathValue) {
+  const normalized = normalizeLegacyPath2(pathValue).replace(/^\.\/+/, "");
+  if (!isPluginSuppliedLegacyPath2(normalized))
+    return null;
+  const safe = resolveSafeChildPath2(claudeDir3, normalized);
+  if (!safe)
+    return null;
+  const relativePath = normalizeLegacyPath2(relative31(resolve45(claudeDir3), safe));
+  if (!isPluginSuppliedLegacyPath2(relativePath))
+    return null;
+  return { absolutePath: safe, relativePath };
+}
+function resolveSafeChildPath2(baseDir, pathValue) {
+  const normalized = normalizeLegacyPath2(pathValue);
+  if (!normalized || hasPathTraversal2(normalized) || isAbsoluteLike3(normalized))
+    return null;
+  const resolvedBase = resolve45(baseDir);
+  const resolvedTarget = resolve45(resolvedBase, normalized);
+  const relativePath = normalizeLegacyPath2(relative31(resolvedBase, resolvedTarget));
+  if (!relativePath || relativePath === ".." || relativePath.startsWith("../"))
+    return null;
+  if (isAbsoluteLike3(relativePath))
+    return null;
+  return resolvedTarget;
+}
+function hasPathTraversal2(pathValue) {
+  return pathValue.split("/").some((segment) => segment === "..");
+}
+function isAbsoluteLike3(pathValue) {
+  return pathValue.startsWith("/") || pathValue.startsWith("//") || /^[A-Za-z]:/.test(pathValue);
+}
+function normalizeLegacyPath2(pathValue) {
+  return pathValue.replace(/\\/g, "/");
+}
+function compareLegacyPaths(a3, b3) {
+  const normalizedA = normalizeLegacyPath2(a3);
+  const normalizedB = normalizeLegacyPath2(b3);
+  if (normalizedA < normalizedB)
+    return -1;
+  if (normalizedA > normalizedB)
+    return 1;
+  return 0;
+}
 function collectTrackedFiles2(meta) {
   if (!isRecord3(meta))
     return [];
@@ -109330,7 +109595,11 @@ function collectTrackedFiles2(meta) {
     for (const f3 of arr) {
       if (isRecord3(f3) && typeof f3.path === "string") {
         const ownership = f3.ownership === "user" || f3.ownership === "ck-modified" ? f3.ownership : "ck";
-        out.push({ path: f3.path, ownership });
+        out.push({
+          path: f3.path,
+          ownership,
+          checksum: typeof f3.checksum === "string" ? f3.checksum : undefined
+        });
       }
     }
   };
@@ -109359,10 +109628,86 @@ function readJsonSafe3(filePath) {
     return null;
   }
 }
+async function installPlugin(installer, pluginSourceDir) {
+  const added = await installer.marketplaceAdd(pluginSourceDir);
+  if (!added.ok) {
+    return { ok: false, error: `marketplace add failed: ${added.stderr.trim()}` };
+  }
+  const installed = await installer.install("user");
+  if (!installed.ok) {
+    return { ok: false, error: `plugin install failed: ${installed.stderr.trim()}` };
+  }
+  return { ok: true };
+}
+async function refreshExistingPlugin(installer, pluginSourceDir, enabled) {
+  const added = await installer.marketplaceAdd(pluginSourceDir);
+  if (!added.ok) {
+    const updatedMarketplace = await installer.marketplaceUpdate();
+    if (!updatedMarketplace.ok) {
+      return {
+        ok: false,
+        error: `marketplace refresh failed: ${updatedMarketplace.stderr.trim() || added.stderr.trim()}`
+      };
+    }
+  }
+  if (!enabled) {
+    const enabledResult = await installer.enable();
+    if (!enabledResult.ok) {
+      return { ok: false, error: `plugin enable failed: ${enabledResult.stderr.trim()}` };
+    }
+  }
+  const updated = await installer.update();
+  if (!updated.ok) {
+    return { ok: false, error: `plugin update failed: ${updated.stderr.trim()}` };
+  }
+  return { ok: true };
+}
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/domains/installation/plugin/uninstall-plugin.ts
+init_install_mode_detector();
+import { existsSync as existsSync69, rmSync as rmSync4 } from "node:fs";
+import { join as join136 } from "node:path";
+init_path_resolver();
+async function uninstallEnginePlugin(opts = {}) {
+  const claudeDir3 = opts.claudeDir ?? PathResolver.getGlobalKitDir();
+  const installer = opts.installer ?? new PluginInstaller(undefined, claudeDir3);
+  const state = detectPluginState(claudeDir3);
+  let uninstalled = false;
+  const errors2 = [];
+  if (state.installed) {
+    const removed = await installer.uninstall();
+    if (removed.ok) {
+      uninstalled = true;
+    } else {
+      errors2.push(`plugin uninstall failed: ${removed.stderr.trim() || "unknown error"}`);
+    }
+    const marketplaceRemoved = await installer.marketplaceRemove(state.marketplace ?? CK_MARKETPLACE_NAME);
+    if (!marketplaceRemoved.ok) {
+      errors2.push(`marketplace remove failed: ${marketplaceRemoved.stderr.trim() || "unknown error"}`);
+    }
+  }
+  let staleCacheRemoved = false;
+  const marketplace = state.marketplace ?? CK_MARKETPLACE_NAME;
+  const cacheDir = join136(claudeDir3, "plugins", "cache", marketplace, CK_PLUGIN_NAME);
+  if (existsSync69(cacheDir)) {
+    rmSync4(cacheDir, { recursive: true, force: true });
+    staleCacheRemoved = true;
+  }
+  const pluginStillInstalled = state.installed ? detectPluginState(claudeDir3).installed : false;
+  if (pluginStillInstalled) {
+    errors2.push("plugin remains registered after cleanup");
+  }
+  return {
+    uninstalled,
+    staleCacheRemoved,
+    pluginStillInstalled,
+    error: errors2.length > 0 ? errors2.join("; ") : undefined
+  };
+}
+
 // src/commands/init/phases/plugin-install-handler.ts
 init_logger();
 init_path_resolver();
@@ -109373,12 +109718,43 @@ async function handlePluginInstall(ctx, deps = {}) {
   }
   const migrate = deps.migrate ?? migrateLegacyToPlugin;
   const installCodex = deps.installCodex ?? installCodexPlugin;
+  const uninstallClaude = deps.uninstallClaudePlugin ?? uninstallEnginePlugin;
+  const removeCodex = deps.removeCodexPlugin ?? removeCodexPlugin;
+  if (ctx.options.installMode === "legacy") {
+    let cleanupError = null;
+    try {
+      const result = await uninstallClaude({ claudeDir: ctx.claudeDir });
+      logLegacyPluginCleanup(result);
+      if (result.pluginStillInstalled) {
+        cleanupError = new Error(`Claude plugin cleanup failed for legacy install mode: ${result.error ?? "plugin remains registered"}`);
+      }
+    } catch (err) {
+      logger.verbose(`Claude plugin cleanup skipped: ${err.message}`);
+      cleanupError = err;
+    }
+    try {
+      const result = await removeCodex();
+      logCodexPluginCleanup(result);
+    } catch (err) {
+      logger.verbose(`Codex plugin cleanup skipped: ${err.message}`);
+    }
+    if (cleanupError) {
+      throw cleanupError;
+    }
+    return ctx;
+  }
   try {
     const pluginSourceDir = stagePluginSource(ctx.extractDir, deps.stageBaseDir);
     try {
       const result = await migrate({ pluginSourceDir, claudeDir: ctx.claudeDir });
       logPluginResult(result);
+      if (ctx.options.installMode === "plugin" && !result.pluginVerified) {
+        throw new Error(`Claude plugin install failed: ${result.error ?? result.action}`);
+      }
     } catch (err) {
+      if (ctx.options.installMode === "plugin") {
+        throw err;
+      }
       logger.verbose(`Claude plugin install skipped (legacy copy retained): ${err.message}`);
     }
     try {
@@ -109388,19 +109764,29 @@ async function handlePluginInstall(ctx, deps = {}) {
       logger.verbose(`Codex plugin install skipped: ${err.message}`);
     }
   } catch (err) {
+    if (ctx.options.installMode === "plugin") {
+      throw err;
+    }
     logger.verbose(`Plugin staging skipped (legacy copy retained): ${err.message}`);
   }
   return ctx;
 }
+function logLegacyPluginCleanup(result) {
+  if (result.uninstalled || result.staleCacheRemoved) {
+    logger.info("Removed ClaudeKit Engineer plugin state for legacy install mode.");
+  } else {
+    logger.verbose("No ClaudeKit Engineer Claude plugin state found for legacy install mode.");
+  }
+}
 function stagePluginSource(extractDir, stageBaseDir) {
-  const base2 = stageBaseDir ?? join136(PathResolver.getCacheDir(true), "ck-plugin-source");
-  const payloadSrc = join136(extractDir, ".claude");
-  if (!existsSync69(payloadSrc)) {
+  const base2 = stageBaseDir ?? join137(PathResolver.getCacheDir(true), "ck-plugin-source");
+  const payloadSrc = join137(extractDir, ".claude");
+  if (!existsSync70(payloadSrc)) {
     throw new Error(`plugin payload not found in archive: ${payloadSrc}`);
   }
-  rmSync4(base2, { recursive: true, force: true });
+  rmSync5(base2, { recursive: true, force: true });
   mkdirSync6(base2, { recursive: true });
-  const stagedPayload = join136(base2, ".claude");
+  const stagedPayload = join137(base2, ".claude");
   cpSync2(payloadSrc, stagedPayload, { recursive: true });
   ensureCodexPluginManifest(stagedPayload);
   const claudeMarketplace = {
@@ -109408,8 +109794,8 @@ function stagePluginSource(extractDir, stageBaseDir) {
     owner: { name: "ClaudeKit" },
     plugins: [{ name: "ck", source: "./.claude", description: "ClaudeKit Engineer" }]
   };
-  mkdirSync6(join136(base2, ".claude-plugin"), { recursive: true });
-  writeFileSync8(join136(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(claudeMarketplace, null, 2)}
+  mkdirSync6(join137(base2, ".claude-plugin"), { recursive: true });
+  writeFileSync8(join137(base2, ".claude-plugin", "marketplace.json"), `${JSON.stringify(claudeMarketplace, null, 2)}
 `, "utf-8");
   const codexMarketplace = {
     name: "claudekit",
@@ -109423,16 +109809,16 @@ function stagePluginSource(extractDir, stageBaseDir) {
       }
     ]
   };
-  mkdirSync6(join136(base2, ".agents", "plugins"), { recursive: true });
-  writeFileSync8(join136(base2, ".agents", "plugins", "marketplace.json"), `${JSON.stringify(codexMarketplace, null, 2)}
+  mkdirSync6(join137(base2, ".agents", "plugins"), { recursive: true });
+  writeFileSync8(join137(base2, ".agents", "plugins", "marketplace.json"), `${JSON.stringify(codexMarketplace, null, 2)}
 `, "utf-8");
   return base2;
 }
 function ensureCodexPluginManifest(pluginRoot) {
-  const manifestPath = join136(pluginRoot, ".codex-plugin", "plugin.json");
-  if (existsSync69(manifestPath))
+  const manifestPath = join137(pluginRoot, ".codex-plugin", "plugin.json");
+  if (existsSync70(manifestPath))
     return;
-  const claudeManifest = readJsonSafe4(join136(pluginRoot, ".claude-plugin", "plugin.json"));
+  const claudeManifest = readJsonSafe4(join137(pluginRoot, ".claude-plugin", "plugin.json"));
   const manifest = pruneUndefined({
     name: stringField(claudeManifest, "name") ?? "ck",
     version: stringField(claudeManifest, "version") ?? "0.0.0",
@@ -109453,7 +109839,7 @@ function ensureCodexPluginManifest(pluginRoot) {
       websiteURL: "https://github.com/claudekit/claudekit-engineer"
     }
   });
-  mkdirSync6(join136(pluginRoot, ".codex-plugin"), { recursive: true });
+  mkdirSync6(join137(pluginRoot, ".codex-plugin"), { recursive: true });
   writeFileSync8(manifestPath, `${JSON.stringify(manifest, null, 2)}
 `, "utf-8");
 }
@@ -109514,11 +109900,18 @@ function logCodexPluginResult(result) {
       break;
   }
 }
+function logCodexPluginCleanup(result) {
+  if (result.removed || result.marketplaceRemoved) {
+    logger.info("Removed ClaudeKit Engineer Codex plugin state for legacy install mode.");
+  } else {
+    logger.verbose("No ClaudeKit Engineer Codex plugin state found for legacy install mode.");
+  }
+}
 // src/commands/init/phases/selection-handler.ts
 init_config_manager();
 init_github_client();
 import { mkdir as mkdir36 } from "node:fs/promises";
-import { join as join139, resolve as resolve46 } from "node:path";
+import { join as join140, resolve as resolve48 } from "node:path";
 
 // src/domains/github/kit-access-checker.ts
 init_error2();
@@ -109690,8 +110083,8 @@ init_hook_health_checker();
 
 // src/domains/installation/fresh-installer.ts
 init_metadata_migration();
-import { existsSync as existsSync70, readdirSync as readdirSync11, rmSync as rmSync5, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
-import { basename as basename28, dirname as dirname44, join as join137, resolve as resolve44 } from "node:path";
+import { existsSync as existsSync71, readdirSync as readdirSync12, rmSync as rmSync6, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
+import { basename as basename28, dirname as dirname44, join as join138, resolve as resolve46 } from "node:path";
 init_logger();
 init_safe_spinner();
 var import_fs_extra35 = __toESM(require_lib(), 1);
@@ -109743,15 +110136,15 @@ async function analyzeFreshInstallation(claudeDir3) {
   };
 }
 function cleanupEmptyDirectories2(filePath, claudeDir3) {
-  const normalizedClaudeDir = resolve44(claudeDir3);
-  let currentDir = resolve44(dirname44(filePath));
+  const normalizedClaudeDir = resolve46(claudeDir3);
+  let currentDir = resolve46(dirname44(filePath));
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir)) {
     try {
-      const entries = readdirSync11(currentDir);
+      const entries = readdirSync12(currentDir);
       if (entries.length === 0) {
         rmdirSync2(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve44(dirname44(currentDir));
+        currentDir = resolve46(dirname44(currentDir));
       } else {
         break;
       }
@@ -109773,8 +110166,8 @@ async function removeFilesByOwnership(claudeDir3, analysis, includeModified) {
     logger.debug(`${KIT_MANIFEST_FILE} was self-tracked; skipping from delete loop — will be rewritten by updateMetadataAfterFresh`);
   }
   for (const file of filesToRemove) {
-    const fullPath = join137(claudeDir3, file.path);
-    if (!existsSync70(fullPath)) {
+    const fullPath = join138(claudeDir3, file.path);
+    if (!existsSync71(fullPath)) {
       continue;
     }
     try {
@@ -109801,7 +110194,7 @@ async function removeFilesByOwnership(claudeDir3, analysis, includeModified) {
   };
 }
 async function updateMetadataAfterFresh(claudeDir3, removedFiles, metadata) {
-  const metadataPath = join137(claudeDir3, KIT_MANIFEST_FILE);
+  const metadataPath = join138(claudeDir3, KIT_MANIFEST_FILE);
   const removedSet = new Set(removedFiles);
   if (metadata.kits) {
     for (const kitName of Object.keys(metadata.kits)) {
@@ -109832,8 +110225,8 @@ function getFreshBackupTargets(claudeDir3, analysis, includeModified) {
       mutatePaths: filesToRemove.length > 0 ? ["metadata.json"] : []
     };
   }
-  const deletePaths = CLAUDEKIT_SUBDIRECTORIES.filter((subdir) => existsSync70(join137(claudeDir3, subdir)));
-  if (existsSync70(join137(claudeDir3, "metadata.json"))) {
+  const deletePaths = CLAUDEKIT_SUBDIRECTORIES.filter((subdir) => existsSync71(join138(claudeDir3, subdir)));
+  if (existsSync71(join138(claudeDir3, "metadata.json"))) {
     deletePaths.push("metadata.json");
   }
   return {
@@ -109855,15 +110248,15 @@ async function removeSubdirectoriesFallback(claudeDir3) {
   const removedFiles = [];
   let removedDirCount = 0;
   for (const subdir of CLAUDEKIT_SUBDIRECTORIES) {
-    const subdirPath = join137(claudeDir3, subdir);
+    const subdirPath = join138(claudeDir3, subdir);
     if (await import_fs_extra35.pathExists(subdirPath)) {
-      rmSync5(subdirPath, { recursive: true, force: true });
+      rmSync6(subdirPath, { recursive: true, force: true });
       removedDirCount++;
       removedFiles.push(`${subdir}/ (entire directory)`);
       logger.debug(`Removed subdirectory: ${subdir}/`);
     }
   }
-  const metadataPath = join137(claudeDir3, "metadata.json");
+  const metadataPath = join138(claudeDir3, "metadata.json");
   if (await import_fs_extra35.pathExists(metadataPath)) {
     unlinkSync5(metadataPath);
     removedFiles.push("metadata.json");
@@ -109941,7 +110334,7 @@ async function handleFreshInstallation(claudeDir3, prompts) {
 var import_fs_extra36 = __toESM(require_lib(), 1);
 import { cp as cp5, mkdir as mkdir35, readdir as readdir42, rename as rename11, rm as rm16, stat as stat22 } from "node:fs/promises";
 import { homedir as homedir47 } from "node:os";
-import { dirname as dirname45, join as join138, normalize as normalize11, resolve as resolve45 } from "node:path";
+import { dirname as dirname45, join as join139, normalize as normalize11, resolve as resolve47 } from "node:path";
 var LEGACY_KIT_MARKERS = [
   "metadata.json",
   ".ck.json",
@@ -109967,7 +110360,7 @@ function uniqueNormalizedPaths(paths) {
   const seen = new Set;
   const result = [];
   for (const path17 of paths) {
-    const normalized = normalize11(resolve45(path17));
+    const normalized = normalize11(resolve47(path17));
     if (seen.has(normalized))
       continue;
     seen.add(normalized);
@@ -109980,10 +110373,10 @@ function getLegacyWindowsGlobalKitDirCandidates(env2 = process.env, homeDir = ho
   const localAppData = safeEnvPath(env2.LOCALAPPDATA);
   const appData = safeEnvPath(env2.APPDATA);
   if (localAppData) {
-    candidates.push(join138(localAppData, ".claude"));
+    candidates.push(join139(localAppData, ".claude"));
   }
   if (appData) {
-    candidates.push(join138(appData, ".claude"));
+    candidates.push(join139(appData, ".claude"));
   }
   if (homeDir) {
     candidates.push(`${withoutTrailingSeparators(homeDir)}.claude`);
@@ -110001,7 +110394,7 @@ async function hasKitMarkers(dir) {
   if (!await isDirectory(dir))
     return false;
   for (const marker of LEGACY_KIT_MARKERS) {
-    if (await import_fs_extra36.pathExists(join138(dir, marker))) {
+    if (await import_fs_extra36.pathExists(join139(dir, marker))) {
       return true;
     }
   }
@@ -110032,8 +110425,8 @@ async function repairLegacyWindowsGlobalKitDir(options2) {
   if (safeEnvPath(env2.CLAUDE_CONFIG_DIR)) {
     return { status: "skipped", reason: "custom-global-dir", candidateDirs: [] };
   }
-  const targetDir = normalize11(resolve45(options2.targetDir));
-  const candidateDirs = getLegacyWindowsGlobalKitDirCandidates(env2, options2.homeDir).filter((candidate) => normalize11(resolve45(candidate)) !== targetDir);
+  const targetDir = normalize11(resolve47(options2.targetDir));
+  const candidateDirs = getLegacyWindowsGlobalKitDirCandidates(env2, options2.homeDir).filter((candidate) => normalize11(resolve47(candidate)) !== targetDir);
   const legacyDirs = [];
   for (const candidate of candidateDirs) {
     if (await hasKitMarkers(candidate)) {
@@ -110256,7 +110649,7 @@ async function handleSelection(ctx) {
       }
     }
   }
-  const resolvedDir = resolve46(targetDir);
+  const resolvedDir = resolve48(targetDir);
   if (ctx.options.global) {
     try {
       const repairResult = await repairLegacyWindowsGlobalKitDir({ targetDir: resolvedDir });
@@ -110303,7 +110696,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir3 = prefix ? join139(resolvedDir, prefix) : resolvedDir;
+    const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir3);
       if (existingMetadata?.kits) {
@@ -110340,7 +110733,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir3 = prefix ? join139(resolvedDir, prefix) : resolvedDir;
+    const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir3, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -110360,7 +110753,7 @@ async function handleSelection(ctx) {
     let currentVersion = null;
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir3 = prefix ? join139(resolvedDir, prefix) : resolvedDir;
+      const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir3);
       currentVersion = existingMetadata?.kits?.[kitType]?.version || null;
       if (currentVersion) {
@@ -110429,7 +110822,7 @@ async function handleSelection(ctx) {
   if (ctx.options.yes && !ctx.options.fresh && !ctx.options.force && !ctx.options.restoreCkHooks && releaseTag && !isOfflineMode && !pendingKits?.length) {
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir3 = prefix ? join139(resolvedDir, prefix) : resolvedDir;
+      const claudeDir3 = prefix ? join140(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir3);
       const installedKitVersion = existingMetadata?.kits?.[kitType]?.version;
       if (installedKitVersion && versionsMatch(installedKitVersion, releaseTag)) {
@@ -110458,7 +110851,7 @@ async function handleSelection(ctx) {
 }
 // src/commands/init/phases/sync-handler.ts
 import { copyFile as copyFile8, mkdir as mkdir37, open as open5, readFile as readFile61, rename as rename12, stat as stat23, unlink as unlink13, writeFile as writeFile35 } from "node:fs/promises";
-import { dirname as dirname46, join as join140, resolve as resolve47 } from "node:path";
+import { dirname as dirname46, join as join141, resolve as resolve49 } from "node:path";
 init_logger();
 init_path_resolver();
 var import_fs_extra38 = __toESM(require_lib(), 1);
@@ -110467,14 +110860,14 @@ async function handleSync(ctx) {
   if (!ctx.options.sync) {
     return ctx;
   }
-  const resolvedDir = ctx.options.global ? PathResolver.getGlobalKitDir() : resolve47(ctx.options.dir || ".");
-  const claudeDir3 = ctx.options.global ? resolvedDir : join140(resolvedDir, ".claude");
+  const resolvedDir = ctx.options.global ? PathResolver.getGlobalKitDir() : resolve49(ctx.options.dir || ".");
+  const claudeDir3 = ctx.options.global ? resolvedDir : join141(resolvedDir, ".claude");
   if (!await import_fs_extra38.pathExists(claudeDir3)) {
     logger.error("Cannot sync: no .claude directory found");
     ctx.prompts.note("Run 'ck init' without --sync to install first.", "No Installation Found");
     return { ...ctx, cancelled: true };
   }
-  const metadataPath = join140(claudeDir3, "metadata.json");
+  const metadataPath = join141(claudeDir3, "metadata.json");
   if (!await import_fs_extra38.pathExists(metadataPath)) {
     logger.error("Cannot sync: no metadata.json found");
     ctx.prompts.note(`Your installation may be from an older version.
@@ -110574,7 +110967,7 @@ function getLockTimeout() {
 var STALE_LOCK_THRESHOLD_MS = 5 * 60 * 1000;
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath = join140(cacheDir, ".sync-lock");
+  const lockPath = join141(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir37(dirname46(lockPath), { recursive: true });
@@ -110601,7 +110994,7 @@ async function acquireSyncLock(global3) {
           }
           logger.debug(`Lock stat failed: ${statError}`);
         }
-        await new Promise((resolve48) => setTimeout(resolve48, 100));
+        await new Promise((resolve50) => setTimeout(resolve50, 100));
         continue;
       }
       throw err;
@@ -110620,11 +111013,11 @@ async function executeSyncMerge(ctx) {
   const releaseLock = await acquireSyncLock(ctx.options.global);
   try {
     const trackedFiles = ctx.syncTrackedFiles;
-    const upstreamDir = ctx.options.global ? join140(ctx.extractDir, ".claude") : ctx.extractDir;
+    const upstreamDir = ctx.options.global ? join141(ctx.extractDir, ".claude") : ctx.extractDir;
     let sourceMetadata = null;
     let deletions = [];
     try {
-      const sourceMetadataPath = join140(upstreamDir, "metadata.json");
+      const sourceMetadataPath = join141(upstreamDir, "metadata.json");
       if (await import_fs_extra38.pathExists(sourceMetadataPath)) {
         const content = await readFile61(sourceMetadataPath, "utf-8");
         sourceMetadata = JSON.parse(content);
@@ -110686,7 +111079,7 @@ async function executeSyncMerge(ctx) {
         try {
           const sourcePath = await validateSyncPath(upstreamDir, file.path);
           const targetPath = await validateSyncPath(ctx.claudeDir, file.path);
-          const targetDir = join140(targetPath, "..");
+          const targetDir = join141(targetPath, "..");
           try {
             await mkdir37(targetDir, { recursive: true });
           } catch (mkdirError) {
@@ -110857,7 +111250,7 @@ async function createBackup(claudeDir3, files, backupDir) {
       const sourcePath = await validateSyncPath(claudeDir3, file.path);
       if (await import_fs_extra38.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
-        const targetDir = join140(targetPath, "..");
+        const targetDir = join141(targetPath, "..");
         await mkdir37(targetDir, { recursive: true });
         await copyFile8(sourcePath, targetPath);
       }
@@ -110872,7 +111265,7 @@ async function createBackup(claudeDir3, files, backupDir) {
 }
 // src/commands/init/phases/transform-handler.ts
 init_config_manager();
-import { join as join144 } from "node:path";
+import { join as join145 } from "node:path";
 
 // src/services/transformers/folder-path-transformer.ts
 init_logger();
@@ -110883,38 +111276,38 @@ init_logger();
 init_types3();
 var import_fs_extra39 = __toESM(require_lib(), 1);
 import { rename as rename13, rm as rm17 } from "node:fs/promises";
-import { join as join141, relative as relative30 } from "node:path";
+import { join as join142, relative as relative32 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join141(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join142(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra39.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join141(extractDir, folders.docs)
+        to: join142(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join141(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join142(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra39.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join141(extractDir, ".claude", folders.docs)
+        to: join142(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join141(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join142(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra39.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join141(extractDir, folders.plans)
+        to: join142(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join141(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join142(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra39.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join141(extractDir, ".claude", folders.plans)
+        to: join142(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -110937,11 +111330,11 @@ async function renameFolders(dirsToRename, extractDir, options2) {
   let foldersRenamed = 0;
   for (const { from, to } of dirsToRename) {
     if (options2.dryRun) {
-      logger.info(`[dry-run] Would rename: ${relative30(extractDir, from)} -> ${relative30(extractDir, to)}`);
+      logger.info(`[dry-run] Would rename: ${relative32(extractDir, from)} -> ${relative32(extractDir, to)}`);
     } else {
       try {
         await moveAcrossDevices(from, to);
-        logger.debug(`Renamed: ${relative30(extractDir, from)} -> ${relative30(extractDir, to)}`);
+        logger.debug(`Renamed: ${relative32(extractDir, from)} -> ${relative32(extractDir, to)}`);
         foldersRenamed++;
       } catch (error) {
         logger.warning(`Failed to rename ${from}: ${error instanceof Error ? error.message : "Unknown error"}`);
@@ -110955,7 +111348,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 init_logger();
 init_types3();
 import { readFile as readFile62, readdir as readdir43, writeFile as writeFile36 } from "node:fs/promises";
-import { join as join142, relative as relative31 } from "node:path";
+import { join as join143, relative as relative33 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -111008,7 +111401,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
   let replacementsCount = 0;
   const entries = await readdir43(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join142(dir, entry.name);
+    const fullPath = join143(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -111035,10 +111428,10 @@ async function transformFileContents(dir, compiledReplacements, options2) {
         }
         if (changeCount > 0) {
           if (options2.dryRun) {
-            logger.debug(`[dry-run] Would update ${relative31(dir, fullPath)}: ${changeCount} replacement(s)`);
+            logger.debug(`[dry-run] Would update ${relative33(dir, fullPath)}: ${changeCount} replacement(s)`);
           } else {
             await writeFile36(fullPath, newContent, "utf-8");
-            logger.debug(`Updated ${relative31(dir, fullPath)}: ${changeCount} replacement(s)`);
+            logger.debug(`Updated ${relative33(dir, fullPath)}: ${changeCount} replacement(s)`);
           }
           filesChanged++;
           replacementsCount += changeCount;
@@ -111145,7 +111538,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 init_logger();
 import { readFile as readFile63, readdir as readdir44, writeFile as writeFile37 } from "node:fs/promises";
 import { homedir as homedir48, platform as platform16 } from "node:os";
-import { extname as extname7, join as join143 } from "node:path";
+import { extname as extname7, join as join144 } from "node:path";
 var IS_WINDOWS3 = platform16() === "win32";
 var HOME_PREFIX = "$HOME";
 function getHomeDirPrefix() {
@@ -111155,7 +111548,7 @@ function normalizeInstallPath(path17) {
   return path17.replace(/\\/g, "/").replace(/\/+$/, "");
 }
 function getDefaultGlobalClaudeDir() {
-  return normalizeInstallPath(join143(homedir48(), ".claude"));
+  return normalizeInstallPath(join144(homedir48(), ".claude"));
 }
 function getCustomGlobalClaudeDir(targetClaudeDir) {
   if (!targetClaudeDir)
@@ -111286,7 +111679,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir44(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join143(dir, entry.name);
+      const fullPath = join144(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -111365,7 +111758,7 @@ async function handleTransforms(ctx) {
       logger.debug(ctx.options.global ? "Saved folder configuration to ~/.claude/.ck.json" : "Saved folder configuration to .claude/.ck.json");
     }
   }
-  const claudeDir3 = ctx.options.global ? ctx.resolvedDir : join144(ctx.resolvedDir, ".claude");
+  const claudeDir3 = ctx.options.global ? ctx.resolvedDir : join145(ctx.resolvedDir, ".claude");
   return {
     ...ctx,
     foldersConfig,
@@ -111441,7 +111834,8 @@ function createInitContext(rawOptions, prompts) {
     dryRun: false,
     prefix: false,
     sync: false,
-    useGit: false
+    useGit: false,
+    installMode: "auto"
   };
   return {
     rawOptions,
@@ -111589,10 +111983,10 @@ async function initCommand(options2) {
 // src/commands/migrate/migrate-command.ts
 init_dist2();
 var import_picocolors30 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync71 } from "node:fs";
+import { existsSync as existsSync72 } from "node:fs";
 import { readFile as readFile67, rm as rm18, unlink as unlink14 } from "node:fs/promises";
 import { homedir as homedir52 } from "node:os";
-import { basename as basename30, dirname as dirname49, join as join148, resolve as resolve48 } from "node:path";
+import { basename as basename30, dirname as dirname49, join as join149, resolve as resolve50 } from "node:path";
 init_logger();
 
 // src/ui/ck-cli-design/next-steps-footer.ts
@@ -111807,13 +112201,13 @@ init_dist2();
 init_model_taxonomy();
 import { mkdir as mkdir39, readFile as readFile66, writeFile as writeFile39 } from "node:fs/promises";
 import { homedir as homedir51 } from "node:os";
-import { dirname as dirname47, join as join147 } from "node:path";
+import { dirname as dirname47, join as join148 } from "node:path";
 
 // src/commands/portable/models-dev-cache.ts
 init_logger();
 import { mkdir as mkdir38, readFile as readFile64, rename as rename14, writeFile as writeFile38 } from "node:fs/promises";
 import { homedir as homedir49 } from "node:os";
-import { join as join145 } from "node:path";
+import { join as join146 } from "node:path";
 
 class ModelsDevUnavailableError extends Error {
   constructor(message, cause) {
@@ -111825,13 +112219,13 @@ var MODELS_DEV_URL = "https://models.dev/api.json";
 var CACHE_TTL_MS3 = 24 * 60 * 60 * 1000;
 var FETCH_TIMEOUT_MS = 1e4;
 function defaultCacheDir() {
-  return join145(homedir49(), ".config", "claudekit", "cache");
+  return join146(homedir49(), ".config", "claudekit", "cache");
 }
 function cacheFilePath(cacheDir) {
-  return join145(cacheDir, "models-dev.json");
+  return join146(cacheDir, "models-dev.json");
 }
 function tmpFilePath(cacheDir) {
-  return join145(cacheDir, "models-dev.json.tmp");
+  return join146(cacheDir, "models-dev.json.tmp");
 }
 async function readCacheEntry(cacheDir) {
   const filePath = cacheFilePath(cacheDir);
@@ -111906,14 +112300,14 @@ async function getModelsDevCatalog(opts = {}) {
 init_logger();
 import { readFile as readFile65 } from "node:fs/promises";
 import { homedir as homedir50, platform as platform17 } from "node:os";
-import { join as join146 } from "node:path";
+import { join as join147 } from "node:path";
 function resolveOpenCodeAuthPath(homeDir) {
   if (platform17() === "win32") {
-    const dataRoot2 = process.env.LOCALAPPDATA ?? join146(homeDir, "AppData", "Local");
-    return join146(dataRoot2, "opencode", "auth.json");
+    const dataRoot2 = process.env.LOCALAPPDATA ?? join147(homeDir, "AppData", "Local");
+    return join147(dataRoot2, "opencode", "auth.json");
   }
-  const dataRoot = process.env.XDG_DATA_HOME ?? join146(homeDir, ".local", "share");
-  return join146(dataRoot, "opencode", "auth.json");
+  const dataRoot = process.env.XDG_DATA_HOME ?? join147(homeDir, ".local", "share");
+  return join147(dataRoot, "opencode", "auth.json");
 }
 async function readAuthedProviders(homeDir) {
   const authPath = resolveOpenCodeAuthPath(homeDir);
@@ -112015,9 +112409,9 @@ function messageForReason(reason) {
 }
 function getOpenCodeConfigPath(options2) {
   if (options2.global) {
-    return join147(options2.homeDir ?? homedir51(), ".config", "opencode", "opencode.json");
+    return join148(options2.homeDir ?? homedir51(), ".config", "opencode", "opencode.json");
   }
-  return join147(options2.cwd ?? process.cwd(), "opencode.json");
+  return join148(options2.cwd ?? process.cwd(), "opencode.json");
 }
 function makeCatalogOpts(options2) {
   return {
@@ -112890,7 +113284,7 @@ function appendFallbackSkillActionsToPlan(plan, skills, selectedProviders, insta
         reason: "New item, not previously installed",
         reasonCode: "new-item",
         reasonCopy: "New - not previously installed",
-        targetPath: join148(basePath, skill.name),
+        targetPath: join149(basePath, skill.name),
         type: "skill"
       });
     }
@@ -113045,9 +113439,9 @@ function shouldExecuteAction2(action) {
 }
 async function executeDeleteAction(action, options2) {
   const preservePaths = options2?.preservePaths ?? new Set;
-  const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve48(action.targetPath));
+  const shouldPreserveTarget = action.targetPath.length > 0 && preservePaths.has(resolve50(action.targetPath));
   try {
-    if (!shouldPreserveTarget && action.targetPath && existsSync71(action.targetPath)) {
+    if (!shouldPreserveTarget && action.targetPath && existsSync72(action.targetPath)) {
       await rm18(action.targetPath, { recursive: true, force: true });
     }
     await removePortableInstallation(action.item, action.type, action.provider, action.global, action.targetPath ? { path: action.targetPath } : undefined);
@@ -113076,7 +113470,7 @@ async function executeDeleteAction(action, options2) {
   }
 }
 function hasSuccessfulReplacementWrite(action, results) {
-  return results.some((result) => result.success && !result.skipped && result.provider === action.provider && replacementTypeMatches(action.type, result.portableType) && replacementItemMatches(action, result) && result.path.length > 0 && resolve48(result.path) !== resolve48(action.targetPath));
+  return results.some((result) => result.success && !result.skipped && result.provider === action.provider && replacementTypeMatches(action.type, result.portableType) && replacementItemMatches(action, result) && result.path.length > 0 && resolve50(result.path) !== resolve50(action.targetPath));
 }
 function replacementTypeMatches(actionType, resultType) {
   return resultType === actionType || actionType === "command" && resultType === "skill";
@@ -113118,9 +113512,9 @@ function resolveHookTargetPath(item, provider, global3) {
   const converted = convertItem(item, pathConfig.format, provider, { global: global3 });
   if (converted.error)
     return null;
-  const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join148(basePath, converted.filename);
-  const resolvedTarget = resolve48(targetPath).replace(/\\/g, "/");
-  const resolvedBase = resolve48(basePath).replace(/\\/g, "/").replace(/\/+$/, "");
+  const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join149(basePath, converted.filename);
+  const resolvedTarget = resolve50(targetPath).replace(/\\/g, "/");
+  const resolvedBase = resolve50(basePath).replace(/\\/g, "/").replace(/\/+$/, "");
   if (resolvedTarget !== resolvedBase && !resolvedTarget.startsWith(`${resolvedBase}/`)) {
     return null;
   }
@@ -113129,8 +113523,8 @@ function resolveHookTargetPath(item, provider, global3) {
 async function processMetadataDeletions(skillSourcePath, installGlobally) {
   if (!skillSourcePath)
     return;
-  const sourceMetadataPath = join148(resolve48(skillSourcePath, ".."), "metadata.json");
-  if (!existsSync71(sourceMetadataPath))
+  const sourceMetadataPath = join149(resolve50(skillSourcePath, ".."), "metadata.json");
+  if (!existsSync72(sourceMetadataPath))
     return;
   let sourceMetadata;
   try {
@@ -113142,8 +113536,8 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
   }
   if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
     return;
-  const claudeDir3 = installGlobally ? join148(homedir52(), ".claude") : join148(process.cwd(), ".claude");
-  if (!existsSync71(claudeDir3))
+  const claudeDir3 = installGlobally ? join149(homedir52(), ".claude") : join149(process.cwd(), ".claude");
+  if (!existsSync72(claudeDir3))
     return;
   try {
     const result = await handleDeletions(sourceMetadata, claudeDir3, inferKitTypeFromSourceMetadata(sourceMetadata));
@@ -113270,8 +113664,8 @@ async function migrateCommand(options2) {
     let requestedGlobal = options2.global ?? false;
     let installGlobally = requestedGlobal;
     if (options2.global === undefined && !options2.yes) {
-      const projectTarget = join148(process.cwd(), ".claude");
-      const globalTarget = join148(homedir52(), ".claude");
+      const projectTarget = join149(process.cwd(), ".claude");
+      const globalTarget = join149(homedir52(), ".claude");
       const scopeChoice = await ie({
         message: "Installation scope",
         options: [
@@ -113344,7 +113738,7 @@ async function migrateCommand(options2) {
     }).join(`
 `));
     if (sourceGlobalOnly) {
-      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join148(homedir52(), ".claude"))}`));
+      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join149(homedir52(), ".claude"))}`));
     } else {
       f2.info(import_picocolors30.default.dim(`  CWD: ${process.cwd()}`));
     }
@@ -113435,7 +113829,7 @@ async function migrateCommand(options2) {
       const interactive = process.stdout.isTTY && !options2.yes;
       const conflictActions = plan.actions.filter((a3) => a3.action === "conflict");
       for (const action of conflictActions) {
-        if (!action.diff && action.targetPath && existsSync71(action.targetPath)) {
+        if (!action.diff && action.targetPath && existsSync72(action.targetPath)) {
           try {
             const targetContent = await readFile67(action.targetPath, "utf-8");
             const sourceItem = effectiveAgents.find((a3) => a3.name === action.item) || effectiveCommands.find((c2) => c2.name === action.item) || (effectiveConfigItem?.name === action.item ? effectiveConfigItem : null) || effectiveRuleItems.find((r2) => r2.name === action.item) || effectiveHookItems.find((h2) => h2.name === action.item);
@@ -113534,9 +113928,9 @@ async function migrateCommand(options2) {
     const progressSink = createMigrateProgressSink(writeTasks.length + plannedDeleteActions.length);
     const writtenPaths = new Set;
     const recordHookTargetForSettings = (provider, global3, targetPath) => {
-      if (targetPath.length === 0 || !existsSync71(targetPath))
+      if (targetPath.length === 0 || !existsSync72(targetPath))
         return;
-      const resolvedPath = resolve48(targetPath);
+      const resolvedPath = resolve50(targetPath);
       const entry = successfulHookFiles.get(provider) ?? {
         files: [],
         global: global3
@@ -113554,7 +113948,7 @@ async function migrateCommand(options2) {
     const recordSuccessfulWrites = (task, taskResults) => {
       for (const result of taskResults.filter((entry) => entry.success)) {
         if (!result.skipped && result.path.length > 0) {
-          writtenPaths.add(resolve48(result.path));
+          writtenPaths.add(resolve50(result.path));
         }
         if (task.type === "hooks") {
           recordHookTargetForSettings(task.provider, task.global, result.path);
@@ -113653,7 +114047,7 @@ async function migrateCommand(options2) {
     for (const [hooksProvider, entry] of successfulHookFiles) {
       if (entry.files.length === 0)
         continue;
-      const sourceSettingsPath = hooksSource ? join148(dirname49(hooksSource), "settings.json") : undefined;
+      const sourceSettingsPath = hooksSource ? join149(dirname49(hooksSource), "settings.json") : undefined;
       const mergeResult = await migrateHooksSettings({
         sourceProvider: "claude-code",
         targetProvider: hooksProvider,
@@ -113718,7 +114112,7 @@ async function migrateCommand(options2) {
       }
     }
     try {
-      const kitRoot = (agentSource ? resolve48(agentSource, "..") : null) ?? (commandSource ? resolve48(commandSource, "..") : null) ?? (skillSource ? resolve48(skillSource, "..") : null) ?? null;
+      const kitRoot = (agentSource ? resolve50(agentSource, "..") : null) ?? (commandSource ? resolve50(commandSource, "..") : null) ?? (skillSource ? resolve50(skillSource, "..") : null) ?? null;
       const manifest = kitRoot ? await loadPortableManifest(kitRoot) : null;
       if (manifest?.cliVersion) {
         await updateAppliedManifestVersion(manifest.cliVersion);
@@ -113766,7 +114160,7 @@ async function migrateCommand(options2) {
 async function rollbackResults(results) {
   const rolledBackPaths = new Set;
   for (const result of results) {
-    if (!result.path || !existsSync71(result.path))
+    if (!result.path || !existsSync72(result.path))
       continue;
     try {
       if (result.overwritten)
@@ -113889,7 +114283,7 @@ var import_picocolors31 = __toESM(require_picocolors(), 1);
 
 // src/commands/new/phases/directory-setup.ts
 init_config_manager();
-import { resolve as resolve49 } from "node:path";
+import { resolve as resolve51 } from "node:path";
 init_logger();
 init_path_resolver();
 init_types3();
@@ -113974,7 +114368,7 @@ async function directorySetup(validOptions, prompts) {
       targetDir = await prompts.getDirectory(targetDir);
     }
   }
-  const resolvedDir = resolve49(targetDir);
+  const resolvedDir = resolve51(targetDir);
   logger.info(`Target directory: ${resolvedDir}`);
   if (PathResolver.isLocalSameAsGlobal(resolvedDir)) {
     logger.warning("You're creating a project at HOME directory.");
@@ -114031,7 +114425,7 @@ async function handleDirectorySetup(ctx) {
 // src/commands/new/phases/project-creation.ts
 init_config_manager();
 init_github_client();
-import { join as join149 } from "node:path";
+import { join as join150 } from "node:path";
 init_logger();
 init_output_manager();
 init_types3();
@@ -114157,7 +114551,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir3 = join149(resolvedDir, ".claude");
+  const claudeDir3 = join150(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir3, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -114204,7 +114598,7 @@ async function handleProjectCreation(ctx) {
 }
 // src/commands/new/phases/post-setup.ts
 init_projects_registry();
-import { join as join150 } from "node:path";
+import { join as join151 } from "node:path";
 init_package_installer();
 init_logger();
 init_path_resolver();
@@ -114236,9 +114630,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir3 = join150(resolvedDir, ".claude");
+  const claudeDir3 = join151(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join150(claudeDir3, ".env"),
+    envPath: join151(claudeDir3, ".env"),
     claudeDir: claudeDir3,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -114307,8 +114701,8 @@ Please use only one download method.`);
 }
 // src/commands/plan/plan-command.ts
 init_output_manager();
-import { existsSync as existsSync74, statSync as statSync13 } from "node:fs";
-import { dirname as dirname53, isAbsolute as isAbsolute15, join as join153, parse as parse7, resolve as resolve53 } from "node:path";
+import { existsSync as existsSync75, statSync as statSync13 } from "node:fs";
+import { dirname as dirname53, isAbsolute as isAbsolute15, join as join154, parse as parse7, resolve as resolve55 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 init_config();
@@ -114317,15 +114711,15 @@ init_plans_registry();
 init_logger();
 init_output_manager();
 var import_picocolors32 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync73, statSync as statSync12 } from "node:fs";
-import { basename as basename31, dirname as dirname51, join as join152, relative as relative32, resolve as resolve51 } from "node:path";
+import { existsSync as existsSync74, statSync as statSync12 } from "node:fs";
+import { basename as basename31, dirname as dirname51, join as join153, relative as relative34, resolve as resolve53 } from "node:path";
 
 // src/commands/plan/plan-dependencies.ts
 init_config();
 init_plan_parser();
 init_plans_registry();
-import { existsSync as existsSync72 } from "node:fs";
-import { dirname as dirname50, join as join151 } from "node:path";
+import { existsSync as existsSync73 } from "node:fs";
+import { dirname as dirname50, join as join152 } from "node:path";
 async function resolvePlanDependencies(references, currentPlanFile, options2 = {}) {
   if (references.length === 0)
     return [];
@@ -114345,9 +114739,9 @@ async function resolvePlanDependencies(references, currentPlanFile, options2 = {
       };
     }
     const scopeRoot = resolvePlanDirForScope(scope, projectRoot, config);
-    const planFile = join151(scopeRoot, planId, "plan.md");
+    const planFile = join152(scopeRoot, planId, "plan.md");
     const isSelfReference = planFile === currentPlanFile;
-    if (!existsSync72(planFile)) {
+    if (!existsSync73(planFile)) {
       return {
         reference,
         scope,
@@ -114376,14 +114770,14 @@ init_config();
 init_plan_parser();
 init_plan_scope();
 init_plans_registry();
-import { isAbsolute as isAbsolute14, resolve as resolve50 } from "node:path";
+import { isAbsolute as isAbsolute14, resolve as resolve52 } from "node:path";
 async function getGlobalPlansDirFromCwd() {
   const projectRoot = findProjectRoot(process.cwd());
   const { config } = await CkConfigManager.loadFull(projectRoot);
   return resolveGlobalPlansDir(config);
 }
 function resolveTargetFromBase(target, baseDir) {
-  const resolvedTarget = isAbsolute14(target) ? resolve50(target) : resolve50(baseDir, target);
+  const resolvedTarget = isAbsolute14(target) ? resolve52(target) : resolve52(baseDir, target);
   return isWithinDir(resolvedTarget, baseDir) ? resolvedTarget : null;
 }
 
@@ -114413,7 +114807,7 @@ async function handleParse(target, options2) {
     return;
   }
   if (isJsonOutput(options2)) {
-    console.log(JSON.stringify({ file: relative32(process.cwd(), planFile), frontmatter, phases }, null, 2));
+    console.log(JSON.stringify({ file: relative34(process.cwd(), planFile), frontmatter, phases }, null, 2));
     return;
   }
   const title = typeof frontmatter.title === "string" ? frontmatter.title : basename31(dirname51(planFile));
@@ -114486,8 +114880,8 @@ async function handleStatus(target, options2) {
     return;
   }
   const effectiveTarget = !resolvedTarget && globalBaseDir ? globalBaseDir : resolvedTarget;
-  const t = effectiveTarget ? resolve51(effectiveTarget) : null;
-  const plansDir = t && existsSync73(t) && statSync12(t).isDirectory() && !existsSync73(join152(t, "plan.md")) ? t : null;
+  const t = effectiveTarget ? resolve53(effectiveTarget) : null;
+  const plansDir = t && existsSync74(t) && statSync12(t).isDirectory() && !existsSync74(join153(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -114671,12 +115065,12 @@ init_plan_parser();
 init_plans_registry();
 init_output_manager();
 var import_picocolors33 = __toESM(require_picocolors(), 1);
-import { basename as basename32, dirname as dirname52, relative as relative33, resolve as resolve52 } from "node:path";
+import { basename as basename32, dirname as dirname52, relative as relative35, resolve as resolve54 } from "node:path";
 function quoteReadTarget(filePath) {
   return `"${filePath.replace(/\\/g, "/").replace(/"/g, "\\\"")}"`;
 }
 function buildPlanCreateReadReminder(planFile, phaseFiles, cwd2 = process.cwd()) {
-  const files = [planFile, ...phaseFiles].map((file) => quoteReadTarget(relative33(cwd2, file)));
+  const files = [planFile, ...phaseFiles].map((file) => quoteReadTarget(relative35(cwd2, file)));
   return [
     "  [i] Claude Code agents: read plan.md and every phase-*.md before editing.",
     "      These files already exist; Write/Edit without Read may be rejected after wasting tokens.",
@@ -114714,13 +115108,13 @@ async function handleCreate(target, options2) {
     return;
   }
   const globalBaseDir = options2.global ? await getGlobalPlansDirFromCwd() : undefined;
-  const resolvedDir = globalBaseDir ? resolveTargetFromBase(dir, globalBaseDir) : resolve52(dir);
+  const resolvedDir = globalBaseDir ? resolveTargetFromBase(dir, globalBaseDir) : resolve54(dir);
   if (globalBaseDir && !resolvedDir) {
     output.error("[X] Target directory must stay within the configured global plans root");
     process.exitCode = 1;
     return;
   }
-  const safeResolvedDir = resolvedDir ?? resolve52(dir);
+  const safeResolvedDir = resolvedDir ?? resolve54(dir);
   const result = scaffoldPlan({
     title: options2.title,
     phases: phaseNames.map((name2) => ({ name: name2 })),
@@ -114748,8 +115142,8 @@ async function handleCreate(target, options2) {
   if (isJsonOutput(options2)) {
     const cwd2 = process.cwd();
     console.log(JSON.stringify({
-      planFile: relative33(cwd2, result.planFile),
-      phaseFiles: result.phaseFiles.map((f3) => relative33(cwd2, f3))
+      planFile: relative35(cwd2, result.planFile),
+      phaseFiles: result.phaseFiles.map((f3) => relative35(cwd2, f3))
     }, null, 2));
     return;
   }
@@ -114808,7 +115202,7 @@ async function handleCheck(target, options2) {
     console.log(JSON.stringify({
       phaseId: target,
       status: newStatus,
-      planFile: relative33(process.cwd(), planFile)
+      planFile: relative35(process.cwd(), planFile)
     }));
     return;
   }
@@ -114852,7 +115246,7 @@ async function handleUncheck(target, options2) {
     console.log(JSON.stringify({
       phaseId: target,
       status: "pending",
-      planFile: relative33(process.cwd(), planFile)
+      planFile: relative35(process.cwd(), planFile)
     }));
     return;
   }
@@ -114884,7 +115278,7 @@ async function handleAddPhase(target, options2) {
     if (isJsonOutput(options2)) {
       console.log(JSON.stringify({
         phaseId: result.phaseId,
-        phaseFile: relative33(process.cwd(), result.phaseFile)
+        phaseFile: relative35(process.cwd(), result.phaseFile)
       }));
       return;
     }
@@ -114899,33 +115293,33 @@ async function handleAddPhase(target, options2) {
 // src/commands/plan/plan-command.ts
 function resolveTargetPath(target, baseDir) {
   if (!baseDir) {
-    return resolve53(target);
+    return resolve55(target);
   }
   if (isAbsolute15(target)) {
-    return resolve53(target);
+    return resolve55(target);
   }
-  const cwdCandidate = resolve53(target);
-  if (existsSync74(cwdCandidate)) {
+  const cwdCandidate = resolve55(target);
+  if (existsSync75(cwdCandidate)) {
     return cwdCandidate;
   }
-  return resolve53(baseDir, target);
+  return resolve55(baseDir, target);
 }
 function resolvePlanFile(target, baseDir) {
-  const t = target ? resolveTargetPath(target, baseDir) : baseDir ? resolve53(baseDir) : process.cwd();
-  if (existsSync74(t)) {
+  const t = target ? resolveTargetPath(target, baseDir) : baseDir ? resolve55(baseDir) : process.cwd();
+  if (existsSync75(t)) {
     const stat24 = statSync13(t);
     if (stat24.isFile())
       return t;
-    const candidate = join153(t, "plan.md");
-    if (existsSync74(candidate))
+    const candidate = join154(t, "plan.md");
+    if (existsSync75(candidate))
       return candidate;
   }
   if (!target && !baseDir) {
     let dir = process.cwd();
     const root = parse7(dir).root;
     while (dir !== root) {
-      const candidate = join153(dir, "plan.md");
-      if (existsSync74(candidate))
+      const candidate = join154(dir, "plan.md");
+      if (existsSync75(candidate))
         return candidate;
       dir = dirname53(dir);
     }
@@ -114975,7 +115369,7 @@ async function planCommand(action, target, options2) {
   let resolvedTarget = target;
   if (resolvedAction && !knownActions.has(resolvedAction)) {
     const looksLikePath = resolvedAction.includes("/") || resolvedAction.includes("\\") || resolvedAction.endsWith(".md") || resolvedAction === "." || resolvedAction === "..";
-    const existsOnDisk = !looksLikePath && existsSync74(resolve53(resolvedAction));
+    const existsOnDisk = !looksLikePath && existsSync75(resolve55(resolvedAction));
     if (looksLikePath || existsOnDisk) {
       resolvedTarget = resolvedAction;
       resolvedAction = undefined;
@@ -115017,13 +115411,13 @@ init_claudekit_data2();
 init_logger();
 init_safe_prompts();
 var import_picocolors34 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync75 } from "node:fs";
-import { resolve as resolve54 } from "node:path";
+import { existsSync as existsSync76 } from "node:fs";
+import { resolve as resolve56 } from "node:path";
 async function handleAdd(projectPath, options2) {
   logger.debug(`Adding project: ${projectPath}, options: ${JSON.stringify(options2)}`);
   intro("Add Project");
-  const absolutePath = resolve54(projectPath);
-  if (!existsSync75(absolutePath)) {
+  const absolutePath = resolve56(projectPath);
+  if (!existsSync76(absolutePath)) {
     log.error(`Path does not exist: ${absolutePath}`);
     process.exitCode = 1;
     return;
@@ -115384,6 +115778,7 @@ async function handleKitSelection(ctx) {
       refresh: false,
       sync: false,
       useGit: false,
+      installMode: "auto",
       verbose: false,
       json: false
     });
@@ -115444,10 +115839,10 @@ init_agents();
 var import_gray_matter12 = __toESM(require_gray_matter(), 1);
 var import_picocolors37 = __toESM(require_picocolors(), 1);
 import { readFile as readFile68 } from "node:fs/promises";
-import { join as join155 } from "node:path";
+import { join as join156 } from "node:path";
 
 // src/commands/skills/installed-skills-inventory.ts
-import { join as join154, resolve as resolve55 } from "node:path";
+import { join as join155, resolve as resolve57 } from "node:path";
 init_path_resolver();
 var SCOPE_SORT_ORDER = {
   project: 0,
@@ -115455,12 +115850,12 @@ var SCOPE_SORT_ORDER = {
 };
 async function getActiveClaudeSkillInstallations(options2 = {}) {
   const projectDir = options2.projectDir ?? process.cwd();
-  const globalDir = resolve55(options2.globalDir ?? PathResolver.getGlobalKitDir());
-  const projectClaudeDir = resolve55(projectDir, ".claude");
+  const globalDir = resolve57(options2.globalDir ?? PathResolver.getGlobalKitDir());
+  const projectClaudeDir = resolve57(projectDir, ".claude");
   const projectScopeAliasesGlobal = projectClaudeDir === globalDir;
   const [projectSkills, globalSkills] = await Promise.all([
-    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join154(projectClaudeDir, "skills")),
-    scanSkills2(join154(globalDir, "skills"))
+    projectScopeAliasesGlobal ? Promise.resolve([]) : scanSkills2(join155(projectClaudeDir, "skills")),
+    scanSkills2(join155(globalDir, "skills"))
   ]);
   const projectIds = new Set(projectSkills.map((skill) => skill.id));
   const globalIds = new Set(globalSkills.map((skill) => skill.id));
@@ -115621,7 +116016,7 @@ async function handleValidate2(sourcePath) {
   spinner.stop(`Checked ${skills.length} skill(s)`);
   let hasIssues = false;
   for (const skill of skills) {
-    const skillMdPath = join155(skill.path, "SKILL.md");
+    const skillMdPath = join156(skill.path, "SKILL.md");
     try {
       const content = await readFile68(skillMdPath, "utf-8");
       const { data } = import_gray_matter12.default(content, {
@@ -116154,31 +116549,6 @@ init_skills_installer();
 init_skills_registry();
 init_skills_uninstaller();
 
-// src/domains/installation/plugin/uninstall-plugin.ts
-init_install_mode_detector();
-import { existsSync as existsSync76, rmSync as rmSync6 } from "node:fs";
-import { join as join156 } from "node:path";
-init_path_resolver();
-async function uninstallEnginePlugin(opts = {}) {
-  const claudeDir3 = opts.claudeDir ?? PathResolver.getGlobalKitDir();
-  const installer = opts.installer ?? new PluginInstaller(undefined, claudeDir3);
-  const state = detectPluginState(claudeDir3);
-  let uninstalled = false;
-  if (state.installed) {
-    await installer.uninstall();
-    await installer.marketplaceRemove(state.marketplace ?? CK_MARKETPLACE_NAME);
-    uninstalled = true;
-  }
-  let staleCacheRemoved = false;
-  const marketplace = state.marketplace ?? CK_MARKETPLACE_NAME;
-  const cacheDir = join156(claudeDir3, "plugins", "cache", marketplace, CK_PLUGIN_NAME);
-  if (existsSync76(cacheDir)) {
-    rmSync6(cacheDir, { recursive: true, force: true });
-    staleCacheRemoved = true;
-  }
-  return { uninstalled, staleCacheRemoved };
-}
-
 // src/commands/uninstall/uninstall-command.ts
 init_metadata_migration();
 init_logger();
@@ -116228,8 +116598,8 @@ async function detectInstallations() {
 }
 
 // src/commands/uninstall/removal-handler.ts
-import { readdirSync as readdirSync13, rmSync as rmSync8 } from "node:fs";
-import { basename as basename33, join as join159, resolve as resolve56, sep as sep14 } from "node:path";
+import { readdirSync as readdirSync14, rmSync as rmSync8 } from "node:fs";
+import { basename as basename33, join as join159, resolve as resolve58, sep as sep14 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -116237,7 +116607,7 @@ var import_fs_extra44 = __toESM(require_lib(), 1);
 
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
-import { readdirSync as readdirSync12, rmSync as rmSync7 } from "node:fs";
+import { readdirSync as readdirSync13, rmSync as rmSync7 } from "node:fs";
 import { dirname as dirname54, join as join157 } from "node:path";
 init_logger();
 init_safe_prompts();
@@ -116263,7 +116633,7 @@ async function cleanupEmptyDirectories3(filePath, installationRoot) {
   let currentDir = dirname54(filePath);
   while (currentDir !== installationRoot && currentDir.startsWith(installationRoot)) {
     try {
-      const entries = readdirSync12(currentDir);
+      const entries = readdirSync13(currentDir);
       if (entries.length === 0) {
         rmSync7(currentDir, { recursive: true });
         cleaned++;
@@ -116593,8 +116963,8 @@ async function restoreUninstallBackup(backup) {
 }
 async function isPathSafeToRemove(filePath, baseDir) {
   try {
-    const resolvedPath = resolve56(filePath);
-    const resolvedBase = resolve56(baseDir);
+    const resolvedPath = resolve58(filePath);
+    const resolvedBase = resolve58(baseDir);
     if (!resolvedPath.startsWith(resolvedBase + sep14) && resolvedPath !== resolvedBase) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
@@ -116602,7 +116972,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
     const stats = await import_fs_extra44.lstat(filePath);
     if (stats.isSymbolicLink()) {
       const realPath = await import_fs_extra44.realpath(filePath);
-      const resolvedReal = resolve56(realPath);
+      const resolvedReal = resolve58(realPath);
       if (!resolvedReal.startsWith(resolvedBase + sep14) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
         return false;
@@ -116700,7 +117070,7 @@ async function removeInstallations(installations, options2) {
         });
         logSettingsCleanup(settingsCleanup, false);
         try {
-          const remaining = readdirSync13(installation.path);
+          const remaining = readdirSync14(installation.path);
           if (remaining.length === 0) {
             rmSync8(installation.path, { recursive: true });
             logger.debug(`Removed empty installation directory: ${installation.path}`);
@@ -117166,7 +117536,7 @@ function getDisclaimerMarker() {
   return AI_DISCLAIMER;
 }
 function spawnAndCollect2(command, args) {
-  return new Promise((resolve57, reject) => {
+  return new Promise((resolve59, reject) => {
     const child = spawn6(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -117179,7 +117549,7 @@ function spawnAndCollect2(command, args) {
         reject(new Error(`${command} exited with code ${code2}: ${stderr}`));
         return;
       }
-      resolve57(Buffer.concat(chunks).toString("utf-8"));
+      resolve59(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
@@ -117287,7 +117657,7 @@ function formatResponse(content, showBranding) {
   return disclaimer + formatted + branding;
 }
 async function postViaGh(owner, repo, issueNumber, body) {
-  return new Promise((resolve57, reject) => {
+  return new Promise((resolve59, reject) => {
     const args = [
       "issue",
       "comment",
@@ -117309,7 +117679,7 @@ async function postViaGh(owner, repo, issueNumber, body) {
         reject(new Error(`gh exited with code ${code2}: ${stderr}`));
         return;
       }
-      resolve57();
+      resolve59();
     });
   });
 }
@@ -117427,7 +117797,7 @@ After completing the implementation:
     "--allowedTools",
     tools
   ];
-  await new Promise((resolve57, reject) => {
+  await new Promise((resolve59, reject) => {
     const child = spawn8("claude", args, { cwd: cwd2, stdio: ["pipe", "pipe", "pipe"], detached: false });
     child.stdin.write(prompt);
     child.stdin.end();
@@ -117452,7 +117822,7 @@ After completing the implementation:
         reject(new Error(`Claude exited ${code2}: ${stderr.slice(0, 500)}`));
         return;
       }
-      resolve57();
+      resolve59();
     });
   });
 }
@@ -117596,7 +117966,7 @@ function checkRateLimit2(processedThisHour, maxPerHour) {
   return processedThisHour < maxPerHour;
 }
 function spawnAndCollect3(command, args) {
-  return new Promise((resolve57, reject) => {
+  return new Promise((resolve59, reject) => {
     const child = spawn9(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -117609,7 +117979,7 @@ function spawnAndCollect3(command, args) {
         reject(new Error(`${command} exited with code ${code2}: ${stderr}`));
         return;
       }
-      resolve57(Buffer.concat(chunks).toString("utf-8"));
+      resolve59(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
@@ -117661,7 +118031,7 @@ async function invokeClaude(options2) {
   return collectClaudeOutput(child, options2.timeoutSec, verbose);
 }
 function collectClaudeOutput(child, timeoutSec, verbose = false) {
-  return new Promise((resolve57, reject) => {
+  return new Promise((resolve59, reject) => {
     const chunks = [];
     const stderrChunks = [];
     child.stdout?.on("data", (chunk) => {
@@ -117691,7 +118061,7 @@ function collectClaudeOutput(child, timeoutSec, verbose = false) {
         reject(new Error(`Claude exited with code ${code2}: ${stderr}`));
         return;
       }
-      resolve57(verbose ? parseStreamJsonOutput(stdout2) : parseClaudeOutput(stdout2));
+      resolve59(verbose ? parseStreamJsonOutput(stdout2) : parseClaudeOutput(stdout2));
     });
   });
 }
@@ -118955,7 +119325,7 @@ function formatQueueInfo(state) {
   return "idle";
 }
 function sleep(ms) {
-  return new Promise((resolve57) => setTimeout(resolve57, ms));
+  return new Promise((resolve59) => setTimeout(resolve59, ms));
 }
 // src/cli/command-registry.ts
 init_logger();
@@ -118966,7 +119336,7 @@ function registerCommands(cli) {
     }
     await newCommand(options2);
   });
-  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--restore-ck-hooks", "Restore CK-managed hook registrations during update self-heal").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
+  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--restore-ck-hooks", "Restore CK-managed hook registrations during update self-heal").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--install-mode <mode>", "Engineer global install mode: auto, plugin, or legacy (default: auto)").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }