claudekit-cli 3.12.1 → 3.13.0

package/dist/index.js

@@ -4094,24 +4094,10 @@ function supportsUnicode() {
 function isTTY() {
   return process.stdout.isTTY === true;
 }
-function getStatusSymbols() {
-  return supportsUnicode() ? UNICODE_SYMBOLS : ASCII_SYMBOLS;
-}
-var import_picocolors, UNICODE_SYMBOLS, ASCII_SYMBOLS, COLOR_PALETTE;
+var import_picocolors, COLOR_PALETTE;
 var init_terminal_utils = __esm(() => {
+  init_output_manager();
   import_picocolors = __toESM(require_picocolors(), 1);
-  UNICODE_SYMBOLS = {
-    pass: "✓",
-    warn: "⚠",
-    fail: "✗",
-    info: "ℹ"
-  };
-  ASCII_SYMBOLS = {
-    pass: "[PASS]",
-    warn: "[WARN]",
-    fail: "[FAIL]",
-    info: "[INFO]"
-  };
   COLOR_PALETTE = {
     pass: import_picocolors.default.green,
     warn: import_picocolors.default.yellow,
@@ -4123,6 +4109,16 @@ var init_terminal_utils = __esm(() => {
 });
 
 // src/shared/output-manager.ts
+function getStatusSymbols() {
+  const symbolSet = supportsUnicode() ? SYMBOLS.unicode : SYMBOLS.ascii;
+  return {
+    pass: symbolSet.pass,
+    warn: symbolSet.warn,
+    fail: symbolSet.fail,
+    info: symbolSet.infoStatus
+  };
+}
+
 class OutputManager {
   config = {
     verbose: false,
@@ -4132,6 +4128,7 @@ class OutputManager {
   jsonBuffer = [];
   unicodeSupported;
   flushPromise = null;
+  flushQueued = false;
   constructor() {
     this.unicodeSupported = supportsUnicode();
   }
@@ -4237,8 +4234,12 @@ class OutputManager {
       ...entry,
       timestamp: new Date().toISOString()
     });
-    if (this.jsonBuffer.length >= 1000 && !this.flushPromise) {
-      queueMicrotask(() => this.flushJson());
+    if (this.jsonBuffer.length >= 1000 && !this.flushPromise && !this.flushQueued) {
+      this.flushQueued = true;
+      queueMicrotask(() => {
+        this.flushQueued = false;
+        this.flushJson();
+      });
     }
   }
   addJsonResult(data) {
@@ -4268,6 +4269,7 @@ class OutputManager {
     this.config = { verbose: false, json: false, quiet: false };
     this.jsonBuffer = [];
     this.flushPromise = null;
+    this.flushQueued = false;
     this.unicodeSupported = supportsUnicode();
   }
 }
@@ -4285,7 +4287,11 @@ var init_output_manager = __esm(() => {
       line: "│",
       selected: "●",
       unselected: "○",
-      pointer: ">"
+      pointer: ">",
+      pass: "✓",
+      warn: "⚠",
+      fail: "✗",
+      infoStatus: "ℹ"
     },
     ascii: {
       prompt: "?",
@@ -4296,7 +4302,11 @@ var init_output_manager = __esm(() => {
       line: "|",
       selected: ">",
       unselected: " ",
-      pointer: ">"
+      pointer: ">",
+      pass: "[PASS]",
+      warn: "[WARN]",
+      fail: "[FAIL]",
+      infoStatus: "[INFO]"
     }
   };
   output = new OutputManager;
@@ -4308,6 +4318,7 @@ import { createWriteStream } from "node:fs";
 class Logger {
   verboseEnabled = false;
   logFileStream;
+  exitHandlerRegistered = false;
   info(message) {
     const symbols = output.getSymbols();
     console.log(import_picocolors3.default.blue(symbols.info), message);
@@ -4362,9 +4373,49 @@ class Logger {
         flags: "a",
         mode: 384
       });
+      this.registerExitHandler();
       this.verbose(`Logging to file: ${path}`);
     }
   }
+  close() {
+    if (this.logFileStream) {
+      this.logFileStream.end();
+      this.logFileStream = undefined;
+    }
+  }
+  registerExitHandler() {
+    if (this.exitHandlerRegistered)
+      return;
+    this.exitHandlerRegistered = true;
+    const cleanup = () => {
+      if (this.logFileStream) {
+        try {
+          this.logFileStream.end();
+        } catch {}
+        this.logFileStream = undefined;
+      }
+    };
+    process.on("exit", cleanup);
+    process.on("SIGINT", () => {
+      cleanup();
+      process.exit(130);
+    });
+    process.on("SIGTERM", () => {
+      cleanup();
+      process.exit(143);
+    });
+    process.on("uncaughtException", (error) => {
+      if (this.logFileStream) {
+        const timestamp = new Date().toISOString();
+        this.logFileStream.write(`${timestamp} [FATAL] Uncaught exception: ${error.message}
+`);
+        this.logFileStream.write(`${error.stack}
+`);
+      }
+      cleanup();
+      process.exit(1);
+    });
+  }
   sanitize(text) {
     return text.replace(/ghp_[a-zA-Z0-9]{36}/g, "ghp_***").replace(/github_pat_[a-zA-Z0-9_]{82}/g, "github_pat_***").replace(/gho_[a-zA-Z0-9]{36}/g, "gho_***").replace(/ghu_[a-zA-Z0-9]{36}/g, "ghu_***").replace(/ghs_[a-zA-Z0-9]{36}/g, "ghs_***").replace(/ghr_[a-zA-Z0-9]{36}/g, "ghr_***").replace(/Bearer [a-zA-Z0-9_-]+/g, "Bearer ***").replace(/token=[a-zA-Z0-9_-]+/g, "token=***");
   }
@@ -6487,6 +6538,35 @@ var require_lib = __commonJS((exports, module) => {
   };
 });
 
+// src/shared/environment.ts
+function isCIEnvironment() {
+  return process.env.CI === "true" || process.env.CI_SAFE_MODE === "true";
+}
+function isNonInteractive() {
+  return !process.stdin.isTTY || process.env.CI === "true" || process.env.NON_INTERACTIVE === "true";
+}
+function isMacOS() {
+  return process.platform === "darwin";
+}
+function isWindows() {
+  return process.platform === "win32";
+}
+function getOptimalConcurrency() {
+  if (isMacOS())
+    return PLATFORM_CONCURRENCY.MACOS;
+  if (isWindows())
+    return PLATFORM_CONCURRENCY.WINDOWS;
+  return PLATFORM_CONCURRENCY.LINUX;
+}
+var PLATFORM_CONCURRENCY;
+var init_environment = __esm(() => {
+  PLATFORM_CONCURRENCY = {
+    MACOS: 10,
+    WINDOWS: 15,
+    LINUX: 20
+  };
+});
+
 // src/types/kit.ts
 var KitType, KitConfigSchema, AVAILABLE_KITS, NEVER_COPY_PATTERNS, USER_CONFIG_PATTERNS, PROTECTED_PATTERNS;
 var init_kit = __esm(() => {
@@ -6561,6 +6641,7 @@ var init_commands = __esm(() => {
     opencode: exports_external.boolean().default(false),
     gemini: exports_external.boolean().default(false),
     installSkills: exports_external.boolean().default(false),
+    withSudo: exports_external.boolean().default(false),
     prefix: exports_external.boolean().default(false),
     beta: exports_external.boolean().default(false),
     dryRun: exports_external.boolean().default(false),
@@ -6578,6 +6659,7 @@ var init_commands = __esm(() => {
     global: exports_external.boolean().default(false),
     fresh: exports_external.boolean().default(false),
     installSkills: exports_external.boolean().default(false),
+    withSudo: exports_external.boolean().default(false),
     prefix: exports_external.boolean().default(false),
     beta: exports_external.boolean().default(false),
     dryRun: exports_external.boolean().default(false),
@@ -6914,35 +6996,6 @@ var require_umd = __commonJS((exports, module) => {
   });
 });
 
-// src/shared/environment.ts
-function isCIEnvironment() {
-  return process.env.CI === "true" || process.env.CI_SAFE_MODE === "true";
-}
-function isNonInteractive() {
-  return !process.stdin.isTTY || process.env.CI === "true" || process.env.NON_INTERACTIVE === "true";
-}
-function isMacOS() {
-  return process.platform === "darwin";
-}
-function isWindows4() {
-  return process.platform === "win32";
-}
-function getOptimalConcurrency() {
-  if (isMacOS())
-    return PLATFORM_CONCURRENCY.MACOS;
-  if (isWindows4())
-    return PLATFORM_CONCURRENCY.WINDOWS;
-  return PLATFORM_CONCURRENCY.LINUX;
-}
-var PLATFORM_CONCURRENCY;
-var init_environment = __esm(() => {
-  PLATFORM_CONCURRENCY = {
-    MACOS: 10,
-    WINDOWS: 15,
-    LINUX: 20
-  };
-});
-
 // node_modules/sisteransi/src/index.js
 var require_src = __commonJS((exports, module) => {
   var ESC = "\x1B";
@@ -7891,9 +7944,8 @@ function validatePackageName(packageName) {
 function validateScriptPath(skillsDir, scriptPath) {
   const skillsDirResolved = resolve2(skillsDir);
   const scriptPathResolved = resolve2(scriptPath);
-  const isWindows5 = process.platform === "win32";
-  const skillsDirNormalized = isWindows5 ? skillsDirResolved.toLowerCase() : skillsDirResolved;
-  const scriptPathNormalized = isWindows5 ? scriptPathResolved.toLowerCase() : scriptPathResolved;
+  const skillsDirNormalized = isWindows() ? skillsDirResolved.toLowerCase() : skillsDirResolved;
+  const scriptPathNormalized = isWindows() ? scriptPathResolved.toLowerCase() : scriptPathResolved;
   if (!scriptPathNormalized.startsWith(skillsDirNormalized)) {
     throw new Error(`Script path outside skills directory: ${scriptPath}`);
   }
@@ -7908,6 +7960,7 @@ function validateScriptPath(skillsDir, scriptPath) {
 }
 var NPM_PACKAGE_REGEX;
 var init_validators = __esm(() => {
+  init_environment();
   init_logger();
   NPM_PACKAGE_REGEX = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
 });
@@ -8239,7 +8292,8 @@ var init_install_error_handler = __esm(() => {
 
 // src/services/package-installer/skills-installer.ts
 import { join as join18 } from "node:path";
-async function installSkillsDependencies(skillsDir) {
+async function installSkillsDependencies(skillsDir, options = {}) {
+  const { skipConfirm = false, withSudo = false } = options;
   const displayName = "Skills Dependencies";
   if (isCIEnvironment()) {
     logger.info("CI environment detected: skipping skills installation");
@@ -8249,7 +8303,7 @@ async function installSkillsDependencies(skillsDir) {
       error: "Installation skipped in CI environment"
     };
   }
-  if (isNonInteractive()) {
+  if (isNonInteractive() && !skipConfirm) {
     logger.info("Running in non-interactive mode. Skipping skills installation.");
     logger.info("See INSTALLATION.md for manual installation instructions.");
     return {
@@ -8311,11 +8365,15 @@ async function installSkillsDependencies(skillsDir) {
         logger.verbose("Could not preview script contents");
       }
     }
-    const shouldProceed = await clack.confirm({
-      message: "Execute this installation script?",
-      initialValue: false
-    });
-    if (clack.isCancel(shouldProceed) || !shouldProceed) {
+    let shouldProceed = skipConfirm;
+    if (!skipConfirm) {
+      const userChoice = await clack.confirm({
+        message: "Execute this installation script?",
+        initialValue: false
+      });
+      shouldProceed = !clack.isCancel(userChoice) && userChoice;
+    }
+    if (!shouldProceed) {
       logger.info("Installation cancelled by user");
       logger.info("");
       logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
@@ -8333,8 +8391,8 @@ async function installSkillsDependencies(skillsDir) {
     logger.info(`Running: ${scriptPath}`);
     const scriptArgs = ["--yes"];
     if (hasInstallState(skillsDir)) {
-      if (isNonInteractive()) {
-        logger.info("Resuming previous installation (non-interactive mode)...");
+      if (skipConfirm || isNonInteractive()) {
+        logger.info("Resuming previous installation...");
         scriptArgs.push("--resume");
       } else {
         const shouldResume = await clack.confirm({
@@ -8350,9 +8408,27 @@ async function installSkillsDependencies(skillsDir) {
     if (platform5 === "linux") {
       const needsSudo = await checkNeedsSudoPackages();
       if (needsSudo) {
-        if (isNonInteractive()) {
-          logger.info("Skipping system packages in non-interactive mode.");
-          logger.info("Install manually: sudo apt-get install -y ffmpeg imagemagick");
+        if (withSudo) {
+          logger.info("");
+          logger.warning("Installing system packages with sudo:");
+          logger.info("  • ffmpeg - Video/audio processing");
+          logger.info("  • imagemagick - Image editing & conversion");
+          logger.info("");
+          logger.info("sudo will run: apt-get install -y ffmpeg imagemagick");
+          logger.info("");
+          scriptArgs.push("--with-sudo");
+        } else if (skipConfirm || isNonInteractive()) {
+          logger.info("");
+          logger.warning("System packages skipped (not included without --with-sudo):");
+          logger.info("  • ffmpeg - Video/audio processing");
+          logger.info("  • imagemagick - Image editing & conversion");
+          logger.info("");
+          logger.info("To include system packages, run with --with-sudo flag:");
+          logger.info("  ck init -g -y --install-skills --with-sudo");
+          logger.info("");
+          logger.info("Or install manually:");
+          logger.info("  sudo apt-get install -y ffmpeg imagemagick");
+          logger.info("");
         } else {
           logger.info("");
           logger.info("System packages (requires sudo):");
@@ -8364,6 +8440,8 @@ async function installSkillsDependencies(skillsDir) {
             initialValue: true
           });
           if (!clack.isCancel(shouldInstallSudo) && shouldInstallSudo) {
+            logger.info("");
+            logger.info("sudo will run: apt-get install -y ffmpeg imagemagick");
             scriptArgs.push("--with-sudo");
           } else {
             logger.info("Skipping system packages. Install manually later:");
@@ -8440,9 +8518,9 @@ async function installSkillsDependencies(skillsDir) {
     };
   }
 }
-async function handleSkillsInstallation(skillsDir) {
+async function handleSkillsInstallation(skillsDir, options = {}) {
   try {
-    const skillsResult = await installSkillsDependencies(skillsDir);
+    const skillsResult = await installSkillsDependencies(skillsDir, options);
     if (skillsResult.success) {
       if (skillsResult.version === PARTIAL_INSTALL_VERSION) {
         logger.success("Skills core dependencies installed (some optional packages skipped)");
@@ -8630,7 +8708,6 @@ import { existsSync as existsSync14 } from "node:fs";
 import { mkdir as mkdir6, symlink as symlink2 } from "node:fs/promises";
 import { dirname as dirname4, join as join21 } from "node:path";
 async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
-  const isWindows5 = process.platform === "win32";
   const linkDir = dirname4(linkPath);
   if (!existsSync14(linkDir)) {
     await mkdir6(linkDir, { recursive: true });
@@ -8645,7 +8722,7 @@ async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
     symlinkTarget = isLocalConfig ? "../.mcp.json" : targetPath;
   }
   try {
-    await symlink2(symlinkTarget, linkPath, isWindows5 ? "file" : undefined);
+    await symlink2(symlinkTarget, linkPath, isWindows() ? "file" : undefined);
     logger.debug(`Created symlink: ${linkPath} → ${symlinkTarget}`);
     return { success: true, method: "symlink", targetPath, geminiSettingsPath: linkPath };
   } catch (error) {
@@ -8658,6 +8735,7 @@ async function createSymlink(targetPath, linkPath, projectDir, isGlobal) {
   }
 }
 var init_linker_core = __esm(() => {
+  init_environment();
   init_logger();
   init_validation();
 });
@@ -15745,9 +15823,19 @@ import { exec as exec4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 
 // src/services/package-installer/dependency-checker.ts
-init_logger();
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
+
+// src/shared/error-utils.ts
+function operationError(operation, subject, details) {
+  return `${operation} failed for '${subject}': ${details}`;
+}
+function notFoundError(type, name, hint) {
+  return hint ? `${type} not found: ${name} (${hint})` : `${type} not found: ${name}`;
+}
+
+// src/services/package-installer/dependency-checker.ts
+init_logger();
 var execAsync = promisify(exec);
 function shouldSkipExpensiveOperations() {
   if (process.env.CK_TEST_HOME) {
@@ -15780,13 +15868,30 @@ function getCICommandPath(command) {
   const osInfo = getOSInfo();
   switch (command) {
     case "node":
-      return osInfo.isWindows ? "C:\\Program Files\\nodejs\\node.exe" : "/usr/bin/node";
+      if (osInfo.isWindows) {
+        return process.env.NODE_PATH ? `${process.env.NODE_PATH}\\node.exe` : "C:\\Program Files\\nodejs\\node.exe";
+      }
+      return "/usr/bin/node";
     case "python3":
     case "python":
-      return osInfo.isWindows ? "C:\\Python39\\python.exe" : "/usr/bin/python3";
+      if (osInfo.isWindows) {
+        const pythonDir = process.env.PYTHON;
+        if (pythonDir) {
+          return `${pythonDir}\\python.exe`;
+        }
+        return "C:\\Windows\\py.exe";
+      }
+      return "/usr/bin/python3";
     case "pip3":
     case "pip":
-      return osInfo.isWindows ? "C:\\Python39\\Scripts\\pip.exe" : "/usr/bin/pip3";
+      if (osInfo.isWindows) {
+        const pythonDir = process.env.PYTHON;
+        if (pythonDir) {
+          return `${pythonDir}\\Scripts\\pip.exe`;
+        }
+        return "C:\\Windows\\py.exe -m pip";
+      }
+      return "/usr/bin/pip3";
     default:
       return null;
   }
@@ -15932,7 +16037,7 @@ async function checkDependency(config) {
     installed: false,
     meetsRequirements: false,
     minVersion: config.minVersion,
-    message: `${config.name} not found in PATH`
+    message: notFoundError(config.name, "PATH", "check installation")
   };
 }
 async function checkAllDependencies() {
@@ -16412,8 +16517,8 @@ class PathResolver {
   static getTestHomeDir() {
     return process.env.CK_TEST_HOME;
   }
-  static isPathSafe(path) {
-    if (!path || typeof path !== "string") {
+  static isValidComponentName(name) {
+    if (!name || typeof name !== "string") {
       return false;
     }
     const dangerousPatterns = [
@@ -16421,17 +16526,17 @@ class PathResolver {
       "~"
     ];
     for (const pattern of dangerousPatterns) {
-      if (path.includes(pattern)) {
+      if (name.includes(pattern)) {
         return false;
       }
     }
-    const normalized = normalize(path);
+    const normalized = normalize(name);
     for (const pattern of dangerousPatterns) {
       if (normalized.includes(pattern)) {
         return false;
       }
     }
-    if (path.startsWith("/") || normalized.startsWith("/") || /^[a-zA-Z]:/.test(path)) {
+    if (name.startsWith("/") || normalized.startsWith("/") || /^[a-zA-Z]:/.test(name)) {
       return false;
     }
     return true;
@@ -16495,7 +16600,7 @@ class PathResolver {
     return join(baseDir, "skills");
   }
   static buildComponentPath(baseDir, component, global2) {
-    if (!PathResolver.isPathSafe(component)) {
+    if (!PathResolver.isValidComponentName(component)) {
       throw new Error(`Invalid component name: "${component}" contains path traversal patterns. Valid names are simple directory names like "agents", "commands", "workflows", "skills", or "hooks".`);
     }
     const prefix = PathResolver.getPathPrefix(global2);
@@ -16685,11 +16790,11 @@ function isValidVersion(version) {
   return /^[a-zA-Z0-9._-]+$/.test(version);
 }
 // src/domains/installation/package-managers/npm-detector.ts
-var isWindows = process.platform === "win32";
+init_environment();
 function getNpmQuery() {
   return {
     pm: "npm",
-    cmd: isWindows ? "npm.cmd ls -g claudekit-cli --depth=0 --json" : "npm ls -g claudekit-cli --depth=0 --json",
+    cmd: isWindows() ? "npm.cmd ls -g claudekit-cli --depth=0 --json" : "npm ls -g claudekit-cli --depth=0 --json",
     checkFn: (stdout) => {
       try {
         const data = JSON.parse(stdout);
@@ -16701,7 +16806,7 @@ function getNpmQuery() {
   };
 }
 function getNpmVersionCommand() {
-  return isWindows ? "npm.cmd --version" : "npm --version";
+  return isWindows() ? "npm.cmd --version" : "npm --version";
 }
 async function getNpmVersion() {
   try {
@@ -16719,7 +16824,7 @@ function getNpmUpdateCommand(packageName, version) {
     throw new Error(`Invalid version: ${version}`);
   }
   const versionSuffix = version ? `@${version}` : "@latest";
-  return isWindows ? `npm.cmd install -g ${packageName}${versionSuffix}` : `npm install -g ${packageName}${versionSuffix}`;
+  return isWindows() ? `npm.cmd install -g ${packageName}${versionSuffix}` : `npm install -g ${packageName}${versionSuffix}`;
 }
 // src/domains/installation/package-managers/bun-detector.ts
 function getBunQuery() {
@@ -16751,16 +16856,16 @@ function getBunUpdateCommand(packageName, version) {
   return `bun add -g ${packageName}${versionSuffix}`;
 }
 // src/domains/installation/package-managers/yarn-detector.ts
-var isWindows2 = process.platform === "win32";
+init_environment();
 function getYarnQuery() {
   return {
     pm: "yarn",
-    cmd: isWindows2 ? "yarn.cmd global list --pattern claudekit-cli" : "yarn global list --pattern claudekit-cli",
+    cmd: isWindows() ? "yarn.cmd global list --pattern claudekit-cli" : "yarn global list --pattern claudekit-cli",
     checkFn: (stdout) => stdout.includes("claudekit-cli")
   };
 }
 function getYarnVersionCommand() {
-  return isWindows2 ? "yarn.cmd --version" : "yarn --version";
+  return isWindows() ? "yarn.cmd --version" : "yarn --version";
 }
 async function getYarnVersion() {
   try {
@@ -16778,19 +16883,19 @@ function getYarnUpdateCommand(packageName, version) {
     throw new Error(`Invalid version: ${version}`);
   }
   const versionSuffix = version ? `@${version}` : "@latest";
-  return isWindows2 ? `yarn.cmd global add ${packageName}${versionSuffix}` : `yarn global add ${packageName}${versionSuffix}`;
+  return isWindows() ? `yarn.cmd global add ${packageName}${versionSuffix}` : `yarn global add ${packageName}${versionSuffix}`;
 }
 // src/domains/installation/package-managers/pnpm-detector.ts
-var isWindows3 = process.platform === "win32";
+init_environment();
 function getPnpmQuery() {
   return {
     pm: "pnpm",
-    cmd: isWindows3 ? "pnpm.cmd ls -g claudekit-cli" : "pnpm ls -g claudekit-cli",
+    cmd: isWindows() ? "pnpm.cmd ls -g claudekit-cli" : "pnpm ls -g claudekit-cli",
     checkFn: (stdout) => stdout.includes("claudekit-cli")
   };
 }
 function getPnpmVersionCommand() {
-  return isWindows3 ? "pnpm.cmd --version" : "pnpm --version";
+  return isWindows() ? "pnpm.cmd --version" : "pnpm --version";
 }
 async function getPnpmVersion() {
   try {
@@ -16808,7 +16913,7 @@ function getPnpmUpdateCommand(packageName, version) {
     throw new Error(`Invalid version: ${version}`);
   }
   const versionSuffix = version ? `@${version}` : "@latest";
-  return isWindows3 ? `pnpm.cmd add -g ${packageName}${versionSuffix}` : `pnpm add -g ${packageName}${versionSuffix}`;
+  return isWindows() ? `pnpm.cmd add -g ${packageName}${versionSuffix}` : `pnpm add -g ${packageName}${versionSuffix}`;
 }
 // src/domains/installation/package-managers/detection-core.ts
 init_logger();
@@ -19808,6 +19913,7 @@ function normalizeVersionTag(version) {
   return trimmed.startsWith("v") ? trimmed : `v${trimmed}`;
 }
 // src/domains/versioning/selection/selection-ui.ts
+init_environment();
 init_logger();
 init_dist2();
 var import_picocolors10 = __toESM(require_picocolors(), 1);
@@ -19965,6 +20071,11 @@ This could be due to:
   if (!allowManualEntry) {
     throw new Error(`No releases available for ${kit.name}`);
   }
+  if (isNonInteractive()) {
+    logger.warning(`Non-interactive mode: no releases found for ${kit.name}`);
+    logger.info("Provide a specific version with --version flag or run in interactive mode");
+    return null;
+  }
   const tryManual = await se({
     message: "Would you like to enter a version manually?"
   });
@@ -19974,6 +20085,11 @@ This could be due to:
   return await getManualVersion(kit);
 }
 async function getManualVersion(kit) {
+  if (isNonInteractive()) {
+    logger.warning("Non-interactive mode: cannot prompt for manual version entry");
+    logger.info("Provide a specific version with --version flag");
+    return null;
+  }
   const version = await te({
     message: `Enter version tag for ${kit.name}:`,
     placeholder: "v1.0.0",
@@ -19993,6 +20109,19 @@ async function getManualVersion(kit) {
   return normalizeVersionTag(version);
 }
 async function createVersionPrompt(kit, choices, _defaultIndex, allowManualEntry, releases, currentVersion = null) {
+  if (isNonInteractive()) {
+    const latestStable2 = releases.find((r2) => r2.isLatestStable && !r2.prerelease);
+    if (latestStable2) {
+      logger.info(`Non-interactive mode: selecting latest stable version ${latestStable2.tag_name}`);
+      return latestStable2.tag_name;
+    }
+    if (releases.length > 0) {
+      logger.info(`Non-interactive mode: selecting version ${releases[0].tag_name}`);
+      return releases[0].tag_name;
+    }
+    logger.warning("Non-interactive mode: no versions available");
+    return null;
+  }
   const clackChoices = [];
   const latestStable = releases.find((r2) => r2.isLatestStable && !r2.prerelease);
   if (latestStable) {
@@ -20060,6 +20189,10 @@ async function handleSelectionError(error, kit, allowManualEntry, retryCallback)
   } else {
     le(VersionDisplayFormatter.formatError(error.message || "Unknown error occurred", "Please try again or contact support"), import_picocolors10.default.red("Error"));
   }
+  if (isNonInteractive()) {
+    logger.warning("Non-interactive mode: version selection failed, cannot retry");
+    return null;
+  }
   if (allowManualEntry) {
     const retry2 = await se({
       message: "Would you like to try entering a version manually?"
@@ -27629,10 +27762,10 @@ import path6 from "node:path";
 // node_modules/tar/dist/esm/get-write-flag.js
 import fs6 from "fs";
 var platform6 = process.env.__FAKE_PLATFORM__ || process.platform;
-var isWindows5 = platform6 === "win32";
+var isWindows2 = platform6 === "win32";
 var { O_CREAT, O_TRUNC, O_WRONLY } = fs6.constants;
 var UV_FS_O_FILEMAP = Number(process.env.__FAKE_FS_O_FILENAME__) || fs6.constants.UV_FS_O_FILEMAP || 0;
-var fMapEnabled = isWindows5 && !!UV_FS_O_FILEMAP;
+var fMapEnabled = isWindows2 && !!UV_FS_O_FILEMAP;
 var fMapLimit = 512 * 1024;
 var fMapFlag = UV_FS_O_FILEMAP | O_TRUNC | O_CREAT | O_WRONLY;
 var getWriteFlag = !fMapEnabled ? () => "w" : (size) => size < fMapLimit ? fMapFlag : "w";
@@ -27921,7 +28054,7 @@ var normalizeUnicode = (s) => {
 
 // node_modules/tar/dist/esm/path-reservations.js
 var platform7 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
-var isWindows6 = platform7 === "win32";
+var isWindows3 = platform7 === "win32";
 var getDirs = (path6) => {
   const dirs = path6.split("/").slice(0, -1).reduce((set, path7) => {
     const s = set[set.length - 1];
@@ -27939,7 +28072,7 @@ class PathReservations {
   #reservations = new Map;
   #running = new Set;
   reserve(paths, fn) {
-    paths = isWindows6 ? ["win32 parallelization disabled"] : paths.map((p) => {
+    paths = isWindows3 ? ["win32 parallelization disabled"] : paths.map((p) => {
       return stripTrailingSlashes(join25(normalizeUnicode(p))).toLowerCase();
     });
     const dirs = new Set(paths.map((path6) => getDirs(path6)).reduce((a3, b3) => a3.concat(b3)));
@@ -28068,10 +28201,10 @@ var UID = Symbol("uid");
 var GID = Symbol("gid");
 var CHECKED_CWD = Symbol("checkedCwd");
 var platform8 = process.env.TESTING_TAR_FAKE_PLATFORM || process.platform;
-var isWindows7 = platform8 === "win32";
+var isWindows4 = platform8 === "win32";
 var DEFAULT_MAX_DEPTH = 1024;
 var unlinkFile = (path7, cb) => {
-  if (!isWindows7) {
+  if (!isWindows4) {
     return fs9.unlink(path7, cb);
   }
   const name2 = path7 + ".DELETE." + randomBytes(16).toString("hex");
@@ -28083,7 +28216,7 @@ var unlinkFile = (path7, cb) => {
   });
 };
 var unlinkFileSync = (path7) => {
-  if (!isWindows7) {
+  if (!isWindows4) {
     return fs9.unlinkSync(path7);
   }
   const name2 = path7 + ".DELETE." + randomBytes(16).toString("hex");
@@ -28153,7 +28286,7 @@ class Unpack extends Parser {
     this.processGid = (this.preserveOwner || this.setOwner) && process.getgid ? process.getgid() : undefined;
     this.maxDepth = typeof opt.maxDepth === "number" ? opt.maxDepth : DEFAULT_MAX_DEPTH;
     this.forceChown = opt.forceChown === true;
-    this.win32 = !!opt.win32 || isWindows7;
+    this.win32 = !!opt.win32 || isWindows4;
     this.newer = !!opt.newer;
     this.keep = !!opt.keep;
     this.noMtime = !!opt.noMtime;
@@ -28208,7 +28341,7 @@ class Unpack extends Parser {
       return false;
     }
     if (!this.preservePaths) {
-      if (parts.includes("..") || isWindows7 && /^[a-z]:\.\.$/i.test(parts[0] ?? "")) {
+      if (parts.includes("..") || isWindows4 && /^[a-z]:\.\.$/i.test(parts[0] ?? "")) {
         this.warn("TAR_ENTRY_ERROR", `path contains '..'`, {
           entry,
           path: p
@@ -28422,7 +28555,7 @@ class Unpack extends Parser {
     entry.resume();
   }
   [ISREUSABLE](entry, st) {
-    return entry.type === "File" && !this.unlink && st.isFile() && st.nlink <= 1 && !isWindows7;
+    return entry.type === "File" && !this.unlink && st.isFile() && st.nlink <= 1 && !isWindows4;
   }
   [CHECKFS](entry) {
     this[PEND]();
@@ -29316,23 +29449,22 @@ Solutions:
   }
 }
 
-// src/commands/init/phases/download-handler.ts
+// src/domains/installation/download-extractor.ts
 init_logger();
 init_output_manager();
-async function handleDownload(ctx) {
-  if (ctx.cancelled || !ctx.release || !ctx.kit)
-    return ctx;
-  const downloadInfo = GitHubClient.getDownloadableAsset(ctx.release);
+async function downloadAndExtract(options) {
+  const { release, kit, exclude } = options;
+  const downloadInfo = GitHubClient.getDownloadableAsset(release);
   logger.verbose("Release info", {
-    tag: ctx.release.tag_name,
-    prerelease: ctx.release.prerelease,
+    tag: release.tag_name,
+    prerelease: release.prerelease,
     downloadType: downloadInfo.type,
     assetSize: downloadInfo.size
   });
   output.section("Downloading");
   const downloadManager = new DownloadManager;
-  if (ctx.options.exclude && ctx.options.exclude.length > 0) {
-    downloadManager.setExcludePatterns(ctx.options.exclude);
+  if (exclude && exclude.length > 0) {
+    downloadManager.setExcludePatterns(exclude);
   }
   const tempDir = await downloadManager.createTempDir();
   const { token } = await AuthManager.getToken();
@@ -29350,8 +29482,8 @@ async function handleDownload(ctx) {
       logger.warning("Asset download failed, falling back to GitHub tarball...");
       const tarballInfo = {
         type: "github-tarball",
-        url: ctx.release.tarball_url,
-        name: `${ctx.kit.repo}-${ctx.release.tag_name}.tar.gz`,
+        url: release.tarball_url,
+        name: `${kit.repo}-${release.tag_name}.tar.gz`,
         size: 0
       };
       archivePath = await downloadManager.downloadFile({
@@ -29370,14 +29502,30 @@ async function handleDownload(ctx) {
   await downloadManager.extractArchive(archivePath, extractDir);
   await downloadManager.validateExtraction(extractDir);
   return {
-    ...ctx,
     tempDir,
     archivePath,
     extractDir
   };
 }
+
+// src/commands/init/phases/download-handler.ts
+async function handleDownload(ctx) {
+  if (ctx.cancelled || !ctx.release || !ctx.kit)
+    return ctx;
+  const result = await downloadAndExtract({
+    release: ctx.release,
+    kit: ctx.kit,
+    exclude: ctx.options.exclude
+  });
+  return {
+    ...ctx,
+    tempDir: result.tempDir,
+    archivePath: result.archivePath,
+    extractDir: result.extractDir
+  };
+}
 // src/commands/init/phases/merge-handler.ts
-import { join as join42 } from "node:path";
+import { join as join43 } from "node:path";
 
 // src/domains/installation/file-merger.ts
 init_logger();
@@ -29561,7 +29709,7 @@ class OwnershipChecker {
       });
       stream.on("error", (err) => {
         stream.destroy();
-        reject(new Error(`Failed to calculate checksum for "${filePath}": ${err.message}`));
+        reject(new Error(operationError("Checksum calculation", filePath, err.message)));
       });
     });
   }
@@ -31383,6 +31531,7 @@ class SettingsMerger {
 }
 
 // src/domains/installation/merger/settings-processor.ts
+init_environment();
 init_logger();
 var import_fs_extra6 = __toESM(require_lib(), 1);
 
@@ -31398,16 +31547,15 @@ class SettingsProcessor {
   async processSettingsJson(sourceFile, destFile) {
     try {
       const sourceContent = await import_fs_extra6.readFile(sourceFile, "utf-8");
-      const isWindows8 = process.platform === "win32";
       let transformedSource = sourceContent;
       if (this.isGlobal) {
-        const homeVar = isWindows8 ? '"%USERPROFILE%"' : '"$HOME"';
+        const homeVar = isWindows() ? '"%USERPROFILE%"' : '"$HOME"';
         transformedSource = this.transformClaudePaths(sourceContent, homeVar);
         if (transformedSource !== sourceContent) {
           logger.debug(`Transformed .claude/ paths to ${homeVar}/.claude/ in settings.json for global installation`);
         }
       } else {
-        const projectDirVar = isWindows8 ? '"%CLAUDE_PROJECT_DIR%"' : '"$CLAUDE_PROJECT_DIR"';
+        const projectDirVar = isWindows() ? '"%CLAUDE_PROJECT_DIR%"' : '"$CLAUDE_PROJECT_DIR"';
         transformedSource = this.transformClaudePaths(sourceContent, projectDirVar);
         if (transformedSource !== sourceContent) {
           logger.debug(`Transformed .claude/ paths to ${projectDirVar}/.claude/ in settings.json for local installation`);
@@ -31657,7 +31805,7 @@ class FileMerger {
 
 // src/domains/migration/legacy-migration.ts
 import { readdir as readdir9, stat as stat6 } from "node:fs/promises";
-import { join as join37, relative as relative6 } from "node:path";
+import { join as join38, relative as relative6 } from "node:path";
 
 // src/services/file-operations/manifest/manifest-reader.ts
 import { join as join34 } from "node:path";
@@ -31767,6 +31915,43 @@ async function getUninstallManifest(claudeDir, kit) {
   };
 }
 // src/services/file-operations/manifest/manifest-tracker.ts
+import { join as join37 } from "node:path";
+
+// src/domains/migration/release-manifest.ts
+init_logger();
+init_zod();
+var import_fs_extra9 = __toESM(require_lib(), 1);
+import { join as join35 } from "node:path";
+var ReleaseManifestFileSchema = exports_external.object({
+  path: exports_external.string(),
+  checksum: exports_external.string().regex(/^[a-f0-9]{64}$/),
+  size: exports_external.number()
+});
+var ReleaseManifestSchema = exports_external.object({
+  version: exports_external.string(),
+  generatedAt: exports_external.string(),
+  files: exports_external.array(ReleaseManifestFileSchema)
+});
+
+class ReleaseManifestLoader {
+  static async load(extractDir) {
+    const manifestPath = join35(extractDir, "release-manifest.json");
+    try {
+      const content = await import_fs_extra9.readFile(manifestPath, "utf-8");
+      const parsed = JSON.parse(content);
+      return ReleaseManifestSchema.parse(parsed);
+    } catch (error) {
+      logger.debug(`Release manifest not found or invalid: ${error}`);
+      return null;
+    }
+  }
+  static findFile(manifest, relativePath) {
+    return manifest.files.find((f3) => f3.path === relativePath);
+  }
+}
+
+// src/services/file-operations/manifest/manifest-tracker.ts
+init_environment();
 init_logger();
 
 // node_modules/yocto-queue/index.js
@@ -31909,111 +32094,31 @@ function validateConcurrency(concurrency) {
   }
 }
 
-// src/services/file-operations/manifest/manifest-tracker.ts
-class ManifestTracker {
-  installedFiles = new Set;
-  userConfigFiles = new Set;
-  trackedFiles = new Map;
-  addInstalledFile(relativePath) {
-    const normalized = relativePath.replace(/\\/g, "/");
-    this.installedFiles.add(normalized);
-  }
-  addInstalledFiles(relativePaths) {
-    for (const path9 of relativePaths) {
-      this.addInstalledFile(path9);
-    }
-  }
-  addUserConfigFile(relativePath) {
-    const normalized = relativePath.replace(/\\/g, "/");
-    this.userConfigFiles.add(normalized);
-  }
-  getInstalledFiles() {
-    return Array.from(this.installedFiles).sort();
-  }
-  getUserConfigFiles() {
-    return Array.from(this.userConfigFiles).sort();
-  }
-  async addTrackedFile(filePath, relativePath, ownership, installedVersion) {
-    const checksum = await OwnershipChecker.calculateChecksum(filePath);
-    const normalized = relativePath.replace(/\\/g, "/");
-    this.trackedFiles.set(normalized, {
-      path: normalized,
-      checksum,
-      ownership,
-      installedVersion
+// src/services/file-operations/manifest/manifest-updater.ts
+import { join as join36 } from "node:path";
+init_logger();
+init_types2();
+var import_fs_extra10 = __toESM(require_lib(), 1);
+var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
+async function writeManifest(claudeDir, kitName, version, scope, kitType, trackedFiles, userConfigFiles) {
+  const metadataPath = join36(claudeDir, "metadata.json");
+  const kit = kitType || (/\bmarketing\b/i.test(kitName) ? "marketing" : "engineer");
+  await import_fs_extra10.ensureFile(metadataPath);
+  let release = null;
+  try {
+    release = await import_proper_lockfile.lock(metadataPath, {
+      retries: { retries: 5, minTimeout: 100, maxTimeout: 1000 },
+      stale: 60000
     });
-    this.installedFiles.add(normalized);
-  }
-  async addTrackedFilesBatch(files, options = {}) {
-    const { concurrency = 20, onProgress } = options;
-    const limit = pLimit(concurrency);
-    const total = files.length;
-    const tasks = files.map((file) => limit(async () => {
+    logger.debug(`Acquired lock on ${metadataPath}`);
+    const migrationResult = await migrateToMultiKit(claudeDir);
+    if (!migrationResult.success) {
+      logger.warning(`Metadata migration warning: ${migrationResult.error}`);
+    }
+    let existingMetadata = { kits: {} };
+    if (await import_fs_extra10.pathExists(metadataPath)) {
       try {
-        const checksum = await OwnershipChecker.calculateChecksum(file.filePath);
-        const normalized = file.relativePath.replace(/\\/g, "/");
-        this.trackedFiles.set(normalized, {
-          path: normalized,
-          checksum,
-          ownership: file.ownership,
-          installedVersion: file.installedVersion
-        });
-        this.installedFiles.add(normalized);
-        return true;
-      } catch (error) {
-        logger.debug(`Failed to track file ${file.relativePath}: ${error}`);
-        return false;
-      }
-    }));
-    const progressInterval = Math.max(1, Math.floor(total / 20));
-    let reportedProgress = 0;
-    const results = await Promise.all(tasks.map(async (task, index) => {
-      const result = await task;
-      const completed = index + 1;
-      if (completed % progressInterval === 0 || completed === total) {
-        if (completed > reportedProgress) {
-          reportedProgress = completed;
-          onProgress?.(completed, total);
-        }
-      }
-      return result;
-    }));
-    const success = results.filter(Boolean).length;
-    const failed = total - success;
-    if (failed > 0) {
-      logger.warning(`Failed to track ${failed} of ${total} files (check debug logs for details)`);
-    }
-    return { success, failed, total };
-  }
-  getTrackedFiles() {
-    return Array.from(this.trackedFiles.values()).sort((a3, b3) => a3.path.localeCompare(b3.path));
-  }
-}
-// src/services/file-operations/manifest/manifest-updater.ts
-import { join as join35 } from "node:path";
-init_logger();
-init_types2();
-var import_fs_extra9 = __toESM(require_lib(), 1);
-var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
-async function writeManifest(claudeDir, kitName, version, scope, kitType, trackedFiles, userConfigFiles) {
-  const metadataPath = join35(claudeDir, "metadata.json");
-  const kit = kitType || (/\bmarketing\b/i.test(kitName) ? "marketing" : "engineer");
-  await import_fs_extra9.ensureFile(metadataPath);
-  let release = null;
-  try {
-    release = await import_proper_lockfile.lock(metadataPath, {
-      retries: { retries: 5, minTimeout: 100, maxTimeout: 1000 },
-      stale: 60000
-    });
-    logger.debug(`Acquired lock on ${metadataPath}`);
-    const migrationResult = await migrateToMultiKit(claudeDir);
-    if (!migrationResult.success) {
-      logger.warning(`Metadata migration warning: ${migrationResult.error}`);
-    }
-    let existingMetadata = { kits: {} };
-    if (await import_fs_extra9.pathExists(metadataPath)) {
-      try {
-        const content = await import_fs_extra9.readFile(metadataPath, "utf-8");
+        const content = await import_fs_extra10.readFile(metadataPath, "utf-8");
         const parsed = JSON.parse(content);
         if (parsed && typeof parsed === "object" && Object.keys(parsed).length > 0) {
           existingMetadata = parsed;
@@ -32040,7 +32145,7 @@ async function writeManifest(claudeDir, kitName, version, scope, kitType, tracke
       userConfigFiles: [...USER_CONFIG_PATTERNS, ...userConfigFiles]
     };
     const validated = MetadataSchema.parse(metadata);
-    await import_fs_extra9.writeFile(metadataPath, JSON.stringify(validated, null, 2), "utf-8");
+    await import_fs_extra10.writeFile(metadataPath, JSON.stringify(validated, null, 2), "utf-8");
     logger.debug(`Wrote manifest for kit "${kit}" with ${trackedFiles.length} tracked files`);
   } finally {
     if (release) {
@@ -32050,8 +32155,8 @@ async function writeManifest(claudeDir, kitName, version, scope, kitType, tracke
   }
 }
 async function removeKitFromManifest(claudeDir, kit) {
-  const metadataPath = join35(claudeDir, "metadata.json");
-  if (!await import_fs_extra9.pathExists(metadataPath))
+  const metadataPath = join36(claudeDir, "metadata.json");
+  if (!await import_fs_extra10.pathExists(metadataPath))
     return false;
   let release = null;
   try {
@@ -32072,7 +32177,7 @@ async function removeKitFromManifest(claudeDir, kit) {
       ...metadata,
       kits: remainingKits
     };
-    await import_fs_extra9.writeFile(metadataPath, JSON.stringify(updated, null, 2), "utf-8");
+    await import_fs_extra10.writeFile(metadataPath, JSON.stringify(updated, null, 2), "utf-8");
     logger.debug(`Removed kit "${kit}" from metadata, ${Object.keys(remainingKits).length} kit(s) remaining`);
     return true;
   } finally {
@@ -32082,6 +32187,126 @@ async function removeKitFromManifest(claudeDir, kit) {
     }
   }
 }
+
+// src/services/file-operations/manifest/manifest-tracker.ts
+class ManifestTracker {
+  installedFiles = new Set;
+  userConfigFiles = new Set;
+  trackedFiles = new Map;
+  addInstalledFile(relativePath) {
+    const normalized = relativePath.replace(/\\/g, "/");
+    this.installedFiles.add(normalized);
+  }
+  addInstalledFiles(relativePaths) {
+    for (const path9 of relativePaths) {
+      this.addInstalledFile(path9);
+    }
+  }
+  addUserConfigFile(relativePath) {
+    const normalized = relativePath.replace(/\\/g, "/");
+    this.userConfigFiles.add(normalized);
+  }
+  getInstalledFiles() {
+    return Array.from(this.installedFiles).sort();
+  }
+  getUserConfigFiles() {
+    return Array.from(this.userConfigFiles).sort();
+  }
+  async addTrackedFile(filePath, relativePath, ownership, installedVersion) {
+    const checksum = await OwnershipChecker.calculateChecksum(filePath);
+    const normalized = relativePath.replace(/\\/g, "/");
+    this.trackedFiles.set(normalized, {
+      path: normalized,
+      checksum,
+      ownership,
+      installedVersion
+    });
+    this.installedFiles.add(normalized);
+  }
+  async addTrackedFilesBatch(files, options = {}) {
+    const { concurrency = 20, onProgress } = options;
+    const limit = pLimit(concurrency);
+    const total = files.length;
+    const tasks = files.map((file) => limit(async () => {
+      try {
+        const checksum = await OwnershipChecker.calculateChecksum(file.filePath);
+        const normalized = file.relativePath.replace(/\\/g, "/");
+        this.trackedFiles.set(normalized, {
+          path: normalized,
+          checksum,
+          ownership: file.ownership,
+          installedVersion: file.installedVersion
+        });
+        this.installedFiles.add(normalized);
+        return true;
+      } catch (error) {
+        logger.debug(`Failed to track file ${file.relativePath}: ${error}`);
+        return false;
+      }
+    }));
+    const progressInterval = Math.max(1, Math.floor(total / 20));
+    let reportedProgress = 0;
+    const results = await Promise.all(tasks.map(async (task, index) => {
+      const result = await task;
+      const completed = index + 1;
+      if (completed % progressInterval === 0 || completed === total) {
+        if (completed > reportedProgress) {
+          reportedProgress = completed;
+          onProgress?.(completed, total);
+        }
+      }
+      return result;
+    }));
+    const success = results.filter(Boolean).length;
+    const failed = total - success;
+    if (failed > 0) {
+      logger.warning(`Failed to track ${failed} of ${total} files (check debug logs for details)`);
+    }
+    return { success, failed, total };
+  }
+  getTrackedFiles() {
+    return Array.from(this.trackedFiles.values()).sort((a3, b3) => a3.path.localeCompare(b3.path));
+  }
+}
+function buildFileTrackingList(options) {
+  const {
+    installedFiles,
+    claudeDir,
+    releaseManifest,
+    installedVersion,
+    isGlobal = false
+  } = options;
+  const filesToTrack = [];
+  for (const installedPath of installedFiles) {
+    if (!isGlobal && !installedPath.startsWith(".claude/"))
+      continue;
+    const relativePath = isGlobal ? installedPath : installedPath.replace(/^\.claude\//, "");
+    const filePath = join37(claudeDir, relativePath);
+    const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
+    const ownership = manifestEntry ? "ck" : "user";
+    filesToTrack.push({
+      filePath,
+      relativePath,
+      ownership,
+      installedVersion
+    });
+  }
+  return filesToTrack;
+}
+async function trackFilesWithProgress(filesToTrack, manifestOptions) {
+  const tracker = new ManifestTracker;
+  const trackingSpinner = createSpinner(`Tracking ${filesToTrack.length} installed files...`);
+  trackingSpinner.start();
+  const trackResult = await tracker.addTrackedFilesBatch(filesToTrack, {
+    concurrency: getOptimalConcurrency(),
+    onProgress: (processed, total) => {
+      trackingSpinner.text = `Tracking files... (${processed}/${total})`;
+    }
+  });
+  trackingSpinner.succeed(`Tracked ${trackResult.success} files`);
+  await writeManifest(manifestOptions.claudeDir, manifestOptions.kitName, manifestOptions.releaseTag, manifestOptions.mode, manifestOptions.kitType, tracker.getTrackedFiles(), tracker.getUserConfigFiles());
+  return trackResult;
+}
 // src/services/file-operations/manifest-writer.ts
 class ManifestWriter {
   tracker = new ManifestTracker;
@@ -32129,41 +32354,6 @@ class ManifestWriter {
 // src/domains/migration/legacy-migration.ts
 init_logger();
 var import_fs_extra11 = __toESM(require_lib(), 1);
-
-// src/domains/migration/release-manifest.ts
-init_logger();
-init_zod();
-var import_fs_extra10 = __toESM(require_lib(), 1);
-import { join as join36 } from "node:path";
-var ReleaseManifestFileSchema = exports_external.object({
-  path: exports_external.string(),
-  checksum: exports_external.string().regex(/^[a-f0-9]{64}$/),
-  size: exports_external.number()
-});
-var ReleaseManifestSchema = exports_external.object({
-  version: exports_external.string(),
-  generatedAt: exports_external.string(),
-  files: exports_external.array(ReleaseManifestFileSchema)
-});
-
-class ReleaseManifestLoader {
-  static async load(extractDir) {
-    const manifestPath = join36(extractDir, "release-manifest.json");
-    try {
-      const content = await import_fs_extra10.readFile(manifestPath, "utf-8");
-      const parsed = JSON.parse(content);
-      return ReleaseManifestSchema.parse(parsed);
-    } catch (error) {
-      logger.debug(`Release manifest not found or invalid: ${error}`);
-      return null;
-    }
-  }
-  static findFile(manifest, relativePath) {
-    return manifest.files.find((f3) => f3.path === relativePath);
-  }
-}
-
-// src/domains/migration/legacy-migration.ts
 class LegacyMigration {
   static async detectLegacy(claudeDir) {
     const metadata = await ManifestWriter.readManifest(claudeDir);
@@ -32194,7 +32384,7 @@ class LegacyMigration {
     for (const entry of entries) {
       if (entry === "metadata.json")
         continue;
-      const fullPath = join37(dir, entry);
+      const fullPath = join38(dir, entry);
       let stats;
       try {
         stats = await stat6(fullPath);
@@ -32296,7 +32486,7 @@ User-created files (sample):`);
     ];
     if (filesToChecksum.length > 0) {
       const checksumResults = await Promise.all(filesToChecksum.map(async ({ relativePath, ownership }) => {
-        const fullPath = join37(claudeDir, relativePath);
+        const fullPath = join38(claudeDir, relativePath);
         const checksum = await OwnershipChecker.calculateChecksum(fullPath);
         return { relativePath, checksum, ownership };
       }));
@@ -32317,7 +32507,7 @@ User-created files (sample):`);
       installedAt: new Date().toISOString(),
       files: trackedFiles
     };
-    const metadataPath = join37(claudeDir, "metadata.json");
+    const metadataPath = join38(claudeDir, "metadata.json");
     await import_fs_extra11.writeFile(metadataPath, JSON.stringify(updatedMetadata, null, 2));
     logger.success(`Migration complete: tracked ${trackedFiles.length} files`);
     return true;
@@ -32325,8 +32515,8 @@ User-created files (sample):`);
 }
 
 // src/services/file-operations/file-scanner.ts
+import { join as join39, relative as relative7, resolve as resolve6 } from "node:path";
 init_logger();
-import { join as join38, relative as relative7, resolve as resolve6 } from "node:path";
 var import_fs_extra12 = __toESM(require_lib(), 1);
 
 class FileScanner2 {
@@ -32343,7 +32533,7 @@ class FileScanner2 {
           logger.debug(`Skipping directory: ${entry}`);
           continue;
         }
-        const fullPath = join38(dirPath, entry);
+        const fullPath = join39(dirPath, entry);
         if (!FileScanner2.isSafePath(basePath, fullPath)) {
           logger.warning(`Skipping potentially unsafe path: ${entry}`);
           continue;
@@ -32371,15 +32561,15 @@ class FileScanner2 {
         }
       }
     } catch (error) {
-      const errorMessage = error instanceof Error ? `Failed to scan directory: ${dirPath} - ${error.message}` : `Failed to scan directory: ${dirPath}`;
+      const errorMessage = error instanceof Error ? operationError("Directory scan", dirPath, error.message) : operationError("Directory scan", dirPath, "unknown error");
       logger.error(errorMessage);
       throw error;
     }
     return files;
   }
   static async findCustomFiles(destDir, sourceDir, subPath) {
-    const destSubDir = join38(destDir, subPath);
-    const sourceSubDir = join38(sourceDir, subPath);
+    const destSubDir = join39(destDir, subPath);
+    const sourceSubDir = join39(sourceDir, subPath);
     logger.debug(`findCustomFiles - destDir: ${destDir}`);
     logger.debug(`findCustomFiles - sourceDir: ${sourceDir}`);
     logger.debug(`findCustomFiles - subPath: "${subPath}"`);
@@ -32420,7 +32610,7 @@ class FileScanner2 {
 init_logger();
 var import_fs_extra13 = __toESM(require_lib(), 1);
 import { lstat as lstat3, mkdir as mkdir13, readdir as readdir11, stat as stat7 } from "node:fs/promises";
-import { join as join39 } from "node:path";
+import { join as join40 } from "node:path";
 
 // src/services/transformers/commands-prefix/prefix-utils.ts
 init_logger();
@@ -32465,14 +32655,14 @@ function shouldApplyPrefix(options) {
 // src/services/transformers/commands-prefix/prefix-applier.ts
 async function applyPrefix(extractDir) {
   validatePath(extractDir, "extractDir");
-  const commandsDir = join39(extractDir, ".claude", "commands");
+  const commandsDir = join40(extractDir, ".claude", "commands");
   if (!await import_fs_extra13.pathExists(commandsDir)) {
     logger.verbose("No commands directory found, skipping prefix application");
     return;
   }
   logger.info("Applying /ck: prefix to slash commands...");
-  const backupDir = join39(extractDir, ".commands-backup");
-  const tempDir = join39(extractDir, ".commands-prefix-temp");
+  const backupDir = join40(extractDir, ".commands-backup");
+  const tempDir = join40(extractDir, ".commands-prefix-temp");
   try {
     const entries = await readdir11(commandsDir);
     if (entries.length === 0) {
@@ -32480,7 +32670,7 @@ async function applyPrefix(extractDir) {
       return;
     }
     if (entries.length === 1 && entries[0] === "ck") {
-      const ckDir2 = join39(commandsDir, "ck");
+      const ckDir2 = join40(commandsDir, "ck");
       const ckStat = await stat7(ckDir2);
       if (ckStat.isDirectory()) {
         logger.verbose("Commands already have /ck: prefix, skipping");
@@ -32490,17 +32680,17 @@ async function applyPrefix(extractDir) {
     await import_fs_extra13.copy(commandsDir, backupDir);
     logger.verbose("Created backup of commands directory");
     await mkdir13(tempDir, { recursive: true });
-    const ckDir = join39(tempDir, "ck");
+    const ckDir = join40(tempDir, "ck");
     await mkdir13(ckDir, { recursive: true });
     let processedCount = 0;
     for (const entry of entries) {
-      const sourcePath = join39(commandsDir, entry);
+      const sourcePath = join40(commandsDir, entry);
       const stats = await lstat3(sourcePath);
       if (stats.isSymbolicLink()) {
         logger.warning(`Skipping symlink for security: ${entry}`);
         continue;
       }
-      const destPath = join39(ckDir, entry);
+      const destPath = join40(ckDir, entry);
       await import_fs_extra13.copy(sourcePath, destPath, {
         overwrite: false,
         errorOnExist: true
@@ -32545,20 +32735,20 @@ async function applyPrefix(extractDir) {
 
 // src/services/transformers/commands-prefix/prefix-cleaner.ts
 import { lstat as lstat5, readdir as readdir13 } from "node:fs/promises";
-import { join as join41 } from "node:path";
+import { join as join42 } from "node:path";
 init_logger();
 var import_fs_extra15 = __toESM(require_lib(), 1);
 
 // src/services/transformers/commands-prefix/file-processor.ts
 import { lstat as lstat4, readdir as readdir12 } from "node:fs/promises";
-import { join as join40 } from "node:path";
+import { join as join41 } from "node:path";
 init_logger();
 var import_fs_extra14 = __toESM(require_lib(), 1);
 async function scanDirectoryFiles(dir) {
   const files = [];
   const entries = await readdir12(dir);
   for (const entry of entries) {
-    const fullPath = join40(dir, entry);
+    const fullPath = join41(dir, entry);
     const stats = await lstat4(fullPath);
     if (stats.isSymbolicLink()) {
       continue;
@@ -32666,8 +32856,8 @@ function logCleanupSummary(deletedCount, preservedCount, dryRun, results) {
 async function cleanupCommandsDirectory(targetDir, isGlobal, options = {}) {
   const { dryRun = false } = options;
   validatePath(targetDir, "targetDir");
-  const claudeDir = isGlobal ? targetDir : join41(targetDir, ".claude");
-  const commandsDir = join41(claudeDir, "commands");
+  const claudeDir = isGlobal ? targetDir : join42(targetDir, ".claude");
+  const commandsDir = join42(claudeDir, "commands");
   const accumulator = {
     results: [],
     deletedCount: 0,
@@ -32701,7 +32891,7 @@ async function cleanupCommandsDirectory(targetDir, isGlobal, options = {}) {
     return result;
   }
   for (const entry of entries) {
-    const entryPath = join41(commandsDir, entry);
+    const entryPath = join42(commandsDir, entry);
     const stats = await lstat5(entryPath);
     if (stats.isSymbolicLink()) {
       addSymlinkSkip(entry, accumulator);
@@ -32743,7 +32933,6 @@ class CommandsPrefix {
 }
 
 // src/commands/init/phases/merge-handler.ts
-init_environment();
 init_logger();
 init_output_manager();
 var import_fs_extra16 = __toESM(require_lib(), 1);
@@ -32754,7 +32943,7 @@ async function handleMerge(ctx) {
   let customClaudeFiles = [];
   if (!ctx.options.fresh) {
     logger.info("Scanning for custom .claude files...");
-    const scanSourceDir = ctx.options.global ? join42(ctx.extractDir, ".claude") : ctx.extractDir;
+    const scanSourceDir = ctx.options.global ? join43(ctx.extractDir, ".claude") : ctx.extractDir;
     const scanTargetSubdir = ctx.options.global ? "" : ".claude";
     customClaudeFiles = await FileScanner2.findCustomFiles(ctx.resolvedDir, scanSourceDir, scanTargetSubdir);
   } else {
@@ -32813,35 +33002,23 @@ async function handleMerge(ctx) {
       return { ...ctx, cancelled: true };
     }
   }
-  const sourceDir = ctx.options.global ? join42(ctx.extractDir, ".claude") : ctx.extractDir;
+  const sourceDir = ctx.options.global ? join43(ctx.extractDir, ".claude") : ctx.extractDir;
   await merger.merge(sourceDir, ctx.resolvedDir, false);
-  const manifestWriter = new ManifestWriter;
   const installedFiles = merger.getAllInstalledFiles();
-  const filesToTrack = [];
-  for (const installedPath of installedFiles) {
-    if (!ctx.options.global && !installedPath.startsWith(".claude/"))
-      continue;
-    const relativePath = ctx.options.global ? installedPath : installedPath.replace(/^\.claude\//, "");
-    const filePath = join42(ctx.claudeDir, relativePath);
-    const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
-    const ownership = manifestEntry ? "ck" : "user";
-    filesToTrack.push({
-      filePath,
-      relativePath,
-      ownership,
-      installedVersion: ctx.release.tag_name
-    });
-  }
-  const trackingSpinner = createSpinner(`Tracking ${filesToTrack.length} installed files...`);
-  trackingSpinner.start();
-  const trackResult = await manifestWriter.addTrackedFilesBatch(filesToTrack, {
-    concurrency: getOptimalConcurrency(),
-    onProgress: (processed, total) => {
-      trackingSpinner.text = `Tracking files... (${processed}/${total})`;
-    }
+  const filesToTrack = buildFileTrackingList({
+    installedFiles,
+    claudeDir: ctx.claudeDir,
+    releaseManifest,
+    installedVersion: ctx.release.tag_name,
+    isGlobal: ctx.options.global
+  });
+  await trackFilesWithProgress(filesToTrack, {
+    claudeDir: ctx.claudeDir,
+    kitName: ctx.kit.name,
+    releaseTag: ctx.release.tag_name,
+    mode: ctx.options.global ? "global" : "local",
+    kitType: ctx.kitType
   });
-  trackingSpinner.succeed(`Tracked ${trackResult.success} files`);
-  await manifestWriter.writeManifest(ctx.claudeDir, ctx.kit.name, ctx.release.tag_name, ctx.options.global ? "global" : "local", ctx.kitType);
   return {
     ...ctx,
     customClaudeFiles,
@@ -32849,7 +33026,7 @@ async function handleMerge(ctx) {
   };
 }
 // src/commands/init/phases/migration-handler.ts
-import { join as join50 } from "node:path";
+import { join as join51 } from "node:path";
 
 // src/domains/skills/skills-detector.ts
 init_logger();
@@ -32864,7 +33041,7 @@ init_types2();
 var import_fs_extra17 = __toESM(require_lib(), 1);
 import { createHash as createHash2 } from "node:crypto";
 import { readFile as readFile14, readdir as readdir14, writeFile as writeFile12 } from "node:fs/promises";
-import { join as join43, relative as relative8 } from "node:path";
+import { join as join44, relative as relative8 } from "node:path";
 
 class SkillsManifestManager {
   static MANIFEST_FILENAME = ".skills-manifest.json";
@@ -32886,12 +33063,12 @@ class SkillsManifestManager {
     return manifest;
   }
   static async writeManifest(skillsDir, manifest) {
-    const manifestPath = join43(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join44(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
     await writeFile12(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
     logger.debug(`Wrote manifest to: ${manifestPath}`);
   }
   static async readManifest(skillsDir) {
-    const manifestPath = join43(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
+    const manifestPath = join44(skillsDir, SkillsManifestManager.MANIFEST_FILENAME);
     if (!await import_fs_extra17.pathExists(manifestPath)) {
       logger.debug(`No manifest found at: ${manifestPath}`);
       return null;
@@ -32914,7 +33091,7 @@ class SkillsManifestManager {
       return "flat";
     }
     for (const dir of dirs.slice(0, 3)) {
-      const dirPath = join43(skillsDir, dir.name);
+      const dirPath = join44(skillsDir, dir.name);
       const subEntries = await readdir14(dirPath, { withFileTypes: true });
       const hasSubdirs = subEntries.some((entry) => entry.isDirectory());
       if (hasSubdirs) {
@@ -32933,7 +33110,7 @@ class SkillsManifestManager {
       const entries = await readdir14(skillsDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory() && entry.name !== "node_modules" && !entry.name.startsWith(".")) {
-          const skillPath = join43(skillsDir, entry.name);
+          const skillPath = join44(skillsDir, entry.name);
           const hash = await SkillsManifestManager.hashDirectory(skillPath);
           skills.push({
             name: entry.name,
@@ -32945,11 +33122,11 @@ class SkillsManifestManager {
       const categories = await readdir14(skillsDir, { withFileTypes: true });
       for (const category of categories) {
         if (category.isDirectory() && category.name !== "node_modules" && !category.name.startsWith(".")) {
-          const categoryPath = join43(skillsDir, category.name);
+          const categoryPath = join44(skillsDir, category.name);
           const skillEntries = await readdir14(categoryPath, { withFileTypes: true });
           for (const skillEntry of skillEntries) {
             if (skillEntry.isDirectory() && !skillEntry.name.startsWith(".")) {
-              const skillPath = join43(categoryPath, skillEntry.name);
+              const skillPath = join44(categoryPath, skillEntry.name);
               const hash = await SkillsManifestManager.hashDirectory(skillPath);
               skills.push({
                 name: skillEntry.name,
@@ -32979,7 +33156,7 @@ class SkillsManifestManager {
     const files = [];
     const entries = await readdir14(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join43(dirPath, entry.name);
+      const fullPath = join44(dirPath, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules") {
         continue;
       }
@@ -33101,7 +33278,7 @@ function getPathMapping(skillName, oldBasePath, newBasePath) {
 // src/domains/skills/detection/script-detector.ts
 var import_fs_extra18 = __toESM(require_lib(), 1);
 import { readdir as readdir15 } from "node:fs/promises";
-import { join as join44 } from "node:path";
+import { join as join45 } from "node:path";
 async function scanDirectory(skillsDir) {
   if (!await import_fs_extra18.pathExists(skillsDir)) {
     return ["flat", []];
@@ -33114,12 +33291,12 @@ async function scanDirectory(skillsDir) {
   let totalSkillLikeCount = 0;
   const allSkills = [];
   for (const dir of dirs) {
-    const dirPath = join44(skillsDir, dir.name);
+    const dirPath = join45(skillsDir, dir.name);
     const subEntries = await readdir15(dirPath, { withFileTypes: true });
     const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
     if (subdirs.length > 0) {
       for (const subdir of subdirs.slice(0, 3)) {
-        const subdirPath = join44(dirPath, subdir.name);
+        const subdirPath = join45(dirPath, subdir.name);
         const subdirFiles = await readdir15(subdirPath, { withFileTypes: true });
         const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
         if (hasSkillMarker) {
@@ -33276,19 +33453,25 @@ class SkillsMigrationDetector {
 // src/domains/skills/skills-migrator.ts
 init_logger();
 init_types2();
-import { join as join49 } from "node:path";
+import { join as join50 } from "node:path";
 
 // src/domains/skills/migrator/migration-executor.ts
 init_logger();
 var import_fs_extra20 = __toESM(require_lib(), 1);
 import { copyFile as copyFile4, mkdir as mkdir14, readdir as readdir16, rm as rm3 } from "node:fs/promises";
-import { join as join45 } from "node:path";
+import { join as join46 } from "node:path";
 
 // src/domains/skills/skills-migration-prompts.ts
+init_environment();
+init_logger();
 init_dist2();
 
 class SkillsMigrationPrompts {
   static async promptMigrationDecision(detection) {
+    if (isNonInteractive()) {
+      logger.info("Non-interactive mode: proceeding with skills migration");
+      return true;
+    }
     const customizedCount = detection.customizations.filter((c2) => c2.isCustomized).length;
     const totalSkills = detection.skillMappings.length;
     let message = `Skills directory structure migration available.
@@ -33334,6 +33517,10 @@ Would you like to migrate now?`;
     if (customizations.length === 0) {
       return "preserve";
     }
+    if (isNonInteractive()) {
+      logger.info("Non-interactive mode: preserving all customizations");
+      return "preserve";
+    }
     const result = await ie({
       message: "How should customized skills be handled?",
       options: [
@@ -33358,6 +33545,10 @@ Would you like to migrate now?`;
     return result;
   }
   static async promptSkillMigration(skillName, customization) {
+    if (isNonInteractive()) {
+      logger.info(`Non-interactive mode: migrating skill ${skillName}`);
+      return true;
+    }
     let message = `Migrate skill: ${skillName}?`;
     if (customization.isCustomized && customization.changes) {
       const changes = customization.changes;
@@ -33403,6 +33594,10 @@ Detected changes:`;
     f2.message("");
   }
   static async promptBackup() {
+    if (isNonInteractive()) {
+      logger.info("Non-interactive mode: creating backup before migration");
+      return true;
+    }
     const result = await se({
       message: "Create backup of current skills directory before migration?",
       initialValue: true
@@ -33428,8 +33623,8 @@ async function copySkillDirectory(sourceDir, destDir) {
   await mkdir14(destDir, { recursive: true });
   const entries = await readdir16(sourceDir, { withFileTypes: true });
   for (const entry of entries) {
-    const sourcePath = join45(sourceDir, entry.name);
-    const destPath = join45(destDir, entry.name);
+    const sourcePath = join46(sourceDir, entry.name);
+    const destPath = join46(destDir, entry.name);
     if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
       continue;
     }
@@ -33444,7 +33639,7 @@ async function executeMigration(mappings, customizations, currentSkillsDir, inte
   const migrated = [];
   const preserved = [];
   const errors2 = [];
-  const tempDir = join45(currentSkillsDir, "..", ".skills-migration-temp");
+  const tempDir = join46(currentSkillsDir, "..", ".skills-migration-temp");
   await mkdir14(tempDir, { recursive: true });
   try {
     for (const mapping of mappings) {
@@ -33465,9 +33660,9 @@ async function executeMigration(mappings, customizations, currentSkillsDir, inte
           }
         }
         const category = mapping.category;
-        const targetPath = category ? join45(tempDir, category, skillName) : join45(tempDir, skillName);
+        const targetPath = category ? join46(tempDir, category, skillName) : join46(tempDir, skillName);
         if (category) {
-          await mkdir14(join45(tempDir, category), { recursive: true });
+          await mkdir14(join46(tempDir, category), { recursive: true });
         }
         await copySkillDirectory(currentSkillPath, targetPath);
         migrated.push(skillName);
@@ -33529,7 +33724,7 @@ init_logger();
 init_types2();
 var import_fs_extra21 = __toESM(require_lib(), 1);
 import { copyFile as copyFile5, mkdir as mkdir15, readdir as readdir17, rm as rm4, stat as stat8 } from "node:fs/promises";
-import { basename as basename2, join as join46, normalize as normalize5 } from "node:path";
+import { basename as basename2, join as join47, normalize as normalize5 } from "node:path";
 function validatePath2(path9, paramName) {
   if (!path9 || typeof path9 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -33555,7 +33750,7 @@ class SkillsBackupManager {
     const timestamp = Date.now();
     const randomSuffix = Math.random().toString(36).substring(2, 8);
     const backupDirName = `${SkillsBackupManager.BACKUP_PREFIX}${timestamp}-${randomSuffix}`;
-    const backupDir = parentDir ? join46(parentDir, backupDirName) : join46(skillsDir, "..", backupDirName);
+    const backupDir = parentDir ? join47(parentDir, backupDirName) : join47(skillsDir, "..", backupDirName);
     logger.info(`Creating backup at: ${backupDir}`);
     try {
       await mkdir15(backupDir, { recursive: true });
@@ -33606,7 +33801,7 @@ class SkillsBackupManager {
     }
     try {
       const entries = await readdir17(parentDir, { withFileTypes: true });
-      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join46(parentDir, entry.name));
+      const backups = entries.filter((entry) => entry.isDirectory() && entry.name.startsWith(SkillsBackupManager.BACKUP_PREFIX)).map((entry) => join47(parentDir, entry.name));
       backups.sort().reverse();
       return backups;
     } catch (error) {
@@ -33634,8 +33829,8 @@ class SkillsBackupManager {
   static async copyDirectory(sourceDir, destDir) {
     const entries = await readdir17(sourceDir, { withFileTypes: true });
     for (const entry of entries) {
-      const sourcePath = join46(sourceDir, entry.name);
-      const destPath = join46(destDir, entry.name);
+      const sourcePath = join47(sourceDir, entry.name);
+      const destPath = join47(destDir, entry.name);
       if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
         continue;
       }
@@ -33651,7 +33846,7 @@ class SkillsBackupManager {
     let size = 0;
     const entries = await readdir17(dirPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join46(dirPath, entry.name);
+      const fullPath = join47(dirPath, entry.name);
       if (entry.isSymbolicLink()) {
         continue;
       }
@@ -33686,12 +33881,12 @@ import { relative as relative10 } from "node:path";
 import { createHash as createHash3 } from "node:crypto";
 import { createReadStream as createReadStream2 } from "node:fs";
 import { readFile as readFile15, readdir as readdir18 } from "node:fs/promises";
-import { join as join47, relative as relative9 } from "node:path";
+import { join as join48, relative as relative9 } from "node:path";
 async function getAllFiles(dirPath) {
   const files = [];
   const entries = await readdir18(dirPath, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join47(dirPath, entry.name);
+    const fullPath = join48(dirPath, entry.name);
     if (entry.name.startsWith(".") || entry.name === "node_modules" || entry.isSymbolicLink()) {
       continue;
     }
@@ -33818,7 +34013,7 @@ async function detectFileChanges(currentSkillPath, baselineSkillPath) {
 init_types2();
 var import_fs_extra23 = __toESM(require_lib(), 1);
 import { readdir as readdir19 } from "node:fs/promises";
-import { join as join48, normalize as normalize6 } from "node:path";
+import { join as join49, normalize as normalize6 } from "node:path";
 function validatePath3(path9, paramName) {
   if (!path9 || typeof path9 !== "string") {
     throw new SkillsMigrationError(`${paramName} must be a non-empty string`);
@@ -33839,13 +34034,13 @@ async function scanSkillsDirectory(skillsDir) {
   if (dirs.length === 0) {
     return ["flat", []];
   }
-  const firstDirPath = join48(skillsDir, dirs[0].name);
+  const firstDirPath = join49(skillsDir, dirs[0].name);
   const subEntries = await readdir19(firstDirPath, { withFileTypes: true });
   const subdirs = subEntries.filter((entry) => entry.isDirectory() && !entry.name.startsWith("."));
   if (subdirs.length > 0) {
     let skillLikeCount = 0;
     for (const subdir of subdirs.slice(0, 3)) {
-      const subdirPath = join48(firstDirPath, subdir.name);
+      const subdirPath = join49(firstDirPath, subdir.name);
       const subdirFiles = await readdir19(subdirPath, { withFileTypes: true });
       const hasSkillMarker = subdirFiles.some((file) => file.isFile() && (file.name === "skill.md" || file.name === "README.md" || file.name === "readme.md" || file.name === "config.json" || file.name === "package.json"));
       if (hasSkillMarker) {
@@ -33855,7 +34050,7 @@ async function scanSkillsDirectory(skillsDir) {
     if (skillLikeCount > 0) {
       const skills = [];
       for (const dir of dirs) {
-        const categoryPath = join48(skillsDir, dir.name);
+        const categoryPath = join49(skillsDir, dir.name);
         const skillDirs = await readdir19(categoryPath, { withFileTypes: true });
         skills.push(...skillDirs.filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name));
       }
@@ -33865,7 +34060,7 @@ async function scanSkillsDirectory(skillsDir) {
   return ["flat", dirs.map((dir) => dir.name)];
 }
 async function findSkillPath(skillsDir, skillName) {
-  const flatPath = join48(skillsDir, skillName);
+  const flatPath = join49(skillsDir, skillName);
   if (await import_fs_extra23.pathExists(flatPath)) {
     return { path: flatPath, category: undefined };
   }
@@ -33874,8 +34069,8 @@ async function findSkillPath(skillsDir, skillName) {
     if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "node_modules") {
       continue;
     }
-    const categoryPath = join48(skillsDir, entry.name);
-    const skillPath = join48(categoryPath, skillName);
+    const categoryPath = join49(skillsDir, entry.name);
+    const skillPath = join49(categoryPath, skillName);
     if (await import_fs_extra23.pathExists(skillPath)) {
       return { path: skillPath, category: entry.name };
     }
@@ -33969,7 +34164,7 @@ class SkillsMigrator {
         }
       }
       if (options.backup && !options.dryRun) {
-        const claudeDir = join49(currentSkillsDir, "..");
+        const claudeDir = join50(currentSkillsDir, "..");
         result.backupPath = await SkillsBackupManager.createBackup(currentSkillsDir, claudeDir);
         logger.success(`Backup created at: ${result.backupPath}`);
       }
@@ -34029,7 +34224,7 @@ async function handleMigration(ctx) {
     logger.debug("Skipping skills migration (fresh installation)");
     return ctx;
   }
-  const newSkillsDir = join50(ctx.extractDir, ".claude", "skills");
+  const newSkillsDir = join51(ctx.extractDir, ".claude", "skills");
   const currentSkillsDir = PathResolver.buildSkillsPath(ctx.resolvedDir, ctx.options.global);
   if (!await import_fs_extra24.pathExists(newSkillsDir) || !await import_fs_extra24.pathExists(currentSkillsDir)) {
     return ctx;
@@ -34057,7 +34252,7 @@ import { existsSync as existsSync15 } from "node:fs";
 import { mkdir as mkdir16, readFile as readFile16, rename as rename2, rm as rm5, writeFile as writeFile13 } from "node:fs/promises";
 import { chmod as chmod2 } from "node:fs/promises";
 import { platform as platform9 } from "node:os";
-import { join as join51 } from "node:path";
+import { join as join52 } from "node:path";
 init_types2();
 var PROJECT_CONFIG_FILE = ".ck.json";
 
@@ -34065,7 +34260,7 @@ class ConfigManager {
   static config = null;
   static globalFlag = false;
   static getProjectConfigDir(projectDir, global3) {
-    return global3 ? projectDir : join51(projectDir, ".claude");
+    return global3 ? projectDir : join52(projectDir, ".claude");
   }
   static setGlobalFlag(global3) {
     ConfigManager.globalFlag = global3;
@@ -34132,7 +34327,7 @@ class ConfigManager {
   }
   static async loadProjectConfig(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join51(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join52(configDir, PROJECT_CONFIG_FILE);
     try {
       if (existsSync15(configPath)) {
         const content = await readFile16(configPath, "utf-8");
@@ -34148,7 +34343,7 @@ class ConfigManager {
   }
   static async saveProjectConfig(projectDir, folders, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join51(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join52(configDir, PROJECT_CONFIG_FILE);
     try {
       if (!existsSync15(configDir)) {
         await mkdir16(configDir, { recursive: true });
@@ -34180,11 +34375,11 @@ class ConfigManager {
   }
   static projectConfigExists(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    return existsSync15(join51(configDir, PROJECT_CONFIG_FILE));
+    return existsSync15(join52(configDir, PROJECT_CONFIG_FILE));
   }
   static async migrateNestedConfig(globalDir) {
-    const correctPath = join51(globalDir, PROJECT_CONFIG_FILE);
-    const incorrectPath = join51(globalDir, ".claude", PROJECT_CONFIG_FILE);
+    const correctPath = join52(globalDir, PROJECT_CONFIG_FILE);
+    const incorrectPath = join52(globalDir, ".claude", PROJECT_CONFIG_FILE);
     if (existsSync15(correctPath)) {
       logger.debug("Config already exists at correct location, skipping migration");
       return false;
@@ -34194,7 +34389,7 @@ class ConfigManager {
         logger.info("Migrating .ck.json from nested location to correct location...");
         await rename2(incorrectPath, correctPath);
         logger.success(`Migrated ${PROJECT_CONFIG_FILE} to ${correctPath}`);
-        const nestedClaudeDir = join51(globalDir, ".claude");
+        const nestedClaudeDir = join52(globalDir, ".claude");
         try {
           await rm5(nestedClaudeDir, { recursive: false });
           logger.debug("Removed empty nested .claude directory");
@@ -34231,6 +34426,7 @@ async function resolveOptions(ctx) {
     docsDir: parsed.docsDir,
     plansDir: parsed.plansDir,
     installSkills: parsed.installSkills ?? false,
+    withSudo: parsed.withSudo ?? false,
     skipSetup: parsed.skipSetup ?? false,
     forceOverwrite: parsed.forceOverwrite ?? false,
     forceOverwriteSettings: parsed.forceOverwriteSettings ?? false,
@@ -34253,14 +34449,14 @@ async function resolveOptions(ctx) {
   };
 }
 // src/commands/init/phases/post-install-handler.ts
-import { join as join54 } from "node:path";
+import { join as join55 } from "node:path";
 
 // src/domains/installation/setup-wizard.ts
-import { join as join53 } from "node:path";
+import { join as join54 } from "node:path";
 
 // src/domains/config/config-generator.ts
 var import_fs_extra25 = __toESM(require_lib(), 1);
-import { join as join52 } from "node:path";
+import { join as join53 } from "node:path";
 async function generateEnvFile(targetDir, values) {
   const lines = [
     "# Generated by ClaudeKit CLI setup wizard",
@@ -34272,7 +34468,7 @@ async function generateEnvFile(targetDir, values) {
       lines.push(`${key}=${value}`);
     }
   }
-  const envPath = join52(targetDir, ".env");
+  const envPath = join53(targetDir, ".env");
   await import_fs_extra25.writeFile(envPath, `${lines.join(`
 `)}
 `, { mode: 384 });
@@ -34346,7 +34542,7 @@ async function parseEnvFile(path9) {
   }
 }
 async function checkGlobalConfig() {
-  const globalEnvPath = join53(PathResolver.getGlobalKitDir(), ".env");
+  const globalEnvPath = join54(PathResolver.getGlobalKitDir(), ".env");
   if (!await import_fs_extra26.pathExists(globalEnvPath))
     return false;
   const env2 = await parseEnvFile(globalEnvPath);
@@ -34362,7 +34558,7 @@ async function runSetupWizard(options) {
   let globalEnv = {};
   const hasGlobalConfig = !isGlobal && await checkGlobalConfig();
   if (!isGlobal) {
-    const globalEnvPath = join53(PathResolver.getGlobalKitDir(), ".env");
+    const globalEnvPath = join54(PathResolver.getGlobalKitDir(), ".env");
     if (await import_fs_extra26.pathExists(globalEnvPath)) {
       globalEnv = await parseEnvFile(globalEnvPath);
     }
@@ -34415,7 +34611,7 @@ async function runSetupWizard(options) {
     }
   }
   await generateEnvFile(targetDir, values);
-  f2.success(`Configuration saved to ${join53(targetDir, ".env")}`);
+  f2.success(`Configuration saved to ${join54(targetDir, ".env")}`);
   return true;
 }
 
@@ -34427,8 +34623,8 @@ async function handlePostInstall(ctx) {
     return ctx;
   }
   if (ctx.options.global) {
-    const claudeMdSource = join54(ctx.extractDir, "CLAUDE.md");
-    const claudeMdDest = join54(ctx.resolvedDir, "CLAUDE.md");
+    const claudeMdSource = join55(ctx.extractDir, "CLAUDE.md");
+    const claudeMdDest = join55(ctx.resolvedDir, "CLAUDE.md");
     if (await import_fs_extra27.pathExists(claudeMdSource)) {
       if (!await import_fs_extra27.pathExists(claudeMdDest)) {
         await import_fs_extra27.copy(claudeMdSource, claudeMdDest);
@@ -34445,7 +34641,10 @@ async function handlePostInstall(ctx) {
   if (installSkills) {
     const { handleSkillsInstallation: handleSkillsInstallation2 } = await Promise.resolve().then(() => (init_package_installer(), exports_package_installer));
     const skillsDir = PathResolver.buildSkillsPath(ctx.resolvedDir, ctx.options.global);
-    await handleSkillsInstallation2(skillsDir);
+    await handleSkillsInstallation2(skillsDir, {
+      skipConfirm: ctx.isNonInteractive,
+      withSudo: ctx.options.withSudo
+    });
   }
   if (!ctx.isNonInteractive) {
     const { isGeminiInstalled: isGeminiInstalled2 } = await Promise.resolve().then(() => (init_package_installer(), exports_package_installer));
@@ -34472,7 +34671,7 @@ async function handlePostInstall(ctx) {
     }
   }
   if (!ctx.options.skipSetup && !ctx.isNonInteractive) {
-    const envPath = join54(ctx.claudeDir, ".env");
+    const envPath = join55(ctx.claudeDir, ".env");
     if (!await import_fs_extra27.pathExists(envPath)) {
       const shouldSetup = await ctx.prompts.confirm("Set up API keys now? (Gemini API key for ai-multimodal skill, optional webhooks)");
       if (shouldSetup) {
@@ -34494,11 +34693,11 @@ Optional: DISCORD_WEBHOOK_URL, TELEGRAM_BOT_TOKEN`, "Configuration skipped");
 }
 // src/commands/init/phases/selection-handler.ts
 import { mkdir as mkdir17 } from "node:fs/promises";
-import { join as join56, resolve as resolve7 } from "node:path";
+import { join as join57, resolve as resolve7 } from "node:path";
 
 // src/domains/installation/fresh-installer.ts
 init_logger();
-import { join as join55 } from "node:path";
+import { join as join56 } from "node:path";
 var import_fs_extra28 = __toESM(require_lib(), 1);
 var CLAUDEKIT_SUBDIRECTORIES = ["commands", "agents", "skills", "workflows", "hooks"];
 async function handleFreshInstallation(claudeDir, prompts) {
@@ -34517,7 +34716,7 @@ async function handleFreshInstallation(claudeDir, prompts) {
     const { rmSync } = await import("node:fs");
     let removedCount = 0;
     for (const subdir of CLAUDEKIT_SUBDIRECTORIES) {
-      const subdirPath = join55(claudeDir, subdir);
+      const subdirPath = join56(claudeDir, subdir);
       if (await import_fs_extra28.pathExists(subdirPath)) {
         rmSync(subdirPath, { recursive: true, force: true });
         removedCount++;
@@ -34582,7 +34781,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join56(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join57(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -34610,7 +34809,7 @@ async function handleSelection(ctx) {
     logger.info("Fetching available versions...");
     let currentVersion = null;
     try {
-      const metadataPath = ctx.options.global ? join56(PathResolver.getGlobalKitDir(), "metadata.json") : join56(resolvedDir, ".claude", "metadata.json");
+      const metadataPath = ctx.options.global ? join57(PathResolver.getGlobalKitDir(), "metadata.json") : join57(resolvedDir, ".claude", "metadata.json");
       const metadata = await readClaudeKitMetadata(metadataPath);
       currentVersion = metadata?.version || null;
       if (currentVersion) {
@@ -34664,7 +34863,7 @@ async function handleSelection(ctx) {
   };
 }
 // src/commands/init/phases/transform-handler.ts
-import { join as join60 } from "node:path";
+import { join as join61 } from "node:path";
 
 // src/services/transformers/folder-path-transformer.ts
 init_logger();
@@ -34675,38 +34874,38 @@ init_logger();
 init_types2();
 var import_fs_extra30 = __toESM(require_lib(), 1);
 import { rename as rename3 } from "node:fs/promises";
-import { join as join57, relative as relative11 } from "node:path";
+import { join as join58, relative as relative11 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join57(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join58(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra30.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join57(extractDir, folders.docs)
+        to: join58(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join57(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join58(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra30.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join57(extractDir, ".claude", folders.docs)
+        to: join58(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join57(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join58(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra30.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join57(extractDir, folders.plans)
+        to: join58(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join57(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join58(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra30.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join57(extractDir, ".claude", folders.plans)
+        to: join58(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -34734,7 +34933,7 @@ async function renameFolders(dirsToRename, extractDir, options) {
 init_logger();
 init_types2();
 import { readFile as readFile18, readdir as readdir20, writeFile as writeFile15 } from "node:fs/promises";
-import { join as join58, relative as relative12 } from "node:path";
+import { join as join59, relative as relative12 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -34787,7 +34986,7 @@ async function transformFileContents(dir, compiledReplacements, options) {
   let replacementsCount = 0;
   const entries = await readdir20(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join58(dir, entry.name);
+    const fullPath = join59(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -34924,7 +35123,7 @@ async function transformFolderPaths(extractDir, folders, options = {}) {
 init_logger();
 import { readFile as readFile19, readdir as readdir21, writeFile as writeFile16 } from "node:fs/promises";
 import { platform as platform10 } from "node:os";
-import { extname, join as join59 } from "node:path";
+import { extname, join as join60 } from "node:path";
 var IS_WINDOWS3 = platform10() === "win32";
 var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
 function getHomeDirPrefix() {
@@ -35016,7 +35215,7 @@ async function transformPathsForGlobalInstall(directory, options = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir21(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join59(dir, entry.name);
+      const fullPath = join60(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -35092,7 +35291,7 @@ async function handleTransforms(ctx) {
       logger.debug(ctx.options.global ? "Saved folder configuration to ~/.claude/.ck.json" : "Saved folder configuration to .claude/.ck.json");
     }
   }
-  const claudeDir = ctx.options.global ? ctx.resolvedDir : join60(ctx.resolvedDir, ".claude");
+  const claudeDir = ctx.options.global ? ctx.resolvedDir : join61(ctx.resolvedDir, ".claude");
   return {
     ...ctx,
     foldersConfig,
@@ -35111,6 +35310,7 @@ function createInitContext(rawOptions, prompts) {
     exclude: [],
     only: [],
     installSkills: false,
+    withSudo: false,
     skipSetup: false,
     forceOverwrite: false,
     forceOverwriteSettings: false,
@@ -35227,57 +35427,28 @@ async function directorySetup(validOptions, prompts) {
     isNonInteractive: isNonInteractive2
   };
 }
-
-// src/commands/new/phases/post-setup.ts
-init_package_installer();
-init_logger();
-async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts) {
-  let installOpenCode2 = validOptions.opencode;
-  let installGemini2 = validOptions.gemini;
-  let installSkills = validOptions.installSkills;
-  if (!isNonInteractive2 && !installOpenCode2 && !installGemini2 && !installSkills) {
-    const packageChoices = await prompts.promptPackageInstallations();
-    installOpenCode2 = packageChoices.installOpenCode;
-    installGemini2 = packageChoices.installGemini;
-    installSkills = await prompts.promptSkillsInstallation();
-  }
-  if (installOpenCode2 || installGemini2) {
-    logger.info("Installing optional packages...");
-    try {
-      const installationResults = await processPackageInstallations(installOpenCode2, installGemini2, resolvedDir);
-      prompts.showPackageInstallationResults(installationResults);
-    } catch (error) {
-      logger.warning(`Package installation failed: ${error instanceof Error ? error.message : String(error)}`);
-      logger.info("You can install these packages manually later using npm install -g <package>");
-    }
-  }
-  if (installSkills) {
-    const { handleSkillsInstallation: handleSkillsInstallation2 } = await Promise.resolve().then(() => (init_package_installer(), exports_package_installer));
-    const skillsDir = PathResolver.buildSkillsPath(resolvedDir, false);
-    await handleSkillsInstallation2(skillsDir);
+async function handleDirectorySetup(ctx) {
+  const result = await directorySetup(ctx.options, ctx.prompts);
+  if (!result) {
+    return { ...ctx, cancelled: true };
   }
+  return {
+    ...ctx,
+    kit: result.kit,
+    resolvedDir: result.resolvedDir,
+    isNonInteractive: result.isNonInteractive
+  };
 }
-
 // src/commands/new/phases/project-creation.ts
-import { join as join61 } from "node:path";
-init_environment();
+import { join as join62 } from "node:path";
 init_logger();
 init_output_manager();
 init_types2();
-async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2, prompts) {
-  const kitConfig = AVAILABLE_KITS[kit];
-  const github = new GitHubClient;
-  const spinner = createSpinner("Checking repository access...").start();
-  logger.verbose("GitHub API check", { repo: kitConfig.repo, owner: kitConfig.owner });
-  try {
-    await github.checkAccess(kitConfig);
-    spinner.succeed("Repository access verified");
-  } catch (error) {
-    spinner.fail("Access denied to repository");
-    logger.error(error.message || `Cannot access ${kitConfig.name}`);
-    return null;
-  }
-  let selectedVersion = validOptions.release;
+
+// src/commands/new/phases/version-selection.ts
+init_logger();
+async function selectVersion2(kit, options, isNonInteractive2, prompts, github) {
+  let selectedVersion = options.release;
   if (!selectedVersion && isNonInteractive2) {
     throw new Error("Interactive version selection unavailable in non-interactive mode. " + "Either: (1) use --release <tag> flag, or (2) set CI=false to enable interactive mode");
   }
@@ -35285,11 +35456,11 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
     logger.info("Fetching available versions...");
     try {
       const versionResult = await prompts.selectVersionEnhanced({
-        kit: kitConfig,
-        includePrereleases: validOptions.beta,
+        kit,
+        includePrereleases: options.beta,
         limit: 10,
         allowManualEntry: true,
-        forceRefresh: validOptions.refresh
+        forceRefresh: options.refresh
       });
       if (!versionResult) {
         logger.warning("Version selection cancelled by user");
@@ -35299,73 +35470,57 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
       logger.success(`Selected version: ${selectedVersion}`);
     } catch (error) {
       logger.error("Failed to fetch versions, using latest release");
-      logger.debug(`Version selection error: ${error.message}`);
+      const message = error instanceof Error ? error.message : String(error);
+      logger.debug(`Version selection error: ${message}`);
       selectedVersion = undefined;
     }
   }
   let release;
   if (selectedVersion) {
-    release = await github.getReleaseByTag(kitConfig, selectedVersion);
+    release = await github.getReleaseByTag(kit, selectedVersion);
   } else {
-    if (validOptions.beta) {
+    if (options.beta) {
       logger.info("Fetching latest beta release...");
     } else {
       logger.info("Fetching latest release...");
     }
-    release = await github.getLatestRelease(kitConfig, validOptions.beta);
+    release = await github.getLatestRelease(kit, options.beta);
     if (release.prerelease) {
       logger.success(`Found beta: ${release.tag_name}`);
     } else {
       logger.success(`Found: ${release.tag_name}`);
     }
   }
-  const downloadInfo = GitHubClient.getDownloadableAsset(release);
-  logger.verbose("Release info", {
-    tag: release.tag_name,
-    prerelease: release.prerelease,
-    downloadType: downloadInfo.type,
-    assetSize: downloadInfo.size
-  });
-  output.section("Downloading");
-  const downloadManager = new DownloadManager;
-  if (validOptions.exclude && validOptions.exclude.length > 0) {
-    downloadManager.setExcludePatterns(validOptions.exclude);
-  }
-  const tempDir = await downloadManager.createTempDir();
-  const { token } = await AuthManager.getToken();
-  let archivePath;
+  return {
+    release,
+    selectedVersion: release.tag_name
+  };
+}
+
+// src/commands/new/phases/project-creation.ts
+async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2, prompts) {
+  const kitConfig = AVAILABLE_KITS[kit];
+  const github = new GitHubClient;
+  const spinner = createSpinner("Checking repository access...").start();
+  logger.verbose("GitHub API check", { repo: kitConfig.repo, owner: kitConfig.owner });
   try {
-    archivePath = await downloadManager.downloadFile({
-      url: downloadInfo.url,
-      name: downloadInfo.name,
-      size: downloadInfo.size,
-      destDir: tempDir,
-      token
-    });
+    await github.checkAccess(kitConfig);
+    spinner.succeed("Repository access verified");
   } catch (error) {
-    if (downloadInfo.type === "asset") {
-      logger.warning("Asset download failed, falling back to GitHub tarball...");
-      const tarballInfo = {
-        type: "github-tarball",
-        url: release.tarball_url,
-        name: `${kitConfig.repo}-${release.tag_name}.tar.gz`,
-        size: 0
-      };
-      archivePath = await downloadManager.downloadFile({
-        url: tarballInfo.url,
-        name: tarballInfo.name,
-        size: tarballInfo.size,
-        destDir: tempDir,
-        token
-      });
-    } else {
-      throw error;
-    }
+    spinner.fail("Access denied to repository");
+    logger.error(error.message || `Cannot access ${kitConfig.name}`);
+    return null;
   }
-  const extractDir = `${tempDir}/extracted`;
-  logger.verbose("Extraction", { archivePath, extractDir });
-  await downloadManager.extractArchive(archivePath, extractDir);
-  await downloadManager.validateExtraction(extractDir);
+  const versionResult = await selectVersion2(kitConfig, validOptions, isNonInteractive2, prompts, github);
+  if (!versionResult) {
+    return null;
+  }
+  const { release } = versionResult;
+  const { extractDir } = await downloadAndExtract({
+    release,
+    kit: kitConfig,
+    exclude: validOptions.exclude
+  });
   if (CommandsPrefix.shouldApplyPrefix(validOptions)) {
     await CommandsPrefix.applyPrefix(extractDir);
   }
@@ -35396,59 +35551,106 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
     await CommandsPrefix.cleanupCommandsDirectory(resolvedDir, false);
   }
   await merger.merge(extractDir, resolvedDir, true);
-  const claudeDir = join61(resolvedDir, ".claude");
-  const manifestWriter = new ManifestWriter;
+  const claudeDir = join62(resolvedDir, ".claude");
   const releaseManifest = await ReleaseManifestLoader.load(extractDir);
   const installedFiles = merger.getAllInstalledFiles();
-  const filesToTrack = [];
-  for (const installedPath of installedFiles) {
-    if (!installedPath.startsWith(".claude/"))
-      continue;
-    const relativePath = installedPath.replace(/^\.claude\//, "");
-    const filePath = join61(claudeDir, relativePath);
-    const manifestEntry = releaseManifest ? ReleaseManifestLoader.findFile(releaseManifest, installedPath) : null;
-    const ownership = manifestEntry ? "ck" : "user";
-    filesToTrack.push({
-      filePath,
-      relativePath,
-      ownership,
-      installedVersion: release.tag_name
-    });
-  }
-  const trackingSpinner = createSpinner(`Tracking ${filesToTrack.length} installed files...`);
-  trackingSpinner.start();
-  const trackResult = await manifestWriter.addTrackedFilesBatch(filesToTrack, {
-    concurrency: getOptimalConcurrency(),
-    onProgress: (processed, total) => {
-      trackingSpinner.text = `Tracking files... (${processed}/${total})`;
-    }
+  const filesToTrack = buildFileTrackingList({
+    installedFiles,
+    claudeDir,
+    releaseManifest,
+    installedVersion: release.tag_name,
+    isGlobal: false
+  });
+  await trackFilesWithProgress(filesToTrack, {
+    claudeDir,
+    kitName: kitConfig.name,
+    releaseTag: release.tag_name,
+    mode: "local"
   });
-  trackingSpinner.succeed(`Tracked ${trackResult.success} files`);
-  await manifestWriter.writeManifest(claudeDir, kitConfig.name, release.tag_name, "local");
   return {
     releaseTag: release.tag_name,
     installedFiles,
     claudeDir
   };
 }
-
+async function handleProjectCreation(ctx) {
+  if (!ctx.kit || !ctx.resolvedDir) {
+    return { ...ctx, cancelled: true };
+  }
+  const result = await projectCreation(ctx.kit, ctx.resolvedDir, ctx.options, ctx.isNonInteractive, ctx.prompts);
+  if (!result) {
+    return { ...ctx, cancelled: true };
+  }
+  return {
+    ...ctx,
+    releaseTag: result.releaseTag,
+    installedFiles: result.installedFiles,
+    claudeDir: result.claudeDir
+  };
+}
+// src/commands/new/phases/post-setup.ts
+init_package_installer();
+init_logger();
+async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts) {
+  let installOpenCode2 = validOptions.opencode;
+  let installGemini2 = validOptions.gemini;
+  let installSkills = validOptions.installSkills;
+  if (!isNonInteractive2 && !installOpenCode2 && !installGemini2 && !installSkills) {
+    const packageChoices = await prompts.promptPackageInstallations();
+    installOpenCode2 = packageChoices.installOpenCode;
+    installGemini2 = packageChoices.installGemini;
+    installSkills = await prompts.promptSkillsInstallation();
+  }
+  if (installOpenCode2 || installGemini2) {
+    logger.info("Installing optional packages...");
+    try {
+      const installationResults = await processPackageInstallations(installOpenCode2, installGemini2, resolvedDir);
+      prompts.showPackageInstallationResults(installationResults);
+    } catch (error) {
+      logger.warning(`Package installation failed: ${error instanceof Error ? error.message : String(error)}`);
+      logger.info("You can install these packages manually later using npm install -g <package>");
+    }
+  }
+  if (installSkills) {
+    const { handleSkillsInstallation: handleSkillsInstallation2 } = await Promise.resolve().then(() => (init_package_installer(), exports_package_installer));
+    const skillsDir = PathResolver.buildSkillsPath(resolvedDir, false);
+    await handleSkillsInstallation2(skillsDir, {
+      skipConfirm: isNonInteractive2,
+      withSudo: validOptions.withSudo
+    });
+  }
+}
+async function handlePostSetup(ctx) {
+  if (!ctx.resolvedDir) {
+    return { ...ctx, cancelled: true };
+  }
+  await postSetup(ctx.resolvedDir, ctx.options, ctx.isNonInteractive, ctx.prompts);
+  return ctx;
+}
 // src/commands/new/new-command.ts
+function createNewContext(options, prompts) {
+  return {
+    options,
+    prompts,
+    isNonInteractive: !process.stdin.isTTY || process.env.CI === "true",
+    cancelled: false
+  };
+}
 async function newCommand(options) {
   const prompts = new PromptsManager;
   prompts.intro("\uD83D\uDE80 ClaudeKit - Create New Project");
   try {
-    const validOptions = NewCommandOptionsSchema.parse(options);
-    const setupResult = await directorySetup(validOptions, prompts);
-    if (!setupResult) {
+    let ctx = createNewContext(NewCommandOptionsSchema.parse(options), prompts);
+    ctx = await handleDirectorySetup(ctx);
+    if (ctx.cancelled)
       return;
-    }
-    const { kit, resolvedDir, isNonInteractive: isNonInteractive2 } = setupResult;
-    const creationResult = await projectCreation(kit, resolvedDir, validOptions, isNonInteractive2, prompts);
-    if (!creationResult) {
+    ctx = await handleProjectCreation(ctx);
+    if (ctx.cancelled)
       return;
-    }
-    await postSetup(resolvedDir, validOptions, isNonInteractive2, prompts);
-    prompts.outro(`✨ Project created successfully at ${resolvedDir}`);
+    ctx = await handlePostSetup(ctx);
+    if (ctx.cancelled)
+      return;
+    prompts.outro(`✨ Project created successfully at ${ctx.resolvedDir}`);
   } catch (error) {
     logger.error(error instanceof Error ? error.message : "Unknown error occurred");
     process.exit(1);
@@ -35483,13 +35685,13 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync2, rmSync as rmSync2 } from "node:fs";
-import { join as join63 } from "node:path";
+import { join as join64 } from "node:path";
 init_logger();
 var import_fs_extra33 = __toESM(require_lib(), 1);
 
 // src/commands/uninstall/analysis-handler.ts
 import { readdirSync, rmSync } from "node:fs";
-import { dirname as dirname8, join as join62 } from "node:path";
+import { dirname as dirname8, join as join63 } from "node:path";
 init_logger();
 var import_picocolors15 = __toESM(require_picocolors(), 1);
 function classifyFileByOwnership(ownership, forceOverwrite, deleteReason) {
@@ -35536,7 +35738,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
   if (uninstallManifest.isMultiKit && kit && metadata?.kits?.[kit]) {
     const kitFiles = metadata.kits[kit].files || [];
     for (const trackedFile of kitFiles) {
-      const filePath = join62(installation.path, trackedFile.path);
+      const filePath = join63(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -35566,7 +35768,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join62(installation.path, trackedFile.path);
+    const filePath = join63(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -35626,7 +35828,7 @@ async function removeInstallations(installations, options) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join63(installation.path, item.path);
+        const filePath = join64(installation.path, item.path);
         if (await import_fs_extra33.pathExists(filePath)) {
           await import_fs_extra33.remove(filePath);
           removedCount++;
@@ -35661,10 +35863,11 @@ async function removeInstallations(installations, options) {
 }
 
 // src/commands/uninstall/uninstall-command.ts
+var prompts = new PromptsManager;
 function displayInstallations(installations, scope) {
-  intro("ClaudeKit Uninstaller");
+  prompts.intro("ClaudeKit Uninstaller");
   const scopeLabel = scope === "all" ? "all" : scope === "local" ? "local only" : "global only";
-  note(installations.map((i) => `  ${i.type === "local" ? "Local " : "Global"}: ${i.path}`).join(`
+  prompts.note(installations.map((i) => `  ${i.type === "local" ? "Local " : "Global"}: ${i.path}`).join(`
 `), `Detected ClaudeKit installations (${scopeLabel})`);
   log.warn("[!] This will permanently delete ClaudeKit files from the above paths.");
 }
@@ -35758,7 +35961,7 @@ async function uninstallCommand(options) {
         forceOverwrite: validOptions.forceOverwrite,
         kit: validOptions.kit
       });
-      outro("Dry-run complete. No changes were made.");
+      prompts.outro("Dry-run complete. No changes were made.");
       return;
     }
     if (validOptions.forceOverwrite) {
@@ -35779,7 +35982,7 @@ ${import_picocolors16.default.yellow("User modifications will be permanently del
       kit: validOptions.kit
     });
     const kitMsg = validOptions.kit ? ` (${validOptions.kit} kit)` : "";
-    outro(`ClaudeKit${kitMsg} uninstalled successfully!`);
+    prompts.outro(`ClaudeKit${kitMsg} uninstalled successfully!`);
   } catch (error) {
     logger.error(error instanceof Error ? error.message : "Unknown error");
     process.exit(1);
@@ -35932,7 +36135,7 @@ var import_compare_versions2 = __toESM(require_umd(), 1);
 // package.json
 var package_default = {
   name: "claudekit-cli",
-  version: "3.12.1",
+  version: "3.13.0",
   description: "CLI tool for bootstrapping and updating ClaudeKit projects",
   type: "module",
   repository: {
@@ -36188,8 +36391,8 @@ ${import_picocolors17.default.bold(import_picocolors17.default.cyan(kitName))} -
 Showing ${releases.length} ${releases.length === 1 ? "release" : "releases"}`));
 }
 async function versionCommand(options) {
-  const prompts = new PromptsManager;
-  prompts.intro("\uD83D\uDCE6 ClaudeKit - Available Versions");
+  const prompts2 = new PromptsManager;
+  prompts2.intro("\uD83D\uDCE6 ClaudeKit - Available Versions");
   try {
     const validOptions = VersionCommandOptionsSchema.parse(options);
     const kitsToFetch = validOptions.kit ? [validOptions.kit] : Object.keys(AVAILABLE_KITS);
@@ -36225,7 +36428,7 @@ ${import_picocolors17.default.bold(import_picocolors17.default.cyan(result.kitCo
         displayKitReleases(result.kitConfig.name, result.releases);
       }
     }
-    prompts.outro("✨ Done");
+    prompts2.outro("✨ Done");
   } catch (error) {
     logger.error(error instanceof Error ? error.message : "Unknown error occurred");
     process.exit(1);
@@ -36235,13 +36438,13 @@ ${import_picocolors17.default.bold(import_picocolors17.default.cyan(result.kitCo
 // src/cli/command-registry.ts
 init_logger();
 function registerCommands(cli) {
-  cli.command("new", "Bootstrap a new ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use (engineer, marketing)").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--force", "Overwrite existing files without confirmation").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--opencode", "Install OpenCode CLI package (non-interactive mode)").option("--gemini", "Install Google Gemini CLI package (non-interactive mode)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").action(async (options) => {
+  cli.command("new", "Bootstrap a new ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use (engineer, marketing)").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--force", "Overwrite existing files without confirmation").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--opencode", "Install OpenCode CLI package (non-interactive mode)").option("--gemini", "Install Google Gemini CLI package (non-interactive mode)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").action(async (options) => {
     if (options.exclude && !Array.isArray(options.exclude)) {
       options.exclude = [options.exclude];
     }
     await newCommand(options);
   });
-  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use (engineer, marketing)").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Completely remove .claude directory before downloading (requires confirmation)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").action(async (options) => {
+  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use (engineer, marketing)").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Completely remove .claude directory before downloading (requires confirmation)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /ck: prefix to all slash commands by moving them to commands/ck/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").action(async (options) => {
     if (options.exclude && !Array.isArray(options.exclude)) {
       options.exclude = [options.exclude];
     }
@@ -36250,7 +36453,7 @@ function registerCommands(cli) {
     }
     await initCommand(options);
   });
-  cli.command("update", "Update ClaudeKit CLI to the latest version").option("-r, --release <version>", "Update to a specific version").option("--check", "Check for updates without installing").option("-y, --yes", "Skip confirmation prompt").option("--beta", "Update to the latest beta version").option("--registry <url>", "Custom npm registry URL").option("--kit <kit>", "[DEPRECATED] Use 'ck init --kit <kit>' instead").option("-g, --global", "[DEPRECATED] Use 'ck init --global' instead").action(async (options) => {
+  cli.command("update", "Update ClaudeKit CLI to the latest version").option("-r, --release <version>", "Update to a specific version").option("--check", "Check for updates without installing").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--beta", "Update to the latest beta version").option("--registry <url>", "Custom npm registry URL").option("--kit <kit>", "[DEPRECATED] Use 'ck init --kit <kit>' instead").option("-g, --global", "[DEPRECATED] Use 'ck init --global' instead").action(async (options) => {
     if (options.kit || options.global) {
       console.log();
       const deprecatedFlags = [options.kit && "--kit", options.global && "--global"].filter(Boolean).join(" and ");
@@ -36280,7 +36483,7 @@ function registerCommands(cli) {
   cli.command("doctor", "Comprehensive health check for ClaudeKit").option("--report", "Generate shareable diagnostic report").option("--fix", "Auto-fix all fixable issues").option("--check-only", "CI mode: no prompts, exit 1 on failures").option("--json", "Output JSON format").option("--full", "Include extended priority checks (slower)").action(async (options) => {
     await doctorCommand(options);
   });
-  cli.command("uninstall", "Remove ClaudeKit installations").option("-y, --yes", "Skip confirmation prompt").option("-l, --local", "Uninstall only local installation (current project)").option("-g, --global", "Uninstall only global installation (~/.claude/)").option("-A, --all", "Uninstall from both local and global locations").option("-k, --kit <type>", "Uninstall specific kit only (engineer, marketing)").option("--dry-run", "Preview what would be removed without deleting").option("--force-overwrite", "Delete even user-modified files (requires confirmation)").action(async (options) => {
+  cli.command("uninstall", "Remove ClaudeKit installations").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("-l, --local", "Uninstall only local installation (current project)").option("-g, --global", "Uninstall only global installation (~/.claude/)").option("-A, --all", "Uninstall from both local and global locations").option("-k, --kit <type>", "Uninstall specific kit only (engineer, marketing)").option("--dry-run", "Preview what would be removed without deleting").option("--force-overwrite", "Delete even user-modified files (requires confirmation)").action(async (options) => {
     await uninstallCommand(options);
   });
   cli.command("easter-egg", "\uD83E\uDD5A Roll for a random discount code (Code Hunt 2025)").action(async () => {
@@ -36290,7 +36493,7 @@ function registerCommands(cli) {
 
 // src/cli/version-display.ts
 import { existsSync as existsSync17, readFileSync as readFileSync5 } from "node:fs";
-import { join as join65 } from "node:path";
+import { join as join66 } from "node:path";
 
 // src/domains/versioning/checking/version-utils.ts
 var import_compare_versions3 = __toESM(require_umd(), 1);
@@ -36317,13 +36520,13 @@ init_types2();
 init_logger();
 import { existsSync as existsSync16 } from "node:fs";
 import { mkdir as mkdir18, readFile as readFile20, writeFile as writeFile17 } from "node:fs/promises";
-import { join as join64 } from "node:path";
+import { join as join65 } from "node:path";
 class VersionCacheManager {
   static CACHE_FILENAME = "version-check.json";
   static CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
   static getCacheFile() {
     const cacheDir = PathResolver.getCacheDir(false);
-    return join64(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join65(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
@@ -36566,9 +36769,9 @@ async function displayVersion() {
   let localKitVersion = null;
   let isGlobalOnlyKit = false;
   const globalKitDir = PathResolver.getGlobalKitDir();
-  const globalMetadataPath = join65(globalKitDir, "metadata.json");
+  const globalMetadataPath = join66(globalKitDir, "metadata.json");
   const prefix = PathResolver.getPathPrefix(false);
-  const localMetadataPath = prefix ? join65(process.cwd(), prefix, "metadata.json") : join65(process.cwd(), "metadata.json");
+  const localMetadataPath = prefix ? join66(process.cwd(), prefix, "metadata.json") : join66(process.cwd(), "metadata.json");
   const isLocalSameAsGlobal = localMetadataPath === globalMetadataPath;
   if (!isLocalSameAsGlobal && existsSync17(localMetadataPath)) {
     try {
@@ -36635,6 +36838,7 @@ import { createWriteStream as createWriteStream3 } from "node:fs";
 class Logger2 {
   verboseEnabled = false;
   logFileStream;
+  exitHandlerRegistered = false;
   info(message) {
     const symbols = output.getSymbols();
     console.log(import_picocolors19.default.blue(symbols.info), message);
@@ -36689,9 +36893,49 @@ class Logger2 {
         flags: "a",
         mode: 384
       });
+      this.registerExitHandler();
       this.verbose(`Logging to file: ${path9}`);
     }
   }
+  close() {
+    if (this.logFileStream) {
+      this.logFileStream.end();
+      this.logFileStream = undefined;
+    }
+  }
+  registerExitHandler() {
+    if (this.exitHandlerRegistered)
+      return;
+    this.exitHandlerRegistered = true;
+    const cleanup = () => {
+      if (this.logFileStream) {
+        try {
+          this.logFileStream.end();
+        } catch {}
+        this.logFileStream = undefined;
+      }
+    };
+    process.on("exit", cleanup);
+    process.on("SIGINT", () => {
+      cleanup();
+      process.exit(130);
+    });
+    process.on("SIGTERM", () => {
+      cleanup();
+      process.exit(143);
+    });
+    process.on("uncaughtException", (error) => {
+      if (this.logFileStream) {
+        const timestamp = new Date().toISOString();
+        this.logFileStream.write(`${timestamp} [FATAL] Uncaught exception: ${error.message}
+`);
+        this.logFileStream.write(`${error.stack}
+`);
+      }
+      cleanup();
+      process.exit(1);
+    });
+  }
   sanitize(text) {
     return text.replace(/ghp_[a-zA-Z0-9]{36}/g, "ghp_***").replace(/github_pat_[a-zA-Z0-9_]{82}/g, "github_pat_***").replace(/gho_[a-zA-Z0-9]{36}/g, "gho_***").replace(/ghu_[a-zA-Z0-9]{36}/g, "ghu_***").replace(/ghs_[a-zA-Z0-9]{36}/g, "ghs_***").replace(/ghr_[a-zA-Z0-9]{36}/g, "ghr_***").replace(/Bearer [a-zA-Z0-9_-]+/g, "Bearer ***").replace(/token=[a-zA-Z0-9_-]+/g, "token=***");
   }
@@ -36736,7 +36980,11 @@ var SYMBOLS2 = {
     line: "│",
     selected: "●",
     unselected: "○",
-    pointer: ">"
+    pointer: ">",
+    pass: "✓",
+    warn: "⚠",
+    fail: "✗",
+    infoStatus: "ℹ"
   },
   ascii: {
     prompt: "?",
@@ -36747,10 +36995,13 @@ var SYMBOLS2 = {
     line: "|",
     selected: ">",
     unselected: " ",
-    pointer: ">"
+    pointer: ">",
+    pass: "[PASS]",
+    warn: "[WARN]",
+    fail: "[FAIL]",
+    infoStatus: "[INFO]"
   }
 };
-
 class OutputManager2 {
   config = {
     verbose: false,
@@ -36760,6 +37011,7 @@ class OutputManager2 {
   jsonBuffer = [];
   unicodeSupported;
   flushPromise = null;
+  flushQueued = false;
   constructor() {
     this.unicodeSupported = supportsUnicode();
   }
@@ -36865,8 +37117,12 @@ class OutputManager2 {
       ...entry,
       timestamp: new Date().toISOString()
     });
-    if (this.jsonBuffer.length >= 1000 && !this.flushPromise) {
-      queueMicrotask(() => this.flushJson());
+    if (this.jsonBuffer.length >= 1000 && !this.flushPromise && !this.flushQueued) {
+      this.flushQueued = true;
+      queueMicrotask(() => {
+        this.flushQueued = false;
+        this.flushJson();
+      });
     }
   }
   addJsonResult(data) {
@@ -36896,6 +37152,7 @@ class OutputManager2 {
     this.config = { verbose: false, json: false, quiet: false };
     this.jsonBuffer = [];
     this.flushPromise = null;
+    this.flushQueued = false;
     this.unicodeSupported = supportsUnicode();
   }
 }