claudekit-cli 3.34.2 → 3.34.4

package/dist/index.js

@@ -33805,14 +33805,11 @@ function normalizeCommand(cmd) {
   if (!cmd)
     return "";
   let normalized = cmd;
-  normalized = normalized.replace(/"\$HOME"/g, "$HOME");
-  normalized = normalized.replace(/"\$CLAUDE_PROJECT_DIR"/g, "$HOME");
-  normalized = normalized.replace(/"\$\{HOME\}"/g, "$HOME");
+  normalized = normalized.replace(/"/g, "");
+  normalized = normalized.replace(/~\//g, "$HOME/");
   normalized = normalized.replace(/\$CLAUDE_PROJECT_DIR/g, "$HOME");
   normalized = normalized.replace(/\$\{HOME\}/g, "$HOME");
-  normalized = normalized.replace(/"%USERPROFILE%"/g, "$HOME");
   normalized = normalized.replace(/%USERPROFILE%/g, "$HOME");
-  normalized = normalized.replace(/"%CLAUDE_PROJECT_DIR%"/g, "$HOME");
   normalized = normalized.replace(/%CLAUDE_PROJECT_DIR%/g, "$HOME");
   normalized = normalized.replace(/\\/g, "/");
   normalized = normalized.replace(/\s+/g, " ").trim();
@@ -45385,7 +45382,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "3.34.2",
+    version: "3.34.4",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {
@@ -58215,7 +58212,7 @@ var init_init_command_help = __esm(() => {
           },
           {
             flags: "--fresh",
-            description: "Remove ClaudeKit directories (commands/, agents/, skills/, rules/, hooks/) and reinstall"
+            description: "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch"
           }
         ]
       },
@@ -76097,7 +76094,6 @@ class InstalledSettingsTracker {
 
 // src/domains/installation/merger/settings-processor.ts
 init_settings_merger();
-init_environment();
 init_logger();
 var import_fs_extra11 = __toESM(require_lib3(), 1);
 
@@ -76135,13 +76131,13 @@ class SettingsProcessor {
       const sourceContent = await import_fs_extra11.readFile(sourceFile, "utf-8");
       let transformedSource = sourceContent;
       if (this.isGlobal) {
-        const homeVar = isWindows() ? '"%USERPROFILE%"' : '"$HOME"';
+        const homeVar = '"$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 = isWindows() ? '"%CLAUDE_PROJECT_DIR%"' : '"$CLAUDE_PROJECT_DIR"';
+        const projectDirVar = '"$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`);
@@ -76151,18 +76147,25 @@ class SettingsProcessor {
       if (destExists && !this.forceOverwriteSettings) {
         await this.selectiveMergeSettings(transformedSource, destFile);
       } else {
-        const formattedContent = this.formatJsonContent(transformedSource);
-        await import_fs_extra11.writeFile(destFile, formattedContent, "utf-8");
         try {
-          const parsedSettings = JSON.parse(formattedContent);
-          if (this.forceOverwriteSettings && destExists) {
-            logger.debug("Force overwrite enabled, replaced settings.json completely");
-            if (this.tracker) {
-              await this.tracker.clearTracking();
+          const parsedSettings = JSON.parse(transformedSource);
+          this.fixHookCommandPaths(parsedSettings);
+          await SettingsMerger.writeSettingsFile(destFile, parsedSettings);
+          try {
+            if (this.forceOverwriteSettings && destExists) {
+              logger.debug("Force overwrite enabled, replaced settings.json completely");
+              if (this.tracker) {
+                await this.tracker.clearTracking();
+              }
             }
+            await this.trackInstalledSettings(parsedSettings);
+          } catch {
+            logger.debug("Settings tracking failed (non-fatal)");
           }
-          await this.trackInstalledSettings(parsedSettings);
-        } catch {}
+        } catch {
+          const formattedContent = this.formatJsonContent(transformedSource);
+          await import_fs_extra11.writeFile(destFile, formattedContent, "utf-8");
+        }
       }
     } catch (error) {
       logger.error(`Failed to process settings.json: ${error}`);
@@ -76222,6 +76225,10 @@ class SettingsProcessor {
       }
       await this.tracker.saveInstalledSettings(installedSettings);
     }
+    const pathsFixed = this.fixHookCommandPaths(mergeResult.merged);
+    if (pathsFixed) {
+      logger.info("Fixed hook command paths to canonical quoted format");
+    }
     await SettingsMerger.writeSettingsFile(destFile, mergeResult.merged);
     logger.success("Merged settings.json (user customizations preserved)");
   }
@@ -76306,12 +76313,14 @@ class SettingsProcessor {
       const content = await import_fs_extra11.readFile(destFile, "utf-8");
       if (!content.trim())
         return null;
-      const homeVar = isWindows() ? "%USERPROFILE%" : "$HOME";
+      const homeVar = "$HOME";
       let normalized = content;
       normalized = normalized.replace(/"\$CLAUDE_PROJECT_DIR"/g, `"${homeVar}"`);
       normalized = normalized.replace(/\$CLAUDE_PROJECT_DIR/g, homeVar);
       normalized = normalized.replace(/"%CLAUDE_PROJECT_DIR%"/g, `"${homeVar}"`);
       normalized = normalized.replace(/%CLAUDE_PROJECT_DIR%/g, homeVar);
+      normalized = normalized.replace(/"%USERPROFILE%"/g, `"${homeVar}"`);
+      normalized = normalized.replace(/%USERPROFILE%/g, homeVar);
       if (normalized !== content) {
         logger.debug("Normalized $CLAUDE_PROJECT_DIR paths to $HOME in existing global settings");
       }
@@ -76326,15 +76335,85 @@ class SettingsProcessor {
       throw new Error("Settings file contains potentially unsafe path characters");
     }
     let transformed = content;
-    const jsonSafePrefix = prefix.includes('"') ? prefix.replace(/"/g, "\\\"") : prefix;
     const rawPrefix = prefix.replace(/"/g, "");
-    transformed = transformed.replace(/(node\s+)(?:\.\/)?\.claude\//g, `$1${jsonSafePrefix}/.claude/`);
+    transformed = transformed.replace(/(node\s+)(?:\.\/)?(\.claude\/[^\s"\\]+)/g, `$1\\"${rawPrefix}/$2\\"`);
     if (rawPrefix.includes("HOME") || rawPrefix.includes("USERPROFILE")) {
       transformed = transformed.replace(/\$CLAUDE_PROJECT_DIR/g, rawPrefix);
       transformed = transformed.replace(/%CLAUDE_PROJECT_DIR%/g, rawPrefix);
     }
     return transformed;
   }
+  fixHookCommandPaths(settings) {
+    let fixed = false;
+    if (settings.hooks) {
+      for (const entries of Object.values(settings.hooks)) {
+        for (const entry of entries) {
+          if ("command" in entry && entry.command) {
+            const result = this.fixSingleCommandPath(entry.command);
+            if (result !== entry.command) {
+              entry.command = result;
+              fixed = true;
+            }
+          }
+          if ("hooks" in entry && entry.hooks) {
+            for (const hook of entry.hooks) {
+              if (hook.command) {
+                const result = this.fixSingleCommandPath(hook.command);
+                if (result !== hook.command) {
+                  hook.command = result;
+                  fixed = true;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    const statusLine = settings.statusLine;
+    if (statusLine?.command) {
+      const result = this.fixSingleCommandPath(statusLine.command);
+      if (result !== statusLine.command) {
+        statusLine.command = result;
+        fixed = true;
+      }
+    }
+    return fixed;
+  }
+  fixSingleCommandPath(cmd) {
+    if (!cmd.includes(".claude/") && !cmd.includes(".claude\\"))
+      return cmd;
+    const varOnlyQuotingRe = /^(node\s+)"(\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)"[/\\](.+)$/;
+    const varOnlyMatch = cmd.match(varOnlyQuotingRe);
+    if (varOnlyMatch) {
+      const [, nodePrefix, capturedVar, restPath] = varOnlyMatch;
+      const canonicalVar = this.canonicalizePathVar(capturedVar);
+      return `${nodePrefix}"${canonicalVar}/${restPath.replace(/\\/g, "/")}"`;
+    }
+    const tildeRe = /^(node\s+)~[/\\](.+)$/;
+    const tildeMatch = cmd.match(tildeRe);
+    if (tildeMatch) {
+      const [, nodePrefix, restPath] = tildeMatch;
+      return `${nodePrefix}"$HOME/${restPath.replace(/\\/g, "/")}"`;
+    }
+    const unquotedRe = /^(node\s+)(\$HOME|\$CLAUDE_PROJECT_DIR|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)[/\\](.+)$/;
+    const unquotedMatch = cmd.match(unquotedRe);
+    if (unquotedMatch) {
+      const [, nodePrefix, capturedVar, restPath] = unquotedMatch;
+      const canonicalVar = this.canonicalizePathVar(capturedVar);
+      return `${nodePrefix}"${canonicalVar}/${restPath.replace(/\\/g, "/")}"`;
+    }
+    return cmd;
+  }
+  canonicalizePathVar(capturedVar) {
+    switch (capturedVar) {
+      case "%USERPROFILE%":
+        return "$HOME";
+      case "%CLAUDE_PROJECT_DIR%":
+        return "$CLAUDE_PROJECT_DIR";
+      default:
+        return capturedVar;
+    }
+  }
 }
 
 // src/domains/installation/merger/copy-executor.ts
@@ -79289,6 +79368,10 @@ Please use only one download method.`);
   if (validOptions.useGit && validOptions.beta) {
     logger.warning("--beta flag is ignored when using --use-git (version already specified via --release)");
   }
+  if (validOptions.fresh && !validOptions.forceOverwriteSettings) {
+    validOptions.forceOverwriteSettings = true;
+    logger.debug("--fresh: auto-enabling settings.json full replace");
+  }
   if (validOptions.fresh && validOptions.sync) {
     throw new Error(`--fresh and --sync are mutually exclusive.
 
@@ -79322,9 +79405,9 @@ async function handlePostInstall(ctx) {
     const claudeMdSource = join88(ctx.extractDir, "CLAUDE.md");
     const claudeMdDest = join88(ctx.resolvedDir, "CLAUDE.md");
     if (await import_fs_extra30.pathExists(claudeMdSource)) {
-      if (!await import_fs_extra30.pathExists(claudeMdDest)) {
+      if (ctx.options.fresh || !await import_fs_extra30.pathExists(claudeMdDest)) {
         await import_fs_extra30.copy(claudeMdSource, claudeMdDest);
-        logger.success("Copied CLAUDE.md to global directory");
+        logger.success(ctx.options.fresh ? "Replaced CLAUDE.md in global directory (fresh install)" : "Copied CLAUDE.md to global directory");
       } else {
         logger.debug("CLAUDE.md already exists in global directory (preserved)");
       }
@@ -82932,7 +83015,7 @@ function registerCommands(cli) {
     }
     await newCommand(options2);
   });
-  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "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)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
+  cli.command("init", "Initialize or update ClaudeKit project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit to use: engineer, marketing, all, or comma-separated").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--only <pattern>", "Include only files matching glob pattern (can be used multiple times)").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove CK files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--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)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "claudekit-cli",
-	"version": "3.34.2",
+	"version": "3.34.4",
 	"description": "CLI tool for bootstrapping and updating ClaudeKit projects",
 	"type": "module",
 	"repository": {