claudekit-cli 4.4.0-dev.8 → 4.4.0-dev.9

package/cli-manifest.json

@@ -1,6 +1,6 @@
 {
-	"version": "4.4.0-dev.8",
-	"generatedAt": "2026-06-09T18:06:36.611Z",
+	"version": "4.4.0-dev.9",
+	"generatedAt": "2026-06-10T04:10:27.534Z",
 	"commands": {
 		"agents": {
 			"name": "agents",

package/dist/index.js

@@ -54841,6 +54841,7 @@ function rewriteCommandPath(command, pathRewrite) {
   if (pathRewrite.commandSubstitutions && pathRewrite.commandSubstitutions.size > 0) {
     const home3 = homedir25();
     const homeForward = normalizeSlashes(home3);
+    const projectDirForward = pathRewrite.projectDir ? normalizeSlashes(pathRewrite.projectDir) : null;
     for (const [originalAbsPath, wrapperAbsPath] of pathRewrite.commandSubstitutions) {
       const originalAbsForward = normalizeSlashes(originalAbsPath);
       let relFromHome = null;
@@ -54849,34 +54850,84 @@ function rewriteCommandPath(command, pathRewrite) {
       } else if (originalAbsForward === homeForward) {
         relFromHome = "";
       }
+      let relFromProject = null;
+      if (projectDirForward !== null) {
+        if (originalAbsForward.startsWith(`${projectDirForward}/`)) {
+          relFromProject = originalAbsForward.slice(projectDirForward.length + 1);
+        } else if (originalAbsForward === projectDirForward) {
+          relFromProject = "";
+        }
+      }
+      const wrapperForward = normalizeSlashes(wrapperAbsPath);
       const candidates = [
-        originalAbsForward,
-        originalAbsPath
+        { text: originalAbsForward, replacement: wrapperForward },
+        { text: originalAbsPath, replacement: wrapperForward }
       ];
       if (relFromHome !== null && relFromHome !== "") {
-        candidates.push(`$HOME/${relFromHome}`);
-        candidates.push(`~/${relFromHome}`);
-        candidates.push(`%USERPROFILE%/${relFromHome}`);
-        candidates.push(`\${HOME}/${relFromHome}`);
+        candidates.push({ text: `$HOME/${relFromHome}`, replacement: wrapperForward });
+        candidates.push({ text: `~/${relFromHome}`, replacement: wrapperForward });
+        candidates.push({ text: `%USERPROFILE%/${relFromHome}`, replacement: wrapperForward });
+        candidates.push({ text: `\${HOME}/${relFromHome}`, replacement: wrapperForward });
+      }
+      if (relFromProject !== null && relFromProject !== "") {
+        candidates.push({
+          text: `"$CLAUDE_PROJECT_DIR/${relFromProject}"`,
+          replacement: `"${wrapperForward}"`
+        });
+        candidates.push({
+          text: `"$CLAUDE_PROJECT_DIR"/${relFromProject}`,
+          replacement: `"${wrapperForward}"`
+        });
+        candidates.push({
+          text: `"\${CLAUDE_PROJECT_DIR}"/${relFromProject}`,
+          replacement: `"${wrapperForward}"`
+        });
+        candidates.push({
+          text: `"%CLAUDE_PROJECT_DIR%"/${relFromProject}`,
+          replacement: `"${wrapperForward}"`
+        });
+        candidates.push({
+          text: `\${CLAUDE_PROJECT_DIR}/${relFromProject}`,
+          replacement: wrapperForward
+        });
+        candidates.push({
+          text: `$CLAUDE_PROJECT_DIR/${relFromProject}`,
+          replacement: wrapperForward
+        });
+        candidates.push({
+          text: `%CLAUDE_PROJECT_DIR%/${relFromProject}`,
+          replacement: `"${wrapperForward}"`
+        });
       }
-      const wrapperForward = normalizeSlashes(wrapperAbsPath);
-      for (const candidate of candidates) {
-        const candidateNorm = normalizeSlashes(candidate);
+      for (const { text, replacement } of candidates) {
+        const candidateNorm = normalizeSlashes(text);
         const rewrittenNorm = normalizeSlashes(rewritten);
         if (rewrittenNorm.includes(candidateNorm)) {
-          rewritten = replaceCommandCandidate(rewrittenNorm, candidateNorm, wrapperForward);
+          rewritten = replaceCommandCandidate(rewrittenNorm, candidateNorm, replacement);
         }
       }
     }
   }
   const src = normalizeSlashes(pathRewrite.sourceDir.endsWith("/") || pathRewrite.sourceDir.endsWith("\\") ? pathRewrite.sourceDir : `${pathRewrite.sourceDir}/`);
   const tgt = normalizeSlashes(pathRewrite.targetDir.endsWith("/") || pathRewrite.targetDir.endsWith("\\") ? pathRewrite.targetDir : `${pathRewrite.targetDir}/`);
-  if (src === tgt)
-    return rewritten;
-  const normalizedRewritten = normalizeSlashes(rewritten);
-  if (!normalizedRewritten.includes(src))
-    return rewritten;
-  return normalizedRewritten.replaceAll(src, tgt);
+  if (src !== tgt) {
+    const normalizedRewritten = normalizeSlashes(rewritten);
+    if (normalizedRewritten.includes(src)) {
+      rewritten = normalizedRewritten.replaceAll(src, tgt);
+    }
+  }
+  if (pathRewrite.projectDir) {
+    const pd = normalizeSlashes(pathRewrite.projectDir);
+    rewritten = rewritten.replace(/"(\$CLAUDE_PROJECT_DIR)(\/[^"]+)"/g, (_match, _varRef, suffix) => `"${pd}${suffix}"`);
+    rewritten = rewritten.replace(/"(\$CLAUDE_PROJECT_DIR)"(\/[^\s"';&|()]*)?/g, (_match, _varRef, suffix) => `"${pd}${suffix ?? ""}"`);
+    rewritten = rewritten.replace(/"\$\{CLAUDE_PROJECT_DIR\}"(\/[^\s"';&|()]*)?/g, (_match, suffix) => `"${pd}${suffix ?? ""}"`);
+    rewritten = rewritten.replace(/\$\{CLAUDE_PROJECT_DIR\}(\/[^\s"';&|()]*)?/g, (_match, suffix) => `"${pd}${suffix ?? ""}"`);
+    rewritten = rewritten.replace(/"%CLAUDE_PROJECT_DIR%(\/[^"]+)"/g, (_match, suffix) => `"${pd}${suffix}"`);
+    rewritten = rewritten.replace(/"%CLAUDE_PROJECT_DIR%"(\/[^\s"';&|()]*)?/g, (_match, suffix) => `"${pd}${suffix ?? ""}"`);
+    rewritten = rewritten.replace(/%CLAUDE_PROJECT_DIR%(\/[^\s"';&|()]*)?(?=[\s"']|$)/g, (_match, suffix) => `"${pd}${suffix ?? ""}"`);
+    rewritten = rewritten.replace(/\$CLAUDE_PROJECT_DIR(?![A-Za-z0-9_])(\/[^\s"';&|()]*)?/g, (_match, suffix) => `"${pd}${suffix ?? ""}"`);
+  }
+  return rewritten;
 }
 function replaceCommandCandidate(command, candidate, replacement) {
   if (!isRelativeCommandCandidate(candidate)) {
@@ -54886,7 +54937,7 @@ function replaceCommandCandidate(command, candidate, replacement) {
   return command.replace(pattern, (_match, prefix) => `${prefix}${replacement}`);
 }
 function isRelativeCommandCandidate(candidate) {
-  return !candidate.startsWith("/") && !candidate.startsWith("$HOME/") && !candidate.startsWith("~/");
+  return !candidate.startsWith("/") && !candidate.startsWith("$HOME/") && !candidate.startsWith("~/") && !candidate.startsWith('"') && !candidate.startsWith("$CLAUDE_PROJECT_DIR") && !candidate.startsWith("${CLAUDE_PROJECT_DIR}") && !candidate.startsWith("%CLAUDE_PROJECT_DIR%");
 }
 function escapeRegExp2(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -55115,7 +55166,8 @@ async function mergeHooksIntoSettings(targetSettingsPath, newHooks, options2 = {
   }
   const existingHooks = existingSettings.hooks ?? {};
   const incompatibleCleanup = pruneIncompatibleHookRegistrations(existingHooks, options2);
-  const pruned = pruneStaleFileHooks(incompatibleCleanup.hooks);
+  const brokenCleanup = pruneVariableTokenBrokenEntries(incompatibleCleanup.hooks, options2);
+  const pruned = pruneStaleFileHooks(brokenCleanup.hooks);
   const merged = deduplicateMerge(pruned, newHooks);
   existingSettings.hooks = merged;
   const dir = dirname16(targetSettingsPath);
@@ -55128,7 +55180,10 @@ async function mergeHooksIntoSettings(targetSettingsPath, newHooks, options2 = {
     await rm6(tempPath, { force: true });
     throw new Error(`Failed to write settings: ${err}. Backup preserved at: ${backupPath}`);
   }
-  return { backupPath, hooksPruned: incompatibleCleanup.hooksPruned };
+  return {
+    backupPath,
+    hooksPruned: incompatibleCleanup.hooksPruned + brokenCleanup.hooksPruned
+  };
 }
 function pruneIncompatibleHookRegistrations(hooks, options2) {
   if (options2.targetProvider !== "codex")
@@ -55157,6 +55212,32 @@ function pruneIncompatibleHookRegistrations(hooks, options2) {
   }
   return { hooks: pruned, hooksPruned };
 }
+function pruneVariableTokenBrokenEntries(hooks, options2) {
+  if (options2.targetProvider !== "codex")
+    return { hooks, hooksPruned: 0 };
+  const varPattern = /\$\{?CLAUDE_PROJECT_DIR\}?|%CLAUDE_PROJECT_DIR%/;
+  const ckHookDirPattern = /\.claude\/hooks\/|\.codex\/hooks\//;
+  let hooksPruned = 0;
+  const result = {};
+  for (const [event, groups] of Object.entries(hooks)) {
+    const keptGroups = [];
+    for (const group of groups) {
+      const keptHooks = group.hooks.filter((entry) => {
+        const cmd = entry.command;
+        if (varPattern.test(cmd) && ckHookDirPattern.test(cmd)) {
+          hooksPruned += 1;
+          return false;
+        }
+        return true;
+      });
+      if (keptHooks.length > 0)
+        keptGroups.push({ ...group, hooks: keptHooks });
+    }
+    if (keptGroups.length > 0)
+      result[event] = keptGroups;
+  }
+  return { hooks: result, hooksPruned };
+}
 function commandTargetsHookDir(command, targetHooksDir) {
   const normalizedCommand = command.replace(/\\/g, "/");
   const normalizedDir = targetHooksDir.replace(/\\/g, "/").replace(/\/+$/, "");
@@ -55423,6 +55504,7 @@ async function migrateHooksSettingsForCodex(options2) {
   }
   const resolvedSourcePath = isGlobal ? sourceSettingsPath : join44(process.cwd(), sourceSettingsPath);
   const resolvedTargetPath = isGlobal ? targetSettingsPath : join44(process.cwd(), targetSettingsPath);
+  const projectDir = isGlobal ? undefined : process.cwd();
   const sourceHooksResult = await inspectHooksSettings(resolvedSourcePath);
   if (sourceHooksResult.status === "missing-file") {
     return {
@@ -55538,7 +55620,8 @@ async function migrateHooksSettingsForCodex(options2) {
   const converted = convertClaudeHooksToCodex(filtered, capabilities, {
     sourceDir: sourceHooksDir,
     targetDir: effectiveTargetDir,
-    commandSubstitutions: commandSubstitutions.size > 0 ? commandSubstitutions : undefined
+    commandSubstitutions: commandSubstitutions.size > 0 ? commandSubstitutions : undefined,
+    projectDir
   });
   let hooksRegistered = 0;
   for (const groups of Object.values(converted)) {
@@ -63859,7 +63942,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "claudekit-cli",
-    version: "4.4.0-dev.8",
+    version: "4.4.0-dev.9",
     description: "CLI tool for bootstrapping and updating ClaudeKit projects",
     type: "module",
     repository: {

package/package.json

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