claudekit-cli 3.35.0-dev.27 → 3.35.0-dev.29

package/dist/index.js

@@ -53303,32 +53303,44 @@ var init_pnpm_detector = __esm(() => {
 import { existsSync as existsSync29, realpathSync } from "node:fs";
 import { chmod as chmod2, mkdir as mkdir11, readFile as readFile22, writeFile as writeFile12 } from "node:fs/promises";
 import { platform as platform4 } from "node:os";
-import { join as join34, sep as sep3 } from "node:path";
+import { join as join34 } from "node:path";
 function detectFromBinaryPath() {
-  try {
-    const scriptPath = process.argv[1];
-    if (!scriptPath)
-      return "unknown";
-    let resolvedPath;
-    try {
-      resolvedPath = realpathSync(scriptPath);
-    } catch {
-      resolvedPath = scriptPath;
-    }
-    const normalized = resolvedPath.split(sep3).join("/").toLowerCase();
-    logger.verbose(`Binary path resolved: ${normalized}`);
-    if (normalized.includes("/.bun/install/") || normalized.includes("/bun/install/global/")) {
+  const normalizePath2 = (pathValue) => pathValue.replace(/\\/g, "/").toLowerCase();
+  const detectFromNormalizedPath = (normalized) => {
+    if (normalized.includes("/.bun/install/") || normalized.includes("/bun/install/global/") || normalized.includes("/.bun/bin/")) {
       return "bun";
     }
-    if (normalized.includes("/pnpm/global/") || normalized.includes("/.local/share/pnpm/")) {
+    if (normalized.includes("/pnpm/global/") || normalized.includes("/.local/share/pnpm/") || normalized.includes("/appdata/local/pnpm/")) {
       return "pnpm";
     }
-    if (normalized.includes("/yarn/global/") || normalized.includes("/.config/yarn/")) {
+    if (normalized.includes("/yarn/global/") || normalized.includes("/.config/yarn/") || normalized.includes("/appdata/local/yarn/data/global/")) {
       return "yarn";
     }
-    if (normalized.includes("/npm/node_modules/") || normalized.includes("/usr/local/lib/node_modules/") || normalized.includes("/usr/lib/node_modules/") || normalized.includes("/opt/homebrew/lib/node_modules/") || normalized.includes("/.nvm/versions/node/") || normalized.includes("/n/versions/node/") || normalized.includes("/appdata/roaming/npm/")) {
+    if (normalized.includes("/npm/node_modules/") || normalized.includes("/usr/local/lib/node_modules/") || normalized.includes("/usr/lib/node_modules/") || normalized.includes("/opt/homebrew/lib/node_modules/") || normalized.includes("/.nvm/versions/node/") || normalized.includes("/n/versions/node/") || normalized.includes("/appdata/roaming/npm/") || normalized.includes("/appdata/roaming/nvm/")) {
       return "npm";
     }
+    if (normalized.includes("/node_modules/claudekit-cli/")) {
+      return "npm";
+    }
+    return "unknown";
+  };
+  try {
+    const execPathCandidate = typeof process.execPath === "string" && /(?:^|[\\/])ck(?:[-.].+)?(?:\.exe)?$/i.test(process.execPath) ? process.execPath : undefined;
+    const pathCandidates = [process.argv[1], execPathCandidate].filter((candidate) => typeof candidate === "string" && candidate.trim().length > 0);
+    for (const candidate of pathCandidates) {
+      let resolvedPath;
+      try {
+        resolvedPath = realpathSync(candidate);
+      } catch {
+        resolvedPath = candidate;
+      }
+      const normalized = normalizePath2(resolvedPath);
+      logger.verbose(`Binary path candidate resolved: ${normalized}`);
+      const detectedPm = detectFromNormalizedPath(normalized);
+      if (detectedPm !== "unknown") {
+        return detectedPm;
+      }
+    }
   } catch {}
   return "unknown";
 }
@@ -54013,7 +54025,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.35.0-dev.27",
+    version: "3.35.0-dev.29",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -54124,6 +54136,24 @@ var init_package = __esm(() => {
 import { exec as exec2 } from "node:child_process";
 import { join as join37 } from "node:path";
 import { promisify as promisify8 } from "node:util";
+function getDefaultUpdateCliCommandDeps() {
+  return {
+    currentVersion: package_default.version,
+    execAsyncFn: execAsync2,
+    packageManagerDetector: PackageManagerDetector,
+    npmRegistryClient: NpmRegistryClient,
+    promptKitUpdateFn: promptKitUpdate
+  };
+}
+function extractCommandStdout(result) {
+  if (typeof result === "string") {
+    return result;
+  }
+  if (result && typeof result.stdout === "string") {
+    return result.stdout;
+  }
+  return "";
+}
 function redactCommandForLog(command) {
   if (!command)
     return command;
@@ -54146,6 +54176,12 @@ function isBetaVersion(version) {
     return false;
   return /-(beta|alpha|rc|dev)[.\d]/i.test(version);
 }
+function parseCliVersionFromOutput(output2) {
+  if (!output2)
+    return null;
+  const match = output2.match(/CLI Version:\s*(\S+)/);
+  return match ? match[1] : null;
+}
 function selectKitForUpdate(params) {
   const { hasLocal, hasGlobal, localKits, globalKits } = params;
   const hasLocalKit = localKits.length > 0 || hasLocal;
@@ -54247,21 +54283,27 @@ async function promptKitUpdate(beta, yes) {
     logger.verbose(`Failed to prompt for kit update: ${error instanceof Error ? error.message : "unknown error"}`);
   }
 }
-async function updateCliCommand(options2) {
+async function updateCliCommand(options2, deps = getDefaultUpdateCliCommandDeps()) {
   const s = de();
   intro("[>] ClaudeKit CLI - Update");
   try {
+    const {
+      currentVersion,
+      execAsyncFn,
+      packageManagerDetector,
+      npmRegistryClient,
+      promptKitUpdateFn
+    } = deps;
     const opts = UpdateCliOptionsSchema.parse(options2);
-    const currentVersion = package_default.version;
     logger.info(`Current CLI version: ${currentVersion}`);
     s.start("Detecting package manager...");
-    const pm = await PackageManagerDetector.detect();
-    const pmVersion = await PackageManagerDetector.getVersion(pm);
-    s.stop(`Using ${PackageManagerDetector.getDisplayName(pm)}${pmVersion ? ` v${pmVersion}` : ""}`);
+    const pm = await packageManagerDetector.detect();
+    const pmVersion = await packageManagerDetector.getVersion(pm);
+    s.stop(`Using ${packageManagerDetector.getDisplayName(pm)}${pmVersion ? ` v${pmVersion}` : ""}`);
     logger.verbose(`Detected package manager: ${pm}`);
     let registryUrl = opts.registry;
     if (!registryUrl && pm === "npm") {
-      const userRegistry = await PackageManagerDetector.getNpmRegistryUrl();
+      const userRegistry = await packageManagerDetector.getNpmRegistryUrl();
       if (userRegistry) {
         registryUrl = userRegistry;
         logger.verbose(`Using npm configured registry: ${redactRegistryUrlForLog(registryUrl)}`);
@@ -54271,7 +54313,7 @@ async function updateCliCommand(options2) {
     let targetVersion = null;
     if (opts.release && opts.release !== "latest") {
       try {
-        const exists = await NpmRegistryClient.versionExists(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, opts.release, registryUrl);
+        const exists = await npmRegistryClient.versionExists(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, opts.release, registryUrl);
         if (!exists) {
           s.stop("Version not found");
           throw new CliUpdateError(`Version ${opts.release} does not exist on npm registry. Run 'ck versions' to see available versions.`);
@@ -54289,25 +54331,25 @@ async function updateCliCommand(options2) {
       targetVersion = opts.release;
       s.stop(`Target version: ${targetVersion}`);
     } else if (opts.dev || opts.beta) {
-      targetVersion = await NpmRegistryClient.getDevVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
+      targetVersion = await npmRegistryClient.getDevVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
       if (!targetVersion) {
         s.stop("No dev version available");
         logger.warning("No dev version found. Using latest stable version instead.");
-        targetVersion = await NpmRegistryClient.getLatestVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
+        targetVersion = await npmRegistryClient.getLatestVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
       } else {
         s.stop(`Latest dev version: ${targetVersion}`);
       }
     } else {
-      targetVersion = await NpmRegistryClient.getLatestVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
+      targetVersion = await npmRegistryClient.getLatestVersion(CLAUDEKIT_CLI_NPM_PACKAGE_NAME, registryUrl);
       s.stop(`Latest version: ${targetVersion || "unknown"}`);
     }
     if (!targetVersion) {
-      throw new CliUpdateError(`Failed to fetch version information from npm registry. Check your internet connection and try again. Manual update: ${PackageManagerDetector.getUpdateCommand(pm, CLAUDEKIT_CLI_NPM_PACKAGE_NAME, undefined, registryUrl)}`);
+      throw new CliUpdateError(`Failed to fetch version information from npm registry. Check your internet connection and try again. Manual update: ${packageManagerDetector.getUpdateCommand(pm, CLAUDEKIT_CLI_NPM_PACKAGE_NAME, undefined, registryUrl)}`);
     }
     const comparison = import_compare_versions.compareVersions(currentVersion, targetVersion);
     if (comparison === 0) {
       outro(`[+] Already on the latest CLI version (${currentVersion})`);
-      await promptKitUpdate(opts.dev || opts.beta, opts.yes);
+      await promptKitUpdateFn(opts.dev || opts.beta, opts.yes);
       return;
     }
     const isDevChannelSwitch = (opts.dev || opts.beta) && isBetaVersion(targetVersion) && !isBetaVersion(currentVersion);
@@ -54322,7 +54364,7 @@ async function updateCliCommand(options2) {
       note(`CLI update available: ${currentVersion} -> ${targetVersion}
 
 Run 'ck update' to install`, "Update Check");
-      await promptKitUpdate(opts.dev || opts.beta, opts.yes);
+      await promptKitUpdateFn(opts.dev || opts.beta, opts.yes);
       outro("Check complete");
       return;
     }
@@ -54335,21 +54377,13 @@ Run 'ck update' to install`, "Update Check");
         return;
       }
     }
-    const updateCmd = PackageManagerDetector.getUpdateCommand(pm, CLAUDEKIT_CLI_NPM_PACKAGE_NAME, targetVersion, registryUrl);
+    const updateCmd = packageManagerDetector.getUpdateCommand(pm, CLAUDEKIT_CLI_NPM_PACKAGE_NAME, targetVersion, registryUrl);
     logger.info(`Running: ${redactCommandForLog(updateCmd)}`);
     s.start("Updating CLI...");
     try {
-      await execAsync2(updateCmd, {
+      await execAsyncFn(updateCmd, {
         timeout: 120000
       });
-      try {
-        const verifyResult = await execAsync2("ck --version", { timeout: 5000 });
-        if (!verifyResult.stdout.includes(targetVersion)) {
-          throw new CliUpdateError("Version verification failed after update");
-        }
-      } catch (verifyError) {
-        logger.warning("Could not verify installation automatically");
-      }
       s.stop("Update completed");
     } catch (error) {
       s.stop("Update failed");
@@ -54370,16 +54404,44 @@ Manual update: ${updateCmd}`);
     }
     s.start("Verifying installation...");
     try {
-      const { stdout } = await execAsync2("ck --version", { timeout: 5000 });
-      const newVersionMatch = stdout.match(/CLI Version:\s*(\S+)/);
-      const newVersion = newVersionMatch ? newVersionMatch[1] : targetVersion;
-      s.stop(`Installed version: ${newVersion}`);
-      outro(`[+] Successfully updated ClaudeKit CLI to ${newVersion}`);
-      await promptKitUpdate(opts.dev || opts.beta, opts.yes);
-    } catch {
-      s.stop("Verification completed");
-      outro(`[+] Update completed. Please restart your terminal to use CLI ${targetVersion}`);
-      await promptKitUpdate(opts.dev || opts.beta, opts.yes);
+      const versionResult = await execAsyncFn("ck --version", { timeout: 5000 });
+      const stdout = extractCommandStdout(versionResult);
+      const activeVersion = parseCliVersionFromOutput(stdout);
+      if (!activeVersion) {
+        s.stop("Verification failed");
+        const message = `Update completed but could not parse 'ck --version' output.
+Please restart your terminal and run 'ck --version'. Expected: ${targetVersion}
+
+Manual update: ${redactCommandForLog(updateCmd)}`;
+        logger.error(message);
+        throw new CliUpdateError(message);
+      }
+      s.stop(`Installed version: ${activeVersion}`);
+      if (activeVersion !== targetVersion) {
+        const mismatchMessage = `Update did not activate the requested version.
+Expected: ${targetVersion}
+Active ck: ${activeVersion}
+
+Likely causes: multiple global installations (npm/bun/pnpm/yarn) or stale shell shim/cache (common on Windows).
+Run '${redactCommandForLog(updateCmd)}' manually, restart terminal, then check command resolution:
+- Windows: where ck
+- macOS/Linux: which -a ck`;
+        logger.error(mismatchMessage);
+        throw new CliUpdateError(mismatchMessage);
+      }
+      outro(`[+] Successfully updated ClaudeKit CLI to ${activeVersion}`);
+      await promptKitUpdateFn(opts.dev || opts.beta, opts.yes);
+    } catch (error) {
+      if (error instanceof CliUpdateError) {
+        throw error;
+      }
+      s.stop("Verification failed");
+      const message = `Update completed but automatic verification failed.
+Please restart your terminal and run 'ck --version'. Expected: ${targetVersion}
+
+Manual update: ${redactCommandForLog(updateCmd)}`;
+      logger.error(message);
+      throw new CliUpdateError(message);
     }
   } catch (error) {
     if (error instanceof CliUpdateError) {
@@ -82907,7 +82969,7 @@ import { join as join89 } from "node:path";
 
 // src/domains/installation/deletion-handler.ts
 import { existsSync as existsSync48, lstatSync as lstatSync3, readdirSync as readdirSync3, rmSync as rmSync2, rmdirSync, unlinkSync as unlinkSync3 } from "node:fs";
-import { dirname as dirname18, join as join76, relative as relative10, resolve as resolve17, sep as sep4 } from "node:path";
+import { dirname as dirname18, join as join76, relative as relative10, resolve as resolve17, sep as sep3 } from "node:path";
 
 // src/services/file-operations/manifest/manifest-reader.ts
 init_metadata_migration();
@@ -83146,7 +83208,7 @@ function cleanupEmptyDirectories(filePath, claudeDir2) {
 function deletePath(fullPath, claudeDir2) {
   const normalizedPath = resolve17(fullPath);
   const normalizedClaudeDir = resolve17(claudeDir2);
-  if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep4}`) && normalizedPath !== normalizedClaudeDir) {
+  if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep3}`) && normalizedPath !== normalizedClaudeDir) {
     throw new Error(`Path traversal detected: ${fullPath}`);
   }
   try {
@@ -83220,7 +83282,7 @@ async function handleDeletions(sourceMetadata, claudeDir2) {
     const fullPath = join76(claudeDir2, path13);
     const normalizedPath = resolve17(fullPath);
     const normalizedClaudeDir = resolve17(claudeDir2);
-    if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep4}`)) {
+    if (!normalizedPath.startsWith(`${normalizedClaudeDir}${sep3}`)) {
       logger.warning(`Skipping invalid path: ${path13}`);
       result.errors.push(path13);
       continue;
@@ -84243,8 +84305,8 @@ var path13 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep5 = defaultPlatform === "win32" ? path13.win32.sep : path13.posix.sep;
-minimatch.sep = sep5;
+var sep4 = defaultPlatform === "win32" ? path13.win32.sep : path13.posix.sep;
+minimatch.sep = sep4;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
 var qmark2 = "[^/]";
@@ -90650,8 +90712,7 @@ async function migrateCommand(options2) {
           value: a3,
           label: providers[a3].displayName
         })),
-        required: true,
-        initialValues: detectedProviders
+        required: true
       });
       if (lD(selected)) {
         ue("Migrate cancelled");
@@ -92372,7 +92433,7 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync6, rmSync as rmSync5 } from "node:fs";
-import { join as join111, resolve as resolve25, sep as sep6 } from "node:path";
+import { join as join111, resolve as resolve25, sep as sep5 } from "node:path";
 init_logger();
 init_safe_prompts();
 init_safe_spinner();
@@ -92515,7 +92576,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
   try {
     const resolvedPath = resolve25(filePath);
     const resolvedBase = resolve25(baseDir);
-    if (!resolvedPath.startsWith(resolvedBase + sep6) && resolvedPath !== resolvedBase) {
+    if (!resolvedPath.startsWith(resolvedBase + sep5) && resolvedPath !== resolvedBase) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
     }
@@ -92523,7 +92584,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
     if (stats.isSymbolicLink()) {
       const realPath = await import_fs_extra37.realpath(filePath);
       const resolvedReal = resolve25(realPath);
-      if (!resolvedReal.startsWith(resolvedBase + sep6) && resolvedReal !== resolvedBase) {
+      if (!resolvedReal.startsWith(resolvedBase + sep5) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
         return false;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.35.0-dev.27",
+	"version": "3.35.0-dev.29",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {