@cryer/star-cli 0.3.12 → 0.3.14

package/dist/{repl-SSCURTAH.js → repl-N2H7JDSH.js}

@@ -5,8 +5,8 @@ import {
   VERSION,
   buildDisplayMessages,
   clearSessions,
-  computeCostUsd,
   deleteSession,
+  displayWidth,
   estimateCost,
   folderIcon,
   formatByteCount,
@@ -30,8 +30,9 @@ import {
   summarizeArgs,
   thinkingIcon,
   toTerminalSafe,
-  toolIcon
-} from "./chunk-2GAUAYCU.js";
+  toolIcon,
+  truncateToWidth
+} from "./chunk-NRLGGA7L.js";
 import {
   AgentLoop,
   WORKING_DIFF_MAX_LINES,
@@ -43,23 +44,24 @@ import {
   compactMessages,
   discoverSkills,
   estimateTokens,
-  getGitSummaryCached,
+  getGitSummaryCachedAsync,
   isAllowedByRules,
   isDangerousCommand,
   isGitRepo,
   summarizeMessages
-} from "./chunk-F5RWZMQY.js";
+} from "./chunk-4HANB3DJ.js";
 import {
+  computeCostUsd,
   contextWindowTokens,
   coreMessageText,
   diffTreeNames,
   reconcileStarMessages,
   toCoreMessages
-} from "./chunk-MYHD3SZB.js";
+} from "./chunk-CECMCDZG.js";
 import {
   createModel,
   reasoningEffortMetadata
-} from "./chunk-MVAMPVTA.js";
+} from "./chunk-KILMI3S5.js";
 import {
   listModels,
   resolveModelConfig
@@ -69,7 +71,7 @@ import {
   formatTaskFinished,
   formatTaskList,
   formatTaskStarted
-} from "./chunk-Q5FJN4LN.js";
+} from "./chunk-54KH4JSO.js";
 import {
   MAX_IMAGE_DIMENSION,
   SKIP_DIRS,
@@ -98,13 +100,14 @@ import {
   starHome,
   upsertEnvContent,
   userMemoryPath
-} from "./chunk-LSYGHLRU.js";
+} from "./chunk-2ISBRSBA.js";
 
 // src/cli/repl.tsx
 import { Box as Box13, Text as Text14, render, useApp } from "ink";
-import { useCallback, useEffect as useEffect4, useMemo, useRef as useRef6, useState as useState7 } from "react";
+import { useCallback, useEffect as useEffect4, useMemo, useRef as useRef7, useState as useState7 } from "react";
 
 // src/config/save.ts
+import { randomUUID } from "crypto";
 import fs from "fs";
 import path from "path";
 import { parse, stringify } from "smol-toml";
@@ -115,14 +118,34 @@ function tomlString(value) {
   return JSON.stringify(value);
 }
 async function writeFileAtomic(filePath, content) {
-  const tmpPath = `${filePath}.${process.pid}.tmp`;
-  await fs.promises.writeFile(tmpPath, content, "utf8");
-  await fs.promises.rename(tmpPath, filePath);
+  const tmpPath = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
   try {
-    await fs.promises.chmod(filePath, 384);
-  } catch {
+    const handle = await fs.promises.open(tmpPath, "wx", 384);
+    try {
+      await handle.writeFile(content, "utf8");
+      await handle.chmod(384);
+    } finally {
+      await handle.close();
+    }
+    await fs.promises.rename(tmpPath, filePath);
+  } catch (error) {
+    await fs.promises.unlink(tmpPath).catch(() => {
+    });
+    throw error;
   }
 }
+var configSaveQueues = /* @__PURE__ */ new Map();
+function serializeConfigSave(filePath, save) {
+  const previous = configSaveQueues.get(filePath) ?? Promise.resolve();
+  const next = previous.catch(() => {
+  }).then(save);
+  configSaveQueues.set(filePath, next);
+  void next.finally(() => {
+    if (configSaveQueues.get(filePath) === next) configSaveQueues.delete(filePath);
+  }).catch(() => {
+  });
+  return next;
+}
 function upsertPermissionRuleText(content, kind, rules, hadPermissionsTable) {
   const newLine = `${kind} = [${rules.map(tomlString).join(", ")}]`;
   const lines = content.split("\n");
@@ -161,28 +184,35 @@ ${newLine}
 }
 async function addPermissionRule(kind, rule) {
   const filePath = globalConfigPath();
-  let content = "";
-  let raw = {};
-  try {
-    content = await fs.promises.readFile(filePath, "utf8");
-    raw = parse(content);
-  } catch (error) {
-    if (error.code !== "ENOENT") throw error;
-  }
-  const permissions = typeof raw.permissions === "object" && raw.permissions !== null ? raw.permissions : {};
-  const rules = Array.isArray(permissions[kind]) ? permissions[kind] : [];
-  if (rules.includes(rule)) return false;
-  const nextRules = [...rules, rule];
-  await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
-  const updated = upsertPermissionRuleText(content, kind, nextRules, raw.permissions !== void 0);
-  if (updated !== null) {
-    await writeFileAtomic(filePath, updated);
+  return serializeConfigSave(filePath, async () => {
+    let content = "";
+    let raw = {};
+    try {
+      content = await fs.promises.readFile(filePath, "utf8");
+      raw = parse(content);
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+    const permissions = typeof raw.permissions === "object" && raw.permissions !== null ? raw.permissions : {};
+    const rules = Array.isArray(permissions[kind]) ? permissions[kind] : [];
+    if (rules.includes(rule)) return false;
+    const nextRules = [...rules, rule];
+    await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
+    const updated = upsertPermissionRuleText(
+      content,
+      kind,
+      nextRules,
+      raw.permissions !== void 0
+    );
+    if (updated !== null) {
+      await writeFileAtomic(filePath, updated);
+      return true;
+    }
+    permissions[kind] = nextRules;
+    raw.permissions = permissions;
+    await writeFileAtomic(filePath, stringify(raw));
     return true;
-  }
-  permissions[kind] = nextRules;
-  raw.permissions = permissions;
-  await writeFileAtomic(filePath, stringify(raw));
-  return true;
+  });
 }
 function upsertTopLevelKeyText(content, key, value) {
   const newLine = `${key} = ${tomlString(value)}`;
@@ -205,14 +235,16 @@ function upsertTopLevelKeyText(content, key, value) {
 }
 async function savePermissionMode(mode) {
   const filePath = globalConfigPath();
-  let content = "";
-  try {
-    content = await fs.promises.readFile(filePath, "utf8");
-  } catch (error) {
-    if (error.code !== "ENOENT") throw error;
-  }
-  await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
-  await writeFileAtomic(filePath, upsertTopLevelKeyText(content, "permissionMode", mode));
+  return serializeConfigSave(filePath, async () => {
+    let content = "";
+    try {
+      content = await fs.promises.readFile(filePath, "utf8");
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+    await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
+    await writeFileAtomic(filePath, upsertTopLevelKeyText(content, "permissionMode", mode));
+  });
 }
 function unquoteTomlString(raw) {
   if (raw.startsWith("'") && raw.endsWith("'")) return raw.slice(1, -1);
@@ -271,29 +303,35 @@ function setReasoningEffortInToml(content, modelName, effort) {
 }
 async function saveReasoningEffort(modelName, effort) {
   const filePath = globalConfigPath();
-  let content = "";
-  try {
-    content = await fs.promises.readFile(filePath, "utf8");
-  } catch (error) {
-    if (error.code !== "ENOENT") throw error;
-  }
-  const updated = setReasoningEffortInToml(content, modelName, effort);
-  if (updated === null) return false;
-  await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
-  await writeFileAtomic(filePath, updated);
-  return true;
+  return serializeConfigSave(filePath, async () => {
+    let content = "";
+    try {
+      content = await fs.promises.readFile(filePath, "utf8");
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+    const updated = setReasoningEffortInToml(content, modelName, effort);
+    if (updated === null) return false;
+    await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
+    await writeFileAtomic(filePath, updated);
+    return true;
+  });
 }
 
 // src/session/resume.ts
 async function resumeSession(id) {
   const store = await SessionStore.open(id);
   if (!store) return null;
-  const [meta, loaded] = await Promise.all([store.meta(), store.starMessages()]);
-  const messages = reconcileStarMessages(loaded);
-  if (messages.length !== loaded.length) {
-    await store.replaceMessages(messages);
+  try {
+    const [meta, loaded] = await Promise.all([store.meta(), store.starMessages()]);
+    const messages = reconcileStarMessages(loaded);
+    if (messages.length !== loaded.length && !await store.replaceMessages(messages)) {
+      throw new Error(`Could not repair persisted history for session ${id}`);
+    }
+    return { meta, messages };
+  } finally {
+    await store.close();
   }
-  return { meta, messages };
 }
 
 // src/session/usage.ts
@@ -357,25 +395,29 @@ function aggregateUsage(metas) {
         hasLegacy = true;
       }
     }
-    const name = typeof meta.model === "string" && meta.model.trim() ? meta.model : "unknown";
-    const entry = models.get(name) ?? {
-      model: name,
-      sessions: 0,
-      requests: 0,
-      promptTokens: 0,
-      completionTokens: 0,
-      totalTokens: 0
-    };
-    entry.sessions += 1;
-    entry.requests += requestCount;
-    addTo(entry, totals);
-    if (hasTotals && meta.usage) {
-      const cached = tokens(meta.usage.cachedPromptTokens);
-      const cacheRead = tokens(meta.usage.cacheReadInputTokens);
+    const fallbackName = typeof meta.model === "string" && meta.model.trim() ? meta.model : "unknown";
+    const perModel = meta.usageByModel !== null && typeof meta.usageByModel === "object";
+    const modelTotals = perModel ? Object.entries(meta.usageByModel ?? {}) : [[fallbackName, hasTotals ? meta.usage : void 0]];
+    for (const [name, modelUsage] of modelTotals) {
+      if (!modelUsage) continue;
+      const modelBucket = bucketOf(modelUsage);
+      const entry = models.get(name) ?? {
+        model: name,
+        sessions: 0,
+        requests: 0,
+        promptTokens: 0,
+        completionTokens: 0,
+        totalTokens: 0
+      };
+      entry.sessions += 1;
+      entry.requests += perModel ? tokens(modelUsage.requests) : requestCount;
+      addTo(entry, modelBucket);
+      const cached = tokens(modelUsage.cachedPromptTokens);
+      const cacheRead = tokens(modelUsage.cacheReadInputTokens);
       if (cached > 0) entry.cachedPromptTokens = (entry.cachedPromptTokens ?? 0) + cached;
       if (cacheRead > 0) entry.cacheReadInputTokens = (entry.cacheReadInputTokens ?? 0) + cacheRead;
+      models.set(name, entry);
     }
-    models.set(name, entry);
   }
   return {
     sessions: metas.length,
@@ -487,7 +529,7 @@ function cacheHitPercent(totals) {
 
 // src/cli/clipboard.ts
 import { execFile } from "child_process";
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { readFile, stat, unlink } from "fs/promises";
 import os from "os";
 import path2 from "path";
@@ -575,7 +617,7 @@ async function readClipboardTempFile(tempFile) {
   return { path: "clipboard.png", mimeType: "image/png", data: buf.toString("base64") };
 }
 async function readClipboardImage() {
-  const tempFile = path2.join(os.tmpdir(), `star-clipboard-${randomUUID()}.png`);
+  const tempFile = path2.join(os.tmpdir(), `star-clipboard-${randomUUID2()}.png`);
   const hasPngpaste = process.platform === "darwin" ? await commandExists("pngpaste") : false;
   const plan = clipboardImagePlan(process.platform, tempFile, hasPngpaste);
   if (!plan) return null;
@@ -927,13 +969,17 @@ function formatSearchResults(hits, query) {
 }
 
 // src/cli/diff-preview.ts
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile2, stat as stat2 } from "fs/promises";
 import path5 from "path";
 var CONTEXT_LINES = 2;
 var MAX_HUNK_LINES = 15;
 var MAX_TOTAL_LINES = 12;
 var NEW_FILE_PREVIEW_LINES = 10;
 var MAX_DP_CELLS = 25e4;
+var MAX_DIFF_PREVIEW_CHARS = 1e6;
+function largeDiffSummary() {
+  return [{ kind: "marker", text: "... (large diff omitted; preview work budget exceeded)" }];
+}
 function diffOps(oldText, newText) {
   const a = oldText.split("\n");
   const b = newText.split("\n");
@@ -1019,6 +1065,8 @@ function hunkRanges(ops) {
   return ranges;
 }
 function buildDiffLines(oldText, newText) {
+  if (oldText === newText) return [];
+  if (oldText.length + newText.length > MAX_DIFF_PREVIEW_CHARS) return largeDiffSummary();
   const ops = diffOps(oldText, newText);
   if (ops.length === 0) return [];
   const ranges = hunkRanges(ops);
@@ -1077,6 +1125,9 @@ function applyEdit(content, oldString, newString, replaceAll) {
   return replaceAll ? content.split(oldString).join(newString) : content.replace(oldString, () => newString);
 }
 function newFilePreview(content, label) {
+  if (content.length > MAX_DIFF_PREVIEW_CHARS) {
+    return { type: "new-file", label, lines: largeDiffSummary() };
+  }
   const all = content.split("\n");
   const shown = all.slice(0, NEW_FILE_PREVIEW_LINES);
   const lines = shown.map((text) => ({ kind: "add", text }));
@@ -1090,6 +1141,10 @@ async function generateDiffPreview(toolName, args, cwd) {
   const filePath = getStringArg(args, "path");
   if (filePath === void 0) return null;
   const absolute = path5.resolve(cwd, filePath);
+  const metadata = await stat2(absolute).catch(() => null);
+  if (metadata?.isFile() && metadata.size > MAX_DIFF_PREVIEW_CHARS) {
+    return { type: "diff", label: filePath, lines: largeDiffSummary() };
+  }
   let existing;
   try {
     existing = await readFile2(absolute, "utf8");
@@ -2686,7 +2741,7 @@ function SelectPrompt({ title, options, onSelect, onCancel, onDelete }) {
   const above = start;
   const below = options.length - start - visible.length;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
-    /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: title }),
+    /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: toTerminalSafe(title) }),
     above > 0 && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
       "\u2026 ",
       above,
@@ -2697,16 +2752,16 @@ function SelectPrompt({ title, options, onSelect, onCancel, onDelete }) {
       return /* @__PURE__ */ jsxs(Text, { children: [
         /* @__PURE__ */ jsxs(Text, { bold: active, inverse: active, children: [
           active ? "\u276F " : "  ",
-          option.label
+          toTerminalSafe(option.label)
         ] }),
         option.hint && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
           " (",
-          option.hint,
+          toTerminalSafe(option.hint),
           ")"
         ] }),
         option.description && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
           " \u2014 ",
-          option.description
+          toTerminalSafe(option.description)
         ] })
       ] }, option.value);
     }),
@@ -2717,7 +2772,7 @@ function SelectPrompt({ title, options, onSelect, onCancel, onDelete }) {
     ] }),
     confirming ? /* @__PURE__ */ jsxs(Text, { color: "red", children: [
       "Delete ",
-      confirming.label,
+      toTerminalSafe(confirming.label),
       "? [y] yes [n] no"
     ] }) : /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
       "[\u2191/\u2193 or j/k] move [Enter] select",
@@ -2739,6 +2794,9 @@ import { memo, useEffect as useEffect2, useRef as useRef3, useState as useState2
 import { readdir } from "fs/promises";
 import path12 from "path";
 var MAX_SCAN_ENTRIES = 2e3;
+var PATH_SUGGEST_DEBOUNCE_MS = 100;
+var PATH_SUGGEST_CACHE_MS = 2e3;
+var PATH_SUGGEST_CACHE_LIMIT = 100;
 function extractAtToken(value, cursor) {
   const before = value.slice(0, cursor);
   const match = /(?:^|\s)@(\S*)$/.exec(before);
@@ -2773,24 +2831,67 @@ async function suggestPaths(token, cwd, maxScanEntries = MAX_SCAN_ENTRIES, maxSu
   matches.sort((a, b) => a.path.localeCompare(b.path));
   return matches.slice(0, maxSuggestions);
 }
+var suggestionCache = /* @__PURE__ */ new Map();
+function cachedSuggestPaths(token, cwd, maxScanEntries = MAX_SCAN_ENTRIES, maxSuggestions = MAX_SUGGESTIONS) {
+  const key = `${path12.resolve(cwd)}\0${token}\0${maxScanEntries}\0${maxSuggestions}`;
+  const now = Date.now();
+  const cached = suggestionCache.get(key);
+  if (cached && now - cached.createdAt <= PATH_SUGGEST_CACHE_MS) {
+    suggestionCache.delete(key);
+    suggestionCache.set(key, cached);
+    return cached.pending;
+  }
+  const pending = Promise.resolve().then(
+    () => suggestPaths(token, cwd, maxScanEntries, maxSuggestions)
+  );
+  suggestionCache.delete(key);
+  suggestionCache.set(key, { createdAt: now, pending });
+  if (suggestionCache.size > PATH_SUGGEST_CACHE_LIMIT) {
+    const oldest = suggestionCache.keys().next();
+    if (!oldest.done) suggestionCache.delete(oldest.value);
+  }
+  return pending;
+}
 
 // src/cli/components/InputBox.tsx
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+function previousGraphemeBoundary(value, cursor) {
+  let previous = 0;
+  for (const { index } of graphemeSegmenter.segment(value.slice(0, cursor))) previous = index;
+  return previous;
+}
+function nextGraphemeBoundary(value, cursor) {
+  const next = graphemeSegmenter.segment(value.slice(cursor))[Symbol.iterator]().next();
+  return next.done ? value.length : cursor + next.value.segment.length;
+}
+function graphemeColumn(value, start, end) {
+  return Array.from(graphemeSegmenter.segment(value.slice(start, end))).length;
+}
+function cursorAtGraphemeColumn(value, start, end, column) {
+  let count = 0;
+  for (const { index, segment } of graphemeSegmenter.segment(value.slice(start, end))) {
+    if (count === column) return start + index;
+    count += 1;
+    if (count > column) return start + index + segment.length;
+  }
+  return end;
+}
 function moveCursorLines(value, cursor, delta) {
   const lineStart = value.lastIndexOf("\n", cursor - 1) + 1;
-  const col = cursor - lineStart;
+  const col = graphemeColumn(value, lineStart, cursor);
   if (delta === -1) {
     if (lineStart === 0) return null;
     const prevEnd = lineStart - 1;
     const prevStart = value.lastIndexOf("\n", prevEnd - 1) + 1;
-    return prevStart + Math.min(col, prevEnd - prevStart);
+    return cursorAtGraphemeColumn(value, prevStart, prevEnd, col);
   }
   const lineEndIndex = value.indexOf("\n", cursor);
   if (lineEndIndex === -1) return null;
   const nextStart = lineEndIndex + 1;
   const nextEndIndex = value.indexOf("\n", nextStart);
   const nextEnd = nextEndIndex === -1 ? value.length : nextEndIndex;
-  return nextStart + Math.min(col, nextEnd - nextStart);
+  return cursorAtGraphemeColumn(value, nextStart, nextEnd, col);
 }
 function findHistoryMatch(history, query, from, step) {
   const needle = query.toLowerCase();
@@ -3000,21 +3101,20 @@ var InputBox = memo(function InputBox2({
   const suggestions = suggestionsEnabled && commands ? filterCommands(value, commands) : [];
   const argHints = suggestionsEnabled && commands && cursor === value.length ? filterArgHints(value, commands) : [];
   useEffect2(() => {
-    if (!suggestionsEnabled || !cwd) {
-      setPathSuggestions([]);
-      return;
-    }
-    const token = extractAtToken(value, cursor);
-    if (!token) {
-      setPathSuggestions([]);
-      return;
-    }
     let cancelled = false;
-    void suggestPaths(token.token, cwd).then((result) => {
-      if (!cancelled) setPathSuggestions(result);
-    });
+    setPathSuggestions([]);
+    const token = suggestionsEnabled && cwd ? extractAtToken(value, cursor) : null;
+    if (!token || !cwd) return;
+    const timer = setTimeout(() => {
+      void cachedSuggestPaths(token.token, cwd).then((result) => {
+        if (!cancelled) setPathSuggestions(result);
+      }).catch(() => {
+        if (!cancelled) setPathSuggestions([]);
+      });
+    }, PATH_SUGGEST_DEBOUNCE_MS);
     return () => {
       cancelled = true;
+      clearTimeout(timer);
     };
   }, [value, cursor, cwd, suggestionsEnabled]);
   const showPathSuggestions = suggestions.length === 0 && argHints.length === 0 && pathSuggestions.length > 0;
@@ -3097,7 +3197,7 @@ var InputBox = memo(function InputBox2({
       }
       const requery = (query) => setSearch({ query, match: findHistoryMatch(history, query, history.length - 1, -1) });
       if (key.backspace || key.delete) {
-        requery(search.query.slice(0, -1));
+        requery(search.query.slice(0, previousGraphemeBoundary(search.query, search.query.length)));
         return;
       }
       if (key.upArrow) {
@@ -3223,13 +3323,13 @@ ${value.slice(cursor)}`, cursor + 1);
       if (moved !== null) setCursor(moved);
       return;
     } else if (key.leftArrow) {
-      setCursor((prev) => Math.max(0, prev - 1));
+      setCursor((prev) => previousGraphemeBoundary(value, prev));
       return;
     } else if (key.rightArrow) {
       if (suggestionCount > 0 && cursor === value.length) {
         completeHighlighted();
       } else {
-        setCursor((prev) => Math.min(value.length, prev + 1));
+        setCursor((prev) => nextGraphemeBoundary(value, prev));
       }
       return;
     }
@@ -3258,17 +3358,17 @@ ${value.slice(cursor)}`, cursor + 1);
     }
     if (key.backspace || key.delete) {
       if (cursor === 0) return;
-      let remove = 1;
+      let removeStart = previousGraphemeBoundary(value, cursor);
       for (const match of value.matchAll(PASTE_TOKEN_RE)) {
         if (match.index + match[0].length === cursor) {
-          remove = match[0].length;
+          removeStart = match.index;
           const id = Number(match[1]);
           pastesRef.current.delete(id);
           if (lastPasteRef.current?.id === id) lastPasteRef.current = null;
           break;
         }
       }
-      edit(value.slice(0, cursor - remove) + value.slice(cursor), cursor - remove);
+      edit(value.slice(0, removeStart) + value.slice(cursor), removeStart);
       return;
     }
     if (input && !key.ctrl && !key.meta) {
@@ -3276,9 +3376,10 @@ ${value.slice(cursor)}`, cursor + 1);
     }
   });
   const before = value.slice(0, cursor);
-  const at = value[cursor];
-  const after = value.slice(cursor + 1);
-  const cursorChar = at === "\n" || at === void 0 || at === PASTE_DELIM ? " " : at;
+  const nextBoundary = nextGraphemeBoundary(value, cursor);
+  const at = value.slice(cursor, nextBoundary);
+  const after = value.slice(nextBoundary);
+  const cursorChar = at === "\n" || at === "" || at === PASTE_DELIM ? " " : at;
   const tail = (at === "\n" ? "\n" : "") + stylePasteTokens(after);
   const styled = search ? `\x1B[36m(reverse-search) \x1B[39m'${search.query}': ${search.match === null ? "\x1B[2mno match\x1B[22m\x1B[7m \x1B[27m" : `${history[search.match]}\x1B[7m \x1B[27m`}` : `\x1B[36m\u276F \x1B[39m${stylePasteTokens(before)}\x1B[7m${cursorChar}\x1B[27m${tail}`;
   const menuStart = Math.min(
@@ -3800,14 +3901,43 @@ function RewindConfirmPrompt({
 // src/cli/components/StatusBar.tsx
 import { Box as Box9, Text as Text10, useStdout as useStdout3 } from "ink";
 import { memo as memo3 } from "react";
-import { jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx10 } from "react/jsx-runtime";
 var BG_LABEL_MAX = 40;
+var BG_PER_LABEL_MAX = 24;
 var WIDE_COLUMNS = 120;
 function cwdLabel(cwd, wide) {
   if (wide) return cwd;
   const base = cwd.replace(/[\\/]+$/, "").split(/[\\/]/).pop();
   return base && base.length > 0 ? base : cwd;
 }
+function fitStatusSegments(segments, columns) {
+  const clean = segments.filter((s) => s != null).map((s) => toTerminalSafe(s).replaceAll("\n", " "));
+  if (clean.length === 0) return [];
+  const available = Math.max(0, columns - clean.length + 1);
+  const widths = clean.map(displayWidth);
+  const budgets = clean.map(() => 0);
+  let active = clean.map((_, index) => index);
+  let remaining = available;
+  while (remaining > 0 && active.length > 0) {
+    const share = Math.floor(remaining / active.length);
+    if (share === 0) {
+      for (const index of active.slice(0, remaining)) budgets[index] = (budgets[index] ?? 0) + 1;
+      break;
+    }
+    let used = 0;
+    const next = [];
+    for (const index of active) {
+      const grant = Math.min((widths[index] ?? 0) - (budgets[index] ?? 0), share);
+      budgets[index] = (budgets[index] ?? 0) + grant;
+      used += grant;
+      if ((budgets[index] ?? 0) < (widths[index] ?? 0)) next.push(index);
+    }
+    if (used === 0) break;
+    remaining -= used;
+    active = next;
+  }
+  return clean.map((segment, index) => truncateToWidth(segment, budgets[index] ?? 0));
+}
 var StatusBar = memo3(function StatusBar2({
   cwd,
   model,
@@ -3821,72 +3951,69 @@ var StatusBar = memo3(function StatusBar2({
   backgroundTasks = []
 }) {
   const { stdout } = useStdout3();
-  const wide = (stdout?.columns ?? 80) >= WIDE_COLUMNS;
-  const joined = backgroundTasks.map((label) => toTerminalSafe(label)).join(", ");
-  const labels = joined.length > BG_LABEL_MAX ? `${joined.slice(0, BG_LABEL_MAX)}\u2026` : joined;
-  return /* @__PURE__ */ jsxs10(Box9, { justifyContent: "space-between", children: [
-    /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      folderIcon,
-      cwdLabel(cwd, wide),
-      gitBranch ? ` [${gitBranch}]` : ""
-    ] }),
-    backgroundTasks.length > 0 && /* @__PURE__ */ jsxs10(Text10, { color: "yellow", children: [
-      "bg: ",
-      backgroundTasks.length,
-      " (",
-      labels,
-      ")"
-    ] }),
-    /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      "\u2726 ",
-      model
-    ] }),
-    contextPercent != null && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      "ctx: ",
-      contextPercent,
-      "%",
-      contextTokens ? ` (${formatTokensCompact(contextTokens.used)}/${formatTokensCompact(contextTokens.window)})` : ""
-    ] }),
-    /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      "cache: ",
-      cachePercent != null ? `${cachePercent}%` : "Not provided"
-    ] }),
-    sessionCostUsd != null && sessionCostUsd > 0 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      "$",
-      formatDollars(sessionCostUsd)
-    ] }),
-    /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      formatTokens(tokens2),
-      " tokens"
-    ] }),
-    /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-      "mode: ",
-      permissionMode
-    ] })
-  ] });
+  const columns = stdout?.columns ?? 80;
+  const wide = columns >= WIDE_COLUMNS;
+  const cwdSegment = `${folderIcon}${cwdLabel(cwd, wide)}${gitBranch ? ` [${gitBranch}]` : ""}`;
+  const modelSegment = `\u2726 ${model}`;
+  const ctxSegment = contextPercent != null ? `ctx: ${contextPercent}%${contextTokens ? ` (${formatTokensCompact(contextTokens.used)}/${formatTokensCompact(contextTokens.window)})` : ""}` : null;
+  const cacheSegment = `cache: ${cachePercent != null ? `${cachePercent}%` : "Not provided"}`;
+  const costSegment = sessionCostUsd != null && sessionCostUsd > 0 ? `$${formatDollars(sessionCostUsd)}` : null;
+  const tokensSegment = `${formatTokens(tokens2)} tokens`;
+  const modeSegment = `mode: ${permissionMode}`;
+  let bgSegment = null;
+  if (backgroundTasks.length > 0) {
+    const joined = backgroundTasks.map((label) => truncateToWidth(toTerminalSafe(label), BG_PER_LABEL_MAX)).join(", ");
+    bgSegment = `bg: ${backgroundTasks.length} (${truncateToWidth(joined, BG_LABEL_MAX)})`;
+  }
+  const raw = [
+    cwdSegment,
+    bgSegment,
+    modelSegment,
+    ctxSegment,
+    cacheSegment,
+    costSegment,
+    tokensSegment,
+    modeSegment
+  ];
+  const keys = ["cwd", "bg", "model", "ctx", "cache", "cost", "tokens", "mode"].filter(
+    (_, index) => raw[index] != null
+  );
+  const fitted = fitStatusSegments(raw, columns);
+  return /* @__PURE__ */ jsx10(Box9, { justifyContent: "space-between", children: fitted.map((segment, index) => /* @__PURE__ */ jsx10(
+    Text10,
+    {
+      color: keys[index] === "bg" ? "yellow" : void 0,
+      dimColor: keys[index] !== "bg",
+      children: segment
+    },
+    keys[index]
+  )) });
 });
 
 // src/cli/components/StreamingMessage.tsx
 import { Box as Box10, Text as Text11, useStdout as useStdout4 } from "ink";
 import { memo as memo4 } from "react";
-import { jsx as jsx10, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 var StreamingMessage = memo4(function StreamingMessage2({
   text,
   continuation
 }) {
   const { stdout } = useStdout4();
-  return /* @__PURE__ */ jsxs11(Box10, { flexDirection: "column", marginBottom: 1, children: [
-    !continuation && /* @__PURE__ */ jsx10(Text11, { bold: true, color: "green", children: "\u2726 star" }),
-    /* @__PURE__ */ jsx10(Text11, { color: "green", children: renderMarkdown(text, "32", stdout.columns ?? 80) })
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", marginBottom: 1, children: [
+    !continuation && /* @__PURE__ */ jsx11(Text11, { bold: true, color: "green", children: "\u2726 star" }),
+    /* @__PURE__ */ jsx11(Text11, { color: "green", children: renderMarkdown(text, "32", stdout.columns ?? 80) })
   ] });
 });
 
 // src/cli/components/ThinkingIndicator.tsx
 import { Box as Box11, Text as Text12 } from "ink";
-import { memo as memo5, useEffect as useEffect3, useState as useState6 } from "react";
+import { memo as memo5, useEffect as useEffect3, useRef as useRef6, useState as useState6 } from "react";
 
 // src/cli/ticker.ts
 var TICK_MS = 100;
+function isMotionDisabled(env = process.env) {
+  return env.STAR_NO_MOTION === "1";
+}
 function nextFlush(prev, next) {
   if (prev.streamed === next.streamed && prev.reasoning === next.reasoning) return null;
   return next;
@@ -3901,22 +4028,58 @@ function startTicker(onTick, intervalMs = TICK_MS) {
 }
 
 // src/cli/components/ThinkingIndicator.tsx
-import { jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsxs as jsxs11 } from "react/jsx-runtime";
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var REASONING_TAIL_LENGTH = 200;
 var THOUGHT_SUMMARY_LENGTH = 100;
-function truncateTail(text, max) {
-  const flat = text.replace(/\s+/g, " ").trim();
-  if (flat.length <= max) return flat;
-  return `\u2026${flat.slice(flat.length - max)}`;
-}
-function roughReasoningTokens(text) {
-  let weight = 0;
-  for (let i = 0; i < text.length; i++) {
-    const code = text.charCodeAt(i);
-    weight += code >= 12288 && code <= 12543 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 40959 || code >= 63744 && code <= 64255 || code >= 65280 && code <= 65519 ? 4 : 1;
+function createReasoningDisplayCache(max = REASONING_TAIL_LENGTH) {
+  return {
+    max,
+    text: "",
+    weight: 0,
+    flatLength: 0,
+    flatTail: "",
+    hasContent: false,
+    pendingSpace: false
+  };
+}
+function appendFlat(cache, text) {
+  cache.flatLength += 1;
+  cache.flatTail = `${cache.flatTail}${text}`.slice(-cache.max);
+}
+function updateReasoningDisplay(cache, text) {
+  if (text !== cache.text) {
+    if (!text.startsWith(cache.text)) {
+      cache.text = "";
+      cache.weight = 0;
+      cache.flatLength = 0;
+      cache.flatTail = "";
+      cache.hasContent = false;
+      cache.pendingSpace = false;
+    }
+    const appended = text.slice(cache.text.length);
+    for (let i = 0; i < appended.length; i++) {
+      const ch = appended[i] ?? "";
+      const code = ch.charCodeAt(0);
+      cache.weight += code >= 12288 && code <= 12543 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 40959 || code >= 63744 && code <= 64255 || code >= 65280 && code <= 65519 ? 4 : 1;
+      if (/\s/.test(ch)) {
+        cache.pendingSpace = cache.hasContent;
+      } else {
+        if (cache.pendingSpace) appendFlat(cache, " ");
+        appendFlat(cache, ch);
+        cache.hasContent = true;
+        cache.pendingSpace = false;
+      }
+    }
+    cache.text = text;
   }
-  return Math.ceil(weight / 4);
+  return {
+    tail: cache.flatLength <= cache.max ? cache.flatTail : `\u2026${cache.flatTail}`,
+    thoughtTokens: Math.ceil(cache.weight / 4)
+  };
+}
+function truncateTail(text, max) {
+  return updateReasoningDisplay(createReasoningDisplayCache(max), text).tail;
 }
 var ThinkingIndicator = memo5(function ThinkingIndicator2({
   reasoning,
@@ -3925,26 +4088,30 @@ var ThinkingIndicator = memo5(function ThinkingIndicator2({
   startedAt
 }) {
   const [tick, setTick] = useState6(0);
-  useEffect3(() => startTicker((t) => setTick(t)), []);
-  const tail = reasoning ? truncateTail(reasoning, REASONING_TAIL_LENGTH) : "";
+  const noMotion = isMotionDisabled();
+  useEffect3(() => {
+    if (noMotion) return;
+    return startTicker((t) => setTick(t));
+  }, [noMotion]);
+  const cacheRef = useRef6(createReasoningDisplayCache());
+  const display = updateReasoningDisplay(cacheRef.current, reasoning ?? "");
   const spinner = SPINNER_FRAMES[(frame ?? tick) % SPINNER_FRAMES.length];
   const label = activity ?? `${thinkingIcon} star is thinking\u2026`;
   const elapsedSec = startedAt === void 0 ? void 0 : Math.max(0, Math.floor((Date.now() - startedAt) / 1e3));
   const stats = [];
   if (elapsedSec !== void 0 && elapsedSec >= 3) stats.push(formatElapsedSeconds(elapsedSec));
-  const thoughtTokens = reasoning ? roughReasoningTokens(reasoning) : 0;
-  if (thoughtTokens > 0) stats.push(`~${formatTokens(thoughtTokens)} thought`);
+  if (display.thoughtTokens > 0) stats.push(`~${formatTokens(display.thoughtTokens)} thought`);
   const status = stats.length > 0 ? ` (${stats.join(" \xB7 ")})` : "";
-  return /* @__PURE__ */ jsxs12(Box11, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs11(Text12, { dimColor: true, children: [
       spinner,
       " ",
       label,
       status
     ] }),
-    tail !== "" && /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
+    display.tail !== "" && /* @__PURE__ */ jsxs11(Text12, { dimColor: true, children: [
       "   ",
-      tail
+      display.tail
     ] })
   ] });
 });
@@ -3952,7 +4119,7 @@ var ThinkingIndicator = memo5(function ThinkingIndicator2({
 // src/cli/components/TodoPanel.tsx
 import { Box as Box12, Text as Text13 } from "ink";
 import { memo as memo6 } from "react";
-import { jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsxs as jsxs12 } from "react/jsx-runtime";
 var SYMBOLS = {
   pending: "\u25CB",
   in_progress: "\u25D0",
@@ -3973,13 +4140,13 @@ function visibleTodoWindow(todos, max = MAX_VISIBLE_TODOS) {
 var TodoPanel = memo6(function TodoPanel2({ todos }) {
   if (todos.length === 0 || todos.every((t) => t.status === "done")) return null;
   const { items, hiddenBefore, hiddenAfter } = visibleTodoWindow(todos);
-  return /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", children: [
-    hiddenBefore > 0 && /* @__PURE__ */ jsxs13(Text13, { dimColor: true, children: [
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
+    hiddenBefore > 0 && /* @__PURE__ */ jsxs12(Text13, { dimColor: true, children: [
       " \u2026 ",
       hiddenBefore,
       " more above"
     ] }),
-    items.map((todo) => /* @__PURE__ */ jsxs13(
+    items.map((todo) => /* @__PURE__ */ jsxs12(
       Text13,
       {
         dimColor: todo.status === "done",
@@ -3993,7 +4160,7 @@ var TodoPanel = memo6(function TodoPanel2({ todos }) {
       },
       todo.id
     )),
-    hiddenAfter > 0 && /* @__PURE__ */ jsxs13(Text13, { dimColor: true, children: [
+    hiddenAfter > 0 && /* @__PURE__ */ jsxs12(Text13, { dimColor: true, children: [
       " \u2026 ",
       hiddenAfter,
       " more"
@@ -4024,13 +4191,21 @@ var JUNK_ENTRY_PATTERN = /^(.)\1{19,}$/;
 function historyPath() {
   return path13.join(starHome(), "history");
 }
-function readLines(file) {
+function readEntries(file) {
   const raw = fs7.readFileSync(file, "utf8");
-  return raw.split("\n").map((line) => line.replace(/\r$/, "")).filter((line) => line.trim().length > 0);
+  return raw.split("\n").map((line) => line.replace(/\r$/, "")).filter((line) => line.trim().length > 0).map((line) => {
+    if (!line.startsWith('"')) return line;
+    try {
+      const parsed = JSON.parse(line);
+      return typeof parsed === "string" ? parsed : line;
+    } catch {
+      return line;
+    }
+  });
 }
-function writeHistory(file, lines) {
+function writeHistory(file, entries) {
   fs7.mkdirSync(path13.dirname(file), { recursive: true });
-  fs7.writeFileSync(file, `${lines.join("\n")}
+  fs7.writeFileSync(file, `${entries.map((entry) => JSON.stringify(entry)).join("\n")}
 `);
 }
 function isJunkHistoryEntry(line) {
@@ -4042,7 +4217,7 @@ function isSkippableEntry(line) {
 function loadHistory(limit = HISTORY_LIMIT) {
   try {
     const file = historyPath();
-    const lines = readLines(file);
+    const lines = readEntries(file);
     const clean = lines.filter((line) => !isSkippableEntry(line));
     if (clean.length !== lines.length || clean.length > HISTORY_LIMIT) {
       writeHistory(file, clean.slice(-HISTORY_LIMIT));
@@ -4053,13 +4228,13 @@ function loadHistory(limit = HISTORY_LIMIT) {
   }
 }
 function appendHistory(entry) {
-  const line = entry.replace(/[\r\n]+/g, " ").trim();
+  const line = entry.trim();
   if (line.length === 0 || isSkippableEntry(line)) return;
   try {
     const file = historyPath();
     let existing = [];
     try {
-      existing = readLines(file);
+      existing = readEntries(file);
     } catch {
     }
     if (existing[existing.length - 1] === line) return;
@@ -4068,7 +4243,7 @@ function appendHistory(entry) {
       return;
     }
     fs7.mkdirSync(path13.dirname(file), { recursive: true });
-    fs7.appendFileSync(file, `${line}
+    fs7.appendFileSync(file, `${JSON.stringify(line)}
 `);
   } catch {
   }
@@ -4168,12 +4343,15 @@ var TerminalTitle = class _TerminalTitle {
   deps;
   timer = null;
   frame = 0;
+  running = false;
   static forCwd(cwd, deps = {}) {
     return new _TerminalTitle(`star-cli \u2014 ${path14.basename(cwd) || cwd}`, deps);
   }
   start() {
-    if (this.timer) return;
+    if (this.running) return;
+    this.running = true;
     this.render(SPINNER_FRAMES2[this.frame] ?? "\u280B");
+    if (isMotionDisabled(this.deps.env)) return;
     this.timer = setInterval(() => {
       this.frame = (this.frame + 1) % SPINNER_FRAMES2.length;
       this.render(SPINNER_FRAMES2[this.frame] ?? "\u280B");
@@ -4183,6 +4361,7 @@ var TerminalTitle = class _TerminalTitle {
   // "done" leaves a bell glyph in the title until the next turn starts;
   // "idle" (interrupt, unmount) restores the bare title.
   stop(kind = "done") {
+    this.running = false;
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
@@ -4264,7 +4443,7 @@ async function checkForUpdate(currentVersion, fetcher = defaultFetcher2, statePa
 }
 
 // src/cli/repl.tsx
-import { jsx as jsx11, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx12, jsxs as jsxs13 } from "react/jsx-runtime";
 var CLEAR_TERMINAL = process.platform === "win32" ? "\x1B[2J\x1B[0f" : "\x1B[2J\x1B[3J\x1B[H";
 function emptyUsage() {
   return { requests: 0, promptTokens: 0, completionTokens: 0, totalTokens: 0 };
@@ -4311,6 +4490,7 @@ function Repl({
   const [epoch, setEpoch] = useState7(0);
   const [streamingText, setStreamingText] = useState7(null);
   const [isStreaming, setIsStreaming] = useState7(false);
+  const [shellRunning, setShellRunning] = useState7(false);
   const [thinking, setThinking] = useState7(false);
   const [thinkingText, setThinkingText] = useState7("");
   const [thoughtSummary, setThoughtSummary] = useState7(null);
@@ -4325,52 +4505,54 @@ function Repl({
   const [pendingRewind, setPendingRewindState] = useState7(null);
   const [picker, setPickerState] = useState7(null);
   const [pendingConnect, setPendingConnectState] = useState7(null);
-  const backendRef = useRef6(backend);
-  const nextIdRef = useRef6(initialDisplay.length);
-  const abortRef = useRef6(null);
-  const busyCommandRef = useRef6(null);
-  const busyAbortRef = useRef6(null);
-  const streamedRef = useRef6("");
-  const turnStartedAtRef = useRef6(0);
-  const lastCommittedLenRef = useRef6(0);
-  const thinkingRef = useRef6(false);
-  const reasoningRef = useRef6("");
-  const tickerStopRef = useRef6(null);
-  const flushedRef = useRef6({ streamed: "", reasoning: "" });
-  const toolCardsRef = useRef6(/* @__PURE__ */ new Map());
-  const pendingRef = useRef6(null);
-  const permissionChainRef = useRef6(Promise.resolve());
-  const alwaysAllowedRef = useRef6(/* @__PURE__ */ new Set());
-  const alwaysAllowedListRef = useRef6([]);
-  const prevModeRef = useRef6(null);
-  const planApprovalRef = useRef6(false);
-  const pendingRewindRef = useRef6(null);
-  const pickerRef = useRef6(null);
-  const titleRef = useRef6(null);
-  const pendingConnectRef = useRef6(null);
-  const modelNameRef = useRef6(model);
-  const sessionStoreRef = useRef6(sessionStore);
-  const configRef = useRef6(config);
+  const backendRef = useRef7(backend);
+  const nextIdRef = useRef7(initialDisplay.length);
+  const abortRef = useRef7(null);
+  const operationKindRef = useRef7(null);
+  const operationIdRef = useRef7(0);
+  const busyCommandRef = useRef7(null);
+  const busyAbortRef = useRef7(null);
+  const streamedRef = useRef7("");
+  const turnStartedAtRef = useRef7(0);
+  const lastCommittedLenRef = useRef7(0);
+  const thinkingRef = useRef7(false);
+  const reasoningRef = useRef7("");
+  const tickerStopRef = useRef7(null);
+  const flushedRef = useRef7({ streamed: "", reasoning: "" });
+  const toolCardsRef = useRef7(/* @__PURE__ */ new Map());
+  const pendingRef = useRef7(null);
+  const permissionChainRef = useRef7(Promise.resolve());
+  const alwaysAllowedRef = useRef7(/* @__PURE__ */ new Set());
+  const alwaysAllowedListRef = useRef7([]);
+  const prevModeRef = useRef7(null);
+  const planApprovalRef = useRef7(false);
+  const pendingRewindRef = useRef7(null);
+  const pickerRef = useRef7(null);
+  const titleRef = useRef7(null);
+  const pendingConnectRef = useRef7(null);
+  const modelNameRef = useRef7(model);
+  const sessionStoreRef = useRef7(sessionStore);
+  const configRef = useRef7(config);
   useEffect4(() => {
     configRef.current = config;
   }, [config]);
-  const usageRef = useRef6(initialUsage ? { ...initialUsage } : emptyUsage());
-  const turnChunksRef = useRef6(0);
-  const messagesRef = useRef6(initialDisplay);
+  const usageRef = useRef7(initialUsage ? { ...initialUsage } : emptyUsage());
+  const turnChunksRef = useRef7(0);
+  const messagesRef = useRef7(initialDisplay);
   const [queueItems, setQueueItems] = useState7([]);
-  const queueRef = useRef6(new PromptQueue());
+  const queueRef = useRef7(new PromptQueue());
   const [pendingImages, setPendingImages] = useState7([]);
-  const pendingImagesRef = useRef6([]);
-  const imageSeqRef = useRef6(1);
+  const pendingImagesRef = useRef7([]);
+  const imageSeqRef = useRef7(1);
   const [inputRefill, setInputRefill] = useState7();
-  const refillSeqRef = useRef6(0);
-  const lastEscRef = useRef6(null);
+  const refillSeqRef = useRef7(0);
+  const lastEscRef = useRef7(null);
   const [gitBranch, setGitBranch] = useState7(null);
   const [contextUsage, setContextUsage] = useState7(null);
   const [initialHistory] = useState7(() => loadHistory());
-  const budgetWarnedRef = useRef6(false);
-  const budgetExceededRef = useRef6(false);
-  const runStreamRef = useRef6(
+  const budgetWarnedRef = useRef7(false);
+  const budgetExceededRef = useRef7(false);
+  const runStreamRef = useRef7(
     null
   );
   const pushMessage = useCallback(
@@ -4463,13 +4645,40 @@ function Repl({
     pendingImagesRef.current = [];
     setPendingImages([]);
   }, []);
-  const sessionCostUsd = useCallback(
-    () => computeCostUsd(
-      usageRef.current,
-      config.models.find((m) => m.name === modelNameRef.current)
-    ),
-    [config]
+  const recordUsage = useCallback(
+    (delta, _modelName, costUsd) => {
+      const usage = usageRef.current;
+      usage.requests += 1;
+      usage.promptTokens += delta.promptTokens;
+      usage.completionTokens += delta.completionTokens;
+      usage.totalTokens += delta.promptTokens + delta.completionTokens || delta.totalTokens;
+      if (delta.cachedPromptTokens) {
+        usage.cachedPromptTokens = (usage.cachedPromptTokens ?? 0) + delta.cachedPromptTokens;
+      }
+      if (delta.cacheReadInputTokens) {
+        usage.cacheReadInputTokens = (usage.cacheReadInputTokens ?? 0) + delta.cacheReadInputTokens;
+      }
+      if (costUsd === null) usage.costUnknown = true;
+      else usage.costUsd = (usage.costUsd ?? 0) + costUsd;
+      if (cacheUsageReported(delta)) {
+        if (!usage.cache) usage.cache = { cachedTokens: 0, promptTokens: 0 };
+        addToCacheTotals(usage.cache, delta);
+      }
+      setUsageVersion((version) => version + 1);
+    },
+    []
   );
+  useEffect4(() => {
+    if (backendRef.current instanceof AgentLoop) backendRef.current.onUsage = recordUsage;
+  }, [recordUsage]);
+  const sessionCostUsd = useCallback(() => {
+    const usage = usageRef.current;
+    if (usage.costUsd !== void 0 || usage.costUnknown) return usage.costUsd ?? 0;
+    return computeCostUsd(
+      usage,
+      config.models.find((model2) => model2.name === modelNameRef.current)
+    );
+  }, [config]);
   const handlePasteImage = useCallback(() => {
     void readClipboardImage().then((result) => {
       if (!result) return;
@@ -4657,10 +4866,19 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
     const stopped = stopBackgroundWork();
     if (stopped > 0) {
       pushMessage("system", `${stopped} background task(s) still running; reports will be lost.`);
-      setTimeout(exit, 50);
-      return;
     }
-    exit();
+    void (async () => {
+      try {
+        await sessionStoreRef.current?.close();
+      } catch (error) {
+        pushMessage(
+          "system",
+          `Failed to flush session metadata: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      if (stopped > 0) setTimeout(exit, 50);
+      else exit();
+    })();
   }, [exit, pushMessage, stopBackgroundWork]);
   useInput((_input, key) => {
     if (key.escape) {
@@ -4734,6 +4952,7 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
           system: SYSTEM_PROMPT,
           sessionStore: sessionStoreRef.current,
           contextMaxTokens: contextWindowTokens(config, name),
+          maxTokens: modelConfig.maxTokens,
           providerMetadata: reasoningEffortMetadata(config, name),
           temperature: modelConfig.temperature,
           streamIdleTimeoutSec: modelConfig.streamIdleTimeoutSec,
@@ -4746,6 +4965,7 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
           await loop.loadMessages([...prev.getStarMessages()]);
         }
         attachConfirmHandler(loop);
+        loop.onUsage = recordUsage;
         backendRef.current = loop;
         modelNameRef.current = name;
         setModelName(name);
@@ -4755,7 +4975,7 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
         return `Failed to switch model: ${error instanceof Error ? error.message : String(error)}`;
       }
     },
-    [config, cwd, attachConfirmHandler]
+    [config, cwd, attachConfirmHandler, recordUsage]
   );
   const pickReasoningEffort = useCallback(
     async (name) => {
@@ -4812,38 +5032,76 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
       if (!resolvedId) {
         return `Session not found: ${id}`;
       }
-      const resumed = await resumeSession(resolvedId);
+      const currentStore = sessionStoreRef.current;
+      const sameStore = currentStore?.id === resolvedId ? currentStore : null;
+      const resumed = sameStore ? await (async () => {
+        const [meta, loaded] = await Promise.all([sameStore.meta(), sameStore.starMessages()]);
+        return { meta, messages: reconcileStarMessages(loaded) };
+      })() : await resumeSession(resolvedId);
       if (!resumed) {
         return `Session not found: ${id}`;
       }
-      const store = await SessionStore.open(resolvedId);
+      const store = sameStore ?? await SessionStore.open(resolvedId);
       if (!store) {
         return `Session not found: ${id}`;
       }
       const stopped = stopBackgroundWork();
       await current.loadMessages(resumed.messages);
+      const previousStore = sessionStoreRef.current;
       current.setSessionStore(store);
       sessionStoreRef.current = store;
+      if (previousStore !== store) await previousStore?.close();
       setTodoSession(store.id);
       setTodos(await loadTodos(cwd, store.id));
       hydrateSnapshots(await loadSessionSnapshots(store.dir));
       const display = buildDisplayMessages(resumed.messages);
       nextIdRef.current = display.length;
-      applyMessages(display);
+      redrawMessages(display);
       usageRef.current = resumed.meta.usage ? { ...resumed.meta.usage } : emptyUsage();
+      budgetWarnedRef.current = false;
+      budgetExceededRef.current = false;
       setUsageVersion((v) => v + 1);
       const stoppedNote = stopped > 0 ? ` Stopped ${stopped} background task(s) from the previous session.` : "";
       return `Resumed session ${resolvedId} (${resumed.messages.length} messages).${stoppedNote}`;
     },
-    [applyMessages, cwd, stopBackgroundWork]
+    [cwd, redrawMessages, stopBackgroundWork]
   );
   const terminalTitle = useCallback(() => {
     titleRef.current ??= TerminalTitle.forCwd(cwd);
     return titleRef.current;
   }, [cwd]);
+  const drainQueue = useCallback(() => {
+    if (abortRef.current || busyCommandRef.current || planApprovalRef.current) return;
+    const status = budgetState(sessionCostUsd(), config.sessionBudgetUsd);
+    const nextPrompt = queueRef.current.dequeue();
+    if (!nextPrompt) return;
+    if (status === "exceeded") {
+      const dropped = queueRef.current.clear().length + 1;
+      setQueueItems([]);
+      pushMessage("system", `Dropped ${dropped} queued message(s) \u2014 session budget exceeded.`);
+    } else {
+      setQueueItems(queueRef.current.list());
+      void runStreamRef.current?.(nextPrompt.text, nextPrompt.images);
+    }
+  }, [config.sessionBudgetUsd, pushMessage, sessionCostUsd]);
   const runStream = useCallback(
     async (input, extraImages = []) => {
-      const resolved = await resolveMentions(input, cwd);
+      const controller = new AbortController();
+      const operationId = ++operationIdRef.current;
+      abortRef.current = controller;
+      operationKindRef.current = "model";
+      let resolved;
+      try {
+        resolved = await resolveMentions(input, cwd);
+      } catch (error) {
+        if (operationIdRef.current === operationId) {
+          abortRef.current = null;
+          operationKindRef.current = null;
+        }
+        pushMessage("system", `Error: ${error instanceof Error ? error.message : String(error)}`);
+        drainQueue();
+        return;
+      }
       const images = [...resolved.images, ...extraImages];
       pushMessage(
         "user",
@@ -4853,8 +5111,6 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
       for (const skip of resolved.skipped) {
         pushMessage("system", `Skipped @${skip.path}: ${skip.reason}`);
       }
-      const controller = new AbortController();
-      abortRef.current = controller;
       const turnStartedAt = Date.now();
       turnStartedAtRef.current = turnStartedAt;
       streamedRef.current = "";
@@ -4967,27 +5223,6 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
             reasoningRef.current = "";
             setThinking(true);
             setThinkingText("");
-          } else if (event.type === "finish") {
-            if (event.usage) {
-              const usage = usageRef.current;
-              usage.requests += 1;
-              usage.promptTokens += event.usage.promptTokens;
-              usage.completionTokens += event.usage.completionTokens;
-              usage.totalTokens += event.usage.totalTokens;
-              if (event.usage.cachedPromptTokens) {
-                usage.cachedPromptTokens = (usage.cachedPromptTokens ?? 0) + event.usage.cachedPromptTokens;
-              }
-              if (event.usage.cacheReadInputTokens) {
-                usage.cacheReadInputTokens = (usage.cacheReadInputTokens ?? 0) + event.usage.cacheReadInputTokens;
-              }
-              if (cacheUsageReported(event.usage)) {
-                if (!usage.cache) usage.cache = { cachedTokens: 0, promptTokens: 0 };
-                addToCacheTotals(usage.cache, event.usage);
-              }
-              setUsageVersion((v) => v + 1);
-              sessionStoreRef.current?.addUsage(event.usage).catch(() => {
-              });
-            }
           } else if (event.type === "retry") {
             streamedRef.current = streamedRef.current.slice(0, lastCommittedLenRef.current);
             flushedRef.current = { ...flushedRef.current, streamed: "" };
@@ -5014,7 +5249,10 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
       } finally {
         tickerStopRef.current?.();
         tickerStopRef.current = null;
-        abortRef.current = null;
+        if (operationIdRef.current === operationId) {
+          abortRef.current = null;
+          operationKindRef.current = null;
+        }
         setIsStreaming(false);
         thinkingRef.current = false;
         reasoningRef.current = "";
@@ -5073,25 +5311,18 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
         const backend2 = backendRef.current;
         if (backend2 instanceof AgentLoop) {
           const undelivered = backend2.takeUndeliveredSteers();
-          for (const text of [...undelivered].reverse()) {
-            queueRef.current.enqueueFront({ text, images: [] });
-          }
-          if (undelivered.length > 0) setQueueItems(queueRef.current.list());
-        }
-        const nextPrompt = queueRef.current.dequeue();
-        if (nextPrompt) {
-          if (status === "exceeded") {
-            const dropped = queueRef.current.clear().length + 1;
-            setQueueItems([]);
-            pushMessage(
-              "system",
-              `Dropped ${dropped} queued message(s) \u2014 session budget exceeded.`
-            );
+          if (interrupted && undelivered.length > 0) {
+            refillSeqRef.current += 1;
+            setInputRefill({ text: undelivered.join("\n"), seq: refillSeqRef.current });
+            pushMessage("system", "Undelivered steering input restored to the draft.");
           } else {
-            setQueueItems(queueRef.current.list());
-            void runStreamRef.current?.(nextPrompt.text, nextPrompt.images);
+            for (const text of [...undelivered].reverse()) {
+              queueRef.current.enqueueFront({ text, images: [] });
+            }
+            if (undelivered.length > 0) setQueueItems(queueRef.current.list());
           }
         }
+        drainQueue();
       }
     },
     [
@@ -5102,7 +5333,8 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
       cwd,
       config,
       sessionCostUsd,
-      terminalTitle
+      terminalTitle,
+      drainQueue
     ]
   );
   useEffect4(() => {
@@ -5111,13 +5343,17 @@ Full configuration details: ${CONFIG_DOCS_URL}`;
   const handlePlanDecision = useCallback(
     (decision) => {
       setPlanApproval(false);
-      if (decision === "no") return;
+      if (decision === "no") {
+        drainQueue();
+        return;
+      }
+      if (abortRef.current || busyCommandRef.current) return;
       const restore = prevModeRef.current ?? "ask";
       applySessionMode(restore);
       pushMessage("system", `Plan approved \u2014 permission mode restored to ${restore}.`);
       void runStream("The plan above is approved. Proceed with the implementation.");
     },
-    [applySessionMode, pushMessage, runStream, setPlanApproval]
+    [applySessionMode, drainQueue, pushMessage, runStream, setPlanApproval]
   );
   const registry = useMemo(() => {
     const ctx = {
@@ -5298,12 +5534,16 @@ ${lines.join("\n")}`;
           return "Nothing to fork \u2014 the current session has no messages yet.";
         }
         const fork = await SessionStore.create(cwd, modelNameRef.current);
-        await fork.replaceMessages(messages2);
+        if (!await fork.replaceMessages(messages2)) {
+          await fork.close();
+          return "Failed to persist the fork; the current session is unchanged.";
+        }
         const oldMeta = await store.meta();
         const title = `Fork of ${oldMeta.title || shortSessionId(oldMeta.id)}`;
         await fork.setTitle(title);
         current.setSessionStore(fork);
         sessionStoreRef.current = fork;
+        await store.close();
         setTodoSession(fork.id);
         return `Forked into new session ${fork.id} ("${title}") and switched to it. Checkpoints and rewind history do not carry over.`;
       },
@@ -5314,8 +5554,10 @@ ${lines.join("\n")}`;
         }
         const stopped = stopBackgroundWork();
         const store = await SessionStore.create(cwd, modelNameRef.current);
+        const previousStore = sessionStoreRef.current;
         current.setSessionStore(store);
         sessionStoreRef.current = store;
+        await previousStore?.close();
         setTodoSession(store.id);
         const [first] = current.getStarMessages();
         await current.loadMessages(first?.message.role === "system" ? [first] : []);
@@ -5353,9 +5595,11 @@ ${lines.join("\n")}`;
       },
       listTasks: () => formatTaskList(defaultTaskManager.list()),
       showUsage: () => {
+        const usage = usageRef.current;
         const modelConfig = config.models.find((m) => m.name === modelNameRef.current);
-        return `${formatUsage(usageRef.current)}
-${estimateCost(usageRef.current, modelNameRef.current, modelConfig)}`;
+        const cost = usage.costUsd !== void 0 || usage.costUnknown ? `Estimated cost: $${formatDollars(usage.costUsd ?? 0)} across recorded models${usage.costUnknown ? " (some requests have no configured price)" : ""}` : estimateCost(usage, modelNameRef.current, modelConfig);
+        return `${formatUsage(usage)}
+${cost}`;
       },
       showGlobalUsage: async () => formatUsageDashboard(await collectUsageStats(), config.models),
       compactContext: async () => {
@@ -5363,6 +5607,8 @@ ${estimateCost(usageRef.current, modelNameRef.current, modelConfig)}`;
           return `Busy \u2014 /${busyCommandRef.current} is still running.`;
         }
         busyCommandRef.current = "compact";
+        const operationId = ++operationIdRef.current;
+        operationKindRef.current = "command";
         const controller = new AbortController();
         busyAbortRef.current = controller;
         turnStartedAtRef.current = Date.now();
@@ -5377,20 +5623,19 @@ ${estimateCost(usageRef.current, modelNameRef.current, modelConfig)}`;
           if (result.compacted && result.messages) {
             const display = buildDisplayMessages(result.messages);
             nextIdRef.current = display.length;
-            applyMessages(display);
+            redrawMessages(display);
           }
           return result.message;
         } finally {
           tickerStopRef.current?.();
           tickerStopRef.current = null;
           setActivity(null);
-          busyCommandRef.current = null;
-          busyAbortRef.current = null;
-          const nextPrompt = queueRef.current.dequeue();
-          if (nextPrompt) {
-            setQueueItems(queueRef.current.list());
-            void runStreamRef.current?.(nextPrompt.text, nextPrompt.images);
+          if (operationIdRef.current === operationId) {
+            busyCommandRef.current = null;
+            busyAbortRef.current = null;
+            operationKindRef.current = null;
           }
+          drainQueue();
         }
       },
       exportSession: (arg) => exportSession({
@@ -5592,7 +5837,6 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
     pickReasoningEffort,
     resume,
     runStream,
-    applyMessages,
     redrawMessages,
     applySessionMode,
     setPendingRewind,
@@ -5600,13 +5844,17 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
     showPicker,
     handlePickerCancel,
     setPicker,
-    stopBackgroundWork
+    stopBackgroundWork,
+    drainQueue
   ]);
   const runShellBang = useCallback(
     async (raw) => {
       pushMessage("user", `!${raw.trim()}`);
       const controller = new AbortController();
+      const operationId = ++operationIdRef.current;
       abortRef.current = controller;
+      operationKindRef.current = "shell";
+      setShellRunning(true);
       try {
         const outcome = await executeShellBang(raw, cwd, controller.signal);
         if (!outcome.ok) {
@@ -5630,13 +5878,18 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         if (current instanceof AgentLoop) {
           await current.appendContextMessage(outcome.contextMessage);
         }
+      } catch (error) {
+        pushMessage("system", `Error: ${error instanceof Error ? error.message : String(error)}`);
       } finally {
-        if (abortRef.current === controller) {
+        if (operationIdRef.current === operationId) {
           abortRef.current = null;
+          operationKindRef.current = null;
         }
+        setShellRunning(false);
+        drainQueue();
       }
     },
-    [cwd, pushMessage]
+    [cwd, drainQueue, pushMessage]
   );
   const handleSubmit = useCallback(
     (text) => {
@@ -5675,7 +5928,28 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
             return;
           }
         }
-        void command.run(parsed.args, registry.ctx);
+        const lifecycleCommand = BUSY_BLOCKED_COMMANDS.has(parsed.name) && parsed.name !== "compact";
+        const operationId = ++operationIdRef.current;
+        if (lifecycleCommand) {
+          busyCommandRef.current = parsed.name;
+          operationKindRef.current = "command";
+        }
+        void (async () => {
+          try {
+            await command.run(parsed.args, registry.ctx);
+          } catch (error) {
+            pushMessage(
+              "system",
+              `Error: ${error instanceof Error ? error.message : String(error)}`
+            );
+          } finally {
+            if (lifecycleCommand && operationIdRef.current === operationId) {
+              busyCommandRef.current = null;
+              operationKindRef.current = null;
+              drainQueue();
+            }
+          }
+        })();
         return;
       }
       const budget = config.sessionBudgetUsd;
@@ -5690,7 +5964,8 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
       if (images.length > 0) clearPendingImages();
       if (abortRef.current || busyCommandRef.current) {
         const backend2 = backendRef.current;
-        if (abortRef.current && images.length === 0 && backend2 instanceof AgentLoop) {
+        if (abortRef.current && operationKindRef.current === "model" && images.length === 0 && backend2 instanceof AgentLoop) {
+          const requestedOperation = operationIdRef.current;
           void (async () => {
             const picked = await showPicker("Turn is running \u2014 how should this be sent?", [
               {
@@ -5704,6 +5979,15 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
                 description: "sent as a new prompt once the current turn finishes"
               }
             ]);
+            if (operationIdRef.current !== requestedOperation || !abortRef.current) {
+              if (!abortRef.current && !busyCommandRef.current) {
+                void runStream(text, images);
+              } else {
+                queueRef.current.enqueue({ text, images });
+                setQueueItems(queueRef.current.list());
+              }
+              return;
+            }
             if (picked === "steer") {
               backend2.injectUserMessage(text);
               pushMessage(
@@ -5736,7 +6020,8 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
       config,
       clearPendingImages,
       sessionCostUsd,
-      showPicker
+      showPicker,
+      drainQueue
     ]
   );
   const commandHints = useMemo(
@@ -5749,8 +6034,11 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
     [registry]
   );
   useEffect4(() => {
+    let cancelled = false;
     const refresh = () => {
-      setGitBranch(getGitSummaryCached(cwd)?.branch ?? null);
+      void getGitSummaryCachedAsync(cwd).then((summary) => {
+        if (!cancelled) setGitBranch(summary?.branch ?? null);
+      });
       const current = backendRef.current;
       if (current instanceof AgentLoop) {
         const window_ = contextWindowTokens(config, modelNameRef.current);
@@ -5766,14 +6054,16 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
       }
     };
     refresh();
-    if (!isStreaming) return;
-    const timer = setInterval(refresh, 2e3);
-    return () => clearInterval(timer);
+    const timer = isStreaming ? setInterval(refresh, 2e3) : null;
+    return () => {
+      cancelled = true;
+      if (timer) clearInterval(timer);
+    };
   }, [cwd, config, isStreaming, epoch, modelName]);
   const sessionCost = sessionCostUsd();
-  return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx11(MessageList, { messages }, `messages-${epoch}`),
-    (thinking || activity !== null) && /* @__PURE__ */ jsx11(
+  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx12(MessageList, { messages }, `messages-${epoch}`),
+    (thinking || activity !== null) && /* @__PURE__ */ jsx12(
       ThinkingIndicator,
       {
         reasoning: thinkingText,
@@ -5781,9 +6071,9 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         startedAt: turnStartedAtRef.current
       }
     ),
-    !thinking && activity === null && thoughtSummary !== null && /* @__PURE__ */ jsx11(Text14, { dimColor: true, children: thoughtSummary }),
-    streamingText !== null && (streamingText !== "" || turnChunksRef.current === 0) && /* @__PURE__ */ jsx11(StreamingMessage, { text: streamingText, continuation: turnChunksRef.current > 0 }),
-    pending && /* @__PURE__ */ jsx11(
+    !thinking && activity === null && thoughtSummary !== null && /* @__PURE__ */ jsx12(Text14, { dimColor: true, children: thoughtSummary }),
+    streamingText !== null && (streamingText !== "" || turnChunksRef.current === 0) && /* @__PURE__ */ jsx12(StreamingMessage, { text: streamingText, continuation: turnChunksRef.current > 0 }),
+    pending && /* @__PURE__ */ jsx12(
       PermissionPrompt,
       {
         request: pending.request,
@@ -5791,8 +6081,8 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         onDecision: handleDecision
       }
     ),
-    planApproval && /* @__PURE__ */ jsx11(ExitPlanPrompt, { onDecision: handlePlanDecision }),
-    pendingRewind && /* @__PURE__ */ jsx11(
+    planApproval && /* @__PURE__ */ jsx12(ExitPlanPrompt, { onDecision: handlePlanDecision }),
+    pendingRewind && /* @__PURE__ */ jsx12(
       RewindConfirmPrompt,
       {
         summary: pendingRewind.summary,
@@ -5802,7 +6092,7 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         onDecision: handleRewindDecision
       }
     ),
-    picker && /* @__PURE__ */ jsx11(
+    picker && /* @__PURE__ */ jsx12(
       SelectPrompt,
       {
         title: picker.title,
@@ -5812,7 +6102,7 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         onDelete: picker.onDelete
       }
     ),
-    pendingConnect && /* @__PURE__ */ jsx11(
+    pendingConnect && /* @__PURE__ */ jsx12(
       ConnectWizard,
       {
         existingProviderNames: config.providers.map((p) => p.name),
@@ -5824,25 +6114,25 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         onCancel: cancelConnect
       }
     ),
-    queueItems.slice(0, MAX_VISIBLE_QUEUED).map((item) => /* @__PURE__ */ jsxs14(Text14, { dimColor: true, children: [
+    queueItems.slice(0, MAX_VISIBLE_QUEUED).map((item) => /* @__PURE__ */ jsxs13(Text14, { dimColor: true, children: [
       "queued: ",
       item.text.length > 80 ? `${item.text.slice(0, 80)}\u2026` : item.text
     ] }, item.id)),
-    queueItems.length > MAX_VISIBLE_QUEUED && /* @__PURE__ */ jsxs14(Text14, { dimColor: true, children: [
+    queueItems.length > MAX_VISIBLE_QUEUED && /* @__PURE__ */ jsxs13(Text14, { dimColor: true, children: [
       "\u2026 ",
       queueItems.length - MAX_VISIBLE_QUEUED,
       " more queued"
     ] }),
-    pendingImages.map((staged) => /* @__PURE__ */ jsxs14(Text14, { dimColor: true, children: [
+    pendingImages.map((staged) => /* @__PURE__ */ jsxs13(Text14, { dimColor: true, children: [
       "[image attached: ",
       staged.image.path,
       "]"
     ] }, staged.id)),
-    /* @__PURE__ */ jsx11(TodoPanel, { todos }),
-    /* @__PURE__ */ jsx11(
+    /* @__PURE__ */ jsx12(TodoPanel, { todos }),
+    /* @__PURE__ */ jsx12(
       InputBox,
       {
-        isStreaming,
+        isStreaming: isStreaming || shellRunning,
         disabled: pending !== null || planApproval || pendingRewind !== null || pendingConnect !== null || picker !== null,
         commands: commandHints,
         cwd,
@@ -5854,7 +6144,7 @@ ${plan.affected.length} file change(s) will be reverted, ${messageCount} message
         onPasteImage: handlePasteImage
       }
     ),
-    /* @__PURE__ */ jsx11(
+    /* @__PURE__ */ jsx12(
       StatusBar,
       {
         cwd,
@@ -5877,7 +6167,7 @@ function renderRepl(backend, opts) {
     defaultTaskManager.cleanup();
   });
   return render(
-    /* @__PURE__ */ jsx11(
+    /* @__PURE__ */ jsx12(
       Repl,
       {
         backend,
@@ -5899,4 +6189,4 @@ export {
   Repl,
   renderRepl
 };
-//# sourceMappingURL=repl-SSCURTAH.js.map
+//# sourceMappingURL=repl-N2H7JDSH.js.map