@markusylisiurunen/tau 0.1.10 → 0.1.12

package/README.md

@@ -1,6 +1,6 @@
 # tau
 
-a terminal-based AI chat client for working with code. tau gives you access to Claude, GPT, and Gemini models, each equipped with tools to explore, write, and edit files in your project.
+a terminal-based AI chat client for working with code. tau gives you access to Claude, GPT, and Gemini models, each equipped with tools to explore, write, and edit files in your project, plus optional sub-agents for deeper codebase investigation and web research.
 
 ![tau](./assets/tau.png)
 
@@ -24,13 +24,16 @@ or store keys in `~/.config/tau/config.json`:
   "apiKeys": {
     "anthropic": "sk-ant-...",
     "openai": "sk-...",
-    "google": "..."
+    "google": "...",
+    "parallel": "..."
   }
 }
 ```
 
 environment variables take precedence over the config file.
 
+`parallel` is only needed for the web sub-agent tools (`web_search`/`web_fetch`).
+
 ## security notice
 
 **the risk level system is a UX guardrail, not a hard security boundary.** it helps prevent accidental writes and guides model behavior, but it has significant limitations:
@@ -86,7 +89,7 @@ tau comes with several built-in personas across different models:
 - **GPT-5.2** (OpenAI)
 - **Gemini 3 Pro** and **Gemini 2.5 Flash** (Google)
 
-each model has three variants: a general-purpose assistant, a coder variant optimized for software engineering, and a raw variant with minimal prompting.
+each model has three variants: a general-purpose assistant, a coder variant optimized for software engineering, and a raw variant with minimal prompting. basic and coder variants include the `web` sub-agent for web research, and coder variants also include the `explore` sub-agent for multi-turn codebase investigation.
 
 switch personas at startup with `--persona` or mid-session with `/persona:<id>`:
 
@@ -94,6 +97,15 @@ switch personas at startup with `--persona` or mid-session with `/persona:<id>`:
 tau --persona opus-4.5-coder
 ```
 
+## sub-agents
+
+some personas can run isolated sub-agents via the internal `task` tool:
+
+- `explore`: read-only, multi-turn codebase investigation
+- `web`: high-threshold web research using Parallel Search/Extract (`web_search`/`web_fetch`)
+
+to use the web sub-agent, set `apiKeys.parallel` in `~/.config/tau/config.json` (see above). tau will only make web calls when needed or when you explicitly ask for web research.
+
 ## reasoning
 
 some models support extended thinking, where they reason through problems before responding. cycle through reasoning levels with `shift+tab`, or set one at startup:
@@ -114,7 +126,9 @@ you can also pipe content directly:
 cat src/app.ts | tau --persona opus-4.5
 ```
 
-for project-aware sessions, use `--with-context` to inject your AGENTS.md (or similar project guidelines file) into the system prompt. run `tau --help` to see all available options.
+for project-aware sessions, use `--with-context` to inject your AGENTS.md into the system prompt. tau searches for this file in the current directory and parent directories up to your home folder.
+
+run `tau --help` to see all available options, or `tau --debug` to inspect loaded personas, prompts, skills, and the full system prompt for debugging configuration issues.
 
 ## memory mode
 
@@ -130,20 +144,20 @@ tau will create or update AGENTS.md at your project root, integrating the new in
 
 tau supports slash commands for common actions:
 
-| command                | description                                  |
-| ---------------------- | -------------------------------------------- |
-| `/help`                | show available commands                      |
-| `/new`                 | clear the session and start fresh            |
-| `/copy`                | copy the last assistant message              |
-| `/copy:code`           | copy just the code blocks                    |
-| `/reload`              | reload personas and prompts from disk        |
-| `/fork:only-summary`   | compress history and continue with a summary |
-| `/fork:with-last-turn` | compress history but keep the last exchange  |
-| `/persona:<id>`        | switch to a different persona                |
-| `/prompt:<id>`         | insert a saved prompt template               |
-| `/bash:<id>`           | run a saved shell command                    |
-| `/risk:<level>`        | change the risk level                        |
-| `!<cmd>`               | run a shell command directly                 |
+| command                | description                                    |
+| ---------------------- | ---------------------------------------------- |
+| `/help`                | show available commands                        |
+| `/new`                 | clear the session and start fresh              |
+| `/copy`                | copy the last assistant message                |
+| `/copy:code`           | copy just the code blocks                      |
+| `/reload`              | reload personas, prompts, and skills from disk |
+| `/fork:only-summary`   | compress history and continue with a summary   |
+| `/fork:with-last-turn` | compress history but keep the last exchange    |
+| `/persona:<id>`        | switch to a different persona                  |
+| `/prompt:<id>`         | insert a saved prompt template                 |
+| `/bash:<id>`           | run a saved shell command                      |
+| `/risk:<level>`        | change the risk level                          |
+| `!<cmd>`               | run a shell command directly                   |
 
 the fork commands are useful when conversations get long. they compress everything into a summary so the model retains context without the overhead of a full history.
 
@@ -155,6 +169,7 @@ the fork commands are useful when conversations get long. they compress everythi
 | `ctrl+t`    | toggle thinking visibility  |
 | `ctrl+o`    | toggle compact tool display |
 | `ctrl+f`    | expand @file mentions       |
+| `alt+up`    | pop queued message          |
 | `esc`       | interrupt generation        |
 | `ctrl+c`    | exit                        |
 
@@ -169,7 +184,8 @@ store settings in `~/.config/tau/config.json`:
   "apiKeys": {
     "anthropic": "sk-ant-...",
     "openai": "sk-...",
-    "google": "..."
+    "google": "...",
+    "parallel": "..."
   },
   "defaultPersona": "gpt-5.2",
   "defaultRisk": "read-write",
@@ -222,7 +238,8 @@ you can also set model parameters via optional frontmatter fields:
 
 - `reasoning`: one of `none`, `minimal`, `low`, `medium`, `high`, `xhigh`
 - `allowedReasoningLevels`: list of reasoning levels shown in the ui
-- `subagents`: enable sub-agents (currently only `explore` is supported) for multi-turn codebase investigation. you can specify as a list (`subagents: [explore]`) to use the main persona's model, or as an object to customize each sub-agent's model and reasoning. example:
+- `skills`: list of enabled skill names (matched by `name` in skill frontmatter), or `"*"` to enable all discovered skills
+- `subagents`: enable sub-agents (`explore` for multi-turn codebase investigation, `web` for web research). you can specify as a list (`subagents: [explore]`, `subagents: [web]`, or `subagents: [explore, web]`) to use the main persona's model, or as an object to customize each sub-agent's model and reasoning. example:
   ```yaml
   subagents:
     explore:
@@ -248,7 +265,13 @@ suggest specific improvements with code examples.
 
 insert them with `/prompt:review`. if a project prompt id conflicts with a user or built-in prompt, the project prompt wins.
 
-use `/reload` to pick up changes to personas and prompts without restarting.
+### skills
+
+skills are optional markdown files discovered at `~/.config/tau/skills/<dir>/SKILL.md` (user-level) and `.tau/skills/<dir>/SKILL.md` (project-level). each `SKILL.md` must contain yaml frontmatter with `name` and `description`.
+
+enable skills per persona with the `skills` frontmatter field. you can list specific skill names (matched by `name` in skill frontmatter), or use `"*"` to enable all discovered skills. all non-raw built-in personas (basic and coder variants) have `skills: "*"` by default. tau injects an index of enabled skills into the system prompt containing only each skill's `name`, `description`, and absolute file path.
+
+use `/reload` to pick up changes to personas, prompts, and skills without restarting.
 
 ## how it works
 

package/dist/app.js

@@ -14,9 +14,9 @@ import { createEditToolDefinition } from "./tools/edit.js";
 import { ToolRegistry } from "./tools/registry.js";
 import { createTaskToolDefinition } from "./tools/task.js";
 import { createWriteToolDefinition } from "./tools/write.js";
-import { REASONING_LEVELS } from "./types.js";
+import { REASONING_LEVELS, } from "./types.js";
 import { AssistantMessageComponent } from "./ui/assistant_message.js";
-import { renderBashBlocked, renderBashExecution, renderBashRunning } from "./ui/bash_execution.js";
+import { renderBashAborted, renderBashBlocked, renderBashExecution, renderBashRunning, } from "./ui/bash_execution.js";
 import { ChatContainerComponent } from "./ui/chat_container.js";
 import { CustomEditor } from "./ui/custom_editor.js";
 import { renderEditBlocked, renderEditSuccess, renderWriteBlocked, renderWriteSuccess, } from "./ui/file_execution.js";
@@ -24,17 +24,17 @@ import { FooterComponent } from "./ui/footer.js";
 import { QueuedMessagesComponent } from "./ui/queued_messages.js";
 import { SessionDividerComponent } from "./ui/session_divider.js";
 import { SessionSummaryComponent } from "./ui/session_summary.js";
-import { SlashAutocompleteProvider } from "./ui/slash_autocomplete.js";
+import { getFileAutocompleteToken, SlashAutocompleteProvider } from "./ui/slash_autocomplete.js";
 import { SystemMessageComponent } from "./ui/system_message.js";
 import { renderTaskBlocked, renderTaskFinished, renderTaskRunning } from "./ui/task_execution.js";
 import { editorBorderForReasoning, theme } from "./ui/theme.js";
 import { UserMessageComponent } from "./ui/user_message.js";
-import { buildBaseSystemPrompt, buildEnvironmentTag, buildProjectContextBlock, findAgentsFilesFromCwdToHome, formatRiskLevelChangeNotice, } from "./utils/context.js";
+import { buildBaseSystemPrompt, buildEnvironmentTag, buildProjectContextBlock, buildSkillsIndexBlock, findAgentsFilesFromCwdToHome, formatRiskLevelChangeNotice, } from "./utils/context.js";
 import { formatHistoryForCompression } from "./utils/fork.js";
 import { formatAdaptiveNumber, formatCwd, formatTokenWindow } from "./utils/format.js";
 import { getGitRoot } from "./utils/git.js";
 import { extractAllFencedCodeBlocks, extractAssistantText } from "./utils/messages.js";
-import { listProjectFiles } from "./utils/project_files.js";
+import { listProjectFiles, listProjectFilesAsync } from "./utils/project_files.js";
 const { palette } = theme;
 export class ChatApp {
     ui;
@@ -45,14 +45,15 @@ export class ChatApp {
     personas;
     currentPersona;
     prompts;
+    skills;
     bashCommands;
     repoRoot;
     initialUserMessage;
     config;
     assistantComponents = [];
     engine;
-    runningBashComponents = new Map(); // toolCallId -> component index
-    runningTaskComponents = new Map(); // toolCallId -> component index
+    runningBashComponents = new Map();
+    runningTaskComponents = new Map();
     taskEvents = new Map(); // toolCallId -> accumulated events
     subagentCostTotal = 0;
     isStreaming = false;
@@ -68,7 +69,9 @@ export class ChatApp {
     initialRiskLevel;
     environmentTag;
     projectContextBlock;
-    projectFiles;
+    projectFiles = [];
+    isRefreshingProjectFiles = false;
+    isInFileAutocomplete = false;
     agentsFiles;
     baseSystemPrompt;
     pendingRiskLevelChange;
@@ -77,6 +80,7 @@ export class ChatApp {
     constructor(options) {
         this.personas = options.personas;
         this.prompts = options.prompts ?? [];
+        this.skills = options.skills ?? [];
         this.bashCommands = options.bashCommands ?? [];
         this.repoRoot = getGitRoot(process.cwd()) ?? process.cwd();
         this.initialUserMessage = options.initialUserMessage;
@@ -105,6 +109,7 @@ export class ChatApp {
         this.clampPersonaReasoning(this.currentPersona);
         this.baseSystemPrompt = buildBaseSystemPrompt({
             personaSystemPrompt: this.currentPersona.systemPrompt,
+            skillsBlock: this.getSkillsIndexBlockForPersona(this.currentPersona).skillsBlock,
             projectContextBlock: this.projectContextBlock,
             environmentTag: this.environmentTag,
             userPreferences: this.config.userPreferences,
@@ -138,7 +143,7 @@ export class ChatApp {
         this.ui.addChild(this.editor);
         this.ui.addChild(this.footer);
         const headerText = `\n${palette.accent("tau")} ${palette.muted("– terminal chat")}\n\n` +
-            palette.muted(buildHelpText(this.agentsFiles));
+            palette.muted(buildHelpText(this.agentsFiles, this.skills));
         this.chatContainer.addMessage(new Text(headerText, 1, 0));
         this.ui.setFocus(this.editor);
         this.updateFooter();
@@ -168,9 +173,15 @@ export class ChatApp {
         this.editor.onChange = (text) => {
             const wasBash = this.isBashMode;
             const wasMemory = this.isMemoryMode;
+            const wasInFileAutocomplete = this.isInFileAutocomplete;
             const trimmed = text.trimStart();
             this.isBashMode = trimmed.startsWith("!");
             this.isMemoryMode = trimmed.startsWith("#");
+            const beforeCursor = this.getEditorTextBeforeCursor();
+            this.isInFileAutocomplete = Boolean(getFileAutocompleteToken(beforeCursor));
+            if (!wasInFileAutocomplete && this.isInFileAutocomplete) {
+                this.refreshProjectFilesInBackground();
+            }
             if (wasBash !== this.isBashMode || wasMemory !== this.isMemoryMode) {
                 this.updateEditorBorderColor();
             }
@@ -181,6 +192,27 @@ export class ChatApp {
         })), () => this.projectFiles));
         this.editor.onSubmit = (text) => this.handleSubmit(text);
     }
+    getEditorTextBeforeCursor() {
+        const { line, col } = this.editor.getCursor();
+        const lines = this.editor.getLines();
+        const current = lines[line] ?? "";
+        return current.slice(0, col);
+    }
+    refreshProjectFilesInBackground() {
+        if (this.isRefreshingProjectFiles)
+            return;
+        this.isRefreshingProjectFiles = true;
+        void listProjectFilesAsync(process.cwd())
+            .then((files) => {
+            this.projectFiles = files;
+        })
+            .catch(() => {
+            // Ignore refresh errors; autocomplete will keep using the existing cache.
+        })
+            .finally(() => {
+            this.isRefreshingProjectFiles = false;
+        });
+    }
     async start() {
         this.ui.start();
         if (this.initialUserMessage) {
@@ -332,6 +364,34 @@ export class ChatApp {
             persona.settings.reasoning = allowed[0];
         }
     }
+    getSkillsIndexBlockForPersona(persona) {
+        const enabled = persona.skills;
+        if (!enabled) {
+            return { unknown: [] };
+        }
+        const skillsByName = new Map();
+        for (const skill of this.skills) {
+            skillsByName.set(skill.name.toLowerCase(), skill);
+        }
+        const selected = [];
+        const unknown = [];
+        const seen = new Set();
+        const enabledArray = enabled === "*" ? Array.from(skillsByName.keys()) : enabled;
+        for (const name of enabledArray) {
+            const key = name.toLowerCase();
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            const skill = skillsByName.get(key);
+            if (skill) {
+                selected.push(skill);
+            }
+            else if (enabled !== "*") {
+                unknown.push(name);
+            }
+        }
+        return { skillsBlock: buildSkillsIndexBlock(selected), unknown };
+    }
     // User Actions ----------------------------------------------------------------------------------
     toggleThinkingVisibility() {
         this.showThinking = !this.showThinking;
@@ -549,7 +609,7 @@ export class ChatApp {
         }
     }
     showHelp() {
-        this.addSystemMessage(buildHelpText(this.agentsFiles), palette.muted);
+        this.addSystemMessage(buildHelpText(this.agentsFiles, this.skills), palette.muted);
     }
     async copyLastAssistantMessage() {
         const lastAssistant = this.getLastAssistantMessage();
@@ -672,6 +732,7 @@ export class ChatApp {
         });
         this.baseSystemPrompt = buildBaseSystemPrompt({
             personaSystemPrompt: this.currentPersona.systemPrompt,
+            skillsBlock: this.getSkillsIndexBlockForPersona(this.currentPersona).skillsBlock,
             projectContextBlock: this.projectContextBlock,
             environmentTag: this.environmentTag,
             previousSessionSummary,
@@ -823,8 +884,10 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
         }
         this.currentPersona = persona;
         this.clampPersonaReasoning(this.currentPersona);
+        const skillsContext = this.getSkillsIndexBlockForPersona(this.currentPersona);
         this.baseSystemPrompt = buildBaseSystemPrompt({
             personaSystemPrompt: this.currentPersona.systemPrompt,
+            skillsBlock: skillsContext.skillsBlock,
             projectContextBlock: this.projectContextBlock,
             environmentTag: this.environmentTag,
             previousSessionSummary: this.previousSessionSummary,
@@ -833,6 +896,9 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
         this.engine.setPersona(this.currentPersona, this.baseSystemPrompt);
         this.updateFooter();
         this.updateEditorBorderColor();
+        if (skillsContext.unknown.length > 0) {
+            this.addSystemMessage(`warning: unknown skills enabled: ${skillsContext.unknown.join(", ")}`, palette.noticeWarn);
+        }
         this.addSystemMessage(`switched to ${persona.label} (${persona.model.id})`, palette.noticeSuccess);
     }
     insertPrompt(id) {
@@ -859,12 +925,13 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
         }
         try {
             const result = await loadAllContent();
-            const { personas, prompts, errors } = result;
+            const { personas, prompts, skills, errors } = result;
             const bashResult = loadBashCommands(process.cwd());
             this.bashCommands = bashResult.commands;
             // Update the personas and prompts lists
             this.personas = personas;
             this.prompts = prompts;
+            this.skills = skills;
             // Try to preserve the current persona; fall back to first if not found
             const currentPersonaId = this.currentPersona.id.toLowerCase();
             const updatedPersona = personas.find((p) => p.id.toLowerCase() === currentPersonaId);
@@ -879,25 +946,31 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                 this.addSystemMessage(`previous persona no longer available; switched to ${this.currentPersona.label || this.currentPersona.id}.`, palette.noticeWarn);
             }
             // Rebuild system prompt and update the engine
+            const skillsContext = this.getSkillsIndexBlockForPersona(this.currentPersona);
             this.baseSystemPrompt = buildBaseSystemPrompt({
                 personaSystemPrompt: this.currentPersona.systemPrompt,
+                skillsBlock: skillsContext.skillsBlock,
                 projectContextBlock: this.projectContextBlock,
                 environmentTag: this.environmentTag,
                 previousSessionSummary: this.previousSessionSummary,
                 userPreferences: this.config.userPreferences,
             });
             this.engine.setPersona(this.currentPersona, this.baseSystemPrompt);
+            if (skillsContext.unknown.length > 0) {
+                this.addSystemMessage(`warning: unknown skills enabled: ${skillsContext.unknown.join(", ")}`, palette.noticeWarn);
+            }
             // Update UI
             this.updateFooter();
             this.updateEditorBorderColor();
             // Display summary
             const personaCount = personas.length;
             const promptCount = prompts.length;
+            const skillCount = skills.length;
             const bashCount = bashResult.commands.length;
             const errorCount = errors.length + bashResult.errors.length;
             const summary = errorCount > 0
-                ? `reloaded: ${personaCount} personas, ${promptCount} prompts, ${bashCount} bash commands (${errorCount} errors).`
-                : `reloaded: ${personaCount} personas, ${promptCount} prompts, ${bashCount} bash commands.`;
+                ? `reloaded: ${personaCount} personas, ${promptCount} prompts, ${skillCount} skills, ${bashCount} bash commands (${errorCount} errors).`
+                : `reloaded: ${personaCount} personas, ${promptCount} prompts, ${skillCount} skills, ${bashCount} bash commands.`;
             this.addSystemMessage(summary, palette.noticeSuccess);
             this.ui.requestRender();
         }
@@ -973,15 +1046,18 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                         if (uiEvent.type === "bash_started") {
                             // Create and add the running component, storing its index
                             const index = this.chatContainer.addToolMessage((compact) => renderBashRunning(uiEvent.command, compact));
-                            this.runningBashComponents.set(uiEvent.toolCallId, index);
+                            this.runningBashComponents.set(uiEvent.toolCallId, {
+                                index,
+                                command: uiEvent.command,
+                            });
                             this.ui.requestRender();
                         }
                         else if (uiEvent.type === "bash_execution") {
                             // Check if we have a running component for this toolCallId
-                            const runningIndex = this.runningBashComponents.get(uiEvent.toolCallId);
-                            if (runningIndex !== undefined) {
+                            const running = this.runningBashComponents.get(uiEvent.toolCallId);
+                            if (running) {
                                 // Replace the running component with the finished execution component
-                                this.chatContainer.replaceToolMessageAtIndex(runningIndex, (compact) => renderBashExecution(uiEvent.command, uiEvent.exitCode, uiEvent.truncationInfo, compact));
+                                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderBashExecution(uiEvent.command, uiEvent.exitCode, uiEvent.truncationInfo, compact));
                                 this.runningBashComponents.delete(uiEvent.toolCallId);
                             }
                             else {
@@ -993,10 +1069,10 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                         else if (uiEvent.type === "bash_blocked") {
                             // Check if this is a post-acceptance failure that has a running card
                             if (uiEvent.toolCallId) {
-                                const runningIndex = this.runningBashComponents.get(uiEvent.toolCallId);
-                                if (runningIndex !== undefined) {
+                                const running = this.runningBashComponents.get(uiEvent.toolCallId);
+                                if (running) {
                                     // Replace the running component with the blocked component
-                                    this.chatContainer.replaceToolMessageAtIndex(runningIndex, (compact) => renderBashBlocked(uiEvent.command, uiEvent.reason, compact));
+                                    this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderBashBlocked(uiEvent.command, uiEvent.reason, compact));
                                     this.runningBashComponents.delete(uiEvent.toolCallId);
                                 }
                                 else {
@@ -1015,7 +1091,14 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                                 this.taskEvents.set(uiEvent.toolCallId, []);
                             }
                             const index = this.chatContainer.addToolMessage((compact) => renderTaskRunning(uiEvent.title, [], 0, 0, 0, compact, uiEvent.name));
-                            this.runningTaskComponents.set(uiEvent.toolCallId, index);
+                            this.runningTaskComponents.set(uiEvent.toolCallId, {
+                                index,
+                                name: uiEvent.name,
+                                title: uiEvent.title,
+                                costTotal: 0,
+                                turns: 0,
+                                toolCalls: 0,
+                            });
                             this.ui.requestRender();
                         }
                         else if (uiEvent.type === "task_progress") {
@@ -1026,20 +1109,32 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                                 this.taskEvents.set(uiEvent.toolCallId, events);
                             }
                             events.push(uiEvent.event);
-                            const runningIndex = this.runningTaskComponents.get(uiEvent.toolCallId);
-                            if (runningIndex !== undefined) {
-                                this.chatContainer.replaceToolMessageAtIndex(runningIndex, (compact) => renderTaskRunning(uiEvent.title, events, uiEvent.costTotal, uiEvent.turns, uiEvent.toolCalls, compact, uiEvent.name));
+                            const running = this.runningTaskComponents.get(uiEvent.toolCallId);
+                            if (running) {
+                                running.name = uiEvent.name;
+                                running.title = uiEvent.title;
+                                running.costTotal = uiEvent.costTotal;
+                                running.turns = uiEvent.turns;
+                                running.toolCalls = uiEvent.toolCalls;
+                                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderTaskRunning(uiEvent.title, events, uiEvent.costTotal, uiEvent.turns, uiEvent.toolCalls, compact, uiEvent.name));
                             }
                             else {
                                 const index = this.chatContainer.addToolMessage((compact) => renderTaskRunning(uiEvent.title, events, uiEvent.costTotal, uiEvent.turns, uiEvent.toolCalls, compact, uiEvent.name));
-                                this.runningTaskComponents.set(uiEvent.toolCallId, index);
+                                this.runningTaskComponents.set(uiEvent.toolCallId, {
+                                    index,
+                                    name: uiEvent.name,
+                                    title: uiEvent.title,
+                                    costTotal: uiEvent.costTotal,
+                                    turns: uiEvent.turns,
+                                    toolCalls: uiEvent.toolCalls,
+                                });
                             }
                             this.ui.requestRender();
                         }
                         else if (uiEvent.type === "task_finished") {
-                            const runningIndex = this.runningTaskComponents.get(uiEvent.toolCallId);
-                            if (runningIndex !== undefined) {
-                                this.chatContainer.replaceToolMessageAtIndex(runningIndex, (compact) => renderTaskFinished(uiEvent.title, uiEvent.costTotal, uiEvent.turns, uiEvent.toolCalls, uiEvent.status, uiEvent.finalOutput, compact, uiEvent.name));
+                            const running = this.runningTaskComponents.get(uiEvent.toolCallId);
+                            if (running) {
+                                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderTaskFinished(uiEvent.title, uiEvent.costTotal, uiEvent.turns, uiEvent.toolCalls, uiEvent.status, uiEvent.finalOutput, compact, uiEvent.name));
                                 this.runningTaskComponents.delete(uiEvent.toolCallId);
                             }
                             else {
@@ -1051,9 +1146,9 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
                             this.ui.requestRender();
                         }
                         else if (uiEvent.type === "task_blocked") {
-                            const runningIndex = this.runningTaskComponents.get(uiEvent.toolCallId);
-                            if (runningIndex !== undefined) {
-                                this.chatContainer.replaceToolMessageAtIndex(runningIndex, (compact) => renderTaskBlocked(uiEvent.title, uiEvent.reason, compact, uiEvent.name));
+                            const running = this.runningTaskComponents.get(uiEvent.toolCallId);
+                            if (running) {
+                                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderTaskBlocked(uiEvent.title, uiEvent.reason, compact, uiEvent.name));
                                 this.runningTaskComponents.delete(uiEvent.toolCallId);
                             }
                             else {
@@ -1098,6 +1193,15 @@ Write plain prose, no formatting. Be thorough enough that the reader can resume
             this.addSystemMessage(`error: ${err.message}`, palette.noticeError);
         }
         finally {
+            const wasAborted = this.currentTurnAbort?.signal.aborted ?? false;
+            const reason = wasAborted ? "aborted" : "interrupted";
+            for (const running of this.runningBashComponents.values()) {
+                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderBashAborted(running.command, reason, compact));
+            }
+            const taskStatus = wasAborted ? "aborted" : "error";
+            for (const running of this.runningTaskComponents.values()) {
+                this.chatContainer.replaceToolMessageAtIndex(running.index, (compact) => renderTaskFinished(running.title, running.costTotal, running.turns, running.toolCalls, taskStatus, reason, compact, running.name));
+            }
             this.footer.stop();
             this.isStreaming = false;
             this.currentTurnAbort = undefined;