@sunasteriskrnd/takumi 1.0.0-dev.25 → 1.0.0-dev.27

package/dist/index.js

@@ -8539,7 +8539,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@sunasteriskrnd/takumi",
-    version: "1.0.0-dev.25",
+    version: "1.0.0-dev.27",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -11227,7 +11227,7 @@ function normalizeTakumiConfigInput(value) {
   }
   return normalized;
 }
-var PlanValidationModeSchema, PlanFocusAreaSchema, PlanResolutionOrderSchema, ProjectTypeSchema, PackageManagerSchema, FrameworkSchema, GEMINI_MODEL_VALUES, LEGACY_GEMINI_MODEL_ALIASES, GeminiModelSchema, StatuslineModeSchema, StatuslineSectionIdSchema, StatuslineSectionConfigSchema, StatuslineThemeSchema, StatuslineLayoutSchema, CodingLevelSchema, PlanResolutionSchema, PlanValidationSchema, SkPlanConfigSchema, SkDocsConfigSchema, SkPathsConfigSchema, SkLocaleConfigSchema, SkTrustConfigSchema, SkProjectConfigSchema, SkGeminiConfigSchema, SkSkillsConfigSchema, UpdatePipelineSchema, ResolvedModelConfigSchema, ModelTierMapSchema, SkModelTaxonomySchema, SkAssertionSchema, SkHooksConfigSchema, TakumiConfigSchema, DEFAULT_TAKUMI_CONFIG, TAKUMI_HOOK_NAMES;
+var PlanValidationModeSchema, PlanFocusAreaSchema, PlanResolutionOrderSchema, ProjectTypeSchema, PackageManagerSchema, FrameworkSchema, GEMINI_MODEL_VALUES, LEGACY_GEMINI_MODEL_ALIASES, GeminiModelSchema, StatuslineModeSchema, StatuslineSectionIdSchema, StatuslineSectionConfigSchema, StatuslineThemeSchema, StatuslineLayoutSchema, CodingLevelSchema, PlanResolutionSchema, PlanValidationSchema, SkPlanConfigSchema, SkDocsConfigSchema, SkPathsConfigSchema, SkLocaleConfigSchema, SkTrustConfigSchema, SkGraphifyConfigSchema, SkProjectConfigSchema, SkGeminiConfigSchema, SkSkillsConfigSchema, SkSkillExtensionsConfigSchema, UpdatePipelineSchema, ResolvedModelConfigSchema, ModelTierMapSchema, SkModelTaxonomySchema, SkAssertionSchema, SkHooksConfigSchema, TakumiConfigSchema, DEFAULT_TAKUMI_CONFIG, TAKUMI_HOOK_NAMES;
 var init_takumi_config = __esm(() => {
   init_zod();
   PlanValidationModeSchema = exports_external.enum(["prompt", "auto", "strict", "none"]);
@@ -11349,6 +11349,9 @@ var init_takumi_config = __esm(() => {
     passphrase: exports_external.string().nullable().optional(),
     enabled: exports_external.boolean().optional()
   });
+  SkGraphifyConfigSchema = exports_external.object({
+    enabled: exports_external.boolean().optional()
+  });
   SkProjectConfigSchema = exports_external.object({
     type: ProjectTypeSchema.optional(),
     packageManager: PackageManagerSchema.optional(),
@@ -11362,6 +11365,9 @@ var init_takumi_config = __esm(() => {
       useGemini: exports_external.boolean().optional()
     }).passthrough().optional()
   }).passthrough();
+  SkSkillExtensionsConfigSchema = exports_external.object({
+    sharedDir: exports_external.string().optional()
+  }).passthrough();
   UpdatePipelineSchema = exports_external.object({
     autoInitAfterUpdate: exports_external.boolean().default(false)
   });
@@ -11404,9 +11410,11 @@ var init_takumi_config = __esm(() => {
     paths: SkPathsConfigSchema.optional(),
     locale: SkLocaleConfigSchema.optional(),
     trust: SkTrustConfigSchema.optional(),
+    graphify: SkGraphifyConfigSchema.optional(),
     project: SkProjectConfigSchema.optional(),
     gemini: SkGeminiConfigSchema.optional(),
     skills: SkSkillsConfigSchema.optional(),
+    skillExtensions: SkSkillExtensionsConfigSchema.optional(),
     assertions: exports_external.array(SkAssertionSchema).optional(),
     hooks: SkHooksConfigSchema.optional(),
     updatePipeline: UpdatePipelineSchema.optional(),
@@ -11450,6 +11458,9 @@ var init_takumi_config = __esm(() => {
       passphrase: null,
       enabled: false
     },
+    graphify: {
+      enabled: true
+    },
     project: {
       type: "auto",
       packageManager: "auto",
@@ -11463,6 +11474,9 @@ var init_takumi_config = __esm(() => {
         useGemini: true
       }
     },
+    skillExtensions: {
+      sharedDir: ""
+    },
     assertions: [],
     hooks: {
       "session-init": true,
@@ -13598,6 +13612,7 @@ function globalSetupToInfo(g2) {
   };
 }
 async function getTakumiSetup(projectDir = process.cwd()) {
+  const { getInstaller, listSupportedProviders } = await Promise.resolve().then(() => (init_registry(), exports_registry));
   const globalResults = await Promise.all(listSupportedProviders().map(async (p) => {
     const inst = getInstaller(p);
     return inst ? await inst.detectGlobalSetup() : null;
@@ -13622,7 +13637,6 @@ async function getTakumiSetup(projectDir = process.cwd()) {
 var import_fs_extra5;
 var init_takumi_scanner = __esm(() => {
   init_paths();
-  init_registry();
   init_skip_directories();
   init_manifest_path_resolver();
   import_fs_extra5 = __toESM(require_lib(), 1);
@@ -33539,10 +33553,16 @@ function mergeHooksObject(current, incoming) {
   const merged = deduplicateMerge(existingHooks, incoming);
   return { ...current, hooks: merged };
 }
+function isMalformedHookCommand(command) {
+  return /(\$HOME|\$\{HOME\}|\$CLAUDE_PROJECT_DIR|\$\{CLAUDE_PROJECT_DIR\}|%USERPROFILE%|%CLAUDE_PROJECT_DIR%)\/\//.test(command);
+}
 function deduplicateMerge(existing, incoming) {
   const merged = {};
   for (const [event, groups] of Object.entries(existing)) {
-    merged[event] = groups.map((g2) => ({ ...g2, hooks: [...g2.hooks] }));
+    merged[event] = groups.map((g2) => ({
+      ...g2,
+      hooks: g2.hooks.filter((h2) => !isMalformedHookCommand(h2.command))
+    }));
   }
   for (const [event, incomingGroups] of Object.entries(incoming)) {
     const existingGroups = merged[event] ?? [];
@@ -33562,7 +33582,13 @@ function deduplicateMerge(existing, incoming) {
     }
     merged[event] = existingGroups;
   }
-  return merged;
+  const cleaned = {};
+  for (const [event, groups] of Object.entries(merged)) {
+    const nonEmpty = groups.filter((g2) => g2.hooks.length > 0);
+    if (nonEmpty.length > 0)
+      cleaned[event] = nonEmpty;
+  }
+  return cleaned;
 }
 var init_hooks_settings_merger = __esm(() => {
   init_provider_registry();
@@ -33755,6 +33781,9 @@ function scrubHookEntry(entry, event, capabilities, pathRewrite) {
   if (pathRewrite) {
     scrubbed.command = rewriteCommandPath(scrubbed.command, pathRewrite);
   }
+  if (typeof scrubbed.timeout === "number" && scrubbed.timeout < MIN_CODEX_HOOK_TIMEOUT_SECONDS) {
+    scrubbed.timeout = MIN_CODEX_HOOK_TIMEOUT_SECONDS;
+  }
   const eventCaps = capabilities.events[event];
   if (eventCaps?.permissionDecisionValues) {
     const allowed = new Set(eventCaps.permissionDecisionValues);
@@ -33773,14 +33802,17 @@ function rewriteCommandPath(command, pathRewrite) {
   if (pathRewrite.commandSubstitutions && pathRewrite.commandSubstitutions.size > 0) {
     const home4 = homedir12();
     const homeForward = normalizeSlashes(home4);
+    const projectDirForward = pathRewrite.projectDir != null ? normalizeSlashes(pathRewrite.projectDir) : null;
+    const relFrom = (absForward, baseForward) => {
+      if (absForward.startsWith(`${baseForward}/`))
+        return absForward.slice(baseForward.length + 1);
+      if (absForward === baseForward)
+        return "";
+      return null;
+    };
     for (const [originalAbsPath, wrapperAbsPath] of pathRewrite.commandSubstitutions) {
       const originalAbsForward = normalizeSlashes(originalAbsPath);
-      let relFromHome = null;
-      if (originalAbsForward.startsWith(`${homeForward}/`)) {
-        relFromHome = originalAbsForward.slice(homeForward.length + 1);
-      } else if (originalAbsForward === homeForward) {
-        relFromHome = "";
-      }
+      const relFromHome = relFrom(originalAbsForward, homeForward);
       const candidates = [originalAbsForward, originalAbsPath];
       if (relFromHome !== null && relFromHome !== "") {
         candidates.push(`$HOME/${relFromHome}`);
@@ -33788,6 +33820,12 @@ function rewriteCommandPath(command, pathRewrite) {
         candidates.push(`%USERPROFILE%/${relFromHome}`);
         candidates.push(`\${HOME}/${relFromHome}`);
       }
+      const relFromProject = projectDirForward !== null ? relFrom(originalAbsForward, projectDirForward) : null;
+      if (relFromProject !== null && relFromProject !== "") {
+        candidates.push(`$CLAUDE_PROJECT_DIR/${relFromProject}`);
+        candidates.push(`\${CLAUDE_PROJECT_DIR}/${relFromProject}`);
+        candidates.push(`%CLAUDE_PROJECT_DIR%/${relFromProject}`);
+      }
       const wrapperForward = normalizeSlashes(wrapperAbsPath);
       for (const candidate of candidates) {
         const candidateNorm = normalizeSlashes(candidate);
@@ -33820,6 +33858,7 @@ function isRelativeCommandCandidate(candidate) {
 function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+var MIN_CODEX_HOOK_TIMEOUT_SECONDS = 10;
 var init_claude_to_codex_hooks = () => {};
 
 // src/domains/installers/codex/path-safety.ts
@@ -34371,7 +34410,8 @@ async function migrateCodexHooksSettings(options2) {
   const wrapperPaths = [];
   const commandSubstitutions = new Map;
   if (targetHooksDir) {
-    const absSourceHooksDir = sourceHooksDir ? isAbsolute2(sourceHooksDir) ? sourceHooksDir : resolve12(projectBase, sourceHooksDir) : "";
+    const sourceHooksDirBase = isGlobal ? homedir14() : projectBase;
+    const absSourceHooksDir = sourceHooksDir ? isAbsolute2(sourceHooksDir) ? sourceHooksDir : resolve12(sourceHooksDirBase, sourceHooksDir) : "";
     const absTargetHooksDir = isAbsolute2(targetHooksDir) ? targetHooksDir : resolve12(projectBase, targetHooksDir);
     const targetAbsolutePaths = installedHookAbsolutePaths && installedHookAbsolutePaths.length > 0 ? installedHookAbsolutePaths.filter(isCodexWrappableHookPath) : installedHookFiles.filter(isCodexWrappableHookPath).map((basenameOrPath) => basenameOrPath.includes("/") || basenameOrPath.includes("\\") ? basenameOrPath : join55(absTargetHooksDir, basenameOrPath));
     const wrapperResults = generateCodexHookWrappers(targetAbsolutePaths, absTargetHooksDir, capabilities);
@@ -34395,7 +34435,8 @@ async function migrateCodexHooksSettings(options2) {
   const converted = convertClaudeHooksToCodex(filtered, capabilities, {
     sourceDir: sourceHooksDir,
     targetDir: targetHooksDir || sourceHooksDir,
-    commandSubstitutions: commandSubstitutions.size > 0 ? commandSubstitutions : undefined
+    commandSubstitutions: commandSubstitutions.size > 0 ? commandSubstitutions : undefined,
+    projectDir: isGlobal ? homedir14() : projectBase
   });
   let hooksRegistered = 0;
   for (const groups of Object.values(converted)) {
@@ -34418,7 +34459,7 @@ async function migrateCodexHooksSettings(options2) {
   }
   let backupPath = null;
   try {
-    const mergeResult = await mergeHooksIntoSettings(resolvedTargetPath, converted);
+    const mergeResult = await withCodexTargetLock2(resolvedTargetPath, () => mergeHooksIntoSettings(resolvedTargetPath, converted));
     backupPath = mergeResult.backupPath;
   } catch (err) {
     return {
@@ -34436,7 +34477,13 @@ async function migrateCodexHooksSettings(options2) {
   if (capabilities.requiresFeatureFlag) {
     const configTomlPath = isGlobal ? join55(homedir14(), ".codex", "config.toml") : join55(projectBase, ".codex", "config.toml");
     const flagResult = await ensureCodexHooksFeatureFlag(configTomlPath, isGlobal);
-    featureFlagWritten = flagResult.status === "written" || flagResult.status === "updated";
+    featureFlagWritten = flagResult.status === "written" || flagResult.status === "updated" || flagResult.status === "already-set";
+    if (flagResult.status === "failed") {
+      warnings.push({
+        reason: "codex-feature-flag-write-failed",
+        message: `Could not write \`[features] hooks = true\` to ${configTomlPath}${flagResult.error ? ` (${flagResult.error})` : ""}. Codex will ignore installed hooks until this flag is set. Add it manually or re-run \`tkm init -a codex\`.`
+      });
+    }
   }
   return {
     status: "registered",
@@ -34460,6 +34507,7 @@ var init_hooks_merger = __esm(() => {
   init_claude_to_codex_hooks();
   init_features_flag();
   init_hook_wrapper();
+  init_path_safety();
   CODEX_WRAPPABLE_HOOK_EXTENSIONS = new Set([".js", ".cjs", ".mjs", ".ts"]);
 });
 
@@ -35985,12 +36033,25 @@ var init_installer2 = __esm(() => {
 });
 
 // src/domains/installers/registry.ts
+var exports_registry = {};
+__export(exports_registry, {
+  unregisterInstaller: () => unregisterInstaller,
+  registerInstaller: () => registerInstaller,
+  listSupportedProviders: () => listSupportedProviders,
+  getInstaller: () => getInstaller
+});
 function getInstaller(provider) {
   return installers[provider] ?? null;
 }
 function listSupportedProviders() {
   return Object.keys(installers);
 }
+function registerInstaller(installer) {
+  installers[installer.provider] = installer;
+}
+function unregisterInstaller(provider) {
+  delete installers[provider];
+}
 var installers;
 var init_registry = __esm(() => {
   init_installer();
@@ -37485,6 +37546,24 @@ var init_kit_version_checker = __esm(() => {
 });
 
 // src/domains/github/npm-registry.ts
+function validateRegistryUrl(url) {
+  if (!url || typeof url !== "string" || url.trim() === "") {
+    throw new Error("Invalid registry URL: must be a non-empty string");
+  }
+  if (SHELL_METACHARACTERS.test(url)) {
+    throw new Error("Invalid registry URL: contains disallowed characters");
+  }
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(`Invalid registry URL: not a valid URL (${redactRegistryUrlForLog(url)})`);
+  }
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
+    throw new Error(`Invalid registry URL: unsupported protocol ${parsed.protocol}`);
+  }
+  return url;
+}
 function redactRegistryUrlForLog(url) {
   if (!url)
     return url;
@@ -37633,9 +37712,10 @@ class NpmRegistryClient {
     }
   }
 }
-var DEFAULT_REGISTRY_URL = "https://registry.npmjs.org", REQUEST_TIMEOUT = 5000, REDACTED_VALUE = "***";
+var DEFAULT_REGISTRY_URL = "https://registry.npmjs.org", REQUEST_TIMEOUT = 5000, REDACTED_VALUE = "***", SHELL_METACHARACTERS;
 var init_npm_registry = __esm(() => {
   init_logger();
+  SHELL_METACHARACTERS = /[\s;|&$`<>()'"\\\n\r]/;
 });
 
 // src/domains/versioning/checking/cli-version-checker.ts
@@ -50384,11 +50464,11 @@ var exports_monorepo_resolver = {};
 __export(exports_monorepo_resolver, {
   resolveMonorepoRoot: () => resolveMonorepoRoot
 });
-import { existsSync as existsSync48, readFileSync as readFileSync16 } from "node:fs";
-import { dirname as dirname27, join as join98, resolve as resolve22 } from "node:path";
+import { existsSync as existsSync49, readFileSync as readFileSync16 } from "node:fs";
+import { dirname as dirname27, join as join99, resolve as resolve22 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function parseMetadataAt(metadataPath) {
-  if (!existsSync48(metadataPath))
+  if (!existsSync49(metadataPath))
     return null;
   try {
     const raw = readFileSync16(metadataPath, "utf-8");
@@ -50402,8 +50482,8 @@ function parseMetadataAt(metadataPath) {
   }
 }
 function readSourceDirFromPackageJson(candidateRoot) {
-  const packageJsonPath = join98(candidateRoot, "package.json");
-  if (!existsSync48(packageJsonPath))
+  const packageJsonPath = join99(candidateRoot, "package.json");
+  if (!existsSync49(packageJsonPath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync16(packageJsonPath, "utf-8"));
@@ -50425,7 +50505,7 @@ function tryReadAtCandidate(candidateRoot) {
     };
   }
   const sourceDir = readSourceDirFromPackageJson(candidateRoot) ?? "claude";
-  const sourceRoot = join98(candidateRoot, sourceDir);
+  const sourceRoot = join99(candidateRoot, sourceDir);
   const nestedMetadata = parseMetadataAt(getManifestPath(sourceRoot)) ?? parseMetadataAt(getLegacyManifestPath(sourceRoot));
   if (nestedMetadata) {
     return {
@@ -57051,17 +57131,102 @@ async function checkHooksExist(projectDir) {
     autoFixable: false
   };
 }
-// src/domains/health-checks/checkers/settings-checker.ts
-init_paths();
+// src/domains/health-checks/checkers/codex-hook-health-checker.ts
 init_registry();
-init_logger();
 import { existsSync as existsSync39 } from "node:fs";
 import { readFile as readFile33 } from "node:fs/promises";
 import { join as join78 } from "node:path";
+async function checkCodexHooksHealth() {
+  const codex = getInstaller("codex");
+  if (!codex?.isInstalledGlobally())
+    return [];
+  const codexRoot = codex.globalRoot();
+  const configTomlPath = join78(codexRoot, "config.toml");
+  const hooksJsonPath = join78(codexRoot, "hooks.json");
+  if (!existsSync39(hooksJsonPath))
+    return [];
+  const results = [];
+  const flagPresent = existsSync39(configTomlPath) ? /(^|\n)\s*hooks\s*=\s*true/.test(await readFile33(configTomlPath, "utf8")) : false;
+  results.push(flagPresent ? {
+    id: "codex-hooks-feature-flag",
+    name: "Codex hooks feature flag",
+    group: "takumi",
+    priority: "critical",
+    status: "pass",
+    message: "[features] hooks = true present",
+    details: configTomlPath,
+    autoFixable: false
+  } : {
+    id: "codex-hooks-feature-flag",
+    name: "Codex hooks feature flag",
+    group: "takumi",
+    priority: "critical",
+    status: "fail",
+    message: "[features] hooks = true missing — Codex ignores all hooks. Add it to config.toml or run `tkm init -a codex`.",
+    details: configTomlPath,
+    autoFixable: false
+  });
+  const missing = await collectMissingWrapperTargets(hooksJsonPath);
+  results.push(missing.length === 0 ? {
+    id: "codex-hooks-command-targets",
+    name: "Codex hook command targets",
+    group: "takumi",
+    priority: "standard",
+    status: "pass",
+    message: "All hook commands point to existing wrappers",
+    details: hooksJsonPath,
+    autoFixable: false
+  } : {
+    id: "codex-hooks-command-targets",
+    name: "Codex hook command targets",
+    group: "takumi",
+    priority: "standard",
+    status: "fail",
+    message: `${missing.length} hook command(s) point to a missing wrapper. Re-run \`tkm init -a codex\` to regenerate.`,
+    details: missing.join(", "),
+    autoFixable: false
+  });
+  return results;
+}
+async function collectMissingWrapperTargets(hooksJsonPath) {
+  let parsed;
+  try {
+    parsed = JSON.parse(await readFile33(hooksJsonPath, "utf8"));
+  } catch {
+    return [];
+  }
+  const hooks = parsed?.hooks;
+  if (!hooks || typeof hooks !== "object")
+    return [];
+  const missing = [];
+  const nodeCmd = /\bnode\s+"([^"]+\.cjs)"/;
+  for (const groups of Object.values(hooks)) {
+    if (!Array.isArray(groups))
+      continue;
+    for (const group of groups) {
+      for (const entry of group?.hooks ?? []) {
+        const command = entry?.command;
+        if (typeof command !== "string")
+          continue;
+        const m2 = command.match(nodeCmd);
+        if (m2 && !existsSync39(m2[1]))
+          missing.push(m2[1]);
+      }
+    }
+  }
+  return missing;
+}
+// src/domains/health-checks/checkers/settings-checker.ts
+init_paths();
+init_registry();
+init_logger();
+import { existsSync as existsSync40 } from "node:fs";
+import { readFile as readFile34 } from "node:fs/promises";
+import { join as join79 } from "node:path";
 async function checkSettingsValid(projectDir) {
-  const globalSettings = join78(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
-  const projectSettings = join78(getLocalClaudeDir(projectDir), "settings.json");
-  const settingsPath = existsSync39(globalSettings) ? globalSettings : existsSync39(projectSettings) ? projectSettings : null;
+  const globalSettings = join79(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
+  const projectSettings = join79(getLocalClaudeDir(projectDir), "settings.json");
+  const settingsPath = existsSync40(globalSettings) ? globalSettings : existsSync40(projectSettings) ? projectSettings : null;
   if (!settingsPath) {
     return {
       id: "sk-settings-valid",
@@ -57074,7 +57239,7 @@ async function checkSettingsValid(projectDir) {
     };
   }
   try {
-    const content = await readFile33(settingsPath, "utf-8");
+    const content = await readFile34(settingsPath, "utf-8");
     JSON.parse(content);
     return {
       id: "sk-settings-valid",
@@ -57131,14 +57296,14 @@ async function checkSettingsValid(projectDir) {
 init_paths();
 init_registry();
 init_logger();
-import { existsSync as existsSync40 } from "node:fs";
-import { readFile as readFile34 } from "node:fs/promises";
+import { existsSync as existsSync41 } from "node:fs";
+import { readFile as readFile35 } from "node:fs/promises";
 import { homedir as homedir24 } from "node:os";
-import { dirname as dirname19, join as join79, normalize as normalize6, resolve as resolve17 } from "node:path";
+import { dirname as dirname19, join as join80, normalize as normalize6, resolve as resolve17 } from "node:path";
 async function checkPathRefsValid(projectDir) {
-  const globalClaudeMd = join79(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
-  const projectClaudeMd = join79(getLocalClaudeDir(projectDir), "CLAUDE.md");
-  const claudeMdPath = existsSync40(globalClaudeMd) ? globalClaudeMd : existsSync40(projectClaudeMd) ? projectClaudeMd : null;
+  const globalClaudeMd = join80(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
+  const projectClaudeMd = join80(getLocalClaudeDir(projectDir), "CLAUDE.md");
+  const claudeMdPath = existsSync41(globalClaudeMd) ? globalClaudeMd : existsSync41(projectClaudeMd) ? projectClaudeMd : null;
   if (!claudeMdPath) {
     return {
       id: "sk-path-refs-valid",
@@ -57151,7 +57316,7 @@ async function checkPathRefsValid(projectDir) {
     };
   }
   try {
-    const content = await readFile34(claudeMdPath, "utf-8");
+    const content = await readFile35(claudeMdPath, "utf-8");
     const refPattern = /@([^\s\)]+)/g;
     const refs = [...content.matchAll(refPattern)].map((m2) => m2[1]);
     if (refs.length === 0) {
@@ -57191,7 +57356,7 @@ async function checkPathRefsValid(projectDir) {
         logger.verbose("Skipping potentially unsafe path reference", { ref, refPath });
         continue;
       }
-      if (!existsSync40(normalizedPath)) {
+      if (!existsSync41(normalizedPath)) {
         broken.push(ref);
       }
     }
@@ -57231,9 +57396,9 @@ async function checkPathRefsValid(projectDir) {
 }
 // src/domains/health-checks/checkers/config-completeness-checker.ts
 init_paths();
-import { existsSync as existsSync41 } from "node:fs";
+import { existsSync as existsSync42 } from "node:fs";
 import { readdir as readdir24 } from "node:fs/promises";
-import { join as join80 } from "node:path";
+import { join as join81 } from "node:path";
 async function checkProjectConfigCompleteness(setup, projectDir) {
   if (setup.globals.some((g2) => g2.path === setup.project.path)) {
     return {
@@ -57250,12 +57415,12 @@ async function checkProjectConfigCompleteness(setup, projectDir) {
   const requiredDirs = ["agents", "commands", "skills"];
   const missingDirs = [];
   for (const dir of requiredDirs) {
-    const dirPath = join80(projectClaudeDir, dir);
-    if (!existsSync41(dirPath)) {
+    const dirPath = join81(projectClaudeDir, dir);
+    if (!existsSync42(dirPath)) {
       missingDirs.push(dir);
     }
   }
-  const hasRulesOrWorkflows = existsSync41(join80(projectClaudeDir, "rules")) || existsSync41(join80(projectClaudeDir, "workflows"));
+  const hasRulesOrWorkflows = existsSync42(join81(projectClaudeDir, "rules")) || existsSync42(join81(projectClaudeDir, "workflows"));
   if (!hasRulesOrWorkflows) {
     missingDirs.push("rules");
   }
@@ -57335,6 +57500,8 @@ class TakumiChecker {
     }
     logger.verbose("TakumiChecker: Checking hooks directory");
     results.push(await checkHooksExist(this.projectDir));
+    logger.verbose("TakumiChecker: Checking Codex hook health");
+    results.push(...await checkCodexHooksHealth());
     logger.verbose("TakumiChecker: Checking settings.json validity");
     results.push(await checkSettingsValid(this.projectDir));
     logger.verbose("TakumiChecker: Checking path references");
@@ -57692,9 +57859,9 @@ import { platform as platform7 } from "node:os";
 // src/domains/health-checks/platform/environment-checker.ts
 init_registry();
 init_environment();
-import { constants as constants2, access as access2, mkdir as mkdir19, readFile as readFile35, unlink as unlink8, writeFile as writeFile24 } from "node:fs/promises";
+import { constants as constants2, access as access2, mkdir as mkdir19, readFile as readFile36, unlink as unlink8, writeFile as writeFile24 } from "node:fs/promises";
 import { arch as arch2, homedir as homedir25, platform as platform6 } from "node:os";
-import { join as join82, normalize as normalize7 } from "node:path";
+import { join as join83, normalize as normalize7 } from "node:path";
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
 }
@@ -57787,11 +57954,11 @@ async function checkGlobalDirAccess(provider) {
       autoFixable: false
     };
   }
-  const testFile = join82(globalDir, ".sk-doctor-access-test");
+  const testFile = join83(globalDir, ".sk-doctor-access-test");
   try {
     await mkdir19(globalDir, { recursive: true });
     await writeFile24(testFile, "test", "utf-8");
-    const content = await readFile35(testFile, "utf-8");
+    const content = await readFile36(testFile, "utf-8");
     await unlink8(testFile);
     if (content !== "test")
       throw new Error("Read mismatch");
@@ -57865,7 +58032,7 @@ async function checkWSLBoundary() {
 // src/domains/health-checks/platform/windows-checker.ts
 init_registry();
 import { mkdir as mkdir20, symlink as symlink2, unlink as unlink9, writeFile as writeFile25 } from "node:fs/promises";
-import { join as join83 } from "node:path";
+import { join as join84 } from "node:path";
 async function checkLongPathSupport() {
   if (shouldSkipExpensiveOperations4()) {
     return {
@@ -57917,8 +58084,8 @@ async function checkSymlinkSupport() {
     };
   }
   const testDir = getInstaller("claude-code")?.globalRoot() ?? "";
-  const target = join83(testDir, ".sk-symlink-test-target");
-  const link = join83(testDir, ".sk-symlink-test-link");
+  const target = join84(testDir, ".sk-symlink-test-target");
+  const link = join84(testDir, ".sk-symlink-test-link");
   try {
     await mkdir20(testDir, { recursive: true });
     await writeFile25(target, "test", "utf-8");
@@ -58214,7 +58381,7 @@ class AutoHealer {
 import { execSync as execSync4, spawnSync as spawnSync4 } from "node:child_process";
 import { readFileSync as readFileSync11, unlinkSync as unlinkSync4, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { dirname as dirname20, join as join84 } from "node:path";
+import { dirname as dirname20, join as join85 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 init_environment();
 init_logger();
@@ -58222,7 +58389,7 @@ init_dist2();
 function getCliVersion3() {
   try {
     const __dirname3 = dirname20(fileURLToPath2(import.meta.url));
-    const pkgPath = join84(__dirname3, "../../../package.json");
+    const pkgPath = join85(__dirname3, "../../../package.json");
     const pkg = JSON.parse(readFileSync11(pkgPath, "utf-8"));
     return pkg.version || "unknown";
   } catch (err) {
@@ -58361,7 +58528,7 @@ class ReportGenerator {
         return null;
       }
     }
-    const tmpFile = join84(tmpdir2(), `sk-report-${Date.now()}.txt`);
+    const tmpFile = join85(tmpdir2(), `sk-report-${Date.now()}.txt`);
     writeFileSync6(tmpFile, report);
     try {
       const result = spawnSync4("gh", ["gist", "create", tmpFile, "--desc", "Takumi Diagnostic Report"], {
@@ -58674,7 +58841,7 @@ async function authedFetch(url, init) {
 // src/commands/hooks/lib/detached-put.ts
 import { spawn as spawn2 } from "node:child_process";
 import { openSync as openSync4 } from "node:fs";
-import { dirname as dirname21, join as join85 } from "node:path";
+import { dirname as dirname21, join as join86 } from "node:path";
 
 // src/commands/hooks/lib/hook-logger.ts
 import { appendFileSync } from "node:fs";
@@ -58721,7 +58888,7 @@ function effectiveDetachMode(flags) {
   return flags.noDetach ? "inline" : "detached";
 }
 function sessionDebugLogPath(sessionDir) {
-  return join85(sessionDir, DETACH_DEBUG_LOG_NAME);
+  return join86(sessionDir, DETACH_DEBUG_LOG_NAME);
 }
 var BUNFS_PREFIX = "/$bunfs/";
 function resolveInvocationPrefix() {
@@ -58751,7 +58918,7 @@ function resolvePreloadScript(entryPath) {
   try {
     const srcDir = dirname21(entryPath);
     const repoRoot = dirname21(srcDir);
-    return join85(repoRoot, "scripts", "preload-config-override.ts");
+    return join86(repoRoot, "scripts", "preload-config-override.ts");
   } catch {
     return null;
   }
@@ -58823,13 +58990,13 @@ import { promises as fs13 } from "node:fs";
 
 // src/commands/hooks/lib/session-paths.ts
 init_paths2();
-import { join as join87 } from "node:path";
+import { join as join88 } from "node:path";
 
 // src/commands/hooks/lib/project-paths.ts
 init_paths2();
 import { createHash as createHash8 } from "node:crypto";
 import { realpathSync as realpathSync2 } from "node:fs";
-import { basename as basename12, join as join86 } from "node:path";
+import { basename as basename12, join as join87 } from "node:path";
 function encodeCwd(cwd2) {
   const stripped = cwd2.replace(/^\/+/, "");
   const sanitized = stripped.replace(/[^a-zA-Z0-9-]/g, "-");
@@ -58848,10 +59015,10 @@ function getProjectLabel(cwd2) {
   return basename12(cwd2) || "";
 }
 function getProjectsRoot() {
-  return join86(getConfigDir(), "projects");
+  return join87(getConfigDir(), "projects");
 }
 function getProjectDir(args) {
-  return join86(getProjectsRoot(), encodeCwd(args.cwd), args.agent);
+  return join87(getProjectsRoot(), encodeCwd(args.cwd), args.agent);
 }
 
 // src/commands/hooks/lib/session-paths.ts
@@ -58863,25 +59030,25 @@ function safeSessionSegment(sessionId) {
   return cleaned.length > 0 ? cleaned.slice(0, MAX_SESSION_ID_LEN) : null;
 }
 function getSessionsRoot() {
-  return join87(getConfigDir(), "sessions");
+  return join88(getConfigDir(), "sessions");
 }
 function getSessionDirV2(args) {
   const segment = safeSessionSegment(args.sessionId);
   if (!segment)
     return null;
-  return join87(getProjectDir({ agent: args.agent, cwd: args.cwd }), "sessions", segment);
+  return join88(getProjectDir({ agent: args.agent, cwd: args.cwd }), "sessions", segment);
 }
 function getEventsFile(sessionDir) {
-  return join87(sessionDir, "events.jsonl");
+  return join88(sessionDir, "events.jsonl");
 }
 function getSummaryFile(sessionDir) {
-  return join87(sessionDir, "summary.json");
+  return join88(sessionDir, "summary.json");
 }
 function getLastPushFile(sessionDir) {
-  return join87(sessionDir, "last_push.txt");
+  return join88(sessionDir, "last_push.txt");
 }
 function getMetaFile(sessionDir) {
-  return join87(sessionDir, "meta.json");
+  return join88(sessionDir, "meta.json");
 }
 
 // src/commands/hooks/lib/throttle.ts
@@ -59499,9 +59666,9 @@ function resolveEndpoint() {
 
 // src/commands/hooks/lib/manifest-versions.ts
 init_manifest_path_resolver();
-import { existsSync as existsSync43, readFileSync as readFileSync12 } from "node:fs";
+import { existsSync as existsSync44, readFileSync as readFileSync12 } from "node:fs";
 import { homedir as homedir26 } from "node:os";
-import { dirname as dirname22, join as join88, resolve as resolve18 } from "node:path";
+import { dirname as dirname22, join as join89, resolve as resolve18 } from "node:path";
 var PROVIDER_DIRS = [".claude", ".codex"];
 var MAX_WALK = 6;
 function readManifestRaw(path10) {
@@ -59520,8 +59687,8 @@ function findManifest(cwd2) {
   let dir = resolve18(cwd2);
   for (let i = 0;i < MAX_WALK; i++) {
     for (const provider of PROVIDER_DIRS) {
-      const providerRoot = join88(dir, provider);
-      if (existsSync43(providerRoot)) {
+      const providerRoot = join89(dir, provider);
+      if (existsSync44(providerRoot)) {
         const path10 = findManifestInProviderDir(providerRoot);
         if (path10)
           return path10;
@@ -59534,11 +59701,11 @@ function findManifest(cwd2) {
   }
   const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
   if (pluginRoot) {
-    const pluginPath = findManifestInProviderDir(join88(pluginRoot, ".claude"));
+    const pluginPath = findManifestInProviderDir(join89(pluginRoot, ".claude"));
     if (pluginPath)
       return pluginPath;
   }
-  const globalPath = findManifestInProviderDir(join88(homedir26(), ".claude"));
+  const globalPath = findManifestInProviderDir(join89(homedir26(), ".claude"));
   if (globalPath)
     return globalPath;
   return null;
@@ -59653,8 +59820,8 @@ async function handleSessionEnd(agent, flags = {}) {
         session_end_raw: data
       };
       const { promises: fs18 } = await import("node:fs");
-      const { join: join89 } = await import("node:path");
-      const target = join89(sessionDir, "meta.json");
+      const { join: join90 } = await import("node:path");
+      const target = join90(sessionDir, "meta.json");
       const tmp = `${target}.tmp`;
       await fs18.writeFile(tmp, JSON.stringify(updated), "utf8");
       await fs18.rename(tmp, target);
@@ -59725,7 +59892,7 @@ init_auth_client();
 
 // src/commands/hooks/lib/retention.ts
 import { promises as fs18 } from "node:fs";
-import { join as join89 } from "node:path";
+import { join as join90 } from "node:path";
 async function hasLastPush(dir) {
   try {
     await fs18.access(getLastPushFile(dir));
@@ -59755,7 +59922,7 @@ async function decideDelete(dir, args) {
 async function listChildren(dir) {
   try {
     const names = await fs18.readdir(dir);
-    return names.map((n) => join89(dir, n));
+    return names.map((n) => join90(dir, n));
   } catch {
     return [];
   }
@@ -59766,7 +59933,7 @@ async function collectV2Sessions() {
   const sessions = [];
   for (const projectDir of projects) {
     for (const agentDir of await listChildren(projectDir)) {
-      for (const sessionDir of await listChildren(join89(agentDir, "sessions"))) {
+      for (const sessionDir of await listChildren(join90(agentDir, "sessions"))) {
         sessions.push(sessionDir);
       }
     }
@@ -60166,7 +60333,7 @@ init_hooks_settings_merger();
 
 // src/commands/portable/settings-write-with-confirm.ts
 init_safe_prompts();
-import { existsSync as existsSync44, mkdirSync as mkdirSync4, readFileSync as readFileSync13, renameSync as renameSync2, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync45, mkdirSync as mkdirSync4, readFileSync as readFileSync13, renameSync as renameSync2, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
 import { dirname as dirname23 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
@@ -61339,7 +61506,7 @@ var EMPTY_RESULT = (status2) => ({
   backupPath: null
 });
 function readCurrent(path10) {
-  if (!existsSync44(path10))
+  if (!existsSync45(path10))
     return { kind: "missing" };
   let raw = "";
   try {
@@ -61456,18 +61623,18 @@ init_dist2();
 // src/commands/hooks/lib/agent-target-picker.ts
 init_safe_prompts();
 init_dist2();
-import { existsSync as existsSync45 } from "node:fs";
+import { existsSync as existsSync46 } from "node:fs";
 
 // src/commands/hooks/lib/settings-path-resolver.ts
 import { lstatSync as lstatSync3, realpathSync as realpathSync3 } from "node:fs";
 import { homedir as homedir27 } from "node:os";
-import { join as join90 } from "node:path";
+import { join as join91 } from "node:path";
 function rawPath(agent, global3) {
   const root = global3 ? homedir27() : process.cwd();
   if (agent === "claude") {
-    return join90(root, ".claude", "settings.json");
+    return join91(root, ".claude", "settings.json");
   }
-  return join90(root, ".codex", "hooks.json");
+  return join91(root, ".codex", "hooks.json");
 }
 function resolveSettingsPath(agent, options2 = {}) {
   const originalPath = rawPath(agent, Boolean(options2.global));
@@ -61495,7 +61662,7 @@ function probe(global3) {
     return {
       agent,
       path: location2.realPath,
-      exists: existsSync45(location2.realPath)
+      exists: existsSync46(location2.realPath)
     };
   });
 }
@@ -61540,7 +61707,7 @@ async function promptHookAgentTargets(options2) {
 
 // src/commands/hooks/lib/entry-builder.ts
 init_capabilities();
-var TIMEOUT_SECONDS = 2;
+var TIMEOUT_SECONDS = 10;
 var DEFAULT_HOOK_BIN = "tkm";
 var CLAUDE_SESSION_START_MATCHER = "startup|resume|clear|compact";
 var HOOK_EVENT_TO_CLAUDE_EVENT = {
@@ -61610,7 +61777,7 @@ function buildHookSection(agent, bin, flags = {}) {
 
 // src/commands/hooks/uninstall-handler.ts
 init_logger();
-import { existsSync as existsSync46, mkdirSync as mkdirSync5, readFileSync as readFileSync14, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync47, mkdirSync as mkdirSync5, readFileSync as readFileSync14, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "node:fs";
 import { dirname as dirname24 } from "node:path";
 var AGENT_DISPLAY2 = {
   claude: "Claude Code",
@@ -61665,7 +61832,7 @@ async function uninstallForAgent(agent, options2) {
     removed: 0,
     dryRun: Boolean(options2.dryRun)
   };
-  if (!existsSync46(location2.realPath)) {
+  if (!existsSync47(location2.realPath)) {
     return result;
   }
   let parsed;
@@ -63219,7 +63386,7 @@ init_logger();
 init_safe_spinner();
 import { mkdir as mkdir25, stat as stat10 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join96 } from "node:path";
+import { join as join97 } from "node:path";
 
 // src/shared/temp-cleanup.ts
 init_logger();
@@ -63238,7 +63405,7 @@ init_logger();
 init_output_manager();
 import { createWriteStream as createWriteStream2, rmSync as rmSync5 } from "node:fs";
 import { mkdir as mkdir21 } from "node:fs/promises";
-import { join as join91 } from "node:path";
+import { join as join92 } from "node:path";
 
 // src/shared/progress-bar.ts
 init_output_manager();
@@ -63448,7 +63615,7 @@ var MAX_DOWNLOAD_SIZE = 500 * 1024 * 1024;
 class FileDownloader {
   async downloadAsset(asset, destDir) {
     try {
-      const destPath = join91(destDir, asset.name);
+      const destPath = join92(destDir, asset.name);
       await mkdir21(destDir, { recursive: true });
       output.info(`Downloading ${asset.name} (${formatBytes(asset.size)})...`);
       logger.verbose("Download details", {
@@ -63533,7 +63700,7 @@ class FileDownloader {
   }
   async downloadFile(params) {
     const { url, name, size, destDir, token } = params;
-    const destPath = join91(destDir, name);
+    const destPath = join92(destDir, name);
     await mkdir21(destDir, { recursive: true });
     output.info(`Downloading ${name}${size ? ` (${formatBytes(size)})` : ""}...`);
     const headers = {};
@@ -63636,7 +63803,7 @@ init_logger();
 init_types2();
 import { constants as constants3 } from "node:fs";
 import { access as access3, readdir as readdir25 } from "node:fs/promises";
-import { join as join92 } from "node:path";
+import { join as join93 } from "node:path";
 async function validateExtraction(extractDir) {
   try {
     const entries = await readdir25(extractDir, { encoding: "utf8" });
@@ -63648,7 +63815,7 @@ async function validateExtraction(extractDir) {
     const missingPaths = [];
     for (const path10 of criticalPaths) {
       try {
-        await access3(join92(extractDir, path10), constants3.F_OK);
+        await access3(join93(extractDir, path10), constants3.F_OK);
         logger.debug(`Found: ${path10}`);
       } catch {
         logger.warning(`Expected path not found: ${path10}`);
@@ -63670,7 +63837,7 @@ async function validateExtraction(extractDir) {
 // src/domains/installation/extraction/tar-extractor.ts
 init_logger();
 import { copyFile as copyFile5, mkdir as mkdir23, readdir as readdir27, rm as rm7, stat as stat8 } from "node:fs/promises";
-import { join as join94 } from "node:path";
+import { join as join95 } from "node:path";
 
 // node_modules/tar/dist/esm/index.min.js
 import Kr from "events";
@@ -66883,7 +67050,7 @@ function decodeFilePath(path10) {
 init_logger();
 init_types2();
 import { copyFile as copyFile4, lstat as lstat6, mkdir as mkdir22, readdir as readdir26 } from "node:fs/promises";
-import { join as join93, relative as relative15 } from "node:path";
+import { join as join94, relative as relative15 } from "node:path";
 async function withRetry2(fn2, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -66905,8 +67072,8 @@ async function moveDirectoryContents(sourceDir, destDir, shouldExclude, sizeTrac
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir26(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join93(sourceDir, entry);
-    const destPath = join93(destDir, entry);
+    const sourcePath = join94(sourceDir, entry);
+    const destPath = join94(destDir, entry);
     const relativePath = relative15(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -66933,8 +67100,8 @@ async function copyDirectory(sourceDir, destDir, shouldExclude, sizeTracker) {
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir26(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join93(sourceDir, entry);
-    const destPath = join93(destDir, entry);
+    const sourcePath = join94(sourceDir, entry);
+    const destPath = join94(destDir, entry);
     const relativePath = relative15(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -66989,7 +67156,7 @@ class TarExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join94(tempExtractDir, rootEntry);
+        const rootPath = join95(tempExtractDir, rootEntry);
         const rootStat = await stat8(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir27(rootPath, { encoding: "utf8" });
@@ -67005,7 +67172,7 @@ class TarExtractor {
           }
         } else {
           await mkdir23(destDir, { recursive: true });
-          await copyFile5(rootPath, join94(destDir, rootEntry));
+          await copyFile5(rootPath, join95(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -67026,7 +67193,7 @@ class TarExtractor {
 init_logger();
 import { createWriteStream as createWriteStream3 } from "node:fs";
 import { chmod as chmod3, copyFile as copyFile6, mkdir as mkdir24, readdir as readdir28, rm as rm8, stat as stat9 } from "node:fs/promises";
-import { dirname as dirname25, join as join95, resolve as resolve20 } from "node:path";
+import { dirname as dirname25, join as join96, resolve as resolve20 } from "node:path";
 import { pipeline } from "node:stream/promises";
 import yauzl from "yauzl-promise";
 class ZipExtractor {
@@ -67040,7 +67207,7 @@ class ZipExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join95(tempExtractDir, rootEntry);
+        const rootPath = join96(tempExtractDir, rootEntry);
         const rootStat = await stat9(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir28(rootPath, { encoding: "utf8" });
@@ -67056,7 +67223,7 @@ class ZipExtractor {
           }
         } else {
           await mkdir24(destDir, { recursive: true });
-          await copyFile6(rootPath, join95(destDir, rootEntry));
+          await copyFile6(rootPath, join96(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -67185,7 +67352,7 @@ class DownloadManager {
   async createTempDir() {
     const timestamp = Date.now();
     const counter = DownloadManager.tempDirCounter++;
-    const primaryTempDir = join96(tmpdir3(), `takumi-${timestamp}-${counter}`);
+    const primaryTempDir = join97(tmpdir3(), `takumi-${timestamp}-${counter}`);
     try {
       await mkdir25(primaryTempDir, { recursive: true });
       logger.debug(`Created temp directory: ${primaryTempDir}`);
@@ -67202,7 +67369,7 @@ Solutions:
   2. Set HOME environment variable
   3. Try running from a different directory`);
       }
-      const fallbackTempDir = join96(homeDir, ".sunagentkit", "tmp", `takumi-${timestamp}-${counter}`);
+      const fallbackTempDir = join97(homeDir, ".sunagentkit", "tmp", `takumi-${timestamp}-${counter}`);
       try {
         await mkdir25(fallbackTempDir, { recursive: true });
         logger.debug(`Created temp directory (fallback): ${fallbackTempDir}`);
@@ -67908,7 +68075,7 @@ Re-run with explicit base kit, e.g. --kit ${BASE_KIT} --kit ${parsed2.join(" --k
 }
 // src/commands/init/phases/selection-handler.ts
 import { mkdir as mkdir26 } from "node:fs/promises";
-import { join as join100, resolve as resolve24 } from "node:path";
+import { join as join101, resolve as resolve24 } from "node:path";
 
 // src/commands/shared/agent-selector.ts
 init_registry();
@@ -68061,8 +68228,8 @@ init_logger();
 init_safe_spinner();
 init_takumi_constants();
 var import_fs_extra31 = __toESM(require_lib(), 1);
-import { existsSync as existsSync49, readdirSync as readdirSync6, rmSync as rmSync6, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
-import { dirname as dirname28, join as join99, resolve as resolve23 } from "node:path";
+import { existsSync as existsSync50, readdirSync as readdirSync6, rmSync as rmSync6, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
+import { dirname as dirname28, join as join100, resolve as resolve23 } from "node:path";
 var TAKUMI_SUBDIRECTORIES = ["commands", "agents", "skills", "rules", "hooks"];
 async function analyzeFreshInstallation(claudeDir) {
   const metadata = await readManifest(claudeDir);
@@ -68132,9 +68299,9 @@ async function removeFilesByOwnership(claudeDir, analysis, includeModified) {
   const filesToRemove = includeModified ? [...analysis.ckFiles, ...analysis.ckModifiedFiles] : analysis.ckFiles;
   const filesToPreserve = includeModified ? analysis.userFiles : [...analysis.ckModifiedFiles, ...analysis.userFiles];
   for (const file of filesToRemove) {
-    const fullPath = join99(claudeDir, file.path);
+    const fullPath = join100(claudeDir, file.path);
     try {
-      if (existsSync49(fullPath)) {
+      if (existsSync50(fullPath)) {
         unlinkSync5(fullPath);
         removedFiles.push(file.path);
         logger.debug(`Removed: ${file.path}`);
@@ -68206,7 +68373,7 @@ async function removeSubdirectoriesFallback(claudeDir) {
   const removedFiles = [];
   let removedDirCount = 0;
   for (const subdir of TAKUMI_SUBDIRECTORIES) {
-    const subdirPath = join99(claudeDir, subdir);
+    const subdirPath = join100(claudeDir, subdir);
     if (await import_fs_extra31.pathExists(subdirPath)) {
       rmSync6(subdirPath, { recursive: true, force: true });
       removedDirCount++;
@@ -68431,7 +68598,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join100(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join101(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir);
       if (existingMetadata?.kits) {
@@ -68464,7 +68631,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join100(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join101(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -68484,7 +68651,7 @@ async function handleSelection(ctx) {
     let currentVersion = null;
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir = prefix ? join100(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join101(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       currentVersion = existingMetadata?.kits?.[kitType]?.version || null;
       if (currentVersion) {
@@ -68572,7 +68739,7 @@ async function handleSelection(ctx) {
   if (ctx.options.yes && !ctx.options.fresh && !ctx.options.force && releaseTag && !isOfflineMode) {
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir = prefix ? join100(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join101(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       const installedKitVersion = existingMetadata?.kits?.[kitType]?.version;
       if (installedKitVersion && versionsMatch(installedKitVersion, releaseTag)) {
@@ -68595,7 +68762,7 @@ async function handleSelection(ctx) {
       let currentSecondaryVersion = null;
       try {
         const prefix = PathResolver.getPathPrefix(ctx.options.global);
-        const claudeDir = prefix ? join100(resolvedDir, prefix) : resolvedDir;
+        const claudeDir = prefix ? join101(resolvedDir, prefix) : resolvedDir;
         const existingMetadata = await readManifest(claudeDir);
         currentSecondaryVersion = existingMetadata?.kits?.[secondaryKit]?.version || null;
       } catch {}
@@ -68678,13 +68845,13 @@ function resolveGlobalTargetDir(targetAgents2) {
 }
 // src/commands/init/phases/sync-handler.ts
 init_paths();
-import { copyFile as copyFile7, mkdir as mkdir28, open as open2, readFile as readFile39, rename as rename7, stat as stat12, unlink as unlink11, writeFile as writeFile28 } from "node:fs/promises";
-import { dirname as dirname29, join as join103, resolve as resolve25 } from "node:path";
+import { copyFile as copyFile7, mkdir as mkdir28, open as open2, readFile as readFile40, rename as rename7, stat as stat12, unlink as unlink11, writeFile as writeFile28 } from "node:fs/promises";
+import { dirname as dirname29, join as join104, resolve as resolve25 } from "node:path";
 
 // src/domains/sync/config-version-checker.ts
 init_auth_client();
-import { mkdir as mkdir27, readFile as readFile37, unlink as unlink10, writeFile as writeFile27 } from "node:fs/promises";
-import { join as join101 } from "node:path";
+import { mkdir as mkdir27, readFile as readFile38, unlink as unlink10, writeFile as writeFile27 } from "node:fs/promises";
+import { join as join102 } from "node:path";
 init_version_utils();
 init_logger();
 init_path_resolver();
@@ -68720,12 +68887,12 @@ var CACHE_FILENAME = "config-update-cache.json";
 class ConfigVersionChecker {
   static getCacheFilePath(kitType, global3) {
     const cacheDir = PathResolver.getCacheDir(global3);
-    return join101(cacheDir, `${kitType}-${CACHE_FILENAME}`);
+    return join102(cacheDir, `${kitType}-${CACHE_FILENAME}`);
   }
   static async loadCache(kitType, global3) {
     try {
       const cachePath = ConfigVersionChecker.getCacheFilePath(kitType, global3);
-      const data = await readFile37(cachePath, "utf8");
+      const data = await readFile38(cachePath, "utf8");
       const parsed = JSON.parse(data);
       if (typeof parsed !== "object" || parsed === null || typeof parsed.lastCheck !== "number" || typeof parsed.latestVersion !== "string" || !parsed.latestVersion || parsed.lastCheck < 0 || parsed.lastCheck > Date.now() + 7 * 24 * 60 * 60 * 1000) {
         logger.debug("Invalid cache structure, ignoring");
@@ -68839,8 +69006,8 @@ class ConfigVersionChecker {
 // src/domains/sync/sync-engine.ts
 init_ownership_checker();
 init_logger();
-import { lstat as lstat7, readFile as readFile38, readlink, realpath as realpath3, stat as stat11 } from "node:fs/promises";
-import { isAbsolute as isAbsolute3, join as join102, normalize as normalize8, relative as relative16 } from "node:path";
+import { lstat as lstat7, readFile as readFile39, readlink, realpath as realpath3, stat as stat11 } from "node:fs/promises";
+import { isAbsolute as isAbsolute3, join as join103, normalize as normalize8, relative as relative16 } from "node:path";
 var MAX_SYNC_FILE_SIZE = 10 * 1024 * 1024;
 var MAX_SYMLINK_DEPTH = 20;
 async function validateSymlinkChain(path11, basePath, maxDepth = MAX_SYMLINK_DEPTH) {
@@ -68852,7 +69019,7 @@ async function validateSymlinkChain(path11, basePath, maxDepth = MAX_SYMLINK_DEP
       if (!stats.isSymbolicLink())
         break;
       const target = await readlink(current);
-      const resolvedTarget = isAbsolute3(target) ? target : join102(current, "..", target);
+      const resolvedTarget = isAbsolute3(target) ? target : join103(current, "..", target);
       const normalizedTarget = normalize8(resolvedTarget);
       const rel = relative16(basePath, normalizedTarget);
       if (rel.startsWith("..") || isAbsolute3(rel)) {
@@ -68888,7 +69055,7 @@ async function validateSyncPath(basePath, filePath) {
   if (normalized.startsWith("..") || normalized.includes("/../")) {
     throw new Error(`Path traversal not allowed: ${filePath}`);
   }
-  const fullPath = join102(basePath, normalized);
+  const fullPath = join103(basePath, normalized);
   const rel = relative16(basePath, fullPath);
   if (rel.startsWith("..") || isAbsolute3(rel)) {
     throw new Error(`Path escapes base directory: ${filePath}`);
@@ -68903,7 +69070,7 @@ async function validateSyncPath(basePath, filePath) {
     }
   } catch (error) {
     if (error.code === "ENOENT") {
-      const parentPath = join102(fullPath, "..");
+      const parentPath = join103(fullPath, "..");
       try {
         const resolvedBase = await realpath3(basePath);
         const resolvedParent = await realpath3(parentPath);
@@ -69074,7 +69241,7 @@ class SyncEngine {
       if (lstats.size > MAX_SYNC_FILE_SIZE) {
         throw new Error(`File too large for sync (${Math.round(lstats.size / 1024 / 1024)}MB > ${MAX_SYNC_FILE_SIZE / 1024 / 1024}MB limit)`);
       }
-      const buffer = await readFile38(filePath);
+      const buffer = await readFile39(filePath);
       if (buffer.includes(0)) {
         return { content: "", isBinary: true };
       }
@@ -69394,7 +69561,7 @@ function getLockTimeout() {
 var STALE_LOCK_THRESHOLD_MS = 5 * 60 * 1000;
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath = join103(cacheDir, ".sync-lock");
+  const lockPath = join104(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir28(dirname29(lockPath), { recursive: true });
@@ -69445,7 +69612,7 @@ async function executeSyncMerge(ctx) {
     try {
       const sourceManifest = await findManifestPath(upstreamDir);
       if (sourceManifest) {
-        const content = await readFile39(sourceManifest.path, "utf-8");
+        const content = await readFile40(sourceManifest.path, "utf-8");
         const sourceMetadata = JSON.parse(content);
         deletions = sourceMetadata.deletions || [];
       }
@@ -69475,7 +69642,7 @@ async function executeSyncMerge(ctx) {
         try {
           const sourcePath = await validateSyncPath(upstreamDir, file.path);
           const targetPath = await validateSyncPath(ctx.claudeDir, file.path);
-          const targetDir = join103(targetPath, "..");
+          const targetDir = join104(targetPath, "..");
           try {
             await mkdir28(targetDir, { recursive: true });
           } catch (mkdirError) {
@@ -69646,7 +69813,7 @@ async function createBackup(claudeDir, files, backupDir) {
       const sourcePath = await validateSyncPath(claudeDir, file.path);
       if (await import_fs_extra33.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
-        const targetDir = join103(targetPath, "..");
+        const targetDir = join104(targetPath, "..");
         await mkdir28(targetDir, { recursive: true });
         await copyFile7(sourcePath, targetPath);
       }
@@ -69672,38 +69839,38 @@ init_logger();
 init_types2();
 var import_fs_extra34 = __toESM(require_lib(), 1);
 import { rename as rename8, rm as rm9 } from "node:fs/promises";
-import { join as join104, relative as relative17 } from "node:path";
+import { join as join105, relative as relative17 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join104(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join105(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra34.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join104(extractDir, folders.docs)
+        to: join105(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join104(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join105(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra34.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join104(extractDir, ".claude", folders.docs)
+        to: join105(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join104(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join105(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra34.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join104(extractDir, folders.plans)
+        to: join105(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join104(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join105(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra34.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join104(extractDir, ".claude", folders.plans)
+        to: join105(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -69743,8 +69910,8 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 // src/services/transformers/folder-transform/path-replacer.ts
 init_logger();
 init_types2();
-import { readFile as readFile40, readdir as readdir29, writeFile as writeFile29 } from "node:fs/promises";
-import { join as join105, relative as relative18 } from "node:path";
+import { readFile as readFile41, readdir as readdir29, writeFile as writeFile29 } from "node:fs/promises";
+import { join as join106, relative as relative18 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -69797,7 +69964,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
   let replacementsCount = 0;
   const entries = await readdir29(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join105(dir, entry.name);
+    const fullPath = join106(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -69810,7 +69977,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
       if (!shouldTransform)
         continue;
       try {
-        const content = await readFile40(fullPath, "utf-8");
+        const content = await readFile41(fullPath, "utf-8");
         let newContent = content;
         let changeCount = 0;
         for (const { regex: regex2, replacement } of compiledReplacements) {
@@ -69932,11 +70099,11 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 
 // src/services/transformers/global-path-transformer.ts
 init_logger();
-import { readFile as readFile41, readdir as readdir30, writeFile as writeFile30 } from "node:fs/promises";
+import { readFile as readFile42, readdir as readdir30, writeFile as writeFile30 } from "node:fs/promises";
 import { platform as platform9 } from "node:os";
-import { extname as extname6, join as join106 } from "node:path";
+import { extname as extname6, join as join107 } from "node:path";
 var IS_WINDOWS3 = platform9() === "win32";
-var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
+var HOME_PREFIX = "$HOME";
 function getHomeDirPrefix() {
   return HOME_PREFIX;
 }
@@ -69959,24 +70126,14 @@ function transformContent(content) {
   let transformed = content;
   const homePrefix = getHomeDirPrefix();
   const claudePath = `${homePrefix}/.claude/`;
-  if (IS_WINDOWS3) {
-    transformed = transformed.replace(/\$HOME\/\.claude\//g, () => {
-      changes++;
-      return claudePath;
-    });
-    transformed = transformed.replace(/\$\{HOME\}\/\.claude\//g, () => {
-      changes++;
-      return claudePath;
-    });
-    transformed = transformed.replace(/\$HOME(?=\/|\\)/g, () => {
-      changes++;
-      return homePrefix;
-    });
-    transformed = transformed.replace(/\$\{HOME\}(?=\/|\\)/g, () => {
-      changes++;
-      return homePrefix;
-    });
-  }
+  transformed = transformed.replace(/%USERPROFILE%\/\.claude\//g, () => {
+    changes++;
+    return claudePath;
+  });
+  transformed = transformed.replace(/%USERPROFILE%(?=\/|\\)/g, () => {
+    changes++;
+    return homePrefix;
+  });
   transformed = transformed.replace(/\$CLAUDE_PROJECT_DIR\/\.claude\//g, () => {
     changes++;
     return claudePath;
@@ -69989,12 +70146,10 @@ function transformContent(content) {
     changes++;
     return claudePath;
   });
-  if (IS_WINDOWS3) {
-    transformed = transformed.replace(/%CLAUDE_PROJECT_DIR%\/\.claude\//g, () => {
-      changes++;
-      return claudePath;
-    });
-  }
+  transformed = transformed.replace(/%CLAUDE_PROJECT_DIR%\/\.claude\//g, () => {
+    changes++;
+    return claudePath;
+  });
   transformed = transformed.replace(/\.\/\.claude\//g, () => {
     changes++;
     return claudePath;
@@ -70046,7 +70201,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir30(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join106(dir, entry.name);
+      const fullPath = join107(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -70054,7 +70209,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
         await processDirectory2(fullPath);
       } else if (entry.isFile() && shouldTransformFile3(entry.name)) {
         try {
-          const content = await readFile41(fullPath, "utf-8");
+          const content = await readFile42(fullPath, "utf-8");
           const { transformed, changes } = transformContent(content);
           if (changes > 0) {
             await writeFile30(fullPath, transformed, "utf-8");
@@ -70313,12 +70468,12 @@ async function initCommand(options2) {
 }
 // src/commands/plan/plan-command.ts
 init_output_manager();
-import { existsSync as existsSync54, statSync as statSync7 } from "node:fs";
-import { dirname as dirname35, join as join110, parse as parse4, resolve as resolve29 } from "node:path";
+import { existsSync as existsSync55, statSync as statSync7 } from "node:fs";
+import { dirname as dirname35, join as join111, parse as parse4, resolve as resolve29 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
-import { existsSync as existsSync53, statSync as statSync6 } from "node:fs";
-import { basename as basename15, dirname as dirname34, join as join109, relative as relative19, resolve as resolve27 } from "node:path";
+import { existsSync as existsSync54, statSync as statSync6 } from "node:fs";
+import { basename as basename15, dirname as dirname34, join as join110, relative as relative19, resolve as resolve27 } from "node:path";
 
 // src/domains/plan-parser/index.ts
 import { dirname as dirname33 } from "node:path";
@@ -70698,20 +70853,20 @@ function parsePlanFile(planFilePath, options2) {
   return { frontmatter, phases };
 }
 // src/domains/plan-parser/plan-scanner.ts
-import { existsSync as existsSync50, readdirSync as readdirSync7 } from "node:fs";
-import { join as join107 } from "node:path";
+import { existsSync as existsSync51, readdirSync as readdirSync7 } from "node:fs";
+import { join as join108 } from "node:path";
 function scanPlanDir(dir) {
-  if (!existsSync50(dir))
+  if (!existsSync51(dir))
     return [];
   try {
-    return readdirSync7(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join107(dir, entry.name, "plan.md")).filter(existsSync50);
+    return readdirSync7(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join108(dir, entry.name, "plan.md")).filter(existsSync51);
   } catch {
     return [];
   }
 }
 // src/domains/plan-parser/plan-validator.ts
 var import_gray_matter6 = __toESM(require_gray_matter(), 1);
-import { existsSync as existsSync51, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync52, readFileSync as readFileSync18 } from "node:fs";
 import { basename as basename13, dirname as dirname31 } from "node:path";
 function validatePlanFile(filePath, strict = false) {
   const content = readFileSync18(filePath, "utf8");
@@ -70751,7 +70906,7 @@ function validatePlanFile(filePath, strict = false) {
     });
   }
   for (const phase of phases) {
-    if (phase.file && !existsSync51(phase.file)) {
+    if (phase.file && !existsSync52(phase.file)) {
       const fileBasename = basename13(phase.file);
       const refLine = lines.findIndex((l2) => l2.includes(fileBasename));
       issues.push({
@@ -70772,8 +70927,8 @@ function validatePlanFile(filePath, strict = false) {
 // src/domains/plan-parser/plan-writer.ts
 var import_gray_matter7 = __toESM(require_gray_matter(), 1);
 import { mkdirSync as mkdirSync6, readFileSync as readFileSync19, writeFileSync as writeFileSync9 } from "node:fs";
-import { existsSync as existsSync52 } from "node:fs";
-import { basename as basename14, dirname as dirname32, join as join108 } from "node:path";
+import { existsSync as existsSync53 } from "node:fs";
+import { basename as basename14, dirname as dirname32, join as join109 } from "node:path";
 function phaseNameToFilename(id, name) {
   const numMatch = /^(\d+)([a-z]*)$/i.exec(id);
   const num3 = numMatch ? numMatch[1] : id;
@@ -70881,12 +71036,12 @@ function scaffoldPlan(options2) {
   mkdirSync6(dir, { recursive: true });
   const resolvedPhases = resolvePhaseIds(options2.phases);
   const optionsWithResolved = { ...options2, phases: resolvedPhases };
-  const planFile = join108(dir, "plan.md");
+  const planFile = join109(dir, "plan.md");
   writeFileSync9(planFile, generatePlanMd(optionsWithResolved), "utf8");
   const phaseFiles = [];
   for (const phase of resolvedPhases) {
     const filename = phaseNameToFilename(phase.id, phase.name);
-    const phaseFile = join108(dir, filename);
+    const phaseFile = join109(dir, filename);
     writeFileSync9(phaseFile, generatePhaseTemplate(phase), "utf8");
     phaseFiles.push(phaseFile);
   }
@@ -70954,7 +71109,7 @@ function updatePhaseStatus(planFile, phaseId, newStatus) {
   writeFileSync9(planFile, updatedContent, "utf8");
   const planDir = dirname32(planFile);
   const phaseFilename = phaseNameFilenameFromTableRow(updatedBody, phaseId, planDir);
-  if (phaseFilename && existsSync52(phaseFilename)) {
+  if (phaseFilename && existsSync53(phaseFilename)) {
     updatePhaseFileFrontmatter(phaseFilename, newStatus);
   }
 }
@@ -70966,7 +71121,7 @@ function phaseNameFilenameFromTableRow(body, phaseId, planDir) {
       continue;
     const linkMatch = /\[([^\]]+)\]\(\.\/([^)]+)\)/.exec(row);
     if (linkMatch)
-      return join108(planDir, linkMatch[2]);
+      return join109(planDir, linkMatch[2]);
   }
   return null;
 }
@@ -71047,7 +71202,7 @@ function addPhase(planFile, name, afterId) {
 `);
   }
   writeFileSync9(planFile, import_gray_matter7.default.stringify(updatedBody, frontmatter), "utf8");
-  const phaseFilePath = join108(planDir, filename);
+  const phaseFilePath = join109(planDir, filename);
   writeFileSync9(phaseFilePath, generatePhaseTemplate({ id: phaseId, name }), "utf8");
   return { phaseId, phaseFile: phaseFilePath };
 }
@@ -71151,7 +71306,7 @@ async function handleValidate(target, options2) {
 }
 async function handleStatus(target, options2) {
   const t = target ? resolve27(target) : null;
-  const plansDir = t && existsSync53(t) && statSync6(t).isDirectory() && !existsSync53(join109(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync54(t) && statSync6(t).isDirectory() && !existsSync54(join110(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -71382,20 +71537,20 @@ async function handleAddPhase(target, options2) {
 // src/commands/plan/plan-command.ts
 function resolvePlanFile(target) {
   const t = target ? resolve29(target) : process.cwd();
-  if (existsSync54(t)) {
+  if (existsSync55(t)) {
     const stat13 = statSync7(t);
     if (stat13.isFile())
       return t;
-    const candidate = join110(t, "plan.md");
-    if (existsSync54(candidate))
+    const candidate = join111(t, "plan.md");
+    if (existsSync55(candidate))
       return candidate;
   }
   if (!target) {
     let dir = process.cwd();
     const root = parse4(dir).root;
     while (dir !== root) {
-      const candidate = join110(dir, "plan.md");
-      if (existsSync54(candidate))
+      const candidate = join111(dir, "plan.md");
+      if (existsSync55(candidate))
         return candidate;
       dir = dirname35(dir);
     }
@@ -71445,7 +71600,7 @@ async function planCommand(action, target, options2) {
   let resolvedTarget = target;
   if (resolvedAction && !knownActions.has(resolvedAction)) {
     const looksLikePath = resolvedAction.includes("/") || resolvedAction.includes("\\") || resolvedAction.endsWith(".md") || resolvedAction === "." || resolvedAction === "..";
-    const existsOnDisk = !looksLikePath && existsSync54(resolve29(resolvedAction));
+    const existsOnDisk = !looksLikePath && existsSync55(resolve29(resolvedAction));
     if (looksLikePath || existsOnDisk) {
       resolvedTarget = resolvedAction;
       resolvedAction = undefined;
@@ -71489,22 +71644,22 @@ init_logger();
 init_logger();
 
 // src/commands/telemetry/shared.ts
-import { existsSync as existsSync55, readFileSync as readFileSync20, readdirSync as readdirSync8 } from "node:fs";
+import { existsSync as existsSync56, readFileSync as readFileSync20, readdirSync as readdirSync8 } from "node:fs";
 import { homedir as homedir28 } from "node:os";
-import { join as join111 } from "node:path";
+import { join as join112 } from "node:path";
 init_token_store();
 init_manifest_path_resolver();
 init_takumi_constants();
-var USER_CACHE_PATH = join111(homedir28(), ".claude", "sk-user.json");
-var EVENT_BUFFER_DIR = join111(homedir28(), ".claude", "sk-events");
-var RATE_STATE_PATH = join111(homedir28(), ".claude", "sk-rate-state.json");
-var TAKUMI_MANIFEST_PATH = join111(homedir28(), ".claude", MANIFEST_FILENAME);
-var LEGACY_METADATA_PATH = join111(homedir28(), ".claude", LEGACY_MANIFEST_FILENAME);
+var USER_CACHE_PATH = join112(homedir28(), ".claude", "sk-user.json");
+var EVENT_BUFFER_DIR = join112(homedir28(), ".claude", "sk-events");
+var RATE_STATE_PATH = join112(homedir28(), ".claude", "sk-rate-state.json");
+var TAKUMI_MANIFEST_PATH = join112(homedir28(), ".claude", MANIFEST_FILENAME);
+var LEGACY_METADATA_PATH = join112(homedir28(), ".claude", LEGACY_MANIFEST_FILENAME);
 var TELEMETRY_HOOK_FIELD = "hooks.telemetry";
 var TOKEN_PLACEHOLDER = "__INJECT_AT_RELEASE__";
 function readUserCache() {
   try {
-    if (!existsSync55(USER_CACHE_PATH))
+    if (!existsSync56(USER_CACHE_PATH))
       return null;
     const parsed = JSON.parse(readFileSync20(USER_CACHE_PATH, "utf8"));
     if (!parsed || typeof parsed !== "object")
@@ -71516,7 +71671,7 @@ function readUserCache() {
 }
 function countBufferFiles() {
   try {
-    if (!existsSync55(EVENT_BUFFER_DIR))
+    if (!existsSync56(EVENT_BUFFER_DIR))
       return 0;
     return readdirSync8(EVENT_BUFFER_DIR).filter((f4) => f4.endsWith(".jsonl")).length;
   } catch {
@@ -71528,7 +71683,7 @@ function readTelemetryConfig() {
   const envToken = process.env.TAKUMI_TELEMETRY_TOKEN;
   let metadata = null;
   try {
-    const resolved = findManifestPathSync(join111(homedir28(), ".claude"));
+    const resolved = findManifestPathSync(join112(homedir28(), ".claude"));
     if (resolved) {
       metadata = JSON.parse(readFileSync20(resolved.path, "utf8"));
     }
@@ -71554,8 +71709,8 @@ function collectRuntimeContext() {
     cacheSource: cache2?.source === "gh" || cache2?.source === "manual" ? cache2.source : null,
     bufferFileCount: countBufferFiles(),
     bufferDir: EVENT_BUFFER_DIR,
-    rateStateExists: existsSync55(RATE_STATE_PATH),
-    userCacheExists: existsSync55(USER_CACHE_PATH),
+    rateStateExists: existsSync56(RATE_STATE_PATH),
+    userCacheExists: existsSync56(USER_CACHE_PATH),
     endpoint,
     tokenConfigured: Boolean(token)
   };
@@ -71706,7 +71861,7 @@ init_safe_prompts();
 init_safe_spinner();
 var import_fs_extra36 = __toESM(require_lib(), 1);
 import { readdirSync as readdirSync10, rmSync as rmSync8 } from "node:fs";
-import { join as join113, resolve as resolve30, sep as sep10 } from "node:path";
+import { join as join114, resolve as resolve30, sep as sep10 } from "node:path";
 
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
@@ -71716,13 +71871,13 @@ init_logger();
 init_safe_prompts();
 init_takumi_constants();
 var import_picocolors27 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync56, readdirSync as readdirSync9, rmSync as rmSync7 } from "node:fs";
-import { dirname as dirname36, join as join112 } from "node:path";
+import { existsSync as existsSync57, readdirSync as readdirSync9, rmSync as rmSync7 } from "node:fs";
+import { dirname as dirname36, join as join113 } from "node:path";
 function listPresentManifestNames(installPath) {
   const present = [];
-  if (existsSync56(getManifestPath(installPath)))
+  if (existsSync57(getManifestPath(installPath)))
     present.push(MANIFEST_FILENAME);
-  if (existsSync56(getLegacyManifestPath(installPath)))
+  if (existsSync57(getLegacyManifestPath(installPath)))
     present.push(LEGACY_MANIFEST_FILENAME);
   return present;
 }
@@ -71770,7 +71925,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 = join112(installation.path, trackedFile.path);
+      const filePath = join113(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -71802,7 +71957,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join112(installation.path, trackedFile.path);
+    const filePath = join113(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -71901,7 +72056,7 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join113(installation.path, item.path);
+        const filePath = join114(installation.path, item.path);
         if (!await import_fs_extra36.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -72374,6 +72529,8 @@ async function updateCliCommand(options2, deps = getDefaultUpdateCliCommandDeps(
         logger.verbose(`Using npm configured registry: ${redactRegistryUrlForLog(registryUrl)}`);
       }
     }
+    if (registryUrl)
+      registryUrl = validateRegistryUrl(registryUrl);
     s3.start("Checking for updates...");
     let targetVersion = null;
     const usePrereleaseChannel = opts.dev || opts.beta;
@@ -72422,6 +72579,9 @@ async function updateCliCommand(options2, deps = getDefaultUpdateCliCommandDeps(
     const isDevChannelSwitch = (opts.dev || opts.beta) && isBetaVersion(targetVersion) && !isBetaVersion(currentVersion);
     if (comparison > 0 && !opts.release && !isDevChannelSwitch) {
       outro(`[+] Current version (${currentVersion}) is newer than latest (${targetVersion})`);
+      if (isBetaVersion(currentVersion)) {
+        note("You are on a prerelease build. `tkm update` tracks the stable channel.\nTo update within the dev/beta channel, run: tkm update --beta");
+      }
       await promptKitUpdateFn(targetIsPrerelease, opts.yes);
       return;
     }
@@ -72746,7 +72906,7 @@ init_manifest_path_resolver();
 init_logger();
 init_types2();
 import { readFileSync as readFileSync21 } from "node:fs";
-import { join as join114 } from "node:path";
+import { join as join115 } from "node:path";
 var PROVIDER_LOCAL_SUBDIRS = {
   "claude-code": ".claude",
   codex: ".codex"
@@ -72801,7 +72961,7 @@ async function displayVersion() {
     const localSubdir = PROVIDER_LOCAL_SUBDIRS[provider];
     if (!localSubdir)
       continue;
-    const localRoot = join114(process.cwd(), localSubdir);
+    const localRoot = join115(process.cwd(), localSubdir);
     if (localRoot === inst.globalRoot())
       continue;
     const resolved = findManifestPathSync(localRoot);