@sma1lboy/kobe 0.5.8 → 0.5.9

package/dist/cli/index.js

@@ -8857,7 +8857,7 @@ var init_package = __esm(() => {
   package_default = {
     $schema: "https://json.schemastore.org/package.json",
     name: "@sma1lboy/kobe",
-    version: "0.5.8",
+    version: "0.5.9",
     description: "TUI orchestrator for Claude Code (codename)",
     type: "module",
     packageManager: "bun@1.3.13",
@@ -10580,6 +10580,7 @@ class Orchestrator {
   worktrees;
   metadataSuggester;
   handles = new Map;
+  firstSpawnLatches = new Map;
   subscribers = new Map;
   pumps = new Map;
   pendingInputBroker = new InMemoryPendingInputBroker;
@@ -10812,8 +10813,16 @@ class Orchestrator {
       const renameTabId = this.resolveTab(task, tabId).id;
       this.maybeRenameTempBranch(task.id, renameTabId, prompt);
     }
-    const targetTab = this.resolveTab(task, tabId);
+    let targetTab = this.resolveTab(task, tabId);
     const key = tabKey(task.id, targetTab.id);
+    if (!targetTab.sessionId) {
+      const inflight = this.firstSpawnLatches.get(key);
+      if (inflight) {
+        await inflight.catch(() => {});
+        task = this.requireTask(id);
+        targetTab = this.resolveTab(task, tabId);
+      }
+    }
     if (this.handles.has(key) === false) {
       const running = this.countRunning();
       if (running >= CONCURRENCY_CAP) {
@@ -10834,18 +10843,28 @@ class Orchestrator {
         model: modelToUse
       });
     } else {
-      handle = await this.engine.spawn(task.worktreePath, promptToSend, {
-        permissionMode: task.permissionMode,
-        model: modelToUse
+      let releaseLatch = () => {};
+      const latch = new Promise((resolve3) => {
+        releaseLatch = resolve3;
       });
-      await this.updateTab(task.id, targetTab.id, { sessionId: handle.sessionId });
-      if (task.title === PLACEHOLDER_TASK_TITLE && prompt && prompt.trim().length > 0) {
-        const derived = deriveTitleFromPrompt(prompt);
-        if (derived)
-          await this.store.update(task.id, { title: derived });
-      }
-      if (prompt && prompt.trim().length > 0) {
-        this.maybeUpgradeTitle(task.id, prompt);
+      this.firstSpawnLatches.set(key, latch);
+      try {
+        handle = await this.engine.spawn(task.worktreePath, promptToSend, {
+          permissionMode: task.permissionMode,
+          model: modelToUse
+        });
+        await this.updateTab(task.id, targetTab.id, { sessionId: handle.sessionId });
+        if (task.title === PLACEHOLDER_TASK_TITLE && prompt && prompt.trim().length > 0) {
+          const derived = deriveTitleFromPrompt(prompt);
+          if (derived)
+            await this.store.update(task.id, { title: derived });
+        }
+        if (prompt && prompt.trim().length > 0) {
+          this.maybeUpgradeTitle(task.id, prompt);
+        }
+      } finally {
+        releaseLatch();
+        this.firstSpawnLatches.delete(key);
       }
     }
     this.handles.set(key, handle);
@@ -10912,6 +10931,12 @@ class Orchestrator {
     }
     this.dispatchEvent(task.id, targetTab.id, { type: "done" });
   }
+  async steerTask(id, prompt, tabId) {
+    const task = this.requireTask(id);
+    const targetTab = this.resolveTab(task, tabId);
+    await this.interruptTask(task.id, targetTab.id);
+    await this.runTask(task.id, prompt, targetTab.id);
+  }
   async pauseTask(id) {
     const task = this.requireTask(id);
     if (task.status !== "in_progress") {
@@ -11459,6 +11484,10 @@ class RemoteOrchestrator {
   async interruptTask(taskId, tabId) {
     await this.client.request("chat.interrupt", { taskId, tabId });
   }
+  async steerTask(taskId, text, tabId) {
+    await this.client.request("chat.steer", { taskId, text, tabId });
+    this.markRunState(taskId, tabId ?? this.getTask(taskId)?.activeTabId, "running");
+  }
   async setArchived(taskId, archived) {
     await this.client.request("task.archive", { taskId, archived });
   }
@@ -15571,7 +15600,8 @@ var init_sync = __esm(() => {
 });
 
 // src/engine/claude-code-local/history.ts
-import { readFile as readFile4, readdir, unlink as unlink2 } from "fs/promises";
+import { randomUUID } from "crypto";
+import { appendFile, mkdir as mkdir3, readFile as readFile4, readdir, unlink as unlink2, writeFile as writeFile3 } from "fs/promises";
 import { homedir as homedir8 } from "os";
 import path6 from "path";
 function encodeCwd(cwd) {
@@ -15668,6 +15698,76 @@ function extractUsage(v) {
 function isObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
+async function appendInterruptedUserPrompt(sessionId, cwd, prompt, deps = defaultDeps2) {
+  if (!prompt || prompt.trim().length === 0)
+    return;
+  const projectDir = path6.join(deps.projectsDir(), encodeCwd(cwd));
+  const filePath = path6.join(projectDir, `${sessionId}.jsonl`);
+  let lines = [];
+  try {
+    const raw = await readFile4(filePath, "utf8");
+    lines = raw.split(`
+`).filter((l) => l.length > 0);
+  } catch (err) {
+    if (err.code !== "ENOENT")
+      throw err;
+    await mkdir3(projectDir, { recursive: true });
+  }
+  let lastConvIdx = -1;
+  let lastConvRecord = null;
+  let lastConvRole = null;
+  for (let i = lines.length - 1;i >= 0; i--) {
+    let parsed;
+    try {
+      parsed = JSON.parse(lines[i]);
+    } catch {
+      continue;
+    }
+    if (!isObject(parsed))
+      continue;
+    const inner = isObject(parsed.message) ? parsed.message : parsed;
+    const role = inner.role;
+    if (role === "user" || role === "assistant") {
+      lastConvIdx = i;
+      lastConvRecord = parsed;
+      lastConvRole = role;
+      break;
+    }
+  }
+  const now = new Date().toISOString();
+  if (lastConvRole === "user" && lastConvRecord && lastConvIdx >= 0) {
+    const inner = isObject(lastConvRecord.message) ? lastConvRecord.message : lastConvRecord;
+    const existing = typeof inner.content === "string" ? inner.content : "";
+    if (existing === prompt || existing.endsWith(`
+
+${prompt}`))
+      return;
+    inner.content = existing.length > 0 ? `${existing}
+
+${prompt}` : prompt;
+    lastConvRecord.timestamp = now;
+    lines[lastConvIdx] = JSON.stringify(lastConvRecord);
+    await writeFile3(filePath, `${lines.join(`
+`)}
+`);
+    return;
+  }
+  const parentUuid = lastConvRecord && typeof lastConvRecord.uuid === "string" ? lastConvRecord.uuid : null;
+  const record = {
+    type: "user",
+    message: { role: "user", content: prompt },
+    uuid: randomUUID(),
+    parentUuid,
+    sessionId,
+    cwd,
+    timestamp: now,
+    isSidechain: false,
+    userType: "external",
+    version: "1.0.0"
+  };
+  await appendFile(filePath, `${JSON.stringify(record)}
+`);
+}
 var defaultDeps2;
 var init_history = __esm(() => {
   defaultDeps2 = {
@@ -16075,13 +16175,21 @@ class ClaudeCodeLocal {
   }
   async stop(handle) {
     const sid = handle.sessionId;
-    await this.registry.kill(sid, this.stopGraceMs);
     const session = this.running.get(sid);
+    const shouldRescue = !!session && !session.completedNaturally && session.prompt.trim().length > 0;
+    const rescuePrompt = session?.prompt ?? "";
+    const rescueCwd = session?.cwd ?? handle.cwd;
+    await this.registry.kill(sid, this.stopGraceMs);
     if (session) {
       session.closed = true;
       this.notify(session);
       this.running.delete(sid);
     }
+    if (shouldRescue) {
+      try {
+        await appendInterruptedUserPrompt(sid, rescueCwd, rescuePrompt);
+      } catch {}
+    }
   }
   async start(args2) {
     const binaryPath = await this.binaryPathResolver();
@@ -16114,14 +16222,17 @@ class ClaudeCodeLocal {
         spawned,
         queue,
         waiters: [],
-        closed: false
+        closed: false,
+        completedNaturally: false,
+        prompt: args2.prompt
       };
       this.running.set(sessionId, session);
       this.registry.register({
         sessionId,
         cwd: args2.cwd,
         proc: spawned.proc,
-        startedAt: Date.now()
+        startedAt: Date.now(),
+        prompt: args2.prompt
       });
       resolveHandle({ sessionId, cwd: args2.cwd });
     };
@@ -16143,6 +16254,9 @@ class ClaudeCodeLocal {
       try {
         for await (const ev of events) {
           queue.push(ev);
+          if (ev.type === "done" && session) {
+            session.completedNaturally = true;
+          }
           if (session)
             this.notify(session);
         }
@@ -16731,7 +16845,11 @@ function stripNewlines(v) {
   return v.replace(/[\r\n]+/g, "");
 }
 function nextField(field) {
-  return field === "repo" ? "baseRef" : "repo";
+  if (field === "repo")
+    return "baseRef";
+  if (field === "baseRef")
+    return "confirm";
+  return "repo";
 }
 function computeRepoOptions(defaultRepo, savedRepos) {
   const seen = new Set;
@@ -16799,6 +16917,27 @@ function validateRepoPath(repo) {
   }
   return null;
 }
+function getCurrentBranch(repo) {
+  if (!repo)
+    return null;
+  try {
+    const { spawnSync: spawnSync8 } = __require("child_process");
+    const out = spawnSync8("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      cwd: repo,
+      encoding: "utf-8",
+      timeout: 2000,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    if (out.status !== 0)
+      return null;
+    const name = out.stdout.trim();
+    if (!name || name === "HEAD")
+      return null;
+    return name;
+  } catch {
+    return null;
+  }
+}
 function listLocalBranches(repo) {
   if (!repo)
     return [];
@@ -16896,7 +17035,8 @@ function NewTaskDialogView(props) {
   } = useTheme();
   const [field, setField] = createSignal("repo");
   const [repo, setRepo] = createSignal(props.defaultRepo);
-  const [baseRef, setBaseRef] = createSignal(DEFAULT_BASE_REF);
+  const [baseRef, setBaseRef] = createSignal(getCurrentBranch(expandHome(props.defaultRepo.trim())) ?? DEFAULT_BASE_REF);
+  const [baseRefTouched, setBaseRefTouched] = createSignal(false);
   const repoOptions = createMemo(() => computeRepoOptions(props.defaultRepo, props.savedRepos));
   const mode = createMemo(() => pickerModeFor(repo(), repoOptions()));
   const subdirSplit = createMemo(() => splitPathForDirSuggest(repo()));
@@ -16914,6 +17054,16 @@ function NewTaskDialogView(props) {
     branchFiltered();
     setBranchCursor(0);
   });
+  createEffect(() => {
+    const r = expandHome(repo().trim());
+    if (!r)
+      return;
+    if (baseRefTouched())
+      return;
+    const current = getCurrentBranch(r);
+    if (current)
+      setBaseRef(current);
+  });
   createEffect(() => {
     activeList();
     setRepoCursor(0);
@@ -16945,7 +17095,7 @@ function NewTaskDialogView(props) {
       const picked2 = activeList()[0];
       if (picked2) {
         setRepo(picked2);
-        commit();
+        setField("baseRef");
         return;
       }
     }
@@ -16964,16 +17114,16 @@ function NewTaskDialogView(props) {
           return;
         }
       }
-      commit();
+      setField("baseRef");
       return;
     }
     const picked = activeList()[repoCursor()];
     if (picked) {
       setRepo(picked);
-      commit();
+      setField("baseRef");
       return;
     }
-    commit();
+    setField("baseRef");
   }
   function selectRepoAtMouse(absoluteIndex) {
     const list = activeList();
@@ -17030,8 +17180,15 @@ function NewTaskDialogView(props) {
       }
     }]
   }));
+  useBindings(() => ({
+    enabled: field() === "confirm",
+    bindings: [{
+      key: "return",
+      cmd: () => commit()
+    }]
+  }));
   return (() => {
-    var _el$ = createElement("box"), _el$2 = createElement("box"), _el$3 = createElement("text"), _el$5 = createElement("text"), _el$7 = createElement("box"), _el$8 = createElement("text"), _el$0 = createElement("input"), _el$18 = createElement("box"), _el$19 = createElement("text"), _el$21 = createElement("input"), _el$31 = createElement("box"), _el$32 = createElement("text");
+    var _el$ = createElement("box"), _el$2 = createElement("box"), _el$3 = createElement("text"), _el$5 = createElement("text"), _el$7 = createElement("box"), _el$8 = createElement("text"), _el$0 = createElement("input"), _el$18 = createElement("box"), _el$19 = createElement("text"), _el$21 = createElement("input"), _el$31 = createElement("box"), _el$32 = createElement("text"), _el$34 = createElement("text");
     insertNode(_el$, _el$2);
     insertNode(_el$, _el$7);
     insertNode(_el$, _el$18);
@@ -17090,23 +17247,23 @@ function NewTaskDialogView(props) {
             const suffix = () => mode() === "browse" ? "/" : "";
             const tag = () => isCurrentDir() ? "  (current dir)" : "";
             return (() => {
-              var _el$34 = createElement("text");
-              setProp(_el$34, "wrapMode", "none");
-              setProp(_el$34, "onMouseUp", () => selectRepoAtMouse(absoluteIndex()));
-              insert(_el$34, () => isCursor() ? "\u25B8 " : "  ", null);
-              insert(_el$34, name, null);
-              insert(_el$34, suffix, null);
-              insert(_el$34, tag, null);
+              var _el$35 = createElement("text");
+              setProp(_el$35, "wrapMode", "none");
+              setProp(_el$35, "onMouseUp", () => selectRepoAtMouse(absoluteIndex()));
+              insert(_el$35, () => isCursor() ? "\u25B8 " : "  ", null);
+              insert(_el$35, name, null);
+              insert(_el$35, suffix, null);
+              insert(_el$35, tag, null);
               effect((_p$) => {
-                var _v$10 = isCursor() ? theme.primary : isSelected() ? theme.accent : theme.textMuted, _v$11 = isCursor() ? TextAttributes19.BOLD : undefined;
-                _v$10 !== _p$.e && (_p$.e = setProp(_el$34, "fg", _v$10, _p$.e));
-                _v$11 !== _p$.t && (_p$.t = setProp(_el$34, "attributes", _v$11, _p$.t));
+                var _v$12 = isCursor() ? theme.primary : isSelected() ? theme.accent : theme.textMuted, _v$13 = isCursor() ? TextAttributes19.BOLD : undefined;
+                _v$12 !== _p$.e && (_p$.e = setProp(_el$35, "fg", _v$12, _p$.e));
+                _v$13 !== _p$.t && (_p$.t = setProp(_el$35, "attributes", _v$13, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$34;
+              return _el$35;
             })();
           }
         }), null);
@@ -17144,10 +17301,14 @@ function NewTaskDialogView(props) {
     setProp(_el$18, "gap", 0);
     insertNode(_el$19, createTextNode(`from branch`));
     setProp(_el$21, "placeholder", DEFAULT_BASE_REF);
-    setProp(_el$21, "onInput", (v) => setBaseRef(stripNewlines(v)));
+    setProp(_el$21, "onInput", (v) => {
+      setBaseRefTouched(true);
+      setBaseRef(stripNewlines(v));
+    });
     setProp(_el$21, "onSubmit", () => {
       setBaseRef(resolveBaseRef(baseRef(), branchFiltered(), branchCursor()));
-      commit();
+      setBaseRefTouched(true);
+      setField("confirm");
     });
     insert(_el$, createComponent2(Show, {
       get when() {
@@ -17197,25 +17358,26 @@ function NewTaskDialogView(props) {
             const isCursor = () => absoluteIndex() === branchCursor();
             const isSelected = () => baseRef().trim() === name;
             return (() => {
-              var _el$35 = createElement("text");
-              setProp(_el$35, "wrapMode", "none");
-              setProp(_el$35, "onMouseUp", () => {
+              var _el$36 = createElement("text");
+              setProp(_el$36, "wrapMode", "none");
+              setProp(_el$36, "onMouseUp", () => {
                 setBaseRef(name);
+                setBaseRefTouched(true);
                 setBranchCursor(absoluteIndex());
-                commit();
+                setField("confirm");
               });
-              insert(_el$35, () => isCursor() ? "\u25B8 " : "  ", null);
-              insert(_el$35, name, null);
+              insert(_el$36, () => isCursor() ? "\u25B8 " : "  ", null);
+              insert(_el$36, name, null);
               effect((_p$) => {
-                var _v$12 = isCursor() ? theme.primary : isSelected() ? theme.accent : theme.textMuted, _v$13 = isCursor() ? TextAttributes19.BOLD : undefined;
-                _v$12 !== _p$.e && (_p$.e = setProp(_el$35, "fg", _v$12, _p$.e));
-                _v$13 !== _p$.t && (_p$.t = setProp(_el$35, "attributes", _v$13, _p$.t));
+                var _v$14 = isCursor() ? theme.primary : isSelected() ? theme.accent : theme.textMuted, _v$15 = isCursor() ? TextAttributes19.BOLD : undefined;
+                _v$14 !== _p$.e && (_p$.e = setProp(_el$36, "fg", _v$14, _p$.e));
+                _v$15 !== _p$.t && (_p$.t = setProp(_el$36, "attributes", _v$15, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$35;
+              return _el$36;
             })();
           }
         }), null);
@@ -17237,10 +17399,15 @@ function NewTaskDialogView(props) {
       }
     }), _el$31);
     insertNode(_el$31, _el$32);
+    insertNode(_el$31, _el$34);
+    setProp(_el$31, "flexDirection", "row");
+    setProp(_el$31, "justifyContent", "space-between");
     setProp(_el$31, "paddingBottom", 1);
     insertNode(_el$32, createTextNode(`\u2191\u2193 pick \xB7 enter select \xB7 tab next field \xB7 esc cancel`));
+    setProp(_el$34, "onMouseUp", () => commit());
+    insert(_el$34, () => field() === "confirm" ? "\u25B8 [ Create ]" : "  [ Create ]");
     effect((_p$) => {
-      var _v$ = TextAttributes19.BOLD, _v$2 = theme.text, _v$3 = theme.textMuted, _v$4 = field() === "repo" ? theme.accent : theme.textMuted, _v$5 = repo(), _v$6 = props.defaultRepo, _v$7 = field() === "repo", _v$8 = field() === "baseRef" ? theme.accent : theme.textMuted, _v$9 = baseRef(), _v$0 = field() === "baseRef", _v$1 = theme.textMuted;
+      var _v$ = TextAttributes19.BOLD, _v$2 = theme.text, _v$3 = theme.textMuted, _v$4 = field() === "repo" ? theme.accent : theme.textMuted, _v$5 = repo(), _v$6 = props.defaultRepo, _v$7 = field() === "repo", _v$8 = field() === "baseRef" ? theme.accent : theme.textMuted, _v$9 = baseRef(), _v$0 = field() === "baseRef", _v$1 = theme.textMuted, _v$10 = field() === "confirm" ? theme.primary : theme.text, _v$11 = field() === "confirm" ? TextAttributes19.BOLD : undefined;
       _v$ !== _p$.e && (_p$.e = setProp(_el$3, "attributes", _v$, _p$.e));
       _v$2 !== _p$.t && (_p$.t = setProp(_el$3, "fg", _v$2, _p$.t));
       _v$3 !== _p$.a && (_p$.a = setProp(_el$5, "fg", _v$3, _p$.a));
@@ -17252,6 +17419,8 @@ function NewTaskDialogView(props) {
       _v$9 !== _p$.r && (_p$.r = setProp(_el$21, "value", _v$9, _p$.r));
       _v$0 !== _p$.d && (_p$.d = setProp(_el$21, "focused", _v$0, _p$.d));
       _v$1 !== _p$.l && (_p$.l = setProp(_el$32, "fg", _v$1, _p$.l));
+      _v$10 !== _p$.u && (_p$.u = setProp(_el$34, "fg", _v$10, _p$.u));
+      _v$11 !== _p$.c && (_p$.c = setProp(_el$34, "attributes", _v$11, _p$.c));
       return _p$;
     }, {
       e: undefined,
@@ -17264,7 +17433,9 @@ function NewTaskDialogView(props) {
       h: undefined,
       r: undefined,
       d: undefined,
-      l: undefined
+      l: undefined,
+      u: undefined,
+      c: undefined
     });
     return _el$;
   })();
@@ -17409,11 +17580,17 @@ var init_rename_task_dialog = __esm(() => {
 function useTaskActions(deps) {
   const { orchestrator, dialog, kv, selectedId, setSelectedId, setFocusedPane, savedRepos } = deps;
   async function openNewTaskFlow() {
-    const lastRepo = (() => {
+    const defaultRepo = (() => {
+      const sid = selectedId();
+      if (sid) {
+        const task = orchestrator.getTask(sid);
+        if (task?.repo?.trim())
+          return task.repo;
+      }
       const raw = kv.get("lastNewTaskRepo");
       return typeof raw === "string" && raw.trim() ? raw : process.cwd();
     })();
-    const result = await NewTaskDialog.show(dialog, lastRepo, savedRepos());
+    const result = await NewTaskDialog.show(dialog, defaultRepo, savedRepos());
     if (!result)
       return;
     try {
@@ -17956,7 +18133,7 @@ var init_history2 = __esm(() => {
 });
 
 // src/tui/panes/chat/composer/image-paste.ts
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync4 } from "fs";
 import { join as join13 } from "path";
 function pastedImagesDir() {
@@ -18040,7 +18217,7 @@ function mimeTypeToExt(mimeType) {
   return ".png";
 }
 function mintPath(ext) {
-  return join13(pastedImagesDir(), `${randomUUID()}${ext}`);
+  return join13(pastedImagesDir(), `${randomUUID2()}${ext}`);
 }
 var IMAGE_TOKEN_RE;
 var init_image_paste = __esm(() => {
@@ -18642,9 +18819,9 @@ function Composer(props) {
     return theme.border;
   };
   return (() => {
-    var _el$ = createElement("box"), _el$14 = createElement("box"), _el$15 = createElement("box"), _el$16 = createElement("box"), _el$17 = createElement("text"), _el$18 = createElement("box"), _el$25 = createElement("box"), _el$26 = createElement("box");
+    var _el$ = createElement("box"), _el$14 = createElement("box"), _el$15 = createElement("box"), _el$21 = createElement("box"), _el$22 = createElement("text"), _el$23 = createElement("box"), _el$30 = createElement("box"), _el$31 = createElement("box");
     insertNode(_el$, _el$14);
-    insertNode(_el$, _el$25);
+    insertNode(_el$, _el$30);
     setProp(_el$, "flexShrink", 0);
     setProp(_el$, "flexDirection", "column");
     setProp(_el$, "paddingTop", 1);
@@ -18691,35 +18868,35 @@ function Composer(props) {
               return idx >= 0 ? match.displayPath.slice(0, idx) : "";
             };
             return (() => {
-              var _el$27 = createElement("box"), _el$28 = createElement("text");
-              insertNode(_el$27, _el$28);
-              setProp(_el$27, "flexDirection", "row");
-              setProp(_el$27, "gap", 2);
-              setProp(_el$28, "wrapMode", "none");
-              insert(_el$28, () => active() ? "\u25B8 " : "  ", null);
-              insert(_el$28, filename, null);
-              insert(_el$27, createComponent2(Show, {
+              var _el$32 = createElement("box"), _el$33 = createElement("text");
+              insertNode(_el$32, _el$33);
+              setProp(_el$32, "flexDirection", "row");
+              setProp(_el$32, "gap", 2);
+              setProp(_el$33, "wrapMode", "none");
+              insert(_el$33, () => active() ? "\u25B8 " : "  ", null);
+              insert(_el$33, filename, null);
+              insert(_el$32, createComponent2(Show, {
                 get when() {
                   return directory().length > 0;
                 },
                 get children() {
-                  var _el$29 = createElement("text");
-                  setProp(_el$29, "wrapMode", "none");
-                  insert(_el$29, directory);
-                  effect((_$p) => setProp(_el$29, "fg", theme.textMuted, _$p));
-                  return _el$29;
+                  var _el$34 = createElement("text");
+                  setProp(_el$34, "wrapMode", "none");
+                  insert(_el$34, directory);
+                  effect((_$p) => setProp(_el$34, "fg", theme.textMuted, _$p));
+                  return _el$34;
                 }
               }), null);
               effect((_p$) => {
-                var _v$20 = active() ? theme.primary : theme.text, _v$21 = active() ? TextAttributes22.BOLD : undefined;
-                _v$20 !== _p$.e && (_p$.e = setProp(_el$28, "fg", _v$20, _p$.e));
-                _v$21 !== _p$.t && (_p$.t = setProp(_el$28, "attributes", _v$21, _p$.t));
+                var _v$23 = active() ? theme.primary : theme.text, _v$24 = active() ? TextAttributes22.BOLD : undefined;
+                _v$23 !== _p$.e && (_p$.e = setProp(_el$33, "fg", _v$23, _p$.e));
+                _v$24 !== _p$.t && (_p$.t = setProp(_el$33, "attributes", _v$24, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$27;
+              return _el$32;
             })();
           }
         }), null);
@@ -18786,47 +18963,47 @@ function Composer(props) {
             const absoluteIndex = () => slashWindow().start + i();
             const active = () => absoluteIndex() === slashCursor();
             return (() => {
-              var _el$30 = createElement("box"), _el$31 = createElement("text");
-              insertNode(_el$30, _el$31);
-              setProp(_el$30, "flexDirection", "row");
-              setProp(_el$30, "gap", 2);
-              setProp(_el$31, "wrapMode", "none");
-              insert(_el$31, () => active() ? "\u25B8 " : "  ", null);
-              insert(_el$31, () => entry.display, null);
-              insert(_el$30, createComponent2(Show, {
+              var _el$35 = createElement("box"), _el$36 = createElement("text");
+              insertNode(_el$35, _el$36);
+              setProp(_el$35, "flexDirection", "row");
+              setProp(_el$35, "gap", 2);
+              setProp(_el$36, "wrapMode", "none");
+              insert(_el$36, () => active() ? "\u25B8 " : "  ", null);
+              insert(_el$36, () => entry.display, null);
+              insert(_el$35, createComponent2(Show, {
                 get when() {
                   return entry.source === "user";
                 },
                 get children() {
-                  var _el$32 = createElement("text");
-                  insertNode(_el$32, createTextNode(`user`));
-                  setProp(_el$32, "wrapMode", "none");
-                  effect((_$p) => setProp(_el$32, "fg", theme.textMuted, _$p));
-                  return _el$32;
+                  var _el$37 = createElement("text");
+                  insertNode(_el$37, createTextNode(`user`));
+                  setProp(_el$37, "wrapMode", "none");
+                  effect((_$p) => setProp(_el$37, "fg", theme.textMuted, _$p));
+                  return _el$37;
                 }
               }), null);
-              insert(_el$30, createComponent2(Show, {
+              insert(_el$35, createComponent2(Show, {
                 get when() {
                   return entry.description;
                 },
                 get children() {
-                  var _el$34 = createElement("text");
-                  setProp(_el$34, "wrapMode", "none");
-                  insert(_el$34, () => entry.description);
-                  effect((_$p) => setProp(_el$34, "fg", theme.textMuted, _$p));
-                  return _el$34;
+                  var _el$39 = createElement("text");
+                  setProp(_el$39, "wrapMode", "none");
+                  insert(_el$39, () => entry.description);
+                  effect((_$p) => setProp(_el$39, "fg", theme.textMuted, _$p));
+                  return _el$39;
                 }
               }), null);
               effect((_p$) => {
-                var _v$22 = active() ? theme.primary : theme.text, _v$23 = active() ? TextAttributes22.BOLD : undefined;
-                _v$22 !== _p$.e && (_p$.e = setProp(_el$31, "fg", _v$22, _p$.e));
-                _v$23 !== _p$.t && (_p$.t = setProp(_el$31, "attributes", _v$23, _p$.t));
+                var _v$25 = active() ? theme.primary : theme.text, _v$26 = active() ? TextAttributes22.BOLD : undefined;
+                _v$25 !== _p$.e && (_p$.e = setProp(_el$36, "fg", _v$25, _p$.e));
+                _v$26 !== _p$.t && (_p$.t = setProp(_el$36, "attributes", _v$26, _p$.t));
                 return _p$;
               }, {
                 e: undefined,
                 t: undefined
               });
-              return _el$30;
+              return _el$35;
             })();
           }
         }), null);
@@ -18860,37 +19037,125 @@ function Composer(props) {
     }), _el$14);
     insertNode(_el$14, _el$15);
     setProp(_el$14, "border", ["left"]);
-    insertNode(_el$15, _el$16);
+    insertNode(_el$15, _el$21);
     setProp(_el$15, "paddingLeft", 2);
     setProp(_el$15, "paddingRight", 2);
     setProp(_el$15, "paddingTop", 1);
     setProp(_el$15, "paddingBottom", 0);
     setProp(_el$15, "flexDirection", "column");
     setProp(_el$15, "flexGrow", 1);
-    insertNode(_el$16, _el$17);
-    insertNode(_el$16, _el$18);
-    setProp(_el$16, "flexDirection", "row");
-    setProp(_el$16, "gap", 1);
-    setProp(_el$16, "alignItems", "flex-start");
-    insert(_el$17, () => props.isStreaming ? "\u2026" : ">");
-    setProp(_el$18, "flexGrow", 1);
-    setProp(_el$18, "flexShrink", 1);
-    setProp(_el$18, "maxHeight", 8);
-    setProp(_el$18, "minHeight", 1);
-    insert(_el$18, createComponent2(Show, {
+    insert(_el$15, createComponent2(Show, {
+      get when() {
+        return (props.queue?.() ?? []).length > 0;
+      },
+      get children() {
+        var _el$16 = createElement("box");
+        setProp(_el$16, "flexDirection", "column");
+        setProp(_el$16, "paddingBottom", 1);
+        insert(_el$16, createComponent2(For, {
+          get each() {
+            return (props.queue?.() ?? []).slice(0, QUEUE_VISIBLE_CAP);
+          },
+          children: (entry, idx) => (() => {
+            var _el$40 = createElement("box"), _el$41 = createElement("text"), _el$43 = createElement("text"), _el$44 = createTextNode(`queued`), _el$45 = createTextNode(`:`), _el$46 = createElement("box"), _el$47 = createElement("text"), _el$48 = createElement("text"), _el$50 = createElement("text");
+            insertNode(_el$40, _el$41);
+            insertNode(_el$40, _el$43);
+            insertNode(_el$40, _el$46);
+            insertNode(_el$40, _el$48);
+            insertNode(_el$40, _el$50);
+            setProp(_el$40, "flexDirection", "row");
+            setProp(_el$40, "gap", 1);
+            setProp(_el$40, "alignItems", "flex-start");
+            insertNode(_el$41, createTextNode(`+`));
+            insertNode(_el$43, _el$44);
+            insertNode(_el$43, _el$45);
+            setProp(_el$43, "wrapMode", "none");
+            insert(_el$43, () => idx() === 0 ? " (next)" : "", _el$45);
+            insertNode(_el$46, _el$47);
+            setProp(_el$46, "flexGrow", 1);
+            insert(_el$47, () => entry.text);
+            insertNode(_el$48, createTextNode(`[\u25B6]`));
+            setProp(_el$48, "onMouseUp", () => props.onSendQueuedNow?.(entry.id));
+            insertNode(_el$50, createTextNode(`[x]`));
+            setProp(_el$50, "onMouseUp", () => props.onCancelQueued?.(entry.id));
+            effect((_p$) => {
+              var _v$27 = theme.textMuted, _v$28 = TextAttributes22.BOLD, _v$29 = theme.textMuted, _v$30 = theme.text, _v$31 = theme.primary, _v$32 = TextAttributes22.BOLD, _v$33 = theme.error, _v$34 = TextAttributes22.BOLD;
+              _v$27 !== _p$.e && (_p$.e = setProp(_el$41, "fg", _v$27, _p$.e));
+              _v$28 !== _p$.t && (_p$.t = setProp(_el$41, "attributes", _v$28, _p$.t));
+              _v$29 !== _p$.a && (_p$.a = setProp(_el$43, "fg", _v$29, _p$.a));
+              _v$30 !== _p$.o && (_p$.o = setProp(_el$47, "fg", _v$30, _p$.o));
+              _v$31 !== _p$.i && (_p$.i = setProp(_el$48, "fg", _v$31, _p$.i));
+              _v$32 !== _p$.n && (_p$.n = setProp(_el$48, "attributes", _v$32, _p$.n));
+              _v$33 !== _p$.s && (_p$.s = setProp(_el$50, "fg", _v$33, _p$.s));
+              _v$34 !== _p$.h && (_p$.h = setProp(_el$50, "attributes", _v$34, _p$.h));
+              return _p$;
+            }, {
+              e: undefined,
+              t: undefined,
+              a: undefined,
+              o: undefined,
+              i: undefined,
+              n: undefined,
+              s: undefined,
+              h: undefined
+            });
+            return _el$40;
+          })()
+        }), null);
+        insert(_el$16, createComponent2(Show, {
+          get when() {
+            return (props.queue?.() ?? []).length > QUEUE_VISIBLE_CAP;
+          },
+          get children() {
+            var _el$17 = createElement("box"), _el$18 = createElement("text"), _el$20 = createElement("text");
+            insertNode(_el$17, _el$18);
+            insertNode(_el$17, _el$20);
+            setProp(_el$17, "flexDirection", "row");
+            setProp(_el$17, "gap", 1);
+            setProp(_el$17, "alignItems", "flex-start");
+            insertNode(_el$18, createTextNode(`+`));
+            insert(_el$20, () => `\u2026 ${(props.queue?.() ?? []).length - QUEUE_VISIBLE_CAP} more queued`);
+            effect((_p$) => {
+              var _v$7 = theme.textMuted, _v$8 = TextAttributes22.BOLD, _v$9 = theme.textMuted;
+              _v$7 !== _p$.e && (_p$.e = setProp(_el$18, "fg", _v$7, _p$.e));
+              _v$8 !== _p$.t && (_p$.t = setProp(_el$18, "attributes", _v$8, _p$.t));
+              _v$9 !== _p$.a && (_p$.a = setProp(_el$20, "fg", _v$9, _p$.a));
+              return _p$;
+            }, {
+              e: undefined,
+              t: undefined,
+              a: undefined
+            });
+            return _el$17;
+          }
+        }), null);
+        return _el$16;
+      }
+    }), _el$21);
+    insertNode(_el$21, _el$22);
+    insertNode(_el$21, _el$23);
+    setProp(_el$21, "flexDirection", "row");
+    setProp(_el$21, "gap", 1);
+    setProp(_el$21, "alignItems", "flex-start");
+    insert(_el$22, () => props.isStreaming ? "\u2026" : ">");
+    setProp(_el$23, "flexGrow", 1);
+    setProp(_el$23, "flexShrink", 1);
+    setProp(_el$23, "maxHeight", 8);
+    setProp(_el$23, "minHeight", 1);
+    insert(_el$23, createComponent2(Show, {
       get when() {
         return props.hasTask;
       },
       get fallback() {
         return (() => {
-          var _el$35 = createElement("text");
-          insert(_el$35, () => props.noTaskMessage ?? "(no task \u2014 press n to create)");
-          effect((_$p) => setProp(_el$35, "fg", theme.textMuted, _$p));
-          return _el$35;
+          var _el$52 = createElement("text");
+          insert(_el$52, () => props.noTaskMessage ?? "(no task \u2014 press n to create)");
+          effect((_$p) => setProp(_el$52, "fg", theme.textMuted, _$p));
+          return _el$52;
         })();
       },
       get children() {
-        var _el$19 = createElement("textarea");
+        var _el$24 = createElement("textarea");
         use((r) => {
           textareaRef = r;
           if (props.draft)
@@ -18898,23 +19163,23 @@ function Composer(props) {
           r.onPaste = handlePaste;
           if (props.focused?.())
             r.focus();
-        }, _el$19);
-        setProp(_el$19, "wrapMode", "word");
-        setProp(_el$19, "keyBindings", composerKeyBindings);
-        setProp(_el$19, "onContentChange", handleContentChange);
-        setProp(_el$19, "onKeyDown", handleKeyDown);
-        setProp(_el$19, "onSubmit", () => handleSubmit("auto"));
+        }, _el$24);
+        setProp(_el$24, "wrapMode", "word");
+        setProp(_el$24, "keyBindings", composerKeyBindings);
+        setProp(_el$24, "onContentChange", handleContentChange);
+        setProp(_el$24, "onKeyDown", handleKeyDown);
+        setProp(_el$24, "onSubmit", () => handleSubmit("auto"));
         effect((_p$) => {
-          var _v$7 = resolvePlaceholder({
+          var _v$0 = resolvePlaceholder({
             isStreaming: props.isStreaming,
             hasTask: props.hasTask,
             noTaskMessage: props.noTaskMessage
-          }), _v$8 = theme.textMuted, _v$9 = theme.text, _v$0 = theme.backgroundElement, _v$1 = theme.backgroundElement;
-          _v$7 !== _p$.e && (_p$.e = setProp(_el$19, "placeholder", _v$7, _p$.e));
-          _v$8 !== _p$.t && (_p$.t = setProp(_el$19, "placeholderColor", _v$8, _p$.t));
-          _v$9 !== _p$.a && (_p$.a = setProp(_el$19, "textColor", _v$9, _p$.a));
-          _v$0 !== _p$.o && (_p$.o = setProp(_el$19, "backgroundColor", _v$0, _p$.o));
-          _v$1 !== _p$.i && (_p$.i = setProp(_el$19, "focusedBackgroundColor", _v$1, _p$.i));
+          }), _v$1 = theme.textMuted, _v$10 = theme.text, _v$11 = theme.backgroundElement, _v$12 = theme.backgroundElement;
+          _v$0 !== _p$.e && (_p$.e = setProp(_el$24, "placeholder", _v$0, _p$.e));
+          _v$1 !== _p$.t && (_p$.t = setProp(_el$24, "placeholderColor", _v$1, _p$.t));
+          _v$10 !== _p$.a && (_p$.a = setProp(_el$24, "textColor", _v$10, _p$.a));
+          _v$11 !== _p$.o && (_p$.o = setProp(_el$24, "backgroundColor", _v$11, _p$.o));
+          _v$12 !== _p$.i && (_p$.i = setProp(_el$24, "focusedBackgroundColor", _v$12, _p$.i));
           return _p$;
         }, {
           e: undefined,
@@ -18923,7 +19188,7 @@ function Composer(props) {
           o: undefined,
           i: undefined
         });
-        return _el$19;
+        return _el$24;
       }
     }));
     insert(_el$15, createComponent2(Show, {
@@ -18931,74 +19196,74 @@ function Composer(props) {
         return props.hasTask;
       },
       get children() {
-        var _el$20 = createElement("box"), _el$21 = createElement("text"), _el$22 = createElement("box"), _el$23 = createElement("box"), _el$24 = createElement("text");
-        insertNode(_el$20, _el$21);
-        insertNode(_el$20, _el$22);
-        setProp(_el$20, "flexDirection", "row");
-        setProp(_el$20, "justifyContent", "space-between");
-        setProp(_el$20, "paddingTop", 1);
-        setProp(_el$20, "flexShrink", 0);
-        setProp(_el$21, "wrapMode", "none");
-        insert(_el$21, footerHint);
-        insertNode(_el$22, _el$23);
-        setProp(_el$22, "flexDirection", "row");
-        setProp(_el$22, "gap", 2);
-        setProp(_el$22, "flexShrink", 0);
-        insert(_el$22, createComponent2(Show, {
+        var _el$25 = createElement("box"), _el$26 = createElement("text"), _el$27 = createElement("box"), _el$28 = createElement("box"), _el$29 = createElement("text");
+        insertNode(_el$25, _el$26);
+        insertNode(_el$25, _el$27);
+        setProp(_el$25, "flexDirection", "row");
+        setProp(_el$25, "justifyContent", "space-between");
+        setProp(_el$25, "paddingTop", 1);
+        setProp(_el$25, "flexShrink", 0);
+        setProp(_el$26, "wrapMode", "none");
+        insert(_el$26, footerHint);
+        insertNode(_el$27, _el$28);
+        setProp(_el$27, "flexDirection", "row");
+        setProp(_el$27, "gap", 2);
+        setProp(_el$27, "flexShrink", 0);
+        insert(_el$27, createComponent2(Show, {
           get when() {
             return modeBadge();
           },
           children: (badge) => (() => {
-            var _el$36 = createElement("text");
-            setProp(_el$36, "wrapMode", "none");
-            insert(_el$36, () => badge().label);
-            effect((_$p) => setProp(_el$36, "fg", toneColor(badge().tone), _$p));
-            return _el$36;
+            var _el$53 = createElement("text");
+            setProp(_el$53, "wrapMode", "none");
+            insert(_el$53, () => badge().label);
+            effect((_$p) => setProp(_el$53, "fg", toneColor(badge().tone), _$p));
+            return _el$53;
           })()
-        }), _el$23);
-        insertNode(_el$23, _el$24);
-        setProp(_el$23, "flexDirection", "row");
-        setProp(_el$23, "flexShrink", 0);
-        setProp(_el$23, "onMouseUp", () => props.onChooseModel?.());
-        setProp(_el$24, "wrapMode", "none");
-        insert(_el$24, modelLabel, null);
-        insert(_el$24, () => props.onChooseModel ? " \u25BE" : "", null);
+        }), _el$28);
+        insertNode(_el$28, _el$29);
+        setProp(_el$28, "flexDirection", "row");
+        setProp(_el$28, "flexShrink", 0);
+        setProp(_el$28, "onMouseUp", () => props.onChooseModel?.());
+        setProp(_el$29, "wrapMode", "none");
+        insert(_el$29, modelLabel, null);
+        insert(_el$29, () => props.onChooseModel ? " \u25BE" : "", null);
         effect((_p$) => {
-          var _v$10 = props.isStreaming ? theme.accent : theme.textMuted, _v$11 = theme.textMuted;
-          _v$10 !== _p$.e && (_p$.e = setProp(_el$21, "fg", _v$10, _p$.e));
-          _v$11 !== _p$.t && (_p$.t = setProp(_el$24, "fg", _v$11, _p$.t));
+          var _v$13 = props.isStreaming ? theme.accent : theme.textMuted, _v$14 = theme.textMuted;
+          _v$13 !== _p$.e && (_p$.e = setProp(_el$26, "fg", _v$13, _p$.e));
+          _v$14 !== _p$.t && (_p$.t = setProp(_el$29, "fg", _v$14, _p$.t));
           return _p$;
         }, {
           e: undefined,
           t: undefined
         });
-        return _el$20;
+        return _el$25;
       }
     }), null);
-    insertNode(_el$25, _el$26);
-    setProp(_el$25, "height", 1);
-    setProp(_el$25, "border", ["left"]);
-    setProp(_el$26, "height", 1);
-    setProp(_el$26, "border", ["bottom"]);
+    insertNode(_el$30, _el$31);
+    setProp(_el$30, "height", 1);
+    setProp(_el$30, "border", ["left"]);
+    setProp(_el$31, "height", 1);
+    setProp(_el$31, "border", ["bottom"]);
     effect((_p$) => {
-      var _v$12 = railColor(), _v$13 = {
+      var _v$15 = railColor(), _v$16 = {
         ...SplitBorder.customBorderChars,
         bottomLeft: "\u2579"
-      }, _v$14 = theme.backgroundElement, _v$15 = props.isStreaming ? theme.accent : theme.primary, _v$16 = railColor(), _v$17 = {
+      }, _v$17 = theme.backgroundElement, _v$18 = props.isStreaming ? theme.accent : theme.primary, _v$19 = railColor(), _v$20 = {
         ...EmptyBorder,
         vertical: theme.backgroundElement.a !== 0 ? "\u2579" : " "
-      }, _v$18 = theme.backgroundElement, _v$19 = {
+      }, _v$21 = theme.backgroundElement, _v$22 = {
         ...EmptyBorder,
         horizontal: theme.backgroundElement.a !== 0 ? "\u2580" : " "
       };
-      _v$12 !== _p$.e && (_p$.e = setProp(_el$14, "borderColor", _v$12, _p$.e));
-      _v$13 !== _p$.t && (_p$.t = setProp(_el$14, "customBorderChars", _v$13, _p$.t));
-      _v$14 !== _p$.a && (_p$.a = setProp(_el$15, "backgroundColor", _v$14, _p$.a));
-      _v$15 !== _p$.o && (_p$.o = setProp(_el$17, "fg", _v$15, _p$.o));
-      _v$16 !== _p$.i && (_p$.i = setProp(_el$25, "borderColor", _v$16, _p$.i));
-      _v$17 !== _p$.n && (_p$.n = setProp(_el$25, "customBorderChars", _v$17, _p$.n));
-      _v$18 !== _p$.s && (_p$.s = setProp(_el$26, "borderColor", _v$18, _p$.s));
-      _v$19 !== _p$.h && (_p$.h = setProp(_el$26, "customBorderChars", _v$19, _p$.h));
+      _v$15 !== _p$.e && (_p$.e = setProp(_el$14, "borderColor", _v$15, _p$.e));
+      _v$16 !== _p$.t && (_p$.t = setProp(_el$14, "customBorderChars", _v$16, _p$.t));
+      _v$17 !== _p$.a && (_p$.a = setProp(_el$15, "backgroundColor", _v$17, _p$.a));
+      _v$18 !== _p$.o && (_p$.o = setProp(_el$22, "fg", _v$18, _p$.o));
+      _v$19 !== _p$.i && (_p$.i = setProp(_el$30, "borderColor", _v$19, _p$.i));
+      _v$20 !== _p$.n && (_p$.n = setProp(_el$30, "customBorderChars", _v$20, _p$.n));
+      _v$21 !== _p$.s && (_p$.s = setProp(_el$31, "borderColor", _v$21, _p$.s));
+      _v$22 !== _p$.h && (_p$.h = setProp(_el$31, "customBorderChars", _v$22, _p$.h));
       return _p$;
     }, {
       e: undefined,
@@ -19013,6 +19278,7 @@ function Composer(props) {
     return _el$;
   })();
 }
+var QUEUE_VISIBLE_CAP = 4;
 var init_Composer = __esm(() => {
   init_solid();
   init_solid();
@@ -21723,6 +21989,81 @@ var init_user_slashes = () => {};
 function totalContextTokens(u) {
   return u.input_tokens + (u.cache_read_input_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0);
 }
+function parseTimestampMs(value) {
+  const ms = new Date(value).getTime();
+  return Number.isFinite(ms) ? ms : null;
+}
+function mergeIntervals(intervals) {
+  if (intervals.length === 0)
+    return [];
+  const sorted = [...intervals].sort((a, b) => a.startMs - b.startMs);
+  const first = sorted[0];
+  if (!first)
+    return [];
+  const merged = [{ startMs: first.startMs, endMs: first.endMs }];
+  for (let i = 1;i < sorted.length; i++) {
+    const current = sorted[i];
+    const last = merged[merged.length - 1];
+    if (!current || !last)
+      continue;
+    if (current.startMs <= last.endMs) {
+      last.endMs = Math.max(last.endMs, current.endMs);
+    } else {
+      merged.push({ startMs: current.startMs, endMs: current.endMs });
+    }
+  }
+  return merged;
+}
+function durationMs(intervals) {
+  return intervals.reduce((total, interval) => total + (interval.endMs - interval.startMs), 0);
+}
+function deriveUsageMetricsFromHistory(past) {
+  let latestUsage;
+  let latestUsageTimestampMs = null;
+  let lastUserTimestampMs = null;
+  let inputTokens = 0;
+  let outputTokens = 0;
+  const intervals = [];
+  for (const message of past) {
+    const timestampMs = parseTimestampMs(message.timestamp);
+    if (message.role === "user" && timestampMs !== null) {
+      lastUserTimestampMs = timestampMs;
+      continue;
+    }
+    if (message.role !== "assistant" || !message.usage)
+      continue;
+    if (timestampMs !== null && (latestUsageTimestampMs === null || timestampMs > latestUsageTimestampMs)) {
+      latestUsageTimestampMs = timestampMs;
+      latestUsage = message.usage;
+    } else if (latestUsage === undefined) {
+      latestUsage = message.usage;
+    }
+    inputTokens += message.usage.input_tokens;
+    outputTokens += message.usage.output_tokens;
+    if (timestampMs !== null && lastUserTimestampMs !== null && timestampMs > lastUserTimestampMs) {
+      intervals.push({ startMs: lastUserTimestampMs, endMs: timestampMs });
+    }
+  }
+  if (!latestUsage)
+    return;
+  const totalDurationMs = durationMs(mergeIntervals(intervals));
+  if (totalDurationMs <= 0)
+    return latestUsage;
+  return {
+    ...latestUsage,
+    total_speed_tokens_per_second: (inputTokens + outputTokens) / (totalDurationMs / 1000)
+  };
+}
+function withTotalSpeedForTurn(usage, startedAtIso, endedAtIso) {
+  const startMs = startedAtIso ? parseTimestampMs(startedAtIso) : null;
+  const endMs = parseTimestampMs(endedAtIso);
+  if (startMs === null || endMs === null || endMs <= startMs)
+    return usage;
+  return {
+    ...usage,
+    total_speed_tokens_per_second: (usage.input_tokens + usage.output_tokens) / ((endMs - startMs) / 1000)
+  };
+}
 function contextWindowTokensForModel(modelId) {
   const id = modelId ?? resolveDefaultModelId();
   if (id.includes("[1m]"))
@@ -21745,13 +22086,21 @@ function formatTokShort(n) {
     return `${(n / 1000).toFixed(1)}k`;
   return String(n);
 }
+function formatTotalSpeed(tokensPerSecond) {
+  if (typeof tokensPerSecond !== "number" || !Number.isFinite(tokensPerSecond))
+    return null;
+  if (tokensPerSecond >= 1000)
+    return `${(tokensPerSecond / 1000).toFixed(1)}k t/s`;
+  return `${tokensPerSecond.toFixed(1)} t/s`;
+}
 function formatContextUsageCompact(u, modelId) {
   const window = contextWindowTokensForModel(modelId);
   const total = totalContextTokens(u);
   if (total <= 0 || window <= 0)
     return null;
   const pct2 = Math.min(100, Math.max(0, Math.round(total / window * 100)));
-  return `${pct2}% \xB7 ${formatTokShort(total)}/${formatTokShort(window)}`;
+  const speed = formatTotalSpeed(u.total_speed_tokens_per_second);
+  return [`${pct2}% \xB7 ${formatTokShort(total)}/${formatTokShort(window)}`, speed].filter(Boolean).join(" \xB7 ");
 }
 var LONG_CTX = 1e6, STD_CTX = 200000;
 var init_context_meter = __esm(() => {
@@ -21803,14 +22152,7 @@ function setMessagesFromHistory(state, past) {
   for (const m of past) {
     appendRowsFromMessage(rows, toolIndexById, m);
   }
-  let latestUsage;
-  for (let i = past.length - 1;i >= 0; i--) {
-    const u = past[i]?.usage;
-    if (u) {
-      latestUsage = u;
-      break;
-    }
-  }
+  const latestUsage = deriveUsageMetricsFromHistory(past);
   return {
     ...state,
     messages: capMessages(rows, new Date().toISOString()),
@@ -21888,19 +22230,20 @@ function applyEvent(state, ev, nowIso = new Date().toISOString()) {
     case "usage":
       return {
         ...state,
-        lastUsage: {
+        lastUsage: withTotalSpeedForTurn({
           input_tokens: ev.input_tokens,
           output_tokens: ev.output_tokens,
           cache_read_input_tokens: ev.cache_read_input_tokens,
           cache_creation_input_tokens: ev.cache_creation_input_tokens
-        }
+        }, state.activeTurnStartedAt, nowIso)
       };
     case "done":
-      return { ...state, isStreaming: false };
+      return { ...state, isStreaming: false, activeTurnStartedAt: undefined };
     case "error":
       return {
         ...state,
         isStreaming: false,
+        activeTurnStartedAt: undefined,
         error: ev.message,
         messages: capMessages([...state.messages, { kind: "system", text: `error: ${ev.message}`, ts: nowIso }], nowIso)
       };
@@ -21910,6 +22253,7 @@ function applyEvent(state, ev, nowIso = new Date().toISOString()) {
         isStreaming: true,
         error: null,
         lastUsage: undefined,
+        activeTurnStartedAt: nowIso,
         messages: capMessages([...state.messages, { kind: "user", text: ev.text, ts: nowIso }], nowIso)
       };
     case "system.info":
@@ -22078,6 +22422,7 @@ function findLastIndex(arr, pred) {
 }
 var SCROLLBACK_CAP = 1000, SENTINEL_PREFIX = "(scrollback truncated \u2014 ", SENTINEL_SUFFIX = " rows dropped)", CLAUDE_NOISE_TAGS, NOISE_TAG_PATTERN, QUEUE_SOFT_CAP = 50;
 var init_store2 = __esm(() => {
+  init_context_meter();
   CLAUDE_NOISE_TAGS = [
     "local-command-caveat",
     "command-message",
@@ -22278,7 +22623,6 @@ var init_use_chat_session = __esm(() => {
 });
 
 // src/tui/panes/chat/Chat.tsx
-import { TextAttributes as TextAttributes25 } from "@opentui/core";
 function Chat(props) {
   const {
     theme
@@ -22483,7 +22827,7 @@ function Chat(props) {
       send(pp);
     });
   });
-  let draining = false;
+  let dispatching = false;
   createEffect(() => {
     const taskId = props.taskId();
     const tabId = activeTabId();
@@ -22496,15 +22840,15 @@ function Chat(props) {
       return;
     if (hasPendingInput())
       return;
-    if (draining)
+    if (dispatching)
       return;
     queueMicrotask(async () => {
-      if (draining)
+      if (dispatching)
         return;
       const cur = activeState();
       if (cur.isStreaming || cur.queue.length === 0)
         return;
-      draining = true;
+      dispatching = true;
       try {
         let head = null;
         patchActiveState((s) => {
@@ -22521,7 +22865,7 @@ function Chat(props) {
           patchActiveState((s) => pushSystemError(s, `queued runTask failed: ${stringifyErr2(err)}`));
         }
       } finally {
-        draining = false;
+        dispatching = false;
       }
     });
   });
@@ -22547,16 +22891,17 @@ function Chat(props) {
     const streaming = activeState().isStreaming;
     if (streaming && mode === "steer") {
       setDraft("");
-      try {
-        await props.orchestrator.interruptTask(taskId, tabId);
-      } catch (err) {
-        patchActiveState((s) => pushSystemError(s, `interrupt failed: ${stringifyErr2(err)}`));
+      if (dispatching)
         return;
-      }
+      dispatching = true;
       try {
-        await props.orchestrator.runTask(taskId, text, tabId);
-      } catch (err) {
-        patchActiveState((s) => pushSystemError(s, `runTask failed: ${stringifyErr2(err)}`));
+        try {
+          await props.orchestrator.steerTask(taskId, text, tabId);
+        } catch (err) {
+          patchActiveState((s) => pushSystemError(s, `steer failed: ${stringifyErr2(err)}`));
+        }
+      } finally {
+        dispatching = false;
       }
       return;
     }
@@ -22579,6 +22924,13 @@ function Chat(props) {
   function cancelQueued(id) {
     patchActiveState((s) => removeFromQueue(s, id));
   }
+  function sendQueuedNow(id) {
+    const entry = activeState().queue.find((q) => q.id === id);
+    if (!entry)
+      return;
+    patchActiveState((s) => removeFromQueue(s, id));
+    send(entry.text, "steer");
+  }
   async function newTab() {
     const taskId = props.taskId();
     if (!taskId)
@@ -22832,19 +23184,6 @@ function Chat(props) {
         return _el$5;
       }
     }), null);
-    insert(_el$, createComponent2(Show, {
-      get when() {
-        return memo2(() => !!props.taskId())() && activeState().queue.length > 0;
-      },
-      get children() {
-        return createComponent2(QueuedPromptList, {
-          get queue() {
-            return activeState().queue;
-          },
-          onCancel: cancelQueued
-        });
-      }
-    }), null);
     insert(_el$, createComponent2(Show, {
       get when() {
         return memo2(() => !!showThinking())() && props.taskId();
@@ -22889,7 +23228,10 @@ function Chat(props) {
           onCyclePermissionMode: cyclePermissionMode,
           modelLabel,
           onChooseModel: () => void chooseModel(),
-          worktreePath
+          worktreePath,
+          queue: () => activeState().queue,
+          onCancelQueued: cancelQueued,
+          onSendQueuedNow: sendQueuedNow
         });
       }
     }), null);
@@ -22905,97 +23247,6 @@ function stringifyErr2(err) {
     return String(err);
   }
 }
-function QueuedPromptList(props) {
-  const {
-    theme
-  } = useTheme();
-  const visible = () => props.queue.slice(0, QUEUE_VISIBLE_CAP);
-  const hidden = () => Math.max(0, props.queue.length - QUEUE_VISIBLE_CAP);
-  return (() => {
-    var _el$7 = createElement("box");
-    setProp(_el$7, "flexDirection", "column");
-    setProp(_el$7, "gap", 0);
-    setProp(_el$7, "paddingTop", 1);
-    setProp(_el$7, "paddingLeft", 1);
-    setProp(_el$7, "paddingRight", 1);
-    insert(_el$7, createComponent2(For, {
-      get each() {
-        return visible();
-      },
-      children: (entry, idx) => (() => {
-        var _el$10 = createElement("box"), _el$11 = createElement("text"), _el$13 = createElement("box"), _el$14 = createElement("text"), _el$15 = createTextNode(`queued`), _el$16 = createTextNode(`:`), _el$17 = createElement("box"), _el$18 = createElement("text"), _el$19 = createElement("text");
-        insertNode(_el$10, _el$11);
-        insertNode(_el$10, _el$13);
-        setProp(_el$10, "flexDirection", "row");
-        setProp(_el$10, "gap", 1);
-        setProp(_el$10, "alignItems", "flex-start");
-        insertNode(_el$11, createTextNode(`+`));
-        insertNode(_el$13, _el$14);
-        insertNode(_el$13, _el$17);
-        insertNode(_el$13, _el$19);
-        setProp(_el$13, "flexGrow", 1);
-        setProp(_el$13, "flexDirection", "row");
-        setProp(_el$13, "gap", 1);
-        insertNode(_el$14, _el$15);
-        insertNode(_el$14, _el$16);
-        setProp(_el$14, "wrapMode", "none");
-        insert(_el$14, () => idx() === 0 ? " (next)" : "", _el$16);
-        insertNode(_el$17, _el$18);
-        setProp(_el$17, "flexGrow", 1);
-        insert(_el$18, () => entry.text);
-        insertNode(_el$19, createTextNode(`[x]`));
-        setProp(_el$19, "onMouseUp", () => props.onCancel(entry.id));
-        effect((_p$) => {
-          var _v$4 = theme.textMuted, _v$5 = TextAttributes25.BOLD, _v$6 = theme.textMuted, _v$7 = theme.text, _v$8 = theme.error, _v$9 = TextAttributes25.BOLD;
-          _v$4 !== _p$.e && (_p$.e = setProp(_el$11, "fg", _v$4, _p$.e));
-          _v$5 !== _p$.t && (_p$.t = setProp(_el$11, "attributes", _v$5, _p$.t));
-          _v$6 !== _p$.a && (_p$.a = setProp(_el$14, "fg", _v$6, _p$.a));
-          _v$7 !== _p$.o && (_p$.o = setProp(_el$18, "fg", _v$7, _p$.o));
-          _v$8 !== _p$.i && (_p$.i = setProp(_el$19, "fg", _v$8, _p$.i));
-          _v$9 !== _p$.n && (_p$.n = setProp(_el$19, "attributes", _v$9, _p$.n));
-          return _p$;
-        }, {
-          e: undefined,
-          t: undefined,
-          a: undefined,
-          o: undefined,
-          i: undefined,
-          n: undefined
-        });
-        return _el$10;
-      })()
-    }), null);
-    insert(_el$7, createComponent2(Show, {
-      get when() {
-        return hidden() > 0;
-      },
-      get children() {
-        var _el$8 = createElement("box"), _el$9 = createElement("text"), _el$1 = createElement("text");
-        insertNode(_el$8, _el$9);
-        insertNode(_el$8, _el$1);
-        setProp(_el$8, "flexDirection", "row");
-        setProp(_el$8, "gap", 1);
-        setProp(_el$8, "alignItems", "flex-start");
-        insertNode(_el$9, createTextNode(`+`));
-        insert(_el$1, () => `\u2026 ${hidden()} more queued`);
-        effect((_p$) => {
-          var _v$ = theme.textMuted, _v$2 = TextAttributes25.BOLD, _v$3 = theme.textMuted;
-          _v$ !== _p$.e && (_p$.e = setProp(_el$9, "fg", _v$, _p$.e));
-          _v$2 !== _p$.t && (_p$.t = setProp(_el$9, "attributes", _v$2, _p$.t));
-          _v$3 !== _p$.a && (_p$.a = setProp(_el$1, "fg", _v$3, _p$.a));
-          return _p$;
-        }, {
-          e: undefined,
-          t: undefined,
-          a: undefined
-        });
-        return _el$8;
-      }
-    }), null);
-    return _el$7;
-  })();
-}
-var QUEUE_VISIBLE_CAP = 4;
 var init_Chat = __esm(() => {
   init_solid();
   init_solid();
@@ -23025,7 +23276,7 @@ var init_Chat = __esm(() => {
 });
 
 // src/tui/component/sidebar.tsx
-import { TextAttributes as TextAttributes26 } from "@opentui/core";
+import { TextAttributes as TextAttributes25 } from "@opentui/core";
 function Sidebar(props) {
   const {
     theme
@@ -23051,7 +23302,7 @@ function Sidebar(props) {
         setProp(_el$2, "paddingBottom", 1);
         insert(_el$3, () => props.title);
         effect((_p$) => {
-          var _v$ = theme.text, _v$2 = TextAttributes26.BOLD;
+          var _v$ = theme.text, _v$2 = TextAttributes25.BOLD;
           _v$ !== _p$.e && (_p$.e = setProp(_el$3, "fg", _v$, _p$.e));
           _v$2 !== _p$.t && (_p$.t = setProp(_el$3, "attributes", _v$2, _p$.t));
           return _p$;
@@ -23310,7 +23561,7 @@ var init_keys4 = __esm(() => {
 });
 
 // src/tui/panes/sidebar/Sidebar.tsx
-import { TextAttributes as TextAttributes27 } from "@opentui/core";
+import { TextAttributes as TextAttributes26 } from "@opentui/core";
 function Sidebar2(props) {
   const {
     theme
@@ -23402,7 +23653,7 @@ function Sidebar2(props) {
             return () => _c$() ? `[ ${tab.label} ]` : tab.label;
           })());
           effect((_p$) => {
-            var _v$7 = active() ? theme.primary : theme.textMuted, _v$8 = active() ? TextAttributes27.BOLD : undefined;
+            var _v$7 = active() ? theme.primary : theme.textMuted, _v$8 = active() ? TextAttributes26.BOLD : undefined;
             _v$7 !== _p$.e && (_p$.e = setProp(_el$13, "fg", _v$7, _p$.e));
             _v$8 !== _p$.t && (_p$.t = setProp(_el$13, "attributes", _v$8, _p$.t));
             return _p$;
@@ -23497,7 +23748,7 @@ function Sidebar2(props) {
             }
           }), null);
           effect((_p$) => {
-            var _v$9 = isCursor() ? theme.primary : isSelected() ? theme.backgroundElement : undefined, _v$0 = isCursor() ? theme.selectedListItemText : badgeColor(), _v$1 = isCursor() ? theme.selectedListItemText : theme.text, _v$10 = (isMain || isSelected() && !isCursor()) && !isCursor() ? TextAttributes27.BOLD : undefined;
+            var _v$9 = isCursor() ? theme.primary : isSelected() ? theme.backgroundElement : undefined, _v$0 = isCursor() ? theme.selectedListItemText : badgeColor(), _v$1 = isCursor() ? theme.selectedListItemText : theme.text, _v$10 = (isMain || isSelected() && !isCursor()) && !isCursor() ? TextAttributes26.BOLD : undefined;
             _v$9 !== _p$.e && (_p$.e = setProp(_el$14, "backgroundColor", _v$9, _p$.e));
             _v$0 !== _p$.t && (_p$.t = setProp(_el$15, "fg", _v$0, _p$.t));
             _v$1 !== _p$.a && (_p$.a = setProp(_el$16, "fg", _v$1, _p$.a));
@@ -23535,7 +23786,7 @@ function Sidebar2(props) {
     setProp(_el$11, "wrapMode", "none");
     setProp(_el$11, "onMouseUp", () => props.onAddTask?.());
     effect((_p$) => {
-      var _v$ = props.width ? props.width() : SIDEBAR_WIDTH, _v$2 = focusedAccessor() ? theme.focusAccent : theme.textMuted, _v$3 = TextAttributes27.BOLD, _v$4 = focusedAccessor() ? theme.focusAccent : theme.textMuted, _v$5 = TextAttributes27.BOLD, _v$6 = theme.textMuted;
+      var _v$ = props.width ? props.width() : SIDEBAR_WIDTH, _v$2 = focusedAccessor() ? theme.focusAccent : theme.textMuted, _v$3 = TextAttributes26.BOLD, _v$4 = focusedAccessor() ? theme.focusAccent : theme.textMuted, _v$5 = TextAttributes26.BOLD, _v$6 = theme.textMuted;
       _v$ !== _p$.e && (_p$.e = setProp(_el$, "width", _v$, _p$.e));
       _v$2 !== _p$.t && (_p$.t = setProp(_el$3, "fg", _v$2, _p$.t));
       _v$3 !== _p$.a && (_p$.a = setProp(_el$3, "attributes", _v$3, _p$.a));
@@ -23605,11 +23856,11 @@ var init_Sidebar = __esm(() => {
 });
 
 // src/orchestrator/bridge/server.ts
-import { mkdir as mkdir3, unlink as unlink3 } from "fs/promises";
+import { mkdir as mkdir4, unlink as unlink3 } from "fs/promises";
 import { createServer } from "net";
 import { dirname as dirname6 } from "path";
 async function startBridgeServer(orch, socketPath) {
-  await mkdir3(dirname6(socketPath), { recursive: true });
+  await mkdir4(dirname6(socketPath), { recursive: true });
   await unlink3(socketPath).catch(() => {});
   const conns = new Set;
   const server = createServer((conn) => {
@@ -23742,7 +23993,7 @@ var exports_bridge = {};
 __export(exports_bridge, {
   startBridge: () => startBridge
 });
-import { writeFile as writeFile3 } from "fs/promises";
+import { writeFile as writeFile4 } from "fs/promises";
 import { homedir as homedir12 } from "os";
 import { join as join15 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -23762,7 +24013,7 @@ async function startBridge(orch, opts = {}) {
       }
     }
   };
-  await writeFile3(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf8");
+  await writeFile4(mcpConfigPath, JSON.stringify(mcpConfig, null, 2), "utf8");
   process.env.KOBE_MCP_CONFIG = mcpConfigPath;
   return {
     socketPath,
@@ -24345,7 +24596,7 @@ var exports_tui = {};
 __export(exports_tui, {
   startTui: () => startTui
 });
-import { TextAttributes as TextAttributes28 } from "@opentui/core";
+import { TextAttributes as TextAttributes27 } from "@opentui/core";
 function HelpHint() {
   const {
     theme
@@ -24419,7 +24670,7 @@ function Banner() {
     insert(_el$20, selected);
     insert(_el$12, createComponent2(HelpHint, {}), null);
     effect((_p$) => {
-      var _v$7 = theme.primary, _v$8 = TextAttributes28.BOLD, _v$9 = theme.borderActive, _v$0 = theme.text, _v$1 = theme.textMuted, _v$10 = {
+      var _v$7 = theme.primary, _v$8 = TextAttributes27.BOLD, _v$9 = theme.borderActive, _v$0 = theme.text, _v$1 = theme.textMuted, _v$10 = {
         fg: theme.accent
       };
       _v$7 !== _p$.e && (_p$.e = setProp(_el$13, "fg", _v$7, _p$.e));