@kmugalkhod/lightcode 0.4.0 → 0.6.0

package/cli.js

@@ -124,7 +124,7 @@ var init_logger = __esm(() => {
 });
 
 // packages/shared/src/version.ts
-var lightcodeVersion = "0.4.0";
+var lightcodeVersion = "0.6.0";
 
 // packages/shared/src/index.ts
 var productName = "Lightcode";
@@ -226,7 +226,8 @@ async function ensureServerRunning() {
     stderr: logFile,
     env: {
       ...process.env,
-      PORT: port
+      PORT: port,
+      LIGHTCODE_PARENT_PID: String(process.pid)
     }
   });
   for (let attempt = 0;attempt < startupPollAttempts; attempt += 1) {
@@ -279,7 +280,8 @@ var init_keymap = __esm(() => {
       "ctrl+q": { sequence: "ctrl+q", action: "system:quit", label: "Quit", category: "system" },
       f1: { sequence: "f1", action: "system:help", label: "Help", category: "system" },
       "ctrl+/": { sequence: "ctrl+/", action: "system:help", label: "Help", category: "system" },
-      "ctrl+o": { sequence: "ctrl+o", action: "system:toggleToolOutput", label: "Expand Tool Output", category: "action" }
+      "ctrl+o": { sequence: "ctrl+o", action: "system:toggleToolOutput", label: "Expand Tool Output", category: "action" },
+      "ctrl+r": { sequence: "ctrl+r", action: "system:toggleReasoning", label: "Show Reasoning", category: "action" }
     }
   };
 });
@@ -319,7 +321,7 @@ function getOverlayRowColors(selected) {
     secondaryTextColor: cliTheme.overlay.description
   };
 }
-var toolStateToneMap, cliTheme, serverStatusColors;
+var toolStateToneMap, cliTheme, space, borderStyleFor, glyphs, serverStatusColors;
 var init_cli_theme = __esm(() => {
   toolStateToneMap = {
     "input-streaming": "muted",
@@ -340,7 +342,7 @@ var init_cli_theme = __esm(() => {
     borders: {
       default: "#273241",
       subtle: "#202A36",
-      active: "#80D0C7"
+      active: "#F2A65A"
     },
     text: {
       primary: "#EEF3F8",
@@ -348,57 +350,66 @@ var init_cli_theme = __esm(() => {
       muted: "#7A8796"
     },
     accent: {
-      primary: "#80D0C7",
-      softBackground: "#17333A",
-      softText: "#BCEDE8"
+      primary: "#F2A65A",
+      softBackground: "#33260F",
+      softText: "#F6C99A"
     },
     semantic: {
       success: "#8BD49C",
-      warning: "#F1C27D",
+      warning: "#E5C07B",
       error: "#F28B82",
       info: "#9CBDFD"
     },
+    diff: {
+      added: "#8BD49C",
+      addedBg: "#13271B",
+      removed: "#F28B82",
+      removedBg: "#2B1619"
+    },
     messageRoles: {
       user: {
         labelColor: "#9CBDFD",
         borderColor: "#22314A",
-        backgroundColor: "#111A27"
+        backgroundColor: "#111A27",
+        glyph: "\u25B8"
       },
       assistant: {
         labelColor: "#8BD49C",
         borderColor: "#203A2A",
-        backgroundColor: "#111C18"
+        backgroundColor: "#111C18",
+        glyph: "\u25C6"
       },
       system: {
         labelColor: "#C3CDD9",
         borderColor: "#273241",
-        backgroundColor: "#131820"
+        backgroundColor: "#131820",
+        glyph: "\u25A0"
       }
     },
     overlay: {
       surface: "#121820",
       border: "#273241",
-      title: "#80D0C7",
-      selectedRowBackground: "#17333A",
+      title: "#F2A65A",
+      selectedRowBackground: "#33260F",
       selectedRowText: "#EEF3F8",
       inputSurface: "#10151C",
       inputText: "#EEF3F8",
       mutedText: "#7A8796",
       footerText: "#B6C2CF",
-      selectedBorder: "#80D0C7",
+      selectedBorder: "#F2A65A",
       badgeBackground: "#18212B",
       badgeText: "#B6C2CF",
       description: "#9AA8B7",
       sectionDivider: "#202A36",
       shortcutHint: "#9AA8B7",
       headerMuted: "#9AA8B7",
-      countBadge: "#17333A",
+      countBadge: "#33260F",
       hoverBackground: "#18212B"
     },
     input: {
       container: "#121820",
       field: "#10151C",
-      focusedBorder: "#80D0C7",
+      focusedBorder: "#F2A65A",
       blurredBorder: "#273241",
       placeholder: "#7A8796",
       text: "#EEF3F8",
@@ -408,12 +419,56 @@ var init_cli_theme = __esm(() => {
     scroll: {
       rail: "#0D1117",
       thumb: "#273241",
-      thumbActive: "#80D0C7"
+      thumbActive: "#F2A65A"
     },
     markdown: {
       tableBorder: "#273241"
     }
   };
+  space = {
+    none: 0,
+    xs: 1,
+    sm: 1,
+    md: 2,
+    lg: 3
+  };
+  borderStyleFor = {
+    card: "rounded",
+    modal: "heavy",
+    chrome: "single"
+  };
+  glyphs = {
+    unicode: {
+      roleUser: "\u25B8",
+      roleAssistant: "\u25C6",
+      roleSystem: "\u25A0",
+      toolRunning: "\u25B8",
+      toolOk: "\u2713",
+      toolError: "\u2717",
+      toolDenied: "\u2298",
+      toolApproval: "\u25CF",
+      statusDot: "\u25CF",
+      indent: "\u23BF",
+      back: "\u25C0",
+      breadcrumb: "\u203A",
+      bullet: "\xB7"
+    },
+    ascii: {
+      roleUser: ">",
+      roleAssistant: "*",
+      roleSystem: "#",
+      toolRunning: ">",
+      toolOk: "+",
+      toolError: "x",
+      toolDenied: "/",
+      toolApproval: "o",
+      statusDot: "o",
+      indent: ">",
+      back: "<",
+      breadcrumb: ">",
+      bullet: "-"
+    }
+  };
   serverStatusColors = {
     checking: cliTheme.text.secondary,
     online: cliTheme.semantic.success,
@@ -433,7 +488,7 @@ function HelpOverlay() {
   return /* @__PURE__ */ jsxDEV("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     borderColor: cliTheme.accent.primary,
     backgroundColor: cliTheme.overlay.surface,
     paddingX: 2,
@@ -493,7 +548,7 @@ var init_help_overlay = __esm(() => {
   init_cli_theme();
   screenHints = [
     { context: "Chat", hint: "Tab/Ctrl+T switch mode | @ attach files | /compact, /undo actions" },
-    { context: "Chat", hint: "Ctrl+O expand tool output | Enter send | Ctrl+Enter newline" },
+    { context: "Chat", hint: "Ctrl+O expand tool output | Ctrl+R show reasoning | Enter send | Ctrl+Enter newline" },
     { context: "Copy", hint: "Ctrl+Y copy mode (\u2191/\u2193 pick, Enter copy, c code) | /copy [last|code|all]" },
     { context: "Sessions", hint: "Enter resume | r rename | f fork | / filter | e export (.md) | d delete" }
   ];
@@ -637,7 +692,7 @@ function CommandPalette({ query, setQuery, selectedIndex }) {
     minHeight: 20,
     flexDirection: "column",
     backgroundColor: cliTheme.overlay.surface,
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     border: ["top", "bottom", "left", "right"],
     borderColor: cliTheme.overlay.border,
     children: [
@@ -874,7 +929,7 @@ function SlashPageMenu({
     width: "100%",
     flexDirection: "column",
     backgroundColor: cliTheme.overlay.surface,
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     borderColor: cliTheme.overlay.border,
     children: [
       /* @__PURE__ */ jsxDEV3("box", {
@@ -1617,9 +1672,10 @@ var init_schema = __esm(() => {
 
 // packages/ai/src/edit-file/schema.ts
 import { z as z6 } from "zod";
-var editFileDescription = "Edit a file via literal search and replace. Use this for focused, small edits.", editFileInputSchema, editFileProviderInputSchema, editFileOutputSchema;
+var editFileDescription, editFileInputSchema, editFileProviderInputSchema, editFileOutputSchema;
 var init_schema2 = __esm(() => {
   init_base_schemas();
+  editFileDescription = "Edit a file via search and replace. Use this for focused, small edits. " + "Line endings (CRLF/LF) and surrounding whitespace are matched tolerantly, so " + "copy the lines as shown by read_file. The search text must match exactly one " + "place \u2014 include enough surrounding context to make it unique, or set " + "replaceAll: true to change every occurrence.";
   editFileInputSchema = z6.object({
     path: boundedPathSchema,
     search: z6.string().min(1),
@@ -2466,7 +2522,8 @@ var init_agent_tools = __esm(() => {
     permissionMode: permissionModeSchema.optional(),
     allowedTools: z21.array(codingAgentToolNameSchema).optional(),
     permissionRules: permissionRulesSchema.optional(),
-    sandbox: sandboxConfigSchema.optional()
+    sandbox: sandboxConfigSchema.optional(),
+    environmentContext: z21.string().optional()
   });
 });
 
@@ -2491,7 +2548,8 @@ function parseChatStreamError(message) {
       kind: parsed.kind,
       statusCode: typeof parsed.statusCode === "number" ? parsed.statusCode : undefined,
       retryable: parsed.retryable,
-      message: parsed.message
+      message: parsed.message,
+      contextLimitTokens: typeof parsed.contextLimitTokens === "number" ? parsed.contextLimitTokens : undefined
     };
   } catch {
     return null;
@@ -2501,6 +2559,15 @@ function describeChatStreamError(info) {
   const status = info.statusCode ? ` (HTTP ${info.statusCode})` : "";
   return `${chatErrorKindLabels[info.kind]}${status}: ${info.message}`;
 }
+function retryReasonLabel(reason) {
+  if (reason === "stall") {
+    return "Stalled";
+  }
+  if (reason === undefined || reason === "network") {
+    return "Connection dropped";
+  }
+  return chatErrorKindLabels[reason];
+}
 var chatStreamErrorPrefix = "LIGHTCODE_ERROR:", maxTransportMessageLength = 500, chatErrorKinds, chatErrorKindLabels;
 var init_chat_error = __esm(() => {
   chatErrorKinds = new Set([
@@ -2841,7 +2908,8 @@ function buildCodingAgentSystemPrompt({
   cwd,
   override,
   mode = defaultCodingAgentMode,
-  includeToolDiscipline = false
+  includeToolDiscipline = false,
+  environmentContext
 }) {
   const promptTemplate = override?.trim() ? override : defaultCodingAgentSystemPrompt;
   const normalizedPrompt = normalizePromptTemplate(promptTemplate, cwd);
@@ -2852,12 +2920,14 @@ function buildCodingAgentSystemPrompt({
 ` + `Mode purpose: ${modeDefinition.purpose}
 ` + `${modeDefinition.instructions}` + (includeToolDiscipline ? `
 
-${toolCallingDisciplineAddendum}` : "");
+${toolCallingDisciplineAddendum}` : "") + (environmentContext?.trim() ? `
+
+${environmentContext.trim()}` : "");
 }
 var cwdPromptPlaceholder = "{cwd}", defaultCodingAgentSystemPrompt, toolCallingDisciplineAddendum;
 var init_coding_agent_prompt = __esm(() => {
   init_coding_agent_modes();
-  defaultCodingAgentSystemPrompt = "You are a coding agent. Use tools for filesystem and codebase tasks instead of guessing, and only interact with files under this working directory: {cwd}. " + "Prefer dedicated tools \u2014 glob_search for paths, grep for text search, structured git tools for repository inspection \u2014 and bash only when those are not enough. " + `Use todo_write to keep multi-step work visible and current, inspect context before risky operations, and emit a brief, natural progress note before major tool actions and after important findings.
+  defaultCodingAgentSystemPrompt = "You are a coding agent working inside the user's project at this working directory: {cwd}. " + 'You can already see the project \u2014 proactively read it. When the user asks you to review, explain, or work on "my code"/"this", inspect the working directory yourself with list_files, glob_search, grep, and read_file; NEVER ask the user to paste or share code that lives in this directory \u2014 open it. ' + "Use tools for filesystem and codebase tasks instead of guessing, and only interact with files under the working directory. " + "Prefer dedicated tools \u2014 glob_search for paths, grep for text search, structured git tools for repository inspection \u2014 and bash only when those are not enough. " + `Use todo_write to keep multi-step work visible and current, inspect context before risky operations, and emit a brief, natural progress note before major tool actions and after important findings.
 
 ` + `You are an agent \u2014 keep working until the request is fully resolved. Never stop with a partial answer; if you say you will do something, do it in the same turn by calling a tool. Do not finish while any todo is pending or in_progress \u2014 end your turn only when the task is complete or you are blocked on input that only the user can provide.
 
@@ -3179,78 +3249,7 @@ function selectCodingAgentIntentTools({
   if (!normalizedText || casualPromptPattern.test(normalizedText)) {
     return [];
   }
-  const selectedTools = [];
-  const hasCodeIntent = includesAny(normalizedText, [
-    "file",
-    "folder",
-    "code",
-    "repo",
-    "project",
-    "implement",
-    "fix",
-    "add",
-    "build",
-    "refactor",
-    "change",
-    "create",
-    "update",
-    "edit",
-    "delete",
-    "run",
-    "test",
-    "typecheck",
-    "debug",
-    "error",
-    "issue",
-    "problem",
-    "fails",
-    "failed",
-    "failing",
-    "bug",
-    "crash",
-    "slow",
-    "slowness",
-    "not working",
-    "epic",
-    "ticket"
-  ]);
-  const hasReadIntent = includesAny(normalizedText, [
-    "read",
-    "list",
-    "find",
-    "search",
-    "grep",
-    "glob",
-    "inspect",
-    "analyse",
-    "analyze",
-    "check"
-  ]);
-  const hasWriteIntent = mode === "build" && includesAny(normalizedText, [
-    "write",
-    "edit",
-    "change",
-    "create",
-    "implement",
-    "fix",
-    "update",
-    "delete",
-    "remove",
-    "rename"
-  ]);
-  const hasShellIntent = mode === "build" && includesAny(normalizedText, [
-    "run",
-    "command",
-    "terminal",
-    "shell",
-    "bash",
-    "powershell",
-    "bun",
-    "tests",
-    "run test",
-    "run tests",
-    "typecheck"
-  ]);
+  const situational = [];
   const hasGitIntent = includesAny(normalizedText, [
     "git",
     "diff",
@@ -3261,95 +3260,64 @@ function selectCodingAgentIntentTools({
     "revision",
     "changes"
   ]);
-  const hasTodoIntent = includesAny(normalizedText, [
-    "todo",
-    "tasks",
-    "checklist",
-    "steps",
-    "epic",
-    "ticket"
-  ]);
-  const hasWebIntent = includesAny(normalizedText, [
-    "http://",
-    "https://",
-    "url",
-    "fetch",
-    "website",
-    "web",
-    "online",
-    "search internet",
-    "latest"
-  ]);
-  const explicitToolSearch = includesAny(normalizedText, [
-    "tool_search",
-    "tool search",
-    "find tool",
-    "available tool"
-  ]);
-  const hasSkillIntent = includesAny(normalizedText, [
-    "skill",
-    "skills",
-    "load skill"
-  ]);
-  const hasMcpIntent = includesAny(normalizedText, [
-    "mcp",
-    "resource",
-    "resources",
-    "mcp tool",
-    "mcp server"
-  ]);
-  if (hasCodeIntent || hasReadIntent && !hasGitIntent && !hasWebIntent && !explicitToolSearch) {
-    for (const toolName of baseReadTools) {
-      pushUniqueTool(selectedTools, toolName);
-    }
-  }
   if (hasGitIntent) {
     if (includesAny(normalizedText, ["status", "state", "dirty", "working tree"]) || !includesAny(normalizedText, ["diff", "log", "show", "history", "commit"])) {
-      pushUniqueTool(selectedTools, "git_status");
+      pushUniqueTool(situational, "git_status");
     }
     if (includesAny(normalizedText, ["diff", "changes", "patch"])) {
-      pushUniqueTool(selectedTools, "git_diff");
+      pushUniqueTool(situational, "git_diff");
     }
     if (includesAny(normalizedText, ["log", "history", "commits"])) {
-      pushUniqueTool(selectedTools, "git_log");
+      pushUniqueTool(situational, "git_log");
     }
     if (includesAny(normalizedText, ["show", "revision", "commit"])) {
-      pushUniqueTool(selectedTools, "git_show");
+      pushUniqueTool(situational, "git_show");
     }
   }
-  if (hasTodoIntent && mode === "build") {
-    pushUniqueTool(selectedTools, "todo_write");
+  if (mode === "build" && includesAny(normalizedText, ["todo", "tasks", "checklist", "steps", "epic", "ticket"])) {
+    pushUniqueTool(situational, "todo_write");
   }
-  if (explicitToolSearch) {
-    pushUniqueTool(selectedTools, "tool_search");
+  if (includesAny(normalizedText, ["tool_search", "tool search", "find tool", "available tool"])) {
+    pushUniqueTool(situational, "tool_search");
   }
-  if (hasSkillIntent) {
-    pushUniqueTool(selectedTools, "skill");
+  if (includesAny(normalizedText, ["skill", "skills", "load skill"])) {
+    pushUniqueTool(situational, "skill");
   }
-  if (hasMcpIntent) {
-    pushUniqueTool(selectedTools, "list_mcp_resources");
+  if (includesAny(normalizedText, ["mcp", "resource", "resources", "mcp tool", "mcp server"])) {
+    pushUniqueTool(situational, "list_mcp_resources");
     if (includesAny(normalizedText, ["read", "resource", "resources"])) {
-      pushUniqueTool(selectedTools, "read_mcp_resource");
+      pushUniqueTool(situational, "read_mcp_resource");
     }
     if (mode === "build" && includesAny(normalizedText, ["call", "execute", "run"])) {
-      pushUniqueTool(selectedTools, "call_mcp_tool");
+      pushUniqueTool(situational, "call_mcp_tool");
     }
   }
-  if (hasWriteIntent) {
-    pushUniqueTool(selectedTools, "write_file");
-    pushUniqueTool(selectedTools, "edit_file");
+  if (includesAny(normalizedText, [
+    "http://",
+    "https://",
+    "url",
+    "fetch",
+    "website",
+    "web",
+    "online",
+    "search internet",
+    "latest"
+  ])) {
+    pushUniqueTool(situational, "web_fetch");
+    pushUniqueTool(situational, "web_search");
   }
-  if (hasShellIntent) {
-    pushUniqueTool(selectedTools, "bash");
+  if (mode === "plan" && includesAny(normalizedText, ["question", "ask", "clarify"])) {
+    pushUniqueTool(situational, "request_user_input");
   }
-  if (hasWebIntent) {
-    pushUniqueTool(selectedTools, "web_fetch");
-    pushUniqueTool(selectedTools, "web_search");
+  const ordered = [...baseReadTools, ...situational];
+  if (mode === "build") {
+    ordered.push("write_file", "edit_file", "bash");
   }
-  if (mode === "plan" && includesAny(normalizedText, ["question", "ask", "clarify"])) {
-    pushUniqueTool(selectedTools, "request_user_input");
+  const selected = [];
+  for (const toolName of ordered) {
+    pushUniqueTool(selected, toolName);
   }
-  return selectedTools;
+  return selected.slice(0, maxProviderActiveTools);
 }
 function limitProviderActiveTools(tools, maxTools = maxProviderActiveTools) {
   if (tools.length <= maxTools) {
@@ -3552,7 +3520,8 @@ function createCodingAgent({
           cwd: options.cwd,
           override: promptOverride,
           mode,
-          includeToolDiscipline
+          includeToolDiscipline,
+          environmentContext: options.environmentContext
         })
       };
     }
@@ -3633,17 +3602,33 @@ function normalizeContextOptimizerConfig(config) {
 }
 function resolveContextWindowTokens({
   config,
-  modelContextWindow
+  modelContextWindow,
+  endpointLimitTokens
+}) {
+  const resolved = config.contextWindowOverride ?? modelContextWindow ?? DEFAULT_CONTEXT_WINDOW_TOKENS;
+  if (typeof endpointLimitTokens === "number" && Number.isFinite(endpointLimitTokens) && endpointLimitTokens > 0) {
+    return Math.min(resolved, endpointLimitTokens);
+  }
+  return resolved;
+}
+function resolveInputBudgetTokens({
+  contextWindow,
+  reservedOutputTokens,
+  safetyFraction = DEFAULT_INPUT_BUDGET_SAFETY_FRACTION
 }) {
-  return config.contextWindowOverride ?? modelContextWindow ?? DEFAULT_CONTEXT_WINDOW_TOKENS;
+  const reserved = typeof reservedOutputTokens === "number" && Number.isFinite(reservedOutputTokens) && reservedOutputTokens > 0 ? reservedOutputTokens : 0;
+  const clampedFraction = Math.min(1, Math.max(0.1, safetyFraction));
+  const usable = Math.max(0, contextWindow - reserved);
+  return Math.max(0, Math.floor(usable * clampedFraction));
 }
-var DEFAULT_CONTEXT_WINDOW_TOKENS = 128000, contextOptimizerConfigSchema, resolvedContextOptimizerConfigSchema, defaultContextOptimizerConfig;
+var DEFAULT_CONTEXT_WINDOW_TOKENS = 128000, contextOptimizerConfigSchema, resolvedContextOptimizerConfigSchema, defaultContextOptimizerConfig, DEFAULT_INPUT_BUDGET_SAFETY_FRACTION = 0.92;
 var init_config3 = __esm(() => {
   contextOptimizerConfigSchema = z26.object({
     autoCompact: z26.boolean().optional(),
     compactAtFraction: z26.number().min(0.3).max(0.95).optional(),
     pruneAtFraction: z26.number().min(0.2).max(0.9).optional(),
     preserveRecentMessages: z26.number().int().min(2).max(100).optional(),
+    maxCoverageTokensPerCompaction: z26.number().int().min(2000).max(200000).optional(),
     contextWindowOverride: z26.number().int().min(8000).max(1e7).optional(),
     summaryMaxChars: z26.number().int().min(200).max(50000).optional(),
     aggressivePruneWhenUncached: z26.boolean().optional(),
@@ -3657,6 +3642,7 @@ var init_config3 = __esm(() => {
     compactAtFraction: z26.number().min(0.3).max(0.95),
     pruneAtFraction: z26.number().min(0.2).max(0.9),
     preserveRecentMessages: z26.number().int().min(2).max(100),
+    maxCoverageTokensPerCompaction: z26.number().int().min(2000).max(200000),
     contextWindowOverride: z26.number().int().min(8000).max(1e7).nullable(),
     summaryMaxChars: z26.number().int().min(200).max(50000),
     aggressivePruneWhenUncached: z26.boolean(),
@@ -3669,6 +3655,7 @@ var init_config3 = __esm(() => {
     compactAtFraction: 0.7,
     pruneAtFraction: 0.6,
     preserveRecentMessages: 6,
+    maxCoverageTokensPerCompaction: 12000,
     contextWindowOverride: null,
     summaryMaxChars: 4000,
     aggressivePruneWhenUncached: true,
@@ -3748,10 +3735,61 @@ var init_estimate = __esm(() => {
       totalTokens: z27.number().nonnegative().optional()
     }),
     modelId: z27.string().optional(),
-    finishReason: languageModelFinishReasonSchema.optional()
+    finishReason: languageModelFinishReasonSchema.optional(),
+    context: z27.object({
+      inputTokens: z27.number().nonnegative(),
+      contextWindow: z27.number().positive(),
+      compactedMessages: z27.number().nonnegative().optional()
+    }).optional()
   }).loose();
 });
 
+// packages/ai/src/common/output-utils.ts
+function omissionMarker(omitted) {
+  return `
+
+... [${omitted} characters omitted; re-read a line range with read_file or raise maxChars] ...
+
+`;
+}
+function truncateText(text, maxChars = DEFAULT_TOOL_TEXT_OUTPUT_CHARS) {
+  if (text.length <= maxChars) {
+    return {
+      text,
+      truncated: false
+    };
+  }
+  const markerReserve = omissionMarker(text.length).length;
+  const usable = Math.max(0, maxChars - markerReserve);
+  const headChars = Math.floor(usable * 0.7);
+  const tailChars = usable - headChars;
+  const head = text.slice(0, headChars);
+  const tail = tailChars > 0 ? text.slice(text.length - tailChars) : "";
+  const omitted = text.length - head.length - tail.length;
+  return {
+    text: `${head}${omissionMarker(omitted)}${tail}`,
+    truncated: true
+  };
+}
+function toSingleLinePreview(value, maxChars = 140) {
+  let text;
+  if (typeof value === "string") {
+    text = value;
+  } else {
+    try {
+      text = JSON.stringify(value);
+    } catch {
+      text = String(value);
+    }
+  }
+  const normalized = text.replace(/\s+/g, " ").trim();
+  if (normalized.length <= maxChars) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxChars - 3)}...`;
+}
+var init_output_utils = () => {};
+
 // packages/ai/src/context/heuristic-summary.ts
 function truncateInline(text, maxChars) {
   const normalized = text.replace(/\s+/g, " ").trim();
@@ -4101,6 +4139,127 @@ var init_tier1_prune = __esm(() => {
   init_message_parts();
 });
 
+// packages/ai/src/context/fit-to-budget.ts
+function estimateStructuralTokens(messages) {
+  return messages.reduce((total, message) => total + estimateMessageTokens(message), 0);
+}
+function getPartState2(part) {
+  const state = isRecord3(part) ? Reflect.get(part, "state") : undefined;
+  return typeof state === "string" ? state : null;
+}
+function elideOutput(part, originalChars) {
+  const stub = {
+    lightcodeElided: true,
+    note: "Tool output elided to fit the model's context budget. Re-run the tool if this output is needed again.",
+    originalChars
+  };
+  return { ...part, output: stub };
+}
+function elideToolOutputsInMessage(message) {
+  let elided = 0;
+  const parts = message.parts.map((part) => {
+    if (!getToolNameFromPart(part) || getPartState2(part) !== "output-available") {
+      return part;
+    }
+    const output = isRecord3(part) ? Reflect.get(part, "output") : undefined;
+    if (output === undefined || isElidedToolOutput(output)) {
+      return part;
+    }
+    elided += 1;
+    return elideOutput(part, safeStringify(output).length);
+  });
+  return elided > 0 ? { message: { ...message, parts }, elided } : { message, elided: 0 };
+}
+function truncateTextPartsInMessage(message, capChars) {
+  let truncated = 0;
+  const parts = message.parts.map((part) => {
+    if (!isRecord3(part)) {
+      return part;
+    }
+    const text = Reflect.get(part, "text");
+    if (typeof text !== "string" || text.length <= capChars) {
+      return part;
+    }
+    const result = truncateText(text, capChars);
+    if (!result.truncated) {
+      return part;
+    }
+    truncated += 1;
+    return { ...part, text: result.text };
+  });
+  return truncated > 0 ? { message: { ...message, parts }, truncated } : { message, truncated: 0 };
+}
+function fitMessagesToBudget(messages, options) {
+  const budget = Math.max(0, Math.floor(options.inputBudgetTokens));
+  const preserveRecentMessages = Math.max(0, options.preserveRecentMessages);
+  let working = [...messages];
+  let elidedToolOutputs = 0;
+  let droppedMessages = 0;
+  let truncatedTextParts = 0;
+  const fits = () => estimateStructuralTokens(working) <= budget;
+  if (fits()) {
+    return {
+      messages: working,
+      elidedToolOutputs: 0,
+      droppedMessages: 0,
+      truncatedTextParts: 0,
+      estimatedTokens: estimateStructuralTokens(working),
+      fitted: false,
+      withinBudget: true
+    };
+  }
+  const preserveFrom = Math.max(0, working.length - preserveRecentMessages);
+  for (let index = 0;index < preserveFrom && !fits(); index += 1) {
+    const { message, elided } = elideToolOutputsInMessage(working[index]);
+    if (elided > 0) {
+      working[index] = message;
+      elidedToolOutputs += elided;
+    }
+  }
+  const firstIsSummary = isSummaryMessage(working[0]);
+  let dropFrom = firstIsSummary ? 1 : 0;
+  while (!fits() && working.length - dropFrom > preserveRecentMessages && dropFrom < working.length) {
+    working.splice(dropFrom, 1);
+    droppedMessages += 1;
+  }
+  if (!fits()) {
+    working = working.map((message) => {
+      const { message: elidedMessage, elided } = elideToolOutputsInMessage(message);
+      elidedToolOutputs += elided;
+      return elidedMessage;
+    });
+    let cap = MAX_TOOL_TEXT_OUTPUT_CHARS;
+    while (!fits() && cap >= MIN_TRUNCATION_CAP_CHARS) {
+      working = working.map((message) => {
+        const { message: truncatedMessage, truncated } = truncateTextPartsInMessage(message, cap);
+        truncatedTextParts += truncated;
+        return truncatedMessage;
+      });
+      cap = Math.floor(cap / 2);
+    }
+  }
+  return {
+    messages: working,
+    elidedToolOutputs,
+    droppedMessages,
+    truncatedTextParts,
+    estimatedTokens: estimateStructuralTokens(working),
+    fitted: elidedToolOutputs > 0 || droppedMessages > 0 || truncatedTextParts > 0,
+    withinBudget: fits()
+  };
+}
+function isSummaryMessage(message) {
+  return message?.id === contextSummaryMessageId;
+}
+var MIN_TRUNCATION_CAP_CHARS = 256;
+var init_fit_to_budget = __esm(() => {
+  init_output_utils();
+  init_estimate();
+  init_heuristic_summary();
+  init_message_parts();
+  init_tier1_prune();
+});
+
 // packages/ai/src/context/build-provider-view.ts
 function computeCompactionCutoffIndex(messages, preserveRecentMessages, afterAnchorIndex) {
   const candidate = messages.length - preserveRecentMessages;
@@ -4114,11 +4273,32 @@ function computeCompactionCutoffIndex(messages, preserveRecentMessages, afterAnc
   }
   return afterAnchorIndex;
 }
+function capCoverageToTokenBudget(coveredMessages, maxTokens) {
+  if (coveredMessages.length <= 1) {
+    return [...coveredMessages];
+  }
+  let total = 0;
+  const capped = [];
+  for (const message of coveredMessages) {
+    const messageTokens = estimateStructuralTokens([message]);
+    if (capped.length > 0 && total + messageTokens > maxTokens) {
+      break;
+    }
+    capped.push(message);
+    total += messageTokens;
+  }
+  return capped;
+}
 function buildProviderView(options) {
   const { messages, contextState, config } = options;
   const contextWindow = resolveContextWindowTokens({
     config,
-    modelContextWindow: options.modelContextWindow
+    modelContextWindow: options.modelContextWindow,
+    endpointLimitTokens: options.endpointLimitTokens
+  });
+  const inputBudgetTokens = resolveInputBudgetTokens({
+    contextWindow,
+    reservedOutputTokens: options.reservedOutputTokens
   });
   let anchorResolved = false;
   let afterAnchorIndex = 0;
@@ -4142,7 +4322,8 @@ function buildProviderView(options) {
   let tier1 = null;
   const uncachedActive = options.cacheActive === false && config.aggressivePruneWhenUncached;
   const pruneFraction = uncachedActive ? config.uncachedPruneAtFraction : config.pruneAtFraction;
-  if (estimate.tokens > pruneFraction * contextWindow) {
+  const triggerTokens = (currentEstimateTokens) => Math.max(currentEstimateTokens, estimateStructuralTokens(providerMessages), typeof options.measuredInputTokens === "number" ? options.measuredInputTokens : 0);
+  if (triggerTokens(estimate.tokens) > pruneFraction * inputBudgetTokens) {
     tier1 = pruneToolOutputs(providerMessages, {
       preserveRecentMessages: config.preserveRecentMessages,
       minOutputChars: uncachedActive ? config.uncachedPruneMinOutputChars : undefined,
@@ -4157,15 +4338,15 @@ function buildProviderView(options) {
     }
   }
   const compactionCutoffIndex = computeCompactionCutoffIndex(messages, config.preserveRecentMessages, afterAnchorIndex);
-  const coveredMessages = messages.slice(afterAnchorIndex, compactionCutoffIndex);
-  const overCompactThreshold = estimate.tokens > config.compactAtFraction * contextWindow;
+  const coveredMessages = capCoverageToTokenBudget(messages.slice(afterAnchorIndex, compactionCutoffIndex), config.maxCoverageTokensPerCompaction);
+  const overCompactThreshold = triggerTokens(estimate.tokens) > config.compactAtFraction * inputBudgetTokens;
   let compactionBlockedReason = null;
   if (overCompactThreshold) {
     if (coveredMessages.length === 0) {
       compactionBlockedReason = "not_enough_messages";
     } else if ((options.pendingInteractionCount ?? 0) > 0) {
       compactionBlockedReason = "pending_interactions";
-    } else if (hasUnresolvedToolWork(messages)) {
+    } else if (hasUnresolvedToolWork(coveredMessages)) {
       compactionBlockedReason = "unresolved_tool_work";
     }
   }
@@ -4173,6 +4354,7 @@ function buildProviderView(options) {
     providerMessages,
     estimate,
     contextWindow,
+    inputBudgetTokens,
     needsCompaction: overCompactThreshold && compactionBlockedReason === null,
     compactionBlockedReason,
     anchorResolved,
@@ -4184,6 +4366,7 @@ function buildProviderView(options) {
 var init_build_provider_view = __esm(() => {
   init_config3();
   init_estimate();
+  init_fit_to_budget();
   init_heuristic_summary();
   init_message_parts();
   init_tier1_prune();
@@ -4232,6 +4415,7 @@ var init_context = __esm(() => {
   init_config3();
   init_context_state();
   init_estimate();
+  init_fit_to_budget();
   init_heuristic_summary();
   init_message_parts();
   init_normalize_provider_messages();
@@ -4461,8 +4645,8 @@ var init_lightcode_config = __esm(() => {
   defaultAutoContinueConfig = {
     enabled: true,
     maxAutoContinues: 50,
-    maxErrorRetries: 5,
-    stallTimeoutSeconds: 180
+    maxErrorRetries: 8,
+    stallTimeoutSeconds: 300
   };
   headroomConfigSchema = z28.object({
     enabled: z28.boolean().optional(),
@@ -4505,7 +4689,7 @@ var init_lightcode_config = __esm(() => {
     context: defaultContextOptimizerConfig,
     maxOutputTokens: 32768,
     maxSteps: 30,
-    maxRetries: 5,
+    maxRetries: 3,
     autoContinue: defaultAutoContinueConfig,
     headroom: defaultHeadroomConfig
   };
@@ -5038,6 +5222,10 @@ async function extractToolCalls(text, knownToolNames) {
   while ((match = DEEPSEEK_WRAPPER_RE.exec(text)) !== null) {
     segments.push({ start: match.index, end: match.index + match[0].length, call: null });
   }
+  FUNCTION_CALLS_WRAPPER_RE.lastIndex = 0;
+  while ((match = FUNCTION_CALLS_WRAPPER_RE.exec(text)) !== null) {
+    segments.push({ start: match.index, end: match.index + match[0].length, call: null });
+  }
   const covered = (idx) => segments.some((s) => idx >= s.start && idx < s.end);
   const orphanIdx = findOrphanMarker(text, covered);
   if (orphanIdx !== -1) {
@@ -5125,7 +5313,7 @@ async function parseBareTrailingJson(text, knownToolNames) {
     return null;
   return { start: idx, payload };
 }
-var TOOL_CALL_OPEN_MARKERS, MAX_MARKER_LENGTH, MARKER_CONFIRMATION_WINDOW = 256, BLOCK_CLOSE_MARKERS, CLOSED_BLOCK_RES, DEEPSEEK_WRAPPER_RE, PARAMETER_TAG_RE, PARAMETER_EQ_RE;
+var TOOL_CALL_OPEN_MARKERS, MAX_MARKER_LENGTH, MARKER_CONFIRMATION_WINDOW = 256, BLOCK_CLOSE_MARKERS, CLOSED_BLOCK_RES, DEEPSEEK_WRAPPER_RE, FUNCTION_CALLS_WRAPPER_RE, PARAMETER_TAG_RE, PARAMETER_EQ_RE;
 var init_xml_tool_call_parser = __esm(() => {
   init_tool_call_json_repair();
   TOOL_CALL_OPEN_MARKERS = [
@@ -5152,6 +5340,7 @@ var init_xml_tool_call_parser = __esm(() => {
     deepseek: /<\uFF5Ctool\u2581call\u2581begin\uFF5C>\s*(?:function)?\s*(?:<\uFF5Ctool\u2581sep\uFF5C>)?\s*([\w.-]+)\s*\n?([\s\S]*?)<\uFF5Ctool\u2581call\u2581end\uFF5C>/g
   };
   DEEPSEEK_WRAPPER_RE = /<\uFF5Ctool\u2581calls\u2581(?:begin|end)\uFF5C>/g;
+  FUNCTION_CALLS_WRAPPER_RE = /<\/?function_calls\s*>/gi;
   PARAMETER_TAG_RE = /<parameter\s+name=["']?([\w.-]+)["']?\s*>([\s\S]*?)(?:<\/parameter>|(?=<parameter\s)|$)/gi;
   PARAMETER_EQ_RE = /<parameter=([\w.-]+)>([\s\S]*?)(?=<parameter=|<\/function>|$)/gi;
 });
@@ -5968,52 +6157,6 @@ var init_resolve_within_workspace = __esm(() => {
   WORKSPACE = defaultWorkspaceContext.root;
 });
 
-// packages/ai/src/common/output-utils.ts
-function omissionMarker(omitted) {
-  return `
-
-... [${omitted} characters omitted; re-read a line range with read_file or raise maxChars] ...
-
-`;
-}
-function truncateText(text, maxChars = DEFAULT_TOOL_TEXT_OUTPUT_CHARS) {
-  if (text.length <= maxChars) {
-    return {
-      text,
-      truncated: false
-    };
-  }
-  const markerReserve = omissionMarker(text.length).length;
-  const usable = Math.max(0, maxChars - markerReserve);
-  const headChars = Math.floor(usable * 0.7);
-  const tailChars = usable - headChars;
-  const head = text.slice(0, headChars);
-  const tail = tailChars > 0 ? text.slice(text.length - tailChars) : "";
-  const omitted = text.length - head.length - tail.length;
-  return {
-    text: `${head}${omissionMarker(omitted)}${tail}`,
-    truncated: true
-  };
-}
-function toSingleLinePreview(value, maxChars = 140) {
-  let text;
-  if (typeof value === "string") {
-    text = value;
-  } else {
-    try {
-      text = JSON.stringify(value);
-    } catch {
-      text = String(value);
-    }
-  }
-  const normalized = text.replace(/\s+/g, " ").trim();
-  if (normalized.length <= maxChars) {
-    return normalized;
-  }
-  return `${normalized.slice(0, maxChars - 3)}...`;
-}
-var init_output_utils = () => {};
-
 // packages/ai/src/bash/runtime.ts
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -6202,24 +6345,129 @@ function createUnifiedDiff(filePath, oldText, newText, { maxChars = DEFAULT_DIFF
 var DEFAULT_DIFF_MAX_CHARS = 6000, DIFF_CONTEXT_LINES = 3;
 var init_unified_diff = () => {};
 
-// packages/ai/src/edit-file/runtime.ts
-import { promises as fs2 } from "fs";
-function countOccurrences(haystack, needle) {
-  if (!needle) {
-    return 0;
+// packages/ai/src/edit-file/match.ts
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function detectEol(content) {
+  const crlf = (content.match(/\r\n/g) ?? []).length;
+  if (crlf === 0) {
+    return `
+`;
   }
-  let count = 0;
-  let startIndex = 0;
-  while (true) {
-    const index = haystack.indexOf(needle, startIndex);
+  const lfOnly = (content.match(/(?<!\r)\n/g) ?? []).length;
+  return crlf >= lfOnly ? `\r
+` : `
+`;
+}
+function toLf(value) {
+  return value.replace(/\r\n/g, `
+`);
+}
+function spliceRanges(content, ranges, replacement) {
+  let out = "";
+  let cursor = 0;
+  for (const range of ranges) {
+    out += content.slice(cursor, range.start) + replacement;
+    cursor = range.end;
+  }
+  return out + content.slice(cursor);
+}
+function literalRanges(content, search) {
+  const ranges = [];
+  let from = 0;
+  for (;; ) {
+    const index = content.indexOf(search, from);
     if (index === -1) {
       break;
     }
-    count += 1;
-    startIndex = index + needle.length;
+    ranges.push({ start: index, end: index + search.length });
+    from = index + search.length;
   }
-  return count;
+  return ranges;
+}
+function buildFlexibleRegex(searchLf) {
+  if (!searchLf.trim()) {
+    return null;
+  }
+  const linePatterns = searchLf.split(`
+`).map((line) => {
+    const core = line.replace(/^[ \t]+/, "").replace(/[ \t]+$/, "");
+    return `[ \\t]*${escapeRegExp(core)}[ \\t]*`;
+  });
+  return new RegExp(`(?<=^|\\n)${linePatterns.join("\\n")}(?=\\n|$)`, "g");
+}
+function regexRanges(content, regex) {
+  const ranges = [];
+  regex.lastIndex = 0;
+  for (;; ) {
+    const match = regex.exec(content);
+    if (!match) {
+      break;
+    }
+    if (match[0].length === 0) {
+      regex.lastIndex += 1;
+      continue;
+    }
+    ranges.push({ start: match.index, end: match.index + match[0].length });
+    regex.lastIndex = match.index + match[0].length;
+  }
+  return ranges;
+}
+function applyRanges(content, ranges, replacement, replaceAll, strategy) {
+  if (ranges.length === 0) {
+    return null;
+  }
+  if (!replaceAll && ranges.length > 1) {
+    throw new EditMatchError(`The search text matches ${ranges.length} places. Add surrounding lines to make it unique, or pass replaceAll: true to change every occurrence.`);
+  }
+  const targetRanges = replaceAll ? ranges : [ranges[0]];
+  return {
+    updatedContent: spliceRanges(content, targetRanges, replacement),
+    replacements: targetRanges.length,
+    strategy
+  };
 }
+function applyEdit(original, search, replace, replaceAll) {
+  if (!search) {
+    throw new EditMatchError("Search text must not be empty.");
+  }
+  const exact = applyRanges(original, literalRanges(original, search), replace, replaceAll, "exact");
+  if (exact) {
+    return exact;
+  }
+  const eol = detectEol(original);
+  const originalLf = toLf(original);
+  const searchLf = toLf(search);
+  const replaceLf = toLf(replace);
+  const restoreEol = (lf) => eol === `\r
+` ? lf.replace(/\n/g, `\r
+`) : lf;
+  const normalized = applyRanges(originalLf, literalRanges(originalLf, searchLf), replaceLf, replaceAll, "eol-normalized");
+  if (normalized) {
+    return { ...normalized, updatedContent: restoreEol(normalized.updatedContent) };
+  }
+  const flexibleRegex = buildFlexibleRegex(searchLf);
+  if (flexibleRegex) {
+    const flexible = applyRanges(originalLf, regexRanges(originalLf, flexibleRegex), replaceLf, replaceAll, "whitespace-flexible");
+    if (flexible) {
+      return { ...flexible, updatedContent: restoreEol(flexible.updatedContent) };
+    }
+  }
+  throw new EditMatchError("No match for the search text. Line-ending and surrounding-whitespace differences are tolerated automatically, so a remaining mismatch means the file content itself differs \u2014 re-read the file and copy the exact lines you want to change.");
+}
+var EditMatchError;
+var init_match = __esm(() => {
+  EditMatchError = class EditMatchError extends Error {
+    constructor(message) {
+      super(message);
+      this.name = "EditMatchError";
+    }
+  };
+});
+
+// packages/ai/src/edit-file/runtime.ts
+import { promises as fs2 } from "fs";
 async function executeEditFile(input, workspaceContext = getDefaultWorkspaceContext(), editContext = {}) {
   const parsedInput = editFileInputSchema.parse(input);
   const resolvedPath = resolveWithinWorkspace(parsedInput.path, {
@@ -6227,11 +6475,7 @@ async function executeEditFile(input, workspaceContext = getDefaultWorkspaceCont
   });
   const relativePath = toWorkspaceRelativePath(resolvedPath, workspaceContext);
   const originalContent = await fs2.readFile(resolvedPath, "utf8");
-  const replacements = parsedInput.replaceAll ? countOccurrences(originalContent, parsedInput.search) : originalContent.includes(parsedInput.search) ? 1 : 0;
-  if (replacements === 0) {
-    throw new Error(`No matches found for the provided search text in "${parsedInput.path}".`);
-  }
-  const updatedContent = parsedInput.replaceAll ? originalContent.split(parsedInput.search).join(parsedInput.replace) : originalContent.replace(parsedInput.search, parsedInput.replace);
+  const { updatedContent, replacements } = applyEdit(originalContent, parsedInput.search, parsedInput.replace, parsedInput.replaceAll);
   if (editContext.sessionId && editContext.turnKey) {
     await recordFileCheckpoint({
       sessionId: editContext.sessionId,
@@ -6253,6 +6497,7 @@ var init_runtime6 = __esm(() => {
   init_runtime5();
   init_resolve_within_workspace();
   init_unified_diff();
+  init_match();
   init_schema2();
 });
 
@@ -7639,11 +7884,13 @@ __export(exports_runtime, {
   sandboxConfigSchema: () => sandboxConfigSchema,
   safeStringify: () => safeStringify,
   runPluginHooks: () => runPluginHooks,
+  retryReasonLabel: () => retryReasonLabel,
   resolvedHeadroomConfigSchema: () => resolvedHeadroomConfigSchema,
   resolvedContextOptimizerConfigSchema: () => resolvedContextOptimizerConfigSchema,
   resolvedAutoContinueConfigSchema: () => resolvedAutoContinueConfigSchema,
   resolveWithinWorkspace: () => resolveWithinWorkspace,
   resolveMaxOutputTokens: () => resolveMaxOutputTokens,
+  resolveInputBudgetTokens: () => resolveInputBudgetTokens,
   resolveDanglingToolParts: () => resolveDanglingToolParts,
   resolveContextWindowTokens: () => resolveContextWindowTokens,
   resolveCodingPermissionMode: () => resolveCodingPermissionMode,
@@ -7721,6 +7968,7 @@ __export(exports_runtime, {
   getActiveCodingToolsForPolicy: () => getActiveCodingToolsForPolicy,
   formatPermissionDecision: () => formatPermissionDecision,
   formatChatStreamError: () => formatChatStreamError,
+  fitMessagesToBudget: () => fitMessagesToBudget,
   extractProposedPlanBlocks: () => extractProposedPlanBlocks,
   extractLatestProposedPlan: () => extractLatestProposedPlan,
   executeWriteFile: () => executeWriteFile,
@@ -7744,6 +7992,7 @@ __export(exports_runtime, {
   executeBash: () => executeBash,
   evaluateCodingToolPermission: () => evaluateCodingToolPermission,
   estimateTextTokens: () => estimateTextTokens,
+  estimateStructuralTokens: () => estimateStructuralTokens,
   estimateMessageTokens: () => estimateMessageTokens,
   estimateContextTokens: () => estimateContextTokens,
   diagnosticsToolsResponseSchema: () => diagnosticsToolsResponseSchema,
@@ -7810,6 +8059,7 @@ __export(exports_runtime, {
   chatInteractionListQuerySchema: () => chatInteractionListQuerySchema,
   chatInteractionKindSchema: () => chatInteractionKindSchema,
   chatInteractionKindOrder: () => chatInteractionKindOrder,
+  capCoverageToTokenBudget: () => capCoverageToTokenBudget,
   callMcpToolProviderInputSchema: () => callMcpToolProviderInputSchema,
   callMcpToolOutputSchema: () => callMcpToolOutputSchema,
   callMcpToolInputSchema: () => callMcpToolInputSchema,
@@ -7830,6 +8080,7 @@ __export(exports_runtime, {
   ESTIMATED_CHARS_PER_TOKEN: () => ESTIMATED_CHARS_PER_TOKEN,
   DEFAULT_PRUNE_QUANTIZE_USER_TURNS: () => DEFAULT_PRUNE_QUANTIZE_USER_TURNS,
   DEFAULT_PRUNE_MIN_OUTPUT_CHARS: () => DEFAULT_PRUNE_MIN_OUTPUT_CHARS,
+  DEFAULT_INPUT_BUDGET_SAFETY_FRACTION: () => DEFAULT_INPUT_BUDGET_SAFETY_FRACTION,
   DEFAULT_CONTEXT_WINDOW_TOKENS: () => DEFAULT_CONTEXT_WINDOW_TOKENS,
   ANTHROPIC_TOOL_OPTIONAL_PARAMETER_BUDGET: () => ANTHROPIC_TOOL_OPTIONAL_PARAMETER_BUDGET
 });
@@ -8164,6 +8415,22 @@ import {
   safeValidateUIMessages
 } from "ai";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+function decideErrorRetry({
+  attempt,
+  kind,
+  elapsedMs,
+  maxErrorRetries
+}) {
+  const cap = kind === "rate_limit" ? Math.min(rateLimitMaxRetries, maxErrorRetries) : maxErrorRetries;
+  if (attempt > cap) {
+    return { retry: false, delayMs: 0 };
+  }
+  const delayMs = Math.min(errorRetryBaseDelayMs * 2 ** (attempt - 1), errorRetryMaxDelayMs);
+  if (elapsedMs + delayMs > errorRetryTimeBudgetMs) {
+    return { retry: false, delayMs: 0 };
+  }
+  return { retry: true, delayMs };
+}
 function getErrorMessage2(error, fallback) {
   if (error instanceof Error) {
     return error.message;
@@ -8454,6 +8721,7 @@ function useCodingSessionChat({
   const autoContinuesRef = useRef(0);
   const errorRetriesRef = useRef(0);
   const errorRetryTimerRef = useRef(null);
+  const errorEpisodeStartRef = useRef(null);
   const lastDecidedAssistantIdRef = useRef(null);
   const lastProgressMarkerRef = useRef(0);
   const noProgressRetriesRef = useRef(0);
@@ -8464,6 +8732,7 @@ function useCodingSessionChat({
     turnKeyRef.current = `turn-${Date.now()}-${turnCounterRef.current}`;
     autoContinuesRef.current = 0;
     errorRetriesRef.current = 0;
+    errorEpisodeStartRef.current = null;
     lastProgressMarkerRef.current = 0;
     noProgressRetriesRef.current = 0;
     taskStuckRef.current = false;
@@ -8860,6 +9129,7 @@ function useCodingSessionChat({
   useEffect(() => {
     if (status === "ready" && !error) {
       errorRetriesRef.current = 0;
+      errorEpisodeStartRef.current = null;
     }
   }, [error, status]);
   useEffect(() => {
@@ -8897,7 +9167,8 @@ function useCodingSessionChat({
       errorRetriesRef.current += 1;
       setAutoContinueState({
         attempt: errorRetriesRef.current,
-        kind: "retry-error"
+        kind: "retry-error",
+        retryReason: "stall"
       });
       (async () => {
         try {
@@ -8972,12 +9243,28 @@ function useCodingSessionChat({
     if (taskStuckRef.current || pendingApprovals.length > 0 || pendingUserPrompts.length > 0 || errorRetryTimerRef.current || stallRecoveryInFlightRef.current) {
       return;
     }
-    if (errorRetriesRef.current >= maxErrorRetriesRef.current) {
-      return;
-    }
     const retryMessages = sanitizeMessagesForRetry(messages);
+    const retryReason = parseChatStreamError(error.message)?.kind ?? "network";
+    if (errorEpisodeStartRef.current === null) {
+      errorEpisodeStartRef.current = Date.now();
+    }
     const attempt = errorRetriesRef.current + 1;
-    const delay = Math.min(errorRetryBaseDelayMs * 2 ** (attempt - 1), errorRetryMaxDelayMs);
+    const decision2 = decideErrorRetry({
+      attempt,
+      kind: retryReason,
+      elapsedMs: Date.now() - errorEpisodeStartRef.current,
+      maxErrorRetries: maxErrorRetriesRef.current
+    });
+    if (!decision2.retry) {
+      return;
+    }
+    const delay = decision2.delayMs;
+    setAutoContinueState({
+      attempt,
+      kind: "retry-error",
+      retryReason,
+      retryAtMs: Date.now() + delay
+    });
     errorRetryTimerRef.current = setTimeout(() => {
       errorRetryTimerRef.current = null;
       if (!registerRetryProgress(messagesRef.current)) {
@@ -8989,7 +9276,7 @@ function useCodingSessionChat({
         return;
       }
       errorRetriesRef.current = attempt;
-      setAutoContinueState({ attempt, kind: "retry-error" });
+      setAutoContinueState({ attempt, kind: "retry-error", retryReason });
       setMessages(retryMessages);
       clearError();
       setToolExecutionError(null);
@@ -9207,7 +9494,7 @@ function useCodingSessionChat({
     isSessionIdValid
   };
 }
-var recoverableDisconnectMessage = "Connection interrupted. Please retry or regenerate your last message.", buildModeAutoPromptResponse = "Proceed with implementation in Build mode. Continue without additional plan questions.", chatMessageUpdateThrottleMs = 50, retryCommandPattern, codingToolNameSet, errorRetryBaseDelayMs = 1000, errorRetryMaxDelayMs = 8000, disconnectErrorPattern, transientProviderErrorPattern, terminalToolPartStates;
+var recoverableDisconnectMessage = "Connection interrupted. Please retry or regenerate your last message.", buildModeAutoPromptResponse = "Proceed with implementation in Build mode. Continue without additional plan questions.", chatMessageUpdateThrottleMs = 50, retryCommandPattern, codingToolNameSet, errorRetryBaseDelayMs = 1000, errorRetryMaxDelayMs = 8000, rateLimitMaxRetries = 6, errorRetryTimeBudgetMs = 180000, disconnectErrorPattern, transientProviderErrorPattern, terminalToolPartStates;
 var init_use_coding_session_chat = __esm(() => {
   init_agent_tools();
   init_chat_error();
@@ -9383,7 +9670,7 @@ function ContextSummaryFrame({ children }) {
   return /* @__PURE__ */ jsxDEV4("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.card,
     borderColor: cliTheme.semantic.info,
     backgroundColor: cliTheme.surfaces.panel,
     paddingX: 1,
@@ -9508,7 +9795,7 @@ function ChatProposedPlanCard({ content }) {
   return /* @__PURE__ */ jsxDEV5("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.card,
     borderColor: cliTheme.borders.active,
     backgroundColor: cliTheme.surfaces.panel,
     paddingX: 1,
@@ -9717,7 +10004,7 @@ function ChatInteractionPopup({
   return /* @__PURE__ */ jsxDEV6("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     borderColor: cliTheme.borders.active,
     backgroundColor: cliTheme.surfaces.panel,
     paddingX: 1,
@@ -9841,21 +10128,146 @@ var init_chat_message_error_part = __esm(() => {
   init_cli_theme();
 });
 
-// apps/cli/src/components/chat/chat-message-reasoning-part.tsx
+// apps/cli/src/state/app-state.tsx
+import { createContext, useCallback as useCallback2, useContext, useMemo as useMemo3, useState as useState3 } from "react";
 import { jsxDEV as jsxDEV8 } from "@opentui/react/jsx-dev-runtime";
+function AppStateProvider({ children }) {
+  const [paletteOpen, setPaletteOpen] = useState3(false);
+  const [paletteQuery, setPaletteQuery] = useState3("");
+  const [paletteSelected, setPaletteSelected] = useState3(0);
+  const [slashMenuOpen, setSlashMenuOpen] = useState3(false);
+  const [slashMenuQuery, setSlashMenuQuery] = useState3("/");
+  const [slashMenuSelected, setSlashMenuSelected] = useState3(0);
+  const openPalette = useCallback2((initialQuery = "") => {
+    setPaletteOpen(true);
+    setPaletteQuery(initialQuery);
+    setPaletteSelected(0);
+    setSlashMenuOpen(false);
+  }, []);
+  const closePalette = useCallback2(() => {
+    setPaletteOpen(false);
+    setPaletteQuery("");
+    setPaletteSelected(0);
+  }, []);
+  const openSlashMenu = useCallback2(() => {
+    setSlashMenuOpen(true);
+    setSlashMenuQuery("/");
+    setSlashMenuSelected(0);
+    setPaletteOpen(false);
+  }, []);
+  const closeSlashMenu = useCallback2(() => {
+    setSlashMenuOpen(false);
+    setSlashMenuQuery("/");
+    setSlashMenuSelected(0);
+  }, []);
+  const [requestedChatActionId, setRequestedChatActionId] = useState3(null);
+  const requestChatAction = useCallback2((id) => {
+    setRequestedChatActionId(id);
+  }, []);
+  const clearRequestedChatAction = useCallback2(() => {
+    setRequestedChatActionId(null);
+  }, []);
+  const [configRefreshNonce, setConfigRefreshNonce] = useState3(0);
+  const bumpConfigRefresh = useCallback2(() => {
+    setConfigRefreshNonce((nonce) => nonce + 1);
+  }, []);
+  const [expandedToolOutput, setExpandedToolOutput] = useState3(false);
+  const toggleToolOutputExpansion = useCallback2(() => {
+    setExpandedToolOutput((expanded) => !expanded);
+  }, []);
+  const [expandedReasoning, setExpandedReasoning] = useState3(false);
+  const toggleReasoningExpansion = useCallback2(() => {
+    setExpandedReasoning((expanded) => !expanded);
+  }, []);
+  const value = useMemo3(() => ({
+    paletteOpen,
+    paletteQuery,
+    setPaletteQuery,
+    paletteSelected,
+    setPaletteSelected,
+    openPalette,
+    closePalette,
+    slashMenuOpen,
+    slashMenuQuery,
+    setSlashMenuQuery,
+    slashMenuSelected,
+    setSlashMenuSelected,
+    openSlashMenu,
+    closeSlashMenu,
+    requestedChatActionId,
+    requestChatAction,
+    clearRequestedChatAction,
+    configRefreshNonce,
+    bumpConfigRefresh,
+    expandedToolOutput,
+    toggleToolOutputExpansion,
+    expandedReasoning,
+    toggleReasoningExpansion
+  }), [
+    paletteOpen,
+    paletteQuery,
+    paletteSelected,
+    openPalette,
+    closePalette,
+    slashMenuOpen,
+    slashMenuQuery,
+    slashMenuSelected,
+    openSlashMenu,
+    closeSlashMenu,
+    requestedChatActionId,
+    requestChatAction,
+    clearRequestedChatAction,
+    configRefreshNonce,
+    bumpConfigRefresh,
+    expandedToolOutput,
+    toggleToolOutputExpansion,
+    expandedReasoning,
+    toggleReasoningExpansion
+  ]);
+  return /* @__PURE__ */ jsxDEV8(AppStateContext.Provider, {
+    value,
+    children
+  }, undefined, false, undefined, this);
+}
+function useAppState() {
+  const context2 = useContext(AppStateContext);
+  if (!context2) {
+    throw new Error("useAppState must be used within AppStateProvider");
+  }
+  return context2;
+}
+var AppStateContext;
+var init_app_state = __esm(() => {
+  AppStateContext = createContext(null);
+});
+
+// apps/cli/src/components/chat/chat-message-reasoning-part.tsx
+import { TextAttributes as TextAttributes7 } from "@opentui/core";
+import { jsxDEV as jsxDEV9 } from "@opentui/react/jsx-dev-runtime";
 function ChatMessageReasoningPart({ part }) {
+  const { expandedReasoning } = useAppState();
   if (!part.text) {
     return null;
   }
-  return /* @__PURE__ */ jsxDEV8("box", {
+  if (!expandedReasoning) {
+    return /* @__PURE__ */ jsxDEV9("box", {
+      paddingX: 1,
+      children: /* @__PURE__ */ jsxDEV9("text", {
+        fg: cliTheme.text.muted,
+        attributes: TextAttributes7.DIM,
+        children: "Thinking\u2026 (Ctrl+R to view)"
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
+  return /* @__PURE__ */ jsxDEV9("box", {
     flexDirection: "column",
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV8("text", {
+      /* @__PURE__ */ jsxDEV9("text", {
         fg: cliTheme.semantic.info,
         children: "Thinking:"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV8("text", {
+      /* @__PURE__ */ jsxDEV9("text", {
         fg: cliTheme.text.secondary,
         children: part.text
       }, undefined, false, undefined, this)
@@ -9863,6 +10275,7 @@ function ChatMessageReasoningPart({ part }) {
   }, undefined, true, undefined, this);
 }
 var init_chat_message_reasoning_part = __esm(() => {
+  init_app_state();
   init_cli_theme();
 });
 
@@ -9929,13 +10342,13 @@ var init_code_syntax_style = __esm(() => {
 });
 
 // apps/cli/src/components/chat/chat-message-text-part.tsx
-import { jsxDEV as jsxDEV9 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV10 } from "@opentui/react/jsx-dev-runtime";
 function renderMarkdown(content, key) {
   const trimmedContent = content.trim();
   if (trimmedContent.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ jsxDEV9("markdown", {
+  return /* @__PURE__ */ jsxDEV10("markdown", {
     width: "100%",
     content: trimmedContent,
     syntaxStyle: markdownSyntaxStyle,
@@ -9960,7 +10373,7 @@ function ChatMessageTextPart({ part }) {
   const renderedSegments = segments.map((segment, index) => {
     const key = `${segment.type}:${index}`;
     if (segment.type === "plan") {
-      return /* @__PURE__ */ jsxDEV9(ChatProposedPlanCard, {
+      return /* @__PURE__ */ jsxDEV10(ChatProposedPlanCard, {
         content: segment.text
       }, key, false, undefined, this);
     }
@@ -9969,7 +10382,7 @@ function ChatMessageTextPart({ part }) {
   if (renderedSegments.length === 0) {
     return null;
   }
-  return /* @__PURE__ */ jsxDEV9("box", {
+  return /* @__PURE__ */ jsxDEV10("box", {
     width: "100%",
     flexDirection: "column",
     gap: 1,
@@ -9984,113 +10397,35 @@ var init_chat_message_text_part = __esm(() => {
   markdownSyntaxStyle = codeSyntaxStyle;
 });
 
-// apps/cli/src/state/app-state.tsx
-import { createContext, useCallback as useCallback2, useContext, useMemo as useMemo3, useState as useState3 } from "react";
-import { jsxDEV as jsxDEV10 } from "@opentui/react/jsx-dev-runtime";
-function AppStateProvider({ children }) {
-  const [paletteOpen, setPaletteOpen] = useState3(false);
-  const [paletteQuery, setPaletteQuery] = useState3("");
-  const [paletteSelected, setPaletteSelected] = useState3(0);
-  const [slashMenuOpen, setSlashMenuOpen] = useState3(false);
-  const [slashMenuQuery, setSlashMenuQuery] = useState3("/");
-  const [slashMenuSelected, setSlashMenuSelected] = useState3(0);
-  const openPalette = useCallback2((initialQuery = "") => {
-    setPaletteOpen(true);
-    setPaletteQuery(initialQuery);
-    setPaletteSelected(0);
-    setSlashMenuOpen(false);
-  }, []);
-  const closePalette = useCallback2(() => {
-    setPaletteOpen(false);
-    setPaletteQuery("");
-    setPaletteSelected(0);
-  }, []);
-  const openSlashMenu = useCallback2(() => {
-    setSlashMenuOpen(true);
-    setSlashMenuQuery("/");
-    setSlashMenuSelected(0);
-    setPaletteOpen(false);
-  }, []);
-  const closeSlashMenu = useCallback2(() => {
-    setSlashMenuOpen(false);
-    setSlashMenuQuery("/");
-    setSlashMenuSelected(0);
-  }, []);
-  const [requestedChatActionId, setRequestedChatActionId] = useState3(null);
-  const requestChatAction = useCallback2((id) => {
-    setRequestedChatActionId(id);
-  }, []);
-  const clearRequestedChatAction = useCallback2(() => {
-    setRequestedChatActionId(null);
-  }, []);
-  const [configRefreshNonce, setConfigRefreshNonce] = useState3(0);
-  const bumpConfigRefresh = useCallback2(() => {
-    setConfigRefreshNonce((nonce) => nonce + 1);
-  }, []);
-  const [expandedToolOutput, setExpandedToolOutput] = useState3(false);
-  const toggleToolOutputExpansion = useCallback2(() => {
-    setExpandedToolOutput((expanded) => !expanded);
-  }, []);
-  const value = useMemo3(() => ({
-    paletteOpen,
-    paletteQuery,
-    setPaletteQuery,
-    paletteSelected,
-    setPaletteSelected,
-    openPalette,
-    closePalette,
-    slashMenuOpen,
-    slashMenuQuery,
-    setSlashMenuQuery,
-    slashMenuSelected,
-    setSlashMenuSelected,
-    openSlashMenu,
-    closeSlashMenu,
-    requestedChatActionId,
-    requestChatAction,
-    clearRequestedChatAction,
-    configRefreshNonce,
-    bumpConfigRefresh,
-    expandedToolOutput,
-    toggleToolOutputExpansion
-  }), [
-    paletteOpen,
-    paletteQuery,
-    paletteSelected,
-    openPalette,
-    closePalette,
-    slashMenuOpen,
-    slashMenuQuery,
-    slashMenuSelected,
-    openSlashMenu,
-    closeSlashMenu,
-    requestedChatActionId,
-    requestChatAction,
-    clearRequestedChatAction,
-    configRefreshNonce,
-    bumpConfigRefresh,
-    expandedToolOutput,
-    toggleToolOutputExpansion
-  ]);
-  return /* @__PURE__ */ jsxDEV10(AppStateContext.Provider, {
-    value,
-    children
-  }, undefined, false, undefined, this);
-}
-function useAppState() {
-  const context2 = useContext(AppStateContext);
-  if (!context2) {
-    throw new Error("useAppState must be used within AppStateProvider");
+// apps/cli/src/ui/cli-theme-capabilities.ts
+function isUtf8Locale(env) {
+  const locale = env.LC_ALL || env.LC_CTYPE || env.LANG || "";
+  if (!locale) {
+    return true;
   }
-  return context2;
+  return /utf-?8/i.test(locale);
 }
-var AppStateContext;
-var init_app_state = __esm(() => {
-  AppStateContext = createContext(null);
+function detectTerminalCapabilities(env = process.env) {
+  const noColor = Boolean(env.NO_COLOR);
+  const dumbTerm = env.TERM === "dumb";
+  return {
+    color: !noColor && !dumbTerm,
+    unicode: isUtf8Locale(env),
+    reducedMotion: Boolean(env.NO_COLOR || env.LIGHTCODE_REDUCED_MOTION)
+  };
+}
+function resolveGlyphs(caps) {
+  return caps.unicode ? glyphs.unicode : glyphs.ascii;
+}
+var terminalCapabilities, activeGlyphs;
+var init_cli_theme_capabilities = __esm(() => {
+  init_cli_theme();
+  terminalCapabilities = detectTerminalCapabilities();
+  activeGlyphs = resolveGlyphs(terminalCapabilities);
 });
 
 // apps/cli/src/components/chat/chat-diff-card.tsx
-import { TextAttributes as TextAttributes7 } from "@opentui/core";
+import { TextAttributes as TextAttributes8 } from "@opentui/core";
 import { jsxDEV as jsxDEV11 } from "@opentui/react/jsx-dev-runtime";
 function collapseDiff(diff) {
   const lines = diff.split(`
@@ -10120,7 +10455,7 @@ function ChatDiffCard({ path: path16, diff }) {
   return /* @__PURE__ */ jsxDEV11("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.card,
     borderColor: cliTheme.borders.subtle,
     backgroundColor: cliTheme.surfaces.inset,
     children: [
@@ -10128,7 +10463,7 @@ function ChatDiffCard({ path: path16, diff }) {
         paddingX: 1,
         children: /* @__PURE__ */ jsxDEV11("text", {
           fg: cliTheme.text.secondary,
-          attributes: TextAttributes7.BOLD,
+          attributes: TextAttributes8.BOLD,
           children: path16
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
@@ -10139,32 +10474,32 @@ function ChatDiffCard({ path: path16, diff }) {
         filetype: inferFiletype(path16),
         syntaxStyle: codeSyntaxStyle,
         showLineNumbers: true,
-        addedBg,
-        removedBg,
+        addedBg: cliTheme.diff.addedBg,
+        removedBg: cliTheme.diff.removedBg,
         lineNumberFg: cliTheme.text.muted,
         lineNumberBg: cliTheme.surfaces.inset,
-        addedSignColor: cliTheme.semantic.success,
-        removedSignColor: cliTheme.semantic.error
+        addedSignColor: cliTheme.diff.added,
+        removedSignColor: cliTheme.diff.removed
       }, undefined, false, undefined, this),
       hiddenLines > 0 || wasPreTruncated ? /* @__PURE__ */ jsxDEV11("box", {
         paddingX: 1,
         children: /* @__PURE__ */ jsxDEV11("text", {
           fg: cliTheme.text.muted,
-          attributes: TextAttributes7.DIM,
+          attributes: TextAttributes8.DIM,
           children: hiddenLines > 0 ? `+${hiddenLines} more diff lines` : "diff truncated"
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null
     ]
   }, undefined, true, undefined, this);
 }
-var COLLAPSED_MAX_LINES = 20, TRUNCATION_MARKER = "... diff truncated ...", addedBg = "#13271B", removedBg = "#2B1619";
+var COLLAPSED_MAX_LINES = 20, TRUNCATION_MARKER = "... diff truncated ...";
 var init_chat_diff_card = __esm(() => {
   init_cli_theme();
   init_code_syntax_style();
 });
 
 // apps/cli/src/components/chat/chat-message-tool-invocation-part.tsx
-import { TextAttributes as TextAttributes8 } from "@opentui/core";
+import { TextAttributes as TextAttributes9 } from "@opentui/core";
 import {
   getToolName
 } from "ai";
@@ -10250,6 +10585,78 @@ function getOutputPreviewLines(part, maxLines) {
   }
   return [];
 }
+function basename(filePath) {
+  const parts = filePath.split(/[\\/]/).filter(Boolean);
+  return parts[parts.length - 1] ?? filePath;
+}
+function countTextLines(text) {
+  const trimmed = text.replace(/[\r\n]+$/, "");
+  return trimmed.length === 0 ? 0 : trimmed.split(/\r?\n/).length;
+}
+function countDiffStats(diff) {
+  let added = 0;
+  let removed = 0;
+  for (const line of diff.split(/\r?\n/)) {
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      added += 1;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      removed += 1;
+    }
+  }
+  return { added, removed };
+}
+function pluralize(count, noun) {
+  return `${count} ${noun}${count === 1 ? "" : "s"}`;
+}
+function summarizeToolOutput(part) {
+  if (part.state !== "output-available") {
+    return null;
+  }
+  const output = part.output;
+  if (typeof output === "string") {
+    const lines = countTextLines(output);
+    return lines > 0 ? { text: pluralize(lines, "line"), isError: false } : null;
+  }
+  if (!output || typeof output !== "object") {
+    return null;
+  }
+  const exitCode = Reflect.get(output, "exitCode");
+  if (typeof exitCode === "number") {
+    const stdout = Reflect.get(output, "stdout");
+    const stdoutText = typeof stdout === "string" ? stdout : "";
+    const testMatch = /(\d+)\s+(passed|failed|passing|failing)/i.exec(stdoutText);
+    if (testMatch) {
+      return { text: `Tests: ${testMatch[0]}`, isError: exitCode !== 0 };
+    }
+    const lines = countTextLines(stdoutText);
+    const tail = lines > 0 ? ` \xB7 ${pluralize(lines, "line")}` : "";
+    return { text: `exit ${exitCode}${tail}`, isError: exitCode !== 0 };
+  }
+  for (const key of ["content", "text"]) {
+    const value = Reflect.get(output, key);
+    if (typeof value === "string" && value.trim()) {
+      return { text: pluralize(countTextLines(value), "line"), isError: false };
+    }
+  }
+  const matches = Reflect.get(output, "matches");
+  if (Array.isArray(matches)) {
+    return { text: pluralize(matches.length, "match"), isError: false };
+  }
+  for (const key of ["paths", "files", "results", "entries"]) {
+    const arr = Reflect.get(output, key);
+    if (Array.isArray(arr)) {
+      const noun = key === "results" || key === "entries" ? "item" : "file";
+      return { text: pluralize(arr.length, noun), isError: false };
+    }
+  }
+  for (const key of ["summary", "message"]) {
+    const value = Reflect.get(output, key);
+    if (typeof value === "string" && value.trim()) {
+      return { text: truncateInline2(value, 100), isError: false };
+    }
+  }
+  return null;
+}
 function ChatMessageToolInvocationPart({
   part,
   pendingApprovalIds
@@ -10259,12 +10666,18 @@ function ChatMessageToolInvocationPart({
   const target = normalizeToolTarget(getToolTarget(part.input));
   const label = target ?? humanizeToolName(toolName);
   const isPendingApproval = part.state === "input-available" && pendingApprovalIds?.has(part.toolCallId);
-  const stateView = isPendingApproval ? { symbol: "!", verb: "Approval pending for" } : TOOL_STATE_VIEW[part.state];
+  const stateView = isPendingApproval ? { symbol: activeGlyphs.toolApproval, verb: "Approval pending for" } : TOOL_STATE_VIEW[part.state];
   const stateColor = isPendingApproval ? cliTheme.semantic.warning : getToolToneColor(part.state);
   const line = `${stateView.symbol} ${stateView.verb} [${humanizeToolName(toolName)}] ${target ?? ""}`.trimEnd();
   const fileEditDiff = getFileEditDiff(part);
   const secondaryParams = getSecondaryParams(part.input, target);
-  const outputPreviewLines = fileEditDiff ? [] : getOutputPreviewLines(part, expandedToolOutput ? EXPANDED_OUTPUT_LINES : COLLAPSED_OUTPUT_LINES);
+  const editSummary = fileEditDiff ? (() => {
+    const { added, removed } = countDiffStats(fileEditDiff.diff);
+    return `Edited ${basename(fileEditDiff.path)} (+${added} -${removed})`;
+  })() : null;
+  const resultSummary = fileEditDiff ? null : summarizeToolOutput(part);
+  const rawPreviewLines = !fileEditDiff && expandedToolOutput ? getOutputPreviewLines(part, EXPANDED_OUTPUT_LINES) : [];
+  const hasCollapsedRawOutput = !fileEditDiff && !expandedToolOutput && getOutputPreviewLines(part, 1).length > 0;
   return /* @__PURE__ */ jsxDEV12("box", {
     flexDirection: "column",
     children: [
@@ -10274,9 +10687,24 @@ function ChatMessageToolInvocationPart({
       }, undefined, false, undefined, this),
       secondaryParams ? /* @__PURE__ */ jsxDEV12("text", {
         fg: cliTheme.text.muted,
-        attributes: TextAttributes8.DIM,
+        attributes: TextAttributes9.DIM,
         children: `  ${secondaryParams}`
       }, undefined, false, undefined, this) : null,
+      editSummary ? /* @__PURE__ */ jsxDEV12("text", {
+        fg: cliTheme.text.muted,
+        children: `  ${activeGlyphs.indent} ${editSummary}`
+      }, undefined, false, undefined, this) : null,
+      resultSummary ? /* @__PURE__ */ jsxDEV12("text", {
+        fg: resultSummary.isError ? cliTheme.semantic.warning : cliTheme.text.muted,
+        children: [
+          `  ${activeGlyphs.indent} ${resultSummary.text}`,
+          hasCollapsedRawOutput ? " \xB7 Ctrl+O" : ""
+        ]
+      }, undefined, true, undefined, this) : hasCollapsedRawOutput ? /* @__PURE__ */ jsxDEV12("text", {
+        fg: cliTheme.text.muted,
+        attributes: TextAttributes9.DIM,
+        children: `  ${activeGlyphs.indent} Ctrl+O to expand`
+      }, undefined, false, undefined, this) : null,
       part.state === "output-error" ? /* @__PURE__ */ jsxDEV12("text", {
         fg: cliTheme.text.secondary,
         children: part.errorText
@@ -10288,22 +10716,15 @@ function ChatMessageToolInvocationPart({
           part.approval.reason
         ]
       }, undefined, true, undefined, this) : null,
-      outputPreviewLines.length > 0 ? /* @__PURE__ */ jsxDEV12("box", {
+      rawPreviewLines.length > 0 ? /* @__PURE__ */ jsxDEV12("box", {
         flexDirection: "column",
         paddingX: 1,
         backgroundColor: cliTheme.surfaces.inset,
-        children: [
-          outputPreviewLines.map((previewLine, index) => /* @__PURE__ */ jsxDEV12("text", {
-            fg: cliTheme.text.muted,
-            children: previewLine || " "
-          }, `${part.toolCallId}-preview-${index}`, false, undefined, this)),
-          !expandedToolOutput ? /* @__PURE__ */ jsxDEV12("text", {
-            fg: cliTheme.text.muted,
-            attributes: TextAttributes8.DIM,
-            children: "Ctrl+O expand"
-          }, undefined, false, undefined, this) : null
-        ]
-      }, undefined, true, undefined, this) : null,
+        children: rawPreviewLines.map((previewLine, index) => /* @__PURE__ */ jsxDEV12("text", {
+          fg: cliTheme.text.muted,
+          children: previewLine || " "
+        }, `${part.toolCallId}-preview-${index}`, false, undefined, this))
+      }, undefined, false, undefined, this) : null,
       fileEditDiff ? /* @__PURE__ */ jsxDEV12(ChatDiffCard, {
         path: fileEditDiff.path,
         diff: fileEditDiff.diff
@@ -10311,10 +10732,11 @@ function ChatMessageToolInvocationPart({
     ]
   }, undefined, true, undefined, this);
 }
-var COLLAPSED_OUTPUT_LINES = 3, EXPANDED_OUTPUT_LINES = 18, OUTPUT_LINE_MAX_CHARS = 160, previewOutputKeys, TOOL_STATE_VIEW;
+var EXPANDED_OUTPUT_LINES = 18, OUTPUT_LINE_MAX_CHARS = 160, previewOutputKeys, TOOL_STATE_VIEW;
 var init_chat_message_tool_invocation_part = __esm(() => {
   init_app_state();
   init_cli_theme();
+  init_cli_theme_capabilities();
   init_text_utils();
   init_chat_diff_card();
   previewOutputKeys = [
@@ -10326,19 +10748,19 @@ var init_chat_message_tool_invocation_part = __esm(() => {
     "message"
   ];
   TOOL_STATE_VIEW = {
-    "input-streaming": { symbol: ">", verb: "Preparing" },
-    "input-available": { symbol: ">", verb: "Running" },
-    "approval-requested": { symbol: "!", verb: "Approval needed for" },
-    "approval-responded": { symbol: ">", verb: "Approval received for" },
-    "output-available": { symbol: "OK", verb: "Completed" },
-    "output-error": { symbol: "ERR", verb: "Failed" },
-    "output-denied": { symbol: "NO", verb: "Denied" }
+    "input-streaming": { symbol: activeGlyphs.toolRunning, verb: "Preparing" },
+    "input-available": { symbol: activeGlyphs.toolRunning, verb: "Running" },
+    "approval-requested": { symbol: activeGlyphs.toolApproval, verb: "Approval needed for" },
+    "approval-responded": { symbol: activeGlyphs.toolRunning, verb: "Approval received for" },
+    "output-available": { symbol: activeGlyphs.toolOk, verb: "Completed" },
+    "output-error": { symbol: activeGlyphs.toolError, verb: "Failed" },
+    "output-denied": { symbol: activeGlyphs.toolDenied, verb: "Denied" }
   };
 });
 
 // apps/cli/src/components/chat/chat-message.tsx
 import { isToolUIPart as isToolUIPart3 } from "ai";
-import { TextAttributes as TextAttributes9 } from "@opentui/core";
+import { TextAttributes as TextAttributes10 } from "@opentui/core";
 import { jsxDEV as jsxDEV13 } from "@opentui/react/jsx-dev-runtime";
 function ChatMessage({ message, pendingApprovalIds }) {
   const roleStyle = getMessageRoleTheme(message.role);
@@ -10374,43 +10796,45 @@ function ChatMessage({ message, pendingApprovalIds }) {
   return /* @__PURE__ */ jsxDEV13("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
-    borderColor: roleStyle.borderColor,
-    backgroundColor: roleStyle.backgroundColor,
-    paddingX: 1,
-    paddingY: 1,
-    gap: 1,
+    gap: space.xs,
     children: [
       /* @__PURE__ */ jsxDEV13("text", {
         fg: roleStyle.labelColor,
-        attributes: TextAttributes9.BOLD,
-        children: ROLE_LABELS[message.role]
+        attributes: TextAttributes10.BOLD,
+        children: `${ROLE_GLYPHS[message.role]} ${ROLE_LABELS[message.role]}`
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsxDEV13("box", {
         width: "100%",
         flexDirection: "column",
-        gap: 1,
+        gap: space.xs,
+        paddingLeft: space.md,
         children: renderedParts
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-var ROLE_LABELS;
+var ROLE_LABELS, ROLE_GLYPHS;
 var init_chat_message = __esm(() => {
   init_chat_message_error_part();
   init_chat_message_reasoning_part();
   init_chat_message_text_part();
   init_chat_message_tool_invocation_part();
   init_cli_theme();
+  init_cli_theme_capabilities();
   ROLE_LABELS = {
-    user: "You",
-    assistant: "Assistant",
-    system: "System"
+    user: "you",
+    assistant: "assistant",
+    system: "system"
+  };
+  ROLE_GLYPHS = {
+    user: activeGlyphs.roleUser,
+    assistant: activeGlyphs.roleAssistant,
+    system: activeGlyphs.roleSystem
   };
 });
 
 // apps/cli/src/components/chat/chat-shell.tsx
-import { TextAttributes as TextAttributes10 } from "@opentui/core";
+import { TextAttributes as TextAttributes11 } from "@opentui/core";
 import { jsxDEV as jsxDEV14 } from "@opentui/react/jsx-dev-runtime";
 function ChatShell({
   title = "Conversation",
@@ -10436,7 +10860,7 @@ function ChatShell({
         children: [
           /* @__PURE__ */ jsxDEV14("text", {
             fg: cliTheme.text.secondary,
-            attributes: TextAttributes10.BOLD,
+            attributes: TextAttributes11.BOLD,
             children: title
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV14("text", {
@@ -10463,7 +10887,7 @@ function ChatShell({
           contentOptions: {
             width: "100%",
             flexDirection: "column",
-            gap: 1
+            gap: space.md
           },
           scrollbarOptions: {
             trackOptions: {
@@ -10477,10 +10901,29 @@ function ChatShell({
               backgroundColor: cliTheme.scroll.rail
             }
           },
-          children: hasMessages ? children : /* @__PURE__ */ jsxDEV14("text", {
-            fg: cliTheme.text.muted,
-            children: emptyStateLabel
-          }, undefined, false, undefined, this)
+          children: hasMessages ? children : /* @__PURE__ */ jsxDEV14("box", {
+            width: "100%",
+            height: "100%",
+            flexDirection: "column",
+            alignItems: "center",
+            justifyContent: "center",
+            gap: space.xs,
+            children: [
+              /* @__PURE__ */ jsxDEV14("text", {
+                fg: cliTheme.accent.primary,
+                attributes: TextAttributes11.BOLD,
+                children: "\u25C6 ready"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV14("text", {
+                fg: cliTheme.text.secondary,
+                children: emptyStateLabel
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV14("text", {
+                fg: cliTheme.text.muted,
+                children: "Type a message \xB7 / for commands \xB7 @ to attach files"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this)
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
       errorMessage ? /* @__PURE__ */ jsxDEV14(ChatMessageErrorPart, {
@@ -10497,7 +10940,7 @@ var init_chat_shell = __esm(() => {
 });
 
 // apps/cli/src/components/chat/permission-mode-selector.tsx
-import { TextAttributes as TextAttributes11 } from "@opentui/core";
+import { TextAttributes as TextAttributes12 } from "@opentui/core";
 import { useKeyboard as useKeyboard2 } from "@opentui/react";
 import { useEffect as useEffect2, useState as useState4 } from "react";
 import { jsxDEV as jsxDEV15 } from "@opentui/react/jsx-dev-runtime";
@@ -10549,7 +10992,7 @@ function PermissionModeSelector({
   return /* @__PURE__ */ jsxDEV15("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     borderColor: cliTheme.overlay.border,
     backgroundColor: cliTheme.overlay.surface,
     children: [
@@ -10565,7 +11008,7 @@ function PermissionModeSelector({
         children: [
           /* @__PURE__ */ jsxDEV15("text", {
             fg: cliTheme.accent.primary,
-            attributes: TextAttributes11.BOLD,
+            attributes: TextAttributes12.BOLD,
             children: "Permission Mode"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV15("text", {
@@ -10598,12 +11041,12 @@ function PermissionModeSelector({
                   /* @__PURE__ */ jsxDEV15("text", {
                     width: 3,
                     fg: isSelected ? cliTheme.accent.primary : cliTheme.text.muted,
-                    attributes: TextAttributes11.BOLD,
+                    attributes: TextAttributes12.BOLD,
                     children: isSelected ? "> " : "  "
                   }, undefined, false, undefined, this),
                   /* @__PURE__ */ jsxDEV15("text", {
                     fg: isSelected ? cliTheme.overlay.selectedRowText : cliTheme.text.primary,
-                    attributes: isSelected ? TextAttributes11.BOLD : TextAttributes11.NONE,
+                    attributes: isSelected ? TextAttributes12.BOLD : TextAttributes12.NONE,
                     children: modeOption.label
                   }, undefined, false, undefined, this),
                   modeOption.mode === currentMode && /* @__PURE__ */ jsxDEV15("text", {
@@ -10625,7 +11068,7 @@ function PermissionModeSelector({
                 marginTop: 1,
                 children: modeOption.risks.map((risk) => /* @__PURE__ */ jsxDEV15("text", {
                   fg: modeOption.mode === "danger-full-access" ? cliTheme.semantic.error : cliTheme.text.muted,
-                  attributes: TextAttributes11.DIM,
+                  attributes: TextAttributes12.DIM,
                   children: [
                     "\u2022 ",
                     risk
@@ -10648,7 +11091,7 @@ function PermissionModeSelector({
         children: [
           /* @__PURE__ */ jsxDEV15("text", {
             fg: cliTheme.overlay.selectedRowText,
-            attributes: TextAttributes11.BOLD,
+            attributes: TextAttributes12.BOLD,
             children: [
               "Selected: ",
               currentSelection.label
@@ -10724,7 +11167,7 @@ var init_fuzzy_match = __esm(() => {
 });
 
 // apps/cli/src/components/chat/chat-text-area.tsx
-import { TextAttributes as TextAttributes12 } from "@opentui/core";
+import { TextAttributes as TextAttributes13 } from "@opentui/core";
 import { useCallback as useCallback3, useEffect as useEffect3, useRef as useRef2, useState as useState5 } from "react";
 import { jsxDEV as jsxDEV16 } from "@opentui/react/jsx-dev-runtime";
 function getTrailingMentionQuery(text) {
@@ -10741,7 +11184,6 @@ function ChatTextArea({
   containerHeight,
   beforeInput,
   footer,
-  modeToggleHint = false,
   slashMenuOpen = false,
   onTextChange,
   mentionCandidates
@@ -10752,7 +11194,6 @@ function ChatTextArea({
   const [mentionQuery, setMentionQuery] = useState5(null);
   const [mentionSelected, setMentionSelected] = useState5(0);
   const isFocused = focused && !disabled;
-  const inputHint = modeToggleHint ? "Enter to send | Ctrl+Enter for newline | Tab/Ctrl+T to switch mode" : "Enter to send | Ctrl+Enter for newline";
   const mentionMatches = mentionQuery !== null && mentionCandidates && mentionCandidates.length > 0 ? fuzzyFilter(mentionQuery, mentionCandidates) : [];
   const selectedMentionIndex = Math.min(mentionSelected, Math.max(mentionMatches.length - 1, 0));
   const acceptMention = useCallback3((mentionPath) => {
@@ -10847,12 +11288,12 @@ function ChatTextArea({
           mentionMatches.map((mentionPath, index) => /* @__PURE__ */ jsxDEV16("text", {
             fg: index === selectedMentionIndex ? cliTheme.overlay.selectedRowText : cliTheme.text.secondary,
             bg: index === selectedMentionIndex ? cliTheme.overlay.selectedRowBackground : undefined,
-            attributes: index === selectedMentionIndex ? TextAttributes12.BOLD : TextAttributes12.NONE,
+            attributes: index === selectedMentionIndex ? TextAttributes13.BOLD : TextAttributes13.NONE,
             children: `${index === selectedMentionIndex ? "> " : "  "}${mentionPath}`
           }, mentionPath, false, undefined, this)),
           /* @__PURE__ */ jsxDEV16("text", {
             fg: cliTheme.overlay.footerText,
-            attributes: TextAttributes12.DIM,
+            attributes: TextAttributes13.DIM,
             children: "Tab attach | Up/Down select | Esc dismiss"
           }, undefined, false, undefined, this)
         ]
@@ -10885,10 +11326,6 @@ function ChatTextArea({
             placeholderColor: cliTheme.input.placeholder,
             focused: isFocused
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV16("text", {
-            fg: cliTheme.input.hint,
-            children: inputHint
-          }, undefined, false, undefined, this),
           footer
         ]
       }, undefined, true, undefined, this)
@@ -10910,7 +11347,7 @@ var init_chat_text_area = __esm(() => {
 });
 
 // apps/cli/src/components/chat/chat-todo-status-card.tsx
-import { TextAttributes as TextAttributes13 } from "@opentui/core";
+import { TextAttributes as TextAttributes14 } from "@opentui/core";
 import { jsxDEV as jsxDEV17 } from "@opentui/react/jsx-dev-runtime";
 function getStatusColor(status) {
   if (status === "completed") {
@@ -10932,7 +11369,7 @@ function ChatTodoStatusCard({ todos }) {
   return /* @__PURE__ */ jsxDEV17("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.card,
     borderColor: cliTheme.semantic.info,
     backgroundColor: cliTheme.surfaces.panel,
     paddingX: 1,
@@ -10946,7 +11383,7 @@ function ChatTodoStatusCard({ todos }) {
         children: [
           /* @__PURE__ */ jsxDEV17("text", {
             fg: cliTheme.semantic.info,
-            attributes: TextAttributes13.BOLD,
+            attributes: TextAttributes14.BOLD,
             children: "Session Todo"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV17("text", {
@@ -10978,7 +11415,7 @@ function ChatTodoStatusCard({ todos }) {
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsxDEV17("text", {
               fg: getStatusColor(todo.status),
-              attributes: TextAttributes13.DIM,
+              attributes: TextAttributes14.DIM,
               children: todoStatusLabel[todo.status]
             }, undefined, false, undefined, this)
           ]
@@ -10986,7 +11423,7 @@ function ChatTodoStatusCard({ todos }) {
       }, undefined, false, undefined, this),
       todos.length > 6 ? /* @__PURE__ */ jsxDEV17("text", {
         fg: cliTheme.text.muted,
-        attributes: TextAttributes13.DIM,
+        attributes: TextAttributes14.DIM,
         children: [
           todos.length - 6,
           " more tasks hidden"
@@ -11008,7 +11445,7 @@ var init_chat_todo_status_card = __esm(() => {
 });
 
 // apps/cli/src/components/chat/chat-tool-approval-card.tsx
-import { TextAttributes as TextAttributes14 } from "@opentui/core";
+import { TextAttributes as TextAttributes15 } from "@opentui/core";
 import { useKeyboard as useKeyboard3 } from "@opentui/react";
 import { useEffect as useEffect4, useState as useState6 } from "react";
 import { jsxDEV as jsxDEV18 } from "@opentui/react/jsx-dev-runtime";
@@ -11121,7 +11558,7 @@ function ChatToolApprovalCard({
         children: [
           /* @__PURE__ */ jsxDEV18("text", {
             fg: cliTheme.semantic.warning,
-            attributes: TextAttributes14.BOLD,
+            attributes: TextAttributes15.BOLD,
             children: "Tool Approval"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV18("text", {
@@ -11144,7 +11581,7 @@ function ChatToolApprovalCard({
             children: [
               /* @__PURE__ */ jsxDEV18("text", {
                 fg: rowColors.primaryTextColor,
-                attributes: keyboardActive && index === safeSelectedIndex ? TextAttributes14.BOLD : TextAttributes14.NONE,
+                attributes: keyboardActive && index === safeSelectedIndex ? TextAttributes15.BOLD : TextAttributes15.NONE,
                 children: [
                   keyboardActive && index === safeSelectedIndex ? "> " : "  ",
                   index + 1,
@@ -11156,7 +11593,7 @@ function ChatToolApprovalCard({
               }, undefined, true, undefined, this),
               /* @__PURE__ */ jsxDEV18("text", {
                 fg: rowColors.secondaryTextColor,
-                attributes: TextAttributes14.DIM,
+                attributes: TextAttributes15.DIM,
                 children: getApprovalDescription(approval)
               }, undefined, false, undefined, this)
             ]
@@ -11170,7 +11607,7 @@ function ChatToolApprovalCard({
         children: [
           /* @__PURE__ */ jsxDEV18("text", {
             fg: cliTheme.text.muted,
-            attributes: TextAttributes14.DIM,
+            attributes: TextAttributes15.DIM,
             children: keyboardActive ? "Enter approve | d deny | a approve all | Esc release focus" : "Down focus card | or type approve/deny below"
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsxDEV18("text", {
@@ -11187,30 +11624,80 @@ var init_chat_tool_approval_card = __esm(() => {
   init_cli_theme();
 });
 
+// apps/cli/src/ui/hooks/use-spinner.ts
+import { useEffect as useEffect5, useState as useState7 } from "react";
+function spinnerGlyph(tick, { active, reducedMotion = false, ascii = false }) {
+  if (reducedMotion || !active) {
+    return STATIC_GLYPH;
+  }
+  const frames = ascii ? ASCII_SPINNER_FRAMES : SPINNER_FRAMES;
+  const index = (tick % frames.length + frames.length) % frames.length;
+  return frames[index];
+}
+function useSpinner(options) {
+  const { active, reducedMotion = false } = options;
+  const [tick, setTick] = useState7(0);
+  useEffect5(() => {
+    if (!active || reducedMotion) {
+      return;
+    }
+    const intervalId = setInterval(() => {
+      setTick((current) => current + 1);
+    }, FRAME_INTERVAL_MS);
+    return () => clearInterval(intervalId);
+  }, [active, reducedMotion]);
+  return spinnerGlyph(tick, options);
+}
+var SPINNER_FRAMES, ASCII_SPINNER_FRAMES, STATIC_GLYPH = "\u25CF", FRAME_INTERVAL_MS = 100;
+var init_use_spinner = __esm(() => {
+  SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  ASCII_SPINNER_FRAMES = ["|", "/", "-", "\\"];
+});
+
 // apps/cli/src/components/chat/loading-timer.tsx
 import { jsxDEV as jsxDEV19 } from "@opentui/react/jsx-dev-runtime";
-function LoadingTimer({ elapsedSeconds }) {
+function formatTokens(tokens) {
+  return tokens >= 1000 ? `${(tokens / 1000).toFixed(1)}k` : `${tokens}`;
+}
+function LoadingTimer({ elapsedSeconds, outputTokens }) {
+  const spinner = useSpinner({
+    active: true,
+    reducedMotion: terminalCapabilities.reducedMotion,
+    ascii: !terminalCapabilities.unicode
+  });
   const hours = Math.floor(elapsedSeconds / 3600);
   const minutes = Math.floor(elapsedSeconds % 3600 / 60);
   const seconds = Math.floor(elapsedSeconds % 60);
   const formattedTime = hours > 0 ? `${hours}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}` : `${minutes}:${seconds.toString().padStart(2, "0")}`;
+  const tokenSuffix = typeof outputTokens === "number" && outputTokens > 0 ? ` \xB7 ${formatTokens(outputTokens)} tok` : "";
   return /* @__PURE__ */ jsxDEV19("box", {
     paddingX: 1,
-    children: /* @__PURE__ */ jsxDEV19("text", {
-      fg: cliTheme.semantic.info,
-      children: [
-        "Thinking ",
-        formattedTime
-      ]
-    }, undefined, true, undefined, this)
-  }, undefined, false, undefined, this);
+    flexDirection: "row",
+    gap: 1,
+    children: [
+      /* @__PURE__ */ jsxDEV19("text", {
+        fg: cliTheme.accent.primary,
+        children: spinner
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV19("text", {
+        fg: cliTheme.semantic.info,
+        children: [
+          "Thinking ",
+          formattedTime,
+          tokenSuffix
+        ]
+      }, undefined, true, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
 }
 var init_loading_timer = __esm(() => {
   init_cli_theme();
+  init_cli_theme_capabilities();
+  init_use_spinner();
 });
 
 // apps/cli/src/components/chat/copy-mode-overlay.tsx
-import { TextAttributes as TextAttributes15 } from "@opentui/core";
+import { TextAttributes as TextAttributes16 } from "@opentui/core";
 import { jsxDEV as jsxDEV20 } from "@opentui/react/jsx-dev-runtime";
 function previewOf(message) {
   const text = collectMessageText(message).replace(/\s+/g, " ").trim();
@@ -11231,7 +11718,7 @@ function CopyModeOverlay({ messages, selectedIndex }) {
     children: [
       /* @__PURE__ */ jsxDEV20("text", {
         fg: cliTheme.accent.primary,
-        attributes: TextAttributes15.BOLD,
+        attributes: TextAttributes16.BOLD,
         children: "Copy mode \u2014 \u2191/\u2193 select \xB7 Enter copy \xB7 c code blocks \xB7 Esc exit"
       }, undefined, false, undefined, this),
       visible.map((message, offset) => {
@@ -11250,7 +11737,7 @@ function CopyModeOverlay({ messages, selectedIndex }) {
       }),
       total > visible.length ? /* @__PURE__ */ jsxDEV20("text", {
         fg: cliTheme.text.muted,
-        attributes: TextAttributes15.DIM,
+        attributes: TextAttributes16.DIM,
         children: `${selectedIndex + 1}/${total}`
       }, undefined, false, undefined, this) : null
     ]
@@ -11264,10 +11751,10 @@ var init_copy_mode_overlay = __esm(() => {
 });
 
 // apps/cli/src/hooks/use-auto-continue-config.ts
-import { useEffect as useEffect5, useState as useState7 } from "react";
+import { useEffect as useEffect6, useState as useState8 } from "react";
 function useAutoContinueConfig() {
-  const [config4, setConfig] = useState7(defaultAutoContinueConfig);
-  useEffect5(() => {
+  const [config4, setConfig] = useState8(defaultAutoContinueConfig);
+  useEffect6(() => {
     let cancelled = false;
     async function loadConfig() {
       try {
@@ -11294,10 +11781,10 @@ var init_use_auto_continue_config = __esm(() => {
 });
 
 // apps/cli/src/hooks/use-context-window.ts
-import { useEffect as useEffect6, useState as useState8 } from "react";
+import { useEffect as useEffect7, useState as useState9 } from "react";
 function useContextWindow() {
-  const [contextWindow, setContextWindow] = useState8(DEFAULT_CONTEXT_WINDOW_TOKENS);
-  useEffect6(() => {
+  const [contextWindow, setContextWindow] = useState9(DEFAULT_CONTEXT_WINDOW_TOKENS);
+  useEffect7(() => {
     let cancelled = false;
     async function loadContextWindow() {
       try {
@@ -11324,12 +11811,12 @@ var init_use_context_window = __esm(() => {
 });
 
 // apps/cli/src/hooks/use-loading-timer.ts
-import { useEffect as useEffect7, useRef as useRef3, useState as useState9 } from "react";
+import { useEffect as useEffect8, useRef as useRef3, useState as useState10 } from "react";
 function useLoadingTimer(isActive) {
-  const [elapsedSeconds, setElapsedSeconds] = useState9(0);
+  const [elapsedSeconds, setElapsedSeconds] = useState10(0);
   const intervalRef = useRef3(null);
   const startTimeRef = useRef3(null);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!isActive) {
       if (intervalRef.current) {
         clearInterval(intervalRef.current);
@@ -11380,19 +11867,33 @@ var init_route_state = __esm(() => {
 });
 
 // apps/cli/src/utils/chat-context-utils.ts
+function latestServerContext(messages) {
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    const context2 = getMessageUsageMetadata(messages[index])?.context;
+    if (context2) {
+      return {
+        inputTokens: context2.inputTokens,
+        contextWindow: context2.contextWindow
+      };
+    }
+  }
+  return null;
+}
 function formatTokenCount(tokens) {
   return tokens >= 1000 ? `${Math.round(tokens / 1000)}k` : `${tokens}`;
 }
 function estimateContextUsage(messages, contextWindow) {
-  const estimate2 = estimateContextTokens(messages);
-  const percentage = Math.min(100, Math.round(estimate2.tokens / Math.max(1, contextWindow) * 100));
+  const serverContext = latestServerContext(messages);
+  const estimate2 = serverContext ? { tokens: serverContext.inputTokens, basis: "usage_calibrated" } : estimateContextTokens(messages);
+  const effectiveWindow = serverContext?.contextWindow ?? contextWindow;
+  const percentage = Math.min(100, Math.round(estimate2.tokens / Math.max(1, effectiveWindow) * 100));
   const level = percentage >= CRITICAL_PERCENTAGE ? "critical" : percentage >= WARNING_PERCENTAGE ? "warning" : "normal";
   return {
     tokens: estimate2.tokens,
     basis: estimate2.basis,
     percentage,
     level,
-    displayText: `${formatTokenCount(estimate2.tokens)}/${formatTokenCount(contextWindow)} ${percentage}%`
+    displayText: `${formatTokenCount(estimate2.tokens)}/${formatTokenCount(effectiveWindow)} ${percentage}%`
   };
 }
 var WARNING_PERCENTAGE = 60, CRITICAL_PERCENTAGE = 85;
@@ -11481,11 +11982,35 @@ var init_file_mentions = __esm(() => {
   };
 });
 
+// apps/cli/src/ui/components/badge.tsx
+import { jsxDEV as jsxDEV21 } from "@opentui/react/jsx-dev-runtime";
+function Badge({ tone = "neutral", label }) {
+  return /* @__PURE__ */ jsxDEV21("box", {
+    backgroundColor: cliTheme.overlay.badgeBackground,
+    paddingX: 1,
+    children: /* @__PURE__ */ jsxDEV21("text", {
+      fg: toneColor[tone],
+      children: label
+    }, undefined, false, undefined, this)
+  }, undefined, false, undefined, this);
+}
+var toneColor;
+var init_badge = __esm(() => {
+  init_cli_theme();
+  toneColor = {
+    neutral: cliTheme.text.secondary,
+    accent: cliTheme.accent.primary,
+    success: cliTheme.semantic.success,
+    warning: cliTheme.semantic.warning,
+    error: cliTheme.semantic.error
+  };
+});
+
 // apps/cli/src/screens/chat-screen.tsx
 import { useKeyboard as useKeyboard4, useRenderer } from "@opentui/react";
-import { Fragment, useCallback as useCallback4, useEffect as useEffect8, useMemo as useMemo4, useRef as useRef4, useState as useState10 } from "react";
+import { Fragment, useCallback as useCallback4, useEffect as useEffect9, useMemo as useMemo4, useRef as useRef4, useState as useState11 } from "react";
 import { useLocation, useNavigate, useParams } from "react-router";
-import { jsxDEV as jsxDEV21 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV22 } from "@opentui/react/jsx-dev-runtime";
 function shouldImplementApprovedPlan(response) {
   if (response.selectedValue === "yes") {
     return true;
@@ -11546,14 +12071,14 @@ function ChatScreen() {
   const skipHistoryLoad = locationState.skipHistoryLoad ?? false;
   const sessionId = parsedRouteParams.success ? parsedRouteParams.data.id : "";
   const isSessionIdValid = parsedRouteParams.success;
-  const [mode, setMode] = useState10(locationState.mode ?? defaultCodingAgentMode);
-  const [permissionMode, setPermissionMode] = useState10(locationState.permissionMode);
-  const [planConfirmationMessageId, setPlanConfirmationMessageId] = useState10(null);
-  const [handledPlanMessageIds, setHandledPlanMessageIds] = useState10([]);
-  const [queuedImplementationInstruction, setQueuedImplementationInstruction] = useState10(null);
-  const [contextState, setContextState] = useState10(null);
-  const [actionNotice, setActionNotice] = useState10(null);
-  const [permissionSelectorOpen, setPermissionSelectorOpen] = useState10(false);
+  const [mode, setMode] = useState11(locationState.mode ?? defaultCodingAgentMode);
+  const [permissionMode, setPermissionMode] = useState11(locationState.permissionMode);
+  const [planConfirmationMessageId, setPlanConfirmationMessageId] = useState11(null);
+  const [handledPlanMessageIds, setHandledPlanMessageIds] = useState11([]);
+  const [queuedImplementationInstruction, setQueuedImplementationInstruction] = useState11(null);
+  const [contextState, setContextState] = useState11(null);
+  const [actionNotice, setActionNotice] = useState11(null);
+  const [permissionSelectorOpen, setPermissionSelectorOpen] = useState11(false);
   const slashRoutes = getSlashMenuItems(slashMenuQuery, {
     includeChatActions: true
   });
@@ -11578,12 +12103,12 @@ function ChatScreen() {
     setSlashMenuSelected,
     slashMenuOpen
   ]);
-  useEffect8(() => {
+  useEffect9(() => {
     const nextMode = locationState.mode ?? defaultCodingAgentMode;
     setMode((currentMode) => currentMode === nextMode ? currentMode : nextMode);
     setPermissionMode((currentPermissionMode) => currentPermissionMode === locationState.permissionMode ? currentPermissionMode : locationState.permissionMode);
   }, [locationState.mode, locationState.permissionMode, sessionId]);
-  useEffect8(() => {
+  useEffect9(() => {
     setPlanConfirmationMessageId(null);
     setHandledPlanMessageIds([]);
     setQueuedImplementationInstruction(null);
@@ -11687,8 +12212,26 @@ function ChatScreen() {
   });
   const elapsedSeconds = useLoadingTimer(isLoading || isStreaming);
   const contextWindow = useContextWindow();
-  const [mentionCandidates, setMentionCandidates] = useState10([]);
-  useEffect8(() => {
+  const [mentionCandidates, setMentionCandidates] = useState11([]);
+  const [retryNowMs, setRetryNowMs] = useState11(() => Date.now());
+  const retryAtMs = autoContinueState?.kind === "retry-error" ? autoContinueState.retryAtMs : undefined;
+  useEffect9(() => {
+    if (!retryAtMs) {
+      return;
+    }
+    const intervalId = setInterval(() => setRetryNowMs(Date.now()), 500);
+    return () => clearInterval(intervalId);
+  }, [retryAtMs]);
+  const retryNoticeText = (() => {
+    if (autoContinueState?.kind !== "retry-error") {
+      return "";
+    }
+    const label = retryReasonLabel(autoContinueState.retryReason);
+    const secondsLeft = retryAtMs ? Math.max(0, Math.ceil((retryAtMs - retryNowMs) / 1000)) : 0;
+    const timing = secondsLeft > 0 ? `in ${secondsLeft}s` : "now";
+    return `${label} \u2014 retrying ${timing} (${autoContinueState.attempt})...`;
+  })();
+  useEffect9(() => {
     let cancelled = false;
     async function loadMentionCandidates() {
       try {
@@ -11719,7 +12262,7 @@ function ChatScreen() {
     } catch {}
   }, [sessionId]);
   const wasStreamingRef = useRef4(false);
-  useEffect8(() => {
+  useEffect9(() => {
     if (wasStreamingRef.current && !isStreaming) {
       refreshContextState();
     }
@@ -11729,8 +12272,8 @@ function ChatScreen() {
     setActionNotice({ text, tone });
   }, []);
   const renderer = useRenderer();
-  const [copyModeOpen, setCopyModeOpen] = useState10(false);
-  const [copyModeIndex, setCopyModeIndex] = useState10(0);
+  const [copyModeOpen, setCopyModeOpen] = useState11(false);
+  const [copyModeIndex, setCopyModeIndex] = useState11(0);
   const copyableMessages = useMemo4(() => messages.filter((message) => (message.role === "user" || message.role === "assistant") && collectMessageText(message).trim().length > 0), [messages]);
   const copySelectedMessage = useCallback4(async (kind) => {
     const message = copyableMessages[copyModeIndex];
@@ -11782,7 +12325,7 @@ function ChatScreen() {
   const setPermissionModeToState = useCallback4((newMode) => {
     setPermissionMode(newMode);
   }, []);
-  useEffect8(() => {
+  useEffect9(() => {
     if (!requestedChatActionId) {
       return;
     }
@@ -11861,13 +12404,24 @@ function ChatScreen() {
   const contextMeterColor = contextEstimate.level === "critical" ? cliTheme.semantic.error : contextEstimate.level === "warning" ? cliTheme.semantic.warning : cliTheme.text.muted;
   const anchorVisibleInMessages = contextState !== null && messages.some((message) => message.id === contextState.anchorMessageId);
   const lastAssistantMessage2 = getLatestAssistantMessage(messages);
+  const liveOutputTokens = (() => {
+    if (!lastAssistantMessage2) {
+      return 0;
+    }
+    const reported = getMessageUsageMetadata(lastAssistantMessage2)?.usage?.outputTokens;
+    if (typeof reported === "number" && reported > 0) {
+      return reported;
+    }
+    const text = collectMessageText(lastAssistantMessage2);
+    return text ? Math.ceil(text.length / 4) : 0;
+  })();
   const modelHasToolCallXmlLeak = !isLoading && !isStreaming && lastAssistantMessage2 ? hasToolCallXmlLeak(lastAssistantMessage2) : false;
   const activeUserPrompt = pendingUserPrompts[0] ?? null;
   const pendingApprovalIds = useMemo4(() => new Set(pendingApprovals.map((approval) => approval.toolCallId)), [pendingApprovals]);
   const planConfirmationOpen = mode === "plan" && activeUserPrompt === null && planConfirmationMessageId !== null;
   const hasBlockingPopup = activeUserPrompt !== null || planConfirmationOpen;
   const canTypeInChat = !isSessionIdValid ? false : hasBlockingPopup ? false : pendingApprovals.length > 0 ? true : !isLoading;
-  useEffect8(() => {
+  useEffect9(() => {
     if (mode !== "plan") {
       setPlanConfirmationMessageId(null);
       return;
@@ -11893,7 +12447,7 @@ function ChatScreen() {
     isStreaming,
     pendingUserPrompts.length
   ]);
-  useEffect8(() => {
+  useEffect9(() => {
     if (mode !== "build" || !queuedImplementationInstruction) {
       return;
     }
@@ -11958,113 +12512,110 @@ function ChatScreen() {
     keyEvent.stopPropagation();
     setMode((currentMode) => cycleCodingAgentMode(currentMode));
   });
-  return /* @__PURE__ */ jsxDEV21("box", {
+  return /* @__PURE__ */ jsxDEV22("box", {
     width: "100%",
     height: "100%",
-    children: /* @__PURE__ */ jsxDEV21(ChatShell, {
+    children: /* @__PURE__ */ jsxDEV22(ChatShell, {
       hasMessages: messages.length > 0 || isStreaming || pendingApprovals.length > 0 || activeUserPrompt !== null || planConfirmationOpen,
       messageCount: messages.length,
       errorMessage,
-      inputArea: /* @__PURE__ */ jsxDEV21(ChatTextArea, {
+      inputArea: /* @__PURE__ */ jsxDEV22(ChatTextArea, {
         placeholder: isLoading ? "Waiting for response..." : "Reply... (@ to attach files)",
         focused: canTypeInChat && !copyModeOpen,
         disabled: !canTypeInChat || copyModeOpen,
         slashMenuOpen,
         mentionCandidates,
         onTextChange: syncSlashMenuFromInput,
-        beforeInput: slashMenuOpen ? /* @__PURE__ */ jsxDEV21(SlashPageMenu, {
+        beforeInput: slashMenuOpen ? /* @__PURE__ */ jsxDEV22(SlashPageMenu, {
           query: slashMenuQuery,
           selectedIndex: selectedSlashRouteIndex,
           routes: slashRoutes
         }, undefined, false, undefined, this) : null,
-        footer: /* @__PURE__ */ jsxDEV21("box", {
+        footer: /* @__PURE__ */ jsxDEV22("box", {
           flexDirection: "row",
           justifyContent: "space-between",
           children: [
-            copyModeOpen ? /* @__PURE__ */ jsxDEV21("text", {
+            copyModeOpen ? /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
               children: "Copy mode: \u2191/\u2193 select \xB7 Enter copy \xB7 c code \xB7 Esc exit"
-            }, undefined, false, undefined, this) : canRetryRecoverableResponse ? /* @__PURE__ */ jsxDEV21("text", {
+            }, undefined, false, undefined, this) : canRetryRecoverableResponse ? /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
-              children: "Type retry or regenerate to try again"
-            }, undefined, false, undefined, this) : pendingApprovals.length > 0 ? /* @__PURE__ */ jsxDEV21("text", {
+              children: errorMessage && /rate.?limit/i.test(errorMessage) ? "Rate-limited \u2014 wait a moment, /model to switch, or add provider credits" : "Type retry or regenerate to try again"
+            }, undefined, false, undefined, this) : pendingApprovals.length > 0 ? /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
               children: "Use approval card or approve/deny commands"
-            }, undefined, false, undefined, this) : hasBlockingPopup ? /* @__PURE__ */ jsxDEV21("text", {
+            }, undefined, false, undefined, this) : hasBlockingPopup ? /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
               children: "Complete the inline prompt to continue"
-            }, undefined, false, undefined, this) : slashMenuOpen ? /* @__PURE__ */ jsxDEV21("text", {
+            }, undefined, false, undefined, this) : slashMenuOpen ? /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
               children: "Choose a page or press Esc"
-            }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV21("text", {
+            }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
-              children: "Tab/Ctrl+T mode | Ctrl+Y copy | Ctrl+P commands"
+              children: "Enter send \xB7 Ctrl+Enter newline"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV21("box", {
+            /* @__PURE__ */ jsxDEV22("box", {
               flexDirection: "row",
               gap: 1,
               alignItems: "center",
               children: [
-                /* @__PURE__ */ jsxDEV21("text", {
+                /* @__PURE__ */ jsxDEV22("text", {
                   fg: contextMeterColor,
-                  children: contextEstimate.displayText
+                  children: truncateInline2(contextEstimate.displayText, 24)
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV21("text", {
+                /* @__PURE__ */ jsxDEV22("text", {
                   children: [
-                    /* @__PURE__ */ jsxDEV21("span", {
+                    /* @__PURE__ */ jsxDEV22("span", {
                       fg: cliTheme.accent.primary,
                       children: modeDefinition.label
                     }, undefined, false, undefined, this),
-                    /* @__PURE__ */ jsxDEV21("span", {
+                    /* @__PURE__ */ jsxDEV22("span", {
                       fg: cliTheme.text.muted,
                       children: " mode"
                     }, undefined, false, undefined, this)
                   ]
                 }, undefined, true, undefined, this),
-                /* @__PURE__ */ jsxDEV21("text", {
-                  children: /* @__PURE__ */ jsxDEV21("span", {
-                    fg: cliTheme.semantic.warning,
-                    children: "|"
+                /* @__PURE__ */ jsxDEV22("text", {
+                  children: /* @__PURE__ */ jsxDEV22("span", {
+                    fg: cliTheme.text.muted,
+                    children: "\xB7"
                   }, undefined, false, undefined, this)
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV21("text", {
-                  children: /* @__PURE__ */ jsxDEV21("span", {
-                    fg: permissionMode === "danger-full-access" ? cliTheme.semantic.error : permissionMode === "read-only" ? cliTheme.text.muted : cliTheme.text.primary,
-                    children: permissionMode ?? "default"
-                  }, undefined, false, undefined, this)
+                /* @__PURE__ */ jsxDEV22(Badge, {
+                  tone: permissionMode === "danger-full-access" ? "error" : permissionMode === "read-only" ? "neutral" : "accent",
+                  label: permissionMode ?? "default"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        modeToggleHint: true,
         onSubmit: submitChatInput
       }, undefined, false, undefined, this),
       children: [
-        contextState && !anchorVisibleInMessages ? /* @__PURE__ */ jsxDEV21(ChatContextStateCard, {
+        contextState && !anchorVisibleInMessages ? /* @__PURE__ */ jsxDEV22(ChatContextStateCard, {
           contextState
         }, undefined, false, undefined, this) : null,
-        messages.map((message) => /* @__PURE__ */ jsxDEV21(Fragment, {
+        messages.map((message) => /* @__PURE__ */ jsxDEV22(Fragment, {
           children: [
-            isAutoContinueMessage(message) ? null : isContextSummaryMessage(message) ? /* @__PURE__ */ jsxDEV21(ChatContextSummaryCard, {
+            isAutoContinueMessage(message) ? null : isContextSummaryMessage(message) ? /* @__PURE__ */ jsxDEV22(ChatContextSummaryCard, {
               message
-            }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV21(ChatMessage, {
+            }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV22(ChatMessage, {
               message,
               pendingApprovalIds
             }, undefined, false, undefined, this),
-            contextState && contextState.anchorMessageId === message.id ? /* @__PURE__ */ jsxDEV21(ChatContextStateCard, {
+            contextState && contextState.anchorMessageId === message.id ? /* @__PURE__ */ jsxDEV22(ChatContextStateCard, {
               contextState
             }, undefined, false, undefined, this) : null
           ]
         }, message.id, true, undefined, this)),
-        actionNotice ? /* @__PURE__ */ jsxDEV21("box", {
+        actionNotice ? /* @__PURE__ */ jsxDEV22("box", {
           paddingX: 1,
-          children: /* @__PURE__ */ jsxDEV21("text", {
+          children: /* @__PURE__ */ jsxDEV22("text", {
             fg: actionNotice.tone === "error" ? cliTheme.semantic.error : cliTheme.semantic.info,
             children: actionNotice.text
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this) : null,
-        modelHasToolCallXmlLeak ? /* @__PURE__ */ jsxDEV21("box", {
+        modelHasToolCallXmlLeak ? /* @__PURE__ */ jsxDEV22("box", {
           paddingX: 1,
           paddingY: 1,
           borderStyle: "single",
@@ -12072,47 +12623,41 @@ function ChatScreen() {
           flexDirection: "column",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV21("text", {
+            /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.semantic.warning,
               children: "Model compatibility issue: this model output raw tool call XML instead of invoking tools."
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV21("text", {
+            /* @__PURE__ */ jsxDEV22("text", {
               fg: cliTheme.text.muted,
               children: "Switch to a model with native function calling (Claude, GPT-4, Llama 3) via /model."
             }, undefined, false, undefined, this)
           ]
-        }, undefined, true, undefined, this) : autoContinueState?.guardTripped ? /* @__PURE__ */ jsxDEV21("box", {
+        }, undefined, true, undefined, this) : autoContinueState?.guardTripped ? /* @__PURE__ */ jsxDEV22("box", {
           paddingX: 1,
-          children: /* @__PURE__ */ jsxDEV21("text", {
+          children: /* @__PURE__ */ jsxDEV22("text", {
             fg: cliTheme.semantic.warning,
             children: autoContinueState.guardTripped === "doom-loop" ? "Agent appears stuck repeating itself \u2014 automatic continuation stopped. Send a message to resume." : autoContinueState.guardTripped === "no-progress" ? "The connection keeps dropping without making progress \u2014 automatic retry stopped. Send a message to resume." : `Reached the automatic continuation limit (${autoContinueState.attempt}). Send a message to resume.`
           }, undefined, false, undefined, this)
-        }, undefined, false, undefined, this) : autoContinueState ? /* @__PURE__ */ jsxDEV21("box", {
+        }, undefined, false, undefined, this) : autoContinueState ? /* @__PURE__ */ jsxDEV22("box", {
           paddingX: 1,
-          children: /* @__PURE__ */ jsxDEV21("text", {
+          children: /* @__PURE__ */ jsxDEV22("text", {
             fg: cliTheme.semantic.info,
-            children: autoContinueState.kind === "continue-length" ? `Output limit hit \u2014 continuing automatically (${autoContinueState.attempt})...` : autoContinueState.kind === "retry-error" ? `Connection dropped \u2014 retrying automatically (${autoContinueState.attempt})...` : `Agent stopped early \u2014 continuing automatically (${autoContinueState.attempt})...`
+            children: autoContinueState.kind === "continue-length" ? `Output limit hit \u2014 continuing automatically (${autoContinueState.attempt})...` : autoContinueState.kind === "retry-error" ? retryNoticeText : `Agent stopped early \u2014 continuing automatically (${autoContinueState.attempt})...`
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this) : null,
-        isLoading || isStreaming ? /* @__PURE__ */ jsxDEV21(LoadingTimer, {
-          elapsedSeconds
-        }, undefined, false, undefined, this) : null,
-        isStreaming ? /* @__PURE__ */ jsxDEV21("box", {
-          paddingX: 1,
-          children: /* @__PURE__ */ jsxDEV21("text", {
-            fg: cliTheme.semantic.info,
-            children: "Assistant is thinking..."
-          }, undefined, false, undefined, this)
+        isLoading || isStreaming ? /* @__PURE__ */ jsxDEV22(LoadingTimer, {
+          elapsedSeconds,
+          outputTokens: liveOutputTokens
         }, undefined, false, undefined, this) : null,
-        pendingApprovals.length > 0 ? /* @__PURE__ */ jsxDEV21(ChatToolApprovalCard, {
+        pendingApprovals.length > 0 ? /* @__PURE__ */ jsxDEV22(ChatToolApprovalCard, {
           approvals: pendingApprovals,
           onResolve: resolveToolApproval,
           onResolveAll: resolveAllToolApprovals
         }, undefined, false, undefined, this) : null,
-        todos.length > 0 ? /* @__PURE__ */ jsxDEV21(ChatTodoStatusCard, {
+        todos.length > 0 ? /* @__PURE__ */ jsxDEV22(ChatTodoStatusCard, {
           todos
         }, undefined, false, undefined, this) : null,
-        activeUserPrompt ? /* @__PURE__ */ jsxDEV21(ChatInteractionPopup, {
+        activeUserPrompt ? /* @__PURE__ */ jsxDEV22(ChatInteractionPopup, {
           title: activeUserPrompt.header ?? "Question",
           question: activeUserPrompt.question,
           options: activeUserPrompt.options.map((option) => ({
@@ -12143,7 +12688,7 @@ function ChatScreen() {
             });
           }
         }, undefined, false, undefined, this) : null,
-        planConfirmationOpen ? /* @__PURE__ */ jsxDEV21(ChatInteractionPopup, {
+        planConfirmationOpen ? /* @__PURE__ */ jsxDEV22(ChatInteractionPopup, {
           title: "Plan review",
           question: "Implement this plan now?",
           options: [
@@ -12191,12 +12736,12 @@ function ChatScreen() {
             sendDirectMessage(defaultPlanRevisionRequest);
           }
         }, undefined, false, undefined, this) : null,
-        permissionSelectorOpen ? /* @__PURE__ */ jsxDEV21(PermissionModeSelector, {
+        permissionSelectorOpen ? /* @__PURE__ */ jsxDEV22(PermissionModeSelector, {
           currentMode: permissionMode,
           onSelect: updatePermissionMode,
           onClose: () => setPermissionSelectorOpen(false)
         }, undefined, false, undefined, this) : null,
-        copyModeOpen ? /* @__PURE__ */ jsxDEV21(CopyModeOverlay, {
+        copyModeOpen ? /* @__PURE__ */ jsxDEV22(CopyModeOverlay, {
           messages: copyableMessages,
           selectedIndex: Math.min(copyModeIndex, Math.max(copyableMessages.length - 1, 0))
         }, undefined, false, undefined, this) : null
@@ -12234,6 +12779,8 @@ var init_chat_screen = __esm(() => {
   init_chat_context_utils();
   init_file_mentions();
   init_markdown_code();
+  init_text_utils();
+  init_badge();
   planConfirmationAcceptKeywords = [
     "yes",
     "y",
@@ -12261,12 +12808,12 @@ var init_chat_screen = __esm(() => {
 });
 
 // apps/cli/src/screens/diagnostics-screen.tsx
-import { TextAttributes as TextAttributes16 } from "@opentui/core";
+import { TextAttributes as TextAttributes17 } from "@opentui/core";
 import { useKeyboard as useKeyboard5 } from "@opentui/react";
-import { useCallback as useCallback5, useEffect as useEffect9, useMemo as useMemo5, useState as useState11 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect10, useMemo as useMemo5, useState as useState12 } from "react";
 import { useLocation as useLocation2 } from "react-router";
 import { z as z35 } from "zod";
-import { jsxDEV as jsxDEV22, Fragment as Fragment2 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV23, Fragment as Fragment2 } from "@opentui/react/jsx-dev-runtime";
 function getStatusColor2(status) {
   if (status === "ok") {
     return cliTheme.semantic.success;
@@ -12288,16 +12835,16 @@ function InfoRow({
   tone
 }) {
   const valueColor = tone === "muted" || tone === undefined ? cliTheme.text.secondary : getStatusColor2(tone);
-  return /* @__PURE__ */ jsxDEV22("box", {
+  return /* @__PURE__ */ jsxDEV23("box", {
     flexDirection: "row",
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV22("text", {
+      /* @__PURE__ */ jsxDEV23("text", {
         fg: cliTheme.text.muted,
         width: 24,
         children: label
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV22("text", {
+      /* @__PURE__ */ jsxDEV23("text", {
         fg: valueColor,
         children: formatNullable(value)
       }, undefined, false, undefined, this)
@@ -12308,7 +12855,7 @@ function Section({
   title,
   children
 }) {
-  return /* @__PURE__ */ jsxDEV22("box", {
+  return /* @__PURE__ */ jsxDEV23("box", {
     flexDirection: "column",
     gap: 1,
     paddingX: 1,
@@ -12317,9 +12864,9 @@ function Section({
     borderColor: cliTheme.borders.subtle,
     backgroundColor: cliTheme.surfaces.panel,
     children: [
-      /* @__PURE__ */ jsxDEV22("text", {
+      /* @__PURE__ */ jsxDEV23("text", {
         fg: cliTheme.accent.primary,
-        attributes: TextAttributes16.BOLD,
+        attributes: TextAttributes17.BOLD,
         children: title
       }, undefined, false, undefined, this),
       children
@@ -12330,123 +12877,123 @@ function renderStatus(payload, routeState) {
   const parsedRouteState = diagnosticsRouteStateSchema.safeParse(routeState);
   const currentSession = parsedRouteState.success ? parsedRouteState.data : {};
   const latestSession = payload.sessions.latest;
-  return /* @__PURE__ */ jsxDEV22(Fragment2, {
+  return /* @__PURE__ */ jsxDEV23(Fragment2, {
     children: [
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Current Chat",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Session",
             value: currentSession.sessionId ?? "not in chat"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Mode",
             value: currentSession.mode ?? "not set"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Permission mode",
             value: currentSession.permissionMode ?? "not set"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "CWD",
             value: currentSession.cwd ?? payload.server.cwd
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Messages",
             value: currentSession.messageCount ?? null
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Pending approvals",
             value: currentSession.pendingApprovalCount ?? 0,
             tone: (currentSession.pendingApprovalCount ?? 0) > 0 ? "warn" : "ok"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Runtime",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Server",
             value: payload.server.status,
             tone: payload.server.status
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Provider",
             value: payload.provider.provider,
             tone: payload.provider.status
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Model",
             value: payload.provider.model
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Database",
             value: payload.database.status,
             tone: payload.database.status
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Tool count",
             value: payload.tools.total
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Schema status",
             value: payload.tools.providerSchemaStatus,
             tone: payload.tools.providerSchemaStatus
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Extensions",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Skills",
             value: payload.extensions.skills.count
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "MCP servers",
             value: payload.extensions.mcp.configuredServers
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "MCP running",
             value: payload.extensions.mcp.runningServers
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "MCP degraded",
             value: payload.extensions.mcp.degradedServers,
             tone: payload.extensions.mcp.degradedServers > 0 ? "warn" : "ok"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Plugins",
             value: payload.extensions.plugins.count
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Plugin hooks",
             value: payload.extensions.plugins.hooks
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Latest Saved Session",
-        children: latestSession ? /* @__PURE__ */ jsxDEV22(Fragment2, {
+        children: latestSession ? /* @__PURE__ */ jsxDEV23(Fragment2, {
           children: [
-            /* @__PURE__ */ jsxDEV22(InfoRow, {
+            /* @__PURE__ */ jsxDEV23(InfoRow, {
               label: "Session",
               value: latestSession.id
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV22(InfoRow, {
+            /* @__PURE__ */ jsxDEV23(InfoRow, {
               label: "Title",
               value: latestSession.title ?? latestSession.latestUserPromptPreview
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV22(InfoRow, {
+            /* @__PURE__ */ jsxDEV23(InfoRow, {
               label: "Messages",
               value: latestSession.messageCount
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV22(InfoRow, {
+            /* @__PURE__ */ jsxDEV23(InfoRow, {
               label: "Updated",
               value: formatDate2(latestSession.updatedAt)
             }, undefined, false, undefined, this)
           ]
-        }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV22("text", {
+        }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.text.muted,
           children: "No saved sessions yet."
         }, undefined, false, undefined, this)
@@ -12455,36 +13002,36 @@ function renderStatus(payload, routeState) {
   }, undefined, true, undefined, this);
 }
 function renderDoctor(payload) {
-  return /* @__PURE__ */ jsxDEV22(Section, {
+  return /* @__PURE__ */ jsxDEV23(Section, {
     title: `Overall: ${payload.status}`,
-    children: payload.checks.map((check) => /* @__PURE__ */ jsxDEV22("box", {
+    children: payload.checks.map((check) => /* @__PURE__ */ jsxDEV23("box", {
       flexDirection: "column",
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsxDEV22("box", {
+        /* @__PURE__ */ jsxDEV23("box", {
           flexDirection: "row",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: getStatusColor2(check.status),
-              attributes: TextAttributes16.BOLD,
+              attributes: TextAttributes17.BOLD,
               width: 8,
               children: check.status.toUpperCase()
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: cliTheme.text.primary,
-              attributes: TextAttributes16.BOLD,
+              attributes: TextAttributes17.BOLD,
               children: check.label
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsxDEV22("text", {
+        /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.text.secondary,
           children: check.summary
         }, undefined, false, undefined, this),
-        check.details.map((detail) => /* @__PURE__ */ jsxDEV22("text", {
+        check.details.map((detail) => /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.text.muted,
-          attributes: TextAttributes16.DIM,
+          attributes: TextAttributes17.DIM,
           children: detail
         }, detail, false, undefined, this))
       ]
@@ -12494,111 +13041,111 @@ function renderDoctor(payload) {
 function renderPermissions(payload, routeState) {
   const parsedRouteState = diagnosticsRouteStateSchema.safeParse(routeState);
   const currentSession = parsedRouteState.success ? parsedRouteState.data : {};
-  return /* @__PURE__ */ jsxDEV22(Fragment2, {
+  return /* @__PURE__ */ jsxDEV23(Fragment2, {
     children: [
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Current Chat",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Mode",
             value: currentSession.mode ?? payload.defaultMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Permission mode",
             value: currentSession.permissionMode ?? payload.effectivePermissionMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Pending approvals",
             value: currentSession.pendingApprovalCount ?? 0,
             tone: (currentSession.pendingApprovalCount ?? 0) > 0 ? "warn" : "ok"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Persisted pending",
             value: payload.pendingInteractions.total,
             tone: payload.pendingInteractions.total > 0 ? "warn" : "ok"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Policy",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Default mode",
             value: payload.defaultMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Configured permission",
             value: payload.configuredPermissionMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Effective permission",
             value: payload.effectivePermissionMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Allowed tools",
             value: payload.allowedTools ? payload.allowedTools.join(", ") : "all policy-allowed tools"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Allow rules",
             value: payload.rules.allow?.length ?? 0
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Ask rules",
             value: payload.rules.ask?.length ?? 0
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Deny rules",
             value: payload.rules.deny?.length ?? 0
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Recovery",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Tool approvals",
             value: payload.pendingInteractions.toolApprovals
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "User prompts",
             value: payload.pendingInteractions.userPrompts
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Stale pending",
             value: payload.pendingInteractions.stale,
             tone: payload.pendingInteractions.stale > 0 ? "warn" : "ok"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Recoverable",
             value: payload.pendingInteractions.recoverable
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Sandbox",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Enabled",
             value: payload.sandbox.enabled ? "yes" : "no"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Mode",
             value: payload.sandbox.mode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Supported",
             value: payload.sandbox.supported ? "yes" : "no",
             tone: payload.sandbox.supported ? "ok" : "warn"
           }, undefined, false, undefined, this),
-          payload.sandbox.unsupportedReason ? /* @__PURE__ */ jsxDEV22("text", {
+          payload.sandbox.unsupportedReason ? /* @__PURE__ */ jsxDEV23("text", {
             fg: cliTheme.semantic.warning,
             children: payload.sandbox.unsupportedReason
           }, undefined, false, undefined, this) : null
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Notes",
-        children: payload.notes.map((note) => /* @__PURE__ */ jsxDEV22("text", {
+        children: payload.notes.map((note) => /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.text.muted,
           children: note
         }, note, false, undefined, this))
@@ -12607,62 +13154,62 @@ function renderPermissions(payload, routeState) {
   }, undefined, true, undefined, this);
 }
 function renderTools(payload) {
-  return /* @__PURE__ */ jsxDEV22(Fragment2, {
+  return /* @__PURE__ */ jsxDEV23(Fragment2, {
     children: [
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Summary",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Total",
             value: payload.summary.total
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Read-only",
             value: payload.summary.readOnly
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Workspace-write",
             value: payload.summary.workspaceWrite
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Danger-full-access",
             value: payload.summary.dangerFullAccess
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Schema status",
             value: payload.summary.providerSchemaStatus,
             tone: payload.summary.providerSchemaStatus
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Tool Catalog",
-        children: payload.tools.map((tool2) => /* @__PURE__ */ jsxDEV22("box", {
+        children: payload.tools.map((tool2) => /* @__PURE__ */ jsxDEV23("box", {
           flexDirection: "column",
           paddingY: 1,
           children: [
-            /* @__PURE__ */ jsxDEV22("box", {
+            /* @__PURE__ */ jsxDEV23("box", {
               flexDirection: "row",
               justifyContent: "space-between",
               children: [
-                /* @__PURE__ */ jsxDEV22("text", {
+                /* @__PURE__ */ jsxDEV23("text", {
                   fg: cliTheme.text.primary,
-                  attributes: TextAttributes16.BOLD,
+                  attributes: TextAttributes17.BOLD,
                   children: tool2.name
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV22("text", {
+                /* @__PURE__ */ jsxDEV23("text", {
                   fg: getStatusColor2(tool2.providerSchemaStatus),
                   children: tool2.permissionMode
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: cliTheme.text.secondary,
               children: tool2.description
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: cliTheme.text.muted,
-              attributes: TextAttributes16.DIM,
+              attributes: TextAttributes17.DIM,
               children: [
                 "Modes: ",
                 tool2.activeInModes.join(", ") || "none",
@@ -12677,51 +13224,51 @@ function renderTools(payload) {
   }, undefined, true, undefined, this);
 }
 function renderConfig(payload) {
-  return /* @__PURE__ */ jsxDEV22(Fragment2, {
+  return /* @__PURE__ */ jsxDEV23(Fragment2, {
     children: [
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Effective Config",
         children: [
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Provider",
             value: payload.selectedProvider
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Configured model",
             value: payload.configuredModel
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Selected model",
             value: payload.selectedModel
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Base URL",
             value: payload.baseUrl ? "configured" : "default"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Default mode",
             value: payload.defaultMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Permission mode",
             value: payload.permissionMode
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Max output tokens",
             value: payload.maxOutputTokens
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22(InfoRow, {
+          /* @__PURE__ */ jsxDEV23(InfoRow, {
             label: "Max steps",
             value: payload.maxSteps
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV22(Section, {
+      /* @__PURE__ */ jsxDEV23(Section, {
         title: "Loaded Files",
-        children: payload.loadedFiles.map((file) => /* @__PURE__ */ jsxDEV22("box", {
+        children: payload.loadedFiles.map((file) => /* @__PURE__ */ jsxDEV23("box", {
           flexDirection: "column",
           children: [
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: file.loaded ? cliTheme.semantic.success : cliTheme.text.muted,
               children: [
                 file.scope,
@@ -12729,17 +13276,17 @@ function renderConfig(payload) {
                 file.loaded ? "loaded" : file.exists ? "not loaded" : "missing"
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ jsxDEV22("text", {
+            /* @__PURE__ */ jsxDEV23("text", {
               fg: cliTheme.text.muted,
-              attributes: TextAttributes16.DIM,
+              attributes: TextAttributes17.DIM,
               children: file.path
             }, undefined, false, undefined, this)
           ]
         }, `${file.scope}:${file.path}`, true, undefined, this))
       }, undefined, false, undefined, this),
-      payload.missingCredentialHints.length > 0 ? /* @__PURE__ */ jsxDEV22(Section, {
+      payload.missingCredentialHints.length > 0 ? /* @__PURE__ */ jsxDEV23(Section, {
         title: "Credential Hints",
-        children: payload.missingCredentialHints.map((hint) => /* @__PURE__ */ jsxDEV22("text", {
+        children: payload.missingCredentialHints.map((hint) => /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.semantic.warning,
           children: hint
         }, hint, false, undefined, this))
@@ -12749,9 +13296,9 @@ function renderConfig(payload) {
 }
 function DiagnosticsScreen({ kind }) {
   const location = useLocation2();
-  const [payload, setPayload] = useState11(null);
-  const [isLoading, setIsLoading] = useState11(true);
-  const [errorMessage, setErrorMessage] = useState11(null);
+  const [payload, setPayload] = useState12(null);
+  const [isLoading, setIsLoading] = useState12(true);
+  const [errorMessage, setErrorMessage] = useState12(null);
   const title = pageTitles[kind];
   const loadDiagnostics = useCallback5(async () => {
     setIsLoading(true);
@@ -12784,7 +13331,7 @@ function DiagnosticsScreen({ kind }) {
       setIsLoading(false);
     }
   }, [kind, title]);
-  useEffect9(() => {
+  useEffect10(() => {
     loadDiagnostics();
   }, [loadDiagnostics]);
   useKeyboard5((keyEvent) => {
@@ -12813,36 +13360,36 @@ function DiagnosticsScreen({ kind }) {
     }
     return renderConfig(payload);
   }, [kind, location.state, payload]);
-  return /* @__PURE__ */ jsxDEV22("box", {
+  return /* @__PURE__ */ jsxDEV23("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV22("box", {
+      /* @__PURE__ */ jsxDEV23("box", {
         flexDirection: "row",
         justifyContent: "space-between",
         paddingX: 1,
         children: [
-          /* @__PURE__ */ jsxDEV22("text", {
+          /* @__PURE__ */ jsxDEV23("text", {
             fg: cliTheme.text.primary,
-            attributes: TextAttributes16.BOLD,
+            attributes: TextAttributes17.BOLD,
             children: title
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV22("text", {
+          /* @__PURE__ */ jsxDEV23("text", {
             fg: cliTheme.text.muted,
             children: isLoading ? "loading..." : "press r to refresh"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      errorMessage ? /* @__PURE__ */ jsxDEV22("box", {
+      errorMessage ? /* @__PURE__ */ jsxDEV23("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV22("text", {
+        children: /* @__PURE__ */ jsxDEV23("text", {
           fg: cliTheme.semantic.error,
           children: errorMessage
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV22("scrollbox", {
+      /* @__PURE__ */ jsxDEV23("scrollbox", {
         flexGrow: 1,
         flexDirection: "column",
         gap: 1,
@@ -12875,17 +13422,24 @@ var init_diagnostics_screen = __esm(() => {
 });
 
 // apps/cli/src/components/home-ascii-art.tsx
-import { jsxDEV as jsxDEV23 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV24 } from "@opentui/react/jsx-dev-runtime";
 function HomeAsciiArt() {
-  return /* @__PURE__ */ jsxDEV23("box", {
+  return /* @__PURE__ */ jsxDEV24("box", {
     flexDirection: "column",
     alignItems: "center",
-    children: /* @__PURE__ */ jsxDEV23("ascii-font", {
-      text: "lightcode",
-      font: "block",
-      color: logoColors
-    }, undefined, false, undefined, this)
-  }, undefined, false, undefined, this);
+    gap: space.xs,
+    children: [
+      /* @__PURE__ */ jsxDEV24("ascii-font", {
+        text: "lightcode",
+        font: "block",
+        color: logoColors
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV24("text", {
+        fg: cliTheme.text.secondary,
+        children: "Agentic coding in your terminal"
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
 }
 var logoColors;
 var init_home_ascii_art = __esm(() => {
@@ -12896,9 +13450,9 @@ var init_home_ascii_art = __esm(() => {
 
 // apps/cli/src/components/home-text-area.tsx
 import { useKeyboard as useKeyboard6 } from "@opentui/react";
-import { useState as useState12 } from "react";
+import { useState as useState13 } from "react";
 import { useNavigate as useNavigate2 } from "react-router";
-import { jsxDEV as jsxDEV24 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV25 } from "@opentui/react/jsx-dev-runtime";
 function HomeTextArea() {
   const navigate = useNavigate2();
   const {
@@ -12910,9 +13464,9 @@ function HomeTextArea() {
     openSlashMenu,
     closeSlashMenu
   } = useAppState();
-  const [sessionCreateError, setSessionCreateError] = useState12(null);
-  const [isCreatingSession, setIsCreatingSession] = useState12(false);
-  const [mode, setMode] = useState12(defaultCodingAgentMode);
+  const [sessionCreateError, setSessionCreateError] = useState13(null);
+  const [isCreatingSession, setIsCreatingSession] = useState13(false);
+  const [mode, setMode] = useState13(defaultCodingAgentMode);
   const slashRoutes = getSlashPageRoutes(slashMenuQuery);
   const selectedIndex = Math.min(slashMenuSelected, Math.max(slashRoutes.length - 1, 0));
   const modeDefinition = codingAgentModes[mode];
@@ -12976,24 +13530,23 @@ function HomeTextArea() {
       setIsCreatingSession(false);
     }
   }
-  return /* @__PURE__ */ jsxDEV24("box", {
+  return /* @__PURE__ */ jsxDEV25("box", {
     width: "66%",
     maxWidth: 104,
     minWidth: 64,
     flexDirection: "column",
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV24(ChatTextArea, {
+      /* @__PURE__ */ jsxDEV25(ChatTextArea, {
         containerHeight: 7,
         allowEmpty: true,
         trimOnSubmit: false,
         placeholder: 'Ask anything... "What is the tech stack of this project?"',
         focused: !isCreatingSession,
         disabled: isCreatingSession,
-        modeToggleHint: true,
         slashMenuOpen,
         onTextChange: syncSlashMenuFromInput,
-        beforeInput: slashMenuOpen ? /* @__PURE__ */ jsxDEV24(SlashPageMenu, {
+        beforeInput: slashMenuOpen ? /* @__PURE__ */ jsxDEV25(SlashPageMenu, {
           query: slashMenuQuery,
           selectedIndex,
           routes: slashRoutes
@@ -13001,21 +13554,21 @@ function HomeTextArea() {
         onSubmit: (text) => {
           createSessionAndNavigate(text);
         },
-        footer: /* @__PURE__ */ jsxDEV24("box", {
+        footer: /* @__PURE__ */ jsxDEV25("box", {
           flexDirection: "row",
           justifyContent: "space-between",
           children: [
-            /* @__PURE__ */ jsxDEV24("text", {
+            /* @__PURE__ */ jsxDEV25("text", {
               fg: cliTheme.text.muted,
               children: isCreatingSession ? "Creating session..." : "Tab/Ctrl+T switch mode | Ctrl+P commands"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV24("text", {
+            /* @__PURE__ */ jsxDEV25("text", {
               children: [
-                /* @__PURE__ */ jsxDEV24("span", {
+                /* @__PURE__ */ jsxDEV25("span", {
                   fg: cliTheme.accent.primary,
                   children: modeDefinition.label
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV24("span", {
+                /* @__PURE__ */ jsxDEV25("span", {
                   fg: cliTheme.text.muted,
                   children: " mode"
                 }, undefined, false, undefined, this)
@@ -13024,9 +13577,9 @@ function HomeTextArea() {
           ]
         }, undefined, true, undefined, this)
       }, undefined, false, undefined, this),
-      sessionCreateError ? /* @__PURE__ */ jsxDEV24("box", {
+      sessionCreateError ? /* @__PURE__ */ jsxDEV25("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV24("text", {
+        children: /* @__PURE__ */ jsxDEV25("text", {
           fg: cliTheme.semantic.error,
           children: sessionCreateError
         }, undefined, false, undefined, this)
@@ -13046,11 +13599,11 @@ var init_home_text_area = __esm(() => {
 });
 
 // apps/cli/src/components/server-status.tsx
-import { useEffect as useEffect10, useState as useState13 } from "react";
-import { jsxDEV as jsxDEV25 } from "@opentui/react/jsx-dev-runtime";
+import { useEffect as useEffect11, useState as useState14 } from "react";
+import { jsxDEV as jsxDEV26 } from "@opentui/react/jsx-dev-runtime";
 function ServerStatus() {
-  const [status, setStatus] = useState13("checking");
-  useEffect10(() => {
+  const [status, setStatus] = useState14("checking");
+  useEffect11(() => {
     let cancelled = false;
     async function checkServer2() {
       try {
@@ -13069,7 +13622,7 @@ function ServerStatus() {
       cancelled = true;
     };
   }, []);
-  return /* @__PURE__ */ jsxDEV25("text", {
+  return /* @__PURE__ */ jsxDEV26("text", {
     fg: serverStatusColors[status],
     children: [
       "Server: ",
@@ -13083,9 +13636,9 @@ var init_server_status = __esm(() => {
 });
 
 // apps/cli/src/screens/home-screen.tsx
-import { jsxDEV as jsxDEV26 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV27 } from "@opentui/react/jsx-dev-runtime";
 function HomeScreen() {
-  return /* @__PURE__ */ jsxDEV26("box", {
+  return /* @__PURE__ */ jsxDEV27("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
@@ -13096,9 +13649,9 @@ function HomeScreen() {
     paddingY: 1,
     backgroundColor: cliTheme.surfaces.base,
     children: [
-      /* @__PURE__ */ jsxDEV26(HomeAsciiArt, {}, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV26(ServerStatus, {}, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV26(HomeTextArea, {}, undefined, false, undefined, this)
+      /* @__PURE__ */ jsxDEV27(HomeAsciiArt, {}, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV27(ServerStatus, {}, undefined, false, undefined, this),
+      /* @__PURE__ */ jsxDEV27(HomeTextArea, {}, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
@@ -13110,14 +13663,14 @@ var init_home_screen = __esm(() => {
 });
 
 // apps/cli/src/screens/model-screen.tsx
-import { TextAttributes as TextAttributes17 } from "@opentui/core";
+import { TextAttributes as TextAttributes18 } from "@opentui/core";
 import { useKeyboard as useKeyboard7 } from "@opentui/react";
-import { useCallback as useCallback6, useEffect as useEffect11, useState as useState14 } from "react";
-import { jsxDEV as jsxDEV27 } from "@opentui/react/jsx-dev-runtime";
+import { useCallback as useCallback6, useEffect as useEffect12, useState as useState15 } from "react";
+import { jsxDEV as jsxDEV28 } from "@opentui/react/jsx-dev-runtime";
 function ModelScreen() {
-  const [isLoading, setIsLoading] = useState14(true);
-  const [payload, setPayload] = useState14(null);
-  const [errorMessage, setErrorMessage] = useState14(null);
+  const [isLoading, setIsLoading] = useState15(true);
+  const [payload, setPayload] = useState15(null);
+  const [errorMessage, setErrorMessage] = useState15(null);
   const loadModelConfig = useCallback6(async () => {
     setIsLoading(true);
     try {
@@ -13134,7 +13687,7 @@ function ModelScreen() {
       setIsLoading(false);
     }
   }, []);
-  useEffect11(() => {
+  useEffect12(() => {
     loadModelConfig();
   }, [loadModelConfig]);
   useKeyboard7((keyEvent) => {
@@ -13145,42 +13698,42 @@ function ModelScreen() {
     keyEvent.stopPropagation();
     loadModelConfig();
   });
-  return /* @__PURE__ */ jsxDEV27("box", {
+  return /* @__PURE__ */ jsxDEV28("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
     gap: 1,
     paddingX: 1,
     children: [
-      /* @__PURE__ */ jsxDEV27("box", {
+      /* @__PURE__ */ jsxDEV28("box", {
         flexDirection: "row",
         justifyContent: "space-between",
         children: [
-          /* @__PURE__ */ jsxDEV27("text", {
+          /* @__PURE__ */ jsxDEV28("text", {
             fg: cliTheme.text.primary,
-            attributes: TextAttributes17.BOLD,
+            attributes: TextAttributes18.BOLD,
             children: "Model"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV27("text", {
+          /* @__PURE__ */ jsxDEV28("text", {
             fg: cliTheme.text.muted,
             children: isLoading ? "loading..." : "press r to refresh"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      errorMessage ? /* @__PURE__ */ jsxDEV27("box", {
-        children: /* @__PURE__ */ jsxDEV27("text", {
+      errorMessage ? /* @__PURE__ */ jsxDEV28("box", {
+        children: /* @__PURE__ */ jsxDEV28("text", {
           fg: cliTheme.semantic.error,
           children: errorMessage
         }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : payload ? /* @__PURE__ */ jsxDEV27("scrollbox", {
+      }, undefined, false, undefined, this) : payload ? /* @__PURE__ */ jsxDEV28("scrollbox", {
         flexGrow: 1,
         flexDirection: "column",
         gap: 1,
         children: [
-          /* @__PURE__ */ jsxDEV27(ModelInfo, {
+          /* @__PURE__ */ jsxDEV28(ModelInfo, {
             payload
           }, undefined, false, undefined, this),
-          payload.missingCredentialHints.length > 0 ? /* @__PURE__ */ jsxDEV27(CredentialHints, {
+          payload.missingCredentialHints.length > 0 ? /* @__PURE__ */ jsxDEV28(CredentialHints, {
             hints: payload.missingCredentialHints
           }, undefined, false, undefined, this) : null
         ]
@@ -13190,7 +13743,7 @@ function ModelScreen() {
 }
 function ModelInfo({ payload }) {
   const baseUrlStatus = payload.baseUrl ? "configured" : "default";
-  return /* @__PURE__ */ jsxDEV27("box", {
+  return /* @__PURE__ */ jsxDEV28("box", {
     flexDirection: "column",
     gap: 2,
     paddingY: 1,
@@ -13198,19 +13751,19 @@ function ModelInfo({ payload }) {
     borderColor: cliTheme.borders.subtle,
     backgroundColor: cliTheme.surfaces.panel,
     children: [
-      /* @__PURE__ */ jsxDEV27(InfoRow2, {
+      /* @__PURE__ */ jsxDEV28(InfoRow2, {
         label: "Provider",
         value: payload.selectedProvider ?? "not set"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV27(InfoRow2, {
+      /* @__PURE__ */ jsxDEV28(InfoRow2, {
         label: "Model",
         value: payload.selectedModel ?? "not set"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV27(InfoRow2, {
+      /* @__PURE__ */ jsxDEV28(InfoRow2, {
         label: "Base URL",
         value: `${baseUrlStatus}${payload.baseUrl ? ` (${payload.baseUrl})` : ""}`
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV27(InfoRow2, {
+      /* @__PURE__ */ jsxDEV28(InfoRow2, {
         label: "Configured model",
         value: payload.configuredModel ?? "not set"
       }, undefined, false, undefined, this)
@@ -13218,16 +13771,16 @@ function ModelInfo({ payload }) {
   }, undefined, true, undefined, this);
 }
 function InfoRow2({ label, value }) {
-  return /* @__PURE__ */ jsxDEV27("box", {
+  return /* @__PURE__ */ jsxDEV28("box", {
     flexDirection: "row",
     gap: 2,
     children: [
-      /* @__PURE__ */ jsxDEV27("text", {
+      /* @__PURE__ */ jsxDEV28("text", {
         fg: cliTheme.text.muted,
         width: 18,
         children: label
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV27("text", {
+      /* @__PURE__ */ jsxDEV28("text", {
         fg: cliTheme.text.primary,
         children: value
       }, undefined, false, undefined, this)
@@ -13235,7 +13788,7 @@ function InfoRow2({ label, value }) {
   }, undefined, true, undefined, this);
 }
 function CredentialHints({ hints }) {
-  return /* @__PURE__ */ jsxDEV27("box", {
+  return /* @__PURE__ */ jsxDEV28("box", {
     flexDirection: "column",
     gap: 1,
     paddingY: 1,
@@ -13243,12 +13796,12 @@ function CredentialHints({ hints }) {
     borderColor: cliTheme.borders.subtle,
     backgroundColor: cliTheme.surfaces.panel,
     children: [
-      /* @__PURE__ */ jsxDEV27("text", {
+      /* @__PURE__ */ jsxDEV28("text", {
         fg: cliTheme.semantic.warning,
-        attributes: TextAttributes17.BOLD,
+        attributes: TextAttributes18.BOLD,
         children: "Missing Credentials"
       }, undefined, false, undefined, this),
-      hints.map((hint, index) => /* @__PURE__ */ jsxDEV27("text", {
+      hints.map((hint, index) => /* @__PURE__ */ jsxDEV28("text", {
         fg: cliTheme.text.secondary,
         children: [
           "- ",
@@ -13266,10 +13819,10 @@ var init_model_screen = __esm(() => {
 });
 
 // apps/cli/src/components/chat/model-selector.tsx
-import { TextAttributes as TextAttributes18 } from "@opentui/core";
+import { TextAttributes as TextAttributes19 } from "@opentui/core";
 import { useKeyboard as useKeyboard8 } from "@opentui/react";
-import { useEffect as useEffect12, useMemo as useMemo6, useState as useState15 } from "react";
-import { jsxDEV as jsxDEV28 } from "@opentui/react/jsx-dev-runtime";
+import { useEffect as useEffect13, useMemo as useMemo6, useState as useState16 } from "react";
+import { jsxDEV as jsxDEV29 } from "@opentui/react/jsx-dev-runtime";
 function formatContextLength(contextLength) {
   if (!contextLength) {
     return "ctx ?";
@@ -13277,14 +13830,14 @@ function formatContextLength(contextLength) {
   return `ctx ${Math.round(contextLength / 1000)}k`;
 }
 function ModelSelector({ onClose, notify }) {
-  const [models, setModels] = useState15([]);
-  const [currentModel, setCurrentModel] = useState15(null);
-  const [loadError, setLoadError] = useState15(null);
-  const [isLoading, setIsLoading] = useState15(true);
-  const [isApplying, setIsApplying] = useState15(false);
-  const [filter, setFilter] = useState15("");
-  const [selectedIndex, setSelectedIndex] = useState15(0);
-  useEffect12(() => {
+  const [models, setModels] = useState16([]);
+  const [currentModel, setCurrentModel] = useState16(null);
+  const [loadError, setLoadError] = useState16(null);
+  const [isLoading, setIsLoading] = useState16(true);
+  const [isApplying, setIsApplying] = useState16(false);
+  const [filter, setFilter] = useState16("");
+  const [selectedIndex, setSelectedIndex] = useState16(0);
+  useEffect13(() => {
     let cancelled = false;
     async function loadModels() {
       try {
@@ -13326,7 +13879,7 @@ function ModelSelector({ onClose, notify }) {
     }
     return models.filter((model) => model.id.toLowerCase().includes(normalized) || model.name.toLowerCase().includes(normalized));
   }, [filter, models]);
-  useEffect12(() => {
+  useEffect13(() => {
     setSelectedIndex((current) => Math.min(current, Math.max(filteredModels.length - 1, 0)));
   }, [filteredModels.length]);
   const applyModel = async (model) => {
@@ -13393,14 +13946,14 @@ function ModelSelector({ onClose, notify }) {
   });
   const windowStart = Math.max(0, Math.min(selectedIndex - Math.floor(maxVisibleRows / 2), filteredModels.length - maxVisibleRows));
   const visibleModels = filteredModels.slice(windowStart, windowStart + maxVisibleRows);
-  return /* @__PURE__ */ jsxDEV28("box", {
+  return /* @__PURE__ */ jsxDEV29("box", {
     width: "100%",
     flexDirection: "column",
-    borderStyle: "single",
+    borderStyle: borderStyleFor.modal,
     borderColor: cliTheme.overlay.border,
     backgroundColor: cliTheme.overlay.surface,
     children: [
-      /* @__PURE__ */ jsxDEV28("box", {
+      /* @__PURE__ */ jsxDEV29("box", {
         width: "100%",
         flexDirection: "row",
         justifyContent: "space-between",
@@ -13410,48 +13963,48 @@ function ModelSelector({ onClose, notify }) {
         border: ["bottom"],
         borderColor: cliTheme.overlay.border,
         children: [
-          /* @__PURE__ */ jsxDEV28("text", {
+          /* @__PURE__ */ jsxDEV29("text", {
             fg: cliTheme.accent.primary,
-            attributes: TextAttributes18.BOLD,
+            attributes: TextAttributes19.BOLD,
             children: "Switch Model (OpenRouter)"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV28("text", {
+          /* @__PURE__ */ jsxDEV29("text", {
             fg: cliTheme.overlay.footerText,
             children: "type to filter | \u2191/\u2193 select | Enter confirm | Esc cancel"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV28("box", {
+      /* @__PURE__ */ jsxDEV29("box", {
         width: "100%",
         paddingX: 2,
         paddingY: 1,
-        children: /* @__PURE__ */ jsxDEV28("text", {
+        children: /* @__PURE__ */ jsxDEV29("text", {
           fg: cliTheme.text.primary,
           children: `Filter: ${filter}\u2588`
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      isLoading ? /* @__PURE__ */ jsxDEV28("box", {
+      isLoading ? /* @__PURE__ */ jsxDEV29("box", {
         paddingX: 2,
         paddingY: 1,
-        children: /* @__PURE__ */ jsxDEV28("text", {
+        children: /* @__PURE__ */ jsxDEV29("text", {
           fg: cliTheme.text.muted,
           children: "Loading models..."
         }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : loadError ? /* @__PURE__ */ jsxDEV28("box", {
+      }, undefined, false, undefined, this) : loadError ? /* @__PURE__ */ jsxDEV29("box", {
         paddingX: 2,
         paddingY: 1,
-        children: /* @__PURE__ */ jsxDEV28("text", {
+        children: /* @__PURE__ */ jsxDEV29("text", {
           fg: cliTheme.semantic.error,
           children: loadError
         }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : filteredModels.length === 0 ? /* @__PURE__ */ jsxDEV28("box", {
+      }, undefined, false, undefined, this) : filteredModels.length === 0 ? /* @__PURE__ */ jsxDEV29("box", {
         paddingX: 2,
         paddingY: 1,
-        children: /* @__PURE__ */ jsxDEV28("text", {
+        children: /* @__PURE__ */ jsxDEV29("text", {
           fg: cliTheme.text.muted,
           children: `No models match "${filter}".`
         }, undefined, false, undefined, this)
-      }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV28("box", {
+      }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV29("box", {
         flexDirection: "column",
         paddingY: 1,
         children: [
@@ -13459,29 +14012,29 @@ function ModelSelector({ onClose, notify }) {
             const index = windowStart + visibleIndex;
             const isSelected = index === selectedIndex;
             const rowColors = getOverlayRowColors(isSelected);
-            return /* @__PURE__ */ jsxDEV28("box", {
+            return /* @__PURE__ */ jsxDEV29("box", {
               width: "100%",
               flexDirection: "row",
               paddingX: 2,
               backgroundColor: rowColors.backgroundColor,
               children: [
-                /* @__PURE__ */ jsxDEV28("text", {
+                /* @__PURE__ */ jsxDEV29("text", {
                   width: 2,
                   fg: isSelected ? cliTheme.accent.primary : cliTheme.text.muted,
-                  attributes: TextAttributes18.BOLD,
+                  attributes: TextAttributes19.BOLD,
                   children: isSelected ? ">" : " "
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV28("text", {
+                /* @__PURE__ */ jsxDEV29("text", {
                   fg: isSelected ? cliTheme.overlay.selectedRowText : cliTheme.text.primary,
-                  attributes: isSelected ? TextAttributes18.BOLD : TextAttributes18.NONE,
+                  attributes: isSelected ? TextAttributes19.BOLD : TextAttributes19.NONE,
                   children: model.id
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV28("text", {
+                /* @__PURE__ */ jsxDEV29("text", {
                   fg: cliTheme.text.muted,
                   marginLeft: 2,
                   children: `${formatContextLength(model.contextLength)}${model.supportsTools ? " | tools" : ""}${model.supportsReasoning ? " | reasoning" : ""}`
                 }, undefined, false, undefined, this),
-                model.id === currentModel && /* @__PURE__ */ jsxDEV28("text", {
+                model.id === currentModel && /* @__PURE__ */ jsxDEV29("text", {
                   fg: cliTheme.accent.primary,
                   marginLeft: 2,
                   children: "(current)"
@@ -13489,10 +14042,10 @@ function ModelSelector({ onClose, notify }) {
               ]
             }, model.id, true, undefined, this);
           }),
-          /* @__PURE__ */ jsxDEV28("box", {
+          /* @__PURE__ */ jsxDEV29("box", {
             paddingX: 2,
             marginTop: 1,
-            children: /* @__PURE__ */ jsxDEV28("text", {
+            children: /* @__PURE__ */ jsxDEV29("text", {
               fg: cliTheme.overlay.footerText,
               children: `${filteredModels.length} model${filteredModels.length === 1 ? "" : "s"}${isApplying ? " | switching..." : ""}`
             }, undefined, false, undefined, this)
@@ -13509,30 +14062,30 @@ var init_model_selector = __esm(() => {
 });
 
 // apps/cli/src/screens/model-select-screen.tsx
-import { TextAttributes as TextAttributes19 } from "@opentui/core";
-import { useState as useState16 } from "react";
+import { TextAttributes as TextAttributes20 } from "@opentui/core";
+import { useState as useState17 } from "react";
 import { useNavigate as useNavigate3 } from "react-router";
-import { jsxDEV as jsxDEV29 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV30 } from "@opentui/react/jsx-dev-runtime";
 function ModelSelectScreen() {
   const navigate = useNavigate3();
-  const [notice, setNotice] = useState16(null);
-  return /* @__PURE__ */ jsxDEV29("box", {
+  const [notice, setNotice] = useState17(null);
+  return /* @__PURE__ */ jsxDEV30("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
     gap: 1,
     paddingX: 1,
     children: [
-      /* @__PURE__ */ jsxDEV29("text", {
+      /* @__PURE__ */ jsxDEV30("text", {
         fg: cliTheme.text.primary,
-        attributes: TextAttributes19.BOLD,
+        attributes: TextAttributes20.BOLD,
         children: "Switch Model"
       }, undefined, false, undefined, this),
-      notice ? /* @__PURE__ */ jsxDEV29("text", {
+      notice ? /* @__PURE__ */ jsxDEV30("text", {
         fg: notice.tone === "error" ? cliTheme.semantic.error : cliTheme.accent.primary,
         children: notice.text
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV29(ModelSelector, {
+      /* @__PURE__ */ jsxDEV30(ModelSelector, {
         notify: (text, tone = "info") => setNotice({ text, tone }),
         onClose: () => navigate(-1)
       }, undefined, false, undefined, this)
@@ -13545,14 +14098,14 @@ var init_model_select_screen = __esm(() => {
 });
 
 // apps/cli/src/screens/onboarding-screen.tsx
-import { TextAttributes as TextAttributes20 } from "@opentui/core";
+import { TextAttributes as TextAttributes21 } from "@opentui/core";
 import { useKeyboard as useKeyboard9 } from "@opentui/react";
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
 import os5 from "os";
 import path17 from "path";
-import { useCallback as useCallback7, useState as useState17 } from "react";
+import { useCallback as useCallback7, useState as useState18 } from "react";
 import { useNavigate as useNavigate4 } from "react-router";
-import { jsxDEV as jsxDEV30 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV31 } from "@opentui/react/jsx-dev-runtime";
 function getUserSettingsPath() {
   const configured = process.env.LIGHTCODE_USER_CONFIG?.trim();
   return configured ?? path17.join(os5.homedir(), ".lightcode", "settings.json");
@@ -13576,12 +14129,12 @@ function mergeUserSettings(update) {
 function OnboardingScreen() {
   const navigate = useNavigate4();
   const { bumpConfigRefresh } = useAppState();
-  const [step, setStep] = useState17("provider");
-  const [selectedIndex, setSelectedIndex] = useState17(0);
-  const [apiKey, setApiKey] = useState17("");
-  const [model, setModel] = useState17("");
-  const [errorText, setErrorText] = useState17(null);
-  const [serverRestarted, setServerRestarted] = useState17(false);
+  const [step, setStep] = useState18("provider");
+  const [selectedIndex, setSelectedIndex] = useState18(0);
+  const [apiKey, setApiKey] = useState18("");
+  const [model, setModel] = useState18("");
+  const [errorText, setErrorText] = useState18(null);
+  const [serverRestarted, setServerRestarted] = useState18(false);
   const provider = providerChoices[selectedIndex];
   const completeSetup = useCallback7(async ({
     finalModel,
@@ -13598,7 +14151,12 @@ function OnboardingScreen() {
         ...finalBaseUrl ? { baseUrl: finalBaseUrl } : {}
       });
       const restarted = await restartOwnedServer();
-      setServerRestarted(restarted);
+      let reloaded = false;
+      try {
+        const response = await client.config.reload.$post();
+        reloaded = response.ok;
+      } catch {}
+      setServerRestarted(restarted || reloaded);
       bumpConfigRefresh();
       setStep("done");
     } catch (error) {
@@ -13625,36 +14183,66 @@ function OnboardingScreen() {
       navigate("/");
     }
   });
-  return /* @__PURE__ */ jsxDEV30("box", {
+  const totalSteps = ONBOARDING_STEP_SEQUENCE.length;
+  const currentStepNumber = step === "baseUrl" || step === "saving" ? ONBOARDING_STEP_SEQUENCE.indexOf("model") + 1 : Math.max(1, ONBOARDING_STEP_SEQUENCE.indexOf(step) + 1);
+  return /* @__PURE__ */ jsxDEV31("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
     alignItems: "center",
     paddingTop: 2,
-    children: /* @__PURE__ */ jsxDEV30("box", {
+    children: /* @__PURE__ */ jsxDEV31("box", {
       width: 72,
       flexDirection: "column",
       gap: 1,
       children: [
-        /* @__PURE__ */ jsxDEV30("text", {
+        /* @__PURE__ */ jsxDEV31("text", {
           fg: cliTheme.accent.primary,
-          attributes: TextAttributes20.BOLD,
+          attributes: TextAttributes21.BOLD,
           children: "Welcome to Lightcode"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV30("text", {
+        /* @__PURE__ */ jsxDEV31("text", {
           fg: cliTheme.text.secondary,
           children: "One-time setup: pick a model provider and store an API key."
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV30("text", {
+        /* @__PURE__ */ jsxDEV31("box", {
+          flexDirection: "row",
+          gap: 1,
+          alignItems: "center",
+          children: [
+            /* @__PURE__ */ jsxDEV31("text", {
+              fg: cliTheme.text.muted,
+              children: [
+                "Step ",
+                currentStepNumber,
+                " of ",
+                totalSteps
+              ]
+            }, undefined, true, undefined, this),
+            /* @__PURE__ */ jsxDEV31("text", {
+              children: [
+                /* @__PURE__ */ jsxDEV31("span", {
+                  fg: cliTheme.accent.primary,
+                  children: Array.from({ length: currentStepNumber }, () => activeGlyphs.statusDot).join(" ")
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ jsxDEV31("span", {
+                  fg: cliTheme.text.muted,
+                  children: Array.from({ length: Math.max(0, totalSteps - currentStepNumber) }, () => ` ${activeGlyphs.bullet}`).join("")
+                }, undefined, false, undefined, this)
+              ]
+            }, undefined, true, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ jsxDEV31("text", {
           fg: cliTheme.text.muted,
-          attributes: TextAttributes20.DIM,
+          attributes: TextAttributes21.DIM,
           children: "Keys are stored in ~/.lightcode/credentials.json (environment variables always take precedence)."
         }, undefined, false, undefined, this),
-        errorText ? /* @__PURE__ */ jsxDEV30("text", {
+        errorText ? /* @__PURE__ */ jsxDEV31("text", {
           fg: cliTheme.semantic.error,
           children: errorText
         }, undefined, false, undefined, this) : null,
-        step === "provider" ? /* @__PURE__ */ jsxDEV30("box", {
+        step === "provider" ? /* @__PURE__ */ jsxDEV31("box", {
           flexDirection: "column",
           borderStyle: "single",
           borderColor: cliTheme.borders.default,
@@ -13662,53 +14250,53 @@ function OnboardingScreen() {
           paddingX: 1,
           paddingY: 1,
           children: [
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.primary,
-              attributes: TextAttributes20.BOLD,
+              attributes: TextAttributes21.BOLD,
               children: "Choose a provider"
             }, undefined, false, undefined, this),
-            providerChoices.map((choice, index) => /* @__PURE__ */ jsxDEV30("box", {
+            providerChoices.map((choice, index) => /* @__PURE__ */ jsxDEV31("box", {
               flexDirection: "row",
               gap: 1,
               backgroundColor: index === selectedIndex ? cliTheme.overlay.selectedRowBackground : undefined,
               paddingX: 1,
               children: [
-                /* @__PURE__ */ jsxDEV30("text", {
+                /* @__PURE__ */ jsxDEV31("text", {
                   fg: index === selectedIndex ? cliTheme.accent.primary : cliTheme.text.muted,
                   children: index === selectedIndex ? ">" : " "
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV30("text", {
+                /* @__PURE__ */ jsxDEV31("text", {
                   fg: index === selectedIndex ? cliTheme.overlay.selectedRowText : cliTheme.text.primary,
-                  attributes: index === selectedIndex ? TextAttributes20.BOLD : TextAttributes20.NONE,
+                  attributes: index === selectedIndex ? TextAttributes21.BOLD : TextAttributes21.NONE,
                   children: choice.label
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsxDEV30("text", {
+                /* @__PURE__ */ jsxDEV31("text", {
                   fg: cliTheme.overlay.description,
                   children: choice.description
                 }, undefined, false, undefined, this)
               ]
             }, choice.id, true, undefined, this)),
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.muted,
-              attributes: TextAttributes20.DIM,
+              attributes: TextAttributes21.DIM,
               children: "Up/Down select - Enter continue"
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this) : null,
-        step === "apiKey" ? /* @__PURE__ */ jsxDEV30("box", {
+        step === "apiKey" ? /* @__PURE__ */ jsxDEV31("box", {
           flexDirection: "column",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.primary,
               children: `Paste your ${provider.label} API key and press Enter`
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.muted,
-              attributes: TextAttributes20.DIM,
+              attributes: TextAttributes21.DIM,
               children: provider.keyHint
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30(ChatTextArea, {
+            /* @__PURE__ */ jsxDEV31(ChatTextArea, {
               placeholder: "API key...",
               onSubmit: (text) => {
                 const trimmedKey = text.trim();
@@ -13725,15 +14313,15 @@ function OnboardingScreen() {
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this) : null,
-        step === "model" ? /* @__PURE__ */ jsxDEV30("box", {
+        step === "model" ? /* @__PURE__ */ jsxDEV31("box", {
           flexDirection: "column",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.primary,
               children: `Model id for ${provider.label} (e.g. ${provider.id === "openrouter" ? "anthropic/claude-sonnet-4-6" : "your model id"})`
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30(ChatTextArea, {
+            /* @__PURE__ */ jsxDEV31(ChatTextArea, {
               placeholder: "Model id...",
               onSubmit: (text) => {
                 const trimmedModel = text.trim();
@@ -13754,15 +14342,15 @@ function OnboardingScreen() {
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this) : null,
-        step === "baseUrl" ? /* @__PURE__ */ jsxDEV30("box", {
+        step === "baseUrl" ? /* @__PURE__ */ jsxDEV31("box", {
           flexDirection: "column",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.primary,
               children: "Base URL of the OpenAI-compatible endpoint"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30(ChatTextArea, {
+            /* @__PURE__ */ jsxDEV31(ChatTextArea, {
               placeholder: "https://...",
               onSubmit: (text) => {
                 const trimmedBaseUrl = text.trim();
@@ -13778,24 +14366,24 @@ function OnboardingScreen() {
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this) : null,
-        step === "saving" ? /* @__PURE__ */ jsxDEV30("text", {
+        step === "saving" ? /* @__PURE__ */ jsxDEV31("text", {
           fg: cliTheme.semantic.info,
           children: "Saving configuration and restarting the server..."
         }, undefined, false, undefined, this) : null,
-        step === "done" ? /* @__PURE__ */ jsxDEV30("box", {
+        step === "done" ? /* @__PURE__ */ jsxDEV31("box", {
           flexDirection: "column",
           gap: 1,
           children: [
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.semantic.success,
-              attributes: TextAttributes20.BOLD,
+              attributes: TextAttributes21.BOLD,
               children: "Setup complete"
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.secondary,
               children: serverRestarted ? "The local server was restarted with your new configuration." : "Restart the Lightcode server to pick up the new configuration."
             }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV30("text", {
+            /* @__PURE__ */ jsxDEV31("text", {
               fg: cliTheme.text.muted,
               children: "Press Enter to start coding."
             }, undefined, false, undefined, this)
@@ -13805,14 +14393,17 @@ function OnboardingScreen() {
     }, undefined, true, undefined, this)
   }, undefined, false, undefined, this);
 }
-var providerChoices;
+var ONBOARDING_STEP_SEQUENCE, providerChoices;
 var init_onboarding_screen = __esm(() => {
   init_src2();
   init_chat_text_area();
+  init_client();
   init_server_launcher();
   init_app_state();
   init_cli_theme();
+  init_cli_theme_capabilities();
   init_text_utils();
+  ONBOARDING_STEP_SEQUENCE = ["provider", "apiKey", "model", "done"];
   providerChoices = [
     {
       id: "anthropic",
@@ -13854,11 +14445,11 @@ var init_onboarding_screen = __esm(() => {
 });
 
 // apps/cli/src/screens/session-list-screen.tsx
-import { TextAttributes as TextAttributes21 } from "@opentui/core";
+import { TextAttributes as TextAttributes22 } from "@opentui/core";
 import { useKeyboard as useKeyboard10 } from "@opentui/react";
-import { useCallback as useCallback8, useEffect as useEffect13, useMemo as useMemo7, useState as useState18 } from "react";
+import { useCallback as useCallback8, useEffect as useEffect14, useMemo as useMemo7, useState as useState19 } from "react";
 import { useNavigate as useNavigate5 } from "react-router";
-import { jsxDEV as jsxDEV31 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV32 } from "@opentui/react/jsx-dev-runtime";
 function getSessionLabel(session) {
   return session.title ?? session.latestUserPromptPreview ?? session.id;
 }
@@ -13871,15 +14462,15 @@ function sessionMatchesFilter(session, query) {
 }
 function SessionListScreen() {
   const navigate = useNavigate5();
-  const [sessions, setSessions] = useState18([]);
-  const [selectedIndex, setSelectedIndex] = useState18(0);
-  const [isLoading, setIsLoading] = useState18(true);
-  const [errorMessage, setErrorMessage] = useState18(null);
-  const [actionMessage, setActionMessage] = useState18(null);
-  const [pendingDeleteId, setPendingDeleteId] = useState18(null);
-  const [filterQuery, setFilterQuery] = useState18("");
-  const [filterOpen, setFilterOpen] = useState18(false);
-  const [renamingSessionId, setRenamingSessionId] = useState18(null);
+  const [sessions, setSessions] = useState19([]);
+  const [selectedIndex, setSelectedIndex] = useState19(0);
+  const [isLoading, setIsLoading] = useState19(true);
+  const [errorMessage, setErrorMessage] = useState19(null);
+  const [actionMessage, setActionMessage] = useState19(null);
+  const [pendingDeleteId, setPendingDeleteId] = useState19(null);
+  const [filterQuery, setFilterQuery] = useState19("");
+  const [filterOpen, setFilterOpen] = useState19(false);
+  const [renamingSessionId, setRenamingSessionId] = useState19(null);
   const visibleSessions = useMemo7(() => sessions.filter((session) => sessionMatchesFilter(session, filterQuery)), [filterQuery, sessions]);
   const safeSelectedIndex = Math.min(selectedIndex, Math.max(visibleSessions.length - 1, 0));
   const selectedSession = visibleSessions[safeSelectedIndex] ?? null;
@@ -14036,7 +14627,7 @@ function SessionListScreen() {
       setActionMessage(getErrorMessage(error, "Unable to rename session."));
     }
   }, [loadSessions]);
-  useEffect13(() => {
+  useEffect14(() => {
     loadSessions();
   }, [loadSessions]);
   useKeyboard10((keyEvent) => {
@@ -14127,85 +14718,96 @@ function SessionListScreen() {
     }
     return "Enter resume | r rename | f fork | / filter | e export | d delete | u refresh";
   }, [sessions.length]);
-  return /* @__PURE__ */ jsxDEV31("box", {
+  return /* @__PURE__ */ jsxDEV32("box", {
     width: "100%",
     height: "100%",
     flexDirection: "column",
     gap: 1,
     children: [
-      /* @__PURE__ */ jsxDEV31("box", {
+      /* @__PURE__ */ jsxDEV32("box", {
         flexDirection: "row",
         justifyContent: "space-between",
         paddingX: 1,
         children: [
-          /* @__PURE__ */ jsxDEV31("text", {
+          /* @__PURE__ */ jsxDEV32("text", {
             fg: cliTheme.text.primary,
-            attributes: TextAttributes21.BOLD,
+            attributes: TextAttributes22.BOLD,
             children: "Sessions"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV31("text", {
+          /* @__PURE__ */ jsxDEV32("text", {
             fg: cliTheme.text.muted,
             children: isLoading ? "loading..." : `${sessions.length} saved`
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      errorMessage ? /* @__PURE__ */ jsxDEV31("box", {
+      errorMessage ? /* @__PURE__ */ jsxDEV32("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV31("text", {
+        children: /* @__PURE__ */ jsxDEV32("text", {
           fg: cliTheme.semantic.error,
           children: errorMessage
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      filterQuery && !filterOpen ? /* @__PURE__ */ jsxDEV31("box", {
+      filterQuery && !filterOpen ? /* @__PURE__ */ jsxDEV32("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV31("text", {
+        children: /* @__PURE__ */ jsxDEV32("text", {
           fg: cliTheme.accent.primary,
           children: `Filter: "${filterQuery}" (${visibleSessions.length} match${visibleSessions.length === 1 ? "" : "es"}) - Esc clears`
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV31("box", {
+      /* @__PURE__ */ jsxDEV32("box", {
         flexDirection: "column",
         flexGrow: 1,
         children: [
-          visibleSessions.length === 0 && !isLoading ? /* @__PURE__ */ jsxDEV31("box", {
-            paddingX: 1,
-            children: /* @__PURE__ */ jsxDEV31("text", {
-              fg: cliTheme.text.muted,
-              children: sessions.length === 0 ? "No saved sessions yet." : "No sessions match the filter."
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this) : null,
+          visibleSessions.length === 0 && !isLoading ? /* @__PURE__ */ jsxDEV32("box", {
+            flexGrow: 1,
+            flexDirection: "column",
+            alignItems: "center",
+            justifyContent: "center",
+            gap: 1,
+            children: [
+              /* @__PURE__ */ jsxDEV32("text", {
+                fg: cliTheme.accent.primary,
+                attributes: TextAttributes22.BOLD,
+                children: sessions.length === 0 ? "\u25C6 No sessions yet" : "No matches"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV32("text", {
+                fg: cliTheme.text.muted,
+                children: sessions.length === 0 ? "Go Home and send a message to start your first session." : "No sessions match the filter \u2014 clear it to see all."
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this) : null,
           visibleSessions.map((session, index) => {
             const isSelected = index === safeSelectedIndex;
             const rowColors = getOverlayRowColors(isSelected);
             const selectedForDelete = pendingDeleteId === session.id;
-            return /* @__PURE__ */ jsxDEV31("box", {
+            return /* @__PURE__ */ jsxDEV32("box", {
               flexDirection: "column",
               paddingX: 1,
               backgroundColor: rowColors.backgroundColor,
               children: [
-                /* @__PURE__ */ jsxDEV31("box", {
+                /* @__PURE__ */ jsxDEV32("box", {
                   flexDirection: "row",
                   justifyContent: "space-between",
                   children: [
-                    /* @__PURE__ */ jsxDEV31("text", {
+                    /* @__PURE__ */ jsxDEV32("text", {
                       fg: selectedForDelete ? cliTheme.semantic.error : rowColors.primaryTextColor,
-                      attributes: TextAttributes21.BOLD,
+                      attributes: TextAttributes22.BOLD,
                       children: [
                         index + 1,
                         ". ",
                         truncateInline2(getSessionLabel(session), 64)
                       ]
                     }, undefined, true, undefined, this),
-                    /* @__PURE__ */ jsxDEV31("text", {
+                    /* @__PURE__ */ jsxDEV32("text", {
                       fg: rowColors.secondaryTextColor,
-                      attributes: TextAttributes21.DIM,
+                      attributes: TextAttributes22.DIM,
                       children: `${session.messageCount} msgs - ${session.mode} - ${formatDate2(session.updatedAt)}`
                     }, undefined, false, undefined, this)
                   ]
                 }, undefined, true, undefined, this),
-                isSelected && session.latestUserPromptPreview ? /* @__PURE__ */ jsxDEV31("text", {
+                isSelected && session.latestUserPromptPreview ? /* @__PURE__ */ jsxDEV32("text", {
                   fg: rowColors.secondaryTextColor,
-                  attributes: TextAttributes21.DIM,
+                  attributes: TextAttributes22.DIM,
                   children: truncateInline2(session.latestUserPromptPreview, 110)
                 }, undefined, false, undefined, this) : null
               ]
@@ -14213,28 +14815,28 @@ function SessionListScreen() {
           })
         ]
       }, undefined, true, undefined, this),
-      actionMessage ? /* @__PURE__ */ jsxDEV31("box", {
+      actionMessage ? /* @__PURE__ */ jsxDEV32("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV31("text", {
+        children: /* @__PURE__ */ jsxDEV32("text", {
           fg: cliTheme.semantic.info,
           children: actionMessage
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      filterOpen ? /* @__PURE__ */ jsxDEV31(ChatTextArea, {
+      filterOpen ? /* @__PURE__ */ jsxDEV32(ChatTextArea, {
         placeholder: "Filter sessions...",
         allowEmpty: true,
         onTextChange: setFilterQuery,
         onSubmit: () => setFilterOpen(false)
       }, undefined, false, undefined, this) : null,
-      renamingSessionId !== null ? /* @__PURE__ */ jsxDEV31(ChatTextArea, {
+      renamingSessionId !== null ? /* @__PURE__ */ jsxDEV32(ChatTextArea, {
         placeholder: "New session title...",
         onSubmit: (title) => void renameSession(renamingSessionId, title)
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV31("box", {
+      /* @__PURE__ */ jsxDEV32("box", {
         paddingX: 1,
-        children: /* @__PURE__ */ jsxDEV31("text", {
+        children: /* @__PURE__ */ jsxDEV32("text", {
           fg: cliTheme.text.muted,
-          attributes: TextAttributes21.DIM,
+          attributes: TextAttributes22.DIM,
           children: inputActive ? "Enter confirm | Esc cancel" : footerText
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
@@ -14252,10 +14854,10 @@ var init_session_list_screen = __esm(() => {
 });
 
 // apps/cli/src/hooks/use-config-badge.ts
-import { useEffect as useEffect14, useState as useState19 } from "react";
+import { useEffect as useEffect15, useState as useState20 } from "react";
 function useConfigBadge(refreshNonce = 0) {
-  const [state, setState] = useState19({ status: "loading" });
-  useEffect14(() => {
+  const [state, setState] = useState20({ status: "loading" });
+  useEffect15(() => {
     let cancelled = false;
     async function loadConfig() {
       try {
@@ -14296,16 +14898,36 @@ var init_use_config_badge = __esm(() => {
   init_src2();
 });
 
+// apps/cli/src/ui/components/status-dot.tsx
+import { jsxDEV as jsxDEV33 } from "@opentui/react/jsx-dev-runtime";
+function StatusDot({ status }) {
+  return /* @__PURE__ */ jsxDEV33("text", {
+    fg: dotColor[status],
+    children: activeGlyphs.statusDot
+  }, undefined, false, undefined, this);
+}
+var dotColor;
+var init_status_dot = __esm(() => {
+  init_cli_theme();
+  init_cli_theme_capabilities();
+  dotColor = {
+    online: cliTheme.semantic.success,
+    degraded: cliTheme.semantic.warning,
+    offline: cliTheme.semantic.error,
+    loading: cliTheme.text.muted
+  };
+});
+
 // apps/cli/src/app.tsx
 var exports_app = {};
 __export(exports_app, {
   App: () => App
 });
-import { TextAttributes as TextAttributes22 } from "@opentui/core";
+import { TextAttributes as TextAttributes23 } from "@opentui/core";
 import { useKeyboard as useKeyboard11, useRenderer as useRenderer2 } from "@opentui/react";
-import { useEffect as useEffect15, useRef as useRef5, useState as useState20 } from "react";
+import { useEffect as useEffect16, useRef as useRef5, useState as useState21 } from "react";
 import { MemoryRouter, Navigate, Route, Routes, useLocation as useLocation3, useNavigate as useNavigate6 } from "react-router";
-import { jsxDEV as jsxDEV32 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV34 } from "@opentui/react/jsx-dev-runtime";
 function getCurrentViewLabel(pathname) {
   if (pathname === "/" || pathname === "/home") {
     return "home";
@@ -14359,10 +14981,11 @@ function AppContent() {
     closeSlashMenu,
     requestChatAction,
     configRefreshNonce,
-    toggleToolOutputExpansion
+    toggleToolOutputExpansion,
+    toggleReasoningExpansion
   } = useAppState();
-  const [helpOpen, setHelpOpen] = useState20(false);
-  const [ctrlCNotice, setCtrlCNotice] = useState20(null);
+  const [helpOpen, setHelpOpen] = useState21(false);
+  const [ctrlCNotice, setCtrlCNotice] = useState21(null);
   const ctrlCArmedRef = useRef5(false);
   const ctrlCTimerRef = useRef5(null);
   const showCtrlCNotice = (text) => {
@@ -14393,7 +15016,7 @@ function AppContent() {
     ctrlCArmedRef.current = true;
     showCtrlCNotice("Press Ctrl+C again to exit");
   };
-  useEffect15(() => {
+  useEffect16(() => {
     return () => {
       if (ctrlCTimerRef.current) {
         clearTimeout(ctrlCTimerRef.current);
@@ -14431,6 +15054,9 @@ function AppContent() {
       case "system:toggleToolOutput":
         toggleToolOutputExpansion();
         break;
+      case "system:toggleReasoning":
+        toggleReasoningExpansion();
+        break;
       case "system:cancel":
         if (helpOpen) {
           setHelpOpen(false);
@@ -14540,7 +15166,7 @@ function AppContent() {
   });
   const configBadge = useConfigBadge(configRefreshNonce);
   const needsOnboarding = configBadge.status === "available" && configBadge.missingCredentialHints.length > 0;
-  useEffect15(() => {
+  useEffect16(() => {
     if (needsOnboarding && location.pathname !== "/onboarding") {
       navigate("/onboarding");
     }
@@ -14549,15 +15175,15 @@ function AppContent() {
     if (slashMenuOpen) {
       return "Slash pages open | Enter Open | Backspace Close | Esc Cancel";
     }
-    const backHint = canGoBack ? ` | Esc/${BACK_SHORTCUT_LABEL} Back` : "";
-    return "/ Pages | Ctrl+P Cmd | F1 Help | Ctrl+C Quit" + backHint;
+    const backHint = canGoBack ? `Esc/${BACK_SHORTCUT_LABEL} Back | ` : "";
+    return backHint + "/ Pages | Ctrl+P Cmd | F1 Help | Ctrl+C Quit";
   };
-  return /* @__PURE__ */ jsxDEV32("box", {
+  return /* @__PURE__ */ jsxDEV34("box", {
     flexDirection: "column",
     flexGrow: 1,
     backgroundColor: cliTheme.surfaces.base,
     children: [
-      /* @__PURE__ */ jsxDEV32("box", {
+      /* @__PURE__ */ jsxDEV34("box", {
         flexDirection: "row",
         justifyContent: "space-between",
         paddingLeft: 1,
@@ -14566,144 +15192,148 @@ function AppContent() {
         border: ["bottom"],
         borderColor: cliTheme.borders.default,
         children: [
-          /* @__PURE__ */ jsxDEV32("box", {
+          /* @__PURE__ */ jsxDEV34("box", {
             flexDirection: "row",
-            gap: 2,
+            gap: 1,
             alignItems: "center",
             children: [
-              /* @__PURE__ */ jsxDEV32("text", {
-                fg: cliTheme.text.primary,
-                attributes: TextAttributes22.BOLD,
+              /* @__PURE__ */ jsxDEV34(StatusDot, {
+                status: configBadge.status === "available" ? "online" : configBadge.status === "loading" ? "loading" : "offline"
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsxDEV34("text", {
+                fg: cliTheme.accent.primary,
+                attributes: TextAttributes23.BOLD,
                 children: "Lightcode"
               }, undefined, false, undefined, this),
-              configBadge.status === "available" ? /* @__PURE__ */ jsxDEV32("text", {
+              configBadge.status === "available" ? /* @__PURE__ */ jsxDEV34("text", {
                 fg: cliTheme.text.secondary,
                 children: [
-                  "| ",
+                  "\xB7 ",
                   configBadge.provider,
-                  " | ",
+                  " \xB7 ",
                   configBadge.model
                 ]
-              }, undefined, true, undefined, this) : configBadge.status === "loading" ? /* @__PURE__ */ jsxDEV32("text", {
+              }, undefined, true, undefined, this) : configBadge.status === "loading" ? /* @__PURE__ */ jsxDEV34("text", {
                 fg: cliTheme.text.muted,
-                children: "| loading..."
-              }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV32("text", {
-                fg: cliTheme.text.muted,
-                children: "| provider unavailable"
+                children: "\xB7 loading\u2026"
+              }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV34("text", {
+                fg: cliTheme.semantic.error,
+                attributes: TextAttributes23.BOLD,
+                children: "\xB7 provider unavailable"
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV32("text", {
+          /* @__PURE__ */ jsxDEV34("text", {
             fg: cliTheme.text.muted,
             children: currentView
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV32("box", {
+      /* @__PURE__ */ jsxDEV34("box", {
         flexGrow: 1,
         padding: 1,
         position: "relative",
         children: [
-          /* @__PURE__ */ jsxDEV32(Routes, {
+          /* @__PURE__ */ jsxDEV34(Routes, {
             children: [
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/",
-                element: /* @__PURE__ */ jsxDEV32(HomeScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(HomeScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/home",
-                element: /* @__PURE__ */ jsxDEV32(Navigate, {
+                element: /* @__PURE__ */ jsxDEV34(Navigate, {
                   to: "/",
                   replace: true
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/status",
-                element: /* @__PURE__ */ jsxDEV32(DiagnosticsScreen, {
+                element: /* @__PURE__ */ jsxDEV34(DiagnosticsScreen, {
                   kind: "status"
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/doctor",
-                element: /* @__PURE__ */ jsxDEV32(DiagnosticsScreen, {
+                element: /* @__PURE__ */ jsxDEV34(DiagnosticsScreen, {
                   kind: "doctor"
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/permissions",
-                element: /* @__PURE__ */ jsxDEV32(DiagnosticsScreen, {
+                element: /* @__PURE__ */ jsxDEV34(DiagnosticsScreen, {
                   kind: "permissions"
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/sessions",
-                element: /* @__PURE__ */ jsxDEV32(SessionListScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(SessionListScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/sessions/:id",
-                element: /* @__PURE__ */ jsxDEV32(ChatScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(ChatScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/tools",
-                element: /* @__PURE__ */ jsxDEV32(DiagnosticsScreen, {
+                element: /* @__PURE__ */ jsxDEV34(DiagnosticsScreen, {
                   kind: "tools"
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/config",
-                element: /* @__PURE__ */ jsxDEV32(DiagnosticsScreen, {
+                element: /* @__PURE__ */ jsxDEV34(DiagnosticsScreen, {
                   kind: "config"
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/model-info",
-                element: /* @__PURE__ */ jsxDEV32(ModelScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(ModelScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/model",
-                element: /* @__PURE__ */ jsxDEV32(ModelSelectScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(ModelSelectScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "/onboarding",
-                element: /* @__PURE__ */ jsxDEV32(OnboardingScreen, {}, undefined, false, undefined, this)
+                element: /* @__PURE__ */ jsxDEV34(OnboardingScreen, {}, undefined, false, undefined, this)
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV32(Route, {
+              /* @__PURE__ */ jsxDEV34(Route, {
                 path: "*",
-                element: /* @__PURE__ */ jsxDEV32(Navigate, {
+                element: /* @__PURE__ */ jsxDEV34(Navigate, {
                   to: "/",
                   replace: true
                 }, undefined, false, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, undefined, true, undefined, this),
-          paletteOpen ? /* @__PURE__ */ jsxDEV32(CommandPalette, {
+          paletteOpen ? /* @__PURE__ */ jsxDEV34(CommandPalette, {
             query: paletteQuery,
             setQuery: setPaletteQuery,
             selectedIndex: paletteSelected
           }, undefined, false, undefined, this) : null,
-          slashMenuOpen && !inputHostsSlashMenu ? /* @__PURE__ */ jsxDEV32("box", {
+          slashMenuOpen && !inputHostsSlashMenu ? /* @__PURE__ */ jsxDEV34("box", {
             position: "absolute",
             top: 1,
             left: 2,
             right: 2,
             zIndex: 20,
-            children: /* @__PURE__ */ jsxDEV32(SlashPageMenu, {
+            children: /* @__PURE__ */ jsxDEV34(SlashPageMenu, {
               query: slashMenuQuery,
               selectedIndex: selectedSlashRouteIndex,
               routes: filteredSlashRoutes
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this) : null,
-          helpOpen ? /* @__PURE__ */ jsxDEV32("box", {
+          helpOpen ? /* @__PURE__ */ jsxDEV34("box", {
             position: "absolute",
             top: 1,
             left: 4,
             right: 4,
             zIndex: 30,
-            children: /* @__PURE__ */ jsxDEV32(HelpOverlay, {}, undefined, false, undefined, this)
+            children: /* @__PURE__ */ jsxDEV34(HelpOverlay, {}, undefined, false, undefined, this)
           }, undefined, false, undefined, this) : null
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV32("box", {
+      /* @__PURE__ */ jsxDEV34("box", {
         flexDirection: "row",
         justifyContent: "center",
         gap: 2,
@@ -14712,7 +15342,7 @@ function AppContent() {
         borderStyle: "single",
         border: ["top"],
         borderColor: cliTheme.borders.default,
-        children: /* @__PURE__ */ jsxDEV32("text", {
+        children: /* @__PURE__ */ jsxDEV34("text", {
           fg: ctrlCNotice ? cliTheme.semantic.warning : cliTheme.text.muted,
           children: ctrlCNotice ?? getFooterStatus()
         }, undefined, false, undefined, this)
@@ -14721,10 +15351,10 @@ function AppContent() {
   }, undefined, true, undefined, this);
 }
 function App() {
-  return /* @__PURE__ */ jsxDEV32(MemoryRouter, {
+  return /* @__PURE__ */ jsxDEV34(MemoryRouter, {
     initialEntries: ["/"],
-    children: /* @__PURE__ */ jsxDEV32(AppStateProvider, {
-      children: /* @__PURE__ */ jsxDEV32(AppContent, {}, undefined, false, undefined, this)
+    children: /* @__PURE__ */ jsxDEV34(AppStateProvider, {
+      children: /* @__PURE__ */ jsxDEV34(AppContent, {}, undefined, false, undefined, this)
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
 }
@@ -14746,12 +15376,13 @@ var init_app = __esm(() => {
   init_app_state();
   init_use_config_badge();
   init_cli_theme();
+  init_status_dot();
   init_clipboard();
 });
 
 // apps/cli/src/index.tsx
 init_src();
-import { jsxDEV as jsxDEV33 } from "@opentui/react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV35 } from "@opentui/react/jsx-dev-runtime";
 var cliArgs = Bun.argv.slice(2);
 if (cliArgs.includes("--version") || cliArgs.includes("-v")) {
   console.log(`${productName} v${lightcodeVersion}`);
@@ -14773,10 +15404,19 @@ var renderer = await createCliRenderer({
 });
 if (serverLaunch.ownedProcess) {
   const ownedProcess = serverLaunch.ownedProcess;
-  process.on("exit", () => {
+  const killOwnedServer = () => {
     try {
       ownedProcess.kill();
     } catch {}
+  };
+  process.on("exit", killOwnedServer);
+  process.on("SIGINT", () => {
+    killOwnedServer();
+    process.exit(0);
+  });
+  process.on("SIGTERM", () => {
+    killOwnedServer();
+    process.exit(0);
   });
 }
-createRoot(renderer).render(/* @__PURE__ */ jsxDEV33(App2, {}, undefined, false, undefined, this));
+createRoot(renderer).render(/* @__PURE__ */ jsxDEV35(App2, {}, undefined, false, undefined, this));