claudekit-cli 4.3.1-dev.17 → 4.3.1-dev.19

package/dist/index.js

@@ -12622,6 +12622,217 @@ var init_converters = __esm(() => {
   init_skill_md();
 });
 
+// src/shared/path-resolver.ts
+import { createHash as createHash3 } from "node:crypto";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
+import { homedir as homedir3, platform as platform2 } from "node:os";
+import { join as join2, normalize, resolve } from "node:path";
+function getEnvVar(name) {
+  const val = process.env[name];
+  if (!val || val.trim() === "")
+    return;
+  if (val.includes("..")) {
+    console.warn(`Environment variable ${name} contains path traversal: ${val}`);
+    return;
+  }
+  return val;
+}
+function isWSL() {
+  try {
+    return process.platform === "linux" && existsSync2("/proc/version") && readFileSync2("/proc/version", "utf8").toLowerCase().includes("microsoft");
+  } catch {
+    return false;
+  }
+}
+function normalizeWSLPath(p) {
+  if (!isWSL())
+    return p;
+  const windowsMatch = p.match(/^([A-Za-z]):(.*)/);
+  if (windowsMatch) {
+    const drive = windowsMatch[1].toLowerCase();
+    const rest = windowsMatch[2].replace(/\\/g, "/");
+    return `/mnt/${drive}${rest}`;
+  }
+  return p;
+}
+
+class PathResolver {
+  static getTestHomeDir() {
+    return process.env.CK_TEST_HOME;
+  }
+  static isValidComponentName(name) {
+    if (!name || typeof name !== "string") {
+      return false;
+    }
+    const dangerousPatterns = [
+      "..",
+      "~"
+    ];
+    for (const pattern of dangerousPatterns) {
+      if (name.includes(pattern)) {
+        return false;
+      }
+    }
+    const normalized = normalize(name);
+    for (const pattern of dangerousPatterns) {
+      if (normalized.includes(pattern)) {
+        return false;
+      }
+    }
+    if (name.startsWith("/") || normalized.startsWith("/") || /^[a-zA-Z]:/.test(name) || name.startsWith("\\\\") || normalized.startsWith("\\\\")) {
+      return false;
+    }
+    return true;
+  }
+  static getConfigDir(global2 = false) {
+    const testHome = PathResolver.getTestHomeDir();
+    if (testHome) {
+      return global2 ? join2(testHome, ".config", "claude") : join2(testHome, ".claudekit");
+    }
+    if (!global2) {
+      return join2(homedir3(), ".claudekit");
+    }
+    const os = platform2();
+    if (os === "win32") {
+      const localAppData = getEnvVar("LOCALAPPDATA") ?? join2(homedir3(), "AppData", "Local");
+      return join2(localAppData, "claude");
+    }
+    const xdgConfigHome = getEnvVar("XDG_CONFIG_HOME");
+    if (xdgConfigHome) {
+      return join2(xdgConfigHome, "claude");
+    }
+    return join2(homedir3(), ".config", "claude");
+  }
+  static getConfigFile(global2 = false) {
+    return join2(PathResolver.getConfigDir(global2), "config.json");
+  }
+  static getCacheDir(global2 = false) {
+    const testHome = PathResolver.getTestHomeDir();
+    if (testHome) {
+      return global2 ? join2(testHome, ".cache", "claude") : join2(testHome, ".claudekit", "cache");
+    }
+    if (!global2) {
+      return join2(homedir3(), ".claudekit", "cache");
+    }
+    const os = platform2();
+    if (os === "win32") {
+      const localAppData = getEnvVar("LOCALAPPDATA") ?? join2(homedir3(), "AppData", "Local");
+      return join2(localAppData, "claude", "cache");
+    }
+    const xdgCacheHome = getEnvVar("XDG_CACHE_HOME");
+    if (xdgCacheHome) {
+      return join2(xdgCacheHome, "claude");
+    }
+    return join2(homedir3(), ".cache", "claude");
+  }
+  static getGlobalKitDir() {
+    const testHome = PathResolver.getTestHomeDir();
+    if (testHome) {
+      return join2(testHome, ".claude");
+    }
+    const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR;
+    if (claudeConfigDir) {
+      return claudeConfigDir;
+    }
+    return join2(homedir3(), ".claude");
+  }
+  static getClaudeKitDir() {
+    const testHome = PathResolver.getTestHomeDir();
+    if (testHome) {
+      return join2(testHome, ".claudekit");
+    }
+    return join2(homedir3(), ".claudekit");
+  }
+  static getProjectsRegistryPath() {
+    return join2(PathResolver.getClaudeKitDir(), "projects.json");
+  }
+  static getOpenCodeDir(global2, baseDir) {
+    const testHome = PathResolver.getTestHomeDir();
+    if (testHome) {
+      return global2 ? join2(testHome, ".config", "opencode") : join2(baseDir || testHome, ".opencode");
+    }
+    if (!global2) {
+      return join2(baseDir || process.cwd(), ".opencode");
+    }
+    const xdgConfigHome = process.env.XDG_CONFIG_HOME;
+    if (xdgConfigHome) {
+      return join2(xdgConfigHome, "opencode");
+    }
+    return join2(homedir3(), ".config", "opencode");
+  }
+  static getPathPrefix(global2) {
+    return global2 ? "" : ".claude";
+  }
+  static buildSkillsPath(baseDir, global2) {
+    const prefix = PathResolver.getPathPrefix(global2);
+    if (prefix) {
+      return join2(baseDir, prefix, "skills");
+    }
+    return join2(baseDir, "skills");
+  }
+  static buildComponentPath(baseDir, component, global2) {
+    if (!PathResolver.isValidComponentName(component)) {
+      throw new Error(`Invalid component name: "${component}" contains path traversal patterns. Valid names are simple directory names like "agents", "commands", "rules", "skills", or "hooks".`);
+    }
+    const prefix = PathResolver.getPathPrefix(global2);
+    if (prefix) {
+      return join2(baseDir, prefix, component);
+    }
+    return join2(baseDir, component);
+  }
+  static getBackupDir(timestamp) {
+    const testHome = PathResolver.getTestHomeDir();
+    const baseDir = testHome ? join2(testHome, ".claudekit") : join2(homedir3(), ".claudekit");
+    if (timestamp) {
+      return join2(baseDir, "backups", timestamp);
+    }
+    const now = new Date;
+    const dateStr = now.toISOString().replace(/[:.]/g, "-").slice(0, 19);
+    const ms = now.getMilliseconds().toString().padStart(3, "0");
+    const random = Math.random().toString(36).slice(2, 6);
+    const ts = `${dateStr}-${ms}-${random}`;
+    return join2(baseDir, "backups", ts);
+  }
+  static normalizeWSLPath(p) {
+    return normalizeWSLPath(p);
+  }
+  static isWSL() {
+    return isWSL();
+  }
+  static isAtHomeDirectory(cwd2) {
+    const currentDir = normalize(cwd2 || process.cwd());
+    const homeDir = normalize(homedir3());
+    return currentDir === homeDir;
+  }
+  static getLocalClaudeDir(baseDir) {
+    const dir = baseDir || process.cwd();
+    return join2(dir, ".claude");
+  }
+  static isLocalSameAsGlobal(cwd2) {
+    const localPath = normalize(PathResolver.getLocalClaudeDir(cwd2));
+    const globalPath = normalize(PathResolver.getGlobalKitDir());
+    return localPath === globalPath;
+  }
+  static isGlobPattern(pattern) {
+    return pattern.includes("*") || pattern.includes("?") || pattern.includes("{");
+  }
+  static computeProjectHash(projectRoot) {
+    let normalized = resolve(projectRoot).replace(/[/\\]+$/, "");
+    if (process.platform === "darwin" || process.platform === "win32") {
+      normalized = normalized.toLowerCase();
+    }
+    return createHash3("sha256").update(normalized).digest("hex").slice(0, 12);
+  }
+  static getPlansRegistriesDir() {
+    return join2(PathResolver.getGlobalKitDir(), "plans-registries");
+  }
+  static getPlansRegistryPath(projectRoot) {
+    const hash = PathResolver.computeProjectHash(projectRoot);
+    return join2(PathResolver.getPlansRegistriesDir(), `${hash}.json`);
+  }
+}
+var init_path_resolver = () => {};
+
 // src/commands/portable/reconcile-types.ts
 function normalizeChecksum(checksum) {
   if (!checksum)
@@ -12686,18 +12897,16 @@ function providerConfigAppliesToType(config, type) {
 var UNKNOWN_CHECKSUM = "unknown";
 
 // src/commands/portable/portable-registry.ts
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync as existsSync3 } from "node:fs";
 import { mkdir, readFile as readFile2, rename, unlink, writeFile } from "node:fs/promises";
-import { homedir as homedir3 } from "node:os";
-import { dirname, join as join2, resolve } from "node:path";
+import { dirname, join as join3, resolve as resolve2 } from "node:path";
 function getPortableRegistryPaths() {
-  const home2 = homedir3();
-  const claudekitDir = join2(home2, ".claudekit");
+  const claudekitDir = PathResolver.getConfigDir(false);
   return {
-    registryPath: join2(claudekitDir, "portable-registry.json"),
-    registryLockPath: join2(claudekitDir, "portable-registry.lock"),
-    legacyRegistryPath: join2(claudekitDir, "skill-registry.json"),
-    migrationLockPath: join2(claudekitDir, ".migration.lock")
+    registryPath: join3(claudekitDir, "portable-registry.json"),
+    registryLockPath: join3(claudekitDir, "portable-registry.lock"),
+    legacyRegistryPath: join3(claudekitDir, "skill-registry.json"),
+    migrationLockPath: join3(claudekitDir, ".migration.lock")
   };
 }
 function isErrnoCode(error, code) {
@@ -12721,19 +12930,19 @@ function getCliVersion() {
     if (process.env.npm_package_version) {
       return process.env.npm_package_version;
     }
-    const { readFileSync: readFileSync2 } = __require("node:fs");
+    const { readFileSync: readFileSync3 } = __require("node:fs");
     const { dirname: dn, join: jp } = __require("node:path");
     const { fileURLToPath } = __require("node:url");
     const __dirname2 = dn(fileURLToPath(import.meta.url));
     const pkgPath = jp(__dirname2, "../../../package.json");
-    const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
+    const pkg = JSON.parse(readFileSync3(pkgPath, "utf-8"));
     return pkg.version || "unknown";
   } catch {
     return "unknown";
   }
 }
-async function migrateLegacyRegistry() {
-  const { legacyRegistryPath } = getPortableRegistryPaths();
+async function migrateLegacyRegistry(paths = getPortableRegistryPaths()) {
+  const { legacyRegistryPath } = paths;
   try {
     const content = await readFile2(legacyRegistryPath, "utf-8");
     const data = JSON.parse(content);
@@ -12762,7 +12971,7 @@ async function migrateRegistryV2ToV3(v2Registry) {
   for (const item of v2Registry.installations) {
     let targetChecksum = UNKNOWN_CHECKSUM;
     try {
-      if (existsSync2(item.path)) {
+      if (existsSync3(item.path)) {
         targetChecksum = await computeFileChecksum(item.path);
       }
     } catch (error) {
@@ -12819,7 +13028,7 @@ async function repairStaleRegistryV3(registry) {
   const installations = [];
   for (const item of registry.installations) {
     let targetChecksum = normalizeChecksum(getStringField(item, "targetChecksum")) || UNKNOWN_CHECKSUM;
-    if (targetChecksum === UNKNOWN_CHECKSUM && existsSync2(item.path)) {
+    if (targetChecksum === UNKNOWN_CHECKSUM && existsSync3(item.path)) {
       try {
         targetChecksum = await computeFileChecksum(item.path);
       } catch {
@@ -12842,15 +13051,15 @@ async function repairStaleRegistryV3(registry) {
     appliedManifestVersion: registry.appliedManifestVersion
   });
 }
-async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
-  return withRegistryLock(async () => {
-    const { registryPath } = getPortableRegistryPaths();
+async function persistCurrentStaleRegistryV3Repair(preparedRepair, paths = getPortableRegistryPaths()) {
+  return withRegistryLock(async (lockedPaths) => {
+    const { registryPath } = lockedPaths;
     let content;
     try {
       content = await readFile2(registryPath, "utf-8");
     } catch (error) {
       if (isErrnoCode(error, "ENOENT")) {
-        return readPortableRegistryInternal({ persistStaleV3Repair: false });
+        return readPortableRegistryInternal({ persistStaleV3Repair: false }, lockedPaths);
       }
       throw error;
     }
@@ -12866,20 +13075,20 @@ async function persistCurrentStaleRegistryV3Repair(preparedRepair) {
     }
     const repairableV3Result = RepairablePortableRegistrySchemaV3.safeParse(data);
     if (!repairableV3Result.success) {
-      return readPortableRegistryInternal({ persistStaleV3Repair: false });
+      return readPortableRegistryInternal({ persistStaleV3Repair: false }, lockedPaths);
     }
     const repairedRegistry = preparedRepair && preparedRepair.sourceContent === content ? preparedRepair.repairedRegistry : await repairStaleRegistryV3(repairableV3Result.data);
-    if (await isMigrationLocked()) {
+    if (await isMigrationLocked(lockedPaths)) {
       logger.verbose("Migration in progress by another process, using repaired v3 view");
       return repairedRegistry;
     }
     logger.verbose("Repairing stale portable registry v3.0 fields");
-    await writePortableRegistry(repairedRegistry);
+    await writePortableRegistry(repairedRegistry, lockedPaths);
     return repairedRegistry;
-  });
+  }, paths);
 }
-async function isMigrationLocked() {
-  const { migrationLockPath } = getPortableRegistryPaths();
+async function isMigrationLocked(paths = getPortableRegistryPaths()) {
+  const { migrationLockPath } = paths;
   try {
     const lockContent = await readFile2(migrationLockPath, "utf-8");
     const lockTime = Number.parseInt(lockContent, 10);
@@ -12903,16 +13112,16 @@ async function isMigrationLocked() {
     return true;
   }
 }
-async function createMigrationLock() {
-  const { migrationLockPath } = getPortableRegistryPaths();
+async function createMigrationLock(paths = getPortableRegistryPaths()) {
+  const { migrationLockPath } = paths;
   const lockDir = dirname(migrationLockPath);
-  if (!existsSync2(lockDir)) {
+  if (!existsSync3(lockDir)) {
     await mkdir(lockDir, { recursive: true });
   }
   await writeFile(migrationLockPath, Date.now().toString(), "utf-8");
 }
-async function removeMigrationLock() {
-  const { migrationLockPath } = getPortableRegistryPaths();
+async function removeMigrationLock(paths = getPortableRegistryPaths()) {
+  const { migrationLockPath } = paths;
   try {
     await unlink(migrationLockPath);
   } catch {}
@@ -12920,8 +13129,8 @@ async function removeMigrationLock() {
 async function readPortableRegistry() {
   return readPortableRegistryInternal({ persistStaleV3Repair: true });
 }
-async function readPortableRegistryInternal(options2) {
-  const { registryPath } = getPortableRegistryPaths();
+async function readPortableRegistryInternal(options2, paths = getPortableRegistryPaths()) {
+  const { registryPath } = paths;
   try {
     const content = await readFile2(registryPath, "utf-8");
     let data;
@@ -12940,61 +13149,61 @@ async function readPortableRegistryInternal(options2) {
       if (!options2.persistStaleV3Repair) {
         return repairedRegistry;
       }
-      if (await isMigrationLocked()) {
+      if (await isMigrationLocked(paths)) {
         logger.verbose("Migration in progress by another process, using repaired v3 view");
         return repairedRegistry;
       }
       return persistCurrentStaleRegistryV3Repair({
         sourceContent: content,
         repairedRegistry
-      });
+      }, paths);
     }
     const v2Result = PortableRegistrySchema.safeParse(data);
     if (!v2Result.success) {
       throw new Error("portable-registry.json has unsupported schema/version");
     }
-    if (await isMigrationLocked()) {
+    if (await isMigrationLocked(paths)) {
       logger.verbose("Migration in progress by another process, using in-memory v2→v3 view");
       return normalizePortableRegistryChecksums(await migrateRegistryV2ToV3(v2Result.data));
     }
     logger.verbose("Auto-migrating registry from v2.0 to v3.0");
-    await createMigrationLock();
+    await createMigrationLock(paths);
     try {
       const v3Registry = normalizePortableRegistryChecksums(await migrateRegistryV2ToV3(v2Result.data));
-      await writePortableRegistry(v3Registry);
+      await writePortableRegistry(v3Registry, paths);
       return v3Registry;
     } finally {
-      await removeMigrationLock();
+      await removeMigrationLock(paths);
     }
   } catch (error) {
     if (!isErrnoCode(error, "ENOENT")) {
       throw error;
     }
   }
-  const migratedV2 = await migrateLegacyRegistry();
+  const migratedV2 = await migrateLegacyRegistry(paths);
   if (migratedV2) {
-    if (await isMigrationLocked()) {
+    if (await isMigrationLocked(paths)) {
       logger.verbose("Migration in progress by another process, using in-memory v2→v3 view");
       return normalizePortableRegistryChecksums(await migrateRegistryV2ToV3(migratedV2));
     }
-    await createMigrationLock();
+    await createMigrationLock(paths);
     try {
       const v3Registry = normalizePortableRegistryChecksums(await migrateRegistryV2ToV3(migratedV2));
-      await writePortableRegistry(v3Registry);
+      await writePortableRegistry(v3Registry, paths);
       return v3Registry;
     } finally {
-      await removeMigrationLock();
+      await removeMigrationLock(paths);
     }
   }
   return { version: "3.0", installations: [] };
 }
-async function readPortableRegistryWithinRegistryLock() {
-  return readPortableRegistryInternal({ persistStaleV3Repair: false });
+async function readPortableRegistryWithinRegistryLock(paths) {
+  return readPortableRegistryInternal({ persistStaleV3Repair: false }, paths);
 }
-async function writePortableRegistry(registry) {
-  const { registryPath } = getPortableRegistryPaths();
+async function writePortableRegistry(registry, paths = getPortableRegistryPaths()) {
+  const { registryPath } = paths;
   const dir = dirname(registryPath);
-  if (!existsSync2(dir)) {
+  if (!existsSync3(dir)) {
     await mkdir(dir, { recursive: true });
   }
   const normalizedRegistry = normalizePortableRegistryChecksums(registry);
@@ -13009,13 +13218,13 @@ async function writePortableRegistry(registry) {
     throw error;
   }
 }
-async function withRegistryLock(operation) {
-  const { registryLockPath } = getPortableRegistryPaths();
+async function withRegistryLock(operation, paths = getPortableRegistryPaths()) {
+  const { registryLockPath } = paths;
   const lockDir = dirname(registryLockPath);
-  if (!existsSync2(lockDir)) {
+  if (!existsSync3(lockDir)) {
     await mkdir(lockDir, { recursive: true });
   }
-  if (!existsSync2(registryLockPath)) {
+  if (!existsSync3(registryLockPath)) {
     await writeFile(registryLockPath, "", "utf-8");
   }
   const release = await import_proper_lockfile.default.lock(registryLockPath, {
@@ -13028,14 +13237,14 @@ async function withRegistryLock(operation) {
     }
   });
   try {
-    return await operation();
+    return await operation(paths);
   } finally {
     await release();
   }
 }
 async function addPortableInstallation(item, type, provider, global2, path2, sourcePath, options2) {
-  await withRegistryLock(async () => {
-    const registry = await readPortableRegistryWithinRegistryLock();
+  await withRegistryLock(async (lockedPaths) => {
+    const registry = await readPortableRegistryWithinRegistryLock(lockedPaths);
     registry.installations = registry.installations.filter((i) => !(i.item === item && i.type === type && i.provider === provider && i.global === global2));
     registry.installations.push({
       item,
@@ -13051,17 +13260,17 @@ async function addPortableInstallation(item, type, provider, global2, path2, sou
       installSource: options2?.installSource || "kit",
       ownedSections: options2?.ownedSections
     });
-    await writePortableRegistry(registry);
+    await writePortableRegistry(registry, lockedPaths);
   });
 }
 async function removePortableInstallation(item, type, provider, global2, options2) {
-  return withRegistryLock(async () => {
-    const registry = await readPortableRegistryWithinRegistryLock();
-    const index = registry.installations.findIndex((i) => i.item === item && i.type === type && i.provider === provider && i.global === global2 && (!options2?.path || resolve(i.path) === resolve(options2.path)));
+  return withRegistryLock(async (lockedPaths) => {
+    const registry = await readPortableRegistryWithinRegistryLock(lockedPaths);
+    const index = registry.installations.findIndex((i) => i.item === item && i.type === type && i.provider === provider && i.global === global2 && (!options2?.path || resolve2(i.path) === resolve2(options2.path)));
     if (index === -1)
       return null;
     const [removed] = registry.installations.splice(index, 1);
-    await writePortableRegistry(registry);
+    await writePortableRegistry(registry, lockedPaths);
     return removed;
   });
 }
@@ -13079,15 +13288,15 @@ function findPortableInstallations(registry, item, type, provider, global2) {
   });
 }
 async function updateAppliedManifestVersion(version) {
-  await withRegistryLock(async () => {
-    const registry = await readPortableRegistryWithinRegistryLock();
+  await withRegistryLock(async (lockedPaths) => {
+    const registry = await readPortableRegistryWithinRegistryLock(lockedPaths);
     registry.appliedManifestVersion = version;
-    await writePortableRegistry(registry);
+    await writePortableRegistry(registry, lockedPaths);
   });
 }
 async function removeInstallationsByFilter(predicate) {
-  return withRegistryLock(async () => {
-    const registry = await readPortableRegistryWithinRegistryLock();
+  return withRegistryLock(async (lockedPaths) => {
+    const registry = await readPortableRegistryWithinRegistryLock(lockedPaths);
     const removed = [];
     registry.installations = registry.installations.filter((entry) => {
       if (predicate(entry)) {
@@ -13097,24 +13306,24 @@ async function removeInstallationsByFilter(predicate) {
       return true;
     });
     if (removed.length > 0) {
-      await writePortableRegistry(registry);
+      await writePortableRegistry(registry, lockedPaths);
     }
     return removed;
   });
 }
 async function syncPortableRegistry() {
-  return withRegistryLock(async () => {
-    const registry = await readPortableRegistryWithinRegistryLock();
+  return withRegistryLock(async (lockedPaths) => {
+    const registry = await readPortableRegistryWithinRegistryLock(lockedPaths);
     const removed = [];
     registry.installations = registry.installations.filter((i) => {
-      if (!existsSync2(i.path)) {
+      if (!existsSync3(i.path)) {
         removed.push(i);
         return false;
       }
       return true;
     });
     if (removed.length > 0) {
-      await writePortableRegistry(registry);
+      await writePortableRegistry(registry, lockedPaths);
     }
     return { removed };
   });
@@ -13123,6 +13332,7 @@ var import_proper_lockfile, PortableInstallationSchema, PortableRegistrySchema,
 var init_portable_registry = __esm(() => {
   init_zod();
   init_logger();
+  init_path_resolver();
   init_checksum_utils();
   import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
   PortableInstallationSchema = exports_external.object({
@@ -13181,10 +13391,10 @@ var init_portable_registry = __esm(() => {
 });
 
 // src/commands/portable/codex-toml-installer.ts
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync4 } from "node:fs";
 import { mkdir as mkdir2, readFile as readFile3, realpath, unlink as unlink2, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { basename, dirname as dirname2, isAbsolute, join as join3, relative, resolve as resolve2 } from "node:path";
+import { basename, dirname as dirname2, isAbsolute, join as join4, relative, resolve as resolve3 } from "node:path";
 function resolveCodexTomlRegistryDeps(deps) {
   return {
     ...defaultCodexTomlRegistryDeps,
@@ -13193,7 +13403,7 @@ function resolveCodexTomlRegistryDeps(deps) {
 }
 async function ensureDir(filePath) {
   const dir = dirname2(filePath);
-  if (!existsSync3(dir)) {
+  if (!existsSync4(dir)) {
     await mkdir2(dir, { recursive: true });
   }
 }
@@ -13201,7 +13411,7 @@ function isErrnoCode2(error, code) {
   return typeof error === "object" && error !== null && "code" in error && error.code === code;
 }
 function normalizePathForComparison(path2) {
-  const normalized = resolve2(path2);
+  const normalized = resolve3(path2);
   return process.platform === "win32" ? normalized.toLowerCase() : normalized;
 }
 function isPathWithinBoundary(targetPath, boundaryPath) {
@@ -13217,7 +13427,7 @@ async function resolveRealPathSafe(path2) {
   try {
     return await realpath(path2);
   } catch {
-    return resolve2(path2);
+    return resolve3(path2);
   }
 }
 async function isCanonicalPathWithinBoundary(targetPath, boundaryPath) {
@@ -13391,10 +13601,10 @@ function mergeConfigTomlWithDiagnostics(existing, managedBlock) {
   };
 }
 function getCodexLockPath(configTomlPath) {
-  return join3(dirname2(configTomlPath), `.${basename(configTomlPath)}.ck-codex.lock`);
+  return join4(dirname2(configTomlPath), `.${basename(configTomlPath)}.ck-codex.lock`);
 }
 async function withCodexTargetLock(configTomlPath, operation) {
-  const resolvedTargetPath = resolve2(configTomlPath);
+  const resolvedTargetPath = resolve3(configTomlPath);
   await ensureDir(resolvedTargetPath);
   const release = await import_proper_lockfile2.default.lock(dirname2(resolvedTargetPath), {
     realpath: false,
@@ -13473,8 +13683,8 @@ async function installCodexToml(items, provider, portableType, options2, deps) {
     };
   }
   const boundary = options2.global ? homedir4() : process.cwd();
-  const agentsDir = resolve2(basePath);
-  const configTomlPath = join3(dirname2(agentsDir), "config.toml");
+  const agentsDir = resolve3(basePath);
+  const configTomlPath = join4(dirname2(agentsDir), "config.toml");
   if (!isPathWithinBoundary(agentsDir, boundary)) {
     return {
       provider,
@@ -13568,7 +13778,7 @@ async function installCodexToml(items, provider, portableType, options2, deps) {
             continue;
           }
           seenSlugOwners.set(slug, item.name);
-          const agentTomlPath = join3(agentsDir, `${slug}.toml`);
+          const agentTomlPath = join4(agentsDir, `${slug}.toml`);
           if (process.platform === "win32" && agentTomlPath.length > MAX_WINDOWS_PATH_LENGTH) {
             allWarnings.push(`Skipped ${item.name}: target path exceeds ${MAX_WINDOWS_PATH_LENGTH} characters on Windows`);
             continue;
@@ -13695,9 +13905,9 @@ async function cleanupStaleCodexConfigEntries(options2) {
   const basePath = options2.global ? pathConfig.globalPath : pathConfig.projectPath;
   if (!basePath)
     return [];
-  const agentsDir = resolve2(basePath);
-  const configTomlPath = join3(dirname2(agentsDir), "config.toml");
-  if (!existsSync3(configTomlPath))
+  const agentsDir = resolve3(basePath);
+  const configTomlPath = join4(dirname2(agentsDir), "config.toml");
+  if (!existsSync4(configTomlPath))
     return [];
   try {
     return await withCodexTargetLock(configTomlPath, async () => {
@@ -13713,8 +13923,8 @@ async function cleanupStaleCodexConfigEntries(options2) {
       if (managedEntries.size > 0) {
         const validEntries = new Map;
         for (const [slug, entry] of managedEntries) {
-          const tomlPath = join3(agentsDir, `${slug}.toml`);
-          if (existsSync3(tomlPath)) {
+          const tomlPath = join4(agentsDir, `${slug}.toml`);
+          if (existsSync4(tomlPath)) {
             validEntries.set(slug, entry);
           } else {
             allStaleSlugs.push(slug);
@@ -13744,10 +13954,10 @@ async function cleanupStaleCodexConfigEntries(options2) {
       const unmanagedSlugs = extractUnmanagedAgentSlugs(analysis.unmanagedContent);
       const legacyStaleSlugs = [];
       for (const slug of unmanagedSlugs) {
-        const tomlPath = join3(agentsDir, `${slug}.toml`);
+        const tomlPath = join4(agentsDir, `${slug}.toml`);
         if (!isPathWithinBoundary(tomlPath, agentsDir))
           continue;
-        if (!existsSync3(tomlPath)) {
+        if (!existsSync4(tomlPath)) {
           legacyStaleSlugs.push(slug);
         }
       }
@@ -13992,13 +14202,13 @@ var init_merge_single_sections = __esm(() => {
 });
 
 // src/commands/portable/portable-installer.ts
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 import { lstat, mkdir as mkdir3, readFile as readFile4, realpath as realpath2, unlink as unlink3, writeFile as writeFile3 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
-import { basename as basename2, dirname as dirname3, join as join4, relative as relative2, resolve as resolve3, sep } from "node:path";
+import { basename as basename2, dirname as dirname3, join as join5, relative as relative2, resolve as resolve4, sep } from "node:path";
 function isSamePath(path1, path2) {
   try {
-    return resolve3(path1) === resolve3(path2);
+    return resolve4(path1) === resolve4(path2);
   } catch {
     return false;
   }
@@ -14027,8 +14237,8 @@ function isWindowsAbsolutePath(path2) {
   return /^[a-zA-Z]:[\\/]/.test(path2) || /^\\\\/.test(path2);
 }
 function isPathWithinBoundary2(targetPath, boundaryPath) {
-  const resolvedTarget = resolve3(targetPath);
-  const resolvedBoundary = resolve3(boundaryPath);
+  const resolvedTarget = resolve4(targetPath);
+  const resolvedBoundary = resolve4(boundaryPath);
   return resolvedTarget === resolvedBoundary || resolvedTarget.startsWith(`${resolvedBoundary}${sep}`);
 }
 function validateStrategyTargetPath(targetPath, options2) {
@@ -14054,16 +14264,16 @@ function resolvePerFileOutputFilename(filename, pathConfig) {
   return `${nameWithoutExt.replace(/\//g, "-")}${ext}`;
 }
 function validateResolvedTargetWithinBase(targetPath, basePath, pathConfig) {
-  const resolvedTarget = resolve3(targetPath);
-  const resolvedBase = pathConfig.writeStrategy === "single-file" ? resolve3(dirname3(basePath)) : resolve3(basePath);
+  const resolvedTarget = resolve4(targetPath);
+  const resolvedBase = pathConfig.writeStrategy === "single-file" ? resolve4(dirname3(basePath)) : resolve4(basePath);
   if (!resolvedTarget.startsWith(`${resolvedBase}${sep}`) && resolvedTarget !== resolvedBase) {
     return "Unsafe path: target escapes base directory";
   }
   return null;
 }
 async function validateNoSymlinkComponents(targetPath, boundaryPath) {
-  const resolvedTarget = resolve3(targetPath);
-  const resolvedBoundary = resolve3(boundaryPath);
+  const resolvedTarget = resolve4(targetPath);
+  const resolvedBoundary = resolve4(boundaryPath);
   if (!isPathWithinBoundary2(resolvedTarget, resolvedBoundary)) {
     return `Unsafe path: target escapes ${resolvedBoundary}`;
   }
@@ -14071,7 +14281,7 @@ async function validateNoSymlinkComponents(targetPath, boundaryPath) {
   let cursor = resolvedBoundary;
   let deepestExisting = resolvedBoundary;
   for (const segment of segments) {
-    cursor = join4(cursor, segment);
+    cursor = join5(cursor, segment);
     try {
       await lstat(cursor);
       deepestExisting = cursor;
@@ -14181,13 +14391,13 @@ function buildPerFileCollisionSkips(items, provider, configDisplayName, basePath
       continue;
     }
     const resolvedFilename = resolvePerFileOutputFilename(result.filename, pathConfig);
-    const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join4(basePath, resolvedFilename);
+    const targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join5(basePath, resolvedFilename);
     if (validateResolvedTargetWithinBase(targetPath, basePath, pathConfig)) {
       continue;
     }
-    const first = seenTargets.get(resolve3(targetPath));
+    const first = seenTargets.get(resolve4(targetPath));
     if (!first) {
-      seenTargets.set(resolve3(targetPath), { itemName: item.name, targetPath });
+      seenTargets.set(resolve4(targetPath), { itemName: item.name, targetPath });
       continue;
     }
     skipped.set(index, {
@@ -14267,16 +14477,16 @@ async function installPerFileItems(items, provider, portableType, pathConfig, op
 }
 async function ensureDir2(filePath) {
   const dir = dirname3(filePath);
-  if (!existsSync4(dir)) {
+  if (!existsSync5(dir)) {
     await mkdir3(dir, { recursive: true });
   }
 }
 function getMergeTargetLockPath(targetPath) {
   const lockName = `.${basename2(targetPath)}.ck-merge.lock`;
-  return join4(dirname3(targetPath), lockName);
+  return join5(dirname3(targetPath), lockName);
 }
 async function withMergeTargetLock(targetPath, operation) {
-  const resolvedTargetPath = resolve3(targetPath);
+  const resolvedTargetPath = resolve4(targetPath);
   await ensureDir2(resolvedTargetPath);
   const release = await import_proper_lockfile3.default.lock(dirname3(resolvedTargetPath), {
     realpath: false,
@@ -14393,7 +14603,7 @@ async function installPerFile(item, provider, portableType, options2, registryDe
       };
     }
     const resolvedFilename = resolvePerFileOutputFilename(result.filename, pathConfig);
-    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join4(basePath, resolvedFilename);
+    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join5(basePath, resolvedFilename);
     const targetPathError = validateResolvedTargetWithinBase(targetPath, basePath, pathConfig);
     if (targetPathError) {
       return {
@@ -14520,7 +14730,7 @@ async function installMergeSingle(items, provider, portableType, options2, regis
             error: "Config merge target accepts only one item per install"
           };
         }
-        const alreadyExists = existsSync4(targetPath);
+        const alreadyExists = existsSync5(targetPath);
         let existingSections = [];
         let existingPreamble = "";
         const allWarnings = [];
@@ -14723,7 +14933,7 @@ async function installYamlMerge(items, provider, portableType, options2, registr
   }
   let targetSnapshot = null;
   try {
-    const alreadyExists = existsSync4(targetPath);
+    const alreadyExists = existsSync5(targetPath);
     let existingModes = new Map;
     if (alreadyExists) {
       try {
@@ -14899,7 +15109,7 @@ async function installJsonMerge(items, provider, portableType, options2, registr
       }
       modes.push(parsedMode.data);
     }
-    const modesPath = join4(basePath, "cline_custom_modes.json");
+    const modesPath = join5(basePath, "cline_custom_modes.json");
     failurePath = modesPath;
     const modesSymlinkError = await validateWritableTargetPath(modesPath, options2);
     if (modesSymlinkError) {
@@ -14912,7 +15122,7 @@ async function installJsonMerge(items, provider, portableType, options2, registr
       };
     }
     await ensureDir2(modesPath);
-    const alreadyExists = existsSync4(modesPath);
+    const alreadyExists = existsSync5(modesPath);
     if (alreadyExists) {
       try {
         const existingRaw = JSON.parse(await readFile4(modesPath, "utf-8"));
@@ -14948,7 +15158,7 @@ async function installJsonMerge(items, provider, portableType, options2, registr
     await writeFile3(modesPath, modesJson, "utf-8");
     const targetChecksum = computeContentChecksum(modesJson);
     const ownedSections = modes.map((m2) => m2.slug);
-    const rulesDir = join4(dirname3(basePath), ".clinerules");
+    const rulesDir = join5(dirname3(basePath), ".clinerules");
     await mkdir3(rulesDir, { recursive: true });
     const capturedRuleSnapshots = new Set;
     for (const item of items) {
@@ -14970,10 +15180,10 @@ async function installJsonMerge(items, provider, portableType, options2, registr
         }
       }
       const filename = `${namespacedName}.md`;
-      const rulePath = join4(rulesDir, filename);
+      const rulePath = join5(rulesDir, filename);
       failurePath = rulePath;
-      const resolvedRulePath = resolve3(rulePath);
-      const resolvedRulesDir = resolve3(rulesDir);
+      const resolvedRulePath = resolve4(rulePath);
+      const resolvedRulesDir = resolve4(rulesDir);
       if (!resolvedRulePath.startsWith(resolvedRulesDir + sep) && resolvedRulePath !== resolvedRulesDir) {
         throw new Error(`Unsafe path: rule target escapes rules directory (${rulePath})`);
       }
@@ -16182,26 +16392,26 @@ var init_types3 = __esm(() => {
 });
 
 // src/shared/kit-layout.ts
-import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
-import { join as join5 } from "node:path";
+import { existsSync as existsSync6, readFileSync as readFileSync3 } from "node:fs";
+import { join as join6 } from "node:path";
 function uniquePaths(paths) {
   return [...new Set(paths)];
 }
 function findFirstExistingPath(paths) {
   for (const candidate of paths) {
-    if (existsSync5(candidate)) {
+    if (existsSync6(candidate)) {
       return candidate;
     }
   }
   return null;
 }
 function resolveKitLayout(projectRoot) {
-  const packageJsonPath = join5(projectRoot, "package.json");
-  if (!existsSync5(packageJsonPath)) {
+  const packageJsonPath = join6(projectRoot, "package.json");
+  if (!existsSync6(packageJsonPath)) {
     return DEFAULT_KIT_LAYOUT;
   }
   try {
-    const parsed = ClaudeKitPackageMetadataSchema.parse(JSON.parse(readFileSync2(packageJsonPath, "utf8")));
+    const parsed = ClaudeKitPackageMetadataSchema.parse(JSON.parse(readFileSync3(packageJsonPath, "utf8")));
     return KitLayoutSchema.parse({
       ...DEFAULT_KIT_LAYOUT,
       ...parsed.claudekit ?? {}
@@ -16213,8 +16423,8 @@ function resolveKitLayout(projectRoot) {
 function getProjectLayoutCandidates(projectRoot, subPath) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join5(projectRoot, layout.sourceDir, subPath),
-    join5(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
+    join6(projectRoot, layout.sourceDir, subPath),
+    join6(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
   ]);
 }
 function findExistingProjectLayoutPath(projectRoot, subPath) {
@@ -16223,9 +16433,9 @@ function findExistingProjectLayoutPath(projectRoot, subPath) {
 function getProjectConfigCandidates(projectRoot) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join5(projectRoot, "CLAUDE.md"),
-    join5(projectRoot, layout.sourceDir, "CLAUDE.md"),
-    join5(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
+    join6(projectRoot, "CLAUDE.md"),
+    join6(projectRoot, layout.sourceDir, "CLAUDE.md"),
+    join6(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
   ]);
 }
 function findExistingProjectConfigPath(projectRoot) {
@@ -16339,9 +16549,9 @@ var init_frontmatter_parser = __esm(() => {
 // src/commands/agents/agents-discovery.ts
 import { readdir } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function getAgentSourcePath(globalOnly = false) {
-  const globalPath = join6(homedir6(), ".claude/agents");
+  const globalPath = join7(homedir6(), ".claude/agents");
   if (globalOnly) {
     return findFirstExistingPath([globalPath]);
   }
@@ -16360,7 +16570,7 @@ async function discoverAgents(sourcePath) {
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.endsWith(".md"))
         continue;
-      const filePath = join6(searchPath, entry.name);
+      const filePath = join7(searchPath, entry.name);
       try {
         const { frontmatter, body } = await parseFrontmatterFile(filePath);
         const name = entry.name.replace(/\.md$/, "");
@@ -19423,217 +19633,6 @@ var init_safe_spinner = __esm(() => {
   };
 });
 
-// src/shared/path-resolver.ts
-import { createHash as createHash3 } from "node:crypto";
-import { existsSync as existsSync8, readFileSync as readFileSync4 } from "node:fs";
-import { homedir as homedir9, platform as platform2 } from "node:os";
-import { join as join11, normalize, resolve as resolve4 } from "node:path";
-function getEnvVar(name) {
-  const val = process.env[name];
-  if (!val || val.trim() === "")
-    return;
-  if (val.includes("..")) {
-    console.warn(`Environment variable ${name} contains path traversal: ${val}`);
-    return;
-  }
-  return val;
-}
-function isWSL() {
-  try {
-    return process.platform === "linux" && existsSync8("/proc/version") && readFileSync4("/proc/version", "utf8").toLowerCase().includes("microsoft");
-  } catch {
-    return false;
-  }
-}
-function normalizeWSLPath(p) {
-  if (!isWSL())
-    return p;
-  const windowsMatch = p.match(/^([A-Za-z]):(.*)/);
-  if (windowsMatch) {
-    const drive = windowsMatch[1].toLowerCase();
-    const rest = windowsMatch[2].replace(/\\/g, "/");
-    return `/mnt/${drive}${rest}`;
-  }
-  return p;
-}
-
-class PathResolver {
-  static getTestHomeDir() {
-    return process.env.CK_TEST_HOME;
-  }
-  static isValidComponentName(name) {
-    if (!name || typeof name !== "string") {
-      return false;
-    }
-    const dangerousPatterns = [
-      "..",
-      "~"
-    ];
-    for (const pattern of dangerousPatterns) {
-      if (name.includes(pattern)) {
-        return false;
-      }
-    }
-    const normalized = normalize(name);
-    for (const pattern of dangerousPatterns) {
-      if (normalized.includes(pattern)) {
-        return false;
-      }
-    }
-    if (name.startsWith("/") || normalized.startsWith("/") || /^[a-zA-Z]:/.test(name) || name.startsWith("\\\\") || normalized.startsWith("\\\\")) {
-      return false;
-    }
-    return true;
-  }
-  static getConfigDir(global3 = false) {
-    const testHome = PathResolver.getTestHomeDir();
-    if (testHome) {
-      return global3 ? join11(testHome, ".config", "claude") : join11(testHome, ".claudekit");
-    }
-    if (!global3) {
-      return join11(homedir9(), ".claudekit");
-    }
-    const os2 = platform2();
-    if (os2 === "win32") {
-      const localAppData = getEnvVar("LOCALAPPDATA") ?? join11(homedir9(), "AppData", "Local");
-      return join11(localAppData, "claude");
-    }
-    const xdgConfigHome = getEnvVar("XDG_CONFIG_HOME");
-    if (xdgConfigHome) {
-      return join11(xdgConfigHome, "claude");
-    }
-    return join11(homedir9(), ".config", "claude");
-  }
-  static getConfigFile(global3 = false) {
-    return join11(PathResolver.getConfigDir(global3), "config.json");
-  }
-  static getCacheDir(global3 = false) {
-    const testHome = PathResolver.getTestHomeDir();
-    if (testHome) {
-      return global3 ? join11(testHome, ".cache", "claude") : join11(testHome, ".claudekit", "cache");
-    }
-    if (!global3) {
-      return join11(homedir9(), ".claudekit", "cache");
-    }
-    const os2 = platform2();
-    if (os2 === "win32") {
-      const localAppData = getEnvVar("LOCALAPPDATA") ?? join11(homedir9(), "AppData", "Local");
-      return join11(localAppData, "claude", "cache");
-    }
-    const xdgCacheHome = getEnvVar("XDG_CACHE_HOME");
-    if (xdgCacheHome) {
-      return join11(xdgCacheHome, "claude");
-    }
-    return join11(homedir9(), ".cache", "claude");
-  }
-  static getGlobalKitDir() {
-    const testHome = PathResolver.getTestHomeDir();
-    if (testHome) {
-      return join11(testHome, ".claude");
-    }
-    const claudeConfigDir = process.env.CLAUDE_CONFIG_DIR;
-    if (claudeConfigDir) {
-      return claudeConfigDir;
-    }
-    return join11(homedir9(), ".claude");
-  }
-  static getClaudeKitDir() {
-    const testHome = PathResolver.getTestHomeDir();
-    if (testHome) {
-      return join11(testHome, ".claudekit");
-    }
-    return join11(homedir9(), ".claudekit");
-  }
-  static getProjectsRegistryPath() {
-    return join11(PathResolver.getClaudeKitDir(), "projects.json");
-  }
-  static getOpenCodeDir(global3, baseDir) {
-    const testHome = PathResolver.getTestHomeDir();
-    if (testHome) {
-      return global3 ? join11(testHome, ".config", "opencode") : join11(baseDir || testHome, ".opencode");
-    }
-    if (!global3) {
-      return join11(baseDir || process.cwd(), ".opencode");
-    }
-    const xdgConfigHome = process.env.XDG_CONFIG_HOME;
-    if (xdgConfigHome) {
-      return join11(xdgConfigHome, "opencode");
-    }
-    return join11(homedir9(), ".config", "opencode");
-  }
-  static getPathPrefix(global3) {
-    return global3 ? "" : ".claude";
-  }
-  static buildSkillsPath(baseDir, global3) {
-    const prefix = PathResolver.getPathPrefix(global3);
-    if (prefix) {
-      return join11(baseDir, prefix, "skills");
-    }
-    return join11(baseDir, "skills");
-  }
-  static buildComponentPath(baseDir, component, global3) {
-    if (!PathResolver.isValidComponentName(component)) {
-      throw new Error(`Invalid component name: "${component}" contains path traversal patterns. Valid names are simple directory names like "agents", "commands", "rules", "skills", or "hooks".`);
-    }
-    const prefix = PathResolver.getPathPrefix(global3);
-    if (prefix) {
-      return join11(baseDir, prefix, component);
-    }
-    return join11(baseDir, component);
-  }
-  static getBackupDir(timestamp) {
-    const testHome = PathResolver.getTestHomeDir();
-    const baseDir = testHome ? join11(testHome, ".claudekit") : join11(homedir9(), ".claudekit");
-    if (timestamp) {
-      return join11(baseDir, "backups", timestamp);
-    }
-    const now = new Date;
-    const dateStr = now.toISOString().replace(/[:.]/g, "-").slice(0, 19);
-    const ms = now.getMilliseconds().toString().padStart(3, "0");
-    const random = Math.random().toString(36).slice(2, 6);
-    const ts = `${dateStr}-${ms}-${random}`;
-    return join11(baseDir, "backups", ts);
-  }
-  static normalizeWSLPath(p) {
-    return normalizeWSLPath(p);
-  }
-  static isWSL() {
-    return isWSL();
-  }
-  static isAtHomeDirectory(cwd2) {
-    const currentDir = normalize(cwd2 || process.cwd());
-    const homeDir = normalize(homedir9());
-    return currentDir === homeDir;
-  }
-  static getLocalClaudeDir(baseDir) {
-    const dir = baseDir || process.cwd();
-    return join11(dir, ".claude");
-  }
-  static isLocalSameAsGlobal(cwd2) {
-    const localPath = normalize(PathResolver.getLocalClaudeDir(cwd2));
-    const globalPath = normalize(PathResolver.getGlobalKitDir());
-    return localPath === globalPath;
-  }
-  static isGlobPattern(pattern) {
-    return pattern.includes("*") || pattern.includes("?") || pattern.includes("{");
-  }
-  static computeProjectHash(projectRoot) {
-    let normalized = resolve4(projectRoot).replace(/[/\\]+$/, "");
-    if (process.platform === "darwin" || process.platform === "win32") {
-      normalized = normalized.toLowerCase();
-    }
-    return createHash3("sha256").update(normalized).digest("hex").slice(0, 12);
-  }
-  static getPlansRegistriesDir() {
-    return join11(PathResolver.getGlobalKitDir(), "plans-registries");
-  }
-  static getPlansRegistryPath(projectRoot) {
-    const hash = PathResolver.computeProjectHash(projectRoot);
-    return join11(PathResolver.getPlansRegistriesDir(), `${hash}.json`);
-  }
-}
-var init_path_resolver = () => {};
-
 // node_modules/universalify/index.js
 var require_universalify = __commonJS((exports) => {
   exports.fromCallback = function(fn) {
@@ -21022,10 +21021,10 @@ var init_safe_prompts = __esm(() => {
 
 // src/commands/commands/commands-discovery.ts
 import { readdir as readdir4 } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
+import { homedir as homedir9 } from "node:os";
 import { join as join16, relative as relative3 } from "node:path";
 function getCommandSourcePath(globalOnly = false) {
-  const globalPath = join16(homedir10(), ".claude/commands");
+  const globalPath = join16(homedir9(), ".claude/commands");
   if (globalOnly) {
     return findFirstExistingPath([globalPath]);
   }
@@ -45405,7 +45404,7 @@ __export(exports_ck_config_manager, {
 });
 import { existsSync as existsSync11 } from "node:fs";
 import { mkdir as mkdir7, readFile as readFile8, writeFile as writeFile6 } from "node:fs/promises";
-import { homedir as homedir11 } from "node:os";
+import { homedir as homedir10 } from "node:os";
 import { join as join19 } from "node:path";
 function getNestedValue(obj, path4) {
   if (!obj || typeof obj !== "object")
@@ -45480,7 +45479,7 @@ function valuesEqual(a3, b3) {
 
 class CkConfigManager {
   static getGlobalConfigDir() {
-    return join19(homedir11(), ".claude");
+    return join19(homedir10(), ".claude");
   }
   static getGlobalConfigPath() {
     return join19(CkConfigManager.getGlobalConfigDir(), CK_CONFIG_FILE);
@@ -45739,7 +45738,7 @@ function notFoundError(type, name, hint) {
 }
 
 // src/shared/command-normalizer.ts
-import { homedir as homedir12 } from "node:os";
+import { homedir as homedir11 } from "node:os";
 import { join as join20 } from "node:path";
 function escapeRegex(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -45779,7 +45778,7 @@ function resolveClaudePathArg(arg, root) {
     const isWin2 = process.platform === "win32";
     const cmp = (s) => isWin2 ? s.toLowerCase() : s;
     const globalRoots = [
-      `${homedir12().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
+      `${homedir11().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
       `${PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "")}/`
     ];
     const isUnderGlobal = globalRoots.some((g2) => cmp(absolutePath).startsWith(cmp(g2)));
@@ -45856,7 +45855,7 @@ function repairClaudeNodeCommandPath(cmd, root) {
     const isWin2 = process.platform === "win32";
     const cmp = (s) => isWin2 ? s.toLowerCase() : s;
     const globalRoots = [
-      `${homedir12().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
+      `${homedir11().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
       `${PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "")}/`
     ];
     const isUnderGlobal = globalRoots.some((g2) => cmp(normalizedAbsPath).startsWith(cmp(g2)));
@@ -45905,7 +45904,7 @@ function normalizeCommand(cmd) {
     return "";
   let normalized = cmd;
   const globalKitDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
-  const defaultGlobalKitDir = join20(homedir12(), ".claude").replace(/\\/g, "/");
+  const defaultGlobalKitDir = join20(homedir11(), ".claude").replace(/\\/g, "/");
   normalized = normalized.replace(/"/g, "");
   normalized = normalized.replace(/~\//g, "$HOME/");
   normalized = normalized.replace(/\$CLAUDE_PROJECT_DIR/g, "$HOME");
@@ -46103,11 +46102,15 @@ function mergeHookEntries(sourceEntries, destEntries, eventName, result, install
       const isFullyDuplicated = commands.length > 0 && commands.every((cmd) => existingCommands.has(normalizeCommand(cmd)));
       const duplicateCommands = commands.filter((cmd) => existingCommands.has(normalizeCommand(cmd)));
       logDuplicates(duplicateCommands, eventName, result);
-      const hasNonRemovedCommands = commands.length === 0 || commands.some((cmd) => !existingCommands.has(normalizeCommand(cmd)) && !wasCommandInstalled(cmd, installedHooks));
+      const newCommands = commands.filter((cmd) => !existingCommands.has(normalizeCommand(cmd)) && !wasCommandInstalled(cmd, installedHooks));
+      const hasNonRemovedCommands = commands.length === 0 || newCommands.length > 0;
       if (!isFullyDuplicated && hasNonRemovedCommands) {
         let filteredEntry = entry;
-        if ("hooks" in entry && entry.hooks && userRemovedCommands.length > 0) {
-          const filteredHooks = entry.hooks.filter((h2) => !h2.command || !wasCommandInstalled(h2.command, installedHooks));
+        if ("hooks" in entry && entry.hooks && commands.length > 0) {
+          const filteredHooks = entry.hooks.filter((h2) => !h2.command || !existingCommands.has(normalizeCommand(h2.command)) && !wasCommandInstalled(h2.command, installedHooks));
+          if (filteredHooks.length === 0) {
+            continue;
+          }
           filteredEntry = { ...entry, hooks: filteredHooks };
         } else if ("command" in entry && wasCommandInstalled(entry.command, installedHooks)) {
           continue;
@@ -46118,16 +46121,12 @@ function mergeHookEntries(sourceEntries, destEntries, eventName, result, install
         if (sourceMatcher) {
           matcherIndex.set(sourceMatcher, merged.length - 1);
         }
-        for (const cmd of commands) {
+        for (const cmd of newCommands) {
           const normalizedCmd = normalizeCommand(cmd);
-          if (!existingCommands.has(normalizedCmd) && !wasCommandInstalled(cmd, installedHooks)) {
-            existingCommands.add(normalizedCmd);
-            result.newlyInstalledHooks.push(cmd);
-            if (sourceKit) {
-              trackHookOrigin(result, sourceKit, cmd);
-            }
-          } else if (!existingCommands.has(normalizedCmd)) {
-            existingCommands.add(normalizedCmd);
+          existingCommands.add(normalizedCmd);
+          result.newlyInstalledHooks.push(cmd);
+          if (sourceKit) {
+            trackHookOrigin(result, sourceKit, cmd);
           }
         }
       }
@@ -48098,7 +48097,7 @@ var init_chokidar = __esm(() => {
 });
 
 // src/domains/web-server/file-watcher.ts
-import { homedir as homedir13 } from "node:os";
+import { homedir as homedir12 } from "node:os";
 import { join as join25 } from "node:path";
 
 class FileWatcher {
@@ -48121,9 +48120,9 @@ class FileWatcher {
   }
   getWatchPaths() {
     const paths = [];
-    const globalDir = join25(homedir13(), ".claudekit");
+    const globalDir = join25(homedir12(), ".claudekit");
     paths.push(join25(globalDir, "config.json"));
-    const globalKitDir = join25(homedir13(), ".claude");
+    const globalKitDir = join25(homedir12(), ".claude");
     paths.push(join25(globalKitDir, ".ck.json"));
     paths.push(join25(globalKitDir, "settings.json"));
     paths.push(join25(globalKitDir, "settings.local.json"));
@@ -48173,8 +48172,8 @@ class FileWatcher {
     return path4.endsWith("config.json") || path4.endsWith(".ck.json") || path4.endsWith("settings.json") || path4.endsWith("settings.local.json");
   }
   getConfigScope(path4) {
-    const globalDir = join25(homedir13(), ".claudekit");
-    const globalKitDir = join25(homedir13(), ".claude");
+    const globalDir = join25(homedir12(), ".claudekit");
+    const globalKitDir = join25(homedir12(), ".claude");
     return path4.startsWith(globalDir) || path4.startsWith(globalKitDir) ? "global" : "local";
   }
   stop() {
@@ -48665,7 +48664,7 @@ var init_claudekit_data2 = __esm(() => {
 // src/domains/web-server/routes/action-routes.ts
 import { spawn, spawnSync } from "node:child_process";
 import { existsSync as existsSync14 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
+import { homedir as homedir13 } from "node:os";
 import { join as join27, resolve as resolve12, sep as sep5 } from "node:path";
 function getWindowsPaths(...relativePaths) {
   const roots = [
@@ -48942,7 +48941,7 @@ async function isActionPathAllowed(dirPath, projectId) {
     try {
       const encodedPath = projectId.slice("discovered-".length);
       const discoveredPath = resolve12(Buffer.from(encodedPath, "base64url").toString("utf-8"));
-      if (discoveredPath === dirPath && (isPathInsideBase(discoveredPath, process.cwd()) || isPathInsideBase(discoveredPath, homedir14()))) {
+      if (discoveredPath === dirPath && (isPathInsideBase(discoveredPath, process.cwd()) || isPathInsideBase(discoveredPath, homedir13()))) {
         return true;
       }
     } catch {}
@@ -48954,7 +48953,7 @@ async function isActionPathAllowed(dirPath, projectId) {
   if (isPathInsideBase(dirPath, process.cwd())) {
     return true;
   }
-  return isPathInsideBase(dirPath, homedir14());
+  return isPathInsideBase(dirPath, homedir13());
 }
 function buildSystemTerminalCommand(dirPath) {
   if (isMacOS()) {
@@ -49293,7 +49292,7 @@ var init_action_routes = __esm(() => {
     projectId: exports_external.string().min(1).max(256).optional()
   }).strict();
   WINDOWS_PATHS = {
-    localAppData: process.env.LOCALAPPDATA || join27(homedir14(), "AppData", "Local"),
+    localAppData: process.env.LOCALAPPDATA || join27(homedir13(), "AppData", "Local"),
     programFiles: process.env.ProgramFiles || "C:\\Program Files",
     programFilesX86: process.env["ProgramFiles(x86)"] || "C:\\Program Files (x86)"
   };
@@ -49314,7 +49313,7 @@ var init_action_routes = __esm(() => {
       openMode: "open-directory",
       capabilities: ["open-directory", "run-command"],
       macAppName: "iTerm",
-      macAppPaths: ["/Applications/iTerm.app", join27(homedir14(), "Applications", "iTerm.app")]
+      macAppPaths: ["/Applications/iTerm.app", join27(homedir13(), "Applications", "iTerm.app")]
     },
     {
       id: "warp",
@@ -49325,7 +49324,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory", "uri-scheme"],
       commands: ["warp"],
       macAppName: "Warp",
-      macAppPaths: ["/Applications/Warp.app", join27(homedir14(), "Applications", "Warp.app")],
+      macAppPaths: ["/Applications/Warp.app", join27(homedir13(), "Applications", "Warp.app")],
       windowsAppPaths: getWindowsPaths("Warp\\Warp.exe"),
       linuxAppPaths: ["/usr/bin/warp", "/usr/local/bin/warp"]
     },
@@ -49348,7 +49347,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["wezterm"],
       macAppName: "WezTerm",
-      macAppPaths: ["/Applications/WezTerm.app", join27(homedir14(), "Applications", "WezTerm.app")],
+      macAppPaths: ["/Applications/WezTerm.app", join27(homedir13(), "Applications", "WezTerm.app")],
       windowsAppPaths: getWindowsPaths("WezTerm\\wezterm-gui.exe", "WezTerm\\wezterm.exe"),
       linuxAppPaths: ["/usr/bin/wezterm", "/usr/local/bin/wezterm"]
     },
@@ -49361,7 +49360,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["kitty"],
       macAppName: "kitty",
-      macAppPaths: ["/Applications/kitty.app", join27(homedir14(), "Applications", "kitty.app")],
+      macAppPaths: ["/Applications/kitty.app", join27(homedir13(), "Applications", "kitty.app")],
       windowsAppPaths: getWindowsPaths("kitty\\kitty.exe"),
       linuxAppPaths: ["/usr/bin/kitty", "/usr/local/bin/kitty"]
     },
@@ -49374,7 +49373,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["alacritty"],
       macAppName: "Alacritty",
-      macAppPaths: ["/Applications/Alacritty.app", join27(homedir14(), "Applications", "Alacritty.app")],
+      macAppPaths: ["/Applications/Alacritty.app", join27(homedir13(), "Applications", "Alacritty.app")],
       windowsAppPaths: getWindowsPaths("Alacritty\\alacritty.exe"),
       linuxAppPaths: ["/usr/bin/alacritty", "/usr/local/bin/alacritty"]
     },
@@ -49447,7 +49446,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-app"],
       commands: ["termius"],
       macAppName: "Termius",
-      macAppPaths: ["/Applications/Termius.app", join27(homedir14(), "Applications", "Termius.app")],
+      macAppPaths: ["/Applications/Termius.app", join27(homedir13(), "Applications", "Termius.app")],
       windowsAppPaths: getWindowsPaths("Termius\\Termius.exe"),
       linuxAppPaths: ["/usr/bin/termius"]
     },
@@ -49470,7 +49469,7 @@ var init_action_routes = __esm(() => {
       macAppName: "Visual Studio Code",
       macAppPaths: [
         "/Applications/Visual Studio Code.app",
-        join27(homedir14(), "Applications", "Visual Studio Code.app")
+        join27(homedir13(), "Applications", "Visual Studio Code.app")
       ],
       windowsAppPaths: getWindowsPaths("Programs\\Microsoft VS Code\\Code.exe", "Microsoft VS Code\\Code.exe"),
       linuxAppPaths: ["/usr/bin/code", "/snap/bin/code"]
@@ -49484,7 +49483,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["cursor"],
       macAppName: "Cursor",
-      macAppPaths: ["/Applications/Cursor.app", join27(homedir14(), "Applications", "Cursor.app")],
+      macAppPaths: ["/Applications/Cursor.app", join27(homedir13(), "Applications", "Cursor.app")],
       windowsAppPaths: getWindowsPaths("Programs\\Cursor\\Cursor.exe", "Cursor\\Cursor.exe"),
       linuxAppPaths: ["/usr/bin/cursor"]
     },
@@ -49497,7 +49496,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["windsurf"],
       macAppName: "Windsurf",
-      macAppPaths: ["/Applications/Windsurf.app", join27(homedir14(), "Applications", "Windsurf.app")],
+      macAppPaths: ["/Applications/Windsurf.app", join27(homedir13(), "Applications", "Windsurf.app")],
       windowsAppPaths: getWindowsPaths("Programs\\Windsurf\\Windsurf.exe", "Windsurf\\Windsurf.exe"),
       linuxAppPaths: ["/usr/bin/windsurf"]
     },
@@ -49512,11 +49511,11 @@ var init_action_routes = __esm(() => {
       macAppName: "Antigravity",
       macAppPaths: [
         "/Applications/Antigravity.app",
-        join27(homedir14(), "Applications", "Antigravity.app")
+        join27(homedir13(), "Applications", "Antigravity.app")
       ],
       windowsAppPaths: getWindowsPaths("Programs\\Antigravity\\Antigravity.exe"),
       linuxAppPaths: ["/usr/bin/antigravity"],
-      fallbackDetectionPaths: [join27(homedir14(), ".gemini", "antigravity")]
+      fallbackDetectionPaths: [join27(homedir13(), ".gemini", "antigravity")]
     },
     {
       id: "zed",
@@ -49527,7 +49526,7 @@ var init_action_routes = __esm(() => {
       capabilities: ["open-directory"],
       commands: ["zed"],
       macAppName: "Zed",
-      macAppPaths: ["/Applications/Zed.app", join27(homedir14(), "Applications", "Zed.app")],
+      macAppPaths: ["/Applications/Zed.app", join27(homedir13(), "Applications", "Zed.app")],
       windowsAppPaths: getWindowsPaths("Zed\\Zed.exe"),
       linuxAppPaths: ["/usr/bin/zed", "/usr/local/bin/zed"]
     },
@@ -49542,7 +49541,7 @@ var init_action_routes = __esm(() => {
       macAppName: "Sublime Text",
       macAppPaths: [
         "/Applications/Sublime Text.app",
-        join27(homedir14(), "Applications", "Sublime Text.app")
+        join27(homedir13(), "Applications", "Sublime Text.app")
       ],
       windowsAppPaths: getWindowsPaths("Sublime Text\\sublime_text.exe"),
       linuxAppPaths: ["/usr/bin/subl", "/snap/bin/subl"]
@@ -49583,7 +49582,7 @@ var init_action_routes = __esm(() => {
 
 // src/domains/web-server/routes/agents-routes.ts
 import { readdir as readdir7 } from "node:fs/promises";
-import { homedir as homedir15 } from "node:os";
+import { homedir as homedir14 } from "node:os";
 import { isAbsolute as isAbsolute4, join as join28, relative as relative7 } from "node:path";
 function resolveAgentDirs() {
   const dirs = [];
@@ -49628,7 +49627,7 @@ async function scanAgentDir(dirPath, dirLabel) {
           color: frontmatter.color || null,
           skillCount: countSkills(frontmatter.tools),
           dirLabel,
-          relativePath: relative7(homedir15(), filePath)
+          relativePath: relative7(homedir14(), filePath)
         });
       } catch {}
     }
@@ -49672,7 +49671,7 @@ function registerAgentsBrowserRoutes(app) {
           color: frontmatter.color || null,
           skillCount: countSkills(frontmatter.tools),
           dirLabel: dir.label,
-          relativePath: relative7(homedir15(), filePath),
+          relativePath: relative7(homedir14(), filePath),
           frontmatter,
           body
         };
@@ -49687,7 +49686,7 @@ var home2;
 var init_agents_routes = __esm(() => {
   init_frontmatter_parser();
   init_kit_layout();
-  home2 = homedir15();
+  home2 = homedir14();
 });
 
 // src/schemas/ck-config.schema.json
@@ -50524,7 +50523,7 @@ var init_ck_config_routes = __esm(() => {
 // src/domains/web-server/routes/command-routes.ts
 import { existsSync as existsSync16 } from "node:fs";
 import { readFile as readFile12, readdir as readdir8 } from "node:fs/promises";
-import { homedir as homedir16 } from "node:os";
+import { homedir as homedir15 } from "node:os";
 import { basename as basename9, isAbsolute as isAbsolute5, join as join30, relative as relative8, resolve as resolve13 } from "node:path";
 async function buildCommandTree(dir, baseDir) {
   let dirents;
@@ -50566,7 +50565,7 @@ async function buildCommandTree(dir, baseDir) {
 }
 function registerCommandRoutes(app) {
   app.get("/api/commands", async (_req, res) => {
-    const commandsDir = join30(homedir16(), ".claude", "commands");
+    const commandsDir = join30(homedir15(), ".claude", "commands");
     if (!existsSync16(commandsDir)) {
       res.json({ tree: [] });
       return;
@@ -50589,7 +50588,7 @@ function registerCommandRoutes(app) {
       res.status(400).json({ error: "Invalid path" });
       return;
     }
-    const commandsDir = join30(homedir16(), ".claude", "commands");
+    const commandsDir = join30(homedir15(), ".claude", "commands");
     const safePath = resolve13(commandsDir, rawPath);
     const rel = relative8(commandsDir, safePath);
     if (rel.startsWith("..") || isAbsolute5(rel)) {
@@ -50663,11 +50662,11 @@ var init_types5 = __esm(() => {
 
 // src/services/claude-data/history-parser.ts
 import { createReadStream, statSync as statSync4 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 import { join as join31 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline";
 function getHistoryPath() {
-  return process.env.CLAUDE_HISTORY_PATH ?? join31(homedir17(), ".claude", "history.jsonl");
+  return process.env.CLAUDE_HISTORY_PATH ?? join31(homedir16(), ".claude", "history.jsonl");
 }
 function emptyResult(parseTimeMs, error) {
   return { projects: [], totalEntries: 0, errorCount: 0, parseTimeMs, error };
@@ -50865,10 +50864,10 @@ var init_session_parser = () => {};
 // src/services/claude-data/skill-scanner.ts
 import { existsSync as existsSync18 } from "node:fs";
 import { readFile as readFile14, readdir as readdir10, stat as stat6 } from "node:fs/promises";
-import { homedir as homedir18 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 import { join as join33 } from "node:path";
 async function getCkSkillMetadata(scope) {
-  const metaPath = scope === "global" ? join33(homedir18(), ".claude", "metadata.json") : join33(process.cwd(), ".claude", "metadata.json");
+  const metaPath = scope === "global" ? join33(homedir17(), ".claude", "metadata.json") : join33(process.cwd(), ".claude", "metadata.json");
   if (!existsSync18(metaPath))
     return null;
   const result = new Map;
@@ -50998,14 +50997,14 @@ async function scanSkills() {
 var import_gray_matter4, skillsDir, SKIP_DIRS2;
 var init_skill_scanner = __esm(() => {
   import_gray_matter4 = __toESM(require_gray_matter(), 1);
-  skillsDir = join33(homedir18(), ".claude", "skills");
+  skillsDir = join33(homedir17(), ".claude", "skills");
   SKIP_DIRS2 = [".venv", "scripts", "__pycache__", "node_modules", ".git", "common"];
 });
 
 // src/services/claude-data/settings-reader.ts
 import { existsSync as existsSync19 } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir9, readFile as readFile15, rename as rename5, rm as rm4, writeFile as writeFile10 } from "node:fs/promises";
-import { homedir as homedir19 } from "node:os";
+import { homedir as homedir18 } from "node:os";
 import { join as join34 } from "node:path";
 function getSettingsPath() {
   return join34(claudeDir, settingsFilename);
@@ -51067,7 +51066,7 @@ function countMcpServers(settings) {
 }
 var claudeDir, settingsFilename = "settings.json", settingsBackupDir;
 var init_settings_reader = __esm(() => {
-  claudeDir = join34(homedir19(), ".claude");
+  claudeDir = join34(homedir18(), ".claude");
   settingsBackupDir = join34(claudeDir, ".ck-backups", "settings");
 });
 
@@ -51235,7 +51234,7 @@ var init_hook_log_reader = __esm(() => {
 });
 
 // src/services/claude-data/project-scanner.ts
-import { homedir as homedir20 } from "node:os";
+import { homedir as homedir19 } from "node:os";
 import { basename as basename10, join as join36, normalize as normalize4 } from "node:path";
 function decodePath(encoded) {
   const decoded = encoded.replace(/^-/, "/").replace(/-/g, "/");
@@ -51250,7 +51249,7 @@ function encodePath(path4) {
 }
 var projectsDir;
 var init_project_scanner = __esm(() => {
-  projectsDir = join36(homedir20(), ".claude", "projects");
+  projectsDir = join36(homedir19(), ".claude", "projects");
 });
 
 // src/services/claude-data/project-discovery.ts
@@ -51345,10 +51344,10 @@ var init_project_discovery = __esm(() => {
 
 // src/services/claude-data/user-preferences.ts
 import { readFile as readFile16, stat as stat7 } from "node:fs/promises";
-import { homedir as homedir21 } from "node:os";
+import { homedir as homedir20 } from "node:os";
 import { join as join37 } from "node:path";
 function getPreferencesPath() {
-  return join37(homedir21(), ".claude.json");
+  return join37(homedir20(), ".claude.json");
 }
 async function readUserPreferences(filePath) {
   const path4 = filePath ?? getPreferencesPath();
@@ -51439,7 +51438,7 @@ var init_claude_data = __esm(() => {
 // src/domains/web-server/routes/dashboard-routes.ts
 import { existsSync as existsSync20 } from "node:fs";
 import { readFile as readFile17, readdir as readdir11 } from "node:fs/promises";
-import { homedir as homedir22 } from "node:os";
+import { homedir as homedir21 } from "node:os";
 import { join as join38 } from "node:path";
 async function readAgents() {
   const agentsDir = join38(claudeDir2, "agents");
@@ -51509,7 +51508,7 @@ async function countAllMcpServers() {
   }
   let claudeJsonCount = 0;
   try {
-    const claudeJsonPath = join38(homedir22(), ".claude.json");
+    const claudeJsonPath = join38(homedir21(), ".claude.json");
     if (existsSync20(claudeJsonPath)) {
       const content = await readFile17(claudeJsonPath, "utf-8");
       const data = JSON.parse(content);
@@ -51636,7 +51635,7 @@ var claudeDir2;
 var init_dashboard_routes = __esm(() => {
   init_frontmatter_parser();
   init_claude_data();
-  claudeDir2 = join38(homedir22(), ".claude");
+  claudeDir2 = join38(homedir21(), ".claude");
 });
 
 // src/domains/web-server/routes/health-routes.ts
@@ -51710,7 +51709,7 @@ var init_hook_log_routes = __esm(() => {
 // src/domains/web-server/routes/mcp-routes.ts
 import { existsSync as existsSync21 } from "node:fs";
 import { readFile as readFile18 } from "node:fs/promises";
-import { homedir as homedir23 } from "node:os";
+import { homedir as homedir22 } from "node:os";
 import { basename as basename12, join as join39, resolve as resolve14 } from "node:path";
 function parseMcpServers(raw, source, sourceLabel) {
   const entries = [];
@@ -51759,7 +51758,7 @@ function mergeServers(lists) {
 function isSafeProjectPath(projectPath) {
   if (projectPath.includes(".."))
     return false;
-  const home3 = homedir23();
+  const home3 = homedir22();
   try {
     const resolved = resolve14(projectPath);
     if (!resolved.startsWith(home3))
@@ -51772,7 +51771,7 @@ function isSafeProjectPath(projectPath) {
 function registerMcpRoutes(app) {
   app.get("/api/mcp-servers", async (_req, res) => {
     try {
-      const claudeDir3 = join39(homedir23(), ".claude");
+      const claudeDir3 = join39(homedir22(), ".claude");
       const allLists = [];
       try {
         const settings = await readSettings();
@@ -51782,7 +51781,7 @@ function registerMcpRoutes(app) {
         }
       } catch {}
       try {
-        const claudeJsonPath = join39(homedir23(), ".claude.json");
+        const claudeJsonPath = join39(homedir22(), ".claude.json");
         if (existsSync21(claudeJsonPath)) {
           const content = await readFile18(claudeJsonPath, "utf-8");
           const parsed = JSON.parse(content);
@@ -52043,7 +52042,7 @@ var init_skill_directory_installer = __esm(() => {
 // src/commands/portable/config-discovery.ts
 import { existsSync as existsSync23, readFileSync as readFileSync6 } from "node:fs";
 import { cp as cp2, mkdir as mkdir11, readFile as readFile19, readdir as readdir12, stat as stat8 } from "node:fs/promises";
-import { homedir as homedir24 } from "node:os";
+import { homedir as homedir23 } from "node:os";
 import { basename as basename13, dirname as dirname12, extname as extname3, join as join41, relative as relative9, resolve as resolve16, sep as sep6 } from "node:path";
 async function copyHooksCompanionDirs(sourceDir, targetDir) {
   const result = {
@@ -52126,7 +52125,7 @@ async function copyHooksCompanionDirs(sourceDir, targetDir) {
 function resolveSourceOrigin(sourcePath) {
   if (!sourcePath)
     return "global";
-  const home3 = homedir24();
+  const home3 = homedir23();
   const cwd2 = process.cwd();
   if (cwd2 === home3)
     return "global";
@@ -52141,16 +52140,16 @@ function getConfigSourcePath(globalOnly = false) {
   return findExistingProjectConfigPath(process.cwd()) ?? getGlobalConfigSourcePath();
 }
 function getGlobalConfigSourcePath() {
-  return join41(homedir24(), ".claude", "CLAUDE.md");
+  return join41(homedir23(), ".claude", "CLAUDE.md");
 }
 function getRulesSourcePath(globalOnly = false) {
-  const globalPath = join41(homedir24(), ".claude", "rules");
+  const globalPath = join41(homedir23(), ".claude", "rules");
   if (globalOnly)
     return globalPath;
   return findExistingProjectLayoutPath(process.cwd(), "rules") ?? globalPath;
 }
 function getHooksSourcePath(globalOnly = false) {
-  const globalPath = join41(homedir24(), ".claude", "hooks");
+  const globalPath = join41(homedir23(), ".claude", "hooks");
   if (globalOnly)
     return globalPath;
   return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? globalPath;
@@ -54339,7 +54338,7 @@ var init_codex_capabilities = __esm(() => {
 // src/commands/portable/codex-path-safety.ts
 import { existsSync as existsSync24 } from "node:fs";
 import { mkdir as mkdir12, realpath as realpath7 } from "node:fs/promises";
-import { homedir as homedir25 } from "node:os";
+import { homedir as homedir24 } from "node:os";
 import { dirname as dirname13, join as join42, resolve as resolve17, sep as sep7 } from "node:path";
 function isPathWithinBoundary3(targetPath, boundaryPath) {
   const resolvedTarget = resolve17(targetPath);
@@ -54386,7 +54385,7 @@ async function withCodexTargetLock2(targetFilePath, operation) {
   }
 }
 function getCodexGlobalBoundary() {
-  return join42(homedir25(), ".codex");
+  return join42(homedir24(), ".codex");
 }
 var import_proper_lockfile6;
 var init_codex_path_safety = __esm(() => {
@@ -54781,7 +54780,7 @@ var init_codex_hook_wrapper = __esm(() => {
 });
 
 // src/commands/portable/converters/claude-to-codex-hooks.ts
-import { homedir as homedir26 } from "node:os";
+import { homedir as homedir25 } from "node:os";
 function convertClaudeHooksToCodex(sourceHooks, capabilities, pathRewrite) {
   const result = {};
   for (const [event, groups] of Object.entries(sourceHooks)) {
@@ -54839,7 +54838,7 @@ function rewriteCommandPath(command, pathRewrite) {
   const normalizeSlashes = (s) => s.replace(/\\/g, "/");
   let rewritten = command;
   if (pathRewrite.commandSubstitutions && pathRewrite.commandSubstitutions.size > 0) {
-    const home3 = homedir26();
+    const home3 = homedir25();
     const homeForward = normalizeSlashes(home3);
     for (const [originalAbsPath, wrapperAbsPath] of pathRewrite.commandSubstitutions) {
       const originalAbsForward = normalizeSlashes(originalAbsPath);
@@ -54942,7 +54941,7 @@ var init_gemini_hook_event_map = __esm(() => {
 // src/commands/portable/hooks-settings-merger.ts
 import { existsSync as existsSync26 } from "node:fs";
 import { mkdir as mkdir13, readFile as readFile21, rename as rename8, rm as rm6, writeFile as writeFile12 } from "node:fs/promises";
-import { homedir as homedir27 } from "node:os";
+import { homedir as homedir26 } from "node:os";
 import { basename as basename14, dirname as dirname16, extname as extname4, join as join44, resolve as resolve20 } from "node:path";
 function isCodexWrappableHookPath(filePath) {
   return hookAssetBasename(filePath) !== "node-hook-runner.sh" && CODEX_WRAPPABLE_HOOK_EXTENSIONS.has(extname4(filePath).toLowerCase());
@@ -55025,7 +55024,7 @@ function normalizeDirPattern(value) {
 }
 function homeRelativeDir(value) {
   const normalized = normalizeDirPattern(value);
-  const home3 = normalizeDirPattern(homedir27());
+  const home3 = normalizeDirPattern(homedir26());
   return normalized.startsWith(`${home3}/`) ? normalized.slice(home3.length + 1) : normalized;
 }
 function buildHookDirRewritePairs(sourceHooksDir, targetHooksDir) {
@@ -55582,7 +55581,7 @@ async function migrateHooksSettingsForCodex(options2) {
   }
   let featureFlagWritten = false;
   if (capabilities.requiresFeatureFlag) {
-    const configTomlPath = isGlobal ? join44(homedir27(), ".codex", "config.toml") : join44(process.cwd(), ".codex", "config.toml");
+    const configTomlPath = isGlobal ? join44(homedir26(), ".codex", "config.toml") : join44(process.cwd(), ".codex", "config.toml");
     const flagResult = await ensureCodexHooksFeatureFlag(configTomlPath, isGlobal);
     featureFlagWritten = flagResult.status === "written" || flagResult.status === "updated";
   }
@@ -56987,10 +56986,10 @@ __export(exports_skills_discovery, {
   discoverSkills: () => discoverSkills
 });
 import { readFile as readFile25, readdir as readdir13, stat as stat9 } from "node:fs/promises";
-import { homedir as homedir28 } from "node:os";
+import { homedir as homedir27 } from "node:os";
 import { dirname as dirname17, join as join45 } from "node:path";
 function getSkillSourcePath(globalOnly = false) {
-  const globalPath = join45(homedir28(), ".claude/skills");
+  const globalPath = join45(homedir27(), ".claude/skills");
   if (globalOnly) {
     return findFirstExistingPath([globalPath]);
   }
@@ -57231,7 +57230,7 @@ var init_migration_result_utils = __esm(() => {
 // src/domains/web-server/routes/migration-routes.ts
 import { existsSync as existsSync30 } from "node:fs";
 import { readFile as readFile26, rm as rm8 } from "node:fs/promises";
-import { homedir as homedir29 } from "node:os";
+import { homedir as homedir28 } from "node:os";
 import { basename as basename17, join as join46, resolve as resolve23 } from "node:path";
 function resolveRegistryDeps(deps) {
   return {
@@ -57910,7 +57909,7 @@ function registerMigrationRoutes(app, deps) {
       };
       const discovered = await discoverMigrationItems(includeAll);
       const cwd2 = process.cwd();
-      const home3 = homedir29();
+      const home3 = homedir28();
       res.status(200).json({
         cwd: cwd2,
         targetPaths: {
@@ -59426,7 +59425,7 @@ function scanPlanDir(dir) {
 var init_plan_scanner = () => {};
 
 // src/domains/plan-parser/plan-scope.ts
-import { homedir as homedir30 } from "node:os";
+import { homedir as homedir29 } from "node:os";
 import { isAbsolute as isAbsolute8, join as join49, relative as relative12, resolve as resolve25 } from "node:path";
 function resolveConfiguredDir(configuredPath, baseDir) {
   const trimmed = configuredPath?.trim();
@@ -59439,7 +59438,7 @@ function resolveProjectPlansDir(projectRoot, config) {
   return resolveConfiguredDir(config?.paths?.plans, projectRoot);
 }
 function resolveGlobalPlansDir(config) {
-  return resolveConfiguredDir(config?.paths?.globalPlans, join49(homedir30(), ".claude"));
+  return resolveConfiguredDir(config?.paths?.globalPlans, join49(homedir29(), ".claude"));
 }
 function resolvePlanDirForScope(scope, projectRoot, config) {
   return scope === "global" ? resolveGlobalPlansDir(config) : resolveProjectPlansDir(projectRoot, config);
@@ -60711,7 +60710,7 @@ var init_p_limit = __esm(() => {
 
 // src/domains/web-server/routes/plan-routes.ts
 import { existsSync as existsSync36, readFileSync as readFileSync12, realpathSync as realpathSync2 } from "node:fs";
-import { homedir as homedir31 } from "node:os";
+import { homedir as homedir30 } from "node:os";
 import { basename as basename20, dirname as dirname24, join as join54, relative as relative14, resolve as resolve27, sep as sep8 } from "node:path";
 function sanitizeError(err) {
   if (err instanceof Error) {
@@ -60902,7 +60901,7 @@ function withTimeout(promiseFactory, timeoutMs, label) {
 function isCurrentProjectFallbackCandidate(currentPath, globalProjectKey) {
   if (toProjectPathKey(currentPath) === globalProjectKey)
     return false;
-  if (toProjectPathKey(currentPath) === toProjectPathKey(homedir31()))
+  if (toProjectPathKey(currentPath) === toProjectPathKey(homedir30()))
     return false;
   return existsSync36(join54(currentPath, ".git")) || existsSync36(CkConfigManager.getProjectConfigPath(currentPath)) || existsSync36(join54(currentPath, "plans"));
 }
@@ -60967,7 +60966,7 @@ function registerPlanRoutes(app) {
   });
   app.get("/api/plan/list-all", async (_req, res) => {
     try {
-      const globalProjectKey = toProjectPathKey(join54(homedir31(), ".claude"));
+      const globalProjectKey = toProjectPathKey(join54(homedir30(), ".claude"));
       const seenProjectKeys = new Set;
       const scanTargets = [];
       for (const project of await ProjectsRegistryManager.listProjects()) {
@@ -61214,7 +61213,7 @@ var init_project_plan_data = __esm(() => {
 // src/domains/web-server/routes/project-routes.ts
 import { existsSync as existsSync37 } from "node:fs";
 import { readFile as readFile27 } from "node:fs/promises";
-import { homedir as homedir32 } from "node:os";
+import { homedir as homedir31 } from "node:os";
 import { basename as basename21, join as join55, resolve as resolve28 } from "node:path";
 function registerProjectRoutes(app) {
   app.get("/api/projects", async (req, res) => {
@@ -61235,7 +61234,7 @@ function registerProjectRoutes(app) {
       for (const discovered of discoveredProjects) {
         if (registeredPaths.has(discovered.path))
           continue;
-        if (discovered.path === join55(homedir32(), ".claude"))
+        if (discovered.path === join55(homedir31(), ".claude"))
           continue;
         const projectInfo = await detectAndBuildProjectInfo(discovered.path, `discovered-${discovered.path}`, cachedSettings, cachedSkills, false);
         if (projectInfo) {
@@ -61251,7 +61250,7 @@ function registerProjectRoutes(app) {
         if (cwdProject) {
           projects.push(cwdProject);
         }
-        const globalDir = join55(homedir32(), ".claude");
+        const globalDir = join55(homedir31(), ".claude");
         const globalProject = await detectAndBuildProjectInfo(globalDir, "global", undefined, undefined, false);
         if (globalProject) {
           projects.push(globalProject);
@@ -61323,12 +61322,12 @@ function registerProjectRoutes(app) {
       const body = validation.data;
       let projectPath = body.path;
       if (projectPath.startsWith("~/") || projectPath === "~") {
-        projectPath = join55(homedir32(), projectPath.slice(1));
+        projectPath = join55(homedir31(), projectPath.slice(1));
       } else if (projectPath.startsWith("~\\")) {
-        projectPath = join55(homedir32(), projectPath.slice(1));
+        projectPath = join55(homedir31(), projectPath.slice(1));
       }
       projectPath = resolve28(projectPath);
-      const homeDir = homedir32();
+      const homeDir = homedir31();
       if (projectPath.includes("..") || !projectPath.startsWith(homeDir)) {
         res.status(400).json({ error: "Invalid path after expansion" });
         return;
@@ -61385,7 +61384,7 @@ function registerProjectRoutes(app) {
       if (id === "current") {
         projectPath = process.cwd();
       } else if (id === "global") {
-        projectPath = join55(homedir32(), ".claude");
+        projectPath = join55(homedir31(), ".claude");
       } else {
         res.status(404).json({ error: "Project not found" });
         return;
@@ -61465,7 +61464,7 @@ async function buildProjectInfoFromRegistry(registered, cachedSettings, cachedSk
   const hasLocalConfig = hasClaudeDir && CkConfigManager.projectConfigExists(registered.path, false);
   const settings = cachedSettings !== undefined ? cachedSettings : await readSettings();
   const skills = cachedSkills !== undefined ? cachedSkills : await scanSkills();
-  const settingsPath = join55(homedir32(), ".claude", "settings.json");
+  const settingsPath = join55(homedir31(), ".claude", "settings.json");
   const health = existsSync37(settingsPath) ? "healthy" : "warning";
   const model = getCurrentModel() || settings?.model || "claude-sonnet-4";
   const planData = includePlanData ? await buildProjectPlanData(registered.path, "project") : null;
@@ -61507,7 +61506,7 @@ async function detectAndBuildProjectInfo(path6, id, cachedSettings, cachedSkills
   const hasLocalConfig = CkConfigManager.projectConfigExists(path6, id === "global");
   const settings = cachedSettings !== undefined ? cachedSettings : await readSettings();
   const skills = cachedSkills !== undefined ? cachedSkills : await scanSkills();
-  const settingsPath = join55(homedir32(), ".claude", "settings.json");
+  const settingsPath = join55(homedir31(), ".claude", "settings.json");
   const health = existsSync37(settingsPath) ? "healthy" : "warning";
   const model = getCurrentModel() || settings?.model || "claude-sonnet-4";
   const scope = id === "global" ? "global" : "project";
@@ -61555,7 +61554,7 @@ var init_project_routes = __esm(() => {
 // src/domains/web-server/routes/session-routes.ts
 import { existsSync as existsSync38 } from "node:fs";
 import { readFile as readFile28, readdir as readdir14, stat as stat10 } from "node:fs/promises";
-import { homedir as homedir33 } from "node:os";
+import { homedir as homedir32 } from "node:os";
 import { basename as basename22, join as join56 } from "node:path";
 function toDateStr(d3) {
   const y3 = d3.getFullYear();
@@ -61564,7 +61563,7 @@ function toDateStr(d3) {
   return `${y3}-${m2}-${day}`;
 }
 async function scanActivityMetrics(periodDays) {
-  const home3 = homedir33();
+  const home3 = homedir32();
   const projectsDir2 = join56(home3, ".claude", "projects");
   const cutoff = new Date;
   cutoff.setDate(cutoff.getDate() - periodDays);
@@ -61635,7 +61634,7 @@ async function scanActivityMetrics(periodDays) {
   return { totalSessions, projects: projectActivities, dailyCounts };
 }
 async function resolveSessionDir(projectId) {
-  const home3 = homedir33();
+  const home3 = homedir32();
   if (projectId.startsWith("discovered-")) {
     try {
       const encodedPathB64 = projectId.slice("discovered-".length);
@@ -61809,7 +61808,7 @@ async function parseSessionDetail(filePath, limit, offset) {
 }
 function registerSessionRoutes(app) {
   app.get("/api/sessions", async (_req, res) => {
-    const home3 = homedir33();
+    const home3 = homedir32();
     const projectsDir2 = join56(home3, ".claude", "projects");
     if (!existsSync38(projectsDir2)) {
       res.json({ projects: [] });
@@ -61878,7 +61877,7 @@ function registerSessionRoutes(app) {
       res.status(404).json({ error: "Project not found" });
       return;
     }
-    const allowedBase = join56(homedir33(), ".claude", "projects");
+    const allowedBase = join56(homedir32(), ".claude", "projects");
     if (!projectDir.startsWith(allowedBase)) {
       res.status(403).json({ error: "Access denied" });
       return;
@@ -61908,7 +61907,7 @@ function registerSessionRoutes(app) {
       res.status(404).json({ error: "Project not found" });
       return;
     }
-    const allowedBase = join56(homedir33(), ".claude", "projects");
+    const allowedBase = join56(homedir32(), ".claude", "projects");
     if (!projectDir.startsWith(allowedBase)) {
       res.status(403).json({ error: "Access denied" });
       return;
@@ -61942,7 +61941,7 @@ var init_session_routes = __esm(() => {
 });
 
 // src/domains/web-server/routes/settings-routes.ts
-import { homedir as homedir34 } from "node:os";
+import { homedir as homedir33 } from "node:os";
 function registerSettingsRoutes(app) {
   app.get("/api/settings", async (_req, res) => {
     try {
@@ -61998,7 +61997,7 @@ function registerSettingsRoutes(app) {
       res.json({
         success: true,
         path: "~/.claude/settings.json",
-        backupPath: saveResult.backupPath ? saveResult.backupPath.replace(homedir34(), "~") : null,
+        backupPath: saveResult.backupPath ? saveResult.backupPath.replace(homedir33(), "~") : null,
         absolutePath: getSettingsPath()
       });
     } catch (error) {
@@ -62032,7 +62031,7 @@ var init_settings_routes = __esm(() => {
 
 // src/domains/skills/skill-catalog-generator.ts
 import { mkdir as mkdir14, readFile as readFile29, readdir as readdir15, rename as rename10, stat as stat11, writeFile as writeFile14 } from "node:fs/promises";
-import { homedir as homedir35 } from "node:os";
+import { homedir as homedir34 } from "node:os";
 import { dirname as dirname25, join as join57, relative as relative15 } from "node:path";
 async function hasScripts(skillPath) {
   try {
@@ -62175,7 +62174,7 @@ var CATALOG_PATH, CATALOG_VERSION = "1.0.0", SKIP_DIRS4, skillCatalogGenerator;
 var init_skill_catalog_generator = __esm(() => {
   init_skills_discovery();
   init_logger();
-  CATALOG_PATH = join57(homedir35(), ".claude", ".skills-catalog.json");
+  CATALOG_PATH = join57(homedir34(), ".claude", ".skills-catalog.json");
   SKIP_DIRS4 = [".venv", "__pycache__", "node_modules", ".git"];
   skillCatalogGenerator = new SkillCatalogGenerator;
 });
@@ -62465,7 +62464,7 @@ var init_skill_browser_routes = __esm(() => {
 
 // src/commands/skills/agents.ts
 import { existsSync as existsSync39, readdirSync as readdirSync6, statSync as statSync8 } from "node:fs";
-import { homedir as homedir37, platform as platform5 } from "node:os";
+import { homedir as homedir36, platform as platform5 } from "node:os";
 import { join as join59 } from "node:path";
 function hasInstallSignal2(path7) {
   if (!path7 || !existsSync39(path7)) {
@@ -62522,7 +62521,7 @@ function isSkillInstalled(skillName, agent, options2) {
 }
 var home3, OPENCODE_BINARY_NAME2, agents;
 var init_agents = __esm(() => {
-  home3 = homedir37();
+  home3 = homedir36();
   OPENCODE_BINARY_NAME2 = platform5() === "win32" ? "opencode.exe" : "opencode";
   agents = {
     "claude-code": {
@@ -62629,7 +62628,7 @@ var init_agents = __esm(() => {
 // src/commands/skills/skills-registry.ts
 import { existsSync as existsSync40 } from "node:fs";
 import { mkdir as mkdir15, readFile as readFile31, writeFile as writeFile15 } from "node:fs/promises";
-import { homedir as homedir38 } from "node:os";
+import { homedir as homedir37 } from "node:os";
 import { dirname as dirname26, join as join60, sep as sep10 } from "node:path";
 function getCliVersion3() {
   try {
@@ -62741,7 +62740,7 @@ async function syncRegistry() {
 var home4, REGISTRY_PATH, SkillInstallationSchema, SkillRegistrySchema, REGISTRY_PATH_MIGRATIONS;
 var init_skills_registry = __esm(() => {
   init_zod();
-  home4 = homedir38();
+  home4 = homedir37();
   REGISTRY_PATH = join60(home4, ".claudekit", "skill-registry.json");
   SkillInstallationSchema = exports_external.object({
     skill: exports_external.string(),
@@ -62773,7 +62772,7 @@ var init_skills_registry = __esm(() => {
 // src/commands/skills/skills-installer.ts
 import { existsSync as existsSync41 } from "node:fs";
 import { cp as cp3, mkdir as mkdir16, rm as rm9, stat as stat12 } from "node:fs/promises";
-import { homedir as homedir39 } from "node:os";
+import { homedir as homedir38 } from "node:os";
 import { dirname as dirname27, join as join61, resolve as resolve30 } from "node:path";
 function isSamePath2(path1, path22) {
   try {
@@ -62904,7 +62903,7 @@ var init_skills_installer = __esm(() => {
   LEGACY_SKILL_PATHS = {
     "gemini-cli": {
       project: ".gemini/skills",
-      global: join61(homedir39(), ".gemini/skills")
+      global: join61(homedir38(), ".gemini/skills")
     }
   };
 });
@@ -63853,7 +63852,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.3.1-dev.17",
+    version: "4.3.1-dev.19",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -63869,6 +63868,7 @@ var init_package = __esm(() => {
     },
     files: [
       "bin/ck.js",
+      "bin/postinstall-hook-restore.cjs",
       "bin/postinstall-self-heal.cjs",
       "dist/index.js",
       "dist/ui/",
@@ -64335,7 +64335,7 @@ var init_package_manager_runner = __esm(() => {
 
 // src/domains/installation/merger/zombie-wirings-pruner.ts
 import { existsSync as existsSync44, readdirSync as readdirSync7 } from "node:fs";
-import { homedir as homedir40 } from "node:os";
+import { homedir as homedir39 } from "node:os";
 import { basename as basename23, dirname as dirname28, isAbsolute as isAbsolute10, resolve as resolve32, sep as sep11 } from "node:path";
 function pruneZombieEngineerWirings(settings, hookDir, preserveCommands = new Set) {
   const pruned = [];
@@ -64415,7 +64415,7 @@ function extractHookFilePath(command, hookDir) {
     return null;
   if (/&&|\|\||;|(?<!["|'])\|(?!["|'])/.test(command))
     return null;
-  const home5 = homedir40().replace(/\\/g, "/");
+  const home5 = homedir39().replace(/\\/g, "/");
   const hookDirNorm = hookDir.replace(/\\/g, "/");
   function resolveEnvPath(prefix, rest) {
     const normRest = rest.replace(/\\/g, "/");
@@ -64495,7 +64495,7 @@ var init_shared2 = __esm(() => {
 import { spawnSync as spawnSync3 } from "node:child_process";
 import { existsSync as existsSync45, readFileSync as readFileSync13, readdirSync as readdirSync8, statSync as statSync9, writeFileSync as writeFileSync5 } from "node:fs";
 import { readdir as readdir17 } from "node:fs/promises";
-import { homedir as homedir41, tmpdir } from "node:os";
+import { homedir as homedir40, tmpdir } from "node:os";
 import { join as join64, resolve as resolve33 } from "node:path";
 function resolveDoctorCkExecutable(platformName = process.platform) {
   return platformName === "win32" ? "ck.cmd" : "ck";
@@ -64525,12 +64525,12 @@ function isPathWithin2(filePath, parentDir) {
 }
 function getCanonicalGlobalCommandRoot() {
   const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
-  const defaultGlobalDir = join64(homedir41(), ".claude").replace(/\\/g, "/");
+  const defaultGlobalDir = join64(homedir40(), ".claude").replace(/\\/g, "/");
   return configuredGlobalDir === defaultGlobalDir ? "$HOME" : configuredGlobalDir;
 }
 function getClaudeSettingsFiles(projectDir) {
   const globalClaudeDir = PathResolver.getGlobalKitDir();
-  const ccsSettingsDir = join64(process.env.CK_TEST_HOME ?? homedir41(), ".ccs");
+  const ccsSettingsDir = join64(process.env.CK_TEST_HOME ?? homedir40(), ".ccs");
   const candidates = [
     {
       path: resolve33(projectDir, ".claude", "settings.json"),
@@ -65229,7 +65229,7 @@ function extractHookReferencePaths(cmd) {
 }
 function resolveHookScriptPath(scriptPath, projectDir) {
   let resolved = scriptPath.replace(/\\/g, "/");
-  const home5 = homedir41();
+  const home5 = homedir40();
   resolved = resolved.replace(/^\$\{?HOME\}?/, home5);
   resolved = resolved.replace(/^\$\{?CLAUDE_PROJECT_DIR\}?/, projectDir);
   resolved = resolved.replace(/^%USERPROFILE%/, home5);
@@ -67444,6 +67444,61 @@ async function readMetadataFile(claudeDir3) {
     return null;
   }
 }
+function extractCkHookName(command) {
+  if (!command.trim().startsWith("node "))
+    return null;
+  const normalized = command.replace(/\\/g, "/");
+  const match = normalized.match(/\/hooks\/([^/"'\s]+)\.(?:cjs|mjs|js)(?:["'\s]|$)/);
+  return match?.[1] ?? null;
+}
+function collectSettingsHookCommands(settings) {
+  const commands = new Set;
+  for (const entries of Object.values(settings.hooks ?? {})) {
+    for (const entry of entries) {
+      if (typeof entry.command === "string") {
+        commands.add(normalizeCommand(entry.command));
+      }
+      for (const hook of entry.hooks ?? []) {
+        if (typeof hook.command === "string") {
+          commands.add(normalizeCommand(hook.command));
+        }
+      }
+    }
+  }
+  return commands;
+}
+function getInstalledHookCommands(config, kit) {
+  const kits = Object.entries(config.kits ?? {});
+  if (kits.length === 0)
+    return [];
+  const kitKey = kit?.toLowerCase();
+  const preferred = kitKey ? kits.filter(([name]) => {
+    const normalizedName = name.toLowerCase();
+    return normalizedName === kitKey || normalizedName.includes(kitKey);
+  }) : [];
+  const candidates = preferred.length > 0 ? preferred : kits;
+  return candidates.flatMap(([, entry]) => entry.installedSettings?.hooks ?? []);
+}
+async function countMissingCkHookRegistrations(claudeDir3, kit) {
+  const settingsPath = join68(claudeDir3, "settings.json");
+  const configPath = join68(claudeDir3, ".ck.json");
+  if (!existsSync47(settingsPath) || !existsSync47(configPath))
+    return 0;
+  const settings = parseJsonContent(await import_fs_extra8.readFile(settingsPath, "utf-8"));
+  const config = parseJsonContent(await import_fs_extra8.readFile(configPath, "utf-8"));
+  const existingCommands = collectSettingsHookCommands(settings);
+  const disabledHooks = new Set(Object.entries(config.hooks ?? {}).filter(([, enabled]) => enabled === false).map(([name]) => name));
+  let missing = 0;
+  for (const command of getInstalledHookCommands(config, kit)) {
+    const hookName = extractCkHookName(command);
+    if (hookName && disabledHooks.has(hookName))
+      continue;
+    if (!existingCommands.has(normalizeCommand(command))) {
+      missing++;
+    }
+  }
+  return missing;
+}
 function buildInitCommand(isGlobal, kit, beta, yes, restoreCkHooks) {
   const parts = ["ck init"];
   if (isGlobal)
@@ -67565,6 +67620,27 @@ async function promptKitUpdate(beta, yes, deps) {
         };
       }
     }
+    const selectedClaudeDir = selection.isGlobal ? setup.global.path : setup.project.path;
+    if (selectedClaudeDir) {
+      try {
+        const missingHookDeps = await findMissingHookDepsFn(selectedClaudeDir);
+        if (missingHookDeps.length > 0) {
+          logger.warning(`Detected ${missingHookDeps.length} ${selection.isGlobal ? "global" : "local"} missing hook dependency(ies); reinstalling kit content`);
+          forceKitReinstall = true;
+        }
+      } catch (error) {
+        logger.verbose(`Selected hook dependency self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
+      }
+      try {
+        const missingHookRegistrations = await countMissingCkHookRegistrations(selectedClaudeDir, selection.kit);
+        if (missingHookRegistrations > 0) {
+          logger.warning(`Detected ${missingHookRegistrations} ${selection.isGlobal ? "global" : "local"} missing hook registration(s); reinstalling kit content`);
+          forceKitReinstall = true;
+        }
+      } catch (error) {
+        logger.verbose(`Selected hook registration self-heal check skipped: ${error instanceof Error ? error.message : "unknown"}`);
+      }
+    }
     let kitVersion = selection.kit ? selection.isGlobal ? globalMetadata?.kits?.[selection.kit]?.version : localMetadata?.kits?.[selection.kit]?.version : undefined;
     const isBetaInstalled = isBetaVersion(kitVersion);
     const promptMessage = selection.promptMessage;
@@ -67834,6 +67910,7 @@ var init_post_update_handler = __esm(() => {
   init_metadata_migration();
   init_version_utils();
   init_claudekit_scanner();
+  init_command_normalizer();
   init_logger();
   init_safe_prompts();
   init_types3();
@@ -68239,7 +68316,7 @@ import { spawn as spawn3 } from "node:child_process";
 import { execFile as execFile8 } from "node:child_process";
 import { existsSync as existsSync48 } from "node:fs";
 import { readFile as readFile38 } from "node:fs/promises";
-import { cpus, homedir as homedir42, totalmem } from "node:os";
+import { cpus, homedir as homedir41, totalmem } from "node:os";
 import { join as join70 } from "node:path";
 function runCommand(cmd, args, fallback2) {
   return new Promise((resolve34) => {
@@ -68405,7 +68482,7 @@ function registerSystemRoutes(app) {
         gitVersion,
         ghVersion,
         shell: process.env.SHELL ?? process.env.ComSpec ?? "unknown",
-        homeDir: homedir42(),
+        homeDir: homedir41(),
         cpuCores: cpus().length,
         totalMemoryGb: (totalmem() / 1024 ** 3).toFixed(1)
       };
@@ -74367,10 +74444,10 @@ var init_config_manager2 = __esm(() => {
 
 // src/services/package-installer/gemini-mcp/validation.ts
 import { existsSync as existsSync63, lstatSync, readlinkSync } from "node:fs";
-import { homedir as homedir45 } from "node:os";
+import { homedir as homedir44 } from "node:os";
 import { join as join93 } from "node:path";
 function getGlobalMcpConfigPath() {
-  return join93(homedir45(), ".claude", ".mcp.json");
+  return join93(homedir44(), ".claude", ".mcp.json");
 }
 function getLocalMcpConfigPath(projectDir) {
   return join93(projectDir, ".mcp.json");
@@ -74391,7 +74468,7 @@ function findMcpConfigPath(projectDir) {
 }
 function getGeminiSettingsPath(projectDir, isGlobal) {
   if (isGlobal) {
-    return join93(homedir45(), ".gemini", "settings.json");
+    return join93(homedir44(), ".gemini", "settings.json");
   }
   return join93(projectDir, ".gemini", "settings.json");
 }
@@ -77019,7 +77096,7 @@ var init_content_validator = __esm(() => {
 import { createHash as createHash9 } from "node:crypto";
 import { existsSync as existsSync79, mkdirSync as mkdirSync5, readFileSync as readFileSync19, readdirSync as readdirSync13, statSync as statSync14 } from "node:fs";
 import { rename as rename16, writeFile as writeFile40 } from "node:fs/promises";
-import { homedir as homedir55 } from "node:os";
+import { homedir as homedir54 } from "node:os";
 import { basename as basename34, join as join160 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
@@ -77094,7 +77171,7 @@ function getCacheFilePath(repoPath) {
 }
 var CACHE_DIR, CACHE_TTL_MS5;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join160(homedir55(), ".claudekit", "cache");
+  CACHE_DIR = join160(homedir54(), ".claudekit", "cache");
   CACHE_TTL_MS5 = 24 * 60 * 60 * 1000;
 });
 
@@ -77548,10 +77625,10 @@ 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 existsSync81, mkdirSync as mkdirSync6, readdirSync as readdirSync15 } from "node:fs";
-import { homedir as homedir56 } from "node:os";
+import { homedir as homedir55 } from "node:os";
 import { join as join162 } from "node:path";
 async function generatePhoto(_content, context, config, platform18, contentId, contentLogger) {
-  const mediaDir = join162(config.contentDir.replace(/^~/, homedir56()), "media", String(contentId));
+  const mediaDir = join162(config.contentDir.replace(/^~/, homedir55()), "media", String(contentId));
   if (!existsSync81(mediaDir)) {
     mkdirSync6(mediaDir, { recursive: true });
   }
@@ -77665,7 +77742,7 @@ var init_content_creator = __esm(() => {
 
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream4, existsSync as existsSync82, mkdirSync as mkdirSync7, statSync as statSync15 } from "node:fs";
-import { homedir as homedir57 } from "node:os";
+import { homedir as homedir56 } from "node:os";
 import { join as join163 } from "node:path";
 
 class ContentLogger {
@@ -77674,7 +77751,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join163(homedir57(), ".claudekit", "logs");
+    this.logDir = join163(homedir56(), ".claudekit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -79285,11 +79362,11 @@ var init_setup_wizard = __esm(() => {
 
 // src/commands/content/content-review-commands.ts
 import { existsSync as existsSync86 } from "node:fs";
-import { homedir as homedir58 } from "node:os";
+import { homedir as homedir57 } from "node:os";
 async function queueContent() {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir58());
+  const dbPath = config.dbPath.replace(/^~/, homedir57());
   if (!existsSync86(dbPath)) {
     logger.info("No content database found. Run 'ck content setup' first.");
     return;
@@ -79316,7 +79393,7 @@ async function queueContent() {
 async function approveContentCmd(id) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir58());
+  const dbPath = config.dbPath.replace(/^~/, homedir57());
   const db = initDatabase(dbPath);
   try {
     approveContent(db, Number.parseInt(id, 10));
@@ -79328,7 +79405,7 @@ async function approveContentCmd(id) {
 async function rejectContentCmd(id, reason) {
   const cwd2 = process.cwd();
   const config = await loadContentConfig(cwd2);
-  const dbPath = config.dbPath.replace(/^~/, homedir58());
+  const dbPath = config.dbPath.replace(/^~/, homedir57());
   const db = initDatabase(dbPath);
   try {
     rejectContent(db, Number.parseInt(id, 10), reason);
@@ -79359,7 +79436,7 @@ __export(exports_content_subcommands, {
   approveContentCmd: () => approveContentCmd
 });
 import { existsSync as existsSync87, readFileSync as readFileSync22, unlinkSync as unlinkSync6 } from "node:fs";
-import { homedir as homedir59 } from "node:os";
+import { homedir as homedir58 } from "node:os";
 import { join as join168 } from "node:path";
 function isDaemonRunning() {
   const lockFile = join168(LOCK_DIR, `${LOCK_NAME2}.lock`);
@@ -79433,7 +79510,7 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join168(homedir59(), ".claudekit", "logs");
+  const logDir = join168(homedir58(), ".claudekit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
   const logPath = join168(logDir, `content-${dateStr}.log`);
   if (!existsSync87(logPath)) {
@@ -79467,12 +79544,12 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join168(homedir59(), ".claudekit", "locks");
+  LOCK_DIR = join168(homedir58(), ".claudekit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync88, mkdirSync as mkdirSync9, unlinkSync as unlinkSync7, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir60 } from "node:os";
+import { homedir as homedir59 } from "node:os";
 import { join as join169 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
@@ -79505,7 +79582,7 @@ async function contentCommand(options2) {
     if (!existsSync88(LOCK_DIR2))
       mkdirSync9(LOCK_DIR2, { recursive: true });
     writeFileSync7(LOCK_FILE, String(process.pid), "utf-8");
-    const dbPath = config.dbPath.replace(/^~/, homedir60());
+    const dbPath = config.dbPath.replace(/^~/, homedir59());
     const db = initDatabase(dbPath);
     contentLogger.info(`Database initialised at ${dbPath}`);
     const adapters = initializeAdapters(config);
@@ -79651,7 +79728,7 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join169(homedir60(), ".claudekit", "locks");
+  LOCK_DIR2 = join169(homedir59(), ".claudekit", "locks");
   LOCK_FILE = join169(LOCK_DIR2, "ck-content.lock");
 });
 
@@ -82872,9 +82949,9 @@ var import_picocolors6 = __toESM(require_picocolors(), 1);
 init_fm_to_json();
 init_portable_registry();
 init_provider_registry();
-import { existsSync as existsSync6 } from "node:fs";
+import { existsSync as existsSync7 } from "node:fs";
 import { readFile as readFile6, rm, writeFile as writeFile4 } from "node:fs/promises";
-import { dirname as dirname4, join as join7 } from "node:path";
+import { dirname as dirname4, join as join8 } from "node:path";
 function toSlug3(name) {
   return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
 }
@@ -82994,7 +83071,7 @@ async function removeFromJsonMerge(agentName, filePath) {
     const rulesDir = dirname4(filePath);
     const ruleNames = new Set([`${agentName}.md`, `${slug}.md`]);
     for (const ruleName of ruleNames) {
-      await rm(join7(rulesDir, ruleName), { force: true });
+      await rm(join8(rulesDir, ruleName), { force: true });
     }
     if (filtered.length === 0) {
       await rm(filePath, { force: true });
@@ -83024,7 +83101,7 @@ async function uninstallAgentFromProvider(agentName, provider, global2) {
     };
   }
   const installation = installations[0];
-  const fileExists = existsSync6(installation.path);
+  const fileExists = existsSync7(installation.path);
   try {
     const config = providers[provider];
     const pathConfig = config.agents;
@@ -83113,8 +83190,8 @@ async function forceUninstallAgentFromProvider(agentName, provider, global2) {
     };
   }
   const writeStrategy = pathConfig.writeStrategy;
-  const targetPath = writeStrategy === "json-merge" ? join7(basePath, "cline_custom_modes.json") : writeStrategy === "merge-single" || writeStrategy === "yaml-merge" || writeStrategy === "single-file" ? basePath : join7(basePath, `${agentName}${pathConfig.fileExtension}`);
-  const fileExists = existsSync6(targetPath);
+  const targetPath = writeStrategy === "json-merge" ? join8(basePath, "cline_custom_modes.json") : writeStrategy === "merge-single" || writeStrategy === "yaml-merge" || writeStrategy === "single-file" ? basePath : join8(basePath, `${agentName}${pathConfig.fileExtension}`);
+  const fileExists = existsSync7(targetPath);
   try {
     if (!fileExists) {
       return {
@@ -83633,7 +83710,7 @@ var import_picocolors8 = __toESM(require_picocolors(), 1);
 
 // src/domains/claudekit-api/index.ts
 import { homedir as homedir7 } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 
 // src/domains/api-key/validator.ts
 var API_BASE_URL = "https://claudekit.cc/api";
@@ -83680,20 +83757,20 @@ function isValidKeyFormat(key) {
   return /^ck_live_[A-Za-z0-9_-]{32}$/.test(key);
 }
 // src/domains/api-key/storage.ts
-import { existsSync as existsSync7, readFileSync as readFileSync3, writeFileSync } from "node:fs";
-import { join as join8 } from "node:path";
+import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync } from "node:fs";
+import { join as join9 } from "node:path";
 var ENV_FILE = ".env";
 var API_KEY_VAR = "CLAUDEKIT_API_KEY";
 function getEnvFilePath(claudeDir) {
-  return join8(claudeDir, ENV_FILE);
+  return join9(claudeDir, ENV_FILE);
 }
 function readExistingApiKey(claudeDir) {
   const envPath = getEnvFilePath(claudeDir);
-  if (!existsSync7(envPath)) {
+  if (!existsSync8(envPath)) {
     return null;
   }
   try {
-    const content = readFileSync3(envPath, "utf-8");
+    const content = readFileSync4(envPath, "utf-8");
     const match = content.match(new RegExp(`^${API_KEY_VAR}=(.+)$`, "m"));
     return match?.[1]?.trim() ?? null;
   } catch {
@@ -83703,8 +83780,8 @@ function readExistingApiKey(claudeDir) {
 function saveApiKey(claudeDir, apiKey) {
   const envPath = getEnvFilePath(claudeDir);
   let content = "";
-  if (existsSync7(envPath)) {
-    content = readFileSync3(envPath, "utf-8");
+  if (existsSync8(envPath)) {
+    content = readFileSync4(envPath, "utf-8");
     if (content.includes(`${API_KEY_VAR}=`)) {
       content = content.replace(new RegExp(`^${API_KEY_VAR}=.*$`, "m"), `${API_KEY_VAR}=${apiKey}`);
     } else {
@@ -83860,7 +83937,7 @@ class ClaudekitHttpClient {
     } catch (error) {
       if (error instanceof CkApiError && error.code === "RATE_LIMIT_EXCEEDED" && error.retryAfter) {
         const delayMs = error.retryAfter * 1000;
-        await new Promise((resolve4) => setTimeout(resolve4, delayMs));
+        await new Promise((resolve5) => setTimeout(resolve5, delayMs));
         return fn();
       }
       throw error;
@@ -83870,7 +83947,7 @@ class ClaudekitHttpClient {
 
 // src/domains/claudekit-api/index.ts
 function createApiClient(claudeDir) {
-  const dir = claudeDir ?? join9(homedir7(), ".claude");
+  const dir = claudeDir ?? join10(homedir7(), ".claude");
   const apiKey = readExistingApiKey(dir);
   if (!apiKey) {
     throw new CkApiError("MISSING_API_KEY", "No API key found. Run `ck api setup` to configure your ClaudeKit API key.", 401);
@@ -84301,13 +84378,13 @@ async function handleApiServices(options2) {
 
 // src/commands/api/subcommands/api-setup-handler.ts
 import { homedir as homedir8 } from "node:os";
-import { join as join10 } from "node:path";
+import { join as join11 } from "node:path";
 init_logger();
 init_dist2();
 var DASHBOARD_URL = "https://claudekit.cc/api-keys";
 var MAX_ATTEMPTS = 3;
 async function handleApiSetup(options2) {
-  const claudeDir = join10(homedir8(), ".claude");
+  const claudeDir = join11(homedir8(), ".claude");
   const existing = readExistingApiKey(claudeDir);
   if (existing && !options2.force) {
     const masked = `${existing.slice(0, 15)}...`;
@@ -88291,7 +88368,7 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync58 } from "node:fs";
 import { readFile as readFile42 } from "node:fs/promises";
-import { homedir as homedir43 } from "node:os";
+import { homedir as homedir42 } from "node:os";
 import { dirname as dirname31, join as join80, normalize as normalize6, resolve as resolve36 } from "node:path";
 async function checkPathRefsValid(projectDir) {
   const globalClaudeMd = join80(PathResolver.getGlobalKitDir(), "CLAUDE.md");
@@ -88324,7 +88401,7 @@ async function checkPathRefsValid(projectDir) {
       };
     }
     const baseDir = dirname31(claudeMdPath);
-    const home5 = homedir43();
+    const home5 = homedir42();
     const broken = [];
     for (const ref of refs) {
       let refPath;
@@ -89328,7 +89405,7 @@ import { platform as platform8 } from "node:os";
 init_environment();
 init_path_resolver();
 import { constants as constants3, access as access4, mkdir as mkdir21, readFile as readFile44, unlink as unlink11, writeFile as writeFile21 } from "node:fs/promises";
-import { arch as arch2, homedir as homedir44, platform as platform7 } from "node:os";
+import { arch as arch2, homedir as homedir43, platform as platform7 } from "node:os";
 import { join as join85, normalize as normalize7 } from "node:path";
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
@@ -89351,7 +89428,7 @@ async function checkPlatformDetect() {
   };
 }
 async function checkHomeDirResolution() {
-  const nodeHome = normalize7(homedir44());
+  const nodeHome = normalize7(homedir43());
   const rawEnvHome = getHomeDirectoryFromEnv(platform7());
   const envHome = rawEnvHome ? normalize7(rawEnvHome) : "";
   const match = nodeHome === envHome && envHome !== "";
@@ -103436,7 +103513,7 @@ class FileScanner {
 
 // src/domains/installation/merger/settings-processor.ts
 import { execSync as execSync5 } from "node:child_process";
-import { homedir as homedir46 } from "node:os";
+import { homedir as homedir45 } from "node:os";
 import { dirname as dirname39, join as join109 } from "node:path";
 
 // src/domains/config/installed-settings-tracker.ts
@@ -104053,7 +104130,7 @@ class SettingsProcessor {
       return false;
     }
     const configuredGlobalDir = PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "");
-    const defaultGlobalDir = join109(homedir46(), ".claude").replace(/\\/g, "/");
+    const defaultGlobalDir = join109(homedir45(), ".claude").replace(/\\/g, "/");
     return configuredGlobalDir !== defaultGlobalDir;
   }
   getClaudeCommandRoot() {
@@ -107750,7 +107827,7 @@ async function handleFreshInstallation(claudeDir3, prompts) {
 // src/domains/installation/global-kit-legacy-repair.ts
 var import_fs_extra35 = __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 { homedir as homedir46 } from "node:os";
 import { dirname as dirname42, join as join133, normalize as normalize11, resolve as resolve46 } from "node:path";
 var LEGACY_KIT_MARKERS = [
   "metadata.json",
@@ -107785,7 +107862,7 @@ function uniqueNormalizedPaths(paths) {
   }
   return result;
 }
-function getLegacyWindowsGlobalKitDirCandidates(env2 = process.env, homeDir = homedir47()) {
+function getLegacyWindowsGlobalKitDirCandidates(env2 = process.env, homeDir = homedir46()) {
   const candidates = [];
   const localAppData = safeEnvPath(env2.LOCALAPPDATA);
   const appData = safeEnvPath(env2.APPDATA);
@@ -108918,7 +108995,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 // src/services/transformers/global-path-transformer.ts
 init_logger();
 import { readFile as readFile61, readdir as readdir44, writeFile as writeFile35 } from "node:fs/promises";
-import { homedir as homedir48, platform as platform15 } from "node:os";
+import { homedir as homedir47, platform as platform15 } from "node:os";
 import { extname as extname7, join as join138 } from "node:path";
 var IS_WINDOWS3 = platform15() === "win32";
 var HOME_PREFIX = "$HOME";
@@ -108929,7 +109006,7 @@ function normalizeInstallPath(path17) {
   return path17.replace(/\\/g, "/").replace(/\/+$/, "");
 }
 function getDefaultGlobalClaudeDir() {
-  return normalizeInstallPath(join138(homedir48(), ".claude"));
+  return normalizeInstallPath(join138(homedir47(), ".claude"));
 }
 function getCustomGlobalClaudeDir(targetClaudeDir) {
   if (!targetClaudeDir)
@@ -109361,13 +109438,13 @@ init_dist2();
 var import_picocolors30 = __toESM(require_picocolors(), 1);
 import { existsSync as existsSync68 } from "node:fs";
 import { readFile as readFile65, rm as rm18, unlink as unlink14 } from "node:fs/promises";
-import { homedir as homedir53 } from "node:os";
+import { homedir as homedir52 } from "node:os";
 import { basename as basename30, join as join143, resolve as resolve50 } from "node:path";
 init_logger();
 
 // src/ui/ck-cli-design/tokens.ts
 var import_picocolors27 = __toESM(require_picocolors(), 1);
-import { homedir as homedir49, platform as platform16 } from "node:os";
+import { homedir as homedir48, platform as platform16 } from "node:os";
 import { resolve as resolve49, win32 as win322 } from "node:path";
 var PANEL_MIN_WIDTH = 60;
 var PANEL_MAX_WIDTH = 72;
@@ -109525,7 +109602,7 @@ function wrapText(value, width) {
 }
 function formatDisplayPath(value) {
   const normalized = value.replace(/\\/g, "/");
-  const home5 = homedir49().replace(/\\/g, "/");
+  const home5 = homedir48().replace(/\\/g, "/");
   if (normalized === home5)
     return "~";
   if (normalized.startsWith(`${home5}/`)) {
@@ -109839,13 +109916,13 @@ init_logger();
 init_dist2();
 init_model_taxonomy();
 import { mkdir as mkdir39, readFile as readFile64, writeFile as writeFile37 } from "node:fs/promises";
-import { homedir as homedir52 } from "node:os";
+import { homedir as homedir51 } from "node:os";
 import { dirname as dirname44, join as join142 } from "node:path";
 
 // src/commands/portable/models-dev-cache.ts
 init_logger();
 import { mkdir as mkdir38, readFile as readFile62, rename as rename14, writeFile as writeFile36 } from "node:fs/promises";
-import { homedir as homedir50 } from "node:os";
+import { homedir as homedir49 } from "node:os";
 import { join as join140 } from "node:path";
 
 class ModelsDevUnavailableError extends Error {
@@ -109858,7 +109935,7 @@ 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 join140(homedir50(), ".config", "claudekit", "cache");
+  return join140(homedir49(), ".config", "claudekit", "cache");
 }
 function cacheFilePath(cacheDir) {
   return join140(cacheDir, "models-dev.json");
@@ -109938,7 +110015,7 @@ async function getModelsDevCatalog(opts = {}) {
 // src/commands/portable/opencode-model-discovery.ts
 init_logger();
 import { readFile as readFile63 } from "node:fs/promises";
-import { homedir as homedir51, platform as platform17 } from "node:os";
+import { homedir as homedir50, platform as platform17 } from "node:os";
 import { join as join141 } from "node:path";
 function resolveOpenCodeAuthPath(homeDir) {
   if (platform17() === "win32") {
@@ -109984,7 +110061,7 @@ function pickGenericModel(models) {
   return sorted[0] ?? null;
 }
 async function resolveOpenCodeDefaultModel(opts = {}) {
-  const home5 = opts.homeDir ?? homedir51();
+  const home5 = opts.homeDir ?? homedir50();
   const authedProviders = await readAuthedProviders(home5);
   if (authedProviders.length === 0) {
     return { ok: false, reason: "no-auth", authedProviders: [] };
@@ -110048,7 +110125,7 @@ function messageForReason(reason) {
 }
 function getOpenCodeConfigPath(options2) {
   if (options2.global) {
-    return join142(options2.homeDir ?? homedir52(), ".config", "opencode", "opencode.json");
+    return join142(options2.homeDir ?? homedir51(), ".config", "opencode", "opencode.json");
   }
   return join142(options2.cwd ?? process.cwd(), "opencode.json");
 }
@@ -111055,7 +111132,7 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
   }
   if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
     return;
-  const claudeDir3 = installGlobally ? join143(homedir53(), ".claude") : join143(process.cwd(), ".claude");
+  const claudeDir3 = installGlobally ? join143(homedir52(), ".claude") : join143(process.cwd(), ".claude");
   if (!existsSync68(claudeDir3))
     return;
   try {
@@ -111184,7 +111261,7 @@ async function migrateCommand(options2) {
     let installGlobally = requestedGlobal;
     if (options2.global === undefined && !options2.yes) {
       const projectTarget = join143(process.cwd(), ".claude");
-      const globalTarget = join143(homedir53(), ".claude");
+      const globalTarget = join143(homedir52(), ".claude");
       const scopeChoice = await ie({
         message: "Installation scope",
         options: [
@@ -111257,7 +111334,7 @@ async function migrateCommand(options2) {
     }).join(`
 `));
     if (sourceGlobalOnly) {
-      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join143(homedir53(), ".claude"))}`));
+      f2.info(import_picocolors30.default.dim(`  Scope: global (--global / -g) - reading from ${formatDisplayPath(join143(homedir52(), ".claude"))}`));
     } else {
       f2.info(import_picocolors30.default.dim(`  CWD: ${process.cwd()}`));
     }
@@ -116286,7 +116363,7 @@ async function scanForRepos(parentDir) {
 init_logger();
 import { spawnSync as spawnSync8 } from "node:child_process";
 import { existsSync as existsSync76 } from "node:fs";
-import { homedir as homedir54 } from "node:os";
+import { homedir as homedir53 } from "node:os";
 import { join as join157 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
@@ -116318,7 +116395,7 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join157(homedir54(), ".claude", "skills");
+  const skillsPath = join157(homedir53(), ".claude", "skills");
   const skillsAvailable = existsSync76(skillsPath);
   if (!skillsAvailable) {
     logger.warning(`ClaudeKit Engineer skills not found at ${skillsPath}`);