@sunasteriskrnd/takumi 1.0.0-dev.60 → 1.0.0-dev.62

package/dist/index.js

@@ -19815,7 +19815,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@sunasteriskrnd/takumi",
-    version: "1.0.0-dev.60",
+    version: "1.0.0-dev.62",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -20012,7 +20012,7 @@ function getLegacyManifestPath(providerRoot) {
   return join4(providerRoot, LEGACY_MANIFEST_FILENAME);
 }
 function getCliVersion() {
-  return "1.0.0-dev.60"?.trim() || process.env.npm_package_version?.trim() || "unknown";
+  return "1.0.0-dev.62"?.trim() || process.env.npm_package_version?.trim() || "unknown";
 }
 function getCliUserAgent() {
   return `${TAKUMI_CLI_NPM_PACKAGE_NAME}/${getCliVersion()}`;
@@ -22554,7 +22554,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, StatuslineBarStyleSchema, StatuslineConfigSchema, 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 PlanValidationModeSchema, PlanFocusAreaSchema, PlanResolutionOrderSchema, ProjectTypeSchema, PackageManagerSchema, FrameworkSchema, GEMINI_MODEL_VALUES, LEGACY_GEMINI_MODEL_ALIASES, GeminiModelSchema, StatuslineModeSchema, StatuslineSectionIdSchema, StatuslineSectionConfigSchema, StatuslineThemeSchema, StatuslineLayoutSchema, StatuslineBarStyleSchema, StatuslineConfigSchema, CodingLevelSchema, PlanResolutionSchema, PlanValidationSchema, SkPlanConfigSchema, SkDocsConfigSchema, SkPathsConfigSchema, SkLocaleConfigSchema, SkTrustConfigSchema, SkGraphifyConfigSchema, SkProjectConfigSchema, SkGeminiConfigSchema, SkSkillsConfigSchema, SkSkillExtensionsConfigSchema, SkTakumiConfigSchema, SkSubagentAgentConfigSchema, SkSubagentConfigSchema, 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"]);
@@ -22739,6 +22739,15 @@ var init_takumi_config = __esm(() => {
   SkSkillExtensionsConfigSchema = exports_external.object({
     sharedDir: exports_external.string().optional()
   }).passthrough();
+  SkTakumiConfigSchema = exports_external.object({
+    sddMode: exports_external.enum(["ask", "on", "off"]).optional()
+  }).passthrough();
+  SkSubagentAgentConfigSchema = exports_external.object({
+    contextPrefix: exports_external.string().optional()
+  }).passthrough();
+  SkSubagentConfigSchema = exports_external.object({
+    agents: exports_external.record(exports_external.string(), SkSubagentAgentConfigSchema).optional()
+  }).passthrough();
   UpdatePipelineSchema = exports_external.object({
     autoInitAfterUpdate: exports_external.boolean().default(false)
   });
@@ -22787,6 +22796,8 @@ var init_takumi_config = __esm(() => {
     gemini: SkGeminiConfigSchema.optional(),
     skills: SkSkillsConfigSchema.optional(),
     skillExtensions: SkSkillExtensionsConfigSchema.optional(),
+    takumi: SkTakumiConfigSchema.optional(),
+    subagent: SkSubagentConfigSchema.optional(),
     assertions: exports_external.array(SkAssertionSchema).optional(),
     hooks: SkHooksConfigSchema.optional(),
     updatePipeline: UpdatePipelineSchema.optional(),
@@ -33976,17 +33987,13 @@ var init_settings_merger = __esm(() => {
 });
 
 // src/domains/installation/merger/settings-processor.ts
-import { execSync } from "node:child_process";
-
 class SettingsProcessor {
-  static MIN_TEAM_HOOKS_VERSION = "2.1.33";
   isGlobal = false;
   forceOverwriteSettings = false;
   projectDir = "";
   kitName = "engineer";
   tracker = null;
   installingKit;
-  cachedVersion = undefined;
   deletionPatterns = [];
   setGlobalFlag(isGlobal) {
     this.isGlobal = isGlobal;
@@ -34052,7 +34059,6 @@ class SettingsProcessor {
           const formattedContent = this.formatJsonContent(transformedSource);
           await import_fs_extra11.writeFile(destFile, formattedContent, "utf-8");
         }
-        await this.injectTeamHooksIfSupported(destFile);
       }
     } catch (error) {
       logger.error(`Failed to process settings.json: ${error}`);
@@ -34122,7 +34128,6 @@ class SettingsProcessor {
     }
     await SettingsMerger.writeSettingsFile(destFile, mergeResult.merged);
     logger.success("Merged settings.json (user customizations preserved)");
-    await this.injectTeamHooksIfSupported(destFile, mergeResult.merged);
   }
   migrateDeprecatedMatchers(destSettings, sourceSettings) {
     if (!destSettings.hooks || !sourceSettings.hooks)
@@ -34389,87 +34394,13 @@ class SettingsProcessor {
         return capturedVar;
     }
   }
-  detectClaudeCodeVersion() {
-    if (this.cachedVersion !== undefined)
-      return this.cachedVersion;
-    try {
-      const output2 = execSync("claude --version", {
-        encoding: "utf-8",
-        timeout: 5000,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      const match = output2.match(/(\d+\.\d+\.\d+)/);
-      this.cachedVersion = match ? match[1] : null;
-    } catch {
-      this.cachedVersion = null;
-    }
-    return this.cachedVersion;
-  }
-  isVersionAtLeast(version3, minimum) {
-    const coerced = import_semver2.default.coerce(version3);
-    if (!coerced)
-      return false;
-    return import_semver2.default.gte(coerced, minimum);
-  }
-  async injectTeamHooksIfSupported(destFile, existingSettings) {
-    const version3 = this.detectClaudeCodeVersion();
-    if (!version3) {
-      logger.debug("Claude Code version not detected, skipping team hooks injection");
-      return;
-    }
-    if (!this.isVersionAtLeast(version3, SettingsProcessor.MIN_TEAM_HOOKS_VERSION)) {
-      logger.debug(`Claude Code ${version3} does not support team hooks (requires >= 2.1.33), skipping injection`);
-      return;
-    }
-    logger.debug(`Claude Code ${version3} detected, checking team hooks`);
-    const settings = existingSettings ?? await SettingsMerger.readSettingsFile(destFile);
-    if (!settings) {
-      logger.warning("Failed to read settings file for team hooks injection");
-      return;
-    }
-    if (!settings.hooks) {
-      settings.hooks = {};
-    }
-    let injected = false;
-    const installedSettings = this.tracker ? await this.tracker.loadInstalledSettings() : { hooks: [], mcpServers: [] };
-    const teamHooks = [
-      { event: "TaskCompleted", handler: "task-completed-handler.cjs" },
-      { event: "TeammateIdle", handler: "teammate-idle-handler.cjs" }
-    ];
-    for (const { event, handler } of teamHooks) {
-      const hookCommand = this.formatCommandPath("node ", this.isGlobal ? "$HOME" : "$CLAUDE_PROJECT_DIR", `.claude/hooks/${handler}`);
-      const eventHooks = settings.hooks[event];
-      if (eventHooks && eventHooks.length > 0)
-        continue;
-      if (this.tracker?.wasHookInstalled(hookCommand, installedSettings)) {
-        logger.debug(`Skipping ${event} hook injection (previously removed by user)`);
-        continue;
-      }
-      settings.hooks[event] = [{ hooks: [{ type: "command", command: hookCommand }] }];
-      logger.info(`Injected ${event} hook`);
-      injected = true;
-      if (this.tracker) {
-        this.tracker.trackHook(hookCommand, installedSettings);
-      }
-    }
-    if (injected) {
-      await SettingsMerger.writeSettingsFile(destFile, settings);
-      if (this.tracker) {
-        await this.tracker.saveInstalledSettings(installedSettings);
-      }
-      logger.success("Team hooks injected successfully");
-    } else {
-      logger.debug("Team hooks already present, no injection needed");
-    }
-  }
 }
-var import_fs_extra11, import_semver2;
+var import_fs_extra11;
 var init_settings_processor = __esm(() => {
   init_installed_settings_tracker();
   init_settings_merger();
   init_logger();
   import_fs_extra11 = __toESM(require_lib(), 1);
-  import_semver2 = __toESM(require_semver2(), 1);
 });
 
 // src/domains/installation/merger/copy-executor.ts
@@ -40953,7 +40884,7 @@ async function loadPortableManifest(kitPath) {
   }
 }
 function getApplicableEntries(entries, appliedVersion, currentVersion) {
-  const normalizedCurrentVersionRaw = import_semver3.default.valid(currentVersion);
+  const normalizedCurrentVersionRaw = import_semver2.default.valid(currentVersion);
   if (!normalizedCurrentVersionRaw) {
     logger.verbose(`Invalid manifest current version "${currentVersion}" — skipping manifest entries safely`);
     return [];
@@ -40961,34 +40892,34 @@ function getApplicableEntries(entries, appliedVersion, currentVersion) {
   const normalizedCurrentVersion = normalizedCurrentVersionRaw;
   let normalizedAppliedVersion;
   if (appliedVersion) {
-    const normalizedAppliedVersionRaw = import_semver3.default.valid(appliedVersion);
+    const normalizedAppliedVersionRaw = import_semver2.default.valid(appliedVersion);
     if (!normalizedAppliedVersionRaw) {
       logger.verbose(`Invalid applied manifest version "${appliedVersion}" — skipping manifest entries safely`);
       return [];
     }
     normalizedAppliedVersion = normalizedAppliedVersionRaw;
-    if (import_semver3.default.gt(normalizedAppliedVersion, normalizedCurrentVersion)) {
+    if (import_semver2.default.gt(normalizedAppliedVersion, normalizedCurrentVersion)) {
       logger.verbose(`Applied manifest version ${normalizedAppliedVersion} is newer than current ${normalizedCurrentVersion} — skipping manifest entries safely`);
       return [];
     }
   }
   return entries.filter((entry) => {
-    const normalizedSince = import_semver3.default.valid(entry.since);
+    const normalizedSince = import_semver2.default.valid(entry.since);
     if (!normalizedSince) {
       logger.verbose(`Skipping manifest entry with invalid "since" version: ${entry.since}`);
       return false;
     }
     if (!normalizedAppliedVersion) {
-      return import_semver3.default.lte(normalizedSince, normalizedCurrentVersion);
+      return import_semver2.default.lte(normalizedSince, normalizedCurrentVersion);
     }
-    return import_semver3.default.gt(normalizedSince, normalizedAppliedVersion) && import_semver3.default.lte(normalizedSince, normalizedCurrentVersion);
+    return import_semver2.default.gt(normalizedSince, normalizedAppliedVersion) && import_semver2.default.lte(normalizedSince, normalizedCurrentVersion);
   });
 }
-var import_semver3, safeRelativePath, RenameEntrySchema, ProviderPathMigrationSchema, SectionRenameSchema, PortableManifestSchema;
+var import_semver2, safeRelativePath, RenameEntrySchema, ProviderPathMigrationSchema, SectionRenameSchema, PortableManifestSchema;
 var init_portable_manifest = __esm(() => {
   init_zod();
   init_logger();
-  import_semver3 = __toESM(require_semver2(), 1);
+  import_semver2 = __toESM(require_semver2(), 1);
   safeRelativePath = exports_external.string().min(1).refine((p) => !p.includes("..") && !path2.isAbsolute(p), {
     message: "Path must be relative without traversal"
   });
@@ -41300,26 +41231,26 @@ function findCapabilitiesForVersion(version3) {
   const exact = CODEX_CAPABILITY_TABLE.find((entry) => entry.version === version3);
   if (exact)
     return exact;
-  const coercedDetected = import_semver4.default.coerce(version3);
+  const coercedDetected = import_semver3.default.coerce(version3);
   if (!coercedDetected)
     return null;
   for (const entry of CODEX_CAPABILITY_TABLE) {
-    const coercedEntry = import_semver4.default.coerce(entry.version);
+    const coercedEntry = import_semver3.default.coerce(entry.version);
     if (!coercedEntry)
       continue;
     if (coercedDetected.major === coercedEntry.major && coercedDetected.minor === coercedEntry.minor) {
       return entry;
     }
-    if (import_semver4.default.gte(coercedDetected, coercedEntry)) {
+    if (import_semver3.default.gte(coercedDetected, coercedEntry)) {
       return entry;
     }
   }
   return null;
 }
-var import_semver4, execFileAsync2, CODEX_CAPABILITY_TABLE, FALLBACK_CAPABILITIES, CODEX_SUPPORTED_EVENTS;
+var import_semver3, execFileAsync2, CODEX_CAPABILITY_TABLE, FALLBACK_CAPABILITIES, CODEX_SUPPORTED_EVENTS;
 var init_capabilities = __esm(() => {
   init_logger();
-  import_semver4 = __toESM(require_semver2(), 1);
+  import_semver3 = __toESM(require_semver2(), 1);
   execFileAsync2 = promisify2(execFile2);
   CODEX_CAPABILITY_TABLE = [
     {
@@ -41432,9 +41363,9 @@ var init_capabilities = __esm(() => {
   ];
   if (CODEX_CAPABILITY_TABLE.length > 1) {
     for (let i = 0;i < CODEX_CAPABILITY_TABLE.length - 1; i++) {
-      const newer = import_semver4.default.coerce(CODEX_CAPABILITY_TABLE[i].version);
-      const older = import_semver4.default.coerce(CODEX_CAPABILITY_TABLE[i + 1].version);
-      if (newer && older && !import_semver4.default.gte(newer, older)) {
+      const newer = import_semver3.default.coerce(CODEX_CAPABILITY_TABLE[i].version);
+      const older = import_semver3.default.coerce(CODEX_CAPABILITY_TABLE[i + 1].version);
+      if (newer && older && !import_semver3.default.gte(newer, older)) {
         throw new Error(`[ck] CODEX_CAPABILITY_TABLE ordering violation: entry[${i}] (${CODEX_CAPABILITY_TABLE[i].version}) must be >= entry[${i + 1}] (${CODEX_CAPABILITY_TABLE[i + 1].version}). Table must be sorted newest-first.`);
       }
     }
@@ -44296,6 +44227,23 @@ var init_agent_prune = __esm(() => {
   init_post_pipeline();
 });
 
+// src/domains/installers/codex/codex-paths.ts
+import { homedir as homedir16 } from "node:os";
+import { join as join60 } from "node:path";
+function codexGlobalRoot() {
+  const testHome = process.env.TAKUMI_TEST_HOME;
+  if (testHome && testHome.trim() !== "")
+    return join60(testHome, ".codex");
+  const codexHome = process.env.CODEX_HOME;
+  if (codexHome && codexHome.trim() !== "" && !codexHome.includes(".."))
+    return codexHome;
+  const xdg = process.env.XDG_CONFIG_HOME;
+  if (xdg && xdg.trim() !== "" && !xdg.includes(".."))
+    return join60(xdg, "codex");
+  return join60(homedir16(), ".codex");
+}
+var init_codex_paths = () => {};
+
 // src/commands/portable/output-sanitizer.ts
 function isDisallowedControlCode(codePoint) {
   return codePoint >= 0 && codePoint <= 8 || codePoint >= 11 && codePoint <= 26 || codePoint >= 28 && codePoint <= 31 || codePoint >= 127 && codePoint <= 159;
@@ -44916,7 +44864,7 @@ var init_reconciler = __esm(() => {
 
 // src/domains/installers/codex/codex-env-marker.ts
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join60 } from "node:path";
+import { join as join61 } from "node:path";
 function writeCodexEnvMarker(global3, projectRoot) {
   try {
     const pathConfig = providers.codex.hooks;
@@ -44925,10 +44873,10 @@ function writeCodexEnvMarker(global3, projectRoot) {
     const scopedPath = global3 ? pathConfig.globalPath : pathConfig.projectPath;
     if (!scopedPath)
       return;
-    const targetHooksDir = global3 ? scopedPath : join60(projectRoot ?? process.cwd(), scopedPath);
-    const libDir = join60(targetHooksDir, "lib");
+    const targetHooksDir = global3 ? scopedPath : join61(projectRoot ?? process.cwd(), scopedPath);
+    const libDir = join61(targetHooksDir, "lib");
     mkdirSync3(libDir, { recursive: true });
-    writeFileSync5(join60(libDir, "env.cjs"), CODEX_ENV_MARKER);
+    writeFileSync5(join61(libDir, "env.cjs"), CODEX_ENV_MARKER);
   } catch (e2) {
     logger.debug(`[init/codex] writeCodexEnvMarker failed: ${String(e2)}`);
   }
@@ -44942,7 +44890,7 @@ var init_codex_env_marker = __esm(() => {
 
 // src/domains/installers/shared/writers/install-one-file.ts
 import { writeFile as writeFile18 } from "node:fs/promises";
-import { dirname as dirname18, join as join61, resolve as resolve15, sep as sep5 } from "node:path";
+import { dirname as dirname18, join as join62, resolve as resolve15, sep as sep5 } from "node:path";
 async function installOneFile(item, provider, kind, options2) {
   const config = providers[provider];
   const typeKey = getProviderPathKey(kind);
@@ -44998,7 +44946,7 @@ async function installOneFile(item, provider, kind, options2) {
       const nameWithoutExt = extIdx >= 0 ? resolvedFilename.substring(0, extIdx) : resolvedFilename;
       resolvedFilename = `${nameWithoutExt.replace(/\//g, "-")}${ext}`;
     }
-    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join61(basePath, resolvedFilename);
+    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join62(basePath, resolvedFilename);
     const resolvedTarget = resolve15(targetPath);
     const resolvedBase = pathConfig.writeStrategy === "single-file" ? resolve15(dirname18(basePath)) : resolve15(basePath);
     if (!resolvedTarget.startsWith(resolvedBase + sep5) && resolvedTarget !== resolvedBase) {
@@ -45638,7 +45586,7 @@ var init_install_items = __esm(() => {
 // src/domains/installers/shared/skill-directory-installer.ts
 import { existsSync as existsSync25 } from "node:fs";
 import { cp as cp3, mkdir as mkdir13, rename as rename6, rm as rm5 } from "node:fs/promises";
-import { join as join62, resolve as resolve16 } from "node:path";
+import { join as join63, resolve as resolve16 } from "node:path";
 async function installSkillDirectories(skills, targetProviders, options2) {
   const results = [];
   for (const provider of targetProviders) {
@@ -45667,7 +45615,7 @@ async function installSkillDirectories(skills, targetProviders, options2) {
     }
     const basePath = resolveInstallBasePath(rawBasePath, options2);
     for (const skill of skills) {
-      const targetDir = join62(basePath, skill.name);
+      const targetDir = join63(basePath, skill.name);
       if (resolve16(skill.path) === resolve16(targetDir)) {
         results.push({
           provider,
@@ -46030,19 +45978,19 @@ var init_reconcile_helpers = __esm(() => {
 // src/commands/portable/config-discovery.ts
 import { existsSync as existsSync27 } from "node:fs";
 import { readFile as readFile31, readdir as readdir20 } from "node:fs/promises";
-import { homedir as homedir16 } from "node:os";
-import { extname as extname4, join as join63, relative as relative12, sep as sep6 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { extname as extname4, join as join64, relative as relative12, sep as sep6 } from "node:path";
 function getConfigSourcePath() {
   return findExistingProjectConfigPath(process.cwd()) ?? getGlobalConfigSourcePath();
 }
 function getGlobalConfigSourcePath() {
-  return join63(homedir16(), ".claude", "CLAUDE.md");
+  return join64(homedir17(), ".claude", "CLAUDE.md");
 }
 function getRulesSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? join63(homedir16(), ".claude", "rules");
+  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? join64(homedir17(), ".claude", "rules");
 }
 function getHooksSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? join63(homedir16(), ".claude", "hooks");
+  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? join64(homedir17(), ".claude", "hooks");
 }
 async function discoverConfig(sourcePath) {
   const path5 = sourcePath ?? getConfigSourcePath();
@@ -46094,7 +46042,7 @@ async function discoverHooks(sourcePath) {
     }
     if (!HOOK_EXTENSIONS.has(ext))
       continue;
-    const fullPath = join63(path5, entry.name);
+    const fullPath = join64(path5, entry.name);
     try {
       const content = await readFile31(fullPath, "utf-8");
       items.push({
@@ -46120,7 +46068,7 @@ async function discoverPortableFiles(dir, baseDir, options2) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const fullPath = join63(dir, entry.name);
+    const fullPath = join64(dir, entry.name);
     if (entry.isSymbolicLink()) {
       continue;
     }
@@ -46163,12 +46111,12 @@ var init_config_discovery = __esm(() => {
 
 // src/domains/installers/shared/commands-discovery.ts
 import { readdir as readdir21 } from "node:fs/promises";
-import { homedir as homedir17 } from "node:os";
-import { join as join64, relative as relative13 } from "node:path";
+import { homedir as homedir18 } from "node:os";
+import { join as join65, relative as relative13 } from "node:path";
 function getCommandSourcePath() {
   return findFirstExistingPath([
     ...getProjectLayoutCandidates(process.cwd(), "commands"),
-    join64(home5, ".claude/commands")
+    join65(home5, ".claude/commands")
   ]);
 }
 async function scanCommandDir(dir, rootDir) {
@@ -46176,7 +46124,7 @@ async function scanCommandDir(dir, rootDir) {
   try {
     const entries = await readdir21(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join64(dir, entry.name);
+      const fullPath = join65(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIP_DIRS2.includes(entry.name))
           continue;
@@ -46219,7 +46167,7 @@ var init_commands_discovery = __esm(() => {
   init_frontmatter_parser();
   init_kit_layout();
   init_logger();
-  home5 = homedir17();
+  home5 = homedir18();
   SKIP_DIRS2 = ["node_modules", ".git", "dist", "build"];
 });
 
@@ -46328,8 +46276,8 @@ __export(exports_takumi_config_manager, {
 });
 import { existsSync as existsSync28 } from "node:fs";
 import { mkdir as mkdir14, readFile as readFile33, writeFile as writeFile20 } from "node:fs/promises";
-import { homedir as homedir18 } from "node:os";
-import { join as join65 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { join as join66 } from "node:path";
 function getNestedValue(obj, path5) {
   if (!obj || typeof obj !== "object")
     return;
@@ -46403,25 +46351,25 @@ function valuesEqual(a3, b3) {
 
 class TakumiConfigManager {
   static getGlobalConfigDir() {
-    return join65(homedir18(), ".claude");
+    return join66(homedir19(), ".claude");
   }
   static resolveConfigPath(dir) {
-    const preferred = join65(dir, TAKUMI_CONFIG_FILE);
+    const preferred = join66(dir, TAKUMI_CONFIG_FILE);
     if (existsSync28(preferred))
       return preferred;
-    const legacy = join65(dir, LEGACY_TAKUMI_CONFIG_FILE);
+    const legacy = join66(dir, LEGACY_TAKUMI_CONFIG_FILE);
     if (existsSync28(legacy))
       return legacy;
     return preferred;
   }
   static configFileExistsIn(dir) {
-    return existsSync28(join65(dir, TAKUMI_CONFIG_FILE)) || existsSync28(join65(dir, LEGACY_TAKUMI_CONFIG_FILE));
+    return existsSync28(join66(dir, TAKUMI_CONFIG_FILE)) || existsSync28(join66(dir, LEGACY_TAKUMI_CONFIG_FILE));
   }
   static getGlobalConfigPath() {
     return TakumiConfigManager.resolveConfigPath(TakumiConfigManager.getGlobalConfigDir());
   }
   static getProjectConfigDir(projectDir) {
-    return join65(projectDir, ".claude");
+    return join66(projectDir, ".claude");
   }
   static getProjectConfigPath(projectDir) {
     return TakumiConfigManager.resolveConfigPath(TakumiConfigManager.getProjectConfigDir(projectDir));
@@ -46703,7 +46651,7 @@ var init_install_pipeline = __esm(() => {
 });
 
 // src/domains/installers/codex/skills-paths.ts
-import { homedir as homedir19 } from "node:os";
+import { homedir as homedir20 } from "node:os";
 import { resolve as resolve17 } from "node:path";
 function getCodexSkillsTargetDir(global3, projectRoot) {
   const cfg = providers.codex.skills;
@@ -46716,7 +46664,7 @@ function getCodexSkillsTargetDir(global3, projectRoot) {
   }
   const projectBase = projectRoot ?? process.cwd();
   const resolved = global3 ? resolve17(path5) : resolve17(projectBase, path5);
-  const boundary = global3 ? homedir19() : projectBase;
+  const boundary = global3 ? homedir20() : projectBase;
   if (!isPathWithinBoundary(resolved, boundary)) {
     throw new Error(`[codex] resolved skills path "${resolved}" escapes boundary "${boundary}"`);
   }
@@ -46728,7 +46676,7 @@ var init_skills_paths = __esm(() => {
 });
 
 // src/domains/installers/codex/scan-codex-directory.ts
-import { join as join66 } from "node:path";
+import { join as join67 } from "node:path";
 async function scanCodexDirectory(root, opts = {}) {
   const counts = { agents: 0, commands: 0, rules: 0, skills: 0 };
   try {
@@ -46736,11 +46684,11 @@ async function scanCodexDirectory(root, opts = {}) {
       return counts;
     const items = await import_fs_extra32.readdir(root);
     if (items.includes("agents")) {
-      const files = await import_fs_extra32.readdir(join66(root, "agents")).catch(() => []);
+      const files = await import_fs_extra32.readdir(join67(root, "agents")).catch(() => []);
       counts.agents = files.filter((f3) => f3.endsWith(".toml")).length;
     }
     if (items.includes("prompts")) {
-      const files = await import_fs_extra32.readdir(join66(root, "prompts")).catch(() => []);
+      const files = await import_fs_extra32.readdir(join67(root, "prompts")).catch(() => []);
       counts.commands = files.filter((f3) => f3.endsWith(".md")).length;
     }
     if (items.includes("AGENTS.md"))
@@ -46749,7 +46697,7 @@ async function scanCodexDirectory(root, opts = {}) {
     if (await import_fs_extra32.pathExists(skillsRoot)) {
       const dirs = await import_fs_extra32.readdir(skillsRoot).catch(() => []);
       for (const d3 of dirs) {
-        const skillDir = join66(skillsRoot, d3);
+        const skillDir = join67(skillsRoot, d3);
         const entries = await import_fs_extra32.readdir(skillDir).catch(() => null);
         if (entries?.includes("SKILL.md"))
           counts.skills++;
@@ -46766,7 +46714,7 @@ var init_scan_codex_directory = __esm(() => {
 
 // src/domains/installers/codex/source-resolver.ts
 import { existsSync as existsSync29 } from "node:fs";
-import { join as join67 } from "node:path";
+import { join as join68 } from "node:path";
 function resolveCodexSources(extractDir) {
   return {
     agents: findExistingProjectLayoutPath(extractDir, "agents"),
@@ -46778,7 +46726,7 @@ function resolveCodexSources(extractDir) {
   };
 }
 function resolveConfigSource(extractDir) {
-  const rootClaudeMd = join67(extractDir, "CLAUDE.md");
+  const rootClaudeMd = join68(extractDir, "CLAUDE.md");
   if (existsSync29(rootClaudeMd))
     return rootClaudeMd;
   return findExistingProjectConfigPath(extractDir);
@@ -46791,7 +46739,7 @@ var init_source_resolver = __esm(() => {
 });
 
 // src/domains/installers/codex/manifest-helpers.ts
-import { join as join68, relative as relative14, sep as sep7 } from "node:path";
+import { join as join69, relative as relative14, sep as sep7 } from "node:path";
 async function collectCodexInstalledFiles(results, codexRoot) {
   const out = [];
   const toPosix = (p) => p.split(sep7).join("/");
@@ -46814,7 +46762,7 @@ async function collectCodexInstalledFiles(results, codexRoot) {
 async function walkDir(dir, root, out, toPosix) {
   const entries = await import_fs_extra33.readdir(dir, { withFileTypes: true }).catch(() => []);
   for (const e2 of entries) {
-    const p = join68(dir, e2.name);
+    const p = join69(dir, e2.name);
     if (e2.isDirectory()) {
       await walkDir(p, root, out, toPosix);
     } else if (e2.isFile()) {
@@ -46857,22 +46805,9 @@ var init_write_codex_manifest = __esm(() => {
 // src/domains/installers/codex/installer.ts
 import { existsSync as existsSync30 } from "node:fs";
 import { rm as rm6 } from "node:fs/promises";
-import { homedir as homedir20 } from "node:os";
-import { join as join69 } from "node:path";
-function codexGlobalRoot() {
-  const testHome = process.env.TAKUMI_TEST_HOME;
-  if (testHome && testHome.trim() !== "")
-    return join69(testHome, ".codex");
-  const codexHome = process.env.CODEX_HOME;
-  if (codexHome && codexHome.trim() !== "" && !codexHome.includes(".."))
-    return codexHome;
-  const xdg = process.env.XDG_CONFIG_HOME;
-  if (xdg && xdg.trim() !== "" && !xdg.includes(".."))
-    return join69(xdg, "codex");
-  return join69(homedir20(), ".codex");
-}
+import { join as join70 } from "node:path";
 function resolveCodexRoot(ctx) {
-  return ctx.options.global ? codexGlobalRoot() : join69(ctx.resolvedDir ?? process.cwd(), ".codex");
+  return ctx.options.global ? codexGlobalRoot() : join70(ctx.resolvedDir ?? process.cwd(), ".codex");
 }
 async function resolveCodexEffectiveSelection(ctx, codexRoot) {
   if (ctx.kitType === BASE_KIT) {
@@ -46900,7 +46835,7 @@ async function syncCodexSkillsLedger(args) {
   }
   const claims = [];
   for (const name of args.keptSkills) {
-    const dir = join69(skillsRoot, name);
+    const dir = join70(skillsRoot, name);
     try {
       if (!existsSync30(dir))
         continue;
@@ -46955,7 +46890,7 @@ async function wipeCodexTargets(global3, projectRoot) {
     global3 ? codexConfig.config?.globalPath : codexConfig.config?.projectPath
   ].filter((p) => Boolean(p));
   const projectBase = projectRoot ?? process.cwd();
-  const targetPaths = rawPaths.map((p) => global3 ? p : join69(projectBase, p));
+  const targetPaths = rawPaths.map((p) => global3 ? p : join70(projectBase, p));
   for (const path5 of targetPaths) {
     if (existsSync30(path5)) {
       try {
@@ -46982,6 +46917,7 @@ var init_installer2 = __esm(() => {
   init_types2();
   init_dist2();
   init_agent_prune();
+  init_codex_paths();
   init_install_pipeline();
   init_scan_codex_directory();
   init_skills_paths();
@@ -46996,7 +46932,7 @@ var init_installer2 = __esm(() => {
       const root = this.globalRoot();
       if (!existsSync30(root))
         return false;
-      return findManifestPathSync(root) !== null || existsSync30(join69(root, "AGENTS.md")) || existsSync30(join69(root, "agents")) || existsSync30(join69(root, "config.toml")) || existsSync30(join69(root, "prompts"));
+      return findManifestPathSync(root) !== null || existsSync30(join70(root, "AGENTS.md")) || existsSync30(join70(root, "agents")) || existsSync30(join70(root, "config.toml")) || existsSync30(join70(root, "prompts"));
     },
     async detectGlobalSetup() {
       const root = this.globalRoot();
@@ -47195,12 +47131,12 @@ var require_umd = __commonJS((exports, module) => {
   (function(global3, factory) {
     typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global3 = typeof globalThis !== "undefined" ? globalThis : global3 || self, factory(global3.compareVersions = {}));
   })(exports, function(exports2) {
-    const semver5 = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
+    const semver4 = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
     const validateAndParse = (version3) => {
       if (typeof version3 !== "string") {
         throw new TypeError("Invalid argument expected string");
       }
-      const match = version3.match(semver5);
+      const match = version3.match(semver4);
       if (!match) {
         throw new Error(`Invalid argument not valid semver ('${version3}' received)`);
       }
@@ -47302,7 +47238,7 @@ var require_umd = __commonJS((exports, module) => {
         return false;
       return true;
     };
-    const validate2 = (version3) => typeof version3 === "string" && /^[v\d]/.test(version3) && semver5.test(version3);
+    const validate2 = (version3) => typeof version3 === "string" && /^[v\d]/.test(version3) && semver4.test(version3);
     const validateStrict = (version3) => typeof version3 === "string" && /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/.test(version3);
     exports2.compare = compare;
     exports2.compareVersions = compareVersions;
@@ -47362,7 +47298,7 @@ var init_version_utils = __esm(() => {
 });
 
 // src/domains/github/github-auth.ts
-import { execSync as execSync2 } from "node:child_process";
+import { execSync } from "node:child_process";
 
 class AuthManager {
   static token = null;
@@ -47446,7 +47382,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
   static runDiagnostic() {
     const info = [];
     try {
-      const version3 = execSync2("gh --version", {
+      const version3 = execSync("gh --version", {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
         timeout: 3000
@@ -47457,7 +47393,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
       info.push("  gh version: failed to retrieve");
     }
     try {
-      const status = execSync2("gh auth status -h github.com", {
+      const status = execSync("gh auth status -h github.com", {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
         timeout: 5000
@@ -47483,7 +47419,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
       return AuthManager.ghCliInstalled;
     }
     try {
-      execSync2("gh --version", {
+      execSync("gh --version", {
         stdio: "ignore",
         timeout: 5000
       });
@@ -47496,7 +47432,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
   }
   static getFromGhCli() {
     try {
-      const token = execSync2("gh auth token -h github.com", {
+      const token = execSync("gh auth token -h github.com", {
         encoding: "utf-8",
         stdio: ["pipe", "pipe", "pipe"],
         timeout: 5000
@@ -47511,7 +47447,7 @@ Note: Do NOT use 'Paste an authentication token' - use web browser login.`);
         logger.debug(`gh auth token stderr: ${error.stderr.toString().trim()}`);
       }
       try {
-        const token = execSync2("gh auth token", {
+        const token = execSync("gh auth token", {
           encoding: "utf-8",
           stdio: ["pipe", "pipe", "pipe"],
           timeout: 5000
@@ -47807,7 +47743,7 @@ var init_error_handler = __esm(() => {
 // src/domains/versioning/release-cache.ts
 import { existsSync as existsSync31 } from "node:fs";
 import { mkdir as mkdir15, readFile as readFile34, unlink as unlink7, writeFile as writeFile21 } from "node:fs/promises";
-import { join as join70 } from "node:path";
+import { join as join71 } from "node:path";
 var ReleaseCacheEntrySchema, ReleaseCache;
 var init_release_cache = __esm(() => {
   init_logger();
@@ -47822,7 +47758,7 @@ var init_release_cache = __esm(() => {
     static CACHE_TTL_SECONDS = Number(process.env.TAKUMI_CACHE_TTL) || 3600;
     cacheDir;
     constructor() {
-      this.cacheDir = join70(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
+      this.cacheDir = join71(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
     }
     async get(key) {
       const cacheFile = this.getCachePath(key);
@@ -47880,7 +47816,7 @@ var init_release_cache = __esm(() => {
           const files = await readdir24(this.cacheDir);
           for (const file of files) {
             if (file.endsWith(".json")) {
-              await unlink7(join70(this.cacheDir, file));
+              await unlink7(join71(this.cacheDir, file));
             }
           }
           logger.debug("All release cache cleared");
@@ -47891,7 +47827,7 @@ var init_release_cache = __esm(() => {
     }
     getCachePath(key) {
       const safeKey = key.replace(/[^a-zA-Z0-9_-]/g, "_");
-      return join70(this.cacheDir, `${safeKey}.json`);
+      return join71(this.cacheDir, `${safeKey}.json`);
     }
     isExpired(timestamp) {
       const now = Date.now();
@@ -48541,7 +48477,7 @@ var init_github_client = __esm(() => {
 // src/domains/versioning/version-cache.ts
 import { existsSync as existsSync32 } from "node:fs";
 import { mkdir as mkdir16, readFile as readFile35, writeFile as writeFile22 } from "node:fs/promises";
-import { join as join71 } from "node:path";
+import { join as join72 } from "node:path";
 var VersionCacheManager;
 var init_version_cache = __esm(() => {
   init_logger();
@@ -48551,7 +48487,7 @@ var init_version_cache = __esm(() => {
     static CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
     static getCacheFile() {
       const cacheDir = PathResolver.getCacheDir(false);
-      return join71(cacheDir, VersionCacheManager.CACHE_FILENAME);
+      return join72(cacheDir, VersionCacheManager.CACHE_FILENAME);
     }
     static async load() {
       const cacheFile = VersionCacheManager.getCacheFile();
@@ -49007,18 +48943,18 @@ var init_version_display = __esm(() => {
 
 // src/domains/auth/paths.ts
 import { homedir as homedir21 } from "node:os";
-import { join as join72 } from "node:path";
+import { join as join73 } from "node:path";
 function getConfigDir() {
   const override = process.env.TAKUMI_HOME;
   if (override && override.trim().length > 0)
     return override;
-  return join72(homedir21(), STATE_DIRNAME);
+  return join73(homedir21(), STATE_DIRNAME);
 }
 function getAuthDir() {
-  return join72(getConfigDir(), "auth");
+  return join73(getConfigDir(), "auth");
 }
 function getTokenPath() {
-  return join72(getAuthDir(), "token.json");
+  return join73(getAuthDir(), "token.json");
 }
 var init_paths2 = __esm(() => {
   init_build_config();
@@ -49026,9 +48962,9 @@ var init_paths2 = __esm(() => {
 
 // src/domains/auth/config-cache.ts
 import { promises as fs } from "node:fs";
-import { join as join73 } from "node:path";
+import { join as join74 } from "node:path";
 function getCachePath() {
-  return join73(getConfigDir(), "auth", "config.json");
+  return join74(getConfigDir(), "auth", "config.json");
 }
 async function readCachedConfig() {
   try {
@@ -49052,7 +48988,7 @@ async function readCachedConfig() {
 }
 async function writeCachedConfig(config) {
   const path5 = getCachePath();
-  const dir = join73(getConfigDir(), "auth");
+  const dir = join74(getConfigDir(), "auth");
   await fs.mkdir(dir, { recursive: true, mode: 448 });
   const body = { ...config, cachedAt: Date.now() };
   const fh = await fs.open(path5, "w", 384);
@@ -50611,12 +50547,12 @@ import {
   rmSync as rmSync4,
   writeFileSync as writeFileSync9
 } from "node:fs";
-import { join as join103 } from "node:path";
+import { join as join104 } from "node:path";
 function getStatuslineCacheDir() {
-  return join103(getConfigDir(), "cache", "statusline");
+  return join104(getConfigDir(), "cache", "statusline");
 }
 function getStatuslineCachePath(fileName) {
-  return join103(getStatuslineCacheDir(), fileName);
+  return join104(getStatuslineCacheDir(), fileName);
 }
 function ensureStatuslineCacheDir() {
   try {
@@ -50682,7 +50618,7 @@ var init_cache_dir = __esm(() => {
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { closeSync as closeSync6, constants as fsConstants4, fstatSync as fstatSync2, openSync as openSync7, readFileSync as readFileSync15 } from "node:fs";
 import { homedir as homedir28, platform as platform8 } from "node:os";
-import { join as join104 } from "node:path";
+import { join as join105 } from "node:path";
 function hasAnthropicRuntimeOverride(env2 = process.env) {
   return OVERRIDE_ENV_KEYS.some((key) => {
     const value = env2[key];
@@ -50732,7 +50668,7 @@ function readTrustedFile(path10) {
   }
 }
 function fromCredentialsFile() {
-  const raw = readTrustedFile(join104(homedir28(), ".claude", ".credentials.json"));
+  const raw = readTrustedFile(join105(homedir28(), ".claude", ".credentials.json"));
   if (!raw)
     return null;
   try {
@@ -50890,14 +50826,14 @@ var exports_monorepo_resolver = {};
 __export(exports_monorepo_resolver, {
   resolveMonorepoRoot: () => resolveMonorepoRoot
 });
-import { existsSync as existsSync60, readFileSync as readFileSync23 } from "node:fs";
-import { dirname as dirname34, join as join124, resolve as resolve29 } from "node:path";
+import { existsSync as existsSync60, readFileSync as readFileSync26 } from "node:fs";
+import { dirname as dirname34, join as join130, resolve as resolve29 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function parseMetadataAt(metadataPath) {
   if (!existsSync60(metadataPath))
     return null;
   try {
-    const raw = readFileSync23(metadataPath, "utf-8");
+    const raw = readFileSync26(metadataPath, "utf-8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.name !== "string" || typeof parsed.version !== "string" || !ACCEPTED_METADATA_NAMES.has(parsed.name)) {
       return null;
@@ -50908,11 +50844,11 @@ function parseMetadataAt(metadataPath) {
   }
 }
 function readSourceDirFromPackageJson(candidateRoot) {
-  const packageJsonPath = join124(candidateRoot, "package.json");
+  const packageJsonPath = join130(candidateRoot, "package.json");
   if (!existsSync60(packageJsonPath))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync23(packageJsonPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync26(packageJsonPath, "utf-8"));
     const kitCfg = parsed.takumi;
     if (kitCfg && typeof kitCfg.sourceDir === "string" && kitCfg.sourceDir.length > 0) {
       return kitCfg.sourceDir;
@@ -50931,7 +50867,7 @@ function tryReadAtCandidate(candidateRoot) {
     };
   }
   const sourceDir = readSourceDirFromPackageJson(candidateRoot) ?? "claude";
-  const sourceRoot = join124(candidateRoot, sourceDir);
+  const sourceRoot = join130(candidateRoot, sourceDir);
   const nestedMetadata = parseMetadataAt(getManifestPath(sourceRoot)) ?? parseMetadataAt(getLegacyManifestPath(sourceRoot));
   if (nestedMetadata) {
     return {
@@ -52025,8 +51961,8 @@ function renderHelp(help, context = { globalHelp: false, options: DEFAULT_HELP_O
   const sections = [
     renderBanner2(options2),
     renderDeprecationWarning(help, theme),
-    renderCommandHeader(help, theme),
-    "",
+    `${renderCommandHeader(help, theme)}
+`,
     renderUsage(help, theme),
     renderExamples(help, options2),
     renderOptionGroups(help, theme),
@@ -52132,7 +52068,7 @@ async function handleHelp(_args) {
       output3 = renderHelp(help, {
         command: help.name,
         globalHelp: false,
-        options: options2
+        options: { ...options2, showBanner: false }
       });
     }
     await displayHelp(output3, options2);
@@ -54082,9 +54018,9 @@ import { promises as fs9 } from "node:fs";
 
 // src/domains/artifact/paths.ts
 init_paths2();
-import { join as join74 } from "node:path";
+import { join as join75 } from "node:path";
 function getManifestPath2() {
-  return join74(getConfigDir(), "artifacts.json");
+  return join75(getConfigDir(), "artifacts.json");
 }
 
 // src/domains/artifact/manifest-store.ts
@@ -54277,13 +54213,13 @@ import { basename as basename11, resolve as resolve18 } from "node:path";
 
 // src/domains/artifact/folder-download.ts
 import { promises as fs10 } from "node:fs";
-import { dirname as dirname19, isAbsolute as isAbsolute4, join as join75, normalize as normalize5 } from "node:path";
+import { dirname as dirname19, isAbsolute as isAbsolute4, join as join76, normalize as normalize5 } from "node:path";
 var CONCURRENCY = 6;
 function sanitizeFilePath(filePath, destDir) {
   if (isAbsolute4(filePath)) {
     throw new Error(`Path traversal rejected: absolute path "${filePath}"`);
   }
-  const resolved = normalize5(join75(destDir, filePath));
+  const resolved = normalize5(join76(destDir, filePath));
   const safeBase = normalize5(destDir);
   if (resolved !== safeBase && !resolved.startsWith(`${safeBase}/`)) {
     throw new Error(`Path traversal rejected: "${filePath}" escapes destination directory`);
@@ -54697,7 +54633,7 @@ import { basename as basename12, extname as extname6, resolve as resolve19 } fro
 // src/domains/artifact/folder-walk.ts
 var import_ignore4 = __toESM(require_ignore(), 1);
 import { promises as fs12 } from "node:fs";
-import { join as join76, relative as relative15 } from "node:path";
+import { join as join77, relative as relative15 } from "node:path";
 var MAX_FILE_BYTES = 20 * 1024 * 1024;
 var IGNORE_FILES = [".gitignore", ".tkmignore"];
 var HARD_IGNORES = [".git", ".gitignore", ".tkmignore"];
@@ -54713,7 +54649,7 @@ async function buildIgnoreMatcher(rootDir) {
   const ig = import_ignore4.default();
   for (const file of IGNORE_FILES) {
     try {
-      ig.add(await fs12.readFile(join76(rootDir, file), "utf8"));
+      ig.add(await fs12.readFile(join77(rootDir, file), "utf8"));
     } catch {}
   }
   ig.add(HARD_IGNORES);
@@ -54745,7 +54681,7 @@ async function walk2(rootDir, dir, ig, out, skipped) {
     if (dirent.isSymbolicLink())
       continue;
     const name = String(dirent.name);
-    const absPath = join76(dir, name);
+    const absPath = join77(dir, name);
     const relPath = relative15(rootDir, absPath).split("\\").join("/");
     if (dirent.isDirectory()) {
       if (ig.ignores(`${relPath}/`)) {
@@ -55295,14 +55231,14 @@ import { existsSync as existsSync33 } from "node:fs";
 import { copyFile as copyFile4, mkdir as mkdir17, readFile as readFile36, rename as rename7, rm as rm7, writeFile as writeFile23 } from "node:fs/promises";
 import { chmod as chmod2 } from "node:fs/promises";
 import { homedir as homedir22, platform as platform4 } from "node:os";
-import { join as join77 } from "node:path";
+import { join as join78 } from "node:path";
 var PROJECT_CONFIG_FILE = ".takumi.json";
 
 class ConfigManager {
   static config = null;
   static globalFlag = false;
   static getProjectConfigDir(projectDir, global3) {
-    return global3 ? projectDir : join77(projectDir, ".claude");
+    return global3 ? projectDir : join78(projectDir, ".claude");
   }
   static setGlobalFlag(global3) {
     ConfigManager.globalFlag = global3;
@@ -55316,7 +55252,7 @@ class ConfigManager {
       return;
     const testHome = process.env.TAKUMI_TEST_HOME;
     const base = testHome && testHome.trim() !== "" ? testHome : homedir22();
-    const legacyFile = join77(base, ".sunagentkit", "config.json");
+    const legacyFile = join78(base, ".sunagentkit", "config.json");
     if (!existsSync33(legacyFile))
       return;
     const targetFile = PathResolver.getConfigFile(false);
@@ -55401,7 +55337,7 @@ class ConfigManager {
   }
   static async loadProjectConfig(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join77(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join78(configDir, PROJECT_CONFIG_FILE);
     try {
       if (existsSync33(configPath)) {
         const content = await readFile36(configPath, "utf-8");
@@ -55417,7 +55353,7 @@ class ConfigManager {
   }
   static async saveProjectConfig(projectDir, folders, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    const configPath = join77(configDir, PROJECT_CONFIG_FILE);
+    const configPath = join78(configDir, PROJECT_CONFIG_FILE);
     try {
       if (!existsSync33(configDir)) {
         await mkdir17(configDir, { recursive: true });
@@ -55466,11 +55402,11 @@ class ConfigManager {
   }
   static projectConfigExists(projectDir, global3 = false) {
     const configDir = ConfigManager.getProjectConfigDir(projectDir, global3);
-    return existsSync33(join77(configDir, PROJECT_CONFIG_FILE));
+    return existsSync33(join78(configDir, PROJECT_CONFIG_FILE));
   }
   static async migrateNestedConfig(globalDir) {
-    const correctPath = join77(globalDir, PROJECT_CONFIG_FILE);
-    const incorrectPath = join77(globalDir, ".claude", PROJECT_CONFIG_FILE);
+    const correctPath = join78(globalDir, PROJECT_CONFIG_FILE);
+    const incorrectPath = join78(globalDir, ".claude", PROJECT_CONFIG_FILE);
     if (existsSync33(correctPath)) {
       logger.debug("Config already exists at correct location, skipping migration");
       return false;
@@ -55480,7 +55416,7 @@ class ConfigManager {
         logger.info("Migrating .takumi.json from nested location to correct location...");
         await rename7(incorrectPath, correctPath);
         logger.success(`Migrated ${PROJECT_CONFIG_FILE} to ${correctPath}`);
-        const nestedClaudeDir = join77(globalDir, ".claude");
+        const nestedClaudeDir = join78(globalDir, ".claude");
         try {
           await rm7(nestedClaudeDir, { recursive: false });
           logger.debug("Removed empty nested .claude directory");
@@ -57180,7 +57116,7 @@ function filterSessionMetas(metas, filter) {
 // src/domains/sessions/store/ingest.ts
 import { createHash as createHash10 } from "node:crypto";
 import { closeSync as closeSync4, openSync as openSync4, readSync as readSync4, readdirSync as readdirSync7, statSync as statSync5 } from "node:fs";
-import { basename as basename15, dirname as dirname21, join as join81 } from "node:path";
+import { basename as basename15, dirname as dirname21, join as join82 } from "node:path";
 
 // node_modules/kysely/dist/util/object-utils.js
 function isUndefined(obj) {
@@ -58612,10 +58548,10 @@ var QueryNode = freeze({
       where: node.where ? WhereNode.cloneWithOperation(node.where, "And", operation) : WhereNode.create(operation)
     });
   },
-  cloneWithJoin(node, join80) {
+  cloneWithJoin(node, join81) {
     return freeze({
       ...node,
-      joins: node.joins ? freeze([...node.joins, join80]) : freeze([join80])
+      joins: node.joins ? freeze([...node.joins, join81]) : freeze([join81])
     });
   },
   cloneWithReturning(node, selections) {
@@ -61166,8 +61102,8 @@ class WithSchemaTransformer extends OperationNodeTransformer {
       this.#collectSchemableIdsFromTableExpr(node.table, schemableIds);
     }
     if ("joins" in node && node.joins) {
-      for (const join80 of node.joins) {
-        this.#collectSchemableIdsFromTableExpr(join80.table, schemableIds);
+      for (const join81 of node.joins) {
+        this.#collectSchemableIdsFromTableExpr(join81.table, schemableIds);
       }
     }
     if ("using" in node && node.using) {
@@ -66439,7 +66375,7 @@ var import_proper_lockfile8 = __toESM(require_proper_lockfile(), 1);
 
 // src/domains/sessions/store/db.ts
 import { promises as fs17 } from "node:fs";
-import { join as join80 } from "node:path";
+import { join as join81 } from "node:path";
 init_logger();
 init_paths2();
 
@@ -66534,10 +66470,10 @@ class StoreUnavailableError extends Error {
 
 // src/domains/sessions/store/db.ts
 function getConsoleStoreDir() {
-  return join80(getConfigDir(), "console");
+  return join81(getConfigDir(), "console");
 }
 function getConsoleStorePath() {
-  return join80(getConsoleStoreDir(), "store.sqlite");
+  return join81(getConsoleStoreDir(), "store.sqlite");
 }
 async function chmodSafe2(path8, mode) {
   try {
@@ -66806,7 +66742,7 @@ async function ingestFile(handle, target) {
 }
 function subagentDirFor(mainPath) {
   const stem = basename15(mainPath).replace(/\.jsonl$/i, "");
-  return join81(dirname21(mainPath), stem, "subagents");
+  return join82(dirname21(mainPath), stem, "subagents");
 }
 async function enumerateTargets(refresh2 = false) {
   const sessions = await list({ refresh: refresh2 });
@@ -66828,7 +66764,7 @@ async function enumerateTargets(refresh2 = false) {
     } catch {}
     for (const f3 of files) {
       targets.push({
-        path: join81(dir, f3),
+        path: join82(dir, f3),
         adapter: "claude",
         sessionId: s.id,
         project: s.project,
@@ -66839,7 +66775,7 @@ async function enumerateTargets(refresh2 = false) {
   return targets;
 }
 async function withIngestLock(fn) {
-  const lockPath = join81(getConsoleStoreDir(), "ingest");
+  const lockPath = join82(getConsoleStoreDir(), "ingest");
   let release;
   try {
     release = await import_proper_lockfile8.default.lock(lockPath, { stale: 60000, retries: 0, realpath: false });
@@ -68647,7 +68583,7 @@ init_takumi_constants();
 import { existsSync as existsSync38, realpathSync } from "node:fs";
 import { chmod as chmod3, mkdir as mkdir18, readFile as readFile37, writeFile as writeFile24 } from "node:fs/promises";
 import { platform as platform5 } from "node:os";
-import { join as join82 } from "node:path";
+import { join as join83 } from "node:path";
 var CACHE_FILE = "install-info.json";
 var CACHE_TTL = 30 * 24 * 60 * 60 * 1000;
 function detectFromBinaryPath() {
@@ -68731,7 +68667,7 @@ function detectFromEnv() {
 }
 async function readCachedPm() {
   try {
-    const cacheFile = join82(PathResolver.getConfigDir(false), CACHE_FILE);
+    const cacheFile = join83(PathResolver.getConfigDir(false), CACHE_FILE);
     if (!existsSync38(cacheFile)) {
       return null;
     }
@@ -68762,7 +68698,7 @@ async function saveCachedPm(pm, getVersion) {
     return;
   try {
     const configDir = PathResolver.getConfigDir(false);
-    const cacheFile = join82(configDir, CACHE_FILE);
+    const cacheFile = join83(configDir, CACHE_FILE);
     if (!existsSync38(configDir)) {
       await mkdir18(configDir, { recursive: true });
       if (platform5() !== "win32") {
@@ -68825,7 +68761,7 @@ async function findOwningPm() {
 async function clearCache() {
   try {
     const { unlink: unlink8 } = await import("node:fs/promises");
-    const cacheFile = join82(PathResolver.getConfigDir(false), CACHE_FILE);
+    const cacheFile = join83(PathResolver.getConfigDir(false), CACHE_FILE);
     if (existsSync38(cacheFile)) {
       await unlink8(cacheFile);
       logger.debug("Package manager cache cleared");
@@ -69087,17 +69023,17 @@ async function checkCliVersion() {
 init_paths();
 init_registry();
 import { existsSync as existsSync39, statSync as statSync7 } from "node:fs";
-import { join as join83 } from "node:path";
+import { join as join84 } from "node:path";
 function checkClaudeMd(setup, projectDir) {
   const results = [];
   const claudeCodeInstaller2 = getInstaller("claude-code");
   if (claudeCodeInstaller2?.isInstalledGlobally()) {
     const claudeGlobal = setup.globals.find((g2) => g2.provider === "claude-code") ?? setup.globals[0];
     const globalPath = claudeGlobal?.path ?? claudeCodeInstaller2.globalRoot();
-    const globalClaudeMd = join83(globalPath, "CLAUDE.md");
+    const globalClaudeMd = join84(globalPath, "CLAUDE.md");
     results.push(checkClaudeMdFile(globalClaudeMd, "Global CLAUDE.md", "tkm-global-claude-md"));
   }
-  const projectClaudeMd = join83(getLocalClaudeDir(projectDir), "CLAUDE.md");
+  const projectClaudeMd = join84(getLocalClaudeDir(projectDir), "CLAUDE.md");
   results.push(checkClaudeMdFile(projectClaudeMd, "Project CLAUDE.md", "tkm-project-claude-md"));
   return results;
 }
@@ -69156,9 +69092,9 @@ function checkClaudeMdFile(path8, name2, id) {
 }
 // src/domains/health-checks/checkers/active-plan-checker.ts
 import { existsSync as existsSync40, readFileSync as readFileSync10 } from "node:fs";
-import { join as join84 } from "node:path";
+import { join as join85 } from "node:path";
 function checkActivePlan(projectDir) {
-  const activePlanPath = join84(projectDir, ".claude", "active-plan");
+  const activePlanPath = join85(projectDir, ".claude", "active-plan");
   if (!existsSync40(activePlanPath)) {
     return {
       id: "tkm-active-plan",
@@ -69172,7 +69108,7 @@ function checkActivePlan(projectDir) {
   }
   try {
     const targetPath = readFileSync10(activePlanPath, "utf-8").trim();
-    const fullPath = join84(projectDir, targetPath);
+    const fullPath = join85(projectDir, targetPath);
     if (!existsSync40(fullPath)) {
       return {
         id: "tkm-active-plan",
@@ -69238,7 +69174,7 @@ function checkComponentCounts(setup) {
 init_registry();
 init_logger();
 import { constants, access, unlink as unlink8, writeFile as writeFile25 } from "node:fs/promises";
-import { join as join85 } from "node:path";
+import { join as join86 } from "node:path";
 
 // src/domains/health-checks/checkers/shared.ts
 init_registry();
@@ -69313,7 +69249,7 @@ async function checkGlobalDirWritable(provider) {
   }
   const timestamp = Date.now();
   const random = Math.random().toString(36).substring(2);
-  const testFile = join85(globalDir, `.tkm-write-test-${timestamp}-${random}`);
+  const testFile = join86(globalDir, `.tkm-write-test-${timestamp}-${random}`);
   try {
     await writeFile25(testFile, "test", { encoding: "utf-8", flag: "wx" });
   } catch (_error) {
@@ -69350,7 +69286,7 @@ init_paths();
 init_registry();
 import { existsSync as existsSync41 } from "node:fs";
 import { readdir as readdir24 } from "node:fs/promises";
-import { join as join86 } from "node:path";
+import { join as join87 } from "node:path";
 
 // src/domains/health-checks/utils/path-normalizer.ts
 import { normalize as normalize6 } from "node:path";
@@ -69362,8 +69298,8 @@ function normalizePath(filePath) {
 
 // src/domains/health-checks/checkers/hooks-checker.ts
 async function checkHooksExist(projectDir) {
-  const globalHooksDir = join86(getInstaller("claude-code")?.globalRoot() ?? "", "hooks");
-  const projectHooksDir = join86(getLocalClaudeDir(projectDir), "hooks");
+  const globalHooksDir = join87(getInstaller("claude-code")?.globalRoot() ?? "", "hooks");
+  const projectHooksDir = join87(getLocalClaudeDir(projectDir), "hooks");
   const globalExists = existsSync41(globalHooksDir);
   const projectExists = existsSync41(projectHooksDir);
   let hookCount = 0;
@@ -69372,7 +69308,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir24(globalHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext) => f3.endsWith(ext)));
     hooks.forEach((hook) => {
-      const fullPath = join86(globalHooksDir, hook);
+      const fullPath = join87(globalHooksDir, hook);
       checkedFiles.add(normalizePath(fullPath));
     });
   }
@@ -69382,7 +69318,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir24(projectHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext) => f3.endsWith(ext)));
     hooks.forEach((hook) => {
-      const fullPath = join86(projectHooksDir, hook);
+      const fullPath = join87(projectHooksDir, hook);
       checkedFiles.add(normalizePath(fullPath));
     });
   }
@@ -69413,14 +69349,14 @@ async function checkHooksExist(projectDir) {
 init_registry();
 import { existsSync as existsSync42 } from "node:fs";
 import { readFile as readFile38 } from "node:fs/promises";
-import { join as join87 } from "node:path";
+import { join as join88 } from "node:path";
 async function checkCodexHooksHealth() {
   const codex = getInstaller("codex");
   if (!codex?.isInstalledGlobally())
     return [];
   const codexRoot = codex.globalRoot();
-  const configTomlPath = join87(codexRoot, "config.toml");
-  const hooksJsonPath = join87(codexRoot, "hooks.json");
+  const configTomlPath = join88(codexRoot, "config.toml");
+  const hooksJsonPath = join88(codexRoot, "hooks.json");
   if (!existsSync42(hooksJsonPath))
     return [];
   const results = [];
@@ -69532,10 +69468,10 @@ init_registry();
 init_logger();
 import { existsSync as existsSync43 } from "node:fs";
 import { readFile as readFile39 } from "node:fs/promises";
-import { join as join88 } from "node:path";
+import { join as join89 } from "node:path";
 async function checkSettingsValid(projectDir) {
-  const globalSettings = join88(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
-  const projectSettings = join88(getLocalClaudeDir(projectDir), "settings.json");
+  const globalSettings = join89(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
+  const projectSettings = join89(getLocalClaudeDir(projectDir), "settings.json");
   const settingsPath = existsSync43(globalSettings) ? globalSettings : existsSync43(projectSettings) ? projectSettings : null;
   if (!settingsPath) {
     return {
@@ -69609,10 +69545,10 @@ init_logger();
 import { existsSync as existsSync44 } from "node:fs";
 import { readFile as readFile40 } from "node:fs/promises";
 import { homedir as homedir25 } from "node:os";
-import { dirname as dirname22, join as join89, normalize as normalize7, resolve as resolve22 } from "node:path";
+import { dirname as dirname22, join as join90, normalize as normalize7, resolve as resolve22 } from "node:path";
 async function checkPathRefsValid(projectDir) {
-  const globalClaudeMd = join89(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
-  const projectClaudeMd = join89(getLocalClaudeDir(projectDir), "CLAUDE.md");
+  const globalClaudeMd = join90(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
+  const projectClaudeMd = join90(getLocalClaudeDir(projectDir), "CLAUDE.md");
   const claudeMdPath = existsSync44(globalClaudeMd) ? globalClaudeMd : existsSync44(projectClaudeMd) ? projectClaudeMd : null;
   if (!claudeMdPath) {
     return {
@@ -69708,7 +69644,7 @@ async function checkPathRefsValid(projectDir) {
 init_paths();
 import { existsSync as existsSync45 } from "node:fs";
 import { readdir as readdir25 } from "node:fs/promises";
-import { join as join90 } from "node:path";
+import { join as join91 } from "node:path";
 async function checkProjectConfigCompleteness(setup, projectDir) {
   if (setup.globals.some((g2) => g2.path === setup.project.path)) {
     return {
@@ -69725,12 +69661,12 @@ async function checkProjectConfigCompleteness(setup, projectDir) {
   const requiredDirs = ["agents", "commands", "skills"];
   const missingDirs = [];
   for (const dir of requiredDirs) {
-    const dirPath = join90(projectClaudeDir, dir);
+    const dirPath = join91(projectClaudeDir, dir);
     if (!existsSync45(dirPath)) {
       missingDirs.push(dir);
     }
   }
-  const hasRulesOrWorkflows = existsSync45(join90(projectClaudeDir, "rules")) || existsSync45(join90(projectClaudeDir, "workflows"));
+  const hasRulesOrWorkflows = existsSync45(join91(projectClaudeDir, "rules")) || existsSync45(join91(projectClaudeDir, "workflows"));
   if (!hasRulesOrWorkflows) {
     missingDirs.push("rules");
   }
@@ -69829,7 +69765,7 @@ import { spawnSync as spawnSync3 } from "node:child_process";
 // src/domains/installation/git-clone-manager.ts
 init_build_config();
 init_logger();
-import { execSync as execSync3 } from "node:child_process";
+import { execSync as execSync2 } from "node:child_process";
 import * as fs19 from "node:fs";
 import * as os6 from "node:os";
 import * as path8 from "node:path";
@@ -69868,7 +69804,7 @@ Check disk space and directory permissions.`);
       const quotedUrl = `"${url}"`;
       const quotedDir = `"${tempDir}"`;
       try {
-        execSync3(`git clone --depth 1 --branch "${tag}" ${quotedUrl} ${quotedDir}`, {
+        execSync2(`git clone --depth 1 --branch "${tag}" ${quotedUrl} ${quotedDir}`, {
           stdio: ["pipe", "pipe", "pipe"],
           timeout,
           encoding: "utf-8"
@@ -69879,12 +69815,12 @@ Check disk space and directory permissions.`);
           logger.debug(`Shallow clone failed for tag ${tag}, trying full clone...`);
           await fs19.promises.rm(tempDir, { recursive: true, force: true }).catch(() => {});
           await fs19.promises.mkdir(tempDir, { recursive: true });
-          execSync3(`git clone --no-checkout ${quotedUrl} ${quotedDir}`, {
+          execSync2(`git clone --no-checkout ${quotedUrl} ${quotedDir}`, {
             stdio: ["pipe", "pipe", "pipe"],
             timeout,
             encoding: "utf-8"
           });
-          execSync3(`git -C ${quotedDir} checkout "tags/${tag}"`, {
+          execSync2(`git -C ${quotedDir} checkout "tags/${tag}"`, {
             stdio: ["pipe", "pipe", "pipe"],
             timeout: 30000,
             encoding: "utf-8"
@@ -69932,7 +69868,7 @@ Ensure you have access to the repository and your git credentials are configured
   }
   static isGitInstalled() {
     try {
-      execSync3("git --version", { stdio: "ignore", timeout: 5000 });
+      execSync2("git --version", { stdio: "ignore", timeout: 5000 });
       return true;
     } catch {
       return false;
@@ -69957,7 +69893,7 @@ Ensure you have access to the repository and your git credentials are configured
   }
   static async testSshConnection() {
     try {
-      execSync3("ssh -T git@github.com 2>&1 || true", {
+      execSync2("ssh -T git@github.com 2>&1 || true", {
         encoding: "utf-8",
         timeout: 1e4
       });
@@ -70172,7 +70108,7 @@ init_registry();
 init_environment();
 import { constants as constants2, access as access2, mkdir as mkdir19, readFile as readFile41, unlink as unlink9, writeFile as writeFile26 } from "node:fs/promises";
 import { arch as arch2, homedir as homedir26, platform as platform6 } from "node:os";
-import { join as join92, normalize as normalize8 } from "node:path";
+import { join as join93, normalize as normalize8 } from "node:path";
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
 }
@@ -70265,7 +70201,7 @@ async function checkGlobalDirAccess(provider) {
       autoFixable: false
     };
   }
-  const testFile = join92(globalDir, ".tkm-doctor-access-test");
+  const testFile = join93(globalDir, ".tkm-doctor-access-test");
   try {
     await mkdir19(globalDir, { recursive: true });
     await writeFile26(testFile, "test", "utf-8");
@@ -70343,7 +70279,7 @@ async function checkWSLBoundary() {
 // src/domains/health-checks/platform/windows-checker.ts
 init_registry();
 import { mkdir as mkdir20, symlink as symlink2, unlink as unlink10, writeFile as writeFile27 } from "node:fs/promises";
-import { join as join93 } from "node:path";
+import { join as join94 } from "node:path";
 async function checkLongPathSupport() {
   if (shouldSkipExpensiveOperations4()) {
     return {
@@ -70357,8 +70293,8 @@ async function checkLongPathSupport() {
     };
   }
   try {
-    const { execSync: execSync4 } = await import("node:child_process");
-    const result = execSync4('reg query "HKLM\\SYSTEM\\CurrentControlSet\\Control\\FileSystem" /v LongPathsEnabled', { encoding: "utf-8", timeout: 2000 });
+    const { execSync: execSync3 } = await import("node:child_process");
+    const result = execSync3('reg query "HKLM\\SYSTEM\\CurrentControlSet\\Control\\FileSystem" /v LongPathsEnabled', { encoding: "utf-8", timeout: 2000 });
     const enabled = result.includes("0x1");
     return {
       id: "long-path-support",
@@ -70395,8 +70331,8 @@ async function checkSymlinkSupport() {
     };
   }
   const testDir = getInstaller("claude-code")?.globalRoot() ?? "";
-  const target = join93(testDir, ".tkm-symlink-test-target");
-  const link = join93(testDir, ".tkm-symlink-test-link");
+  const target = join94(testDir, ".tkm-symlink-test-target");
+  const link = join94(testDir, ".tkm-symlink-test-link");
   try {
     await mkdir20(testDir, { recursive: true });
     await writeFile27(target, "test", "utf-8");
@@ -70689,10 +70625,10 @@ class AutoHealer {
   }
 }
 // src/domains/health-checks/report-generator.ts
-import { execSync as execSync4, spawnSync as spawnSync4 } from "node:child_process";
+import { execSync as execSync3, spawnSync as spawnSync4 } from "node:child_process";
 import { readFileSync as readFileSync11, unlinkSync as unlinkSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { dirname as dirname23, join as join94 } from "node:path";
+import { dirname as dirname23, join as join95 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 init_environment();
 init_logger();
@@ -70700,7 +70636,7 @@ init_dist2();
 function getCliVersion3() {
   try {
     const __dirname3 = dirname23(fileURLToPath2(import.meta.url));
-    const pkgPath = join94(__dirname3, "../../../package.json");
+    const pkgPath = join95(__dirname3, "../../../package.json");
     const pkg = JSON.parse(readFileSync11(pkgPath, "utf-8"));
     return pkg.version || "unknown";
   } catch (err) {
@@ -70825,7 +70761,7 @@ class ReportGenerator {
   }
   async uploadToGist(report) {
     try {
-      execSync4("gh --version", { stdio: "ignore" });
+      execSync3("gh --version", { stdio: "ignore" });
     } catch {
       logger.warning("GitHub CLI not installed, skipping gist upload");
       return null;
@@ -70839,7 +70775,7 @@ class ReportGenerator {
         return null;
       }
     }
-    const tmpFile = join94(tmpdir2(), `tkm-report-${Date.now()}.txt`);
+    const tmpFile = join95(tmpdir2(), `tkm-report-${Date.now()}.txt`);
     writeFileSync6(tmpFile, report);
     try {
       const result = spawnSync4("gh", ["gist", "create", tmpFile, "--desc", "Takumi Diagnostic Report"], {
@@ -71159,12 +71095,12 @@ var conventionDescriptiveName = {
 };
 
 // src/domains/hooks/handlers/convention-quality-gate/command-runner.ts
-import { execSync as execSync5 } from "node:child_process";
+import { execSync as execSync4 } from "node:child_process";
 
 // src/domains/hooks/handlers/_shared/env-file.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { renameSync as renameSync2, unlinkSync as unlinkSync6, writeFileSync as writeFileSync7 } from "node:fs";
-import { basename as basename16, dirname as dirname24, join as join95 } from "node:path";
+import { basename as basename16, dirname as dirname24, join as join96 } from "node:path";
 function hexEscape(code) {
   return `\\x${code.toString(16).padStart(2, "0")}`;
 }
@@ -71217,7 +71153,7 @@ function renderEnvFile(entries) {
 function writeEnvFile(filePath, entries) {
   const content = renderEnvFile(entries);
   const dir = dirname24(filePath);
-  const tmpPath = join95(dir, `.${basename16(filePath)}.${randomUUID2()}.tmp`);
+  const tmpPath = join96(dir, `.${basename16(filePath)}.${randomUUID2()}.tmp`);
   try {
     writeFileSync7(tmpPath, content, { encoding: "utf8", mode: 384 });
   } catch (err) {
@@ -71244,7 +71180,7 @@ function substituteFileToken(command, filePath) {
 }
 var defaultCommandRunner = (command, opts) => {
   try {
-    execSync5(command, {
+    execSync4(command, {
       cwd: opts.cwd,
       timeout: opts.timeoutMs,
       encoding: "utf8",
@@ -71265,10 +71201,10 @@ var defaultCommandRunner = (command, opts) => {
 // src/domains/hooks/handlers/convention-quality-gate/debounce.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync8 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join96 } from "node:path";
+import { join as join97 } from "node:path";
 function stateFilePath(sessionId) {
   const safe = sessionId.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 128) || "default";
-  return join96(tmpdir3(), `takumi-guardrail-${safe}.json`);
+  return join97(tmpdir3(), `takumi-guardrail-${safe}.json`);
 }
 function isWithinDebounce(sessionId, debounceMs, now) {
   try {
@@ -71416,6 +71352,7 @@ var conventionQualityGate = {
 
 // src/domains/hooks/handlers/extension-skill/handler.ts
 import fs20 from "node:fs";
+import os7 from "node:os";
 import path9 from "node:path";
 var CONFIG_KEY2 = "skill-extension-loader";
 var SKILLS_ROOT_SEGMENTS = [".claude", "skills"];
@@ -71470,9 +71407,9 @@ function readFrontmatter(raw) {
 `).trim()
   };
 }
-function renderBlock(skill, relBase, kept, skipped) {
+function renderBlock(skill, kept, skipped) {
   const parts = [
-    `Skill extensions for "${skill}" (user-owned, from ${relBase}/)`,
+    `Skill extensions for "${skill}" (user-owned, local + team-shared)`,
     "Apply order: pre → override → post. The entries below are already in that order; layer them on top of the shipped skill instructions."
   ];
   const totalChars = kept.reduce((n, e2) => n + e2.body.length, 0);
@@ -71495,36 +71432,54 @@ ${refs}`);
 
 `);
 }
-function loadExtensions(input, ctx) {
-  if (input.tool_name !== "Skill")
-    return NO_OP2;
-  const toolInput = input.tool_input;
-  const skill = toolInput && typeof toolInput.skill === "string" ? toolInput.skill.trim() : "";
-  if (!skill)
-    return NO_OP2;
-  const cwd2 = typeof input.cwd === "string" && input.cwd ? input.cwd : ctx.cwd;
-  const skillDir = baseSkillName(skill);
-  if (!skillDir)
-    return NO_OP2;
-  const skillsRoot = path9.resolve(cwd2, ...SKILLS_ROOT_SEGMENTS);
-  const extDir = path9.resolve(skillsRoot, skillDir, "extensions");
-  if (extDir !== skillsRoot && !extDir.startsWith(skillsRoot + path9.sep))
-    return NO_OP2;
+function displayRel(cwd2, filePath) {
+  const rel = path9.relative(cwd2, filePath);
+  return rel.startsWith("..") ? filePath : rel;
+}
+function resolveLocalExtDir(skillDir, roots) {
+  const seen = new Set;
+  for (const root of roots) {
+    if (!root || seen.has(root))
+      continue;
+    seen.add(root);
+    const skillsRoot = path9.resolve(root, ...SKILLS_ROOT_SEGMENTS);
+    const extDir = path9.resolve(skillsRoot, skillDir, "extensions");
+    if (extDir !== skillsRoot && !extDir.startsWith(skillsRoot + path9.sep))
+      continue;
+    if (fs20.existsSync(extDir))
+      return extDir;
+  }
+  return null;
+}
+function resolveSharedExtDir(skillDir, sharedDirRaw, projectRoot) {
+  const raw = typeof sharedDirRaw === "string" ? sharedDirRaw.trim() : "";
+  if (!raw)
+    return null;
+  const sharedRoot = path9.isAbsolute(raw) ? raw : path9.resolve(projectRoot, raw);
+  if (!path9.isAbsolute(raw) && sharedRoot !== projectRoot && !sharedRoot.startsWith(projectRoot + path9.sep)) {
+    return null;
+  }
+  const cand = path9.resolve(sharedRoot, skillDir);
+  if (cand !== sharedRoot && !cand.startsWith(sharedRoot + path9.sep))
+    return null;
+  return fs20.existsSync(cand) ? cand : null;
+}
+function readExtensionsFromDir(extDir, skillDir, cwd2) {
+  const kept = [];
+  const skipped = [];
   let entries;
   try {
     entries = fs20.readdirSync(extDir, { withFileTypes: true });
   } catch {
-    return NO_OP2;
+    return { kept, skipped };
   }
-  const relBase = `.claude/skills/${skillDir}/extensions`;
-  const kept = [];
-  const skipped = [];
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.toLowerCase().endsWith(".md"))
       continue;
+    const absPath = path9.join(extDir, entry.name);
     let raw;
     try {
-      raw = fs20.readFileSync(path9.join(extDir, entry.name), "utf8");
+      raw = fs20.readFileSync(absPath, "utf8");
     } catch {
       skipped.push(entry.name);
       continue;
@@ -71536,12 +71491,37 @@ function loadExtensions(input, ctx) {
       skipped.push(entry.name);
       continue;
     }
-    kept.push({ file: entry.name, relPath: `${relBase}/${entry.name}`, type, body: parsed.body });
+    kept.push({ file: entry.name, relPath: displayRel(cwd2, absPath), type, body: parsed.body });
   }
+  return { kept, skipped };
+}
+function loadExtensions(input, ctx) {
+  if (input.tool_name !== "Skill")
+    return NO_OP2;
+  const toolInput = input.tool_input;
+  const skill = toolInput && typeof toolInput.skill === "string" ? toolInput.skill.trim() : "";
+  if (!skill)
+    return NO_OP2;
+  const cwd2 = typeof input.cwd === "string" && input.cwd ? input.cwd : ctx.cwd;
+  const skillDir = baseSkillName(skill);
+  if (!skillDir)
+    return NO_OP2;
+  const projectDir = process.env.CLAUDE_PROJECT_DIR ?? "";
+  const home6 = os7.homedir();
+  const primaryRoot = projectDir || cwd2;
+  const localExtDir = resolveLocalExtDir(skillDir, [projectDir, cwd2, home6]);
+  const sharedExtDir = resolveSharedExtDir(skillDir, ctx.config?.skillExtensions?.sharedDir, primaryRoot);
+  if (!localExtDir && !sharedExtDir)
+    return NO_OP2;
+  const local = localExtDir ? readExtensionsFromDir(localExtDir, skillDir, cwd2) : { kept: [], skipped: [] };
+  const shared = sharedExtDir ? readExtensionsFromDir(sharedExtDir, skillDir, cwd2) : { kept: [], skipped: [] };
+  const localNames = new Set(local.kept.map((e2) => e2.file));
+  const kept = [...local.kept, ...shared.kept.filter((e2) => !localNames.has(e2.file))];
+  const skipped = [...local.skipped, ...shared.skipped];
   if (kept.length === 0)
     return NO_OP2;
   kept.sort((a3, b3) => a3.type.order - b3.type.order || a3.file.localeCompare(b3.file));
-  return { status: "context", output: renderBlock(skill, relBase, kept, skipped), timingMs: 0 };
+  return { status: "context", output: renderBlock(skill, kept, skipped), timingMs: 0 };
 }
 var extensionSkill = {
   name: "extension-skill",
@@ -71693,7 +71673,7 @@ function detectBroadGlob(pattern, pathHint) {
 // src/domains/hooks/handlers/guard-breadth-scout/check-ignore.ts
 var import_ignore5 = __toESM(require_ignore(), 1);
 import { existsSync as existsSync47, readFileSync as readFileSync13 } from "node:fs";
-import { dirname as dirname25, join as join97 } from "node:path";
+import { dirname as dirname25, join as join98 } from "node:path";
 var BUILTIN_HEAVY_DIR_LINES = [
   "node_modules",
   ".pnp",
@@ -71730,7 +71710,7 @@ var BUILTIN_HEAVY_DIR_LINES = [
 function findGitRoot(startDir) {
   let dir = startDir;
   while (true) {
-    if (existsSync47(join97(dir, ".git")))
+    if (existsSync47(join98(dir, ".git")))
       return dir;
     const parent = dirname25(dir);
     if (parent === dir)
@@ -71760,9 +71740,9 @@ function loadIgnoreConfig(cwd2) {
   const gitRoot = findGitRoot(cwd2);
   const candidatePaths = [];
   if (gitRoot) {
-    candidatePaths.push(join97(gitRoot, ".claude", ".tkmignore"));
+    candidatePaths.push(join98(gitRoot, ".claude", ".tkmignore"));
   }
-  candidatePaths.push(join97(cwd2, ".claude", ".tkmignore"));
+  candidatePaths.push(join98(cwd2, ".claude", ".tkmignore"));
   for (const candidate of candidatePaths) {
     const lines = readIgnoreFile(candidate);
     if (lines !== null) {
@@ -72167,7 +72147,10 @@ var guardJailbreak = {
   events: ["PreToolUse"],
   matchers: { PreToolUse: "Bash|Glob|Grep|Read|Edit|Write" },
   denyOnTimeout: true,
-  run(input) {
+  run(input, ctx) {
+    if (!isHandlerEnabled(ctx, "guard-jailbreak")) {
+      return NO_OP3;
+    }
     if (typeof input?.tool_name !== "string" || input.tool_name.length === 0) {
       return ALLOW;
     }
@@ -72458,7 +72441,7 @@ function resolveEndpoint() {
 init_manifest_path_resolver();
 import { existsSync as existsSync48, readFileSync as readFileSync14 } from "node:fs";
 import { homedir as homedir27 } from "node:os";
-import { dirname as dirname26, join as join98, resolve as resolve23 } from "node:path";
+import { dirname as dirname26, join as join99, resolve as resolve23 } from "node:path";
 var PROVIDER_DIRS = [".claude", ".codex"];
 var MAX_WALK = 6;
 function readManifestRaw(path10) {
@@ -72477,7 +72460,7 @@ function findManifest(cwd2) {
   let dir = resolve23(cwd2);
   for (let i = 0;i < MAX_WALK; i++) {
     for (const provider of PROVIDER_DIRS) {
-      const providerRoot = join98(dir, provider);
+      const providerRoot = join99(dir, provider);
       if (existsSync48(providerRoot)) {
         const path10 = findManifestInProviderDir(providerRoot);
         if (path10)
@@ -72491,11 +72474,11 @@ function findManifest(cwd2) {
   }
   const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
   if (pluginRoot) {
-    const pluginPath = findManifestInProviderDir(join98(pluginRoot, ".claude"));
+    const pluginPath = findManifestInProviderDir(join99(pluginRoot, ".claude"));
     if (pluginPath)
       return pluginPath;
   }
-  const globalPath = findManifestInProviderDir(join98(homedir27(), ".claude"));
+  const globalPath = findManifestInProviderDir(join99(homedir27(), ".claude"));
   if (globalPath)
     return globalPath;
   return null;
@@ -72651,7 +72634,7 @@ function bucketTokens(records) {
 // src/domains/hooks/telemetry/lib/session-lock.ts
 var import_proper_lockfile9 = __toESM(require_proper_lockfile(), 1);
 import { promises as fs21 } from "node:fs";
-import { join as join99 } from "node:path";
+import { join as join100 } from "node:path";
 var LOCK_RESOURCE = "summary.json";
 var DEFAULT_TIMEOUT_MS3 = 2000;
 var RETRY_INTERVAL_MS = 100;
@@ -72659,7 +72642,7 @@ var DEFAULT_STALE_AFTER_MS = 1e4;
 async function withSummaryLock(sessionDir, fn, options2 = {}) {
   const timeoutMs = options2.timeoutMs ?? DEFAULT_TIMEOUT_MS3;
   const staleAfterMs = options2.staleAfterMs ?? DEFAULT_STALE_AFTER_MS;
-  const resource = join99(sessionDir, LOCK_RESOURCE);
+  const resource = join100(sessionDir, LOCK_RESOURCE);
   try {
     await fs21.mkdir(sessionDir, { recursive: true });
   } catch {
@@ -72695,13 +72678,13 @@ import { promises as fs22 } from "node:fs";
 
 // src/domains/hooks/telemetry/lib/session-paths.ts
 init_paths2();
-import { join as join101 } from "node:path";
+import { join as join102 } from "node:path";
 
 // src/shared/project-paths.ts
 init_paths2();
 import { createHash as createHash11 } from "node:crypto";
 import { realpathSync as realpathSync2 } from "node:fs";
-import { basename as basename17, join as join100 } from "node:path";
+import { basename as basename17, join as join101 } from "node:path";
 function encodeCwd(cwd2) {
   const stripped = cwd2.replace(/^\/+/, "");
   const sanitized = stripped.replace(/[^a-zA-Z0-9-]/g, "-");
@@ -72720,10 +72703,10 @@ function getProjectLabel(cwd2) {
   return basename17(cwd2) || "";
 }
 function getProjectsRoot() {
-  return join100(getConfigDir(), "projects");
+  return join101(getConfigDir(), "projects");
 }
 function getProjectDir(args) {
-  return join100(getProjectsRoot(), encodeCwd(args.cwd), args.agent);
+  return join101(getProjectsRoot(), encodeCwd(args.cwd), args.agent);
 }
 
 // src/domains/hooks/telemetry/lib/session-paths.ts
@@ -72735,35 +72718,35 @@ function safeSessionSegment(sessionId) {
   return cleaned.length > 0 ? cleaned.slice(0, MAX_SESSION_ID_LEN) : null;
 }
 function getSessionsRoot() {
-  return join101(getConfigDir(), "sessions");
+  return join102(getConfigDir(), "sessions");
 }
 function getSessionDirV2(args) {
   const segment = safeSessionSegment(args.sessionId);
   if (!segment)
     return null;
-  return join101(getProjectDir({ agent: args.agent, cwd: args.cwd }), "sessions", segment);
+  return join102(getProjectDir({ agent: args.agent, cwd: args.cwd }), "sessions", segment);
 }
 function getEventsFile(sessionDir) {
-  return join101(sessionDir, "events.jsonl");
+  return join102(sessionDir, "events.jsonl");
 }
 function getSummaryFile(sessionDir) {
-  return join101(sessionDir, "summary.json");
+  return join102(sessionDir, "summary.json");
 }
 function getLastPushFile(sessionDir) {
-  return join101(sessionDir, "last_push.txt");
+  return join102(sessionDir, "last_push.txt");
 }
 var OBSERVATIONS_FILENAME = "observations.jsonl";
 function getObservationsFile(sessionDir) {
-  return join101(sessionDir, OBSERVATIONS_FILENAME);
+  return join102(sessionDir, OBSERVATIONS_FILENAME);
 }
 function getObservationsFlushingFile(sessionDir) {
-  return join101(sessionDir, `${OBSERVATIONS_FILENAME}.flushing`);
+  return join102(sessionDir, `${OBSERVATIONS_FILENAME}.flushing`);
 }
 function getObservationsPushedFile(sessionDir) {
-  return join101(sessionDir, "obs_pushed.txt");
+  return join102(sessionDir, "obs_pushed.txt");
 }
 function getMetaFile(sessionDir) {
-  return join101(sessionDir, "meta.json");
+  return join102(sessionDir, "meta.json");
 }
 
 // src/domains/hooks/telemetry/lib/summary.ts
@@ -72985,7 +72968,7 @@ async function applyClaudeTranscriptDelta(args) {
 // src/domains/hooks/telemetry/lib/detached-put.ts
 import { spawn as spawn2 } from "node:child_process";
 import { openSync as openSync5 } from "node:fs";
-import { dirname as dirname27, join as join102 } from "node:path";
+import { dirname as dirname27, join as join103 } from "node:path";
 var ALLOWED_ENV_PREFIXES = ["TKM_", "TAKUMI_"];
 var ALLOWED_ENV_KEYS = new Set(["HOME", "USERPROFILE", "PATH", "NODE_ENV"]);
 var DETACH_DEBUG_LOG_NAME = "detach-debug.log";
@@ -72993,7 +72976,7 @@ function effectiveDetachMode(flags) {
   return flags.noDetach ? "inline" : "detached";
 }
 function sessionDebugLogPath(sessionDir) {
-  return join102(sessionDir, DETACH_DEBUG_LOG_NAME);
+  return join103(sessionDir, DETACH_DEBUG_LOG_NAME);
 }
 var BUNFS_PREFIX = "/$bunfs/";
 var REENTRY_VERBS = ["hooks", "hook-exec"];
@@ -73013,8 +72996,7 @@ function resolveInvocationPrefix() {
   if (verbIdx === -1) {
     if (isCompiledBunBinary)
       return { command, prefixArgs: [] };
-    const isScriptEntry = typeof entry === "string" && (entry.endsWith(".ts") || entry.endsWith(".js"));
-    return { command, prefixArgs: isScriptEntry ? [entry] : [] };
+    return { command, prefixArgs: typeof entry === "string" && entry.length > 0 ? [entry] : [] };
   }
   if (isCompiledBunBinary) {
     return { command, prefixArgs: [] };
@@ -73034,7 +73016,7 @@ function resolvePreloadScript(entryPath) {
   try {
     const srcDir = dirname27(entryPath);
     const repoRoot = dirname27(srcDir);
-    return join102(repoRoot, "scripts", "preload-config-override.ts");
+    return join103(repoRoot, "scripts", "preload-config-override.ts");
   } catch {
     return null;
   }
@@ -73318,8 +73300,8 @@ async function runSessionEndFlush(data, ctx) {
         session_end_raw: data
       };
       const { promises: fs25 } = await import("node:fs");
-      const { join: join105 } = await import("node:path");
-      const target = join105(sessionDir, "meta.json");
+      const { join: join106 } = await import("node:path");
+      const target = join106(sessionDir, "meta.json");
       const tmp = `${target}.tmp`;
       await fs25.writeFile(tmp, JSON.stringify(updated), "utf8");
       await fs25.rename(tmp, target);
@@ -73807,11 +73789,11 @@ async function handleStop(agent, flags = {}) {
 // src/domains/hooks/telemetry/otlp/observations-export.ts
 init_paths2();
 import { promises as fs30, openSync as openSync9 } from "node:fs";
-import { join as join106 } from "node:path";
+import { join as join107 } from "node:path";
 
 // src/domains/hooks/telemetry/lib/retention.ts
 import { promises as fs27 } from "node:fs";
-import { join as join105 } from "node:path";
+import { join as join106 } from "node:path";
 async function pathExists25(path10) {
   try {
     await fs27.access(path10);
@@ -73846,7 +73828,7 @@ async function decideDelete(dir, args) {
 async function listChildren(dir) {
   try {
     const names = await fs27.readdir(dir);
-    return names.map((n2) => join105(dir, n2));
+    return names.map((n2) => join106(dir, n2));
   } catch {
     return [];
   }
@@ -73857,7 +73839,7 @@ async function collectV2Sessions() {
   const sessions = [];
   for (const projectDir of projects) {
     for (const agentDir of await listChildren(projectDir)) {
-      for (const sessionDir of await listChildren(join105(agentDir, "sessions"))) {
+      for (const sessionDir of await listChildren(join106(agentDir, "sessions"))) {
         sessions.push(sessionDir);
       }
     }
@@ -74286,7 +74268,7 @@ async function exportSessionObservations(sessionDir, opts = {}, deps = {}) {
   }
 }
 function lockPath() {
-  return join106(getConfigDir(), "obs-flush.lock");
+  return join107(getConfigDir(), "obs-flush.lock");
 }
 async function acquireSweepLock(now) {
   const path10 = lockPath();
@@ -74925,7 +74907,7 @@ var metricsRecord = {
 
 // src/domains/statusline/activity-cache.ts
 import { readdirSync as readdirSync8, rmSync as rmSync5, statSync as statSync8 } from "node:fs";
-import { join as join107 } from "node:path";
+import { join as join108 } from "node:path";
 
 // src/domains/statusline/activity-snapshot.ts
 import { existsSync as existsSync51 } from "node:fs";
@@ -75385,7 +75367,7 @@ function cleanupStaleActivity(now = Date.now()) {
   for (const entry of entries) {
     if (!entry.startsWith(FILE_PREFIX) || !entry.endsWith(FILE_SUFFIX))
       continue;
-    const full = join107(getStatuslineCacheDir(), entry);
+    const full = join108(getStatuslineCacheDir(), entry);
     try {
       if (now - statSync8(full).mtimeMs > ACTIVITY_TTL_MS)
         rmSync5(full, { force: true });
@@ -75450,11 +75432,11 @@ var sessionActivity = {
 
 // src/domains/hooks/handlers/session-init/handler.ts
 import { mkdirSync as mkdirSync6 } from "node:fs";
-import { dirname as dirname29, join as join111 } from "node:path";
+import { dirname as dirname29, join as join113 } from "node:path";
 
 // src/domains/hooks/handlers/_shared/project-detector.ts
 import { existsSync as existsSync52, readFileSync as readFileSync16 } from "node:fs";
-import { join as join108 } from "node:path";
+import { join as join109 } from "node:path";
 var LOCKFILE_PRIORITY = [
   { manager: "bun", files: ["bun.lockb", "bun.lock"] },
   { manager: "pnpm", files: ["pnpm-lock.yaml"] },
@@ -75489,14 +75471,14 @@ var APP_FRAMEWORKS = new Set([
 var WORKSPACE_MARKER_FILES = ["pnpm-workspace.yaml", "turbo.json", "lerna.json"];
 function fileExists(cwd2, name2) {
   try {
-    return existsSync52(join108(cwd2, name2));
+    return existsSync52(join109(cwd2, name2));
   } catch {
     return false;
   }
 }
 function readPackageJson(cwd2) {
   try {
-    const raw = readFileSync16(join108(cwd2, "package.json"), "utf8");
+    const raw = readFileSync16(join109(cwd2, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed === "object")
       return parsed;
@@ -75577,14 +75559,86 @@ function detectProject(cwd2) {
   };
 }
 
+// src/domains/hooks/handlers/session-init/context-blocks.ts
+import { readFileSync as readFileSync17 } from "node:fs";
+import { join as join110 } from "node:path";
+var CODING_LEVEL_STYLE_FILES = {
+  0: "coding-level-0-eli5",
+  1: "coding-level-1-junior",
+  2: "coding-level-2-middle",
+  3: "coding-level-3-senior",
+  4: "coding-level-4-expert",
+  5: "coding-level-5-principal"
+};
+function compactionApprovalWarning(source) {
+  if (source !== "compact")
+    return null;
+  return [
+    "⚠️ CONTEXT COMPACTED - APPROVAL STATE CHECK:",
+    "If you were waiting for user approval via AskUserQuestion (e.g., a review gate),",
+    "you MUST re-confirm with the user before proceeding. Do NOT assume approval was given.",
+    'Use AskUserQuestion to verify: "Context was compacted. Please confirm approval to continue."'
+  ].join(`
+`);
+}
+function codingLevelGuidelines(codingLevel, settingsDir) {
+  if (typeof codingLevel !== "number")
+    return null;
+  const styleFile = CODING_LEVEL_STYLE_FILES[codingLevel];
+  if (!styleFile)
+    return null;
+  try {
+    const stylePath = join110(settingsDir, "output-styles", `${styleFile}.md`);
+    const content = readFileSync17(stylePath, "utf8");
+    const withoutFrontmatter = content.replace(/^---[\s\S]*?---\n*/, "").trim();
+    return withoutFrontmatter.length > 0 ? withoutFrontmatter : null;
+  } catch {
+    return null;
+  }
+}
+function renderAssertion(assertion) {
+  if (typeof assertion === "string")
+    return assertion;
+  if (assertion && typeof assertion === "object") {
+    const a3 = assertion;
+    const text = typeof a3.message === "string" ? a3.message : typeof a3.rule === "string" ? a3.rule : "";
+    const pattern = typeof a3.pattern === "string" && a3.pattern.length > 0 ? ` (${a3.pattern})` : "";
+    if (text)
+      return `${text}${pattern}`;
+  }
+  return String(assertion);
+}
+function userAssertions(assertions) {
+  if (!Array.isArray(assertions) || assertions.length === 0)
+    return null;
+  const lines = ["User Assertions:"];
+  assertions.forEach((assertion, i) => {
+    lines.push(`  ${i + 1}. ${renderAssertion(assertion)}`);
+  });
+  return lines.join(`
+`);
+}
+function renderContextBlocks(source, ctx, settingsDir) {
+  const config = ctx.config ?? {};
+  const blocks = [
+    compactionApprovalWarning(source),
+    codingLevelGuidelines(config.codingLevel, settingsDir),
+    userAssertions(config.assertions)
+  ].filter((b3) => b3 !== null);
+  return blocks.length > 0 ? `
+${blocks.join(`
+
+`)}` : "";
+}
+
 // src/domains/hooks/handlers/session-init/env-entries.ts
 import { createHash as createHash14 } from "node:crypto";
 import { platform as platform9, userInfo } from "node:os";
-import { join as join110 } from "node:path";
+import { join as join112 } from "node:path";
 
 // src/domains/hooks/handlers/session-init/plan-resolver.ts
-import { existsSync as existsSync53, readFileSync as readFileSync17, readdirSync as readdirSync9 } from "node:fs";
-import { join as join109 } from "node:path";
+import { existsSync as existsSync53, readFileSync as readFileSync18, readdirSync as readdirSync9 } from "node:fs";
+import { join as join111 } from "node:path";
 var MAX_PLAN_DIRS = 100;
 var MAX_PLAN_FILE_BYTES = 64 * 1024;
 function listPlanDirs(plansPath) {
@@ -75598,10 +75652,10 @@ function listPlanDirs(plansPath) {
 }
 function planFileMentionsSession(planDir, sessionId) {
   try {
-    const planFile = join109(planDir, "plan.md");
+    const planFile = join111(planDir, "plan.md");
     if (!existsSync53(planFile))
       return false;
-    const body = readFileSync17(planFile, { encoding: "utf8" });
+    const body = readFileSync18(planFile, { encoding: "utf8" });
     if (body.length > MAX_PLAN_FILE_BYTES)
       return false;
     return body.includes(sessionId);
@@ -75613,7 +75667,7 @@ function resolveActivePlan(plansPath, sessionId) {
   if (!sessionId)
     return "";
   for (const name2 of listPlanDirs(plansPath)) {
-    const dir = join109(plansPath, name2);
+    const dir = join111(plansPath, name2);
     if (name2.includes(sessionId) || planFileMentionsSession(dir, sessionId)) {
       return dir;
     }
@@ -75634,7 +75688,7 @@ function resolveSuggestedPlan(plansPath, branch, branchPattern) {
     return "";
   for (const name2 of listPlanDirs(plansPath)) {
     if (name2.includes(slug))
-      return join109(plansPath, name2);
+      return join111(plansPath, name2);
   }
   return "";
 }
@@ -75688,11 +75742,11 @@ function buildEnvEntries(params) {
   const plan = config.plan ?? {};
   const locale = config.locale ?? {};
   const validation = plan.validation ?? {};
-  const settingsDir = join110(projectRoot, ".claude");
-  const docsPath = join110(projectRoot, paths.docs ?? "docs");
-  const plansPath = join110(projectRoot, paths.plans ?? "plans");
+  const settingsDir = join112(projectRoot, ".claude");
+  const docsPath = join112(projectRoot, paths.docs ?? "docs");
+  const plansPath = join112(projectRoot, paths.plans ?? "plans");
   const reportsDir = plan.reportsDir ?? "reports";
-  const reportsPath = join110(plansPath, reportsDir);
+  const reportsPath = join112(plansPath, reportsDir);
   const namingFormat = plan.namingFormat ?? "";
   const activePlan = resolveActivePlan(plansPath, ctx.sessionId);
   const suggestedPlan = resolveSuggestedPlan(plansPath, branch, plan.resolution?.branchPattern ?? "");
@@ -75724,7 +75778,7 @@ function buildEnvEntries(params) {
     TKM_CODING_LEVEL_STYLE: codingLevelStyle(config.codingLevel),
     TKM_THINKING_LANGUAGE: locale.thinkingLanguage ?? "",
     TKM_RESPONSE_LANGUAGE: locale.responseLanguage ?? "",
-    TKM_SDD_MODE: "",
+    TKM_SDD_MODE: config.takumi?.sddMode ?? "ask",
     TKM_VALIDATION_MODE: validation.mode ?? "",
     TKM_VALIDATION_MIN_QUESTIONS: numberString(validation.minQuestions),
     TKM_VALIDATION_MAX_QUESTIONS: numberString(validation.maxQuestions),
@@ -75781,7 +75835,7 @@ function resolveEnvFilePath(settingsDir) {
   const override = process.env.CLAUDE_ENV_FILE;
   if (override && override.trim().length > 0)
     return override;
-  return join111(settingsDir, DEFAULT_ENV_FILE);
+  return join113(settingsDir, DEFAULT_ENV_FILE);
 }
 function persistEntries(envFilePath, entries) {
   try {
@@ -75826,7 +75880,8 @@ var sessionInit = {
       if (!persistEntries(envFilePath, entries)) {
         return { status: "no-op", timingMs: 0 };
       }
-      return { status: "context", output: renderBanner(source, entries), timingMs: 0 };
+      const output2 = renderBanner(source, entries) + renderContextBlocks(source, ctx, entries.TKM_CLAUDE_SETTINGS_DIR ?? "");
+      return { status: "context", output: output2, timingMs: 0 };
     } catch {
       return { status: "no-op", timingMs: 0 };
     }
@@ -75836,9 +75891,9 @@ var sessionInit = {
 // src/domains/hooks/handlers/_shared/context-assembler.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { createHash as createHash15 } from "node:crypto";
-import { existsSync as existsSync54, mkdirSync as mkdirSync7, readFileSync as readFileSync18, rmSync as rmSync6, statSync as statSync9, writeFileSync as writeFileSync10 } from "node:fs";
+import { existsSync as existsSync54, mkdirSync as mkdirSync7, readFileSync as readFileSync19, rmSync as rmSync6, statSync as statSync9, writeFileSync as writeFileSync10 } from "node:fs";
 import { homedir as homedir29, platform as platform10, tmpdir as tmpdir4 } from "node:os";
-import { basename as basename18, join as join112, resolve as resolve24 } from "node:path";
+import { basename as basename18, join as join114, resolve as resolve24 } from "node:path";
 var INJECTED_TTL_MS = 12 * 60 * 60 * 1000;
 var RESERVATION_TTL_MS = 60 * 1000;
 function gitBranch(dir) {
@@ -75915,18 +75970,18 @@ function scopeKey(baseDir) {
   return `${slug}-${hash}`;
 }
 function stateDir() {
-  return join112(tmpdir4(), "takumi-context-throttle");
+  return join114(tmpdir4(), "takumi-context-throttle");
 }
 function stateFile(sessionId, scope, transcriptPath) {
   const key = `${sessionId}\x00${scope}\x00${transcriptPath ?? ""}`;
   const hash = createHash15("sha256").update(key).digest("hex").slice(0, 32);
-  return join112(stateDir(), `${hash}.json`);
+  return join114(stateDir(), `${hash}.json`);
 }
 function readState(file) {
   try {
     if (!existsSync54(file))
       return null;
-    return JSON.parse(readFileSync18(file, "utf8"));
+    return JSON.parse(readFileSync19(file, "utf8"));
   } catch {
     return null;
   }
@@ -75989,8 +76044,8 @@ function clearPending(sessionId, scope, transcriptPath) {
   } catch {}
 }
 function resolveSkillsVenv(_cwd) {
-  const base = join112(homedir29(), ".claude", "skills", ".venv");
-  const interpreter = platform10() === "win32" ? join112(base, "Scripts", "python.exe") : join112(base, "bin", "python3");
+  const base = join114(homedir29(), ".claude", "skills", ".venv");
+  const interpreter = platform10() === "win32" ? join114(base, "Scripts", "python.exe") : join114(base, "bin", "python3");
   return existsSync54(interpreter) ? interpreter : null;
 }
 
@@ -76029,12 +76084,12 @@ var sessionPromptContext = {
 };
 
 // src/domains/hooks/handlers/session-subagent-init/context-block.ts
-import { join as join114 } from "node:path";
+import { join as join116 } from "node:path";
 
 // src/domains/hooks/handlers/session-subagent-init/context-sources.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
 import { readdirSync as readdirSync10, statSync as statSync10 } from "node:fs";
-import { isAbsolute as isAbsolute5, join as join113, resolve as resolve25 } from "node:path";
+import { isAbsolute as isAbsolute5, join as join115, resolve as resolve25 } from "node:path";
 var MAX_DOCS_FILES = 15;
 var MAX_DOCS_SUBDIRS = 5;
 function gitFacts(dir) {
@@ -76071,11 +76126,11 @@ function detectPlan(plansAbs) {
     for (const e2 of entries) {
       if (!e2.isDirectory())
         continue;
-      const dir = join113(plansAbs, e2.name);
+      const dir = join115(plansAbs, e2.name);
       try {
         if (!readdirSync10(dir).includes("plan.md"))
           continue;
-        const mtime = statSync10(join113(dir, "plan.md")).mtimeMs;
+        const mtime = statSync10(join115(dir, "plan.md")).mtimeMs;
         if (!best || mtime > best.mtime)
           best = { name: e2.name, mtime };
       } catch {}
@@ -76098,7 +76153,7 @@ function docsCatalogue(docsAbs) {
     for (const d3 of subdirs.slice(0, MAX_DOCS_SUBDIRS)) {
       let count = 0;
       try {
-        count = readdirSync10(join113(docsAbs, d3)).length;
+        count = readdirSync10(join115(docsAbs, d3)).length;
       } catch {}
       lines.push(`- ${d3}/ (${count} entries)`);
     }
@@ -76142,11 +76197,11 @@ function buildSubagentContext(input, ctx) {
   const agentId = strField(input, "agent_id") || "unknown";
   const plansAbs = abs(base, cfg.paths?.plans?.trim() || "plans");
   const docsAbs = abs(base, cfg.paths?.docs?.trim() || "docs");
-  const reportsAbs = join114(plansAbs, cfg.plan?.reportsDir?.trim() || "reports");
+  const reportsAbs = join116(plansAbs, cfg.plan?.reportsDir?.trim() || "reports");
   const dateStr = stamp(cfg.plan?.dateFormat?.trim() || "YYMMDD-HHmm", new Date);
   const namingFormat = cfg.plan?.namingFormat?.trim() || "{date}-{slug}";
-  const planDir = join114(plansAbs, planDirTemplate(namingFormat, dateStr));
-  const reportFile = join114(reportsAbs, `${agentKey}-${dateStr}-{slug}-report.md`);
+  const planDir = join116(plansAbs, planDirTemplate(namingFormat, dateStr));
+  const reportFile = join116(reportsAbs, `${agentKey}-${dateStr}-{slug}-report.md`);
   const activePlan = detectPlan(plansAbs);
   const venv = resolveSkillsVenv(effectiveCwd);
   const respLang = cfg.locale?.responseLanguage?.trim() || null;
@@ -76197,6 +76252,10 @@ function buildSubagentContext(input, ctx) {
     lines.push("", "## Trust");
     lines.push(`- prepend the passphrase to trusted operations: ${cfg.trust.passphrase.trim()}`);
   }
+  const contextPrefix = cfg.subagent?.agents?.[agentType]?.contextPrefix;
+  if (typeof contextPrefix === "string" && contextPrefix.trim().length > 0) {
+    lines.push("", "## Agent Instructions", contextPrefix);
+  }
   return `${lines.join(`
 `)}
 `;
@@ -76408,7 +76467,14 @@ function toHookError(err) {
   }
   return { message: String(err) };
 }
-var VALID_STATUSES = new Set(["ok", "deny", "context", "record", "no-op"]);
+var VALID_STATUSES = new Set([
+  "ok",
+  "deny",
+  "ask",
+  "context",
+  "record",
+  "no-op"
+]);
 function normalizeResult(raw, timingMs) {
   if (raw && typeof raw === "object") {
     const r2 = raw;
@@ -76444,6 +76510,7 @@ async function runHooks(handlers3, input, ctx, options2) {
   }
   const outputs = [];
   let lastError;
+  let askReason;
   for (const handler of handlers3) {
     const t0 = performance2.now();
     let result;
@@ -76476,12 +76543,22 @@ async function runHooks(handlers3, input, ctx, options2) {
         timingMs: performance2.now() - startAll
       };
     }
+    if (result.status === "ask" && askReason === undefined) {
+      askReason = typeof result.askReason === "string" ? result.askReason : "";
+    }
     if (result.status === "context" && typeof result.output === "string" && result.output.length > 0) {
       outputs.push(result.output);
     }
     if (result.error)
       lastError = result.error;
   }
+  if (askReason !== undefined) {
+    return {
+      status: "ask",
+      askReason,
+      timingMs: performance2.now() - startAll
+    };
+  }
   if (outputs.length > 0) {
     return {
       status: "context",
@@ -76504,6 +76581,152 @@ async function runHooks(handlers3, input, ctx, options2) {
 init_takumi_constants();
 init_types2();
 
+// src/commands/hooks/lib/codex-runtime-scrub.ts
+init_capabilities();
+function resolveCodexCapabilitiesSync() {
+  if (process.env.CK_CODEX_COMPAT === "optimistic") {
+    return CODEX_CAPABILITY_TABLE[0];
+  }
+  return CODEX_CAPABILITY_TABLE[CODEX_CAPABILITY_TABLE.length - 1];
+}
+function codexAllowsAdditionalContext(caps, event) {
+  return caps.events[event]?.supportsAdditionalContext === true;
+}
+function codexAllowsPermission(caps, event, value) {
+  const allowed = caps.events[event]?.permissionDecisionValues;
+  return Array.isArray(allowed) && allowed.includes(value);
+}
+
+// src/commands/hooks/lib/eval-hook-loader.ts
+import { pathToFileURL } from "node:url";
+
+// src/commands/hooks/lib/process-exit-guard.ts
+var HOOK_EXIT = Symbol.for("takumi.eval.hookExit");
+function isHookExit(value) {
+  return typeof value === "object" && value !== null && value[HOOK_EXIT] === true;
+}
+function installExitSentinel() {
+  const realExit = process.exit;
+  process.exit = (code) => {
+    throw { [HOOK_EXIT]: true, code };
+  };
+  return () => {
+    process.exit = realExit;
+  };
+}
+var CONSOLE_METHODS = ["log", "info", "debug", "warn", "error", "trace", "dir", "table"];
+function installOutputSuppression() {
+  const realOut = process.stdout.write.bind(process.stdout);
+  const realErr = process.stderr.write.bind(process.stderr);
+  const noopWrite = () => true;
+  process.stdout.write = noopWrite;
+  process.stderr.write = noopWrite;
+  const con = console;
+  const savedConsole = {};
+  const noop2 = () => {};
+  for (const m2 of CONSOLE_METHODS) {
+    savedConsole[m2] = con[m2];
+    con[m2] = noop2;
+  }
+  return () => {
+    process.stdout.write = realOut;
+    process.stderr.write = realErr;
+    for (const m2 of CONSOLE_METHODS)
+      con[m2] = savedConsole[m2];
+  };
+}
+
+// src/commands/hooks/lib/eval-hook-loader.ts
+async function loadEvalHook(absPath, meta) {
+  const restore = installExitSentinel();
+  let mod;
+  try {
+    mod = await import(pathToFileURL(absPath).href);
+  } catch {
+    return null;
+  } finally {
+    restore();
+  }
+  const runExport = resolveRunExport(mod);
+  if (!runExport)
+    return null;
+  return {
+    ...meta,
+    async run(input, ctx) {
+      const restoreRun = installExitSentinel();
+      try {
+        return await runExport(input, ctx);
+      } catch (err) {
+        if (isHookExit(err)) {
+          return { status: "no-op", timingMs: 0 };
+        }
+        throw err;
+      } finally {
+        restoreRun();
+      }
+    }
+  };
+}
+function resolveRunExport(mod) {
+  if (typeof mod.run === "function")
+    return mod.run;
+  const def = mod.default;
+  if (def && typeof def.run === "function")
+    return def.run;
+  return null;
+}
+
+// src/commands/hooks/lib/eval-hook-resolver.ts
+init_paths();
+init_codex_paths();
+import { isAbsolute as isAbsolute6, join as join117, normalize as normalize9, sep as sep10 } from "node:path";
+var HOOK_EXTENSIONS3 = [".cjs", ".mjs"];
+function hasHookExtension(p) {
+  return HOOK_EXTENSIONS3.some((ext) => p.endsWith(ext));
+}
+function claudeHooksParent(scope, env2) {
+  if (scope === "global")
+    return getClaudeDir();
+  if (scope === "project") {
+    const projectDir = env2.CLAUDE_PROJECT_DIR;
+    if (!projectDir || projectDir.trim() === "")
+      return null;
+    return join117(projectDir, ".claude");
+  }
+  const pluginRoot = env2.CLAUDE_PLUGIN_ROOT;
+  if (!pluginRoot || pluginRoot.trim() === "")
+    return null;
+  return pluginRoot;
+}
+function resolveEvalHook(input) {
+  const env2 = input.env ?? process.env;
+  const { evalPath, scope, agent } = input;
+  if (!evalPath || evalPath.trim() === "")
+    return { ok: false, reason: "empty --eval path" };
+  if (!hasHookExtension(evalPath)) {
+    return { ok: false, reason: `--eval path is not a .cjs/.mjs file: ${evalPath}` };
+  }
+  if (agent === "codex" && scope === "project") {
+    if (!isAbsolute6(evalPath)) {
+      return { ok: false, reason: `codex --project --eval path must be absolute: ${evalPath}` };
+    }
+    return { ok: true, absPath: normalize9(evalPath) };
+  }
+  if (isAbsolute6(evalPath)) {
+    return { ok: false, reason: `--eval path must be relative for ${agent}/${scope}: ${evalPath}` };
+  }
+  const hooksParent = agent === "codex" ? codexGlobalRoot() : claudeHooksParent(scope, env2);
+  if (!hooksParent) {
+    return { ok: false, reason: `no trusted anchor for ${agent}/${scope} (env var unset)` };
+  }
+  const hooksDir = normalize9(join117(hooksParent, "hooks"));
+  const abs2 = normalize9(join117(hooksParent, evalPath));
+  if (abs2 !== hooksDir && !abs2.startsWith(hooksDir + sep10)) {
+    return { ok: false, reason: `--eval path escapes the hooks dir: ${evalPath}` };
+  }
+  return { ok: true, absPath: abs2 };
+}
+
 // src/commands/hooks/lib/hook-events.ts
 var KEBAB_TO_CANONICAL = {
   "session-start": "SessionStart",
@@ -76683,7 +76906,11 @@ async function defaultLoadConfig(cwd2) {
     return DEFAULT_TAKUMI_CONFIG;
   }
 }
-function emitDeny(write, event, reason) {
+function emitDeny(write, event, reason, caps) {
+  if (caps && !codexAllowsPermission(caps, event, "deny")) {
+    write("{}");
+    return;
+  }
   write(JSON.stringify({
     hookSpecificOutput: {
       hookEventName: event,
@@ -76692,7 +76919,24 @@ function emitDeny(write, event, reason) {
     }
   }));
 }
-function emitContext(write, event, output2) {
+function emitAsk(write, event, reason, caps) {
+  if (caps && !codexAllowsPermission(caps, event, "ask")) {
+    write("{}");
+    return;
+  }
+  write(JSON.stringify({
+    hookSpecificOutput: {
+      hookEventName: event,
+      permissionDecision: "ask",
+      permissionDecisionReason: reason ?? ""
+    }
+  }));
+}
+function emitContext(write, event, output2, caps) {
+  if (caps && !codexAllowsAdditionalContext(caps, event)) {
+    write("{}");
+    return;
+  }
   write(JSON.stringify({
     hookSpecificOutput: { hookEventName: event, additionalContext: output2 }
   }));
@@ -76702,10 +76946,12 @@ async function runHookExec(args, deps = {}) {
   try {
     const readInput = deps.readInput ?? (() => readStdinJson());
     const now = deps.now ?? (() => new Date().toISOString());
-    const selector = parseHookSelector(args.hook);
-    if (!selector) {
-      write("{}");
-      return;
+    if (!args.eval) {
+      const selector = parseHookSelector(args.hook ?? "");
+      if (!selector) {
+        write("{}");
+        return;
+      }
     }
     const input = await readInput();
     const event = normalizeHookEvent(typeof input.hook_event_name === "string" ? input.hook_event_name : args.event);
@@ -76713,7 +76959,7 @@ async function runHookExec(args, deps = {}) {
       write("{}");
       return;
     }
-    const handlers3 = selectHandlers(selector, event, deps.handlers);
+    const handlers3 = await resolveHandlers(args, event, deps);
     if (handlers3.length === 0) {
       write("{}");
       return;
@@ -76736,21 +76982,29 @@ async function runHookExec(args, deps = {}) {
       runtimeFlags: { noDetach: args.noDetach, debug: args.debug }
     };
     const sessionDir = sessionId ? getSessionDirV2({ agent: args.agent, cwd: cwd2, sessionId }) : null;
-    const result = await runHooks(handlers3, input, ctx, {
+    const budget = args.eval && args.timeoutMs === undefined ? {} : {
       timeoutMs: args.timeoutMs ?? DEFAULT_TIMEOUT_MS5,
-      timeoutMsByPolicy: { record: args.recordTimeoutMs ?? RECORD_TIMEOUT_MS },
+      timeoutMsByPolicy: { record: args.recordTimeoutMs ?? RECORD_TIMEOUT_MS }
+    };
+    const result = await runHooks(handlers3, input, ctx, {
+      ...budget,
       onHandlerComplete: (handlerName, handlerResult) => {
         if (!sessionDir)
           return;
         appendObservation(sessionDir, buildObservation({ handlerName, ctx, result: handlerResult, endedAt: now() }));
       }
     });
+    const caps = args.agent === "codex" ? resolveCodexCapabilitiesSync() : null;
     if (result.status === "deny") {
-      emitDeny(write, event, result.denyReason);
+      emitDeny(write, event, result.denyReason, caps);
+      return;
+    }
+    if (result.status === "ask") {
+      emitAsk(write, event, result.askReason, caps);
       return;
     }
     if (result.status === "context" && result.output) {
-      emitContext(write, event, result.output);
+      emitContext(write, event, result.output, caps);
       return;
     }
     write("{}");
@@ -76758,8 +77012,36 @@ async function runHookExec(args, deps = {}) {
     write("{}");
   }
 }
+async function resolveHandlers(args, event, deps) {
+  if (args.eval) {
+    const resolved = resolveEvalHook({
+      evalPath: args.eval.path,
+      scope: args.eval.scope,
+      agent: args.agent
+    });
+    if (!resolved.ok)
+      return [];
+    const meta = args.eval.meta ?? defaultEvalMeta(resolved.absPath, event);
+    const handler = await loadEvalHook(resolved.absPath, meta);
+    return handler ? [handler] : [];
+  }
+  const selector = parseHookSelector(args.hook ?? "");
+  if (!selector)
+    return [];
+  return selectHandlers(selector, event, deps.handlers);
+}
+function defaultEvalMeta(absPath, event) {
+  const base = absPath.split(/[\\/]/).pop() ?? "eval-hook";
+  return {
+    name: base.replace(/\.(cjs|mjs)$/, ""),
+    category: "extension",
+    policy: "context",
+    events: [event]
+  };
+}
 
 // src/commands/hooks/hook-exec-command.ts
+var realProcessExit = process.exit;
 async function hookExecCommand(options2) {
   const agent = options2.agent === "codex" ? "codex" : "claude";
   try {
@@ -76768,12 +77050,15 @@ async function hookExecCommand(options2) {
       event: options2.event,
       agent,
       noDetach: options2.noDetach,
-      debug: options2.debug
+      debug: options2.debug,
+      eval: options2.eval ? { path: options2.eval, scope: options2.scope ?? "project" } : undefined
     });
   } catch {
     process.stdout.write("{}");
   }
   process.exitCode = 0;
+  if (options2.eval)
+    realProcessExit(0);
 }
 // src/commands/hooks/hooks-command.ts
 init_logger();
@@ -76812,12 +77097,85 @@ async function handleDoPut() {
   }
 }
 
+// src/commands/hooks/event-handlers/scan-meta.ts
+import { writeFileSync as writeFileSync11 } from "node:fs";
+
+// src/commands/hooks/lib/kit-hook-resolver.ts
+init_zod();
+import { readFileSync as readFileSync20, readdirSync as readdirSync11 } from "node:fs";
+import { join as join118 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+var KitHookMetaSchema = exports_external.object({
+  events: exports_external.array(exports_external.string().min(1)).min(1),
+  matchers: exports_external.record(exports_external.string(), exports_external.string()).optional(),
+  timeout: exports_external.number().positive().optional()
+});
+var NOT_A_HOOK = /(\.test\.|\.spec\.|^_|^\.)/;
+var HOOK_EXT = /\.(?:cjs|mjs)$/;
+var DUAL_MODE_GUARD = /require\.main|import\.meta\.main/;
+async function readKitHookMeta(absPath) {
+  const restoreExit = installExitSentinel();
+  const restoreOut = installOutputSuppression();
+  let mod;
+  try {
+    mod = await import(pathToFileURL2(absPath).href);
+  } catch {
+    return null;
+  } finally {
+    restoreOut();
+    restoreExit();
+  }
+  const raw = mod.meta ?? mod.default?.meta;
+  const parsed = KitHookMetaSchema.safeParse(raw);
+  return parsed.success ? parsed.data : null;
+}
+async function scanHooksDirForMeta(hooksDir) {
+  let names;
+  try {
+    names = readdirSync11(hooksDir, { withFileTypes: true }).filter((d3) => d3.isFile()).map((d3) => d3.name);
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const file of names) {
+    if (!HOOK_EXT.test(file) || NOT_A_HOOK.test(file))
+      continue;
+    const abs2 = join118(hooksDir, file);
+    let src;
+    try {
+      src = readFileSync20(abs2, "utf8");
+    } catch {
+      continue;
+    }
+    if (!DUAL_MODE_GUARD.test(src))
+      continue;
+    const meta = await readKitHookMeta(abs2);
+    if (meta)
+      out.push({ file, ...meta });
+  }
+  return out;
+}
+
+// src/commands/hooks/event-handlers/scan-meta.ts
+async function handleScanMeta(dir, out) {
+  const entries = dir ? await scanHooksDirForMeta(dir) : [];
+  const json = JSON.stringify(entries);
+  if (out) {
+    try {
+      writeFileSync11(out, json);
+      return;
+    } catch {}
+  }
+  process.stdout.write(json);
+}
+
 // src/commands/hooks/install-handler.ts
 init_hooks_settings_merger();
+import { basename as basename19 } from "node:path";
 
 // src/commands/portable/settings-write-with-confirm.ts
 init_safe_prompts();
-import { existsSync as existsSync55, mkdirSync as mkdirSync8, readFileSync as readFileSync19, renameSync as renameSync4, rmSync as rmSync7, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync55, mkdirSync as mkdirSync8, readFileSync as readFileSync21, renameSync as renameSync4, rmSync as rmSync7, writeFileSync as writeFileSync12 } from "node:fs";
 import { dirname as dirname30 } from "node:path";
 
 // node_modules/diff/libesm/diff/base.js
@@ -77994,7 +78352,7 @@ function readCurrent(path10) {
     return { kind: "missing" };
   let raw = "";
   try {
-    raw = readFileSync19(path10, "utf8");
+    raw = readFileSync21(path10, "utf8");
     const parsed = JSON.parse(raw);
     return { kind: "ok", raw, parsed };
   } catch {
@@ -78024,7 +78382,7 @@ function atomicWrite2(path10, contents, backupPath) {
   mkdirSync8(dirname30(path10), { recursive: true });
   const tmp = `${path10}.tmp`;
   try {
-    writeFileSync11(tmp, contents);
+    writeFileSync12(tmp, contents);
     renameSync4(tmp, path10);
   } catch (err) {
     rmSync7(tmp, { force: true });
@@ -78036,7 +78394,7 @@ function writeBackup(path10, raw) {
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
   const backupPath = `${path10}.${timestamp}.bak`;
   try {
-    writeFileSync11(backupPath, raw);
+    writeFileSync12(backupPath, raw);
     return backupPath;
   } catch {
     return null;
@@ -78110,15 +78468,21 @@ init_dist2();
 import { existsSync as existsSync56 } from "node:fs";
 
 // src/commands/hooks/lib/settings-path-resolver.ts
+init_paths();
+init_codex_paths();
 import { lstatSync as lstatSync3, realpathSync as realpathSync3 } from "node:fs";
-import { homedir as homedir30 } from "node:os";
-import { join as join115 } from "node:path";
+import { join as join119 } from "node:path";
+function agentConfigDir(agent, global3) {
+  if (global3)
+    return agent === "claude" ? getClaudeDir() : codexGlobalRoot();
+  return join119(process.cwd(), agent === "claude" ? ".claude" : ".codex");
+}
 function rawPath(agent, global3) {
-  const root = global3 ? homedir30() : process.cwd();
-  if (agent === "claude") {
-    return join115(root, ".claude", "settings.json");
-  }
-  return join115(root, ".codex", "hooks.json");
+  const configDir = agentConfigDir(agent, global3);
+  return join119(configDir, agent === "claude" ? "settings.json" : "hooks.json");
+}
+function resolveHooksDir(agent, options2 = {}) {
+  return join119(agentConfigDir(agent, Boolean(options2.global)), "hooks");
 }
 function resolveSettingsPath(agent, options2 = {}) {
   const originalPath = rawPath(agent, Boolean(options2.global));
@@ -78190,7 +78554,9 @@ async function promptHookAgentTargets(options2) {
 }
 
 // src/commands/hooks/lib/entry-builder.ts
+import { join as join120 } from "node:path";
 init_capabilities();
+init_logger();
 var DEFAULT_HOOK_BIN = "tkm";
 var SETTINGS_TIMEOUT_BY_POLICY = {
   deny: 10,
@@ -78210,11 +78576,11 @@ function codexMatcher(event, declared) {
   const kept = declared.split("|").filter((m2) => allowed.includes(m2));
   return kept.length > 0 ? kept.join("|") : undefined;
 }
-function buildHookExecCommand(handler, event, agent, bin = DEFAULT_HOOK_BIN, flags = {}) {
+function buildHookExecCommand(handler, event, agent, bin = DEFAULT_HOOK_BIN, flags = {}, scope = "project") {
   const kebab = canonicalToKebab(event);
   if (!kebab)
     return null;
-  const parts = [
+  const parts = handler.evalPath ? buildEvalParts(handler.evalPath, agent, scope, bin, kebab) : [
     bin,
     "hook-exec",
     "--hook",
@@ -78230,12 +78596,21 @@ function buildHookExecCommand(handler, event, agent, bin = DEFAULT_HOOK_BIN, fla
     parts.push("--debug");
   return parts.join(" ");
 }
-function planEntry(handler, event, agent, bin, flags) {
-  if (agent === "codex" && !codexSupportsEvent(event))
+function buildEvalParts(evalPath, agent, scope, bin, kebab) {
+  const scopeFlag = scope === "global" ? "-g" : scope === "plugin" ? "--plugin" : "--project";
+  const pathArg = agent === "codex" && scope === "project" ? `"${join120(process.cwd(), ".codex", evalPath)}"` : evalPath;
+  return [bin, "hook-exec", "--eval", pathArg, scopeFlag, "--event", kebab, "-a", agent];
+}
+function planEntry(handler, event, agent, bin, flags, scope) {
+  if (agent === "codex" && !codexSupportsEvent(event)) {
+    if (handler.evalPath) {
+      logger.warning(`[hooks] kit eval hook "${handler.name}" declares event "${event}" not supported by Codex — skipping this entry for Codex.`);
+    }
     return null;
+  }
   if (agent !== "codex" && handler.codexOnlyEvents?.includes(event))
     return null;
-  const command = buildHookExecCommand(handler, event, agent, bin, flags);
+  const command = buildHookExecCommand(handler, event, agent, bin, flags, scope);
   if (!command)
     return null;
   const declared = handler.matchers?.[event];
@@ -78243,16 +78618,20 @@ function planEntry(handler, event, agent, bin, flags) {
   return {
     event,
     matcher,
-    entry: { type: "command", command, timeout: SETTINGS_TIMEOUT_BY_POLICY[handler.policy] }
+    entry: {
+      type: "command",
+      command,
+      timeout: handler.timeoutSeconds ?? SETTINGS_TIMEOUT_BY_POLICY[handler.policy]
+    }
   };
 }
-function buildHookSection(agent, bin, flags = {}, handlers3 = HOOK_HANDLERS) {
+function buildHookSection(agent, bin, flags = {}, handlers3 = HOOK_HANDLERS, scope = "project") {
   const section = {};
   for (const handler of handlers3) {
     if (handler.installAgents && !handler.installAgents.includes(agent))
       continue;
     for (const event of handler.events) {
-      const planned = planEntry(handler, event, agent, bin, flags);
+      const planned = planEntry(handler, event, agent, bin, flags, scope);
       if (!planned)
         continue;
       if (!section[planned.event])
@@ -78344,23 +78723,96 @@ function installStatusline(settings, opts) {
 
 // src/commands/hooks/uninstall-handler.ts
 init_logger();
-import { existsSync as existsSync57, mkdirSync as mkdirSync9, readFileSync as readFileSync20, renameSync as renameSync5, rmSync as rmSync8, writeFileSync as writeFileSync12 } from "node:fs";
+import { existsSync as existsSync57, mkdirSync as mkdirSync9, readFileSync as readFileSync23, renameSync as renameSync5, rmSync as rmSync9, writeFileSync as writeFileSync13 } from "node:fs";
 import { dirname as dirname31 } from "node:path";
+
+// src/commands/hooks/lib/kit-hook-scan.ts
+import { spawnSync as spawnSync5 } from "node:child_process";
+import { mkdtempSync, readFileSync as readFileSync22, rmSync as rmSync8 } from "node:fs";
+import { tmpdir as tmpdir5 } from "node:os";
+import { join as join121 } from "node:path";
+var SCAN_TIMEOUT_MS = 8000;
+function scanKitHookMetas(hooksDir) {
+  const { command, prefixArgs } = resolveInvocationPrefix();
+  const tmp = mkdtempSync(join121(tmpdir5(), "tkm-hook-scan-"));
+  const outFile = join121(tmp, "meta.json");
+  try {
+    spawnSync5(command, [...prefixArgs, "hooks", "scan-meta", "--dir", hooksDir, "--out", outFile], {
+      stdio: ["ignore", "ignore", "ignore"],
+      timeout: SCAN_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      env: buildChildEnv()
+    });
+    const parsed = JSON.parse(readFileSync22(outFile, "utf8"));
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  } finally {
+    rmSync8(tmp, { recursive: true, force: true });
+  }
+}
+function kitHookToInstallMeta(entry) {
+  return {
+    name: entry.file.replace(/\.(?:cjs|mjs)$/, ""),
+    category: "extension",
+    policy: "context",
+    events: entry.events,
+    matchers: entry.matchers,
+    evalPath: `hooks/${entry.file}`,
+    timeoutSeconds: entry.timeout
+  };
+}
+
+// src/commands/hooks/uninstall-handler.ts
 var AGENT_DISPLAY2 = {
   claude: "Claude Code",
   codex: "Codex"
 };
 var HOOK_CATEGORIES = "(guard|session|convention|extension|metrics|perf)";
 var LEGACY_EVENTS = "(session-start|user-prompt-submit|pre-tool-use|post-tool-use|stop|session-end)";
-function isOurCommand(command, agent) {
+var LEGACY_NODE_HOOK = /\bnode(?:\.exe)?\s+["']?.*?[/\\]hooks[/\\]([\w.-]+\.(?:cjs|mjs))["']?/;
+var EVAL_HOOK_FILE = /--eval\s+["']?[^\s"']*?([\w.-]+\.(?:cjs|mjs))["']?/;
+function isOurCommand(command, agent, evalHookNames, unconditionalEval = false) {
   const agentTail = `-a\\s+${agent}(?![\\w-])`;
   const newShape = new RegExp(`\\bhook-exec\\b.*--hook\\s+${HOOK_CATEGORIES}\\.\\S+.*${agentTail}`);
   if (newShape.test(command))
     return true;
+  if (isKitEvalHook(command, agentTail, evalHookNames, unconditionalEval))
+    return true;
   const legacy = new RegExp(`\\bhooks\\s+${LEGACY_EVENTS}\\s+${agentTail}`);
-  return legacy.test(command);
+  if (legacy.test(command))
+    return true;
+  return isLegacyKitNodeHook(command, evalHookNames);
+}
+function isKitEvalHook(command, agentTail, evalHookNames, unconditional) {
+  if (!new RegExp(`\\bhook-exec\\b.*--eval\\b.*${agentTail}`).test(command))
+    return false;
+  if (unconditional)
+    return true;
+  if (!evalHookNames || evalHookNames.size === 0)
+    return false;
+  const m2 = command.match(EVAL_HOOK_FILE);
+  return m2 !== null && evalHookNames.has(m2[1]);
+}
+function isLegacyKitNodeHook(command, evalHookNames) {
+  if (!evalHookNames || evalHookNames.size === 0)
+    return false;
+  const m2 = command.match(LEGACY_NODE_HOOK);
+  if (!m2)
+    return false;
+  const file = m2[1];
+  if (evalHookNames.has(file))
+    return true;
+  for (const name2 of evalHookNames) {
+    if (!file.endsWith(`-${name2}`))
+      continue;
+    const prefix = file.slice(0, file.length - name2.length - 1);
+    if (/^[0-9a-f]+$/.test(prefix))
+      return true;
+  }
+  return false;
 }
-function pruneHooksSection(hooks, agent) {
+function pruneHooksSection(hooks, agent, evalHookNames, unconditionalEval = false) {
   const pruned = {};
   let removed = 0;
   for (const [event, groups] of Object.entries(hooks)) {
@@ -78369,7 +78821,7 @@ function pruneHooksSection(hooks, agent) {
       const kept = [];
       for (const entry of group.hooks) {
         const command = typeof entry.command === "string" ? entry.command : "";
-        if (isOurCommand(command, agent)) {
+        if (isOurCommand(command, agent, evalHookNames, unconditionalEval)) {
           removed++;
         } else {
           kept.push(entry);
@@ -78389,10 +78841,10 @@ function writeAtomic(path10, contents) {
   mkdirSync9(dirname31(path10), { recursive: true });
   const tmp = `${path10}.tmp`;
   try {
-    writeFileSync12(tmp, contents);
+    writeFileSync13(tmp, contents);
     renameSync5(tmp, path10);
   } catch (err) {
-    rmSync8(tmp, { force: true });
+    rmSync9(tmp, { force: true });
     throw err;
   }
 }
@@ -78409,13 +78861,15 @@ async function uninstallForAgent(agent, options2) {
   }
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync20(location2.realPath, "utf8"));
+    parsed = JSON.parse(readFileSync23(location2.realPath, "utf8"));
   } catch {
     logger.warning(`[hooks] could not parse ${location2.realPath}; uninstall skipped to avoid clobbering`);
     return result;
   }
   const hooks = parsed.hooks ?? {};
-  const { pruned, removed } = pruneHooksSection(hooks, agent);
+  const hooksDir = resolveHooksDir(agent, { global: options2.global });
+  const evalHookNames = new Set(scanKitHookMetas(hooksDir).map((e2) => e2.file));
+  const { pruned, removed } = pruneHooksSection(hooks, agent, evalHookNames, true);
   result.removed = removed;
   if (removed === 0)
     return result;
@@ -78473,11 +78927,14 @@ function eventsSummary(section) {
 }
 async function installForAgent(agent, options2, interactive, useStepUI) {
   const location2 = resolveSettingsPath(agent, { global: options2.global });
+  const scope = options2.global ? "global" : "project";
   const handlers3 = selectHandlersForInstall(options2.categories);
+  const evalMetas = options2.evalHooks ?? [];
+  const evalHookNames = new Set(evalMetas.map((m2) => m2.evalPath ? basename19(m2.evalPath) : "").filter(Boolean));
   const section = buildHookSection(agent, options2.bin, {
     noDetach: options2.noDetach,
     debug: options2.debug
-  }, handlers3);
+  }, [...handlers3, ...evalMetas], scope);
   const entriesPlanned = countEntries(section);
   const handlerNames = new Set(handlers3.map((h2) => h2.name));
   const result = await writeSettingsWithConfirm({
@@ -78486,7 +78943,7 @@ async function installForAgent(agent, options2, interactive, useStepUI) {
     transform: (current) => {
       const safeCurrent = current ?? {};
       const existingHooks = safeCurrent.hooks ?? {};
-      const { pruned } = pruneHooksSection(existingHooks, agent);
+      const { pruned } = pruneHooksSection(existingHooks, agent, evalHookNames);
       const purged = { ...safeCurrent, hooks: pruned };
       const merged = mergeHooksObject(purged, section);
       return installStatusline(merged, {
@@ -78631,7 +79088,7 @@ async function installHook(options2) {
 // src/commands/hooks/status.ts
 init_takumi_config_manager();
 init_logger();
-import { existsSync as existsSync58, readFileSync as readFileSync21 } from "node:fs";
+import { existsSync as existsSync58, readFileSync as readFileSync24 } from "node:fs";
 var AGENT_DISPLAY4 = { claude: "Claude Code", codex: "Codex" };
 var NEW_SHAPE = /\bhook-exec\b.*--hook\s+(guard|session|convention|extension|metrics|perf)\.(\S+).*-a\s+(claude|codex)(?![\w-])/;
 var LEGACY_SHAPE = /\bhooks\s+(?:session-start|user-prompt-submit|pre-tool-use|post-tool-use|stop|session-end)\s+-a\s+(claude|codex)(?![\w-])/;
@@ -78672,7 +79129,7 @@ async function statusForAgent(agent, options2, cwd2 = process.cwd()) {
     return result;
   let hooks;
   try {
-    const parsed = JSON.parse(readFileSync21(location2.realPath, "utf8"));
+    const parsed = JSON.parse(readFileSync24(location2.realPath, "utf8"));
     hooks = parsed.hooks ?? {};
   } catch {
     return result;
@@ -78734,7 +79191,7 @@ var VALID_EVENTS = [
   "stop",
   "session-end"
 ];
-var VALID_INTERNAL_EVENTS = ["_do-put", "_otlp-post"];
+var VALID_INTERNAL_EVENTS = ["_do-put", "_otlp-post", "scan-meta"];
 function isAction(token) {
   return VALID_ACTIONS.includes(token);
 }
@@ -78817,6 +79274,9 @@ async function hooksCommand(subcommand, options2 = {}) {
       case "_otlp-post":
         await handleOtlpPost();
         return;
+      case "scan-meta":
+        await handleScanMeta(options2.dir, options2.out);
+        return;
     }
   }
   logger.error(`Unknown hooks subcommand: ${subcommand}`);
@@ -80002,20 +80462,20 @@ init_manifest_path_resolver();
 init_logger();
 init_takumi_constants();
 var import_fs_extra34 = __toESM(require_lib(), 1);
-var import_semver5 = __toESM(require_semver2(), 1);
-import { join as join116 } from "node:path";
+var import_semver4 = __toESM(require_semver2(), 1);
+import { join as join122 } from "node:path";
 function evaluateCliVersionGate(input) {
   const min = typeof input.minCliVersion === "string" ? input.minCliVersion.trim() : undefined;
   if (!min)
     return { allowed: true };
-  const coercedMin = import_semver5.default.coerce(min);
+  const coercedMin = import_semver4.default.coerce(min);
   if (!coercedMin)
     return { allowed: true };
   const rawCli = (input.cliVersion ?? getCliVersion()).trim();
-  const coercedCli = import_semver5.default.coerce(rawCli);
+  const coercedCli = import_semver4.default.coerce(rawCli);
   if (!coercedCli)
     return { allowed: true };
-  if (import_semver5.default.gte(coercedCli, coercedMin))
+  if (import_semver4.default.gte(coercedCli, coercedMin))
     return { allowed: true };
   const reason = `This kit requires takumi CLI >= ${coercedMin.version}, but the installed CLI is ${rawCli}. Upgrade with \`${TAKUMI_CLI_GLOBAL_INSTALL_COMMAND}\`, or re-run with --force to install anyway.`;
   if (input.force)
@@ -80024,7 +80484,7 @@ function evaluateCliVersionGate(input) {
 }
 async function readKitMinCliVersion(extractDir) {
   try {
-    const resolved = await findManifestPath(join116(extractDir, ".claude"));
+    const resolved = await findManifestPath(join122(extractDir, ".claude"));
     if (!resolved)
       return;
     const raw = await import_fs_extra34.readFile(resolved.path, "utf-8");
@@ -80039,6 +80499,7 @@ async function readKitMinCliVersion(extractDir) {
 // src/commands/init/init-command.ts
 init_manifest();
 init_environment();
+init_kit_layout();
 init_logger();
 init_process_lock();
 init_types2();
@@ -80220,8 +80681,8 @@ init_environment();
 init_logger();
 init_safe_spinner();
 import { mkdir as mkdir25, stat as stat10 } from "node:fs/promises";
-import { tmpdir as tmpdir5 } from "node:os";
-import { join as join122 } from "node:path";
+import { tmpdir as tmpdir6 } from "node:os";
+import { join as join128 } from "node:path";
 
 // src/shared/temp-cleanup.ts
 init_logger();
@@ -80238,9 +80699,9 @@ var import_ignore6 = __toESM(require_ignore(), 1);
 // src/domains/installation/download/file-downloader.ts
 init_logger();
 init_output_manager();
-import { createWriteStream as createWriteStream2, rmSync as rmSync9 } from "node:fs";
+import { createWriteStream as createWriteStream2, rmSync as rmSync10 } from "node:fs";
 import { mkdir as mkdir21 } from "node:fs/promises";
-import { join as join117 } from "node:path";
+import { join as join123 } from "node:path";
 
 // src/shared/progress-bar.ts
 init_output_manager();
@@ -80450,7 +80911,7 @@ var MAX_DOWNLOAD_SIZE = 500 * 1024 * 1024;
 class FileDownloader {
   async downloadAsset(asset, destDir) {
     try {
-      const destPath = join117(destDir, asset.name);
+      const destPath = join123(destDir, asset.name);
       await mkdir21(destDir, { recursive: true });
       output.info(`Downloading ${asset.name} (${formatBytes(asset.size)})...`);
       logger.verbose("Download details", {
@@ -80508,7 +80969,7 @@ class FileDownloader {
           fileStream.end();
           await new Promise((resolve27) => fileStream.once("close", resolve27));
           try {
-            rmSync9(destPath, { force: true });
+            rmSync10(destPath, { force: true });
           } catch (cleanupError) {
             const errorMsg = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
             logger.debug(`Failed to clean up partial download ${destPath}: ${errorMsg}`);
@@ -80522,7 +80983,7 @@ class FileDownloader {
         fileStream.end();
         await new Promise((resolve27) => fileStream.once("close", resolve27));
         try {
-          rmSync9(destPath, { force: true });
+          rmSync10(destPath, { force: true });
         } catch (cleanupError) {
           const errorMsg = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
           logger.debug(`Failed to clean up partial download ${destPath}: ${errorMsg}`);
@@ -80535,7 +80996,7 @@ class FileDownloader {
   }
   async downloadFile(params) {
     const { url, name: name2, size, destDir, token } = params;
-    const destPath = join117(destDir, name2);
+    const destPath = join123(destDir, name2);
     await mkdir21(destDir, { recursive: true });
     output.info(`Downloading ${name2}${size ? ` (${formatBytes(size)})` : ""}...`);
     const headers = {};
@@ -80605,7 +81066,7 @@ class FileDownloader {
         fileStream.end();
         await new Promise((resolve27) => fileStream.once("close", resolve27));
         try {
-          rmSync9(destPath, { force: true });
+          rmSync10(destPath, { force: true });
         } catch (cleanupError) {
           const errorMsg = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
           logger.debug(`Failed to clean up partial download ${destPath}: ${errorMsg}`);
@@ -80623,7 +81084,7 @@ class FileDownloader {
       fileStream.end();
       await new Promise((resolve27) => fileStream.once("close", resolve27));
       try {
-        rmSync9(destPath, { force: true });
+        rmSync10(destPath, { force: true });
       } catch (cleanupError) {
         const errorMsg = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
         logger.debug(`Failed to clean up partial download ${destPath}: ${errorMsg}`);
@@ -80638,7 +81099,7 @@ init_logger();
 init_types2();
 import { constants as constants3 } from "node:fs";
 import { access as access3, readdir as readdir26 } from "node:fs/promises";
-import { join as join118 } from "node:path";
+import { join as join124 } from "node:path";
 async function validateExtraction(extractDir) {
   try {
     const entries = await readdir26(extractDir, { encoding: "utf8" });
@@ -80650,7 +81111,7 @@ async function validateExtraction(extractDir) {
     const missingPaths = [];
     for (const path10 of criticalPaths) {
       try {
-        await access3(join118(extractDir, path10), constants3.F_OK);
+        await access3(join124(extractDir, path10), constants3.F_OK);
         logger.debug(`Found: ${path10}`);
       } catch {
         logger.warning(`Expected path not found: ${path10}`);
@@ -80672,7 +81133,7 @@ async function validateExtraction(extractDir) {
 // src/domains/installation/extraction/tar-extractor.ts
 init_logger();
 import { copyFile as copyFile6, mkdir as mkdir23, readdir as readdir28, rm as rm8, stat as stat8 } from "node:fs/promises";
-import { join as join120 } from "node:path";
+import { join as join126 } from "node:path";
 
 // node_modules/tar/dist/esm/index.min.js
 import Kr from "events";
@@ -82704,7 +83165,7 @@ var ls = Symbol("readdir");
 var ai = Symbol("onreaddir");
 var li = Symbol("pipe");
 var ir = Symbol("entry");
-var os7 = Symbol("entryOpt");
+var os8 = Symbol("entryOpt");
 var ci = Symbol("writeEntryClass");
 var rr = Symbol("write");
 var hs = Symbol("ondrain");
@@ -82767,7 +83228,7 @@ var Et = class extends D {
       t.resume();
     else {
       let i = new di(t.path, e2);
-      i.entry = new ri(t, this[os7](i)), i.entry.on("end", () => this[ns](i)), this[G2] += 1, this[W2].push(i);
+      i.entry = new ri(t, this[os8](i)), i.entry.on("end", () => this[ns](i)), this[G2] += 1, this[W2].push(i);
     }
     this[Ft]();
   }
@@ -82836,13 +83297,13 @@ var Et = class extends D {
       }
     }
   }
-  [os7](t) {
+  [os8](t) {
     return { onwarn: (e2, i, r2) => this.warn(e2, i, r2), noPax: this.noPax, cwd: this.cwd, absolute: t.absolute, preservePaths: this.preservePaths, maxReadSize: this.maxReadSize, strict: this.strict, portable: this.portable, linkCache: this.linkCache, statCache: this.statCache, noMtime: this.noMtime, mtime: this.mtime, prefix: this.prefix, onWriteEntry: this.onWriteEntry };
   }
   [ir](t) {
     this[G2] += 1;
     try {
-      return new this[ci](t.path, this[os7](t)).on("end", () => this[ns](t)).on("error", (i) => this.emit("error", i));
+      return new this[ci](t.path, this[os8](t)).on("end", () => this[ns](t)).on("error", (i) => this.emit("error", i));
     } catch (e2) {
       this.emit("error", e2);
     }
@@ -83885,7 +84346,7 @@ function decodeFilePath(path10) {
 init_logger();
 init_types2();
 import { copyFile as copyFile5, lstat as lstat8, mkdir as mkdir22, readdir as readdir27 } from "node:fs/promises";
-import { join as join119, relative as relative17 } from "node:path";
+import { join as join125, relative as relative17 } from "node:path";
 async function withRetry2(fn2, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -83907,8 +84368,8 @@ async function moveDirectoryContents(sourceDir, destDir, shouldExclude, sizeTrac
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir27(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join119(sourceDir, entry);
-    const destPath = join119(destDir, entry);
+    const sourcePath = join125(sourceDir, entry);
+    const destPath = join125(destDir, entry);
     const relativePath = relative17(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -83935,8 +84396,8 @@ async function copyDirectory(sourceDir, destDir, shouldExclude, sizeTracker) {
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir27(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join119(sourceDir, entry);
-    const destPath = join119(destDir, entry);
+    const sourcePath = join125(sourceDir, entry);
+    const destPath = join125(destDir, entry);
     const relativePath = relative17(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -83991,7 +84452,7 @@ class TarExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join120(tempExtractDir, rootEntry);
+        const rootPath = join126(tempExtractDir, rootEntry);
         const rootStat = await stat8(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir28(rootPath, { encoding: "utf8" });
@@ -84007,7 +84468,7 @@ class TarExtractor {
           }
         } else {
           await mkdir23(destDir, { recursive: true });
-          await copyFile6(rootPath, join120(destDir, rootEntry));
+          await copyFile6(rootPath, join126(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -84028,7 +84489,7 @@ class TarExtractor {
 init_logger();
 import { createWriteStream as createWriteStream3 } from "node:fs";
 import { chmod as chmod4, copyFile as copyFile7, mkdir as mkdir24, readdir as readdir29, rm as rm9, stat as stat9 } from "node:fs/promises";
-import { dirname as dirname32, join as join121, resolve as resolve27 } from "node:path";
+import { dirname as dirname32, join as join127, resolve as resolve27 } from "node:path";
 import { pipeline } from "node:stream/promises";
 import yauzl from "yauzl-promise";
 class ZipExtractor {
@@ -84042,7 +84503,7 @@ class ZipExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join121(tempExtractDir, rootEntry);
+        const rootPath = join127(tempExtractDir, rootEntry);
         const rootStat = await stat9(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir29(rootPath, { encoding: "utf8" });
@@ -84058,7 +84519,7 @@ class ZipExtractor {
           }
         } else {
           await mkdir24(destDir, { recursive: true });
-          await copyFile7(rootPath, join121(destDir, rootEntry));
+          await copyFile7(rootPath, join127(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -84187,7 +84648,7 @@ class DownloadManager {
   async createTempDir() {
     const timestamp = Date.now();
     const counter = DownloadManager.tempDirCounter++;
-    const primaryTempDir = join122(tmpdir5(), `takumi-${timestamp}-${counter}`);
+    const primaryTempDir = join128(tmpdir6(), `takumi-${timestamp}-${counter}`);
     try {
       await mkdir25(primaryTempDir, { recursive: true });
       logger.debug(`Created temp directory: ${primaryTempDir}`);
@@ -84204,7 +84665,7 @@ Solutions:
   2. Set HOME environment variable
   3. Try running from a different directory`);
       }
-      const fallbackTempDir = join122(homeDir, STATE_DIRNAME, "tmp", `takumi-${timestamp}-${counter}`);
+      const fallbackTempDir = join128(homeDir, STATE_DIRNAME, "tmp", `takumi-${timestamp}-${counter}`);
       try {
         await mkdir25(fallbackTempDir, { recursive: true });
         logger.debug(`Created temp directory (fallback): ${fallbackTempDir}`);
@@ -84932,7 +85393,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 join125, resolve as resolve30 } from "node:path";
+import { join as join131, resolve as resolve30 } from "node:path";
 
 // src/commands/shared/agent-selector.ts
 init_registry();
@@ -85246,7 +85707,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join125(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join131(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir);
       if (existingMetadata?.kits) {
@@ -85279,7 +85740,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join125(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join131(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -85299,7 +85760,7 @@ async function handleSelection(ctx) {
     let currentVersion = null;
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir = prefix ? join125(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join131(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       currentVersion = existingMetadata?.kits?.[kitType]?.version || null;
       if (currentVersion) {
@@ -85387,7 +85848,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 ? join125(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join131(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       const installedKitVersion = existingMetadata?.kits?.[kitType]?.version;
       if (installedKitVersion && versionsMatch(installedKitVersion, releaseTag)) {
@@ -85410,7 +85871,7 @@ async function handleSelection(ctx) {
       let currentSecondaryVersion = null;
       try {
         const prefix = PathResolver.getPathPrefix(ctx.options.global);
-        const claudeDir = prefix ? join125(resolvedDir, prefix) : resolvedDir;
+        const claudeDir = prefix ? join131(resolvedDir, prefix) : resolvedDir;
         const existingMetadata = await readManifest(claudeDir);
         currentSecondaryVersion = existingMetadata?.kits?.[secondaryKit]?.version || null;
       } catch {}
@@ -85494,12 +85955,12 @@ function resolveGlobalTargetDir(targetAgents2) {
 // src/commands/init/phases/sync-handler.ts
 init_paths();
 import { copyFile as copyFile8, mkdir as mkdir28, open as open3, readFile as readFile45, rename as rename8, stat as stat12, unlink as unlink12, writeFile as writeFile29 } from "node:fs/promises";
-import { dirname as dirname35, join as join128, resolve as resolve31 } from "node:path";
+import { dirname as dirname35, join as join134, resolve as resolve31 } from "node:path";
 
 // src/domains/sync/config-version-checker.ts
 init_auth_client();
 import { mkdir as mkdir27, readFile as readFile43, unlink as unlink11, writeFile as writeFile28 } from "node:fs/promises";
-import { join as join126 } from "node:path";
+import { join as join132 } from "node:path";
 init_version_utils();
 init_logger();
 init_path_resolver();
@@ -85535,7 +85996,7 @@ var CACHE_FILENAME = "config-update-cache.json";
 class ConfigVersionChecker {
   static getCacheFilePath(kitType, global3) {
     const cacheDir = PathResolver.getCacheDir(global3);
-    return join126(cacheDir, `${kitType}-${CACHE_FILENAME}`);
+    return join132(cacheDir, `${kitType}-${CACHE_FILENAME}`);
   }
   static async loadCache(kitType, global3) {
     try {
@@ -85655,7 +86116,7 @@ class ConfigVersionChecker {
 init_ownership_checker();
 init_logger();
 import { lstat as lstat9, readFile as readFile44, readlink, realpath as realpath3, stat as stat11 } from "node:fs/promises";
-import { isAbsolute as isAbsolute6, join as join127, normalize as normalize9, relative as relative18 } from "node:path";
+import { isAbsolute as isAbsolute7, join as join133, normalize as normalize10, relative as relative18 } 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) {
@@ -85667,10 +86128,10 @@ async function validateSymlinkChain(path11, basePath, maxDepth = MAX_SYMLINK_DEP
       if (!stats.isSymbolicLink())
         break;
       const target = await readlink(current);
-      const resolvedTarget = isAbsolute6(target) ? target : join127(current, "..", target);
-      const normalizedTarget = normalize9(resolvedTarget);
+      const resolvedTarget = isAbsolute7(target) ? target : join133(current, "..", target);
+      const normalizedTarget = normalize10(resolvedTarget);
       const rel = relative18(basePath, normalizedTarget);
-      if (rel.startsWith("..") || isAbsolute6(rel)) {
+      if (rel.startsWith("..") || isAbsolute7(rel)) {
         throw new Error(`Symlink chain escapes base directory at depth ${depth}: ${path11}`);
       }
       current = normalizedTarget;
@@ -85696,16 +86157,16 @@ async function validateSyncPath(basePath, filePath) {
   if (filePath.length > 1024) {
     throw new Error(`Path too long: ${filePath.slice(0, 50)}...`);
   }
-  const normalized = normalize9(filePath);
-  if (isAbsolute6(normalized)) {
+  const normalized = normalize10(filePath);
+  if (isAbsolute7(normalized)) {
     throw new Error(`Absolute paths not allowed: ${filePath}`);
   }
   if (normalized.startsWith("..") || normalized.includes("/../")) {
     throw new Error(`Path traversal not allowed: ${filePath}`);
   }
-  const fullPath = join127(basePath, normalized);
+  const fullPath = join133(basePath, normalized);
   const rel = relative18(basePath, fullPath);
-  if (rel.startsWith("..") || isAbsolute6(rel)) {
+  if (rel.startsWith("..") || isAbsolute7(rel)) {
     throw new Error(`Path escapes base directory: ${filePath}`);
   }
   await validateSymlinkChain(fullPath, basePath);
@@ -85713,17 +86174,17 @@ async function validateSyncPath(basePath, filePath) {
     const resolvedBase = await realpath3(basePath);
     const resolvedFull = await realpath3(fullPath);
     const resolvedRel = relative18(resolvedBase, resolvedFull);
-    if (resolvedRel.startsWith("..") || isAbsolute6(resolvedRel)) {
+    if (resolvedRel.startsWith("..") || isAbsolute7(resolvedRel)) {
       throw new Error(`Symlink escapes base directory: ${filePath}`);
     }
   } catch (error) {
     if (error.code === "ENOENT") {
-      const parentPath = join127(fullPath, "..");
+      const parentPath = join133(fullPath, "..");
       try {
         const resolvedBase = await realpath3(basePath);
         const resolvedParent = await realpath3(parentPath);
         const resolvedRel = relative18(resolvedBase, resolvedParent);
-        if (resolvedRel.startsWith("..") || isAbsolute6(resolvedRel)) {
+        if (resolvedRel.startsWith("..") || isAbsolute7(resolvedRel)) {
           throw new Error(`Parent symlink escapes base directory: ${filePath}`);
         }
       } catch (parentError) {
@@ -86209,7 +86670,7 @@ function getLockTimeout() {
 var STALE_LOCK_THRESHOLD_MS = 5 * 60 * 1000;
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath2 = join128(cacheDir, ".sync-lock");
+  const lockPath2 = join134(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir28(dirname35(lockPath2), { recursive: true });
@@ -86290,7 +86751,7 @@ async function executeSyncMerge(ctx) {
         try {
           const sourcePath = await validateSyncPath(upstreamDir, file.path);
           const targetPath = await validateSyncPath(ctx.claudeDir, file.path);
-          const targetDir = join128(targetPath, "..");
+          const targetDir = join134(targetPath, "..");
           try {
             await mkdir28(targetDir, { recursive: true });
           } catch (mkdirError) {
@@ -86461,7 +86922,7 @@ async function createBackup(claudeDir, files, backupDir) {
       const sourcePath = await validateSyncPath(claudeDir, file.path);
       if (await import_fs_extra36.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
-        const targetDir = join128(targetPath, "..");
+        const targetDir = join134(targetPath, "..");
         await mkdir28(targetDir, { recursive: true });
         await copyFile8(sourcePath, targetPath);
       }
@@ -86487,38 +86948,38 @@ init_logger();
 init_types2();
 var import_fs_extra37 = __toESM(require_lib(), 1);
 import { rename as rename9, rm as rm10 } from "node:fs/promises";
-import { join as join129, relative as relative19 } from "node:path";
+import { join as join135, relative as relative19 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join129(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join135(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra37.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join129(extractDir, folders.docs)
+        to: join135(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join129(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join135(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra37.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join129(extractDir, ".claude", folders.docs)
+        to: join135(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join129(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join135(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra37.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join129(extractDir, folders.plans)
+        to: join135(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join129(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join135(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra37.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join129(extractDir, ".claude", folders.plans)
+        to: join135(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -86559,7 +87020,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 init_logger();
 init_types2();
 import { readFile as readFile46, readdir as readdir30, writeFile as writeFile30 } from "node:fs/promises";
-import { join as join130, relative as relative20 } from "node:path";
+import { join as join136, relative as relative20 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -86612,7 +87073,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
   let replacementsCount = 0;
   const entries = await readdir30(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join130(dir, entry.name);
+    const fullPath = join136(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -86749,7 +87210,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 init_logger();
 import { readFile as readFile47, readdir as readdir31, writeFile as writeFile31 } from "node:fs/promises";
 import { platform as platform12 } from "node:os";
-import { extname as extname8, join as join131 } from "node:path";
+import { extname as extname8, join as join137 } from "node:path";
 var IS_WINDOWS3 = platform12() === "win32";
 var HOME_PREFIX = "$HOME";
 function getHomeDirPrefix() {
@@ -86838,8 +87299,8 @@ function transformContent(content) {
 }
 function shouldTransformFile3(filename) {
   const ext = extname8(filename).toLowerCase();
-  const basename19 = filename.split("/").pop() || filename;
-  return TRANSFORMABLE_EXTENSIONS3.has(ext) || ALWAYS_TRANSFORM_FILES.has(basename19);
+  const basename20 = filename.split("/").pop() || filename;
+  return TRANSFORMABLE_EXTENSIONS3.has(ext) || ALWAYS_TRANSFORM_FILES.has(basename20);
 }
 async function transformPathsForGlobalInstall(directory, options2 = {}) {
   let filesTransformed = 0;
@@ -86849,7 +87310,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir31(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join131(dir, entry.name);
+      const fullPath = join137(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -86940,8 +87401,16 @@ function mapAgentToHookAgent(agent) {
     return "codex";
   return null;
 }
-async function installTkmHooksForAgents(targetAgents2, options2) {
-  const categories = options2.installHooks ? undefined : ["metrics"];
+function collectKitEvalHooks(extractDir, into) {
+  const sourceHooksDir = findExistingProjectLayoutPath(extractDir, "hooks");
+  if (!sourceHooksDir)
+    return;
+  for (const entry of scanKitHookMetas(sourceHooksDir)) {
+    into.set(entry.file, kitHookToInstallMeta(entry));
+  }
+}
+async function installTkmHooksForAgents(targetAgents2, options2, evalHooks) {
+  const categories = undefined;
   for (const agent of targetAgents2) {
     const hookAgent = mapAgentToHookAgent(agent);
     if (!hookAgent)
@@ -86952,11 +87421,12 @@ async function installTkmHooksForAgents(targetAgents2, options2) {
         global: options2.global,
         dryRun: options2.dryRun,
         categories,
+        evalHooks,
         yes: true
       });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger.warning(`[init] tkm hooks install for ${agent} failed: ${message}`);
+      logger.error(`[init] tkm hooks install for ${agent} FAILED — guards/session hooks may be inactive; re-run \`tkm hooks install -a ${hookAgent}\`: ${message}`);
     }
   }
 }
@@ -87091,6 +87561,7 @@ async function executeInit(options2, prompts, deps) {
     return;
   }
   const aggregatedResults = [];
+  const discoveredEvalHooks = new Map;
   let lastCtx = ctx;
   for (let i = 0;i < selectedKits.length; i++) {
     const currentKit = selectedKits[i];
@@ -87183,17 +87654,18 @@ async function executeInit(options2, prompts, deps) {
     aggregatedResults.push(...kitResults);
     if (kitResults.some((r2) => r2.cancelled))
       return;
+    if (lastCtx.extractDir) {
+      collectKitEvalHooks(lastCtx.extractDir, discoveredEvalHooks);
+    }
   }
   ctx = lastCtx;
   const results = aggregatedResults;
   ctx.installerResults = results;
-  if (!isSyncMode) {
-    await installTkmHooksForAgents(targetAgents2, {
-      global: Boolean(ctx.options.global),
-      dryRun: Boolean(ctx.options.dryRun),
-      installHooks: Boolean(ctx.options.installHooks)
-    });
-  }
+  await installTkmHooksForAgents(targetAgents2, {
+    global: Boolean(ctx.options.global),
+    dryRun: Boolean(ctx.options.dryRun),
+    installHooks: Boolean(ctx.options.installHooks)
+  }, [...discoveredEvalHooks.values()]);
   if (targetAgents2.length > 1) {
     displayMultiInstallerSummary(results);
   }
@@ -87268,10 +87740,10 @@ init_dist2();
 // src/domains/mcp/agent-detector.ts
 init_environment();
 import { existsSync as existsSync61 } from "node:fs";
-import { join as join132 } from "node:path";
+import { join as join138 } from "node:path";
 
 // src/domains/mcp/shell-out.ts
-import { spawnSync as spawnSync5 } from "node:child_process";
+import { spawnSync as spawnSync6 } from "node:child_process";
 var DEFAULT_TIMEOUT_MS7 = 60000;
 var PROBE_TIMEOUT_MS = 5000;
 var SERVICE_NAME_PATTERN = /^[a-z0-9-]+$/;
@@ -87279,7 +87751,7 @@ function isValidServiceName(name2) {
   return SERVICE_NAME_PATTERN.test(name2);
 }
 function runAgentCli(bin, args, timeoutMs = DEFAULT_TIMEOUT_MS7) {
-  const result = spawnSync5(bin, args, {
+  const result = spawnSync6(bin, args, {
     timeout: timeoutMs,
     encoding: "utf-8",
     shell: false,
@@ -87302,7 +87774,7 @@ function runAgentCli(bin, args, timeoutMs = DEFAULT_TIMEOUT_MS7) {
 }
 function isBinaryOnPath(bin) {
   const probeCmd = process.platform === "win32" ? "where" : "which";
-  const result = spawnSync5(probeCmd, [bin], {
+  const result = spawnSync6(probeCmd, [bin], {
     timeout: PROBE_TIMEOUT_MS,
     encoding: "utf-8",
     shell: false
@@ -87358,9 +87830,9 @@ function getAgentConfigPath(agent) {
     return null;
   switch (agent) {
     case "claude-code":
-      return join132(home6, ".claude.json");
+      return join138(home6, ".claude.json");
     case "codex":
-      return join132(home6, ".codex", "config.toml");
+      return join138(home6, ".codex", "config.toml");
     default: {
       const _exhaustive = agent;
       return _exhaustive;
@@ -87386,7 +87858,7 @@ var PROJECT_MARKERS = {
   codex: [".codex", "AGENTS.md"]
 };
 function detectProjectAgents(cwd2 = process.cwd(), exists2 = existsSync61) {
-  return ALL_MCP_AGENTS.filter((agent) => PROJECT_MARKERS[agent].some((marker) => exists2(join132(cwd2, marker))));
+  return ALL_MCP_AGENTS.filter((agent) => PROJECT_MARKERS[agent].some((marker) => exists2(join138(cwd2, marker))));
 }
 
 // src/domains/mcp/registry-client.ts
@@ -87398,12 +87870,12 @@ init_auth_client();
 init_logger();
 init_paths2();
 import { promises as fs33 } from "node:fs";
-import { join as join133 } from "node:path";
+import { join as join139 } from "node:path";
 function getCacheDir() {
-  return join133(getConfigDir(), "mcp");
+  return join139(getConfigDir(), "mcp");
 }
 function getCachePath2() {
-  return join133(getCacheDir(), "registry-cache.json");
+  return join139(getCacheDir(), "registry-cache.json");
 }
 async function readCachedRegistry() {
   try {
@@ -87534,14 +88006,14 @@ function resolveService(registry, name2) {
 // src/domains/mcp/writers/claude-config-file.ts
 import { existsSync as existsSync62 } from "node:fs";
 import { mkdir as mkdir29, writeFile as writeFile32 } from "node:fs/promises";
-import { dirname as dirname36, join as join134 } from "node:path";
+import { dirname as dirname36, join as join140 } from "node:path";
 var AGENT = "claude-code";
 var LOCAL_SCOPE_FALLBACK_WARNING = "claude CLI not found; local scope isn't representable via direct file write, wrote to user-level ~/.claude.json instead";
 function userConfigPath() {
   return getAgentConfigPath(AGENT);
 }
 function projectConfigPath() {
-  return join134(process.cwd(), ".mcp.json");
+  return join140(process.cwd(), ".mcp.json");
 }
 function configPathFor(scope) {
   return scope === "project" ? projectConfigPath() : userConfigPath();
@@ -88210,18 +88682,18 @@ async function mcpCommand(action, service, options2 = {}) {
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync68, statSync as statSync12 } from "node:fs";
-import { dirname as dirname42, join as join138, parse as parse4, resolve as resolve35 } from "node:path";
+import { dirname as dirname42, join as join144, parse as parse4, resolve as resolve35 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 import { existsSync as existsSync67, statSync as statSync11 } from "node:fs";
-import { basename as basename21, dirname as dirname41, join as join137, relative as relative21, resolve as resolve33 } from "node:path";
+import { basename as basename22, dirname as dirname41, join as join143, relative as relative21, resolve as resolve33 } from "node:path";
 
 // src/domains/plan-parser/index.ts
 import { dirname as dirname40 } from "node:path";
 
 // src/domains/plan-parser/plan-table-parser.ts
 var import_gray_matter6 = __toESM(require_gray_matter(), 1);
-import { readFileSync as readFileSync24 } from "node:fs";
+import { readFileSync as readFileSync27 } from "node:fs";
 import { dirname as dirname37, resolve as resolve32 } from "node:path";
 function normalizeStatus(raw) {
   const s3 = raw.toLowerCase().trim();
@@ -88587,30 +89059,30 @@ function parsePhasesFromBody(body, dir, options2) {
   return parseFormat6(normalizedBody, dir, options2);
 }
 function parsePlanFile(planFilePath, options2) {
-  const content = readFileSync24(planFilePath, "utf8");
+  const content = readFileSync27(planFilePath, "utf8");
   const dir = dirname37(planFilePath);
   const { data: frontmatter, content: body } = import_gray_matter6.default(content);
   const phases = parsePhasesFromBody(body, dir, options2);
   return { frontmatter, phases };
 }
 // src/domains/plan-parser/plan-scanner.ts
-import { existsSync as existsSync64, readdirSync as readdirSync11 } from "node:fs";
-import { join as join135 } from "node:path";
+import { existsSync as existsSync64, readdirSync as readdirSync12 } from "node:fs";
+import { join as join141 } from "node:path";
 function scanPlanDir(dir) {
   if (!existsSync64(dir))
     return [];
   try {
-    return readdirSync11(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join135(dir, entry.name, "plan.md")).filter(existsSync64);
+    return readdirSync12(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join141(dir, entry.name, "plan.md")).filter(existsSync64);
   } catch {
     return [];
   }
 }
 // src/domains/plan-parser/plan-validator.ts
 var import_gray_matter7 = __toESM(require_gray_matter(), 1);
-import { existsSync as existsSync65, readFileSync as readFileSync25 } from "node:fs";
-import { basename as basename19, dirname as dirname38 } from "node:path";
+import { existsSync as existsSync65, readFileSync as readFileSync28 } from "node:fs";
+import { basename as basename20, dirname as dirname38 } from "node:path";
 function validatePlanFile(filePath, strict = false) {
-  const content = readFileSync25(filePath, "utf8");
+  const content = readFileSync28(filePath, "utf8");
   const dir = dirname38(filePath);
   const issues = [];
   const lines = content.split(`
@@ -88648,13 +89120,13 @@ function validatePlanFile(filePath, strict = false) {
   }
   for (const phase of phases) {
     if (phase.file && !existsSync65(phase.file)) {
-      const fileBasename = basename19(phase.file);
+      const fileBasename = basename20(phase.file);
       const refLine = lines.findIndex((l2) => l2.includes(fileBasename));
       issues.push({
         line: refLine >= 0 ? refLine + 1 : 1,
         severity: "warning",
         code: "missing-phase-file",
-        message: `Phase ${phase.phaseId} references '${basename19(phase.file)}' which doesn't exist`
+        message: `Phase ${phase.phaseId} references '${basename20(phase.file)}' which doesn't exist`
       });
     }
   }
@@ -88667,9 +89139,9 @@ function validatePlanFile(filePath, strict = false) {
 }
 // src/domains/plan-parser/plan-writer.ts
 var import_gray_matter8 = __toESM(require_gray_matter(), 1);
-import { mkdirSync as mkdirSync10, readFileSync as readFileSync26, writeFileSync as writeFileSync13 } from "node:fs";
+import { mkdirSync as mkdirSync10, readFileSync as readFileSync29, writeFileSync as writeFileSync14 } from "node:fs";
 import { existsSync as existsSync66 } from "node:fs";
-import { basename as basename20, dirname as dirname39, join as join136 } from "node:path";
+import { basename as basename21, dirname as dirname39, join as join142 } from "node:path";
 function phaseNameToFilename(id, name2) {
   const numMatch = /^(\d+)([a-z]*)$/i.exec(id);
   const num4 = numMatch ? numMatch[1] : id;
@@ -88777,13 +89249,13 @@ function scaffoldPlan(options2) {
   mkdirSync10(dir, { recursive: true });
   const resolvedPhases = resolvePhaseIds(options2.phases);
   const optionsWithResolved = { ...options2, phases: resolvedPhases };
-  const planFile = join136(dir, "plan.md");
-  writeFileSync13(planFile, generatePlanMd(optionsWithResolved), "utf8");
+  const planFile = join142(dir, "plan.md");
+  writeFileSync14(planFile, generatePlanMd(optionsWithResolved), "utf8");
   const phaseFiles = [];
   for (const phase of resolvedPhases) {
     const filename = phaseNameToFilename(phase.id, phase.name);
-    const phaseFile = join136(dir, filename);
-    writeFileSync13(phaseFile, generatePhaseTemplate(phase), "utf8");
+    const phaseFile = join142(dir, filename);
+    writeFileSync14(phaseFile, generatePhaseTemplate(phase), "utf8");
     phaseFiles.push(phaseFile);
   }
   return { planFile, phaseFiles };
@@ -88807,7 +89279,7 @@ function isCanonicalFormat(content) {
   return /^\|\s*phase\s*\|\s*name\s*\|\s*status\s*\|/im.test(content);
 }
 function updatePhaseStatus(planFile, phaseId, newStatus) {
-  const raw = readFileSync26(planFile, "utf8").replace(/\r\n/g, `
+  const raw = readFileSync29(planFile, "utf8").replace(/\r\n/g, `
 `);
   if (!isCanonicalFormat(raw)) {
     console.error("[!] plan.md is not in canonical format — skipping status update");
@@ -88847,7 +89319,7 @@ function updatePhaseStatus(planFile, phaseId, newStatus) {
   }
   const updatedFrontmatter = { ...frontmatter, status: planStatus };
   const updatedContent = import_gray_matter8.default.stringify(updatedBody, updatedFrontmatter);
-  writeFileSync13(planFile, updatedContent, "utf8");
+  writeFileSync14(planFile, updatedContent, "utf8");
   const planDir = dirname39(planFile);
   const phaseFilename = phaseNameFilenameFromTableRow(updatedBody, phaseId, planDir);
   if (phaseFilename && existsSync66(phaseFilename)) {
@@ -88862,18 +89334,18 @@ function phaseNameFilenameFromTableRow(body, phaseId, planDir) {
       continue;
     const linkMatch = /\[([^\]]+)\]\(\.\/([^)]+)\)/.exec(row);
     if (linkMatch)
-      return join136(planDir, linkMatch[2]);
+      return join142(planDir, linkMatch[2]);
   }
   return null;
 }
 function updatePhaseFileFrontmatter(phaseFile, newStatus) {
-  const raw = readFileSync26(phaseFile, "utf8");
+  const raw = readFileSync29(phaseFile, "utf8");
   const { data: frontmatter, content: body } = import_gray_matter8.default(raw);
   const updated = { ...frontmatter, status: newStatus };
-  writeFileSync13(phaseFile, import_gray_matter8.default.stringify(body, updated), "utf8");
+  writeFileSync14(phaseFile, import_gray_matter8.default.stringify(body, updated), "utf8");
 }
 function addPhase(planFile, name2, afterId) {
-  const raw = readFileSync26(planFile, "utf8").replace(/\r\n/g, `
+  const raw = readFileSync29(planFile, "utf8").replace(/\r\n/g, `
 `);
   if (!isCanonicalFormat(raw)) {
     console.error("[!] plan.md is not in canonical format — cannot add phase");
@@ -88909,7 +89381,7 @@ function addPhase(planFile, name2, afterId) {
         insertIdx = i;
     }
     if (insertIdx === -1) {
-      throw new Error(`Phase ID "${afterId}" not found in ${basename20(planFile)}`);
+      throw new Error(`Phase ID "${afterId}" not found in ${basename21(planFile)}`);
     }
     lines.splice(insertIdx + 1, 0, newRow);
     updatedBody = lines.join(`
@@ -88942,9 +89414,9 @@ function addPhase(planFile, name2, afterId) {
     updatedBody = lines.join(`
 `);
   }
-  writeFileSync13(planFile, import_gray_matter8.default.stringify(updatedBody, frontmatter), "utf8");
-  const phaseFilePath = join136(planDir, filename);
-  writeFileSync13(phaseFilePath, generatePhaseTemplate({ id: phaseId, name: name2 }), "utf8");
+  writeFileSync14(planFile, import_gray_matter8.default.stringify(updatedBody, frontmatter), "utf8");
+  const phaseFilePath = join142(planDir, filename);
+  writeFileSync14(phaseFilePath, generatePhaseTemplate({ id: phaseId, name: name2 }), "utf8");
   return { phaseId, phaseFile: phaseFilePath };
 }
 
@@ -88992,7 +89464,7 @@ async function handleParse(target, options2) {
     console.log(JSON.stringify({ file: relative21(process.cwd(), planFile), frontmatter, phases }, null, 2));
     return;
   }
-  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename21(dirname41(planFile));
+  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename22(dirname41(planFile));
   console.log();
   console.log(import_picocolors28.default.bold(`  Plan: ${title}`));
   console.log(`  File: ${planFile}`);
@@ -89047,7 +89519,7 @@ async function handleValidate(target, options2) {
 }
 async function handleStatus(target, options2) {
   const t = target ? resolve33(target) : null;
-  const plansDir = t && existsSync67(t) && statSync11(t).isDirectory() && !existsSync67(join137(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync67(t) && statSync11(t).isDirectory() && !existsSync67(join143(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -89072,14 +89544,14 @@ async function handleStatus(target, options2) {
       try {
         const s3 = buildPlanSummary(pf);
         const bar = progressBar(s3.completed, s3.totalPhases);
-        const title2 = s3.title ?? basename21(dirname41(pf));
+        const title2 = s3.title ?? basename22(dirname41(pf));
         console.log(`  ${import_picocolors28.default.bold(title2)}`);
         console.log(`  ${bar}`);
         if (s3.inProgress > 0)
           console.log(`  [~] ${s3.inProgress} in progress`);
         console.log();
       } catch {
-        console.log(`  [X] Failed to read: ${basename21(dirname41(pf))}`);
+        console.log(`  [X] Failed to read: ${basename22(dirname41(pf))}`);
         console.log();
       }
     }
@@ -89103,7 +89575,7 @@ async function handleStatus(target, options2) {
     console.log(JSON.stringify(summary, null, 2));
     return;
   }
-  const title = summary.title ?? basename21(dirname41(planFile));
+  const title = summary.title ?? basename22(dirname41(planFile));
   console.log();
   console.log(import_picocolors28.default.bold(`  ${title}`));
   if (summary.status)
@@ -89129,7 +89601,7 @@ async function handleKanban(target, _options) {
 }
 
 // src/commands/plan/plan-write-handlers.ts
-import { basename as basename22, relative as relative22, resolve as resolve34 } from "node:path";
+import { basename as basename23, relative as relative22, resolve as resolve34 } from "node:path";
 init_output_manager();
 var import_picocolors29 = __toESM(require_picocolors(), 1);
 async function handleCreate(target, options2) {
@@ -89182,7 +89654,7 @@ async function handleCreate(target, options2) {
   console.log(`  Directory: ${resolve34(dir)}`);
   console.log(`  Phases: ${result.phaseFiles.length}`);
   for (const f4 of result.phaseFiles) {
-    console.log(`    [ ] ${basename22(f4)}`);
+    console.log(`    [ ] ${basename23(f4)}`);
   }
   console.log();
 }
@@ -89282,7 +89754,7 @@ function resolvePlanFile(target) {
     const stat13 = statSync12(t);
     if (stat13.isFile())
       return t;
-    const candidate = join138(t, "plan.md");
+    const candidate = join144(t, "plan.md");
     if (existsSync68(candidate))
       return candidate;
   }
@@ -89290,7 +89762,7 @@ function resolvePlanFile(target) {
     let dir = process.cwd();
     const root = parse4(dir).root;
     while (dir !== root) {
-      const candidate = join138(dir, "plan.md");
+      const candidate = join144(dir, "plan.md");
       if (existsSync68(candidate))
         return candidate;
       dir = dirname42(dir);
@@ -89380,7 +89852,7 @@ async function planCommand(action, target, options2) {
 }
 // src/commands/statusline/statusline-command.ts
 import { appendFileSync as appendFileSync3 } from "node:fs";
-import { homedir as homedir32 } from "node:os";
+import { homedir as homedir31 } from "node:os";
 init_cache_dir();
 
 // src/domains/statusline/config-loader.ts
@@ -89491,7 +89963,7 @@ function computeContextPercent(cw) {
 
 // src/domains/statusline/git-cache.ts
 import { createHash as createHash16 } from "node:crypto";
-import { readFileSync as readFileSync27 } from "node:fs";
+import { readFileSync as readFileSync30 } from "node:fs";
 init_cache_dir();
 var GIT_CACHE_TTL_MS = 30000;
 var MAX_UNTRACKED_FILES = 200;
@@ -89572,7 +90044,7 @@ function untrackedInsertions(cwd2) {
       break;
     let buf;
     try {
-      buf = readFileSync27(`${cwd2}/${relative23}`);
+      buf = readFileSync30(`${cwd2}/${relative23}`);
     } catch {
       continue;
     }
@@ -89754,7 +90226,7 @@ function quotaWindows(now = Date.now()) {
 }
 
 // src/domains/statusline/components.ts
-import { homedir as homedir31 } from "node:os";
+import { homedir as homedir30 } from "node:os";
 
 // src/domains/statusline/colors.ts
 init_help_colors();
@@ -89983,13 +90455,13 @@ function shortenLeadingDirs(path11, keepFull) {
     return path11;
   const leadCount = segments.length - keepFull;
   const shortened = segments.map((seg, i) => i < leadCount ? Array.from(seg)[0] ?? seg : seg);
-  const sep10 = marker || leadingSlash ? "/" : "";
-  return `${marker}${sep10}${shortened.join("/")}`;
+  const sep11 = marker || leadingSlash ? "/" : "";
+  return `${marker}${sep11}${shortened.join("/")}`;
 }
 function renderDirectory(data, s3) {
   let path11 = data.cwd || process.cwd();
   if (s3.collapseHome) {
-    const home6 = homedir31();
+    const home6 = homedir30();
     if (home6 && path11.startsWith(home6))
       path11 = `~${path11.slice(home6.length)}`;
   }
@@ -90076,11 +90548,11 @@ function renderStatusline(data, settings) {
 }
 
 // src/domains/statusline/versions.ts
-import { join as join139 } from "node:path";
+import { join as join145 } from "node:path";
 async function resolveCoreVersion(cwd2) {
   try {
     const { readManifest: readManifest3 } = await Promise.resolve().then(() => (init_manifest(), exports_manifest));
-    const meta = await readManifest3(join139(cwd2, ".claude"));
+    const meta = await readManifest3(join145(cwd2, ".claude"));
     if (!meta)
       return null;
     const kits = meta.kits;
@@ -90106,7 +90578,7 @@ function writeDebug(enabled, context, err) {
   } catch {}
 }
 function collapseHome(p2) {
-  const home6 = homedir32();
+  const home6 = homedir31();
   return home6 && p2.startsWith(home6) ? `~${p2.slice(home6.length)}` : p2;
 }
 function fallbackLine(cwd2) {
@@ -90170,24 +90642,24 @@ init_logger();
 init_logger();
 
 // src/commands/telemetry/shared.ts
-import { existsSync as existsSync69, readFileSync as readFileSync28, readdirSync as readdirSync12 } from "node:fs";
-import { homedir as homedir33 } from "node:os";
-import { join as join140 } from "node:path";
+import { existsSync as existsSync69, readFileSync as readFileSync31, readdirSync as readdirSync13 } from "node:fs";
+import { homedir as homedir32 } from "node:os";
+import { join as join146 } from "node:path";
 init_token_store();
 init_manifest_path_resolver();
 init_takumi_constants();
-var USER_CACHE_PATH = join140(homedir33(), ".claude", "sk-user.json");
-var EVENT_BUFFER_DIR = join140(homedir33(), ".claude", "sk-events");
-var RATE_STATE_PATH = join140(homedir33(), ".claude", "sk-rate-state.json");
-var TAKUMI_MANIFEST_PATH = join140(homedir33(), ".claude", MANIFEST_FILENAME);
-var LEGACY_METADATA_PATH = join140(homedir33(), ".claude", LEGACY_MANIFEST_FILENAME);
+var USER_CACHE_PATH = join146(homedir32(), ".claude", "sk-user.json");
+var EVENT_BUFFER_DIR = join146(homedir32(), ".claude", "sk-events");
+var RATE_STATE_PATH = join146(homedir32(), ".claude", "sk-rate-state.json");
+var TAKUMI_MANIFEST_PATH = join146(homedir32(), ".claude", MANIFEST_FILENAME);
+var LEGACY_METADATA_PATH = join146(homedir32(), ".claude", LEGACY_MANIFEST_FILENAME);
 var TELEMETRY_HOOK_FIELD = "hooks.telemetry";
 var TOKEN_PLACEHOLDER = "__INJECT_AT_RELEASE__";
 function readUserCache() {
   try {
     if (!existsSync69(USER_CACHE_PATH))
       return null;
-    const parsed = JSON.parse(readFileSync28(USER_CACHE_PATH, "utf8"));
+    const parsed = JSON.parse(readFileSync31(USER_CACHE_PATH, "utf8"));
     if (!parsed || typeof parsed !== "object")
       return null;
     return parsed;
@@ -90199,7 +90671,7 @@ function countBufferFiles() {
   try {
     if (!existsSync69(EVENT_BUFFER_DIR))
       return 0;
-    return readdirSync12(EVENT_BUFFER_DIR).filter((f4) => f4.endsWith(".jsonl")).length;
+    return readdirSync13(EVENT_BUFFER_DIR).filter((f4) => f4.endsWith(".jsonl")).length;
   } catch {
     return 0;
   }
@@ -90209,9 +90681,9 @@ function readTelemetryConfig() {
   const envToken = process.env.TAKUMI_TELEMETRY_TOKEN;
   let metadata = null;
   try {
-    const resolved = findManifestPathSync(join140(homedir33(), ".claude"));
+    const resolved = findManifestPathSync(join146(homedir32(), ".claude"));
     if (resolved) {
-      metadata = JSON.parse(readFileSync28(resolved.path, "utf8"));
+      metadata = JSON.parse(readFileSync31(resolved.path, "utf8"));
     }
   } catch {
     metadata = null;
@@ -90386,8 +90858,8 @@ init_logger();
 init_safe_prompts();
 init_safe_spinner();
 var import_fs_extra39 = __toESM(require_lib(), 1);
-import { readdirSync as readdirSync14, rmSync as rmSync11 } from "node:fs";
-import { join as join142, resolve as resolve36, sep as sep10 } from "node:path";
+import { readdirSync as readdirSync15, rmSync as rmSync12 } from "node:fs";
+import { join as join148, resolve as resolve36, sep as sep11 } from "node:path";
 
 // src/commands/uninstall/analysis-handler.ts
 init_metadata_migration();
@@ -90397,8 +90869,8 @@ init_logger();
 init_safe_prompts();
 init_takumi_constants();
 var import_picocolors30 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync70, readdirSync as readdirSync13, rmSync as rmSync10 } from "node:fs";
-import { dirname as dirname43, join as join141 } from "node:path";
+import { existsSync as existsSync70, readdirSync as readdirSync14, rmSync as rmSync11 } from "node:fs";
+import { dirname as dirname43, join as join147 } from "node:path";
 function listPresentManifestNames(installPath) {
   const present = [];
   if (existsSync70(getManifestPath(installPath)))
@@ -90424,9 +90896,9 @@ async function cleanupEmptyDirectories3(filePath, installationRoot) {
   let currentDir = dirname43(filePath);
   while (currentDir !== installationRoot && currentDir.startsWith(installationRoot)) {
     try {
-      const entries = readdirSync13(currentDir);
+      const entries = readdirSync14(currentDir);
       if (entries.length === 0) {
-        rmSync10(currentDir, { recursive: true });
+        rmSync11(currentDir, { recursive: true });
         cleaned++;
         logger.debug(`Removed empty directory: ${currentDir}`);
         currentDir = dirname43(currentDir);
@@ -90451,7 +90923,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 = join141(installation.path, trackedFile.path);
+      const filePath = join147(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -90483,7 +90955,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join141(installation.path, trackedFile.path);
+    const filePath = join147(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -90541,7 +91013,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
   try {
     const resolvedPath = resolve36(filePath);
     const resolvedBase = resolve36(baseDir);
-    if (!resolvedPath.startsWith(resolvedBase + sep10) && resolvedPath !== resolvedBase) {
+    if (!resolvedPath.startsWith(resolvedBase + sep11) && resolvedPath !== resolvedBase) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
     }
@@ -90549,7 +91021,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
     if (stats.isSymbolicLink()) {
       const realPath = await import_fs_extra39.realpath(filePath);
       const resolvedReal = resolve36(realPath);
-      if (!resolvedReal.startsWith(resolvedBase + sep10) && resolvedReal !== resolvedBase) {
+      if (!resolvedReal.startsWith(resolvedBase + sep11) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
         return false;
       }
@@ -90582,7 +91054,7 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join142(installation.path, item.path);
+        const filePath = join148(installation.path, item.path);
         if (!await import_fs_extra39.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -90601,9 +91073,9 @@ async function removeInstallations(installations, options2) {
         await ManifestWriter.removeKitFromManifest(installation.path, options2.kit);
       }
       try {
-        const remaining = readdirSync14(installation.path);
+        const remaining = readdirSync15(installation.path);
         if (remaining.length === 0) {
-          rmSync11(installation.path, { recursive: true });
+          rmSync12(installation.path, { recursive: true });
           logger.debug(`Removed empty installation directory: ${installation.path}`);
         }
       } catch {}
@@ -91367,7 +91839,7 @@ function parsePositiveIntFlag(raw, label, example, max) {
 }
 var ARTIFACT_LIST_LIMIT_MAX = 100;
 function registerCommands(cli) {
-  cli.command("init", "Initialize or update Takumi project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit(s) to install (core, extras). Repeat the flag to install multiple kits, e.g. --kit core --kit extras.").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("--skill-role <role>", "Install only skills tagged with these role(s) (comma-separated or repeatable). Combines with --skill-category as a union.").option("--skill-category <category>", "Install only skills in these categor(y/ies) (comma-separated or repeatable). Combines with --skill-role as a union.").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove takumi files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--install-hooks", "Install all agent hooks (guard, session, convention, extension). Default installs only telemetry hooks.").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /tkm: prefix to all slash commands by moving them to commands/tkm/ 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("--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").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass the Worker release distribution API; default uses Worker)").option("-a, --agent <agents...>", "Target agents (claude-code, codex). Default: claude-code").action(async (options2) => {
+  cli.command("init", "Initialize or update Takumi project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit(s) to install (core, extras). Repeat the flag to install multiple kits, e.g. --kit core --kit extras.").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("--skill-role <role>", "Install only skills tagged with these role(s) (comma-separated or repeatable). Combines with --skill-category as a union.").option("--skill-category <category>", "Install only skills in these categor(y/ies) (comma-separated or repeatable). Combines with --skill-role as a union.").option("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove takumi files, replace settings.json and CLAUDE.md, reinstall from scratch").option("--force", "Force reinstall even if already at latest version (use with --yes; re-onboards missing files without full reset)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--install-hooks", "(deprecated: no-op) The full hook set (guard, session, convention, extension, metrics, perf) installs by default.").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /tkm: prefix to all slash commands by moving them to commands/tkm/ 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("--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").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass the Worker release distribution API; default uses Worker)").option("-a, --agent <agents...>", "Target agents (claude-code, codex). Default: claude-code").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }
@@ -91439,7 +91911,7 @@ function registerCommands(cli) {
   cli.command("telemetry [action]", "Inspect or control Takumi telemetry").option("--json", "Output in JSON format (status)").action(async (action, options2) => {
     await telemetryCommand(action, options2);
   });
-  cli.command("hooks [event]", "Manage Takumi hook entries in agent settings (install|uninstall)").option("-a, --agent <agent>", "Target agent: claude or codex").option("-g, --global", "Use the user-level settings file instead of project-local").option("--dry-run", "Preview the diff without writing").option("-y, --yes", "Auto-approve diff prompts and create missing settings files").option("--bin <command>", "Override the leading binary in generated hook commands").option("--no-detach", "Force inline PUT; default behavior spawns a detached child for the network call").option("--debug", "Mirror hook logs into <sessionDir>/detach-debug.log for inspection").option("--job <data>", "Internal: base64 job payload for fork-detached PUT").action(async (event, options2 = {}) => {
+  cli.command("hooks [event]", "Manage Takumi hook entries in agent settings (install|uninstall)").option("-a, --agent <agent>", "Target agent: claude or codex").option("-g, --global", "Use the user-level settings file instead of project-local").option("--dry-run", "Preview the diff without writing").option("-y, --yes", "Auto-approve diff prompts and create missing settings files").option("--bin <command>", "Override the leading binary in generated hook commands").option("--no-detach", "Force inline PUT; default behavior spawns a detached child for the network call").option("--debug", "Mirror hook logs into <sessionDir>/detach-debug.log for inspection").option("--job <data>", "Internal: base64 job payload for fork-detached PUT").option("--dir <path>", "Internal: hooks dir for the scan-meta eval-hook scan").option("--out <path>", "Internal: out-of-band result file for scan-meta").action(async (event, options2 = {}) => {
     const agent = options2.agent === "claude" || options2.agent === "codex" ? options2.agent : undefined;
     const noDetach = options2.detach === false;
     await hooksCommand(event, {
@@ -91449,13 +91921,18 @@ function registerCommands(cli) {
       yes: options2.yes,
       bin: options2.bin,
       noDetach,
-      debug: options2.debug
+      debug: options2.debug,
+      dir: options2.dir,
+      out: options2.out
     });
   });
-  cli.command("hook-exec", "Run a Takumi hook handler for the piped stdin event (agent-invoked)").option("--hook <selector>", "Handler selector: <category>.<name> or <category>.* (wildcard)").option("--event <event>", "Fallback hook event (kebab-case); stdin hook_event_name wins").option("-a, --agent <agent>", "Target agent: claude or codex").option("--no-detach", "Force inline PUT instead of spawning a detached child").option("--debug", "Mirror hook logs into <sessionDir>/detach-debug.log").action(async (options2 = {}) => {
+  cli.command("hook-exec", "Run a Takumi hook handler for the piped stdin event (agent-invoked)").option("--hook <selector>", "Handler selector: <category>.<name> or <category>.* (wildcard)").option("--eval <relpath>", "Run a kit JS hook file in-process (relative to the scope's hooks dir)").option("-g, --global", "Scope for --eval resolution: the global hooks dir").option("--project", "Scope for --eval resolution: the project hooks dir (default)").option("--plugin", "Scope for --eval resolution: the plugin hooks dir").option("--event <event>", "Fallback hook event (kebab-case); stdin hook_event_name wins").option("-a, --agent <agent>", "Target agent: claude or codex").option("--no-detach", "Force inline PUT instead of spawning a detached child").option("--debug", "Mirror hook logs into <sessionDir>/detach-debug.log").action(async (options2 = {}) => {
     const agent = options2.agent === "claude" || options2.agent === "codex" ? options2.agent : undefined;
+    const scope = options2.global ? "global" : options2.plugin ? "plugin" : options2.project ? "project" : undefined;
     await hookExecCommand({
       hook: options2.hook,
+      eval: options2.eval,
+      scope,
       event: options2.event,
       agent,
       noDetach: options2.detach === false,
@@ -91522,8 +91999,8 @@ init_version_checker();
 init_manifest_path_resolver();
 init_logger();
 init_types2();
-import { readFileSync as readFileSync29 } from "node:fs";
-import { join as join143 } from "node:path";
+import { readFileSync as readFileSync32 } from "node:fs";
+import { join as join149 } from "node:path";
 var PROVIDER_LOCAL_SUBDIRS = {
   "claude-code": ".claude",
   codex: ".codex"
@@ -91578,7 +92055,7 @@ async function displayVersion() {
     const localSubdir = PROVIDER_LOCAL_SUBDIRS[provider];
     if (!localSubdir)
       continue;
-    const localRoot = join143(process.cwd(), localSubdir);
+    const localRoot = join149(process.cwd(), localSubdir);
     if (localRoot === inst.globalRoot())
       continue;
     const resolved = findManifestPathSync(localRoot);
@@ -91588,7 +92065,7 @@ async function displayVersion() {
   }
   for (const { provider, path: metaPath } of localChecks) {
     try {
-      const rawMetadata = JSON.parse(readFileSync29(metaPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync32(metaPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {
@@ -91608,7 +92085,7 @@ async function displayVersion() {
     const resolved = findManifestPathSync(installPath);
     if (resolved) {
       try {
-        const rawMetadata = JSON.parse(readFileSync29(resolved.path, "utf-8"));
+        const rawMetadata = JSON.parse(readFileSync32(resolved.path, "utf-8"));
         const metadata = MetadataSchema.parse(rawMetadata);
         const kitsDisplay = formatInstalledKits(metadata);
         if (kitsDisplay) {
@@ -91990,7 +92467,7 @@ var output2 = new OutputManager2;
 // src/shared/temp-cleanup.ts
 init_logger();
 var import_fs_extra41 = __toESM(require_lib(), 1);
-import { rmSync as rmSync12 } from "node:fs";
+import { rmSync as rmSync13 } from "node:fs";
 var tempDirs2 = new Set;
 async function cleanup() {
   if (tempDirs2.size === 0)
@@ -92011,7 +92488,7 @@ function cleanupSync() {
     return;
   for (const dir of tempDirs2) {
     try {
-      rmSync12(dir, { recursive: true, force: true });
+      rmSync13(dir, { recursive: true, force: true });
     } catch {}
   }
   tempDirs2.clear();