zidane 5.4.3 → 5.5.0

package/dist/tui.js

@@ -1,15 +1,15 @@
-import { E as cleanupPersistedSession, O as resolvePersistDir, p as createAgent } from "./tools-BK2vG9UX.js";
+import { A as resolvePersistDir, B as formatTaskStatus, H as previewLine, I as ageString, L as compactPath, O as cleanupPersistedSession, R as fmtTokens, U as shortId, V as formatTaskSummary, j as resolveTasksDir, p as createAgent, z as formatDuration } from "./tools-D_icxa-V.js";
 import { s as errorMessage } from "./errors-CDwtPIMX.js";
 import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-CNUbvbsy.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-DxyAERe1.js";
+import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-iTy-0wYz.js";
 import { n as formatTokenUsage } from "./stats-DgOvY7wd.js";
-import { n as loadSession, t as createSession } from "./session-kwsNnOmt.js";
+import { n as loadSession, t as createSession } from "./session-CbkiJDlH.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as useMcpAuthDispatch, $t as isTurnHighlighted, A as getSafelist, An as rewriteMultiEditHeader, At as clampFps, B as supportsOAuth, Cn as summarizeEditPayload, Cr as modelSupportsReasoning, Ct as shortId, D as useSafeModeQueue, Dn as mergeApprovalAndBodyOutcomes, Dr as piIdOf, Dt as SETTINGS_CHOICES, E as useSafeModeActions, Et as DEFAULT_SETTINGS, F as suggestSafelistEntry, Ft as resolveTheme, Gn as createSkillsCompletionProvider, Gt as ConfigProvider, H as filterModelCatalog, Ht as DiscoveryProvider, Jn as createFilesCompletionProvider, Jt as EDIT_TOOL_NAMES, K as discoverProjectMcps, Kn as uniqueSkillNamesFromReferences, Kt as useConfig, L as splitPromptSegments, Ln as ensureKeybindingsFile, Mn as summarizeOutcomes, Nn as findGitRoot, Nr as accentColor, On as parseEditOutcomesFromResult, Ot as SETTINGS_TOGGLES, Pt as resolveChipColor, Q as McpAuthProvider, Qt as isEditErrorResult, R as formatPathForCwd, St as fmtTokens, T as SafeModeProvider, Tn as buildEditOutcomesAnnotation, Tt as useEnabledToggleSet, U as indexOfEntry, Ut as useDiscovery, V as buildModelCatalog, Vt as createDiscoverySlot, W as buildMcpServers, Wt as useDiscoveryOptional, Xt as deriveSessionTitle, Y as createFileMcpCredentialStore, Yr as useActiveTodos, Zt as eventsFromTurns, _ as turnContextSize, _t as truncateTrailing, a as computeTurnAnchors, ar as bootTick, at as InteractionsProvider, b as defaultSkillScanPaths, bn as filetypeFromPath, bt as ageString, c as formatToolCall, cn as sumRunCosts, ct as createInteractionTools, d as useSelectStyle, dn as toolResultText, dt as pendingInteractionsFromTurns, en as isVisible, er as useCompletion, et as useMcpAuthState, f as useSurfaces, fn as turnSelectionOwnership, g as finalizeStreamingMarkdownForOwner, gn as buildUnifiedDiff, gt as hintsLength, h as finalizeStreamingMarkdown, hn as buildContextualDiff, ht as clipHintsToWidth, i as turnAsText, in as marginTopFor, j as isOnSafelist, jn as stripEditOutcomesAnnotation, jt as useSettings, k as addToSafelist, kn as resolveApprovalForPayload, kt as SettingsProvider, l as ThemeProvider, m as useTheme, mt as useInteractionsQueue, n as deleteTurnSafely, nn as listSessionMeta, nr as buildLinearRamp, o as TOOL_DISPLAY, oi as buildBuildSystem, on as selectableTurnIds, or as shouldAutoCompact, pn as updateToolEventOutcomes, pr as setProviderCredential, pt as useInteractionsActions, qt as resolveConfig, r as truncateTurnsAt, rr as tryOpenBrowser, rt as splitMarkdownCodeBlocks, s as displayNameFor, si as buildPlanSystem, sn as stripSpawnTokensLine, sr as detectAuth, st as buildResumedToolResultsTurn, tn as lastContextSizeFromTurns, tr as blendHsl, tt as getMcpAuthStatus, u as useColors, un as toolCallPreview, ut as makeRequestInteraction, v as useStreamBuffer, w as writeSessionExport, wt as listProjectFiles, x as discoverProjectSkills, xn as previewEditPayload, xr as getContextWindow, xt as compactPath, y as buildSkillsConfig, yn as extractEditPayload, yt as generateSessionTitle, z as runOAuthLogin, zn as matchesBinding, zr as TODO_STATUS_GLYPHS } from "./turn-operations-OzKEOXul.js";
+import { $ as useMcpAuthDispatch, $n as tryOpenBrowser, A as getSafelist, At as resolveChipColor, B as supportsOAuth, Bt as useDiscoveryOptional, Cn as mergeApprovalAndBodyOutcomes, Cr as piIdOf, Ct as SETTINGS_CHOICES, D as useSafeModeQueue, Dn as stripEditOutcomesAnnotation, Dt as useSettings, E as useSafeModeActions, En as rewriteMultiEditHeader, Et as clampFps, F as suggestSafelistEntry, Fn as matchesBinding, Fr as TODO_STATUS_GLYPHS, Gr as useActiveTodos, H as filterModelCatalog, Hn as uniqueSkillNamesFromReferences, Ht as useConfig, Jt as isEditErrorResult, K as discoverProjectMcps, Kt as deriveSessionTitle, L as splitPromptSegments, Lt as createDiscoverySlot, Nn as ensureKeybindingsFile, On as summarizeOutcomes, Q as McpAuthProvider, Qn as buildLinearRamp, Qt as listSessionMeta, R as formatPathForCwd, Rt as DiscoveryProvider, St as DEFAULT_SETTINGS, T as SafeModeProvider, Tn as resolveApprovalForPayload, Tt as SettingsProvider, U as indexOfEntry, Ut as resolveConfig, V as buildModelCatalog, Vn as createSkillsCompletionProvider, Vt as ConfigProvider, W as buildMcpServers, Wn as createFilesCompletionProvider, Wt as EDIT_TOOL_NAMES, Xn as useCompletion, Xt as isVisible, Y as createFileMcpCredentialStore, Yt as isTurnHighlighted, Zn as blendHsl, Zt as lastContextSizeFromTurns, _ as turnContextSize, _n as previewEditPayload, _r as getContextWindow, _t as truncateTrailing, a as computeTurnAnchors, at as InteractionsProvider, b as defaultSkillScanPaths, bt as listProjectFiles, c as formatToolCall, cn as turnSelectionOwnership, ct as createInteractionTools, d as useSelectStyle, dn as buildContextualDiff, dt as pendingInteractionsFromTurns, en as marginTopFor, et as useMcpAuthState, f as useSurfaces, fn as buildUnifiedDiff, g as finalizeStreamingMarkdownForOwner, gn as filetypeFromPath, gt as hintsLength, h as finalizeStreamingMarkdown, hn as extractEditPayload, ht as clipHintsToWidth, i as turnAsText, in as sumRunCosts, j as isOnSafelist, jt as resolveTheme, k as addToSafelist, kn as findGitRoot, kr as accentColor, l as ThemeProvider, ln as updateToolEventOutcomes, lr as setProviderCredential, m as useTheme, mt as useInteractionsQueue, n as deleteTurnSafely, ni as buildBuildSystem, nn as selectableTurnIds, nr as shouldAutoCompact, o as TOOL_DISPLAY, on as toolCallPreview, pt as useInteractionsActions, qt as eventsFromTurns, r as truncateTurnsAt, ri as buildPlanSystem, rn as stripSpawnTokensLine, rr as detectAuth, rt as splitMarkdownCodeBlocks, s as displayNameFor, sn as toolResultText, st as buildResumedToolResultsTurn, tr as bootTick, tt as getMcpAuthStatus, u as useColors, ut as makeRequestInteraction, v as useStreamBuffer, w as writeSessionExport, wn as parseEditOutcomesFromResult, wt as SETTINGS_TOGGLES, x as discoverProjectSkills, xn as buildEditOutcomesAnnotation, xt as useEnabledToggleSet, y as buildSkillsConfig, yn as summarizeEditPayload, yr as modelSupportsReasoning, yt as generateSessionTitle, z as runOAuthLogin, zt as useDiscovery } from "./turn-operations-CtgBlBHn.js";
+import { homedir } from "node:os";
 import { spawn } from "node:child_process";
-import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
-import { homedir } from "node:os";
+import { Buffer } from "node:buffer";
 import { createContext, createElement, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { BoxRenderable, CodeRenderable, RGBA, SyntaxStyle, TextRenderable, addDefaultParsers, createCliRenderer, decodePasteBytes, defaultTextareaKeyBindings, getTreeSitterClient, stripAnsiSequences } from "@opentui/core";
 import { createRoot, useKeyboard, useRenderer, useSelectionHandler, useTerminalDimensions } from "@opentui/react";
@@ -250,7 +250,10 @@ function CancelToolModal({ inFlight, onCancel, onCancelAll, onClose }) {
 		}
 		if (key.name === "return") {
 			const row = rows[safeIndex];
-			if (row) onCancel(row.callId, "user-clicked-cancel");
+			if (row) {
+				const result = onCancel(row, "user-clicked-cancel");
+				if (result instanceof Promise) result.catch(() => {});
+			}
 			onClose();
 			return;
 		}
@@ -322,6 +325,7 @@ function CancelToolRow({ row, isFocused, highlightBg, elapsedColWidth, callIdCol
 	const elapsed = formatElapsed(Date.now() - row.startedAt).padStart(elapsedColWidth, " ");
 	const idLabel = truncate(row.callId, callIdColWidth).padEnd(callIdColWidth, " ");
 	const childLabel = (row.childId ? `· ${row.childId}` : "").padEnd(childColWidth, " ");
+	const kindGlyph = row.kind === "task" ? "⌁" : "·";
 	return /* @__PURE__ */ jsx("box", {
 		style: {
 			height: 1,
@@ -341,6 +345,14 @@ function CancelToolRow({ row, isFocused, highlightBg, elapsedColWidth, callIdCol
 					fg: COLOR.mute,
 					children: " "
 				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.warn : COLOR.mute,
+					children: kindGlyph
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
 				/* @__PURE__ */ jsx("span", {
 					fg: isFocused ? COLOR.brand : COLOR.dim,
 					children: row.tool
@@ -571,8 +583,15 @@ function CrushThrobber({ label, size = 15, from, to, labelColor }) {
 * embedded Tree-sitter language tokens (`keyword`, `string`, `function`,
 * …) — OpenTUI's `<markdown>` re-uses the same `SyntaxStyle` for the
 * fenced-code renderable, so one table drives both surfaces.
+*
+* `overrides`, when set, replaces individual entries by token name —
+* each override is merged INTO the resolved entry (shallow). Used by
+* the "on-selection" variant to swap `markup.raw.bg` for the row's
+* selection surface so inline code chips blend into the highlight
+* rather than reading as "punched out" rectangles. Top-level keys
+* absent from the base theme become brand-new entries.
 */
-function buildMdStyle(theme) {
+function buildMdStyle(theme, overrides) {
 	const styles = {};
 	for (const [token, style] of Object.entries(theme.syntax)) {
 		const out = {};
@@ -584,13 +603,26 @@ function buildMdStyle(theme) {
 		if (style.dim) out.dim = true;
 		styles[token] = out;
 	}
+	if (overrides) for (const [token, patch] of Object.entries(overrides)) styles[token] = {
+		...styles[token] ?? {},
+		...patch
+	};
 	return SyntaxStyle.fromStyles(styles);
 }
 const MdStyleContext = createContext(null);
 function MdStyleProvider({ children }) {
 	const theme = useTheme();
-	const style = useMemo(() => buildMdStyle(theme), [theme]);
-	return createElement(MdStyleContext.Provider, { value: style }, children);
+	const bundle = useMemo(() => {
+		const selectionBg = RGBA.fromHex(theme.surfaces.selection);
+		return {
+			regular: buildMdStyle(theme),
+			selected: buildMdStyle(theme, {
+				"markup.raw": { bg: selectionBg },
+				"markup.raw.block": { bg: selectionBg }
+			})
+		};
+	}, [theme]);
+	return createElement(MdStyleContext.Provider, { value: bundle }, children);
 }
 /**
 * Active markdown / syntax-highlighting style. Returns a single shared
@@ -598,13 +630,18 @@ function MdStyleProvider({ children }) {
 * mount, re-built on theme switch. A `Settings.theme` flip re-paints every
 * `<markdown>` that reads this hook.
 *
+* Pass `{ selected: true }` to get the on-selection variant where inline
+* code chips' background matches the row's selection surface (so the
+* chips blend into the highlight rather than reading as punched-out
+* rectangles).
+*
 * Throws if used outside `<MdStyleProvider>` so a missing wiring shows up
 * loudly in development rather than silently rendering plain text.
 */
-function useMdStyle() {
-	const style = useContext(MdStyleContext);
-	if (!style) throw new Error("useMdStyle must be used inside <MdStyleProvider>");
-	return style;
+function useMdStyle(opts = {}) {
+	const bundle = useContext(MdStyleContext);
+	if (!bundle) throw new Error("useMdStyle must be used inside <MdStyleProvider>");
+	return opts.selected ? bundle.selected : bundle.regular;
 }
 const CHIP_TOKEN_PREFIX = "completion.reference";
 /** Per-kind token name in the chip `SyntaxStyle` — e.g. `completion.reference.skills`. */
@@ -718,7 +755,7 @@ function useChipHighlights(textareaRef, references, chipStyle) {
 * same-turn events read as one continuous highlighted block instead of a
 * striped list.
 */
-const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId }) => {
+const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId, hideChildLabel = false }) => {
 	const SURFACE = useSurfaces();
 	const gap = marginTopFor(event, previous);
 	return /* @__PURE__ */ jsx("box", {
@@ -733,7 +770,9 @@ const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, an
 		},
 		children: /* @__PURE__ */ jsx(EventLineImpl, {
 			event,
-			depthOffset
+			depthOffset,
+			hideChildLabel,
+			selected
 		})
 	});
 });
@@ -1229,11 +1268,12 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds }) {
 	}, [events]);
 	const title = childIds.length === 0 ? " subagent " : childIds.length === 1 ? ` ${childIds[0]} ` : ` subagents · ${childIds.join(", ")} `;
 	const marginTop = previous ? 1 : 0;
+	const hideChildLabel = childIds.length === 1;
 	return /* @__PURE__ */ jsx("box", {
 		title,
 		style: {
 			border: true,
-			borderColor: COLOR.mute,
+			borderColor: COLOR.brand,
 			paddingLeft: 1,
 			paddingRight: 1,
 			paddingTop: 0,
@@ -1248,7 +1288,8 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds }) {
 			previous: events[i - 1],
 			depthOffset: 1,
 			selected: selectedTurnId !== null && evt.turnId === selectedTurnId,
-			anchorId: anchorIds?.[i]
+			anchorId: anchorIds?.[i],
+			hideChildLabel
 		}, i))
 	});
 }
@@ -1290,7 +1331,7 @@ function rowStyle(paddingLeft) {
 		alignSelf: "stretch"
 	};
 }
-function EventLineImpl({ event, depthOffset = 0 }) {
+function EventLineImpl({ event, depthOffset = 0, hideChildLabel = false, selected = false }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
 	const safeText = event.text === "" ? " " : event.text;
@@ -1353,7 +1394,8 @@ function EventLineImpl({ event, depthOffset = 0 }) {
 			style: row,
 			children: /* @__PURE__ */ jsx(MarkdownBlock, {
 				text: event.text,
-				dim: child
+				dim: child,
+				selected
 			})
 		});
 		case "spawn-start": return /* @__PURE__ */ jsx("box", {
@@ -1365,10 +1407,13 @@ function EventLineImpl({ event, depthOffset = 0 }) {
 						fg: COLOR.accent,
 						children: "🌱 "
 					}),
-					/* @__PURE__ */ jsx("span", {
-						fg: COLOR.dim,
-						children: `[${event.childId ?? "child"}] `
-					}),
+					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.brand,
+						children: event.childId ?? "child"
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.dim,
 						children: safeText
@@ -1385,10 +1430,13 @@ function EventLineImpl({ event, depthOffset = 0 }) {
 						fg: COLOR.accent,
 						children: "🌳 "
 					}),
-					/* @__PURE__ */ jsx("span", {
-						fg: COLOR.dim,
-						children: `[${event.childId ?? "child"}] `
-					}),
+					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+						fg: COLOR.brand,
+						children: event.childId ?? "child"
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
 					/* @__PURE__ */ jsx("span", {
 						fg: COLOR.mute,
 						children: safeText
@@ -1400,10 +1448,80 @@ function EventLineImpl({ event, depthOffset = 0 }) {
 			event,
 			indent: row.paddingLeft
 		});
+		case "task-notification": return /* @__PURE__ */ jsx(TaskNotificationBlock, {
+			event,
+			indent: row.paddingLeft
+		});
 		default: return /* @__PURE__ */ jsx("text", { children: safeText });
 	}
 }
 /**
+* One-line completion banner for a background task that exited or was
+* killed. Visual contract:
+*
+*   - Glyph color reflects exit cleanliness:
+*       `'exited'` exit code 0 → success (subtle accent — quiet).
+*       `'exited'` non-zero    → warn  (model / user should notice).
+*       `'killed'`             → warn  (we issued SIGTERM).
+*   - Task id reads in the agent's brand accent so the banner stands
+*     apart from surrounding markdown without screaming.
+*   - Status label takes the same accent as the glyph — color-coupling
+*     reinforces the "this is what happened" mental model at a glance.
+*   - Output path is `compactPath()`-formatted (`~/.zidane/...` when
+*     under `$HOME`) so the column doesn't blow past terminal width
+*     just to show the user's home prefix they already know about.
+*
+* Vertical spacing comes from `marginTopFor` — banners get a `tool`-like
+* gap before (and the next non-task event provides the gap after), but
+* consecutive banners stack tightly so a burst of completions doesn't
+* scatter the transcript.
+*/
+function TaskNotificationBlock({ event, indent }) {
+	const COLOR = useColors();
+	const task = event.task;
+	const statusAccent = (task ? task.status === "killed" || task.exitCode !== 0 : false) ? COLOR.warn : COLOR.brand;
+	const statusLabel = task ? formatTaskStatus(task) : "done";
+	const displayPath = task?.outputPath ? compactPath(task.outputPath) : "";
+	return /* @__PURE__ */ jsx("box", {
+		style: { paddingLeft: indent },
+		children: /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: statusAccent,
+					children: "⌁ "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.brand,
+					children: task?.taskId ?? "?"
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: statusAccent,
+					children: statusLabel
+				}),
+				task && task.durationMs > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}), /* @__PURE__ */ jsx("span", {
+					fg: COLOR.dim,
+					children: formatDuration(task.durationMs)
+				})] }),
+				displayPath && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " · "
+				}), /* @__PURE__ */ jsx("span", {
+					fg: COLOR.dim,
+					children: displayPath
+				})] })
+			]
+		})
+	});
+}
+/**
 * Boundary card for `compact-summary` events. Two visual rows:
 *
 *   1. Meta line — emoji + replaced-turn count + model + token usage,
@@ -1821,10 +1939,10 @@ function parseBlockIndex(id) {
 	const parsed = Number.parseInt(match[1] ?? "", 10);
 	return Number.isFinite(parsed) ? parsed : 0;
 }
-const MarkdownBlock = memo(({ text, dim }) => {
+const MarkdownBlock = memo(({ text, dim, selected = false }) => {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
-	const mdStyle = useMdStyle();
+	const mdStyle = useMdStyle({ selected });
 	const renderer = useRenderer();
 	const content = text.replace(/^\n+|\n+$/g, "");
 	const bag = useRef({
@@ -1846,7 +1964,7 @@ const MarkdownBlock = memo(({ text, dim }) => {
 		streaming: true,
 		internalBlockMode: "coalesced",
 		fg: dim ? COLOR.dim : void 0,
-		bg: SURFACE.background,
+		bg: selected ? SURFACE.selection : SURFACE.background,
 		renderNode
 	});
 });
@@ -8699,6 +8817,26 @@ function AppShell() {
 	const inFlightToolsRef = useRef([]);
 	inFlightToolsRef.current = inFlightTools;
 	/**
+	* Live registry of running background tasks — populated by
+	* `background:start` (and `child:background:start`), drained by
+	* `background:exit` (and the child sibling). Same shape as
+	* {@link InFlightToolCall} so it merges cleanly into the cancel-tool
+	* picker's snapshot; the `kind: 'task'` discriminator routes the
+	* cancel callback to `agent.killBackgroundTask(taskId)` instead of
+	* `agent.cancelTool(callId)`.
+	*
+	* Tracked separately from `inFlightTools` because the two have
+	* different lifetimes: a tool call is in-flight only while
+	* `tool:before` and `tool:after` straddle, but a background task
+	* survives PAST its spawning tool call — the `shell` body returns
+	* the handle and `tool:after` fires while the task keeps running.
+	* Without this separate registry, `ctrl+k` would never see a task
+	* because the tool entry has already drained.
+	*/
+	const [backgroundTasks, setBackgroundTasks] = useState([]);
+	const backgroundTasksRef = useRef([]);
+	backgroundTasksRef.current = backgroundTasks;
+	/**
 	* Names of currently-active skills, tracked via `skills:activate` /
 	* `skills:deactivate` hooks. Drives the footer's "✦ N skill(s)"
 	* chip — the user's only passive surface for noticing that a skill
@@ -8816,6 +8954,10 @@ function AppShell() {
 			persistThreshold: 0,
 			persistDir
 		} : { persistDir };
+		const tasksDir = resolveTasksDir({
+			userDir: dataDir,
+			sessionId: session.id
+		});
 		const agent = createAgent({
 			...profile.preset,
 			...builtInSystem ? { system: builtInSystem } : {},
@@ -8830,7 +8972,8 @@ function AppShell() {
 			},
 			behavior: {
 				...profile.preset.behavior ?? {},
-				...persistBehavior
+				...persistBehavior,
+				tasksDir
 			},
 			provider: descriptor.factory(),
 			session,
@@ -9022,6 +9165,44 @@ function AppShell() {
 		agent.hooks.hook("tool:cancelled", ({ callId }) => {
 			unregisterInFlightTool(callId);
 		});
+		const registerBackgroundTask = (ctx) => {
+			setBackgroundTasks((prev) => [...prev, {
+				kind: "task",
+				callId: ctx.taskId,
+				tool: `shell (background): ${previewLine(ctx.command, 60)}`,
+				startedAt: ctx.startedAt,
+				...ctx.childId ? { childId: ctx.childId } : {}
+			}]);
+		};
+		const dropBackgroundTaskAndEmitBanner = (ctx) => {
+			setBackgroundTasks((prev) => prev.filter((t) => t.callId !== ctx.taskId));
+			streamRef.current?.appendImmediate({
+				kind: "task-notification",
+				text: formatTaskSummary(ctx),
+				task: {
+					taskId: ctx.taskId,
+					status: ctx.status,
+					exitCode: ctx.exitCode,
+					outputPath: ctx.outputPath,
+					command: ctx.command,
+					durationMs: ctx.durationMs
+				},
+				...ctx.childId ? { childId: ctx.childId } : {},
+				...typeof ctx.depth === "number" ? { depth: ctx.depth } : {}
+			});
+		};
+		agent.hooks.hook("background:start", (ctx) => registerBackgroundTask(ctx));
+		agent.hooks.hook("background:exit", (ctx) => dropBackgroundTaskAndEmitBanner(ctx));
+		agent.hooks.hook("background:reassign", (ctx) => {
+			setBackgroundTasks((prev) => prev.map((entry) => entry.callId === ctx.taskId ? {
+				kind: "task",
+				callId: entry.callId,
+				tool: entry.tool,
+				startedAt: entry.startedAt
+			} : entry));
+		});
+		agent.hooks.hook("child:background:start", (ctx) => registerBackgroundTask(ctx));
+		agent.hooks.hook("child:background:exit", (ctx) => dropBackgroundTaskAndEmitBanner(ctx));
 		agent.hooks.hook("skills:activate", ({ skill }) => {
 			setActiveSkillNames((prev) => {
 				if (prev.has(skill.name)) return prev;
@@ -9063,7 +9244,7 @@ function AppShell() {
 			stream.flushAndUpdate(finalizeStreamingMarkdown);
 		});
 		agent.hooks.hook("spawn:before", ({ id, task, depth }) => {
-			const taskPreview = task.length > 80 ? `${task.slice(0, 80)}…` : task;
+			const taskPreview = previewLine(task, 80);
 			stream.appendImmediate({
 				kind: "spawn-start",
 				text: taskPreview,
@@ -9201,6 +9382,7 @@ function AppShell() {
 		sessionSafelistRef.current.clear();
 		pendingAnnotationsRef.current.clear();
 		setInFlightTools([]);
+		setBackgroundTasks([]);
 		setActiveSkillNames(/* @__PURE__ */ new Set());
 	}, [
 		stream,
@@ -9929,6 +10111,10 @@ function AppShell() {
 			userDir: dataDir,
 			sessionId: id
 		}));
+		cleanupPersistedSession(resolveTasksDir({
+			userDir: dataDir,
+			sessionId: id
+		}));
 		const wasCurrent = id === currentSession?.id;
 		if (wasCurrent) {
 			await teardown();
@@ -10320,16 +10506,24 @@ function AppShell() {
 			onCycleAgent();
 			return;
 		}
-		if (matchesBinding(key, keybindings.cancelToolCall) && screen === "chat" && busy && !pendingApproval) {
-			const snapshot = inFlightToolsRef.current;
+		if (matchesBinding(key, keybindings.cancelToolCall) && screen === "chat" && !pendingApproval) {
+			const tools = inFlightToolsRef.current.filter((entry) => entry.childId === void 0);
+			const tasks = backgroundTasksRef.current.filter((entry) => entry.childId === void 0);
+			const snapshot = [...tools, ...tasks];
 			if (snapshot.length === 0) return;
 			modal.open(/* @__PURE__ */ jsx(CancelToolModal, {
 				inFlight: snapshot,
-				onCancel: (callId, reason) => agentRef.current?.cancelTool(callId, reason) ?? false,
+				onCancel: (entry, reason) => {
+					const agent = agentRef.current;
+					if (!agent) return false;
+					if (entry.kind === "task") return agent.killBackgroundTask(entry.callId);
+					return agent.cancelTool(entry.callId, reason);
+				},
 				onCancelAll: () => {
 					const agent = agentRef.current;
 					if (!agent) return;
-					for (const entry of inFlightToolsRef.current) agent.cancelTool(entry.callId, "user-cancelled-all");
+					for (const entry of snapshot) if (entry.kind === "task") agent.killBackgroundTask(entry.callId);
+					else agent.cancelTool(entry.callId, "user-cancelled-all");
 				},
 				onClose: () => modal.close()
 			}));
@@ -10367,7 +10561,7 @@ function AppShell() {
 		agentLabel: pickedAgent.label,
 		agentColor: accentColor(pickedAgent.accent, COLOR),
 		keybindings,
-		inFlightToolCount: inFlightTools.length,
+		inFlightToolCount: inFlightTools.reduce((n, entry) => entry.childId === void 0 ? n + 1 : n, 0) + backgroundTasks.reduce((n, entry) => entry.childId === void 0 ? n + 1 : n, 0),
 		activeSkillCount: activeSkillNames.size,
 		skillsChipColor: COLOR.brand
 	}), [
@@ -10384,6 +10578,7 @@ function AppShell() {
 		modelHasReasoning,
 		keybindings,
 		inFlightTools,
+		backgroundTasks,
 		activeSkillNames
 	]);
 	const queuedMessagePreviews = useMemo(() => messageQueue.map((m) => ({
@@ -10550,7 +10745,7 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 		const baseBusyHints = [];
 		if (inFlightToolCount > 0) baseBusyHints.push({
 			key: keybindings.cancelToolCall,
-			label: inFlightToolCount === 1 ? "cancel tool" : `cancel tool (${inFlightToolCount})`
+			label: inFlightToolCount === 1 ? "cancel" : `cancel (${inFlightToolCount})`
 		});
 		baseBusyHints.push({
 			key: "esc",
@@ -10611,6 +10806,10 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 		label: activeSkillCount === 1 ? "1 skill" : `${activeSkillCount} skills`,
 		labelColor: skillsChipColor
 	} : null;
+	const cancelTaskChip = inFlightToolCount > 0 ? {
+		key: keybindings.cancelToolCall,
+		label: inFlightToolCount === 1 ? "cancel task" : `cancel task (${inFlightToolCount})`
+	} : null;
 	return [
 		...hasMultipleAgents ? [{
 			key: keybindings.cycleAgent,
@@ -10619,6 +10818,7 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 		}] : [],
 		...modelHint ? [modelHint] : [],
 		...skillsChip ? [skillsChip] : [],
+		...cancelTaskChip ? [cancelTaskChip] : [],
 		...currentSession ? [{
 			key: keybindings.openSessionDetails,
 			label: "session"