scream-code 0.16.5 → 0.16.7

package/dist/{app-F12Iraus.mjs → app-DDepBvBx.mjs}

@@ -4,8 +4,8 @@ import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import "./suppress-sqlite-warning-C2VB0doZ.mjs";
-import { $n as readSessionIndex, $t as SubagentSlots, A as langFromPath, An as startManualEmbeddingDownload, At as toggleEmptySessionHint, B as charsForTokenBudget, Bn as getLogDir, Bt as OSC11_QUERY, C as getDaemonInstructions, Cn as buildSkillSlashCommands, D as renderDiffLines, Dn as setExperimentalFlags, Dt as createMarkdownTheme, E as ToolCallComponent, En as isExperimentalFlagEnabled, Et as createEditorTheme, F as replaceTabs, Fn as loadTuiConfig, Ft as parseOsc11BackgroundTheme, G as WelcomeComponent, Gn as PRODUCT_NAME, Gt as TERMINAL_FOCUS_IN, H as getSharedSpeedTracker, Hn as CLI_COMMAND_NAME, Ht as OSC11_RESPONSE_PREFIX, I as sanitizeShellOutput, In as saveTuiConfig, It as DISABLE_TERMINAL_FOCUS_REPORTING, J as resetBreathingClock, Jn as saveCatalogCache, Jt as TERMINAL_THEME_LIGHT, K as BREATHE_CYCLE_MS, Kn as DEFAULT_CATALOG_URL, Kt as TERMINAL_FOCUS_OUT, L as SkillActivationComponent, Ln as detectShellEnvironment, Lt as DISABLE_TERMINAL_THEME_REPORTING, M as ThinkingComponent, Mn as PULSE_WAVE_FRAMES, Mt as contrastTextHex, N as NoticeMessageComponent, Nn as TuiConfigParseError, Nt as getColorPalette, O as renderDiffLinesClustered, On as getKnowledgeStore, Ot as isEmptySessionHintDismissed, P as StatusMessageComponent, Pn as TuiLikePreferencesSchema, Pt as detectTerminalTheme, Qn as appendSessionIndexEntry, Qt as lerpGradient, R as AssistantMessageComponent, Rn as getDataDir, Rt as ENABLE_TERMINAL_FOCUS_REPORTING, Sn as getNoActiveSessionMessage, St as clearInfoPanelState, T as UserMessageComponent, Tn as sortSlashCommands, Tt as resolveThemeSync, U as BackgroundAgentStatusComponent, Un as CLI_UI_MODE, Ut as OSC11_RESPONSE_PREFIX_NO_ESC, V as estimateTokens, Vn as detectInstallSource, Vt as OSC11_RESPONSE, W as AgentGroupComponent, Wn as CLI_USER_AGENT_PRODUCT, Wt as QUERY_TERMINAL_THEME, X as clearGoalState, Xn as encodeWorkDirKey, Xt as isStreaming, Y as CompactionComponent, Yn as ScreamHarness, Yt as isBusy, Z as refineGoal, Zn as normalizeWorkDir, Zt as FooterComponent, _ as selectUpdateTarget, _n as SESSION_TIPS, an as STATUS_BULLET, ar as log, at as changeThinkingLevel, b as appendJsonlLine, bn as getCtrlDHint, bt as refreshProviderBalance, c as hasDispose, cn as formatErrorMessage, cr as isOrphanedToolCallError, d as MoonLoader, dn as serializeToolResultOutput, dt as handleFusionPlanCommand, er as removeSessionIndexEntry, f as formatMemoryMemoForInjection, fn as stringValue, gn as MAIN_AGENT_ID, hn as EXIT_CONFIRM_WINDOW_MS, i as buildRoleAdditionalText, in as printableChar, ir as flushDiagnosticLogs, it as toTerminalHyperlink, j as CachedContainer, jn as PIXEL_PULSE_FRAMES, jt as createThemeStyles, k as highlightLines, kn as isEmbeddingModelCached, kt as isTurnElapsedEnabled, l as isExpandable, ln as isTodoItemShape, lr as ErrorCodes, mn as EMPTY_SESSION_HINT_URL, n as clearEvalPanelState, nr as resolveScreamHome, on as appendStreamingArgsPreview, or as resolveGlobalLogPath, ot as getModelCycleLevel, pn as truncateErrorMessage, pt as handlePlanCommand, q as getBreathingFrame, qn as fetchCatalog, qt as TERMINAL_THEME_DARK, r as openUrl, rr as MemoryMemoStore, rt as isInternalMessage, s as disposeChildren, sn as argsRecord, sr as isScreamError, t as dispatchInput, u as isPlanExpandable, un as parseStreamingArgs, ur as SCREAM_ERROR_INFO, v as refreshUpdateCache, vn as TIP_ROTATION_INTERVAL_MS, wn as BUILTIN_SLASH_COMMANDS, x as readJsonlFile, xn as getLlmNotSetMessage, xt as supportsBalance, y as readUpdateCache, yn as getCtrlCHint, z as ActivityGroupComponent, zn as getInputHistoryFile, zt as ENABLE_TERMINAL_THEME_REPORTING } from "./dispatch-VY-K2oXV.mjs";
-import { a as setLocale, i as getLocale, o as t } from "./text-input-dialog-KaFgI_Ko.mjs";
+import { $n as normalizeWorkDir, $t as lerpGradient, A as highlightLines, An as getKnowledgeStore, At as isTurnElapsedEnabled, B as ActivityGroupComponent, Bn as getDataDir, Bt as ENABLE_TERMINAL_THEME_REPORTING, Cn as getNoActiveSessionMessage, Ct as clearInfoPanelState, D as ToolCallComponent, Dn as isExperimentalFlagEnabled, Dt as createEditorTheme, E as UserMessageComponent, En as sortSlashCommands, Et as resolveThemeSync, F as StatusMessageComponent, Fn as TuiConfigParseError, Ft as detectTerminalTheme, G as AgentGroupComponent, Gn as CLI_UI_MODE, Gt as QUERY_TERMINAL_THEME, H as estimateTokens, Hn as getLogDir, Ht as OSC11_RESPONSE, I as replaceTabs, In as TuiLikePreferencesSchema, It as parseOsc11BackgroundTheme, J as getBreathingFrame, Jn as DEFAULT_CATALOG_URL, Jt as TERMINAL_THEME_DARK, K as WelcomeComponent, Kn as CLI_USER_AGENT_PRODUCT, Kt as TERMINAL_FOCUS_IN, L as sanitizeShellOutput, Ln as loadTuiConfig, Lt as DISABLE_TERMINAL_FOCUS_REPORTING, M as CachedContainer, Mn as startManualEmbeddingDownload, Mt as createThemeStyles, N as ThinkingComponent, Nn as PIXEL_PULSE_FRAMES, Nt as contrastTextHex, O as renderDiffLines, On as setExperimentalFlags, Ot as createMarkdownTheme, P as NoticeMessageComponent, Pn as PULSE_WAVE_FRAMES, Pt as getColorPalette, Q as refineGoal, Qn as encodeWorkDirKey, Qt as FooterComponent, R as SkillActivationComponent, Rn as saveTuiConfig, Rt as DISABLE_TERMINAL_THEME_REPORTING, S as readJsonlFile, Sn as getLlmNotSetMessage, St as supportsBalance, Tn as BUILTIN_SLASH_COMMANDS, U as getSharedSpeedTracker, Un as detectInstallSource, Ut as OSC11_RESPONSE_PREFIX, V as charsForTokenBudget, Vn as getInputHistoryFile, Vt as OSC11_QUERY, W as BackgroundAgentStatusComponent, Wn as CLI_COMMAND_NAME, Wt as OSC11_RESPONSE_PREFIX_NO_ESC, X as CompactionComponent, Xn as saveCatalogCache, Xt as isBusy, Y as resetBreathingClock, Yn as fetchCatalog, Yt as TERMINAL_THEME_LIGHT, Z as clearGoalState, Zn as ScreamHarness, Zt as isStreaming, _n as MAIN_AGENT_ID, a as syncDiagramCapabilityPrompt, an as printableChar, ar as MemoryMemoStore, at as toTerminalHyperlink, b as readUpdateCache, bn as getCtrlCHint, c as disposeChildren, cn as argsRecord, cr as resolveGlobalLogPath, d as isPlanExpandable, dn as parseStreamingArgs, dr as ErrorCodes, en as SubagentSlots, er as appendSessionIndexEntry, f as MoonLoader, fn as serializeToolResultOutput, fr as SCREAM_ERROR_INFO, ft as handleFusionPlanCommand, gn as EXIT_CONFIRM_WINDOW_MS, hn as EMPTY_SESSION_HINT_URL, i as buildRoleAdditionalText, ir as resolveScreamHome, it as isInternalMessage, j as langFromPath, jn as hasEmbeddingModelCache, jt as toggleEmptySessionHint, k as renderDiffLinesClustered, kn as embeddingFailureDetail, kt as isEmptySessionHintDismissed, l as hasDispose, ln as formatErrorMessage, lr as isScreamError, mn as truncateErrorMessage, mt as handlePlanCommand, n as clearEvalPanelState, nr as removeSessionIndexEntry, on as STATUS_BULLET, or as flushDiagnosticLogs, ot as changeThinkingLevel, p as formatMemoryMemoForInjection, pn as stringValue, q as BREATHE_CYCLE_MS, qn as PRODUCT_NAME, qt as TERMINAL_FOCUS_OUT, r as openUrl, sn as appendStreamingArgsPreview, sr as log, st as getModelCycleLevel, t as dispatchInput, tr as readSessionIndex, u as isExpandable, un as isTodoItemShape, ur as isOrphanedToolCallError, v as selectUpdateTarget, vn as SESSION_TIPS, w as getDaemonInstructions, wn as buildSkillSlashCommands, x as appendJsonlLine, xn as getCtrlDHint, xt as refreshProviderBalance, y as refreshUpdateCache, yn as TIP_ROTATION_INTERVAL_MS, z as AssistantMessageComponent, zn as detectShellEnvironment, zt as ENABLE_TERMINAL_FOCUS_REPORTING } from "./dispatch-Vw9ccFm7.mjs";
+import { a as setLocale, i as getLocale, o as t } from "./text-input-dialog-D9ByqSsK.mjs";
 import { createRequire } from "node:module";
 import { randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import { access, appendFile, chmod, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
@@ -32,7 +32,7 @@ function optionalBuildString(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 const SCREAM_BUILD_INFO = {
-	version: optionalBuildString("0.16.5"),
+	version: optionalBuildString("0.16.7"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -1986,7 +1986,8 @@ function formatBackgroundAgentTranscript(phase, meta, extras = void 0) {
 	return {
 		phase,
 		headline,
-		detail: detailParts.length > 0 ? detailParts.join(" · ") : void 0
+		detail: detailParts.length > 0 ? detailParts.join(" · ") : void 0,
+		trackingId: meta.agentId
 	};
 }
 //#endregion
@@ -2209,7 +2210,8 @@ function formatBackgroundTaskTranscript(info) {
 	return {
 		phase: phaseFromStatus(info.status),
 		headline: headlineFor(info),
-		detail: detailFor(info)
+		detail: detailFor(info),
+		trackingId: info.taskId
 	};
 }
 //#endregion
@@ -2361,15 +2363,15 @@ function formatStepDebugTiming(input) {
 	const latency = input.llmFirstTokenLatencyMs;
 	const streamMs = input.llmStreamDurationMs;
 	if (latency === void 0 || streamMs === void 0) return void 0;
-	const parts = [`TTFT: ${formatDuration$1(latency)}`];
+	const parts = [`TTFT: ${formatDuration(latency)}`];
 	const outputTokens = input.usage?.output;
 	if (outputTokens !== void 0 && outputTokens > 0 && streamMs > 0) {
 		const tps = (outputTokens / (streamMs / 1e3)).toFixed(1);
-		parts.push(`TPS: ${tps} tok/s (${outputTokens} tokens in ${formatDuration$1(streamMs)})`);
+		parts.push(`TPS: ${tps} tok/s (${outputTokens} tokens in ${formatDuration(streamMs)})`);
 	}
 	return `[Debug] ${parts.join(" | ")}`;
 }
-function formatDuration$1(ms) {
+function formatDuration(ms) {
 	if (ms < 1e3) return `${Math.round(ms)}ms`;
 	return `${(ms / 1e3).toFixed(1)}s`;
 }
@@ -2910,6 +2912,7 @@ var SessionEventHandler = class {
 	}
 	handleStepCompleted(event) {
 		this.host.streamingUI.flushNow();
+		this.host.streamingUI.flushPendingApprovals();
 		this.maybeShowDebugTiming(event);
 		this.recordProviderLatency(event);
 		this.drainQueuedMessagesIntoSteer();
@@ -2936,6 +2939,24 @@ var SessionEventHandler = class {
 			sessionApiCalls: this.host.state.appState.sessionApiCalls + 1
 		});
 	}
+	/**
+	* A retried attempt that produces output again is no longer reconnecting:
+	* drop the retry label as soon as it streams a delta or emits a tool call, so
+	* neither the footer status block nor the status bar keeps claiming
+	* "重连中 N/M" for the rest of the step. The fields are only ever set by
+	* handleStepRetrying, so this is the single clearing point besides
+	* step/turn boundaries.
+	*/
+	clearReconnectState() {
+		if (!(this.host.state.appState.reconnectAttempt > 0)) return;
+		this.host.setAppState({
+			reconnectAttempt: 0,
+			reconnectMaxAttempts: void 0,
+			reconnectDelayMs: void 0,
+			reconnectStatusCode: void 0,
+			reconnectErrorName: void 0
+		});
+	}
 	maybeShowDebugTiming(event) {
 		if (process.env["SCREAM_CODE_DEBUG"] !== "1") return;
 		const text = formatStepDebugTiming(event);
@@ -2995,12 +3016,14 @@ var SessionEventHandler = class {
 	}
 	handleThinkingDelta(event) {
 		const { state, streamingUI } = this.host;
+		this.clearReconnectState();
 		streamingUI.appendThinkingDelta(event.delta);
 		if (canTransitionTo(state.appState.streamingPhase, "thinking")) this.host.setAppState({ streamingPhase: "thinking" });
 		streamingUI.scheduleFlush();
 	}
 	handleAssistantDelta(event) {
 		const { state, streamingUI } = this.host;
+		this.clearReconnectState();
 		if (streamingUI.hasThinkingDraft()) streamingUI.flushThinkingToTranscript();
 		streamingUI.appendAssistantDelta(event.delta);
 		this.host.patchLivePane({
@@ -3028,6 +3051,7 @@ var SessionEventHandler = class {
 	}
 	handleToolCall(event) {
 		const { streamingUI } = this.host;
+		this.clearReconnectState();
 		streamingUI.flushNow();
 		if (event.name === "SendSubagentMessage") {
 			const args = argsRecord(event.args);
@@ -3059,6 +3083,7 @@ var SessionEventHandler = class {
 	handleToolCallDelta(event) {
 		if (event.toolCallId.length === 0) return;
 		const { state, streamingUI } = this.host;
+		this.clearReconnectState();
 		streamingUI.accumulateToolCallDelta(event.toolCallId, event.name, event.argumentsPart);
 		this.host.patchLivePane({
 			pendingApproval: null,
@@ -3113,7 +3138,7 @@ var SessionEventHandler = class {
 			message: event.message
 		};
 		streamingUI.completeToolResult(event.toolCallId, resultData);
-		if (canTransitionTo(this.host.state.appState.streamingPhase, "waiting")) this.host.setAppState({ streamingPhase: "waiting" });
+		if (!streamingUI.hasPendingToolCalls() && canTransitionTo(this.host.state.appState.streamingPhase, "waiting")) this.host.setAppState({ streamingPhase: "waiting" });
 	}
 	handleStatusUpdate(event) {
 		const patch = {};
@@ -3134,11 +3159,16 @@ var SessionEventHandler = class {
 		}
 	}
 	handleSessionError(event) {
+		const hadActiveTurn = this.host.streamingUI.hasActiveTurn();
 		this.host.streamingUI.flushNow();
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.finalizeLiveTextBuffers();
 		this.host.streamingUI.endActivityGroup();
 		this.host.showError(`[${event.code}] ${event.message}`);
+		if (event.code === "turn.agent_busy" && !hadActiveTurn && this.host.state.appState.streamingPhase !== "idle") {
+			this.host.setAppState({ streamingPhase: "idle" });
+			this.host.resetLivePane();
+		}
 	}
 	handleSessionWarning(event) {
 		this.host.showStatus(t("handler.warning_prefix", { message: event.message }), this.host.state.theme.colors.warning);
@@ -3637,6 +3667,19 @@ var SessionEventHandler = class {
 	}
 };
 //#endregion
+//#region src/tui/utils/approval-notice.ts
+function buildApprovalNotice(args) {
+	const sessionScoped = args.decision === "approved" && args.scope === "session";
+	const tone = sessionScoped ? "approved_session" : args.decision;
+	const label = args.decision === "approved" ? sessionScoped ? args.labels.approvedSession : args.labels.approved : args.decision === "rejected" ? args.labels.rejected : args.labels.cancelled;
+	const feedback = args.feedback !== void 0 && args.feedback.length > 0 ? ` — "${args.feedback}"` : "";
+	return {
+		label,
+		detail: `${args.action}${feedback}`,
+		tone
+	};
+}
+//#endregion
 //#region src/tui/utils/media-url.ts
 function getMediaKindLabels() {
 	return {
@@ -4095,6 +4138,7 @@ var SessionReplayRenderer = class {
 	}
 	advanceTurn(context) {
 		this.host.streamingUI.endActivityGroup();
+		this.host.streamingUI.flushPendingApprovals();
 		context.turnIndex += 1;
 		context.stepIndex = 0;
 		context.currentTurnId = `replay:${String(context.turnIndex)}`;
@@ -4173,21 +4217,19 @@ var SessionReplayRenderer = class {
 			return;
 		}
 		const { result } = record;
-		const parts = [];
-		switch (result.decision) {
-			case "approved":
-				parts.push(result.scope === "session" ? t("replay.approved_session") : t("replay.approved"));
-				break;
-			case "rejected":
-				parts.push(t("replay.rejected"));
-				break;
-			case "cancelled":
-				parts.push(t("replay.cancelled"));
-				break;
-		}
-		parts.push(`: ${record.action}`);
-		if (result.feedback !== void 0 && result.feedback.length > 0) parts.push(` — "${result.feedback}"`);
-		this.host.appendTranscriptEntry(replayEntry(context, "status", parts.join(""), "notice"));
+		const notice = buildApprovalNotice({
+			decision: result.decision,
+			scope: result.scope,
+			action: record.action,
+			feedback: result.feedback,
+			labels: {
+				approved: t("replay.approved"),
+				approvedSession: t("replay.approved_session"),
+				rejected: t("replay.rejected"),
+				cancelled: t("replay.cancelled")
+			}
+		});
+		this.host.streamingUI.recordApproval(record.toolCallId, notice.label, notice.detail, notice.tone);
 	}
 	renderPlanReviewResult(context, record) {
 		const { result } = record;
@@ -4366,6 +4408,11 @@ var StreamingUIController = class StreamingUIController {
 	_pendingToolComponents = /* @__PURE__ */ new Map();
 	_pendingAgentGroup = null;
 	_activityGroup;
+	/**
+	* Approval outcomes answered before their tool call was dispatched, waiting
+	* for the call's row to appear (see `recordApproval`). Keyed by call id.
+	*/
+	_pendingApprovals = /* @__PURE__ */ new Map();
 	/** Guards the single `registerLiveComponent` call for the turn's block. */
 	_activityGroupRegistered = false;
 	/** Block that borrowed a card, so late results refresh their own block. */
@@ -4578,6 +4625,19 @@ var StreamingUIController = class StreamingUIController {
 		this._streamingToolCallArguments.delete(toolCallId);
 		return matchedCall;
 	}
+	/** True while a tool call of the step being handled has no result yet. A
+	*  parallel batch dispatches its results in provider order, so this is what
+	*  keeps the footer in "执行中" until the whole batch settles instead of
+	*  flipping to "等待中" on the first result. Entries from an earlier step or
+	*  turn are ignored: nothing can settle them any more, and counting them
+	*  would pin the footer in "执行中" for the rest of the turn. */
+	hasPendingToolCalls() {
+		for (const call of this._activeToolCalls.values()) {
+			if (call.turnId !== this._currentTurnId || call.step !== this._currentStep) continue;
+			if (call.result === void 0) return true;
+		}
+		return false;
+	}
 	/** Marks in-flight tool calls as truncated when a step hits max_tokens.
 	*  Returns the count of tool calls that were truncated. */
 	markStepTruncated(turnId, step) {
@@ -4598,6 +4658,7 @@ var StreamingUIController = class StreamingUIController {
 	/** Tears down replay-specific state after session history has been rendered. */
 	cleanupAfterReplay(completedToolCallIds) {
 		this.endActivityGroup();
+		this.flushPendingApprovals();
 		this._activeToolCalls.clear();
 		for (const toolCallId of completedToolCallIds) this._pendingToolComponents.delete(toolCallId);
 		this._pendingAgentGroup = null;
@@ -4665,6 +4726,65 @@ var StreamingUIController = class StreamingUIController {
 		group.attachNotice(data);
 		return true;
 	}
+	/**
+	* Files an approval outcome with the call it allowed.
+	*
+	* The prompt is answered before its tool call is dispatched, so the row it
+	* belongs under usually does not exist yet: while a turn is running the
+	* outcome waits here for its own call to appear, and is filed under it the
+	* moment it does. Two cases keep the row they always had instead — an outcome
+	* answered between turns (a background agent's call, where no block will ever
+	* open), and one whose call's row is not in the block that is open now (a
+	* subagent's call, a card that stays standalone, a block that already
+	* settled), which is mounted when the step settles.
+	*/
+	recordApproval(callId, label, detail, tone) {
+		const card = this._pendingToolComponents.get(callId);
+		const owner = card === void 0 ? void 0 : this._groupByToolCard.get(card);
+		if (owner !== void 0 && this.host.state.transcriptContainer.children.includes(owner) && owner.attachApproval(callId, label, detail, tone)) return;
+		const group = this._activityGroup;
+		if (group !== void 0 && group.attachApproval(callId, label, detail, tone)) return;
+		if (!this.hasActiveTurn()) {
+			this.mountApprovalNotices([{
+				label,
+				detail,
+				tone
+			}]);
+			return;
+		}
+		this._pendingApprovals.set(callId, {
+			label,
+			detail,
+			tone
+		});
+	}
+	/** Files the outcome waiting for this call, now that its row exists. */
+	adoptPendingApproval(group, callId) {
+		const pending = this._pendingApprovals.get(callId);
+		if (pending === void 0) return;
+		this._pendingApprovals.delete(callId);
+		if (!group.attachApproval(callId, pending.label, pending.detail, pending.tone)) this.mountApprovalNotices([pending]);
+	}
+	/**
+	* Mounts outcomes as their own notice row — the row an approval used to get
+	* straight away, and the fallback for anything no block ever claims.
+	*/
+	mountApprovalNotices(approvals) {
+		for (const approval of approvals) this.host.transcriptController.appendEntry({
+			id: nextTranscriptId(),
+			kind: "status",
+			renderMode: "notice",
+			content: `${approval.label}: ${approval.detail}`
+		});
+		this.host.state.ui.requestRender();
+	}
+	/** Settles anything still waiting: mounted as notices, in the order answered. */
+	flushPendingApprovals() {
+		if (this._pendingApprovals.size === 0) return;
+		const parked = [...this._pendingApprovals.values()];
+		this._pendingApprovals.clear();
+		this.mountApprovalNotices(parked);
+	}
 	endActivityGroup() {
 		const group = this._activityGroup;
 		this._activityGroup = void 0;
@@ -4787,6 +4907,7 @@ var StreamingUIController = class StreamingUIController {
 		this._assistantDraft = "";
 		this._shownAssistantLength = 0;
 		this.clearFlushTimerIfIdle();
+		this._streamingBlock?.component.setStreaming(false);
 		this._streamingBlock = null;
 		this._thinkingDraft = "";
 		this.lastDeltaAt = void 0;
@@ -4799,6 +4920,7 @@ var StreamingUIController = class StreamingUIController {
 		this._streamingToolCallArguments.clear();
 		this.disposeAndClearPendingToolComponents();
 		this._pendingAgentGroup = null;
+		this.flushPendingApprovals();
 	}
 	resetToolCallState() {
 		this._activeToolCalls.clear();
@@ -4889,6 +5011,7 @@ var StreamingUIController = class StreamingUIController {
 		const block = this._streamingBlock;
 		if (block !== null) {
 			block.entry.content = fullText;
+			block.component.setStreaming(true);
 			block.component.updateContent(fullText);
 			this.host.state.ui.requestRender();
 		}
@@ -4898,6 +5021,7 @@ var StreamingUIController = class StreamingUIController {
 		const block = this._streamingBlock;
 		this._streamingBlock = null;
 		if (block !== null) {
+			block.component.setStreaming(false);
 			this.host.transcriptController.unmarkPending(block.component);
 			this.host.transcriptController.commit();
 		}
@@ -4962,6 +5086,7 @@ var StreamingUIController = class StreamingUIController {
 		if (state.planExpanded) tc.setPlanExpanded(true);
 		if (toolCall.name !== "Agent") this._pendingAgentGroup = null;
 		if (!this.tryAttachAgentToolCall(toolCall, tc)) if (StreamingUIController.STANDALONE_TOOL_NAMES.has(toolCall.name)) {
+			if (toolCall.name === "ExitPlanMode") this.endActivityGroup();
 			tc.setExpanded(state.toolOutputExpanded);
 			state.transcriptContainer.addChild(tc);
 			state.ui.requestRender();
@@ -4969,7 +5094,8 @@ var StreamingUIController = class StreamingUIController {
 			const group = this.ensureActivityGroup();
 			this.registerActivityGroupEntry(group, entry);
 			this._groupByToolCard.set(tc, group);
-			group.attachTool(tc, toolCall.step ?? this._currentStep);
+			group.attachTool(tc, toolCall.step ?? this._currentStep, toolCall.id);
+			this.adoptPendingApproval(group, toolCall.id);
 			state.ui.requestRender();
 		}
 		if (toolCall.name === "ExitPlanMode" && typeof toolCall.args["plan"] !== "string") {
@@ -6281,6 +6407,9 @@ var TranscriptController = class TranscriptController {
 	welcomeComponent;
 	committedComponent;
 	liveComponentToEntry = /* @__PURE__ */ new Map();
+	/** Live `started` notice cards by task id, so the terminal notice can stop the
+	*  ticker of the card that is still claiming the task is running. */
+	liveNoticesByTrackingId = /* @__PURE__ */ new Map();
 	pendingComponents = /* @__PURE__ */ new Set();
 	/** Max live transcript children before the oldest are folded into the
 	*  committed single-line summary. Overridable via SCREAM_TRANSCRIPT_LIVE_LIMIT
@@ -6306,6 +6435,26 @@ var TranscriptController = class TranscriptController {
 	releaseLiveComponent(component) {
 		this.liveComponentToEntry.delete(component);
 	}
+	/**
+	* Stop everything a component owns once it leaves the live area. Committed
+	* views re-render from the entry data, so disposing cannot lose content, but
+	* skipping it would let an animation timer outlive the row it belonged to.
+	*/
+	dropLiveComponent(component) {
+		for (const [trackingId, tracked] of this.liveNoticesByTrackingId) if (tracked === component) this.liveNoticesByTrackingId.delete(trackingId);
+		if (hasDispose(component)) component.dispose();
+	}
+	/**
+	* Stops the ticker of the card that announced `trackingId`. Called when the
+	* task reaches a terminal state: that card is history now, and a glyph that
+	* keeps rotating would claim the task is still running.
+	*/
+	settleLiveNotice(trackingId) {
+		const tracked = this.liveNoticesByTrackingId.get(trackingId);
+		if (tracked === void 0) return;
+		this.liveNoticesByTrackingId.delete(trackingId);
+		tracked.settle();
+	}
 	markPending(component) {
 		this.pendingComponents.add(component);
 	}
@@ -6347,6 +6496,7 @@ var TranscriptController = class TranscriptController {
 				this.committedComponent.appendEntry(entry, state.theme.colors);
 				container.removeChild(component);
 				this.liveComponentToEntry.delete(component);
+				this.dropLiveComponent(component);
 			}
 			this.committedComponent.setCount(this.committedComponent.getCount() + toCommit.length);
 			if (process.env["SCREAM_CODE_DEBUG"] === "1") this.host.showStatus(`[debug] committed=${this.committedComponent.getCount()} live=${this.getLiveCount()}`);
@@ -6381,10 +6531,10 @@ var TranscriptController = class TranscriptController {
 					if (state.planExpanded) tc.setPlanExpanded(true);
 					return tc;
 				}
-				if (entry.backgroundAgentStatus !== void 0) return new BackgroundAgentStatusComponent(entry.backgroundAgentStatus, state.theme.colors);
+				if (entry.backgroundAgentStatus !== void 0) return new BackgroundAgentStatusComponent(entry.backgroundAgentStatus, state.theme.colors, state.ui);
 				return entry.renderMode === "notice" ? new NoticeMessageComponent(entry.content, entry.detail, state.theme.colors, entry.noticeMarkerColor) : new StatusMessageComponent(entry.content, state.theme.colors, entry.color);
 			case "status":
-				if (entry.backgroundAgentStatus !== void 0) return new BackgroundAgentStatusComponent(entry.backgroundAgentStatus, state.theme.colors);
+				if (entry.backgroundAgentStatus !== void 0) return new BackgroundAgentStatusComponent(entry.backgroundAgentStatus, state.theme.colors, state.ui);
 				return entry.renderMode === "notice" ? new NoticeMessageComponent(entry.content, entry.detail, state.theme.colors, entry.noticeMarkerColor) : new StatusMessageComponent(entry.content, state.theme.colors, entry.color);
 			case "cron":
 				if (entry.cronData === void 0) return null;
@@ -6399,8 +6549,15 @@ var TranscriptController = class TranscriptController {
 		if (component) {
 			this.liveComponentToEntry.set(component, entry);
 			const status = entry.backgroundAgentStatus;
-			if (status !== void 0 && this.host.streamingUI.attachNotice(status)) this.releaseLiveComponent(component);
-			else this.host.state.transcriptContainer.addChild(component);
+			if (status !== void 0 && component instanceof BackgroundAgentStatusComponent) {
+				const trackingId = status.trackingId;
+				if (trackingId !== void 0) if (status.phase === "started") this.liveNoticesByTrackingId.set(trackingId, component);
+				else this.settleLiveNotice(trackingId);
+			}
+			if (status !== void 0 && this.host.streamingUI.attachNotice(status)) {
+				this.releaseLiveComponent(component);
+				this.dropLiveComponent(component);
+			} else this.host.state.transcriptContainer.addChild(component);
 			this.host.state.ui.requestRender();
 		}
 		return component ?? null;
@@ -6426,26 +6583,19 @@ var TranscriptController = class TranscriptController {
 	}
 	appendApprovalEntry(request, response) {
 		if (request.toolName === "ExitPlanMode" || request.display.kind === "plan_review") return;
-		const parts = [];
-		switch (response.decision) {
-			case "approved":
-				parts.push(response.scope === "session" ? t("tc.approved_session") : t("tc.approved"));
-				break;
-			case "rejected":
-				parts.push(t("tc.rejected"));
-				break;
-			case "cancelled":
-				parts.push(t("tc.cancelled"));
-				break;
-		}
-		parts.push(`: ${request.action}`);
-		if (response.feedback !== void 0 && response.feedback.length > 0) parts.push(` — "${response.feedback}"`);
-		this.appendEntry({
-			id: nextTranscriptId(),
-			kind: "status",
-			renderMode: "notice",
-			content: parts.join("")
+		const notice = buildApprovalNotice({
+			decision: response.decision,
+			scope: response.scope,
+			action: request.action,
+			feedback: response.feedback,
+			labels: {
+				approved: t("tc.approved"),
+				approvedSession: t("tc.approved_session"),
+				rejected: t("tc.rejected"),
+				cancelled: t("tc.cancelled")
+			}
 		});
+		this.host.streamingUI.recordApproval(request.toolCallId, notice.label, notice.detail, notice.tone);
 	}
 	renderWelcome() {
 		const { state } = this.host;
@@ -6464,6 +6614,7 @@ var TranscriptController = class TranscriptController {
 		const { state, streamingUI, imageStore } = this.host;
 		streamingUI.discardPending();
 		streamingUI.endActivityGroup();
+		streamingUI.flushPendingApprovals();
 		state.transcriptEntries = [];
 		streamingUI.disposeActiveCompactionBlock();
 		streamingUI.resetLiveText();
@@ -6731,20 +6882,6 @@ const gitPanel = {
 };
 //#endregion
 //#region src/tui/components/sidebar/panels/session-panel.ts
-function formatDuration(ms) {
-	const totalSeconds = Math.max(0, Math.floor(ms / 1e3));
-	if (getLocale() === "zh") {
-		if (totalSeconds < 60) return `${totalSeconds}秒`;
-		const hours = Math.floor(totalSeconds / 3600);
-		const minutes = Math.floor(totalSeconds % 3600 / 60);
-		return hours > 0 ? `${hours}小时${minutes}分` : `${minutes}分钟`;
-	}
-	if (totalSeconds < 60) return `${totalSeconds}s`;
-	const hours = Math.floor(totalSeconds / 3600);
-	const minutes = Math.floor(totalSeconds % 3600 / 60);
-	if (hours > 0) return `${hours}h ${minutes}m`;
-	return `${minutes}m`;
-}
 /** 1,234 → "1,234" via the platform locale grouping. */
 function formatCount$1(n) {
 	return n.toLocaleString("en-US");
@@ -6770,8 +6907,8 @@ function gridFits(rows, width) {
 /**
 * Session summary, live-rendered each frame as a strict two-column table:
 * one field per row, labels sharing a left column, values sharing a right
-* edge. Uptime derives from `startedAt` so it ticks between data updates;
-* every other value comes from the snapshot in getData().
+* edge. Every value comes from the snapshot in getData(); nothing here is
+* derived from wall-clock time.
 */
 var SessionPanelContent = class {
 	ctx;
@@ -6786,7 +6923,6 @@ var SessionPanelContent = class {
 		if (stats === void 0) return [chalk.hex(this.colors.textDim)(t("sidebar.session_empty"))];
 		const label = (s) => chalk.hex(this.colors.textDim)(s);
 		const value = (s) => chalk.hex(this.colors.text)(s);
-		const now = Date.now();
 		const tokenRows = [
 			[t("sidebar.tokens"), stats.tokensTotal],
 			[t("sidebar.tokens_cache_hit"), stats.tokensInputCacheHit],
@@ -6794,7 +6930,6 @@ var SessionPanelContent = class {
 			[t("sidebar.tokens_output"), stats.tokensOutput]
 		];
 		const countRows = [
-			[t("sidebar.uptime"), formatDuration(now - stats.startedAt)],
 			[t("sidebar.turns"), formatCount$1(stats.turns)],
 			[t("sidebar.tools"), formatCount$1(stats.toolCalls)],
 			[t("sidebar.calls"), formatCount$1(stats.apiCalls)],
@@ -6841,8 +6976,8 @@ function statusText(status) {
 	}
 }
 /**
-* Fixed 8-slot subagent panel: one row per default subagent type (plus any
-* custom types appended in spawn order). Live-rendered each frame from the
+* Fixed default-slot subagent panel: one row per default subagent type (plus
+* any custom types appended in spawn order). Live-rendered each frame from the
 * current snapshot; idle slots stay greyed out.
 */
 var AgentsPanelContent = class {
@@ -6865,7 +7000,7 @@ var AgentsPanelContent = class {
 	renderSlot(cell, slot, index, width) {
 		const dim = (s) => chalk.hex(this.colors.textDim)(s);
 		const idle = slot.status === "idle";
-		const phase = (Date.now() % AGENT_GRADIENT_CYCLE_MS / AGENT_GRADIENT_CYCLE_MS + index * .125) % 1;
+		const phase = (Date.now() % AGENT_GRADIENT_CYCLE_MS / AGENT_GRADIENT_CYCLE_MS + index * .6180339887498949) % 1;
 		const active = slot.status === "working" || slot.status === "outputting" ? chalk.hex(lerpGradient(phase)).bold : void 0;
 		const marker = padLabel((active ?? chalk.hex(this.statusColor(slot.status)))(idle ? "○" : "●"), 2);
 		const label = (idle ? dim : chalk.hex(this.colors.textStrong))(cell.label);
@@ -7125,23 +7260,38 @@ function toneFor(site, stale) {
 /**
 * Merge the measured provider reading with the probe samples into Hub rows.
 * The provider row always leads (it answers "is the model I'm using reachable"),
-* and it staleness-checks against its own budget: a long idle stretch means
-* nothing was asked, not that the network died.
+* it staleness-checks against its own budget: a long idle stretch means nothing
+* was asked, not that the network died — and it is coloured on its own ladder
+* (see {@link hubModelTone}), not on the probe bar.
 */
 function buildHubSamples(snapshot, provider, now = Date.now()) {
 	const ageMs = provider.sampledAt === void 0 ? 0 : now - provider.sampledAt;
 	return [{
 		id: HUB_MODEL_ROW_ID,
 		ms: provider.ms,
-		tone: hubLatencyTone(provider.ms, ageMs >= HUB_MODEL_STALE_MS)
+		tone: hubModelTone(provider.ms, ageMs >= HUB_MODEL_STALE_MS)
 	}, ...snapshot.samples];
 }
-/** Shared tone rule for every Hub row (probe sites and the measured provider). */
+/** Tone rule for the probed endpoint rows: green ≤{@link HUB_GOOD_MS}, amber above. */
 function hubLatencyTone(ms, stale = false) {
 	if (ms === void 0 || stale) return "dim";
 	return ms <= 100 ? "ok" : "warn";
 }
 /**
+* Tone rule for the measured provider row (model first token), deliberately
+* separate from the probe ladder: a first token and a HEAD request are not
+* comparable, and one shared bar would call every healthy answer slow. Green
+* ≤{@link HUB_MODEL_GOOD_MS}, amber up to {@link HUB_MODEL_SLOW_MS}, red past
+* it — that long is worth flagging, not merely dimming. `undefined` (nothing
+* measured yet, or a provider just switched) and a stale reading stay dim:
+* neither is an outage.
+*/
+function hubModelTone(ms, stale = false) {
+	if (ms === void 0 || stale) return "dim";
+	if (ms <= 5e3) return "ok";
+	return ms <= 15e3 ? "warn" : "down";
+}
+/**
 * Compact latency reading: whole milliseconds below a second, one-decimal
 * seconds above — a probe that never answers must never read as `65400ms`.
 */
@@ -7162,9 +7312,11 @@ const EMPTY_MARK = "--";
 *
 * Values share one right edge through the same two-column engine the Session
 * panel uses, so rows never jitter as numbers change width, and only the value
-* carries colour (green ≤100ms, amber above it, red when a site stopped
-* answering). The panel is a pure view: probing happens in the data provider,
-* which is what keeps a slow endpoint from ever touching a frame.
+* carries colour. Two ladders, because two different things are timed: probe
+* rows are green ≤100ms, amber above it, red once a site stopped answering,
+* while the measured provider row (model first token) is green ≤5s, amber up to
+* 15s and red past that. The panel is a pure view: probing happens in the data
+* provider, which is what keeps a slow endpoint from ever touching a frame.
 */
 var HubPanelContent = class {
 	ctx;
@@ -7776,10 +7928,6 @@ var LifecycleController = class LifecycleController {
 	*  frame asked, so a closed sidebar produces no traffic. */
 	hubProbe = createHubProbe();
 	sidebarGitCacheWorkDir = "";
-	/** Session start time for the sidebar uptime counter. Reset on session
-	* switch so a resumed old session doesn't show the TUI process age. */
-	sidebarSessionStartedAt = Date.now();
-	sidebarSessionId;
 	/** Memo for the session-stats aggregation: recomputed only when the
 	* transcript length, compaction count or usage object changes. */
 	sidebarStatsMemo;
@@ -8047,10 +8195,6 @@ var LifecycleController = class LifecycleController {
 		};
 	}
 	readSidebarSessionStats(appState) {
-		if (this.sidebarSessionId !== appState.sessionId) {
-			this.sidebarSessionId = appState.sessionId;
-			this.sidebarSessionStartedAt = Date.now();
-		}
 		const entries = this.host.state.transcriptEntries;
 		const usage = appState.sessionUsage;
 		const subagentUsage = appState.subagentUsage;
@@ -8072,8 +8216,7 @@ var LifecycleController = class LifecycleController {
 			tokensTotal: LifecycleController.sumTokens(usage) + subagentOutput,
 			tokensInputCacheHit: usage.inputCacheRead,
 			tokensInputCacheMiss: usage.inputOther + usage.inputCacheCreation,
-			tokensOutput: usage.output + subagentOutput,
-			startedAt: this.sidebarSessionStartedAt
+			tokensOutput: usage.output + subagentOutput
 		};
 		this.sidebarStatsMemo = {
 			length: entries.length,
@@ -8367,7 +8510,7 @@ var FileMentionProvider = class {
 		const atPrefix = extractAtPrefix(textBeforeCursor);
 		if (!options.force && atPrefix === null && textBeforeCursor.startsWith("/") && !textBeforeCursor.includes(" ")) {
 			const query = textBeforeCursor.slice(1);
-			const filtered = fuzzyFilter(this.slashCommandItems, query, (item) => item.value).slice(0, MAX_SUGGESTIONS_WHEN_QUERY);
+			const filtered = fuzzyFilter(this.slashCommandItems, query, (item) => !query.startsWith("skill:") && item.value.startsWith("skill:") ? item.value.slice(6) : item.value);
 			if (filtered.length === 0) return null;
 			return {
 				items: filtered,
@@ -9319,7 +9462,7 @@ const SIDE_PADDING = 1;
 * Renders the stacked sidebar: every visible registered panel gets its own
 * full box frame (┌─┐│└┘) with the panel title embedded in the top frame, one
 * below the other. Panels render live each frame (their body reads the
-* current data snapshot), so time-based values (uptime, goal wall-clock)
+* current data snapshot), so time-based values (goal wall-clock)
 * tick without rebuilding. The focused panel's title is bolded; focus is
 * moved by the SidebarManager (`/sidebar next/prev`, Ctrl+X toggles).
 * The whole frame is painted in the theme accent colour and the rendered
@@ -9333,9 +9476,10 @@ var SidebarContainer = class extends Container {
 	* only rebuilt when the visible panel set changes. */
 	bodies = /* @__PURE__ */ new Map();
 	builtStackKey = "";
-	/** 1s heartbeat while the sidebar is open: keeps live values (uptime,
-	* goal wall-clock, gradient phase of busy agent slots) ticking without
-	* needing an event. Stopped when the sidebar closes. */
+	/** 1s heartbeat for the whole container lifetime: keeps live values (goal
+	* wall-clock, gradient phase of busy agent slots) ticking while the sidebar
+	* is open — the tick is a no-op when it is closed, and only `dispose()`
+	* (TUI teardown) clears the interval. */
 	heartbeat;
 	constructor(manager, requestRender, colors) {
 		super();
@@ -11002,6 +11146,7 @@ var SessionManager$1 = class {
 		await this.unloadCurrentSession("switching session")?.close({ extractMemories: false });
 		this.host.session = session;
 		this.registerSessionHandlers(session);
+		await syncDiagramCapabilityPrompt(session);
 	}
 	async syncRuntimeState(session = this.requireSession()) {
 		const status = await session.getStatus();
@@ -13373,6 +13518,7 @@ function createInitialAppState(input) {
 		isSwitchingSession: false,
 		streamingPhase: "idle",
 		streamingStartTime: 0,
+		pendingUserAction: null,
 		theme: input.tuiConfig.theme,
 		version: input.version,
 		hasNewVersion: false,
@@ -13809,14 +13955,28 @@ var ScreamTUI = class {
 	patchLivePane(patch) {
 		if (!hasPatchChanges(this.state.livePane, patch)) return;
 		Object.assign(this.state.livePane, patch);
+		this.syncPendingUserAction();
 		this.lifecycleController.updateActivityPane();
 		this.state.ui.requestRender();
 	}
 	resetLivePane() {
 		this.state.livePane = { ...INITIAL_LIVE_PANE };
+		this.syncPendingUserAction();
 		this.lifecycleController.updateActivityPane();
 		this.state.ui.requestRender();
 	}
+	/**
+	* Mirror the live pane's pending panels onto `AppState.pendingUserAction` so
+	* the footer status block can report "等待批准/等待回答" instead of claiming a
+	* running phase while a panel is blocked on the user. Every mutation of
+	* `livePane` goes through patchLivePane/resetLivePane, so this stays the
+	* single writer of that field.
+	*/
+	syncPendingUserAction() {
+		const { pendingApproval, pendingQuestion } = this.state.livePane;
+		const next = pendingApproval !== null ? "approval" : pendingQuestion !== null ? "question" : null;
+		if (next !== this.state.appState.pendingUserAction) this.setAppState({ pendingUserAction: next });
+	}
 	requireSession() {
 		if (this.session === void 0) throw new Error(getNoActiveSessionMessage());
 		return this.session;
@@ -13893,7 +14053,7 @@ var ScreamTUI = class {
 		const card = new OnboardingCardComponent({
 			colors: this.state.theme.colors,
 			onConfigure: () => {
-				import("./dispatch-BNVgLsrQ.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
+				import("./dispatch-CIGyjBDa.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
 					this.restoreEditor();
 					onDone?.();
 				});
@@ -13914,7 +14074,7 @@ var ScreamTUI = class {
 		if (this.state.startupState === "picker") return;
 		try {
 			await getKnowledgeStore();
-			if (isEmbeddingModelCached()) {
+			if (hasEmbeddingModelCache()) {
 				startManualEmbeddingDownload().catch(() => {});
 				return;
 			}
@@ -13929,8 +14089,9 @@ var ScreamTUI = class {
 					const spinner = this.showProgressSpinner(t("kw.embedding_downloading"));
 					let ok = false;
 					let error;
+					let failureKind;
 					try {
-						({ok, error} = await startManualEmbeddingDownload());
+						({ok, error, failureKind} = await startManualEmbeddingDownload());
 					} catch (error) {
 						error = error instanceof Error ? error.message : String(error);
 					}
@@ -13940,7 +14101,7 @@ var ScreamTUI = class {
 					});
 					if (ok) this.showStatus(t("kw.embedding_ready"));
 					else {
-						const detail = [t("knowledge.download_model_retry_hint"), error].filter(Boolean).join("\n");
+						const detail = embeddingFailureDetail(failureKind, error);
 						this.showNotice(t("kw.embedding_failed"), detail);
 					}
 				})();
@@ -16175,13 +16336,16 @@ async function ensureSessionsDir(homeDir) {
 	const dir = getSessionsDir(homeDir);
 	if (!existsSync(dir)) await mkdir(dir, { recursive: true });
 }
-async function appendJournalLine(homeDir, sessionId, line) {
+async function appendJournalLine(homeDir, sessionId, line, throwOnError = false) {
+	let writeError;
 	await appendJournalLineSerialized(getJournalPath(homeDir, sessionId), line, (error) => {
+		writeError = error;
 		log.warn("web: failed to persist journal line", {
 			sessionId,
 			error: String(error)
 		});
 	});
+	if (throwOnError && writeError !== void 0) throw writeError;
 }
 let metaWriteSeq = 0;
 async function saveMetadata(homeDir, meta) {
@@ -16266,16 +16430,22 @@ function isMessageBearingEntry(entry) {
 */
 function contextHistoryToChatMessages(history) {
 	const out = [];
+	let pendingAnchor = "other";
 	for (const message of history) {
 		if (message.role !== "user" && message.role !== "assistant") continue;
 		if (isInternalMessage(message)) continue;
-		if (message.origin !== void 0 && message.origin.kind !== "user") continue;
+		const anchor = classifyUndoAnchor(message.origin);
+		if (message.role === "user") {
+			pendingAnchor = anchor;
+			if (anchor === "skill" || anchor === "other") continue;
+		}
 		const text = message.content.map((part) => part.type === "text" ? part.text : "").join("").trim();
 		if (text.length === 0) continue;
 		out.push({
 			role: message.role,
 			content: text,
-			tools: []
+			tools: [],
+			undoAnchor: message.role === "assistant" ? pendingAnchor : anchor
 		});
 	}
 	return out;
@@ -16305,6 +16475,65 @@ function deriveTitle(messages) {
 	const text = firstUser.content.trim();
 	return text.length > 40 ? text.slice(0, 40) + "..." : text;
 }
+/**
+* Remove complete user-turn blocks from a rendered transcript.  The core
+* context owns the authoritative undo operation; the web journal is append
+* only, so a durable undo marker asks this projection to hide the same turns
+* when snapshots are rebuilt (including after a restart).
+*
+* `beforeSeq` is an inclusive cursor captured before the core mutation. It
+* also covers a user message that reserved the next sequence but never
+* emitted a turn event.
+*/
+function removeLastTurnsBefore(messages, count, beforeSeq) {
+	if (count <= 0 || messages.length === 0) return;
+	const firstFutureIndex = messages.findIndex((message) => typeof message.seq === "number" && message.seq > beforeSeq);
+	const prefixLength = firstFutureIndex === -1 ? messages.length : firstFutureIndex;
+	const prefix = messages.slice(0, prefixLength);
+	const tail = messages.slice(prefixLength);
+	let remaining = count;
+	while (remaining > 0) {
+		let anchor = -1;
+		for (let i = prefix.length - 1; i >= 0; i -= 1) {
+			const message = prefix[i];
+			if (message?.role === "assistant" && message.undoAnchor === "skill") {
+				anchor = i;
+				while (anchor > 0) {
+					const previous = prefix[anchor - 1];
+					if (previous?.role !== "assistant" || previous.undoAnchor !== "skill") break;
+					anchor -= 1;
+				}
+				break;
+			}
+			if (message?.role === "user") {
+				anchor = i;
+				break;
+			}
+		}
+		if (anchor < 0) break;
+		prefix.splice(anchor);
+		remaining -= 1;
+	}
+	messages.splice(0, messages.length, ...prefix, ...tail);
+}
+function classifyUndoAnchor(origin) {
+	if (origin === void 0 || origin === null) return "user";
+	if (typeof origin !== "object") return "other";
+	const kind = origin.kind;
+	if (kind === "user") return "user";
+	if (kind === "skill_activation" && origin.trigger === "user-slash") return "skill";
+	return "other";
+}
+/** Match the core `/undo` anchor rule without importing agent-core internals. */
+function countUndoAnchors(history) {
+	let count = 0;
+	for (const message of history) {
+		if (message.role !== "user") continue;
+		const origin = message.origin;
+		if (origin === void 0 || origin.kind === "user" || origin.kind === "skill_activation" && origin.trigger === "user-slash") count += 1;
+	}
+	return count;
+}
 const execFileAsync = promisify(execFile);
 /** Raw porcelain rows: repo-root-relative path + XY status. `getGitStatus`
 *  enriches these into full `GitFileChange` records. */
@@ -16567,6 +16796,8 @@ var WebSession = class {
 	heartbeatTimer = null;
 	unsubscribe = null;
 	busy = false;
+	/** Prevent two concurrent REST `/undo` calls from mutating core history together. */
+	undoInFlight = false;
 	/**
 	* In-flight turn count across all agents (main + subagents). Used by the
 	* idle-exit watchdog: a single boolean is not enough because a subagent's
@@ -16655,13 +16886,13 @@ var WebSession = class {
 		});
 		return entries;
 	}
-	async persistEntry(entry) {
+	async persistEntry(entry, throwOnError = false) {
 		if (!this.homeDir) return;
 		const line = JSON.stringify({
 			type: "journal",
 			...entry
 		});
-		await appendJournalLine(this.homeDir, this.sessionId, line);
+		await appendJournalLine(this.homeDir, this.sessionId, line, throwOnError);
 	}
 	async persistUserMessage(text, beforeSeq, clientMessageId) {
 		this.userMessages.push({
@@ -16718,6 +16949,9 @@ var WebSession = class {
 	* journal holds no message records.
 	*/
 	seededMessages = [];
+	/** Undo markers already reflected by a core-history seed must not be applied twice. */
+	seedCoveredUndoMarkers = /* @__PURE__ */ new Set();
+	historySeeded = false;
 	/**
 	* Mark the journal untrustworthy (byte-interleaving damage, see
 	* journal-writer.ts).
@@ -16759,7 +16993,10 @@ var WebSession = class {
 	* monotonic with live events and consistent with the getMessagesOlder cursor.
 	*/
 	seedHistory(messages) {
-		if (messages.length === 0 || this.seededMessages.length > 0) return;
+		if (this.historySeeded) return;
+		this.historySeeded = true;
+		for (const entry of this.journal) if (entry.payload.type === "web.history.undone") this.seedCoveredUndoMarkers.add(entry.seq);
+		if (messages.length === 0) return;
 		let seq = 1;
 		for (const message of messages) {
 			this.seededMessages.push({
@@ -16806,7 +17043,7 @@ var WebSession = class {
 	* clients. Used for server-owned reconstruction material (finalized
 	* assistant snapshots) that clients never consume as live events.
 	*/
-	appendDurableSilent(payload) {
+	appendDurableSilent(payload, throwOnPersistenceError = false) {
 		const entry = {
 			seq: this.nextSeq++,
 			epoch: this.epoch,
@@ -16814,8 +17051,12 @@ var WebSession = class {
 			payload
 		};
 		this.journal.push(entry);
-		this.trackPending(this.persistEntry(entry));
-		return entry;
+		const persisted = this.persistEntry(entry, throwOnPersistenceError);
+		this.trackPending(persisted);
+		return {
+			entry,
+			persisted
+		};
 	}
 	subscribeEvents() {
 		if (!this.session) return;
@@ -17144,13 +17385,14 @@ var WebSession = class {
 		});
 	}
 	async handleCommand(ws, command, args, pendingMsgId) {
-		const ok = (message) => {
+		const ok = (message, extra) => {
 			this.broadcast({
 				type: "command_result",
 				command,
 				ok: true,
 				message,
-				pendingMsgId
+				pendingMsgId,
+				...extra
 			}, false);
 		};
 		const fail = (message) => {
@@ -17186,9 +17428,10 @@ var WebSession = class {
 				}
 				return;
 			case "auto":
+			case "ask":
 			case "yes":
 			case "bot": {
-				const mode = command === "auto" ? "auto" : command === "bot" ? "bot" : "yolo";
+				const mode = command === "auto" ? "auto" : command === "ask" ? "ask" : command === "bot" ? "bot" : "yolo";
 				try {
 					await this.session.setPermission(mode);
 					this.permission = mode;
@@ -17231,7 +17474,7 @@ var WebSession = class {
 						fail("Fork 失败：无法复制当前会话。");
 						return;
 					}
-					ok(`会话已 fork，新会话 ID：${result.sessionId}`);
+					ok(`会话已 fork，新会话 ID：${result.sessionId}`, { sessionId: result.sessionId });
 				} catch (error) {
 					fail(`Fork 失败：${errMsg(error)}`);
 				}
@@ -17342,6 +17585,7 @@ var WebSession = class {
 				planMode: false,
 				wolfpackMode: false,
 				rlmEnabled: false,
+				rlmMaxDepth: null,
 				contextTokens: 0,
 				maxContextTokens: 0,
 				contextUsage: 0
@@ -17518,6 +17762,64 @@ var WebSession = class {
 		if (!this.session) throw new HttpError(409, "Session is archived (read-only)", ErrorCodes.SESSION_CLOSED);
 		return this.session;
 	}
+	/**
+	* Undo user turns in the core session and append a durable web projection
+	* marker.  The core RPC deliberately has no UI knowledge, so without the
+	* marker the old append-only web journal would resurrect the removed turns
+	* on the next snapshot or after a restart.
+	*/
+	async undoHistory(count) {
+		if (!Number.isSafeInteger(count) || count < 1) throw new HttpError(400, "Undo count must be a positive integer.");
+		if (this.busy) throw new HttpError(409, "Session is busy", ErrorCodes.TURN_AGENT_BUSY);
+		const session = this.requireLiveSession();
+		if (this.undoInFlight) throw new HttpError(409, "Undo already in progress");
+		this.undoInFlight = true;
+		try {
+			const beforeSeq = this.nextSeq;
+			let beforeAnchors = null;
+			try {
+				beforeAnchors = countUndoAnchors((await session.getContext()).history);
+			} catch (error) {
+				log.warn("web: failed to read context before undo", {
+					sessionId: this.sessionId,
+					error: String(error)
+				});
+			}
+			await session.undoHistory(count);
+			let removed = count;
+			if (beforeAnchors !== null) try {
+				const afterAnchors = countUndoAnchors((await session.getContext()).history);
+				removed = Math.max(0, beforeAnchors - afterAnchors);
+			} catch (error) {
+				log.warn("web: failed to read context after undo", {
+					sessionId: this.sessionId,
+					error: String(error)
+				});
+			}
+			if (removed <= 0) {
+				await this.refreshStatus();
+				this.broadcastStatus();
+				return;
+			}
+			const { entry, persisted } = this.appendDurableSilent({
+				type: "web.history.undone",
+				count: removed,
+				beforeSeq
+			}, true);
+			await persisted;
+			this.broadcast({
+				type: "event",
+				seq: entry.seq,
+				epoch: entry.epoch,
+				payload: entry.payload
+			}, false);
+			this.trackPending(this.updateTitle());
+			await this.refreshStatus();
+			this.broadcastStatus();
+		} finally {
+			this.undoInFlight = false;
+		}
+	}
 	requireGoalSession(allowBusy = false) {
 		if (!this.session) throw new HttpError(409, "Session is archived (read-only)", ErrorCodes.SESSION_CLOSED);
 		if (!allowBusy && this.busy) throw new HttpError(409, "Session is busy", ErrorCodes.TURN_AGENT_BUSY);
@@ -17595,6 +17897,7 @@ var WebSession = class {
 						role: "assistant",
 						content: "",
 						tools: [],
+						undoAnchor: classifyUndoAnchor(event.origin),
 						seq: entry.seq,
 						model: this.cachedStatus?.model,
 						turnStats: {
@@ -17648,13 +17951,20 @@ var WebSession = class {
 					break;
 				case "web.message.finalized": {
 					const finalized = event.message;
-					finalized.seq = messages.length > 0 && messages.at(-1)?.role === "assistant" ? messages.at(-1).seq : entry.seq;
+					const lastSkeletonSeq = messages.length > 0 && messages.at(-1)?.role === "assistant" ? messages.at(-1).seq : entry.seq;
+					if (finalized.undoAnchor === void 0 && messages.at(-1)?.role === "assistant") finalized.undoAnchor = messages.at(-1).undoAnchor;
+					finalized.seq = lastSkeletonSeq;
 					if (messages.length > 0 && messages.at(-1)?.role === "assistant") messages[messages.length - 1] = finalized;
 					else messages.push(finalized);
 					currentAssistant = null;
 					turnFinalized = true;
 					break;
 				}
+				case "web.history.undone":
+					if (!this.seedCoveredUndoMarkers.has(entry.seq)) removeLastTurnsBefore(messages, event.count, event.beforeSeq);
+					currentAssistant = null;
+					turnFinalized = false;
+					break;
 				case "turn.ended":
 					if (event.reason === "failed" && currentAssistant) currentAssistant.isError = true;
 					if (currentAssistant && !turnFinalized && currentAssistant.content === "") currentAssistant.degraded = true;
@@ -17666,7 +17976,10 @@ var WebSession = class {
 		}
 		for (let i = userIndex; i < this.userMessages.length; i++) {
 			const item = this.userMessages[i];
-			if (item !== void 0) messages.push(item.msg);
+			if (item !== void 0) messages.push({
+				...item.msg,
+				seq: item.beforeSeq
+			});
 		}
 		return messages;
 	}
@@ -18263,7 +18576,9 @@ var SessionManager = class {
 		await ws.switchRlm(enabled, maxDepth);
 	}
 	async undoHistory(sessionId, count) {
-		await this.getLiveSession(sessionId).undoHistory(count);
+		const ws = this.sessions.get(sessionId);
+		if (!ws) throw new HttpError(404, "Session not found", ErrorCodes.SESSION_NOT_FOUND);
+		await ws.undoHistory(count);
 	}
 	async compact(sessionId, instruction) {
 		await this.getLiveSession(sessionId).compact(instruction ? { instruction } : {});
@@ -18433,16 +18748,32 @@ async function handleSessionDataRoutes(req, res, url, method, resolveSession, wo
 		}
 		return true;
 	}
-	if (url === `${API_PREFIX}/git/status` && method === "GET") {
-		const gs = await getGitStatus(workDir);
-		res.writeHead(200, { "Content-Type": "application/json" });
-		res.end(JSON.stringify(gs));
-		return true;
-	}
-	if (url.startsWith(`${API_PREFIX}/git/diff?`) && method === "GET") {
-		const relPath = new URLSearchParams(url.split("?")[1] ?? "").get("path") ?? "";
+	const gitPath = url.split("?")[0];
+	const isGitStatusRoute = gitPath === `${API_PREFIX}/git/status` && method === "GET";
+	if (isGitStatusRoute || gitPath === `${API_PREFIX}/git/diff` && method === "GET") {
+		const gitQuery = new URLSearchParams(url.split("?")[1] ?? "");
+		const requestedGitSessionId = gitQuery.get("sessionId");
+		let gitWorkDir = workDir;
+		if (requestedGitSessionId !== null) {
+			const gitSession = resolveSession(requestedGitSessionId);
+			if (!gitSession) {
+				sendJson(res, 404, {
+					code: ErrorCodes.SESSION_NOT_FOUND,
+					message: "Session not found"
+				});
+				return true;
+			}
+			gitWorkDir = gitSession.workDir;
+		}
+		if (isGitStatusRoute) {
+			const gs = await getGitStatus(gitWorkDir);
+			res.writeHead(200, { "Content-Type": "application/json" });
+			res.end(JSON.stringify(gs));
+			return true;
+		}
+		const relPath = gitQuery.get("path") ?? "";
 		try {
-			const result = await getGitFileDiff(workDir, relPath);
+			const result = await getGitFileDiff(gitWorkDir, relPath);
 			res.writeHead(200, { "Content-Type": "application/json" });
 			res.end(JSON.stringify({
 				path: relPath,
@@ -18653,6 +18984,7 @@ async function handleSessionControlRoutes(req, res, url, method, manager) {
 	return false;
 }
 async function handleResourceRoutes(req, res, url, method, manager) {
+	const routePath = url.split("?")[0] ?? url;
 	const skillsMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/skills$`).exec(url);
 	if (skillsMatch && method === "GET") {
 		try {
@@ -18840,7 +19172,7 @@ async function handleResourceRoutes(req, res, url, method, manager) {
 		}
 		return true;
 	}
-	const tasksMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks$`).exec(url);
+	const tasksMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks$`).exec(routePath);
 	if (tasksMatch && method === "GET") {
 		try {
 			const query = new URLSearchParams(url.split("?")[1] ?? "");
@@ -18852,7 +19184,7 @@ async function handleResourceRoutes(req, res, url, method, manager) {
 		}
 		return true;
 	}
-	const taskOutputMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks/([^/]+)/output$`).exec(url);
+	const taskOutputMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks/([^/]+)/output$`).exec(routePath);
 	if (taskOutputMatch && method === "GET") {
 		try {
 			const query = new URLSearchParams(url.split("?")[1] ?? "");
@@ -18863,7 +19195,7 @@ async function handleResourceRoutes(req, res, url, method, manager) {
 		}
 		return true;
 	}
-	const taskStopMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks/([^/]+)/stop$`).exec(url);
+	const taskStopMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/tasks/([^/]+)/stop$`).exec(routePath);
 	if (taskStopMatch && method === "POST") {
 		try {
 			const body = await readJsonBody(req);