@kernelonpanic/kitcode 1.2.5 → 1.2.8

package/dist/index.js

@@ -62,7 +62,7 @@ var themeSchema = z.object({
 var langSchema = z.enum(["en", "ru"]);
 var budgetSchema = z.object({
   maxTokensPerTurn: z.number().int().min(0).max(1e7).default(1e7),
-  maxCostUsdPerTurn: z.number().positive().max(1e3).default(5),
+  maxCostUsdPerTurn: z.number().nonnegative().max(1e3).default(0),
   maxSubagentsPerTurn: z.number().int().min(0).max(16).default(3)
 });
 var diagnosticsSchema = z.object({
@@ -79,7 +79,7 @@ var configSchema = z.object({
   maxTokens: z.number().int().positive().max(2e5).default(64e3),
   budget: budgetSchema.default({
     maxTokensPerTurn: 1e7,
-    maxCostUsdPerTurn: 5,
+    maxCostUsdPerTurn: 0,
     maxSubagentsPerTurn: 3
   }),
   diagnostics: diagnosticsSchema.default({ autoRun: true, commands: [] }),
@@ -999,6 +999,14 @@ function sanitizeTerminalText(value) {
   }
   return output;
 }
+function sanitizeThinkingText(text, streaming = false) {
+  const clean = sanitizeTerminalText(text).replace(/<\/?think(?:ing)?>/gi, "");
+  if (!streaming) return clean;
+  const start = clean.lastIndexOf("<");
+  if (start === -1) return clean;
+  const suffix = clean.slice(start).toLowerCase();
+  return ["<think>", "</think>", "<thinking>", "</thinking>"].some((tag) => tag.startsWith(suffix)) ? clean.slice(0, start) : clean;
+}
 function skipCsi(text, from) {
   for (let index = from; index < text.length; index += 1) {
     const code = text.charCodeAt(index);
@@ -1551,7 +1559,12 @@ async function* streamWithRetry(provider, request, modelRef, signal) {
       if (attempt >= MAX_RETRIES2) break;
       const waitMs = retryBackoffMs(error, attempt);
       if (waitMs > 0) {
-        await sleep(waitMs, signal);
+        try {
+          await sleep(waitMs, signal);
+        } catch (error2) {
+          if (signal.aborted) return;
+          throw error2;
+        }
         continue;
       }
       break;
@@ -1762,7 +1775,7 @@ function createTurnBudget(limits, resolvePricing = pricingFor) {
           reason: `Turn stopped at the token budget (${limits.maxTokensPerTurn.toLocaleString()} tokens). This is a safety limit to prevent runaway costs. To disable it, run: /budget 0`
         };
       }
-      if (current.costUsd !== null && current.costUsd >= limits.maxCostUsdPerTurn) {
+      if (limits.maxCostUsdPerTurn > 0 && current.costUsd !== null && current.costUsd >= limits.maxCostUsdPerTurn) {
         return {
           allowed: false,
           reason: `Turn stopped at the cost budget ($${limits.maxCostUsdPerTurn.toFixed(2)}). Send another message to continue.`
@@ -1781,7 +1794,7 @@ function createTurnBudget(limits, resolvePricing = pricingFor) {
         };
       }
       const pricing = resolvePricing(request.modelRef);
-      if (current.costUsd !== null) {
+      if (limits.maxCostUsdPerTurn > 0 && current.costUsd !== null) {
         const remainingUsd = limits.maxCostUsdPerTurn - current.costUsd;
         const effectivePricing = pricing ?? UNKNOWN_MODEL_PRICING;
         const inputUsd = estimatedInput * effectivePricing.input / 1e6;
@@ -2467,7 +2480,7 @@ async function isFile2(file) {
 
 // src/core/attachments.ts
 import { execFile } from "child_process";
-import { lstat as lstat2, readFile as readFile6, stat as stat5 } from "fs/promises";
+import { lstat as lstat2, readdir as readdir3, readFile as readFile6, stat as stat5 } from "fs/promises";
 import os2 from "os";
 import path7 from "path";
 import { fileURLToPath } from "url";
@@ -2506,15 +2519,17 @@ async function loadAttachment(cwd, requestedPath) {
     if (error.code === "ENOENT") throw new Error(`Attachment not found: ${resolved}`);
     throw error;
   });
+  if (info.isDirectory()) {
+    const attachment = await loadFirstImageFromDirectory(resolved);
+    if (attachment) return attachment;
+    throw new Error(`No supported images found in directory: ${path7.basename(resolved)}`);
+  }
   if (!info.isFile()) throw new Error(`Attachment is not a regular file: ${resolved}`);
   return loadResolvedAttachment(resolved, info.size);
 }
 async function loadAutomaticAttachment(cwd, requestedPath) {
   if (!looksLikeAttachmentPath(requestedPath)) return null;
-  const requested = resolveAttachmentPath(cwd, requestedPath);
-  const safe = resolveInside(cwd, requested);
-  if (!safe.ok || safe.relative === "") return null;
-  const resolved = safe.path;
+  const resolved = resolveAttachmentPath(cwd, requestedPath);
   if (isSensitiveAutomaticPath(resolved)) {
     throw new Error(
       `For safety, sensitive-looking files must be attached explicitly with /attach: ${path7.basename(resolved)}`
@@ -2526,17 +2541,23 @@ async function loadAutomaticAttachment(cwd, requestedPath) {
     if (error.code === "ENOENT" || error.code === "ENOTDIR") return null;
     throw error;
   });
+  if (info?.isDirectory()) return loadFirstImageFromDirectory(resolved);
   if (!info?.isFile()) return null;
   return loadResolvedAttachment(resolved, info.size);
 }
+var MAX_PATH_CHARS = 2048;
 function looksLikeAttachmentPath(value) {
   const trimmed = value.trim();
   if (!trimmed || /[\r\n\0]/.test(trimmed)) return false;
+  if (trimmed.length > MAX_PATH_CHARS) return false;
   const candidate = normalizeInputPath(trimmed);
   if (/^file:\/\//i.test(candidate)) return true;
   if (path7.isAbsolute(candidate)) return true;
   if (/^(?:~|\.{1,2})[\\/]/.test(candidate)) return true;
-  if (candidate.includes("/") || candidate.includes("\\")) return true;
+  if (candidate.includes("/") || candidate.includes("\\")) {
+    if (trimmed.length > 200) return false;
+    return true;
+  }
   const basename3 = path7.basename(candidate).toLowerCase();
   return path7.extname(basename3) !== "" || AUTO_PATH_NAMES.has(basename3);
 }
@@ -2600,6 +2621,18 @@ async function loadResolvedAttachment(resolved, size) {
     block: { type: "file", mediaType: textMime(resolved), text, name }
   };
 }
+async function loadFirstImageFromDirectory(dirPath) {
+  const IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp"]);
+  const entries = await readdir3(dirPath, { withFileTypes: true }).catch(() => null);
+  if (!entries) return null;
+  const sorted = entries.filter((entry) => entry.isFile() && IMAGE_EXTENSIONS.has(path7.extname(entry.name).toLowerCase())).sort((a, b) => a.name.localeCompare(b.name));
+  if (sorted.length === 0) return null;
+  const first2 = sorted[0];
+  const filePath = path7.join(dirPath, first2.name);
+  const info = await stat5(filePath).catch(() => null);
+  if (!info?.isFile()) return null;
+  return loadResolvedAttachment(filePath, info.size);
+}
 function resolveAttachmentPath(cwd, requestedPath) {
   const cleaned = normalizeInputPath(requestedPath.trim());
   if (!cleaned) throw new Error("Give a file path: /attach <path>");
@@ -3238,11 +3271,25 @@ function createSubagentRunner(makeConfig, tools) {
   return {
     async run(request) {
       if (request.signal.aborted) return SUBAGENT_CANCELLED;
+      let steps = 0;
       const base = makeConfig(SUBAGENT_SYSTEM, tools);
       const cfg = {
         ...base,
+        provider: {
+          id: base.provider.id,
+          kind: base.provider.kind,
+          listModels: () => base.provider.listModels(),
+          knownModels: () => base.provider.knownModels(),
+          stream: (chat) => base.provider.stream(steps === MAX_SUBAGENT_STEPS ? {
+            ...chat,
+            tools: [],
+            system: `${chat.system}
+
+This is your last model call. Do not call tools. Return your findings now, clearly stating any unfinished work.`
+          } : chat)
+        },
         tools: {
-          get: (name) => name === TASK_TOOL_NAME ? void 0 : base.tools.get(name),
+          get: (name) => name === TASK_TOOL_NAME || steps >= MAX_SUBAGENT_STEPS ? void 0 : base.tools.get(name),
           schemas: () => base.tools.schemas().filter((schema) => schema.name !== TASK_TOOL_NAME)
         },
         system: `${SUBAGENT_SYSTEM}
@@ -3251,7 +3298,6 @@ Working directory: ${base.cwd}`
       };
       const limit = new AbortController();
       const signal = AbortSignal.any([request.signal, limit.signal]);
-      let steps = 0;
       const hooks = {
         onEvent(event) {
           if (event.type === "turn_start" && ++steps > MAX_SUBAGENT_STEPS) limit.abort();
@@ -3275,6 +3321,7 @@ Working directory: ${base.cwd}`
       ];
       const text = finalText(await runTurn(cfg, history, hooks, signal));
       if (!limit.signal.aborted) return text;
+      if (request.signal.aborted && text === SUBAGENT_NO_ANSWER) return SUBAGENT_CANCELLED;
       return text === SUBAGENT_NO_ANSWER ? STEP_LIMIT_NOTE : `${text}
 
 ${STEP_LIMIT_NOTE}`;
@@ -3452,7 +3499,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.2.5",
+  version: "1.2.8",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -3520,7 +3567,7 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "e9d5bdd60b06f2ee8d2d28f0d53b13d68298ae6b" : "development";
+var KITCODE_COMMIT = true ? "422e80dd7cd81a1c20f186b1e3ab36d6e0779b89" : "development";
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -3908,7 +3955,7 @@ async function limitedResponseText(response, limit) {
 import { chmod as chmod4, readFile as readFile7, writeFile as writeFile5 } from "fs/promises";
 import path8 from "path";
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
-var CACHE_VERSION = 2;
+var CACHE_VERSION = 3;
 async function loadModels(provider, refresh = false) {
   const file = cacheFile(provider.id);
   const cached = await readCache(file);
@@ -4135,13 +4182,15 @@ async function* streamTurn(client, providerId, apiKey2, req) {
     final = await stream.finalMessage();
   } catch (error) {
     if (isUserAbort(error, req.signal)) {
-      const partial = stream.currentMessage;
-      if (partial) yield { type: "usage", usage: toUsage(partial.usage) };
+      const partial2 = stream.currentMessage;
+      if (partial2) yield { type: "usage", usage: toUsage(partial2.usage) };
       const limits3 = parseRateLimits(capture.headers());
       if (limits3) yield { type: "rate_limits", limits: limits3 };
       yield { type: "done", stopReason: "aborted", content: partialContent(thinking, text) };
       return;
     }
+    const partial = stream.currentMessage;
+    if (partial) yield { type: "usage", usage: toUsage(partial.usage) };
     const limits2 = parseRateLimits(capture.headers());
     if (limits2) yield { type: "rate_limits", limits: limits2 };
     if (events === 0 && capture.succeeded() && !isConnectionFailure(error)) {
@@ -4175,7 +4224,7 @@ async function listModels(client, providerId, apiKey2) {
         name: model.display_name,
         contextWindow: model.max_input_tokens ?? void 0,
         maxOutput: model.max_tokens ?? void 0,
-        pricing: pricingFor(model.id)
+        pricing: modelInfoFromRaw(model)?.pricing ?? pricingFor(model.id)
       });
     }
     return models;
@@ -4335,6 +4384,7 @@ async function* streamTurn2(client, providerId, apiKey2, req) {
     }
   } catch (error) {
     if (!isUserAbort(error, req.signal)) {
+      if (sawUsage) yield { type: "usage", usage };
       const limits2 = parseRateLimits(capture.headers());
       if (limits2) yield { type: "rate_limits", limits: limits2 };
       throw toProviderError(error, providerId, [apiKey2]);
@@ -4350,13 +4400,13 @@ async function* streamTurn2(client, providerId, apiKey2, req) {
     return;
   }
   if (recognised === 0) throw await invalidStreamError(providerId, capture, void 0, [apiKey2]);
+  if (sawUsage) yield { type: "usage", usage };
   const content = toContentBlocks2(providerId, thinking, text, calls);
   for (const block of content) {
     if (block.type === "tool_use") {
       yield { type: "tool_call", id: block.id, name: block.name, input: block.input };
     }
   }
-  if (sawUsage) yield { type: "usage", usage };
   const limits = parseRateLimits(capture.headers());
   if (limits) yield { type: "rate_limits", limits };
   yield { type: "done", stopReason: resolveStop(finishReason, calls.size > 0), content };
@@ -5313,7 +5363,7 @@ function createToolRegistry(tools) {
 }
 
 // src/prompts/library.ts
-import { chmod as chmod6, readFile as readFile12, readdir as readdir3, unlink as unlink3, writeFile as writeFile6 } from "fs/promises";
+import { chmod as chmod6, readFile as readFile12, readdir as readdir4, unlink as unlink3, writeFile as writeFile6 } from "fs/promises";
 import path10 from "path";
 async function savePrompt(input) {
   const slug = slugify(input.name);
@@ -5346,7 +5396,7 @@ async function getPrompt(slug) {
 async function listPrompts() {
   let names;
   try {
-    names = await readdir3(promptsDir);
+    names = await readdir4(promptsDir);
   } catch (error) {
     if (!isMissing(error)) throw error;
     return [];
@@ -5418,7 +5468,7 @@ function parse(slug, text) {
 }
 
 // src/skills/library.ts
-import { lstat as lstat4, open as open2, readdir as readdir4 } from "fs/promises";
+import { lstat as lstat4, open as open2, readdir as readdir5 } from "fs/promises";
 import path11 from "path";
 var SKILL_FILE = "SKILL.md";
 var FRONTMATTER_BYTES = 8192;
@@ -5430,7 +5480,7 @@ async function discoverSkills(dirs) {
   for (const root of dirs) {
     const rootInfo = await lstat4(root).catch(() => null);
     if (!rootInfo?.isDirectory() || rootInfo.isSymbolicLink()) continue;
-    const entries = await readdir4(root, { withFileTypes: true }).catch(() => []);
+    const entries = await readdir5(root, { withFileTypes: true }).catch(() => []);
     const found = await Promise.all(
       entries.filter((entry) => entry.isDirectory() && !entry.isSymbolicLink()).slice(0, MAX_SKILLS_PER_ROOT).map((entry) => readMeta(root, rootInfo, path11.join(root, entry.name)))
     );
@@ -6485,6 +6535,7 @@ async function boot(options) {
     async setMaxTokensPerTurn(tokens3) {
       await persistConfig((draft) => {
         draft.budget.maxTokensPerTurn = tokens3;
+        draft.budget.maxCostUsdPerTurn = 0;
       });
     },
     getLang: () => config.lang,
@@ -7016,9 +7067,49 @@ function validateKey(value) {
 // src/app/tui.tsx
 import { render } from "ink";
 
+// src/ui/terminal-size.ts
+import { useStdout } from "ink";
+import { useMemo, useSyncExternalStore } from "react";
+var stores = /* @__PURE__ */ new WeakMap();
+function createStore(stdout) {
+  let size = { columns: stdout.columns || 80, rows: stdout.rows || 24 };
+  const listeners = /* @__PURE__ */ new Set();
+  const update = () => {
+    const columns = stdout.columns || 80;
+    const rows = stdout.rows || 24;
+    if (columns === size.columns && rows === size.rows) return;
+    size = { columns, rows };
+    for (const listener of listeners) listener();
+  };
+  return {
+    getSnapshot: () => size,
+    subscribe(listener) {
+      if (listeners.size === 0) stdout.on("resize", update);
+      listeners.add(listener);
+      update();
+      return () => {
+        listeners.delete(listener);
+        if (listeners.size === 0) stdout.off("resize", update);
+      };
+    }
+  };
+}
+function useTerminalSize() {
+  const { stdout } = useStdout();
+  const store = useMemo(() => {
+    let current = stores.get(stdout);
+    if (!current) {
+      current = createStore(stdout);
+      stores.set(stdout, current);
+    }
+    return current;
+  }, [stdout]);
+  return useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
+}
+
 // src/ui/App.tsx
-import { Box as Box13, Text as Text12, useApp, useInput as useInput2, useWindowSize as useWindowSize4 } from "ink";
-import { useCallback, useEffect as useEffect2, useMemo as useMemo4, useRef as useRef4, useState as useState5 } from "react";
+import { Box as Box13, Text as Text12, useApp, useInput as useInput2 } from "ink";
+import { useCallback, useEffect as useEffect2, useMemo as useMemo5, useRef as useRef4, useState as useState5 } from "react";
 
 // src/mcp/add.ts
 var SERVER_NAME = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/;
@@ -7645,7 +7736,7 @@ import { Box as Box3, Text as Text3 } from "ink";
 import { useState } from "react";
 
 // src/ui/components/Logo.tsx
-import { Box as Box2, Text as Text2, useWindowSize } from "ink";
+import { Box as Box2, Text as Text2 } from "ink";
 
 // src/ui/workspace.ts
 import { homedir } from "os";
@@ -7692,7 +7783,7 @@ var CAT = ["  \u2571\\_\u2571\\ ", " ( o.o )", "  > ^ <  "];
 function Logo({ subtitle, workspace }) {
   const theme = useTheme();
   const strings = useStrings();
-  const { columns } = useWindowSize();
+  const { columns } = useTerminalSize();
   const location = workspace ? formatWorkspacePath(workspace, Math.max(6, Math.min(72, columns - 15))) : "";
   return /* @__PURE__ */ jsxs2(Box2, { width: "100%", marginBottom: 1, children: [
     /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", flexShrink: 0, children: CAT.map((line) => /* @__PURE__ */ jsx2(Text2, { color: theme.accent, children: line }, line)) }),
@@ -7950,15 +8041,16 @@ function previewText(value, limit = MAX_PREVIEW_CHARS) {
 
 // src/ui/components/Picker.tsx
 import { Box as Box7, Text as Text7 } from "ink";
-import { useMemo, useState as useState3 } from "react";
+import { useMemo as useMemo2, useState as useState3 } from "react";
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var WINDOW = 10;
 function Picker({ title, items, onSelect, onCancel }) {
   const theme = useTheme();
+  const { columns } = useTerminalSize();
   const strings = useStrings();
   const [query, setQuery] = useState3("");
   const [cursor, setCursor] = useState3(0);
-  const matches = useMemo(() => {
+  const matches = useMemo2(() => {
     const needle = query.toLowerCase();
     if (needle === "") return items;
     return items.filter(
@@ -7985,7 +8077,7 @@ function Picker({ title, items, onSelect, onCancel }) {
   });
   const start = Math.max(0, Math.min(active2 - WINDOW + 2, matches.length - WINDOW));
   const visible = matches.slice(start, start + WINDOW);
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
+  return /* @__PURE__ */ jsxs7(Box7, { width: columns, maxWidth: "100%", flexShrink: 0, flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, children: [
     /* @__PURE__ */ jsxs7(Text7, { bold: true, color: theme.accent, children: [
       sanitizeTerminalText(title),
       query !== "" && /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
@@ -7995,7 +8087,7 @@ function Picker({ title, items, onSelect, onCancel }) {
     ] }),
     matches.length === 0 ? /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: strings.noMatches }) : visible.map((item, index) => {
       const selected = start + index === active2;
-      return /* @__PURE__ */ jsxs7(Text7, { color: selected ? theme.accent : void 0, inverse: selected, children: [
+      return /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", color: selected ? theme.accent : void 0, inverse: selected, children: [
         truncate2(sanitizeTerminalText(item.label), 70),
         item.hint && /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
           " ",
@@ -8051,6 +8143,7 @@ var PromptInput = memo(function PromptInput2({
   attachments = []
 }) {
   const theme = useTheme();
+  const { columns } = useTerminalSize();
   const strings = useStrings();
   const safeValue = sanitizeTerminalText(value);
   const [selectionCursor, setSelectionCursor] = useState4(0);
@@ -8186,7 +8279,7 @@ var PromptInput = memo(function PromptInput2({
   });
   const start = Math.max(0, Math.min(active2 - WINDOW2 + 2, suggestions.length - WINDOW2));
   const visible = suggestions.slice(start, start + WINDOW2);
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", marginTop: 1, flexShrink: 0, children: [
+  return /* @__PURE__ */ jsxs8(Box8, { width: columns, maxWidth: "100%", flexDirection: "column", marginTop: 1, flexShrink: 0, children: [
     /* @__PURE__ */ jsxs8(
       Box8,
       {
@@ -8197,7 +8290,7 @@ var PromptInput = memo(function PromptInput2({
         paddingX: 1,
         children: [
           /* @__PURE__ */ jsx8(Text8, { color: disabled ? "gray" : theme.accent, children: "\u203A " }),
-          /* @__PURE__ */ jsx8(EditableText, { value: safeValue, cursor: inputCursor, placeholder: strings.placeholder }),
+          /* @__PURE__ */ jsx8(Box8, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx8(EditableText, { value: safeValue, cursor: inputCursor, placeholder: strings.placeholder }) }),
           pending && pending > 0 ? /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
             " \xB7 ",
             strings.queued(pending)
@@ -8490,9 +8583,12 @@ function liveTranscriptRows(rows) {
   return Math.max(1, interactiveViewportRows(rows) - INTERACTIVE_CHROME_ROWS);
 }
 function TerminalViewport({ children, rows }) {
+  const { columns } = useTerminalSize();
   return /* @__PURE__ */ jsx10(
     Box10,
     {
+      width: columns,
+      maxWidth: "100%",
       flexDirection: "column",
       maxHeight: interactiveViewportRows(rows),
       overflowY: "hidden",
@@ -8502,18 +8598,18 @@ function TerminalViewport({ children, rows }) {
 }
 
 // src/ui/components/Transcript.tsx
-import { Box as Box12, Static, Text as Text11, useWindowSize as useWindowSize3 } from "ink";
-import { memo as memo2, useMemo as useMemo3, useRef as useRef3 } from "react";
+import { Box as Box12, Static, Text as Text11 } from "ink";
+import { memo as memo2, useMemo as useMemo4, useRef as useRef3 } from "react";
 import Spinner2 from "ink-spinner";
 import stringWidth2 from "string-width";
 
 // src/ui/markdown.tsx
-import { Box as Box11, Text as Text10, useWindowSize as useWindowSize2 } from "ink";
-import { Fragment as Fragment4, useMemo as useMemo2 } from "react";
+import { Box as Box11, Text as Text10 } from "ink";
+import { Fragment as Fragment4, useMemo as useMemo3 } from "react";
 import stringWidth from "string-width";
 import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 function Markdown({ children }) {
-  const blocks = useMemo2(() => extractBlocks(children), [children]);
+  const blocks = useMemo3(() => extractBlocks(children), [children]);
   return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: blocks.map((block, i) => /* @__PURE__ */ jsx11(BlockView, { block }, i)) });
 }
 function BlockView({ block }) {
@@ -8547,7 +8643,7 @@ function BlockView({ block }) {
     case "code":
       return /* @__PURE__ */ jsx11(CodeBlock, { code: block.text ?? "" });
     case "hr":
-      return /* @__PURE__ */ jsx11(Box11, { marginTop: 1, marginBottom: 1, children: /* @__PURE__ */ jsx11(Text10, { dimColor: true, wrap: "truncate-end", children: "\u2500".repeat(60) }) });
+      return /* @__PURE__ */ jsx11(Box11, { height: 1 });
   }
 }
 function CodeBlock({ code }) {
@@ -8555,7 +8651,7 @@ function CodeBlock({ code }) {
   return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", marginTop: 1, children: lines.map((line, i) => /* @__PURE__ */ jsx11(Text10, { color: "cyan", children: line }, i)) });
 }
 function TableView({ block }) {
-  const { columns } = useWindowSize2();
+  const { columns } = useTerminalSize();
   const headers = block.headers ?? [];
   const rows = block.rows ?? [];
   if (headers.length === 0 && rows.length === 0) {
@@ -9128,26 +9224,41 @@ var BubbleView = memo2(function BubbleView2({
     return /* @__PURE__ */ jsx12(AssistantView, { bubble, maxRows });
   }
   if (bubble.kind === "subagent") {
-    return /* @__PURE__ */ jsx12(SubagentView, { bubble });
+    return /* @__PURE__ */ jsx12(SubagentView, { bubble, maxRows });
   }
   return /* @__PURE__ */ jsx12(ToolView, { bubble });
 });
-function AssistantView({ bubble, maxRows }) {
-  const { columns } = useWindowSize3();
+function splitThinkingPrefix(text, streaming) {
+  const opening = /^\s*<think(?:ing)?>/i.exec(text);
+  if (!opening) {
+    const prefix = text.trimStart().toLowerCase();
+    return { thinking: "", text: streaming && prefix !== "" && ["<think>", "<thinking>"].some((tag) => tag.startsWith(prefix)) ? "" : text };
+  }
+  const rest = text.slice(opening[0].length);
+  const closing = /<\/think(?:ing)?>/i.exec(rest);
+  return closing ? { thinking: sanitizeThinkingText(rest.slice(0, closing.index)), text: rest.slice(closing.index + closing[0].length) } : { thinking: sanitizeThinkingText(rest, streaming), text: "" };
+}
+function AssistantView({ bubble: source, maxRows }) {
+  const tagged = splitThinkingPrefix(source.text, source.streaming);
+  const bubble = { ...source, text: tagged.text, thinking: [source.thinking, tagged.thinking].filter(Boolean).join("\n") };
+  const { columns } = useTerminalSize();
   const frozenThinking = useRef3(void 0);
   const answering = bubble.streaming && bubble.text !== "";
   if (!answering) frozenThinking.current = void 0;
   if (answering && frozenThinking.current === void 0) {
     frozenThinking.current = bubble.thinking;
   }
-  const visibleThinking = assistantThinkingForFrame(bubble, frozenThinking.current);
+  const visibleThinking = sanitizeThinkingText(
+    assistantThinkingForFrame(bubble, frozenThinking.current),
+    bubble.streaming
+  );
   const liveBudget = bubble.streaming && maxRows !== void 0 ? Math.max(1, maxRows - 1) : void 0;
   const thinkingBudget = liveBudget === void 0 ? void 0 : bubble.text !== "" ? Math.min(3, Math.max(0, liveBudget - 1)) : Math.max(0, liveBudget - 1);
   const frameThinking = thinkingBudget === void 0 ? visibleThinking.trim() : clipTextToRows(visibleThinking.trim(), thinkingBudget, columns);
   const usedThinkingRows = frameThinking === "" ? 0 : frameThinking.split("\n").length;
   const frameText = liveBudget === void 0 ? bubble.text : clipTextToRows(bubble.text, Math.max(1, liveBudget - usedThinkingRows), columns);
   return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
-    frameThinking !== "" && /* @__PURE__ */ jsx12(Text11, { dimColor: true, italic: true, children: frameThinking }),
+    frameThinking !== "" && /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", maxHeight: thinkingBudget, overflowY: "hidden", children: /* @__PURE__ */ jsx12(Markdown, { children: frameThinking }) }),
     bubble.streaming ? /* @__PURE__ */ jsx12(Text11, { children: frameText }) : /* @__PURE__ */ jsx12(Markdown, { children: bubble.text }),
     bubble.streaming && bubble.text === "" && /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
       /* @__PURE__ */ jsx12(Spinner2, { type: "dots" }),
@@ -9186,7 +9297,7 @@ function ToolView({ bubble }) {
   const mark = bubble.state === "running" ? "\u25CC" : bubble.state === "ok" ? "\u25CF" : "\u2717";
   const color = bubble.state === "error" ? theme.error : bubble.state === "ok" ? theme.ok : theme.warn;
   const display = bubble.display;
-  const diff = useMemo3(
+  const diff = useMemo4(
     () => display?.kind === "diff" ? diffLines(display.before, display.after) : null,
     [display]
   );
@@ -9224,20 +9335,20 @@ function previewLines(content) {
   if (lines.length <= 6) return lines;
   return [...lines.slice(0, 6), `\u2026 ${lines.length - 6} more lines`];
 }
-function SubagentView({ bubble }) {
+function SubagentView({ bubble, maxRows }) {
   const theme = useTheme();
+  const { columns } = useTerminalSize();
   const mark = bubble.state === "running" ? "\u25CC" : "\u25CF";
   const color = bubble.state === "running" ? theme.warn : theme.ok;
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsxs11(Text11, { color, bold: true, children: [
+  const latest = bubble.bubbles.at(-1);
+  const progress = latest?.kind === "assistant" ? sanitizeThinkingText(latest.text || latest.thinking, latest.streaming) : latest?.kind === "tool" ? latest.summary : "";
+  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, minWidth: 0, children: [
+    /* @__PURE__ */ jsxs11(Text11, { color, bold: true, wrap: "truncate-end", children: [
       mark,
       " subagent: ",
       bubble.description
     ] }),
-    /* @__PURE__ */ jsxs11(Box12, { marginLeft: 2, flexDirection: "column", children: [
-      bubble.bubbles.map((inner, index) => /* @__PURE__ */ jsx12(BubbleView, { bubble: inner }, index)),
-      bubble.state === "done" && bubble.result && /* @__PURE__ */ jsx12(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "\u2500\u2500 result \u2500\u2500" }) })
-    ] })
+    /* @__PURE__ */ jsx12(Box12, { marginLeft: 2, flexDirection: "column", minWidth: 0, children: bubble.state === "running" ? /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", maxHeight: Math.max(1, (maxRows ?? 6) - 2), overflowY: "hidden", children: /* @__PURE__ */ jsx12(Markdown, { children: clipTextToRows(progress, Math.max(1, (maxRows ?? 6) - 2), Math.max(1, columns - 2)) }) }) : bubble.result ? /* @__PURE__ */ jsx12(Markdown, { children: sanitizeThinkingText(bubble.result) }) : null })
   ] });
 }
 
@@ -9488,7 +9599,7 @@ function App({
   warnings = []
 }) {
   const { exit } = useApp();
-  const { rows } = useWindowSize4();
+  const { rows } = useTerminalSize();
   const [transcript, setTranscript] = useState5(
     () => warnings.reduce((state, text) => pushNotice(state, "warn", text), fromHistory(initialHistory))
   );
@@ -9506,6 +9617,7 @@ function App({
   const drainQueueRef = useRef4(() => void 0);
   const [attachments, setAttachments] = useState5([]);
   const attachmentsRef = useRef4([]);
+  const attachmentGeneration = useRef4(0);
   const automaticAttachmentTask = useRef4(null);
   const clipboardPasteTask = useRef4(null);
   const [overlay, setOverlay] = useState5({ kind: "none" });
@@ -9570,8 +9682,8 @@ function App({
     const timer = setInterval(() => tick((n) => n + 1), 1e3);
     return () => clearInterval(timer);
   }, [turnStart]);
-  const theme = useMemo4(() => makeTheme(accent), [accent]);
-  const strings = useMemo4(() => stringsFor(lang), [lang]);
+  const theme = useMemo5(() => makeTheme(accent), [accent]);
+  const strings = useMemo5(() => stringsFor(lang), [lang]);
   const notice = useCallback(
     (level, text) => {
       flushTranscriptEvents();
@@ -10192,6 +10304,9 @@ ${strings.mcpAddUsage}`
         }
         case "attach": {
           if (rawRest.toLowerCase() === "clear") {
+            attachmentGeneration.current += 1;
+            automaticAttachmentTask.current = null;
+            clipboardPasteTask.current = null;
             replaceAttachments([]);
             notice("info", strings.attachmentsCleared);
             return;
@@ -10203,15 +10318,18 @@ ${strings.mcpAddUsage}`
             }
             if (clipboardPasteTask.current) return;
             const task = runtime.loadClipboardImage().then((block) => {
+              if (clipboardPasteTask.current !== task) return;
               if (appendAttachment(block)) {
                 notice(
                   "info",
                   strings.attachmentAdded(attachmentLabel(block) ?? "clipboard image")
                 );
               }
-            }).catch(
-              (error) => notice("error", error instanceof Error ? error.message : String(error))
-            );
+            }).catch((error) => {
+              if (clipboardPasteTask.current === task) {
+                notice("error", error instanceof Error ? error.message : String(error));
+              }
+            });
             clipboardPasteTask.current = task;
             try {
               await task;
@@ -10520,6 +10638,7 @@ Rename the file if you want a different name.`);
         return Promise.resolve(true);
       }
       const task = runtime.loadAutomaticAttachment(requestedPath).then((block) => {
+        if (automaticAttachmentTask.current !== task) return true;
         if (!block) return false;
         if (!appendAttachment(block)) {
           notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
@@ -10527,9 +10646,9 @@ Rename the file if you want a different name.`);
         }
         notice("info", strings.attachmentAdded(attachmentLabel(block) ?? "attachment"));
         return true;
-      }).catch((error) => {
-        notice("error", error instanceof Error ? error.message : String(error));
-        return true;
+      }).catch(() => {
+        if (automaticAttachmentTask.current !== task) return true;
+        return false;
       });
       automaticAttachmentTask.current = task;
       void task.finally(() => {
@@ -10546,12 +10665,17 @@ Rename the file if you want a different name.`);
       return;
     }
     const task = runtime.loadClipboardImage().then((block) => {
+      if (clipboardPasteTask.current !== task) return;
       if (!appendAttachment(block)) {
         notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
         return;
       }
       notice("info", strings.attachmentAdded(attachmentLabel(block) ?? "clipboard image"));
-    }).catch((error) => notice("error", error instanceof Error ? error.message : String(error)));
+    }).catch((error) => {
+      if (clipboardPasteTask.current === task) {
+        notice("error", error instanceof Error ? error.message : String(error));
+      }
+    });
     clipboardPasteTask.current = task;
     void task.finally(() => {
       if (clipboardPasteTask.current === task) clipboardPasteTask.current = null;
@@ -10559,6 +10683,7 @@ Rename the file if you want a different name.`);
   }, [appendAttachment, notice, runtime, strings]);
   const submit = useCallback(
     async (raw) => {
+      const generation = attachmentGeneration.current;
       const pendingAttachments = [automaticAttachmentTask.current, clipboardPasteTask.current].filter(
         (task) => task !== null
       );
@@ -10566,6 +10691,7 @@ Rename the file if you want a different name.`);
       if (detachedInput) {
         setInput("");
         await Promise.all(pendingAttachments);
+        if (generation !== attachmentGeneration.current) return;
       }
       const text = raw.trim();
       const submitSlash = () => {
@@ -10581,9 +10707,13 @@ Rename the file if you want a different name.`);
         submitSlash();
         return;
       }
-      if (text && looksLikeAttachmentPath(text) && await tryQueueAutomaticAttachment(text)) {
-        if (!detachedInput) setInput("");
-        return;
+      if (text && looksLikeAttachmentPath(text)) {
+        const attached = await tryQueueAutomaticAttachment(text);
+        if (generation !== attachmentGeneration.current) return;
+        if (attached) {
+          if (!detachedInput) setInput("");
+          return;
+        }
       }
       if (text.startsWith("/")) {
         submitSlash();
@@ -10618,15 +10748,19 @@ Rename the file if you want a different name.`);
       return;
     }
     if (!key.escape) return;
-    if (input !== "") {
-      setInput("");
+    if (busyRef.current && abort.current) {
+      if (!abort.current.signal.aborted) {
+        abort.current.abort();
+        notice("warn", strings.cancelled);
+      }
       return;
     }
-    if (busy && abort.current) {
-      abort.current.abort();
-      queueRef.current = [];
-      setPendingCount(0);
-      notice("warn", strings.cancelled);
+    if (input !== "" || attachmentsRef.current.length > 0 || automaticAttachmentTask.current || clipboardPasteTask.current) {
+      attachmentGeneration.current += 1;
+      setInput("");
+      replaceAttachments([]);
+      if (automaticAttachmentTask.current) automaticAttachmentTask.current = null;
+      if (clipboardPasteTask.current) clipboardPasteTask.current = null;
       return;
     }
     if (overlay.kind === "permission") {