@sunasteriskrnd/takumi 1.0.0-dev.13 → 1.0.0-dev.15

package/dist/index.js

@@ -19579,14 +19579,17 @@ function isSafeRelativeLayoutPath(value) {
   return segments.every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
 }
 function isValidKitType(value) {
-  return value === "engineer" || value === "extras";
+  return value === "core" || value === "extras";
 }
-var KitType, KitConfigSchema, KitLayoutSchema, TakumiPackageMetadataSchema, DEFAULT_KIT_LAYOUT, AVAILABLE_KITS, BASE_KIT = "engineer", NEVER_COPY_PATTERNS, USER_CONFIG_PATTERNS, PROTECTED_PATTERNS;
+function backendIdOf(kitType) {
+  return AVAILABLE_KITS[kitType].id;
+}
+var KitType, KitConfigSchema, KitLayoutSchema, TakumiPackageMetadataSchema, DEFAULT_KIT_LAYOUT, AVAILABLE_KITS, BASE_KIT = "core", NEVER_COPY_PATTERNS, USER_CONFIG_PATTERNS, PROTECTED_PATTERNS;
 var init_kit = __esm(() => {
   init_zod();
-  KitType = exports_external.enum(["engineer", "extras"]);
+  KitType = exports_external.enum(["core", "extras"]);
   KitConfigSchema = exports_external.object({
-    id: KitType,
+    id: exports_external.string(),
     name: exports_external.string(),
     repo: exports_external.string(),
     owner: exports_external.string(),
@@ -19604,12 +19607,12 @@ var init_kit = __esm(() => {
     runtimeDir: ".claude"
   };
   AVAILABLE_KITS = {
-    engineer: {
+    core: {
       id: "engineer",
-      name: "Takumi Engineer",
+      name: "Core",
       repo: "takumi",
       owner: "sun-asterisk-internal",
-      description: "Engineering toolkit for building with Claude"
+      description: "Core toolkit for building with Claude"
     },
     extras: {
       id: "extras",
@@ -20270,6 +20273,7 @@ var exports_types = {};
 __export(exports_types, {
   normalizeTakumiConfigInput: () => normalizeTakumiConfigInput,
   isValidKitType: () => isValidKitType,
+  backendIdOf: () => backendIdOf,
   VidcapOptionsSchema: () => VidcapOptionsSchema,
   VersionCommandOptionsSchema: () => VersionCommandOptionsSchema,
   ValidationResultSchema: () => ValidationResultSchema,
@@ -32365,7 +32369,7 @@ var init_error_handler = __esm(() => {
 // src/domains/versioning/release-cache.ts
 import { existsSync as existsSync40 } from "node:fs";
 import { mkdir as mkdir18, readFile as readFile34, unlink as unlink8, writeFile as writeFile24 } from "node:fs/promises";
-import { join as join77 } from "node:path";
+import { join as join79 } from "node:path";
 var ReleaseCacheEntrySchema, ReleaseCache;
 var init_release_cache = __esm(() => {
   init_logger();
@@ -32380,7 +32384,7 @@ var init_release_cache = __esm(() => {
     static CACHE_TTL_SECONDS = Number(process.env.TAKUMI_CACHE_TTL) || 3600;
     cacheDir;
     constructor() {
-      this.cacheDir = join77(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
+      this.cacheDir = join79(PathResolver.getCacheDir(false), ReleaseCache.CACHE_DIR);
     }
     async get(key) {
       const cacheFile = this.getCachePath(key);
@@ -32438,7 +32442,7 @@ var init_release_cache = __esm(() => {
           const files = await readdir25(this.cacheDir);
           for (const file of files) {
             if (file.endsWith(".json")) {
-              await unlink8(join77(this.cacheDir, file));
+              await unlink8(join79(this.cacheDir, file));
             }
           }
           logger.debug("All release cache cleared");
@@ -32449,7 +32453,7 @@ var init_release_cache = __esm(() => {
     }
     getCachePath(key) {
       const safeKey = key.replace(/[^a-zA-Z0-9_-]/g, "_");
-      return join77(this.cacheDir, `${safeKey}.json`);
+      return join79(this.cacheDir, `${safeKey}.json`);
     }
     isExpired(timestamp) {
       const now = Date.now();
@@ -33370,7 +33374,7 @@ async function checkTokenScopes() {
     };
   }
 }
-async function checkRepositoryAccess(kitType = "engineer") {
+async function checkRepositoryAccess(kitType = "core") {
   if (process.env.CI === "true") {
     return {
       id: `github-repo-access-${kitType}`,
@@ -33442,14 +33446,14 @@ var exports_monorepo_resolver = {};
 __export(exports_monorepo_resolver, {
   resolveMonorepoRoot: () => resolveMonorepoRoot
 });
-import { existsSync as existsSync42, readFileSync as readFileSync11 } from "node:fs";
-import { dirname as dirname23, join as join88, resolve as resolve19 } from "node:path";
+import { existsSync as existsSync42, readFileSync as readFileSync12 } from "node:fs";
+import { dirname as dirname23, join as join90, resolve as resolve20 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function parseMetadataAt(metadataPath) {
   if (!existsSync42(metadataPath))
     return null;
   try {
-    const raw = readFileSync11(metadataPath, "utf-8");
+    const raw = readFileSync12(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;
@@ -33460,11 +33464,11 @@ function parseMetadataAt(metadataPath) {
   }
 }
 function readSourceDirFromPackageJson(candidateRoot) {
-  const packageJsonPath = join88(candidateRoot, "package.json");
+  const packageJsonPath = join90(candidateRoot, "package.json");
   if (!existsSync42(packageJsonPath))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync11(packageJsonPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync12(packageJsonPath, "utf-8"));
     const kitCfg = parsed.takumi;
     if (kitCfg && typeof kitCfg.sourceDir === "string" && kitCfg.sourceDir.length > 0) {
       return kitCfg.sourceDir;
@@ -33483,7 +33487,7 @@ function tryReadAtCandidate(candidateRoot) {
     };
   }
   const sourceDir = readSourceDirFromPackageJson(candidateRoot) ?? "claude";
-  const sourceRoot = join88(candidateRoot, sourceDir);
+  const sourceRoot = join90(candidateRoot, sourceDir);
   const nestedMetadata = parseMetadataAt(getManifestPath(sourceRoot)) ?? parseMetadataAt(getLegacyManifestPath(sourceRoot));
   if (nestedMetadata) {
     return {
@@ -33496,7 +33500,7 @@ function tryReadAtCandidate(candidateRoot) {
   return null;
 }
 function walkUpForMetadata(startDir, maxDepth = 5) {
-  let current = resolve19(startDir);
+  let current = resolve20(startDir);
   for (let i = 0;i < maxDepth; i++) {
     const result = tryReadAtCandidate(current);
     if (result)
@@ -33517,7 +33521,7 @@ function resolveMonorepoRoot() {
       return result2;
   } catch {}
   if (process.argv[1]) {
-    const binDir = dirname23(resolve19(process.argv[1]));
+    const binDir = dirname23(resolve20(process.argv[1]));
     const result2 = walkUpForMetadata(binDir);
     if (result2)
       return result2;
@@ -33616,7 +33620,7 @@ async function restoreOriginalBranch(branchName, cwd2, issueNumber) {
   }
 }
 function spawnAndCollect(command, args, cwd2) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const child = spawn3(command, args, { ...cwd2 && { cwd: cwd2 }, stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -33629,7 +33633,7 @@ function spawnAndCollect(command, args, cwd2) {
         reject(new Error(`${command} ${args[0] ?? ""} exited with code ${code}: ${stderr}`));
         return;
       }
-      resolve30(Buffer.concat(chunks).toString("utf-8"));
+      resolve31(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
@@ -33648,9 +33652,9 @@ __export(exports_worktree_manager, {
 });
 import { existsSync as existsSync53 } from "node:fs";
 import { readFile as readFile44, writeFile as writeFile32 } from "node:fs/promises";
-import { join as join108 } from "node:path";
+import { join as join110 } from "node:path";
 async function createWorktree(projectDir, issueNumber, baseBranch) {
-  const worktreePath = join108(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join110(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `sk-watch/issue-${issueNumber}`;
   await spawnAndCollect("git", ["fetch", "origin", baseBranch], projectDir).catch(() => {
     logger.warning(`[worktree] Could not fetch origin/${baseBranch}, using local`);
@@ -33668,7 +33672,7 @@ async function createWorktree(projectDir, issueNumber, baseBranch) {
   return worktreePath;
 }
 async function removeWorktree(projectDir, issueNumber) {
-  const worktreePath = join108(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join110(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `sk-watch/issue-${issueNumber}`;
   try {
     await spawnAndCollect("git", ["worktree", "remove", worktreePath, "--force"], projectDir);
@@ -33682,7 +33686,7 @@ async function listActiveWorktrees(projectDir) {
   try {
     const output2 = await spawnAndCollect("git", ["worktree", "list", "--porcelain"], projectDir);
     const issueNumbers = [];
-    const worktreePrefix = join108(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
+    const worktreePrefix = join110(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
     for (const line of output2.split(`
 `)) {
       if (line.startsWith("worktree ")) {
@@ -33710,7 +33714,7 @@ async function cleanupAllWorktrees(projectDir) {
   await spawnAndCollect("git", ["worktree", "prune"], projectDir).catch(() => {});
 }
 async function ensureGitignore(projectDir) {
-  const gitignorePath = join108(projectDir, ".gitignore");
+  const gitignorePath = join110(projectDir, ".gitignore");
   try {
     const content = existsSync53(gitignorePath) ? await readFile44(gitignorePath, "utf-8") : "";
     if (!content.includes(".worktrees")) {
@@ -33814,16 +33818,16 @@ var init_content_validator = __esm(() => {
 
 // src/commands/content/phases/context-cache-manager.ts
 import { createHash as createHash8 } from "node:crypto";
-import { existsSync as existsSync59, mkdirSync as mkdirSync4, readFileSync as readFileSync16, readdirSync as readdirSync10, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync59, mkdirSync as mkdirSync5, readFileSync as readFileSync17, readdirSync as readdirSync10, statSync as statSync7 } from "node:fs";
 import { rename as rename10, writeFile as writeFile34 } from "node:fs/promises";
 import { homedir as homedir27 } from "node:os";
-import { basename as basename13, join as join115 } from "node:path";
+import { basename as basename14, join as join117 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
   if (!existsSync59(cachePath))
     return null;
   try {
-    const raw = readFileSync16(cachePath, "utf-8");
+    const raw = readFileSync17(cachePath, "utf-8");
     const cache2 = JSON.parse(raw);
     const age = Date.now() - new Date(cache2.createdAt).getTime();
     if (age >= CACHE_TTL_MS3)
@@ -33838,7 +33842,7 @@ function getCachedContext(repoPath) {
 }
 async function saveCachedContext(repoPath, cache2) {
   if (!existsSync59(CACHE_DIR)) {
-    mkdirSync4(CACHE_DIR, { recursive: true });
+    mkdirSync5(CACHE_DIR, { recursive: true });
   }
   const cachePath = getCacheFilePath(repoPath);
   const tmpPath = `${cachePath}.tmp`;
@@ -33860,38 +33864,38 @@ function computeSourceHash(repoPath) {
 }
 function getDocSourcePaths(repoPath) {
   const paths = [];
-  const docsDir = join115(repoPath, "docs");
+  const docsDir = join117(repoPath, "docs");
   if (existsSync59(docsDir)) {
     try {
       const files = readdirSync10(docsDir);
       for (const f4 of files) {
         if (f4.endsWith(".md"))
-          paths.push(join115(docsDir, f4));
+          paths.push(join117(docsDir, f4));
       }
     } catch {}
   }
-  const readme = join115(repoPath, "README.md");
+  const readme = join117(repoPath, "README.md");
   if (existsSync59(readme))
     paths.push(readme);
-  const stylesDir = join115(repoPath, "assets", "writing-styles");
+  const stylesDir = join117(repoPath, "assets", "writing-styles");
   if (existsSync59(stylesDir)) {
     try {
       const files = readdirSync10(stylesDir);
       for (const f4 of files) {
-        paths.push(join115(stylesDir, f4));
+        paths.push(join117(stylesDir, f4));
       }
     } catch {}
   }
   return paths.sort();
 }
 function getCacheFilePath(repoPath) {
-  const repoName = basename13(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
+  const repoName = basename14(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
   const pathHash = createHash8("sha256").update(repoPath).digest("hex").slice(0, 8);
-  return join115(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
+  return join117(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
 }
 var CACHE_DIR, CACHE_TTL_MS3;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join115(homedir27(), ".sunagentkit", "cache");
+  CACHE_DIR = join117(homedir27(), ".sunagentkit", "cache");
   CACHE_TTL_MS3 = 24 * 60 * 60 * 1000;
 });
 
@@ -34071,8 +34075,8 @@ function extractContentFromResponse(response) {
 
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync5 } from "node:child_process";
-import { existsSync as existsSync60, readFileSync as readFileSync17, readdirSync as readdirSync11 } from "node:fs";
-import { join as join116 } from "node:path";
+import { existsSync as existsSync60, readFileSync as readFileSync18, readdirSync as readdirSync11 } from "node:fs";
+import { join as join118 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
   if (rawContent.total.length < 200) {
@@ -34120,18 +34124,18 @@ function collectRawDocs(repoPath) {
       return "";
     if (totalChars >= MAX_RAW_CONTENT_CHARS)
       return "";
-    const content = readFileSync17(filePath, "utf-8");
+    const content = readFileSync18(filePath, "utf-8");
     const capped = content.slice(0, Math.min(maxChars, MAX_RAW_CONTENT_CHARS - totalChars));
     totalChars += capped.length;
     return capped;
   };
   const docsContent = [];
-  const docsDir = join116(repoPath, "docs");
+  const docsDir = join118(repoPath, "docs");
   if (existsSync60(docsDir)) {
     try {
       const files = readdirSync11(docsDir).filter((f4) => f4.endsWith(".md")).sort();
       for (const f4 of files) {
-        const content = readCapped(join116(docsDir, f4), 5000);
+        const content = readCapped(join118(docsDir, f4), 5000);
         if (content) {
           docsContent.push(`### ${f4}
 ${content}`);
@@ -34145,21 +34149,21 @@ ${content}`);
   let brand = "";
   const brandCandidates = ["docs/brand-guidelines.md", "docs/design-guidelines.md"];
   for (const p2 of brandCandidates) {
-    brand = readCapped(join116(repoPath, p2), 3000);
+    brand = readCapped(join118(repoPath, p2), 3000);
     if (brand)
       break;
   }
   let styles3 = "";
-  const stylesDir = join116(repoPath, "assets", "writing-styles");
+  const stylesDir = join118(repoPath, "assets", "writing-styles");
   if (existsSync60(stylesDir)) {
     try {
       const files = readdirSync11(stylesDir).slice(0, 3);
-      styles3 = files.map((f4) => readCapped(join116(stylesDir, f4), 1000)).filter(Boolean).join(`
+      styles3 = files.map((f4) => readCapped(join118(stylesDir, f4), 1000)).filter(Boolean).join(`
 
 `);
     } catch {}
   }
-  const readme = readCapped(join116(repoPath, "README.md"), 3000);
+  const readme = readCapped(join118(repoPath, "README.md"), 3000);
   const total = [docs, brand, styles3, readme].join(`
 `);
   return { docs, brand, styles: styles3, readme, total };
@@ -34344,13 +34348,13 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 
 // src/commands/content/phases/photo-generator.ts
 import { execSync as execSync6 } from "node:child_process";
-import { existsSync as existsSync61, mkdirSync as mkdirSync5, readdirSync as readdirSync12 } from "node:fs";
+import { existsSync as existsSync61, mkdirSync as mkdirSync6, readdirSync as readdirSync12 } from "node:fs";
 import { homedir as homedir28 } from "node:os";
-import { join as join117 } from "node:path";
+import { join as join119 } from "node:path";
 async function generatePhoto(_content, context, config, platform10, contentId, contentLogger) {
-  const mediaDir = join117(config.contentDir.replace(/^~/, homedir28()), "media", String(contentId));
+  const mediaDir = join119(config.contentDir.replace(/^~/, homedir28()), "media", String(contentId));
   if (!existsSync61(mediaDir)) {
-    mkdirSync5(mediaDir, { recursive: true });
+    mkdirSync6(mediaDir, { recursive: true });
   }
   const prompt = buildPhotoPrompt(context, platform10);
   const dimensions = platform10 === "facebook" ? { width: 1200, height: 630 } : { width: 1200, height: 675 };
@@ -34373,7 +34377,7 @@ async function generatePhoto(_content, context, config, platform10, contentId, c
     const imageFile = files.find((f4) => /\.(png|jpg|jpeg|webp)$/i.test(f4));
     if (imageFile) {
       const ext2 = imageFile.split(".").pop() ?? "png";
-      return { path: join117(mediaDir, imageFile), ...dimensions, format: ext2 };
+      return { path: join119(mediaDir, imageFile), ...dimensions, format: ext2 };
     }
     contentLogger.warn(`Photo generation produced no image for content ${contentId}`);
     return null;
@@ -34461,9 +34465,9 @@ var init_content_creator = __esm(() => {
 });
 
 // src/commands/content/phases/content-logger.ts
-import { createWriteStream as createWriteStream5, existsSync as existsSync62, mkdirSync as mkdirSync6, statSync as statSync8 } from "node:fs";
+import { createWriteStream as createWriteStream5, existsSync as existsSync62, mkdirSync as mkdirSync7, statSync as statSync8 } from "node:fs";
 import { homedir as homedir29 } from "node:os";
-import { join as join118 } from "node:path";
+import { join as join120 } from "node:path";
 
 class ContentLogger {
   stream = null;
@@ -34471,12 +34475,12 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join118(homedir29(), ".sunagentkit", "logs");
+    this.logDir = join120(homedir29(), ".sunagentkit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
     if (!existsSync62(this.logDir)) {
-      mkdirSync6(this.logDir, { recursive: true });
+      mkdirSync7(this.logDir, { recursive: true });
     }
     this.rotateIfNeeded();
   }
@@ -34503,7 +34507,7 @@ class ContentLogger {
     }
   }
   getLogPath() {
-    return join118(this.logDir, `content-${this.getDateStr()}.log`);
+    return join120(this.logDir, `content-${this.getDateStr()}.log`);
   }
   write(level, message) {
     this.rotateIfNeeded();
@@ -34520,18 +34524,18 @@ class ContentLogger {
     if (dateStr !== this.currentDate) {
       this.close();
       this.currentDate = dateStr;
-      const logPath = join118(this.logDir, `content-${dateStr}.log`);
+      const logPath = join120(this.logDir, `content-${dateStr}.log`);
       this.stream = createWriteStream5(logPath, { flags: "a", mode: 384 });
       return;
     }
     if (this.maxBytes > 0 && this.stream) {
-      const logPath = join118(this.logDir, `content-${this.currentDate}.log`);
+      const logPath = join120(this.logDir, `content-${this.currentDate}.log`);
       try {
         const stat15 = statSync8(logPath);
         if (stat15.size >= this.maxBytes) {
           this.close();
           const suffix = Date.now();
-          const rotatedPath = join118(this.logDir, `content-${this.currentDate}-${suffix}.log`);
+          const rotatedPath = join120(this.logDir, `content-${this.currentDate}-${suffix}.log`);
           import("node:fs/promises").then(({ rename: rename11 }) => rename11(logPath, rotatedPath).catch(() => {}));
           this.stream = createWriteStream5(logPath, { flags: "w", mode: 384 });
         }
@@ -34568,7 +34572,7 @@ function openDatabase(dbPath) {
 var init_sqlite_client = () => {};
 
 // src/commands/content/phases/db-manager.ts
-import { existsSync as existsSync63, mkdirSync as mkdirSync7 } from "node:fs";
+import { existsSync as existsSync63, mkdirSync as mkdirSync8 } from "node:fs";
 import { dirname as dirname34 } from "node:path";
 function initDatabase(dbPath) {
   ensureParentDir2(dbPath);
@@ -34592,7 +34596,7 @@ function runRetentionCleanup(db, retentionDays = 90) {
 function ensureParentDir2(dbPath) {
   const dir = dirname34(dbPath);
   if (dir && !existsSync63(dir)) {
-    mkdirSync7(dir, { recursive: true });
+    mkdirSync8(dir, { recursive: true });
   }
 }
 function getCurrentSchemaVersion(db) {
@@ -34756,8 +34760,8 @@ function isNoiseCommit(title, author) {
 
 // src/commands/content/phases/change-detector.ts
 import { execSync as execSync8 } from "node:child_process";
-import { existsSync as existsSync64, readFileSync as readFileSync18, readdirSync as readdirSync13, statSync as statSync9 } from "node:fs";
-import { join as join119 } from "node:path";
+import { existsSync as existsSync64, readFileSync as readFileSync19, readdirSync as readdirSync13, statSync as statSync9 } from "node:fs";
+import { join as join121 } from "node:path";
 function detectCommits(repo, since) {
   try {
     const fetchUrl = sshToHttps(repo.remoteUrl);
@@ -34855,7 +34859,7 @@ function detectTags(repo, since) {
   }
 }
 function detectCompletedPlans(repo, since) {
-  const plansDir = join119(repo.path, "plans");
+  const plansDir = join121(repo.path, "plans");
   if (!existsSync64(plansDir))
     return [];
   const sinceMs = new Date(since).getTime();
@@ -34865,14 +34869,14 @@ function detectCompletedPlans(repo, since) {
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const planFile = join119(plansDir, entry.name, "plan.md");
+      const planFile = join121(plansDir, entry.name, "plan.md");
       if (!existsSync64(planFile))
         continue;
       try {
         const stat15 = statSync9(planFile);
         if (stat15.mtimeMs < sinceMs)
           continue;
-        const content = readFileSync18(planFile, "utf-8");
+        const content = readFileSync19(planFile, "utf-8");
         const frontmatterMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
         if (!frontmatterMatch)
           continue;
@@ -34943,7 +34947,7 @@ function classifyCommit(event) {
 // src/commands/content/phases/repo-discoverer.ts
 import { execSync as execSync9 } from "node:child_process";
 import { readdirSync as readdirSync14 } from "node:fs";
-import { join as join120 } from "node:path";
+import { join as join122 } from "node:path";
 function discoverRepos2(cwd2) {
   const repos = [];
   if (isGitRepoRoot(cwd2)) {
@@ -34956,7 +34960,7 @@ function discoverRepos2(cwd2) {
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("."))
         continue;
-      const dirPath = join120(cwd2, entry.name);
+      const dirPath = join122(cwd2, entry.name);
       if (isGitRepoRoot(dirPath)) {
         const info = getRepoInfo(dirPath);
         if (info)
@@ -35623,9 +35627,9 @@ var init_types3 = __esm(() => {
 
 // src/commands/content/phases/state-manager.ts
 import { readFile as readFile46, rename as rename11, writeFile as writeFile35 } from "node:fs/promises";
-import { join as join121 } from "node:path";
+import { join as join123 } from "node:path";
 async function loadContentConfig(projectDir) {
-  const configPath = join121(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join123(projectDir, TAKUMI_CONFIG_FILE2);
   try {
     const raw = await readFile46(configPath, "utf-8");
     const json = JSON.parse(raw);
@@ -35635,13 +35639,13 @@ async function loadContentConfig(projectDir) {
   }
 }
 async function saveContentConfig(projectDir, config) {
-  const configPath = join121(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join123(projectDir, TAKUMI_CONFIG_FILE2);
   const json = await readJsonSafe(configPath);
   json.content = { ...json.content, ...config };
   await atomicWrite2(configPath, json);
 }
 async function loadContentState(projectDir) {
-  const configPath = join121(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join123(projectDir, TAKUMI_CONFIG_FILE2);
   try {
     const raw = await readFile46(configPath, "utf-8");
     const json = JSON.parse(raw);
@@ -35652,7 +35656,7 @@ async function loadContentState(projectDir) {
   }
 }
 async function saveContentState(projectDir, state) {
-  const configPath = join121(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join123(projectDir, TAKUMI_CONFIG_FILE2);
   const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10);
   for (const key of Object.keys(state.dailyPostCounts)) {
     const dateStr = key.slice(-10);
@@ -35934,7 +35938,7 @@ var init_platform_setup_x = __esm(() => {
 
 // src/commands/content/phases/setup-wizard.ts
 import { existsSync as existsSync65 } from "node:fs";
-import { join as join122 } from "node:path";
+import { join as join124 } from "node:path";
 async function runSetupWizard2(cwd2, contentLogger) {
   console.log();
   oe(import_picocolors34.default.bgCyan(import_picocolors34.default.white(" SK Content — Multi-Channel Content Engine ")));
@@ -36002,8 +36006,8 @@ async function showRepoSummary(cwd2) {
 function detectBrandAssets(cwd2, contentLogger) {
   const repos = discoverRepos2(cwd2);
   for (const repo of repos) {
-    const hasGuidelines = existsSync65(join122(repo.path, "docs", "brand-guidelines.md"));
-    const hasStyles = existsSync65(join122(repo.path, "assets", "writing-styles"));
+    const hasGuidelines = existsSync65(join124(repo.path, "docs", "brand-guidelines.md"));
+    const hasStyles = existsSync65(join124(repo.path, "assets", "writing-styles"));
     if (!hasGuidelines) {
       f2.warning(`${repo.name}: No docs/brand-guidelines.md — content will use generic tone.`);
       contentLogger.warn(`${repo.name}: missing docs/brand-guidelines.md`);
@@ -36143,25 +36147,25 @@ __export(exports_content_subcommands, {
   logsContent: () => logsContent,
   approveContentCmd: () => approveContentCmd
 });
-import { existsSync as existsSync67, readFileSync as readFileSync19, unlinkSync as unlinkSync6 } from "node:fs";
+import { existsSync as existsSync67, readFileSync as readFileSync20, unlinkSync as unlinkSync7 } from "node:fs";
 import { homedir as homedir31 } from "node:os";
-import { join as join123 } from "node:path";
+import { join as join125 } from "node:path";
 function isDaemonRunning() {
-  const lockFile = join123(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join125(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync67(lockFile))
     return { running: false, pid: null };
   try {
-    const pidStr = readFileSync19(lockFile, "utf-8").trim();
+    const pidStr = readFileSync20(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (Number.isNaN(pid)) {
-      unlinkSync6(lockFile);
+      unlinkSync7(lockFile);
       return { running: false, pid: null };
     }
     process.kill(pid, 0);
     return { running: true, pid };
   } catch {
     try {
-      unlinkSync6(lockFile);
+      unlinkSync7(lockFile);
     } catch {}
     return { running: false, pid: null };
   }
@@ -36179,13 +36183,13 @@ async function startContent(options2) {
   await contentCommand(options2);
 }
 async function stopContent() {
-  const lockFile = join123(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join125(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync67(lockFile)) {
     logger.info("Content daemon is not running.");
     return;
   }
   try {
-    const pidStr = readFileSync19(lockFile, "utf-8").trim();
+    const pidStr = readFileSync20(lockFile, "utf-8").trim();
     const pid = Number.parseInt(pidStr, 10);
     if (!Number.isNaN(pid)) {
       process.kill(pid, "SIGTERM");
@@ -36218,9 +36222,9 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join123(homedir31(), ".sunagentkit", "logs");
+  const logDir = join125(homedir31(), ".sunagentkit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
-  const logPath = join123(logDir, `content-${dateStr}.log`);
+  const logPath = join125(logDir, `content-${dateStr}.log`);
   if (!existsSync67(logPath)) {
     logger.info("No content logs found for today.");
     return;
@@ -36233,7 +36237,7 @@ async function logsContent(options2) {
       process.exit(0);
     });
   } else {
-    const content = readFileSync19(logPath, "utf-8");
+    const content = readFileSync20(logPath, "utf-8");
     console.log(content);
   }
 }
@@ -36252,13 +36256,13 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join123(homedir31(), ".sunagentkit", "locks");
+  LOCK_DIR = join125(homedir31(), ".sunagentkit", "locks");
 });
 
 // src/commands/content/content-command.ts
-import { existsSync as existsSync68, mkdirSync as mkdirSync8, unlinkSync as unlinkSync7, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync68, mkdirSync as mkdirSync9, unlinkSync as unlinkSync8, writeFileSync as writeFileSync8 } from "node:fs";
 import { homedir as homedir32 } from "node:os";
-import { join as join124 } from "node:path";
+import { join as join126 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
   const contentLogger = new ContentLogger;
@@ -36288,8 +36292,8 @@ async function contentCommand(options2) {
       contentLogger.info("Setup complete. Starting daemon...");
     }
     if (!existsSync68(LOCK_DIR2))
-      mkdirSync8(LOCK_DIR2, { recursive: true });
-    writeFileSync6(LOCK_FILE, String(process.pid), "utf-8");
+      mkdirSync9(LOCK_DIR2, { recursive: true });
+    writeFileSync8(LOCK_FILE, String(process.pid), "utf-8");
     const dbPath = config.dbPath.replace(/^~/, homedir32());
     const db = initDatabase(dbPath);
     contentLogger.info(`Database initialised at ${dbPath}`);
@@ -36304,7 +36308,7 @@ async function contentCommand(options2) {
       abortRequested = true;
       contentLogger.info("Shutting down gracefully...");
       try {
-        unlinkSync7(LOCK_FILE);
+        unlinkSync8(LOCK_FILE);
       } catch {}
       await saveContentState(cwd2, state);
       closeDatabase(db);
@@ -36334,7 +36338,7 @@ async function contentCommand(options2) {
     const msg = err instanceof Error ? err.message : String(err);
     contentLogger.error(`Fatal error: ${msg}`);
     try {
-      unlinkSync7(LOCK_FILE);
+      unlinkSync8(LOCK_FILE);
     } catch {}
     contentLogger.close();
     process.exit(1);
@@ -36419,8 +36423,8 @@ function shouldRunCleanup(lastAt) {
   return Date.now() - new Date(lastAt).getTime() >= 86400000;
 }
 function sleep3(ms2) {
-  return new Promise((resolve30) => {
-    setTimeout(resolve30, ms2);
+  return new Promise((resolve31) => {
+    setTimeout(resolve31, ms2);
   });
 }
 var LOCK_DIR2, LOCK_FILE, MAX_CREATION_RETRIES = 3, MAX_PUBLISH_RETRIES_PER_CYCLE = 3, PUBLISH_RETRY_WINDOW_HOURS = 24;
@@ -36436,8 +36440,8 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join124(homedir32(), ".sunagentkit", "locks");
-  LOCK_FILE = join124(LOCK_DIR2, "sk-content.lock");
+  LOCK_DIR2 = join126(homedir32(), ".sunagentkit", "locks");
+  LOCK_FILE = join126(LOCK_DIR2, "sk-content.lock");
 });
 
 // src/commands/content/index.ts
@@ -36583,8 +36587,8 @@ var init_new_command_help = __esm(() => {
     usage: "tkm new [options]",
     examples: [
       {
-        command: "tkm new --kit engineer --dir ./my-project",
-        description: "Create engineer kit project in specific directory"
+        command: "tkm new --kit core --dir ./my-project",
+        description: "Create core kit project in specific directory"
       },
       {
         command: "tkm new -y --use-git --release v2.1.0",
@@ -36619,7 +36623,7 @@ var init_new_command_help = __esm(() => {
           },
           {
             flags: "--kit <kit>",
-            description: "Kit to use (engineer, marketing)"
+            description: "Kit to use (core, extras)"
           },
           {
             flags: "-r, --release <version>",
@@ -36672,8 +36676,8 @@ var init_init_command_help = __esm(() => {
     usage: "tkm init [options]",
     examples: [
       {
-        command: "tkm init --kit engineer",
-        description: "Update local project with latest engineer kit"
+        command: "tkm init --kit core",
+        description: "Update local project with latest core kit"
       },
       {
         command: "tkm init --use-git --release v2.1.0 -y",
@@ -36686,7 +36690,7 @@ var init_init_command_help = __esm(() => {
         options: [
           {
             flags: "-y, --yes",
-            description: "Non-interactive mode with sensible defaults (kit: engineer, dir: ., version: latest)"
+            description: "Non-interactive mode with sensible defaults (kit: core, dir: ., version: latest)"
           },
           {
             flags: "--use-git",
@@ -36712,7 +36716,7 @@ var init_init_command_help = __esm(() => {
           },
           {
             flags: "--kit <kit>",
-            description: "Kit to use (engineer, marketing)"
+            description: "Kit to use (core, extras)"
           },
           {
             flags: "-r, --release <version>",
@@ -36877,7 +36881,7 @@ var init_uninstall_command_help = __esm(() => {
           },
           {
             flags: "-k, --kit <type>",
-            description: "Uninstall specific kit only (engineer, marketing)"
+            description: "Uninstall specific kit only (core, extras)"
           }
         ]
       },
@@ -36991,8 +36995,8 @@ var init_versions_command_help = __esm(() => {
     usage: "tkm versions [options]",
     examples: [
       {
-        command: "tkm versions --kit engineer --limit 10",
-        description: "Show latest 10 versions of engineer kit"
+        command: "tkm versions --kit core --limit 10",
+        description: "Show latest 10 versions of core kit"
       },
       {
         command: "tkm versions --all",
@@ -37005,7 +37009,7 @@ var init_versions_command_help = __esm(() => {
         options: [
           {
             flags: "--kit <kit>",
-            description: "Filter by specific kit (engineer, marketing)"
+            description: "Filter by specific kit (core, extras)"
           },
           {
             flags: "--limit <number>",
@@ -37035,7 +37039,7 @@ var init_config_command_help = __esm(() => {
         description: "Read a config value"
       },
       {
-        command: "tkm config set defaults.kit engineer",
+        command: "tkm config set defaults.kit core",
         description: "Set a config value from the CLI"
       },
       {
@@ -37410,7 +37414,7 @@ function getPagerArgs(pagerCmd) {
   return [];
 }
 async function trySystemPager(content) {
-  return new Promise((resolve30) => {
+  return new Promise((resolve31) => {
     const pagerCmd = process.env.PAGER || "less";
     const pagerArgs = getPagerArgs(pagerCmd);
     try {
@@ -37420,20 +37424,20 @@ async function trySystemPager(content) {
       });
       const timeout = setTimeout(() => {
         pager.kill();
-        resolve30(false);
+        resolve31(false);
       }, 30000);
       pager.stdin.write(content);
       pager.stdin.end();
       pager.on("close", (code) => {
         clearTimeout(timeout);
-        resolve30(code === 0);
+        resolve31(code === 0);
       });
       pager.on("error", () => {
         clearTimeout(timeout);
-        resolve30(false);
+        resolve31(false);
       });
     } catch {
-      resolve30(false);
+      resolve31(false);
     }
   });
 }
@@ -37460,16 +37464,16 @@ async function basicPager(content) {
       break;
     }
     const remaining = lines.length - currentLine;
-    await new Promise((resolve30) => {
+    await new Promise((resolve31) => {
       rl.question(`-- More (${remaining} lines) [Enter/q] --`, (answer) => {
         if (answer.toLowerCase() === "q") {
           rl.close();
           process.exitCode = 0;
-          resolve30();
+          resolve31();
           return;
         }
         process.stdout.write("\x1B[1A\x1B[2K");
-        resolve30();
+        resolve31();
       });
     });
   }
@@ -42877,7 +42881,7 @@ class SystemChecker {
   }
 }
 // src/services/file-operations/takumi-scanner.ts
-import { join as join67 } from "node:path";
+import { join as join69 } from "node:path";
 
 // src/domains/installers/claude-code/paths.ts
 import { homedir as homedir6 } from "node:os";
@@ -42942,7 +42946,21 @@ function findManifestPathSync(providerRoot) {
 // src/domains/migration/metadata-migration.ts
 init_logger();
 init_takumi_constants();
+init_types2();
 var import_fs_extra4 = __toESM(require_lib(), 1);
+function renameLegacyKitsKey(metadata) {
+  if (!metadata.kits)
+    return metadata;
+  const raw = metadata.kits;
+  const { engineer: legacy, ...rest } = raw;
+  if (legacy == null)
+    return metadata;
+  const nextKits = rest;
+  if (nextKits.core == null) {
+    nextKits.core = legacy;
+  }
+  return { ...metadata, kits: nextKits };
+}
 async function detectMetadataFormat(claudeDir) {
   const resolved = await findManifestPath(claudeDir);
   if (!resolved) {
@@ -42955,9 +42973,9 @@ async function detectMetadataFormat(claudeDir) {
     if (!trimmed) {
       return { format: "none", metadata: null, detectedKit: null, filenameUsed: null };
     }
-    const parsed = JSON.parse(trimmed);
+    const parsed = renameLegacyKitsKey(JSON.parse(trimmed));
     if (parsed.kits && Object.keys(parsed.kits).length > 0) {
-      const installedKits = Object.keys(parsed.kits);
+      const installedKits = Object.keys(parsed.kits).filter(isValidKitType);
       return {
         format: "multi-kit",
         metadata: parsed,
@@ -42966,12 +42984,12 @@ async function detectMetadataFormat(claudeDir) {
       };
     }
     if (parsed.name || parsed.version || parsed.files) {
-      let detectedKit = "engineer";
+      let detectedKit = "core";
       const nameToCheck = parsed.name || "";
       if (/\bextras\b/i.test(nameToCheck)) {
         detectedKit = "extras";
       } else if (/\bengineer\b/i.test(nameToCheck)) {
-        detectedKit = "engineer";
+        detectedKit = "core";
       }
       return { format: "legacy", metadata: parsed, detectedKit, filenameUsed };
     }
@@ -43011,7 +43029,7 @@ async function migrateToMultiKit(claudeDir) {
       error: "Metadata exists but could not be read"
     };
   }
-  const legacyKit = detection.detectedKit || "engineer";
+  const legacyKit = detection.detectedKit || "core";
   try {
     const kitMetadata = {
       version: legacy.version || "unknown",
@@ -43101,18 +43119,19 @@ function getTrackedFilesForKit(metadata, kitType) {
 }
 function getInstalledKits(metadata) {
   if (metadata.kits) {
-    return Object.keys(metadata.kits);
+    const migrated = renameLegacyKitsKey(metadata);
+    return Object.keys(migrated.kits ?? {}).filter(isValidKitType);
   }
   const nameToCheck = metadata.name || "";
   const kits = [];
   if (/\bengineer\b/i.test(nameToCheck)) {
-    kits.push("engineer");
+    kits.push("core");
   }
   if (kits.length > 0) {
     return kits;
   }
   if (metadata.version) {
-    return ["engineer"];
+    return ["core"];
   }
   return [];
 }
@@ -43130,7 +43149,7 @@ async function readManifest(providerRoot) {
   try {
     const content = await import_fs_extra5.readFile(resolved.path, "utf-8");
     const parsed = JSON.parse(content);
-    return MetadataSchema.parse(parsed);
+    return renameLegacyKitsKey(MetadataSchema.parse(parsed));
   } catch (error) {
     logger.debug(`Failed to read manifest: ${error}`);
     return null;
@@ -43557,7 +43576,7 @@ async function reconcileCoexistingLegacy(legacyPath, canonicalPath) {
 async function writeManifest(providerRoot, kitName, version3, scope, kitType, trackedFiles, userConfigFiles) {
   await migrateLegacyManifestFilename(providerRoot);
   const metadataPath = getManifestPath(providerRoot);
-  const kit = kitType || "engineer";
+  const kit = kitType || "core";
   await import_fs_extra6.ensureFile(metadataPath);
   let release = null;
   try {
@@ -43576,7 +43595,7 @@ async function writeManifest(providerRoot, kitName, version3, scope, kitType, tr
         const content = await import_fs_extra6.readFile(metadataPath, "utf-8");
         const parsed = JSON.parse(content);
         if (parsed && typeof parsed === "object" && Object.keys(parsed).length > 0) {
-          existingMetadata = parsed;
+          existingMetadata = renameLegacyKitsKey(parsed);
         }
       } catch (error) {
         logger.debug(`Could not read existing metadata: ${error}`);
@@ -47692,7 +47711,7 @@ function logCleanupSummary(deletedCount, preservedCount, dryRun, results) {
 
 // src/services/transformers/commands-prefix/prefix-cleaner.ts
 var KIT_PREFIX_MAP = {
-  tkm: "engineer"
+  tkm: "core"
 };
 function createKitSpecificMetadata(metadata, kitType) {
   if (metadata.kits?.[kitType]) {
@@ -49887,7 +49906,7 @@ var claudeCodeInstaller = {
 import { existsSync as existsSync31 } from "node:fs";
 import { rm as rm6 } from "node:fs/promises";
 import { homedir as homedir21 } from "node:os";
-import { join as join66 } from "node:path";
+import { join as join68 } from "node:path";
 
 // src/commands/portable/provider-registry.ts
 import { existsSync as existsSync16, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
@@ -50666,7 +50685,7 @@ init_takumi_constants();
 init_dist2();
 
 // src/domains/installers/codex/install-pipeline.ts
-import { basename as basename8 } from "node:path";
+import { basename as basename9 } from "node:path";
 
 // src/commands/portable/conflict-resolver.ts
 init_dist2();
@@ -51796,9 +51815,32 @@ function buildPlan(actions) {
   };
 }
 
+// src/domains/installers/codex/codex-env-marker.ts
+import { mkdirSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join49 } from "node:path";
+init_logger();
+var CODEX_ENV_MARKER = `module.exports = { agent: 'codex' };
+`;
+function writeCodexEnvMarker(global3) {
+  try {
+    const pathConfig = providers.codex.hooks;
+    if (!pathConfig)
+      return;
+    const scopedPath = global3 ? pathConfig.globalPath : pathConfig.projectPath;
+    if (!scopedPath)
+      return;
+    const targetHooksDir = global3 ? scopedPath : join49(process.cwd(), scopedPath);
+    const libDir = join49(targetHooksDir, "lib");
+    mkdirSync(libDir, { recursive: true });
+    writeFileSync2(join49(libDir, "env.cjs"), CODEX_ENV_MARKER);
+  } catch (e2) {
+    logger.debug(`[init/codex] writeCodexEnvMarker failed: ${String(e2)}`);
+  }
+}
+
 // src/domains/installers/shared/writers/install-one-file.ts
 import { writeFile as writeFile18 } from "node:fs/promises";
-import { dirname as dirname11, join as join50, resolve as resolve7, sep as sep4 } from "node:path";
+import { dirname as dirname11, join as join51, resolve as resolve7, sep as sep4 } from "node:path";
 
 // src/commands/portable/converters/codex-command-skill-path.ts
 var COMMAND_SKILL_PREFIX = "source-command";
@@ -52711,7 +52753,7 @@ var import_proper_lockfile4 = __toESM(require_proper_lockfile(), 1);
 import { existsSync as existsSync19 } from "node:fs";
 import { mkdir as mkdir13, readFile as readFile21, unlink as unlink4, writeFile as writeFile17 } from "node:fs/promises";
 import { homedir as homedir11 } from "node:os";
-import { basename as basename3, dirname as dirname10, join as join49, resolve as resolve6, sep as sep3 } from "node:path";
+import { basename as basename3, dirname as dirname10, join as join50, resolve as resolve6, sep as sep3 } from "node:path";
 function isSamePath(path1, path22) {
   try {
     return resolve6(path1) === resolve6(path22);
@@ -52814,7 +52856,7 @@ async function ensureDir2(filePath) {
 }
 function getMergeTargetLockPath(targetPath) {
   const lockName = `.${basename3(targetPath)}.sk-merge.lock`;
-  return join49(dirname10(targetPath), lockName);
+  return join50(dirname10(targetPath), lockName);
 }
 async function withMergeTargetLock(targetPath, operation) {
   const resolvedTargetPath = resolve6(targetPath);
@@ -52923,7 +52965,7 @@ async function installOneFile(item, provider, kind, options2) {
       const nameWithoutExt = extIdx >= 0 ? resolvedFilename.substring(0, extIdx) : resolvedFilename;
       resolvedFilename = `${nameWithoutExt.replace(/\//g, "-")}${ext2}`;
     }
-    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join50(basePath, resolvedFilename);
+    targetPath = pathConfig.writeStrategy === "single-file" ? basePath : join51(basePath, resolvedFilename);
     const resolvedTarget = resolve7(targetPath);
     const resolvedBase = pathConfig.writeStrategy === "single-file" ? resolve7(dirname11(basePath)) : resolve7(basePath);
     if (!resolvedTarget.startsWith(resolvedBase + sep4) && resolvedTarget !== resolvedBase) {
@@ -53476,7 +53518,7 @@ ${sections.join(`
 import { existsSync as existsSync21 } from "node:fs";
 import { mkdir as mkdir14, readFile as readFile23, realpath, unlink as unlink5, writeFile as writeFile20 } from "node:fs/promises";
 import { homedir as homedir12 } from "node:os";
-import { basename as basename4, dirname as dirname12, isAbsolute, join as join51, relative as relative10, resolve as resolve8 } from "node:path";
+import { basename as basename4, dirname as dirname12, isAbsolute, join as join52, relative as relative10, resolve as resolve8 } from "node:path";
 init_logger();
 var import_proper_lockfile5 = __toESM(require_proper_lockfile(), 1);
 var SENTINEL_START = "# --- tkm-managed-agents-start ---";
@@ -53674,7 +53716,7 @@ function mergeConfigTomlWithDiagnostics(existing, managedBlock) {
   };
 }
 function getCodexLockPath(configTomlPath) {
-  return join51(dirname12(configTomlPath), `.${basename4(configTomlPath)}.tkm-codex.lock`);
+  return join52(dirname12(configTomlPath), `.${basename4(configTomlPath)}.tkm-codex.lock`);
 }
 async function withCodexTargetLock(configTomlPath, operation) {
   const resolvedTargetPath = resolve8(configTomlPath);
@@ -53757,7 +53799,7 @@ async function installCodexToml(items, provider, kind, options2, deps) {
   }
   const boundary = options2.global ? homedir12() : process.cwd();
   const agentsDir = resolve8(basePath);
-  const configTomlPath = join51(dirname12(agentsDir), "config.toml");
+  const configTomlPath = join52(dirname12(agentsDir), "config.toml");
   if (!isPathWithinBoundary2(agentsDir, boundary)) {
     return {
       provider,
@@ -53848,7 +53890,7 @@ async function installCodexToml(items, provider, kind, options2, deps) {
             continue;
           }
           seenSlugOwners.set(slug, item.name);
-          const agentTomlPath = join51(agentsDir, `${slug}.toml`);
+          const agentTomlPath = join52(agentsDir, `${slug}.toml`);
           if (process.platform === "win32" && agentTomlPath.length > MAX_WINDOWS_PATH_LENGTH) {
             allWarnings.push(`Skipped ${item.name}: target path exceeds ${MAX_WINDOWS_PATH_LENGTH} characters on Windows`);
             continue;
@@ -53973,7 +54015,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
   if (!basePath)
     return [];
   const agentsDir = resolve8(basePath);
-  const configTomlPath = join51(dirname12(agentsDir), "config.toml");
+  const configTomlPath = join52(dirname12(agentsDir), "config.toml");
   if (!existsSync21(configTomlPath))
     return [];
   try {
@@ -53984,7 +54026,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
       if (managedEntries.size > 0) {
         const validEntries = new Map;
         for (const [slug, entry] of managedEntries) {
-          const tomlPath = join51(agentsDir, `${slug}.toml`);
+          const tomlPath = join52(agentsDir, `${slug}.toml`);
           if (existsSync21(tomlPath)) {
             validEntries.set(slug, entry);
           } else {
@@ -54013,7 +54055,7 @@ async function cleanupStaleCodexConfigEntries(options2) {
       const unmanagedSlugs = extractUnmanagedAgentSlugs(analysis.unmanagedContent);
       const legacyStaleSlugs = [];
       for (const slug of unmanagedSlugs) {
-        const tomlPath = join51(agentsDir, `${slug}.toml`);
+        const tomlPath = join52(agentsDir, `${slug}.toml`);
         if (!isPathWithinBoundary2(tomlPath, agentsDir))
           continue;
         if (!existsSync21(tomlPath)) {
@@ -54090,7 +54132,7 @@ function installCodexHooksItems(items, options2) {
 // src/domains/installers/shared/skill-directory-installer.ts
 import { existsSync as existsSync22 } from "node:fs";
 import { cp as cp3, mkdir as mkdir15, rename as rename5, rm as rm5 } from "node:fs/promises";
-import { join as join52, resolve as resolve9 } from "node:path";
+import { join as join53, resolve as resolve9 } from "node:path";
 async function installSkillDirectories(skills, targetProviders, options2) {
   const results = [];
   for (const provider of targetProviders) {
@@ -54118,7 +54160,7 @@ async function installSkillDirectories(skills, targetProviders, options2) {
       continue;
     }
     for (const skill of skills) {
-      const targetDir = join52(basePath, skill.name);
+      const targetDir = join53(basePath, skill.name);
       if (resolve9(skill.path) === resolve9(targetDir)) {
         results.push({
           provider,
@@ -54280,8 +54322,8 @@ function displayMultiInstallerSummary(results) {
 }
 
 // src/domains/installers/codex/post-pipeline.ts
-import { cpSync, existsSync as existsSync26, readdirSync as readdirSync3 } from "node:fs";
-import { basename as basename7, dirname as dirname17, join as join57 } from "node:path";
+import { cpSync, existsSync as existsSync26, readFileSync as readFileSync7, readdirSync as readdirSync3, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { basename as basename8, dirname as dirname17, join as join59 } from "node:path";
 
 // src/commands/portable/reconcile-registry-backfill.ts
 function shouldBackfillRegistry(action) {
@@ -54308,7 +54350,7 @@ init_logger();
 
 // src/domains/installers/codex/hooks-merger.ts
 import { homedir as homedir15 } from "node:os";
-import { basename as basename6, extname as extname3, isAbsolute as isAbsolute2, join as join56, resolve as resolve13 } from "node:path";
+import { basename as basename6, extname as extname3, isAbsolute as isAbsolute2, join as join57, resolve as resolve13 } from "node:path";
 
 // src/commands/portable/hook-migration-compatibility.ts
 import path6 from "node:path";
@@ -54427,9 +54469,9 @@ function dedupeWarnings(warnings) {
 }
 
 // src/commands/portable/hooks-settings-merger.ts
-import { existsSync as existsSync23, mkdirSync, renameSync, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync23, mkdirSync as mkdirSync2, renameSync, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "node:fs";
 import { readFile as readFile24 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname13, join as join53 } from "node:path";
+import { basename as basename5, dirname as dirname13, join as join54 } from "node:path";
 async function inspectHooksSettings(settingsPath) {
   try {
     if (!existsSync23(settingsPath)) {
@@ -54463,7 +54505,7 @@ async function mergeHooksIntoSettings(targetSettingsPath, newHooks) {
     const timestamp = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
     backupPath = `${targetSettingsPath}.${timestamp}.bak`;
     try {
-      writeFileSync2(backupPath, raw);
+      writeFileSync3(backupPath, raw);
     } catch {
       backupPath = null;
     }
@@ -54472,10 +54514,10 @@ async function mergeHooksIntoSettings(targetSettingsPath, newHooks) {
   const merged = deduplicateMerge(existingHooks, newHooks);
   existingSettings.hooks = merged;
   const dir = dirname13(targetSettingsPath);
-  mkdirSync(dir, { recursive: true });
+  mkdirSync2(dir, { recursive: true });
   const tempPath = `${targetSettingsPath}.tmp`;
   try {
-    writeFileSync2(tempPath, JSON.stringify(existingSettings, null, 2));
+    writeFileSync3(tempPath, JSON.stringify(existingSettings, null, 2));
     renameSync(tempPath, targetSettingsPath);
   } catch (err) {
     rmSync2(tempPath, { force: true });
@@ -54769,7 +54811,7 @@ var import_proper_lockfile6 = __toESM(require_proper_lockfile(), 1);
 import { existsSync as existsSync24 } from "node:fs";
 import { mkdir as mkdir16, realpath as realpath2 } from "node:fs/promises";
 import { homedir as homedir14 } from "node:os";
-import { dirname as dirname14, join as join54, resolve as resolve10, sep as sep5 } from "node:path";
+import { dirname as dirname14, join as join55, resolve as resolve10, sep as sep5 } from "node:path";
 function isPathWithinBoundary3(targetPath, boundaryPath) {
   const resolvedTarget = resolve10(targetPath);
   const resolvedBoundary = resolve10(boundaryPath);
@@ -54788,7 +54830,7 @@ async function isCanonicalPathWithinBoundary2(targetPath, boundaryPath) {
   return isPathWithinBoundary3(canonicalTarget, canonicalBoundary);
 }
 function getCodexLockPath2(targetFilePath) {
-  return join54(dirname14(resolve10(targetFilePath)), ".config.toml.tkm-codex.lock");
+  return join55(dirname14(resolve10(targetFilePath)), ".config.toml.tkm-codex.lock");
 }
 async function withCodexTargetLock2(targetFilePath, operation) {
   const resolvedTargetPath = resolve10(targetFilePath);
@@ -54815,7 +54857,7 @@ async function withCodexTargetLock2(targetFilePath, operation) {
   }
 }
 function getCodexGlobalBoundary() {
-  return join54(homedir14(), ".codex");
+  return join55(homedir14(), ".codex");
 }
 
 // src/domains/installers/codex/features-flag.ts
@@ -54986,8 +55028,8 @@ async function atomicWrite(filePath, content) {
 
 // src/domains/installers/codex/hook-wrapper.ts
 import { createHash as createHash7 } from "node:crypto";
-import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname16, join as join55, resolve as resolve12 } from "node:path";
+import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { dirname as dirname16, join as join56, resolve as resolve12 } from "node:path";
 function wrapperFilename(originalPath) {
   const abs = resolve12(originalPath);
   const hash = createHash7("sha256").update(abs).digest("hex").slice(0, 8);
@@ -54999,7 +55041,7 @@ function generateCodexHookWrappers(originalPaths, wrapperDir, capabilities, time
   const resolvedWrapperDir = resolve12(wrapperDir);
   for (const originalPath of originalPaths) {
     const filename = wrapperFilename(originalPath);
-    const wrapperPath = join55(resolvedWrapperDir, filename);
+    const wrapperPath = join56(resolvedWrapperDir, filename);
     if (!isPathWithinBoundary3(wrapperPath, resolvedWrapperDir)) {
       results.push({
         wrapperPath,
@@ -55010,11 +55052,11 @@ function generateCodexHookWrappers(originalPaths, wrapperDir, capabilities, time
       continue;
     }
     try {
-      mkdirSync2(dirname16(wrapperPath), { recursive: true });
+      mkdirSync3(dirname16(wrapperPath), { recursive: true });
       const resolvedPath = resolve12(originalPath);
       const hookTimeoutMs = timeoutsByPath?.[resolvedPath] ?? timeoutsByPath?.[originalPath];
       const content = buildWrapperScript(originalPath, capabilities, hookTimeoutMs);
-      writeFileSync3(wrapperPath, content, { mode: 493 });
+      writeFileSync4(wrapperPath, content, { mode: 493 });
       results.push({ wrapperPath, originalPath, success: true });
     } catch (err) {
       results.push({
@@ -55253,8 +55295,8 @@ async function migrateCodexHooksSettings(options2) {
       codexCapabilitiesVersion: capabilities.version
     };
   }
-  const resolvedSourcePath = sourceSettingsPathOverride ? sourceSettingsPathOverride : isGlobal ? sourceSettingsPath : join56(process.cwd(), sourceSettingsPath);
-  const resolvedTargetPath = isGlobal ? targetSettingsPath : join56(process.cwd(), targetSettingsPath);
+  const resolvedSourcePath = sourceSettingsPathOverride ? sourceSettingsPathOverride : isGlobal ? sourceSettingsPath : join57(process.cwd(), sourceSettingsPath);
+  const resolvedTargetPath = isGlobal ? targetSettingsPath : join57(process.cwd(), targetSettingsPath);
   const sourceHooksResult = await inspectHooksSettings(resolvedSourcePath);
   if (sourceHooksResult.status === "missing-file") {
     return {
@@ -55303,7 +55345,7 @@ async function migrateCodexHooksSettings(options2) {
   if (targetHooksDir) {
     const absSourceHooksDir = sourceHooksDir ? isAbsolute2(sourceHooksDir) ? sourceHooksDir : resolve13(sourceHooksDir) : "";
     const absTargetHooksDir = isAbsolute2(targetHooksDir) ? targetHooksDir : resolve13(targetHooksDir);
-    const targetAbsolutePaths = installedHookAbsolutePaths && installedHookAbsolutePaths.length > 0 ? installedHookAbsolutePaths.filter(isCodexWrappableHookPath) : installedHookFiles.filter(isCodexWrappableHookPath).map((basenameOrPath) => basenameOrPath.includes("/") || basenameOrPath.includes("\\") ? basenameOrPath : join56(absTargetHooksDir, basenameOrPath));
+    const targetAbsolutePaths = installedHookAbsolutePaths && installedHookAbsolutePaths.length > 0 ? installedHookAbsolutePaths.filter(isCodexWrappableHookPath) : installedHookFiles.filter(isCodexWrappableHookPath).map((basenameOrPath) => basenameOrPath.includes("/") || basenameOrPath.includes("\\") ? basenameOrPath : join57(absTargetHooksDir, basenameOrPath));
     const wrapperResults = generateCodexHookWrappers(targetAbsolutePaths, absTargetHooksDir, capabilities);
     for (const wr of wrapperResults) {
       if (!wr.success)
@@ -55312,13 +55354,13 @@ async function migrateCodexHooksSettings(options2) {
       const base = basename6(wr.originalPath);
       const addKey = (p) => commandSubstitutions.set(p, wr.wrapperPath);
       addKey(wr.originalPath);
-      addKey(join56(absTargetHooksDir, base));
+      addKey(join57(absTargetHooksDir, base));
       if (targetHooksDir !== absTargetHooksDir)
-        addKey(join56(targetHooksDir, base));
+        addKey(join57(targetHooksDir, base));
       if (absSourceHooksDir) {
-        addKey(join56(absSourceHooksDir, base));
+        addKey(join57(absSourceHooksDir, base));
         if (sourceHooksDir !== absSourceHooksDir)
-          addKey(join56(sourceHooksDir, base));
+          addKey(join57(sourceHooksDir, base));
       }
     }
   }
@@ -55364,7 +55406,7 @@ async function migrateCodexHooksSettings(options2) {
   }
   let featureFlagWritten = false;
   if (capabilities.requiresFeatureFlag) {
-    const configTomlPath = isGlobal ? join56(homedir15(), ".codex", "config.toml") : join56(process.cwd(), ".codex", "config.toml");
+    const configTomlPath = isGlobal ? join57(homedir15(), ".codex", "config.toml") : join57(process.cwd(), ".codex", "config.toml");
     const flagResult = await ensureCodexHooksFeatureFlag(configTomlPath, isGlobal);
     featureFlagWritten = flagResult.status === "written" || flagResult.status === "updated";
   }
@@ -55382,6 +55424,101 @@ async function migrateCodexHooksSettings(options2) {
   };
 }
 
+// src/domains/installers/codex/prune-deleted-hooks.ts
+import { basename as basename7, join as join58, resolve as resolve14 } from "node:path";
+var WRAPPER_HASH_PREFIX = /^[0-9a-f]{8}-/;
+function deletionsToBasenames(deletions) {
+  const out = [];
+  for (const entry of deletions) {
+    if (!entry || typeof entry !== "string")
+      continue;
+    if (!entry.startsWith("hooks/"))
+      continue;
+    if (entry.includes("*"))
+      continue;
+    const base = basename7(entry);
+    if (base.endsWith(".cjs"))
+      out.push(base);
+  }
+  return out;
+}
+function commandReferencesBasename(command, base) {
+  const segments = command.split(/[\s"'`]+/).filter(Boolean);
+  for (const tok of segments) {
+    const tokBase = basename7(tok);
+    if (tokBase === base)
+      return true;
+    if (tokBase.endsWith(base) && tokBase.length === base.length + 9 && WRAPPER_HASH_PREFIX.test(tokBase) && tokBase.slice(9) === base) {
+      return true;
+    }
+  }
+  return false;
+}
+function pruneDeletedHooks(userHooksJson, deletions, wrapperDir) {
+  const basenames = deletionsToBasenames(deletions);
+  const removedWrapperPaths = [];
+  let prunedRegistrationCount = 0;
+  if (!userHooksJson || typeof userHooksJson !== "object") {
+    return {
+      prunedJson: userHooksJson ?? {},
+      removedWrapperPaths: [],
+      prunedRegistrationCount: 0
+    };
+  }
+  if (basenames.length === 0) {
+    return {
+      prunedJson: userHooksJson,
+      removedWrapperPaths: [],
+      prunedRegistrationCount: 0
+    };
+  }
+  const resolvedWrapperDir = resolve14(wrapperDir);
+  const cloned = JSON.parse(JSON.stringify(userHooksJson));
+  const hooks = cloned.hooks ?? {};
+  for (const eventName of Object.keys(hooks)) {
+    const groups = hooks[eventName] ?? [];
+    const survivingGroups = [];
+    for (const group of groups) {
+      const entries = group.hooks ?? [];
+      const survivingEntries = [];
+      for (const entry of entries) {
+        const cmd = typeof entry.command === "string" ? entry.command : "";
+        const matchedBase = basenames.find((b3) => commandReferencesBasename(cmd, b3));
+        if (matchedBase) {
+          prunedRegistrationCount += 1;
+          const tokens = cmd.split(/[\s"'`]+/).filter(Boolean);
+          for (const tok of tokens) {
+            const tokBase = basename7(tok);
+            if (tokBase === matchedBase || tokBase.endsWith(`-${matchedBase}`)) {
+              const candidate = resolve14(join58(resolvedWrapperDir, tokBase));
+              if (isPathWithinBoundary3(candidate, resolvedWrapperDir)) {
+                removedWrapperPaths.push(candidate);
+              }
+            }
+          }
+        } else {
+          survivingEntries.push(entry);
+        }
+      }
+      if (survivingEntries.length > 0) {
+        survivingGroups.push({ ...group, hooks: survivingEntries });
+      }
+    }
+    if (survivingGroups.length > 0) {
+      hooks[eventName] = survivingGroups;
+    } else {
+      delete hooks[eventName];
+    }
+  }
+  cloned.hooks = hooks;
+  const uniqueWrappers = Array.from(new Set(removedWrapperPaths));
+  return {
+    prunedJson: cloned,
+    removedWrapperPaths: uniqueWrappers,
+    prunedRegistrationCount
+  };
+}
+
 // src/domains/installers/codex/post-pipeline.ts
 var HOOK_SUPPORT_SKIP_DIRS = new Set(["__tests__", "tests", "docs"]);
 function installCodexHookSupportDirs(hookItems, global3) {
@@ -55396,12 +55533,12 @@ function installCodexHookSupportDirs(hookItems, global3) {
     const scopedPath = global3 ? pathConfig.globalPath : pathConfig.projectPath;
     if (!scopedPath)
       return;
-    const targetHooksDir = global3 ? scopedPath : join57(process.cwd(), scopedPath);
+    const targetHooksDir = global3 ? scopedPath : join59(process.cwd(), scopedPath);
     for (const entry of readdirSync3(sourceHooksDir, { withFileTypes: true })) {
       if (!entry.isDirectory() || HOOK_SUPPORT_SKIP_DIRS.has(entry.name))
         continue;
-      const src = join57(sourceHooksDir, entry.name);
-      const dest = join57(targetHooksDir, entry.name);
+      const src = join59(sourceHooksDir, entry.name);
+      const dest = join59(targetHooksDir, entry.name);
       if (!existsSync26(dest)) {
         cpSync(src, dest, { recursive: true });
       } else {
@@ -55433,7 +55570,7 @@ function deriveKitHookSource(items) {
   if (!kitConfigRoot)
     return;
   return {
-    settingsPath: join57(kitConfigRoot, "settings.json"),
+    settingsPath: join59(kitConfigRoot, "settings.json"),
     hooksDir: ".claude/hooks"
   };
 }
@@ -55442,7 +55579,7 @@ async function cleanupStaleCodexToml(global3) {
     const staleSlugs = await cleanupStaleCodexConfigEntries({ global: global3, provider: "codex" });
     if (staleSlugs.length > 0) {
       const staleSet = new Set(staleSlugs.map((s) => `${s}.toml`));
-      await removeInstallationsByFilter((i) => i.type === "agent" && i.provider === "codex" && i.global === global3 && staleSet.has(basename7(i.path)));
+      await removeInstallationsByFilter((i) => i.type === "agent" && i.provider === "codex" && i.global === global3 && staleSet.has(basename8(i.path)));
     }
   } catch (e2) {
     logger.debug(`[init/codex] codex-toml cleanup failed: ${String(e2)}`);
@@ -55455,6 +55592,47 @@ async function healRegistryChecksums(actions, registry) {
     logger.debug("[init/codex] backfill checksums failed");
   }
 }
+async function pruneCodexDeletedHooks(items, global3) {
+  try {
+    const kitRoot = items.agents[0]?.sourcePath?.split(/[/\\]agents[/\\]/)[0] ?? items.commands[0]?.sourcePath?.split(/[/\\]commands[/\\]/)[0] ?? items.hooks[0]?.sourcePath?.split(/[/\\]hooks[/\\]/)[0] ?? null;
+    if (!kitRoot)
+      return;
+    const metadataPath = join59(kitRoot, "metadata.json");
+    if (!existsSync26(metadataPath))
+      return;
+    const metadataRaw = readFileSync7(metadataPath, "utf-8");
+    const metadata = JSON.parse(metadataRaw);
+    const deletions = metadata.deletions ?? [];
+    if (deletions.length === 0)
+      return;
+    const codex = providers.codex;
+    const hooksJsonPath = global3 ? codex.settingsJsonPath?.globalPath : codex.settingsJsonPath?.projectPath ? join59(process.cwd(), codex.settingsJsonPath.projectPath) : null;
+    if (!hooksJsonPath || !existsSync26(hooksJsonPath))
+      return;
+    const wrapperDir = global3 ? codex.hooks?.globalPath : codex.hooks?.projectPath ? join59(process.cwd(), codex.hooks.projectPath) : null;
+    if (!wrapperDir)
+      return;
+    const userJson = JSON.parse(readFileSync7(hooksJsonPath, "utf-8"));
+    const { prunedJson, removedWrapperPaths, prunedRegistrationCount } = pruneDeletedHooks(userJson, deletions, wrapperDir);
+    if (prunedRegistrationCount === 0 && removedWrapperPaths.length === 0)
+      return;
+    if (prunedRegistrationCount > 0) {
+      writeFileSync5(hooksJsonPath, `${JSON.stringify(prunedJson, null, 2)}
+`);
+    }
+    for (const wrapperPath of removedWrapperPaths) {
+      try {
+        if (existsSync26(wrapperPath))
+          unlinkSync3(wrapperPath);
+      } catch (e2) {
+        logger.debug(`[init/codex] failed to unlink wrapper ${wrapperPath}: ${String(e2)}`);
+      }
+    }
+    logger.debug(`[init/codex] pruned ${prunedRegistrationCount} stale hook registration(s) and ${removedWrapperPaths.length} wrapper file(s)`);
+  } catch (e2) {
+    logger.debug(`[init/codex] pruneCodexDeletedHooks failed: ${String(e2)}`);
+  }
+}
 async function bumpAppliedManifestVersion(items) {
   try {
     const kitRoot = items.agents[0]?.sourcePath?.split(/[/\\]agents[/\\]/)[0] ?? items.commands[0]?.sourcePath?.split(/[/\\]commands[/\\]/)[0] ?? null;
@@ -55651,12 +55829,12 @@ async function computeCodexTargetStates(global3) {
 import { existsSync as existsSync29 } from "node:fs";
 import { readFile as readFile27, readdir as readdir16 } from "node:fs/promises";
 import { homedir as homedir16 } from "node:os";
-import { extname as extname4, join as join59, relative as relative11, sep as sep6 } from "node:path";
+import { extname as extname4, join as join61, relative as relative11, sep as sep6 } from "node:path";
 
 // src/shared/kit-layout.ts
 init_types2();
-import { existsSync as existsSync28, readFileSync as readFileSync7 } from "node:fs";
-import { join as join58 } from "node:path";
+import { existsSync as existsSync28, readFileSync as readFileSync8 } from "node:fs";
+import { join as join60 } from "node:path";
 function uniquePaths(paths) {
   return [...new Set(paths)];
 }
@@ -55669,12 +55847,12 @@ function findFirstExistingPath(paths) {
   return null;
 }
 function resolveKitLayout(projectRoot) {
-  const packageJsonPath = join58(projectRoot, "package.json");
+  const packageJsonPath = join60(projectRoot, "package.json");
   if (!existsSync28(packageJsonPath)) {
     return DEFAULT_KIT_LAYOUT;
   }
   try {
-    const parsed = TakumiPackageMetadataSchema.parse(JSON.parse(readFileSync7(packageJsonPath, "utf8")));
+    const parsed = TakumiPackageMetadataSchema.parse(JSON.parse(readFileSync8(packageJsonPath, "utf8")));
     return KitLayoutSchema.parse({
       ...DEFAULT_KIT_LAYOUT,
       ...parsed.takumi ?? {}
@@ -55686,8 +55864,8 @@ function resolveKitLayout(projectRoot) {
 function getProjectLayoutCandidates(projectRoot, subPath) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join58(projectRoot, layout.sourceDir, subPath),
-    join58(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
+    join60(projectRoot, layout.sourceDir, subPath),
+    join60(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, subPath)
   ]);
 }
 function findExistingProjectLayoutPath(projectRoot, subPath) {
@@ -55696,9 +55874,9 @@ function findExistingProjectLayoutPath(projectRoot, subPath) {
 function getProjectConfigCandidates(projectRoot) {
   const layout = resolveKitLayout(projectRoot);
   return uniquePaths([
-    join58(projectRoot, "CLAUDE.md"),
-    join58(projectRoot, layout.sourceDir, "CLAUDE.md"),
-    join58(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
+    join60(projectRoot, "CLAUDE.md"),
+    join60(projectRoot, layout.sourceDir, "CLAUDE.md"),
+    join60(projectRoot, DEFAULT_KIT_LAYOUT.sourceDir, "CLAUDE.md")
   ]);
 }
 function findExistingProjectConfigPath(projectRoot) {
@@ -55712,13 +55890,13 @@ function getConfigSourcePath() {
   return findExistingProjectConfigPath(process.cwd()) ?? getGlobalConfigSourcePath();
 }
 function getGlobalConfigSourcePath() {
-  return join59(homedir16(), ".claude", "CLAUDE.md");
+  return join61(homedir16(), ".claude", "CLAUDE.md");
 }
 function getRulesSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? join59(homedir16(), ".claude", "rules");
+  return findExistingProjectLayoutPath(process.cwd(), "rules") ?? join61(homedir16(), ".claude", "rules");
 }
 function getHooksSourcePath() {
-  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? join59(homedir16(), ".claude", "hooks");
+  return findExistingProjectLayoutPath(process.cwd(), "hooks") ?? join61(homedir16(), ".claude", "hooks");
 }
 async function discoverConfig(sourcePath) {
   const path7 = sourcePath ?? getConfigSourcePath();
@@ -55770,7 +55948,7 @@ async function discoverHooks(sourcePath) {
     }
     if (!HOOK_EXTENSIONS.has(ext2))
       continue;
-    const fullPath = join59(path7, entry.name);
+    const fullPath = join61(path7, entry.name);
     try {
       const content = await readFile27(fullPath, "utf-8");
       items.push({
@@ -55796,7 +55974,7 @@ async function discoverPortableFiles(dir, baseDir, options2) {
   for (const entry of entries) {
     if (entry.name.startsWith("."))
       continue;
-    const fullPath = join59(dir, entry.name);
+    const fullPath = join61(dir, entry.name);
     if (entry.isSymbolicLink()) {
       continue;
     }
@@ -55834,7 +56012,7 @@ async function discoverPortableFiles(dir, baseDir, options2) {
 // src/domains/installers/shared/agents-discovery.ts
 import { readdir as readdir17 } from "node:fs/promises";
 import { homedir as homedir17 } from "node:os";
-import { join as join60 } from "node:path";
+import { join as join62 } from "node:path";
 
 // src/commands/portable/frontmatter-parser.ts
 init_logger();
@@ -55934,7 +56112,7 @@ var home3 = homedir17();
 function getAgentSourcePath() {
   return findFirstExistingPath([
     ...getProjectLayoutCandidates(process.cwd(), "agents"),
-    join60(home3, ".claude/agents")
+    join62(home3, ".claude/agents")
   ]);
 }
 async function discoverAgents(sourcePath) {
@@ -55947,7 +56125,7 @@ async function discoverAgents(sourcePath) {
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.endsWith(".md"))
         continue;
-      const filePath = join60(searchPath, entry.name);
+      const filePath = join62(searchPath, entry.name);
       try {
         const { frontmatter, body } = await parseFrontmatterFile(filePath);
         const name = entry.name.replace(/\.md$/, "");
@@ -55971,14 +56149,14 @@ async function discoverAgents(sourcePath) {
 // src/domains/installers/shared/commands-discovery.ts
 import { readdir as readdir18 } from "node:fs/promises";
 import { homedir as homedir18 } from "node:os";
-import { join as join61, relative as relative12 } from "node:path";
+import { join as join63, relative as relative12 } from "node:path";
 init_logger();
 var home4 = homedir18();
 var SKIP_DIRS = ["node_modules", ".git", "dist", "build"];
 function getCommandSourcePath() {
   return findFirstExistingPath([
     ...getProjectLayoutCandidates(process.cwd(), "commands"),
-    join61(home4, ".claude/commands")
+    join63(home4, ".claude/commands")
   ]);
 }
 async function scanCommandDir(dir, rootDir) {
@@ -55986,7 +56164,7 @@ async function scanCommandDir(dir, rootDir) {
   try {
     const entries = await readdir18(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join61(dir, entry.name);
+      const fullPath = join63(dir, entry.name);
       if (entry.isDirectory()) {
         if (SKIP_DIRS.includes(entry.name))
           continue;
@@ -56028,23 +56206,23 @@ async function discoverCommands(sourcePath) {
 // src/domains/installers/shared/skills-discovery.ts
 import { readFile as readFile29, readdir as readdir19, stat as stat6 } from "node:fs/promises";
 import { homedir as homedir19 } from "node:os";
-import { dirname as dirname18, join as join62 } from "node:path";
+import { dirname as dirname18, join as join64 } from "node:path";
 init_logger();
 var import_gray_matter4 = __toESM(require_gray_matter(), 1);
 var home5 = homedir19();
 var SKIP_DIRS2 = ["node_modules", ".git", "dist", "build", ".venv", "__pycache__", "common"];
 function getSkillSourcePath() {
-  const bundledRoot = join62(process.cwd(), "node_modules", "takumi-engineer");
+  const bundledRoot = join64(process.cwd(), "node_modules", "takumi-engineer");
   return findFirstExistingPath([
-    join62(bundledRoot, "skills"),
+    join64(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(bundledRoot, "skills"),
     ...getProjectLayoutCandidates(process.cwd(), "skills"),
-    join62(home5, ".claude/skills")
+    join64(home5, ".claude/skills")
   ]);
 }
 async function hasSkillMd(dir) {
   try {
-    const skillPath = join62(dir, "SKILL.md");
+    const skillPath = join64(dir, "SKILL.md");
     const stats = await stat6(skillPath);
     return stats.isFile();
   } catch {
@@ -56092,9 +56270,9 @@ async function discoverSkills(sourcePath) {
       if (!entry.isDirectory() || SKIP_DIRS2.includes(entry.name)) {
         continue;
       }
-      const skillDir = join62(searchPath, entry.name);
+      const skillDir = join64(searchPath, entry.name);
       if (await hasSkillMd(skillDir)) {
-        const skill = await parseSkillMd(join62(skillDir, "SKILL.md"));
+        const skill = await parseSkillMd(join64(skillDir, "SKILL.md"));
         if (skill && !seenNames.has(skill.name)) {
           skills.push(skill);
           seenNames.add(skill.name);
@@ -56236,7 +56414,7 @@ async function executeCodexPipeline(items, options2) {
     results.push(...installed);
     if (action.type === "hooks") {
       for (const r2 of installed.filter((r3) => r3.success && !r3.skipped)) {
-        successfulHookFiles.push(basename8(r2.path));
+        successfulHookFiles.push(basename9(r2.path));
       }
     }
   }
@@ -56249,7 +56427,9 @@ async function executeCodexPipeline(items, options2) {
   ui.phase("Finalizing post-install");
   if (items.hooks.length > 0) {
     installCodexHookSupportDirs(items.hooks, options2.global);
+    writeCodexEnvMarker(options2.global);
   }
+  await pruneCodexDeletedHooks(items, options2.global);
   await mergeInstalledHooks(successfulHookFiles, options2.global, deriveKitHookSource(items));
   await cleanupStaleCodexToml(options2.global);
   await healRegistryChecksums(plan.actions, registry);
@@ -56267,11 +56447,11 @@ async function executeCodexPipeline(items, options2) {
 
 // src/domains/installers/codex/scan-codex-directory.ts
 var import_fs_extra29 = __toESM(require_lib(), 1);
-import { join as join63 } from "node:path";
+import { join as join65 } from "node:path";
 
 // src/domains/installers/codex/skills-paths.ts
 import { homedir as homedir20 } from "node:os";
-import { resolve as resolve14 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 function getCodexSkillsTargetDir(global3) {
   const cfg = providers.codex.skills;
   if (!cfg) {
@@ -56281,7 +56461,7 @@ function getCodexSkillsTargetDir(global3) {
   if (!path7) {
     throw new Error(`[codex] no ${global3 ? "global" : "project"}-level skills path configured`);
   }
-  const resolved = resolve14(path7);
+  const resolved = resolve15(path7);
   const boundary = global3 ? homedir20() : process.cwd();
   if (!isPathWithinBoundary3(resolved, boundary)) {
     throw new Error(`[codex] resolved skills path "${resolved}" escapes boundary "${boundary}"`);
@@ -56297,11 +56477,11 @@ async function scanCodexDirectory(root, opts = {}) {
       return counts;
     const items = await import_fs_extra29.readdir(root);
     if (items.includes("agents")) {
-      const files = await import_fs_extra29.readdir(join63(root, "agents")).catch(() => []);
+      const files = await import_fs_extra29.readdir(join65(root, "agents")).catch(() => []);
       counts.agents = files.filter((f3) => f3.endsWith(".toml")).length;
     }
     if (items.includes("prompts")) {
-      const files = await import_fs_extra29.readdir(join63(root, "prompts")).catch(() => []);
+      const files = await import_fs_extra29.readdir(join65(root, "prompts")).catch(() => []);
       counts.commands = files.filter((f3) => f3.endsWith(".md")).length;
     }
     if (items.includes("AGENTS.md"))
@@ -56310,7 +56490,7 @@ async function scanCodexDirectory(root, opts = {}) {
     if (await import_fs_extra29.pathExists(skillsRoot)) {
       const dirs = await import_fs_extra29.readdir(skillsRoot).catch(() => []);
       for (const d3 of dirs) {
-        const skillDir = join63(skillsRoot, d3);
+        const skillDir = join65(skillsRoot, d3);
         const entries = await import_fs_extra29.readdir(skillDir).catch(() => null);
         if (entries?.includes("SKILL.md"))
           counts.skills++;
@@ -56322,7 +56502,7 @@ async function scanCodexDirectory(root, opts = {}) {
 
 // src/domains/installers/codex/source-resolver.ts
 import { existsSync as existsSync30 } from "node:fs";
-import { join as join64 } from "node:path";
+import { join as join66 } from "node:path";
 function resolveCodexSources(extractDir) {
   return {
     agents: findExistingProjectLayoutPath(extractDir, "agents"),
@@ -56334,7 +56514,7 @@ function resolveCodexSources(extractDir) {
   };
 }
 function resolveConfigSource(extractDir) {
-  const rootClaudeMd = join64(extractDir, "CLAUDE.md");
+  const rootClaudeMd = join66(extractDir, "CLAUDE.md");
   if (existsSync30(rootClaudeMd))
     return rootClaudeMd;
   return findExistingProjectConfigPath(extractDir);
@@ -56345,7 +56525,7 @@ function hasAnyCodexSource(sources) {
 
 // src/domains/installers/codex/manifest-helpers.ts
 var import_fs_extra30 = __toESM(require_lib(), 1);
-import { join as join65, relative as relative13, sep as sep7 } from "node:path";
+import { join as join67, relative as relative13, sep as sep7 } from "node:path";
 var codexOwnershipResolver = () => ({ ownership: "takumi" });
 async function collectCodexInstalledFiles(results, codexRoot) {
   const out = [];
@@ -56369,7 +56549,7 @@ async function collectCodexInstalledFiles(results, codexRoot) {
 async function walkDir(dir, root, out, toPosix) {
   const entries = await import_fs_extra30.readdir(dir, { withFileTypes: true }).catch(() => []);
   for (const e2 of entries) {
-    const p = join65(dir, e2.name);
+    const p = join67(dir, e2.name);
     if (e2.isDirectory()) {
       await walkDir(p, root, out, toPosix);
     } else if (e2.isFile()) {
@@ -56393,7 +56573,7 @@ async function writeCodexManifest(ctx, results, codexRoot, installGlobally) {
   });
   await trackFilesWithProgress(filesToTrack, {
     providerRoot: codexRoot,
-    kitName: ctx.kit?.name ?? "engineer",
+    kitName: ctx.kit?.name ?? "Core",
     releaseTag: installedVersion,
     mode: installGlobally ? "global" : "local",
     kitType: ctx.kitType
@@ -56406,20 +56586,20 @@ var codexInstaller = {
   globalRoot() {
     const testHome = process.env.TAKUMI_TEST_HOME;
     if (testHome && testHome.trim() !== "")
-      return join66(testHome, ".codex");
+      return join68(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 join66(xdg, "codex");
-    return join66(homedir21(), ".codex");
+      return join68(xdg, "codex");
+    return join68(homedir21(), ".codex");
   },
   isInstalledGlobally() {
     const root = this.globalRoot();
     if (!existsSync31(root))
       return false;
-    return findManifestPathSync(root) !== null || existsSync31(join66(root, "AGENTS.md")) || existsSync31(join66(root, "agents")) || existsSync31(join66(root, "config.toml")) || existsSync31(join66(root, "prompts"));
+    return findManifestPathSync(root) !== null || existsSync31(join68(root, "AGENTS.md")) || existsSync31(join68(root, "agents")) || existsSync31(join68(root, "config.toml")) || existsSync31(join68(root, "prompts"));
   },
   async detectGlobalSetup() {
     const root = this.globalRoot();
@@ -56531,7 +56711,7 @@ var codexInstaller = {
           error: errMsg
         };
       }
-      const codexRoot = installGlobally ? this.globalRoot() : join66(ctx.resolvedDir ?? process.cwd(), ".codex");
+      const codexRoot = installGlobally ? this.globalRoot() : join68(ctx.resolvedDir ?? process.cwd(), ".codex");
       await writeCodexManifest(ctx, results, codexRoot, installGlobally);
       return {
         provider: "codex",
@@ -56610,33 +56790,33 @@ async function scanTakumiDirectory(directoryPath) {
     }
     const items = await import_fs_extra31.readdir(directoryPath);
     if (items.includes("agents")) {
-      const agentsPath = join67(directoryPath, "agents");
+      const agentsPath = join69(directoryPath, "agents");
       const agentFiles = await import_fs_extra31.readdir(agentsPath);
       counts.agents = agentFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("commands")) {
-      const commandsPath = join67(directoryPath, "commands");
+      const commandsPath = join69(directoryPath, "commands");
       const commandFiles = await import_fs_extra31.readdir(commandsPath);
       counts.commands = commandFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("rules")) {
-      const rulesPath = join67(directoryPath, "rules");
+      const rulesPath = join69(directoryPath, "rules");
       const ruleFiles = await import_fs_extra31.readdir(rulesPath);
       counts.rules = ruleFiles.filter((file) => file.endsWith(".md")).length;
     } else if (items.includes("workflows")) {
-      const workflowsPath = join67(directoryPath, "workflows");
+      const workflowsPath = join69(directoryPath, "workflows");
       const workflowFiles = await import_fs_extra31.readdir(workflowsPath);
       counts.rules = workflowFiles.filter((file) => file.endsWith(".md")).length;
     }
     if (items.includes("skills")) {
-      const skillsPath = join67(directoryPath, "skills");
+      const skillsPath = join69(directoryPath, "skills");
       const skillItems = await import_fs_extra31.readdir(skillsPath);
       let skillCount = 0;
       for (const item of skillItems) {
         if (SKIP_DIRS_CLAUDE_INTERNAL.includes(item)) {
           continue;
         }
-        const itemPath = join67(skillsPath, item);
+        const itemPath = join69(skillsPath, item);
         const stat8 = await import_fs_extra31.readdir(itemPath).catch(() => null);
         if (stat8?.includes("SKILL.md")) {
           skillCount++;
@@ -56949,7 +57129,7 @@ init_takumi_constants();
 import { existsSync as existsSync32, realpathSync } from "node:fs";
 import { chmod as chmod2, mkdir as mkdir17, readFile as readFile31, writeFile as writeFile22 } from "node:fs/promises";
 import { platform as platform5 } from "node:os";
-import { join as join68 } from "node:path";
+import { join as join70 } from "node:path";
 var CACHE_FILE = "install-info.json";
 var CACHE_TTL = 30 * 24 * 60 * 60 * 1000;
 function detectFromBinaryPath() {
@@ -57033,7 +57213,7 @@ function detectFromEnv() {
 }
 async function readCachedPm() {
   try {
-    const cacheFile = join68(PathResolver.getConfigDir(false), CACHE_FILE);
+    const cacheFile = join70(PathResolver.getConfigDir(false), CACHE_FILE);
     if (!existsSync32(cacheFile)) {
       return null;
     }
@@ -57064,7 +57244,7 @@ async function saveCachedPm(pm, getVersion) {
     return;
   try {
     const configDir = PathResolver.getConfigDir(false);
-    const cacheFile = join68(configDir, CACHE_FILE);
+    const cacheFile = join70(configDir, CACHE_FILE);
     if (!existsSync32(configDir)) {
       await mkdir17(configDir, { recursive: true });
       if (platform5() !== "win32") {
@@ -57127,7 +57307,7 @@ async function findOwningPm() {
 async function clearCache() {
   try {
     const { unlink: unlink7 } = await import("node:fs/promises");
-    const cacheFile = join68(PathResolver.getConfigDir(false), CACHE_FILE);
+    const cacheFile = join70(PathResolver.getConfigDir(false), CACHE_FILE);
     if (existsSync32(cacheFile)) {
       await unlink7(cacheFile);
       logger.debug("Package manager cache cleared");
@@ -57387,17 +57567,17 @@ async function checkCliVersion() {
 }
 // src/domains/health-checks/checkers/claude-md-checker.ts
 import { existsSync as existsSync33, statSync as statSync3 } from "node:fs";
-import { join as join69 } from "node:path";
+import { join as join71 } 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 = join69(globalPath, "CLAUDE.md");
+    const globalClaudeMd = join71(globalPath, "CLAUDE.md");
     results.push(checkClaudeMdFile(globalClaudeMd, "Global CLAUDE.md", "sk-global-claude-md"));
   }
-  const projectClaudeMd = join69(getLocalClaudeDir(projectDir), "CLAUDE.md");
+  const projectClaudeMd = join71(getLocalClaudeDir(projectDir), "CLAUDE.md");
   results.push(checkClaudeMdFile(projectClaudeMd, "Project CLAUDE.md", "sk-project-claude-md"));
   return results;
 }
@@ -57455,10 +57635,10 @@ function checkClaudeMdFile(path7, name, id) {
   }
 }
 // src/domains/health-checks/checkers/active-plan-checker.ts
-import { existsSync as existsSync34, readFileSync as readFileSync8 } from "node:fs";
-import { join as join70 } from "node:path";
+import { existsSync as existsSync34, readFileSync as readFileSync9 } from "node:fs";
+import { join as join72 } from "node:path";
 function checkActivePlan(projectDir) {
-  const activePlanPath = join70(projectDir, ".claude", "active-plan");
+  const activePlanPath = join72(projectDir, ".claude", "active-plan");
   if (!existsSync34(activePlanPath)) {
     return {
       id: "sk-active-plan",
@@ -57471,8 +57651,8 @@ function checkActivePlan(projectDir) {
     };
   }
   try {
-    const targetPath = readFileSync8(activePlanPath, "utf-8").trim();
-    const fullPath = join70(projectDir, targetPath);
+    const targetPath = readFileSync9(activePlanPath, "utf-8").trim();
+    const fullPath = join72(projectDir, targetPath);
     if (!existsSync34(fullPath)) {
       return {
         id: "sk-active-plan",
@@ -57530,13 +57710,13 @@ function checkComponentCounts(setup) {
     priority: "standard",
     status: totalComponents > 0 ? "info" : "warn",
     message: totalComponents > 0 ? `${totalAgents} agents, ${totalCommands} commands, ${totalRules} rules, ${totalSkills} skills` : "No components found",
-    suggestion: totalComponents === 0 ? "Install Takumi: takumi new --kit engineer" : undefined,
+    suggestion: totalComponents === 0 ? "Install Takumi: takumi new --kit core" : undefined,
     autoFixable: false
   };
 }
 // src/domains/health-checks/checkers/permissions-checker.ts
 import { constants, access, unlink as unlink7, writeFile as writeFile23 } from "node:fs/promises";
-import { join as join71 } from "node:path";
+import { join as join73 } from "node:path";
 init_logger();
 
 // src/domains/health-checks/checkers/shared.ts
@@ -57611,7 +57791,7 @@ async function checkGlobalDirWritable(provider) {
   }
   const timestamp = Date.now();
   const random = Math.random().toString(36).substring(2);
-  const testFile = join71(globalDir, `.sk-write-test-${timestamp}-${random}`);
+  const testFile = join73(globalDir, `.sk-write-test-${timestamp}-${random}`);
   try {
     await writeFile23(testFile, "test", { encoding: "utf-8", flag: "wx" });
   } catch (_error) {
@@ -57646,7 +57826,7 @@ async function checkGlobalDirWritable(provider) {
 // src/domains/health-checks/checkers/hooks-checker.ts
 import { existsSync as existsSync35 } from "node:fs";
 import { readdir as readdir23 } from "node:fs/promises";
-import { join as join72 } from "node:path";
+import { join as join74 } from "node:path";
 
 // src/domains/health-checks/utils/path-normalizer.ts
 import { normalize as normalize5 } from "node:path";
@@ -57658,8 +57838,8 @@ function normalizePath(filePath) {
 
 // src/domains/health-checks/checkers/hooks-checker.ts
 async function checkHooksExist(projectDir) {
-  const globalHooksDir = join72(getInstaller("claude-code")?.globalRoot() ?? "", "hooks");
-  const projectHooksDir = join72(getLocalClaudeDir(projectDir), "hooks");
+  const globalHooksDir = join74(getInstaller("claude-code")?.globalRoot() ?? "", "hooks");
+  const projectHooksDir = join74(getLocalClaudeDir(projectDir), "hooks");
   const globalExists = existsSync35(globalHooksDir);
   const projectExists = existsSync35(projectHooksDir);
   let hookCount = 0;
@@ -57668,7 +57848,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir23(globalHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext2) => f3.endsWith(ext2)));
     hooks.forEach((hook) => {
-      const fullPath = join72(globalHooksDir, hook);
+      const fullPath = join74(globalHooksDir, hook);
       checkedFiles.add(normalizePath(fullPath));
     });
   }
@@ -57678,7 +57858,7 @@ async function checkHooksExist(projectDir) {
     const files = await readdir23(projectHooksDir, { withFileTypes: false });
     const hooks = files.filter((f3) => HOOK_EXTENSIONS2.some((ext2) => f3.endsWith(ext2)));
     hooks.forEach((hook) => {
-      const fullPath = join72(projectHooksDir, hook);
+      const fullPath = join74(projectHooksDir, hook);
       checkedFiles.add(normalizePath(fullPath));
     });
   }
@@ -57708,11 +57888,11 @@ async function checkHooksExist(projectDir) {
 // src/domains/health-checks/checkers/settings-checker.ts
 import { existsSync as existsSync36 } from "node:fs";
 import { readFile as readFile32 } from "node:fs/promises";
-import { join as join73 } from "node:path";
+import { join as join75 } from "node:path";
 init_logger();
 async function checkSettingsValid(projectDir) {
-  const globalSettings = join73(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
-  const projectSettings = join73(getLocalClaudeDir(projectDir), "settings.json");
+  const globalSettings = join75(getInstaller("claude-code")?.globalRoot() ?? "", "settings.json");
+  const projectSettings = join75(getLocalClaudeDir(projectDir), "settings.json");
   const settingsPath = existsSync36(globalSettings) ? globalSettings : existsSync36(projectSettings) ? projectSettings : null;
   if (!settingsPath) {
     return {
@@ -57783,11 +57963,11 @@ async function checkSettingsValid(projectDir) {
 import { existsSync as existsSync37 } from "node:fs";
 import { readFile as readFile33 } from "node:fs/promises";
 import { homedir as homedir22 } from "node:os";
-import { dirname as dirname19, join as join74, normalize as normalize6, resolve as resolve15 } from "node:path";
+import { dirname as dirname19, join as join76, normalize as normalize6, resolve as resolve16 } from "node:path";
 init_logger();
 async function checkPathRefsValid(projectDir) {
-  const globalClaudeMd = join74(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
-  const projectClaudeMd = join74(getLocalClaudeDir(projectDir), "CLAUDE.md");
+  const globalClaudeMd = join76(getInstaller("claude-code")?.globalRoot() ?? "", "CLAUDE.md");
+  const projectClaudeMd = join76(getLocalClaudeDir(projectDir), "CLAUDE.md");
   const claudeMdPath = existsSync37(globalClaudeMd) ? globalClaudeMd : existsSync37(projectClaudeMd) ? projectClaudeMd : null;
   if (!claudeMdPath) {
     return {
@@ -57831,7 +58011,7 @@ async function checkPathRefsValid(projectDir) {
       } else if (/^[A-Za-z]:/.test(ref)) {
         refPath = normalize6(ref);
       } else {
-        refPath = resolve15(baseDir, ref);
+        refPath = resolve16(baseDir, ref);
       }
       const normalizedPath = normalize6(refPath);
       const isWithinHome = normalizedPath.startsWith(home6);
@@ -57882,7 +58062,7 @@ async function checkPathRefsValid(projectDir) {
 // src/domains/health-checks/checkers/config-completeness-checker.ts
 import { existsSync as existsSync38 } from "node:fs";
 import { readdir as readdir24 } from "node:fs/promises";
-import { join as join75 } from "node:path";
+import { join as join77 } from "node:path";
 async function checkProjectConfigCompleteness(setup, projectDir) {
   if (setup.globals.some((g2) => g2.path === setup.project.path)) {
     return {
@@ -57899,12 +58079,12 @@ async function checkProjectConfigCompleteness(setup, projectDir) {
   const requiredDirs = ["agents", "commands", "skills"];
   const missingDirs = [];
   for (const dir of requiredDirs) {
-    const dirPath = join75(projectClaudeDir, dir);
+    const dirPath = join77(projectClaudeDir, dir);
     if (!existsSync38(dirPath)) {
       missingDirs.push(dir);
     }
   }
-  const hasRulesOrWorkflows = existsSync38(join75(projectClaudeDir, "rules")) || existsSync38(join75(projectClaudeDir, "workflows"));
+  const hasRulesOrWorkflows = existsSync38(join77(projectClaudeDir, "rules")) || existsSync38(join77(projectClaudeDir, "workflows"));
   if (!hasRulesOrWorkflows) {
     missingDirs.push("rules");
   }
@@ -58153,7 +58333,7 @@ function maskToken(token) {
 class AuthChecker {
   group = "auth";
   kits;
-  constructor(kits = ["engineer"]) {
+  constructor(kits = ["core"]) {
     this.kits = kits;
   }
   async run() {
@@ -58341,7 +58521,7 @@ import { platform as platform7 } from "node:os";
 // src/domains/health-checks/platform/environment-checker.ts
 import { constants as constants2, access as access2, mkdir as mkdir19, readFile as readFile35, unlink as unlink9, writeFile as writeFile25 } from "node:fs/promises";
 import { arch as arch2, homedir as homedir23, platform as platform6 } from "node:os";
-import { join as join78, normalize as normalize7 } from "node:path";
+import { join as join80, normalize as normalize7 } from "node:path";
 init_environment();
 function shouldSkipExpensiveOperations4() {
   return shouldSkipExpensiveOperations();
@@ -58435,7 +58615,7 @@ async function checkGlobalDirAccess(provider) {
       autoFixable: false
     };
   }
-  const testFile = join78(globalDir, ".sk-doctor-access-test");
+  const testFile = join80(globalDir, ".sk-doctor-access-test");
   try {
     await mkdir19(globalDir, { recursive: true });
     await writeFile25(testFile, "test", "utf-8");
@@ -58512,7 +58692,7 @@ async function checkWSLBoundary() {
 
 // src/domains/health-checks/platform/windows-checker.ts
 import { mkdir as mkdir20, symlink as symlink2, unlink as unlink10, writeFile as writeFile26 } from "node:fs/promises";
-import { join as join79 } from "node:path";
+import { join as join81 } from "node:path";
 async function checkLongPathSupport() {
   if (shouldSkipExpensiveOperations4()) {
     return {
@@ -58564,8 +58744,8 @@ async function checkSymlinkSupport() {
     };
   }
   const testDir = getInstaller("claude-code")?.globalRoot() ?? "";
-  const target = join79(testDir, ".sk-symlink-test-target");
-  const link = join79(testDir, ".sk-symlink-test-link");
+  const target = join81(testDir, ".sk-symlink-test-target");
+  const link = join81(testDir, ".sk-symlink-test-link");
   try {
     await mkdir20(testDir, { recursive: true });
     await writeFile26(target, "test", "utf-8");
@@ -58859,9 +59039,9 @@ class AutoHealer {
 }
 // src/domains/health-checks/report-generator.ts
 import { execSync as execSync4, spawnSync as spawnSync4 } from "node:child_process";
-import { readFileSync as readFileSync9, unlinkSync as unlinkSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { readFileSync as readFileSync10, unlinkSync as unlinkSync4, writeFileSync as writeFileSync6 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { dirname as dirname20, join as join80 } from "node:path";
+import { dirname as dirname20, join as join82 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 init_environment();
 init_logger();
@@ -58869,8 +59049,8 @@ init_dist2();
 function getCliVersion3() {
   try {
     const __dirname3 = dirname20(fileURLToPath2(import.meta.url));
-    const pkgPath = join80(__dirname3, "../../../package.json");
-    const pkg = JSON.parse(readFileSync9(pkgPath, "utf-8"));
+    const pkgPath = join82(__dirname3, "../../../package.json");
+    const pkg = JSON.parse(readFileSync10(pkgPath, "utf-8"));
     return pkg.version || "unknown";
   } catch (err) {
     logger.debug(`Failed to read CLI version: ${err}`);
@@ -59008,8 +59188,8 @@ class ReportGenerator {
         return null;
       }
     }
-    const tmpFile = join80(tmpdir2(), `sk-report-${Date.now()}.txt`);
-    writeFileSync4(tmpFile, report);
+    const tmpFile = join82(tmpdir2(), `sk-report-${Date.now()}.txt`);
+    writeFileSync6(tmpFile, report);
     try {
       const result = spawnSync4("gh", ["gist", "create", tmpFile, "--desc", "Takumi Diagnostic Report"], {
         encoding: "utf-8"
@@ -59025,7 +59205,7 @@ class ReportGenerator {
       return null;
     } finally {
       try {
-        unlinkSync3(tmpFile);
+        unlinkSync4(tmpFile);
       } catch {}
     }
   }
@@ -59534,8 +59714,9 @@ class WorkerSource {
 }
 
 // src/domains/installation/release-entry-adapter.ts
-function githubReleaseToEntry(release, kit = "engineer") {
-  const expected = assetNameFor(kit);
+init_types2();
+function githubReleaseToEntry(release, kit = "core") {
+  const expected = assetNameFor(backendIdOf(kit));
   const expectedAsset = release.assets.find((a3) => a3.name === expected);
   const fallback2 = release.assets[0];
   const archive = expectedAsset?.name ?? fallback2?.name ?? expected;
@@ -60497,7 +60678,7 @@ init_environment();
 init_logger();
 import { mkdir as mkdir25, stat as stat10 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import { join as join86 } from "node:path";
+import { join as join88 } from "node:path";
 
 // src/shared/temp-cleanup.ts
 init_logger();
@@ -60516,7 +60697,7 @@ init_logger();
 init_output_manager();
 import { createWriteStream as createWriteStream2, rmSync as rmSync3 } from "node:fs";
 import { mkdir as mkdir21 } from "node:fs/promises";
-import { join as join81 } from "node:path";
+import { join as join83 } from "node:path";
 
 // src/shared/progress-bar.ts
 init_output_manager();
@@ -60681,10 +60862,10 @@ init_types2();
 // src/domains/installation/utils/path-security.ts
 init_types2();
 import { lstatSync as lstatSync3, realpathSync as realpathSync2 } from "node:fs";
-import { relative as relative14, resolve as resolve16 } from "node:path";
+import { relative as relative14, resolve as resolve17 } from "node:path";
 var MAX_EXTRACTION_SIZE = 500 * 1024 * 1024;
 function isPathSafe(basePath, targetPath) {
-  const resolvedBase = resolve16(basePath);
+  const resolvedBase = resolve17(basePath);
   try {
     const stat8 = lstatSync3(targetPath);
     if (stat8.isSymbolicLink()) {
@@ -60694,7 +60875,7 @@ function isPathSafe(basePath, targetPath) {
       }
     }
   } catch {}
-  const resolvedTarget = resolve16(targetPath);
+  const resolvedTarget = resolve17(targetPath);
   const relativePath = relative14(resolvedBase, resolvedTarget);
   return !relativePath.startsWith("..") && !relativePath.startsWith("/") && resolvedTarget.startsWith(resolvedBase);
 }
@@ -60726,7 +60907,7 @@ var MAX_DOWNLOAD_SIZE = 500 * 1024 * 1024;
 class FileDownloader {
   async downloadAsset(asset, destDir) {
     try {
-      const destPath = join81(destDir, asset.name);
+      const destPath = join83(destDir, asset.name);
       await mkdir21(destDir, { recursive: true });
       output.info(`Downloading ${asset.name} (${formatBytes(asset.size)})...`);
       logger.verbose("Download details", {
@@ -60782,7 +60963,7 @@ class FileDownloader {
         }
         if (downloadedSize !== totalSize) {
           fileStream.end();
-          await new Promise((resolve17) => fileStream.once("close", resolve17));
+          await new Promise((resolve18) => fileStream.once("close", resolve18));
           try {
             rmSync3(destPath, { force: true });
           } catch (cleanupError) {
@@ -60796,7 +60977,7 @@ class FileDownloader {
         return destPath;
       } catch (error) {
         fileStream.end();
-        await new Promise((resolve17) => fileStream.once("close", resolve17));
+        await new Promise((resolve18) => fileStream.once("close", resolve18));
         try {
           rmSync3(destPath, { force: true });
         } catch (cleanupError) {
@@ -60811,7 +60992,7 @@ class FileDownloader {
   }
   async downloadFile(params) {
     const { url, name, size, destDir, token } = params;
-    const destPath = join81(destDir, name);
+    const destPath = join83(destDir, name);
     await mkdir21(destDir, { recursive: true });
     output.info(`Downloading ${name}${size ? ` (${formatBytes(size)})` : ""}...`);
     const headers = {};
@@ -60879,7 +61060,7 @@ class FileDownloader {
       const expectedSize = Number(response.headers.get("content-length"));
       if (expectedSize > 0 && downloadedSize !== expectedSize) {
         fileStream.end();
-        await new Promise((resolve17) => fileStream.once("close", resolve17));
+        await new Promise((resolve18) => fileStream.once("close", resolve18));
         try {
           rmSync3(destPath, { force: true });
         } catch (cleanupError) {
@@ -60897,7 +61078,7 @@ class FileDownloader {
       return destPath;
     } catch (error) {
       fileStream.end();
-      await new Promise((resolve17) => fileStream.once("close", resolve17));
+      await new Promise((resolve18) => fileStream.once("close", resolve18));
       try {
         rmSync3(destPath, { force: true });
       } catch (cleanupError) {
@@ -60914,7 +61095,7 @@ init_logger();
 init_types2();
 import { constants as constants3 } from "node:fs";
 import { access as access3, readdir as readdir25 } from "node:fs/promises";
-import { join as join82 } from "node:path";
+import { join as join84 } from "node:path";
 async function validateExtraction(extractDir) {
   try {
     const entries = await readdir25(extractDir, { encoding: "utf8" });
@@ -60926,7 +61107,7 @@ async function validateExtraction(extractDir) {
     const missingPaths = [];
     for (const path8 of criticalPaths) {
       try {
-        await access3(join82(extractDir, path8), constants3.F_OK);
+        await access3(join84(extractDir, path8), constants3.F_OK);
         logger.debug(`Found: ${path8}`);
       } catch {
         logger.warning(`Expected path not found: ${path8}`);
@@ -60948,7 +61129,7 @@ async function validateExtraction(extractDir) {
 // src/domains/installation/extraction/tar-extractor.ts
 init_logger();
 import { copyFile as copyFile6, mkdir as mkdir23, readdir as readdir27, rm as rm7, stat as stat8 } from "node:fs/promises";
-import { join as join84 } from "node:path";
+import { join as join86 } from "node:path";
 
 // node_modules/tar/dist/esm/index.min.js
 import Kr from "events";
@@ -64161,7 +64342,7 @@ function decodeFilePath(path8) {
 init_logger();
 init_types2();
 import { copyFile as copyFile5, lstat as lstat6, mkdir as mkdir22, readdir as readdir26 } from "node:fs/promises";
-import { join as join83, relative as relative15 } from "node:path";
+import { join as join85, relative as relative15 } from "node:path";
 async function withRetry2(fn2, retries = 3) {
   for (let i = 0;i < retries; i++) {
     try {
@@ -64183,8 +64364,8 @@ async function moveDirectoryContents(sourceDir, destDir, shouldExclude, sizeTrac
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir26(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join83(sourceDir, entry);
-    const destPath = join83(destDir, entry);
+    const sourcePath = join85(sourceDir, entry);
+    const destPath = join85(destDir, entry);
     const relativePath = relative15(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -64211,8 +64392,8 @@ async function copyDirectory(sourceDir, destDir, shouldExclude, sizeTracker) {
   await mkdir22(destDir, { recursive: true });
   const entries = await readdir26(sourceDir, { encoding: "utf8" });
   for (const entry of entries) {
-    const sourcePath = join83(sourceDir, entry);
-    const destPath = join83(destDir, entry);
+    const sourcePath = join85(sourceDir, entry);
+    const destPath = join85(destDir, entry);
     const relativePath = relative15(sourceDir, sourcePath);
     if (!isPathSafe(destDir, destPath)) {
       logger.warning(`Skipping unsafe path: ${relativePath}`);
@@ -64267,7 +64448,7 @@ class TarExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join84(tempExtractDir, rootEntry);
+        const rootPath = join86(tempExtractDir, rootEntry);
         const rootStat = await stat8(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir27(rootPath, { encoding: "utf8" });
@@ -64283,7 +64464,7 @@ class TarExtractor {
           }
         } else {
           await mkdir23(destDir, { recursive: true });
-          await copyFile6(rootPath, join84(destDir, rootEntry));
+          await copyFile6(rootPath, join86(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -64304,7 +64485,7 @@ class TarExtractor {
 init_logger();
 import { createWriteStream as createWriteStream3 } from "node:fs";
 import { chmod as chmod3, copyFile as copyFile7, mkdir as mkdir24, readdir as readdir28, rm as rm8, stat as stat9 } from "node:fs/promises";
-import { dirname as dirname21, join as join85, resolve as resolve17 } from "node:path";
+import { dirname as dirname21, join as join87, resolve as resolve18 } from "node:path";
 import { pipeline } from "node:stream/promises";
 import yauzl from "yauzl-promise";
 class ZipExtractor {
@@ -64318,7 +64499,7 @@ class ZipExtractor {
       logger.debug(`Root entries: ${entries.join(", ")}`);
       if (entries.length === 1) {
         const rootEntry = entries[0];
-        const rootPath = join85(tempExtractDir, rootEntry);
+        const rootPath = join87(tempExtractDir, rootEntry);
         const rootStat = await stat9(rootPath);
         if (rootStat.isDirectory()) {
           const rootContents = await readdir28(rootPath, { encoding: "utf8" });
@@ -64334,7 +64515,7 @@ class ZipExtractor {
           }
         } else {
           await mkdir24(destDir, { recursive: true });
-          await copyFile7(rootPath, join85(destDir, rootEntry));
+          await copyFile7(rootPath, join87(destDir, rootEntry));
         }
       } else {
         logger.debug("Multiple root entries - moving all");
@@ -64351,13 +64532,13 @@ class ZipExtractor {
   }
   async extractToDir(archivePath, destDir) {
     const zip = await yauzl.open(archivePath, { decodeStrings: false });
-    const destRoot = resolve17(destDir);
+    const destRoot = resolve18(destDir);
     let count = 0;
     try {
       for await (const entry of zip) {
         const rawName = entry.filename;
         const name = normalizeZipEntryName(rawName);
-        const outPath = resolve17(destRoot, name);
+        const outPath = resolve18(destRoot, name);
         if (!isPathSafe(destRoot, outPath)) {
           throw new Error(`Unsafe zip entry path (zip-slip): ${name}`);
         }
@@ -64463,7 +64644,7 @@ class DownloadManager {
   async createTempDir() {
     const timestamp = Date.now();
     const counter = DownloadManager.tempDirCounter++;
-    const primaryTempDir = join86(tmpdir3(), `takumi-${timestamp}-${counter}`);
+    const primaryTempDir = join88(tmpdir3(), `takumi-${timestamp}-${counter}`);
     try {
       await mkdir25(primaryTempDir, { recursive: true });
       logger.debug(`Created temp directory: ${primaryTempDir}`);
@@ -64480,7 +64661,7 @@ Solutions:
   2. Set HOME environment variable
   3. Try running from a different directory`);
       }
-      const fallbackTempDir = join86(homeDir, ".sunagentkit", "tmp", `takumi-${timestamp}-${counter}`);
+      const fallbackTempDir = join88(homeDir, ".sunagentkit", "tmp", `takumi-${timestamp}-${counter}`);
       try {
         await mkdir25(fallbackTempDir, { recursive: true });
         logger.debug(`Created temp directory (fallback): ${fallbackTempDir}`);
@@ -65177,7 +65358,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 join90, resolve as resolve21 } from "node:path";
+import { join as join92, resolve as resolve22 } from "node:path";
 
 // src/commands/shared/agent-selector.ts
 function selectAgents(opts = {}) {
@@ -65321,8 +65502,8 @@ async function runPreflightChecks() {
 }
 
 // src/domains/installation/fresh-installer.ts
-import { existsSync as existsSync43, readdirSync as readdirSync4, rmSync as rmSync4, rmdirSync as rmdirSync2, unlinkSync as unlinkSync4 } from "node:fs";
-import { dirname as dirname24, join as join89, resolve as resolve20 } from "node:path";
+import { existsSync as existsSync43, readdirSync as readdirSync4, rmSync as rmSync4, rmdirSync as rmdirSync2, unlinkSync as unlinkSync5 } from "node:fs";
+import { dirname as dirname24, join as join91, resolve as resolve21 } from "node:path";
 init_logger();
 init_takumi_constants();
 var import_fs_extra32 = __toESM(require_lib(), 1);
@@ -65370,15 +65551,15 @@ async function analyzeFreshInstallation(claudeDir) {
   };
 }
 function cleanupEmptyDirectories2(filePath, claudeDir) {
-  const normalizedClaudeDir = resolve20(claudeDir);
-  let currentDir = resolve20(dirname24(filePath));
+  const normalizedClaudeDir = resolve21(claudeDir);
+  let currentDir = resolve21(dirname24(filePath));
   while (currentDir !== normalizedClaudeDir && currentDir.startsWith(normalizedClaudeDir)) {
     try {
       const entries = readdirSync4(currentDir);
       if (entries.length === 0) {
         rmdirSync2(currentDir);
         logger.debug(`Removed empty directory: ${currentDir}`);
-        currentDir = resolve20(dirname24(currentDir));
+        currentDir = resolve21(dirname24(currentDir));
       } else {
         break;
       }
@@ -65395,10 +65576,10 @@ async function removeFilesByOwnership(claudeDir, analysis, includeModified) {
   const filesToRemove = includeModified ? [...analysis.ckFiles, ...analysis.ckModifiedFiles] : analysis.ckFiles;
   const filesToPreserve = includeModified ? analysis.userFiles : [...analysis.ckModifiedFiles, ...analysis.userFiles];
   for (const file of filesToRemove) {
-    const fullPath = join89(claudeDir, file.path);
+    const fullPath = join91(claudeDir, file.path);
     try {
       if (existsSync43(fullPath)) {
-        unlinkSync4(fullPath);
+        unlinkSync5(fullPath);
         removedFiles.push(file.path);
         logger.debug(`Removed: ${file.path}`);
         cleanupEmptyDirectories2(fullPath, claudeDir);
@@ -65456,7 +65637,7 @@ async function updateMetadataAfterFresh(claudeDir, removedFiles) {
     await import_fs_extra32.writeFile(canonicalPath, JSON.stringify(metadata, null, 2));
     if (resolved.isLegacy && canonicalPath !== resolved.path) {
       try {
-        unlinkSync4(resolved.path);
+        unlinkSync5(resolved.path);
       } catch {}
     }
     logger.debug(`Updated manifest, removed ${removedFiles.length} file entries`);
@@ -65469,7 +65650,7 @@ async function removeSubdirectoriesFallback(claudeDir) {
   const removedFiles = [];
   let removedDirCount = 0;
   for (const subdir of TAKUMI_SUBDIRECTORIES) {
-    const subdirPath = join89(claudeDir, subdir);
+    const subdirPath = join91(claudeDir, subdir);
     if (await import_fs_extra32.pathExists(subdirPath)) {
       rmSync4(subdirPath, { recursive: true, force: true });
       removedDirCount++;
@@ -65479,12 +65660,12 @@ async function removeSubdirectoriesFallback(claudeDir) {
   }
   const canonicalPath = getManifestPath(claudeDir);
   if (await import_fs_extra32.pathExists(canonicalPath)) {
-    unlinkSync4(canonicalPath);
+    unlinkSync5(canonicalPath);
     removedFiles.push(MANIFEST_FILENAME);
   }
   const legacyPath = getLegacyManifestPath(claudeDir);
   if (await import_fs_extra32.pathExists(legacyPath)) {
-    unlinkSync4(legacyPath);
+    unlinkSync5(legacyPath);
     removedFiles.push(LEGACY_MANIFEST_FILENAME);
   }
   return {
@@ -65588,7 +65769,7 @@ async function handleSelection(ctx) {
       const github2 = new GitHubClient;
       release2 = await github2.getReleaseByTag(kit2, ctx.selectedVersion);
     } else {
-      const worker = new WorkerSource(getServerUrl(), ctx.kitType);
+      const worker = new WorkerSource(getServerUrl(), backendIdOf(ctx.kitType));
       const entry = await worker.fetchByTag(ctx.selectedVersion);
       release2 = releaseEntryToGitHubRelease(entry, kit2);
     }
@@ -65708,7 +65889,7 @@ async function handleSelection(ctx) {
       }
     }
   }
-  const resolvedDir = resolve21(targetDir);
+  const resolvedDir = resolve22(targetDir);
   logger.info(`Target directory: ${resolvedDir}`);
   if (!ctx.options.global && isLocalSameAsGlobal(resolvedDir)) {
     logger.warning("You're at HOME directory. Installing here modifies your GLOBAL Takumi.");
@@ -65742,7 +65923,7 @@ async function handleSelection(ctx) {
   }
   if (!ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join90(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join92(resolvedDir, prefix) : resolvedDir;
     try {
       const existingMetadata = await readManifest(claudeDir);
       if (existingMetadata?.kits) {
@@ -65775,7 +65956,7 @@ async function handleSelection(ctx) {
   }
   if (ctx.options.fresh) {
     const prefix = PathResolver.getPathPrefix(ctx.options.global);
-    const claudeDir = prefix ? join90(resolvedDir, prefix) : resolvedDir;
+    const claudeDir = prefix ? join92(resolvedDir, prefix) : resolvedDir;
     const canProceed = await handleFreshInstallation(claudeDir, ctx.prompts);
     if (!canProceed) {
       return { ...ctx, cancelled: true };
@@ -65795,7 +65976,7 @@ async function handleSelection(ctx) {
     let currentVersion = null;
     try {
       const prefix = PathResolver.getPathPrefix(ctx.options.global);
-      const claudeDir = prefix ? join90(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join92(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       currentVersion = existingMetadata?.kits?.[kitType]?.version || null;
       if (currentVersion) {
@@ -65858,7 +66039,7 @@ async function handleSelection(ctx) {
       logger.success(`Found: ${release.tag_name}`);
     }
   } else if (selectedVersion) {
-    const worker = new WorkerSource(getServerUrl(), kitType);
+    const worker = new WorkerSource(getServerUrl(), backendIdOf(kitType));
     const entry = await worker.fetchByTag(selectedVersion);
     release = releaseEntryToGitHubRelease(entry, kit);
   } else {
@@ -65867,7 +66048,7 @@ async function handleSelection(ctx) {
     } else {
       logger.info("Fetching latest release...");
     }
-    const worker = new WorkerSource(getServerUrl(), kitType);
+    const worker = new WorkerSource(getServerUrl(), backendIdOf(kitType));
     const entry = await worker.fetchLatest(ctx.options.beta);
     release = releaseEntryToGitHubRelease(entry, kit);
     if (release.prerelease) {
@@ -65883,7 +66064,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 ? join90(resolvedDir, prefix) : resolvedDir;
+      const claudeDir = prefix ? join92(resolvedDir, prefix) : resolvedDir;
       const existingMetadata = await readManifest(claudeDir);
       const installedKitVersion = existingMetadata?.kits?.[kitType]?.version;
       if (installedKitVersion && versionsMatch(installedKitVersion, releaseTag)) {
@@ -65906,7 +66087,7 @@ async function handleSelection(ctx) {
       let currentSecondaryVersion = null;
       try {
         const prefix = PathResolver.getPathPrefix(ctx.options.global);
-        const claudeDir = prefix ? join90(resolvedDir, prefix) : resolvedDir;
+        const claudeDir = prefix ? join92(resolvedDir, prefix) : resolvedDir;
         const existingMetadata = await readManifest(claudeDir);
         currentSecondaryVersion = existingMetadata?.kits?.[secondaryKit]?.version || null;
       } catch {}
@@ -65938,7 +66119,7 @@ async function handleSelection(ctx) {
           const ghClient = github ?? new GitHubClient;
           secondaryRelease = secondaryVersion ? await ghClient.getReleaseByTag(kitConfig, secondaryVersion) : await ghClient.getLatestRelease(kitConfig, ctx.options.beta);
         } else {
-          const worker = new WorkerSource(getServerUrl(), secondaryKit);
+          const worker = new WorkerSource(getServerUrl(), backendIdOf(secondaryKit));
           const entry = secondaryVersion ? await worker.fetchByTag(secondaryVersion) : await worker.fetchLatest(ctx.options.beta);
           secondaryRelease = releaseEntryToGitHubRelease(entry, kitConfig);
         }
@@ -65973,7 +66154,7 @@ async function resolveReleaseForKit(ctx, kitType) {
     const release = await github.getLatestRelease(kit, ctx.options.beta);
     return release;
   }
-  const worker = new WorkerSource(getServerUrl(), kitType);
+  const worker = new WorkerSource(getServerUrl(), backendIdOf(kitType));
   const entry = await worker.fetchLatest(ctx.options.beta);
   return releaseEntryToGitHubRelease(entry, kit);
 }
@@ -65989,14 +66170,15 @@ function resolveGlobalTargetDir(targetAgents) {
 }
 // src/commands/init/phases/sync-handler.ts
 import { copyFile as copyFile8, mkdir as mkdir28, open as open3, readFile as readFile39, rename as rename7, stat as stat12, unlink as unlink12, writeFile as writeFile29 } from "node:fs/promises";
-import { dirname as dirname25, join as join93, resolve as resolve22 } from "node:path";
+import { dirname as dirname25, join as join95, resolve as resolve23 } from "node:path";
 
 // src/domains/sync/config-version-checker.ts
 init_auth_client();
 import { mkdir as mkdir27, readFile as readFile37, unlink as unlink11, writeFile as writeFile28 } from "node:fs/promises";
-import { join as join91 } from "node:path";
+import { join as join93 } from "node:path";
 init_logger();
 init_path_resolver();
+init_types2();
 var CACHE_TTL_HOURS = 24;
 var DEFAULT_CACHE_TTL_MS = CACHE_TTL_HOURS * 60 * 60 * 1000;
 var MIN_CACHE_TTL_MS = 60 * 1000;
@@ -66028,7 +66210,7 @@ var CACHE_FILENAME = "config-update-cache.json";
 class ConfigVersionChecker {
   static getCacheFilePath(kitType, global3) {
     const cacheDir = PathResolver.getCacheDir(global3);
-    return join91(cacheDir, `${kitType}-${CACHE_FILENAME}`);
+    return join93(cacheDir, `${kitType}-${CACHE_FILENAME}`);
   }
   static async loadCache(kitType, global3) {
     try {
@@ -66059,7 +66241,7 @@ class ConfigVersionChecker {
     const baseBackoff = 1000;
     for (let attempt = 0;attempt < maxRetries; attempt++) {
       try {
-        const worker = new WorkerSource(getServerUrl(), kitType);
+        const worker = new WorkerSource(getServerUrl(), backendIdOf(kitType));
         const entry = await worker.fetchLatest();
         const version3 = entry.version.replace(/^v/, "");
         if (!version3 || version3.length > 256) {
@@ -66084,7 +66266,7 @@ class ConfigVersionChecker {
           return null;
         }
         const delay3 = baseBackoff * 2 ** attempt;
-        await new Promise((resolve22) => setTimeout(resolve22, delay3));
+        await new Promise((resolve23) => setTimeout(resolve23, delay3));
       }
     }
     return null;
@@ -66146,7 +66328,7 @@ class ConfigVersionChecker {
 }
 // src/domains/sync/sync-engine.ts
 import { lstat as lstat7, readFile as readFile38, readlink, realpath as realpath3, stat as stat11 } from "node:fs/promises";
-import { isAbsolute as isAbsolute3, join as join92, normalize as normalize8, relative as relative16 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join94, normalize as normalize8, relative as relative16 } from "node:path";
 init_logger();
 
 // node_modules/diff/libesm/diff/base.js
@@ -67253,7 +67435,7 @@ async function validateSymlinkChain(path9, basePath, maxDepth = MAX_SYMLINK_DEPT
       if (!stats.isSymbolicLink())
         break;
       const target = await readlink(current);
-      const resolvedTarget = isAbsolute3(target) ? target : join92(current, "..", target);
+      const resolvedTarget = isAbsolute3(target) ? target : join94(current, "..", target);
       const normalizedTarget = normalize8(resolvedTarget);
       const rel = relative16(basePath, normalizedTarget);
       if (rel.startsWith("..") || isAbsolute3(rel)) {
@@ -67289,7 +67471,7 @@ async function validateSyncPath(basePath, filePath) {
   if (normalized.startsWith("..") || normalized.includes("/../")) {
     throw new Error(`Path traversal not allowed: ${filePath}`);
   }
-  const fullPath = join92(basePath, normalized);
+  const fullPath = join94(basePath, normalized);
   const rel = relative16(basePath, fullPath);
   if (rel.startsWith("..") || isAbsolute3(rel)) {
     throw new Error(`Path escapes base directory: ${filePath}`);
@@ -67304,7 +67486,7 @@ async function validateSyncPath(basePath, filePath) {
     }
   } catch (error) {
     if (error.code === "ENOENT") {
-      const parentPath = join92(fullPath, "..");
+      const parentPath = join94(fullPath, "..");
       try {
         const resolvedBase = await realpath3(basePath);
         const resolvedParent = await realpath3(parentPath);
@@ -67689,7 +67871,7 @@ async function handleSync(ctx) {
     logger.error(`Sync not yet supported for ${targetAgent}. Only --agent claude-code supports --sync.`);
     return { ...ctx, cancelled: true };
   }
-  const resolvedDir = ctx.options.global ? getClaudeDir() : resolve22(ctx.options.dir || ".");
+  const resolvedDir = ctx.options.global ? getClaudeDir() : resolve23(ctx.options.dir || ".");
   const claudeDir = ctx.options.global ? resolvedDir : getLocalClaudeDir(resolvedDir);
   if (!await import_fs_extra34.pathExists(claudeDir)) {
     logger.error("Cannot sync: no .claude directory found");
@@ -67705,9 +67887,9 @@ Run 'takumi init' to update.`, "Legacy Installation");
   }
   let kitType = ctx.options.selectedKits?.[0];
   if (!kitType) {
-    const engineerMeta = await readKitManifest(claudeDir, "engineer");
-    if (engineerMeta) {
-      kitType = "engineer";
+    const coreMeta = await readKitManifest(claudeDir, "core");
+    if (coreMeta) {
+      kitType = "core";
     } else {
       logger.error("Cannot sync: no kit installation found in metadata");
       return { ...ctx, cancelled: true };
@@ -67792,7 +67974,7 @@ function getLockTimeout() {
 var STALE_LOCK_THRESHOLD_MS = 5 * 60 * 1000;
 async function acquireSyncLock(global3) {
   const cacheDir = PathResolver.getCacheDir(global3);
-  const lockPath = join93(cacheDir, ".sync-lock");
+  const lockPath = join95(cacheDir, ".sync-lock");
   const startTime = Date.now();
   const lockTimeout = getLockTimeout();
   await mkdir28(dirname25(lockPath), { recursive: true });
@@ -67819,7 +68001,7 @@ async function acquireSyncLock(global3) {
           }
           logger.debug(`Lock stat failed: ${statError}`);
         }
-        await new Promise((resolve23) => setTimeout(resolve23, 100));
+        await new Promise((resolve24) => setTimeout(resolve24, 100));
         continue;
       }
       throw err;
@@ -67873,7 +68055,7 @@ async function executeSyncMerge(ctx) {
         try {
           const sourcePath = await validateSyncPath(upstreamDir, file.path);
           const targetPath = await validateSyncPath(ctx.claudeDir, file.path);
-          const targetDir = join93(targetPath, "..");
+          const targetDir = join95(targetPath, "..");
           try {
             await mkdir28(targetDir, { recursive: true });
           } catch (mkdirError) {
@@ -68044,7 +68226,7 @@ async function createBackup(claudeDir, files, backupDir) {
       const sourcePath = await validateSyncPath(claudeDir, file.path);
       if (await import_fs_extra34.pathExists(sourcePath)) {
         const targetPath = await validateSyncPath(backupDir, file.path);
-        const targetDir = join93(targetPath, "..");
+        const targetDir = join95(targetPath, "..");
         await mkdir28(targetDir, { recursive: true });
         await copyFile8(sourcePath, targetPath);
       }
@@ -68066,38 +68248,38 @@ init_logger();
 init_types2();
 var import_fs_extra35 = __toESM(require_lib(), 1);
 import { rename as rename8, rm as rm9 } from "node:fs/promises";
-import { join as join94, relative as relative17 } from "node:path";
+import { join as join96, relative as relative17 } from "node:path";
 async function collectDirsToRename(extractDir, folders) {
   const dirsToRename = [];
   if (folders.docs !== DEFAULT_FOLDERS.docs) {
-    const docsPath = join94(extractDir, DEFAULT_FOLDERS.docs);
+    const docsPath = join96(extractDir, DEFAULT_FOLDERS.docs);
     if (await import_fs_extra35.pathExists(docsPath)) {
       dirsToRename.push({
         from: docsPath,
-        to: join94(extractDir, folders.docs)
+        to: join96(extractDir, folders.docs)
       });
     }
-    const claudeDocsPath = join94(extractDir, ".claude", DEFAULT_FOLDERS.docs);
+    const claudeDocsPath = join96(extractDir, ".claude", DEFAULT_FOLDERS.docs);
     if (await import_fs_extra35.pathExists(claudeDocsPath)) {
       dirsToRename.push({
         from: claudeDocsPath,
-        to: join94(extractDir, ".claude", folders.docs)
+        to: join96(extractDir, ".claude", folders.docs)
       });
     }
   }
   if (folders.plans !== DEFAULT_FOLDERS.plans) {
-    const plansPath = join94(extractDir, DEFAULT_FOLDERS.plans);
+    const plansPath = join96(extractDir, DEFAULT_FOLDERS.plans);
     if (await import_fs_extra35.pathExists(plansPath)) {
       dirsToRename.push({
         from: plansPath,
-        to: join94(extractDir, folders.plans)
+        to: join96(extractDir, folders.plans)
       });
     }
-    const claudePlansPath = join94(extractDir, ".claude", DEFAULT_FOLDERS.plans);
+    const claudePlansPath = join96(extractDir, ".claude", DEFAULT_FOLDERS.plans);
     if (await import_fs_extra35.pathExists(claudePlansPath)) {
       dirsToRename.push({
         from: claudePlansPath,
-        to: join94(extractDir, ".claude", folders.plans)
+        to: join96(extractDir, ".claude", folders.plans)
       });
     }
   }
@@ -68138,7 +68320,7 @@ async function renameFolders(dirsToRename, extractDir, options2) {
 init_logger();
 init_types2();
 import { readFile as readFile40, readdir as readdir29, writeFile as writeFile30 } from "node:fs/promises";
-import { join as join95, relative as relative18 } from "node:path";
+import { join as join97, relative as relative18 } from "node:path";
 var TRANSFORMABLE_FILE_PATTERNS = [
   ".md",
   ".txt",
@@ -68191,7 +68373,7 @@ async function transformFileContents(dir, compiledReplacements, options2) {
   let replacementsCount = 0;
   const entries = await readdir29(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = join95(dir, entry.name);
+    const fullPath = join97(dir, entry.name);
     if (entry.isDirectory()) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
@@ -68328,7 +68510,7 @@ async function transformFolderPaths(extractDir, folders, options2 = {}) {
 init_logger();
 import { readFile as readFile41, readdir as readdir30, writeFile as writeFile31 } from "node:fs/promises";
 import { platform as platform9 } from "node:os";
-import { extname as extname6, join as join96 } from "node:path";
+import { extname as extname6, join as join98 } from "node:path";
 var IS_WINDOWS3 = platform9() === "win32";
 var HOME_PREFIX = IS_WINDOWS3 ? "%USERPROFILE%" : "$HOME";
 function getHomeDirPrefix() {
@@ -68429,8 +68611,8 @@ function transformContent(content) {
 }
 function shouldTransformFile3(filename) {
   const ext2 = extname6(filename).toLowerCase();
-  const basename9 = filename.split("/").pop() || filename;
-  return TRANSFORMABLE_EXTENSIONS3.has(ext2) || ALWAYS_TRANSFORM_FILES.has(basename9);
+  const basename10 = filename.split("/").pop() || filename;
+  return TRANSFORMABLE_EXTENSIONS3.has(ext2) || ALWAYS_TRANSFORM_FILES.has(basename10);
 }
 async function transformPathsForGlobalInstall(directory, options2 = {}) {
   let filesTransformed = 0;
@@ -68440,7 +68622,7 @@ async function transformPathsForGlobalInstall(directory, options2 = {}) {
   async function processDirectory2(dir) {
     const entries = await readdir30(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join96(dir, entry.name);
+      const fullPath = join98(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name === "node_modules" || entry.name.startsWith(".") && entry.name !== ".claude") {
           continue;
@@ -68680,7 +68862,7 @@ init_types2();
 var import_picocolors23 = __toESM(require_picocolors(), 1);
 
 // src/commands/new/phases/directory-setup.ts
-import { resolve as resolve23 } from "node:path";
+import { resolve as resolve24 } from "node:path";
 init_logger();
 init_types2();
 var import_fs_extra36 = __toESM(require_lib(), 1);
@@ -68764,7 +68946,7 @@ async function directorySetup(validOptions, prompts) {
       targetDir = await prompts.getDirectory(targetDir);
     }
   }
-  const resolvedDir = resolve23(targetDir);
+  const resolvedDir = resolve24(targetDir);
   logger.info(`Target directory: ${resolvedDir}`);
   if (isLocalSameAsGlobal(resolvedDir)) {
     logger.warning("You're creating a project at HOME directory.");
@@ -68819,7 +69001,7 @@ async function handleDirectorySetup(ctx) {
   };
 }
 // src/commands/new/phases/project-creation.ts
-import { join as join97 } from "node:path";
+import { join as join99 } from "node:path";
 init_github_client();
 init_logger();
 init_output_manager();
@@ -68973,7 +69155,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir = join97(resolvedDir, ".claude");
+  const claudeDir = join99(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -69026,10 +69208,10 @@ async function handleProjectCreation(ctx) {
   };
 }
 // src/commands/new/phases/post-setup.ts
-import { join as join99 } from "node:path";
+import { join as join101 } from "node:path";
 
 // src/domains/installation/setup-wizard.ts
-import { join as join98 } from "node:path";
+import { join as join100 } from "node:path";
 init_logger();
 init_dist2();
 var import_fs_extra37 = __toESM(require_lib(), 1);
@@ -69109,7 +69291,7 @@ async function parseEnvFile(path9) {
   }
 }
 async function checkGlobalConfig() {
-  const globalEnvPath = join98(getClaudeDir(), ".env");
+  const globalEnvPath = join100(getClaudeDir(), ".env");
   if (!await import_fs_extra37.pathExists(globalEnvPath))
     return false;
   const env2 = await parseEnvFile(globalEnvPath);
@@ -69125,7 +69307,7 @@ async function runSetupWizard(options2) {
   let globalEnv = {};
   const hasGlobalConfig = !isGlobal && await checkGlobalConfig();
   if (!isGlobal) {
-    const globalEnvPath = join98(getClaudeDir(), ".env");
+    const globalEnvPath = join100(getClaudeDir(), ".env");
     if (await import_fs_extra37.pathExists(globalEnvPath)) {
       globalEnv = await parseEnvFile(globalEnvPath);
     }
@@ -69188,7 +69370,7 @@ async function runSetupWizard(options2) {
     }
   }
   await generateEnvFile(targetDir, values);
-  f2.success(`Configuration saved to ${join98(targetDir, ".env")}`);
+  f2.success(`Configuration saved to ${join100(targetDir, ".env")}`);
   return true;
 }
 async function promptForAdditionalGeminiKeys(primaryKey) {
@@ -69291,9 +69473,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir = join99(resolvedDir, ".claude");
+  const claudeDir = join101(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join99(claudeDir, ".env"),
+    envPath: join101(claudeDir, ".env"),
     claudeDir,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -69370,19 +69552,19 @@ Example: tkm new --use-git --release v2.1.0`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync48, statSync as statSync5 } from "node:fs";
-import { dirname as dirname31, join as join103, parse as parse2, resolve as resolve27 } from "node:path";
+import { dirname as dirname31, join as join105, parse as parse2, resolve as resolve28 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 import { existsSync as existsSync47, statSync as statSync4 } from "node:fs";
-import { basename as basename11, dirname as dirname30, join as join102, relative as relative19, resolve as resolve25 } from "node:path";
+import { basename as basename12, dirname as dirname30, join as join104, relative as relative19, resolve as resolve26 } from "node:path";
 
 // src/domains/plan-parser/index.ts
 import { dirname as dirname29 } from "node:path";
 
 // src/domains/plan-parser/plan-table-parser.ts
 var import_gray_matter5 = __toESM(require_gray_matter(), 1);
-import { readFileSync as readFileSync12 } from "node:fs";
-import { dirname as dirname26, resolve as resolve24 } from "node:path";
+import { readFileSync as readFileSync13 } from "node:fs";
+import { dirname as dirname26, resolve as resolve25 } from "node:path";
 function normalizeStatus(raw) {
   const s3 = raw.toLowerCase().trim();
   if (s3.includes("complete") || s3.includes("done") || s3.includes("✓") || s3.includes("✅")) {
@@ -69466,7 +69648,7 @@ function parseHeaderAwareTable(content, dir, options2) {
         hasLinks = true;
         linkText = linkMatch[1].trim();
         name = filenameToTitle(linkText);
-        file = resolve24(dir, linkMatch[2]);
+        file = resolve25(dir, linkMatch[2]);
       } else {
         name = nameRaw.replace(/\[.*?\]\(.*?\)/g, "").trim() || `Phase ${phaseId}`;
         linkText = name;
@@ -69506,7 +69688,7 @@ function parseFormat1(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status2),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: linkText.trim(),
       anchor
     });
@@ -69526,7 +69708,7 @@ function parseFormat2(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status2),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText,
       anchor
     });
@@ -69545,7 +69727,7 @@ function parseFormat2b(content, dir, options2) {
       phaseId,
       name: name.trim(),
       status: normalizeStatus(status2),
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: name.trim(),
       anchor
     });
@@ -69644,7 +69826,7 @@ function parseFormat4(content, planFilePath, options2) {
       current = { name, status: hasCheck ? "completed" : "pending" };
     } else if (fileMatch && current) {
       const planDir = dirname26(planFilePath);
-      current.file = resolve24(planDir, fileMatch[1].trim());
+      current.file = resolve25(planDir, fileMatch[1].trim());
     } else if (statusMatch && current) {
       current.status = normalizeStatus(statusMatch[2]);
     }
@@ -69710,7 +69892,7 @@ function parseFormat6(content, dir, options2) {
       phaseId,
       name: phaseName,
       status: checked.toLowerCase() === "x" ? "completed" : "pending",
-      file: resolve24(dir, linkPath),
+      file: resolve25(dir, linkPath),
       linkText: phaseName,
       anchor
     });
@@ -69747,7 +69929,7 @@ function parsePhasesFromBody(body, dir, options2) {
   return parseFormat6(normalizedBody, dir, options2);
 }
 function parsePlanFile(planFilePath, options2) {
-  const content = readFileSync12(planFilePath, "utf8");
+  const content = readFileSync13(planFilePath, "utf8");
   const dir = dirname26(planFilePath);
   const { data: frontmatter, content: body } = import_gray_matter5.default(content);
   const phases = parsePhasesFromBody(body, dir, options2);
@@ -69755,22 +69937,22 @@ function parsePlanFile(planFilePath, options2) {
 }
 // src/domains/plan-parser/plan-scanner.ts
 import { existsSync as existsSync44, readdirSync as readdirSync5 } from "node:fs";
-import { join as join100 } from "node:path";
+import { join as join102 } from "node:path";
 function scanPlanDir(dir) {
   if (!existsSync44(dir))
     return [];
   try {
-    return readdirSync5(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join100(dir, entry.name, "plan.md")).filter(existsSync44);
+    return readdirSync5(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join102(dir, entry.name, "plan.md")).filter(existsSync44);
   } catch {
     return [];
   }
 }
 // src/domains/plan-parser/plan-validator.ts
 var import_gray_matter6 = __toESM(require_gray_matter(), 1);
-import { existsSync as existsSync45, readFileSync as readFileSync13 } from "node:fs";
-import { basename as basename9, dirname as dirname27 } from "node:path";
+import { existsSync as existsSync45, readFileSync as readFileSync14 } from "node:fs";
+import { basename as basename10, dirname as dirname27 } from "node:path";
 function validatePlanFile(filePath, strict = false) {
-  const content = readFileSync13(filePath, "utf8");
+  const content = readFileSync14(filePath, "utf8");
   const dir = dirname27(filePath);
   const issues = [];
   const lines = content.split(`
@@ -69808,13 +69990,13 @@ function validatePlanFile(filePath, strict = false) {
   }
   for (const phase of phases) {
     if (phase.file && !existsSync45(phase.file)) {
-      const fileBasename = basename9(phase.file);
+      const fileBasename = basename10(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 '${basename9(phase.file)}' which doesn't exist`
+        message: `Phase ${phase.phaseId} references '${basename10(phase.file)}' which doesn't exist`
       });
     }
   }
@@ -69827,9 +70009,9 @@ function validatePlanFile(filePath, strict = false) {
 }
 // src/domains/plan-parser/plan-writer.ts
 var import_gray_matter7 = __toESM(require_gray_matter(), 1);
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync14, writeFileSync as writeFileSync5 } from "node:fs";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync15, writeFileSync as writeFileSync7 } from "node:fs";
 import { existsSync as existsSync46 } from "node:fs";
-import { basename as basename10, dirname as dirname28, join as join101 } from "node:path";
+import { basename as basename11, dirname as dirname28, join as join103 } from "node:path";
 function phaseNameToFilename(id, name) {
   const numMatch = /^(\d+)([a-z]*)$/i.exec(id);
   const num = numMatch ? numMatch[1] : id;
@@ -69934,16 +70116,16 @@ function resolvePhaseIds(phases) {
 }
 function scaffoldPlan(options2) {
   const { dir } = options2;
-  mkdirSync3(dir, { recursive: true });
+  mkdirSync4(dir, { recursive: true });
   const resolvedPhases = resolvePhaseIds(options2.phases);
   const optionsWithResolved = { ...options2, phases: resolvedPhases };
-  const planFile = join101(dir, "plan.md");
-  writeFileSync5(planFile, generatePlanMd(optionsWithResolved), "utf8");
+  const planFile = join103(dir, "plan.md");
+  writeFileSync7(planFile, generatePlanMd(optionsWithResolved), "utf8");
   const phaseFiles = [];
   for (const phase of resolvedPhases) {
     const filename = phaseNameToFilename(phase.id, phase.name);
-    const phaseFile = join101(dir, filename);
-    writeFileSync5(phaseFile, generatePhaseTemplate(phase), "utf8");
+    const phaseFile = join103(dir, filename);
+    writeFileSync7(phaseFile, generatePhaseTemplate(phase), "utf8");
     phaseFiles.push(phaseFile);
   }
   return { planFile, phaseFiles };
@@ -69967,7 +70149,7 @@ function isCanonicalFormat(content) {
   return /^\|\s*phase\s*\|\s*name\s*\|\s*status\s*\|/im.test(content);
 }
 function updatePhaseStatus(planFile, phaseId, newStatus) {
-  const raw = readFileSync14(planFile, "utf8").replace(/\r\n/g, `
+  const raw = readFileSync15(planFile, "utf8").replace(/\r\n/g, `
 `);
   if (!isCanonicalFormat(raw)) {
     console.error("[!] plan.md is not in canonical format — skipping status update");
@@ -70007,7 +70189,7 @@ function updatePhaseStatus(planFile, phaseId, newStatus) {
   }
   const updatedFrontmatter = { ...frontmatter, status: planStatus };
   const updatedContent = import_gray_matter7.default.stringify(updatedBody, updatedFrontmatter);
-  writeFileSync5(planFile, updatedContent, "utf8");
+  writeFileSync7(planFile, updatedContent, "utf8");
   const planDir = dirname28(planFile);
   const phaseFilename = phaseNameFilenameFromTableRow(updatedBody, phaseId, planDir);
   if (phaseFilename && existsSync46(phaseFilename)) {
@@ -70022,18 +70204,18 @@ function phaseNameFilenameFromTableRow(body, phaseId, planDir) {
       continue;
     const linkMatch = /\[([^\]]+)\]\(\.\/([^)]+)\)/.exec(row);
     if (linkMatch)
-      return join101(planDir, linkMatch[2]);
+      return join103(planDir, linkMatch[2]);
   }
   return null;
 }
 function updatePhaseFileFrontmatter(phaseFile, newStatus) {
-  const raw = readFileSync14(phaseFile, "utf8");
+  const raw = readFileSync15(phaseFile, "utf8");
   const { data: frontmatter, content: body } = import_gray_matter7.default(raw);
   const updated = { ...frontmatter, status: newStatus };
-  writeFileSync5(phaseFile, import_gray_matter7.default.stringify(body, updated), "utf8");
+  writeFileSync7(phaseFile, import_gray_matter7.default.stringify(body, updated), "utf8");
 }
 function addPhase(planFile, name, afterId) {
-  const raw = readFileSync14(planFile, "utf8").replace(/\r\n/g, `
+  const raw = readFileSync15(planFile, "utf8").replace(/\r\n/g, `
 `);
   if (!isCanonicalFormat(raw)) {
     console.error("[!] plan.md is not in canonical format — cannot add phase");
@@ -70069,7 +70251,7 @@ function addPhase(planFile, name, afterId) {
         insertIdx = i;
     }
     if (insertIdx === -1) {
-      throw new Error(`Phase ID "${afterId}" not found in ${basename10(planFile)}`);
+      throw new Error(`Phase ID "${afterId}" not found in ${basename11(planFile)}`);
     }
     lines.splice(insertIdx + 1, 0, newRow);
     updatedBody = lines.join(`
@@ -70102,9 +70284,9 @@ function addPhase(planFile, name, afterId) {
     updatedBody = lines.join(`
 `);
   }
-  writeFileSync5(planFile, import_gray_matter7.default.stringify(updatedBody, frontmatter), "utf8");
-  const phaseFilePath = join101(planDir, filename);
-  writeFileSync5(phaseFilePath, generatePhaseTemplate({ id: phaseId, name }), "utf8");
+  writeFileSync7(planFile, import_gray_matter7.default.stringify(updatedBody, frontmatter), "utf8");
+  const phaseFilePath = join103(planDir, filename);
+  writeFileSync7(phaseFilePath, generatePhaseTemplate({ id: phaseId, name }), "utf8");
   return { phaseId, phaseFile: phaseFilePath };
 }
 
@@ -70152,7 +70334,7 @@ async function handleParse(target, options2) {
     console.log(JSON.stringify({ file: relative19(process.cwd(), planFile), frontmatter, phases }, null, 2));
     return;
   }
-  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename11(dirname30(planFile));
+  const title = typeof frontmatter.title === "string" ? frontmatter.title : basename12(dirname30(planFile));
   console.log();
   console.log(import_picocolors24.default.bold(`  Plan: ${title}`));
   console.log(`  File: ${planFile}`);
@@ -70206,8 +70388,8 @@ async function handleValidate(target, options2) {
     process.exitCode = 1;
 }
 async function handleStatus(target, options2) {
-  const t = target ? resolve25(target) : null;
-  const plansDir = t && existsSync47(t) && statSync4(t).isDirectory() && !existsSync47(join102(t, "plan.md")) ? t : null;
+  const t = target ? resolve26(target) : null;
+  const plansDir = t && existsSync47(t) && statSync4(t).isDirectory() && !existsSync47(join104(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -70232,14 +70414,14 @@ async function handleStatus(target, options2) {
       try {
         const s3 = buildPlanSummary(pf);
         const bar = progressBar(s3.completed, s3.totalPhases);
-        const title2 = s3.title ?? basename11(dirname30(pf));
+        const title2 = s3.title ?? basename12(dirname30(pf));
         console.log(`  ${import_picocolors24.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: ${basename11(dirname30(pf))}`);
+        console.log(`  [X] Failed to read: ${basename12(dirname30(pf))}`);
         console.log();
       }
     }
@@ -70263,7 +70445,7 @@ async function handleStatus(target, options2) {
     console.log(JSON.stringify(summary, null, 2));
     return;
   }
-  const title = summary.title ?? basename11(dirname30(planFile));
+  const title = summary.title ?? basename12(dirname30(planFile));
   console.log();
   console.log(import_picocolors24.default.bold(`  ${title}`));
   if (summary.status)
@@ -70289,7 +70471,7 @@ async function handleKanban(target, _options) {
 }
 
 // src/commands/plan/plan-write-handlers.ts
-import { basename as basename12, relative as relative20, resolve as resolve26 } from "node:path";
+import { basename as basename13, relative as relative20, resolve as resolve27 } from "node:path";
 init_output_manager();
 var import_picocolors25 = __toESM(require_picocolors(), 1);
 async function handleCreate(target, options2) {
@@ -70325,7 +70507,7 @@ async function handleCreate(target, options2) {
   const result = scaffoldPlan({
     title: options2.title,
     phases: phaseNames.map((name) => ({ name })),
-    dir: resolve26(dir),
+    dir: resolve27(dir),
     priority,
     issue: options2.issue ? Number(options2.issue) : undefined
   });
@@ -70339,10 +70521,10 @@ async function handleCreate(target, options2) {
   }
   console.log();
   console.log(import_picocolors25.default.bold(`  [OK] Plan created: ${options2.title}`));
-  console.log(`  Directory: ${resolve26(dir)}`);
+  console.log(`  Directory: ${resolve27(dir)}`);
   console.log(`  Phases: ${result.phaseFiles.length}`);
   for (const f4 of result.phaseFiles) {
-    console.log(`    [ ] ${basename12(f4)}`);
+    console.log(`    [ ] ${basename13(f4)}`);
   }
   console.log();
 }
@@ -70437,12 +70619,12 @@ async function handleAddPhase(target, options2) {
 
 // src/commands/plan/plan-command.ts
 function resolvePlanFile(target) {
-  const t = target ? resolve27(target) : process.cwd();
+  const t = target ? resolve28(target) : process.cwd();
   if (existsSync48(t)) {
     const stat13 = statSync5(t);
     if (stat13.isFile())
       return t;
-    const candidate = join103(t, "plan.md");
+    const candidate = join105(t, "plan.md");
     if (existsSync48(candidate))
       return candidate;
   }
@@ -70450,7 +70632,7 @@ function resolvePlanFile(target) {
     let dir = process.cwd();
     const root = parse2(dir).root;
     while (dir !== root) {
-      const candidate = join103(dir, "plan.md");
+      const candidate = join105(dir, "plan.md");
       if (existsSync48(candidate))
         return candidate;
       dir = dirname31(dir);
@@ -70501,7 +70683,7 @@ async function planCommand(action, target, options2) {
   let resolvedTarget = target;
   if (resolvedAction && !knownActions.has(resolvedAction)) {
     const looksLikePath = resolvedAction.includes("/") || resolvedAction.includes("\\") || resolvedAction.endsWith(".md") || resolvedAction === "." || resolvedAction === "..";
-    const existsOnDisk = !looksLikePath && existsSync48(resolve27(resolvedAction));
+    const existsOnDisk = !looksLikePath && existsSync48(resolve28(resolvedAction));
     if (looksLikePath || existsOnDisk) {
       resolvedTarget = resolvedAction;
       resolvedAction = undefined;
@@ -70540,7 +70722,7 @@ async function planCommand(action, target, options2) {
 }
 // src/commands/projects/add-handler.ts
 import { existsSync as existsSync49 } from "node:fs";
-import { resolve as resolve28 } from "node:path";
+import { resolve as resolve29 } from "node:path";
 // src/domains/takumi-data/claude-projects-scanner.ts
 init_logger();
 // src/commands/projects/add-handler.ts
@@ -70549,7 +70731,7 @@ var import_picocolors26 = __toESM(require_picocolors(), 1);
 async function handleAdd(projectPath, options2) {
   logger.debug(`Adding project: ${projectPath}, options: ${JSON.stringify(options2)}`);
   intro("Add Project");
-  const absolutePath = resolve28(projectPath);
+  const absolutePath = resolve29(projectPath);
   if (!existsSync49(absolutePath)) {
     log.error(`Path does not exist: ${absolutePath}`);
     process.exitCode = 1;
@@ -70721,23 +70903,23 @@ init_logger();
 init_logger();
 
 // src/commands/telemetry/shared.ts
-import { existsSync as existsSync50, readFileSync as readFileSync15, readdirSync as readdirSync6 } from "node:fs";
+import { existsSync as existsSync50, readFileSync as readFileSync16, readdirSync as readdirSync6 } from "node:fs";
 import { homedir as homedir24 } from "node:os";
-import { join as join104 } from "node:path";
+import { join as join106 } from "node:path";
 init_token_store();
 init_takumi_constants();
-var USER_CACHE_PATH = join104(homedir24(), ".claude", "sk-user.json");
-var EVENT_BUFFER_DIR = join104(homedir24(), ".claude", "sk-events");
-var RATE_STATE_PATH = join104(homedir24(), ".claude", "sk-rate-state.json");
-var TAKUMI_MANIFEST_PATH = join104(homedir24(), ".claude", MANIFEST_FILENAME);
-var LEGACY_METADATA_PATH = join104(homedir24(), ".claude", LEGACY_MANIFEST_FILENAME);
+var USER_CACHE_PATH = join106(homedir24(), ".claude", "sk-user.json");
+var EVENT_BUFFER_DIR = join106(homedir24(), ".claude", "sk-events");
+var RATE_STATE_PATH = join106(homedir24(), ".claude", "sk-rate-state.json");
+var TAKUMI_MANIFEST_PATH = join106(homedir24(), ".claude", MANIFEST_FILENAME);
+var LEGACY_METADATA_PATH = join106(homedir24(), ".claude", LEGACY_MANIFEST_FILENAME);
 var TELEMETRY_HOOK_FIELD = "hooks.telemetry";
 var TOKEN_PLACEHOLDER = "__INJECT_AT_RELEASE__";
 function readUserCache() {
   try {
     if (!existsSync50(USER_CACHE_PATH))
       return null;
-    const parsed = JSON.parse(readFileSync15(USER_CACHE_PATH, "utf8"));
+    const parsed = JSON.parse(readFileSync16(USER_CACHE_PATH, "utf8"));
     if (!parsed || typeof parsed !== "object")
       return null;
     return parsed;
@@ -70771,9 +70953,9 @@ function readTelemetryConfig() {
   const envToken = process.env.TAKUMI_TELEMETRY_TOKEN;
   let metadata = null;
   try {
-    const resolved = findManifestPathSync(join104(homedir24(), ".claude"));
+    const resolved = findManifestPathSync(join106(homedir24(), ".claude"));
     if (resolved) {
-      metadata = JSON.parse(readFileSync15(resolved.path, "utf8"));
+      metadata = JSON.parse(readFileSync16(resolved.path, "utf8"));
     }
   } catch {
     metadata = null;
@@ -70817,13 +70999,13 @@ async function handleDisable() {
 }
 // src/commands/telemetry/phases/purge-local-handler.ts
 init_logger();
-import { existsSync as existsSync51, readdirSync as readdirSync7, unlinkSync as unlinkSync5 } from "node:fs";
-import { join as join105 } from "node:path";
+import { existsSync as existsSync51, readdirSync as readdirSync7, unlinkSync as unlinkSync6 } from "node:fs";
+import { join as join107 } from "node:path";
 function removeIfExists(path9) {
   try {
     if (!existsSync51(path9))
       return false;
-    unlinkSync5(path9);
+    unlinkSync6(path9);
     return true;
   } catch {
     return false;
@@ -70838,7 +71020,7 @@ function removeBufferFiles() {
       if (!file.endsWith(".jsonl"))
         continue;
       try {
-        unlinkSync5(join105(EVENT_BUFFER_DIR, file));
+        unlinkSync6(join107(EVENT_BUFFER_DIR, file));
         count += 1;
       } catch {}
     }
@@ -71064,13 +71246,13 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync9, rmSync as rmSync6 } from "node:fs";
-import { join as join107, resolve as resolve29, sep as sep8 } from "node:path";
+import { join as join109, resolve as resolve30, sep as sep8 } from "node:path";
 init_logger();
 var import_fs_extra39 = __toESM(require_lib(), 1);
 
 // src/commands/uninstall/analysis-handler.ts
 import { existsSync as existsSync52, readdirSync as readdirSync8, rmSync as rmSync5 } from "node:fs";
-import { dirname as dirname32, join as join106 } from "node:path";
+import { dirname as dirname32, join as join108 } from "node:path";
 init_logger();
 init_takumi_constants();
 var import_picocolors29 = __toESM(require_picocolors(), 1);
@@ -71126,7 +71308,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 = join106(installation.path, trackedFile.path);
+      const filePath = join108(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -71158,7 +71340,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join106(installation.path, trackedFile.path);
+    const filePath = join108(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -71214,8 +71396,8 @@ async function isDirectory(filePath) {
 }
 async function isPathSafeToRemove(filePath, baseDir) {
   try {
-    const resolvedPath = resolve29(filePath);
-    const resolvedBase = resolve29(baseDir);
+    const resolvedPath = resolve30(filePath);
+    const resolvedBase = resolve30(baseDir);
     if (!resolvedPath.startsWith(resolvedBase + sep8) && resolvedPath !== resolvedBase) {
       logger.debug(`Path outside installation directory: ${filePath}`);
       return false;
@@ -71223,7 +71405,7 @@ async function isPathSafeToRemove(filePath, baseDir) {
     const stats = await import_fs_extra39.lstat(filePath);
     if (stats.isSymbolicLink()) {
       const realPath = await import_fs_extra39.realpath(filePath);
-      const resolvedReal = resolve29(realPath);
+      const resolvedReal = resolve30(realPath);
       if (!resolvedReal.startsWith(resolvedBase + sep8) && resolvedReal !== resolvedBase) {
         logger.debug(`Symlink points outside installation directory: ${filePath} -> ${realPath}`);
         return false;
@@ -71257,7 +71439,7 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join107(installation.path, item.path);
+        const filePath = join109(installation.path, item.path);
         if (!await import_fs_extra39.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -71625,7 +71807,7 @@ var import_fs_extra40 = __toESM(require_lib(), 1);
 // package.json
 var package_default = {
   name: "@sunasteriskrnd/takumi",
-  version: "1.0.0-dev.13",
+  version: "1.0.0-dev.15",
   description: "CLI tool for bootstrapping and managing Takumi projects",
   type: "module",
   repository: {
@@ -71938,12 +72120,12 @@ async function promptKitUpdate(beta, yes, deps) {
         args.push("--beta");
       const displayCmd = `tkm ${args.join(" ")}`;
       logger.info(`Running: ${displayCmd}`);
-      const spawnFn = deps?.spawnInitFn ?? ((spawnArgs) => new Promise((resolve30) => {
+      const spawnFn = deps?.spawnInitFn ?? ((spawnArgs) => new Promise((resolve31) => {
         const child = spawn2("tkm", spawnArgs, { stdio: "inherit", shell: true });
-        child.on("close", (code) => resolve30(code ?? 1));
+        child.on("close", (code) => resolve31(code ?? 1));
         child.on("error", (err) => {
           logger.verbose(`Failed to spawn tkm init: ${err.message}`);
-          resolve30(1);
+          resolve31(1);
         });
       }));
       const exitCode = await spawnFn(args);
@@ -72180,7 +72362,7 @@ async function fetchReleasesForKit(kitType, options2) {
     const filtered = options2.includePrereleases ? releases : releases.filter((r2) => !r2.draft && !r2.prerelease);
     return filtered.map((r2) => githubReleaseToEntry(r2, kitType));
   }
-  const worker = new WorkerSource(getServerUrl(), kitType);
+  const worker = new WorkerSource(getServerUrl(), backendIdOf(kitType));
   const entries = await worker.fetchReleaseList(options2.includePrereleases);
   return entries.slice(0, options2.limit);
 }
@@ -72232,7 +72414,7 @@ init_logger();
 import { existsSync as existsSync58 } from "node:fs";
 import { rm as rm10 } from "node:fs/promises";
 import { homedir as homedir26 } from "node:os";
-import { join as join114 } from "node:path";
+import { join as join116 } from "node:path";
 var import_picocolors32 = __toESM(require_picocolors(), 1);
 
 // src/commands/watch/phases/implementation-runner.ts
@@ -72301,7 +72483,7 @@ function getDisclaimerMarker() {
   return AI_DISCLAIMER;
 }
 function spawnAndCollect2(command, args) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -72314,7 +72496,7 @@ function spawnAndCollect2(command, args) {
         reject(new Error(`${command} exited with code ${code}: ${stderr}`));
         return;
       }
-      resolve30(Buffer.concat(chunks).toString("utf-8"));
+      resolve31(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
@@ -72414,7 +72596,7 @@ function formatResponse(content) {
   return disclaimer + formatted;
 }
 async function postViaGh(owner, repo, issueNumber, body) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const args = [
       "issue",
       "comment",
@@ -72436,7 +72618,7 @@ async function postViaGh(owner, repo, issueNumber, body) {
         reject(new Error(`gh exited with code ${code}: ${stderr}`));
         return;
       }
-      resolve30();
+      resolve31();
     });
   });
 }
@@ -72554,7 +72736,7 @@ After completing the implementation:
     "--allowedTools",
     tools
   ];
-  await new Promise((resolve30, reject) => {
+  await new Promise((resolve31, reject) => {
     const child = spawn6("claude", args, { cwd: cwd2, stdio: ["pipe", "pipe", "pipe"], detached: false });
     child.stdin.write(prompt);
     child.stdin.end();
@@ -72579,7 +72761,7 @@ After completing the implementation:
         reject(new Error(`Claude exited ${code}: ${stderr.slice(0, 500)}`));
         return;
       }
-      resolve30();
+      resolve31();
     });
   });
 }
@@ -72722,7 +72904,7 @@ function checkRateLimit2(processedThisHour, maxPerHour) {
   return processedThisHour < maxPerHour;
 }
 function spawnAndCollect3(command, args) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const child = spawn7(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     const chunks = [];
     const stderrChunks = [];
@@ -72735,14 +72917,14 @@ function spawnAndCollect3(command, args) {
         reject(new Error(`${command} exited with code ${code}: ${stderr}`));
         return;
       }
-      resolve30(Buffer.concat(chunks).toString("utf-8"));
+      resolve31(Buffer.concat(chunks).toString("utf-8"));
     });
   });
 }
 
 // src/commands/watch/phases/issue-processor.ts
 import { mkdir as mkdir29, writeFile as writeFile33 } from "node:fs/promises";
-import { join as join110 } from "node:path";
+import { join as join112 } from "node:path";
 
 // src/commands/watch/phases/approval-detector.ts
 init_logger();
@@ -72784,7 +72966,7 @@ async function invokeClaude(options2) {
   return collectClaudeOutput(child, options2.timeoutSec, verbose);
 }
 function collectClaudeOutput(child, timeoutSec, verbose = false) {
-  return new Promise((resolve30, reject) => {
+  return new Promise((resolve31, reject) => {
     const chunks = [];
     const stderrChunks = [];
     child.stdout?.on("data", (chunk) => {
@@ -72814,7 +72996,7 @@ function collectClaudeOutput(child, timeoutSec, verbose = false) {
         reject(new Error(`Claude exited with code ${code}: ${stderr}`));
         return;
       }
-      resolve30(verbose ? parseStreamJsonOutput(stdout2) : parseClaudeOutput(stdout2));
+      resolve31(verbose ? parseStreamJsonOutput(stdout2) : parseClaudeOutput(stdout2));
     });
   });
 }
@@ -73117,9 +73299,9 @@ async function checkAwaitingApproval(state, setup, options2, watchLog, projectDi
 
 // src/commands/watch/phases/plan-dir-finder.ts
 import { readdir as readdir32, stat as stat13 } from "node:fs/promises";
-import { join as join109 } from "node:path";
+import { join as join111 } from "node:path";
 async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
-  const plansRoot = join109(cwd2, "plans");
+  const plansRoot = join111(cwd2, "plans");
   try {
     const entries = await readdir32(plansRoot);
     const tenMinAgo = Date.now() - 10 * 60 * 1000;
@@ -73128,14 +73310,14 @@ async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
     for (const entry of entries) {
       if (entry === "watch" || entry === "reports" || entry === "visuals")
         continue;
-      const dirPath = join109(plansRoot, entry);
+      const dirPath = join111(plansRoot, entry);
       const dirStat = await stat13(dirPath);
       if (!dirStat.isDirectory())
         continue;
       if (dirStat.mtimeMs < tenMinAgo)
         continue;
       try {
-        await stat13(join109(dirPath, "plan.md"));
+        await stat13(join111(dirPath, "plan.md"));
       } catch {
         continue;
       }
@@ -73366,13 +73548,13 @@ async function handlePlanGeneration(issue, state, config, setup, options2, watch
     stats.plansCreated++;
     const detectedPlanDir = await findRecentPlanDir(projectDir, issue.number, watchLog);
     if (detectedPlanDir) {
-      state.activeIssues[numStr].planPath = join110(detectedPlanDir, "plan.md");
+      state.activeIssues[numStr].planPath = join112(detectedPlanDir, "plan.md");
       watchLog.info(`Plan directory detected: ${detectedPlanDir}`);
     } else {
       try {
-        const planDir = join110(projectDir, "plans", "watch");
+        const planDir = join112(projectDir, "plans", "watch");
         await mkdir29(planDir, { recursive: true });
-        const planFilePath = join110(planDir, `issue-${issue.number}-plan.md`);
+        const planFilePath = join112(planDir, `issue-${issue.number}-plan.md`);
         await writeFile33(planFilePath, planResult.planText, "utf-8");
         state.activeIssues[numStr].planPath = planFilePath;
         watchLog.info(`Plan saved (fallback) to ${planFilePath}`);
@@ -73677,18 +73859,18 @@ init_logger();
 import { spawnSync as spawnSync5 } from "node:child_process";
 import { existsSync as existsSync55 } from "node:fs";
 import { readdir as readdir33, stat as stat14 } from "node:fs/promises";
-import { join as join111 } from "node:path";
+import { join as join113 } from "node:path";
 async function scanForRepos(parentDir) {
   const repos = [];
   const entries = await readdir33(parentDir);
   for (const entry of entries) {
     if (entry.startsWith("."))
       continue;
-    const fullPath = join111(parentDir, entry);
+    const fullPath = join113(parentDir, entry);
     const entryStat = await stat14(fullPath);
     if (!entryStat.isDirectory())
       continue;
-    const gitDir = join111(fullPath, ".git");
+    const gitDir = join113(fullPath, ".git");
     if (!existsSync55(gitDir))
       continue;
     const result = spawnSync5("gh", ["repo", "view", "--json", "owner,name"], {
@@ -73715,7 +73897,7 @@ init_logger();
 import { spawnSync as spawnSync6 } from "node:child_process";
 import { existsSync as existsSync56 } from "node:fs";
 import { homedir as homedir25 } from "node:os";
-import { join as join112 } from "node:path";
+import { join as join114 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
   const ghVersion = spawnSync6("gh", ["--version"], { encoding: "utf-8", timeout: 1e4 });
@@ -73746,10 +73928,10 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join112(homedir25(), ".claude", "skills");
+  const skillsPath = join114(homedir25(), ".claude", "skills");
   const skillsAvailable = existsSync56(skillsPath);
   if (!skillsAvailable) {
-    logger.warning(`Takumi Engineer skills not found at ${skillsPath}`);
+    logger.warning(`Core skills not found at ${skillsPath}`);
   }
   return {
     repoOwner,
@@ -73765,7 +73947,7 @@ init_path_resolver();
 import { createWriteStream as createWriteStream4, statSync as statSync6 } from "node:fs";
 import { existsSync as existsSync57 } from "node:fs";
 import { mkdir as mkdir31, rename as rename9 } from "node:fs/promises";
-import { join as join113 } from "node:path";
+import { join as join115 } from "node:path";
 
 class WatchLogger {
   logStream = null;
@@ -73773,7 +73955,7 @@ class WatchLogger {
   logPath = null;
   maxBytes;
   constructor(logDir, maxBytes = 0) {
-    this.logDir = logDir ?? join113(PathResolver.getTakumiDir(), "logs");
+    this.logDir = logDir ?? join115(PathResolver.getTakumiDir(), "logs");
     this.maxBytes = maxBytes;
   }
   async init() {
@@ -73782,7 +73964,7 @@ class WatchLogger {
         await mkdir31(this.logDir, { recursive: true });
       }
       const dateStr = formatDate(new Date);
-      this.logPath = join113(this.logDir, `watch-${dateStr}.log`);
+      this.logPath = join115(this.logDir, `watch-${dateStr}.log`);
       this.logStream = createWriteStream4(this.logPath, { flags: "a", mode: 384 });
     } catch (error) {
       logger.warning(`Cannot create watch log file: ${error instanceof Error ? error.message : "Unknown"}`);
@@ -73962,7 +74144,7 @@ async function watchCommand(options2) {
 }
 async function discoverRepos(options2, watchLog) {
   const cwd2 = process.cwd();
-  const isGitRepo = existsSync58(join114(cwd2, ".git"));
+  const isGitRepo = existsSync58(join116(cwd2, ".git"));
   if (options2.force) {
     await forceRemoveLock(watchLog);
   }
@@ -74032,7 +74214,7 @@ async function resetState(state, projectDir, watchLog) {
   watchLog.info(`Watch state reset (--force) for ${projectDir}`);
 }
 async function forceRemoveLock(watchLog) {
-  const lockPath = join114(homedir26(), ".sunagentkit", "locks", `${LOCK_NAME}.lock`);
+  const lockPath = join116(homedir26(), ".sunagentkit", "locks", `${LOCK_NAME}.lock`);
   try {
     await rm10(lockPath, { recursive: true, force: true });
     watchLog.info("Removed existing lock file (--force)");
@@ -74071,18 +74253,18 @@ function formatQueueInfo(state) {
   return "idle";
 }
 function sleep2(ms2) {
-  return new Promise((resolve30) => setTimeout(resolve30, ms2));
+  return new Promise((resolve31) => setTimeout(resolve31, ms2));
 }
 // src/cli/command-registry.ts
 init_logger();
 function registerCommands(cli) {
-  cli.command("new", "Bootstrap a new Takumi project (with interactive version selection)").option("--dir <dir>", "Target directory (default: .)").option("--kit <kit>", "Kit(s) to install (engineer, extras). Repeat the flag to install multiple kits, e.g. --kit engineer --kit extras.").option("-r, --release <version>", "Skip version selection, use specific version (e.g., latest, v1.0.0)").option("--force", "Overwrite existing files without confirmation").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--opencode", "Install OpenCode CLI package (non-interactive mode)").option("--gemini", "Install Google Gemini CLI package (non-interactive mode)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").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("--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 Worker R2 proxy; default uses Worker)").action(async (options2) => {
+  cli.command("new", "Bootstrap a new 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("--force", "Overwrite existing files without confirmation").option("--exclude <pattern>", "Exclude files matching glob pattern (can be used multiple times)").option("--opencode", "Install OpenCode CLI package (non-interactive mode)").option("--gemini", "Install Google Gemini CLI package (non-interactive mode)").option("--install-skills", "Install skills dependencies (non-interactive mode)").option("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").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("--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 Worker R2 proxy; default uses Worker)").action(async (options2) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }
     await newCommand(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 (engineer, extras). Repeat the flag to install multiple kits, e.g. --kit engineer --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("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove SK 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("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass Worker R2 proxy; 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("-g, --global", "Use platform-specific user configuration directory").option("--fresh", "Full reset: remove SK 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("--with-sudo", "Include system packages requiring sudo (Linux: ffmpeg, imagemagick)").option("--prefix", "Add /sk: prefix to all slash commands by moving them to commands/sk/ subdirectory").option("--beta", "Show beta versions in selection prompt").option("--refresh", "Bypass release cache to fetch latest versions from GitHub").option("--dry-run", "Preview changes without applying them (requires --prefix)").option("--force-overwrite", "Override ownership protections and delete user-modified files (requires --prefix)").option("--force-overwrite-settings", "Fully replace settings.json instead of selective merge (destroys user customizations)").option("--skip-setup", "Skip interactive configuration wizard").option("--docs-dir <name>", "Custom docs folder name (default: docs)").option("--plans-dir <name>", "Custom plans folder name (default: plans)").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("--sync", "Sync config files from upstream with interactive hunk-by-hunk merge").option("--use-git", "Use git clone instead of GitHub API (uses SSH/HTTPS credentials)").option("--archive <path>", "Use local archive file instead of downloading (zip/tar.gz)").option("--kit-path <path>", "Use local kit directory instead of downloading").option("--local", "Use local monorepo as kit source (auto-detects from CLI location)").option("--use-gh", "Force GitHub release source (bypass Worker R2 proxy; 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];
     }
@@ -74124,13 +74306,13 @@ function registerCommands(cli) {
       process.exit(1);
     }
   });
-  cli.command("versions", "List available versions of Takumi repositories").option("--kit <kit>", "Filter by specific kit (engineer)").option("--limit <limit>", "Number of releases to show (default: 30)").option("--all", "Show the beta channel (prereleases only) instead of the stable channel. " + "On --use-gh, returns all release types interleaved.").option("--use-gh", "Use legacy GitHub release source (requires gh CLI)").action(async (options2) => {
+  cli.command("versions", "List available versions of Takumi repositories").option("--kit <kit>", "Filter by specific kit (core)").option("--limit <limit>", "Number of releases to show (default: 30)").option("--all", "Show the beta channel (prereleases only) instead of the stable channel. " + "On --use-gh, returns all release types interleaved.").option("--use-gh", "Use legacy GitHub release source (requires gh CLI)").action(async (options2) => {
     await versionCommand(options2);
   });
   cli.command("doctor", "Comprehensive health check for Takumi").option("--report", "Generate shareable diagnostic report").option("--fix", "Auto-fix all fixable issues").option("--check-only", "CI mode: no prompts, exit 1 on failures").option("--json", "Output JSON format").option("--full", "Include extended priority checks (slower)").action(async (options2) => {
     await doctorCommand(options2);
   });
-  cli.command("uninstall", "Remove Takumi installations").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("-l, --local", "Uninstall only local installation (current project)").option("-g, --global", "Uninstall only global installation (~/.claude/)").option("-A, --all", "Uninstall from both local and global locations").option("-k, --kit <type>", "Uninstall specific kit only (engineer)").option("--dry-run", "Preview what would be removed without deleting").option("--force-overwrite", "Delete even user-modified files (requires confirmation)").action(async (options2) => {
+  cli.command("uninstall", "Remove Takumi installations").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("-l, --local", "Uninstall only local installation (current project)").option("-g, --global", "Uninstall only global installation (~/.claude/)").option("-A, --all", "Uninstall from both local and global locations").option("-k, --kit <type>", "Uninstall specific kit only (core)").option("--dry-run", "Preview what would be removed without deleting").option("--force-overwrite", "Delete even user-modified files (requires confirmation)").action(async (options2) => {
     await uninstallCommand(options2);
   });
   cli.command("content [action] [id]", "Multi-channel content automation (start|stop|status|logs|setup|queue|approve|reject)").option("--dry-run", "Generate content without publishing").option("--verbose", "Enable verbose logging").option("--force", "Kill existing process and start fresh").option("--tail", "Follow log output (for logs action)").option("--reason <reason>", "Rejection reason (for reject action)").action(async (action, id, options2) => {
@@ -74212,8 +74394,8 @@ function registerCommands(cli) {
 }
 
 // src/cli/version-display.ts
-import { readFileSync as readFileSync20 } from "node:fs";
-import { join as join126 } from "node:path";
+import { readFileSync as readFileSync21 } from "node:fs";
+import { join as join128 } from "node:path";
 init_help_banner();
 // src/domains/versioning/checking/kit-version-checker.ts
 init_github_client();
@@ -74225,14 +74407,14 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync69 } from "node:fs";
 import { mkdir as mkdir32, readFile as readFile47, writeFile as writeFile36 } from "node:fs/promises";
-import { join as join125 } from "node:path";
+import { join as join127 } from "node:path";
 
 class VersionCacheManager {
   static CACHE_FILENAME = "version-check.json";
   static CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
   static getCacheFile() {
     const cacheDir = PathResolver.getCacheDir(false);
-    return join125(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join127(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
@@ -74295,7 +74477,7 @@ class VersionCacheManager {
 async function fetchLatestRelease(currentVersion) {
   try {
     const githubClient = new GitHubClient;
-    const kit = AVAILABLE_KITS.engineer;
+    const kit = AVAILABLE_KITS.core;
     const timeoutPromise = new Promise((_4, reject) => setTimeout(() => reject(new Error("Timeout")), 5000));
     const releasePromise = githubClient.getLatestRelease(kit);
     const release = await Promise.race([releasePromise, timeoutPromise]);
@@ -74525,7 +74707,7 @@ async function displayVersion() {
     const localSubdir = PROVIDER_LOCAL_SUBDIRS[provider];
     if (!localSubdir)
       continue;
-    const localRoot = join126(process.cwd(), localSubdir);
+    const localRoot = join128(process.cwd(), localSubdir);
     if (localRoot === inst.globalRoot())
       continue;
     const resolved = findManifestPathSync(localRoot);
@@ -74535,7 +74717,7 @@ async function displayVersion() {
   }
   for (const { provider, path: metaPath } of localChecks) {
     try {
-      const rawMetadata = JSON.parse(readFileSync20(metaPath, "utf-8"));
+      const rawMetadata = JSON.parse(readFileSync21(metaPath, "utf-8"));
       const metadata = MetadataSchema.parse(rawMetadata);
       const kitsDisplay = formatInstalledKits(metadata);
       if (kitsDisplay) {
@@ -74555,7 +74737,7 @@ async function displayVersion() {
     const resolved = findManifestPathSync(installPath);
     if (resolved) {
       try {
-        const rawMetadata = JSON.parse(readFileSync20(resolved.path, "utf-8"));
+        const rawMetadata = JSON.parse(readFileSync21(resolved.path, "utf-8"));
         const metadata = MetadataSchema.parse(rawMetadata);
         const kitsDisplay = formatInstalledKits(metadata);
         if (kitsDisplay) {