@kernelonpanic/kitcode 1.3.3 → 1.4.1

package/dist/index.js

@@ -75,6 +75,11 @@ var configSchema = z.object({
   theme: themeSchema.default({ accent: "#a78bfa" }),
   effort: effortSchema.default("xhigh"),
   thinking: z.boolean().default(true),
+  // Terminal bell when a long answer finishes or a permission prompt appears.
+  bell: z.boolean().default(true),
+  // Manual override for the model's context window. Unset means the window
+  // comes from the provider catalogue or the endpoint's model list.
+  contextWindow: z.number().int().min(1e3).max(1e7).optional(),
   maxTokens: z.number().int().positive().max(2e5).default(64e3),
   budget: budgetSchema.default({
     maxTokensPerTurn: 1e7,
@@ -1396,15 +1401,39 @@ async function clearProjectMemory(workspace) {
 }
 
 // src/providers/effort.ts
+var HARD_TASK = new RegExp("(?<!\\p{L})(?:bug|fix|debug|test|refactor|implement|\u0431\u0430\u0433|\u0444\u0438\u043A\u0441|\u0438\u0441\u043F\u0440\u0430\u0432|\u0442\u0435\u0441\u0442|\u0440\u0435\u0444\u0430\u043A\u0442\u043E\u0440|\u0440\u0435\u0430\u043B\u0438\u0437)", "iu");
 function resolveEffort(effort, messages) {
   if (effort !== "auto") return effort;
   const latest = messages.findLast((message) => message.role === "user" && message.content.some((block) => block.type === "text"));
   const text = latest?.content.filter((block) => block.type === "text").map((block) => block.text).join("\n") ?? "";
-  return text.length > 500 || /bug|fix|debug|test|refactor|implement|баг|фикс|исправ|тест|рефактор|реализ/i.test(text) ? "high" : "medium";
+  return text.length > 500 || HARD_TASK.test(text) ? "high" : "medium";
+}
+var rejected = /* @__PURE__ */ new Set();
+function markEffortRejected(providerId, model) {
+  rejected.add(`${providerId}/${model}`);
+}
+function effectiveEffort(kind, model, effort, messages, providerId) {
+  if (providerId !== void 0 && rejected.has(`${providerId}/${model}`)) return void 0;
+  const requested = resolveEffort(effort, messages);
+  return kind === "openai" ? openAiEffort(model, requested) : anthropicEffort(model, requested);
+}
+function anthropicEffort(model, effort) {
+  if (!effort) return void 0;
+  const id = (model.split("/").at(-1) ?? model).replace(/^(?:[a-z]{2}\.)?anthropic\./, "");
+  if (!id.startsWith("claude-")) return void 0;
+  if (/^claude-(?:3|[a-z]+-3|haiku-4|sonnet-4(?:-[0-5])?(?:-\d{8}|@|$)|opus-4(?:-[01])?(?:-\d{8}|@|$))/.test(id)) return void 0;
+  if (/^claude-opus-4-5(?:-|@|$)/.test(id)) return effort === "xhigh" || effort === "max" ? "high" : effort;
+  if (/^claude-(?:opus|sonnet)-4-6(?:-|@|$)/.test(id)) return effort === "xhigh" ? "high" : effort;
+  return effort;
 }
 function openAiEffort(model, effort) {
-  const id = model.split("/").at(-1) ?? model;
-  if (!/^(?:o[134](?:-|$)|gpt-5(?:[.-]|$))/.test(id)) return void 0;
+  const id = (model.split("/").at(-1) ?? model).toLowerCase();
+  if (/^(?:gpt-oss|gemini-(?:2\.5|[3-9])|grok-3-mini)/.test(id)) {
+    return effort === "max" || effort === "xhigh" ? "high" : effort;
+  }
+  if (!/^(?:o[134](?:-|$)|gpt-5(?:[.-]|$))/.test(id)) {
+    return effort === "max" || effort === "xhigh" ? "high" : effort;
+  }
   if (/^(?:o[134](?:-|$)|gpt-5(?:-(?:mini|nano|\d{4})|$)|gpt-5\.1(?:-|$))/.test(id)) {
     return effort === "max" || effort === "xhigh" ? "high" : effort;
   }
@@ -1487,9 +1516,10 @@ async function loadSession(id) {
 async function listSessions(limit = 20) {
   const files = await filesByRecency();
   const summaries = [];
-  for (const file of files.slice(0, limit)) {
+  for (const file of files) {
+    if (summaries.length >= limit) break;
     const state = readState(await readFile4(file, "utf8").catch(() => ""));
-    if (state) {
+    if (state && state.messages.length > 0) {
       summaries.push({
         id: state.id,
         title: state.title,
@@ -1846,6 +1876,17 @@ async function runTurn(cfg, history, hooks, signal) {
       hooks.onEvent({ type: "turn_end", stopReason: "max_tokens" });
       return messages;
     }
+    if (steps > 1) {
+      const trimmed = cfg.trimContext?.(messages);
+      if (trimmed) {
+        messages = trimmed;
+        hooks.onEvent({
+          type: "notice",
+          level: "info",
+          text: "Context is nearly full: cleared older tool output to keep going."
+        });
+      }
+    }
     const request = async () => {
       if (signal.aborted) return { content: [], stopReason: "aborted" };
       const budgetDecision = cfg.budget?.beforeRequest({
@@ -1920,13 +1961,19 @@ async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
   let outcome;
   let text = "";
   let thinking = "";
+  let outputTokens = 0;
+  const startedAt = Date.now();
+  let firstTokenAt;
   for await (const event of streamWithRetry(cfg.provider, request, cfg.modelRef, signal)) {
     switch (event.type) {
       case "text_delta":
+        firstTokenAt ??= Date.now();
         text += event.text;
         hooks.onEvent({ type: "text_delta", text: event.text });
         break;
       case "thinking_delta":
+        firstTokenAt ??= Date.now();
+        if (!cfg.thinking) break;
         thinking += event.text;
         hooks.onEvent({ type: "thinking_delta", text: event.text });
         break;
@@ -1934,6 +1981,7 @@ async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
         cfg.budget?.record(cfg.modelRef, event.usage);
         cfg.usage.record(cfg.modelRef, event.usage);
         hooks.onEvent({ type: "usage", model: cfg.modelRef, usage: event.usage });
+        outputTokens = event.usage.output;
         break;
       case "rate_limits":
         hooks.onEvent({ type: "rate_limits", model: cfg.modelRef, limits: event.limits });
@@ -1945,7 +1993,13 @@ async function consumeStream(cfg, messages, hooks, signal, maxTokens) {
         break;
     }
   }
-  if (outcome) return outcome;
+  if (outcome) {
+    const ms = Date.now() - (firstTokenAt ?? startedAt);
+    if (outcome.stopReason !== "aborted" && outputTokens > 0 && ms > 0) {
+      hooks.onEvent({ type: "speed", model: cfg.modelRef, outputTokens, ms });
+    }
+    return outcome;
+  }
   if (signal.aborted) {
     const content = [];
     if (thinking) content.push({ type: "thinking", text: thinking });
@@ -2066,23 +2120,21 @@ async function runToolCalls(cfg, content, hooks, signal) {
     const operation = () => runOneCall(cfg, call, hooks, signal);
     return call.name !== "task" && cfg.executionLane ? cfg.executionLane.run(operation) : operation();
   };
-  for (let index = 0; index < calls.length; ) {
-    const call = calls[index];
-    if (call.name !== "task") {
-      results.push(await run(call));
-      index += 1;
-      continue;
-    }
-    const batch = [];
-    while (calls[index]?.name === "task") {
-      batch.push(run(calls[index]));
-      index += 1;
-    }
-    const settled = await Promise.allSettled(batch);
-    for (const result of settled) {
-      if (result.status === "rejected") throw result.reason;
-      results.push(result.value);
-    }
+  const tasks = calls.filter((call) => call.name === "task").map(run);
+  const others = (async () => {
+    const out = [];
+    for (const call of calls) if (call.name !== "task") out.push(await run(call));
+    return out;
+  })();
+  const [settledOthers] = await Promise.allSettled([others]);
+  const settledTasks = await Promise.allSettled(tasks);
+  for (const result of [settledOthers, ...settledTasks]) {
+    if (result.status === "rejected") throw result.reason;
+  }
+  const otherResults = settledOthers.status === "fulfilled" ? settledOthers.value : [];
+  const taskResults = settledTasks.map((result) => result.value);
+  for (const call of calls) {
+    results.push((call.name === "task" ? taskResults : otherResults).shift());
   }
   return results;
 }
@@ -2099,6 +2151,7 @@ async function runOneCall(cfg, call, hooks, signal) {
     requestPermission: (request) => hooks.requestPermission(request),
     checkpoint: cfg.checkpoint,
     onEvent: (event) => hooks.onEvent(event),
+    onProgress: (text) => hooks.onEvent({ type: "tool_progress", id: call.id, text }),
     confirm: async (question) => await hooks.requestPermission({
       toolName: tool.name,
       summary: question,
@@ -2409,13 +2462,13 @@ function beginCheckpoint(options) {
 async function undoLatestCheckpoint(options) {
   assertSessionId2(options.sessionId);
   const root = workspaceRoot(options.cwd);
-  const sessionDir = path6.join(options.storageDir ?? checkpointsDir, options.sessionId);
-  const file = await newestCheckpoint(sessionDir);
+  const storageDir = options.storageDir ?? checkpointsDir;
   const empty = { found: false, restored: [], removed: [], conflicts: [], failed: [] };
+  const file = await newestCheckpoint(path6.join(storageDir, options.sessionId)) ?? await newestWorkspaceCheckpoint(storageDir, root);
   if (!file) return empty;
   const checkpoint = await readCheckpoint(file);
-  if (checkpoint.sessionId !== options.sessionId || checkpoint.cwd !== root) {
-    throw new Error("The latest undo checkpoint belongs to a different workspace or session.");
+  if (checkpoint.cwd !== root) {
+    throw new Error("The latest undo checkpoint belongs to a different workspace.");
   }
   const result = { ...empty, found: true };
   const retry = [];
@@ -2585,6 +2638,27 @@ function decodeSnapshot(snapshot) {
 function validBase64(value) {
   return value.length % 4 === 0 && /^[A-Za-z0-9+/]*={0,2}$/.test(value);
 }
+async function newestWorkspaceCheckpoint(storageDir, root) {
+  let sessions;
+  try {
+    sessions = await readdir2(storageDir);
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+  const candidates = [];
+  for (const session of sessions) {
+    if (!/^[A-Za-z0-9_-]{1,240}$/.test(session)) continue;
+    const file = await newestCheckpoint(path6.join(storageDir, session)).catch(() => null);
+    if (file) candidates.push({ name: path6.basename(file), file });
+  }
+  candidates.sort((a, b) => b.name.localeCompare(a.name));
+  for (const candidate of candidates) {
+    const checkpoint = await readCheckpoint(candidate.file).catch(() => null);
+    if (checkpoint?.cwd === root) return candidate.file;
+  }
+  return null;
+}
 async function newestCheckpoint(sessionDir) {
   let names;
   try {
@@ -2623,6 +2697,7 @@ var DEFAULT_TIMEOUT = 12e4;
 var MAX_TIMEOUT = 6e5;
 var MAX_OUTPUT = 1e5;
 var MAX_COMMAND_CHARS = 2e4;
+var PROGRESS_INTERVAL_MS = 250;
 var bashTool = {
   name: "bash",
   description: "Run a shell command in the workspace root. stdout and stderr are merged. Avoid commands that wait for interactive input. Set background: true to keep a long command (dev server, test watcher, build) running while you carry on with other work, then collect its output with bash_output.",
@@ -2686,6 +2761,19 @@ var bashTool = {
         windowsHide: true
       });
       const chunks = [];
+      let partial = "";
+      let lastProgress = 0;
+      const progress = (text) => {
+        if (!ctx.onProgress) return;
+        const lines = (partial + text).split(/\r?\n|\r/);
+        partial = lines.at(-1) ?? "";
+        const now = Date.now();
+        if (now - lastProgress < PROGRESS_INTERVAL_MS) return;
+        const latest = [...lines].reverse().find((line) => line.trim() !== "");
+        if (latest === void 0) return;
+        lastProgress = now;
+        ctx.onProgress(latest.trim());
+      };
       let captured = 0;
       let truncated = false;
       const collect = (buf) => {
@@ -2696,6 +2784,7 @@ var bashTool = {
         } catch {
           text = buf.toString();
         }
+        progress(text);
         if (text.length > MAX_OUTPUT - captured) {
           chunks.push(text.slice(0, MAX_OUTPUT - captured));
           truncated = true;
@@ -2909,7 +2998,7 @@ async function isFile2(file) {
 
 // src/core/attachments.ts
 import { execFile } from "child_process";
-import { lstat as lstat2, readdir as readdir3, readFile as readFile7, stat as stat5 } from "fs/promises";
+import { lstat as lstat2, mkdtemp, readdir as readdir3, readFile as readFile7, rm as rm4, stat as stat5, writeFile as writeFile6 } from "fs/promises";
 import os2 from "os";
 import path8 from "path";
 import { fileURLToPath } from "url";
@@ -3004,14 +3093,15 @@ async function loadClipboardImage(platform = process.platform, runner = runClipb
       if (data.length > MAX_IMAGE_BYTES) {
         throw new Error(`Clipboard image is larger than ${formatBytes(MAX_IMAGE_BYTES)}.`);
       }
+      const fitted = await fitImage(data, mediaType, platform);
       return {
         type: "image",
-        mediaType,
-        data: data.toString("base64"),
-        name: clipboardImageName(mediaType)
+        mediaType: fitted.mediaType,
+        data: fitted.data.toString("base64"),
+        name: clipboardImageName(fitted.mediaType)
       };
     } catch (error) {
-      if (error instanceof Error && error.message.startsWith("Clipboard image is larger")) {
+      if (error instanceof Error && /^(?:Clipboard image|Image) is larger/.test(error.message)) {
         throw error;
       }
     }
@@ -3028,10 +3118,11 @@ async function loadResolvedAttachment(resolved, size) {
   const data = await readFile7(resolved);
   const mediaType = detectImage(data);
   if (mediaType) {
+    const fitted = await fitImage(data, mediaType);
     return {
       path: resolved,
-      bytes: data.length,
-      block: { type: "image", mediaType, data: data.toString("base64"), name }
+      bytes: fitted.data.length,
+      block: { type: "image", mediaType: fitted.mediaType, data: fitted.data.toString("base64"), name }
     };
   }
   if (data.length > MAX_TEXT_BYTES) {
@@ -3221,6 +3312,85 @@ try {
   $image.Dispose()
 }
 `;
+var MAX_SENT_IMAGE_BYTES = 37e5;
+var SHRINK_LONG_EDGE = 2e3;
+async function fitImage(data, mediaType, platform = process.platform, shrink = shrinkWithSystemTools) {
+  if (data.length <= MAX_SENT_IMAGE_BYTES) return { data, mediaType };
+  const dir = await mkdtemp(path8.join(os2.tmpdir(), "kitcode-image-"));
+  try {
+    const input = path8.join(dir, `in${extensionFor(mediaType)}`);
+    const output = path8.join(dir, "out.jpg");
+    await writeFile6(input, data);
+    try {
+      await shrink(input, output, platform);
+    } catch {
+      throw new Error(
+        `Image is larger than ${formatBytes(MAX_SENT_IMAGE_BYTES)} and could not be scaled down automatically` + (platform === "win32" || platform === "darwin" ? "" : " (install ImageMagick for that)") + ". Save a smaller copy and attach that."
+      );
+    }
+    const shrunk = await readFile7(output);
+    if (shrunk.length > MAX_SENT_IMAGE_BYTES || detectImage(shrunk) !== "image/jpeg") {
+      throw new Error(`Image is larger than ${formatBytes(MAX_SENT_IMAGE_BYTES)} even after scaling it down.`);
+    }
+    return { data: shrunk, mediaType: "image/jpeg" };
+  } finally {
+    await rm4(dir, { recursive: true, force: true }).catch(() => void 0);
+  }
+}
+async function shrinkWithSystemTools(input, output, platform) {
+  if (platform === "win32") {
+    await runQuiet("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", WINDOWS_SHRINK_SCRIPT], {
+      KITCODE_IMAGE_IN: input,
+      KITCODE_IMAGE_OUT: output,
+      KITCODE_IMAGE_EDGE: String(SHRINK_LONG_EDGE)
+    });
+    return;
+  }
+  if (platform === "darwin") {
+    await runQuiet("sips", ["-Z", String(SHRINK_LONG_EDGE), "-s", "format", "jpeg", "-s", "formatOptions", "85", input, "--out", output]);
+    return;
+  }
+  const args = [input, "-resize", `${SHRINK_LONG_EDGE}x${SHRINK_LONG_EDGE}>`, "-background", "white", "-flatten", "-quality", "85", output];
+  try {
+    await runQuiet("magick", args);
+  } catch {
+    await runQuiet("convert", args);
+  }
+}
+function runQuiet(command, args, env) {
+  return new Promise((resolve3, reject) => {
+    execFile(command, args, { timeout: 2e4, windowsHide: true, env: { ...process.env, ...env } }, (error) => {
+      if (error) reject(error);
+      else resolve3();
+    });
+  });
+}
+function extensionFor(mediaType) {
+  return mediaType === "image/jpeg" ? ".jpg" : mediaType === "image/gif" ? ".gif" : mediaType === "image/webp" ? ".webp" : ".png";
+}
+var WINDOWS_SHRINK_SCRIPT = String.raw`
+Add-Type -AssemblyName System.Drawing
+$source = [System.Drawing.Image]::FromFile($env:KITCODE_IMAGE_IN)
+try {
+  $edge = [double]$env:KITCODE_IMAGE_EDGE
+  $scale = [Math]::Min(1.0, $edge / [Math]::Max($source.Width, $source.Height))
+  $width = [Math]::Max(1, [int]($source.Width * $scale))
+  $height = [Math]::Max(1, [int]($source.Height * $scale))
+  $bitmap = New-Object System.Drawing.Bitmap $width, $height
+  $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+  $graphics.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
+  $graphics.Clear([System.Drawing.Color]::White)
+  $graphics.DrawImage($source, 0, 0, $width, $height)
+  $codec = [System.Drawing.Imaging.ImageCodecInfo]::GetImageEncoders() | Where-Object { $_.MimeType -eq 'image/jpeg' }
+  $parameters = New-Object System.Drawing.Imaging.EncoderParameters 1
+  $parameters.Param[0] = New-Object System.Drawing.Imaging.EncoderParameter([System.Drawing.Imaging.Encoder]::Quality, [long]85)
+  $bitmap.Save($env:KITCODE_IMAGE_OUT, $codec, $parameters)
+  $graphics.Dispose()
+  $bitmap.Dispose()
+} finally {
+  $source.Dispose()
+}
+`;
 function textMime(file) {
   const extension = path8.extname(file).toLowerCase();
   const known = {
@@ -3249,13 +3419,27 @@ function normalizeInputPath(value) {
       return value.slice(1, -1);
     }
   }
+  if (WINDOWS_PATH.test(value)) return value.replace(/\\ /g, " ");
   return value.replace(/\\([\\ "'()\[\]&;#$!])/g, (_match, character) => character);
 }
+var WINDOWS_PATH = /^(?:[A-Za-z]:[\\/]|\\\\)/;
+function splitAttachmentPaths(value) {
+  const trimmed = value.trim();
+  if (!trimmed || /[\r\n\0]/.test(trimmed)) return null;
+  const tokens2 = [];
+  const pattern = /"([^"]+)"|'([^']+)'|((?:\\ |[^\s"'])+)/g;
+  for (const match of trimmed.matchAll(pattern)) {
+    tokens2.push(match[1] ?? match[2] ?? match[3] ?? "");
+  }
+  if (tokens2.length < 2) return null;
+  const absolute = (token) => /^file:\/\//i.test(token) || WINDOWS_PATH.test(token) || token.startsWith("/") || /^~[\\/]/.test(token);
+  return tokens2.every(absolute) ? tokens2 : null;
+}
 function safeName(value) {
   return value.replace(/[\r\n\0-\x1f\x7f]/g, "").slice(0, 200) || "attachment";
 }
 function formatBytes(value) {
-  return `${Math.round(value / 1024 / 1024)} MB`;
+  return `${(value / 1024 / 1024).toFixed(1).replace(/\.0$/, "")} MB`;
 }
 
 // src/core/compact.ts
@@ -3271,11 +3455,15 @@ var MAX_FILE_BLOCK_CHARS = 2e3;
 var MAX_TOOL_RESULT_CHARS = 1200;
 var MAX_TOOL_ERROR_CHARS = 2e3;
 var MAX_TOOL_INPUT_CHARS = 800;
-var SINGLE_MAX_TOKENS = 768;
-var CHUNK_MAX_TOKENS = 512;
-var MERGE_MAX_TOKENS = 1024;
+var SINGLE_MAX_TOKENS = 3e3;
+var CHUNK_MAX_TOKENS = 1200;
+var MERGE_MAX_TOKENS = 4e3;
+var MAX_PREVIOUS_SUMMARY_CHARS = 4e4;
+var SUMMARY_MARKER = "[Earlier conversation summary]";
+var KEEP_RECENT_TOOL_RESULTS = 6;
+var CLEARABLE_TOOL_RESULT_CHARS = 300;
 var CHUNK_CONCURRENCY = 3;
-var SYSTEM_SUMMARIZE = "You are summarizing a coding conversation so another agent can continue the work. Extract and preserve ONLY: concrete requirements, user preferences, files changed, commands run and their results, errors encountered, bugs found, architectural decisions, and unfinished work. Be terse and factual. Do NOT include greetings, acknowledgments, chain-of-thought, or step-by-step narration. Use these sections: Requirements; Verified facts (with file paths or tool evidence); Changes made; Verification (exact commands, pass/fail/not run, and unresolved error excerpts); Decisions and assumptions; Remaining work. Keep plans and assumptions separate from verified facts. Never turn an intended command into a completed check. When checks conflict, retain the latest result and mark earlier results as superseded. Preserve explicit user corrections and project constraints. Do not retain credentials or secret values. Return only the summary.";
+var SYSTEM_SUMMARIZE = `You are summarizing a coding conversation so another agent can continue the work. Extract and preserve ONLY: concrete requirements, user preferences, files changed, commands run and their results, errors encountered, bugs found, architectural decisions, and unfinished work. Be terse and factual. Do NOT include greetings, acknowledgments, chain-of-thought, or step-by-step narration. Use these sections: Requirements; Verified facts (with file paths or tool evidence); Changes made; Verification (exact commands, pass/fail/not run, and unresolved error excerpts); Decisions and assumptions; Remaining work. Keep plans and assumptions separate from verified facts. Never turn an intended command into a completed check. When checks conflict, retain the latest result and mark earlier results as superseded. Preserve explicit user corrections and project constraints. Do not retain credentials or secret values. If the input starts with "${SUMMARY_MARKER}", that is the summary of even older work: carry over everything in it that is still relevant and fold the newer events into the same sections. Return only the summary.`;
 var SYSTEM_MERGE = "Merge these partial summaries of a coding conversation into one coherent summary. Remove duplicates. Preserve: requirements, files changed, commands run, errors, decisions, and unfinished work. Keep the structured sections and evidence from the source summaries. Separate verified facts, assumptions, and planned work; keep exact verification commands and their latest outcomes. Do not resolve conflicting evidence by guessing. Do not retain credentials or secret values. Be terse. Return only the merged summary.";
 async function compactHistory(options) {
   const cut = compactCutIndex(options.history);
@@ -3348,7 +3536,7 @@ async function compactHistory(options) {
   const prefix = [
     {
       role: "user",
-      content: [{ type: "text", text: `[Earlier conversation summary]
+      content: [{ type: "text", text: `${SUMMARY_MARKER}
 ${summary2}` }]
     },
     {
@@ -3356,14 +3544,70 @@ ${summary2}` }]
       content: [{ type: "text", text: "Earlier context loaded. I will continue from this summary." }]
     }
   ];
+  const kept = clearOldToolResults(options.history.slice(cut));
   return {
-    history: [...prefix, ...options.history.slice(cut)],
+    history: [...prefix, ...withoutThinkingReplay(kept.history)],
     compacted: true,
     removedMessages: cut,
+    clearedToolResults: kept.cleared,
     usage,
     rateLimits
   };
 }
+function clearOldToolResults(history, keepRecent = KEEP_RECENT_TOOL_RESULTS) {
+  let seen = 0;
+  let cleared = 0;
+  const out = [...history];
+  for (let index = out.length - 1; index >= 0; index -= 1) {
+    const message = out[index];
+    if (!message.content.some((block) => block.type === "tool_result")) continue;
+    let changed = false;
+    const content = [...message.content];
+    for (let at = content.length - 1; at >= 0; at -= 1) {
+      const block = content[at];
+      if (block.type !== "tool_result") continue;
+      seen += 1;
+      if (seen <= keepRecent || block.content.length <= CLEARABLE_TOOL_RESULT_CHARS) continue;
+      if (block.content.startsWith(CLEARED_NOTE_PREFIX)) continue;
+      content[at] = {
+        ...block,
+        content: `${CLEARED_NOTE_PREFIX} ${block.content.length} characters). Run the tool again if you need it.]`
+      };
+      cleared += 1;
+      changed = true;
+    }
+    if (changed) out[index] = { ...message, content };
+  }
+  return { history: cleared > 0 ? out : history, cleared };
+}
+var CLEARED_NOTE_PREFIX = "[Older tool output cleared to free context (";
+function withoutThinkingReplay(history) {
+  let changed = false;
+  const out = history.map((message) => {
+    if (message.role !== "assistant" || !message.content.some((block) => block.type === "thinking" && block.raw)) {
+      return message;
+    }
+    changed = true;
+    return {
+      ...message,
+      content: message.content.map((block) => block.type === "thinking" && block.raw ? { type: "thinking", text: block.text } : block)
+    };
+  });
+  return changed ? out : history;
+}
+function estimateHistoryTokens(history) {
+  let chars = 0;
+  for (const message of history) {
+    for (const block of message.content) {
+      if (block.type === "text" || block.type === "thinking") chars += block.text.length;
+      else if (block.type === "tool_result") chars += block.content.length;
+      else if (block.type === "file") chars += block.text.length;
+      else if (block.type === "tool_use") chars += safeJson(block.input).length;
+      else if (block.type === "image") chars += 6e3;
+    }
+  }
+  return Math.round(chars / 4);
+}
 function shouldAutoCompact(used, window) {
   return window !== null && window > 0 && used / window >= 0.8;
 }
@@ -3407,7 +3651,7 @@ function estimateCompactBudget(history, maxTokens = MERGE_MAX_TOKENS) {
 function isConversationUser(message) {
   if (message.role !== "user") return false;
   return message.content.some(
-    (block) => block.type === "image" || block.type === "file" || block.type === "text" && !block.text.startsWith("[Earlier conversation summary]")
+    (block) => block.type === "image" || block.type === "file" || block.type === "text" && !block.text.startsWith(SUMMARY_MARKER)
   );
 }
 function chunkRenderedMessages(messages, targetChars, overlapMessages, overlapMaxChars) {
@@ -3613,6 +3857,9 @@ ${blocks.join("\n")}`] : [];
 function renderBlock(block, role) {
   switch (block.type) {
     case "text":
+      if (role === "user" && block.text.startsWith(SUMMARY_MARKER)) {
+        return truncate(block.text, MAX_PREVIOUS_SUMMARY_CHARS);
+      }
       return truncate(
         block.text,
         role === "user" ? MAX_USER_TEXT_CHARS : MAX_ASSISTANT_TEXT_CHARS
@@ -3689,7 +3936,7 @@ function buildSystemPrompt(args) {
 
 // src/core/subagent.ts
 var TASK_TOOL_NAME = "task";
-var MAX_SUBAGENT_STEPS = 12;
+var MAX_SUBAGENT_STEPS = 30;
 var SUBAGENT_NO_ANSWER = "The subagent stopped without writing a final answer \u2014 it was interrupted or ended on a tool call. Nothing was reported back: do the work directly, or delegate it again with a narrower prompt.";
 var SUBAGENT_CANCELLED = "The subagent was cancelled before it produced anything.";
 var STEP_LIMIT_NOTE = `The subagent was stopped after ${MAX_SUBAGENT_STEPS} model calls without finishing, so anything above is partial. Do the work directly or delegate a narrower piece of it.`;
@@ -3704,12 +3951,12 @@ var SUBAGENT_SYSTEM = [
 ].join("\n");
 function createSubagentRunner(makeConfig, tools) {
   const permissionLane = createExecutionLane();
-  const executionLane = createExecutionLane();
-  const modelRequestLane = createExecutionLane();
   return {
     async run(request) {
       if (request.signal.aborted) return SUBAGENT_CANCELLED;
       let steps = 0;
+      const executionLane = createExecutionLane();
+      const modelRequestLane = createExecutionLane();
       const base = makeConfig(SUBAGENT_SYSTEM, tools);
       const cfg = {
         ...base,
@@ -3721,9 +3968,12 @@ function createSubagentRunner(makeConfig, tools) {
           kind: base.provider.kind,
           listModels: () => base.provider.listModels(),
           knownModels: () => base.provider.knownModels(),
+          // Keep the tool definitions on the last call: the history holds
+          // tool_use/tool_result blocks, and providers reject those without
+          // tools (Anthropic: 400 "must define tools"). Calls made anyway are
+          // refused by tools.get below.
           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.`
@@ -3854,9 +4104,10 @@ function formatUsageBreakdown(tracker) {
   lines.push("", `total  ${formatUsageCompact(tracker)}`);
   return lines.join("\n");
 }
-function tokens(count) {
-  if (count < 1e3) return String(count);
-  const [value, suffix] = count < 1e6 ? [count / 1e3, "k"] : [count / 1e6, "M"];
+function tokens(count2) {
+  if (count2 < 1e3) return String(count2);
+  const k = Number((count2 / 1e3).toFixed(1));
+  const [value, suffix] = k < 1e3 ? [k, "k"] : [count2 / 1e6, "M"];
   return `${value.toFixed(1).replace(/\.0$/, "")}${suffix}`;
 }
 function dollars(amount) {
@@ -3940,7 +4191,7 @@ function clip(value) {
 // package.json
 var package_default = {
   name: "@kernelonpanic/kitcode",
-  version: "1.3.3",
+  version: "1.4.1",
   description: "Terminal coding agent with a config you never have to write by hand",
   type: "module",
   license: "MIT",
@@ -3973,6 +4224,7 @@ var package_default = {
   dependencies: {
     "@anthropic-ai/sdk": "^0.115.0",
     "@modelcontextprotocol/sdk": "^1.30.0",
+    build: "^0.1.4",
     chalk: "^6.0.0",
     commander: "^15.0.0",
     "fast-glob": "^3.3.3",
@@ -4008,7 +4260,7 @@ var package_default = {
 
 // src/version.ts
 var KITCODE_VERSION = package_default.version;
-var KITCODE_COMMIT = true ? "81f72aca6f23448aa2239b7bd9175da0f9e5862c" : "development";
+var KITCODE_COMMIT = true ? "be753d255e7675a850d0ca1ee64f790f68d3fd93" : "development";
 
 // src/mcp/client.ts
 var clientInfo = { name: "kitcode", version: KITCODE_VERSION };
@@ -4393,7 +4645,7 @@ async function limitedResponseText(response, limit) {
 }
 
 // src/providers/catalog.ts
-import { chmod as chmod4, readFile as readFile8, writeFile as writeFile6 } from "fs/promises";
+import { chmod as chmod4, readFile as readFile8, writeFile as writeFile7 } from "fs/promises";
 import path9 from "path";
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var CACHE_VERSION = 3;
@@ -4455,7 +4707,7 @@ async function writeCache(file, models) {
   const payload = { version: CACHE_VERSION, fetchedAt: Date.now(), models };
   try {
     await ensureDir(path9.dirname(file));
-    await writeFile6(file, JSON.stringify(payload), { encoding: "utf8", mode: 384 });
+    await writeFile7(file, JSON.stringify(payload), { encoding: "utf8", mode: 384 });
     await chmod4(file, 384);
   } catch {
     return;
@@ -4603,8 +4855,11 @@ async function* streamTurn(client, providerId, apiKey2, req) {
     messages: toMessageParams(req.messages),
     tools: toToolParams(req.tools)
   };
-  if (req.thinking) params.thinking = { type: "adaptive", display: "summarized" };
-  const effort = resolveEffort(req.effort, req.messages);
+  if (req.thinking) {
+    const thinking2 = thinkingParam(req.model, req.maxTokens);
+    if (thinking2) params.thinking = thinking2;
+  }
+  const effort = effectiveEffort("anthropic", req.model, req.effort, req.messages);
   if (effort) params.output_config = { effort };
   let thinking = "";
   let text = "";
@@ -4683,6 +4938,11 @@ function toMessageParams(messages) {
     const content = message.content.flatMap(toBlockParams);
     if (content.length > 0) params.push({ role: message.role, content });
   }
+  const last = params.at(-1)?.content;
+  if (Array.isArray(last)) {
+    const block = last.findLast((candidate) => candidate.type !== "thinking" && candidate.type !== "redacted_thinking");
+    if (block) block.cache_control = { type: "ephemeral" };
+  }
   return params;
 }
 function toBlockParams(block) {
@@ -4752,6 +5012,15 @@ function toUsage(usage) {
     cacheRead: usage.cache_read_input_tokens ?? 0
   };
 }
+var BUDGET_THINKING = /^claude-(?:3|[a-z]+-3|haiku-4|(?:sonnet|opus)-4(?:-[0-5])?(?:-\d{8}|@|$))/;
+var THINKING_BUDGET = 16e3;
+var MIN_THINKING_BUDGET = 1024;
+function thinkingParam(model, maxTokens) {
+  const id = (model.split("/").at(-1) ?? model).replace(/^(?:[a-z]{2}\.)?anthropic\./, "");
+  if (!BUDGET_THINKING.test(id)) return { type: "adaptive", display: "summarized" };
+  const budget = Math.min(THINKING_BUDGET, maxTokens - 1);
+  return budget >= MIN_THINKING_BUDGET ? { type: "enabled", budget_tokens: budget } : void 0;
+}
 function toRefusal(details) {
   return { category: details?.category ?? null, explanation: details?.explanation ?? null };
 }
@@ -4784,6 +5053,57 @@ function createOpenAiProvider(args) {
   };
 }
 async function* streamTurn2(client, providerId, apiKey2, req) {
+  let effort = effectiveEffort("openai", req.model, req.effort, req.messages, providerId);
+  const thinkingKey = `${providerId}/${req.model}`;
+  let thinkingOff = req.thinking === false && !thinkingOffRejected.has(thinkingKey) ? thinkingOffParams(req.model) : void 0;
+  let tokenField = completionTokenModels.has(thinkingKey) || usesCompletionTokens(req.model) ? "max_completion_tokens" : "max_tokens";
+  for (; ; ) {
+    let streamed = false;
+    try {
+      for await (const event of streamOnce(client, providerId, apiKey2, req, effort, thinkingOff, tokenField)) {
+        if (event.type !== "rate_limits" && event.type !== "usage") streamed = true;
+        yield event;
+      }
+      return;
+    } catch (error) {
+      if (streamed) throw error;
+      if (tokenField === "max_tokens" && rejectsField(error, /max_completion_tokens/)) {
+        completionTokenModels.add(thinkingKey);
+        tokenField = "max_completion_tokens";
+        continue;
+      }
+      if (effort && rejectsField(error, /reasoning|effort/i)) {
+        markEffortRejected(providerId, req.model);
+        effort = void 0;
+        continue;
+      }
+      if (thinkingOff && rejectsField(error, /thinking/i)) {
+        thinkingOffRejected.add(thinkingKey);
+        thinkingOff = void 0;
+        continue;
+      }
+      throw error;
+    }
+  }
+}
+var thinkingOffRejected = /* @__PURE__ */ new Set();
+var completionTokenModels = /* @__PURE__ */ new Set();
+function usesCompletionTokens(model) {
+  const id = (model.split("/").at(-1) ?? model).toLowerCase();
+  return /^(?:o[1-9](?:-|$)|gpt-5(?:[.-]|$))/.test(id);
+}
+function thinkingOffParams(model) {
+  const id = (model.split("/").at(-1) ?? model).toLowerCase();
+  if (/^(?:glm-4\.[5-9]|glm-[5-9]|kimi-k(?:2\.[5-9]|[3-9]))/.test(id)) return { thinking: { type: "disabled" } };
+  if (/^(?:qwen3|qwq)/.test(id)) return { enable_thinking: false };
+  return void 0;
+}
+function rejectsField(error, field2) {
+  if (!(error instanceof ProviderError) || error.status !== 400 && error.status !== 422) return false;
+  const cause = error.cause instanceof Error ? error.cause.message : "";
+  return field2.test(`${error.message} ${cause}`);
+}
+async function* streamOnce(client, providerId, apiKey2, req, effort, thinkingOff, tokenField) {
   let text = "";
   let thinking = "";
   let finishReason = null;
@@ -4793,13 +5113,13 @@ async function* streamTurn2(client, providerId, apiKey2, req) {
   let recognised = 0;
   const calls = /* @__PURE__ */ new Map();
   const capture = captureResponseHead();
-  const effort = openAiEffort(req.model, resolveEffort(req.effort, req.messages));
   try {
     const stream = await client.withOptions({ fetch: capture.fetch }).chat.completions.create(
       {
         model: req.model,
-        max_tokens: req.maxTokens,
+        [tokenField]: req.maxTokens,
         ...effort ? { reasoning_effort: effort } : {},
+        ...thinkingOff,
         messages: toChatMessages(req.system, req.messages),
         ...req.tools.length > 0 ? { tools: toChatTools(req.tools) } : {},
         stream: true,
@@ -4989,14 +5309,22 @@ function toUsage2(usage) {
   return normalizeOpenAiUsage(usage);
 }
 function normalizeOpenAiUsage(usage) {
-  const cacheRead = usage.prompt_tokens_details?.cached_tokens ?? 0;
+  const prompt = count(usage.prompt_tokens);
+  const cacheRead = Math.min(
+    prompt,
+    count(usage.prompt_tokens_details?.cached_tokens) || count(usage.prompt_cache_hit_tokens) || count(usage.cached_tokens)
+  );
+  const cacheWrite = Math.min(prompt - cacheRead, count(usage.prompt_tokens_details?.cache_write_tokens));
   return {
-    input: Math.max(0, (usage.prompt_tokens ?? 0) - cacheRead),
-    output: usage.completion_tokens ?? 0,
-    cacheWrite: 0,
+    input: prompt - cacheRead - cacheWrite,
+    output: count(usage.completion_tokens),
+    cacheWrite,
     cacheRead
   };
 }
+function count(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
 
 // src/providers/registry.ts
 function createRegistry(config, auth) {
@@ -5045,6 +5373,7 @@ var PLAN_REFUSAL = "Plan mode is on: this tool changes state and is unavailable.
 function createPermissionEngine(configPermissions) {
   const sessionGrants = /* @__PURE__ */ new Set();
   let bypassEnabled = false;
+  let bypassUnlocked = false;
   let current = "normal";
   const resolve3 = (tool, requested) => configPermissions[tool.name] ?? requested ?? tool.defaultPermission;
   return {
@@ -5071,9 +5400,12 @@ function createPermissionEngine(configPermissions) {
     bypass: {
       enable() {
         bypassEnabled = true;
+        bypassUnlocked = true;
+        current = "normal";
       },
       disable() {
         bypassEnabled = false;
+        bypassUnlocked = false;
       },
       isEnabled() {
         return bypassEnabled;
@@ -5085,7 +5417,18 @@ function createPermissionEngine(configPermissions) {
         current = mode;
       },
       cycle() {
-        current = MODES[(MODES.indexOf(current) + 1) % MODES.length] ?? "normal";
+        if (bypassEnabled) {
+          bypassEnabled = false;
+          current = "normal";
+          return current;
+        }
+        const next = MODES[(MODES.indexOf(current) + 1) % MODES.length] ?? "normal";
+        if (next === "normal" && bypassUnlocked) {
+          bypassEnabled = true;
+          current = "normal";
+          return "bypass";
+        }
+        current = next;
         return current;
       }
     }
@@ -5153,7 +5496,7 @@ import { readFile as readFile9, stat as stat6 } from "fs/promises";
 
 // src/tools/safe-write.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { chmod as chmod5, lstat as lstat3, open, rename as rename5, rm as rm4 } from "fs/promises";
+import { chmod as chmod5, lstat as lstat3, open, rename as rename5, rm as rm5 } from "fs/promises";
 import { basename as basename2, dirname as dirname2, join as join2 } from "path";
 var UnsafeFileChangeError = class extends Error {
   constructor(message) {
@@ -5216,7 +5559,7 @@ async function atomicWriteSafeFile(file, data, snapshot) {
     await rename5(temp, file);
   } catch (error) {
     await handle?.close().catch(() => void 0);
-    await rm4(temp, { force: true }).catch(() => void 0);
+    await rm5(temp, { force: true }).catch(() => void 0);
     throw error;
   }
 }
@@ -5279,12 +5622,12 @@ async function lstatMaybe(file) {
 var MAX_FILE_BYTES2 = 5e6;
 function countOccurrences(haystack, needle) {
   if (needle === "") return 0;
-  let count = 0;
+  let count2 = 0;
   let from = 0;
   for (; ; ) {
     const at = haystack.indexOf(needle, from);
-    if (at === -1) return count;
-    count += 1;
+    if (at === -1) return count2;
+    count2 += 1;
     from = at + needle.length;
   }
 }
@@ -5343,16 +5686,16 @@ var editTool = {
       return { content: `Cannot edit ${path15}: it is a binary file, not text.`, isError: true };
     }
     const before = beforeBuffer.toString("utf8");
-    const count = countOccurrences(before, oldString);
-    if (count === 0) {
+    const count2 = countOccurrences(before, oldString);
+    if (count2 === 0) {
       return {
         content: `oldString was not found in ${path15}. Read the file again and match the text exactly, including whitespace.`,
         isError: true
       };
     }
-    if (count > 1 && !replaceAll) {
+    if (count2 > 1 && !replaceAll) {
       return {
-        content: `oldString matches ${count} places in ${path15}. Add more surrounding context to identify a single one, or set replaceAll to true.`,
+        content: `oldString matches ${count2} places in ${path15}. Add more surrounding context to identify a single one, or set replaceAll to true.`,
         isError: true
       };
     }
@@ -5376,14 +5719,14 @@ var editTool = {
       return { content: `Failed to write ${path15}: ${error.message}`, isError: true };
     }
     return {
-      content: `Edited ${path15} (${count} ${count === 1 ? "replacement" : "replacements"})`,
+      content: `Edited ${path15} (${count2} ${count2 === 1 ? "replacement" : "replacements"})`,
       display: { kind: "diff", path: path15, before, after }
     };
   }
 };
 function replacement(before, oldString, newString, replaceAll) {
-  const count = countOccurrences(before, oldString);
-  if (count === 0 || count > 1 && !replaceAll) return null;
+  const count2 = countOccurrences(before, oldString);
+  if (count2 === 0 || count2 > 1 && !replaceAll) return null;
   if (replaceAll) return before.split(oldString).join(newString);
   const at = before.indexOf(oldString);
   return before.slice(0, at) + newString + before.slice(at + oldString.length);
@@ -5815,7 +6158,7 @@ function createToolRegistry(tools) {
 }
 
 // src/prompts/library.ts
-import { chmod as chmod6, readFile as readFile13, readdir as readdir4, unlink as unlink3, writeFile as writeFile7 } from "fs/promises";
+import { chmod as chmod6, readFile as readFile13, readdir as readdir4, unlink as unlink3, writeFile as writeFile8 } from "fs/promises";
 import path11 from "path";
 async function savePrompt(input) {
   const slug = slugify(input.name);
@@ -5829,7 +6172,7 @@ async function savePrompt(input) {
   };
   await ensureDir(promptsDir);
   const file = path11.join(promptsDir, `${slug}.md`);
-  await writeFile7(file, serialize(prompt), {
+  await writeFile8(file, serialize(prompt), {
     encoding: "utf8",
     mode: 384
   });
@@ -6372,7 +6715,10 @@ function createTaskTool(runner) {
       required: ["description", "prompt"],
       additionalProperties: false
     },
-    defaultPermission: "ask",
+    // Starting a subagent changes nothing by itself: each tool call it makes
+    // goes through the same permission and plan-mode checks as the parent.
+    defaultPermission: "allow",
+    readOnly: true,
     summarize(input) {
       return `task(${brief(field(input, "description"))})`;
     },
@@ -6546,6 +6892,7 @@ async function readJsonBounded(response) {
 
 // src/app/runtime.ts
 var PREFERRED2 = ["claude-opus-5", "claude-sonnet-5", "gpt-5", "claude-opus-4-8"];
+var MID_TURN_TRIM_RATIO = 0.8;
 async function boot(options) {
   const loadedConfig = await loadRuntimeConfig(options.cwd);
   const config = loadedConfig.config;
@@ -6619,6 +6966,7 @@ async function boot(options) {
   const notifyContext = () => {
     for (const listener of contextListeners) listener();
   };
+  const resolveContextWindow = (ref, discovered) => config.contextWindow ?? discovered ?? knownContextWindow(ref);
   const knownContextWindow = (ref) => {
     const parsed = parseModelRef(ref);
     if (!parsed) return null;
@@ -6635,27 +6983,27 @@ async function boot(options) {
     modelRef = ref;
     if (latestRateLimits?.model !== ref) latestRateLimits = void 0;
     contextUsage = restoredContext?.model === ref ? restoredContext : void 0;
-    modelContextWindow = discoveredWindow ?? knownContextWindow(ref);
+    modelContextWindow = resolveContextWindow(ref, discoveredWindow);
     notifyContext();
   };
-  modelContextWindow = knownContextWindow(modelRef);
+  modelContextWindow = resolveContextWindow(modelRef);
   async function refreshModelContextWindow() {
     const targetRef = modelRef;
     const parsed = parseModelRef(targetRef);
     if (!parsed) {
       if (modelRef === targetRef) {
-        modelContextWindow = null;
+        modelContextWindow = config.contextWindow ?? null;
         notifyContext();
       }
       return;
     }
-    let next = modelContextWindow ?? knownContextWindow(targetRef);
+    let next = resolveContextWindow(targetRef);
     try {
       const provider = registry.get(parsed.provider);
       const models = await loadModels(provider);
       rememberModels(parsed.provider, models);
       const found = models.find((m) => m.id === parsed.model);
-      next = found?.contextWindow ?? next;
+      next = resolveContextWindow(targetRef, found?.contextWindow);
     } catch {
     }
     if (modelRef === targetRef) {
@@ -6678,9 +7026,16 @@ async function boot(options) {
       effort: config.effort,
       thinking: config.thinking,
       budget: activeBudget,
-      checkpoint: activeCheckpoint
+      checkpoint: activeCheckpoint,
+      trimContext: (messages) => trimForWindow(resolved.provider.kind, messages)
     };
   };
+  const trimForWindow = (kind, messages) => {
+    if (kind !== "openai" || !modelContextWindow) return null;
+    if (estimateHistoryTokens(messages) < modelContextWindow * MID_TURN_TRIM_RATIO) return null;
+    const cleared = clearOldToolResults(messages);
+    return cleared.cleared > 0 ? cleared.history : null;
+  };
   let activeBudget;
   let activeCheckpoint;
   let activeAgentCount = 0;
@@ -6727,8 +7082,22 @@ async function boot(options) {
     return save;
   };
   const compactWithBudget = async (history, signal, budget) => {
+    const tokensBefore = estimateHistoryTokens(history);
     if (compactCutIndex(history) <= 0) {
-      return { history, compacted: false, removedMessages: 0 };
+      const cleared = clearOldToolResults(history);
+      if (cleared.cleared === 0) return { history, compacted: false, removedMessages: 0 };
+      const next = withoutThinkingReplay(cleared.history);
+      contextUsage = void 0;
+      session.context = void 0;
+      notifyContext();
+      return {
+        history: next,
+        compacted: true,
+        removedMessages: 0,
+        clearedToolResults: cleared.cleared,
+        tokensBefore,
+        tokensAfter: estimateHistoryTokens(next)
+      };
     }
     const resolved = registry.resolve(modelRef);
     const estimate = estimateCompactBudget(history, config.maxTokens);
@@ -6756,7 +7125,7 @@ async function boot(options) {
       session.context = void 0;
       notifyContext();
     }
-    return result;
+    return { ...result, tokensBefore, tokensAfter: estimateHistoryTokens(result.history) };
   };
   const runtime = {
     cwd: options.cwd,
@@ -6983,26 +7352,50 @@ async function boot(options) {
     effortDescription(history) {
       if (!modelRef) return "unavailable";
       const { provider, modelId } = registry.resolve(modelRef);
-      const requested = resolveEffort(config.effort, history);
-      const effective = provider.kind === "openai" ? openAiEffort(modelId, requested) : requested;
-      return effective ? `${config.effort} \u2192 ${effective} (API request)` : `${config.effort} \u2192 not sent: unknown model support`;
+      const effective = effectiveEffort(provider.kind, modelId, config.effort, history, provider.id);
+      return effective ? `${config.effort} \u2192 ${effective} (API request)` : `${config.effort} \u2192 not sent: this model/provider does not accept an effort level`;
     },
     getEffort: () => config.effort,
+    getEffectiveEffort(history) {
+      if (!modelRef) return null;
+      try {
+        const { provider, modelId } = registry.resolve(modelRef);
+        return effectiveEffort(provider.kind, modelId, config.effort, history, provider.id) ?? null;
+      } catch {
+        return null;
+      }
+    },
     async setEffort(effort) {
       await persistConfig((draft) => {
         draft.effort = effort;
       });
     },
+    getBell: () => config.bell,
+    async setBell(enabled) {
+      await persistConfig((draft) => {
+        draft.bell = enabled;
+      });
+    },
     getThinking: () => config.thinking,
     async setThinking(enabled) {
       await persistConfig((draft) => {
         draft.thinking = enabled;
       });
     },
+    getContextWindowOverride: () => config.contextWindow,
+    async setContextWindowOverride(tokens2) {
+      await persistConfig((draft) => {
+        if (tokens2 === void 0) delete draft.contextWindow;
+        else draft.contextWindow = tokens2;
+      });
+      modelContextWindow = config.contextWindow ?? resolveContextWindow(modelRef);
+      notifyContext();
+      void refreshModelContextWindow();
+    },
     getMaxTokensPerTurn: () => config.budget.maxTokensPerTurn,
-    async setMaxTokensPerTurn(tokens3) {
+    async setMaxTokensPerTurn(tokens2) {
       await persistConfig((draft) => {
-        draft.budget.maxTokensPerTurn = tokens3;
+        draft.budget.maxTokensPerTurn = tokens2;
         draft.budget.maxCostUsdPerTurn = 0;
       });
     },
@@ -7257,7 +7650,7 @@ ${lines.join("\n")}` : null;
             hooks.onEvent({
               type: "notice",
               level: "info",
-              text: `Compacted older context; kept the latest conversation (${result.removedMessages} messages replaced).`
+              text: describeCompaction(result)
             });
           }
         } catch (error) {
@@ -7276,10 +7669,6 @@ ${lines.join("\n")}` : null;
       const trackedHooks = {
         ...hooks,
         onEvent(event) {
-          if (event.type === "turn_start") {
-            contextUsage = void 0;
-            notifyContext();
-          }
           if (event.type === "usage") {
             contextUsage = { model: requestModelRef, usage: event.usage };
             notifyContext();
@@ -7333,6 +7722,7 @@ ${lines.join("\n")}` : null;
         context: contextUsage
       };
       session = snapshot;
+      if (history.length === 0) return;
       const save = persistQueue.catch(() => void 0).then(() => saveSession(snapshot));
       persistQueue = save;
       await save;
@@ -7370,6 +7760,13 @@ function preferredDetectedModel(detected) {
   }
   return candidates[0];
 }
+function describeCompaction(result) {
+  const parts = [];
+  if (result.removedMessages > 0) parts.push(`${result.removedMessages} older messages summarised`);
+  if (result.clearedToolResults) parts.push(`${result.clearedToolResults} old tool outputs cleared`);
+  const size = result.tokensBefore !== void 0 && result.tokensAfter !== void 0 ? ` \xB7 ~${tokens(result.tokensBefore)} \u2192 ~${tokens(result.tokensAfter)} tokens` : "";
+  return `Context compacted: ${parts.join(", ")}${size}.`;
+}
 
 // src/app/ask.ts
 var RU_YES = /* @__PURE__ */ new Set(["y", "\u043D"]);
@@ -7556,8 +7953,8 @@ function validateKey(value) {
 import { render } from "ink";
 
 // src/ui/App.tsx
-import { Box as Box13, Text as Text12, useApp, useInput as useInput2, useStdout as useStdout2 } from "ink";
-import { useCallback, useEffect as useEffect2, useMemo as useMemo5, useRef as useRef4, useState as useState5 } from "react";
+import { Box as Box14, Text as Text13, useApp, useInput as useInput3, useStdout as useStdout2 } from "ink";
+import { useCallback, useEffect as useEffect4, useMemo as useMemo6, useRef as useRef5, useState as useState8 } from "react";
 
 // src/ui/terminal-size.ts
 import { useStdout } from "ink";
@@ -7631,37 +8028,74 @@ function stdioServer(name, command, args) {
   return parsed.success ? { ok: true, name, config: parsed.data } : { ok: false, error: "usage" };
 }
 
+// src/ui/speed.ts
+var CHARS_PER_TOKEN = 4;
+var MIN_LIVE_MS = 1e3;
+function createSpeedMeter() {
+  return { streamedChars: 0, firstTokenAt: null, last: null };
+}
+function recordSpeed(meter, event, now = Date.now()) {
+  switch (event.type) {
+    case "turn_start":
+      meter.streamedChars = 0;
+      meter.firstTokenAt = null;
+      break;
+    case "text_delta":
+    case "thinking_delta":
+      meter.firstTokenAt ??= now;
+      meter.streamedChars += event.text.length;
+      break;
+    case "speed":
+      meter.last = event.outputTokens / (event.ms / 1e3);
+      meter.streamedChars = 0;
+      meter.firstTokenAt = null;
+      break;
+  }
+}
+function readSpeed(meter, busy, now = Date.now()) {
+  if (busy && meter.firstTokenAt !== null && meter.streamedChars > 0) {
+    const ms = now - meter.firstTokenAt;
+    if (ms >= MIN_LIVE_MS) {
+      return { tokensPerSecond: meter.streamedChars / CHARS_PER_TOKEN / (ms / 1e3), live: true };
+    }
+  }
+  return meter.last === null || !Number.isFinite(meter.last) ? null : { tokensPerSecond: meter.last, live: false };
+}
+
 // src/ui/commands.ts
+var BUSY_SAFE = { runsWhileBusy: true };
 var COMMANDS = [
-  { name: "model" },
+  { name: "model", ...BUSY_SAFE },
   { name: "login" },
   { name: "provider" },
   { name: "logout", args: "[provider]" },
   { name: "key", args: "[provider]" },
   { name: "refresh", args: "[provider]" },
-  { name: "effort" },
-  { name: "thinking" },
-  { name: "budget", args: "[tokens]" },
-  { name: "theme", args: "[color]" },
-  { name: "lang" },
+  { name: "effort", ...BUSY_SAFE },
+  { name: "thinking", ...BUSY_SAFE },
+  { name: "bell", args: "[on|off]", ...BUSY_SAFE },
+  { name: "context", args: "[tokens|auto]", ...BUSY_SAFE },
+  { name: "budget", args: "[tokens]", ...BUSY_SAFE },
+  { name: "theme", args: "[color]", ...BUSY_SAFE },
+  { name: "lang", ...BUSY_SAFE },
   { name: "prompt", args: "[save <name>|delete <name>]" },
   { name: "skills", args: "[install <source>]" },
   { name: "bypass" },
-  { name: "usage" },
+  { name: "usage", ...BUSY_SAFE },
   { name: "mcp", args: "[add|list|delete|enable|disable]" },
   { name: "attach", args: "<path|clipboard|clear>" },
   { name: "memory", args: "[show|set <text>|clear]" },
   { name: "compact" },
   { name: "update" },
-  { name: "checker" },
+  { name: "checker", ...BUSY_SAFE },
   { name: "sessions", args: "[list|rename|delete [all]|export]" },
-  { name: "config" },
+  { name: "config", ...BUSY_SAFE },
   { name: "resume" },
   { name: "undo" },
   { name: "clear" },
-  { name: "help" },
-  { name: "exit" },
-  { name: "subagents" }
+  { name: "subagents", ...BUSY_SAFE },
+  { name: "help", ...BUSY_SAFE },
+  { name: "exit", ...BUSY_SAFE }
 ];
 var SUBCOMMANDS = [
   { name: "mcp add", args: "<name> <url|-- command>" },
@@ -7675,6 +8109,10 @@ var SUBCOMMANDS = [
   { name: "sessions delete all" },
   { name: "sessions export", args: "[id] [path]" }
 ];
+function commandRunsWhileBusy(name) {
+  if (name === "quit") return true;
+  return COMMANDS.some((command) => command.name === name && command.runsWhileBusy === true);
+}
 function matchCommands(line) {
   if (!line.startsWith("/")) return [];
   const token = line.slice(1);
@@ -7712,17 +8150,23 @@ function isSubsequence2(needle, haystack) {
   return needle.length === 0;
 }
 function editDistance(a, b) {
+  let beforePrevious = [];
   let previous = Array.from({ length: b.length + 1 }, (_, index) => index);
   for (let i = 1; i <= a.length; i += 1) {
     const current = [i];
     for (let j = 1; j <= b.length; j += 1) {
       const cost = a[i - 1] === b[j - 1] ? 0 : 1;
-      current[j] = Math.min(
+      let best = Math.min(
         (current[j - 1] ?? 0) + 1,
         (previous[j] ?? 0) + 1,
         (previous[j - 1] ?? 0) + cost
       );
+      if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) {
+        best = Math.min(best, (beforePrevious[j - 2] ?? 0) + 1);
+      }
+      current[j] = best;
     }
+    beforePrevious = previous;
     previous = current;
   }
   return previous[b.length] ?? 0;
@@ -7783,11 +8227,19 @@ var PRESETS = {
   white: "#e5e7eb"
 };
 var DEFAULT_ACCENT = PRESETS.purple;
+function parseAccent(value) {
+  const trimmed = value.trim().toLowerCase();
+  if (Object.hasOwn(PRESETS, trimmed)) return trimmed;
+  const hex = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/.exec(trimmed)?.[1];
+  if (!hex) return void 0;
+  const full = hex.length === 3 ? [...hex].map((digit) => digit + digit).join("") : hex;
+  return `#${full}`;
+}
 function resolveAccent(value) {
   if (!value) return DEFAULT_ACCENT;
-  const preset = PRESETS[value.toLowerCase()];
-  if (preset) return preset;
-  return /^#[0-9a-f]{6}$/i.test(value) ? value : DEFAULT_ACCENT;
+  const parsed = parseAccent(value);
+  if (!parsed) return DEFAULT_ACCENT;
+  return PRESETS[parsed] ?? parsed;
 }
 function makeTheme(accent) {
   return {
@@ -7851,10 +8303,12 @@ var en = {
   placeholder: "ask, or / for commands",
   working: "working\u2026",
   suggestHelp: "\u2191\u2193 move \xB7 tab complete \xB7 enter run",
-  more: (count) => `\u2026 ${count} more`,
+  more: (count2) => `\u2026 ${count2} more`,
   allowOnce: "allow once",
   always: "always",
   deny: "deny",
+  dangerousCommand: "risky command",
+  permissionKeys: "\u2191/\u2193 choose \xB7 enter confirm \xB7 y/a/n \xB7 esc deny",
   yes: "yes",
   noDefault: "no (default)",
   noMatches: "no matches",
@@ -7869,7 +8323,7 @@ var en = {
   titleModelRefresh: "Reload models for a provider",
   titleSessions: "Resume a session",
   titleSessionAction: "Session action",
-  resumed: (id, count) => `Resumed ${id} \u2014 ${count} messages restored`,
+  resumed: (id, count2) => `Resumed ${id} \u2014 ${count2} messages restored`,
   sessionsEmpty: "No saved sessions yet.",
   providerSet: (id, model) => `Provider: ${id} \xB7 model ${model}`,
   providersEmpty: "No providers configured. Use /login to add one.",
@@ -7877,11 +8331,15 @@ var en = {
   providerBalance: (balances) => `provider balance: ${balances}`,
   providerKeyRemaining: (balances) => `API key limit remaining: ${balances}`,
   noThink: "no-think",
-  mcpFailed: (count) => `mcp:${count} failed`,
+  mcpFailed: (count2) => `mcp:${count2} failed`,
   escCancel: "esc to cancel",
+  escClear: "esc clears the input \xB7 esc again cancels the answer",
   escHelp: "esc \u2014 cancel the running turn",
   cancelled: "Cancelled.",
-  queued: (count) => `queued: ${count}`,
+  queued: (count2) => `queued: ${count2}`,
+  pasteToken: (id, lines, chars) => `[paste #${id} \xB7 ${lines > 1 ? `${lines} lines` : `${chars} chars`}]`,
+  inputRows: (from, to, total) => `lines ${from}\u2013${to} of ${total}`,
+  queueHint: "waiting for the current answer \xB7 \u2191/\u2193 pick one to edit \xB7 enter puts it back in its place",
   configAt: (path15) => `config: ${path15}`,
   skillsEmpty: "No skills installed. Drop a folder with a SKILL.md into ~/.kitcode/skills or ./.kitcode/skills",
   skillsInstallUsage: "Usage: /skills install <github-url|npm-package|local-path>",
@@ -7900,7 +8358,7 @@ var en = {
   mcpDeleted: (name) => `MCP "${name}" disconnected and removed.`,
   mcpDeleteFailed: (name, error) => `Could not remove MCP "${name}": ${error}`,
   mcpNotFound: (name) => `MCP server "${name}" was not found.`,
-  mcpTools: (count) => `${count} tools`,
+  mcpTools: (count2) => `${count2} tools`,
   mcpEnabled: (name, tools) => `MCP "${name}" enabled \xB7 ${tools} tools`,
   mcpDisabled: (name) => `MCP "${name}" disabled.`,
   mcpToggleFailed: (name, error) => `Could not change MCP "${name}": ${error}`,
@@ -7910,14 +8368,24 @@ var en = {
     error: "error",
     disabled: "disabled"
   },
-  activeAgents: (count) => `agents: ${count}`,
-  subagentsStatus: (count) => count > 0 ? `Active sub-agents: ${count}` : "No active sub-agents.",
+  moreAgents: (count2) => `+${count2} more`,
+  noSubagents: "No sub-agents in this session yet.",
+  subagentsTitle: "Open a sub-agent chat",
+  subagentRunning: "running",
+  subagentDone: "done",
+  subagentWaiting: "waiting for the first step\u2026",
+  subagentBack: "esc back",
   attachUsage: "Usage: /attach <image-or-text-file> \xB7 /attach clipboard \xB7 /attach clear",
   attachmentAdded: (name) => `Attached for the next message: ${name}`,
   attachmentsCleared: "Pending attachments cleared.",
   compactNothing: "Not enough older conversation to compact yet.",
   compactStarting: "Compacting context\u2026",
-  compactDone: (count) => `Context compacted \xB7 ${count} older messages replaced with a summary.`,
+  compactDone: (summarised, cleared, before, after) => [
+    "Context compacted",
+    summarised > 0 ? `${summarised} older messages replaced with a summary` : "",
+    cleared > 0 ? `${cleared} old tool outputs cleared` : "",
+    before !== void 0 && after !== void 0 ? `~${tokens(before)} \u2192 ~${tokens(after)} tokens` : ""
+  ].filter(Boolean).join(" \xB7 ") + ".",
   sessionRenameUsage: "Type the title after the command: /sessions rename <id> <title>",
   sessionRenamed: (title) => `Session renamed to "${title}".`,
   sessionDeleteAsk: "The saved chat file will be deleted. This cannot be undone.",
@@ -7926,7 +8394,7 @@ var en = {
   sessionDeleteAllAskBody: "All KitCode sessions from every workspace will be permanently deleted.",
   sessionDeleteAllFinalAsk: "Final confirmation: delete all chats?",
   sessionDeleteAllFinalBody: "This cannot be undone. Press y only if you want to erase the complete session history.",
-  sessionsDeletedAll: (count) => `All saved chats deleted \xB7 ${count} sessions removed.`,
+  sessionsDeletedAll: (count2) => `All saved chats deleted \xB7 ${count2} sessions removed.`,
   sessionsDeleteAllFailed: (deleted, failed) => `Session cleanup was incomplete \xB7 ${deleted} removed, ${failed} failed.`,
   sessionExported: (path15) => `Session exported to ${path15}`,
   sessionActionResume: "resume",
@@ -7939,14 +8407,18 @@ ${url}`,
   updateCurrent: (version) => `KitCode ${version} is up to date.`,
   updateFailed: (reason) => `Could not check for updates: ${reason}.`,
   accentSet: (name, hex) => `Accent: ${name} (${hex})`,
+  accentInvalid: (value) => `"${value}" is not a colour. Use a preset name or a hex code like #ff8800 or #f80.`,
+  customAccent: "custom colour\u2026",
+  customAccentPrompt: "Hex colour, e.g. #ff8800 or #f80",
   reasoning: (on) => `Reasoning ${on ? "on" : "off"}`,
+  bellState: (on) => on ? "Sound on: a beep when a long answer finishes or a permission is needed." : "Sound off.",
   effortSet: (value) => `Effort: ${value}`,
-  budgetCurrent: (tokens3) => `Token budget: ${tokens3.toLocaleString()} per turn`,
-  budgetSet: (tokens3) => `Token budget set to ${tokens3.toLocaleString()} per turn`,
+  budgetCurrent: (tokens2) => `Token budget: ${tokens2.toLocaleString()} per turn`,
+  budgetSet: (tokens2) => `Token budget set to ${tokens2.toLocaleString()} per turn`,
   budgetUnlimited: "Token budget: unlimited (0). Set /budget <tokens> to restore a limit.",
   budgetInvalid: "Invalid budget: must be between 1,000 and 10,000,000",
   modelSet: (value) => `Model: ${value}`,
-  modelsRefreshed: (provider, count) => `${provider}: ${count} models reloaded from the endpoint.`,
+  modelsRefreshed: (provider, count2) => `${provider}: ${count2} models reloaded from the endpoint.`,
   noModels: "No models available. Use /login to add a provider.",
   bypassOff: "Approval prompts are back on.",
   bypassAsk1: "Disable approval prompts for this session?",
@@ -7973,10 +8445,17 @@ ${url}`,
   promptsEmpty: "No saved prompts. Use /prompt save <name>.",
   unknownCommand: (name) => `Unknown command /${name}. Try /help`,
   didYouMean: (typed, guess) => `Unknown command /${typed}. Did you mean /${guess}?`,
-  undoNothing: "Nothing to undo in this session.",
+  undoNothing: "Nothing to undo: no file changes made by kitcode in this folder.",
   undoResult: (restored, removed) => `Undo complete: ${restored} restored, ${removed} newly created removed.`,
   undoConflicts: (paths) => `Kept newer changes in: ${paths.join(", ")}`,
   undoFailed: (failures) => `Could not restore: ${failures.join("; ")}`,
+  titleContext: "Context window",
+  contextCurrent: (tokens2) => `Context window: ${tokens2.toLocaleString()} tokens`,
+  contextSet: (tokens2) => `Context window set to ${tokens2.toLocaleString()} tokens. Auto-compact triggers at 80%.`,
+  contextAuto: (tokens2) => tokens2 === null ? "Context window: unknown \u2014 using whatever the provider reports." : `Context window: auto (${tokens2.toLocaleString()} tokens from the provider).`,
+  contextUnknown: "Context window: unknown. Set it with /context 256k, /context 512k or /context 1m.",
+  contextInvalid: "Usage: /context 256k | 512k | 1m | <tokens> | auto",
+  contextCurrentLabel: "current",
   titleAccent: "Accent colour",
   titleEffort: "Reasoning depth",
   titleModel: "Model",
@@ -7986,7 +8465,7 @@ ${url}`,
   titleMcpDelete: "Remove an MCP server",
   titleMcpEnable: "Enable an MCP server",
   titleMcpDisable: "Disable an MCP server",
-  modeLabel: { normal: "normal", accept: "auto-accept edits", plan: "plan only" },
+  modeLabel: { normal: "normal", accept: "auto-accept edits", plan: "plan only", bypass: "BYPASS \u2014 no permission prompts" },
   modeChanged: (label) => `Mode: ${label}  (shift+tab to cycle)`,
   cmd: {
     model: "switch model",
@@ -7997,6 +8476,8 @@ ${url}`,
     refresh: "reload the model list for a provider",
     effort: "set reasoning depth",
     thinking: "toggle reasoning",
+    bell: "toggle the sound for finished answers and permission prompts",
+    context: "set or show the model context window",
     budget: "set token budget per turn",
     theme: "change the accent colour",
     lang: "change the interface language",
@@ -8029,7 +8510,7 @@ ${url}`,
     clear: "start a fresh session",
     help: "list commands",
     exit: "quit",
-    subagents: "show active sub-agents and what they are doing"
+    subagents: "open a sub-agent and watch its chat live"
   }
 };
 var ru = {
@@ -8043,10 +8524,12 @@ var ru = {
   placeholder: "\u0441\u043F\u0440\u043E\u0441\u0438, \u0438\u043B\u0438 / \u0434\u043B\u044F \u043A\u043E\u043C\u0430\u043D\u0434",
   working: "\u0440\u0430\u0431\u043E\u0442\u0430\u044E\u2026",
   suggestHelp: "\u2191\u2193 \u0432\u044B\u0431\u043E\u0440 \xB7 tab \u2014 \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u044C \xB7 enter \u2014 \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C",
-  more: (count) => `\u2026 \u0435\u0449\u0451 ${count}`,
+  more: (count2) => `\u2026 \u0435\u0449\u0451 ${count2}`,
   allowOnce: "\u0440\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044C \u043E\u0434\u0438\u043D \u0440\u0430\u0437",
   always: "\u0432\u0441\u0435\u0433\u0434\u0430",
   deny: "\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C",
+  dangerousCommand: "\u0440\u0438\u0441\u043A\u043E\u0432\u0430\u043D\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430",
+  permissionKeys: "\u2191/\u2193 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \xB7 enter \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C \xB7 y/a/n \xB7 esc \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C",
   yes: "\u0434\u0430",
   noDefault: "\u043D\u0435\u0442 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E)",
   noMatches: "\u043D\u0438\u0447\u0435\u0433\u043E \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E",
@@ -8061,7 +8544,7 @@ var ru = {
   titleModelRefresh: "\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u043C\u043E\u0434\u0435\u043B\u0438 \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u0430",
   titleSessions: "\u0412\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0435\u0441\u0441\u0438\u044E",
   titleSessionAction: "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0441 \u0441\u0435\u0441\u0441\u0438\u0435\u0439",
-  resumed: (id, count) => `\u0421\u0435\u0441\u0441\u0438\u044F ${id} \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u2014 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439: ${count}`,
+  resumed: (id, count2) => `\u0421\u0435\u0441\u0441\u0438\u044F ${id} \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u2014 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439: ${count2}`,
   sessionsEmpty: "\u0421\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0445 \u0441\u0435\u0441\u0441\u0438\u0439 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442.",
   providerSet: (id, model) => `\u041F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440: ${id} \xB7 \u043C\u043E\u0434\u0435\u043B\u044C ${model}`,
   providersEmpty: "\u041F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u043E\u0432 \u043D\u0435\u0442. \u0414\u043E\u0431\u0430\u0432\u044C \u0447\u0435\u0440\u0435\u0437 /login.",
@@ -8069,11 +8552,15 @@ var ru = {
   providerBalance: (balances) => `\u0431\u0430\u043B\u0430\u043D\u0441 \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u0430: ${balances}`,
   providerKeyRemaining: (balances) => `\u043E\u0441\u0442\u0430\u0442\u043E\u043A \u043B\u0438\u043C\u0438\u0442\u0430 API-\u043A\u043B\u044E\u0447\u0430: ${balances}`,
   noThink: "\u0431\u0435\u0437 \u0440\u0430\u0437\u043C\u044B\u0448\u043B\u0435\u043D\u0438\u0439",
-  mcpFailed: (count) => `mcp: ${count} \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439`,
+  mcpFailed: (count2) => `mcp: ${count2} \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439`,
   escCancel: "esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C",
+  escClear: "esc \u2014 \u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C \u043F\u043E\u043B\u0435 \xB7 \u0435\u0449\u0451 \u0440\u0430\u0437 esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043E\u0442\u0432\u0435\u0442",
   escHelp: "esc \u2014 \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0445\u043E\u0434",
   cancelled: "\u041E\u0442\u043C\u0435\u043D\u0435\u043D\u043E.",
-  queued: (count) => `\u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u0438: ${count}`,
+  queued: (count2) => `\u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u0438: ${count2}`,
+  pasteToken: (id, lines, chars) => `[\u0432\u0441\u0442\u0430\u0432\u043A\u0430 #${id} \xB7 ${lines > 1 ? `${lines} \u0441\u0442\u0440\u043E\u043A` : `${chars} \u0441\u0438\u043C\u0432\u043E\u043B\u043E\u0432`}]`,
+  inputRows: (from, to, total) => `\u0441\u0442\u0440\u043E\u043A\u0438 ${from}\u2013${to} \u0438\u0437 ${total}`,
+  queueHint: "\u0436\u0434\u0443\u0442 \u0442\u0435\u043A\u0443\u0449\u0435\u0433\u043E \u043E\u0442\u0432\u0435\u0442\u0430 \xB7 \u2191/\u2193 \u2014 \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u043E\u0434\u043D\u043E \u0434\u043B\u044F \u043F\u0440\u0430\u0432\u043A\u0438 \xB7 enter \u0432\u0435\u0440\u043D\u0451\u0442 \u0435\u0433\u043E \u043D\u0430 \u043C\u0435\u0441\u0442\u043E",
   configAt: (path15) => `\u043A\u043E\u043D\u0444\u0438\u0433: ${path15}`,
   skillsEmpty: "\u0421\u043A\u0438\u043B\u043B\u043E\u0432 \u043D\u0435\u0442. \u041F\u043E\u043B\u043E\u0436\u0438 \u043F\u0430\u043F\u043A\u0443 \u0441 \u0444\u0430\u0439\u043B\u043E\u043C SKILL.md \u0432 ~/.kitcode/skills \u0438\u043B\u0438 ./.kitcode/skills",
   skillsInstallUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /skills install <github-url|npm-\u043F\u0430\u043A\u0435\u0442|\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439-\u043F\u0443\u0442\u044C>",
@@ -8092,7 +8579,7 @@ var ru = {
   mcpDeleted: (name) => `MCP \xAB${name}\xBB \u043E\u0442\u043A\u043B\u044E\u0447\u0451\u043D \u0438 \u0443\u0434\u0430\u043B\u0451\u043D.`,
   mcpDeleteFailed: (name, error) => `\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0443\u0434\u0430\u043B\u0438\u0442\u044C MCP \xAB${name}\xBB: ${error}`,
   mcpNotFound: (name) => `MCP-\u0441\u0435\u0440\u0432\u0435\u0440 \xAB${name}\xBB \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.`,
-  mcpTools: (count) => `\u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${count}`,
+  mcpTools: (count2) => `\u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${count2}`,
   mcpEnabled: (name, tools) => `MCP \xAB${name}\xBB \u0432\u043A\u043B\u044E\u0447\u0451\u043D \xB7 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${tools}`,
   mcpDisabled: (name) => `MCP \xAB${name}\xBB \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D.`,
   mcpToggleFailed: (name, error) => `\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C MCP \xAB${name}\xBB: ${error}`,
@@ -8102,14 +8589,24 @@ var ru = {
     error: "\u043E\u0448\u0438\u0431\u043A\u0430",
     disabled: "\u043E\u0442\u043A\u043B\u044E\u0447\u0451\u043D"
   },
-  activeAgents: (count) => `\u0430\u0433\u0435\u043D\u0442\u043E\u0432: ${count}`,
-  subagentsStatus: (count) => count > 0 ? `\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0445 \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u043E\u0432: ${count}` : "\u041D\u0435\u0442 \u0430\u043A\u0442\u0438\u0432\u043D\u044B\u0445 \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u043E\u0432.",
+  moreAgents: (count2) => `+${count2} \u0435\u0449\u0451`,
+  noSubagents: "\u0412 \u044D\u0442\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u0435\u0449\u0451 \u043D\u0435 \u0431\u044B\u043B\u043E \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u043E\u0432.",
+  subagentsTitle: "\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u0447\u0430\u0442 \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u0430",
+  subagentRunning: "\u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442",
+  subagentDone: "\u0433\u043E\u0442\u043E\u0432\u043E",
+  subagentWaiting: "\u0436\u0434\u0451\u043C \u043F\u0435\u0440\u0432\u044B\u0439 \u0448\u0430\u0433\u2026",
+  subagentBack: "esc \u2014 \u043D\u0430\u0437\u0430\u0434",
   attachUsage: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /attach <\u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0430-\u0438\u043B\u0438-\u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439-\u0444\u0430\u0439\u043B> \xB7 /attach clipboard \xB7 /attach clear",
   attachmentAdded: (name) => `\u041F\u0440\u0438\u043A\u0440\u0435\u043F\u043B\u0435\u043D\u043E \u043A \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u043C\u0443 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044E: ${name}`,
   attachmentsCleared: "\u041E\u0436\u0438\u0434\u0430\u044E\u0449\u0438\u0435 \u0432\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0443\u0431\u0440\u0430\u043D\u044B.",
   compactNothing: "\u041F\u043E\u043A\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u0447\u043D\u043E \u0441\u0442\u0430\u0440\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0434\u043B\u044F \u0441\u0436\u0430\u0442\u0438\u044F \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430.",
   compactStarting: "\u0421\u0436\u0430\u0442\u0438\u0435 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430\u2026",
-  compactDone: (count) => `\u041A\u043E\u043D\u0442\u0435\u043A\u0441\u0442 \u0441\u0436\u0430\u0442 \xB7 \u0441\u0442\u0430\u0440\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u043E \u0441\u0432\u043E\u0434\u043A\u043E\u0439: ${count}.`,
+  compactDone: (summarised, cleared, before, after) => [
+    "\u041A\u043E\u043D\u0442\u0435\u043A\u0441\u0442 \u0441\u0436\u0430\u0442",
+    summarised > 0 ? `\u0441\u0442\u0430\u0440\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u043E \u0441\u0432\u043E\u0434\u043A\u043E\u0439: ${summarised}` : "",
+    cleared > 0 ? `\u043E\u0447\u0438\u0449\u0435\u043D\u043E \u0441\u0442\u0430\u0440\u044B\u0445 \u0432\u044B\u0432\u043E\u0434\u043E\u0432 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u043E\u0432: ${cleared}` : "",
+    before !== void 0 && after !== void 0 ? `~${tokens(before)} \u2192 ~${tokens(after)} \u0442\u043E\u043A\u0435\u043D\u043E\u0432` : ""
+  ].filter(Boolean).join(" \xB7 ") + ".",
   sessionRenameUsage: "\u0414\u043E\u043F\u0438\u0448\u0438 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435: /sessions rename <id> <\u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435>",
   sessionRenamed: (title) => `\u0421\u0435\u0441\u0441\u0438\u044F \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0430 \u0432 \xAB${title}\xBB.`,
   sessionDeleteAsk: "\u0424\u0430\u0439\u043B \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u043E\u0433\u043E \u0447\u0430\u0442\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043B\u0451\u043D \u0431\u0435\u0437 \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u0438 \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F.",
@@ -8118,7 +8615,7 @@ var ru = {
   sessionDeleteAllAskBody: "\u0411\u0443\u0434\u0443\u0442 \u043D\u0430\u0432\u0441\u0435\u0433\u0434\u0430 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u0432\u0441\u0435 \u0441\u0435\u0441\u0441\u0438\u0438 KitCode \u0438\u0437 \u0432\u0441\u0435\u0445 \u0440\u0430\u0431\u043E\u0447\u0438\u0445 \u043F\u0430\u043F\u043E\u043A.",
   sessionDeleteAllFinalAsk: "\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u0435: \u0442\u043E\u0447\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0432\u0441\u0435 \u0447\u0430\u0442\u044B?",
   sessionDeleteAllFinalBody: "\u042D\u0442\u043E \u043D\u0435\u043B\u044C\u0437\u044F \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C. \u041D\u0430\u0436\u0438\u043C\u0430\u0439 y \u0442\u043E\u043B\u044C\u043A\u043E \u0435\u0441\u043B\u0438 \u0445\u043E\u0447\u0435\u0448\u044C \u0441\u0442\u0435\u0440\u0435\u0442\u044C \u0432\u0441\u044E \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u0441\u0435\u0441\u0441\u0438\u0439.",
-  sessionsDeletedAll: (count) => `\u0412\u0441\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u0447\u0430\u0442\u044B \u0443\u0434\u0430\u043B\u0435\u043D\u044B \xB7 \u0441\u0435\u0441\u0441\u0438\u0439: ${count}.`,
+  sessionsDeletedAll: (count2) => `\u0412\u0441\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0435 \u0447\u0430\u0442\u044B \u0443\u0434\u0430\u043B\u0435\u043D\u044B \xB7 \u0441\u0435\u0441\u0441\u0438\u0439: ${count2}.`,
   sessionsDeleteAllFailed: (deleted, failed) => `\u0423\u0434\u0430\u043B\u0435\u043D\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E \u043D\u0435 \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \xB7 \u0443\u0434\u0430\u043B\u0435\u043D\u043E: ${deleted}, \u043E\u0448\u0438\u0431\u043E\u043A: ${failed}.`,
   sessionExported: (path15) => `\u0421\u0435\u0441\u0441\u0438\u044F \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0430: ${path15}`,
   sessionActionResume: "\u043E\u0442\u043A\u0440\u044B\u0442\u044C",
@@ -8131,14 +8628,18 @@ ${url}`,
   updateCurrent: (version) => `\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u0430\u043A\u0442\u0443\u0430\u043B\u044C\u043D\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F KitCode ${version}.`,
   updateFailed: (reason) => `\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F: ${reason}.`,
   accentSet: (name, hex) => `\u0426\u0432\u0435\u0442: ${name} (${hex})`,
+  accentInvalid: (value) => `\xAB${value}\xBB \u2014 \u043D\u0435 \u0446\u0432\u0435\u0442. \u0423\u043A\u0430\u0436\u0438 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0438\u0437 \u0441\u043F\u0438\u0441\u043A\u0430 \u0438\u043B\u0438 hex-\u043A\u043E\u0434, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 #ff8800 \u0438\u043B\u0438 #f80.`,
+  customAccent: "\u0441\u0432\u043E\u0439 \u0446\u0432\u0435\u0442\u2026",
+  customAccentPrompt: "Hex-\u043A\u043E\u0434 \u0446\u0432\u0435\u0442\u0430, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 #ff8800 \u0438\u043B\u0438 #f80",
   reasoning: (on) => `\u0420\u0430\u0437\u043C\u044B\u0448\u043B\u0435\u043D\u0438\u044F ${on ? "\u0432\u043A\u043B\u044E\u0447\u0435\u043D\u044B" : "\u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D\u044B"}`,
+  bellState: (on) => on ? "\u0417\u0432\u0443\u043A \u0432\u043A\u043B\u044E\u0447\u0451\u043D: \u0441\u0438\u0433\u043D\u0430\u043B, \u043A\u043E\u0433\u0434\u0430 \u0434\u043E\u043B\u0433\u0438\u0439 \u043E\u0442\u0432\u0435\u0442 \u0433\u043E\u0442\u043E\u0432 \u0438\u043B\u0438 \u043D\u0443\u0436\u043D\u043E \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435." : "\u0417\u0432\u0443\u043A \u0432\u044B\u043A\u043B\u044E\u0447\u0435\u043D.",
   effortSet: (value) => `\u0413\u043B\u0443\u0431\u0438\u043D\u0430: ${value}`,
-  budgetCurrent: (tokens3) => `\u041B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432: ${tokens3.toLocaleString()} \u0437\u0430 \u0445\u043E\u0434`,
-  budgetSet: (tokens3) => `\u041B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D: ${tokens3.toLocaleString()} \u0437\u0430 \u0445\u043E\u0434`,
+  budgetCurrent: (tokens2) => `\u041B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432: ${tokens2.toLocaleString()} \u0437\u0430 \u0445\u043E\u0434`,
+  budgetSet: (tokens2) => `\u041B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D: ${tokens2.toLocaleString()} \u0437\u0430 \u0445\u043E\u0434`,
   budgetUnlimited: "\u041B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432: \u0431\u0435\u0437\u043B\u0438\u043C\u0438\u0442\u043D\u044B\u0439 (0). \u0412\u0432\u0435\u0434\u0438 /budget <\u0447\u0438\u0441\u043B\u043E> \u0447\u0442\u043E\u0431\u044B \u0432\u0435\u0440\u043D\u0443\u0442\u044C \u043B\u0438\u043C\u0438\u0442.",
   budgetInvalid: "\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043B\u0438\u043C\u0438\u0442: \u043E\u0442 1 000 \u0434\u043E 10 000 000",
   modelSet: (value) => `\u041C\u043E\u0434\u0435\u043B\u044C: ${value}`,
-  modelsRefreshed: (provider, count) => `${provider}: \u0441 \u044D\u043D\u0434\u043F\u043E\u0438\u043D\u0442\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043E \u043C\u043E\u0434\u0435\u043B\u0435\u0439 \u2014 ${count}.`,
+  modelsRefreshed: (provider, count2) => `${provider}: \u0441 \u044D\u043D\u0434\u043F\u043E\u0438\u043D\u0442\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u043E \u043C\u043E\u0434\u0435\u043B\u0435\u0439 \u2014 ${count2}.`,
   noModels: "\u041C\u043E\u0434\u0435\u043B\u0435\u0439 \u043D\u0435\u0442. \u0414\u043E\u0431\u0430\u0432\u044C \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u0430 \u0447\u0435\u0440\u0435\u0437 /login.",
   bypassOff: "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F \u0441\u043D\u043E\u0432\u0430 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u044B.",
   bypassAsk1: "\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F \u043D\u0430 \u044D\u0442\u0443 \u0441\u0435\u0441\u0441\u0438\u044E?",
@@ -8165,10 +8666,17 @@ ${url}`,
   promptsEmpty: "\u0421\u043E\u0445\u0440\u0430\u043D\u0451\u043D\u043D\u044B\u0445 \u043F\u0440\u043E\u043C\u0442\u043E\u0432 \u043D\u0435\u0442. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439 /prompt save <\u0438\u043C\u044F>.",
   unknownCommand: (name) => `\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 /${name}. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439 /help`,
   didYouMean: (typed, guess) => `\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 /${typed}. \u041C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C /${guess}?`,
-  undoNothing: "\u0412 \u044D\u0442\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u043F\u043E\u043A\u0430 \u043D\u0435\u0447\u0435\u0433\u043E \u043E\u0442\u043A\u0430\u0442\u044B\u0432\u0430\u0442\u044C.",
+  undoNothing: "\u041D\u0435\u0447\u0435\u0433\u043E \u043E\u0442\u043A\u0430\u0442\u044B\u0432\u0430\u0442\u044C: kitcode \u0435\u0449\u0451 \u043D\u0435 \u043C\u0435\u043D\u044F\u043B \u0444\u0430\u0439\u043B\u044B \u0432 \u044D\u0442\u043E\u0439 \u043F\u0430\u043F\u043A\u0435.",
   undoResult: (restored, removed) => `\u041E\u0442\u043A\u0430\u0442 \u0437\u0430\u0432\u0435\u0440\u0448\u0451\u043D: \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E ${restored}, \u0443\u0434\u0430\u043B\u0435\u043D\u043E \u043D\u043E\u0432\u044B\u0445 \u0444\u0430\u0439\u043B\u043E\u0432 ${removed}.`,
   undoConflicts: (paths) => `\u0411\u043E\u043B\u0435\u0435 \u0441\u0432\u0435\u0436\u0438\u0435 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u044B \u0432: ${paths.join(", ")}`,
   undoFailed: (failures) => `\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C: ${failures.join("; ")}`,
+  titleContext: "\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430",
+  contextCurrent: (tokens2) => `\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430: ${tokens2.toLocaleString()} \u0442\u043E\u043A\u0435\u043D\u043E\u0432`,
+  contextSet: (tokens2) => `\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430: ${tokens2.toLocaleString()} \u0442\u043E\u043A\u0435\u043D\u043E\u0432. \u0410\u0432\u0442\u043E\u0441\u0436\u0430\u0442\u0438\u0435 \u0441\u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043D\u0430 80%.`,
+  contextAuto: (tokens2) => tokens2 === null ? "\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430: \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E \u2014 \u0431\u0435\u0440\u0451\u043C \u0442\u043E, \u0447\u0442\u043E \u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442 \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440." : `\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430: \u0430\u0432\u0442\u043E (${tokens2.toLocaleString()} \u0442\u043E\u043A\u0435\u043D\u043E\u0432 \u043E\u0442 \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u0430).`,
+  contextUnknown: "\u041E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E. \u0417\u0430\u0434\u0430\u0439 \u0435\u0433\u043E: /context 256k, /context 512k \u0438\u043B\u0438 /context 1m.",
+  contextInvalid: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435: /context 256k | 512k | 1m | <\u0442\u043E\u043A\u0435\u043D\u044B> | auto",
+  contextCurrentLabel: "\u0442\u0435\u043A\u0443\u0449\u0435\u0435",
   titleAccent: "\u0426\u0432\u0435\u0442 \u0430\u043A\u0446\u0435\u043D\u0442\u0430",
   titleEffort: "\u0413\u043B\u0443\u0431\u0438\u043D\u0430 \u0440\u0430\u0437\u043C\u044B\u0448\u043B\u0435\u043D\u0438\u0439",
   titleModel: "\u041C\u043E\u0434\u0435\u043B\u044C",
@@ -8178,7 +8686,7 @@ ${url}`,
   titleMcpDelete: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C MCP-\u0441\u0435\u0440\u0432\u0435\u0440",
   titleMcpEnable: "\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C MCP-\u0441\u0435\u0440\u0432\u0435\u0440",
   titleMcpDisable: "\u0412\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C MCP-\u0441\u0435\u0440\u0432\u0435\u0440",
-  modeLabel: { normal: "\u043E\u0431\u044B\u0447\u043D\u044B\u0439", accept: "\u043F\u0440\u0430\u0432\u043A\u0438 \u0431\u0435\u0437 \u0441\u043F\u0440\u043E\u0441\u0430", plan: "\u0442\u043E\u043B\u044C\u043A\u043E \u043F\u043B\u0430\u043D" },
+  modeLabel: { normal: "\u043E\u0431\u044B\u0447\u043D\u044B\u0439", accept: "\u043F\u0440\u0430\u0432\u043A\u0438 \u0431\u0435\u0437 \u0441\u043F\u0440\u043E\u0441\u0430", plan: "\u0442\u043E\u043B\u044C\u043A\u043E \u043F\u043B\u0430\u043D", bypass: "BYPASS \u2014 \u0431\u0435\u0437 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0439" },
   modeChanged: (label) => `\u0420\u0435\u0436\u0438\u043C: ${label}  (shift+tab \u2014 \u043F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C)`,
   cmd: {
     model: "\u0441\u043C\u0435\u043D\u0438\u0442\u044C \u043C\u043E\u0434\u0435\u043B\u044C",
@@ -8189,6 +8697,8 @@ ${url}`,
     refresh: "\u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u043F\u0438\u0441\u043E\u043A \u043C\u043E\u0434\u0435\u043B\u0435\u0439 \u043F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440\u0430",
     effort: "\u0433\u043B\u0443\u0431\u0438\u043D\u0430 \u0440\u0430\u0437\u043C\u044B\u0448\u043B\u0435\u043D\u0438\u0439",
     thinking: "\u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0440\u0430\u0437\u043C\u044B\u0448\u043B\u0435\u043D\u0438\u044F",
+    bell: "\u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0437\u0432\u0443\u043A \u043E \u0433\u043E\u0442\u043E\u0432\u043E\u043C \u043E\u0442\u0432\u0435\u0442\u0435 \u0438 \u0437\u0430\u043F\u0440\u043E\u0441\u0430\u0445 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0439",
+    context: "\u0437\u0430\u0434\u0430\u0442\u044C \u0438\u043B\u0438 \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043E\u043A\u043D\u043E \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u043C\u043E\u0434\u0435\u043B\u0438",
     budget: "\u043B\u0438\u043C\u0438\u0442 \u0442\u043E\u043A\u0435\u043D\u043E\u0432 \u0437\u0430 \u0445\u043E\u0434 (0 = \u0431\u0435\u0437\u043B\u0438\u043C\u0438\u0442)",
     theme: "\u0441\u043C\u0435\u043D\u0438\u0442\u044C \u0446\u0432\u0435\u0442 \u0430\u043A\u0446\u0435\u043D\u0442\u0430",
     lang: "\u0441\u043C\u0435\u043D\u0438\u0442\u044C \u044F\u0437\u044B\u043A \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430",
@@ -8220,7 +8730,7 @@ ${url}`,
     clear: "\u043D\u0430\u0447\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0441\u0435\u0441\u0441\u0438\u044E",
     help: "\u0441\u043F\u0438\u0441\u043E\u043A \u043A\u043E\u043C\u0430\u043D\u0434",
     exit: "\u0432\u044B\u0445\u043E\u0434",
-    subagents: "\u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0430\u043A\u0442\u0438\u0432\u043D\u044B\u0445 \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u043E\u0432 \u0438 \u0447\u0435\u043C \u0437\u0430\u043D\u044F\u0442\u044B"
+    subagents: "\u043E\u0442\u043A\u0440\u044B\u0442\u044C \u0441\u0443\u0431-\u0430\u0433\u0435\u043D\u0442\u0430 \u0438 \u0441\u043C\u043E\u0442\u0440\u0435\u0442\u044C \u0435\u0433\u043E \u0447\u0430\u0442 \u0432\u0436\u0438\u0432\u0443\u044E"
   }
 };
 var DICTIONARIES = { en, ru };
@@ -8431,9 +8941,11 @@ function Onboarding({ onSubmit }) {
 
 // src/ui/components/PermissionPrompt.tsx
 import { Box as Box6, Text as Text6 } from "ink";
+import { useEffect, useRef as useRef2, useState as useState3 } from "react";
 
 // src/ui/components/Diff.tsx
 import { Box as Box5, Text as Text5 } from "ink";
+import stringWidth from "string-width";
 
 // src/ui/diff.ts
 var MAX_RENDER_DIFF_CHARS = 5e5;
@@ -8460,28 +8972,54 @@ function diffBody(before, after) {
   let added = 0;
   let removed = 0;
   for (let i = Math.max(0, start - 2); i < start; i += 1) {
-    hunk.push({ kind: "ctx", text: a[i] ?? "" });
+    hunk.push({ kind: "ctx", text: a[i] ?? "", line: i + 1 });
   }
+  const dels = [];
   for (let i = start; i < endA; i += 1) {
-    hunk.push({ kind: "del", text: a[i] ?? "" });
+    dels.push({ kind: "del", text: a[i] ?? "", line: i + 1 });
     removed += 1;
   }
+  const adds = [];
   for (let i = start; i < endB; i += 1) {
-    hunk.push({ kind: "add", text: b[i] ?? "" });
+    adds.push({ kind: "add", text: b[i] ?? "", line: i + 1 });
     added += 1;
   }
+  if (dels.length === adds.length) {
+    dels.forEach((del, index) => {
+      const add = adds[index];
+      const span = changedSpans(del.text, add.text);
+      if (span) {
+        del.changed = span.before;
+        add.changed = span.after;
+      }
+    });
+  }
+  hunk.push(...dels, ...adds);
   for (let i = endA; i < Math.min(a.length, endA + 2); i += 1) {
-    hunk.push({ kind: "ctx", text: a[i] ?? "" });
+    hunk.push({ kind: "ctx", text: a[i] ?? "", line: i + 1 });
   }
   return { added, removed, hunk };
 }
+function changedSpans(before, after) {
+  if (before === after) return null;
+  let head = 0;
+  while (head < before.length && head < after.length && before[head] === after[head]) head += 1;
+  let tail2 = 0;
+  while (tail2 < before.length - head && tail2 < after.length - head && before[before.length - 1 - tail2] === after[after.length - 1 - tail2]) tail2 += 1;
+  if (head + tail2 < Math.min(before.length, after.length) / 3) return null;
+  return { before: [head, before.length - tail2], after: [head, after.length - tail2] };
+}
 function truncate2(text, width) {
   return text.length <= width ? text : `${text.slice(0, width - 1)}\u2026`;
 }
 
 // src/ui/components/Diff.tsx
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function Diff({ before, after }) {
+import { Fragment, jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+var STYLE = {
+  add: { sign: "+", fg: "#86efac", bg: "#173822", strong: "#2c6a40" },
+  del: { sign: "-", fg: "#fca5a5", bg: "#3f1c1c", strong: "#83302d" }
+};
+function Diff({ before, after, indent }) {
   if (!canRenderDiff(before, after)) {
     return /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
       "Diff preview omitted: it exceeds ",
@@ -8490,77 +9028,152 @@ function Diff({ before, after }) {
     ] });
   }
   const { hunk, hidden } = diffLines(sanitizeTerminalText(before), sanitizeTerminalText(after));
-  return /* @__PURE__ */ jsx5(DiffHunk, { lines: hunk, hidden });
+  return /* @__PURE__ */ jsx5(DiffHunk, { lines: hunk, hidden, indent });
 }
-function DiffHunk({ lines, hidden }) {
+function DiffHunk({ lines, hidden, indent = 2 }) {
+  const { columns } = useTerminalSize();
+  const gutter = Math.max(1, ...lines.map((line) => String(line.line ?? "").length));
+  const width = Math.max(10, (Number.isFinite(columns) ? columns : 80) - indent - gutter - 4);
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
-    lines.map((line, index) => /* @__PURE__ */ jsxs5(
-      Text5,
-      {
-        color: line.kind === "add" ? "green" : line.kind === "del" ? "red" : "gray",
-        dimColor: line.kind === "ctx",
-        children: [
-          line.kind === "add" ? "+ " : line.kind === "del" ? "- " : "  ",
-          truncate2(sanitizeTerminalText(line.text), 110)
-        ]
-      },
-      index
-    )),
+    lines.map((line, index) => {
+      const text = sanitizeTerminalText(line.text).replace(/\t/g, "  ").replace(/\r$/, "");
+      const number = String(line.line ?? "").padStart(gutter);
+      if (line.kind === "ctx") {
+        return /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
+          number,
+          "   ",
+          clip2(text, width)
+        ] }, index);
+      }
+      const style = STYLE[line.kind];
+      const shown = clip2(text, width);
+      const span = line.changed && shown === text && text === line.text ? line.changed : void 0;
+      return /* @__PURE__ */ jsxs5(Box5, { children: [
+        /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
+          number,
+          " "
+        ] }),
+        /* @__PURE__ */ jsx5(Box5, { flexGrow: 1, backgroundColor: style.bg, children: /* @__PURE__ */ jsxs5(Text5, { color: style.fg, wrap: "truncate-end", children: [
+          style.sign,
+          " ",
+          span ? /* @__PURE__ */ jsxs5(Fragment, { children: [
+            shown.slice(0, span[0]),
+            /* @__PURE__ */ jsx5(Text5, { backgroundColor: style.strong, bold: true, children: shown.slice(span[0], span[1]) }),
+            shown.slice(span[1])
+          ] }) : shown
+        ] }) })
+      ] }, index);
+    }),
     hidden > 0 && /* @__PURE__ */ jsxs5(Text5, { dimColor: true, children: [
-      "  \u2026 ",
+      " ".repeat(gutter),
+      "   \u2026 ",
       hidden,
       " more lines"
     ] })
   ] });
 }
+function clip2(text, width) {
+  if (stringWidth(text) <= width) return text;
+  let out = "";
+  for (const character of text) {
+    if (stringWidth(out + character) > width - 1) break;
+    out += character;
+  }
+  return `${out}\u2026`;
+}
 
 // src/ui/components/PermissionPrompt.tsx
-import { Fragment, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var MAX_PREVIEW_CHARS = 2e4;
+var ENTER_GRACE_MS = 400;
+var DANGEROUS = [
+  /\brm\s+(?:-[a-z]*[rf][a-z]*\s+)+/i,
+  /\b(?:rmdir|del|erase|rd)\s+\/[sq]/i,
+  /\bRemove-Item\b.*-Recurse/i,
+  /\bgit\s+(?:push\s+.*(?:--force|-f\b)|reset\s+--hard|clean\s+-[a-z]*f|checkout\s+--\s|branch\s+-D)/i,
+  /\b(?:sudo|doas|runas)\b/i,
+  /\b(?:curl|wget|iwr|Invoke-WebRequest)\b[^|]*\|\s*(?:sh|bash|zsh|iex|Invoke-Expression|python)/i,
+  /\b(?:mkfs|format|diskpart|dd\s+if=)/i,
+  /\bchmod\s+(?:-R\s+)?777\b/i,
+  />\s*\/dev\/(?:sd|nvme|disk)/i,
+  /\bDROP\s+(?:TABLE|DATABASE)\b/i
+];
+function isDangerousCommand(command) {
+  return DANGEROUS.some((pattern) => pattern.test(command));
+}
 function PermissionPrompt({ request, onDecide }) {
   const theme = useTheme();
   const strings = useStrings();
+  const options = [
+    { decision: "once", label: strings.allowOnce, key: "y" },
+    ...request.allowAlways !== false ? [{ decision: "always", label: `${strings.always} (${sanitizeTerminalText(request.toolName)})`, key: "a" }] : [],
+    { decision: "deny", label: strings.deny, key: "n" }
+  ];
+  const command = commandOf(request.input);
+  const dangerous = command !== void 0 && isDangerousCommand(command);
+  const [selected, setSelected] = useState3(dangerous ? options.length - 1 : 0);
+  const shownAt = useRef2(Date.now());
+  useEffect(() => {
+    shownAt.current = Date.now();
+    setSelected(dangerous ? options.length - 1 : 0);
+  }, [request]);
   useTerminalInput((char, key) => {
     const c = normalizeHotkey(char);
-    if (c === "y") onDecide("once");
-    else if (c === "a" && request.allowAlways !== false) onDecide("always");
-    else if (c === "n" || key.escape || key.return) onDecide("deny");
+    if (key.upArrow) setSelected((index) => (index - 1 + options.length) % options.length);
+    else if (key.downArrow || key.tab) setSelected((index) => (index + 1) % options.length);
+    else if (key.escape) onDecide("deny");
+    else if (key.return) {
+      if (Date.now() - shownAt.current >= ENTER_GRACE_MS) onDecide(options[selected].decision);
+    } else {
+      const byKey = options.find((option) => option.key === c);
+      if (byKey) onDecide(byKey.decision);
+    }
   });
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", borderStyle: "round", borderColor: theme.warn, paddingX: 1, children: [
-    /* @__PURE__ */ jsx6(Text6, { bold: true, color: theme.warn, children: sanitizeTerminalText(request.summary) }),
-    request.display?.kind === "diff" && /* @__PURE__ */ jsxs6(Box6, { marginTop: 1, flexDirection: "column", children: [
-      /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: sanitizeTerminalText(request.display.path) }),
-      /* @__PURE__ */ jsx6(Diff, { before: request.display.before, after: request.display.after })
-    ] }),
-    request.display?.kind === "text" && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: previewText(request.display.text) }),
-    request.display?.kind === "list" && /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: sanitizeTerminalText(request.display.title) }),
-      request.display.items.slice(0, 100).map((item, index) => /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
-        "\u2022 ",
-        previewText(item, 1e3)
-      ] }, index))
+  const frame = dangerous ? theme.error : theme.warn;
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", borderStyle: "round", borderColor: frame, paddingX: 1, children: [
+    /* @__PURE__ */ jsxs6(Text6, { bold: true, color: frame, children: [
+      dangerous ? `\u26A0 ${strings.dangerousCommand} \xB7 ` : "",
+      sanitizeTerminalText(request.summary)
     ] }),
-    !request.display && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: printInput(request.input) }),
-    /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsxs6(Text6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { bold: true, children: "y" }),
-      " ",
-      strings.allowOnce,
-      " \xB7",
-      " ",
-      request.allowAlways !== false && /* @__PURE__ */ jsxs6(Fragment, { children: [
-        /* @__PURE__ */ jsx6(Text6, { bold: true, children: "a" }),
-        " ",
-        strings.always,
-        " (",
-        sanitizeTerminalText(request.toolName),
-        ") \xB7 "
+    command !== void 0 ? /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsxs6(Text6, { color: dangerous ? theme.error : void 0, children: [
+      "$ ",
+      previewText(command, 2e3)
+    ] }) }) : /* @__PURE__ */ jsxs6(Fragment2, { children: [
+      request.display?.kind === "diff" && /* @__PURE__ */ jsxs6(Box6, { marginTop: 1, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: sanitizeTerminalText(request.display.path) }),
+        /* @__PURE__ */ jsx6(Diff, { before: request.display.before, after: request.display.after, indent: 4 })
       ] }),
-      /* @__PURE__ */ jsx6(Text6, { bold: true, children: "n" }),
-      " ",
-      strings.deny
-    ] }) })
+      request.display?.kind === "text" && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: previewText(request.display.text) }),
+      request.display?.kind === "list" && /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: sanitizeTerminalText(request.display.title) }),
+        request.display.items.slice(0, 100).map((item, index) => /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
+          "\u2022 ",
+          previewText(item, 1e3)
+        ] }, index))
+      ] }),
+      !request.display && /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: printInput(request.input) })
+    ] }),
+    /* @__PURE__ */ jsxs6(Box6, { marginTop: 1, flexDirection: "column", children: [
+      options.map((option, index) => {
+        const active2 = index === selected;
+        return /* @__PURE__ */ jsxs6(Text6, { color: active2 ? frame : void 0, bold: active2, dimColor: !active2, children: [
+          active2 ? "\u276F " : "  ",
+          option.label,
+          /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
+            " (",
+            option.key,
+            ")"
+          ] })
+        ] }, option.decision);
+      }),
+      /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: strings.permissionKeys })
+    ] })
   ] });
 }
+function commandOf(input) {
+  const command = input?.command;
+  return typeof command === "string" && command.trim() !== "" ? command : void 0;
+}
 function printInput(input) {
   try {
     return previewText(JSON.stringify(input, null, 2));
@@ -8576,15 +9189,15 @@ function previewText(value, limit = MAX_PREVIEW_CHARS) {
 
 // src/ui/components/Picker.tsx
 import { Box as Box7, Text as Text7 } from "ink";
-import { useMemo as useMemo2, useState as useState3 } from "react";
+import { useMemo as useMemo2, useState as useState4 } 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 [query, setQuery] = useState4("");
+  const [cursor, setCursor] = useState4(0);
   const matches = useMemo2(() => {
     const needle = query.toLowerCase();
     if (needle === "") return items;
@@ -8636,7 +9249,8 @@ function Picker({ title, items, onSelect, onCancel }) {
 
 // src/ui/components/PromptInput.tsx
 import { Box as Box8, Text as Text8 } from "ink";
-import { memo, useEffect, useRef as useRef2, useState as useState4 } from "react";
+import { memo, useEffect as useEffect2, useMemo as useMemo3, useRef as useRef3, useState as useState5 } from "react";
+import stringWidth2 from "string-width";
 
 // src/ui/history.ts
 function moveInputHistory(history, index, value, draft, direction) {
@@ -8677,6 +9291,10 @@ var CAT_FRAMES = [
   "/\u1420\uFF61\uA788\uFF61\u141F\\ \u223E"
 ];
 var MAX_INPUT_ROWS = 6;
+var PASTE_COLLAPSE_CHARS = 1e3;
+var PASTE_COLLAPSE_LINES = 10;
+var VISIBLE_QUEUED = 3;
+var MODE_COLORS = { plan: "#60a5fa", accept: "#fbbf24" };
 var PromptInput = memo(function PromptInput2({
   value,
   onChange,
@@ -8688,37 +9306,48 @@ var PromptInput = memo(function PromptInput2({
   hint,
   history,
   attachments = [],
-  onListFiles
+  onListFiles,
+  mode = "normal",
+  bypass = false,
+  queued = [],
+  onNavigateQueue
 }) {
   const theme = useTheme();
-  const { columns, rows } = useTerminalSize();
+  const { columns } = useTerminalSize();
   const panelWidth = Math.max(2, columns - 1);
-  const inputRows = Math.max(1, Math.min(MAX_INPUT_ROWS, rows - 16));
+  const inputRows = MAX_INPUT_ROWS;
   const strings = useStrings();
-  const [catFrame, setCatFrame] = useState4(0);
-  useEffect(() => {
+  const [catFrame, setCatFrame] = useState5(0);
+  useEffect2(() => {
     if (!disabled) return;
     const timer = setInterval(() => setCatFrame((frame) => (frame + 1) % CAT_FRAMES.length), CAT_FRAME_MS);
     return () => clearInterval(timer);
   }, [disabled]);
-  const panelColor = disabled ? theme.warn : theme.accent;
+  const modeColor = bypass ? theme.error : mode === "plan" ? MODE_COLORS.plan : mode === "accept" ? MODE_COLORS.accept : void 0;
+  const panelColor = disabled ? theme.warn : modeColor ?? theme.accent;
+  const modeTitle = bypass ? "BYPASS" : mode !== "normal" ? strings.modeLabel[mode] ?? mode : "";
   const fullTitle = disabled ? `KitCode ${CAT_FRAMES[catFrame]}` : "KitCode";
   const panelTitle = fullTitle.slice(0, Math.max(0, panelWidth - 5));
   const safeValue = sanitizeTerminalText(value);
-  const [selectionCursor, setSelectionCursor] = useState4(0);
-  const [inputCursor, setInputCursor] = useState4(() => characters2(safeValue).length);
-  const [historyIndex, setHistoryIndex] = useState4(null);
-  const historyDraft = useRef2("");
-  const pendingValue = useRef2(null);
-  const valueRef = useRef2(safeValue);
-  const cursorRef = useRef2(inputCursor);
+  const [selectionCursor, setSelectionCursor] = useState5(0);
+  const [inputCursor, setInputCursor] = useState5(() => characters2(safeValue).length);
+  const [historyIndex, setHistoryIndex] = useState5(null);
+  const historyDraft = useRef3("");
+  const pendingValue = useRef3(null);
+  const valueRef = useRef3(safeValue);
+  const cursorRef = useRef3(inputCursor);
   valueRef.current = safeValue;
   cursorRef.current = inputCursor;
+  const valueChars = useMemo3(() => characters2(safeValue), [safeValue]);
+  const inputView = valueChars.length === 0 ? null : inputWindow(valueChars, clamp2(inputCursor, 0, valueChars.length), panelWidth - 4, inputRows);
+  const position = inputView && inputView.total > inputRows ? strings.inputRows(inputView.first + 1, inputView.first + inputView.rows.length, inputView.total) : "";
+  const footerText = [modeTitle && `${modeTitle} \xB7 shift+tab`, position].filter(Boolean).join(" \xB7 ");
+  const footer = footerText ? `\u2500 ${footerText} ` : "";
   const commandSuggestions = matchCommands(safeValue);
   const mention = onListFiles ? mentionSpan(safeValue, inputCursor) : null;
-  const [files, setFiles] = useState4([]);
+  const [files, setFiles] = useState5([]);
   const mentionQuery = mention?.query ?? null;
-  useEffect(() => {
+  useEffect2(() => {
     if (mentionQuery === null || !onListFiles) {
       setFiles([]);
       return;
@@ -8736,10 +9365,10 @@ var PromptInput = memo(function PromptInput2({
   const open3 = suggestions.length > 0 || showFiles;
   const optionCount = showFiles ? files.length : suggestions.length;
   const active2 = Math.min(selectionCursor, Math.max(0, optionCount - 1));
-  useEffect(() => {
+  useEffect2(() => {
     setSelectionCursor(0);
   }, [safeValue]);
-  useEffect(() => {
+  useEffect2(() => {
     const length = characters2(safeValue).length;
     if (pendingValue.current === safeValue) {
       pendingValue.current = null;
@@ -8759,28 +9388,39 @@ var PromptInput = memo(function PromptInput2({
     historyDraft.current = next;
     onChange(next);
   };
+  const pastes = useRef3(/* @__PURE__ */ new Map());
+  const pasteCounter = useRef3(0);
   const submit = (next) => {
     setHistoryIndex(null);
     historyDraft.current = "";
-    onSubmit(next);
+    const expanded = expandPastes(next, pastes.current);
+    pastes.current = /* @__PURE__ */ new Map();
+    onSubmit(expanded);
   };
   const insertPastedText = (pasted) => {
     const inserted = characters2(sanitizeTerminalText(pasted));
     if (inserted.length === 0) return;
     const valueCharacters = characters2(valueRef.current);
     const cursor = clamp2(cursorRef.current, 0, valueCharacters.length);
-    valueCharacters.splice(cursor, 0, ...inserted);
-    change(valueCharacters.join(""), cursor + inserted.length);
+    const next = valueCharacters.slice(0, cursor).concat(inserted, valueCharacters.slice(cursor));
+    change(next.join(""), cursor + inserted.length);
+  };
+  const collapsePaste = (text) => {
+    const lines = text.split("\n").length;
+    if (text.length < PASTE_COLLAPSE_CHARS && lines <= PASTE_COLLAPSE_LINES) return text;
+    pasteCounter.current += 1;
+    pastes.current.set(pasteCounter.current, text);
+    return strings.pasteToken(pasteCounter.current, lines, text.length);
   };
   useTerminalPaste((pasted) => {
     const safePaste = sanitizeTerminalText(pasted);
     if (onPastePath && looksLikeAttachmentPath(safePaste)) {
       void onPastePath(safePaste).then((consumed) => {
-        if (!consumed) insertPastedText(safePaste);
+        if (!consumed) insertPastedText(collapsePaste(safePaste));
       });
       return;
     }
-    insertPastedText(safePaste);
+    insertPastedText(collapsePaste(safePaste));
   });
   useTerminalInput((input, key) => {
     if (onPasteImage && (key.ctrl || key.meta || key.super) && (input.toLowerCase() === "v" || input === "")) {
@@ -8813,6 +9453,13 @@ var PromptInput = memo(function PromptInput2({
       if (chosen) submit(`/${chosen.name}`);
       return;
     }
+    if (!open3 && (key.upArrow || key.downArrow) && onNavigateQueue) {
+      const next = onNavigateQueue(key.upArrow ? "previous" : "next", safeValue);
+      if (next !== null) {
+        change(next);
+        return;
+      }
+    }
     if (!open3 && (key.upArrow || key.downArrow)) {
       const moved = moveInputHistory(
         history,
@@ -8867,6 +9514,21 @@ var PromptInput = memo(function PromptInput2({
   const visible = suggestions.slice(start, start + WINDOW2);
   const fileStart = Math.max(0, Math.min(active2 - WINDOW2 + 2, files.length - WINDOW2));
   return /* @__PURE__ */ jsxs8(Box8, { width: panelWidth, maxWidth: "100%", flexDirection: "column", marginTop: 1, flexShrink: 0, children: [
+    queued.length > 0 && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", marginBottom: 1, children: [
+      queued.slice(0, VISIBLE_QUEUED).map((text, index) => /* @__PURE__ */ jsxs8(Text8, { dimColor: true, wrap: "truncate-end", children: [
+        "  ",
+        "\u23F3 ",
+        sanitizeTerminalText(text).replace(/\s+/g, " ").trim()
+      ] }, index)),
+      queued.length > VISIBLE_QUEUED && /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
+        "  ",
+        strings.more(queued.length - VISIBLE_QUEUED)
+      ] }),
+      /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
+        "  ",
+        strings.queueHint
+      ] })
+    ] }),
     /* @__PURE__ */ jsxs8(Box8, { width: "100%", flexShrink: 0, children: [
       /* @__PURE__ */ jsx8(Box8, { flexShrink: 0, children: /* @__PURE__ */ jsx8(Text8, { color: panelColor, children: "\u256D" }) }),
       /* @__PURE__ */ jsx8(Box8, { flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsxs8(Text8, { color: panelColor, wrap: "truncate-end", children: [
@@ -8892,12 +9554,8 @@ var PromptInput = memo(function PromptInput2({
       /* @__PURE__ */ jsx8(Box8, { flexShrink: 0, children: /* @__PURE__ */ jsx8(Text8, { color: panelColor, children: "\u256E" }) })
     ] }),
     /* @__PURE__ */ jsxs8(Box8, { width: "100%", paddingX: 1, maxHeight: inputRows, overflowY: "hidden", children: [
-      /* @__PURE__ */ jsx8(Text8, { color: panelColor, children: "\u203A " }),
-      /* @__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)
-      ] }) : null
+      /* @__PURE__ */ jsx8(Text8, { color: panelColor, bold: true, children: "\u203A " }),
+      /* @__PURE__ */ jsx8(Box8, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx8(EditableText, { window: inputView, placeholder: strings.placeholder }) })
     ] }),
     attachments.length > 0 && /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
       "  ",
@@ -8921,7 +9579,8 @@ var PromptInput = memo(function PromptInput2({
           borderRight: false
         }
       ),
-      /* @__PURE__ */ jsx8(Box8, { flexShrink: 0, children: /* @__PURE__ */ jsx8(Text8, { color: panelColor, children: "\u256F" }) })
+      footer && /* @__PURE__ */ jsx8(Box8, { flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx8(Text8, { color: panelColor, bold: true, wrap: "truncate-start", children: footer.slice(0, Math.max(0, panelWidth - 6)) }) }),
+      /* @__PURE__ */ jsx8(Box8, { flexShrink: 0, children: /* @__PURE__ */ jsx8(Text8, { color: panelColor, children: footer ? "\u2500\u256F" : "\u256F" }) })
     ] }),
     disabled && hint && /* @__PURE__ */ jsxs8(Text8, { color: theme.accent, children: [
       "  ",
@@ -8958,25 +9617,81 @@ var PromptInput = memo(function PromptInput2({
     ] })
   ] });
 });
-function EditableText({
-  value,
-  cursor,
-  placeholder
-}) {
-  const valueCharacters = characters2(value);
-  const at = clamp2(cursor, 0, valueCharacters.length);
-  if (valueCharacters.length === 0) {
+function inputWindow(chars, cursor, width, maxRows) {
+  const limit = Math.max(1, width - 1);
+  const rows = [{ chars: [], start: 0 }];
+  let rowWidth = 0;
+  let cursorRow = -1;
+  let cursorCol = 0;
+  for (let index = 0; index <= chars.length; index += 1) {
+    const row = rows[rows.length - 1];
+    if (index === cursor) {
+      cursorRow = rows.length - 1;
+      cursorCol = row.chars.length;
+    }
+    if (index === chars.length) break;
+    const character = chars[index];
+    if (character === "\n") {
+      rows.push({ chars: [], start: index + 1 });
+      rowWidth = 0;
+      continue;
+    }
+    const cells = charWidth(character);
+    if (rowWidth + cells > limit && row.chars.length > 0) {
+      rows.push({ chars: [character], start: index });
+      rowWidth = cells;
+      if (cursorRow === rows.length - 2 && cursorCol === row.chars.length) {
+        cursorRow = rows.length - 1;
+        cursorCol = 0;
+      }
+      continue;
+    }
+    row.chars.push(character);
+    rowWidth += cells;
+  }
+  if (cursorRow === -1) {
+    cursorRow = rows.length - 1;
+    cursorCol = rows[cursorRow].chars.length;
+  }
+  let first2 = Math.max(0, rows.length - maxRows);
+  if (cursorRow < first2) first2 = cursorRow;
+  if (cursorRow >= first2 + maxRows) first2 = cursorRow - maxRows + 1;
+  return {
+    rows: rows.slice(first2, first2 + maxRows).map((row, offset) => ({
+      text: row.chars.join(""),
+      ...first2 + offset === cursorRow ? { cursor: cursorCol } : {}
+    })),
+    first: first2,
+    total: rows.length
+  };
+}
+function charWidth(character) {
+  const code = character.codePointAt(0) ?? 0;
+  if (code >= 32 && code < 768 || code >= 880 && code < 4352) return 1;
+  return stringWidth2(character);
+}
+function EditableText({ window, placeholder }) {
+  if (!window) {
     const placeholderCharacters = characters2(sanitizeTerminalText(placeholder));
     return /* @__PURE__ */ jsxs8(Text8, { children: [
       /* @__PURE__ */ jsx8(Text8, { inverse: true, children: placeholderCharacters[0] ?? " " }),
       /* @__PURE__ */ jsx8(Text8, { color: "gray", children: placeholderCharacters.slice(1).join("") })
     ] });
   }
-  return /* @__PURE__ */ jsxs8(Text8, { children: [
-    valueCharacters.slice(0, at).join(""),
-    /* @__PURE__ */ jsx8(Text8, { inverse: true, children: valueCharacters[at] ?? " " }),
-    valueCharacters.slice(at + 1).join("")
-  ] });
+  return /* @__PURE__ */ jsx8(Box8, { flexDirection: "column", children: window.rows.map((row, index) => {
+    if (row.cursor === void 0) return /* @__PURE__ */ jsx8(Text8, { children: row.text || " " }, index);
+    const chars = characters2(row.text);
+    return /* @__PURE__ */ jsxs8(Text8, { children: [
+      chars.slice(0, row.cursor).join(""),
+      /* @__PURE__ */ jsx8(Text8, { inverse: true, children: chars[row.cursor] ?? " " }),
+      chars.slice(row.cursor + 1).join("")
+    ] }, index);
+  }) });
+}
+var PASTE_TOKEN = /\[(?:paste|вставка) #(\d+)[^\]\n]*\]/g;
+function expandPastes(text, pastes) {
+  if (pastes.size === 0) return text;
+  return text.replace(PASTE_TOKEN, (token, id) => pastes.get(Number(id)) ?? token);
 }
 function nextCursor(cursor, length, key) {
   if (key.home) return 0;
@@ -8994,7 +9709,6 @@ function clamp2(value, min, max) {
 
 // src/ui/components/StatusBar.tsx
 import { Box as Box9, Text as Text9 } from "ink";
-import { Fragment as Fragment2 } from "react";
 
 // src/ui/time.ts
 function formatDuration(ms) {
@@ -9010,32 +9724,31 @@ function formatDuration(ms) {
 // src/ui/components/StatusBar.tsx
 import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 var BAR_WIDTH = 12;
+var VISIBLE_AGENTS = 3;
+var AGENT_LABEL_WIDTH = 28;
+function shortTask(task) {
+  const label = sanitizeTerminalText(task).replace(/\s+/g, " ").trim() || "subagent";
+  return label.length <= AGENT_LABEL_WIDTH ? label : `${label.slice(0, AGENT_LABEL_WIDTH - 1)}\u2026`;
+}
 function StatusBar({ status }) {
   const theme = useTheme();
   const strings = useStrings();
-  const primary = [];
   const details = [];
-  primary.push(/* @__PURE__ */ jsx9(ModelBadge, { ref: status.modelRef }, "model"));
-  primary.push(/* @__PURE__ */ jsx9(EffortLabel, { effort: status.effort }, "effort"));
+  details.push(/* @__PURE__ */ jsx9(Text9, { color: theme.accent, bold: true, children: shortModel(status.modelRef) }, "model"));
+  details.push(/* @__PURE__ */ jsx9(EffortLabel, { effort: status.effort, effective: status.effectiveEffort }, "effort"));
   if (!status.thinking) {
     details.push(
       /* @__PURE__ */ jsx9(Text9, { color: theme.warn, children: strings.noThink }, "think")
     );
   }
-  if (status.mode !== "normal") {
-    const modeColor = status.mode === "accept" ? "yellow" : status.mode === "plan" ? "blue" : theme.accent;
-    details.push(
-      /* @__PURE__ */ jsx9(Text9, { color: modeColor, children: strings.modeLabel[status.mode] ?? status.mode }, "mode")
-    );
-  }
-  if (status.usage) {
+  if (status.usage && status.usage.totalTokens > 0) {
     const u = status.usage;
     details.push(
       /* @__PURE__ */ jsxs9(Text9, { children: [
         /* @__PURE__ */ jsx9(Text9, { color: "white", bold: true, children: u.input }),
-        /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \u2191 " }),
+        /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "\u2191 " }),
         /* @__PURE__ */ jsx9(Text9, { color: theme.ok, children: u.output }),
-        /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \u2193" }),
+        /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "\u2193" }),
         u.cache && /* @__PURE__ */ jsxs9(Fragment3, { children: [
           /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " (" }),
           /* @__PURE__ */ jsxs9(Text9, { color: "gray", children: [
@@ -9051,6 +9764,15 @@ function StatusBar({ status }) {
       ] }, "usage")
     );
   }
+  if (status.speed) {
+    const rate = status.speed.tokensPerSecond;
+    details.push(
+      /* @__PURE__ */ jsxs9(Text9, { children: [
+        /* @__PURE__ */ jsx9(Text9, { color: status.speed.live ? theme.accent : "white", bold: !status.speed.live, children: `${status.speed.live ? "~" : ""}${rate < 10 ? rate.toFixed(1) : Math.round(rate)}` }),
+        /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " tok/s" })
+      ] }, "speed")
+    );
+  }
   details.push(
     /* @__PURE__ */ jsx9(
       Text9,
@@ -9062,14 +9784,14 @@ function StatusBar({ status }) {
       "elapsed"
     )
   );
-  if (status.bypass) {
-    details.push(
-      /* @__PURE__ */ jsxs9(Text9, { color: "black", backgroundColor: theme.warn, bold: true, children: [
-        " ",
-        "BYPASS",
-        " "
-      ] }, "bypass")
-    );
+  if (status.mcp.connected > 0) {
+    details.push(/* @__PURE__ */ jsxs9(Text9, { color: theme.ok, children: [
+      "mcp:",
+      status.mcp.connected
+    ] }, "mcp"));
+  }
+  if (status.mcp.failed > 0) {
+    details.push(/* @__PURE__ */ jsx9(Text9, { color: theme.error, children: strings.mcpFailed(status.mcp.failed) }, "mcp-failed"));
   }
   return /* @__PURE__ */ jsxs9(
     Box9,
@@ -9089,59 +9811,28 @@ function StatusBar({ status }) {
       flexDirection: "column",
       children: [
         /* @__PURE__ */ jsxs9(Box9, { width: "100%", alignItems: "flex-start", children: [
-          /* @__PURE__ */ jsx9(Box9, { flexGrow: 1, flexShrink: 1, flexWrap: "wrap", children: /* @__PURE__ */ jsx9(Segments, { items: primary }) }),
-          /* @__PURE__ */ jsxs9(
-            Box9,
-            {
-              flexShrink: 0,
-              marginLeft: 2,
-              flexDirection: "column",
-              alignItems: "flex-end",
-              children: [
-                /* @__PURE__ */ jsx9(ContextMeter, { context: status.context }),
-                (status.mcp.connected > 0 || status.mcp.failed > 0) && /* @__PURE__ */ jsxs9(Text9, { children: [
-                  status.mcp.connected > 0 && /* @__PURE__ */ jsxs9(Text9, { color: theme.ok, children: [
-                    "mcp:",
-                    status.mcp.connected
-                  ] }),
-                  status.mcp.connected > 0 && status.mcp.failed > 0 && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \xB7 " }),
-                  status.mcp.failed > 0 && /* @__PURE__ */ jsx9(Text9, { color: theme.error, children: strings.mcpFailed(status.mcp.failed) })
-                ] }),
-                status.activeAgents > 0 && /* @__PURE__ */ jsx9(Text9, { color: theme.accent, children: strings.activeAgents(status.activeAgents) })
-              ]
-            }
-          )
+          /* @__PURE__ */ jsx9(Box9, { flexGrow: 1, flexShrink: 1, flexWrap: "wrap", children: details.map((item, index) => /* @__PURE__ */ jsxs9(Text9, { children: [
+            index > 0 && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \xB7 " }),
+            item
+          ] }, index)) }),
+          /* @__PURE__ */ jsx9(Box9, { flexShrink: 0, marginLeft: 2, children: /* @__PURE__ */ jsx9(ContextMeter, { context: status.context }) })
         ] }),
-        details.length > 0 && /* @__PURE__ */ jsx9(Box9, { flexWrap: "wrap", children: details.map((item, index) => /* @__PURE__ */ jsxs9(Fragment2, { children: [
-          index > 0 && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \xB7 " }),
-          item
-        ] }, index)) })
+        status.agents.length > 0 && /* @__PURE__ */ jsxs9(Box9, { width: "100%", flexDirection: "column", alignItems: "flex-end", children: [
+          status.agents.slice(0, VISIBLE_AGENTS).map((task, index) => /* @__PURE__ */ jsxs9(Text9, { color: theme.accent, wrap: "truncate-end", children: [
+            "\u25CC ",
+            shortTask(task)
+          ] }, index)),
+          status.agents.length > VISIBLE_AGENTS && /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: strings.moreAgents(status.agents.length - VISIBLE_AGENTS) })
+        ] })
       ]
     }
   );
 }
-function Segments({ items }) {
-  return items.flatMap((item, index) => {
-    const elements = [];
-    if (index > 0) {
-      elements.push(
-        /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " \xB7 " }) }, `sep-${index}`)
-      );
-    }
-    elements.push(/* @__PURE__ */ jsx9(Fragment2, { children: item }, `item-${index}`));
-    return elements;
-  });
-}
 function shortModel(ref) {
   const safe = sanitizeTerminalText(ref);
   const slash = safe.lastIndexOf("/");
   return slash === -1 ? safe : safe.slice(slash + 1);
 }
-function ModelBadge({ ref: modelRef }) {
-  const theme = useTheme();
-  const name = shortModel(modelRef);
-  return /* @__PURE__ */ jsx9(Box9, { borderColor: theme.accent, borderStyle: "round", paddingX: 1, children: /* @__PURE__ */ jsx9(Text9, { color: theme.accent, bold: true, children: name }) });
-}
 var EFFORT_STYLES = {
   auto: { label: "auto", color: "cyan" },
   max: { label: "max", color: "red", bold: true },
@@ -9150,36 +9841,30 @@ var EFFORT_STYLES = {
   medium: { label: "medium", color: "blue" },
   low: { label: "low", color: "gray", dim: true }
 };
-function EffortLabel({ effort }) {
+function EffortLabel({ effort, effective }) {
   const style = EFFORT_STYLES[effort];
-  return /* @__PURE__ */ jsx9(Box9, { borderColor: style.color ?? "gray", borderStyle: "round", paddingX: 1, children: /* @__PURE__ */ jsx9(
-    Text9,
-    {
-      color: style.color,
-      bold: style.bold,
-      dimColor: style.dim,
-      children: style.label
-    }
-  ) });
-}
-function tokens2(count) {
-  if (count < 1e3) return String(count);
-  const [value, suffix] = count < 1e6 ? [count / 1e3, "k"] : [count / 1e6, "M"];
-  return `${value.toFixed(1).replace(/\.0$/, "")}${suffix}`;
+  if (effective === null) {
+    return /* @__PURE__ */ jsx9(Text9, { color: "gray", dimColor: true, strikethrough: true, children: style.label });
+  }
+  const sent = effective !== effort ? EFFORT_STYLES[effective] : void 0;
+  return /* @__PURE__ */ jsxs9(Text9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: style.color, bold: style.bold, dimColor: style.dim, children: style.label }),
+    sent && /* @__PURE__ */ jsxs9(Fragment3, { children: [
+      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: effort === "auto" ? "\xB7" : "\u2192" }),
+      /* @__PURE__ */ jsx9(Text9, { color: sent.color, bold: sent.bold, dimColor: sent.dim, children: sent.label })
+    ] })
+  ] });
 }
 function ContextMeter({
   context
 }) {
   const theme = useTheme();
-  const { window: win, used, exact } = context;
-  if (!exact || win === null || win <= 0) {
+  const { window: win, exact } = context;
+  const used = exact ? context.used : 0;
+  if (win === null || win <= 0) {
     return /* @__PURE__ */ jsxs9(Text9, { children: [
       /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "ctx " }),
-      /* @__PURE__ */ jsx9(Text9, { color: "gray", children: exact ? tokens2(used) : "?" }),
-      win && win > 0 && /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
-        "/",
-        tokens2(win)
-      ] })
+      /* @__PURE__ */ jsx9(Text9, { color: "gray", children: tokens(used) })
     ] });
   }
   const pct = Math.min(Math.max(used / win, 0), 1);
@@ -9197,107 +9882,306 @@ function ContextMeter({
     /* @__PURE__ */ jsx9(Text9, { color, children: "\u258C" }),
     /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
-      tokens2(used),
+      tokens(used),
       "/",
-      tokens2(win)
+      tokens(win)
     ] })
   ] });
 }
 
-// src/ui/components/TerminalViewport.tsx
-import { Box as Box10 } from "ink";
-import { jsx as jsx10 } from "react/jsx-runtime";
-function interactiveViewportRows(rows) {
-  if (!Number.isFinite(rows)) return 22;
-  return Math.max(1, Math.floor(rows) - 2);
-}
-var INTERACTIVE_CHROME_ROWS = 14;
-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",
-      children
-    }
-  );
-}
+// src/ui/components/SubagentChat.tsx
+import { Box as Box12, Text as Text12, useInput as useInput2 } from "ink";
+import { useState as useState7 } from "react";
 
 // src/ui/components/Transcript.tsx
-import { Box as Box12, Static, Text as Text11 } from "ink";
-import { memo as memo2, useMemo as useMemo4, useRef as useRef3 } from "react";
+import { Box as Box11, Static, Text as Text11 } from "ink";
+import { memo as memo2, useEffect as useEffect3, useMemo as useMemo5, useRef as useRef4, useState as useState6 } from "react";
 import Spinner2 from "ink-spinner";
-import stringWidth2 from "string-width";
+import stringWidth4 from "string-width";
 
 // src/ui/markdown.tsx
-import { Box as Box11, Text as InkText } from "ink";
-import { createContext as createContext3, Fragment as Fragment4, useContext as useContext3, useMemo as useMemo3 } from "react";
-import stringWidth from "string-width";
-import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Box as Box10, Text as InkText } from "ink";
+import { createContext as createContext3, Fragment as Fragment4, useContext as useContext3, useMemo as useMemo4 } from "react";
+import stringWidth3 from "string-width";
+
+// src/ui/highlight.ts
+var words = (list) => new Set(list.split(/\s+/).filter(Boolean));
+var JS_KEYWORDS = words(`
+  async await break case catch class const continue debugger default delete do else enum export
+  extends finally for from function get if implements import in instanceof interface let new of
+  package private protected public readonly return satisfies set static super switch this throw
+  try type typeof var void while with yield as declare abstract keyof namespace`);
+var GRAMMARS = {
+  js: { keywords: JS_KEYWORDS, literals: words("true false null undefined NaN Infinity"), lineComment: ["//"], block: ["/*", "*/"], types: true },
+  py: {
+    keywords: words(`and as assert async await break class continue def del elif else except finally for
+      from global if import in is lambda nonlocal not or pass raise return try while with yield match case self`),
+    literals: words("True False None"),
+    lineComment: ["#"],
+    triple: true,
+    types: true
+  },
+  go: {
+    keywords: words(`break case chan const continue default defer else fallthrough for func go goto if import
+      interface map package range return select struct switch type var`),
+    literals: words("true false nil iota"),
+    lineComment: ["//"],
+    block: ["/*", "*/"],
+    types: true
+  },
+  rust: {
+    keywords: words(`as async await break const continue crate dyn else enum extern fn for if impl in let loop
+      match mod move mut pub ref return self Self static struct super trait type unsafe use where while`),
+    literals: words("true false None Some Ok Err"),
+    lineComment: ["//"],
+    block: ["/*", "*/"],
+    types: true
+  },
+  c: {
+    keywords: words(`auto break case char class const continue default delete do double else enum extern float
+      for goto if inline int long namespace new private protected public return short signed sizeof static
+      struct switch template this throw try typedef typename union unsigned using virtual void volatile while
+      boolean byte extends final finally implements import instanceof interface package super synchronized throws var`),
+    literals: words("true false null nullptr NULL"),
+    lineComment: ["//"],
+    block: ["/*", "*/"],
+    types: true
+  },
+  sh: {
+    keywords: words(`if then else elif fi for while until do done case esac in function return export local
+      readonly set unset shift exit echo cd source alias`),
+    literals: words("true false"),
+    lineComment: ["#"]
+  },
+  json: { keywords: /* @__PURE__ */ new Set(), literals: words("true false null"), lineComment: [] },
+  sql: {
+    keywords: words(`select from where insert into values update set delete create table drop alter index join
+      left right inner outer on group by order having limit offset as and or not null is in distinct union all
+      primary key foreign references default SELECT FROM WHERE INSERT INTO VALUES UPDATE SET DELETE CREATE TABLE
+      DROP ALTER INDEX JOIN LEFT RIGHT INNER OUTER ON GROUP BY ORDER HAVING LIMIT OFFSET AS AND OR NOT NULL IS IN
+      DISTINCT UNION ALL PRIMARY KEY FOREIGN REFERENCES DEFAULT`),
+    literals: words("true false TRUE FALSE"),
+    lineComment: ["--"],
+    block: ["/*", "*/"]
+  }
+};
+var ALIASES = {
+  js: "js",
+  javascript: "js",
+  jsx: "js",
+  mjs: "js",
+  cjs: "js",
+  ts: "js",
+  typescript: "js",
+  tsx: "js",
+  py: "py",
+  python: "py",
+  go: "go",
+  golang: "go",
+  rs: "rust",
+  rust: "rust",
+  c: "c",
+  h: "c",
+  cpp: "c",
+  "c++": "c",
+  cc: "c",
+  hpp: "c",
+  cs: "c",
+  csharp: "c",
+  java: "c",
+  kotlin: "c",
+  kt: "c",
+  swift: "c",
+  php: "c",
+  sh: "sh",
+  bash: "sh",
+  zsh: "sh",
+  shell: "sh",
+  console: "sh",
+  powershell: "sh",
+  ps1: "sh",
+  ps: "sh",
+  json: "json",
+  jsonc: "json",
+  json5: "json",
+  sql: "sql",
+  postgres: "sql",
+  mysql: "sql",
+  sqlite: "sql"
+};
+function grammarFor(lang) {
+  return lang ? ALIASES[lang.toLowerCase()] : void 0;
+}
+function highlightCode(code, lang) {
+  const grammar = GRAMMARS[grammarFor(lang) ?? ""];
+  const lines = code.split("\n");
+  if (!grammar) return lines.map((line) => [{ kind: "plain", text: line }]);
+  const state = {};
+  return lines.map((line) => highlightLine(line, grammar, state));
+}
+function highlightLine(line, grammar, state) {
+  const tokens2 = [];
+  const push = (kind, text) => {
+    if (text === "") return;
+    const last = tokens2.at(-1);
+    if (last && last.kind === kind) last.text += text;
+    else tokens2.push({ kind, text });
+  };
+  let i = 0;
+  if (state.open) {
+    const end = line.indexOf(state.open.close);
+    if (end === -1) {
+      push(state.open.kind, line);
+      return tokens2;
+    }
+    push(state.open.kind, line.slice(0, end + state.open.close.length));
+    i = end + state.open.close.length;
+    state.open = void 0;
+  }
+  while (i < line.length) {
+    const rest = line.slice(i);
+    const lineComment = grammar.lineComment.find((marker) => rest.startsWith(marker));
+    if (lineComment) {
+      push("comment", rest);
+      break;
+    }
+    if (grammar.block && rest.startsWith(grammar.block[0])) {
+      const end = rest.indexOf(grammar.block[1], grammar.block[0].length);
+      if (end === -1) {
+        push("comment", rest);
+        state.open = { kind: "comment", close: grammar.block[1] };
+        break;
+      }
+      push("comment", rest.slice(0, end + grammar.block[1].length));
+      i += end + grammar.block[1].length;
+      continue;
+    }
+    if (grammar.triple && (rest.startsWith('"""') || rest.startsWith("'''"))) {
+      const quote = rest.slice(0, 3);
+      const end = rest.indexOf(quote, 3);
+      if (end === -1) {
+        push("string", rest);
+        state.open = { kind: "string", close: quote };
+        break;
+      }
+      push("string", rest.slice(0, end + 3));
+      i += end + 3;
+      continue;
+    }
+    const character = line[i];
+    if (character === '"' || character === "'" || character === "`") {
+      let j = i + 1;
+      while (j < line.length && line[j] !== character) j += line[j] === "\\" ? 2 : 1;
+      push("string", line.slice(i, Math.min(line.length, j + 1)));
+      i = j + 1;
+      continue;
+    }
+    const number = /^(?:0x[0-9a-f_]+|\d[\d_]*(?:\.\d+)?(?:e[+-]?\d+)?)/i.exec(rest);
+    if (number && !/[\w$]/.test(line[i - 1] ?? "")) {
+      push("number", number[0]);
+      i += number[0].length;
+      continue;
+    }
+    const word = /^[A-Za-z_$][\w$]*/.exec(rest);
+    if (word) {
+      const text = word[0];
+      const kind = grammar.keywords.has(text) ? "keyword" : grammar.literals.has(text) ? "literal" : grammar.types && /^[A-Z][a-z0-9]/.test(text) ? "type" : "plain";
+      push(kind, text);
+      i += text.length;
+      continue;
+    }
+    push("plain", character);
+    i += 1;
+  }
+  return tokens2;
+}
+
+// src/ui/markdown.tsx
+import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 var DimContext = createContext3(false);
-function Text10({ dimColor, color, ...props }) {
+function Text10({ dimColor, color, bold, ...props }) {
   const dim = useContext3(DimContext);
-  return /* @__PURE__ */ jsx11(InkText, { ...props, color: dim ? void 0 : color, dimColor: dimColor ?? dim });
+  return /* @__PURE__ */ jsx10(
+    InkText,
+    {
+      ...props,
+      color: dim ? void 0 : color,
+      bold: dim ? void 0 : bold,
+      dimColor: dimColor ?? dim
+    }
+  );
 }
 function Markdown({ children, dim = false }) {
-  const blocks = useMemo3(() => extractBlocks(children), [children]);
-  return /* @__PURE__ */ jsx11(DimContext.Provider, { value: dim, children: /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: blocks.map((block, i) => /* @__PURE__ */ jsx11(BlockView, { block }, i)) }) });
+  const blocks = useMemo4(() => extractBlocks(children), [children]);
+  return /* @__PURE__ */ jsx10(DimContext.Provider, { value: dim, children: /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: blocks.map((block, i) => /* @__PURE__ */ jsx10(BlockView, { block }, i)) }) });
 }
 function BlockView({ block }) {
   switch (block.type) {
     case "heading": {
-      return /* @__PURE__ */ jsx11(Box11, { marginTop: block.level === 1 ? 1 : 0, children: /* @__PURE__ */ jsx11(Text10, { bold: true, children: inline(block.text ?? "") }) });
+      return /* @__PURE__ */ jsx10(Box10, { marginTop: block.level === 1 ? 1 : 0, children: /* @__PURE__ */ jsx10(Text10, { bold: true, children: inline(block.text ?? "") }) });
     }
     case "blockquote":
-      return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: (block.text ?? "").split("\n").map((line, i) => /* @__PURE__ */ jsx11(Text10, { dimColor: true, italic: true, children: inline(line) }, i)) });
+      return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: (block.text ?? "").split("\n").map((line, i) => /* @__PURE__ */ jsx10(Text10, { dimColor: true, italic: true, children: inline(line) }, i)) });
     case "ul":
-      return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: (block.items ?? []).map((item, i) => /* @__PURE__ */ jsxs10(Box11, { children: [
-        /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: item.text?.match(/^[☑☐] /) ? "" : "\u2022 " }),
-        /* @__PURE__ */ jsx11(Box11, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx11(BlockView, { block: item }) })
+      return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: (block.items ?? []).map((item, i) => /* @__PURE__ */ jsxs10(Box10, { children: [
+        /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: item.text?.match(/^[☑☐] /) ? "" : "\u2022 " }),
+        /* @__PURE__ */ jsx10(Box10, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx10(BlockView, { block: item }) })
       ] }, i)) });
     case "ol":
-      return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: (block.items ?? []).map((item, i) => /* @__PURE__ */ jsxs10(Box11, { children: [
-        /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: `${(block.start ?? 1) + i}. ` }),
-        /* @__PURE__ */ jsx11(Box11, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx11(BlockView, { block: item }) })
+      return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: (block.items ?? []).map((item, i) => /* @__PURE__ */ jsxs10(Box10, { children: [
+        /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: `${(block.start ?? 1) + i}. ` }),
+        /* @__PURE__ */ jsx10(Box10, { flexGrow: 1, flexShrink: 1, minWidth: 0, children: /* @__PURE__ */ jsx10(BlockView, { block: item }) })
       ] }, i)) });
     case "paragraph":
     default: {
-      const content = /* @__PURE__ */ jsx11(Text10, { children: inline(block.text ?? "") });
+      const content = /* @__PURE__ */ jsx10(Text10, { children: inline(block.text ?? "") });
       if (!block.children?.length) return content;
-      return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
+      return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
         content,
-        /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: block.children.map((child, index) => /* @__PURE__ */ jsx11(BlockView, { block: child }, index)) })
+        /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: block.children.map((child, index) => /* @__PURE__ */ jsx10(BlockView, { block: child }, index)) })
       ] });
     }
     case "table":
-      return /* @__PURE__ */ jsx11(TableView, { block });
+      return /* @__PURE__ */ jsx10(TableView, { block });
     case "code":
-      return /* @__PURE__ */ jsx11(CodeBlock, { code: block.text ?? "" });
+      return /* @__PURE__ */ jsx10(CodeBlock, { code: block.text ?? "", lang: block.lang });
     case "hr":
-      return /* @__PURE__ */ jsx11(Box11, { height: 1 });
+      return /* @__PURE__ */ jsx10(Box10, { height: 1 });
   }
 }
-function CodeBlock({ code }) {
-  const lines = code.split("\n");
-  return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", marginTop: 1, children: lines.map((line, i) => /* @__PURE__ */ jsx11(Text10, { color: "cyan", children: line }, i)) });
+var TOKEN_COLORS = {
+  plain: void 0,
+  keyword: "#c4a7ff",
+  string: "#86efac",
+  comment: void 0,
+  number: "#fbbf24",
+  literal: "#fb923c",
+  type: "#67e8f9"
+};
+function CodeBlock({ code, lang }) {
+  const lines = useMemo4(() => highlightCode(code.replace(/\t/g, "  "), lang), [code, lang]);
+  const plain = grammarFor(lang) ? void 0 : "cyan";
+  return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", marginTop: 1, children: lines.map((tokens2, i) => /* @__PURE__ */ jsx10(Text10, { children: tokens2.map((token, j) => /* @__PURE__ */ jsx10(
+    Text10,
+    {
+      color: TOKEN_COLORS[token.kind] ?? (token.kind === "plain" ? plain : void 0),
+      dimColor: token.kind === "comment" ? true : void 0,
+      italic: token.kind === "comment",
+      children: token.text
+    },
+    j
+  )) }, i)) });
 }
 function TableView({ block }) {
   const { columns } = useTerminalSize();
   const headers = block.headers ?? [];
   const rows = block.rows ?? [];
   if (headers.length === 0 && rows.length === 0) {
-    return /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: "(empty table)" });
+    return /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: "(empty table)" });
   }
   const colCount = Math.max(headers.length, ...rows.map((r) => r?.length ?? 0));
   if (colCount === 0) {
-    return /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: "(empty table)" });
+    return /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: "(empty table)" });
   }
   const allRows = [headers, ...rows].map(
     (row) => Array.from({ length: colCount }, (_, index) => inlineDisplayText(row[index] ?? ""))
@@ -9306,7 +10190,7 @@ function TableView({ block }) {
   for (const row of allRows) {
     for (let i = 0; i < colCount; i++) {
       const cell = row[i] ?? "";
-      naturalWidths[i] = Math.max(naturalWidths[i] ?? 1, stringWidth(cell));
+      naturalWidths[i] = Math.max(naturalWidths[i] ?? 1, stringWidth3(cell));
     }
   }
   const colWidths = fitColumnWidths(naturalWidths, Math.max(1, columns));
@@ -9322,7 +10206,7 @@ function TableView({ block }) {
       const align = block.colAligns?.[i] ?? "left";
       const width = colWidths[i] ?? 1;
       const fitted = truncateToWidth(cell, width);
-      const visualWidth = stringWidth(fitted);
+      const visualWidth = stringWidth3(fitted);
       const totalPad = Math.max(0, width - visualWidth);
       let padded;
       if (align === "right") {
@@ -9336,13 +10220,13 @@ function TableView({ block }) {
       cells.push(padded);
     }
     lines.push(
-      /* @__PURE__ */ jsx11(Text10, { bold: rowIdx === 0, wrap: "truncate-end", children: cells.join(" \u2502 ") }, `row-${rowIdx}`)
+      /* @__PURE__ */ jsx10(Text10, { bold: rowIdx === 0, wrap: "truncate-end", children: cells.join(" \u2502 ") }, `row-${rowIdx}`)
     );
     if (rowIdx === 0) {
-      lines.push(/* @__PURE__ */ jsx11(Text10, { dimColor: true, wrap: "truncate-end", children: separator }, `sep-${rowIdx}`));
+      lines.push(/* @__PURE__ */ jsx10(Text10, { dimColor: true, wrap: "truncate-end", children: separator }, `sep-${rowIdx}`));
     }
   });
-  return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: lines });
+  return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: lines });
 }
 function fitColumnWidths(natural, maxLineWidth) {
   const widths = natural.map((width) => Math.max(1, width));
@@ -9365,11 +10249,11 @@ function fitColumnWidths(natural, maxLineWidth) {
 }
 var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function truncateToWidth(text, maxWidth) {
-  if (stringWidth(text) <= maxWidth) return text;
+  if (stringWidth3(text) <= maxWidth) return text;
   if (maxWidth <= 1) return "\u2026";
   let result = "";
   for (const { segment } of graphemeSegmenter.segment(text)) {
-    if (stringWidth(result + segment) > maxWidth - 1) break;
+    if (stringWidth3(result + segment) > maxWidth - 1) break;
     result += segment;
   }
   return `${result}\u2026`;
@@ -9730,7 +10614,7 @@ function inline(text, depth = 0) {
       handler: (m) => {
         const fragmentKey = key++;
         return /* @__PURE__ */ jsxs10(Fragment4, { children: [
-          /* @__PURE__ */ jsx11(Text10, { color: "cyan", underline: true, children: inline(m[2], depth + 1) }),
+          /* @__PURE__ */ jsx10(Text10, { color: "cyan", underline: true, children: inline(m[2], depth + 1) }),
           /* @__PURE__ */ jsxs10(Text10, { dimColor: true, color: "gray", children: [
             "(",
             restoreInlineEscapes(m[3]),
@@ -9741,31 +10625,31 @@ function inline(text, depth = 0) {
     },
     {
       re: /(`+)([^`]+?)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { bold: true, color: "cyan", children: restoreInlineEscapes(m[2]) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { bold: true, color: "cyan", children: restoreInlineEscapes(m[2]) }, key++)
     },
     {
       re: /(\*\*\*|___)(?=\S)(.*?\S)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { bold: true, italic: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { bold: true, italic: true, children: inline(m[2], depth + 1) }, key++)
     },
     {
       re: /(\*\*)(?=\S)(.*?\S)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { bold: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { bold: true, children: inline(m[2], depth + 1) }, key++)
     },
     {
       re: /(__)(?=\S)(.*?\S)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { bold: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { bold: true, children: inline(m[2], depth + 1) }, key++)
     },
     {
       re: /(~~)(?=\S)(.*?\S)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { strikethrough: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { strikethrough: true, children: inline(m[2], depth + 1) }, key++)
     },
     {
       re: /(\*)(?=\S)(.*?\S)\1/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { italic: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { italic: true, children: inline(m[2], depth + 1) }, key++)
     },
     {
       re: /(?<!\w)(_)(?=\S)(.*?\S)\1(?!\w)/,
-      handler: (m) => /* @__PURE__ */ jsx11(Text10, { italic: true, children: inline(m[2], depth + 1) }, key++)
+      handler: (m) => /* @__PURE__ */ jsx10(Text10, { italic: true, children: inline(m[2], depth + 1) }, key++)
     }
   ];
   while (rest.length > 0) {
@@ -9789,7 +10673,7 @@ function inline(text, depth = 0) {
 }
 
 // src/ui/components/Transcript.tsx
-import { Fragment as Fragment5, jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 var HEADER = { kind: "header" };
 function assistantThinkingForFrame(bubble, frozenThinking) {
   return bubble.streaming && bubble.text !== "" ? frozenThinking ?? bubble.thinking : bubble.thinking;
@@ -9806,7 +10690,7 @@ var Transcript = memo2(function Transcript2({
 }) {
   const liveAt = firstMutableBubbleIndex(bubbles);
   const stableCount = liveAt === -1 ? bubbles.length : liveAt;
-  const stableRef = useRef3([]);
+  const stableRef = useRef4([]);
   if (stableRef.current.length < stableCount) {
     stableRef.current = [
       ...stableRef.current,
@@ -9820,7 +10704,7 @@ var Transcript = memo2(function Transcript2({
   const agents = live.filter((bubble) => bubble.kind === "subagent");
   const groupedAgents = agents.length > 1;
   return /* @__PURE__ */ jsxs11(
-    Box12,
+    Box11,
     {
       flexDirection: "column",
       marginBottom: 1,
@@ -9828,9 +10712,9 @@ var Transcript = memo2(function Transcript2({
       minHeight: 0,
       overflowY: "hidden",
       children: [
-        /* @__PURE__ */ jsx12(Static, { items: staticItems, children: (item) => item.kind === "header" ? /* @__PURE__ */ jsx12(Logo, { workspace }, "kitcode-header") : /* @__PURE__ */ jsx12(BubbleView, { bubble: item }, item.id) }),
+        /* @__PURE__ */ jsx11(Static, { items: staticItems, children: (item) => item.kind === "header" ? /* @__PURE__ */ jsx11(Logo, { workspace }, "kitcode-header") : /* @__PURE__ */ jsx11(BubbleView, { bubble: item }, item.id) }),
         /* @__PURE__ */ jsxs11(
-          Box12,
+          Box11,
           {
             flexDirection: "column",
             flexShrink: 1,
@@ -9839,8 +10723,8 @@ var Transcript = memo2(function Transcript2({
             overflowY: "hidden",
             justifyContent: "flex-end",
             children: [
-              live.filter((bubble) => !groupedAgents || bubble.kind !== "subagent" && !(bubble.kind === "tool" && bubble.name === "task")).map((bubble) => /* @__PURE__ */ jsx12(BubbleView, { bubble, maxRows: maxLiveRows }, bubble.id)),
-              groupedAgents && /* @__PURE__ */ jsx12(SubagentSummary, { agents })
+              live.filter((bubble) => !groupedAgents || bubble.kind !== "subagent" && !(bubble.kind === "tool" && bubble.name === "task")).map((bubble) => /* @__PURE__ */ jsx11(BubbleView, { bubble, maxRows: maxLiveRows }, bubble.id)),
+              groupedAgents && /* @__PURE__ */ jsx11(SubagentSummary, { agents })
             ]
           }
         )
@@ -9854,22 +10738,22 @@ var BubbleView = memo2(function BubbleView2({
 }) {
   const theme = useTheme();
   if (bubble.kind === "user") {
-    return /* @__PURE__ */ jsx12(Box12, { marginTop: 1, children: /* @__PURE__ */ jsxs11(Text11, { color: theme.accent, bold: true, children: [
+    return /* @__PURE__ */ jsx11(Box11, { marginTop: 1, children: /* @__PURE__ */ jsxs11(Text11, { color: theme.accent, bold: true, children: [
       "\u203A ",
       bubble.text
     ] }) });
   }
   if (bubble.kind === "notice") {
     const color = bubble.level === "error" ? theme.error : bubble.level === "warn" ? theme.warn : theme.accent;
-    return /* @__PURE__ */ jsx12(Box12, { marginTop: 1, children: /* @__PURE__ */ jsx12(Text11, { color, children: bubble.text }) });
+    return /* @__PURE__ */ jsx11(Box11, { marginTop: 1, children: /* @__PURE__ */ jsx11(Text11, { color, children: bubble.text }) });
   }
   if (bubble.kind === "assistant") {
-    return /* @__PURE__ */ jsx12(AssistantView, { bubble, maxRows });
+    return /* @__PURE__ */ jsx11(AssistantView, { bubble, maxRows });
   }
   if (bubble.kind === "subagent") {
-    return /* @__PURE__ */ jsx12(SubagentView, { bubble, maxRows });
+    return /* @__PURE__ */ jsx11(SubagentView, { bubble, maxRows });
   }
-  return /* @__PURE__ */ jsx12(ToolView, { bubble });
+  return /* @__PURE__ */ jsx11(ToolView, { bubble });
 });
 function splitThinkingPrefix(text, streaming) {
   const opening = /^\s*<think(?:ing)?>/i.exec(text);
@@ -9885,7 +10769,7 @@ 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 frozenThinking = useRef4(void 0);
   const answering = bubble.streaming && bubble.text !== "";
   if (!answering) frozenThinking.current = void 0;
   if (answering && frozenThinking.current === void 0) {
@@ -9900,11 +10784,11 @@ function AssistantView({ bubble: source, maxRows }) {
   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(Box12, { flexDirection: "column", maxHeight: thinkingBudget, overflowY: "hidden", children: /* @__PURE__ */ jsx12(Markdown, { dim: true, children: frameThinking }) }),
-    bubble.streaming ? /* @__PURE__ */ jsx12(Text11, { children: frameText }) : /* @__PURE__ */ jsx12(Markdown, { children: bubble.text }),
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, children: [
+    frameThinking !== "" && /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", maxHeight: thinkingBudget, overflowY: "hidden", children: /* @__PURE__ */ jsx11(Markdown, { dim: true, children: frameThinking }) }),
+    bubble.streaming ? /* @__PURE__ */ jsx11(Text11, { children: frameText }) : /* @__PURE__ */ jsx11(Markdown, { children: bubble.text }),
     bubble.streaming && bubble.text === "" && /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
-      /* @__PURE__ */ jsx12(Spinner2, { type: "dots" }),
+      /* @__PURE__ */ jsx11(Spinner2, { type: "dots" }),
       " thinking"
     ] })
   ] });
@@ -9923,7 +10807,7 @@ function wrapVisualLine(line, columns) {
   let current = "";
   let currentWidth = 0;
   for (const character of line) {
-    const width = Math.max(1, stringWidth2(character));
+    const width = Math.max(1, stringWidth4(character));
     if (current !== "" && currentWidth + width > columns) {
       rows.push(current);
       current = "";
@@ -9940,23 +10824,23 @@ 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 = useMemo4(
+  const diff = useMemo5(
     () => display?.kind === "diff" ? diffLines(display.before, display.after) : null,
     [display]
   );
-  if (!diff) return /* @__PURE__ */ jsx12(NonDiffToolView, { bubble, mark, color });
+  if (!diff) return /* @__PURE__ */ jsx11(NonDiffToolView, { bubble, mark, color });
   const hasChanges = diff.added > 0 || diff.removed > 0;
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ jsxs11(Text11, { color, children: [
       mark,
       " ",
       bubble.summary,
       hasChanges && /* @__PURE__ */ jsxs11(Fragment5, { children: [
-        diff.added > 0 && /* @__PURE__ */ jsx12(Text11, { color: theme.ok, bold: true, children: ` +${diff.added}` }),
-        diff.removed > 0 && /* @__PURE__ */ jsx12(Text11, { color: theme.error, bold: true, children: ` -${diff.removed}` })
+        diff.added > 0 && /* @__PURE__ */ jsx11(Text11, { color: theme.ok, bold: true, children: ` +${diff.added}` }),
+        diff.removed > 0 && /* @__PURE__ */ jsx11(Text11, { color: theme.error, bold: true, children: ` -${diff.removed}` })
       ] })
     ] }),
-    /* @__PURE__ */ jsx12(Box12, { marginLeft: 2, children: /* @__PURE__ */ jsx12(DiffHunk, { lines: diff.hunk, hidden: diff.hidden }) })
+    /* @__PURE__ */ jsx11(Box11, { marginLeft: 2, children: /* @__PURE__ */ jsx11(DiffHunk, { lines: diff.hunk, hidden: diff.hidden }) })
   ] });
 }
 function NonDiffToolView({
@@ -9964,13 +10848,32 @@ function NonDiffToolView({
   mark,
   color
 }) {
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
+  const running = bubble.state === "running";
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ jsxs11(Text11, { color, children: [
       mark,
       " ",
-      bubble.summary
+      bubble.summary,
+      running && bubble.startedAt !== void 0 && /* @__PURE__ */ jsx11(Elapsed, { since: bubble.startedAt })
     ] }),
-    bubble.state !== "running" && bubble.content.trim() !== "" && /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", marginLeft: 2, children: previewLines(bubble.content).map((line, index) => /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: truncate2(line, 110) }, index)) })
+    running && bubble.progress && /* @__PURE__ */ jsx11(Box11, { marginLeft: 2, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, wrap: "truncate-end", children: [
+      "\u2514 ",
+      bubble.progress
+    ] }) }),
+    !running && bubble.content.trim() !== "" && /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", marginLeft: 2, children: previewLines(bubble.content).map((line, index) => /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: truncate2(line, 110) }, index)) })
+  ] });
+}
+var ELAPSED_AFTER_MS = 2e3;
+function Elapsed({ since }) {
+  const [now, setNow] = useState6(() => Date.now());
+  useEffect3(() => {
+    const timer = setInterval(() => setNow(Date.now()), 1e3);
+    return () => clearInterval(timer);
+  }, []);
+  const ms = now - since;
+  return ms < ELAPSED_AFTER_MS ? null : /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+    " \xB7 ",
+    formatDuration(ms)
   ] });
 }
 function previewLines(content) {
@@ -9982,7 +10885,7 @@ var VISIBLE_SUBAGENTS = 3;
 function SubagentSummary({ agents }) {
   const theme = useTheme();
   const running = agents.filter((agent) => agent.state === "running");
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, minWidth: 0, children: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, minWidth: 0, children: [
     /* @__PURE__ */ jsxs11(Text11, { color: theme.accent, wrap: "truncate-end", children: [
       "Subagents: ",
       running.length,
@@ -9999,7 +10902,7 @@ function SubagentSummary({ agents }) {
         progress.replace(/\s+/g, " ").trim() || "waiting"
       ] }, agent.id);
     }),
-    /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "/subagents \xB7 all active tasks" })
+    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "/subagents \xB7 open a sub-agent chat" })
   ] });
 }
 function SubagentView({ bubble, maxRows }) {
@@ -10009,16 +10912,99 @@ function SubagentView({ bubble, maxRows }) {
   const color = bubble.state === "running" ? theme.warn : theme.ok;
   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: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", marginTop: 1, minWidth: 0, children: [
     /* @__PURE__ */ jsxs11(Text11, { color, bold: true, wrap: "truncate-end", children: [
       mark,
       " subagent: ",
       bubble.description
     ] }),
-    /* @__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 })
+    /* @__PURE__ */ jsx11(Box11, { marginLeft: 2, flexDirection: "column", minWidth: 0, children: bubble.state === "running" ? /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", maxHeight: Math.max(1, (maxRows ?? 6) - 2), overflowY: "hidden", children: /* @__PURE__ */ jsx11(Markdown, { children: clipTextToRows(progress, Math.max(1, (maxRows ?? 6) - 2), Math.max(1, columns - 2)) }) }) : bubble.result ? /* @__PURE__ */ jsx11(Markdown, { children: sanitizeThinkingText(bubble.result) }) : null })
+  ] });
+}
+
+// src/ui/components/SubagentChat.tsx
+import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
+function SubagentChat({
+  bubble,
+  rows,
+  onClose
+}) {
+  const theme = useTheme();
+  const strings = useStrings();
+  const [offset, setOffset] = useState7(0);
+  const total = bubble?.bubbles.length ?? 0;
+  useInput2((_input, key) => {
+    if (key.escape) onClose();
+    else if (key.upArrow) setOffset((value) => Math.min(Math.max(0, total - 1), value + 1));
+    else if (key.downArrow) setOffset((value) => Math.max(0, value - 1));
+  });
+  if (!bubble) {
+    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: strings.noSubagents }),
+      /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: strings.subagentBack })
+    ] });
+  }
+  const running = bubble.state === "running";
+  const shown = bubble.bubbles.slice(0, total - offset);
+  const bodyRows = Math.max(3, rows - 2);
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", minWidth: 0, children: [
+    /* @__PURE__ */ jsxs12(Text12, { color: running ? theme.warn : theme.ok, bold: true, wrap: "truncate-end", children: [
+      running ? "\u25CC" : "\u25CF",
+      " ",
+      bubble.description,
+      /* @__PURE__ */ jsxs12(Text12, { dimColor: true, bold: false, children: [
+        " \xB7 ",
+        running ? strings.subagentRunning : strings.subagentDone
+      ] })
+    ] }),
+    /* @__PURE__ */ jsxs12(
+      Box12,
+      {
+        flexDirection: "column",
+        height: bodyRows,
+        overflowY: "hidden",
+        justifyContent: "flex-end",
+        minWidth: 0,
+        children: [
+          shown.length === 0 && !bubble.result && /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: strings.subagentWaiting }),
+          shown.map((inner) => /* @__PURE__ */ jsx12(BubbleView, { bubble: inner, maxRows: bodyRows }, inner.id)),
+          offset === 0 && !running && bubble.result && shown.length === 0 && /* @__PURE__ */ jsx12(Text12, { children: bubble.result })
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
+      strings.subagentBack,
+      " \xB7 \u2191/\u2193",
+      offset > 0 ? ` \xB7 \u2212${offset}` : ""
+    ] })
   ] });
 }
 
+// src/ui/components/TerminalViewport.tsx
+import { Box as Box13 } from "ink";
+import { jsx as jsx13 } from "react/jsx-runtime";
+var INTERACTIVE_CHROME_ROWS = 11;
+var MAX_LIVE_ROWS = 11;
+var MIN_LIVE_ROWS = 4;
+function liveTranscriptRows(rows) {
+  if (!Number.isFinite(rows)) return MAX_LIVE_ROWS;
+  return Math.max(MIN_LIVE_ROWS, Math.min(MAX_LIVE_ROWS, Math.floor(rows) - INTERACTIVE_CHROME_ROWS - 2));
+}
+function TerminalViewport({ children, rows }) {
+  const { columns } = useTerminalSize();
+  return /* @__PURE__ */ jsx13(
+    Box13,
+    {
+      width: columns,
+      maxWidth: "100%",
+      flexDirection: "column",
+      maxHeight: liveTranscriptRows(rows) + INTERACTIVE_CHROME_ROWS,
+      overflowY: "hidden",
+      children
+    }
+  );
+}
+
 // src/ui/transcript.ts
 function emptyTranscript() {
   return { bubbles: [], seq: 0 };
@@ -10059,11 +11045,19 @@ function applyEvent(state, event) {
             name: sanitizeTerminalText(event.name),
             summary: sanitizeTerminalText(event.summary),
             state: "running",
-            content: ""
+            content: "",
+            startedAt: Date.now()
           }
         ],
         seq: state.seq + 1
       };
+    case "tool_progress":
+      return {
+        ...state,
+        bubbles: state.bubbles.map(
+          (bubble) => bubble.kind === "tool" && bubble.id === event.id && bubble.state === "running" ? { ...bubble, progress: sanitizeTerminalText(event.text) } : bubble
+        )
+      };
     case "tool_end":
       return {
         ...state,
@@ -10120,6 +11114,7 @@ function applyEvent(state, event) {
     case "turn_start":
     case "usage":
     case "rate_limits":
+    case "speed":
       return state;
   }
 }
@@ -10256,10 +11251,25 @@ function sanitizeDisplay(display) {
 }
 
 // src/ui/App.tsx
-import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 var EFFORTS = ["auto", "low", "medium", "high", "xhigh", "max"];
 var STREAM_FRAME_MS = 50;
+var CUSTOM_ACCENT = "__custom__";
+var BELL_AFTER_MS = 15e3;
+var SUBAGENT_CHAT_EXTRA_ROWS = 4;
 var MAX_ATTACHMENTS = 8;
+var CONTEXT_PRESETS = [256e3, 512e3, 1e6];
+function formatContextTokens(tokens2) {
+  if (tokens2 >= 1e6) return `${tokens2 / 1e6}M`;
+  return `${Math.round(tokens2 / 1e3)}k`;
+}
+function parseContextTokens(input) {
+  const match = /^(\d+(?:\.\d+)?)\s*([km])?$/i.exec(input.trim());
+  if (!match) return null;
+  const scale = match[2]?.toLowerCase() === "m" ? 1e6 : match[2]?.toLowerCase() === "k" ? 1e3 : 1;
+  const tokens2 = Math.round(Number(match[1]) * scale);
+  return tokens2 >= 1e3 && tokens2 <= 1e7 ? tokens2 : null;
+}
 function App({
   runtime,
   initialHistory,
@@ -10268,40 +11278,53 @@ function App({
   const { exit, suspendTerminal } = useApp();
   const { stdout } = useStdout2();
   const { rows } = useTerminalSize();
-  const [transcript, setTranscript] = useState5(
+  const [transcript, setTranscript] = useState8(
     () => warnings.reduce((state, text) => pushNotice(state, "warn", text), fromHistory(initialHistory))
   );
-  const [transcriptRevision, setTranscriptRevision] = useState5(0);
-  const [input, setInput] = useState5("");
-  const [promptHistory, setPromptHistory] = useState5(
+  const [transcriptRevision, setTranscriptRevision] = useState8(0);
+  const transcriptRef = useRef5(transcript);
+  transcriptRef.current = transcript;
+  const [input, setInput] = useState8("");
+  const [promptHistory, setPromptHistory] = useState8(
     () => inputHistoryFromMessages(initialHistory)
   );
-  const [busy, setBusy] = useState5(false);
-  const busyRef = useRef4(false);
-  const [pendingCount, setPendingCount] = useState5(0);
-  const queueRef = useRef4([]);
-  const slashQueueRef = useRef4(Promise.resolve());
-  const slashPendingRef = useRef4(0);
-  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" });
-  const [accent, setAccent] = useState5(runtime.getAccent());
-  const [lang, setLang] = useState5(runtime.getLang());
-  const [setup, setSetup] = useState5(runtime.needsSetup());
-  const [, forceRender] = useState5(0);
-  const history = useRef4(initialHistory);
-  const abort = useRef4(null);
-  const sessionStart = useRef4(Date.now());
-  const turns = useRef4(0);
-  const [turnStart, setTurnStart] = useState5(null);
-  const [, tick] = useState5(0);
-  const [context, setContext] = useState5(() => runtime.modelContext());
-  const transcriptEvents = useRef4([]);
-  const transcriptTimer = useRef4(null);
+  const [busy, setBusy] = useState8(false);
+  const busyRef = useRef5(false);
+  const [pendingCount, setPendingCount] = useState8(0);
+  const queueRef = useRef5([]);
+  const slashQueueRef = useRef5(Promise.resolve());
+  const slashPendingRef = useRef5(0);
+  const drainQueueRef = useRef5(() => void 0);
+  const [attachments, setAttachments] = useState8([]);
+  const attachmentsRef = useRef5([]);
+  const attachmentGeneration = useRef5(0);
+  const automaticAttachmentTask = useRef5(null);
+  const clipboardPasteTask = useRef5(null);
+  const [overlay, setOverlay] = useState8({ kind: "none" });
+  const [accent, setAccent] = useState8(runtime.getAccent());
+  const [lang, setLang] = useState8(runtime.getLang());
+  const [setup, setSetup] = useState8(runtime.needsSetup());
+  const [, forceRender] = useState8(0);
+  const history = useRef5(initialHistory);
+  const abort = useRef5(null);
+  const sessionStart = useRef5(Date.now());
+  const turns = useRef5(0);
+  const [turnStart, setTurnStart] = useState8(null);
+  const [, tick] = useState8(0);
+  const [context, setContext] = useState8(() => runtime.modelContext());
+  const speedMeter = useRef5(createSpeedMeter());
+  const undoNote = useRef5(null);
+  const withUndoNote = (content) => {
+    const note = undoNote.current;
+    if (!note) return content;
+    undoNote.current = null;
+    return [{ type: "text", text: note }, ...content];
+  };
+  const transcriptEvents = useRef5([]);
+  const transcriptTimer = useRef5(null);
+  const bell = useCallback(() => {
+    if (stdout.isTTY && runtime.getBell()) stdout.write("\x07");
+  }, [runtime, stdout]);
   const clearScreen = useCallback(() => {
     if (stdout.isTTY) stdout.write("\x1B[2J\x1B[3J\x1B[H");
   }, [stdout]);
@@ -10328,6 +11351,7 @@ function App({
   }, []);
   const queueTranscriptEvent = useCallback(
     (event) => {
+      recordSpeed(speedMeter.current, event);
       transcriptEvents.current.push(event);
       if (event.type !== "text_delta" && event.type !== "thinking_delta") {
         flushTranscriptEvents();
@@ -10337,24 +11361,24 @@ function App({
     },
     [flushTranscriptEvents]
   );
-  useEffect2(
+  useEffect4(
     () => () => {
       if (transcriptTimer.current !== null) clearTimeout(transcriptTimer.current);
       transcriptEvents.current = [];
     },
     []
   );
-  useEffect2(
+  useEffect4(
     () => runtime.subscribeContext(() => setContext(runtime.modelContext())),
     [runtime]
   );
-  useEffect2(() => {
+  useEffect4(() => {
     if (turnStart === null) return;
     const timer = setInterval(() => tick((n) => n + 1), 1e3);
     return () => clearInterval(timer);
   }, [turnStart]);
-  const theme = useMemo5(() => makeTheme(accent), [accent]);
-  const strings = useMemo5(() => stringsFor(lang), [lang]);
+  const theme = useMemo6(() => makeTheme(accent), [accent]);
+  const strings = useMemo6(() => stringsFor(lang), [lang]);
   const notice = useCallback(
     (level, text) => {
       flushTranscriptEvents();
@@ -10362,7 +11386,7 @@ function App({
     },
     [flushTranscriptEvents]
   );
-  useEffect2(() => {
+  useEffect4(() => {
     const check = runtime.startupUpdateCheck();
     let active2 = true;
     void check.then((result) => {
@@ -10402,7 +11426,8 @@ function App({
     abort.current = controller;
     busyRef.current = true;
     setBusy(true);
-    setTurnStart(Date.now());
+    const startedAt = Date.now();
+    setTurnStart(startedAt);
     turns.current += 1;
     const hooks = {
       onEvent: queueTranscriptEvent,
@@ -10425,7 +11450,11 @@ function App({
           return;
         }
         controller.signal.addEventListener("abort", cancel, { once: true });
-        setOverlay({ kind: "permission", request, resolve: finish });
+        bell();
+        setOverlay((current) => {
+          if (current.kind === "picker") current.select("");
+          return { kind: "permission", request, resolve: finish };
+        });
       })
     };
     try {
@@ -10439,6 +11468,7 @@ function App({
     } catch (error) {
       notice("error", error instanceof Error ? error.message : String(error));
     } finally {
+      if (!controller.signal.aborted && Date.now() - startedAt >= BELL_AFTER_MS) bell();
       flushTranscriptEvents();
       abort.current = null;
       busyRef.current = false;
@@ -10446,9 +11476,14 @@ function App({
       setTurnStart(null);
       drainQueueRef.current();
     }
-  }, [flushTranscriptEvents, notice, queueTranscriptEvent, runtime]);
+  }, [bell, flushTranscriptEvents, notice, queueTranscriptEvent, runtime]);
   const applyAccent = useCallback(
-    async (value) => {
+    async (requested) => {
+      const value = parseAccent(requested);
+      if (!value) {
+        notice("warn", strings.accentInvalid(requested));
+        return;
+      }
       await runtime.setAccent(value);
       setAccent(value);
       notice("info", strings.accentSet(value, resolveAccent(value)));
@@ -10652,6 +11687,10 @@ function App({
               notice("info", strings.undoNothing);
               return;
             }
+            const reverted = [...result.restored, ...result.removed];
+            if (reverted.length > 0) {
+              undoNote.current = `[kitcode] The user ran /undo. These file changes from the previous turn were reverted and are no longer on disk: ${reverted.join(", ")}. Re-read files before relying on them.`;
+            }
             const lines = [strings.undoResult(result.restored.length, result.removed.length)];
             if (result.conflicts.length > 0) {
               lines.push(strings.undoConflicts(result.conflicts));
@@ -10776,8 +11815,8 @@ ${strings.modelSet(result.nextModel)}` : ""}`;
             return;
           }
           try {
-            const count = await runtime.refreshProviderModels(providerId);
-            notice("info", strings.modelsRefreshed(providerId, count));
+            const count2 = await runtime.refreshProviderModels(providerId);
+            notice("info", strings.modelsRefreshed(providerId, count2));
           } catch (error) {
             notice("error", error instanceof Error ? error.message : String(error));
           }
@@ -11077,7 +12116,7 @@ ${strings.mcpAddUsage}`
               history.current = result.history;
               setPromptHistory(inputHistoryFromMessages(result.history));
               setTranscript(
-                pushNotice(fromHistory(result.history), "info", strings.compactDone(result.removedMessages))
+                pushNotice(fromHistory(result.history), "info", strings.compactDone(result.removedMessages, result.clearedToolResults ?? 0, result.tokensBefore, result.tokensAfter))
               );
               setTranscriptRevision((revision) => revision + 1);
               await runtime.persist(result.history);
@@ -11096,17 +12135,27 @@ ${strings.mcpAddUsage}`
           return;
         }
         case "subagents": {
-          const agents = runtime.activeAgentsList();
+          const agents = transcriptRef.current.bubbles.filter(
+            (bubble) => bubble.kind === "subagent"
+          );
           if (agents.length === 0) {
-            notice("info", strings.subagentsStatus(0));
+            notice("info", strings.noSubagents);
             return;
           }
-          const lines = agents.map((a, i) => {
-            const label = a.description || `subagent ${i + 1}`;
-            const progress = a.progress.length > 0 ? ` \xB7 ${a.progress[a.progress.length - 1]}` : "";
-            return `${label}${progress}`;
-          });
-          notice("info", lines.join("\n"));
+          const ordered = [
+            ...agents.filter((agent) => agent.state === "running"),
+            ...agents.filter((agent) => agent.state !== "running").reverse()
+          ];
+          const running = ordered.filter((agent) => agent.state === "running");
+          const id = running.length === 1 && rawRest === "" ? running[0].id : await pick(
+            strings.subagentsTitle,
+            ordered.slice(0, 20).map((agent) => ({
+              key: agent.id,
+              label: agent.description || "subagent",
+              hint: agent.state === "running" ? strings.subagentRunning : strings.subagentDone
+            }))
+          );
+          if (id) setOverlay({ kind: "subagent", id });
           return;
         }
         case "checker":
@@ -11124,9 +12173,21 @@ ${strings.mcpAddUsage}`
           }
           const choice = await pick(
             strings.titleAccent,
-            Object.entries(PRESETS).map(([name, hex]) => ({ key: name, label: name, hint: hex }))
+            [
+              ...Object.entries(PRESETS).map(([name, hex]) => ({ key: name, label: name, hint: hex })),
+              { key: CUSTOM_ACCENT, label: strings.customAccent, hint: "#rrggbb" }
+            ]
           );
-          if (choice) await applyAccent(choice);
+          if (choice === CUSTOM_ACCENT) {
+            const typed = await promptInput(strings.customAccentPrompt);
+            if (typed) await applyAccent(typed);
+          } else if (choice) await applyAccent(choice);
+          return;
+        }
+        case "bell": {
+          const next = rawRest === "on" ? true : rawRest === "off" ? false : !runtime.getBell();
+          await runtime.setBell(next);
+          notice("info", strings.bellState(next));
           return;
         }
         case "thinking": {
@@ -11163,16 +12224,16 @@ ${strings.mcpAddUsage}`
         case "budget": {
           const current = runtime.getMaxTokensPerTurn();
           if (rest[0]) {
-            const tokens3 = Number(rest[0]);
-            if (tokens3 === 0) {
+            const tokens2 = Number(rest[0]);
+            if (tokens2 === 0) {
               await runtime.setMaxTokensPerTurn(0);
               notice("info", strings.budgetUnlimited);
               forceRender((n) => n + 1);
-            } else if (!Number.isInteger(tokens3) || tokens3 < 1e3 || tokens3 > 1e7) {
+            } else if (!Number.isInteger(tokens2) || tokens2 < 1e3 || tokens2 > 1e7) {
               notice("warn", strings.budgetInvalid);
             } else {
-              await runtime.setMaxTokensPerTurn(tokens3);
-              notice("info", strings.budgetSet(tokens3));
+              await runtime.setMaxTokensPerTurn(tokens2);
+              notice("info", strings.budgetSet(tokens2));
               forceRender((n) => n + 1);
             }
           } else {
@@ -11180,6 +12241,57 @@ ${strings.mcpAddUsage}`
           }
           return;
         }
+        case "context": {
+          const override = runtime.getContextWindowOverride();
+          const current = runtime.modelContext();
+          const requested = rest[0]?.toLowerCase();
+          if (requested !== void 0 && requested !== "") {
+            if (requested === "auto") {
+              await runtime.setContextWindowOverride(void 0);
+              notice("info", strings.contextAuto(runtime.modelContext().window));
+              forceRender((n) => n + 1);
+              return;
+            }
+            const tokens2 = parseContextTokens(requested);
+            if (tokens2 === null) {
+              notice("warn", strings.contextInvalid);
+              return;
+            }
+            await runtime.setContextWindowOverride(tokens2);
+            notice("info", strings.contextSet(tokens2));
+            forceRender((n) => n + 1);
+            return;
+          }
+          const effective = override ?? current.window;
+          notice("info", effective === null ? strings.contextUnknown : strings.contextCurrent(effective));
+          const choice = await pick(
+            strings.titleContext,
+            CONTEXT_PRESETS.map((preset) => ({
+              key: String(preset),
+              label: formatContextTokens(preset),
+              hint: current.window === preset ? strings.contextCurrentLabel : void 0
+            })).concat([
+              {
+                key: "auto",
+                label: "auto",
+                hint: override === void 0 ? strings.contextCurrentLabel : void 0
+              }
+            ])
+          );
+          if (!choice) return;
+          const chosen = CONTEXT_PRESETS.find((preset) => String(preset) === choice);
+          if (choice === "auto") {
+            await runtime.setContextWindowOverride(void 0);
+            notice("info", strings.contextAuto(runtime.modelContext().window));
+          } else if (chosen !== void 0) {
+            await runtime.setContextWindowOverride(chosen);
+            notice("info", strings.contextSet(chosen));
+          } else {
+            return;
+          }
+          forceRender((n) => n + 1);
+          return;
+        }
         case "model": {
           const items = await runtime.listModelItems();
           if (items.length === 0) {
@@ -11329,7 +12441,7 @@ Rename the file if you want a different name.`);
         return;
       }
       setTranscript((state) => pushUser(state, userDisplay(item.text, item.content)));
-      history.current = [...history.current, { role: "user", content: item.content }];
+      history.current = [...history.current, { role: "user", content: withUndoNote(item.content) }];
       void runAgent();
     },
     [runAgent, runSlash]
@@ -11346,6 +12458,49 @@ Rename the file if you want a different name.`);
     queueMicrotask(() => enqueueNext(next));
   }, [enqueueNext]);
   drainQueueRef.current = drainQueue;
+  const checkedOut = useRef5(null);
+  const putBackCheckedOut = (currentValue) => {
+    const out = checkedOut.current;
+    if (!out) return null;
+    checkedOut.current = null;
+    const restored = withEditedText(out.item, currentValue, attachmentsRef.current);
+    replaceAttachments([]);
+    const index = Math.min(out.index, queueRef.current.length);
+    queueRef.current = [...queueRef.current.slice(0, index), restored, ...queueRef.current.slice(index)];
+    return index;
+  };
+  const checkOut = (index) => {
+    const item = queueRef.current[index];
+    queueRef.current = queueRef.current.filter((_, at) => at !== index);
+    checkedOut.current = { index, item };
+    replaceAttachments(item.kind === "message" ? item.attachments : []);
+    return item.kind === "command" ? item.line : item.text;
+  };
+  const navigateQueue = useCallback(
+    (direction, currentValue) => {
+      if (!busyRef.current && slashPendingRef.current === 0) {
+        checkedOut.current = null;
+        return null;
+      }
+      if (!checkedOut.current && (currentValue !== "" || queueRef.current.length === 0)) return null;
+      const from = putBackCheckedOut(currentValue);
+      const length = queueRef.current.length;
+      let value;
+      if (from === null) value = direction === "previous" ? checkOut(length - 1) : "";
+      else if (direction === "previous") value = checkOut(Math.max(0, from - 1));
+      else value = from + 1 < length ? checkOut(from + 1) : "";
+      setPendingCount(queueRef.current.length);
+      return value;
+    },
+    [replaceAttachments]
+  );
+  const enqueue = (item) => {
+    const out = checkedOut.current;
+    checkedOut.current = null;
+    const index = out ? Math.min(out.index, queueRef.current.length) : queueRef.current.length;
+    queueRef.current = [...queueRef.current.slice(0, index), item, ...queueRef.current.slice(index)];
+    setPendingCount(queueRef.current.length);
+  };
   const tryQueueAutomaticAttachment = useCallback(
     (requestedPath) => {
       if (!looksLikeAttachmentPath(requestedPath)) return Promise.resolve(false);
@@ -11356,19 +12511,30 @@ Rename the file if you want a different name.`);
         notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
         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.`);
-          return true;
+      const paths = splitAttachmentPaths(requestedPath) ?? [requestedPath];
+      let task;
+      task = (async () => {
+        let added = 0;
+        for (const candidate of paths) {
+          try {
+            const block = await runtime.loadAutomaticAttachment(candidate);
+            if (automaticAttachmentTask.current !== task) return true;
+            if (!block) continue;
+            if (!appendAttachment(block)) {
+              notice("warn", `At most ${MAX_ATTACHMENTS} attachments can be queued for one message.`);
+              return true;
+            }
+            added += 1;
+            notice("info", strings.attachmentAdded(attachmentLabel(block) ?? "attachment"));
+          } catch (error) {
+            if (automaticAttachmentTask.current !== task) return true;
+            if (error instanceof Error && !error.code) {
+              notice("warn", error.message);
+            }
+          }
         }
-        notice("info", strings.attachmentAdded(attachmentLabel(block) ?? "attachment"));
-        return true;
-      }).catch(() => {
-        if (automaticAttachmentTask.current !== task) return true;
-        return false;
-      });
+        return added > 0;
+      })();
       automaticAttachmentTask.current = task;
       void task.finally(() => {
         if (automaticAttachmentTask.current === task) automaticAttachmentTask.current = null;
@@ -11420,12 +12586,11 @@ Rename the file if you want a different name.`);
       const submitSlash = () => {
         if (!detachedInput) setInput("");
         const command = text.slice(1).trim().split(/\s+/)[0]?.toLowerCase();
-        const liveCommand = ["help", "usage", "subagents", "config", "exit", "quit"].includes(command ?? "");
-        if (busyRef.current && !liveCommand || slashPendingRef.current > 0) {
-          queueRef.current = [...queueRef.current, { kind: "command", line: text }];
-          setPendingCount(queueRef.current.length);
+        if (busyRef.current && !commandRunsWhileBusy(command) || slashPendingRef.current > 0) {
+          enqueue({ kind: "command", line: text });
           return;
         }
+        checkedOut.current = null;
         runSlash(text);
       };
       if (isKnownSlashCommand(text)) {
@@ -11463,14 +12628,14 @@ Rename the file if you want a different name.`);
         ...mentioned
       ];
       replaceAttachments([]);
-      const item = { kind: "message", text, content };
+      const item = { kind: "message", text, content, attachments: queuedAttachments };
       if (busyRef.current || slashPendingRef.current > 0) {
-        queueRef.current = [...queueRef.current, item];
-        setPendingCount(queueRef.current.length);
+        enqueue(item);
         return;
       }
+      checkedOut.current = null;
       setTranscript((state) => pushUser(state, userDisplay(text, content)));
-      history.current = [...history.current, { role: "user", content }];
+      history.current = [...history.current, { role: "user", content: withUndoNote(content) }];
       void runAgent();
     },
     [replaceAttachments, runAgent, runSlash, tryQueueAutomaticAttachment]
@@ -11483,14 +12648,25 @@ Rename the file if you want a different name.`);
       return;
     }
     if (!key.escape) return;
-    if (busyRef.current && abort.current) {
+    if (overlay.kind === "subagent") return;
+    if (checkedOut.current && overlay.kind === "none") {
+      if (busyRef.current || slashPendingRef.current > 0) {
+        putBackCheckedOut(input);
+        setPendingCount(queueRef.current.length);
+        setInput("");
+        return;
+      }
+      checkedOut.current = null;
+    }
+    const hasDraft = input !== "" || attachmentsRef.current.length > 0 || automaticAttachmentTask.current !== null || clipboardPasteTask.current !== null;
+    if (busyRef.current && abort.current && !(hasDraft && overlay.kind === "none")) {
       if (!abort.current.signal.aborted) {
         abort.current.abort();
         notice("warn", strings.cancelled);
       }
       return;
     }
-    if (input !== "" || attachmentsRef.current.length > 0 || automaticAttachmentTask.current || clipboardPasteTask.current) {
+    if (hasDraft) {
       attachmentGeneration.current += 1;
       setInput("");
       replaceAttachments([]);
@@ -11515,10 +12691,10 @@ Rename the file if you want a different name.`);
     }
     setInput("");
   });
-  const shell = (children) => /* @__PURE__ */ jsx13(ThemeContext.Provider, { value: theme, children: /* @__PURE__ */ jsx13(StringsContext.Provider, { value: strings, children }) });
+  const shell = (children) => /* @__PURE__ */ jsx14(ThemeContext.Provider, { value: theme, children: /* @__PURE__ */ jsx14(StringsContext.Provider, { value: strings, children }) });
   if (lang === void 0) {
     return shell(
-      /* @__PURE__ */ jsx13(
+      /* @__PURE__ */ jsx14(
         LanguagePicker,
         {
           onPick: (chosen) => {
@@ -11531,7 +12707,7 @@ Rename the file if you want a different name.`);
   }
   if (setup) {
     return shell(
-      /* @__PURE__ */ jsx13(
+      /* @__PURE__ */ jsx14(
         Onboarding,
         {
           onSubmit: async (url, key) => {
@@ -11546,17 +12722,17 @@ ${strings.configAt(runtime.configPath())}`);
     );
   }
   return shell(
-    /* @__PURE__ */ jsxs12(TerminalViewport, { rows, children: [
-      /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsxs13(TerminalViewport, { rows, children: [
+      /* @__PURE__ */ jsx14(
         Transcript,
         {
           bubbles: transcript.bubbles,
           workspace: runtime.cwd,
-          maxLiveRows: liveTranscriptRows(rows)
+          maxLiveRows: overlay.kind === "subagent" ? 0 : liveTranscriptRows(rows)
         },
         transcriptRevision
       ),
-      overlay.kind === "permission" && /* @__PURE__ */ jsx13(
+      overlay.kind === "permission" && /* @__PURE__ */ jsx14(
         PermissionPrompt,
         {
           request: overlay.request,
@@ -11566,7 +12742,7 @@ ${strings.configAt(runtime.configPath())}`);
           }
         }
       ),
-      overlay.kind === "picker" && /* @__PURE__ */ jsx13(
+      overlay.kind === "picker" && /* @__PURE__ */ jsx14(
         Picker,
         {
           title: overlay.title,
@@ -11581,7 +12757,17 @@ ${strings.configAt(runtime.configPath())}`);
           }
         }
       ),
-      overlay.kind === "confirm" && /* @__PURE__ */ jsx13(
+      overlay.kind === "subagent" && /* @__PURE__ */ jsx14(
+        SubagentChat,
+        {
+          bubble: transcript.bubbles.find(
+            (bubble) => bubble.kind === "subagent" && bubble.id === overlay.id
+          ),
+          rows: liveTranscriptRows(rows) + SUBAGENT_CHAT_EXTRA_ROWS,
+          onClose: () => setOverlay({ kind: "none" })
+        }
+      ),
+      overlay.kind === "confirm" && /* @__PURE__ */ jsx14(
         Confirm,
         {
           title: overlay.title,
@@ -11593,7 +12779,7 @@ ${strings.configAt(runtime.configPath())}`);
           }
         }
       ),
-      overlay.kind === "textinput" && /* @__PURE__ */ jsx13(
+      overlay.kind === "textinput" && /* @__PURE__ */ jsx14(
         TextInputOverlay,
         {
           title: overlay.title,
@@ -11608,7 +12794,7 @@ ${strings.configAt(runtime.configPath())}`);
           }
         }
       ),
-      overlay.kind === "none" && /* @__PURE__ */ jsx13(
+      overlay.kind === "none" && /* @__PURE__ */ jsx14(
         PromptInput,
         {
           value: input,
@@ -11619,7 +12805,11 @@ ${strings.configAt(runtime.configPath())}`);
           onListFiles: listWorkspaceFiles,
           disabled: busy,
           pending: pendingCount,
-          hint: busy ? strings.escCancel : void 0,
+          queued: queueRef.current.map((item) => item.kind === "command" ? item.line : item.text || attachmentSummary(item.attachments)),
+          onNavigateQueue: navigateQueue,
+          hint: busy ? input !== "" || attachments.length > 0 ? strings.escClear : strings.escCancel : void 0,
+          mode: runtime.getMode(),
+          bypass: runtime.isBypassEnabled(),
           history: promptHistory,
           attachments: attachments.flatMap((block) => {
             const label = attachmentLabel(block);
@@ -11627,21 +12817,23 @@ ${strings.configAt(runtime.configPath())}`);
           })
         }
       ),
-      /* @__PURE__ */ jsx13(
+      /* @__PURE__ */ jsx14(
         StatusBar,
         {
           status: {
             modelRef: runtime.getModelRef() || strings.noModel,
             effort: runtime.getEffort(),
+            effectiveEffort: runtime.getEffectiveEffort(history.current),
             thinking: runtime.getThinking(),
             usage: runtime.usageParts(),
+            speed: readSpeed(speedMeter.current, busy),
             mcp: runtime.mcpSummary(),
             mode: runtime.getMode(),
             bypass: runtime.isBypassEnabled(),
             busy,
             sessionMs: Date.now() - sessionStart.current,
             turnMs: turnStart === null ? null : Date.now() - turnStart,
-            activeAgents: runtime.activeAgentsCount(),
+            agents: runtime.activeAgentsList().map((agent) => agent.description),
             context
           }
         }
@@ -11655,17 +12847,17 @@ function TextInputOverlay({
   onAnswer,
   onCancel
 }) {
-  const [value, setValue] = useState5("");
+  const [value, setValue] = useState8("");
   const theme = useTheme();
   const submit = useCallback(() => {
     onAnswer(value || null);
   }, [value, onAnswer]);
-  useInput2((_input, key) => {
+  useInput3((_input, key) => {
     if (key.escape) onCancel();
   });
-  return /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: title }),
-    /* @__PURE__ */ jsx13(
+  return /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: title }),
+    /* @__PURE__ */ jsx14(
       TextInput2,
       {
         value,
@@ -11674,9 +12866,24 @@ function TextInputOverlay({
         mask: mask ? "\u2022" : void 0
       }
     ),
-    /* @__PURE__ */ jsx13(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx13(Text12, { dimColor: true, color: theme.accent, children: "enter submit \xB7 esc cancel" }) })
+    /* @__PURE__ */ jsx14(Box14, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text13, { dimColor: true, color: theme.accent, children: "enter submit \xB7 esc cancel" }) })
   ] });
 }
+function withEditedText(item, text, attachments) {
+  if (item.kind === "command") {
+    if (text.startsWith("/")) return { kind: "command", line: text };
+    return { kind: "message", text, attachments, content: messageContent(text, attachments, []) };
+  }
+  if (text === item.text && attachments === item.attachments) return item;
+  const mentioned = item.content.filter((block) => block.type !== "text" && !item.attachments.includes(block));
+  return { kind: "message", text, attachments, content: messageContent(text, attachments, mentioned) };
+}
+function messageContent(text, attachments, mentioned) {
+  return [...text ? [{ type: "text", text }] : [], ...attachments, ...mentioned];
+}
+function attachmentSummary(blocks) {
+  return "\u{1F4CE} " + blocks.map((block) => attachmentLabel(block) ?? "attachment").join(", ");
+}
 function isKnownSlashCommand(line) {
   if (!line.startsWith("/")) return false;
   const [name = ""] = line.slice(1).trim().toLowerCase().split(/\s+/);
@@ -11747,7 +12954,7 @@ function unquoteArg(value) {
 }
 
 // src/app/tui.tsx
-import { jsx as jsx14 } from "react/jsx-runtime";
+import { jsx as jsx15 } from "react/jsx-runtime";
 function clearTerminal() {
   if (process.stdout.isTTY) process.stdout.write("\x1B[2J\x1B[3J\x1B[H");
 }
@@ -11767,7 +12974,7 @@ async function startTui(options) {
   });
   clearTerminal();
   const instance = render(
-    /* @__PURE__ */ jsx14(App, { runtime, initialHistory: history, warnings }),
+    /* @__PURE__ */ jsx15(App, { runtime, initialHistory: history, warnings }),
     TUI_RENDER_OPTIONS
   );
   try {