claudekit-cli 3.42.2-dev.5 → 3.42.2-dev.7

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "3.42.2-dev.5",
-	"generatedAt": "2026-04-30T19:53:41.311Z",
+	"version": "3.42.2-dev.7",
+	"generatedAt": "2026-05-04T15:29:19.209Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -43804,6 +43804,26 @@ function repairClaudeNodeCommandPath(cmd, root) {
     const command = formatCanonicalClaudeCommand(nodePrefix, root, relativePath, suffix);
     return { command, changed: command !== cmd, issue: "invalid-format" };
   }
+  const absoluteMatch = cmd.match(/^(node\s+)"((?:[A-Za-z]:[/\\]|\/)[^"]*?[/\\]\.claude[/\\][^"]+)"(.*)$/) ?? cmd.match(/^(node\s+)((?:[A-Za-z]:[\\/]|\/)[^\s"]*?[\\/]\.claude[\\/][^\s"]+)(.*)$/);
+  if (absoluteMatch) {
+    const [, nodePrefix, absolutePath, suffix] = absoluteMatch;
+    const normalizedAbsPath = absolutePath.replace(/\\/g, "/");
+    const dotClaudeIdx = normalizedAbsPath.indexOf("/.claude/");
+    if (dotClaudeIdx === -1) {
+      return { command: cmd, changed: false, issue: null };
+    }
+    const isWin2 = process.platform === "win32";
+    const cmp = (s) => isWin2 ? s.toLowerCase() : s;
+    const globalRoots = [
+      `${homedir11().replace(/\\/g, "/").replace(/\/+$/, "")}/.claude/`,
+      `${PathResolver.getGlobalKitDir().replace(/\\/g, "/").replace(/\/+$/, "")}/`
+    ];
+    const isUnderGlobal = globalRoots.some((g2) => cmp(normalizedAbsPath).startsWith(cmp(g2)));
+    const resolvedRoot = isUnderGlobal ? "$HOME" : root;
+    const relativePath = normalizedAbsPath.slice(dotClaudeIdx + 1);
+    const command = formatCanonicalClaudeCommand(nodePrefix, resolvedRoot, relativePath, suffix);
+    return { command, changed: command !== cmd, issue: "invalid-format" };
+  }
   return { command: cmd, changed: false, issue: null };
 }
 function normalizeCommand(cmd) {
@@ -62369,7 +62389,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.42.2-dev.5",
+    version: "3.42.2-dev.7",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -86203,6 +86223,20 @@ import { join as join86, resolve as resolve31 } from "node:path";
 var HOOK_CHECK_TIMEOUT_MS = 5000;
 var PYTHON_CHECK_TIMEOUT_MS = 3000;
 var MAX_LOG_FILE_SIZE_BYTES = 10 * 1024 * 1024;
+
+class FixerDidNotConvergeError extends Error {
+  unresolved;
+  constructor(unresolved) {
+    const lines = unresolved.map((f3) => `  ${f3.label} :: ${f3.eventName} :: ${f3.command}`).join(`
+`);
+    super(`ck doctor --fix: fixer did not converge — ${unresolved.length} stale hook command path(s) remain after repair:
+${lines}
+
+This is a bug. Please open an issue at https://github.com/mrgoonie/claudekit-cli`);
+    this.name = "FixerDidNotConvergeError";
+    this.unresolved = unresolved;
+  }
+}
 function getHooksDir(projectDir) {
   const projectHooksDir = resolve31(projectDir, ".claude", "hooks");
   const globalHooksDir = resolve31(PathResolver.getGlobalKitDir(), "hooks");
@@ -86296,13 +86330,18 @@ async function repairHookCommandsInSettingsFile(settingsFile) {
   if (!settings?.hooks) {
     return 0;
   }
+  const findings = collectHookCommandFindings(settings, settingsFile);
+  if (findings.length === 0) {
+    return 0;
+  }
+  const repairMap = new Map(findings.map((f3) => [f3.command, f3.expected]));
   let repaired = 0;
   for (const entries of Object.values(settings.hooks)) {
     for (const entry of entries) {
       if ("command" in entry && typeof entry.command === "string") {
-        const repair = repairClaudeNodeCommandPath(entry.command, settingsFile.root);
-        if (repair.changed) {
-          entry.command = repair.command;
+        const fixed = repairMap.get(entry.command);
+        if (fixed !== undefined) {
+          entry.command = fixed;
           repaired++;
         }
       }
@@ -86313,9 +86352,9 @@ async function repairHookCommandsInSettingsFile(settingsFile) {
         if (!hook.command) {
           continue;
         }
-        const repair = repairClaudeNodeCommandPath(hook.command, settingsFile.root);
-        if (repair.changed) {
-          hook.command = repair.command;
+        const fixed = repairMap.get(hook.command);
+        if (fixed !== undefined) {
+          hook.command = fixed;
           repaired++;
         }
       }
@@ -86324,6 +86363,10 @@ async function repairHookCommandsInSettingsFile(settingsFile) {
   if (repaired > 0) {
     await SettingsMerger.writeSettingsFile(settingsFile.path, settings);
   }
+  const remaining = collectHookCommandFindings(settings, settingsFile);
+  if (remaining.length > 0) {
+    throw new FixerDidNotConvergeError(remaining);
+  }
   return repaired;
 }
 async function checkHookSyntax(projectDir) {
@@ -104868,24 +104911,63 @@ import { mkdir as mkdir34 } from "node:fs/promises";
 import { join as join135, resolve as resolve38 } from "node:path";
 
 // src/domains/github/kit-access-checker.ts
+init_error2();
 init_logger();
 init_safe_spinner();
 init_types3();
+init_types3();
 init_github_client();
+function toGitHubError(error) {
+  if (error instanceof GitHubError) {
+    return error;
+  }
+  const classified = classifyGitHubError(error, "check repository access");
+  const actions = suggestActions(classified.category);
+  const formattedActions = formatActions(actions);
+  const messageParts = [classified.message];
+  if (classified.details) {
+    messageParts.push(`
+${classified.details}`);
+  }
+  if (formattedActions) {
+    messageParts.push(`
+Solutions:${formattedActions}`);
+  }
+  messageParts.push(`
+Need help? Run with: ck new --verbose`);
+  return new GitHubError(messageParts.join(`
+`), classified.httpStatus);
+}
 async function detectAccessibleKits() {
   const spinner = createSpinner("Checking kit access...").start();
   const github = new GitHubClient;
-  const results = await Promise.all(Object.entries(AVAILABLE_KITS).map(async ([type, config]) => {
-    try {
-      await github.checkAccess(config);
-      logger.debug(`Access confirmed: ${type}`);
-      return type;
-    } catch {
-      logger.debug(`No access to ${type}`);
-      return null;
-    }
+  const settled = await Promise.allSettled(Object.entries(AVAILABLE_KITS).map(async ([type, config]) => {
+    await github.checkAccess(config);
+    logger.debug(`Access confirmed: ${type}`);
+    return type;
   }));
-  const accessible = results.filter((kit) => kit !== null);
+  const accessible = [];
+  const fatalErrors = [];
+  for (const result of settled) {
+    if (result.status === "fulfilled") {
+      accessible.push(result.value);
+    } else {
+      const err = result.reason;
+      const status = err?.statusCode ?? err?.status;
+      if (status === 404) {
+        logger.debug("No access to kit (404)");
+      } else {
+        fatalErrors.push(toGitHubError(err));
+      }
+    }
+  }
+  if (fatalErrors.length > 0) {
+    spinner.fail("Kit access check failed");
+    for (const extra of fatalErrors.slice(1)) {
+      logger.debug(`Additional kit access error (suppressed): ${extra.message}`);
+    }
+    throw fatalErrors[0];
+  }
   if (accessible.length === 0) {
     spinner.fail("No kit access found");
   } else {

package/package.json

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