@sunasteriskrnd/takumi 0.5.0 → 0.6.0

package/dist/index.js

@@ -11225,12 +11225,12 @@ function isSafeRelativeLayoutPath(value) {
   return segments.every((segment) => segment.length > 0 && segment !== "." && segment !== "..");
 }
 function isValidKitType(value) {
-  return value === "engineer";
+  return value === "engineer" || value === "extras";
 }
-var KitType, KitConfigSchema, KitLayoutSchema, TakumiPackageMetadataSchema, DEFAULT_KIT_LAYOUT, AVAILABLE_KITS, NEVER_COPY_PATTERNS, USER_CONFIG_PATTERNS, PROTECTED_PATTERNS;
+var KitType, KitConfigSchema, KitLayoutSchema, TakumiPackageMetadataSchema, DEFAULT_KIT_LAYOUT, AVAILABLE_KITS, BASE_KIT = "engineer", NEVER_COPY_PATTERNS, USER_CONFIG_PATTERNS, PROTECTED_PATTERNS;
 var init_kit = __esm(() => {
   init_zod();
-  KitType = exports_external.enum(["engineer"]);
+  KitType = exports_external.enum(["engineer", "extras"]);
   KitConfigSchema = exports_external.object({
     id: KitType,
     name: exports_external.string(),
@@ -11256,6 +11256,13 @@ var init_kit = __esm(() => {
       repo: "takumi",
       owner: "sun-asterisk-internal",
       description: "Engineering toolkit for building with Claude"
+    },
+    extras: {
+      id: "extras",
+      name: "Takumi Extras",
+      repo: "takumi-extras",
+      owner: "sun-asterisk-internal",
+      description: "Extras agent kit"
     }
   };
   NEVER_COPY_PATTERNS = [
@@ -11444,13 +11451,14 @@ var init_metadata = __esm(() => {
   KitMetadataSchema = exports_external.object({
     version: exports_external.string(),
     installedAt: exports_external.string(),
+    installState: exports_external.enum(["pending", "complete"]).optional(),
     files: exports_external.array(TrackedFileSchema).optional(),
     lastUpdateCheck: exports_external.string().optional(),
     dismissedVersion: exports_external.string().optional(),
     installedSettings: InstalledSettingsSchema.optional()
   });
   MultiKitMetadataSchema = exports_external.object({
-    kits: exports_external.record(KitType, KitMetadataSchema).optional(),
+    kits: exports_external.record(exports_external.string(), KitMetadataSchema).optional(),
     scope: exports_external.enum(["local", "global"]).optional(),
     name: exports_external.string().optional(),
     version: exports_external.string().optional(),
@@ -12116,6 +12124,7 @@ __export(exports_types, {
   DEFAULT_FOLDERS: () => DEFAULT_FOLDERS,
   ConfigSchema: () => ConfigSchema,
   CodingLevelSchema: () => CodingLevelSchema,
+  BASE_KIT: () => BASE_KIT,
   AuthenticationError: () => AuthenticationError,
   ApiStatusOptionsSchema: () => ApiStatusOptionsSchema,
   ApiSetupOptionsSchema: () => ApiSetupOptionsSchema,
@@ -34554,9 +34563,9 @@ __export(exports_worktree_manager, {
 });
 import { existsSync as existsSync60 } from "node:fs";
 import { readFile as readFile49, writeFile as writeFile36 } from "node:fs/promises";
-import { join as join119 } from "node:path";
+import { join as join120 } from "node:path";
 async function createWorktree(projectDir, issueNumber, baseBranch) {
-  const worktreePath = join119(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join120(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`);
@@ -34574,7 +34583,7 @@ async function createWorktree(projectDir, issueNumber, baseBranch) {
   return worktreePath;
 }
 async function removeWorktree(projectDir, issueNumber) {
-  const worktreePath = join119(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
+  const worktreePath = join120(projectDir, WORKTREE_DIR, `issue-${issueNumber}`);
   const branchName = `sk-watch/issue-${issueNumber}`;
   try {
     await spawnAndCollect("git", ["worktree", "remove", worktreePath, "--force"], projectDir);
@@ -34588,7 +34597,7 @@ async function listActiveWorktrees(projectDir) {
   try {
     const output2 = await spawnAndCollect("git", ["worktree", "list", "--porcelain"], projectDir);
     const issueNumbers = [];
-    const worktreePrefix = join119(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
+    const worktreePrefix = join120(projectDir, WORKTREE_DIR, "issue-").replace(/\\/g, "/");
     for (const line of output2.split(`
 `)) {
       if (line.startsWith("worktree ")) {
@@ -34616,7 +34625,7 @@ async function cleanupAllWorktrees(projectDir) {
   await spawnAndCollect("git", ["worktree", "prune"], projectDir).catch(() => {});
 }
 async function ensureGitignore(projectDir) {
-  const gitignorePath = join119(projectDir, ".gitignore");
+  const gitignorePath = join120(projectDir, ".gitignore");
   try {
     const content = existsSync60(gitignorePath) ? await readFile49(gitignorePath, "utf-8") : "";
     if (!content.includes(".worktrees")) {
@@ -34723,7 +34732,7 @@ import { createHash as createHash8 } from "node:crypto";
 import { existsSync as existsSync66, mkdirSync as mkdirSync4, readFileSync as readFileSync16, readdirSync as readdirSync10, statSync as statSync7 } from "node:fs";
 import { rename as rename10, writeFile as writeFile38 } from "node:fs/promises";
 import { homedir as homedir32 } from "node:os";
-import { basename as basename17, join as join126 } from "node:path";
+import { basename as basename17, join as join127 } from "node:path";
 function getCachedContext(repoPath) {
   const cachePath = getCacheFilePath(repoPath);
   if (!existsSync66(cachePath))
@@ -34766,25 +34775,25 @@ function computeSourceHash(repoPath) {
 }
 function getDocSourcePaths(repoPath) {
   const paths = [];
-  const docsDir = join126(repoPath, "docs");
+  const docsDir = join127(repoPath, "docs");
   if (existsSync66(docsDir)) {
     try {
       const files = readdirSync10(docsDir);
       for (const f4 of files) {
         if (f4.endsWith(".md"))
-          paths.push(join126(docsDir, f4));
+          paths.push(join127(docsDir, f4));
       }
     } catch {}
   }
-  const readme = join126(repoPath, "README.md");
+  const readme = join127(repoPath, "README.md");
   if (existsSync66(readme))
     paths.push(readme);
-  const stylesDir = join126(repoPath, "assets", "writing-styles");
+  const stylesDir = join127(repoPath, "assets", "writing-styles");
   if (existsSync66(stylesDir)) {
     try {
       const files = readdirSync10(stylesDir);
       for (const f4 of files) {
-        paths.push(join126(stylesDir, f4));
+        paths.push(join127(stylesDir, f4));
       }
     } catch {}
   }
@@ -34793,11 +34802,11 @@ function getDocSourcePaths(repoPath) {
 function getCacheFilePath(repoPath) {
   const repoName = basename17(repoPath).replace(/[^a-zA-Z0-9_-]/g, "_");
   const pathHash = createHash8("sha256").update(repoPath).digest("hex").slice(0, 8);
-  return join126(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
+  return join127(CACHE_DIR, `${repoName}-${pathHash}-context-cache.json`);
 }
 var CACHE_DIR, CACHE_TTL_MS3;
 var init_context_cache_manager = __esm(() => {
-  CACHE_DIR = join126(homedir32(), ".sunagentkit", "cache");
+  CACHE_DIR = join127(homedir32(), ".sunagentkit", "cache");
   CACHE_TTL_MS3 = 24 * 60 * 60 * 1000;
 });
 
@@ -34978,7 +34987,7 @@ function extractContentFromResponse(response) {
 // src/commands/content/phases/docs-summarizer.ts
 import { execSync as execSync5 } from "node:child_process";
 import { existsSync as existsSync67, readFileSync as readFileSync17, readdirSync as readdirSync11 } from "node:fs";
-import { join as join127 } from "node:path";
+import { join as join128 } from "node:path";
 async function summarizeProjectDocs(repoPath, contentLogger) {
   const rawContent = collectRawDocs(repoPath);
   if (rawContent.total.length < 200) {
@@ -35032,12 +35041,12 @@ function collectRawDocs(repoPath) {
     return capped;
   };
   const docsContent = [];
-  const docsDir = join127(repoPath, "docs");
+  const docsDir = join128(repoPath, "docs");
   if (existsSync67(docsDir)) {
     try {
       const files = readdirSync11(docsDir).filter((f4) => f4.endsWith(".md")).sort();
       for (const f4 of files) {
-        const content = readCapped(join127(docsDir, f4), 5000);
+        const content = readCapped(join128(docsDir, f4), 5000);
         if (content) {
           docsContent.push(`### ${f4}
 ${content}`);
@@ -35051,21 +35060,21 @@ ${content}`);
   let brand = "";
   const brandCandidates = ["docs/brand-guidelines.md", "docs/design-guidelines.md"];
   for (const p2 of brandCandidates) {
-    brand = readCapped(join127(repoPath, p2), 3000);
+    brand = readCapped(join128(repoPath, p2), 3000);
     if (brand)
       break;
   }
   let styles3 = "";
-  const stylesDir = join127(repoPath, "assets", "writing-styles");
+  const stylesDir = join128(repoPath, "assets", "writing-styles");
   if (existsSync67(stylesDir)) {
     try {
       const files = readdirSync11(stylesDir).slice(0, 3);
-      styles3 = files.map((f4) => readCapped(join127(stylesDir, f4), 1000)).filter(Boolean).join(`
+      styles3 = files.map((f4) => readCapped(join128(stylesDir, f4), 1000)).filter(Boolean).join(`
 
 `);
     } catch {}
   }
-  const readme = readCapped(join127(repoPath, "README.md"), 3000);
+  const readme = readCapped(join128(repoPath, "README.md"), 3000);
   const total = [docs, brand, styles3, readme].join(`
 `);
   return { docs, brand, styles: styles3, readme, total };
@@ -35252,9 +35261,9 @@ IMPORTANT: Generate the image and output the path as JSON: {"imagePath": "/path/
 import { execSync as execSync6 } from "node:child_process";
 import { existsSync as existsSync68, mkdirSync as mkdirSync5, readdirSync as readdirSync12 } from "node:fs";
 import { homedir as homedir33 } from "node:os";
-import { join as join128 } from "node:path";
+import { join as join129 } from "node:path";
 async function generatePhoto(_content, context, config, platform10, contentId, contentLogger) {
-  const mediaDir = join128(config.contentDir.replace(/^~/, homedir33()), "media", String(contentId));
+  const mediaDir = join129(config.contentDir.replace(/^~/, homedir33()), "media", String(contentId));
   if (!existsSync68(mediaDir)) {
     mkdirSync5(mediaDir, { recursive: true });
   }
@@ -35279,7 +35288,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: join128(mediaDir, imageFile), ...dimensions, format: ext2 };
+      return { path: join129(mediaDir, imageFile), ...dimensions, format: ext2 };
     }
     contentLogger.warn(`Photo generation produced no image for content ${contentId}`);
     return null;
@@ -35369,7 +35378,7 @@ var init_content_creator = __esm(() => {
 // src/commands/content/phases/content-logger.ts
 import { createWriteStream as createWriteStream5, existsSync as existsSync69, mkdirSync as mkdirSync6, statSync as statSync8 } from "node:fs";
 import { homedir as homedir34 } from "node:os";
-import { join as join129 } from "node:path";
+import { join as join130 } from "node:path";
 
 class ContentLogger {
   stream = null;
@@ -35377,7 +35386,7 @@ class ContentLogger {
   logDir;
   maxBytes;
   constructor(maxBytes = 0) {
-    this.logDir = join129(homedir34(), ".sunagentkit", "logs");
+    this.logDir = join130(homedir34(), ".sunagentkit", "logs");
     this.maxBytes = maxBytes;
   }
   init() {
@@ -35409,7 +35418,7 @@ class ContentLogger {
     }
   }
   getLogPath() {
-    return join129(this.logDir, `content-${this.getDateStr()}.log`);
+    return join130(this.logDir, `content-${this.getDateStr()}.log`);
   }
   write(level, message) {
     this.rotateIfNeeded();
@@ -35426,18 +35435,18 @@ class ContentLogger {
     if (dateStr !== this.currentDate) {
       this.close();
       this.currentDate = dateStr;
-      const logPath = join129(this.logDir, `content-${dateStr}.log`);
+      const logPath = join130(this.logDir, `content-${dateStr}.log`);
       this.stream = createWriteStream5(logPath, { flags: "a", mode: 384 });
       return;
     }
     if (this.maxBytes > 0 && this.stream) {
-      const logPath = join129(this.logDir, `content-${this.currentDate}.log`);
+      const logPath = join130(this.logDir, `content-${this.currentDate}.log`);
       try {
         const stat16 = statSync8(logPath);
         if (stat16.size >= this.maxBytes) {
           this.close();
           const suffix = Date.now();
-          const rotatedPath = join129(this.logDir, `content-${this.currentDate}-${suffix}.log`);
+          const rotatedPath = join130(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 });
         }
@@ -35663,7 +35672,7 @@ function isNoiseCommit(title, author) {
 // src/commands/content/phases/change-detector.ts
 import { execSync as execSync8 } from "node:child_process";
 import { existsSync as existsSync71, readFileSync as readFileSync18, readdirSync as readdirSync13, statSync as statSync9 } from "node:fs";
-import { join as join130 } from "node:path";
+import { join as join131 } from "node:path";
 function detectCommits(repo, since) {
   try {
     const fetchUrl = sshToHttps(repo.remoteUrl);
@@ -35761,7 +35770,7 @@ function detectTags(repo, since) {
   }
 }
 function detectCompletedPlans(repo, since) {
-  const plansDir = join130(repo.path, "plans");
+  const plansDir = join131(repo.path, "plans");
   if (!existsSync71(plansDir))
     return [];
   const sinceMs = new Date(since).getTime();
@@ -35771,7 +35780,7 @@ function detectCompletedPlans(repo, since) {
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const planFile = join130(plansDir, entry.name, "plan.md");
+      const planFile = join131(plansDir, entry.name, "plan.md");
       if (!existsSync71(planFile))
         continue;
       try {
@@ -35849,7 +35858,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 join131 } from "node:path";
+import { join as join132 } from "node:path";
 function discoverRepos2(cwd2) {
   const repos = [];
   if (isGitRepoRoot(cwd2)) {
@@ -35862,7 +35871,7 @@ function discoverRepos2(cwd2) {
     for (const entry of entries) {
       if (!entry.isDirectory() || entry.name.startsWith("."))
         continue;
-      const dirPath = join131(cwd2, entry.name);
+      const dirPath = join132(cwd2, entry.name);
       if (isGitRepoRoot(dirPath)) {
         const info = getRepoInfo(dirPath);
         if (info)
@@ -36529,9 +36538,9 @@ var init_types3 = __esm(() => {
 
 // src/commands/content/phases/state-manager.ts
 import { readFile as readFile51, rename as rename11, writeFile as writeFile39 } from "node:fs/promises";
-import { join as join132 } from "node:path";
+import { join as join133 } from "node:path";
 async function loadContentConfig(projectDir) {
-  const configPath = join132(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join133(projectDir, TAKUMI_CONFIG_FILE2);
   try {
     const raw = await readFile51(configPath, "utf-8");
     const json = JSON.parse(raw);
@@ -36541,13 +36550,13 @@ async function loadContentConfig(projectDir) {
   }
 }
 async function saveContentConfig(projectDir, config) {
-  const configPath = join132(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join133(projectDir, TAKUMI_CONFIG_FILE2);
   const json = await readJsonSafe(configPath);
   json.content = { ...json.content, ...config };
   await atomicWrite3(configPath, json);
 }
 async function loadContentState(projectDir) {
-  const configPath = join132(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join133(projectDir, TAKUMI_CONFIG_FILE2);
   try {
     const raw = await readFile51(configPath, "utf-8");
     const json = JSON.parse(raw);
@@ -36558,7 +36567,7 @@ async function loadContentState(projectDir) {
   }
 }
 async function saveContentState(projectDir, state) {
-  const configPath = join132(projectDir, TAKUMI_CONFIG_FILE2);
+  const configPath = join133(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);
@@ -36840,7 +36849,7 @@ var init_platform_setup_x = __esm(() => {
 
 // src/commands/content/phases/setup-wizard.ts
 import { existsSync as existsSync72 } from "node:fs";
-import { join as join133 } from "node:path";
+import { join as join134 } from "node:path";
 async function runSetupWizard2(cwd2, contentLogger) {
   console.log();
   oe(import_picocolors40.default.bgCyan(import_picocolors40.default.white(" SK Content — Multi-Channel Content Engine ")));
@@ -36908,8 +36917,8 @@ async function showRepoSummary(cwd2) {
 function detectBrandAssets(cwd2, contentLogger) {
   const repos = discoverRepos2(cwd2);
   for (const repo of repos) {
-    const hasGuidelines = existsSync72(join133(repo.path, "docs", "brand-guidelines.md"));
-    const hasStyles = existsSync72(join133(repo.path, "assets", "writing-styles"));
+    const hasGuidelines = existsSync72(join134(repo.path, "docs", "brand-guidelines.md"));
+    const hasStyles = existsSync72(join134(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`);
@@ -37051,9 +37060,9 @@ __export(exports_content_subcommands, {
 });
 import { existsSync as existsSync74, readFileSync as readFileSync19, unlinkSync as unlinkSync6 } from "node:fs";
 import { homedir as homedir36 } from "node:os";
-import { join as join134 } from "node:path";
+import { join as join135 } from "node:path";
 function isDaemonRunning() {
-  const lockFile = join134(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join135(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync74(lockFile))
     return { running: false, pid: null };
   try {
@@ -37085,7 +37094,7 @@ async function startContent(options2) {
   await contentCommand(options2);
 }
 async function stopContent() {
-  const lockFile = join134(LOCK_DIR, `${LOCK_NAME2}.lock`);
+  const lockFile = join135(LOCK_DIR, `${LOCK_NAME2}.lock`);
   if (!existsSync74(lockFile)) {
     logger.info("Content daemon is not running.");
     return;
@@ -37124,9 +37133,9 @@ async function statusContent() {
   } catch {}
 }
 async function logsContent(options2) {
-  const logDir = join134(homedir36(), ".sunagentkit", "logs");
+  const logDir = join135(homedir36(), ".sunagentkit", "logs");
   const dateStr = new Date().toISOString().slice(0, 10).replace(/-/g, "");
-  const logPath = join134(logDir, `content-${dateStr}.log`);
+  const logPath = join135(logDir, `content-${dateStr}.log`);
   if (!existsSync74(logPath)) {
     logger.info("No content logs found for today.");
     return;
@@ -37158,13 +37167,13 @@ var init_content_subcommands = __esm(() => {
   init_setup_wizard();
   init_state_manager();
   init_content_review_commands();
-  LOCK_DIR = join134(homedir36(), ".sunagentkit", "locks");
+  LOCK_DIR = join135(homedir36(), ".sunagentkit", "locks");
 });
 
 // src/commands/content/content-command.ts
 import { existsSync as existsSync75, mkdirSync as mkdirSync8, unlinkSync as unlinkSync7, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir37 } from "node:os";
-import { join as join135 } from "node:path";
+import { join as join136 } from "node:path";
 async function contentCommand(options2) {
   const cwd2 = process.cwd();
   const contentLogger = new ContentLogger;
@@ -37342,8 +37351,8 @@ var init_content_command = __esm(() => {
   init_publisher();
   init_review_manager();
   init_state_manager();
-  LOCK_DIR2 = join135(homedir37(), ".sunagentkit", "locks");
-  LOCK_FILE = join135(LOCK_DIR2, "sk-content.lock");
+  LOCK_DIR2 = join136(homedir37(), ".sunagentkit", "locks");
+  LOCK_FILE = join136(LOCK_DIR2, "sk-content.lock");
 });
 
 // src/commands/content/index.ts
@@ -49278,28 +49287,32 @@ var import_fs_extra6 = __toESM(require_lib(), 1);
 var import_picomatch = __toESM(require_picomatch2(), 1);
 function findFileInMetadata(metadata, path3) {
   if (!metadata)
-    return null;
+    return { tracked: null, ownerKit: null };
   if (metadata.kits) {
-    for (const kitMeta of Object.values(metadata.kits)) {
-      if (kitMeta?.files) {
-        const found = kitMeta.files.find((f3) => f3.path === path3);
-        if (found)
-          return found;
-      }
+    for (const [kitName, kitMeta] of Object.entries(metadata.kits)) {
+      if (!kitMeta?.files)
+        continue;
+      const found = kitMeta.files.find((f3) => f3.path === path3);
+      if (found)
+        return { tracked: found, ownerKit: kitName };
     }
   }
   if (metadata.files) {
     const found = metadata.files.find((f3) => f3.path === path3);
     if (found)
-      return found;
+      return { tracked: found, ownerKit: null };
   }
-  return null;
+  return { tracked: null, ownerKit: null };
 }
-function shouldDeletePath(path3, metadata) {
-  const tracked = findFileInMetadata(metadata, path3);
+function shouldDeletePath(path3, metadata, installingKit) {
+  const { tracked, ownerKit } = findFileInMetadata(metadata, path3);
   if (!tracked)
     return true;
-  return tracked.ownership !== "user";
+  if (tracked.ownership === "user")
+    return false;
+  if (installingKit && ownerKit && ownerKit !== installingKit)
+    return false;
+  return true;
 }
 function collectFilesRecursively(dir, baseDir) {
   const results = [];
@@ -49422,7 +49435,7 @@ async function updateMetadataAfterDeletion(claudeDir, deletedPaths) {
     logger.debug("Failed to write updated metadata.json");
   }
 }
-async function handleDeletions(sourceMetadata, claudeDir) {
+async function handleDeletions(sourceMetadata, claudeDir, installingKit) {
   const deletionPatterns = sourceMetadata.deletions || [];
   if (deletionPatterns.length === 0) {
     return { deletedPaths: [], preservedPaths: [], errors: [] };
@@ -49439,9 +49452,9 @@ async function handleDeletions(sourceMetadata, claudeDir) {
       result.errors.push(path3);
       continue;
     }
-    if (!shouldDeletePath(path3, userMetadata)) {
+    if (!shouldDeletePath(path3, userMetadata, installingKit)) {
       result.preservedPaths.push(path3);
-      logger.verbose(`Preserved user file: ${path3}`);
+      logger.verbose(`Preserved file (cross-kit or user-owned): ${path3}`);
       continue;
     }
     if (existsSync13(fullPath)) {
@@ -52510,14 +52523,17 @@ async function writeManifest(providerRoot, kitName, version3, scope, kitType, tr
         logger.debug(`Could not read existing metadata: ${error}`);
       }
     }
+    const existingKits = existingMetadata.kits || {};
+    const otherKitsExist = Object.keys(existingKits).some((k2) => k2 !== kit);
     const installedAt = new Date().toISOString();
+    const existingKitMeta = existingKits[kit];
     const kitMetadata = {
+      ...existingKitMeta ?? {},
       version: version3,
       installedAt,
+      installState: "complete",
       files: trackedFiles.length > 0 ? trackedFiles : undefined
     };
-    const existingKits = existingMetadata.kits || {};
-    const otherKitsExist = Object.keys(existingKits).some((k2) => k2 !== kit);
     const metadata = {
       kits: {
         ...existingKits,
@@ -52548,6 +52564,69 @@ async function writeManifest(providerRoot, kitName, version3, scope, kitType, tr
     }
   }
 }
+async function writeKitPending(providerRoot, kit, version3, scope) {
+  const metadataPath = join28(providerRoot, "metadata.json");
+  await import_fs_extra10.ensureFile(metadataPath);
+  let release = null;
+  try {
+    release = await import_proper_lockfile4.lock(metadataPath, {
+      retries: { retries: 5, minTimeout: 100, maxTimeout: 1000 },
+      stale: 60000
+    });
+    logger.debug(`Acquired lock on ${metadataPath} for pending-state write`);
+    const migrationResult = await migrateToMultiKit(providerRoot);
+    if (!migrationResult.success) {
+      logger.warning(`Metadata migration warning: ${migrationResult.error}`);
+    }
+    let existingMetadata = { kits: {} };
+    if (await import_fs_extra10.pathExists(metadataPath)) {
+      try {
+        const content = await import_fs_extra10.readFile(metadataPath, "utf-8");
+        const parsed = JSON.parse(content);
+        if (parsed && typeof parsed === "object" && Object.keys(parsed).length > 0) {
+          existingMetadata = parsed;
+        }
+      } catch (error) {
+        logger.debug(`Could not read existing metadata: ${error}`);
+      }
+    }
+    const existingKits = existingMetadata.kits || {};
+    const pendingMetadata = {
+      version: version3,
+      installedAt: new Date().toISOString(),
+      installState: "pending",
+      files: []
+    };
+    const metadata = {
+      ...existingMetadata,
+      kits: {
+        ...existingKits,
+        [kit]: pendingMetadata
+      },
+      scope
+    };
+    const validated = MetadataSchema.parse(metadata);
+    await import_fs_extra10.writeFile(metadataPath, JSON.stringify(validated, null, 2), "utf-8");
+    logger.debug(`Wrote pending-state entry for kit "${kit}"`);
+  } finally {
+    if (release) {
+      await release();
+      logger.debug(`Released lock on ${metadataPath}`);
+    }
+  }
+}
+async function findPendingKits(providerRoot) {
+  const metadata = await readManifest(providerRoot);
+  if (!metadata?.kits)
+    return [];
+  const pending = [];
+  for (const [kitName, kitMeta] of Object.entries(metadata.kits)) {
+    if (kitMeta?.installState === "pending") {
+      pending.push(kitName);
+    }
+  }
+  return pending;
+}
 async function removeKitFromManifest(providerRoot, kit) {
   const metadataPath = join28(providerRoot, "metadata.json");
   if (!await import_fs_extra10.pathExists(metadataPath))
@@ -52749,6 +52828,12 @@ class ManifestWriter {
   async writeManifest(providerRoot, kitName, version3, scope, kitType) {
     return writeManifest(providerRoot, kitName, version3, scope, kitType, this.getTrackedFiles(), this.getUserConfigFiles());
   }
+  static async writeKitPending(providerRoot, kit, version3, scope) {
+    return writeKitPending(providerRoot, kit, version3, scope);
+  }
+  static async findPendingKits(providerRoot) {
+    return findPendingKits(providerRoot);
+  }
   static async readManifest(providerRoot) {
     return readManifest(providerRoot);
   }
@@ -53716,7 +53801,7 @@ async function handleMerge(ctx) {
   }
   try {
     if (sourceMetadata?.deletions && sourceMetadata.deletions.length > 0) {
-      const deletionResult = await handleDeletions(sourceMetadata, ctx.claudeDir);
+      const deletionResult = await handleDeletions(sourceMetadata, ctx.claudeDir, ctx.kitType);
       if (deletionResult.deletedPaths.length > 0) {
         logger.info(`Removed ${deletionResult.deletedPaths.length} deprecated file(s)`);
         for (const path4 of deletionResult.deletedPaths) {
@@ -63269,6 +63354,9 @@ async function doctorCommand(options2 = {}) {
   }
 }
 
+// src/commands/init/init-command.ts
+import { join as join102 } from "node:path";
+
 // src/domains/sync/config-version-checker.ts
 init_auth_client();
 import { mkdir as mkdir22, readFile as readFile38, unlink as unlink12, writeFile as writeFile29 } from "node:fs/promises";
@@ -64049,7 +64137,96 @@ async function maybeShowConfigUpdateNotification(claudeDir, global3) {
 init_package_installer();
 init_logger();
 
+// src/domains/ui/prompts/agent-selection-prompts.ts
+init_provider_registry();
+
+// src/services/package-installer/agent-cli-detector.ts
+init_process_executor();
+var DETECT_TIMEOUT_MS = 5000;
+var BINARY_CANDIDATES = {
+  "claude-code": process.platform === "win32" ? ["claude.exe", "claude.cmd", "claude"] : ["claude"],
+  codex: process.platform === "win32" ? ["codex.exe", "codex.cmd", "codex"] : ["codex"]
+};
+async function probeBinary(candidates) {
+  for (const bin of candidates) {
+    const needsShell = process.platform === "win32" && /\.(cmd|bat)$/i.test(bin);
+    try {
+      const { stdout: stdout2 } = await execFileAsync5(bin, ["--version"], {
+        timeout: DETECT_TIMEOUT_MS,
+        encoding: "utf8",
+        shell: needsShell
+      });
+      return typeof stdout2 === "string" ? stdout2 : String(stdout2);
+    } catch {}
+  }
+  return null;
+}
+function extractVersion(stdout2) {
+  const match2 = stdout2.match(/(\d+\.\d+\.\d+(?:[-+][\w.]+)?)/);
+  return match2 ? match2[1] : undefined;
+}
+async function detectAgentInstallations(providers2) {
+  const probes = providers2.filter((p) => (p in BINARY_CANDIDATES)).map(async (provider) => {
+    const candidates = BINARY_CANDIDATES[provider];
+    if (!candidates) {
+      return [provider, { installed: false }];
+    }
+    const stdout2 = await probeBinary(candidates);
+    const detection = stdout2 ? { installed: true, version: extractVersion(stdout2) } : { installed: false };
+    return [provider, detection];
+  });
+  const entries = await Promise.all(probes);
+  const result = {};
+  for (const [provider, detection] of entries) {
+    result[provider] = detection;
+  }
+  return result;
+}
+
+// src/domains/ui/prompts/agent-selection-prompts.ts
+function buildDetectionNote(supported, detections) {
+  const lines = supported.map((provider) => {
+    const detection = detections[provider];
+    const label = providers[provider]?.displayName ?? provider;
+    if (detection?.installed) {
+      const version3 = detection.version ? ` v${detection.version}` : "";
+      return `  ✓ ${label}${version3} detected on PATH`;
+    }
+    return `  ✗ ${label} not detected on PATH`;
+  });
+  lines.push("");
+  lines.push("Init writes config files regardless — detection only informs defaults.");
+  return lines.join(`
+`);
+}
+function computeInitialSelection(supported, detections) {
+  if (detections["claude-code"]?.installed)
+    return ["claude-code"];
+  const firstInstalled = supported.find((p) => detections[p]?.installed);
+  return firstInstalled ? [firstInstalled] : [];
+}
+async function promptAgentSelection(supported) {
+  const detections = await detectAgentInstallations(supported);
+  note(buildDetectionNote(supported, detections), "Detected agent CLIs");
+  const options2 = supported.map((provider) => {
+    const detection = detections[provider];
+    const label = providers[provider]?.displayName ?? provider;
+    const hint = detection?.installed ? detection.version ? `installed v${detection.version}` : "installed" : "not detected — config will still be written";
+    return { value: provider, label, hint };
+  });
+  const initialValues = computeInitialSelection(supported, detections);
+  const selected = await ae({
+    message: "Select agent(s) to initialize",
+    options: options2,
+    required: true,
+    initialValues
+  });
+  if (lD(selected))
+    return null;
+  return selected;
+}
 // src/domains/ui/prompts/kit-prompts.ts
+init_logger();
 init_types2();
 async function selectKit(defaultKit, accessibleKits) {
   const kits = accessibleKits ?? Object.keys(AVAILABLE_KITS);
@@ -64067,6 +64244,39 @@ async function selectKit(defaultKit, accessibleKits) {
   }
   return kit;
 }
+async function selectKits(accessibleKits, defaults2) {
+  const kits = accessibleKits ?? Object.keys(AVAILABLE_KITS);
+  const options2 = kits.map((key) => {
+    const isBase = key === BASE_KIT;
+    const cfg = AVAILABLE_KITS[key];
+    return {
+      value: key,
+      label: isBase ? `${cfg.name} (base, required)` : cfg.name,
+      hint: cfg.description
+    };
+  });
+  const initialValues = defaults2 && defaults2.length > 0 ? Array.from(new Set([BASE_KIT, ...defaults2])).filter((k2) => kits.includes(k2)) : kits;
+  const selected = await ae({
+    message: "Select kit(s) to install:",
+    options: options2,
+    initialValues,
+    required: true
+  });
+  if (lD(selected)) {
+    throw new Error("Kit selection cancelled");
+  }
+  const result = selected;
+  if (!result.includes(BASE_KIT) && kits.includes(BASE_KIT)) {
+    logger.info(`"${AVAILABLE_KITS[BASE_KIT].name}" is the base kit and was added back automatically.`);
+    result.unshift(BASE_KIT);
+  }
+  const idx = result.indexOf(BASE_KIT);
+  if (idx > 0) {
+    result.splice(idx, 1);
+    result.unshift(BASE_KIT);
+  }
+  return result;
+}
 async function getDirectory(defaultDir = ".") {
   const dir = await te({
     message: "Enter target directory:",
@@ -64730,6 +64940,9 @@ class PromptsManager {
   async selectKit(defaultKit, accessibleKits) {
     return selectKit(defaultKit, accessibleKits);
   }
+  async selectKits(accessibleKits, defaults2) {
+    return selectKits(accessibleKits, defaults2);
+  }
   async selectVersion(versions, defaultVersion) {
     return selectVersion(versions, defaultVersion);
   }
@@ -64805,6 +65018,9 @@ class PromptsManager {
   async promptSkillsInstallation() {
     return promptSkillsInstallation();
   }
+  async promptAgentSelection(supported) {
+    return promptAgentSelection(supported);
+  }
   showPackageInstallationResults(results) {
     const successfulInstalls = [];
     const failedInstalls = [];
@@ -64868,6 +65084,8 @@ class PromptsManager {
 
 // src/commands/init/init-command.ts
 init_logger();
+init_path_resolver();
+init_types2();
 
 // src/commands/init/context-factory.ts
 function createInitContext(rawOptions, prompts) {
@@ -69545,8 +69763,28 @@ async function handleDownload(ctx) {
 // src/commands/init/phases/options-resolver.ts
 init_logger();
 init_types2();
+function parseKitFlag(raw) {
+  const tokens = raw.split(",").map((s3) => s3.trim()).filter((s3) => s3.length > 0);
+  if (tokens.length === 0)
+    return null;
+  if (tokens.length === 1 && tokens[0] === "all") {
+    return Object.keys(AVAILABLE_KITS);
+  }
+  const seen = new Set;
+  const out = [];
+  for (const tok of tokens) {
+    if (!isValidKitType(tok))
+      return null;
+    if (!seen.has(tok)) {
+      seen.add(tok);
+      out.push(tok);
+    }
+  }
+  return out;
+}
 async function resolveOptions(ctx) {
   const explicitDir = ctx.rawOptions.dir !== undefined;
+  const explicitAgents = Array.isArray(ctx.rawOptions.agents) && ctx.rawOptions.agents.length > 0;
   const parsed = UpdateCommandOptionsSchema.parse(ctx.rawOptions);
   const validOptions = {
     kit: parsed.kit,
@@ -69589,8 +69827,6 @@ async function resolveOptions(ctx) {
 ` + "For other agents, run init without --sync to perform a fresh install.");
     }
     validOptions.agents = Array.from(new Set(validOptions.agents));
-  } else {
-    validOptions.agents = ["claude-code"];
   }
   ConfigManager.setGlobalFlag(validOptions.global);
   if (validOptions.global) {
@@ -69635,10 +69871,52 @@ Example: takumi init --use-git --release v2.1.0`);
 Choose one approach.`);
   }
   const isNonInteractive2 = validOptions.yes || !process.stdin.isTTY || process.env.CI === "true" || process.env.NON_INTERACTIVE === "true";
+  if (validOptions.kit) {
+    const parsed2 = parseKitFlag(validOptions.kit);
+    if (!parsed2 || parsed2.length === 0) {
+      throw new Error(`Invalid --kit value: "${validOptions.kit}".
+Valid kits: ${Object.keys(AVAILABLE_KITS).join(", ")}`);
+    }
+    if (!parsed2.includes(BASE_KIT)) {
+      if (isNonInteractive2) {
+        throw new Error(`The "${BASE_KIT}" kit is required when installing additional kits.
+Re-run with explicit base kit, e.g. --kit ${BASE_KIT} --kit ${parsed2.join(" --kit ")}`);
+      }
+      logger.info(`"${BASE_KIT}" is the required base kit — adding it automatically.`);
+      parsed2.unshift(BASE_KIT);
+    } else {
+      const idx = parsed2.indexOf(BASE_KIT);
+      if (idx > 0) {
+        parsed2.splice(idx, 1);
+        parsed2.unshift(BASE_KIT);
+      }
+    }
+    validOptions.selectedKits = parsed2;
+  }
   if (validOptions.yes) {
     logger.info("Running in non-interactive mode (--yes flag)");
   }
   const initialInstallSkills = validOptions.installSkills ? true : undefined;
+  if (!explicitAgents) {
+    if (isNonInteractive2) {
+      validOptions.agents = ["claude-code"];
+    } else {
+      const supported = listSupportedProviders();
+      const selected = await ctx.prompts.promptAgentSelection(supported);
+      if (selected === null) {
+        logger.warning("Agent selection cancelled");
+        return {
+          ...ctx,
+          options: validOptions,
+          explicitDir,
+          isNonInteractive: isNonInteractive2,
+          installSkills: initialInstallSkills,
+          cancelled: true
+        };
+      }
+      validOptions.agents = selected;
+    }
+  }
   return {
     ...ctx,
     options: validOptions,
@@ -70052,48 +70330,58 @@ async function handleSelection(ctx) {
       return { ...ctx, cancelled: true };
     }
   }
-  let kitType;
-  const kitOption = ctx.options.kit || config.defaults?.kit;
-  if (kitOption) {
+  let selectedKits = ctx.options.selectedKits;
+  if (!selectedKits || selectedKits.length === 0) {
     const allKitTypes = Object.keys(AVAILABLE_KITS);
-    if (kitOption === "all" || kitOption.includes(",")) {
-      const kitsToInstall = accessibleKits ?? allKitTypes;
-      if (kitsToInstall.length === 0) {
-        logger.error("No kits accessible for installation");
-        return { ...ctx, cancelled: true };
-      }
-      kitType = kitsToInstall[0];
-      logger.info(`Using kit: ${AVAILABLE_KITS[kitType].name}`);
-    } else {
-      if (!isValidKitType(kitOption)) {
+    const kitOption = ctx.options.kit || config.defaults?.kit;
+    if (kitOption) {
+      if (kitOption === "all") {
+        selectedKits = accessibleKits ?? allKitTypes;
+      } else if (!isValidKitType(kitOption)) {
         logger.error(`Invalid kit: ${kitOption}`);
         logger.info(`Valid kits: ${allKitTypes.join(", ")}`);
         return { ...ctx, cancelled: true };
+      } else {
+        selectedKits = [kitOption];
       }
-      kitType = kitOption;
-      if (accessibleKits && !accessibleKits.includes(kitType)) {
-        logger.error(`No access to ${AVAILABLE_KITS[kitType].name}`);
-        logger.info("Request access from your team lead or check your GitHub invitation");
-        return { ...ctx, cancelled: true };
+    }
+    if (!selectedKits || selectedKits.length === 0) {
+      if (ctx.isNonInteractive) {
+        if (!accessibleKits || accessibleKits.length === 0) {
+          throw new Error("Kit must be specified via --kit flag in non-interactive mode (no accessible kits detected)");
+        }
+        selectedKits = [accessibleKits[0]];
+        logger.info(`Auto-selected: ${AVAILABLE_KITS[selectedKits[0]].name}`);
+      } else if (accessibleKits?.length === 1) {
+        selectedKits = [accessibleKits[0]];
+        logger.info(`Using ${AVAILABLE_KITS[selectedKits[0]].name} (only accessible kit)`);
+      } else {
+        selectedKits = await ctx.prompts.selectKits(accessibleKits);
       }
     }
   }
-  if (!kitType) {
-    if (ctx.isNonInteractive) {
-      if (!accessibleKits || accessibleKits.length === 0) {
-        throw new Error("Kit must be specified via --kit flag in non-interactive mode (no accessible kits detected)");
-      }
-      kitType = accessibleKits[0];
-      logger.info(`Auto-selected: ${AVAILABLE_KITS[kitType].name}`);
-    } else if (accessibleKits?.length === 1) {
-      kitType = accessibleKits[0];
-      logger.info(`Using ${AVAILABLE_KITS[kitType].name} (only accessible kit)`);
-    } else {
-      kitType = await ctx.prompts.selectKit(undefined, accessibleKits);
+  if (accessibleKits) {
+    const inaccessible = selectedKits.filter((k3) => !accessibleKits.includes(k3));
+    if (inaccessible.length > 0) {
+      logger.error(`No access to: ${inaccessible.map((k3) => AVAILABLE_KITS[k3].name).join(", ")}`);
+      logger.info("Request access from your team lead or check your GitHub invitation");
+      return { ...ctx, cancelled: true };
+    }
+  }
+  if (selectedKits.includes(BASE_KIT)) {
+    const idx = selectedKits.indexOf(BASE_KIT);
+    if (idx > 0) {
+      selectedKits.splice(idx, 1);
+      selectedKits.unshift(BASE_KIT);
     }
   }
+  const kitType = selectedKits[0];
   const kit = AVAILABLE_KITS[kitType];
-  logger.info(`Selected kit: ${kit.name}`);
+  if (selectedKits.length > 1) {
+    logger.info(`Selected kits: ${selectedKits.map((k3) => AVAILABLE_KITS[k3].name).join(", ")} (installed in order)`);
+  } else {
+    logger.info(`Selected kit: ${kit.name}`);
+  }
   let targetDir;
   if (ctx.explicitDir) {
     targetDir = ctx.options.dir;
@@ -70302,12 +70590,30 @@ async function handleSelection(ctx) {
     ...ctx,
     kit,
     kitType,
+    selectedKits,
     resolvedDir,
     release,
     selectedVersion,
     accessibleKits
   };
 }
+async function resolveReleaseForKit(ctx, kitType) {
+  const isOfflineMode = !!(ctx.options.kitPath || ctx.options.archive);
+  if (isOfflineMode)
+    return;
+  const kit = AVAILABLE_KITS[kitType];
+  if (ctx.options.useGit) {
+    throw new Error(`--use-git is not supported for multi-kit installs (secondary kit: ${kitType}). Run kits individually.`);
+  }
+  if (ctx.options.useGh) {
+    const github = new GitHubClient;
+    const release = await github.getLatestRelease(kit, ctx.options.beta);
+    return release;
+  }
+  const worker = new WorkerSource(getServerUrl(), kitType);
+  const entry = await worker.fetchLatest(ctx.options.beta);
+  return releaseEntryToGitHubRelease(entry, kit);
+}
 function resolveGlobalTargetDir(targetAgents) {
   const primary = targetAgents[0];
   if (primary) {
@@ -70348,7 +70654,7 @@ async function handleSync(ctx) {
 Run 'takumi init' to update.`, "Legacy Installation");
     return { ...ctx, cancelled: true };
   }
-  let kitType = ctx.options.kit;
+  let kitType = ctx.options.selectedKits?.[0];
   if (!kitType) {
     const engineerMeta = await readKitManifest(claudeDir, "engineer");
     if (engineerMeta) {
@@ -71181,23 +71487,91 @@ async function executeInit(options2, prompts) {
   ctx = await handleSelection(ctx);
   if (ctx.cancelled)
     return;
-  ctx = await handleDownload(ctx);
-  if (ctx.cancelled)
+  if (ctx.resolvedDir && !isSyncMode) {
+    try {
+      const prefix = PathResolver.getPathPrefix(ctx.options.global);
+      const claudeDir = prefix ? join102(ctx.resolvedDir, prefix) : ctx.resolvedDir;
+      const pending = await ManifestWriter.findPendingKits(claudeDir);
+      if (pending.length > 0) {
+        logger.warning(`Previous install was interrupted for kit(s): ${pending.join(", ")}. Re-running install will overwrite the pending entry.`);
+      }
+    } catch (error) {
+      logger.debug(`Pending-kit check skipped: ${error}`);
+    }
+  }
+  const selectedKits = ctx.selectedKits && ctx.selectedKits.length > 0 ? ctx.selectedKits : ctx.kitType ? [ctx.kitType] : [];
+  if (selectedKits.length === 0) {
+    logger.error("No kits resolved for installation");
     return;
-  if (!isSyncMode) {
-    ctx = await handleTransforms(ctx);
-    if (ctx.cancelled)
-      return;
   }
-  if (isSyncMode) {
-    ctx = await executeSyncMerge(ctx);
-    if (ctx.cancelled)
+  const aggregatedResults = [];
+  let lastCtx = ctx;
+  for (let i = 0;i < selectedKits.length; i++) {
+    const currentKit = selectedKits[i];
+    if (i > 0) {
+      logger.info(`Installing kit ${i + 1}/${selectedKits.length}: ${AVAILABLE_KITS[currentKit].name}`);
+      if (lastCtx.options.release) {
+        logger.info(`Secondary kit "${currentKit}" uses latest channel — --release applies only to the primary kit.`);
+      }
+      let nextRelease;
+      try {
+        nextRelease = await resolveReleaseForKit(lastCtx, currentKit);
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger.error(`Failed to resolve release for ${currentKit}: ${message}`);
+        aggregatedResults.push({
+          provider: targetAgents[0] ?? "claude-code",
+          success: false,
+          cancelled: false,
+          installedFiles: [],
+          error: `Release fetch failed for kit "${currentKit}": ${message}`
+        });
+        continue;
+      }
+      lastCtx = {
+        ...lastCtx,
+        kit: AVAILABLE_KITS[currentKit],
+        kitType: currentKit,
+        release: nextRelease,
+        selectedVersion: nextRelease?.tag_name,
+        tempDir: undefined,
+        extractDir: undefined,
+        archivePath: undefined
+      };
+    } else if (selectedKits.length > 1) {
+      logger.info(`Installing kit ${i + 1}/${selectedKits.length}: ${AVAILABLE_KITS[currentKit].name}`);
+    }
+    if (lastCtx.resolvedDir && lastCtx.release && !isSyncMode) {
+      try {
+        const prefix = PathResolver.getPathPrefix(lastCtx.options.global);
+        const claudeDir = prefix ? join102(lastCtx.resolvedDir, prefix) : lastCtx.resolvedDir;
+        const scope = lastCtx.options.global ? "global" : "local";
+        await ManifestWriter.writeKitPending(claudeDir, currentKit, lastCtx.release.tag_name, scope);
+      } catch (error) {
+        logger.debug(`writeKitPending skipped: ${error}`);
+      }
+    }
+    lastCtx = await handleDownload(lastCtx);
+    if (lastCtx.cancelled)
+      return;
+    if (!isSyncMode) {
+      lastCtx = await handleTransforms(lastCtx);
+      if (lastCtx.cancelled)
+        return;
+    }
+    if (isSyncMode) {
+      lastCtx = await executeSyncMerge(lastCtx);
+      if (lastCtx.cancelled)
+        return;
+    }
+    const kitResults = await dispatchInstallers(lastCtx, targetAgents);
+    aggregatedResults.push(...kitResults);
+    if (kitResults.some((r2) => r2.cancelled))
       return;
   }
-  const results = await dispatchInstallers(ctx, targetAgents);
+  ctx = lastCtx;
+  const results = aggregatedResults;
   ctx.installerResults = results;
-  if (results.some((r2) => r2.cancelled))
-    return;
   if (targetAgents.length > 1) {
     displayMultiInstallerSummary(results);
   }
@@ -71258,7 +71632,7 @@ async function initCommand(options2) {
 import { existsSync as existsSync47 } from "node:fs";
 import { readFile as readFile45, rm as rm13, unlink as unlink15 } from "node:fs/promises";
 import { homedir as homedir25 } from "node:os";
-import { basename as basename12, join as join102, resolve as resolve26 } from "node:path";
+import { basename as basename12, join as join103, resolve as resolve26 } from "node:path";
 init_dist2();
 var import_picocolors27 = __toESM(require_picocolors(), 1);
 init_logger();
@@ -71740,7 +72114,7 @@ async function executeDeleteAction(action, options2) {
 async function processMetadataDeletions(skillSourcePath, installGlobally) {
   if (!skillSourcePath)
     return;
-  const sourceMetadataPath = join102(resolve26(skillSourcePath, ".."), "metadata.json");
+  const sourceMetadataPath = join103(resolve26(skillSourcePath, ".."), "metadata.json");
   if (!existsSync47(sourceMetadataPath))
     return;
   let sourceMetadata;
@@ -71753,11 +72127,11 @@ async function processMetadataDeletions(skillSourcePath, installGlobally) {
   }
   if (!sourceMetadata.deletions || sourceMetadata.deletions.length === 0)
     return;
-  const claudeDir = installGlobally ? join102(homedir25(), ".claude") : join102(process.cwd(), ".claude");
+  const claudeDir = installGlobally ? join103(homedir25(), ".claude") : join103(process.cwd(), ".claude");
   if (!existsSync47(claudeDir))
     return;
   try {
-    const result = await handleDeletions(sourceMetadata, claudeDir);
+    const result = await handleDeletions(sourceMetadata, claudeDir, undefined);
     if (result.deletedPaths.length > 0) {
       logger.verbose(`[migrate] Cleaned up ${result.deletedPaths.length} deprecated path(s): ${result.deletedPaths.join(", ")}`);
     }
@@ -71901,8 +72275,8 @@ async function migrateCommand(options2) {
     selectedProviders = Array.from(new Set(selectedProviders));
     let installGlobally = options2.global ?? false;
     if (options2.global === undefined && !options2.yes) {
-      const projectTarget = join102(process.cwd(), ".claude");
-      const globalTarget = join102(homedir25(), ".claude");
+      const projectTarget = join103(process.cwd(), ".claude");
+      const globalTarget = join103(homedir25(), ".claude");
       const scopeChoice = await ie({
         message: "Installation scope",
         options: [
@@ -71954,7 +72328,7 @@ async function migrateCommand(options2) {
     }
     const providerNames = selectedProviders.map((prov) => import_picocolors27.default.cyan(providers[prov].displayName)).join(", ");
     f2.message(`  Providers: ${providerNames}`);
-    const targetDir = installGlobally ? join102(homedir25(), ".claude") : join102(process.cwd(), ".claude");
+    const targetDir = installGlobally ? join103(homedir25(), ".claude") : join103(process.cwd(), ".claude");
     f2.message(`  Scope: ${installGlobally ? "Global" : "Project"} ${import_picocolors27.default.dim(`-> ${targetDir}`)}`);
     const cmdProviders = getProvidersSupporting("commands");
     const unsupportedCmd = selectedProviders.filter((pv) => !cmdProviders.includes(pv));
@@ -72464,7 +72838,7 @@ async function handleDirectorySetup(ctx) {
   };
 }
 // src/commands/new/phases/project-creation.ts
-import { join as join103 } from "node:path";
+import { join as join104 } from "node:path";
 init_github_client();
 init_logger();
 init_output_manager();
@@ -72618,7 +72992,7 @@ async function projectCreation(kit, resolvedDir, validOptions, isNonInteractive2
   output.section("Installing");
   logger.verbose("Installation target", { directory: resolvedDir });
   const merger = new FileMerger;
-  const claudeDir = join103(resolvedDir, ".claude");
+  const claudeDir = join104(resolvedDir, ".claude");
   merger.setMultiKitContext(claudeDir, kit);
   if (validOptions.exclude && validOptions.exclude.length > 0) {
     merger.addIgnorePatterns(validOptions.exclude);
@@ -72671,10 +73045,10 @@ async function handleProjectCreation(ctx) {
   };
 }
 // src/commands/new/phases/post-setup.ts
-import { join as join105 } from "node:path";
+import { join as join106 } from "node:path";
 
 // src/domains/installation/setup-wizard.ts
-import { join as join104 } from "node:path";
+import { join as join105 } from "node:path";
 init_logger();
 init_dist2();
 var import_fs_extra36 = __toESM(require_lib(), 1);
@@ -72754,7 +73128,7 @@ async function parseEnvFile(path9) {
   }
 }
 async function checkGlobalConfig() {
-  const globalEnvPath = join104(getClaudeDir(), ".env");
+  const globalEnvPath = join105(getClaudeDir(), ".env");
   if (!await import_fs_extra36.pathExists(globalEnvPath))
     return false;
   const env2 = await parseEnvFile(globalEnvPath);
@@ -72770,7 +73144,7 @@ async function runSetupWizard(options2) {
   let globalEnv = {};
   const hasGlobalConfig = !isGlobal && await checkGlobalConfig();
   if (!isGlobal) {
-    const globalEnvPath = join104(getClaudeDir(), ".env");
+    const globalEnvPath = join105(getClaudeDir(), ".env");
     if (await import_fs_extra36.pathExists(globalEnvPath)) {
       globalEnv = await parseEnvFile(globalEnvPath);
     }
@@ -72833,7 +73207,7 @@ async function runSetupWizard(options2) {
     }
   }
   await generateEnvFile(targetDir, values);
-  f2.success(`Configuration saved to ${join104(targetDir, ".env")}`);
+  f2.success(`Configuration saved to ${join105(targetDir, ".env")}`);
   return true;
 }
 async function promptForAdditionalGeminiKeys(primaryKey) {
@@ -72936,9 +73310,9 @@ async function postSetup(resolvedDir, validOptions, isNonInteractive2, prompts)
       withSudo: validOptions.withSudo
     });
   }
-  const claudeDir = join105(resolvedDir, ".claude");
+  const claudeDir = join106(resolvedDir, ".claude");
   await promptSetupWizardIfNeeded({
-    envPath: join105(claudeDir, ".env"),
+    envPath: join106(claudeDir, ".env"),
     claudeDir,
     isGlobal: false,
     isNonInteractive: isNonInteractive2,
@@ -73015,11 +73389,11 @@ Example: tkm new --use-git --release v2.1.0`);
 // src/commands/plan/plan-command.ts
 init_output_manager();
 import { existsSync as existsSync52, statSync as statSync5 } from "node:fs";
-import { dirname as dirname33, join as join109, parse as parse2, resolve as resolve31 } from "node:path";
+import { dirname as dirname33, join as join110, parse as parse2, resolve as resolve31 } from "node:path";
 
 // src/commands/plan/plan-read-handlers.ts
 import { existsSync as existsSync51, statSync as statSync4 } from "node:fs";
-import { basename as basename15, dirname as dirname32, join as join108, relative as relative20, resolve as resolve29 } from "node:path";
+import { basename as basename15, dirname as dirname32, join as join109, relative as relative20, resolve as resolve29 } from "node:path";
 
 // src/domains/plan-parser/index.ts
 import { dirname as dirname31 } from "node:path";
@@ -73400,12 +73774,12 @@ function parsePlanFile(planFilePath, options2) {
 }
 // src/domains/plan-parser/plan-scanner.ts
 import { existsSync as existsSync48, readdirSync as readdirSync5 } from "node:fs";
-import { join as join106 } from "node:path";
+import { join as join107 } from "node:path";
 function scanPlanDir(dir) {
   if (!existsSync48(dir))
     return [];
   try {
-    return readdirSync5(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join106(dir, entry.name, "plan.md")).filter(existsSync48);
+    return readdirSync5(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join107(dir, entry.name, "plan.md")).filter(existsSync48);
   } catch {
     return [];
   }
@@ -73474,7 +73848,7 @@ function validatePlanFile(filePath, strict = false) {
 var import_gray_matter7 = __toESM(require_gray_matter(), 1);
 import { mkdirSync as mkdirSync3, readFileSync as readFileSync14, writeFileSync as writeFileSync5 } from "node:fs";
 import { existsSync as existsSync50 } from "node:fs";
-import { basename as basename14, dirname as dirname30, join as join107 } from "node:path";
+import { basename as basename14, dirname as dirname30, join as join108 } from "node:path";
 function phaseNameToFilename(id, name) {
   const numMatch = /^(\d+)([a-z]*)$/i.exec(id);
   const num = numMatch ? numMatch[1] : id;
@@ -73582,12 +73956,12 @@ function scaffoldPlan(options2) {
   mkdirSync3(dir, { recursive: true });
   const resolvedPhases = resolvePhaseIds(options2.phases);
   const optionsWithResolved = { ...options2, phases: resolvedPhases };
-  const planFile = join107(dir, "plan.md");
+  const planFile = join108(dir, "plan.md");
   writeFileSync5(planFile, generatePlanMd(optionsWithResolved), "utf8");
   const phaseFiles = [];
   for (const phase of resolvedPhases) {
     const filename = phaseNameToFilename(phase.id, phase.name);
-    const phaseFile = join107(dir, filename);
+    const phaseFile = join108(dir, filename);
     writeFileSync5(phaseFile, generatePhaseTemplate(phase), "utf8");
     phaseFiles.push(phaseFile);
   }
@@ -73667,7 +74041,7 @@ function phaseNameFilenameFromTableRow(body, phaseId, planDir) {
       continue;
     const linkMatch = /\[([^\]]+)\]\(\.\/([^)]+)\)/.exec(row);
     if (linkMatch)
-      return join107(planDir, linkMatch[2]);
+      return join108(planDir, linkMatch[2]);
   }
   return null;
 }
@@ -73748,7 +74122,7 @@ function addPhase(planFile, name, afterId) {
 `);
   }
   writeFileSync5(planFile, import_gray_matter7.default.stringify(updatedBody, frontmatter), "utf8");
-  const phaseFilePath = join107(planDir, filename);
+  const phaseFilePath = join108(planDir, filename);
   writeFileSync5(phaseFilePath, generatePhaseTemplate({ id: phaseId, name }), "utf8");
   return { phaseId, phaseFile: phaseFilePath };
 }
@@ -73852,7 +74226,7 @@ async function handleValidate(target, options2) {
 }
 async function handleStatus(target, options2) {
   const t = target ? resolve29(target) : null;
-  const plansDir = t && existsSync51(t) && statSync4(t).isDirectory() && !existsSync51(join108(t, "plan.md")) ? t : null;
+  const plansDir = t && existsSync51(t) && statSync4(t).isDirectory() && !existsSync51(join109(t, "plan.md")) ? t : null;
   if (plansDir) {
     const planFiles = scanPlanDir(plansDir);
     if (planFiles.length === 0) {
@@ -74087,7 +74461,7 @@ function resolvePlanFile(target) {
     const stat13 = statSync5(t);
     if (stat13.isFile())
       return t;
-    const candidate = join109(t, "plan.md");
+    const candidate = join110(t, "plan.md");
     if (existsSync52(candidate))
       return candidate;
   }
@@ -74095,7 +74469,7 @@ function resolvePlanFile(target) {
     let dir = process.cwd();
     const root = parse2(dir).root;
     while (dir !== root) {
-      const candidate = join109(dir, "plan.md");
+      const candidate = join110(dir, "plan.md");
       if (existsSync52(candidate))
         return candidate;
       dir = dirname33(dir);
@@ -74367,112 +74741,112 @@ var import_picocolors34 = __toESM(require_picocolors(), 1);
 // src/commands/skills/agents.ts
 import { existsSync as existsSync54 } from "node:fs";
 import { homedir as homedir26 } from "node:os";
-import { join as join110 } from "node:path";
+import { join as join111 } from "node:path";
 var home6 = homedir26();
 var agents = {
   "claude-code": {
     name: "claude-code",
     displayName: "Claude Code",
     projectPath: ".claude/skills",
-    globalPath: join110(home6, ".claude/skills"),
-    detect: async () => existsSync54(join110(home6, ".claude"))
+    globalPath: join111(home6, ".claude/skills"),
+    detect: async () => existsSync54(join111(home6, ".claude"))
   },
   cursor: {
     name: "cursor",
     displayName: "Cursor",
     projectPath: ".cursor/skills",
-    globalPath: join110(home6, ".cursor/skills"),
-    detect: async () => existsSync54(join110(home6, ".cursor"))
+    globalPath: join111(home6, ".cursor/skills"),
+    detect: async () => existsSync54(join111(home6, ".cursor"))
   },
   codex: {
     name: "codex",
     displayName: "Codex",
     projectPath: ".codex/skills",
-    globalPath: join110(home6, ".codex/skills"),
-    detect: async () => existsSync54(join110(home6, ".codex"))
+    globalPath: join111(home6, ".codex/skills"),
+    detect: async () => existsSync54(join111(home6, ".codex"))
   },
   opencode: {
     name: "opencode",
     displayName: "OpenCode",
     projectPath: ".opencode/skills",
-    globalPath: join110(home6, ".config/opencode/skills"),
-    detect: async () => existsSync54(join110(home6, ".config/opencode"))
+    globalPath: join111(home6, ".config/opencode/skills"),
+    detect: async () => existsSync54(join111(home6, ".config/opencode"))
   },
   goose: {
     name: "goose",
     displayName: "Goose",
     projectPath: ".goose/skills",
-    globalPath: join110(home6, ".config/goose/skills"),
-    detect: async () => existsSync54(join110(home6, ".config/goose"))
+    globalPath: join111(home6, ".config/goose/skills"),
+    detect: async () => existsSync54(join111(home6, ".config/goose"))
   },
   "gemini-cli": {
     name: "gemini-cli",
     displayName: "Gemini CLI",
     projectPath: ".agents/skills",
-    globalPath: join110(home6, ".agents/skills"),
-    detect: async () => existsSync54(join110(home6, ".gemini"))
+    globalPath: join111(home6, ".agents/skills"),
+    detect: async () => existsSync54(join111(home6, ".gemini"))
   },
   antigravity: {
     name: "antigravity",
     displayName: "Antigravity",
     projectPath: ".agent/skills",
-    globalPath: join110(home6, ".gemini/antigravity/skills"),
-    detect: async () => existsSync54(join110(process.cwd(), ".agent")) || existsSync54(join110(home6, ".gemini/antigravity"))
+    globalPath: join111(home6, ".gemini/antigravity/skills"),
+    detect: async () => existsSync54(join111(process.cwd(), ".agent")) || existsSync54(join111(home6, ".gemini/antigravity"))
   },
   "github-copilot": {
     name: "github-copilot",
     displayName: "GitHub Copilot",
     projectPath: ".github/skills",
-    globalPath: join110(home6, ".copilot/skills"),
-    detect: async () => existsSync54(join110(home6, ".copilot"))
+    globalPath: join111(home6, ".copilot/skills"),
+    detect: async () => existsSync54(join111(home6, ".copilot"))
   },
   amp: {
     name: "amp",
     displayName: "Amp",
     projectPath: ".agents/skills",
-    globalPath: join110(home6, ".config/agents/skills"),
-    detect: async () => existsSync54(join110(home6, ".config/amp"))
+    globalPath: join111(home6, ".config/agents/skills"),
+    detect: async () => existsSync54(join111(home6, ".config/amp"))
   },
   kilo: {
     name: "kilo",
     displayName: "Kilo Code",
     projectPath: ".kilocode/skills",
-    globalPath: join110(home6, ".kilocode/skills"),
-    detect: async () => existsSync54(join110(home6, ".kilocode"))
+    globalPath: join111(home6, ".kilocode/skills"),
+    detect: async () => existsSync54(join111(home6, ".kilocode"))
   },
   roo: {
     name: "roo",
     displayName: "Roo Code",
     projectPath: ".roo/skills",
-    globalPath: join110(home6, ".roo/skills"),
-    detect: async () => existsSync54(join110(home6, ".roo"))
+    globalPath: join111(home6, ".roo/skills"),
+    detect: async () => existsSync54(join111(home6, ".roo"))
   },
   windsurf: {
     name: "windsurf",
     displayName: "Windsurf",
     projectPath: ".windsurf/skills",
-    globalPath: join110(home6, ".codeium/windsurf/skills"),
-    detect: async () => existsSync54(join110(home6, ".codeium/windsurf"))
+    globalPath: join111(home6, ".codeium/windsurf/skills"),
+    detect: async () => existsSync54(join111(home6, ".codeium/windsurf"))
   },
   cline: {
     name: "cline",
     displayName: "Cline",
     projectPath: ".cline/skills",
-    globalPath: join110(home6, ".cline/skills"),
-    detect: async () => existsSync54(join110(home6, ".cline"))
+    globalPath: join111(home6, ".cline/skills"),
+    detect: async () => existsSync54(join111(home6, ".cline"))
   },
   openhands: {
     name: "openhands",
     displayName: "OpenHands",
     projectPath: ".openhands/skills",
-    globalPath: join110(home6, ".openhands/skills"),
-    detect: async () => existsSync54(join110(home6, ".openhands"))
+    globalPath: join111(home6, ".openhands/skills"),
+    detect: async () => existsSync54(join111(home6, ".openhands"))
   }
 };
 function getInstallPath(skillName, agent, options2) {
   const config = agents[agent];
   const basePath = options2.global ? config.globalPath : config.projectPath;
-  return join110(basePath, skillName);
+  return join111(basePath, skillName);
 }
 function isSkillInstalled(skillName, agent, options2) {
   const installPath = getInstallPath(skillName, agent, options2);
@@ -74483,16 +74857,16 @@ function isSkillInstalled(skillName, agent, options2) {
 import { existsSync as existsSync56 } from "node:fs";
 import { cp as cp4, mkdir as mkdir31, rm as rm14, stat as stat13 } from "node:fs/promises";
 import { homedir as homedir28 } from "node:os";
-import { dirname as dirname35, join as join112, resolve as resolve33 } from "node:path";
+import { dirname as dirname35, join as join113, resolve as resolve33 } from "node:path";
 
 // src/commands/skills/skills-registry.ts
 init_zod();
 import { existsSync as existsSync55 } from "node:fs";
 import { mkdir as mkdir30, readFile as readFile47, writeFile as writeFile35 } from "node:fs/promises";
 import { homedir as homedir27 } from "node:os";
-import { dirname as dirname34, join as join111, sep as sep9 } from "node:path";
+import { dirname as dirname34, join as join112, sep as sep9 } from "node:path";
 var home7 = homedir27();
-var REGISTRY_PATH2 = join111(home7, ".sunagentkit", "skill-registry.json");
+var REGISTRY_PATH2 = join112(home7, ".sunagentkit", "skill-registry.json");
 var SkillInstallationSchema = exports_external.object({
   skill: exports_external.string(),
   agent: exports_external.string(),
@@ -74630,7 +75004,7 @@ async function syncRegistry() {
 var LEGACY_SKILL_PATHS = {
   "gemini-cli": {
     project: ".gemini/skills",
-    global: join112(homedir28(), ".gemini/skills")
+    global: join113(homedir28(), ".gemini/skills")
   }
 };
 function isSamePath3(path1, path22) {
@@ -74664,7 +75038,7 @@ async function cleanupLegacySkillPath(skillName, agent, global3) {
   if (!legacy)
     return;
   const legacyBase = global3 ? legacy.global : legacy.project;
-  const legacyPath = join112(legacyBase, skillName);
+  const legacyPath = join113(legacyBase, skillName);
   if (!existsSync56(legacyPath))
     return;
   await rm14(legacyPath, { recursive: true, force: true });
@@ -74674,7 +75048,7 @@ async function cleanupLegacySkillPath(skillName, agent, global3) {
     if (entry.skill === skillName && entry.agent === agent && entry.global === global3) {
       if (entry.path === legacyPath) {
         const newBase = global3 ? agents[agent].globalPath : agents[agent].projectPath;
-        entry.path = join112(newBase, skillName);
+        entry.path = join113(newBase, skillName);
         changed = true;
       }
     }
@@ -74759,7 +75133,7 @@ function getInstallPreview(skill, targetAgents, options2) {
 // src/commands/skills/skills-uninstaller.ts
 import { existsSync as existsSync57 } from "node:fs";
 import { rm as rm15 } from "node:fs/promises";
-import { join as join113 } from "node:path";
+import { join as join114 } from "node:path";
 async function uninstallSkillFromAgent(skill, agent, global3) {
   const agentConfig = agents[agent];
   const registry = await readRegistry();
@@ -74807,7 +75181,7 @@ async function uninstallSkillFromAgent(skill, agent, global3) {
 async function forceUninstallSkill(skill, agent, global3) {
   const agentConfig = agents[agent];
   const basePath = global3 ? agentConfig.globalPath : agentConfig.projectPath;
-  const path9 = join113(basePath, skill);
+  const path9 = join114(basePath, skill);
   if (!existsSync57(path9)) {
     return {
       skill,
@@ -75312,12 +75686,12 @@ init_logger();
 // src/commands/telemetry/shared.ts
 import { existsSync as existsSync58, readFileSync as readFileSync15, readdirSync as readdirSync6 } from "node:fs";
 import { homedir as homedir29 } from "node:os";
-import { join as join114 } from "node:path";
+import { join as join115 } from "node:path";
 init_token_store();
-var USER_CACHE_PATH = join114(homedir29(), ".claude", "sk-user.json");
-var EVENT_BUFFER_DIR = join114(homedir29(), ".claude", "sk-events");
-var RATE_STATE_PATH = join114(homedir29(), ".claude", "sk-rate-state.json");
-var METADATA_PATH = join114(homedir29(), ".claude", "metadata.json");
+var USER_CACHE_PATH = join115(homedir29(), ".claude", "sk-user.json");
+var EVENT_BUFFER_DIR = join115(homedir29(), ".claude", "sk-events");
+var RATE_STATE_PATH = join115(homedir29(), ".claude", "sk-rate-state.json");
+var METADATA_PATH = join115(homedir29(), ".claude", "metadata.json");
 var TELEMETRY_HOOK_FIELD = "hooks.telemetry";
 var TOKEN_PLACEHOLDER = "__INJECT_AT_RELEASE__";
 function readUserCache() {
@@ -75404,7 +75778,7 @@ async function handleDisable() {
 // src/commands/telemetry/phases/purge-local-handler.ts
 init_logger();
 import { existsSync as existsSync59, readdirSync as readdirSync7, unlinkSync as unlinkSync5 } from "node:fs";
-import { join as join115 } from "node:path";
+import { join as join116 } from "node:path";
 function removeIfExists(path9) {
   try {
     if (!existsSync59(path9))
@@ -75424,7 +75798,7 @@ function removeBufferFiles() {
       if (!file.endsWith(".jsonl"))
         continue;
       try {
-        unlinkSync5(join115(EVENT_BUFFER_DIR, file));
+        unlinkSync5(join116(EVENT_BUFFER_DIR, file));
         count += 1;
       } catch {}
     }
@@ -75650,13 +76024,13 @@ async function detectInstallations() {
 
 // src/commands/uninstall/removal-handler.ts
 import { readdirSync as readdirSync9, rmSync as rmSync6 } from "node:fs";
-import { join as join117, resolve as resolve34, sep as sep10 } from "node:path";
+import { join as join118, resolve as resolve34, sep as sep10 } from "node:path";
 init_logger();
 var import_fs_extra38 = __toESM(require_lib(), 1);
 
 // src/commands/uninstall/analysis-handler.ts
 import { readdirSync as readdirSync8, rmSync as rmSync5 } from "node:fs";
-import { dirname as dirname36, join as join116 } from "node:path";
+import { dirname as dirname36, join as join117 } from "node:path";
 init_logger();
 var import_picocolors35 = __toESM(require_picocolors(), 1);
 function classifyFileByOwnership(ownership, forceOverwrite, deleteReason) {
@@ -75703,7 +76077,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 = join116(installation.path, trackedFile.path);
+      const filePath = join117(installation.path, trackedFile.path);
       if (uninstallManifest.filesToPreserve.includes(trackedFile.path)) {
         result.toPreserve.push({ path: trackedFile.path, reason: "shared with other kit" });
         continue;
@@ -75733,7 +76107,7 @@ async function analyzeInstallation(installation, forceOverwrite, kit) {
     return result;
   }
   for (const trackedFile of allTrackedFiles) {
-    const filePath = join116(installation.path, trackedFile.path);
+    const filePath = join117(installation.path, trackedFile.path);
     const ownershipResult = await OwnershipChecker.checkOwnership(filePath, metadata, installation.path);
     if (!ownershipResult.exists)
       continue;
@@ -75830,7 +76204,7 @@ async function removeInstallations(installations, options2) {
       let removedCount = 0;
       let cleanedDirs = 0;
       for (const item of analysis.toDelete) {
-        const filePath = join117(installation.path, item.path);
+        const filePath = join118(installation.path, item.path);
         if (!await import_fs_extra38.pathExists(filePath))
           continue;
         if (!await isPathSafeToRemove(filePath, installation.path)) {
@@ -76032,7 +76406,7 @@ ${import_picocolors36.default.yellow("User modifications will be permanently del
 // src/commands/update-cli.ts
 init_takumi_config_manager();
 import { exec as exec8, spawn as spawn2 } from "node:child_process";
-import { join as join118 } from "node:path";
+import { join as join119 } from "node:path";
 import { promisify as promisify14 } from "node:util";
 
 // src/domains/github/npm-registry.ts
@@ -76199,7 +76573,7 @@ var import_fs_extra39 = __toESM(require_lib(), 1);
 // package.json
 var package_default = {
   name: "@sunasteriskrnd/takumi",
-  version: "0.5.0",
+  version: "0.6.0",
   description: "CLI tool for bootstrapping and managing Takumi projects",
   type: "module",
   repository: {
@@ -76222,6 +76596,7 @@ var package_default = {
     build: `bun build src/index.ts --outdir dist --target node --external @octokit/rest --external better-sqlite3 --external yauzl-promise --external @node-rs/crc32 && node -e "const fs=require('fs'),f='dist/index.js',c=fs.readFileSync(f,'utf-8');fs.writeFileSync(f,c.replace(/^#!.*\\n\\/\\/ @bun\\n/,''))"`,
     "verify:package": "node scripts/prepublish-check.js",
     test: "bun test",
+    "test:ci": "NON_INTERACTIVE=true CI_SAFE_MODE=true bun test",
     "test:integration": "CK_RUN_CLI_INTEGRATION=1 bun test tests/integration/cli.test.ts",
     "test:watch": "bun test --watch",
     "test:quick": "./scripts/dev-quick-start.sh test",
@@ -76383,7 +76758,7 @@ function selectKitForUpdate(params) {
   };
 }
 async function readMetadataFile(claudeDir) {
-  const metadataPath = join118(claudeDir, "metadata.json");
+  const metadataPath = join119(claudeDir, "metadata.json");
   try {
     if (!await import_fs_extra39.pathExists(metadataPath)) {
       return null;
@@ -76884,7 +77259,7 @@ init_logger();
 import { existsSync as existsSync65 } from "node:fs";
 import { rm as rm16 } from "node:fs/promises";
 import { homedir as homedir31 } from "node:os";
-import { join as join125 } from "node:path";
+import { join as join126 } from "node:path";
 var import_picocolors38 = __toESM(require_picocolors(), 1);
 
 // src/commands/watch/phases/implementation-runner.ts
@@ -77394,7 +77769,7 @@ function spawnAndCollect3(command, args) {
 
 // src/commands/watch/phases/issue-processor.ts
 import { mkdir as mkdir32, writeFile as writeFile37 } from "node:fs/promises";
-import { join as join121 } from "node:path";
+import { join as join122 } from "node:path";
 
 // src/commands/watch/phases/approval-detector.ts
 init_logger();
@@ -77769,9 +78144,9 @@ async function checkAwaitingApproval(state, setup, options2, watchLog, projectDi
 
 // src/commands/watch/phases/plan-dir-finder.ts
 import { readdir as readdir32, stat as stat14 } from "node:fs/promises";
-import { join as join120 } from "node:path";
+import { join as join121 } from "node:path";
 async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
-  const plansRoot = join120(cwd2, "plans");
+  const plansRoot = join121(cwd2, "plans");
   try {
     const entries = await readdir32(plansRoot);
     const tenMinAgo = Date.now() - 10 * 60 * 1000;
@@ -77780,14 +78155,14 @@ async function findRecentPlanDir(cwd2, issueNumber, watchLog) {
     for (const entry of entries) {
       if (entry === "watch" || entry === "reports" || entry === "visuals")
         continue;
-      const dirPath = join120(plansRoot, entry);
+      const dirPath = join121(plansRoot, entry);
       const dirStat = await stat14(dirPath);
       if (!dirStat.isDirectory())
         continue;
       if (dirStat.mtimeMs < tenMinAgo)
         continue;
       try {
-        await stat14(join120(dirPath, "plan.md"));
+        await stat14(join121(dirPath, "plan.md"));
       } catch {
         continue;
       }
@@ -78018,13 +78393,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 = join121(detectedPlanDir, "plan.md");
+      state.activeIssues[numStr].planPath = join122(detectedPlanDir, "plan.md");
       watchLog.info(`Plan directory detected: ${detectedPlanDir}`);
     } else {
       try {
-        const planDir = join121(projectDir, "plans", "watch");
+        const planDir = join122(projectDir, "plans", "watch");
         await mkdir32(planDir, { recursive: true });
-        const planFilePath = join121(planDir, `issue-${issue.number}-plan.md`);
+        const planFilePath = join122(planDir, `issue-${issue.number}-plan.md`);
         await writeFile37(planFilePath, planResult.planText, "utf-8");
         state.activeIssues[numStr].planPath = planFilePath;
         watchLog.info(`Plan saved (fallback) to ${planFilePath}`);
@@ -78329,18 +78704,18 @@ init_logger();
 import { spawnSync as spawnSync5 } from "node:child_process";
 import { existsSync as existsSync62 } from "node:fs";
 import { readdir as readdir33, stat as stat15 } from "node:fs/promises";
-import { join as join122 } from "node:path";
+import { join as join123 } 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 = join122(parentDir, entry);
+    const fullPath = join123(parentDir, entry);
     const entryStat = await stat15(fullPath);
     if (!entryStat.isDirectory())
       continue;
-    const gitDir = join122(fullPath, ".git");
+    const gitDir = join123(fullPath, ".git");
     if (!existsSync62(gitDir))
       continue;
     const result = spawnSync5("gh", ["repo", "view", "--json", "owner,name"], {
@@ -78367,7 +78742,7 @@ init_logger();
 import { spawnSync as spawnSync6 } from "node:child_process";
 import { existsSync as existsSync63 } from "node:fs";
 import { homedir as homedir30 } from "node:os";
-import { join as join123 } from "node:path";
+import { join as join124 } from "node:path";
 async function validateSetup(cwd2) {
   const workDir = cwd2 ?? process.cwd();
   const ghVersion = spawnSync6("gh", ["--version"], { encoding: "utf-8", timeout: 1e4 });
@@ -78398,7 +78773,7 @@ Run this command from a directory with a GitHub remote.`);
   } catch {
     throw new Error(`Failed to parse repository info: ${ghRepo.stdout}`);
   }
-  const skillsPath = join123(homedir30(), ".claude", "skills");
+  const skillsPath = join124(homedir30(), ".claude", "skills");
   const skillsAvailable = existsSync63(skillsPath);
   if (!skillsAvailable) {
     logger.warning(`Takumi Engineer skills not found at ${skillsPath}`);
@@ -78417,7 +78792,7 @@ init_path_resolver();
 import { createWriteStream as createWriteStream4, statSync as statSync6 } from "node:fs";
 import { existsSync as existsSync64 } from "node:fs";
 import { mkdir as mkdir34, rename as rename9 } from "node:fs/promises";
-import { join as join124 } from "node:path";
+import { join as join125 } from "node:path";
 
 class WatchLogger {
   logStream = null;
@@ -78425,7 +78800,7 @@ class WatchLogger {
   logPath = null;
   maxBytes;
   constructor(logDir, maxBytes = 0) {
-    this.logDir = logDir ?? join124(PathResolver.getTakumiDir(), "logs");
+    this.logDir = logDir ?? join125(PathResolver.getTakumiDir(), "logs");
     this.maxBytes = maxBytes;
   }
   async init() {
@@ -78434,7 +78809,7 @@ class WatchLogger {
         await mkdir34(this.logDir, { recursive: true });
       }
       const dateStr = formatDate(new Date);
-      this.logPath = join124(this.logDir, `watch-${dateStr}.log`);
+      this.logPath = join125(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"}`);
@@ -78614,7 +78989,7 @@ async function watchCommand(options2) {
 }
 async function discoverRepos(options2, watchLog) {
   const cwd2 = process.cwd();
-  const isGitRepo = existsSync65(join125(cwd2, ".git"));
+  const isGitRepo = existsSync65(join126(cwd2, ".git"));
   if (options2.force) {
     await forceRemoveLock(watchLog);
   }
@@ -78684,7 +79059,7 @@ async function resetState(state, projectDir, watchLog) {
   watchLog.info(`Watch state reset (--force) for ${projectDir}`);
 }
 async function forceRemoveLock(watchLog) {
-  const lockPath = join125(homedir31(), ".sunagentkit", "locks", `${LOCK_NAME}.lock`);
+  const lockPath = join126(homedir31(), ".sunagentkit", "locks", `${LOCK_NAME}.lock`);
   try {
     await rm16(lockPath, { recursive: true, force: true });
     watchLog.info("Removed existing lock file (--force)");
@@ -78728,13 +79103,13 @@ function sleep2(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 to use (engineer)").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 (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) => {
     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 to use (engineer)").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 (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) => {
     if (options2.exclude && !Array.isArray(options2.exclude)) {
       options2.exclude = [options2.exclude];
     }
@@ -78747,6 +79122,9 @@ function registerCommands(cli) {
     if (options2.agent) {
       options2.agents = options2.agent;
     }
+    if (options2.kit && Array.isArray(options2.kit)) {
+      options2.kit = options2.kit.join(",");
+    }
     await initCommand(options2);
   });
   cli.command("update", "Update Takumi CLI to the latest version").option("-r, --release <version>", "Update to a specific version").option("--check", "Check for updates without installing").option("-y, --yes", "Non-interactive mode with sensible defaults (skip all prompts)").option("-d, --dev", "Update to the latest dev version").option("--beta", "Alias for --dev (deprecated)").option("--registry <url>", "Custom npm registry URL").option("--kit <kit>", "[DEPRECATED] Use 'takumi init --kit <kit>' instead").option("-g, --global", "[DEPRECATED] Use 'takumi init --global' instead").action(async (options2) => {
@@ -78886,7 +79264,7 @@ function registerCommands(cli) {
 
 // src/cli/version-display.ts
 import { existsSync as existsSync77, readFileSync as readFileSync20 } from "node:fs";
-import { join as join137 } from "node:path";
+import { join as join138 } from "node:path";
 init_help_banner();
 // src/domains/versioning/checking/kit-version-checker.ts
 init_github_client();
@@ -78898,14 +79276,14 @@ init_logger();
 init_path_resolver();
 import { existsSync as existsSync76 } from "node:fs";
 import { mkdir as mkdir35, readFile as readFile52, writeFile as writeFile40 } from "node:fs/promises";
-import { join as join136 } from "node:path";
+import { join as join137 } 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 join136(cacheDir, VersionCacheManager.CACHE_FILENAME);
+    return join137(cacheDir, VersionCacheManager.CACHE_FILENAME);
   }
   static async load() {
     const cacheFile = VersionCacheManager.getCacheFile();
@@ -79198,8 +79576,8 @@ async function displayVersion() {
     const localSubdir = PROVIDER_LOCAL_SUBDIRS[provider];
     if (!localSubdir)
       continue;
-    const localMeta = join137(process.cwd(), localSubdir, "metadata.json");
-    if (localMeta === join137(inst.globalRoot(), "metadata.json"))
+    const localMeta = join138(process.cwd(), localSubdir, "metadata.json");
+    if (localMeta === join138(inst.globalRoot(), "metadata.json"))
       continue;
     if (!existsSync77(localMeta))
       continue;
@@ -79224,7 +79602,7 @@ async function displayVersion() {
   }
   const singleInstall = detectedGlobals.length === 1 && detectedGlobals[0]?.provider === "claude-code";
   for (const { provider, path: installPath } of detectedGlobals) {
-    const metadataPath = join137(installPath, "metadata.json");
+    const metadataPath = join138(installPath, "metadata.json");
     if (existsSync77(metadataPath)) {
       try {
         const rawMetadata = JSON.parse(readFileSync20(metadataPath, "utf-8"));