zidane 5.4.2 → 5.4.3

package/dist/tui.js

@@ -1,11 +1,11 @@
-import { D as resolvePersistDir, T as cleanupPersistedSession, p as createAgent } from "./tools-BNfyY14s.js";
-import { s as errorMessage } from "./errors-Byb0F8B9.js";
-import { s as McpOAuthProvider, t as connectMcpServers } from "./mcp-DhmmJfxK.js";
-import { C as summaryToTurn, a as selectFilesFromSession, r as buildPostCompactAttachments, s as compactConversation, t as loginMcpServer } from "./login-CJbeAadS.js";
+import { E as cleanupPersistedSession, O as resolvePersistDir, p as createAgent } from "./tools-BK2vG9UX.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 { n as formatTokenUsage } from "./stats-DgOvY7wd.js";
-import { n as loadSession, t as createSession } from "./session-BHZwxmfr.js";
+import { n as loadSession, t as createSession } from "./session-kwsNnOmt.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as useMcpAuthDispatch, $n as blendHsl, $t as isVisible, A as getSafelist, An as summarizeOutcomes, At as clampFps, B as supportsOAuth, Cn as buildEditOutcomesAnnotation, Ct as shortId, D as useSafeModeQueue, Dn as resolveApprovalForPayload, Dt as SETTINGS_CHOICES, E as useSafeModeActions, En as parseEditOutcomesFromResult, Et as DEFAULT_SETTINGS, F as suggestSafelistEntry, Fn as ensureKeybindingsFile, Ft as resolveTheme, Gt as ConfigProvider, H as filterModelCatalog, Ht as DiscoveryProvider, K as discoverProjectMcps, Kn as createFilesCompletionProvider, Kt as useConfig, L as splitPromptSegments, Ln as matchesBinding, Lr as TODO_STATUS_GLYPHS, On as rewriteMultiEditHeader, Ot as SETTINGS_TOGGLES, Pt as resolveChipColor, Q as McpAuthProvider, Qn as useCompletion, Qt as isTurnHighlighted, R as formatPathForCwd, St as fmtTokens, T as SafeModeProvider, Tn as mergeApprovalAndBodyOutcomes, Tr as piIdOf, Tt as useEnabledToggleSet, U as indexOfEntry, Un as createSkillsCompletionProvider, Ut as useDiscovery, V as buildModelCatalog, Vt as createDiscoverySlot, W as buildMcpServers, Wn as uniqueSkillNamesFromReferences, Wt as useDiscoveryOptional, Xt as eventsFromTurns, Y as createFileMcpCredentialStore, Yt as deriveSessionTitle, Zt as isEditErrorResult, _ as turnContextSize, _t as truncateTrailing, a as computeTurnAnchors, ai as buildPlanSystem, an as selectableTurnIds, ar as detectAuth, at as InteractionsProvider, b as defaultSkillScanPaths, bn as previewEditPayload, bt as ageString, c as formatToolCall, ct as createInteractionTools, d as useSelectStyle, dn as turnSelectionOwnership, dr as setProviderCredential, dt as pendingInteractionsFromTurns, en as lastContextSizeFromTurns, er as buildLinearRamp, et as useMcpAuthState, f as useSurfaces, fn as updateToolEventOutcomes, g as finalizeStreamingMarkdownForOwner, gt as hintsLength, h as finalizeStreamingMarkdown, hn as buildUnifiedDiff, ht as clipHintsToWidth, i as turnAsText, ii as buildBuildSystem, ir as shouldAutoCompact, j as isOnSafelist, jn as findGitRoot, jr as accentColor, jt as useSettings, k as addToSafelist, kn as stripEditOutcomesAnnotation, kt as SettingsProvider, l as ThemeProvider, ln as toolCallPreview, m as useTheme, mt as useInteractionsQueue, n as deleteTurnSafely, o as TOOL_DISPLAY, on as stripSpawnTokensLine, pt as useInteractionsActions, qr as useActiveTodos, qt as resolveConfig, r as truncateTurnsAt, rn as marginTopFor, rr as bootTick, rt as splitMarkdownCodeBlocks, s as displayNameFor, sn as sumRunCosts, st as buildResumedToolResultsTurn, tn as listSessionMeta, tr as tryOpenBrowser, tt as getMcpAuthStatus, u as useColors, un as toolResultText, ut as makeRequestInteraction, v as useStreamBuffer, vn as extractEditPayload, w as writeSessionExport, wt as listProjectFiles, x as discoverProjectSkills, xr as modelSupportsReasoning, xt as compactPath, y as buildSkillsConfig, yn as filetypeFromPath, yr as getContextWindow, yt as generateSessionTitle, z as runOAuthLogin } from "./turn-operations-TKvy0q29.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 { spawn } from "node:child_process";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
@@ -223,6 +223,170 @@ function EmptyState$1() {
 	});
 }
 //#endregion
+//#region src/tui/cancel-tool-modal.tsx
+/** @jsxImportSource @opentui/react */
+function CancelToolModal({ inFlight, onCancel, onCancelAll, onClose }) {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const { width: termWidth } = useTerminalDimensions();
+	const [selectedIdx, setSelectedIdx] = useState(0);
+	const rows = inFlight;
+	const empty = rows.length === 0;
+	useEffect(() => {
+		if (!empty) return;
+		const t = setTimeout(onClose, 500);
+		return () => clearTimeout(t);
+	}, [empty, onClose]);
+	const safeIndex = empty ? 0 : Math.min(selectedIdx, rows.length - 1);
+	useKeyboard((key) => {
+		if (empty) return;
+		if (key.name === "up") {
+			setSelectedIdx((i) => ((i - 1) % rows.length + rows.length) % rows.length);
+			return;
+		}
+		if (key.name === "down") {
+			setSelectedIdx((i) => (i + 1) % rows.length);
+			return;
+		}
+		if (key.name === "return") {
+			const row = rows[safeIndex];
+			if (row) onCancel(row.callId, "user-clicked-cancel");
+			onClose();
+			return;
+		}
+		if (key.name === "a") {
+			onCancelAll();
+			onClose();
+		}
+	});
+	const elapsedColWidth = 8;
+	const callIdColWidth = 14;
+	const childColWidth = 10;
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "cancel tool call",
+		bottomTitle: empty ? "no calls in flight" : `${rows.length} in flight`,
+		maxWidth: Math.min(96, Math.max(64, termWidth - 8)),
+		minWidth: 56,
+		onClose,
+		children: [empty ? /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.dim,
+			children: [/* @__PURE__ */ jsx("span", {
+				fg: COLOR.mute,
+				children: "no tool calls are currently in flight — "
+			}), /* @__PURE__ */ jsx("span", {
+				fg: COLOR.dim,
+				children: "nothing to cancel."
+			})]
+		}) : /* @__PURE__ */ jsx("box", {
+			style: {
+				flexDirection: "column",
+				flexShrink: 0
+			},
+			children: rows.map((row, i) => /* @__PURE__ */ jsx(CancelToolRow, {
+				row,
+				isFocused: i === safeIndex,
+				highlightBg: SURFACE.selection,
+				elapsedColWidth,
+				callIdColWidth,
+				childColWidth
+			}, row.callId))
+		}), /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.dim,
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "↑↓"
+				}),
+				" navigate · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "↵"
+				}),
+				" cancel selected · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "a"
+				}),
+				" cancel all · ",
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: "esc"
+				}),
+				" close"
+			]
+		})]
+	});
+}
+function CancelToolRow({ row, isFocused, highlightBg, elapsedColWidth, callIdColWidth, childColWidth }) {
+	const COLOR = useColors();
+	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, " ");
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			height: 1,
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexShrink: 0,
+			backgroundColor: isFocused ? highlightBg : void 0
+		},
+		children: /* @__PURE__ */ jsxs("text", {
+			wrapMode: "none",
+			children: [
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.mute,
+					children: isFocused ? "›" : " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: " "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: isFocused ? COLOR.brand : COLOR.dim,
+					children: row.tool
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: "  "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: idLabel
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: "  "
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.mute,
+					children: childLabel
+				}),
+				/* @__PURE__ */ jsx("span", {
+					fg: COLOR.warn,
+					children: elapsed
+				})
+			]
+		})
+	});
+}
+/**
+* Format a sub-minute duration as `0.3s` / `7.4s`; minute-plus as `2m12s`.
+* Tight + monospace-friendly so the column stays right-aligned.
+*/
+function formatElapsed(ms) {
+	if (ms < 0) return "0.0s";
+	if (ms < 6e4) return `${(ms / 1e3).toFixed(1)}s`;
+	const totalSeconds = Math.floor(ms / 1e3);
+	const minutes = Math.floor(totalSeconds / 60);
+	const seconds = totalSeconds % 60;
+	return `${minutes}m${String(seconds).padStart(2, "0")}s`;
+}
+function truncate(s, max) {
+	if (s.length <= max) return s;
+	if (max <= 1) return s.slice(0, max);
+	return `${s.slice(0, max - 1)}…`;
+}
+//#endregion
 //#region src/tui/clipboard.ts
 /**
 * Two-pronged clipboard write.
@@ -1721,11 +1885,15 @@ function EditDiffBlock({ payload, dim }) {
 	const COLOR = useColors();
 	const SURFACE = useSurfaces();
 	const mdStyle = useMdStyle();
+	const { settings } = useSettings();
 	const filetype = useMemo(() => filetypeFromPath(payload.path), [payload.path]);
 	const replaceAllCount = payload.hunks.filter((h) => h.replaceAll).length;
 	const hunkBadge = payload.tool === "multi_edit" && payload.hunks.length > 1 ? `${payload.hunks.length} hunks` : null;
-	const summary = summarizeOutcomes(payload.outcomes);
-	const perHunkMode = !!payload.outcomes && summary.denied + summary.skipped + summary.failed > 0;
+	const outcomeSummary = summarizeOutcomes(payload.outcomes);
+	const hasMixedOutcomes = !!payload.outcomes && outcomeSummary.denied + outcomeSummary.skipped + outcomeSummary.failed > 0;
+	const editSummary = useMemo(() => summarizeEditPayload(payload), [payload]);
+	const perHunkMode = hasMixedOutcomes;
+	const compact = settings.editDiffDisplay === "compact";
 	return /* @__PURE__ */ jsxs("box", {
 		style: {
 			flexDirection: "column",
@@ -1751,6 +1919,24 @@ function EditDiffBlock({ payload, dim }) {
 					fg: dim ? COLOR.dim : COLOR.warn,
 					children: payload.path
 				}),
+				(editSummary.totalAdded > 0 || editSummary.totalRemoved > 0) && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					}),
+					editSummary.totalAdded > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+						children: `+${editSummary.totalAdded}`
+					}),
+					editSummary.totalAdded > 0 && editSummary.totalRemoved > 0 && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " "
+					}),
+					editSummary.totalRemoved > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+						children: `−${editSummary.totalRemoved}`
+					})
+				] }),
 				hunkBadge && /* @__PURE__ */ jsx("span", {
 					fg: COLOR.mute,
 					children: ` · ${hunkBadge}`
@@ -1765,33 +1951,36 @@ function EditDiffBlock({ payload, dim }) {
 						children: " · "
 					}),
 					/* @__PURE__ */ jsx("span", {
-						fg: summary.applied > 0 ? COLOR.accent : COLOR.mute,
-						children: `${summary.applied} applied`
+						fg: outcomeSummary.applied > 0 ? COLOR.accent : COLOR.mute,
+						children: `${outcomeSummary.applied} applied`
 					}),
-					summary.denied > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					outcomeSummary.denied > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
 						fg: COLOR.mute,
 						children: " · "
 					}), /* @__PURE__ */ jsx("span", {
 						fg: COLOR.error,
-						children: `${summary.denied} denied`
+						children: `${outcomeSummary.denied} denied`
 					})] }),
-					summary.skipped > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					outcomeSummary.skipped > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
 						fg: COLOR.mute,
 						children: " · "
 					}), /* @__PURE__ */ jsx("span", {
 						fg: COLOR.warn,
-						children: `${summary.skipped} skipped`
+						children: `${outcomeSummary.skipped} skipped`
 					})] }),
-					summary.failed > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+					outcomeSummary.failed > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
 						fg: COLOR.mute,
 						children: " · "
 					}), /* @__PURE__ */ jsx("span", {
 						fg: COLOR.error,
-						children: `${summary.failed} failed`
+						children: `${outcomeSummary.failed} failed`
 					})] })
 				] })
 			]
-		}), perHunkMode ? /* @__PURE__ */ jsx("box", {
+		}), compact ? /* @__PURE__ */ jsx(CompactDiffSummary, {
+			summary: editSummary,
+			dim
+		}) : perHunkMode ? /* @__PURE__ */ jsx("box", {
 			style: {
 				flexDirection: "column",
 				flexShrink: 0
@@ -1809,10 +1998,10 @@ function EditDiffBlock({ payload, dim }) {
 				dim
 			}, i))
 		}) : /* @__PURE__ */ jsx("diff", {
-			diff: buildUnifiedDiff(payload),
+			diff: payload.priorContent !== void 0 ? buildContextualDiff(payload, payload.priorContent) : buildUnifiedDiff(payload),
 			view: "unified",
 			wrapMode: "word",
-			showLineNumbers: false,
+			showLineNumbers: true,
 			...filetype ? { filetype } : {},
 			syntaxStyle: mdStyle,
 			addedBg: SURFACE.diff.addBg,
@@ -1828,6 +2017,91 @@ function EditDiffBlock({ payload, dim }) {
 	});
 }
 /**
+* Compact-mode body — one line per hunk under the tool header. Format:
+*
+*   `  L42 · +2 −1 · old → new`
+*
+* Where `L<n>` is the new-file line position (omitted when priorContent
+* is absent and the position is unknown), and the `old → new` preview
+* is the FIRST changed line on each side, ASCII-arrowed and truncated
+* by the renderer's own word-wrap. A pure addition shows `+ new` only;
+* a pure deletion shows `− old` only.
+*/
+function CompactDiffSummary({ summary, dim }) {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	if (summary.hunks.length === 0) return null;
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			flexDirection: "column",
+			flexShrink: 0
+		},
+		children: summary.hunks.map((h, i) => {
+			const oldPreview = h.firstOld?.trim();
+			const newPreview = h.firstNew?.trim();
+			return /* @__PURE__ */ jsxs("text", {
+				fg: dim ? COLOR.dim : COLOR.mute,
+				wrapMode: "word",
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: "  "
+					}),
+					h.line !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : COLOR.mute,
+						children: `L${h.line}`
+					}), /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
+					h.added > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+						children: `+${h.added}`
+					}),
+					h.added > 0 && h.removed > 0 && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " "
+					}),
+					h.removed > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+						children: `−${h.removed}`
+					}),
+					(oldPreview || newPreview) && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					}),
+					oldPreview && newPreview ? /* @__PURE__ */ jsxs(Fragment, { children: [
+						/* @__PURE__ */ jsx("span", {
+							fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+							children: oldPreview
+						}),
+						/* @__PURE__ */ jsx("span", {
+							fg: COLOR.mute,
+							children: " → "
+						}),
+						/* @__PURE__ */ jsx("span", {
+							fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+							children: newPreview
+						})
+					] }) : oldPreview ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+						children: "− "
+					}), /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+						children: oldPreview
+					})] }) : newPreview ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+						children: "+ "
+					}), /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+						children: newPreview
+					})] }) : null
+				]
+			}, i);
+		})
+	});
+}
+/**
 * One hunk inside an `EditDiffBlock` rendered as its own mini-diff with
 * a status badge above it. Used only in the per-hunk view (multi_edit
 * with mixed outcomes) so denied / skipped / failed edits remain
@@ -1835,9 +2109,11 @@ function EditDiffBlock({ payload, dim }) {
 */
 const BADGE_WIDTH = 7;
 function HunkBlock({ index, hunk, outcome, tool, path, filetype, mdStyle, COLOR, SURFACE, dim }) {
+	const { settings } = useSettings();
 	const kind = outcome?.kind ?? "applied";
 	const reason = outcome?.reason;
 	const dimmed = dim || kind !== "applied";
+	const compact = settings.editDiffDisplay === "compact";
 	const diffText = useMemo(() => buildUnifiedDiff({
 		tool,
 		path,
@@ -1847,6 +2123,15 @@ function HunkBlock({ index, hunk, outcome, tool, path, filetype, mdStyle, COLOR,
 		tool,
 		path
 	]);
+	const hunkStats = useMemo(() => summarizeEditPayload({
+		tool,
+		path,
+		hunks: [hunk]
+	}).hunks[0], [
+		hunk,
+		tool,
+		path
+	]);
 	const badge = kind === "applied" ? {
 		label: "applied",
 		fg: COLOR.accent
@@ -1881,6 +2166,24 @@ function HunkBlock({ index, hunk, outcome, tool, path, filetype, mdStyle, COLOR,
 					fg: badge.fg,
 					children: badge.label.padEnd(BADGE_WIDTH)
 				}),
+				hunkStats && (hunkStats.added > 0 || hunkStats.removed > 0) && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " · "
+					}),
+					hunkStats.added > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.addFg,
+						children: `+${hunkStats.added}`
+					}),
+					hunkStats.added > 0 && hunkStats.removed > 0 && /* @__PURE__ */ jsx("span", {
+						fg: COLOR.mute,
+						children: " "
+					}),
+					hunkStats.removed > 0 && /* @__PURE__ */ jsx("span", {
+						fg: dim ? COLOR.dim : SURFACE.diff.removeFg,
+						children: `−${hunkStats.removed}`
+					})
+				] }),
 				reason && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("span", {
 					fg: COLOR.mute,
 					children: ": "
@@ -1889,11 +2192,11 @@ function HunkBlock({ index, hunk, outcome, tool, path, filetype, mdStyle, COLOR,
 					children: reason
 				})] })
 			]
-		}), /* @__PURE__ */ jsx("diff", {
+		}), !compact && /* @__PURE__ */ jsx("diff", {
 			diff: diffText,
 			view: "unified",
 			wrapMode: "word",
-			showLineNumbers: false,
+			showLineNumbers: true,
 			...filetype ? { filetype } : {},
 			syntaxStyle: mdStyle,
 			addedBg: SURFACE.diff.addBg,
@@ -1913,7 +2216,7 @@ function ToolCallBlock({ event, display, dim }) {
 	const COLOR = useColors();
 	const mdStyle = useMdStyle();
 	const name = event.tool ?? "";
-	const verb = displayNameFor(name);
+	const verb = displayNameFor(name, event.input);
 	const pretty = useMemo(() => {
 		if (!event.input) return null;
 		try {
@@ -7612,6 +7915,31 @@ const PREVIEW_CHAR_MAX = 8e3;
 * keeps a comfortable shape rather than stretching to the full height.
 */
 const MAX_MODAL_HEIGHT = 28;
+const EDIT_TEXTAREA_BINDINGS = [
+	...defaultTextareaKeyBindings.filter((b) => b.name !== "return" && !(b.name === "a" && b.ctrl && !b.shift && !b.meta)),
+	{
+		name: "a",
+		ctrl: true,
+		action: "select-all"
+	},
+	{
+		name: "return",
+		action: "submit"
+	},
+	{
+		name: "return",
+		shift: true,
+		action: "newline"
+	}
+];
+/**
+* Extract the editable text from a turn — joins all `text` blocks.
+* Non-text blocks (tool_call, tool_result, thinking, etc.) are structural
+* and not included in the editable surface.
+*/
+function editableText(turn) {
+	return turn.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
+}
 function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 	const COLOR = useColors();
 	const modal = useModal();
@@ -7621,6 +7949,9 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 	const bottomTitle = `${index - 1} before · ${total - index} after`;
 	const [pending, setPending] = useState(null);
 	const [copyStatus, setCopyStatus] = useState("idle");
+	const [editing, setEditing] = useState(false);
+	const textareaRef = useRef(null);
+	const hasEditableText = turn.content.some((b) => b.type === "text");
 	const commitFork = () => {
 		modal.close();
 		actions.onFork(turn.id);
@@ -7636,7 +7967,16 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 		}
 		setCopyStatus(writeToClipboard(fullText) ? "copied" : "failed");
 	};
+	const commitEdit = () => {
+		const newText = textareaRef.current?.plainText ?? "";
+		modal.close();
+		actions.onEdit(turn.id, newText);
+	};
 	useKeyboard((key) => {
+		if (editing) {
+			if (key.name === "escape") setEditing(false);
+			return;
+		}
 		if (key.name === "escape" && pending) {
 			setPending(null);
 			return;
@@ -7658,15 +7998,22 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 			handleCopy();
 			return;
 		}
+		if (matchesBinding(key, keybindings.turnEdit)) {
+			if (!hasEditableText) return;
+			setPending(null);
+			setCopyStatus("idle");
+			setEditing(true);
+			return;
+		}
 		if (pending) setPending(null);
 	});
 	return /* @__PURE__ */ jsxs(Modal, {
-		title: `turn ${index} / ${total} · ${turn.role}`,
-		bottomTitle,
+		title: editing ? `edit turn ${index} / ${total} · ${turn.role}` : `turn ${index} / ${total} · ${turn.role}`,
+		bottomTitle: editing ? void 0 : bottomTitle,
 		maxHeight: MAX_MODAL_HEIGHT,
-		disableEscape: pending !== null,
+		disableEscape: editing || pending !== null,
 		children: [
-			/* @__PURE__ */ jsxs("text", {
+			!editing && /* @__PURE__ */ jsxs("text", {
 				fg: COLOR.dim,
 				children: [
 					/* @__PURE__ */ jsx("span", {
@@ -7705,7 +8052,7 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 					] })
 				]
 			}),
-			/* @__PURE__ */ jsxs("text", {
+			!editing && /* @__PURE__ */ jsxs("text", {
 				fg: COLOR.dim,
 				children: [/* @__PURE__ */ jsx("span", {
 					fg: COLOR.mute,
@@ -7715,7 +8062,31 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 					children: summary
 				})]
 			}),
-			/* @__PURE__ */ jsx("box", {
+			editing ? /* @__PURE__ */ jsx("box", {
+				title: " edit ",
+				style: {
+					border: true,
+					borderColor: COLOR.borderActive,
+					paddingLeft: 1,
+					paddingRight: 1,
+					flexDirection: "column",
+					flexGrow: 1,
+					flexShrink: 1,
+					minHeight: 5
+				},
+				children: /* @__PURE__ */ jsx("textarea", {
+					ref: textareaRef,
+					focused: true,
+					keyBindings: EDIT_TEXTAREA_BINDINGS,
+					initialValue: editableText(turn),
+					placeholder: "enter text…",
+					style: {
+						flexGrow: 1,
+						height: "100%"
+					},
+					onSubmit: commitEdit
+				})
+			}) : /* @__PURE__ */ jsx("box", {
 				title: " preview ",
 				style: {
 					border: true,
@@ -7740,13 +8111,34 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 					children: "— no text content —"
 				})
 			}),
-			/* @__PURE__ */ jsx(ActionRow, {
+			editing ? /* @__PURE__ */ jsxs("text", {
+				fg: COLOR.dim,
+				children: [
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "↵"
+					}),
+					" save · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "shift+↵"
+					}),
+					" newline · ",
+					/* @__PURE__ */ jsx("span", {
+						fg: COLOR.warn,
+						children: "esc"
+					}),
+					" cancel"
+				]
+			}) : /* @__PURE__ */ jsx(ActionRow, {
 				pending,
 				copyStatus,
 				canCopy: fullText.length > 0,
+				canEdit: hasEditableText,
 				forkKey: keybindings.turnFork,
 				deleteKey: keybindings.turnDelete,
-				copyKey: keybindings.turnCopy
+				copyKey: keybindings.turnCopy,
+				editKey: keybindings.turnEdit
 			})
 		]
 	});
@@ -7758,7 +8150,7 @@ function TurnDetailsModal({ turn, index, total, actions, keybindings }) {
 * by accident. The copy result rides the same row when present — same
 * geometry, no layout shift.
 */
-function ActionRow({ pending, copyStatus, canCopy, forkKey, deleteKey, copyKey }) {
+function ActionRow({ pending, copyStatus, canCopy, canEdit, forkKey, deleteKey, copyKey, editKey }) {
 	const COLOR = useColors();
 	if (pending === "fork") return /* @__PURE__ */ jsxs("text", {
 		fg: COLOR.dim,
@@ -7818,6 +8210,11 @@ function ActionRow({ pending, copyStatus, canCopy, forkKey, deleteKey, copyKey }
 				children: deleteKey
 			}),
 			" delete · ",
+			/* @__PURE__ */ jsx("span", {
+				fg: canEdit ? COLOR.warn : COLOR.mute,
+				children: editKey
+			}),
+			canEdit ? " edit · " : " (no text) · ",
 			/* @__PURE__ */ jsx("span", {
 				fg: COLOR.warn,
 				children: "esc"
@@ -7858,6 +8255,11 @@ function ActionRow({ pending, copyStatus, canCopy, forkKey, deleteKey, copyKey }
 				children: copyKey
 			}),
 			canCopy ? " copy · " : " (nothing to copy) · ",
+			/* @__PURE__ */ jsx("span", {
+				fg: canEdit ? COLOR.warn : COLOR.mute,
+				children: editKey
+			}),
+			canEdit ? " edit · " : " (no text) · ",
 			/* @__PURE__ */ jsx("span", {
 				fg: COLOR.warn,
 				children: "esc"
@@ -7919,6 +8321,42 @@ async function launchEditor(path) {
 	}).unref();
 }
 /**
+* Session-metadata key under which the TUI persists the user's "pinned"
+* active skills — the set the user toggled on via `/skill-name` and
+* expects to stay active across run boundaries (and TUI restarts).
+*
+* Separate from the agent's `skillActivationState` for two reasons:
+*   1. The framework's run-end pass deactivates everything; the pinned
+*      set survives that pass so the next prompt can re-activate.
+*   2. The agent's session-resume rehydrator only sees `skills_use`
+*      `tool_call` blocks in history. Slash-command activations bypass
+*      that path; this metadata key is the system-of-record for them.
+*/
+const ACTIVE_SKILLS_META_KEY = "zidane.activeSkills";
+/**
+* Read the pinned-skills set out of session metadata. Tolerant by
+* design — older sessions, manually-edited metadata, or a future
+* type drift all degrade to "no pins", never throw. Returns a fresh
+* Set so callers can mutate-and-store without aliasing the input.
+*/
+function readPinnedSkills(raw) {
+	if (!Array.isArray(raw)) return /* @__PURE__ */ new Set();
+	return new Set(raw.filter((v) => typeof v === "string" && v.length > 0));
+}
+/**
+* Mirror the pinned-skills set into session metadata. Sorted for
+* stable on-disk ordering (diffs / debugging). `session.setMeta`
+* already routes through `session:meta` hooks, so observers see a
+* single normalized payload regardless of insertion order.
+*
+* Imported lazily via the session ref — calling sites already
+* captured `session` in scope, so we accept it as an argument
+* rather than re-fetching from a ref.
+*/
+function persistPinnedSkills(session, pins) {
+	session.setMeta(ACTIVE_SKILLS_META_KEY, Array.from(pins).sort());
+}
+/**
 * Filter a `multi_edit` (or single `edit` / `write_file`) input's hunk
 * list down to the approved subset, in original order. Used by the
 * approval gate to rebind `ctx.input.edits` after a partial decision —
@@ -8239,6 +8677,60 @@ function AppShell() {
 	const agentRef = useRef(null);
 	const sessionRef = useRef(null);
 	/**
+	* Live registry of in-flight tool calls — populated by `tool:before`
+	* (and `child:tool:before`), drained by `tool:after` / `tool:error` /
+	* `tool:cancelled` (and their `child:*` siblings). Drives the
+	* "cancel tool call" picker (see {@link CancelToolModal}).
+	*
+	* Mirrored in `inFlightToolsRef` for callbacks that read the latest
+	* value synchronously without listing `inFlightTools` in their deps —
+	* the picker open path needs both: a state snapshot for the modal's
+	* rendered rows, and the live ref for any subsequent cancel actions
+	* that fire after the snapshot was taken.
+	*
+	* Excludes `mcp:tool:before` / `mcp:tool:after` deliberately for
+	* v1 — `agent.cancelTool(callId)` operates on the unified loop-side
+	* callId registry, which MCP tools also live in (they're dispatched
+	* through the same `executeSingleTool`), so the cancel works for
+	* them too; we just don't surface them in the picker UI yet to
+	* avoid drowning the list with high-cardinality MCP transient calls.
+	*/
+	const [inFlightTools, setInFlightTools] = useState([]);
+	const inFlightToolsRef = useRef([]);
+	inFlightToolsRef.current = inFlightTools;
+	/**
+	* 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
+	* (and its `allowed-tools` restrictions) is in effect. Cleared on
+	* session teardown alongside the rest of the per-session live state.
+	*
+	* Stored as a Set rather than an array so dedup is structural (a
+	* runaway `skills:activate` for the same name doesn't inflate the
+	* count). React state is the snapshot we render against; a fresh
+	* Set per update gives React identity-based change detection.
+	*/
+	const [activeSkillNames, setActiveSkillNames] = useState(() => /* @__PURE__ */ new Set());
+	/**
+	* Mirror of {@link activeSkillNames} for synchronous reads in
+	* `onSubmitPrompt`. The submit path runs outside React's render cycle
+	* and needs to pre-activate every user-pinned skill before
+	* `agent.run()` — listing the state in `useCallback`'s deps would
+	* re-bind the handler on every activation change, which would
+	* invalidate the textarea's submit binding on every `/skill` trigger.
+	* The ref keeps the binding stable and the read fresh.
+	*/
+	const activeSkillNamesRef = useRef(activeSkillNames);
+	activeSkillNamesRef.current = activeSkillNames;
+	const registerInFlightTool = useCallback((entry) => {
+		setInFlightTools((prev) => {
+			return [...prev.filter((e) => e.callId !== entry.callId), entry];
+		});
+	}, []);
+	const unregisterInFlightTool = useCallback((callId) => {
+		setInFlightTools((prev) => prev.filter((e) => e.callId !== callId));
+	}, []);
+	/**
 	* In-flight auto-compaction promise. Held in a ref so the next
 	* `onSubmitPrompt` invocation can `await` it before calling
 	* `agent.run()` — this is what prevents a user-submitted prompt from
@@ -8491,9 +8983,14 @@ function AppShell() {
 		agent.hooks.hook("stream:thinking", ({ delta, turnId }) => stream.queueStreamDelta("thinking", delta, { turnId }));
 		agent.hooks.hook("stream:text", ({ delta, turnId }) => stream.queueStreamDelta("markdown", delta, { turnId }));
 		agent.hooks.hook("tool:before", async ({ callId, name, input, turnId }) => {
+			registerInFlightTool({
+				callId,
+				tool: name,
+				startedAt: Date.now()
+			});
 			if (pendingAnnotationsRef.current.has(callId)) return;
 			let priorContent;
-			if (name === "write_file" && agent.handle && typeof input.path === "string") try {
+			if (EDIT_TOOL_NAMES.has(name) && agent.handle && typeof input.path === "string") try {
 				priorContent = await agent.execution.readFile(agent.handle, input.path);
 			} catch {}
 			const edit = extractEditPayload(name, input, priorContent);
@@ -8508,6 +9005,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("tool:after", ({ callId, name, result, turnId }) => {
+			unregisterInFlightTool(callId);
 			const raw = toolResultText(result);
 			const text = name === "spawn" ? stripSpawnTokensLine(raw) : raw;
 			stream.appendImmediate({
@@ -8518,6 +9016,31 @@ function AppShell() {
 				turnId
 			});
 		});
+		agent.hooks.hook("tool:error", ({ callId }) => {
+			unregisterInFlightTool(callId);
+		});
+		agent.hooks.hook("tool:cancelled", ({ callId }) => {
+			unregisterInFlightTool(callId);
+		});
+		agent.hooks.hook("skills:activate", ({ skill }) => {
+			setActiveSkillNames((prev) => {
+				if (prev.has(skill.name)) return prev;
+				const next = new Set(prev);
+				next.add(skill.name);
+				persistPinnedSkills(session, next);
+				return next;
+			});
+		});
+		agent.hooks.hook("skills:deactivate", ({ skill, reason }) => {
+			if (reason === "run-end") return;
+			setActiveSkillNames((prev) => {
+				if (!prev.has(skill.name)) return prev;
+				const next = new Set(prev);
+				next.delete(skill.name);
+				persistPinnedSkills(session, next);
+				return next;
+			});
+		});
 		agent.hooks.hook("mcp:tool:after", ({ callId, displayName, result, turnId }) => {
 			stream.appendImmediate({
 				kind: "tool-result",
@@ -8580,6 +9103,12 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:tool:before", ({ callId, name, input, childId, depth, turnId, priorContent }) => {
+			registerInFlightTool({
+				callId,
+				tool: name,
+				startedAt: Date.now(),
+				childId
+			});
 			if (pendingAnnotationsRef.current.has(callId)) return;
 			const edit = extractEditPayload(name, input, priorContent);
 			stream.appendImmediate({
@@ -8595,6 +9124,7 @@ function AppShell() {
 			});
 		});
 		agent.hooks.hook("child:tool:after", ({ callId, name, result, childId, depth, turnId }) => {
+			unregisterInFlightTool(callId);
 			stream.appendImmediate({
 				kind: "tool-result",
 				text: toolResultText(result),
@@ -8605,6 +9135,12 @@ function AppShell() {
 				turnId
 			});
 		});
+		agent.hooks.hook("child:tool:error", ({ callId }) => {
+			unregisterInFlightTool(callId);
+		});
+		agent.hooks.hook("child:tool:cancelled", ({ callId }) => {
+			unregisterInFlightTool(callId);
+		});
 		agent.hooks.hook("child:stream:end", ({ childId }) => {
 			stream.flushAndUpdate((prev) => finalizeStreamingMarkdownForOwner(prev, childId));
 		});
@@ -8621,7 +9157,9 @@ function AppShell() {
 		config.prefix,
 		interactions,
 		dataDir,
-		mcpCredentialStore
+		mcpCredentialStore,
+		registerInFlightTool,
+		unregisterInFlightTool
 	]);
 	const refreshSessions = useCallback(async () => {
 		const list = await listSessionMeta(store, settings.showAllProjects ? void 0 : { projectRoot: projectDir });
@@ -8662,6 +9200,8 @@ function AppShell() {
 		runningRef.current = false;
 		sessionSafelistRef.current.clear();
 		pendingAnnotationsRef.current.clear();
+		setInFlightTools([]);
+		setActiveSkillNames(/* @__PURE__ */ new Set());
 	}, [
 		stream,
 		denyAll,
@@ -8739,6 +9279,7 @@ function AppShell() {
 		});
 		sessionRef.current = session;
 		agentRef.current = buildAgent(session, key);
+		setActiveSkillNames(readPinnedSkills(session.metadata["zidane.activeSkills"]));
 		setEvents(eventsFromTurns(session.turns, session.runs));
 		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
 		setLastInputTokens(replayedTokens);
@@ -9094,7 +9635,8 @@ function AppShell() {
 			...refSpans.length > 0 ? { refs: refSpans } : {}
 		});
 		if (autoCompactInFlightRef.current) await autoCompactInFlightRef.current.catch(() => {});
-		const skillNames = uniqueSkillNamesFromReferences(references);
+		const newRefs = uniqueSkillNamesFromReferences(references);
+		const skillNames = Array.from(new Set([...activeSkillNamesRef.current, ...newRefs]));
 		for (const name of skillNames) try {
 			await agent.activateSkill(name);
 		} catch (err) {
@@ -9332,6 +9874,36 @@ function AppShell() {
 			return nextTurns.some((t) => t.id === prev) ? prev : null;
 		});
 	}, []);
+	const onEditTurn = useCallback(async (turnId, newText) => {
+		const session = sessionRef.current;
+		if (!session) return;
+		const turn = session.turns.find((t) => t.id === turnId);
+		if (!turn) return;
+		if (!turn.content.some((b) => b.type === "text")) return;
+		const nonTextBlocks = turn.content.filter((b) => b.type !== "text");
+		const firstTextIdx = turn.content.findIndex((b) => b.type === "text");
+		const updatedContent = [...nonTextBlocks];
+		if (newText.trim()) updatedContent.splice(firstTextIdx >= 0 ? Math.min(firstTextIdx, updatedContent.length) : 0, 0, {
+			type: "text",
+			text: newText
+		});
+		turn.content = updatedContent;
+		session.setTurns([...session.turns]);
+		try {
+			await session.save();
+		} catch (err) {
+			debugLog("edit: save failed", err);
+			return;
+		}
+		setEvents(eventsFromTurns(session.turns, session.runs));
+		const replayedTokens = lastContextSizeFromTurns(session.turns, session.runs);
+		setLastInputTokens(replayedTokens);
+		lastInputTokensRef.current = replayedTokens;
+		setCurrentSession((prev) => prev ? {
+			...prev,
+			updatedAt: Date.now()
+		} : prev);
+	}, []);
 	/**
 	* Identity of the session row the user has focused on the sessions
 	* screen — single source of truth. `SessionsScreen` is rendered fully
@@ -9628,7 +10200,8 @@ function AppShell() {
 			total: turnIds.length,
 			actions: {
 				onFork: onForkTurn,
-				onDelete: onDeleteTurn
+				onDelete: onDeleteTurn,
+				onEdit: onEditTurn
 			},
 			keybindings
 		}));
@@ -9638,6 +10211,7 @@ function AppShell() {
 		turnIds,
 		onForkTurn,
 		onDeleteTurn,
+		onEditTurn,
 		keybindings
 	]);
 	useKeyboard((key) => {
@@ -9746,6 +10320,21 @@ function AppShell() {
 			onCycleAgent();
 			return;
 		}
+		if (matchesBinding(key, keybindings.cancelToolCall) && screen === "chat" && busy && !pendingApproval) {
+			const snapshot = inFlightToolsRef.current;
+			if (snapshot.length === 0) return;
+			modal.open(/* @__PURE__ */ jsx(CancelToolModal, {
+				inFlight: snapshot,
+				onCancel: (callId, reason) => agentRef.current?.cancelTool(callId, reason) ?? false,
+				onCancelAll: () => {
+					const agent = agentRef.current;
+					if (!agent) return;
+					for (const entry of inFlightToolsRef.current) agent.cancelTool(entry.callId, "user-cancelled-all");
+				},
+				onClose: () => modal.close()
+			}));
+			return;
+		}
 		if (key.name !== "escape") return;
 		if (busy || pendingApproval) return onAbort();
 		if (popupOpenRef.current) return;
@@ -9777,7 +10366,10 @@ function AppShell() {
 		effortKeyColor: COLOR.warn,
 		agentLabel: pickedAgent.label,
 		agentColor: accentColor(pickedAgent.accent, COLOR),
-		keybindings
+		keybindings,
+		inFlightToolCount: inFlightTools.length,
+		activeSkillCount: activeSkillNames.size,
+		skillsChipColor: COLOR.brand
 	}), [
 		screen,
 		busy,
@@ -9790,7 +10382,9 @@ function AppShell() {
 		pickedAgent,
 		COLOR,
 		modelHasReasoning,
-		keybindings
+		keybindings,
+		inFlightTools,
+		activeSkillNames
 	]);
 	const queuedMessagePreviews = useMemo(() => messageQueue.map((m) => ({
 		text: m.prompt,
@@ -9909,7 +10503,7 @@ function effortForModel(descriptor, modelId, remembered) {
 * secondary `/n` chord with the current effort label, surfacing the
 * effort picker as a discoverable, in-place affordance.
 */
-function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInteractionResumed, currentSession, hasMultipleAgents, modelLabel, modelColor, effortLabel, effortColor, effortKeyColor, agentLabel, agentColor, keybindings }) {
+function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInteractionResumed, currentSession, hasMultipleAgents, modelLabel, modelColor, effortLabel, effortColor, effortKeyColor, agentLabel, agentColor, keybindings, inFlightToolCount, activeSkillCount, skillsChipColor }) {
 	if (pending) return [
 		{
 			key: "↑↓",
@@ -9952,10 +10546,18 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 			label: "leave for later"
 		}
 	];
-	if (busy) return [{
-		key: "esc",
-		label: "abort"
-	}];
+	if (busy) {
+		const baseBusyHints = [];
+		if (inFlightToolCount > 0) baseBusyHints.push({
+			key: keybindings.cancelToolCall,
+			label: inFlightToolCount === 1 ? "cancel tool" : `cancel tool (${inFlightToolCount})`
+		});
+		baseBusyHints.push({
+			key: "esc",
+			label: "abort"
+		});
+		return baseBusyHints;
+	}
 	if (screen === "auth") return [
 		{
 			key: "↑↓",
@@ -10003,6 +10605,12 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 			labelColor: effortColor
 		} } : {}
 	} : null;
+	const skillsChip = activeSkillCount > 0 ? {
+		key: "✦",
+		keyColor: skillsChipColor,
+		label: activeSkillCount === 1 ? "1 skill" : `${activeSkillCount} skills`,
+		labelColor: skillsChipColor
+	} : null;
 	return [
 		...hasMultipleAgents ? [{
 			key: keybindings.cycleAgent,
@@ -10010,6 +10618,7 @@ function buildHints({ screen, busy, pending, pendingInteractionLive, pendingInte
 			labelColor: agentColor
 		}] : [],
 		...modelHint ? [modelHint] : [],
+		...skillsChip ? [skillsChip] : [],
 		...currentSession ? [{
 			key: keybindings.openSessionDetails,
 			label: "session"