@sma1lboy/kobe 0.7.18 → 0.7.19

package/dist/cli/index.js

@@ -90,7 +90,7 @@ var init_package = __esm(() => {
   package_default = {
     $schema: "https://json.schemastore.org/package.json",
     name: "@sma1lboy/kobe",
-    version: "0.7.18",
+    version: "0.7.19",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -3919,7 +3919,9 @@ var init_protocol = __esm(() => {
     "update",
     "engine-state",
     "ui-prefs",
-    "keybindings"
+    "keybindings",
+    "task.jobs",
+    "worktree.changes"
   ];
 });
 
@@ -4067,6 +4069,7 @@ class KobeDaemonClient {
     this.disposed = true;
     this.socket?.end();
     this.socket = null;
+    this.failPending();
   }
   forceDisconnect() {
     const socket = this.socket;
@@ -4074,6 +4077,15 @@ class KobeDaemonClient {
       return;
     this.socket = null;
     socket.destroy();
+    this.failPending();
+  }
+  failPending() {
+    if (this.pending.size === 0)
+      return;
+    const err = new Error("daemon connection closed");
+    for (const pending of this.pending.values())
+      pending.reject(err);
+    this.pending.clear();
   }
   on(name, handler) {
     let set = this.handlers.get(name);
@@ -4148,9 +4160,7 @@ class KobeDaemonClient {
     if (this.socket !== which)
       return;
     this.socket = null;
-    for (const pending of this.pending.values())
-      pending.reject(new Error("daemon connection closed"));
-    this.pending.clear();
+    this.failPending();
     this.emitLifecycle("close");
   }
   emitLifecycle(name) {
@@ -5941,7 +5951,7 @@ function parseEvents(raw, fallbackSessionId) {
       if (!text)
         continue;
       if (!firstUserMessage)
-        firstUserMessage = text.slice(0, PREVIEW_CHAR_CAP);
+        firstUserMessage = Buffer.from(text.slice(0, PREVIEW_CHAR_CAP), "utf8").toString("utf8");
       messages.push({ role: "user", blocks: [{ type: "text", text }], timestamp, sessionId });
       continue;
     }
@@ -6277,7 +6287,8 @@ function titleFromMessages(messages) {
   if (!firstUser)
     return "";
   const text = firstUser.blocks.filter((b) => b.type === "text").map((b) => b.text).join(" ");
-  return deriveTitleFromPrompt(text);
+  const title = deriveTitleFromPrompt(text);
+  return title.length > 0 ? Buffer.from(title, "utf8").toString("utf8") : title;
 }
 async function deriveTitleFromSession(worktree, vendor = DEFAULT_TASK_VENDOR) {
   if (!worktree)
@@ -7071,8 +7082,20 @@ function createDaemonHandlerRegistry() {
       name: "task.ensureWorktree",
       async handle(payload, ctx) {
         const taskId = requireString(payload, "taskId");
-        const path11 = await ctx.orch.ensureWorktree(taskId);
-        return { worktreePath: path11 };
+        ctx.bus.publish("task.jobs", { taskId, kind: "ensureWorktree", phase: "running" });
+        try {
+          const path11 = await ctx.orch.ensureWorktree(taskId);
+          ctx.bus.publish("task.jobs", { taskId, kind: "ensureWorktree", phase: "done" });
+          return { worktreePath: path11 };
+        } catch (err) {
+          ctx.bus.publish("task.jobs", {
+            taskId,
+            kind: "ensureWorktree",
+            phase: "error",
+            error: err instanceof Error ? err.message : String(err)
+          });
+          throw err;
+        }
       }
     },
     {
@@ -7333,6 +7356,232 @@ var init_ui_prefs_watcher = __esm(() => {
   FOCUS_ACCENT_SLOT_NAMES = ["primary", "success", "info"];
 });
 
+// src/lib/poll-scheduling.ts
+import { spawn as spawn2 } from "child_process";
+function computeNextAllowedAt(startedAt, finishedAt, timedOut, cfg) {
+  if (timedOut)
+    return startedAt + cfg.slowRetryMs;
+  return finishedAt + Math.max(cfg.minIntervalMs, (finishedAt - startedAt) * 5);
+}
+function shouldPoll(state, now) {
+  return !state.inFlight && now >= state.nextAllowedAt;
+}
+function maybeStartScheduledRun(state, cfg, run, onValue) {
+  const startedAt = Date.now();
+  if (!shouldPoll(state, startedAt))
+    return false;
+  state.inFlight = true;
+  const controller = new AbortController;
+  const timer = setTimeout(() => controller.abort(), cfg.timeoutMs);
+  (async () => {
+    let value;
+    let ok = false;
+    try {
+      value = await run(controller.signal);
+      ok = true;
+    } catch {}
+    clearTimeout(timer);
+    const timedOut = controller.signal.aborted;
+    state.nextAllowedAt = computeNextAllowedAt(startedAt, Date.now(), timedOut, cfg);
+    state.inFlight = false;
+    if (ok && !timedOut)
+      onValue(value);
+  })();
+  return true;
+}
+function spawnCapture(cmd, args, opts) {
+  return new Promise((resolve2) => {
+    let out = "";
+    let settled = false;
+    const finish = (status) => {
+      if (settled)
+        return;
+      settled = true;
+      resolve2({ status, stdout: out });
+    };
+    const child = spawn2(cmd, args.slice(), {
+      cwd: opts.cwd,
+      stdio: ["ignore", "pipe", "ignore"],
+      env: opts.env,
+      signal: opts.signal,
+      killSignal: "SIGKILL"
+    });
+    child.stdout?.on("data", (chunk) => {
+      out += String(chunk);
+    });
+    child.on("error", () => finish(null));
+    child.on("close", (code) => finish(code));
+  });
+}
+var init_poll_scheduling = () => {};
+
+// src/tui/panes/sidebar/worktree-changes.ts
+var exports_worktree_changes = {};
+__export(exports_worktree_changes, {
+  sameWorktreeChanges: () => sameWorktreeChanges,
+  readWorktreeChanges: () => readWorktreeChanges,
+  pickPushedChanges: () => pickPushedChanges,
+  parsePorcelain: () => parsePorcelain2
+});
+import { spawnSync as spawnSync7 } from "child_process";
+function sameWorktreeChanges(a, b) {
+  return a.added === b.added && a.deleted === b.deleted;
+}
+function pickPushedChanges(pushed, worktreePath) {
+  if (!pushed)
+    return null;
+  return pushed.get(worktreePath) ?? ZERO;
+}
+function readWorktreeChanges(worktreePath) {
+  if (!worktreePath)
+    return ZERO;
+  try {
+    const out = spawnSync7("git", ["status", "--porcelain=v1"], {
+      cwd: worktreePath,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" }
+    });
+    if (out.status !== 0 || !out.stdout)
+      return ZERO;
+    return parsePorcelain2(out.stdout);
+  } catch {
+    return ZERO;
+  }
+}
+function parsePorcelain2(text) {
+  let added = 0;
+  let deleted = 0;
+  for (const line of text.split(`
+`)) {
+    if (!line || line.startsWith("##"))
+      continue;
+    const x = line.charAt(0);
+    const y = line.charAt(1);
+    if (x === "D" || y === "D")
+      deleted += 1;
+    else
+      added += 1;
+  }
+  return { added, deleted };
+}
+var ZERO;
+var init_worktree_changes = __esm(() => {
+  ZERO = { added: 0, deleted: 0 };
+});
+
+// ../kobe-daemon/src/daemon/worktree-changes-collector.ts
+async function runGitStatus(worktreePath, signal) {
+  const res = await spawnCapture("git", ["status", "--porcelain=v1"], {
+    cwd: worktreePath,
+    env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" },
+    signal
+  });
+  if (res.status !== 0)
+    throw new Error("git status failed");
+  return parsePorcelain2(res.stdout);
+}
+function trackedWorktreePaths(tasks) {
+  const paths = new Set;
+  for (const task of tasks) {
+    if (task.archived)
+      continue;
+    if (!task.worktreePath)
+      continue;
+    if (isRemoteRepoKey(task.repo) || isRemoteRepoKey(task.worktreePath))
+      continue;
+    paths.add(task.worktreePath);
+  }
+  return paths;
+}
+
+class WorktreeChangesCollector {
+  orch;
+  bus;
+  options;
+  entries = new Map;
+  stopped = false;
+  constructor(orch, bus, options = {}) {
+    this.orch = orch;
+    this.bus = bus;
+    this.options = options;
+  }
+  tick() {
+    if (this.stopped)
+      return;
+    try {
+      const tracked = trackedWorktreePaths(this.orch.listTasks());
+      let pruned = false;
+      for (const path11 of this.entries.keys()) {
+        if (tracked.has(path11))
+          continue;
+        const entry = this.entries.get(path11);
+        if (entry?.value)
+          pruned = true;
+        this.entries.delete(path11);
+      }
+      if (pruned)
+        this.publish();
+      for (const path11 of tracked)
+        this.maybeCollect(path11);
+    } catch (err) {
+      logDaemonError("worktree-changes", err);
+    }
+  }
+  stop() {
+    this.stopped = true;
+  }
+  maybeCollect(worktreePath) {
+    let entry = this.entries.get(worktreePath);
+    if (!entry) {
+      entry = { inFlight: false, nextAllowedAt: 0 };
+      this.entries.set(worktreePath, entry);
+    }
+    const cadence = this.options.cadence ?? {
+      timeoutMs: WORKTREE_CHANGES_TIMEOUT_MS,
+      slowRetryMs: WORKTREE_CHANGES_SLOW_RETRY_MS,
+      minIntervalMs: WORKTREE_CHANGES_MIN_INTERVAL_MS
+    };
+    const run = this.options.run ?? runGitStatus;
+    maybeStartScheduledRun(entry, cadence, (signal) => run(worktreePath, signal), (value) => {
+      if (this.stopped)
+        return;
+      if (this.entries.get(worktreePath) !== entry)
+        return;
+      if (entry.value && sameWorktreeChanges(entry.value, value))
+        return;
+      entry.value = value;
+      this.publish();
+    });
+  }
+  publish() {
+    const changes = {};
+    for (const [path11, entry] of this.entries) {
+      if (entry.value)
+        changes[path11] = entry.value;
+    }
+    this.bus.publish("worktree.changes", { changes });
+  }
+}
+function startWorktreeChangesCollector(orch, bus, tickMs = DEFAULT_WORKTREE_CHANGES_TICK_MS) {
+  if (tickMs <= 0)
+    return () => {};
+  const collector = new WorktreeChangesCollector(orch, bus);
+  collector.tick();
+  const timer = setInterval(() => collector.tick(), tickMs);
+  timer.unref?.();
+  return () => {
+    clearInterval(timer);
+    collector.stop();
+  };
+}
+var DEFAULT_WORKTREE_CHANGES_TICK_MS = 2000, WORKTREE_CHANGES_TIMEOUT_MS = 4000, WORKTREE_CHANGES_SLOW_RETRY_MS = 60000, WORKTREE_CHANGES_MIN_INTERVAL_MS = 1500;
+var init_worktree_changes_collector = __esm(() => {
+  init_poll_scheduling();
+  init_repos();
+  init_worktree_changes();
+});
+
 // ../kobe-daemon/src/daemon/server.ts
 import { mkdir as mkdir6, readFile as readFile8, unlink as unlink4, writeFile as writeFile4 } from "fs/promises";
 import { createServer } from "net";
@@ -7436,6 +7685,7 @@ async function startDaemonServer(orch, options = {}) {
     path: defaultKeybindingsPath(options.homeDir),
     debounceMs: options.keybindingsDebounceMs ?? DEFAULT_KEYBINDINGS_DEBOUNCE_MS
   });
+  const stopWorktreeChangesCollector = startWorktreeChangesCollector(orch, bus, options.worktreeChangesTickMs ?? DEFAULT_WORKTREE_CHANGES_TICK_MS);
   const serverApi = {
     socketPath,
     pidPath,
@@ -7450,6 +7700,7 @@ async function startDaemonServer(orch, options = {}) {
       stopAutoTitlePoller();
       stopUiPrefsWatcher();
       stopKeybindingsWatcher();
+      stopWorktreeChangesCollector();
       activity.close();
       broadcast(clients, { type: "event", name: "daemon.stopping", payload: {} });
       for (const client of Array.from(clients)) {
@@ -7573,6 +7824,7 @@ var init_server = __esm(() => {
   init_paths2();
   init_protocol();
   init_ui_prefs_watcher();
+  init_worktree_changes_collector();
   init_handlers();
   DEFAULT_UPDATE_POLL_MS = 6 * 60 * 60 * 1000;
 });
@@ -7641,7 +7893,7 @@ __export(exports_daemon_process, {
   connectOrStartDaemon: () => connectOrStartDaemon,
   connectIfRunning: () => connectIfRunning
 });
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { closeSync, existsSync as existsSync5, mkdirSync as mkdirSync4, openSync } from "fs";
 import { dirname as dirname8, resolve as resolve2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -7655,7 +7907,7 @@ function spawnDetachedDaemon(command, args, env, logPath) {
   } catch {
     stdio = "ignore";
   }
-  const child = spawn2(command, [...args], { detached: true, stdio, env });
+  const child = spawn3(command, [...args], { detached: true, stdio, env });
   child.unref();
   if (logFd !== undefined) {
     try {
@@ -7938,7 +8190,7 @@ var init_interactive_command = __esm(() => {
 });
 
 // src/lib/feedback.ts
-import { spawnSync as spawnSync7 } from "child_process";
+import { spawnSync as spawnSync8 } from "child_process";
 function parseRepoSlug(slug) {
   const [owner, name] = slug.split("/");
   if (!owner || !name)
@@ -7993,7 +8245,7 @@ function submitFeedback(input, deps = {}) {
     throw new Error("package repository is not a GitHub repository");
   const { owner, name } = parseRepoSlug(slug);
   const categorySlug = input.categorySlug?.trim() || DEFAULT_FEEDBACK_CATEGORY_SLUG;
-  const io = { spawn: deps.spawn ?? spawnSync7 };
+  const io = { spawn: deps.spawn ?? spawnSync8 };
   const categoryData = runGhGraphql(DISCUSSION_CATEGORY_QUERY, { owner, name }, io);
   const repository = categoryData.repository;
   const repositoryId = repository?.id;
@@ -8132,6 +8384,13 @@ var init_keybindings_file = __esm(() => {
 });
 
 // src/tui/lib/keymap-overrides.ts
+function pairContract(first, second) {
+  const layout = `alternating [${first}, ${second}] pairs`;
+  return {
+    layout,
+    validateCount: (count) => count >= 2 && count % 2 === 0 ? null : `needs ${layout} (an even number of chords \u2014 got ${count})`
+  };
+}
 function normalizeChord(raw, opts) {
   const trimmed = raw.trim().toLowerCase();
   if (!trimmed)
@@ -8271,6 +8530,14 @@ function applyKeymapOverrides(keymap, entries) {
       warnings.push(`${entry.id}: not customizable \u2014 the key is handled outside the keymap (doc-only row)`);
       continue;
     }
+    const contract = SLOT_CONTRACTS[entry.id];
+    if (contract && entry.keys.length > 0) {
+      const problem = contract.validateCount(entry.keys.length);
+      if (problem) {
+        warnings.push(`${entry.id}: ${problem} \u2014 keeping the default`);
+        continue;
+      }
+    }
     const keys = entry.keys.filter((chord) => {
       if (chord.length === 1 && NO_BARE_LETTER_SCOPES.has(row.scope)) {
         warnings.push(`${entry.id}: "${chord}" dropped \u2014 a bare character on a ${row.scope}-scope binding would steal typed input (add a modifier)`);
@@ -8282,6 +8549,10 @@ function applyKeymapOverrides(keymap, entries) {
       warnings.push(`${entry.id}: no chords survived validation \u2014 keeping the default`);
       continue;
     }
+    if (contract && keys.length !== entry.keys.length) {
+      warnings.push(`${entry.id}: a dropped chord would shift the slot layout (${contract.layout}) \u2014 keeping the default`);
+      continue;
+    }
     const defaultKeys = row.keys;
     const mutable = row;
     mutable.keys = keys;
@@ -8312,21 +8583,23 @@ function applyKeymapOverrides(keymap, entries) {
   }
   return { applied, warnings };
 }
-var FIXED_BINDING_IDS, NO_BARE_LETTER_SCOPES, MOD_ALIASES, KEY_ALIASES, KNOWN_NAMED_KEYS, MOD_ORDER;
+var FIXED_BINDING_IDS, SLOT_CONTRACTS, NO_BARE_LETTER_SCOPES, MOD_ALIASES, KEY_ALIASES, KNOWN_NAMED_KEYS, MOD_ORDER;
 var init_keymap_overrides = __esm(() => {
   FIXED_BINDING_IDS = {
-    "focus.numeric": "pane focus is positional (h/j/k/l \u2192 pane) and mirrors the tmux-layer ctrl+hjkl bindings",
-    "sidebar.nav": "handler maps j/down vs k/up by key name",
-    "sidebar.goto": "gg vs Shift+G is discriminated inside the handler",
-    "sidebar.pin": "Shift+P is discriminated inside the handler",
-    "sidebar.localMerge": "Shift+M is discriminated inside the handler",
-    "sidebar.view": "[ vs ] direction is read from the key name",
-    "sidebar.search.nav": "handler maps down vs up by key name",
-    "files.nav": "handler maps j/down vs k/up by key name",
-    "files.hierarchy": "handler maps h/left vs l/right by key name",
-    "files.tab": "[ vs ] direction is read from the key name",
-    "chat.question.nav": "handler maps j/down vs k/up by key name",
-    "chat.question.pick-number": "digits map to options by key name"
+    "focus.numeric": "pane focus is positional (h/j/k/l \u2192 pane) and mirrors the tmux-layer ctrl+hjkl bindings \u2014 rebind tmux.focus instead",
+    "sidebar.goto": "gg vs Shift+G is discriminated via evt.shift; shift+<letter> chords are inexpressible, so a rebind can't carry both halves",
+    "sidebar.pin": "fires on Shift+P via evt.shift; shift+<letter> chords are inexpressible, so a rebind can't work",
+    "sidebar.localMerge": "fires on Shift+M via evt.shift; shift+<letter> chords are inexpressible, so a rebind can't work",
+    "chat.question.nav": "the question picker has no live registration site (display-only row) \u2014 rebinding would change Help without changing behavior",
+    "chat.question.pick-number": "digits map to options positionally and the question picker has no live registration site (display-only row)"
+  };
+  SLOT_CONTRACTS = {
+    "sidebar.nav": pairContract("down", "up"),
+    "files.nav": pairContract("down", "up"),
+    "sidebar.search.nav": pairContract("down", "up"),
+    "files.hierarchy": pairContract("collapse", "expand"),
+    "sidebar.view": pairContract("previous view", "next view"),
+    "files.tab": pairContract("previous tab", "next tab")
   };
   NO_BARE_LETTER_SCOPES = new Set(["global", "workspace", "terminal"]);
   MOD_ALIASES = {
@@ -10897,51 +11170,6 @@ var init_repo_init = __esm(() => {
   INIT_PROMPT_REL = join7(".kobe", "init-prompt.md");
 });
 
-// src/tui/panes/sidebar/worktree-changes.ts
-var exports_worktree_changes = {};
-__export(exports_worktree_changes, {
-  readWorktreeChanges: () => readWorktreeChanges,
-  parsePorcelain: () => parsePorcelain2
-});
-import { spawnSync as spawnSync8 } from "child_process";
-function readWorktreeChanges(worktreePath) {
-  if (!worktreePath)
-    return ZERO;
-  try {
-    const out = spawnSync8("git", ["status", "--porcelain=v1"], {
-      cwd: worktreePath,
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env, GIT_OPTIONAL_LOCKS: "0" }
-    });
-    if (out.status !== 0 || !out.stdout)
-      return ZERO;
-    return parsePorcelain2(out.stdout);
-  } catch {
-    return ZERO;
-  }
-}
-function parsePorcelain2(text) {
-  let added = 0;
-  let deleted = 0;
-  for (const line of text.split(`
-`)) {
-    if (!line || line.startsWith("##"))
-      continue;
-    const x = line.charAt(0);
-    const y = line.charAt(1);
-    if (x === "D" || y === "D")
-      deleted += 1;
-    else
-      added += 1;
-  }
-  return { added, deleted };
-}
-var ZERO;
-var init_worktree_changes = __esm(() => {
-  ZERO = { added: 0, deleted: 0 };
-});
-
 // src/cli/api-cmd.ts
 var exports_api_cmd = {};
 __export(exports_api_cmd, {
@@ -13035,16 +13263,21 @@ class DaemonLink {
     const socketPath = allowSpawn ? await ensureDaemonReachable() : defaultDaemonSocketPath();
     const client = new KobeDaemonClient(socketPath);
     await client.connect();
-    const hello = await client.request("hello", {
-      protocolVersion: DAEMON_PROTOCOL_VERSION,
-      minProtocolVersion: MIN_COMPATIBLE_PROTOCOL_VERSION
-    });
-    if (hello.tasks)
-      this.tasks = hello.tasks;
-    this.engineStates = {};
-    client.on("*", (frame) => this.onFrame(frame.name, frame.payload));
-    client.onLifecycle("close", () => this.onDrop(client));
-    await client.subscribe({ role: "gui" });
+    try {
+      const hello = await client.request("hello", {
+        protocolVersion: DAEMON_PROTOCOL_VERSION,
+        minProtocolVersion: MIN_COMPATIBLE_PROTOCOL_VERSION
+      });
+      if (hello.tasks)
+        this.tasks = hello.tasks;
+      this.engineStates = {};
+      client.on("*", (frame) => this.onFrame(frame.name, frame.payload));
+      client.onLifecycle("close", () => this.onDrop(client));
+      await client.subscribe({ role: "gui" });
+    } catch (err) {
+      client.close();
+      throw err;
+    }
     this.client = client;
     this.setConnected(true);
   }
@@ -15101,6 +15334,30 @@ var init_solid = __esm(() => {
 });
 
 // src/client/remote-orchestrator.ts
+function parseWorktreeChangesPayload(payload) {
+  const changes = payload?.changes;
+  if (!changes || typeof changes !== "object" || Array.isArray(changes))
+    return null;
+  const map = new Map;
+  for (const [path11, value] of Object.entries(changes)) {
+    const counts = value;
+    if (typeof counts?.added !== "number" || typeof counts.deleted !== "number")
+      return null;
+    map.set(path11, { added: counts.added, deleted: counts.deleted });
+  }
+  return map;
+}
+function sameWorktreeChangesMap(a, b) {
+  if (a.size !== b.size)
+    return false;
+  for (const [path11, counts] of a) {
+    const other = b.get(path11);
+    if (!other || !sameWorktreeChanges(counts, other))
+      return false;
+  }
+  return true;
+}
+
 class RemoteOrchestrator {
   client;
   tasksAcc;
@@ -15113,6 +15370,10 @@ class RemoteOrchestrator {
   setDaemonVersionSig;
   engineStateAcc;
   setEngineStateSig;
+  taskJobsAcc;
+  setTaskJobsSig;
+  worktreeChangesAcc;
+  setWorktreeChangesSig;
   uiPrefsAcc;
   setUiPrefsSig;
   keybindingsRevAcc;
@@ -15129,6 +15390,8 @@ class RemoteOrchestrator {
     const [update, setUpdate] = createSignal(null);
     const [daemonVersion, setDaemonVersion] = createSignal(null);
     const [engineState, setEngineState] = createSignal(new Map);
+    const [taskJobs, setTaskJobs] = createSignal(new Map);
+    const [worktreeChanges, setWorktreeChanges] = createSignal(null);
     const [uiPrefs, setUiPrefs] = createSignal(null);
     const [keybindingsRev, setKeybindingsRev] = createSignal(null);
     const [connectionState, setConnectionState] = createSignal("online");
@@ -15142,6 +15405,10 @@ class RemoteOrchestrator {
     this.setDaemonVersionSig = (next) => setDaemonVersion(() => next);
     this.engineStateAcc = engineState;
     this.setEngineStateSig = (next) => setEngineState(() => next);
+    this.taskJobsAcc = taskJobs;
+    this.setTaskJobsSig = (next) => setTaskJobs(() => next);
+    this.worktreeChangesAcc = worktreeChanges;
+    this.setWorktreeChangesSig = (next) => setWorktreeChanges(() => next);
     this.uiPrefsAcc = uiPrefs;
     this.setUiPrefsSig = (next) => setUiPrefs(() => next);
     this.keybindingsRevAcc = keybindingsRev;
@@ -15202,6 +15469,12 @@ class RemoteOrchestrator {
     if (hello.tasks)
       this.setTasks(hello.tasks.map(deserializeTask));
     await this.client.subscribe({ role: this.role });
+    if (hello.capabilities?.includes("worktree.changes")) {
+      if (this.worktreeChangesAcc() === null)
+        this.setWorktreeChangesSig(new Map);
+    } else {
+      this.setWorktreeChangesSig(null);
+    }
     this.setConnectionState("online");
     logClient("orch", `subscribed as ${this.role} (${this.tasksAcc().length} tasks)`);
   }
@@ -15234,6 +15507,12 @@ class RemoteOrchestrator {
   engineStateSignal() {
     return this.engineStateAcc;
   }
+  taskJobsSignal() {
+    return this.taskJobsAcc;
+  }
+  worktreeChangesSignal() {
+    return this.worktreeChangesAcc;
+  }
   uiPrefsSignal() {
     return this.uiPrefsAcc;
   }
@@ -15319,8 +15598,11 @@ class RemoteOrchestrator {
   handleEvent(name, payload) {
     if (name === "task.snapshot") {
       const value = payload?.tasks;
-      if (Array.isArray(value))
+      if (Array.isArray(value)) {
         this.setTasks(value.map(deserializeTask));
+        this.pruneEngineState(value);
+        this.pruneTaskJobs(value);
+      }
       return;
     }
     if (name === "active-task") {
@@ -15345,6 +15627,34 @@ class RemoteOrchestrator {
       this.setEngineStateSig(next);
       return;
     }
+    if (name === "task.jobs") {
+      const p = payload;
+      if (typeof p?.taskId !== "string" || p.kind !== "ensureWorktree")
+        return;
+      const current = this.taskJobsAcc();
+      if (p.phase === "running") {
+        const next = new Map(current);
+        next.set(p.taskId, { kind: p.kind });
+        this.setTaskJobsSig(next);
+        return;
+      }
+      if ((p.phase === "done" || p.phase === "error") && current.has(p.taskId)) {
+        const next = new Map(current);
+        next.delete(p.taskId);
+        this.setTaskJobsSig(next);
+      }
+      return;
+    }
+    if (name === "worktree.changes") {
+      const next = parseWorktreeChangesPayload(payload);
+      if (!next)
+        return;
+      const current = this.worktreeChangesAcc();
+      if (current && sameWorktreeChangesMap(current, next))
+        return;
+      this.setWorktreeChangesSig(next);
+      return;
+    }
     if (name === "ui-prefs") {
       const p = payload;
       if (typeof p?.theme !== "string")
@@ -15366,6 +15676,38 @@ class RemoteOrchestrator {
       return;
     }
   }
+  pruneEngineState(tasks) {
+    const current = this.engineStateAcc();
+    if (current.size === 0)
+      return;
+    const live = new Set(tasks.map((t) => t.id));
+    let next = null;
+    for (const key of current.keys()) {
+      if (live.has(key))
+        continue;
+      if (!next)
+        next = new Map(current);
+      next.delete(key);
+    }
+    if (next)
+      this.setEngineStateSig(next);
+  }
+  pruneTaskJobs(tasks) {
+    const current = this.taskJobsAcc();
+    if (current.size === 0)
+      return;
+    const live = new Set(tasks.map((t) => t.id));
+    let next = null;
+    for (const key of current.keys()) {
+      if (live.has(key))
+        continue;
+      if (!next)
+        next = new Map(current);
+      next.delete(key);
+    }
+    if (next)
+      this.setTaskJobsSig(next);
+  }
 }
 function deserializeTask(s) {
   return {
@@ -15389,6 +15731,7 @@ var init_remote_orchestrator = __esm(() => {
   init_daemon_process();
   init_protocol();
   init_dev();
+  init_worktree_changes();
   init_version();
 });
 
@@ -15917,7 +16260,7 @@ function dispatchKeyEvent(bindingStack, evt) {
       continue;
     const hit = cfg.bindings.find((b) => candidates.includes(b.key));
     if (hit) {
-      hit.cmd(evt);
+      hit.cmd(evt, hit.slot);
       evt.preventDefault();
       return true;
     }
@@ -16328,7 +16671,7 @@ function joinDrill(typedValue, baseExpanded, name) {
 var init_path_helpers = () => {};
 
 // src/tui/component/new-task-dialog/clone.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import * as fs5 from "fs";
 import * as path11 from "path";
 function deriveFolderName(url) {
@@ -16407,7 +16750,7 @@ function cloneRepo(url, target, onProgress) {
   return new Promise((resolve8) => {
     let stderrBuf = "";
     try {
-      const child = spawn3("git", ["clone", "--progress", url, target], {
+      const child = spawn4("git", ["clone", "--progress", url, target], {
         stdio: ["ignore", "ignore", "pipe"]
       });
       child.stderr?.setEncoding("utf-8");
@@ -17933,8 +18276,7 @@ function bindByIds(handlers) {
       console.warn(`[kobe/keybindings] bindByIds: id="${id}" has no chords (or doesn't exist in KobeKeymap)`);
       continue;
     }
-    for (const c of chords)
-      out.push({ key: c, cmd });
+    chords.forEach((c, slot) => out.push({ key: c, cmd, slot }));
   }
   return out;
 }
@@ -18839,20 +19181,28 @@ function UiPrefsSync(props) {
     focusAccent: props.boot.focusAccent
   });
   const [prefsOrch, setPrefsOrch] = createSignal(null);
+  let disposed = false;
   onMount(() => {
     (async () => {
+      let remote = null;
       try {
         const client = await connectIfRunning();
         if (!client) {
           logClient("ui-prefs", "no daemon \u2014 keeping boot-time visual prefs");
           return;
         }
-        const remote = new RemoteOrchestrator(client);
+        remote = new RemoteOrchestrator(client);
         await remote.init();
-        setPrefsOrch(remote);
       } catch (err) {
         logClientError("ui-prefs", err);
+        remote?.dispose();
+        return;
+      }
+      if (disposed) {
+        remote.dispose();
+        return;
       }
+      setPrefsOrch(remote);
     })();
   });
   createEffect(() => {
@@ -18872,7 +19222,10 @@ function UiPrefsSync(props) {
     lastKeybindingsRev = rev;
     reloadUserKeybindings();
   });
-  onCleanup(() => prefsOrch()?.dispose());
+  onCleanup(() => {
+    disposed = true;
+    prefsOrch()?.dispose();
+  });
   return null;
 }
 async function bootPaneHost(opts) {
@@ -19097,6 +19450,31 @@ function repoBasename(repo) {
 function flattenIds(rows) {
   return rows.map((r) => r.task.id);
 }
+function sameSidebarRowTask(a, b) {
+  return a === b || a.id === b.id && a.kind === b.kind && a.title === b.title && a.repo === b.repo && a.branch === b.branch && a.worktreePath === b.worktreePath && a.status === b.status && a.archived === b.archived && a.pinned === b.pinned && a.vendor === b.vendor;
+}
+function reconcileSidebarRows(prev, next) {
+  if (prev.length === 0)
+    return next;
+  const prevById = new Map;
+  for (const row of prev)
+    prevById.set(row.task.id, row);
+  let allReused = prev.length === next.length;
+  const out = new Array(next.length);
+  for (let i = 0;i < next.length; i++) {
+    const fresh = next[i];
+    const old = prevById.get(fresh.task.id);
+    if (old && old.flatIndex === fresh.flatIndex && sameSidebarRowTask(old.task, fresh.task)) {
+      out[i] = old;
+      if (allReused && prev[i] !== old)
+        allReused = false;
+    } else {
+      out[i] = fresh;
+      allReused = false;
+    }
+  }
+  return allReused ? prev : out;
+}
 var init_groups = () => {};
 
 // src/tui/quick-task/host.tsx
@@ -22039,7 +22417,7 @@ var init_task_actions = __esm(() => {
 });
 
 // src/tui/lib/worktree-opener.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 import { existsSync as existsSync15 } from "fs";
 import { basename as basename7, delimiter, isAbsolute as isAbsolute2, join as join17 } from "path";
 function executableOnPath(command, env, exists) {
@@ -22098,7 +22476,7 @@ function buildOpenWorktreeCommand(worktreePath, opener) {
 function openWorktree(worktreePath, opener, deps = {}) {
   if (!worktreePath)
     return false;
-  const spawnFn = deps.spawn ?? spawn4;
+  const spawnFn = deps.spawn ?? spawn5;
   const [command, args2] = buildOpenWorktreeCommand(worktreePath, opener);
   try {
     const child = spawnFn(command, args2, { detached: true, stdio: "ignore" });
@@ -22147,15 +22525,6 @@ var init_worktree_opener = __esm(() => {
 });
 
 // src/tui/lib/background-poll.ts
-import { spawn as spawn5 } from "child_process";
-function computeNextAllowedAt(startedAt, finishedAt, timedOut, cfg) {
-  if (timedOut)
-    return startedAt + cfg.slowRetryMs;
-  return finishedAt + Math.max(cfg.minIntervalMs, (finishedAt - startedAt) * 5);
-}
-function shouldPoll(state, now) {
-  return !state.inFlight && now >= state.nextAllowedAt;
-}
 function createBackgroundPoller(cfg) {
   const entries = new Map;
   function entryFor(key) {
@@ -22177,58 +22546,17 @@ function createBackgroundPoller(cfg) {
       if (!key)
         return;
       const entry = entryFor(key);
-      const startedAt = Date.now();
-      if (!shouldPoll(entry, startedAt))
-        return;
-      entry.inFlight = true;
-      const controller = new AbortController;
-      const timer = setTimeout(() => controller.abort(), cfg.timeoutMs);
-      (async () => {
-        let value;
-        let ok = false;
-        try {
-          value = await cfg.run(key, controller.signal);
-          ok = true;
-        } catch {}
-        clearTimeout(timer);
-        const timedOut = controller.signal.aborted;
-        entry.nextAllowedAt = computeNextAllowedAt(startedAt, Date.now(), timedOut, cfg);
-        entry.inFlight = false;
-        if (ok && !timedOut)
-          entry.write(value);
-      })();
+      maybeStartScheduledRun(entry, cfg, (signal) => cfg.run(key, signal), (value) => entry.write(value));
     },
     reset() {
       entries.clear();
     }
   };
 }
-function spawnCapture(cmd, args2, opts) {
-  return new Promise((resolve9) => {
-    let out = "";
-    let settled = false;
-    const finish = (status) => {
-      if (settled)
-        return;
-      settled = true;
-      resolve9({ status, stdout: out });
-    };
-    const child = spawn5(cmd, args2.slice(), {
-      cwd: opts.cwd,
-      stdio: ["ignore", "pipe", "ignore"],
-      env: opts.env,
-      signal: opts.signal,
-      killSignal: "SIGKILL"
-    });
-    child.stdout?.on("data", (chunk) => {
-      out += String(chunk);
-    });
-    child.on("error", () => finish(null));
-    child.on("close", (code) => finish(code));
-  });
-}
 var init_background_poll = __esm(() => {
   init_dev();
+  init_poll_scheduling();
+  init_poll_scheduling();
 });
 
 // src/tui/panes/sidebar/git-head.ts
@@ -22366,20 +22694,18 @@ function useSidebarBindings(opts) {
   useBindings(() => ({
     enabled: opts.focused() && !searchModeAccessor(),
     bindings: bindByIds({
-      "sidebar.nav": (evt) => {
+      "sidebar.nav": (_evt, slot) => {
+        const down = (slot ?? 0) % 2 === 0;
         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);
+          opts.onMoveRequest?.(id, down ? 1 : -1);
           return;
         }
-        if (evt.name === "j" || evt.name === "down")
+        if (down)
           ctrl.moveDown();
-        else if (evt.name === "k" || evt.name === "up")
+        else
           ctrl.moveUp();
       },
       "sidebar.select": () => {
@@ -22453,21 +22779,18 @@ function useSidebarBindings(opts) {
   useBindings(() => ({
     enabled: opts.focused(),
     bindings: bindByIds({
-      "sidebar.view": (evt) => {
-        if (evt.name === "]")
-          opts.onViewSwitch?.(1);
-        else
-          opts.onViewSwitch?.(-1);
+      "sidebar.view": (_evt, slot) => {
+        opts.onViewSwitch?.((slot ?? 0) % 2 === 0 ? -1 : 1);
       }
     })
   }));
   useBindings(() => ({
     enabled: opts.focused() && searchModeAccessor(),
     bindings: bindByIds({
-      "sidebar.search.nav": (evt) => {
-        if (evt.name === "down")
+      "sidebar.search.nav": (_evt, slot) => {
+        if ((slot ?? 0) % 2 === 0)
           ctrl.moveDown();
-        else if (evt.name === "up")
+        else
           ctrl.moveUp();
       },
       "sidebar.search.submit": () => {
@@ -22523,11 +22846,12 @@ function buildSidebarRowView(opts) {
   const activityBadge = activityBadgeFor(activityState);
   const activityLabel = activityLabelFor(activityState);
   const untrackedCustomEngine = isCustomEngineTask(task) && !hasActivity;
-  const loading = !untrackedCustomEngine && (activityState === "running" || opts.live || !hasActivity && !isMain && task.status === "in_progress");
+  const materializing = opts.job !== undefined;
+  const loading = materializing || !untrackedCustomEngine && (activityState === "running" || opts.live || !hasActivity && !isMain && task.status === "in_progress");
   const spinner = IN_PROGRESS_SPINNER[opts.spinnerFrame] ?? IN_PROGRESS_SPINNER[0];
-  const tone = untrackedCustomEngine ? "textMuted" : activityLabel?.tone ?? (loading ? "primary" : activityBadge?.tone ?? badge.tone);
+  const tone = materializing ? "primary" : untrackedCustomEngine ? "textMuted" : activityLabel?.tone ?? (loading ? "primary" : activityBadge?.tone ?? badge.tone);
   const fallbackSubtitle = untrackedCustomEngine ? NO_TRACKING_SUBTITLE : STATUS_LABEL[task.status];
-  const subtitleText = activityLabel ? opts.truncateBranch(activityLabel.text, opts.subtitleBudget) : branch.length > 0 ? opts.truncateBranch(branch, opts.subtitleBudget) : opts.truncateBranch(fallbackSubtitle, opts.subtitleBudget);
+  const subtitleText = materializing ? opts.truncateBranch(MATERIALIZING_SUBTITLE, opts.subtitleBudget) : activityLabel ? opts.truncateBranch(activityLabel.text, opts.subtitleBudget) : branch.length > 0 ? opts.truncateBranch(branch, opts.subtitleBudget) : opts.truncateBranch(fallbackSubtitle, opts.subtitleBudget);
   const restGlyph = untrackedCustomEngine ? NO_TRACKING_GLYPH : activityBadge?.glyph ?? badge.glyph;
   const restProjectGlyph = untrackedCustomEngine ? NO_TRACKING_GLYPH : activityBadge?.glyph ?? "\u2605";
   return {
@@ -22554,7 +22878,7 @@ function activityBadgeFor(state) {
       return null;
   }
 }
-var STATUS_BADGE, STATUS_LABEL, IN_PROGRESS_SPINNER, SPINNER_FRAME_MS = 100, NO_TRACKING_GLYPH = "\xB7", NO_TRACKING_SUBTITLE = "no activity tracking";
+var STATUS_BADGE, STATUS_LABEL, IN_PROGRESS_SPINNER, SPINNER_FRAME_MS = 100, NO_TRACKING_GLYPH = "\xB7", NO_TRACKING_SUBTITLE = "no activity tracking", MATERIALIZING_SUBTITLE = "materializing";
 var init_row_view = __esm(() => {
   init_vendor();
   init_groups();
@@ -22592,7 +22916,7 @@ var init_worktree_changes_poller = __esm(() => {
   ZERO2 = { added: 0, deleted: 0 };
   poller2 = createBackgroundPoller({
     initial: ZERO2,
-    equals: (a, b) => a.added === b.added && a.deleted === b.deleted,
+    equals: sameWorktreeChanges,
     timeoutMs: POLL_TIMEOUT_MS,
     slowRetryMs: SLOW_REPO_RETRY_MS,
     minIntervalMs: MIN_POLL_INTERVAL_MS,
@@ -22680,7 +23004,7 @@ function Sidebar(props) {
   const spinnerInterval = setInterval(() => setSpinnerFrame((n) => (n + 1) % IN_PROGRESS_SPINNER.length), SPINNER_FRAME_MS);
   onCleanup(() => clearInterval(spinnerInterval));
   const sortMode = () => props.sortMode?.() ?? "default";
-  const rows = createMemo(() => buildRows(props.tasks(), view(), searchMode() ? searchQuery() : "", sortMode()));
+  const rows = createMemo((prev) => reconcileSidebarRows(prev, buildRows(props.tasks(), view(), searchMode() ? searchQuery() : "", sortMode())), []);
   const flatIds = createMemo(() => flattenIds(rows()));
   const firstTaskFlatIndex = createMemo(() => {
     const r = rows();
@@ -23029,10 +23353,15 @@ function Sidebar(props) {
           }
         };
         const changes = createMemo(() => {
+          const pushed = pickPushedChanges(props.worktreeChanges?.(), task.worktreePath);
+          if (pushed)
+            return pushed;
           branchTick();
           if (!task.archived)
             pollWorktreeChanges(task.worktreePath);
           return worktreeChanges(task.worktreePath);
+        }, undefined, {
+          equals: sameWorktreeChanges
         });
         const projectBranch = createMemo(() => {
           branchTick();
@@ -23043,6 +23372,7 @@ function Sidebar(props) {
         const rowView = createMemo(() => buildSidebarRowView({
           task,
           activity: props.engineState?.().get(task.id),
+          job: props.taskJobs?.().get(task.id),
           live: isLive(),
           spinnerFrame: spinnerFrame(),
           subtitleBudget: subtitleBudget(),
@@ -23475,6 +23805,7 @@ var init_Sidebar = __esm(() => {
   init_groups();
   init_keys();
   init_row_view();
+  init_worktree_changes();
   init_worktree_changes_poller();
   VIEW_TABS = [{
     view: "active",
@@ -23825,6 +24156,17 @@ function TasksShell(props) {
       get engineState() {
         return memo2(() => !!props.orch)() ? props.orch.engineStateSignal() : undefined;
       },
+      get taskJobs() {
+        return memo2(() => !!props.orch)() ? props.orch.taskJobsSignal() : undefined;
+      },
+      get worktreeChanges() {
+        return props.orch ? () => {
+          const orch = props.orch;
+          if (!orch || orch.connectionStateSignal()() !== "online")
+            return null;
+          return orch.worktreeChangesSignal()();
+        } : undefined;
+      },
       onRenameRequest: (id) => void renameTask(id),
       onDeleteRequest: (id) => void deleteTask(id),
       onArchiveRequest: (id) => void archiveTask(id),
@@ -25028,26 +25370,24 @@ function useFileTreeBindings(opts) {
   useBindings(() => ({
     enabled: opts.focused(),
     bindings: bindByIds({
-      "files.nav": (evt) => {
-        if (evt.name === "j" || evt.name === "down")
+      "files.nav": (_evt, slot) => {
+        if ((slot ?? 0) % 2 === 0)
           opts.moveDown();
-        else if (evt.name === "k" || evt.name === "up")
+        else
           opts.moveUp();
       },
-      "files.hierarchy": (evt) => {
-        if (evt.name === "l" || evt.name === "right")
-          opts.expandOrDescend();
-        else if (evt.name === "h" || evt.name === "left")
+      "files.hierarchy": (_evt, slot) => {
+        if ((slot ?? 0) % 2 === 0)
           opts.collapseOrParent();
+        else
+          opts.expandOrDescend();
       },
-      "files.tab": (evt) => {
+      "files.tab": (_evt, slot) => {
         const cur = opts.currentTab();
         const idx = TAB_ORDER.indexOf(cur);
         if (idx < 0)
           return;
-        const delta = evt.name === "[" ? -1 : evt.name === "]" ? 1 : 0;
-        if (delta === 0)
-          return;
+        const delta = (slot ?? 0) % 2 === 0 ? -1 : 1;
         const next = TAB_ORDER[(idx + delta + TAB_ORDER.length) % TAB_ORDER.length];
         if (next)
           opts.setTab(next);

package/package.json

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