@sma1lboy/kobe 0.7.10 → 0.7.12

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.12",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -118,6 +118,7 @@ var init_package = __esm(() => {
       "@biomejs/biome": "1.9.4",
       "@tsconfig/bun": "1.0.9",
       "@types/bun": "1.3.12",
+      "@types/node": "25.6.2",
       knip: "^6.14.2",
       "node-pty": "^1.1.0",
       typescript: "5.8.2",
@@ -663,6 +664,33 @@ class TaskIndexStore {
     this.notifyListeners();
     return next;
   }
+  async move(id, delta, withinIds) {
+    this.assertLoaded();
+    const task = this.cache.tasks.find((t) => t.id === id);
+    if (!task)
+      throw new Error(`task not found: ${id}`);
+    const ids = withinIds?.length ? withinIds : this.cache.tasks.map((t) => t.id);
+    const pos = ids.indexOf(String(id));
+    if (pos < 0)
+      throw new Error(`task not movable in current group: ${id}`);
+    const targetId = ids[pos + delta];
+    if (!targetId)
+      return task;
+    const fromIdx = this.cache.tasks.findIndex((t) => t.id === id);
+    const toIdx = this.cache.tasks.findIndex((t) => t.id === targetId);
+    if (fromIdx < 0 || toIdx < 0 || fromIdx === toIdx)
+      return task;
+    const [moved] = this.cache.tasks.splice(fromIdx, 1);
+    if (!moved)
+      return task;
+    const adjustedToIdx = fromIdx < toIdx ? toIdx - 1 : toIdx;
+    const insertAt = delta > 0 ? adjustedToIdx + 1 : adjustedToIdx;
+    const next = { ...moved, updatedAt: new Date().toISOString() };
+    this.cache.tasks.splice(insertAt, 0, next);
+    await this.save();
+    this.notifyListeners();
+    return next;
+  }
   async archive(id, status = "done") {
     return this.update(id, { status });
   }
@@ -3096,6 +3124,13 @@ class Orchestrator {
       return;
     await this.store.update(task.id, { pinned: next });
   }
+  async moveTask(id, delta) {
+    const task = this.requireTask(id);
+    if (task.kind === "main")
+      return;
+    const groupIds = this.store.list().filter((t) => (t.kind ?? "task") !== "main" && t.archived === task.archived && (t.pinned ?? false) === (task.pinned ?? false)).map((t) => String(t.id));
+    await this.store.move(task.id, delta, groupIds);
+  }
   async setArchived(id, archived) {
     const task = this.requireTask(id);
     const next = archived ?? !task.archived;
@@ -5019,6 +5054,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;
@@ -5329,6 +5379,14 @@ async function startDaemonServer(orch, options = {}) {
         await orch.setPinned(taskId, optionalBoolean(payload, "pinned"));
         return {};
       }
+      case "task.move": {
+        const taskId = requireString(payload, "taskId");
+        const direction = requireString(payload, "direction");
+        if (direction !== "up" && direction !== "down")
+          throw new Error("direction must be up or down");
+        await orch.moveTask(taskId, direction === "up" ? -1 : 1);
+        return {};
+      }
       case "task.status": {
         const taskId = requireString(payload, "taskId");
         const status = requireString(payload, "status");
@@ -5364,6 +5422,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 +8477,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 +8518,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 +8572,8 @@ class NoopHookAdapter {
     return false;
   }
   async removeWorktreeSyncHook() {}
+  async installWorktreeWatchHook() {}
+  async removeWorktreeWatchHook() {}
 }
 var init_hook_adapter2 = __esm(() => {
   init_hook_adapter();
@@ -8480,6 +8583,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 +8620,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 +8730,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 +8768,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();
@@ -10067,6 +10230,9 @@ class RemoteOrchestrator {
   async setPinned(id, pinned) {
     await this.client.request("task.pin", { taskId: String(id), pinned });
   }
+  async moveTask(id, delta) {
+    await this.client.request("task.move", { taskId: String(id), direction: delta < 0 ? "up" : "down" });
+  }
   async setArchived(id, archived) {
     await this.client.request("task.archive", { taskId: String(id), archived });
   }
@@ -16986,28 +17152,51 @@ function useSidebarBindings(opts) {
     return ids[idx];
   };
   const searchModeAccessor = () => opts.searchMode?.() ?? false;
+  const moveModeAccessor = () => opts.moveMode?.() ?? false;
   useBindings(() => ({
     enabled: opts.focused() && !searchModeAccessor(),
     bindings: bindByIds({
       "sidebar.nav": (evt) => {
+        if (moveModeAccessor()) {
+          const id = cursorTaskId();
+          if (id === undefined)
+            return;
+          if (evt.name === "j" || evt.name === "down")
+            opts.onMoveRequest?.(id, 1);
+          else if (evt.name === "k" || evt.name === "up")
+            opts.onMoveRequest?.(id, -1);
+          return;
+        }
         if (evt.name === "j" || evt.name === "down")
           ctrl.moveDown();
         else if (evt.name === "k" || evt.name === "up")
           ctrl.moveUp();
       },
-      "sidebar.select": () => ctrl.selectCurrent(),
+      "sidebar.select": () => {
+        if (moveModeAccessor()) {
+          opts.onMoveModeExit?.();
+          return;
+        }
+        ctrl.selectCurrent();
+      },
       "sidebar.goto": (evt) => {
+        if (moveModeAccessor())
+          return;
         if (evt.shift)
           ctrl.pressShiftG();
         else
           ctrl.pressG();
       },
       "sidebar.delete": () => {
+        if (moveModeAccessor())
+          return;
         const id = cursorTaskId();
         if (id !== undefined)
           opts.onDeleteRequest?.(id);
       },
       "sidebar.archive": () => {
+        if (moveModeAccessor())
+          return;
         const id = cursorTaskId();
         if (id !== undefined)
           opts.onArchiveRequest?.(id);
@@ -17020,20 +17209,32 @@ function useSidebarBindings(opts) {
           opts.onLocalMergeRequest?.(id);
       },
       "sidebar.rename": () => {
+        if (moveModeAccessor())
+          return;
         const id = cursorTaskId();
         if (id !== undefined)
           opts.onRenameRequest?.(id);
       },
       "sidebar.pin": (evt) => {
+        if (moveModeAccessor())
+          return;
         if (!evt.shift)
           return;
         const id = cursorTaskId();
         if (id !== undefined)
           opts.onPinRequest?.(id);
       },
-      "sidebar.search.enter": () => opts.onSearchEnter?.()
+      "sidebar.search.enter": () => {
+        if (moveModeAccessor())
+          return;
+        opts.onSearchEnter?.();
+      }
     })
   }));
+  useBindings(() => ({
+    enabled: opts.focused() && moveModeAccessor(),
+    bindings: [{ key: "escape", cmd: () => opts.onMoveModeExit?.() }]
+  }));
   useBindings(() => ({
     enabled: opts.focused(),
     bindings: bindByIds({
@@ -17218,6 +17419,9 @@ function Sidebar(props) {
     onDeleteRequest: (id) => props.onDeleteRequest?.(id),
     onArchiveRequest: (id) => props.onArchiveRequest?.(id),
     onLocalMergeRequest: (id) => props.onLocalMergeRequest?.(id),
+    moveMode: props.moveMode,
+    onMoveRequest: (id, delta) => props.onMoveRequest?.(id, delta),
+    onMoveModeExit: () => props.onMoveModeExit?.(),
     onRenameRequest: (id) => props.onRenameRequest?.(id),
     onPinRequest: (id) => props.onPinRequest?.(id),
     onViewSwitch: (delta) => cycleView(delta),
@@ -17438,33 +17642,55 @@ function Sidebar(props) {
         });
         const titleText = isMain ? repoBasename(task.repo) : task.title;
         const activity = () => props.engineState?.().get(task.id)?.state;
-        const loading = () => activity() === "running" || isLive() || !isMain && task.status === "in_progress";
-        const activityChip = () => {
+        const hasActivity = () => activity() !== undefined;
+        const loading = () => activity() === "running" || isLive() || !hasActivity() && !isMain && task.status === "in_progress";
+        const activityBadge = () => {
           switch (activity()) {
             case "rate_limited":
               return {
-                text: "limited",
+                glyph: "\u25F7",
                 tone: "warning"
               };
             case "permission_needed":
               return {
-                text: "approve?",
+                glyph: "?",
                 tone: "warning"
               };
             case "error":
               return {
-                text: "error",
+                glyph: "\u2715",
                 tone: "error"
               };
             case "turn_complete":
               return {
-                text: "done",
+                glyph: "\u2713",
                 tone: "primary"
               };
             default:
               return null;
           }
         };
+        const stateGlyph = () => {
+          if (loading())
+            return IN_PROGRESS_SPINNER[spinnerFrame()] ?? IN_PROGRESS_SPINNER[0];
+          return activityBadge()?.glyph ?? badge.glyph;
+        };
+        const projectGlyph = () => {
+          if (loading())
+            return IN_PROGRESS_SPINNER[spinnerFrame()] ?? IN_PROGRESS_SPINNER[0];
+          return activityBadge()?.glyph ?? "\u2605";
+        };
+        const stateColor = () => {
+          const active = activityBadge();
+          if (!loading() && active) {
+            if (active.tone === "error")
+              return theme.error;
+            if (active.tone === "warning")
+              return theme.warning;
+            return theme.primary;
+          }
+          return badgeColor();
+        };
         const subtitleText = createMemo(() => {
           if (task.branch.length > 0)
             return truncateBranchLabel(task.branch, subtitleBudget());
@@ -17519,7 +17745,7 @@ function Sidebar(props) {
           insert(_el$29, createComponent2(Show, {
             when: isMain,
             get children() {
-              var _el$30 = createElement("box"), _el$31 = createElement("text"), _el$32 = createElement("box"), _el$33 = createElement("text"), _el$34 = createElement("text");
+              var _el$30 = createElement("box"), _el$31 = createElement("text"), _el$32 = createElement("box"), _el$33 = createElement("text"), _el$34 = createElement("text"), _el$35 = createElement("text");
               insertNode(_el$30, _el$31);
               insertNode(_el$30, _el$32);
               setProp(_el$30, "flexDirection", "row");
@@ -17528,64 +17754,36 @@ function Sidebar(props) {
               insert(_el$31, barGlyph);
               insertNode(_el$32, _el$33);
               insertNode(_el$32, _el$34);
+              insertNode(_el$32, _el$35);
               setProp(_el$32, "flexDirection", "row");
               setProp(_el$32, "flexGrow", 1);
               setProp(_el$32, "paddingRight", 1);
               setProp(_el$32, "gap", 0);
               setProp(_el$33, "wrapMode", "none");
-              insert(_el$33, (() => {
-                var _c$2 = memo2(() => !!loading());
-                return () => _c$2() ? IN_PROGRESS_SPINNER[spinnerFrame()] ?? IN_PROGRESS_SPINNER[0] : "\u2605";
-              })());
+              insert(_el$33, projectGlyph);
               setProp(_el$34, "wrapMode", "none");
               setProp(_el$34, "flexGrow", 1);
               insert(_el$34, () => spacedTitle(titleText, titleBudget()));
-              insert(_el$32, createComponent2(Show, {
-                get when() {
-                  return loading();
-                },
-                get children() {
-                  var _el$35 = createElement("text");
-                  insertNode(_el$35, createTextNode(` working`));
-                  setProp(_el$35, "wrapMode", "none");
-                  effect((_$p) => setProp(_el$35, "fg", theme.primary, _$p));
-                  return _el$35;
-                }
-              }), null);
-              insert(_el$32, createComponent2(Show, {
-                get when() {
-                  return !loading();
-                },
-                get children() {
-                  var _el$37 = createElement("text");
-                  setProp(_el$37, "wrapMode", "none");
-                  insert(_el$37, () => ` ${truncatePathTail(abbrevHome(task.repo), subtitleBudget())}`);
-                  effect((_p$) => {
-                    var _v$15 = theme.textMuted, _v$16 = TextAttributes9.DIM;
-                    _v$15 !== _p$.e && (_p$.e = setProp(_el$37, "fg", _v$15, _p$.e));
-                    _v$16 !== _p$.t && (_p$.t = setProp(_el$37, "attributes", _v$16, _p$.t));
-                    return _p$;
-                  }, {
-                    e: undefined,
-                    t: undefined
-                  });
-                  return _el$37;
-                }
-              }), null);
+              setProp(_el$35, "wrapMode", "none");
+              insert(_el$35, () => ` ${truncatePathTail(abbrevHome(task.repo), subtitleBudget())}`);
               effect((_p$) => {
-                var _v$17 = barColor(), _v$18 = theme.primary, _v$19 = TextAttributes9.BOLD, _v$20 = theme.text, _v$21 = TextAttributes9.BOLD;
-                _v$17 !== _p$.e && (_p$.e = setProp(_el$31, "fg", _v$17, _p$.e));
-                _v$18 !== _p$.t && (_p$.t = setProp(_el$33, "fg", _v$18, _p$.t));
-                _v$19 !== _p$.a && (_p$.a = setProp(_el$33, "attributes", _v$19, _p$.a));
-                _v$20 !== _p$.o && (_p$.o = setProp(_el$34, "fg", _v$20, _p$.o));
-                _v$21 !== _p$.i && (_p$.i = setProp(_el$34, "attributes", _v$21, _p$.i));
+                var _v$15 = barColor(), _v$16 = stateColor(), _v$17 = TextAttributes9.BOLD, _v$18 = theme.text, _v$19 = TextAttributes9.BOLD, _v$20 = theme.textMuted, _v$21 = TextAttributes9.DIM;
+                _v$15 !== _p$.e && (_p$.e = setProp(_el$31, "fg", _v$15, _p$.e));
+                _v$16 !== _p$.t && (_p$.t = setProp(_el$33, "fg", _v$16, _p$.t));
+                _v$17 !== _p$.a && (_p$.a = setProp(_el$33, "attributes", _v$17, _p$.a));
+                _v$18 !== _p$.o && (_p$.o = setProp(_el$34, "fg", _v$18, _p$.o));
+                _v$19 !== _p$.i && (_p$.i = setProp(_el$34, "attributes", _v$19, _p$.i));
+                _v$20 !== _p$.n && (_p$.n = setProp(_el$35, "fg", _v$20, _p$.n));
+                _v$21 !== _p$.s && (_p$.s = setProp(_el$35, "attributes", _v$21, _p$.s));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined,
                 a: undefined,
                 o: undefined,
-                i: undefined
+                i: undefined,
+                n: undefined,
+                s: undefined
               });
               return _el$30;
             }
@@ -17594,58 +17792,43 @@ function Sidebar(props) {
             when: !isMain,
             get children() {
               return [(() => {
-                var _el$38 = createElement("box"), _el$39 = createElement("text"), _el$40 = createElement("box"), _el$41 = createElement("text"), _el$42 = createElement("text");
+                var _el$36 = createElement("box"), _el$37 = createElement("text"), _el$38 = createElement("box"), _el$39 = createElement("text"), _el$40 = createElement("text");
+                insertNode(_el$36, _el$37);
+                insertNode(_el$36, _el$38);
+                setProp(_el$36, "flexDirection", "row");
+                setProp(_el$36, "gap", 0);
+                setProp(_el$37, "wrapMode", "none");
+                insert(_el$37, barGlyph);
                 insertNode(_el$38, _el$39);
                 insertNode(_el$38, _el$40);
                 setProp(_el$38, "flexDirection", "row");
+                setProp(_el$38, "flexGrow", 1);
+                setProp(_el$38, "paddingRight", 1);
                 setProp(_el$38, "gap", 0);
                 setProp(_el$39, "wrapMode", "none");
-                insert(_el$39, barGlyph);
-                insertNode(_el$40, _el$41);
-                insertNode(_el$40, _el$42);
-                setProp(_el$40, "flexDirection", "row");
+                insert(_el$39, stateGlyph);
+                setProp(_el$40, "wrapMode", "none");
                 setProp(_el$40, "flexGrow", 1);
-                setProp(_el$40, "paddingRight", 1);
-                setProp(_el$40, "gap", 0);
-                setProp(_el$41, "wrapMode", "none");
-                insert(_el$41, (() => {
-                  var _c$3 = memo2(() => !!loading());
-                  return () => _c$3() ? IN_PROGRESS_SPINNER[spinnerFrame()] ?? IN_PROGRESS_SPINNER[0] : badge.glyph;
-                })());
-                setProp(_el$42, "wrapMode", "none");
-                setProp(_el$42, "flexGrow", 1);
-                insert(_el$42, () => spacedTitle(titleText, titleBudget()));
-                insert(_el$40, createComponent2(Show, {
+                insert(_el$40, () => spacedTitle(titleText, titleBudget()));
+                insert(_el$38, createComponent2(Show, {
                   get when() {
-                    return loading();
+                    return memo2(() => !!props.moveMode?.())() && isCursor();
                   },
                   get children() {
-                    var _el$43 = createElement("text");
-                    insertNode(_el$43, createTextNode(` working`));
-                    setProp(_el$43, "wrapMode", "none");
-                    effect((_$p) => setProp(_el$43, "fg", theme.primary, _$p));
-                    return _el$43;
+                    var _el$41 = createElement("text");
+                    insertNode(_el$41, createTextNode(` move`));
+                    setProp(_el$41, "wrapMode", "none");
+                    effect((_$p) => setProp(_el$41, "fg", theme.warning, _$p));
+                    return _el$41;
                   }
                 }), null);
-                insert(_el$40, createComponent2(Show, {
-                  get when() {
-                    return memo2(() => !!!loading())() && activityChip();
-                  },
-                  children: (chip) => (() => {
-                    var _el$55 = createElement("text");
-                    setProp(_el$55, "wrapMode", "none");
-                    insert(_el$55, () => ` ${chip().text}`);
-                    effect((_$p) => setProp(_el$55, "fg", chip().tone === "error" ? theme.error : chip().tone === "warning" ? theme.warning : theme.primary, _$p));
-                    return _el$55;
-                  })()
-                }), null);
                 effect((_p$) => {
-                  var _v$22 = barColor(), _v$23 = badgeColor(), _v$24 = TextAttributes9.BOLD, _v$25 = theme.text, _v$26 = isSelected() || isCursor() ? TextAttributes9.BOLD : undefined;
-                  _v$22 !== _p$.e && (_p$.e = setProp(_el$39, "fg", _v$22, _p$.e));
-                  _v$23 !== _p$.t && (_p$.t = setProp(_el$41, "fg", _v$23, _p$.t));
-                  _v$24 !== _p$.a && (_p$.a = setProp(_el$41, "attributes", _v$24, _p$.a));
-                  _v$25 !== _p$.o && (_p$.o = setProp(_el$42, "fg", _v$25, _p$.o));
-                  _v$26 !== _p$.i && (_p$.i = setProp(_el$42, "attributes", _v$26, _p$.i));
+                  var _v$22 = barColor(), _v$23 = stateColor(), _v$24 = TextAttributes9.BOLD, _v$25 = theme.text, _v$26 = isSelected() || isCursor() ? TextAttributes9.BOLD : undefined;
+                  _v$22 !== _p$.e && (_p$.e = setProp(_el$37, "fg", _v$22, _p$.e));
+                  _v$23 !== _p$.t && (_p$.t = setProp(_el$39, "fg", _v$23, _p$.t));
+                  _v$24 !== _p$.a && (_p$.a = setProp(_el$39, "attributes", _v$24, _p$.a));
+                  _v$25 !== _p$.o && (_p$.o = setProp(_el$40, "fg", _v$25, _p$.o));
+                  _v$26 !== _p$.i && (_p$.i = setProp(_el$40, "attributes", _v$26, _p$.i));
                   return _p$;
                 }, {
                   e: undefined,
@@ -17654,74 +17837,74 @@ function Sidebar(props) {
                   o: undefined,
                   i: undefined
                 });
-                return _el$38;
+                return _el$36;
               })(), (() => {
-                var _el$45 = createElement("box"), _el$46 = createElement("text"), _el$47 = createElement("box"), _el$48 = createElement("text");
+                var _el$43 = createElement("box"), _el$44 = createElement("text"), _el$45 = createElement("box"), _el$46 = createElement("text");
+                insertNode(_el$43, _el$44);
+                insertNode(_el$43, _el$45);
+                setProp(_el$43, "flexDirection", "row");
+                setProp(_el$43, "gap", 0);
+                setProp(_el$44, "wrapMode", "none");
+                insert(_el$44, barGlyph);
                 insertNode(_el$45, _el$46);
-                insertNode(_el$45, _el$47);
                 setProp(_el$45, "flexDirection", "row");
-                setProp(_el$45, "gap", 0);
+                setProp(_el$45, "flexGrow", 1);
+                setProp(_el$45, "paddingLeft", 2);
+                setProp(_el$45, "paddingRight", 1);
+                setProp(_el$45, "gap", 1);
                 setProp(_el$46, "wrapMode", "none");
-                insert(_el$46, barGlyph);
-                insertNode(_el$47, _el$48);
-                setProp(_el$47, "flexDirection", "row");
-                setProp(_el$47, "flexGrow", 1);
-                setProp(_el$47, "paddingLeft", 2);
-                setProp(_el$47, "paddingRight", 1);
-                setProp(_el$47, "gap", 1);
-                setProp(_el$48, "wrapMode", "none");
-                setProp(_el$48, "flexGrow", 1);
-                insert(_el$48, subtitleText);
-                insert(_el$47, createComponent2(Show, {
+                setProp(_el$46, "flexGrow", 1);
+                insert(_el$46, subtitleText);
+                insert(_el$45, createComponent2(Show, {
                   get when() {
                     return task.pinned === true;
                   },
                   get children() {
-                    var _el$49 = createElement("text");
-                    insertNode(_el$49, createTextNode(`\u25B4`));
-                    setProp(_el$49, "wrapMode", "none");
-                    effect((_$p) => setProp(_el$49, "fg", theme.warning, _$p));
-                    return _el$49;
+                    var _el$47 = createElement("text");
+                    insertNode(_el$47, createTextNode(`\u25B4`));
+                    setProp(_el$47, "wrapMode", "none");
+                    effect((_$p) => setProp(_el$47, "fg", theme.warning, _$p));
+                    return _el$47;
                   }
                 }), null);
-                insert(_el$47, createComponent2(Show, {
+                insert(_el$45, createComponent2(Show, {
                   get when() {
                     return changes().added > 0;
                   },
                   get children() {
-                    var _el$51 = createElement("text"), _el$52 = createTextNode(`+`);
-                    insertNode(_el$51, _el$52);
-                    setProp(_el$51, "wrapMode", "none");
-                    insert(_el$51, () => changes().added, null);
-                    effect((_$p) => setProp(_el$51, "fg", theme.success, _$p));
-                    return _el$51;
+                    var _el$49 = createElement("text"), _el$50 = createTextNode(`+`);
+                    insertNode(_el$49, _el$50);
+                    setProp(_el$49, "wrapMode", "none");
+                    insert(_el$49, () => changes().added, null);
+                    effect((_$p) => setProp(_el$49, "fg", theme.success, _$p));
+                    return _el$49;
                   }
                 }), null);
-                insert(_el$47, createComponent2(Show, {
+                insert(_el$45, createComponent2(Show, {
                   get when() {
                     return changes().deleted > 0;
                   },
                   get children() {
-                    var _el$53 = createElement("text"), _el$54 = createTextNode(`\u2212`);
-                    insertNode(_el$53, _el$54);
-                    setProp(_el$53, "wrapMode", "none");
-                    insert(_el$53, () => changes().deleted, null);
-                    effect((_$p) => setProp(_el$53, "fg", theme.error, _$p));
-                    return _el$53;
+                    var _el$51 = createElement("text"), _el$52 = createTextNode(`\u2212`);
+                    insertNode(_el$51, _el$52);
+                    setProp(_el$51, "wrapMode", "none");
+                    insert(_el$51, () => changes().deleted, null);
+                    effect((_$p) => setProp(_el$51, "fg", theme.error, _$p));
+                    return _el$51;
                   }
                 }), null);
                 effect((_p$) => {
                   var _v$27 = barColor(), _v$28 = theme.textMuted, _v$29 = TextAttributes9.DIM;
-                  _v$27 !== _p$.e && (_p$.e = setProp(_el$46, "fg", _v$27, _p$.e));
-                  _v$28 !== _p$.t && (_p$.t = setProp(_el$48, "fg", _v$28, _p$.t));
-                  _v$29 !== _p$.a && (_p$.a = setProp(_el$48, "attributes", _v$29, _p$.a));
+                  _v$27 !== _p$.e && (_p$.e = setProp(_el$44, "fg", _v$27, _p$.e));
+                  _v$28 !== _p$.t && (_p$.t = setProp(_el$46, "fg", _v$28, _p$.t));
+                  _v$29 !== _p$.a && (_p$.a = setProp(_el$46, "attributes", _v$29, _p$.a));
                   return _p$;
                 }, {
                   e: undefined,
                   t: undefined,
                   a: undefined
                 });
-                return _el$45;
+                return _el$43;
               })()];
             }
           }), null);
@@ -17784,43 +17967,43 @@ function Sidebar(props) {
         const left = createMemo(() => Math.max(0, Math.min(h().x + 2, dims().width - boxW() - 1)));
         const top = createMemo(() => Math.max(0, Math.min(h().y + 1, dims().height - boxH() - 1)));
         return (() => {
-          var _el$56 = createElement("box");
-          setProp(_el$56, "position", "absolute");
-          setProp(_el$56, "zIndex", 2600);
-          setProp(_el$56, "flexDirection", "column");
-          setProp(_el$56, "border", true);
-          setProp(_el$56, "paddingLeft", 1);
-          setProp(_el$56, "paddingRight", 1);
-          insert(_el$56, createComponent2(For, {
+          var _el$53 = createElement("box");
+          setProp(_el$53, "position", "absolute");
+          setProp(_el$53, "zIndex", 2600);
+          setProp(_el$53, "flexDirection", "column");
+          setProp(_el$53, "border", true);
+          setProp(_el$53, "paddingLeft", 1);
+          setProp(_el$53, "paddingRight", 1);
+          insert(_el$53, createComponent2(For, {
             get each() {
               return lines();
             },
             children: (l) => (() => {
-              var _el$57 = createElement("text");
-              setProp(_el$57, "wrapMode", "none");
-              insert(_el$57, (() => {
-                var _c$4 = memo2(() => !!l.dim);
-                return () => _c$4() ? truncatePathTail(l.text, innerW()) : truncateTitle(l.text, innerW());
+              var _el$54 = createElement("text");
+              setProp(_el$54, "wrapMode", "none");
+              insert(_el$54, (() => {
+                var _c$2 = memo2(() => !!l.dim);
+                return () => _c$2() ? truncatePathTail(l.text, innerW()) : truncateTitle(l.text, innerW());
               })());
               effect((_p$) => {
                 var _v$35 = l.dim ? theme.textMuted : theme.text, _v$36 = l.bold ? TextAttributes9.BOLD : l.dim ? TextAttributes9.DIM : undefined;
-                _v$35 !== _p$.e && (_p$.e = setProp(_el$57, "fg", _v$35, _p$.e));
-                _v$36 !== _p$.t && (_p$.t = setProp(_el$57, "attributes", _v$36, _p$.t));
+                _v$35 !== _p$.e && (_p$.e = setProp(_el$54, "fg", _v$35, _p$.e));
+                _v$36 !== _p$.t && (_p$.t = setProp(_el$54, "attributes", _v$36, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$57;
+              return _el$54;
             })()
           }));
           effect((_p$) => {
             var _v$30 = left(), _v$31 = top(), _v$32 = boxW(), _v$33 = theme.focusAccent, _v$34 = theme.backgroundElement;
-            _v$30 !== _p$.e && (_p$.e = setProp(_el$56, "left", _v$30, _p$.e));
-            _v$31 !== _p$.t && (_p$.t = setProp(_el$56, "top", _v$31, _p$.t));
-            _v$32 !== _p$.a && (_p$.a = setProp(_el$56, "width", _v$32, _p$.a));
-            _v$33 !== _p$.o && (_p$.o = setProp(_el$56, "borderColor", _v$33, _p$.o));
-            _v$34 !== _p$.i && (_p$.i = setProp(_el$56, "backgroundColor", _v$34, _p$.i));
+            _v$30 !== _p$.e && (_p$.e = setProp(_el$53, "left", _v$30, _p$.e));
+            _v$31 !== _p$.t && (_p$.t = setProp(_el$53, "top", _v$31, _p$.t));
+            _v$32 !== _p$.a && (_p$.a = setProp(_el$53, "width", _v$32, _p$.a));
+            _v$33 !== _p$.o && (_p$.o = setProp(_el$53, "borderColor", _v$33, _p$.o));
+            _v$34 !== _p$.i && (_p$.i = setProp(_el$53, "backgroundColor", _v$34, _p$.i));
             return _p$;
           }, {
             e: undefined,
@@ -17829,7 +18012,7 @@ function Sidebar(props) {
             o: undefined,
             i: undefined
           });
-          return _el$56;
+          return _el$53;
         })();
       }
     }), null);
@@ -17925,6 +18108,7 @@ function TasksShell(props) {
   const dialog = useDialog();
   const kv = useKV();
   const [selectedId, setSelectedId] = createSignal(props.tasks().some((t) => t.id === props.initialTaskId) ? props.initialTaskId : props.tasks()[0]?.id ?? null);
+  const [moveMode, setMoveMode] = createSignal(false);
   const [updateInfo, setUpdateInfo] = createSignal(null);
   const dimensions = useTerminalDimensions();
   let activeConfirmed = !props.initialTaskId;
@@ -18174,6 +18358,19 @@ function TasksShell(props) {
       console.error(`[kobe tasks] failed to open worktree with ${opener.label}`);
     }
   }
+  async function moveTask(id, delta) {
+    const task = props.tasks().find((t) => t.id === id);
+    if (!task || task.kind === "main" || !props.orch)
+      return;
+    try {
+      await props.orch.moveTask(id, delta);
+    } catch (err) {
+      console.error("[kobe tasks] task.move failed:", err);
+      return;
+    }
+    setSelectedId(id);
+    await props.reload();
+  }
   useBindings(() => ({
     enabled: dialog.stack.length === 0,
     bindings: [{
@@ -18305,18 +18502,30 @@ function TasksShell(props) {
       onRenameRequest: (id) => void renameTask(id),
       onDeleteRequest: (id) => void deleteTask(id),
       onArchiveRequest: (id) => void archiveTask(id),
+      onLocalMergeRequest: (id) => {
+        const task = props.tasks().find((t) => t.id === id);
+        if (!task || task.kind === "main")
+          return;
+        setSelectedId(id);
+        setMoveMode((cur) => !cur);
+      },
+      moveMode,
+      onMoveRequest: (id, delta) => void moveTask(id, delta),
+      onMoveModeExit: () => setMoveMode(false),
       focused: () => dialog.stack.length === 0
     }));
-    insert(_el$, createComponent2(ShortcutHints, {}), null);
+    insert(_el$, createComponent2(ShortcutHints, {
+      moveMode
+    }), null);
     effect((_$p) => setProp(_el$, "backgroundColor", theme.background, _$p));
     return _el$;
   })();
 }
-function ShortcutHints() {
+function ShortcutHints(props) {
   const {
     theme
   } = useTheme();
-  const HINTS = [{
+  const DEFAULT_HINTS = [{
     k: "\u23CE",
     label: "open"
   }, {
@@ -18331,6 +18540,9 @@ function ShortcutHints() {
   }, {
     k: "[/]",
     label: "views"
+  }, {
+    k: "M",
+    label: "move task"
   }, {
     k: "A/D",
     label: "archive/delete"
@@ -18365,9 +18577,17 @@ function ShortcutHints() {
     k: "\u2303Q",
     label: "detach"
   }];
+  const MOVE_HINTS = [{
+    k: "J/K",
+    label: "reorder"
+  }, {
+    k: "\u23CE/Esc",
+    label: "done"
+  }];
+  const hints = () => props.moveMode?.() ? MOVE_HINTS : DEFAULT_HINTS;
   const LABEL_COL_MAX = 18;
-  const labelColWidth = Math.min(LABEL_COL_MAX, Math.max(...HINTS.map((h) => h.label.length)));
-  const clipLabel = (s) => s.length <= labelColWidth ? s : `${s.slice(0, Math.max(0, labelColWidth - 1))}\u2026`;
+  const labelColWidth = () => Math.min(LABEL_COL_MAX, Math.max(...hints().map((h) => h.label.length)));
+  const clipLabel = (s) => s.length <= labelColWidth() ? s : `${s.slice(0, Math.max(0, labelColWidth() - 1))}\u2026`;
   return (() => {
     var _el$3 = createElement("box"), _el$4 = createElement("text");
     insertNode(_el$3, _el$4);
@@ -18380,7 +18600,9 @@ function ShortcutHints() {
     insertNode(_el$4, createTextNode(`\u2500\u2500 keys \u2500\u2500`));
     setProp(_el$4, "wrapMode", "none");
     insert(_el$3, createComponent2(For, {
-      each: HINTS,
+      get each() {
+        return hints();
+      },
       children: (h) => (() => {
         var _el$6 = createElement("box"), _el$7 = createElement("box"), _el$8 = createElement("text"), _el$9 = createTextNode(`[`), _el$0 = createTextNode(`]`), _el$1 = createElement("box"), _el$10 = createElement("text");
         insertNode(_el$6, _el$7);
@@ -18396,20 +18618,21 @@ function ShortcutHints() {
         setProp(_el$8, "wrapMode", "none");
         insert(_el$8, () => h.k, _el$0);
         insertNode(_el$1, _el$10);
-        setProp(_el$1, "width", labelColWidth);
         setProp(_el$1, "flexShrink", 0);
         setProp(_el$10, "wrapMode", "none");
         insert(_el$10, () => clipLabel(h.label));
         effect((_p$) => {
-          var _v$3 = theme.accent, _v$4 = TextAttributes10.BOLD, _v$5 = theme.textMuted;
+          var _v$3 = theme.accent, _v$4 = TextAttributes10.BOLD, _v$5 = labelColWidth(), _v$6 = theme.textMuted;
           _v$3 !== _p$.e && (_p$.e = setProp(_el$8, "fg", _v$3, _p$.e));
           _v$4 !== _p$.t && (_p$.t = setProp(_el$8, "attributes", _v$4, _p$.t));
-          _v$5 !== _p$.a && (_p$.a = setProp(_el$10, "fg", _v$5, _p$.a));
+          _v$5 !== _p$.a && (_p$.a = setProp(_el$1, "width", _v$5, _p$.a));
+          _v$6 !== _p$.o && (_p$.o = setProp(_el$10, "fg", _v$6, _p$.o));
           return _p$;
         }, {
           e: undefined,
           t: undefined,
-          a: undefined
+          a: undefined,
+          o: undefined
         });
         return _el$6;
       })()

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@sma1lboy/kobe",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "description": "TUI orchestrator for Claude Code (codename)",
   "type": "module",
   "packageManager": "bun@1.3.13",
@@ -49,6 +49,7 @@
     "@biomejs/biome": "1.9.4",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.3.12",
+    "@types/node": "25.6.2",
     "knip": "^6.14.2",
     "node-pty": "^1.1.0",
     "typescript": "5.8.2",