zidane 6.2.11 → 6.2.12

package/dist/tui.js

@@ -1,5 +1,5 @@
-import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-B_kUHJ16.js";
-import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-6iGNP46b.js";
+import { $ as useMcpAuthState, $n as buildPlanSystem, $t as restoreChainFallbacks, A as runOAuthLogin, Bt as createDiscoverySlot, Ct as SETTINGS_CHOICES, D as formatPathForCwd, Dt as clampFps, Et as SettingsProvider, G as buildVisibleMcpRows, Gt as useConfig, Ht as useDiscovery, J as createFileMcpCredentialStore, Jt as buildRunModel, K as indexOfServerRow, Kt as resolveConfig, L as loadMcpToolsCache, M as buildMcpServers, Mt as resolveTheme, O as fetchOAuthRedirect, Ot as useSettings, P as discoverProjectMcps, Q as useMcpAuthDispatch, Qn as buildBuildSystem, Qt as providerKeySetChanged, R as mcpToolsCachePath, St as SETTINGS_CATEGORIES, T as suggestSafelistEntries, Tn as accentColor, Tt as SETTINGS_TOGGLES, U as useMcpToolToggleMap, Ut as useDiscoveryOptional, V as subscribeMcpToolsCache, Vn as useActiveTodos, Vt as DiscoveryProvider, Wt as ConfigProvider, Xt as chainsEqual, Yt as chainPositionOf, Z as McpAuthProvider, Zt as filterChainFallbacks, _ as useSafeModeQueue, _n as discoverAgentsMd, _r as toolCallPreview, _t as buildHints, a as useSurfaces, an as bootTick, at as buildResumedToolResultsTurn, b as getSafelist, br as usageByModel, bt as useEnabledToggleSet, c as useStreamBuffer, cr as lastContextSizeFromTurns, ct as makeRequestInteraction, d as discoverProjectSkills, dr as marginTopFor, dt as useInteractionsActions, er as envSection, et as getMcpAuthStatus, ft as useInteractionsQueue, g as useSafeModeActions, gn as chatAutoCompactBehavior, gt as truncateTrailing, h as SafeModeProvider, hr as sumRunCosts, ht as hintsLength, i as useSelectStyle, ir as compactSummaryEvent, it as PRESENT_PLAN_TOOL, j as supportsOAuth, jn as TODO_STATUS_GLYPHS, jt as resolveChipColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, lr as listSessionMeta, lt as pendingInteractionsFromTurns, m as writeSessionExport, mr as stripSpawnTokensLine, mt as clipHintsToWidth, n as ThemeProvider, nn as useCompletion, nr as createChatTurnsReadTool, nt as ASK_USER_TOOL, on as buildUpdateHint, or as deriveSessionTitle, ot as createInteractionTools, pr as serverToolResultSummary, pt as EMPTY_HINTS, q as parentServerName, qt as resolveStoragePaths, r as useColors, rn as tryOpenBrowser, rt as InteractionsProvider, s as useTheme, sn as useUpdateCheck, sr as eventsFromTurns, t as computeTurnAnchors, tn as toggleChainEntry, tr as chatReferenceTokensForPrompt, u as defaultSkillScanPaths, ur as loadState, vr as toolResultText, wt as SETTINGS_INPUTS, x as isOnSafelist, xt as DEFAULT_SETTINGS, y as addToSafelist, yr as updateToolEventOutcomes, yt as listProjectFiles, z as refreshMcpToolsCatalog } from "./transcript-anchors-BzcuKnq8.js";
+import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-DhfdXgL2.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-kBUHBlnq.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-A4ep-iJs.js";
@@ -14,9 +14,9 @@ import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { n as connectMcpServers, u as McpOAuthProvider } from "./mcp-BCaN_Gyg.js";
 import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as commandBlockToEvent, g as parseCommandInvocation, h as executeCommand, n as patchInlineGhost, p as commandBlocksToContent, r as resolveInlineSuggestion, s as generateSessionTitle, t as createPathAutocompleteProvider } from "./inline-autocomplete-BAwBcZtD.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
-import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-CDpejYOf.js";
-import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-B5nMPF8w.js";
-import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-BH6G59RL.js";
+import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-DKWqoaYH.js";
+import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-Clf-R27F.js";
+import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning } from "./auth-TZg3MVi2.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
 import { $ as buildEditOutcomesAnnotation, A as blendHsl, B as turnSelectionOwnership, C as stripHtmlCommentsOutsideCode, E as uniqueSkillNamesFromReferences, F as isTurnHighlighted, H as buildContextualDiff, I as isUserBashEvent, J as filetypeFromPath, L as isVisible, M as BASH_CALL_ID_PREFIX, N as EDIT_TOOL_NAMES, O as createFilesCompletionProvider, P as isEditErrorResult, R as promptHistoryFromEvents, S as splitMarkdownCodeBlocks, T as createSkillsCompletionProvider, U as buildUnifiedDiff, W as clipDiffForRender, Y as previewEditPayload, Z as summarizeEditPayload, _ as filterModelCatalog, a as TOOL_DISPLAY, at as stripEditOutcomesAnnotation, b as chunkMarkdownForRender, d as finalizeStreamingMarkdown, f as finalizeStreamingMarkdownForOwner, g as buildModelCatalog, h as splitPromptSegments, i as turnAsText, it as rewriteMultiEditHeader, j as buildLinearRamp, lt as createChatsCompletionProvider, m as turnContextSize, n as deleteTurnSafely, nt as parseEditOutcomesFromResult, o as displayNameFor, ot as summarizeOutcomes, q as extractEditPayload, r as truncateTurnsAt, rt as resolveApprovalForPayload, s as formatToolCall, tt as mergeApprovalAndBodyOutcomes, u as capTranscriptEvents, v as indexOfEntry, x as normalizeMarkdownCodeFences, z as selectableTurnIds } from "./turn-operations-CXjRaltC.js";
@@ -1505,7 +1505,7 @@ const BASH_RESULT_MAX_LINES = 10;
 * same-turn events read as one continuous highlighted block instead of a
 * striped list.
 */
-const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId, hideChildLabel = false, settleCodeEpoch = 0 }) => {
+const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, anchorId, hideChildLabel = false, settleCodeEpoch = 0, liveSpawn }) => {
 	const SURFACE = useSurfaces();
 	const gap = marginTopFor(event, previous);
 	return /* @__PURE__ */ jsx$1("box", {
@@ -1524,7 +1524,8 @@ const EventLine = memo(({ event, previous, depthOffset = 0, selected = false, an
 			depthOffset,
 			hideChildLabel,
 			selected,
-			settleCodeEpoch
+			settleCodeEpoch,
+			liveSpawn
 		})
 	});
 });
@@ -1977,10 +1978,12 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 		for (let i = items.length - 1; i >= 0 && open.size > 0; i--) {
 			const item = items[i];
 			const here = [];
-			for (const [id, childEvents] of open) if (item.kind === "child-run" ? item.events.some((e) => e.childId === id) : item.event.kind === "spawn-start" && item.event.childId === id) {
+			for (const [id, child] of open) if (item.kind === "child-run" ? item.events.some((e) => e.childId === id) : item.event.kind === "spawn-start" && item.event.childId === id) {
 				here.push({
 					id,
-					activity: spawnActivity(childEvents)
+					activity: spawnActivity(child.events),
+					startedAt: child.start.spawn?.startedAt ?? Date.now(),
+					turns: observedSpawnTurns(child.events)
 				});
 				open.delete(id);
 			}
@@ -2030,18 +2033,14 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 			children: [items.map((item, i) => {
 				if (item.kind === "event") {
 					const live = liveByItem.get(i);
-					const line = /* @__PURE__ */ jsx$1(EventLine, {
+					return /* @__PURE__ */ jsx$1(EventLine, {
 						event: item.event,
 						previous: item.previous,
 						selected: isTurnHighlighted(item.event, selectedTurnId, ownership),
 						anchorId: anchors.ids[i][0],
-						settleCodeEpoch: codeSettle.current.targets.has(item.event) ? codeSettle.current.epoch : 0
-					}, live ? void 0 : i);
-					if (!live) return line;
-					return /* @__PURE__ */ jsxs("box", { children: [line, live.map((spawn) => /* @__PURE__ */ jsx$1(LiveSpawnRow, {
-						spawn,
-						showLabel: true
-					}, spawn.id))] }, i);
+						settleCodeEpoch: codeSettle.current.targets.has(item.event) ? codeSettle.current.epoch : 0,
+						liveSpawn: live?.[0]
+					}, i);
 				}
 				return /* @__PURE__ */ jsx$1(SubagentBlock, {
 					events: item.events,
@@ -2068,27 +2067,37 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false }) {
 * events they've produced since. Computed against the FULL event list — a
 * parent-depth row (e.g. a background-task banner) can split one child's
 * events across two boxes, and only a global scan knows whether the child
-* actually finished. `spawn:error` emits a child-tagged `error` event and
-* never a `spawn-end`, so that closes the child too. Live-only signal:
-* replayed sessions always synthesize a `spawn-end` per child run, so
-* nothing stays open after a reload.
+* actually finished. `spawn:complete` fires for EVERY terminal state
+* (success/abort/timeout/error \u2014 see spawn.ts), so a `spawn-end` marker is
+* the normal close; a child-tagged `error` event (`spawn:error`, e.g. a
+* destroy failure surfaced after completion) also closes, covering
+* whichever order the two arrive in. Live-only signal: replayed sessions
+* always synthesize a `spawn-end` per child run, so nothing stays open
+* after a reload.
 */
 function openSpawns(events) {
 	const open = /* @__PURE__ */ new Map();
 	for (const event of events) {
 		if (!event.childId || (event.depth ?? 0) === 0) continue;
 		if (event.kind === "spawn-start") {
-			open.set(event.childId, []);
+			open.set(event.childId, {
+				start: event,
+				events: []
+			});
 			continue;
 		}
 		if (event.kind === "spawn-end" || event.kind === "error") {
 			open.delete(event.childId);
 			continue;
 		}
-		open.get(event.childId)?.push(event);
+		open.get(event.childId)?.events.push(event);
 	}
 	return open;
 }
+/** Distinct child-loop turns observed in the streamed event tail. */
+function observedSpawnTurns(events) {
+	return new Set(events.flatMap((event) => event.turnId ? [event.turnId] : [])).size;
+}
 /**
 * One-word-ish description of what a running child is doing right now,
 * derived from its trailing events: `text` while prose streams, `thinking`
@@ -2114,8 +2123,30 @@ function spawnActivity(events) {
 		default: return "working";
 	}
 }
+/**
+* Pair lifecycle markers from the end so reused labels (`child-1` in a
+* later top-level run) don't make an old terminal hide a new active start.
+* Exported for the layout invariant test; renderers otherwise use it only
+* through {@link partitionTranscript}.
+*/
+function collapseCompletedSpawnStarts(events) {
+	const keep = Array.from({ length: events.length }).fill(true);
+	const terminalByChild = /* @__PURE__ */ new Map();
+	for (let i = events.length - 1; i >= 0; i--) {
+		const event = events[i];
+		if (event.kind === "spawn-end" && event.childId) terminalByChild.set(event.childId, (terminalByChild.get(event.childId) ?? 0) + 1);
+		else if (event.kind === "spawn-start" && event.childId) {
+			const terminals = terminalByChild.get(event.childId) ?? 0;
+			if (terminals > 0) {
+				keep[i] = false;
+				terminalByChild.set(event.childId, terminals - 1);
+			}
+		}
+	}
+	return events.filter((_, i) => keep[i]);
+}
 function partitionTranscript(events, settings) {
-	const visible = events.filter((e) => isVisible(e, settings));
+	const visible = collapseCompletedSpawnStarts(events).filter((e) => isVisible(e, settings));
 	if (visible.length === 0) return [];
 	if (settings.hideSubagentOutput) return visible.map((event, i) => ({
 		kind: "event",
@@ -2171,7 +2202,7 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 	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__ */ jsxs("box", {
+	return /* @__PURE__ */ jsx$1("box", {
 		title,
 		style: {
 			border: true,
@@ -2185,38 +2216,81 @@ function SubagentBlock({ events, previous, selectedTurnId = null, anchorIds, cod
 			flexShrink: 0,
 			alignSelf: "stretch"
 		},
-		children: [events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
+		children: events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
 			event: evt,
 			previous: events[i - 1],
 			depthOffset: 1,
 			selected: selectedTurnId !== null && evt.turnId === selectedTurnId,
 			anchorId: anchorIds?.[i],
 			hideChildLabel,
-			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0
-		}, i)), live?.map((spawn) => /* @__PURE__ */ jsx$1("box", {
-			style: { marginTop: events.length > 0 ? 1 : 0 },
-			children: /* @__PURE__ */ jsx$1(LiveSpawnRow, {
-				spawn,
-				showLabel: !hideChildLabel
-			})
-		}, spawn.id))]
+			settleCodeEpoch: codeSettleTargets?.has(evt) ? codeSettleEpoch : 0,
+			liveSpawn: evt.kind === "spawn-start" ? live?.find((spawn) => spawn.id === evt.childId) : void 0
+		}, i))
 	});
 }
-/** Spinner + current-activity line for a still-running subagent. */
-function LiveSpawnRow({ spawn, showLabel }) {
+/**
+* Stable one-row subagent lifecycle layout. Identity/model/task stay in
+* the left lane for the whole run; only the right tail changes:
+* active `2 turns · 14s · ⠋ tool call`, done `4 turns`.
+*/
+function SpawnLifecycleMarker({ row, dim, event, hideChildLabel, live }) {
 	const COLOR = useColors();
-	return /* @__PURE__ */ jsxs("text", {
-		fg: COLOR.dim,
+	const frame = useSpinnerFrame();
+	const terminal = event.kind === "spawn-end";
+	const failed = terminal && (event.text.startsWith("error") || event.text.startsWith("aborted"));
+	const turns = terminal ? event.spawn?.turns : live?.turns;
+	const turnLabel = `${turns ?? 0} turn${turns === 1 ? "" : "s"}`;
+	const elapsed = live ? formatDuration(Math.max(0, Date.now() - live.startedAt)) : null;
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			...row,
+			flexDirection: "row",
+			alignItems: "center"
+		},
 		children: [
-			/* @__PURE__ */ jsx$1(StatusSpinner, { color: COLOR.warn }),
-			showLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-				fg: COLOR.brand,
-				children: ` ${spawn.id}`
-			}), /* @__PURE__ */ jsx$1("span", {
+			/* @__PURE__ */ jsxs("text", {
+				fg: dim,
+				wrapMode: "none",
+				style: { flexShrink: 1 },
+				children: [
+					/* @__PURE__ */ jsx$1("span", {
+						fg: failed ? COLOR.error : COLOR.accent,
+						children: terminal ? failed ? "✗ " : "🌳 " : "🌱 "
+					}),
+					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.brand,
+						children: event.childId ?? "child"
+					}), /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
+					event.model !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.model,
+						children: event.model
+					}), /* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.mute,
+						children: " · "
+					})] }),
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.dim,
+						children: terminal ? event.spawn?.task ?? event.text : event.text
+					})
+				]
+			}),
+			/* @__PURE__ */ jsx$1("box", { style: { flexGrow: 1 } }),
+			/* @__PURE__ */ jsxs("text", {
 				fg: COLOR.mute,
-				children: " ·"
-			})] }),
-			` ${spawn.activity}`
+				wrapMode: "none",
+				style: { flexShrink: 0 },
+				children: [/* @__PURE__ */ jsx$1("span", { children: turnLabel }), live && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx$1("span", { children: ` · ${elapsed} · ` }),
+					/* @__PURE__ */ jsx$1("span", {
+						fg: COLOR.warn,
+						children: frame
+					}),
+					/* @__PURE__ */ jsx$1("span", { children: ` ${live.activity}` })
+				] })]
+			})
 		]
 	});
 }
@@ -2259,7 +2333,7 @@ function rowStyle(paddingLeft) {
 		alignSelf: "stretch"
 	};
 }
-function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false, settleCodeEpoch = 0 }) {
+function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = false, selected = false, settleCodeEpoch = 0, liveSpawn }) {
 	const COLOR = useColors();
 	const { settings } = useSettings();
 	const cleanText = stripTerminalControlChars(event.text);
@@ -2382,58 +2456,18 @@ function EventLineImpl({ event, previous, depthOffset = 0, hideChildLabel = fals
 				settleCodeEpoch
 			})
 		});
-		case "spawn-start": return /* @__PURE__ */ jsx$1("box", {
-			style: row,
-			children: /* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.accent,
-						children: "🌱 "
-					}),
-					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.brand,
-						children: event.childId ?? "child"
-					}), /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: " · "
-					})] }),
-					event.model !== void 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.model,
-						children: event.model
-					}), /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: " · "
-					})] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.dim,
-						children: safeText
-					})
-				]
-			})
+		case "spawn-start": return /* @__PURE__ */ jsx$1(SpawnLifecycleMarker, {
+			row,
+			dim: COLOR.dim,
+			event,
+			hideChildLabel,
+			live: liveSpawn
 		});
-		case "spawn-end": return /* @__PURE__ */ jsx$1("box", {
-			style: row,
-			children: /* @__PURE__ */ jsxs("text", {
-				fg: COLOR.dim,
-				children: [
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.accent,
-						children: "🌳 "
-					}),
-					!hideChildLabel && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.brand,
-						children: event.childId ?? "child"
-					}), /* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: " · "
-					})] }),
-					/* @__PURE__ */ jsx$1("span", {
-						fg: COLOR.mute,
-						children: safeText
-					})
-				]
-			})
+		case "spawn-end": return /* @__PURE__ */ jsx$1(SpawnLifecycleMarker, {
+			row,
+			dim: COLOR.dim,
+			event,
+			hideChildLabel
 		});
 		case "compact-summary": return /* @__PURE__ */ jsx$1(CompactSummaryBlock, {
 			event,
@@ -4651,6 +4685,44 @@ function CwdPickerModal({ currentCwd, onPick }) {
 	});
 }
 //#endregion
+//#region src/tui/project-location-context.tsx
+const ProjectLocationContext = createContext(null);
+/** Resolve the project root used by BOTH discovery and agent activation. */
+function resolveProjectLocation(cwd) {
+	return {
+		cwd,
+		projectDir: findGitRoot(cwd) ?? cwd
+	};
+}
+/**
+* Single source of truth for the TUI's active cwd/project root. It must
+* sit ABOVE both `DiscoveryShell` and `AppShell`: discovery used to derive
+* a frozen root from `process.cwd()` while AppShell independently honored
+* `launch.cwd` and runtime project switches, causing `.agents` skills/MCPs
+* to be read from the wrong repository.
+*/
+function ProjectLocationProvider({ initialCwd, children }) {
+	const [location, setLocation] = useState(() => resolveProjectLocation(initialCwd));
+	const setCwd = useCallback((next) => {
+		process.chdir(next);
+		setLocation(resolveProjectLocation(next));
+	}, []);
+	const value = useMemo(() => ({
+		cwd: location.cwd,
+		projectDir: location.projectDir,
+		setCwd
+	}), [location, setCwd]);
+	return /* @__PURE__ */ jsx(ProjectLocationContext.Provider, {
+		value,
+		children
+	});
+}
+function useProjectLocation() {
+	const value = useContext(ProjectLocationContext);
+	if (!value) throw new Error("useProjectLocation must be used inside ProjectLocationProvider");
+	return value;
+}
+//#endregion
 //#region src/tui/discovery-shell.tsx
 /**
 * SWR throttles. `files` is short so a long-open `@` popover picks up
@@ -4670,7 +4742,7 @@ function DiscoveryShell({ children }) {
 	const dispatchAuth = useMcpAuthDispatch();
 	const dispatchAuthRef = useRef(dispatchAuth);
 	dispatchAuthRef.current = dispatchAuth;
-	const [projectDir] = useState(() => findGitRoot(process.cwd()) ?? process.cwd());
+	const { projectDir } = useProjectLocation();
 	const dataDir = config.paths.userDir;
 	const mcpCredentialStore = useMemo(() => createFileMcpCredentialStore(dataDir), [dataDir]);
 	const [skillsCatalog, setSkillsCatalog] = useState([]);
@@ -12670,11 +12742,13 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 		})).catch((err) => {
 			if (err instanceof SkillInstallError && err.code === "multiple-candidates" && err.candidates && err.candidates.length > 0) {
 				setSkillOp(null);
-				const items = err.details && err.details.length === err.candidates.length ? err.details : err.candidates.map((rel) => ({ rel }));
+				const fullCatalog = err.details !== void 0 && err.details.length === err.candidates.length;
+				const items = fullCatalog && err.details ? err.details : err.candidates.map((rel) => ({ rel }));
 				setSkillImportAll({
 					source: req.source,
 					scope: req.choice,
-					items
+					items,
+					fullCatalog
 				});
 				return;
 			}
@@ -13551,7 +13625,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 				onConfirm: (selected) => {
 					const req = skillImportAll;
 					setSkillImportAll(null);
-					runSkillInstall(selected.length === req.items.length ? {
+					runSkillInstall(req.fullCatalog && selected.length === req.items.length ? {
 						source: req.source,
 						all: true,
 						choice: req.scope
@@ -15991,7 +16065,8 @@ function App({ config }) {
 */
 function ThemedShell() {
 	const { settings } = useSettings();
-	const [extensionRegistry, setExtensionRegistry] = useState(useConfig().extensions);
+	const config = useConfig();
+	const [extensionRegistry, setExtensionRegistry] = useState(config.extensions);
 	useEffect(() => () => {
 		disposeExtensionRegistry(extensionRegistry);
 	}, [extensionRegistry]);
@@ -16008,7 +16083,10 @@ function ThemedShell() {
 			registry: renderersRegistry,
 			children: /* @__PURE__ */ jsx$1(ThemeProvider, {
 				theme,
-				children: /* @__PURE__ */ jsx$1(MdStyleProvider, { children: /* @__PURE__ */ jsx$1(ChipStyleProvider, { children: /* @__PURE__ */ jsx$1(SafeModeProvider, { children: /* @__PURE__ */ jsx$1(InteractionsProvider, { children: /* @__PURE__ */ jsx$1(McpAuthProvider, { children: /* @__PURE__ */ jsx$1(DiscoveryShell, { children: /* @__PURE__ */ jsx$1(ModalRoot, { children: /* @__PURE__ */ jsx$1(AppShell, {}) }) }) }) }) }) }) })
+				children: /* @__PURE__ */ jsx$1(MdStyleProvider, { children: /* @__PURE__ */ jsx$1(ChipStyleProvider, { children: /* @__PURE__ */ jsx$1(SafeModeProvider, { children: /* @__PURE__ */ jsx$1(InteractionsProvider, { children: /* @__PURE__ */ jsx$1(McpAuthProvider, { children: /* @__PURE__ */ jsx$1(ProjectLocationProvider, {
+					initialCwd: config.launch?.cwd ?? process.cwd(),
+					children: /* @__PURE__ */ jsx$1(DiscoveryShell, { children: /* @__PURE__ */ jsx$1(ModalRoot, { children: /* @__PURE__ */ jsx$1(AppShell, {}) }) })
+				}) }) }) }) }) })
 			})
 		})
 	});
@@ -16184,16 +16262,9 @@ function AppShell() {
 	useEffect(() => {
 		smoothStreamingRef.current = settings.smoothStreaming;
 	}, [settings.smoothStreaming]);
-	const initialCwd = launch?.cwd ?? process.cwd();
-	const [projectDir, setProjectDir] = useState(() => findGitRoot(initialCwd) ?? initialCwd);
-	const [cwd, setCwdRaw] = useState(() => initialCwd);
+	const { cwd, projectDir, setCwd } = useProjectLocation();
 	const cwdRef = useRef(cwd);
 	cwdRef.current = cwd;
-	const setCwd = useCallback((next) => {
-		process.chdir(next);
-		setCwdRaw(next);
-		setProjectDir(findGitRoot(next) ?? next);
-	}, []);
 	const safelistRef = useRef(null);
 	const readSafelist = useCallback(() => {
 		if (safelistRef.current === null) safelistRef.current = getSafelist(dataDir, projectDir);
@@ -17578,19 +17649,26 @@ function AppShell() {
 		});
 		const spawnStartedAt = /* @__PURE__ */ new Map();
 		agent.hooks.hook("spawn:before", ({ id, task, depth, model }) => {
-			spawnStartedAt.set(id, Date.now());
+			const startedAt = Date.now();
 			const taskPreview = previewLine(task, 80);
+			spawnStartedAt.set(id, {
+				startedAt,
+				task: taskPreview,
+				...model ? { model } : {}
+			});
 			stream.appendImmediate({
 				kind: "spawn-start",
 				text: taskPreview,
 				childId: id,
 				depth: depth ?? 1,
+				spawn: { startedAt },
 				...model ? { model } : {}
 			});
 		});
 		agent.hooks.hook("spawn:complete", ({ id, depth, status, stats }) => {
 			const tag = status === "aborted" ? "aborted" : status === "error" ? "error" : "done";
-			const startedAt = spawnStartedAt.get(id);
+			const started = spawnStartedAt.get(id);
+			const startedAt = started?.startedAt;
 			spawnStartedAt.delete(id);
 			const elapsed = startedAt !== void 0 ? ` · ${formatDuration(Date.now() - startedAt)}` : "";
 			const cost = flattenTurns(stats).reduce((sum, turn) => sum + (turn.cost ?? 0), 0);
@@ -17599,7 +17677,13 @@ function AppShell() {
 				kind: "spawn-end",
 				text: segments ? `${tag}${segments} · ${formatTokenUsage(stats)}` : `${tag} ${formatTokenUsage(stats)}`,
 				childId: id,
-				depth: depth ?? 1
+				depth: depth ?? 1,
+				spawn: {
+					startedAt: startedAt ?? Date.now(),
+					...started?.task ? { task: started.task } : {},
+					turns: stats.turns
+				},
+				...started?.model ? { model: started.model } : {}
 			});
 		});
 		agent.hooks.hook("spawn:error", ({ id, depth, error }) => {