@sma1lboy/kobe 0.7.10 → 0.7.11

package/dist/cli/index.js

@@ -70,7 +70,7 @@ var init_package = __esm(() => {
   package_default = {
     $schema: "https://json.schemastore.org/package.json",
     name: "@sma1lboy/kobe",
-    version: "0.7.10",
+    version: "0.7.11",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -5019,6 +5019,21 @@ function matchTaskByCwd(tasks, cwd) {
   }
   return bestId;
 }
+function matchRepoByCwd(tasks, cwd) {
+  const target = normalize(cwd);
+  let best;
+  let bestLen = -1;
+  for (const t of tasks) {
+    if (!t.repo)
+      continue;
+    const repo = normalize(t.repo);
+    if (isAncestorOrSelf(repo, target) && repo.length > bestLen) {
+      bestLen = repo.length;
+      best = repo;
+    }
+  }
+  return best;
+}
 function findAdoptableWorktree(tasks, cwd) {
   const target = normalize(cwd);
   const repos = new Set;
@@ -5364,6 +5379,20 @@ async function startDaemonServer(orch, options = {}) {
         });
         return { task: serializeTask(task) };
       }
+      case "worktree.reconcile": {
+        const cwd = requireString(payload, "cwd");
+        const worktreePath = requireString(payload, "worktreePath");
+        const repo = matchRepoByCwd(orch.listTasks(), cwd) ?? matchRepoByCwd(orch.listTasks(), worktreePath);
+        if (!repo)
+          return { adopted: false };
+        try {
+          const task = await orch.adoptWorktree({ repo, worktreePath, ifExists: "return" });
+          return { adopted: true, taskId: task.id };
+        } catch (err) {
+          logDaemonError("worktree-created", err);
+          return { adopted: false };
+        }
+      }
       case "task.setActive": {
         bus.publish("active-task", { taskId: optionalString(payload, "taskId") ?? null });
         return {};
@@ -8405,6 +8434,29 @@ function mergeActivityHooks(current, install, inv = kobeCliInvocation()) {
   }
   return Object.keys(hooks).length > 0 ? { ...restSettings, hooks } : { ...restSettings };
 }
+function buildWorktreeWatchHook(inv = kobeCliInvocation()) {
+  const command = shellQuoteArgv([...inv, "hook", WORKTREE_SYNC_MARKER]);
+  return { PostToolUse: [{ matcher: "Bash", hooks: [{ type: "command", command }] }] };
+}
+function isKobeWorktreeWatchGroup(group) {
+  if (!isObject6(group) || !Array.isArray(group.hooks))
+    return false;
+  return group.hooks.some((h) => isObject6(h) && typeof h.command === "string" && h.command.includes(WORKTREE_SYNC_MARKER));
+}
+function mergeWorktreeWatchHook(current, install, inv = kobeCliInvocation()) {
+  const { hooks: rawHooks, ...restSettings } = current;
+  const hooks = isObject6(rawHooks) ? { ...rawHooks } : {};
+  const key = "PostToolUse";
+  const prior = Array.isArray(hooks[key]) ? hooks[key] : [];
+  const kept = prior.filter((g) => !isKobeWorktreeWatchGroup(g));
+  if (install)
+    kept.push(...buildWorktreeWatchHook(inv)[key]);
+  if (kept.length > 0)
+    hooks[key] = kept;
+  else
+    delete hooks[key];
+  return Object.keys(hooks).length > 0 ? { ...restSettings, hooks } : { ...restSettings };
+}
 
 class ClaudeHookAdapter {
   vendor = "claude";
@@ -8423,6 +8475,12 @@ class ClaudeHookAdapter {
   async removeWorktreeSyncHook(settingsFilePath) {
     await this.editSettings(settingsFilePath, (cur) => mergeWorktreeSyncHook(cur, null));
   }
+  async installWorktreeWatchHook(settingsFilePath) {
+    await this.editSettings(settingsFilePath, (cur) => mergeWorktreeWatchHook(cur, true));
+  }
+  async removeWorktreeWatchHook(settingsFilePath) {
+    await this.editSettings(settingsFilePath, (cur) => mergeWorktreeWatchHook(cur, false));
+  }
   async editSettings(settingsFilePath, transform) {
     try {
       const current = await readJsonObject(settingsFilePath);
@@ -8471,6 +8529,8 @@ class NoopHookAdapter {
     return false;
   }
   async removeWorktreeSyncHook() {}
+  async installWorktreeWatchHook() {}
+  async removeWorktreeWatchHook() {}
 }
 var init_hook_adapter2 = __esm(() => {
   init_hook_adapter();
@@ -8480,6 +8540,7 @@ var init_hook_adapter2 = __esm(() => {
 var exports_hook_cmd = {};
 __export(exports_hook_cmd, {
   runHookSubcommand: () => runHookSubcommand,
+  parseWorktreeAddPath: () => parseWorktreeAddPath,
   ensureGlobalKobeHooks: () => ensureGlobalKobeHooks
 });
 import { homedir as homedir10 } from "os";
@@ -8516,12 +8577,69 @@ function flagValue(argv, name) {
   }
   return;
 }
+function isPlainObject2(v) {
+  return !!v && typeof v === "object" && !Array.isArray(v);
+}
+function tokenizeCommand(command) {
+  const out = [];
+  const re = /"([^"]*)"|'([^']*)'|(\S+)/g;
+  let m;
+  while ((m = re.exec(command)) !== null)
+    out.push(m[1] ?? m[2] ?? m[3] ?? "");
+  return out;
+}
+function parseWorktreeAddPath(command) {
+  const tokens = tokenizeCommand(command);
+  const valueFlags = new Set(["-b", "-B", "--reason"]);
+  for (let i = 0;i + 1 < tokens.length; i++) {
+    if (tokens[i] !== "worktree" || tokens[i + 1] !== "add")
+      continue;
+    let j = i + 2;
+    while (j < tokens.length) {
+      const t = tokens[j];
+      if (t === "&&" || t === "||" || t === ";" || t === "|" || t === ">" || t === ">>")
+        break;
+      if (t.startsWith("-")) {
+        j += valueFlags.has(t) ? 2 : 1;
+        continue;
+      }
+      return t;
+    }
+  }
+  return;
+}
+async function runWorktreeCreatedHook() {
+  const payload = await readStdinPayload();
+  const toolInput = isPlainObject2(payload.tool_input) ? payload.tool_input : {};
+  const command = typeof toolInput.command === "string" ? toolInput.command : "";
+  if (!command.includes("worktree"))
+    return;
+  const rawPath = parseWorktreeAddPath(command);
+  if (!rawPath)
+    return;
+  const cwd = typeof payload.cwd === "string" && payload.cwd ? payload.cwd : process.cwd();
+  const worktreePath = resolve6(cwd, rawPath);
+  const client = await connectIfRunning();
+  if (!client)
+    return;
+  try {
+    await client.request("worktree.reconcile", { cwd, worktreePath });
+  } finally {
+    client.close();
+  }
+}
 async function runHookSubcommand(argv) {
   const [verb, ...rest] = argv;
   if (verb === "setup") {
     await runHookSetup(rest);
     return;
   }
+  if (verb === WORKTREE_CREATED_VERB) {
+    try {
+      await runWorktreeCreatedHook();
+    } catch {}
+    return;
+  }
   try {
     if (!verb || !isEngineActivityKind(verb))
       return;
@@ -8569,8 +8687,10 @@ function persistedSyncPath(stored) {
 async function ensureGlobalKobeHooks() {
   try {
     const globalPath = globalSettingsPath();
-    for (const a of activityHookAdapters())
+    for (const a of activityHookAdapters()) {
       await a.installActivityHooks(globalPath);
+      await a.installWorktreeWatchHook(globalPath);
+    }
     await cleanupWorktreeSyncHook();
   } catch {}
 }
@@ -8605,7 +8725,7 @@ async function runHookSetup(_argv) {
   ].join(`
 `));
 }
-var SYNC_SETTING_KEY = "externalWorktreeSync";
+var WORKTREE_CREATED_VERB = "worktree-created", SYNC_SETTING_KEY = "externalWorktreeSync";
 var init_hook_cmd = __esm(() => {
   init_daemon_process();
   init_hook_adapter2();

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@sma1lboy/kobe",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "description": "TUI orchestrator for Claude Code (codename)",
   "type": "module",
   "packageManager": "bun@1.3.13",