scream-code 0.16.1 → 0.16.2

package/dist/{app-lSa6fM8z.mjs → app-V7s7I7Nr.mjs}

@@ -4,14 +4,14 @@ 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 isOrphanedToolCallError, $t as appendStreamingArgsPreview, A as renderDiffLinesClustered, An as saveTuiConfig, At as DISABLE_TERMINAL_THEME_REPORTING, B as BackgroundAgentStatusComponent, Bn as DEFAULT_CATALOG_URL, Bt as TERMINAL_THEME_DARK, Cn as isEmbeddingModelCached, Ct as createMarkdownTheme, D as toggleEmptySessionHint, Dn as TuiConfigParseError, Dt as detectTerminalTheme, E as isTurnElapsedEnabled, En as PULSE_WAVE_FRAMES, Et as getColorPalette, F as estimateTokens, Fn as detectInstallSource, Ft as OSC11_RESPONSE_PREFIX, G as getBreathingFrame, Gn as appendSessionIndexEntry, Gt as lerpGradient, H as AgentGroupComponent, Hn as saveCatalogCache, Ht as isBusy, I as getSharedSpeedTracker, In as CLI_COMMAND_NAME, It as OSC11_RESPONSE_PREFIX_NO_ESC, J as refineGoal, Jn as MemoryMemoStore, K as resetBreathingClock, L as SkillActivationComponent, Ln as CLI_UI_MODE, Lt as QUERY_TERMINAL_THEME, M as langFromPath, Mn as getDataDir, Mt as ENABLE_TERMINAL_THEME_REPORTING, N as CachedContainer, Nn as getInputHistoryFile, Nt as OSC11_QUERY, O as ToolCallComponent, On as TuiLikePreferencesSchema, Ot as parseOsc11BackgroundTheme, P as ThinkingComponent, Pn as getLogDir, Pt as OSC11_RESPONSE, Qn as isScreamError, Qt as STATUS_BULLET, R as ReadGroupComponent, Rn as CLI_USER_AGENT_PRODUCT, Rt as TERMINAL_FOCUS_IN, S as getDaemonInstructions, Sn as getKnowledgeStore, St as createEditorTheme, T as isEmptySessionHintDismissed, Tn as PIXEL_PULSE_FRAMES, Tt as contrastTextHex, U as WelcomeComponent, Un as ScreamHarness, Ut as isStreaming, V as AssistantMessageComponent, Vn as fetchCatalog, Vt as TERMINAL_THEME_LIGHT, W as BREATHE_CYCLE_MS, Wn as encodeWorkDirKey, Wt as FooterComponent, Xn as log, Xt as printableChar, Yn as flushDiagnosticLogs, Zn as resolveGlobalLogPath, Zt as INTERJECTION_BULLET, _ as refreshUpdateCache, _n as buildSkillSlashCommands, _t as supportsBalance, an as stringValue, b as readJsonlFile, bn as isExperimentalFlagEnabled, c as hasDispose, cn as EMPTY_SESSION_HINT_URL, d as formatMemoryMemoForInjection, dn as SESSION_TIPS, en as argsRecord, er as ErrorCodes, et as toTerminalHyperlink, fn as TIP_ROTATION_INTERVAL_MS, g as selectUpdateTarget, gn as getNoActiveSessionMessage, gt as refreshProviderBalance, hn as getLlmNotSetMessage, i as buildRoleAdditionalText, in as serializeToolResultOutput, j as highlightLines, jn as detectShellEnvironment, jt as ENABLE_TERMINAL_FOCUS_REPORTING, k as renderDiffLines, kn as loadTuiConfig, kt as DISABLE_TERMINAL_FOCUS_REPORTING, l as isPlanExpandable, ln as EXIT_CONFIRM_WINDOW_MS, lt as handlePlanCommand, mn as getCtrlDHint, n as clearEvalPanelState, nn as isTodoItemShape, nt as getModelCycleLevel, on as truncateErrorMessage, pn as getCtrlCHint, q as clearGoalState, qn as resolveScreamHome, r as openUrl, rn as parseStreamingArgs, s as disposeChildren, sn as CHARS_PER_TOKEN, st as handleFusionPlanCommand, t as dispatchInput, tn as formatErrorMessage, tr as SCREAM_ERROR_INFO, tt as changeThinkingLevel, u as MoonLoader, un as MAIN_AGENT_ID, v as readUpdateCache, vn as BUILTIN_SLASH_COMMANDS, vt as clearInfoPanelState, w as UserMessageComponent, wn as startManualEmbeddingDownload, wt as createThemeStyles, xn as setExperimentalFlags, xt as resolveThemeSync, y as appendJsonlLine, yn as sortSlashCommands, z as parseReadGroupOutput, zn as PRODUCT_NAME, zt as TERMINAL_FOCUS_OUT } from "./dispatch-DqeJdQZQ.mjs";
-import { a as setLocale, i as getLocale, o as t } from "./text-input-dialog-BABWY9vy.mjs";
+import { $ as getBreathingFrame, $n as encodeWorkDirKey, $t as isStreaming, A as ToolCallComponent, An as setExperimentalFlags, B as sanitizeShellOutput, Bn as detectShellEnvironment, Bt as DISABLE_TERMINAL_THEME_REPORTING, Cn as getCtrlDHint, D as isEmptySessionHintDismissed, Dn as BUILTIN_SLASH_COMMANDS, Dt as supportsBalance, E as UserMessageComponent, En as buildSkillSlashCommands, Et as refreshProviderBalance, F as CachedContainer, Fn as PULSE_WAVE_FRAMES, Ft as contrastTextHex, G as AssistantMessageComponent, Gn as CLI_COMMAND_NAME, Gt as OSC11_RESPONSE_PREFIX, H as ReadGroupComponent, Hn as getInputHistoryFile, Ht as ENABLE_TERMINAL_THEME_REPORTING, I as ThinkingComponent, In as TuiConfigParseError, It as getColorPalette, J as estimateTokens, Jn as PRODUCT_NAME, Jt as TERMINAL_FOCUS_IN, K as ActivityGroupComponent, Kn as CLI_UI_MODE, Kt as OSC11_RESPONSE_PREFIX_NO_ESC, L as NoticeMessageComponent, Ln as TuiLikePreferencesSchema, Lt as detectTerminalTheme, M as renderDiffLinesClustered, Mn as isEmbeddingModelCached, Mt as createEditorTheme, N as highlightLines, Nn as startManualEmbeddingDownload, Nt as createMarkdownTheme, O as isTurnElapsedEnabled, On as sortSlashCommands, Ot as clearInfoPanelState, P as langFromPath, Pn as PIXEL_PULSE_FRAMES, Pt as createThemeStyles, Q as BREATHE_CYCLE_MS, Qn as ScreamHarness, Qt as isBusy, R as StatusMessageComponent, Rn as loadTuiConfig, Rt as parseOsc11BackgroundTheme, S as readJsonlFile, Sn as getCtrlCHint, Tn as getNoActiveSessionMessage, U as parseReadGroupOutput, Un as getLogDir, Ut as OSC11_QUERY, V as SkillActivationComponent, Vn as getDataDir, Vt as ENABLE_TERMINAL_FOCUS_REPORTING, W as BackgroundAgentStatusComponent, Wn as detectInstallSource, Wt as OSC11_RESPONSE, X as AgentGroupComponent, Xn as fetchCatalog, Xt as TERMINAL_THEME_DARK, Y as getSharedSpeedTracker, Yn as DEFAULT_CATALOG_URL, Yt as TERMINAL_FOCUS_OUT, Z as WelcomeComponent, Zn as saveCatalogCache, Zt as TERMINAL_THEME_LIGHT, _n as EMPTY_SESSION_HINT_URL, _t as handleFusionPlanCommand, ar as resolveScreamHome, b as readUpdateCache, bn as SESSION_TIPS, c as hasDispose, cn as STATUS_BULLET, cr as log, d as readExpanded, dn as formatErrorMessage, dr as isOrphanedToolCallError, dt as changeThinkingLevel, en as FooterComponent, er as normalizeWorkDir, et as resetBreathingClock, f as MoonLoader, fn as isTodoItemShape, fr as ErrorCodes, ft as getModelCycleLevel, gn as truncateErrorMessage, hn as stringValue, i as buildRoleAdditionalText, j as renderDiffLines, jn as getKnowledgeStore, jt as resolveThemeSync, k as toggleEmptySessionHint, kn as isExperimentalFlagEnabled, l as isExpandable, ln as appendStreamingArgsPreview, lr as resolveGlobalLogPath, lt as isInternalMessage, mn as serializeToolResultOutput, n as clearEvalPanelState, nn as SubagentSlots, nr as readSessionIndex, nt as clearGoalState, or as MemoryMemoStore, p as formatMemoryMemoForInjection, pn as parseStreamingArgs, pr as SCREAM_ERROR_INFO, q as charsForTokenBudget, qn as CLI_USER_AGENT_PRODUCT, qt as QUERY_TERMINAL_THEME, r as openUrl, rr as removeSessionIndexEntry, rt as refineGoal, s as disposeChildren, sn as printableChar, sr as flushDiagnosticLogs, t as dispatchInput, tn as lerpGradient, tr as appendSessionIndexEntry, tt as CompactionComponent, u as isPlanExpandable, un as argsRecord, ur as isScreamError, ut as toTerminalHyperlink, v as selectUpdateTarget, vn as EXIT_CONFIRM_WINDOW_MS, w as getDaemonInstructions, wn as getLlmNotSetMessage, x as appendJsonlLine, xn as TIP_ROTATION_INTERVAL_MS, y as refreshUpdateCache, yn as MAIN_AGENT_ID, yt as handlePlanCommand, z as replaceTabs, zn as saveTuiConfig, zt as DISABLE_TERMINAL_FOCUS_REPORTING } from "./dispatch-D0mYcf1X.mjs";
+import { a as setLocale, i as getLocale, o as t } from "./text-input-dialog-CzJKBIoN.mjs";
 import { createRequire } from "node:module";
 import { randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
-import { access, chmod, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { access, appendFile, chmod, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { Writable } from "node:stream";
 import { WebSocket, WebSocketServer } from "ws";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, realpathSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { appendFileSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import * as path$1 from "node:path";
 import path, { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { z } from "zod";
@@ -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.1"),
+	version: optionalBuildString("0.16.2"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -1968,42 +1968,6 @@ var EditorKeyboardController = class {
 	}
 };
 //#endregion
-//#region src/tui/utils/sanitize.ts
-/** Replace tabs with spaces, keeping column alignment. Default tab width 4. */
-function replaceTabs(text, tabWidth = 4) {
-	return text.replaceAll("	", " ".repeat(tabWidth));
-}
-/**
-* Strip terminal control characters from untrusted shell output before it is
-* rendered inside a framed pane. Carriage returns (progress-bar redraws) and
-* ANSI escape sequences (cursor moves, screen clears, SGR color codes, OSC
-* title/OSC 52 clipboard sequences, charset selection) would otherwise disrupt
-* the terminal borders or let task output inject escape sequences. All
-* printable text is preserved.
-*/
-function sanitizeShellOutput(output) {
-	return output.replaceAll("\r", "").replaceAll(/\u001B\[[0-?]*[ -/]*[@-~]/g, "").replaceAll(/\u001B\][^\u0007\u001B]*(?:\u0007|\u001B\\)/g, "").replaceAll(/\u001B[P^_][^\u0007\u001B]*(?:\u0007|\u001B\\)/g, "").replaceAll(/\u001B[()][0-9A-Za-z]/g, "").replaceAll(/\u001B[=>78DEFHMc]/g, "");
-}
-//#endregion
-//#region src/tui/components/messages/status-message.ts
-var StatusMessageComponent = class extends Container {
-	constructor(content, colors, color) {
-		super();
-		const sanitized = replaceTabs(content);
-		const text = color === void 0 ? chalk.hex(colors.textDim)(sanitized) : chalk.hex(color)(sanitized);
-		this.addChild(new Text(`  ${text}`, 0, 0));
-	}
-};
-var NoticeMessageComponent = class extends Container {
-	constructor(title, detail, colors, markerColor) {
-		super();
-		const marker = markerColor === void 0 ? "  " : chalk.hex(markerColor)(INTERJECTION_BULLET);
-		this.addChild(new Spacer(1));
-		this.addChild(new Text(`${marker}${chalk.hex(colors.textStrong)(replaceTabs(title))}`, 0, 0));
-		if (detail !== void 0 && detail.length > 0) this.addChild(new Text(`  ${chalk.hex(colors.textDim)(replaceTabs(detail))}`, 0, 0));
-	}
-};
-//#endregion
 //#region src/tui/utils/background-agent-status.ts
 const MAX_BACKGROUND_FIELD_LENGTH = 240;
 function normalizeBackgroundField(value) {
@@ -2183,233 +2147,6 @@ function renderChildRequestNotice(fields, name) {
 	};
 }
 //#endregion
-//#region src/tui/utils/subagent-slots.ts
-/** Default subagent types, in the fixed display order of the slots. */
-const DEFAULT_SUBAGENT_TYPES = [
-	"coder",
-	"explore",
-	"plan",
-	"verify",
-	"reviewer",
-	"oracle",
-	"worker",
-	"writer"
-];
-/** How long a `requesting` overlay stays visible after a subagent asks the
-*  parent for help. The request itself returns at once and the agent keeps
-*  working, so this is a display window, not a blocked state. */
-const REQUESTING_WINDOW_MS = 5e3;
-var SubagentSlots = class {
-	slots = /* @__PURE__ */ new Map();
-	instances = /* @__PURE__ */ new Map();
-	/** Live instance count per type: a slot only returns to idle when the LAST
-	* instance of that type terminates (WolfPack spawns several coders at once
-	* and they share one visual slot). */
-	runningByType = /* @__PURE__ */ new Map();
-	/** main-side SendSubagentMessage tool callId → target subagent agentId. */
-	messagingByCall = /* @__PURE__ */ new Map();
-	/** Status to restore per TYPE when a messaging window closes, captured from
-	* the first open window; concurrent windows on the same type keep counting
-	* and the slot only exits messaging when the last window closes. */
-	messagingPrev = /* @__PURE__ */ new Map();
-	/** Slot type → open `requesting` overlay. Keyed by type so several live
-	*  instances of one type share a single marker; the real activity state stays
-	*  untouched in the slot and shows back up once the overlay expires. */
-	requesting = /* @__PURE__ */ new Map();
-	/** Count of open messaging windows per type (handles same-type siblings). */
-	messagingCount = /* @__PURE__ */ new Map();
-	reset() {
-		this.slots.clear();
-		this.instances.clear();
-		this.runningByType.clear();
-		this.messagingByCall.clear();
-		this.messagingPrev.clear();
-		this.messagingCount.clear();
-		this.requesting.clear();
-	}
-	/**
-	* subagent.spawned. A first spawn starts the slot as working; a second
-	* spawn of the SAME agentId means the main agent resumed it (返工中),
-	* tracked via an instance generation counter.
-	*/
-	onSpawned(agentId, subagentType, description) {
-		const instance = this.instances.get(agentId);
-		if (instance !== void 0) {
-			instance.generation += 1;
-			this.runningByType.set(instance.type, (this.runningByType.get(instance.type) ?? 0) + 1);
-			this.setState(instance.type, "reworking", agentId, description === void 0 ? void 0 : `resume: ${description}`);
-			return;
-		}
-		this.instances.set(agentId, {
-			type: subagentType,
-			generation: 1
-		});
-		this.runningByType.set(subagentType, (this.runningByType.get(subagentType) ?? 0) + 1);
-		this.setState(subagentType, "working", agentId, description);
-	}
-	/** subagent.started. Keeps the current state (spawned already set it); only
-	*  used to materialize a slot if lifecycle events raced past us. */
-	onStarted(agentId) {
-		const instance = this.instances.get(agentId);
-		if (instance === void 0) return;
-		const slot = this.ensureSlot(instance.type);
-		if (slot.status === "idle") {
-			slot.status = "working";
-			slot.agentId = agentId;
-			slot.lastActivityAt = Date.now();
-		}
-	}
-	/** subagent.completed / subagent.failed: the slot goes back to resting only
-	*  when the LAST live instance of that type terminates (siblings spawned by
-	*  the same tool call keep the slot busy). */
-	onTerminated(agentId) {
-		const instance = this.instances.get(agentId);
-		if (instance === void 0) return;
-		if (this.requesting.get(instance.type)?.agentId === agentId) this.requesting.delete(instance.type);
-		const remaining = (this.runningByType.get(instance.type) ?? 1) - 1;
-		if (remaining > 0) {
-			this.runningByType.set(instance.type, remaining);
-			const slot = this.ensureSlot(instance.type);
-			slot.detail = void 0;
-			slot.lastActivityAt = Date.now();
-			return;
-		}
-		this.runningByType.delete(instance.type);
-		this.setState(instance.type, "idle", void 0, void 0);
-	}
-	/**
-	* Routed subagent activity (agentId !== main):
-	* - kind 'tool'      → working (tool call in flight)
-	* - kind 'output'    → outputting (assistant/thinking delta)
-	* - kind 'toolResult'→ detail only (the agent may keep working/outputting)
-	*/
-	onActivity(agentId, kind, detail) {
-		const instance = this.instances.get(agentId);
-		if (instance === void 0) return;
-		if (kind === "toolResult") {
-			const slot = this.ensureSlot(instance.type);
-			slot.detail = detail;
-			slot.lastActivityAt = Date.now();
-			return;
-		}
-		this.setState(instance.type, kind === "tool" ? "working" : "outputting", agentId, detail);
-	}
-	/** A subagent asked the parent for help. The request returns immediately and
-	*  the agent keeps working, so this only raises a transient overlay — the real
-	*  activity state stays in the slot and shows back up when it expires. While
-	*  `messaging` is on screen the overlay loses (see visibleSlot). */
-	onRequesting(agentId, at = Date.now()) {
-		const instance = this.instances.get(agentId);
-		if (instance === void 0) return;
-		this.requesting.set(instance.type, {
-			until: at + REQUESTING_WINDOW_MS,
-			agentId
-		});
-		const slot = this.ensureSlot(instance.type);
-		slot.agentId = agentId;
-		slot.lastActivityAt = at;
-	}
-	/**
-	* Main-side SendSubagentMessage tool call started: the target subagent's
-	* slot shows messaging until the tool call returns.
-	*/
-	onMessagingStart(toolCallId, targetAgentId, operation) {
-		if (targetAgentId === void 0) return;
-		const instance = this.instances.get(targetAgentId);
-		if (instance === void 0) return;
-		this.messagingByCall.set(toolCallId, targetAgentId);
-		this.requesting.delete(instance.type);
-		const slot = this.ensureSlot(instance.type);
-		if (slot.status !== "messaging") this.messagingPrev.set(instance.type, slot.status);
-		this.messagingCount.set(instance.type, (this.messagingCount.get(instance.type) ?? 0) + 1);
-		this.setState(instance.type, "messaging", targetAgentId, operation === void 0 ? void 0 : `message (${operation})`);
-	}
-	/** Tool call finished: the messaging window closes; restore the state the
-	*  slot had before the chat (working/outputting), else idle. */
-	onMessagingEnd(toolCallId) {
-		const target = this.messagingByCall.get(toolCallId);
-		if (target === void 0) return;
-		this.messagingByCall.delete(toolCallId);
-		const instance = this.instances.get(target);
-		if (instance === void 0) return;
-		const slot = this.ensureSlot(instance.type);
-		if (slot.status !== "messaging") return;
-		const remaining = (this.messagingCount.get(instance.type) ?? 1) - 1;
-		if (remaining > 0) {
-			this.messagingCount.set(instance.type, remaining);
-			return;
-		}
-		this.messagingCount.delete(instance.type);
-		const prev = this.messagingPrev.get(instance.type);
-		this.messagingPrev.delete(instance.type);
-		slot.status = prev === "working" || prev === "outputting" || prev === "reworking" ? prev : "idle";
-		slot.detail = void 0;
-		slot.lastActivityAt = Date.now();
-	}
-	/**
-	* All slots in fixed display order: the eight default types first (always
-	* present, idle when never used), then extra types in spawn order.
-	*/
-	getSlots(at = Date.now()) {
-		this.dropExpiredOverlays(at);
-		const ordered = [];
-		for (const type of DEFAULT_SUBAGENT_TYPES) ordered.push(this.visibleSlot(type));
-		for (const slot of this.slots.values()) {
-			if (DEFAULT_SUBAGENT_TYPES.includes(slot.type)) continue;
-			ordered.push(this.visibleSlot(slot.type));
-		}
-		return ordered;
-	}
-	/** Display view of one slot: the real state with an unexpired `requesting`
-	*  overlay on top. Read-path only — it never mutates. Callers must run
-	*  {@link dropExpiredOverlays} first, and messaging clears the overlay in
-	*  {@link onMessagingStart}; the `messaging` guard only covers same-tick ordering. */
-	visibleSlot(type) {
-		const copy = {
-			...this.ensureSlot(type),
-			count: this.runningByType.get(type) ?? 0
-		};
-		if (this.requesting.has(type) && copy.status !== "messaging") copy.status = "requesting";
-		return copy;
-	}
-	dropExpiredOverlays(at) {
-		for (const [type, overlay] of this.requesting) if (at >= overlay.until) this.requesting.delete(type);
-	}
-	ensureSlot(type) {
-		let slot = this.slots.get(type);
-		if (slot === void 0) {
-			if (this.slots.size >= 16) {
-				slot = {
-					type,
-					status: "idle",
-					agentId: void 0,
-					detail: void 0,
-					count: 0,
-					lastActivityAt: 0
-				};
-				return slot;
-			}
-			slot = {
-				type,
-				status: "idle",
-				agentId: void 0,
-				detail: void 0,
-				count: 0,
-				lastActivityAt: Date.now()
-			};
-			this.slots.set(type, slot);
-		}
-		return slot;
-	}
-	setState(type, status, agentId, detail) {
-		const slot = this.ensureSlot(type);
-		slot.status = status;
-		slot.agentId = agentId;
-		slot.detail = detail;
-		slot.lastActivityAt = Date.now();
-	}
-};
-//#endregion
 //#region src/tui/utils/background-task-status.ts
 const MAX_DETAIL_LENGTH = 240;
 function truncate(value) {
@@ -2984,7 +2721,7 @@ var SessionEventHandler = class {
 		if (this.providerLatencySamples.length > this.providerLatencyWindow) this.providerLatencySamples.shift();
 		this.providerLatencyAt = Date.now();
 	}
-	/** Sidebar Hub: average measured response time for the provider in use. The
+	/** Sidebar Hub: average measured first-token latency for the provider in use. The
 	*  caller owns tone and staleness — this stays a plain reading. */
 	getProviderLatency() {
 		if (this.providerLatencySamples.length === 0) return {
@@ -3137,6 +2874,7 @@ var SessionEventHandler = class {
 	handleTurnBegin(_event) {
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.setStep(0);
+		this.host.streamingUI.endActivityGroup();
 		this.host.patchLivePane({
 			pendingApproval: null,
 			pendingQuestion: null
@@ -3399,6 +3137,7 @@ var SessionEventHandler = class {
 		this.host.streamingUI.flushNow();
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.finalizeLiveTextBuffers();
+		this.host.streamingUI.endActivityGroup();
 		this.host.showError(`[${event.code}] ${event.message}`);
 	}
 	handleSessionWarning(event) {
@@ -4344,6 +4083,7 @@ var SessionReplayRenderer = class {
 		context.completedToolCallIds.add(toolCallId);
 	}
 	advanceTurn(context) {
+		this.host.streamingUI.endActivityGroup();
 		context.turnIndex += 1;
 		context.stepIndex = 0;
 		context.currentTurnId = `replay:${String(context.turnIndex)}`;
@@ -4509,81 +4249,6 @@ var SessionReplayRenderer = class {
 	}
 };
 //#endregion
-//#region src/tui/components/dialogs/compaction.ts
-/**
-* Renders a compaction block in the transcript.
-*
-* Lifecycle:
-*   - constructed on `compaction.started` → blinking white bullet +
-*     "Compacting context..." and optional custom instruction
-*   - `markDone()` on `compaction.completed` → solid green bullet +
-*     "Compaction complete (X → Y tokens)"
-*   - `markCanceled()` on `compaction.cancelled` → solid warning bullet +
-*     "Compaction cancelled"
-*
-* Bullet animation mirrors `ToolCallComponent` (500ms blink) so the user
-* reads the same "work in progress" signal across the UI.
-*/
-const BLINK_INTERVAL = 500;
-var CompactionComponent = class extends Container {
-	colors;
-	ui;
-	headerText;
-	blinkOn = true;
-	blinkTimer = null;
-	done = false;
-	canceled = false;
-	tokensBefore;
-	tokensAfter;
-	constructor(colors, ui, instruction) {
-		super();
-		this.colors = colors;
-		this.ui = ui;
-		this.addChild(new Spacer(1));
-		this.headerText = new Text(this.buildHeader(), 0, 0);
-		this.addChild(this.headerText);
-		if (instruction !== void 0) this.addChild(new Text(chalk.dim(`  ${instruction}`), 0, 0));
-		this.startBlink();
-	}
-	markDone(tokensBefore, tokensAfter) {
-		if (this.done || this.canceled) return;
-		this.done = true;
-		this.tokensBefore = tokensBefore;
-		this.tokensAfter = tokensAfter;
-		this.stopBlink();
-		this.headerText.setText(this.buildHeader());
-		this.ui?.requestRender();
-	}
-	markCanceled() {
-		if (this.done || this.canceled) return;
-		this.canceled = true;
-		this.stopBlink();
-		this.headerText.setText(this.buildHeader());
-		this.ui?.requestRender();
-	}
-	dispose() {
-		this.stopBlink();
-	}
-	buildHeader() {
-		if (this.done) return `${chalk.hex(this.colors.success)(STATUS_BULLET)}${chalk.hex(this.colors.success).bold(t("compaction.done"))}${this.tokensBefore !== void 0 && this.tokensAfter !== void 0 ? chalk.dim(` (${String(this.tokensBefore)} → ${String(this.tokensAfter)} token)`) : ""}`;
-		if (this.canceled) return `${chalk.hex(this.colors.warning)(STATUS_BULLET)}${chalk.hex(this.colors.warning).bold(t("compaction.canceled"))}`;
-		return `${this.blinkOn ? chalk.hex(this.colors.roleAssistant)(STATUS_BULLET) : "  "}${chalk.hex(this.colors.primary).bold(t("compaction.in_progress"))}`;
-	}
-	startBlink() {
-		this.blinkTimer = setInterval(() => {
-			this.blinkOn = !this.blinkOn;
-			this.headerText.setText(this.buildHeader());
-			this.ui?.requestRender();
-		}, BLINK_INTERVAL);
-	}
-	stopBlink() {
-		if (this.blinkTimer !== null) {
-			clearInterval(this.blinkTimer);
-			this.blinkTimer = null;
-		}
-	}
-};
-//#endregion
 //#region src/tui/utils/terminal-notification.ts
 function notifyTerminalOnce(state, key, notification) {
 	const { enabled, condition } = state.appState.notifications;
@@ -4657,7 +4322,7 @@ function isControlCharacter(ch) {
 }
 //#endregion
 //#region src/tui/controllers/streaming-ui.ts
-var StreamingUIController = class {
+var StreamingUIController = class StreamingUIController {
 	host;
 	flushTimer;
 	lastFlushAt;
@@ -4691,6 +4356,30 @@ var StreamingUIController = class {
 	_pendingReadGroupComponents = /* @__PURE__ */ new Map();
 	_pendingAgentGroup = null;
 	_pendingReadGroup = null;
+	_activityGroup;
+	/** Guards the single `registerLiveComponent` call for the turn's block. */
+	_activityGroupRegistered = false;
+	/** Block that borrowed a card, so late results refresh their own block. */
+	_groupByToolCard = /* @__PURE__ */ new WeakMap();
+	/** Reasoning of the turn's earlier steps, kept when a step's draft resets. */
+	_turnThinkingHistory = "";
+	_lastThinkingText = "";
+	/**
+	* Tools that keep their own transcript card instead of joining the turn's
+	* activity block:
+	* - `Read` / `Agent` are owned by the read/agent group machinery (and by
+	*   `/revoke`, which walks those groups);
+	* - `AskUserQuestion` returns early above and mounts its finished card;
+	* - `ExitPlanMode` owns the plan box, which Ctrl+E expands by walking the
+	*   transcript container's direct children.
+	*/
+	static STANDALONE_TOOL_NAMES = new Set([
+		"Read",
+		"Agent",
+		"AskUserQuestion",
+		"ExitPlanMode",
+		"ReadMediaFile"
+	]);
 	constructor(host) {
 		this.host = host;
 	}
@@ -4903,6 +4592,7 @@ var StreamingUIController = class {
 	}
 	/** Tears down replay-specific state after session history has been rendered. */
 	cleanupAfterReplay(completedToolCallIds) {
+		this.endActivityGroup();
 		this._activeToolCalls.clear();
 		for (const toolCallId of completedToolCallIds) this._pendingToolComponents.delete(toolCallId);
 		this._pendingAgentGroup = null;
@@ -4914,6 +4604,74 @@ var StreamingUIController = class {
 		this.pendingToolCallFlushIds.clear();
 		this.host.state.ui.requestRender();
 	}
+	/**
+	* Returns the turn's block, creating it on demand: a block only ever starts
+	* where work starts (reasoning or a tool call), which keeps it positioned
+	* right after whatever the assistant last said.
+	*
+	* Live turns spin, replayed turns (history) do not — the streaming phase is
+	* the discriminator, so a second block inside the same live turn still spins.
+	*/
+	ensureActivityGroup() {
+		const existing = this._activityGroup;
+		if (existing !== void 0) return existing;
+		const { state } = this.host;
+		const group = new ActivityGroupComponent(state.theme.colors, state.ui);
+		group.setRunning(state.appState.streamingPhase !== "idle");
+		this._activityGroup = group;
+		this._turnThinkingHistory = "";
+		state.transcriptContainer.addChild(group);
+		state.ui.requestRender();
+		return group;
+	}
+	/**
+	* Seals the current block as soon as the assistant starts writing visible
+	* text, so every stretch of work stays next to the answer it produced instead
+	* of the whole turn's process piling up above the prose.
+	*/
+	sealActivityGroupOnText(text) {
+		if (this._activityGroup === void 0) return;
+		if (text.trim().length === 0) return;
+		this.endActivityGroup();
+	}
+	/**
+	* Registers the block against the first entry it owns, so history folding can
+	* later sweep the whole block as one entry. Marked pending so a growing block
+	* is never folded mid-turn.
+	*/
+	registerActivityGroupEntry(group, entry) {
+		if (this._activityGroupRegistered) return;
+		this._activityGroupRegistered = true;
+		this.host.transcriptController.registerLiveComponent(group, entry);
+		this.host.transcriptController.markPending(group);
+	}
+	/**
+	* Settles the block: stops the spinner, drops one that never got content, and
+	* releases the reference so the next turn opens a fresh one. Blocks with
+	* content stay mounted (replayed history keeps its blocks).
+	*/
+	endActivityGroup() {
+		const group = this._activityGroup;
+		this._activityGroup = void 0;
+		this._activityGroupRegistered = false;
+		this._turnThinkingHistory = "";
+		this._lastThinkingText = "";
+		if (group === void 0) return;
+		group.setRunning(false);
+		if (group.isEmpty()) {
+			this.host.transcriptController.unmarkPending(group);
+			this.host.state.transcriptContainer.removeChild(group);
+			group.dispose();
+			return;
+		}
+		this.host.transcriptController.unmarkPending(group);
+		group.dispose();
+	}
+	/** Reasoning text of the whole turn: earlier steps plus the current draft. */
+	activityThinkingText(draft) {
+		if (this._turnThinkingHistory.length === 0) return draft;
+		return `${this._turnThinkingHistory}\n${draft}`;
+	}
 	disposeActiveThinkingComponent() {
 		if (this._activeThinkingComponent !== void 0) {
 			this._activeThinkingComponent.dispose();
@@ -4988,7 +4746,9 @@ var StreamingUIController = class {
 		const draft = this._assistantDraft;
 		if (this._shownAssistantLength >= draft.length) return this._shownAssistantLength;
 		const measured = getSharedSpeedTracker().getSpeed();
-		const budget = Math.min(25, Math.max(1, Math.ceil((measured > 0 ? measured : 50) * (50 / 1e3) * CHARS_PER_TOKEN)));
+		const tokPerSec = measured > 0 ? measured : 50;
+		const requested = charsForTokenBudget(draft.slice(this._shownAssistantLength), tokPerSec * (50 / 1e3));
+		const budget = Math.min(25, Math.max(1, requested));
 		this._shownAssistantLength = Math.min(draft.length, this._shownAssistantLength + budget);
 		return this._shownAssistantLength;
 	}
@@ -5052,6 +4812,7 @@ var StreamingUIController = class {
 		const turnStartTime = this.turnStartAt !== 0 ? this.turnStartAt : state.appState.streamingStartTime;
 		const completedTurnKey = this._currentTurnId ?? `local:${String(turnStartTime)}`;
 		this.finalizeLiveTextBuffers();
+		this.endActivityGroup();
 		this.resetToolCallState();
 		this._currentTurnId = void 0;
 		const next = this.host.shiftQueuedMessage();
@@ -5125,6 +4886,7 @@ var StreamingUIController = class {
 			block.component.updateContent(fullText);
 			this.host.state.ui.requestRender();
 		}
+		this.sealActivityGroupOnText(fullText);
 	}
 	onStreamingTextEnd() {
 		const block = this._streamingBlock;
@@ -5140,7 +4902,7 @@ var StreamingUIController = class {
 		if (this._activeThinkingComponent === void 0) {
 			this._pendingAgentGroup = null;
 			this._pendingReadGroup = null;
-			const component = new ThinkingComponent(fullText, state.theme.colors, true, "live", state.ui);
+			const component = new ThinkingComponent(fullText, state.theme.colors, true, "finalized", state.ui);
 			const entry = {
 				id: nextTranscriptId(),
 				kind: "thinking",
@@ -5153,21 +4915,30 @@ var StreamingUIController = class {
 			this.host.pushTranscriptEntry(entry);
 			this.host.transcriptController.registerLiveComponent(component, entry);
 			this.host.transcriptController.markPending(component);
-			if (state.toolOutputExpanded) component.setExpanded(true);
-			state.transcriptContainer.addChild(component);
+			const group = this.ensureActivityGroup();
+			this.registerActivityGroupEntry(group, entry);
+			this._lastThinkingText = fullText;
+			group.setThinking(this.activityThinkingText(fullText), true);
 		} else {
 			this._activeThinkingComponent.setText(fullText);
 			if (this._thinkingEntry !== void 0) this._thinkingEntry.content = fullText;
+			this._lastThinkingText = fullText;
+			this.ensureActivityGroup().setThinking(this.activityThinkingText(fullText), true);
 		}
 		state.ui.requestRender();
 	}
 	onThinkingEnd() {
 		if (this._activeThinkingComponent === void 0) return;
-		this._activeThinkingComponent.finalize();
-		this.host.transcriptController.unmarkPending(this._activeThinkingComponent);
+		const component = this._activeThinkingComponent;
+		component.finalize();
+		this.host.transcriptController.unmarkPending(component);
 		this.host.transcriptController.commit();
+		this.host.transcriptController.releaseLiveComponent(component);
 		this._activeThinkingComponent = void 0;
 		this._thinkingEntry = void 0;
+		if (this._lastThinkingText.trim().length > 0) this._turnThinkingHistory = this.activityThinkingText(this._lastThinkingText);
+		this._lastThinkingText = "";
+		this._activityGroup?.endThinking();
 		this.host.state.ui.requestRender();
 	}
 	onToolCallStart(toolCall) {
@@ -5191,15 +4962,20 @@ var StreamingUIController = class {
 		this.host.pushTranscriptEntry(entry);
 		this.host.transcriptController.registerLiveComponent(tc, entry);
 		this.host.transcriptController.markPending(tc);
-		if (state.toolOutputExpanded) tc.setExpanded(true);
 		if (state.planExpanded) tc.setPlanExpanded(true);
 		if (toolCall.name !== "Agent") this._pendingAgentGroup = null;
 		if (toolCall.name !== "Read") this._pendingReadGroup = null;
 		let handled = this.tryAttachAgentToolCall(toolCall, tc);
 		if (!handled) handled = this.tryAttachReadToolCall(toolCall, tc);
-		if (!handled) {
+		if (!handled) if (StreamingUIController.STANDALONE_TOOL_NAMES.has(toolCall.name)) {
 			state.transcriptContainer.addChild(tc);
 			state.ui.requestRender();
+		} else {
+			const group = this.ensureActivityGroup();
+			this.registerActivityGroupEntry(group, entry);
+			this._groupByToolCard.set(tc, group);
+			group.attachTool(tc, toolCall.step ?? this._currentStep);
+			state.ui.requestRender();
 		}
 		if (toolCall.name === "ExitPlanMode" && typeof toolCall.args["plan"] !== "string") {
 			const session = this.host.requireSession();
@@ -5254,6 +5030,9 @@ var StreamingUIController = class {
 		if (tc) {
 			tc.setResult(result);
 			tc.dispose();
+			const owner = this._groupByToolCard.get(tc) ?? this._activityGroup;
+			owner?.notifyToolChanged();
+			if (owner !== void 0 && this._groupByToolCard.has(tc)) this.host.transcriptController.releaseLiveComponent(tc);
 			this.host.transcriptController.unmarkPending(tc);
 			this._pendingToolComponents.delete(toolCallId);
 			const entry = this.host.state.transcriptEntries.find((e) => e.toolCallData?.id === toolCallId);
@@ -5265,7 +5044,6 @@ var StreamingUIController = class {
 		if (matchedCall?.name === "AskUserQuestion") {
 			const completed = new ToolCallComponent(matchedCall, result, state.theme.colors, state.ui, state.theme.markdownTheme, state.appState.workDir);
 			completed.setPermissionMode(state.appState.permissionMode);
-			if (state.toolOutputExpanded) completed.setExpanded(true);
 			if (state.planExpanded) completed.setPlanExpanded(true);
 			const entry = {
 				id: nextTranscriptId(),
@@ -6617,6 +6395,14 @@ var TranscriptController = class TranscriptController {
 	registerLiveComponent(component, entry) {
 		this.liveComponentToEntry.set(component, entry);
 	}
+	/**
+	* Drops the entry mapping of a component that will never be folded into the
+	* committed history (it is not a container child), so the map cannot retain
+	* components — and the text they hold — for the life of the session.
+	*/
+	releaseLiveComponent(component) {
+		this.liveComponentToEntry.delete(component);
+	}
 	markPending(component) {
 		this.pendingComponents.add(component);
 	}
@@ -6684,11 +6470,7 @@ var TranscriptController = class TranscriptController {
 				component.updateContent(entry.content);
 				return component;
 			}
-			case "thinking": {
-				const thinking = new ThinkingComponent(entry.content, state.theme.colors, true);
-				if (state.toolOutputExpanded) thinking.setExpanded(true);
-				return thinking;
-			}
+			case "thinking": return new ThinkingComponent(entry.content, state.theme.colors, true);
 			case "tool_call":
 				if (entry.toolCallData?.name === "ReadGroup" && entry.toolCallData.result !== void 0) {
 					const rgc = new ReadGroupComponent(state.theme.colors, state.ui);
@@ -6697,7 +6479,6 @@ var TranscriptController = class TranscriptController {
 				}
 				if (entry.toolCallData) {
 					const tc = new ToolCallComponent(entry.toolCallData, entry.toolCallData.result, state.theme.colors, state.ui, state.theme.markdownTheme, state.appState.workDir);
-					if (state.toolOutputExpanded) tc.setExpanded(true);
 					if (state.planExpanded) tc.setPlanExpanded(true);
 					return tc;
 				}
@@ -6781,6 +6562,7 @@ var TranscriptController = class TranscriptController {
 	clearAndRedraw() {
 		const { state, streamingUI, imageStore } = this.host;
 		streamingUI.discardPending();
+		streamingUI.endActivityGroup();
 		state.transcriptEntries = [];
 		streamingUI.disposeActiveCompactionBlock();
 		streamingUI.resetLiveText();
@@ -6837,6 +6619,18 @@ var TranscriptController = class TranscriptController {
 	}
 	toggleToolOutputExpansion() {
 		const { state } = this.host;
+		const children = state.transcriptContainer.children;
+		for (let i = children.length - 1; i >= 0; i -= 1) {
+			const child = children[i];
+			if (child === void 0) continue;
+			if (isExpandable(child)) {
+				state.toolOutputExpanded = !(readExpanded(child) ?? state.toolOutputExpanded);
+				child.setExpanded(state.toolOutputExpanded);
+				state.ui.requestRender();
+				return;
+			}
+			if (child instanceof ReadGroupComponent || child instanceof AgentGroupComponent) break;
+		}
 		state.toolOutputExpanded = !state.toolOutputExpanded;
 		state.ui.requestRender();
 	}
@@ -7058,17 +6852,14 @@ function formatCount$1(n) {
 	return n.toLocaleString("en-US");
 }
 /**
-* Compact token form for narrow sidebars: 2,267,680,102 → `22.7亿` (zh) or
-* `2.3B` (en). Used only when the thousands-separated form cannot fit, so a
-* narrow sidebar keeps every value readable instead of cutting digits.
+* Compact token form for narrow sidebars: 2,267,680,102 → `2267.7M`. One unit
+* ladder for every locale (K below a million, M above) so the value column
+* stays comparable across languages: Chinese no longer switches to the
+* ten-thousand / hundred-million units it used before.
+* Used only when the thousands-separated form cannot fit, so a narrow sidebar
+* keeps every value readable instead of cutting digits.
 */
 function formatCompact(n) {
-	if (getLocale() === "zh") {
-		if (n >= 9995e4) return `${(n / 1e8).toFixed(1)}亿`;
-		if (n >= 9500) return `${Math.round(n / 1e4)}万`;
-		return String(n);
-	}
-	if (n >= 9995e5) return `${(n / 1e9).toFixed(1)}B`;
 	if (n >= 999500) return `${(n / 1e6).toFixed(1)}M`;
 	if (n >= 1e3) return `${Math.round(n / 1e3)}K`;
 	return String(n);
@@ -7136,6 +6927,10 @@ const sessionPanel = {
 *  with the 1s sidebar heartbeat each tick advances half the cycle, so the
 *  colour jump is clearly visible instead of drifting imperceptibly. */
 const AGENT_GRADIENT_CYCLE_MS = 2e3;
+/** Display form of a slot type: 'coder' reads as 'Coder' in the panel. */
+function displayType(type) {
+	return type.length === 0 ? type : type.charAt(0).toUpperCase() + type.slice(1);
+}
 /** Localized status word per slot state. */
 function statusText(status) {
 	switch (status) {
@@ -7165,7 +6960,7 @@ var AgentsPanelContent = class {
 		if (agents === void 0 || agents.length === 0) return [];
 		return layoutSidebarGrid(agents.map((slot) => ({
 			marker: slot.status === "idle" ? "○" : "●",
-			label: slot.type,
+			label: displayType(slot.type),
 			value: statusText(slot.status) + (slot.count > 1 ? `  ×${slot.count}` : "")
 		})), width).map((cell, index) => this.renderSlot(cell, agents[index], index, width));
 	}
@@ -7321,20 +7116,23 @@ const HUB_MODEL_STALE_MS = 5 * 6e4;
 const HUB_ENDPOINTS = Object.freeze([
 	{
 		id: "github",
-		url: "https://github.com/"
+		url: "https://github.com/",
+		label: "Github"
 	},
 	{
 		id: "google",
-		url: "https://www.google.com/"
+		url: "https://www.google.com/",
+		label: "Google"
 	},
 	{
 		id: "x",
 		url: "https://x.com/",
-		label: "x (twitter)"
+		label: "X (Twitter)"
 	},
 	{
 		id: "huggingface",
-		url: "https://huggingface.co/"
+		url: "https://huggingface.co/",
+		label: "Huggingface"
 	},
 	{
 		id: "alibaba",
@@ -13977,6 +13775,7 @@ var ScreamTUI = class {
 	beginSessionRequest() {
 		this.streamingUI.markTurnStarted();
 		this.streamingUI.setTurnId(void 0);
+		this.streamingUI.endActivityGroup();
 		this.streamingUI.resetLiveText();
 		this.streamingUI.resetToolUi();
 		this.streamingUI.resetToolCallState();
@@ -13988,6 +13787,7 @@ var ScreamTUI = class {
 	}
 	failSessionRequest(message) {
 		this.setAppState({ streamingPhase: "idle" });
+		this.streamingUI.endActivityGroup();
 		this.resetLivePane();
 		this.showError(message);
 	}
@@ -14195,7 +13995,7 @@ var ScreamTUI = class {
 		const card = new OnboardingCardComponent({
 			colors: this.state.theme.colors,
 			onConfigure: () => {
-				import("./dispatch-B6jbxY0D.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
+				import("./dispatch-BRkUiHzo.mjs").then(({ handleConnectCommand }) => handleConnectCommand(this, "")).finally(() => {
 					this.restoreEditor();
 					onDone?.();
 				});
@@ -15864,6 +15664,53 @@ async function persistKey(filePath, record) {
 	await rename(tmp, filePath);
 }
 //#endregion
+//#region src/web/journal-writer.ts
+/**
+* Serialization gate for journal appends.
+*
+* Why it exists (an incident observed in the field): the session journal is an
+* append-only file holding one JSON record per line, and lines used to be
+* appended with `writeFile(path, line + '\n', { flag: 'a' })`. A
+* `web.message.finalized` entry carries an entire assistant body (hundreds of
+* thousands of characters in practice) while small entries such as turn.ended
+* are written at the same time — the two writes interleaved at the byte level,
+* so what landed on disk were malformed lines with the two records spliced
+* into each other:
+*
+*   ..."content":"...{"type":"journal","seq":38354,...   ← another record spliced into the body
+*
+* Consequence: the whole line fails JSON.parse and the message disappears from
+* the UI (the reader can only skip it), which the user perceives as a garbled
+* or lost body. Queueing the writes inside the process eliminates the
+* interleaving; the append itself still goes through appendFile (O_APPEND), so
+* a single write is never split by another fd.
+*
+* The queue is keyed by file path and dropped once drained, so a long-running
+* process does not grow it without bound. No cross-process writer exists today
+* (only the web server writes the journal); if one appears, this needs a
+* file-lock based scheme instead.
+*/
+const writeChains = /* @__PURE__ */ new Map();
+/**
+* Append one line (plus its newline) to the journal; concurrent calls for the
+* same file land in arrival order.
+*/
+async function appendJournalLineSerialized(path, line, onError) {
+	const next = (writeChains.get(path) ?? Promise.resolve()).catch(() => void 0).then(async () => {
+		try {
+			await appendFile(path, line + "\n");
+		} catch (error) {
+			onError(error);
+		}
+	});
+	writeChains.set(path, next);
+	try {
+		await next;
+	} finally {
+		if (writeChains.get(path) === next) writeChains.delete(path);
+	}
+}
+//#endregion
 //#region src/web/rateLimit.ts
 function createFixedWindowLimiter(opts) {
 	const { windowMs, max } = opts;
@@ -16431,14 +16278,12 @@ async function ensureSessionsDir(homeDir) {
 	if (!existsSync(dir)) await mkdir(dir, { recursive: true });
 }
 async function appendJournalLine(homeDir, sessionId, line) {
-	try {
-		await writeFile(getJournalPath(homeDir, sessionId), line + "\n", { flag: "a" });
-	} catch (error) {
+	await appendJournalLineSerialized(getJournalPath(homeDir, sessionId), line, (error) => {
 		log.warn("web: failed to persist journal line", {
 			sessionId,
 			error: String(error)
 		});
-	}
+	});
 }
 let metaWriteSeq = 0;
 async function saveMetadata(homeDir, meta) {
@@ -16465,16 +16310,77 @@ async function loadMetadata(homeDir, sessionId) {
 async function loadJournal(homeDir, sessionId) {
 	try {
 		const lines = (await readFile(getJournalPath(homeDir, sessionId), "utf-8")).split("\n").filter((l) => l.trim().length > 0);
-		const results = [];
+		const entries = [];
+		let corrupt = 0;
 		for (const line of lines) try {
-			results.push(JSON.parse(line));
+			entries.push(JSON.parse(line));
 		} catch {
+			corrupt += 1;
 			log.warn("web: skipping corrupt journal line", { sessionId });
 		}
-		return results;
+		return {
+			entries,
+			corrupt
+		};
 	} catch {
-		return [];
+		return {
+			entries: [],
+			corrupt: 0
+		};
+	}
+}
+/**
+* Event families that mutate the main transcript: only the main agent's
+* (`agentId === 'main'`) events of these kinds may be applied, journaled and
+* broadcast. Subagents and background tasks each emit their own turn.started
+* plus hundreds of text/tool events — mixing them into the main transcript
+* produces a body where two streams alternate block by block, blows the tool
+* list up to 97 entries and the model badge to 4 lines (reproduced from a real
+* session). Subagent presence is carried by subagent.* events instead, never by
+* the transcript.
+*/
+const MAIN_TRANSCRIPT_EVENTS = new Set([
+	"turn.started",
+	"turn.ended",
+	"assistant.delta",
+	"thinking.delta",
+	"tool.call.started",
+	"tool.result"
+]);
+/**
+* Whether a journal entry already carries a message (if so it needs no seeding
+* from core history).
+*/
+function isMessageBearingEntry(entry) {
+	if ("type" in entry && entry.type === "user_message") return true;
+	const payload = entry.payload;
+	return payload.type === "web.message.finalized" || payload.type === "turn.started";
+}
+/**
+* Core context history → web ChatMessage seed.
+*
+* Only "real user input + assistant bodies" are carried over: core tool records
+* and the web-side ToolMessage are different shapes, so a forced mapping would
+* invent fake cards. Messages with a non-user origin (injections, system
+* triggers, background-task notices, skill-activation envelopes, compaction
+* summaries) are protocol content meant for the model and must not be rendered
+* as user turns.
+*/
+function contextHistoryToChatMessages(history) {
+	const out = [];
+	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 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: []
+		});
 	}
+	return out;
 }
 async function listPersistedSessions(homeDir) {
 	const dir = getSessionsDir(homeDir);
@@ -16653,10 +16559,11 @@ const MAX_INLINE_DIFF_BYTES = 512 * 1024;
 * Single-file patch. `repoPath` is **repository-root relative** — the same base
 * `git status` reports, so the UI can hand it straight back.
 *
-* Two cases used to return an empty patch and look like "点了没反应":
-* nested files (the old code re-prefixed workdir-relative paths with `../..`,
-* resolving them outside the repo) and untracked files (`git diff` has nothing
-* to say about them). The second case now gets a synthesised added-file patch.
+* Two cases used to return an empty patch, which read as "clicking did
+* nothing": nested files (the old code re-prefixed workdir-relative paths with
+* `../..`, resolving them outside the repo) and untracked files (`git diff` has
+* nothing to say about them). The second case now gets a synthesised added-file
+* patch.
 */
 async function getGitFileDiff(workDir, repoPath) {
 	const rel = normalizeNumstatPath(repoPath);
@@ -16774,7 +16681,27 @@ var WebSession = class {
 	* snapshot (`web.message.finalized`) — the only source that survives a
 	* server restart (deltas are volatile by design).
 	*/
-	liveAssistant = null;
+	/**
+	* In-flight main-agent turn messages, keyed by `turnId`.
+	* A single pointer (the old liveAssistant) merged several streams into one
+	* message when an interrupted turn overlapped a freshly started one, or when
+	* subagents ran concurrently, producing interleaved garbage — hence one slot
+	* per turn.
+	*/
+	liveAssistants = /* @__PURE__ */ new Map();
+	/**
+	* In-flight message of one turn; without a turnId it falls back to the most
+	* recently started one (older-frame compatibility).
+	*/
+	liveFor(turnId) {
+		if (typeof turnId === "number") {
+			const hit = this.liveAssistants.get(turnId);
+			if (hit) return hit;
+		}
+		let latest = null;
+		for (const message of this.liveAssistants.values()) latest = message;
+		return latest;
+	}
 	liveTurnCount = 0;
 	/** pendingMsgId awaiting compaction completion/cancellation event. */
 	pendingCompactionMsgId = null;
@@ -16888,6 +16815,63 @@ var WebSession = class {
 		const msgs = this.buildMessages();
 		if (msgs.length > 0 && !this.customTitle) this.title = deriveTitle(msgs);
 	}
+	/**
+	* Core wire history seed: filled in once by the activation path when the
+	* journal holds no message records.
+	*/
+	seededMessages = [];
+	/**
+	* Mark the journal untrustworthy (byte-interleaving damage, see
+	* journal-writer.ts).
+	*
+	* The loaded journal entries and any legacy userMessages are dropped so the
+	* message list is presented from the core transcript seed instead; state
+	* snapshots (goal/todo, …) were already cached by loadFromPersisted and are
+	* unaffected. nextSeq does not roll back: live entries keep appending and
+	* rendering as usual after activation, so new messages are untouched (a seq
+	* gap on the client takes the existing gap → snapshot refetch path).
+	*/
+	markDamaged(reason) {
+		const droppedEntries = this.journal.length;
+		const droppedUsers = this.userMessages.length;
+		this.journal.length = 0;
+		this.userMessages.length = 0;
+		log.warn("web: session journal damaged; messages rebuilt from core transcript", {
+			sessionId: this.sessionId,
+			reason,
+			droppedEntries,
+			droppedUsers
+		});
+	}
+	/**
+	* Whether the current message list holds at least one assistant message with
+	* a body. Used to decide how far journal remnants can be trusted: user
+	* messages are persisted separately (they always carry text), while the
+	* byte-interleaving damage only ever ate assistant bodies — so only the
+	* assistant side is inspected.
+	*/
+	hasAnyAssistantContent() {
+		return this.buildMessages().some((message) => message.role === "assistant" && message.content.trim().length > 0);
+	}
+	/**
+	* Seed messages from the core session history. An older session's web
+	* journal may hold nothing but state entries (or predate durable snapshots),
+	* which leaves the chat area empty after a resume while the wire history is
+	* intact. The seed occupies seq 1..N and lifts nextSeq past it, keeping seq
+	* monotonic with live events and consistent with the getMessagesOlder cursor.
+	*/
+	seedHistory(messages) {
+		if (messages.length === 0 || this.seededMessages.length > 0) return;
+		let seq = 1;
+		for (const message of messages) {
+			this.seededMessages.push({
+				...message,
+				seq
+			});
+			seq += 1;
+		}
+		if (seq - 1 >= this.nextSeq) this.nextSeq = seq;
+	}
 	async updateTitle() {
 		if (this.customTitle) return;
 		const newTitle = deriveTitle(this.buildMessages());
@@ -16939,11 +16923,12 @@ var WebSession = class {
 		if (!this.session) return;
 		this.unsubscribe = this.session.onEvent((event) => {
 			if ((event.type === "goal.updated" || event.type === "todo.updated") && event.agentId !== "main") return;
+			if (MAIN_TRANSCRIPT_EVENTS.has(event.type) && event.agentId !== "main") return;
 			if (event.type === "turn.started") {
 				this.busy = true;
 				this.activeTurns += 1;
 				this.liveTurnCount += 1;
-				this.liveAssistant = {
+				this.liveAssistants.set(event.turnId, {
 					role: "assistant",
 					content: "",
 					tools: [],
@@ -16959,11 +16944,11 @@ var WebSession = class {
 						tokens: null,
 						tokensPerSec: null
 					}
-				};
+				});
 			} else if (event.type === "turn.ended") {
 				this.activeTurns = Math.max(0, this.activeTurns - 1);
 				this.busy = this.activeTurns > 0;
-				const live = this.liveAssistant;
+				const live = this.liveFor(event.turnId);
 				if (event.reason === "failed" && live) live.isError = true;
 				if (live) {
 					live.turnStats = {
@@ -16983,13 +16968,13 @@ var WebSession = class {
 						message: live
 					});
 				}
-				this.liveAssistant = null;
+				this.liveAssistants.delete(event.turnId);
 				this.trackPending(this.updateTitle());
 			} else if (event.type === "assistant.delta") {
-				const live = this.liveAssistant;
+				const live = this.liveFor(event.turnId);
 				if (live) live.content += event.delta;
 			} else if (event.type === "thinking.delta") {
-				const live = this.liveAssistant;
+				const live = this.liveFor(event.turnId);
 				if (live) {
 					const t = live.tools.find((x) => x.name === "thinking");
 					if (t) t.output = (t.output ?? "") + event.delta;
@@ -17001,7 +16986,7 @@ var WebSession = class {
 					});
 				}
 			} else if (event.type === "tool.call.started") {
-				const live = this.liveAssistant;
+				const live = this.liveFor(event.turnId);
 				if (live) {
 					live.tools.push({
 						toolCallId: event.toolCallId,
@@ -17011,7 +16996,7 @@ var WebSession = class {
 					if (live.turnStats) live.turnStats.step += 1;
 				}
 			} else if (event.type === "tool.result") {
-				const live = this.liveAssistant;
+				const live = this.liveFor(event.turnId);
 				if (live) {
 					const tool = live.tools.find((t) => t.toolCallId === event.toolCallId);
 					if (tool) {
@@ -17492,7 +17477,7 @@ var WebSession = class {
 			workDir: this.workDir,
 			title: this.title,
 			createdAt: this.createdAt,
-			messageCount: this.buildMessages().length,
+			messageCount: this.isActive ? this.buildMessages().length : -1,
 			active: this.isActive
 		};
 	}
@@ -17686,7 +17671,7 @@ var WebSession = class {
 		return this.connections.size;
 	}
 	buildMessages() {
-		const messages = [];
+		const messages = [...this.seededMessages];
 		let currentAssistant = null;
 		let userIndex = 0;
 		let turnCount = 0;
@@ -17872,6 +17857,36 @@ async function handleGoalRoute(req, res, url, resolveSession) {
 	}
 	return true;
 }
+/**
+* Validate the optional workDir argument of session creation; undefined means
+* "reuse the server process directory".
+*
+* Trade-off: web is a local tool and the browser shares the CLI's trust level,
+* so no directory allowlist is introduced; but only an explicitly provided
+* absolute path is accepted — relative paths and `..` segments are rejected
+* (resolving them away instead of rejecting would amount to permitting
+* traversal), and the target must exist, be a directory and be readable and
+* writable. An invalid directory fails loudly with a 4xx at the moment the
+* session is created, rather than letting the agent wander into some
+* unexpected location later.
+*/
+async function validateSessionWorkDir(raw) {
+	if (raw === void 0 || raw === null) return void 0;
+	if (typeof raw !== "string") throw new HttpError(400, "workDir 必须是字符串", "request.invalid");
+	const value = raw.trim();
+	if (!value) return void 0;
+	if (!isAbsolute(value)) throw new HttpError(400, `workDir 必须是绝对路径：${value}`, "request.invalid");
+	if (value.split(/[\\/]+/).includes("..")) throw new HttpError(400, `workDir 不允许包含 ".." 遍历段：${value}`, "request.invalid");
+	const st = await stat(value).catch(() => null);
+	if (!st) throw new HttpError(404, `目录不存在：${value}`, "request.invalid");
+	if (!st.isDirectory()) throw new HttpError(400, `不是目录：${value}`, "request.invalid");
+	try {
+		await access(value, constants.R_OK | constants.W_OK);
+	} catch {
+		throw new HttpError(403, `目录不可读写：${value}`, "request.invalid");
+	}
+	return value;
+}
 var SessionManager = class {
 	sessions = /* @__PURE__ */ new Map();
 	/** In-flight activation promises to deduplicate concurrent calls. */
@@ -17894,7 +17909,7 @@ var SessionManager = class {
 		await ensureSessionsDir(this.homeDir);
 		const metas = await listPersistedSessions(this.homeDir);
 		for (const meta of metas) {
-			const entries = await loadJournal(this.homeDir, meta.sessionId);
+			const { entries } = await loadJournal(this.homeDir, meta.sessionId);
 			const ws = new WebSession(null, {
 				sessionId: meta.sessionId,
 				coreSessionId: meta.coreSessionId ?? meta.sessionId,
@@ -17908,11 +17923,107 @@ var SessionManager = class {
 			ws.loadFromPersisted(entries);
 			this.sessions.set(meta.sessionId, ws);
 		}
+		try {
+			const index = await readSessionIndex(this.homeDir, join(this.homeDir, "sessions"));
+			const managerWorkDir = normalizeWorkDir(this.workDir);
+			for (const entry of index.values()) try {
+				if (normalizeWorkDir(entry.workDir) !== managerWorkDir) continue;
+				if (this.sessions.has(entry.sessionId)) continue;
+				if (!existsSync(entry.sessionDir)) continue;
+				let title = "未命名会话";
+				let createdAt = Date.now();
+				try {
+					const raw = await readFile(join(entry.sessionDir, "state.json"), "utf8");
+					const state = JSON.parse(raw);
+					if (typeof state.title === "string" && state.title) title = state.title;
+					if (state.createdAt) {
+						const t = typeof state.createdAt === "number" ? state.createdAt : Date.parse(state.createdAt);
+						if (Number.isFinite(t)) createdAt = t;
+					}
+				} catch {}
+				const session = new WebSession(null, {
+					sessionId: entry.sessionId,
+					coreSessionId: entry.sessionId,
+					workDir: entry.workDir,
+					permission: this.permission,
+					yolo: this.yolo,
+					homeDir: this.homeDir,
+					createdAt,
+					title
+				});
+				this.sessions.set(entry.sessionId, session);
+			} catch (error) {
+				log.warn("web: skipping unreadable session index entry", {
+					sessionId: entry.sessionId,
+					sessionDir: entry.sessionDir,
+					error: errorMessage(error)
+				});
+			}
+		} catch (error) {
+			log.warn("web: session index unreadable; falling back to web mirror + directory scan", {
+				homeDir: this.homeDir,
+				error: errorMessage(error)
+			});
+		}
+		const wdKey = encodeWorkDirKey(this.workDir);
+		const wdDir = join(this.homeDir, "sessions", wdKey);
+		try {
+			if (existsSync(wdDir)) for (const name of await readdir(wdDir)) {
+				if (!name.startsWith("session_")) continue;
+				if (this.sessions.has(name)) continue;
+				try {
+					const sessionDir = join(wdDir, name);
+					let title = "未命名会话";
+					let createdAt = Date.now();
+					try {
+						const raw = await readFile(join(sessionDir, "state.json"), "utf8");
+						const state = JSON.parse(raw);
+						if (typeof state.title === "string" && state.title) title = state.title;
+						if (state.createdAt) {
+							const t = typeof state.createdAt === "number" ? state.createdAt : Date.parse(state.createdAt);
+							if (Number.isFinite(t)) createdAt = t;
+						}
+					} catch {}
+					const session = new WebSession(null, {
+						sessionId: name,
+						coreSessionId: name,
+						workDir: this.workDir,
+						permission: this.permission,
+						yolo: this.yolo,
+						homeDir: this.homeDir,
+						createdAt,
+						title
+					});
+					this.sessions.set(name, session);
+				} catch (error) {
+					log.warn("web: skipping unreadable core session directory", {
+						wdKey,
+						sessionId: name,
+						error: errorMessage(error)
+					});
+				}
+			}
+		} catch (error) {
+			log.warn("web: core session bucket scan failed", {
+				wdKey,
+				dir: wdDir,
+				error: errorMessage(error)
+			});
+		}
 		log.info("web: loaded persisted sessions", { count: this.sessions.size });
 	}
-	async createSession() {
+	/** Server process directory: the default workspace when session creation omits workDir. */
+	get defaultWorkDir() {
+		return this.workDir;
+	}
+	/**
+	* Create a session; an omitted workDir reuses the server process directory
+	* and is passed to the harness as-is.
+	*/
+	async createSession(workDir) {
+		const dir = workDir ?? this.workDir;
 		const session = await this.harness.createSession({
-			workDir: this.workDir,
+			workDir: dir,
 			model: this.model,
 			permission: this.permission
 		});
@@ -17920,7 +18031,7 @@ var SessionManager = class {
 		const createdAt = Date.now();
 		const webSession = new WebSession(session, {
 			sessionId,
-			workDir: this.workDir,
+			workDir: dir,
 			permission: this.permission,
 			yolo: this.yolo,
 			homeDir: this.homeDir,
@@ -17937,7 +18048,7 @@ var SessionManager = class {
 		this.sessions.set(sessionId, webSession);
 		log.info("web: session created", {
 			sessionId,
-			workDir: this.workDir
+			workDir: dir
 		});
 		return webSession;
 	}
@@ -17982,8 +18093,19 @@ var SessionManager = class {
 			coreSessionId: session.id,
 			onFork: (id) => this.forkSession(id)
 		});
-		const entries = await loadJournal(this.homeDir, sessionId);
+		const { entries, corrupt } = await loadJournal(this.homeDir, sessionId);
 		reactivated.loadFromPersisted(entries);
+		const journalHasContent = reactivated.hasAnyAssistantContent();
+		if (corrupt > 0 && !journalHasContent) reactivated.markDamaged(`journal has ${corrupt} corrupt lines and no parsed message carries a body`);
+		if (!entries.some(isMessageBearingEntry) || corrupt > 0 && !journalHasContent) try {
+			const context = await session.getContext();
+			reactivated.seedHistory(contextHistoryToChatMessages(context.history));
+		} catch (error) {
+			log.warn("web: seeding history from core transcript failed", {
+				sessionId,
+				error: error instanceof Error ? error.message : String(error)
+			});
+		}
 		try {
 			await reactivated.ready;
 		} catch (error) {
@@ -18038,7 +18160,7 @@ var SessionManager = class {
 			const title = `${source.getTitle()} (fork)`;
 			const webSession = new WebSession(session, {
 				sessionId: newId,
-				workDir: this.workDir,
+				workDir: source.getMetadata().workDir,
 				permission: source.getMetadata().permission,
 				yolo: this.yolo,
 				homeDir: this.homeDir,
@@ -18052,6 +18174,16 @@ var SessionManager = class {
 				await writeFile(getJournalPath(this.homeDir, newId), lines);
 			}
 			webSession.loadFromPersisted(entries);
+			if (!entries.some(isMessageBearingEntry)) try {
+				const context = await session.getContext();
+				webSession.seedHistory(contextHistoryToChatMessages(context.history));
+			} catch (error) {
+				log.warn("web: seeding forked history from core transcript failed", {
+					sourceId,
+					newId,
+					error: errorMessage(error)
+				});
+			}
 			try {
 				await webSession.ready;
 			} catch (error) {
@@ -18087,8 +18219,33 @@ var SessionManager = class {
 	async delete(sessionId) {
 		const ws = this.sessions.get(sessionId);
 		if (!ws) return false;
+		const workDir = ws.workDir;
+		const coreId = ws.getCoreSessionId();
 		await ws.delete();
 		this.sessions.delete(sessionId);
+		const coreDir = join(this.homeDir, "sessions", encodeWorkDirKey(workDir), coreId);
+		let moved = true;
+		try {
+			if (existsSync(coreDir)) {
+				const trashRoot = join(this.homeDir, "trash");
+				await mkdir(trashRoot, { recursive: true });
+				await rename(coreDir, join(trashRoot, `${coreId}-${Date.now()}`));
+			} else log.warn("web: core session directory not found on delete", {
+				sessionId,
+				coreId,
+				workDir,
+				coreDir
+			});
+		} catch (error) {
+			moved = false;
+			log.warn("web: moving session directory to trash failed; index entry kept", {
+				sessionId,
+				coreId,
+				coreDir,
+				error: errorMessage(error)
+			});
+		}
+		if (moved) await removeSessionIndexEntry(this.homeDir, coreId);
 		return true;
 	}
 	/** List available model aliases from the harness config (reloaded). */
@@ -18831,17 +18988,18 @@ async function runWebServer(opts) {
 			res.end(JSON.stringify(manager.list()));
 			return;
 		}
+		if (url === `${API_PREFIX}/workdir` && method === "GET") {
+			sendJson(res, 200, { workDir: manager.defaultWorkDir });
+			return;
+		}
 		if (url === `${API_PREFIX}/sessions` && method === "POST") {
 			try {
-				const ws = await manager.createSession();
+				const dir = await validateSessionWorkDir((await readJsonBody(req))["workDir"]);
+				const ws = await manager.createSession(dir);
 				res.writeHead(201, { "Content-Type": "application/json" });
 				res.end(JSON.stringify(ws.getListItem()));
 			} catch (error) {
-				res.writeHead(500, { "Content-Type": "application/json" });
-				res.end(JSON.stringify({
-					code: 500,
-					message: String(error)
-				}));
+				sendHttpError(res, error);
 			}
 			return;
 		}
@@ -19137,7 +19295,10 @@ async function runWebServer(opts) {
 		if (url === "/" || url === "/index.html") {
 			try {
 				const html = await readFile(join(publicDir, "index.html"), "utf-8");
-				res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+				res.writeHead(200, {
+					"Content-Type": "text/html; charset=utf-8",
+					"Cache-Control": "no-store"
+				});
 				res.end(html);
 			} catch {
 				res.writeHead(500, { "Content-Type": "text/plain" });
@@ -19150,7 +19311,9 @@ async function runWebServer(opts) {
 			const filePath = join(publicDir, safeUrl);
 			const contentType = contentTypes[filePath.split(".").pop() ?? ""] ?? "application/octet-stream";
 			const data = await readFile(filePath);
-			res.writeHead(200, { "Content-Type": contentType });
+			const headers = { "Content-Type": contentType };
+			if (safeUrl.startsWith("/assets/")) headers["Cache-Control"] = "public, max-age=31536000, immutable";
+			res.writeHead(200, headers);
 			res.end(data);
 		} catch {
 			res.writeHead(404, { "Content-Type": "text/plain" });