scream-code 0.10.13 → 0.11.1

package/dist/{app-DBxlfmut.mjs → app-p7tymZds.mjs}

@@ -717,7 +717,7 @@ function isOrphanedToolCallMessage(lowerMessage) {
 */
 function isOrphanedToolCallError(error) {
 	if (error instanceof APIOrphanedToolCallError) return true;
-	return isOrphanedToolCallMessage(errorMessage$6(error).toLowerCase());
+	return isOrphanedToolCallMessage(errorMessage$7(error).toLowerCase());
 }
 /**
 * The API returned an empty response (no content, no tool calls).
@@ -764,7 +764,7 @@ function isContextOverflowStatusError(statusCode, message) {
 	const lowerMessage = message.toLowerCase();
 	return CONTEXT_OVERFLOW_MESSAGE_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
-function errorMessage$6(error) {
+function errorMessage$7(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -47296,7 +47296,7 @@ function isAbortError$1(err) {
 	if (err instanceof Error) return err.name === "AbortError";
 	return false;
 }
-function errorMessage$5(err) {
+function errorMessage$6(err) {
 	if (err instanceof Error) return err.message;
 	return String(err);
 }
@@ -52494,7 +52494,7 @@ var GoalMode = class {
 		const state = this.state;
 		if (state === void 0 || state.status !== "active") return null;
 		state.tokensUsed += Math.max(0, tokenDelta);
-		this.persistState(state, { silent: true });
+		this.persistState(state);
 		this.appendGoalUpdate({ tokensUsed: state.tokensUsed });
 		return this.toSnapshot(state);
 	}
@@ -52516,7 +52516,7 @@ var GoalMode = class {
 			time: Date.now()
 		});
 		if (state.notes.length > MAX_GOAL_NOTES) state.notes = state.notes.slice(-60);
-		this.persistState(state, { silent: true });
+		this.persistState(state);
 		return this.toSnapshot(state);
 	}
 	clearInternal(actor, opts = {}) {
@@ -52581,7 +52581,7 @@ var GoalMode = class {
 			wallClockMs: liveWallClockMs(state, Date.now()),
 			budget: computeBudgetReport(state, Date.now()),
 			terminalReason: state.terminalReason,
-			notes: state.notes
+			notes: state.notes.map((note) => ({ ...note }))
 		};
 	}
 };
@@ -52865,7 +52865,7 @@ var UpdateGoalTool = class {
 		try {
 			await goal.pauseGoal({ reason: "verifying" }, "system");
 		} catch (error) {
-			return toolError(`Failed to pause goal for verification: ${errorMessage$4(error)}`, goal);
+			return toolError(`Failed to pause goal for verification: ${errorMessage$5(error)}`, goal);
 		}
 		let rawGrade;
 		try {
@@ -52873,7 +52873,7 @@ var UpdateGoalTool = class {
 		} catch (error) {
 			const resumeError = await resumeAfterGrading(goal);
 			if (resumeError !== void 0) return resumeError;
-			const reason = `Goal verification could not be completed: ${errorMessage$4(error)}`;
+			const reason = `Goal verification could not be completed: ${errorMessage$5(error)}`;
 			this.appendGradingFeedback(reason);
 			return {
 				isError: true,
@@ -52901,7 +52901,7 @@ var UpdateGoalTool = class {
 					name: GOAL_COMPLETION_REMINDER_NAME
 				});
 			} catch (error) {
-				return toolError(`Failed to mark verified goal complete: ${errorMessage$4(error)}`, goal);
+				return toolError(`Failed to mark verified goal complete: ${errorMessage$5(error)}`, goal);
 			}
 			return {
 				output: `Goal verified and marked complete.\n${grade.reason}`,
@@ -52936,7 +52936,7 @@ async function resumeAfterGrading(goal) {
 		await goal.resumeGoal({}, "system");
 		return;
 	} catch (error) {
-		return toolError(`Failed to restore active goal after verification: ${errorMessage$4(error)}`, goal);
+		return toolError(`Failed to restore active goal after verification: ${errorMessage$5(error)}`, goal);
 	}
 }
 function toolError(message, goal) {
@@ -52945,7 +52945,7 @@ function toolError(message, goal) {
 		output: `${message}. Current goal status: ${goal.getGoal().goal?.status ?? "missing"}.`
 	};
 }
-function errorMessage$4(error) {
+function errorMessage$5(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -78351,7 +78351,7 @@ async function runHook(command, input, options) {
 			detached: process.platform !== "win32"
 		});
 	} catch (error) {
-		return allowResult({ stderr: errorMessage$3(error) });
+		return allowResult({ stderr: errorMessage$4(error) });
 	}
 	return new Promise((resolve) => {
 		let stdout = "";
@@ -78399,7 +78399,7 @@ async function runHook(command, input, options) {
 		child.on("error", (error) => {
 			settle(allowResult({
 				stdout,
-				stderr: stderr + errorMessage$3(error)
+				stderr: stderr + errorMessage$4(error)
 			}));
 		});
 		child.on("close", (code) => {
@@ -78495,7 +78495,7 @@ function tryKillProcess(child, signal) {
 function isRecord$5(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function errorMessage$3(error) {
+function errorMessage$4(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -89581,7 +89581,7 @@ function parseToolCallArguments(raw) {
 		} catch {
 			return {
 				success: false,
-				error: errorMessage$5(error)
+				error: errorMessage$6(error)
 			};
 		}
 	}
@@ -89661,7 +89661,7 @@ async function prepareToolCall(step, call) {
 			toolCallId: call.toolCall.id,
 			error
 		});
-		return settleError(effectiveArgs, error instanceof PathSecurityError ? error.message : `Tool "${call.toolName}" failed to resolve execution: ${errorMessage$5(error)}`);
+		return settleError(effectiveArgs, error instanceof PathSecurityError ? error.message : `Tool "${call.toolName}" failed to resolve execution: ${errorMessage$6(error)}`);
 	}
 	const displayFields = toolCallDisplayFieldsFromExecution(execution);
 	const settleAborted = () => settleError(effectiveArgs, abortedToolOutput(call.toolName, step.signal), displayFields);
@@ -89720,7 +89720,7 @@ async function runPrepareToolExecutionHook(step, call) {
 		return {
 			kind: "hookFailed",
 			args,
-			output: `prepareToolExecution hook failed for "${call.toolName}": ${errorMessage$5(error)}`
+			output: `prepareToolExecution hook failed for "${call.toolName}": ${errorMessage$6(error)}`
 		};
 	}
 	const effectiveArgs = hookResult?.updatedArgs ?? args;
@@ -89761,7 +89761,7 @@ async function runAuthorizeToolExecutionHook(step, call, args, execution) {
 		};
 		return {
 			block: true,
-			reason: `authorizeToolExecution hook failed for "${call.toolName}": ${errorMessage$5(error)}`
+			reason: `authorizeToolExecution hook failed for "${call.toolName}": ${errorMessage$6(error)}`
 		};
 	}
 }
@@ -89788,7 +89788,7 @@ async function runRunnableToolCall(step, call, effectiveArgs, metadata, executio
 			toolCallId: toolCall.id,
 			error
 		});
-		return makeErrorToolResult(call, effectiveArgs, aborted ? abortedToolOutput(toolName, signal) : `Tool "${toolName}" failed: ${errorMessage$5(error)}`);
+		return makeErrorToolResult(call, effectiveArgs, aborted ? abortedToolOutput(toolName, signal) : `Tool "${toolName}" failed: ${errorMessage$6(error)}`);
 	}
 	return makeToolResult(call, effectiveArgs, toolResult);
 }
@@ -89820,7 +89820,7 @@ async function finalizePendingToolResult(step, pendingResult) {
 			toolCallId: pendingResult.toolCall.id,
 			error
 		});
-		const output = aborted ? `Tool "${pendingResult.toolName}" aborted during finalizeToolResult hook.` : `finalizeToolResult hook failed for "${pendingResult.toolName}": ${errorMessage$5(error)}`;
+		const output = aborted ? `Tool "${pendingResult.toolName}" aborted during finalizeToolResult hook.` : `finalizeToolResult hook failed for "${pendingResult.toolName}": ${errorMessage$6(error)}`;
 		return {
 			...pendingResult,
 			stopTurn: pendingResult.stopTurn,
@@ -90178,7 +90178,7 @@ async function runTurn(input) {
 				usage
 			};
 		}
-		dispatchEvent(makeInterruptedEvent(isMaxStepsExceededError(error) ? "max_steps" : "error", steps, activeStep, errorMessage$5(error)));
+		dispatchEvent(makeInterruptedEvent(isMaxStepsExceededError(error) ? "max_steps" : "error", steps, activeStep, errorMessage$6(error)));
 		throw error;
 	}
 	return {
@@ -94455,6 +94455,13 @@ var LspRegistry = class {
 };
 //#endregion
 //#region ../../packages/agent-core/src/agent/tool/index.ts
+function cloneTodos(todos) {
+	return todos.map((todo) => ({
+		title: todo.title,
+		status: todo.status,
+		phase: todo.phase
+	}));
+}
 const CRITERIA_SYSTEM_PROMPT = [
 	"You generate concrete, verifiable acceptance criteria for a given objective.",
 	"Criteria must be specific and testable — state what should work end-to-end, not just what should exist.",
@@ -94645,12 +94652,20 @@ var ToolManager = class {
 		});
 	}
 	updateStore(key, value) {
+		const storedValue = key === "todo" ? cloneTodos(value ?? []) : value;
 		this.agent.records.logRecord({
 			type: "tools.update_store",
 			key,
-			value
+			value: storedValue
+		});
+		this.store[key] = storedValue;
+		if (key === "todo") this.agent.emitEvent({
+			type: "todo.updated",
+			todos: this.getTodos()
 		});
-		this.store[key] = value;
+	}
+	getTodos() {
+		return cloneTodos(this.store.todo ?? []);
 	}
 	registerUserTool(input) {
 		this.agent.records.logRecord({
@@ -96700,6 +96715,9 @@ var Agent = class {
 			getGoal: () => {
 				return this.goal.getGoal();
 			},
+			getTodos: () => {
+				return this.tools.getTodos();
+			},
 			setGoalBudget: async (payload) => {
 				const { value, unit } = payload;
 				let budgetLimits;
@@ -114592,7 +114610,7 @@ function markitConversionCacheKey(bytes, extension) {
 function cacheEntryPath(key) {
 	return path$8.join(documentConversionCacheDir(), `${key}.json`);
 }
-function errorMessage$2(error) {
+function errorMessage$3(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 function parseCacheEntry(raw) {
@@ -114611,14 +114629,14 @@ async function readMarkitConversionCache(key) {
 	try {
 		raw = await fs$1.readFile(target, "utf8");
 	} catch (error) {
-		if (!isEnoent(error)) log.debug("document conversion cache read failed", { error: errorMessage$2(error) });
+		if (!isEnoent(error)) log.debug("document conversion cache read failed", { error: errorMessage$3(error) });
 		return { status: "miss" };
 	}
 	let entry;
 	try {
 		entry = parseCacheEntry(raw);
 	} catch (error) {
-		log.debug("document conversion cache read failed", { error: errorMessage$2(error) });
+		log.debug("document conversion cache read failed", { error: errorMessage$3(error) });
 		entry = null;
 	}
 	if (entry === null) {
@@ -114635,7 +114653,7 @@ async function pruneMarkitConversionCache(cacheDir) {
 	try {
 		names = await fs$1.readdir(cacheDir);
 	} catch (error) {
-		if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$2(error) });
+		if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$3(error) });
 		return;
 	}
 	const now = Date.now();
@@ -114647,7 +114665,7 @@ async function pruneMarkitConversionCache(cacheDir) {
 		try {
 			stat = await fs$1.stat(entryPath);
 		} catch (error) {
-			if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$2(error) });
+			if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$3(error) });
 			continue;
 		}
 		if (!stat.isFile()) continue;
@@ -114671,7 +114689,7 @@ async function pruneMarkitConversionCache(cacheDir) {
 			await fs$1.rm(entry.path, { force: true });
 			totalBytes -= entry.size;
 		} catch (error) {
-			if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$2(error) });
+			if (!isEnoent(error)) log.debug("document conversion cache prune failed", { error: errorMessage$3(error) });
 		}
 	}
 }
@@ -114689,11 +114707,11 @@ async function writeMarkitConversionCache(key, content) {
 		await fs$1.rename(tempPath, target);
 	} catch (error) {
 		await fs$1.rm(tempPath, { force: true }).catch(() => void 0);
-		log.debug("document conversion cache write failed", { error: errorMessage$2(error) });
+		log.debug("document conversion cache write failed", { error: errorMessage$3(error) });
 		return;
 	}
 	pruneMarkitConversionCache(cacheDir).catch((error) => {
-		log.debug("document conversion cache prune failed", { error: errorMessage$2(error) });
+		log.debug("document conversion cache prune failed", { error: errorMessage$3(error) });
 	});
 }
 //#endregion
@@ -116759,6 +116777,9 @@ var SessionAPIImpl = class {
 	getGoal({ agentId, ...payload }) {
 		return this.getAgent(agentId).getGoal(payload);
 	}
+	getTodos({ agentId, ...payload }) {
+		return this.getAgent(agentId).getTodos(payload);
+	}
 	setGoalBudget({ agentId, ...payload }) {
 		return this.getAgent(agentId).setGoalBudget(payload);
 	}
@@ -118504,6 +118525,9 @@ var ScreamCore = class {
 	getGoal({ sessionId, ...payload }) {
 		return this.sessionApi(sessionId).getGoal(payload);
 	}
+	getTodos({ sessionId, ...payload }) {
+		return this.sessionApi(sessionId).getTodos(payload);
+	}
 	setGoalBudget({ sessionId, ...payload }) {
 		return this.sessionApi(sessionId).setGoalBudget(payload);
 	}
@@ -118970,6 +118994,12 @@ var SDKRpcClient = class {
 			agentId: this.interactiveAgentId
 		});
 	}
+	async getTodos(input) {
+		return (await this.getRpc()).getTodos({
+			sessionId: input.sessionId,
+			agentId: this.interactiveAgentId
+		});
+	}
 	async setGoalBudget(input) {
 		return (await this.getRpc()).setGoalBudget({
 			sessionId: input.sessionId,
@@ -119289,7 +119319,7 @@ var SDKRpcClient = class {
 				type: "error",
 				sessionId: request.sessionId,
 				agentId: request.agentId,
-				...makeErrorPayload(ErrorCodes.SESSION_APPROVAL_HANDLER_ERROR, errorMessage$1(error))
+				...makeErrorPayload(ErrorCodes.SESSION_APPROVAL_HANDLER_ERROR, errorMessage$2(error))
 			});
 			return {
 				decision: "cancelled",
@@ -119307,7 +119337,7 @@ var SDKRpcClient = class {
 				type: "error",
 				sessionId: request.sessionId,
 				agentId: request.agentId,
-				...makeErrorPayload(ErrorCodes.SESSION_QUESTION_HANDLER_ERROR, errorMessage$1(error))
+				...makeErrorPayload(ErrorCodes.SESSION_QUESTION_HANDLER_ERROR, errorMessage$2(error))
 			});
 			return null;
 		}
@@ -119342,7 +119372,7 @@ var ClientAPI = class {
 		return this.client.toolCall(request);
 	}
 };
-function errorMessage$1(error) {
+function errorMessage$2(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -119733,6 +119763,10 @@ var Session = class {
 		this.ensureOpen();
 		return this.rpc.getGoal({ sessionId: this.id });
 	}
+	async getTodos() {
+		this.ensureOpen();
+		return this.rpc.getTodos({ sessionId: this.id });
+	}
 	async setGoalBudget(value, unit) {
 		this.ensureOpen();
 		return this.rpc.setGoalBudget({
@@ -120184,7 +120218,7 @@ function optionalBuildString(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 const SCREAM_BUILD_INFO = {
-	version: optionalBuildString("0.10.13"),
+	version: optionalBuildString("0.11.1"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -120273,7 +120307,7 @@ async function handleExport(deps, sessionId, output, opts) {
 		});
 		deps.stdout.write(`${result.zipPath}\n`);
 	} catch (error) {
-		deps.stderr.write(`${errorMessage(error)}\n`);
+		deps.stderr.write(`${errorMessage$1(error)}\n`);
 		deps.exit(1);
 	}
 }
@@ -120336,7 +120370,7 @@ async function confirmPreviousSession(summary) {
 		rl.close();
 	}
 }
-function errorMessage(error) {
+function errorMessage$1(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -125537,6 +125571,28 @@ function detectGoalConflict(state, _action) {
 	return null;
 }
 //#endregion
+//#region src/utils/goal-refiner.md
+var goal_refiner_default = "You are a goal refiner. Given a brief task description, produce one clear, actionable objective sentence of at most 200 characters. Return only the objective: no explanation, quotation marks, labels, or prefixes.\n";
+/**
+* Normalize an LLM-refined objective. Invalid output falls back to the user's
+* original description so refinement never loses the requested task.
+*/
+function parseRefinedGoal(rawOutput, fallback) {
+	const normalized = rawOutput.trim().replace(/^```(?:text)?\s*/i, "").replace(/\s*```$/, "").trim().replace(/^(?:objective|goal)\s*:\s*/i, "").replace(/^["'“‘](.*)["'”’]$/s, "$1").replaceAll(/\s+/g, " ").trim();
+	if (normalized.length === 0 || normalized.length > 200) return fallback.trim();
+	return normalized;
+}
+/** Refine a goal through the session LLM, with a deterministic raw-input fallback. */
+async function refineGoal(session, description) {
+	const fallback = description.trim();
+	if (fallback.length === 0) return "";
+	try {
+		return parseRefinedGoal(await session.generateText(goal_refiner_default, fallback), fallback);
+	} catch {
+		return fallback;
+	}
+}
+//#endregion
 //#region src/tui/commands/goal.ts
 const GOAL_STATUS_DISMISS_MS = 1e4;
 let activeGoalPanel;
@@ -125633,7 +125689,6 @@ async function createGoal(host, parsed) {
 	}
 	await showGoalConfigWizard(host, session, parsed.objective, parsed.replace);
 }
-const GOAL_REFINER_SYSTEM_PROMPT = "You are a goal refiner. Given a brief task description, produce a single clear, actionable objective sentence (max 200 chars). Do not add explanations, quotes, or prefixes.";
 /**
 * Guided goal creation: collect a brief task description, refine it via the
 * LLM into a single objective sentence, let the user confirm/edit, then enter
@@ -125659,13 +125714,7 @@ async function guidedGoalSetup(host) {
 	});
 	if (initialDesc === void 0) return;
 	host.showStatus(t("goal.setup_refining"));
-	let objective;
-	try {
-		objective = (await session.generateText(GOAL_REFINER_SYSTEM_PROMPT, initialDesc)).trim();
-		if (objective.length === 0) objective = initialDesc;
-	} catch {
-		objective = initialDesc;
-	}
+	const objective = await refineGoal(session, initialDesc);
 	const confirmed = await promptText(host, TextInputDialogComponent, {
 		title: t("goal.setup_title_confirm"),
 		subtitle: t("goal.setup_confirm_hint"),
@@ -131153,7 +131202,7 @@ async function readMarketplaceText(location, fetchImpl) {
 }
 function parseMarketplaceEntry(value, index, location) {
 	if (!isRecord$3(value)) throw new TypeError(`插件市场条目 ${index + 1} 必须是一个对象.`);
-	const id = requiredString(value, "id", index);
+	const id = requiredString$1(value, "id", index);
 	const source = stringField$1(value, "source") ?? stringField$1(value, "url") ?? stringField$1(value, "downloadUrl");
 	if (source === void 0) throw new Error(`插件市场条目 ${id} 必须定义 "source".`);
 	return {
@@ -131188,7 +131237,7 @@ function resolveLocalPath(input, workDir) {
 	if (input.startsWith("~/")) return join(homedir(), input.slice(2));
 	return isAbsolute(input) ? input : resolve(workDir, input);
 }
-function requiredString(value, field, index) {
+function requiredString$1(value, field, index) {
 	const result = stringField$1(value, field);
 	if (result === void 0) throw new Error(`插件市场条目 ${index + 1} 必须定义 "${field}".`);
 	return result;
@@ -135727,6 +135776,9 @@ var SessionEventHandler = class {
 			case "goal.updated":
 				this.handleGoalUpdated(event);
 				break;
+			case "todo.updated":
+				this.handleTodoUpdated(event);
+				break;
 			default: break;
 		}
 	}
@@ -135830,7 +135882,7 @@ var SessionEventHandler = class {
 	handleTurnEnd(event, sendQueued) {
 		this.host.setAppState({ reconnectAttempt: 0 });
 		const todos = this.host.state.todoPanel.getTodos();
-		if (todos.length > 0 && todos.every((t) => t.status === "done")) this.host.streamingUI.setTodoList([]);
+		if (todos.length > 0 && todos.every((todo) => todo.status === "done")) this.host.streamingUI.setTodoList([]);
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.finalizeTurn(sendQueued);
 	}
@@ -136001,17 +136053,7 @@ var SessionEventHandler = class {
 			synthetic: event.synthetic,
 			display: event.display
 		};
-		const matchedCall = streamingUI.completeToolResult(event.toolCallId, resultData);
-		if (matchedCall !== void 0 && matchedCall.name === "TodoList" && !event.isError) {
-			const rawTodos = matchedCall.args.todos;
-			if (Array.isArray(rawTodos)) {
-				const sanitized = rawTodos.filter((todo) => isTodoItemShape(todo)).map((t) => ({
-					title: t.title,
-					status: t.status
-				}));
-				streamingUI.setTodoList(sanitized);
-			}
-		}
+		streamingUI.completeToolResult(event.toolCallId, resultData);
 		if (canTransitionTo(this.host.state.appState.streamingPhase, "waiting")) this.host.setAppState({ streamingPhase: "waiting" });
 	}
 	handleStatusUpdate(event) {
@@ -136155,6 +136197,9 @@ var SessionEventHandler = class {
 			goalActive: snapshot.status === "active"
 		});
 	}
+	handleTodoUpdated(event) {
+		this.host.streamingUI.setTodoList(event.todos);
+	}
 	handleCompactionBegin(event) {
 		this.host.streamingUI.finalizeLiveTextBuffers();
 		this.lastCompactionTrigger = event.trigger;
@@ -146297,9 +146342,11 @@ function installStreamJsonTerminationHandlers(cleanup) {
 /** Error carrying an HTTP status code for REST handlers. */
 var HttpError = class extends Error {
 	statusCode;
-	constructor(statusCode, message) {
+	code;
+	constructor(statusCode, message, code) {
 		super(message);
 		this.statusCode = statusCode;
+		this.code = code;
 	}
 };
 const HEARTBEAT_INTERVAL_MS = 3e4;
@@ -146331,20 +146378,45 @@ const contentTypes = {
 	ttf: "font/ttf"
 };
 /** Reads and parses a JSON request body (64 KiB cap). */
+function cloneSnapshot(value) {
+	return structuredClone(value);
+}
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+function sendJson(res, statusCode, body) {
+	res.writeHead(statusCode, { "Content-Type": "application/json" });
+	res.end(JSON.stringify(body));
+}
 function readJsonBody(req) {
 	return new Promise((resolve, reject) => {
 		let data = "";
+		let size = 0;
+		let rejected = false;
 		req.on("data", (chunk) => {
+			if (rejected) return;
+			size += chunk.length;
+			if (size > 64 * 1024) {
+				rejected = true;
+				data = "";
+				reject(new HttpError(413, "Request body too large"));
+				return;
+			}
 			data += chunk.toString("utf-8");
-			if (data.length > 64 * 1024) reject(new HttpError(413, "Request body too large"));
 		});
 		req.on("end", () => {
+			if (rejected) return;
 			if (!data) {
 				resolve({});
 				return;
 			}
 			try {
-				resolve(JSON.parse(data));
+				const parsed = JSON.parse(data);
+				if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+					reject(new HttpError(400, "JSON body must be an object"));
+					return;
+				}
+				resolve(parsed);
 			} catch {
 				reject(new HttpError(400, "Invalid JSON body"));
 			}
@@ -146352,6 +146424,75 @@ function readJsonBody(req) {
 		req.on("error", reject);
 	});
 }
+function requiredString(body, field) {
+	const value = body[field];
+	if (typeof value !== "string" || value.trim().length === 0) throw new HttpError(400, `Missing or empty ${field} field`, "request.invalid");
+	return value.trim();
+}
+function optionalString(body, field) {
+	const value = body[field];
+	if (value === void 0) return void 0;
+	if (typeof value !== "string" || value.trim().length === 0) throw new HttpError(400, `${field} must be a non-empty string`, "request.invalid");
+	return value.trim();
+}
+function optionalBoolean(body, field, fallback) {
+	const value = body[field];
+	if (value === void 0) return fallback;
+	if (typeof value !== "boolean") throw new HttpError(400, `${field} must be a boolean`, "request.invalid");
+	return value;
+}
+function parseGoalBudgets(body) {
+	const raw = body["budgets"];
+	if (raw === void 0) return [];
+	if (!Array.isArray(raw)) throw new HttpError(400, "budgets must be an array", "request.invalid");
+	const validUnits = new Set([
+		"turns",
+		"tokens",
+		"milliseconds",
+		"seconds",
+		"minutes",
+		"hours"
+	]);
+	const seen = /* @__PURE__ */ new Set();
+	return raw.map((item) => {
+		if (item === null || typeof item !== "object" || Array.isArray(item)) throw new HttpError(400, "Each budget must be an object", "request.invalid");
+		const value = item["value"];
+		const unit = item["unit"];
+		if (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0) throw new HttpError(400, "Budget value must be a positive safe integer", "request.invalid");
+		if (typeof unit !== "string" || !validUnits.has(unit)) throw new HttpError(400, "Budget unit must be turns, tokens, milliseconds, seconds, minutes, or hours", "request.invalid");
+		const typedUnit = unit;
+		const dimension = typedUnit === "turns" || typedUnit === "tokens" ? typedUnit : "time";
+		if (seen.has(dimension)) throw new HttpError(400, `Duplicate budget dimension: ${dimension}`, "request.invalid");
+		seen.add(dimension);
+		return {
+			value,
+			unit: typedUnit
+		};
+	});
+}
+function toHttpError(error) {
+	if (error instanceof HttpError) return error;
+	if (isScreamError(error)) switch (error.code) {
+		case ErrorCodes.GOAL_OBJECTIVE_EMPTY:
+		case ErrorCodes.GOAL_OBJECTIVE_TOO_LONG:
+		case ErrorCodes.REQUEST_INVALID: return new HttpError(400, error.message, error.code);
+		case ErrorCodes.GOAL_NOT_FOUND:
+		case ErrorCodes.SESSION_NOT_FOUND: return new HttpError(404, error.message, error.code);
+		case ErrorCodes.GOAL_ALREADY_EXISTS:
+		case ErrorCodes.GOAL_NOT_RESUMABLE:
+		case ErrorCodes.GOAL_STATUS_INVALID:
+		case ErrorCodes.TURN_AGENT_BUSY: return new HttpError(409, error.message, error.code);
+		default: return new HttpError(500, error.message, error.code);
+	}
+	return new HttpError(500, errorMessage(error));
+}
+function sendHttpError(res, error) {
+	const mapped = toHttpError(error);
+	sendJson(res, mapped.statusCode, {
+		code: mapped.code ?? mapped.statusCode,
+		message: mapped.message
+	});
+}
 function isVolatileEvent(event) {
 	switch (event.type) {
 		case "assistant.delta":
@@ -146539,11 +146680,21 @@ var WebSession = class {
 	nextSeq = 1;
 	epoch = 1;
 	cachedStatus = null;
+	cachedGoal = null;
+	cachedTodos = [];
+	goalEventRevision = 0;
+	todoEventRevision = 0;
+	goalMutationTail = Promise.resolve();
+	pendingGoalMutations = 0;
+	coreSessionId;
+	ready;
 	title = "New Session";
 	pendingApprovals = /* @__PURE__ */ new Map();
 	heartbeatTimer = null;
 	unsubscribe = null;
 	busy = false;
+	/** pendingMsgId awaiting compaction completion/cancellation event. */
+	pendingCompactionMsgId = null;
 	homeDir;
 	yolo;
 	/** Fork hook supplied by SessionManager; absent in standalone mode. */
@@ -146558,13 +146709,14 @@ var WebSession = class {
 		this.yolo = opts.yolo;
 		this.homeDir = opts.homeDir ?? null;
 		this.createdAt = opts.createdAt;
+		this.coreSessionId = session?.id ?? opts.coreSessionId ?? opts.sessionId;
 		this.onFork = opts.onFork;
 		if (opts.title) this.title = opts.title;
 		if (session) {
-			this.refreshStatus();
 			this.subscribeEvents();
 			this.setupApprovalHandler();
-		}
+			this.ready = this.initializeCoreState();
+		} else this.ready = Promise.resolve();
 		this.startHeartbeat();
 	}
 	get isActive() {
@@ -146586,7 +146738,8 @@ var WebSession = class {
 		for (const um of this.userMessages) entries.push({
 			type: "user_message",
 			text: um.msg.content,
-			beforeSeq: um.beforeSeq
+			beforeSeq: um.beforeSeq,
+			clientMessageId: um.msg.clientMessageId
 		});
 		return entries;
 	}
@@ -146598,11 +146751,12 @@ var WebSession = class {
 		});
 		await appendJournalLine(this.homeDir, this.sessionId, line);
 	}
-	async persistUserMessage(text, beforeSeq) {
+	async persistUserMessage(text, beforeSeq, clientMessageId) {
 		this.userMessages.push({
 			msg: {
 				role: "user",
 				content: text,
+				clientMessageId,
 				tools: []
 			},
 			beforeSeq
@@ -146611,7 +146765,8 @@ var WebSession = class {
 		const line = JSON.stringify({
 			type: "user_message",
 			text,
-			beforeSeq
+			beforeSeq,
+			clientMessageId
 		});
 		await appendJournalLine(this.homeDir, this.sessionId, line);
 	}
@@ -146622,6 +146777,7 @@ var WebSession = class {
 				msg: {
 					role: "user",
 					content: um.text,
+					clientMessageId: um.clientMessageId,
 					tools: []
 				},
 				beforeSeq: um.beforeSeq
@@ -146630,6 +146786,8 @@ var WebSession = class {
 			const je = entry;
 			this.journal.push(je);
 			this.nextSeq = Math.max(this.nextSeq, je.seq + 1);
+			if (this.session === null && je.payload.agentId === "main" && je.payload.type === "goal.updated") this.cachedGoal = cloneSnapshot(je.payload.snapshot);
+			else if (this.session === null && je.payload.agentId === "main" && je.payload.type === "todo.updated") this.cachedTodos = cloneSnapshot(je.payload.todos);
 		}
 		const msgs = this.buildMessages();
 		if (msgs.length > 0 && !this.customTitle) this.title = deriveTitle(msgs);
@@ -146645,6 +146803,7 @@ var WebSession = class {
 	getMetadata() {
 		return {
 			sessionId: this.sessionId,
+			coreSessionId: this.coreSessionId,
 			workDir: this.workDir,
 			title: this.title,
 			createdAt: this.createdAt,
@@ -146653,11 +146812,12 @@ var WebSession = class {
 		};
 	}
 	appendEvent(event) {
+		const payload = event.type === "goal.updated" || event.type === "todo.updated" ? cloneSnapshot(event) : event;
 		const entry = {
 			seq: this.nextSeq++,
 			epoch: this.epoch,
-			volatile: isVolatileEvent(event),
-			payload: event
+			volatile: isVolatileEvent(payload),
+			payload
 		};
 		this.journal.push(entry);
 		if (!entry.volatile) this.persistEntry(entry);
@@ -146666,10 +146826,17 @@ var WebSession = class {
 	subscribeEvents() {
 		if (!this.session) return;
 		this.unsubscribe = this.session.onEvent((event) => {
+			if ((event.type === "goal.updated" || event.type === "todo.updated") && event.agentId !== "main") return;
 			if (event.type === "turn.started") this.busy = true;
 			else if (event.type === "turn.ended") {
 				this.busy = false;
 				this.updateTitle();
+			} else if (event.type === "goal.updated") {
+				this.goalEventRevision += 1;
+				this.cachedGoal = cloneSnapshot(event.snapshot);
+			} else if (event.type === "todo.updated") {
+				this.todoEventRevision += 1;
+				this.cachedTodos = cloneSnapshot(event.todos);
 			}
 			if (event.type === "session.meta.updated" || event.type === "turn.ended") this.refreshStatus();
 			const entry = this.appendEvent(event);
@@ -146677,10 +146844,46 @@ var WebSession = class {
 				type: "event",
 				seq: entry.seq,
 				epoch: entry.epoch,
-				payload: event
+				payload: entry.payload
 			}, entry.volatile);
+			if (event.type === "compaction.completed") {
+				const msgId = this.pendingCompactionMsgId;
+				this.pendingCompactionMsgId = null;
+				this.refreshStatus().then(() => this.broadcastStatus());
+				if (msgId) this.broadcast({
+					type: "command_result",
+					command: "compact",
+					ok: true,
+					message: "会话上下文已压缩。",
+					pendingMsgId: msgId
+				}, false);
+			} else if (event.type === "compaction.cancelled") {
+				const msgId = this.pendingCompactionMsgId;
+				this.pendingCompactionMsgId = null;
+				if (msgId) this.broadcast({
+					type: "command_result",
+					command: "compact",
+					ok: false,
+					message: `压缩已取消${event.reason ? `：${event.reason}` : "。"}`,
+					pendingMsgId: msgId
+				}, false);
+			}
 		});
 	}
+	async initializeCoreState() {
+		const session = this.session;
+		if (!session) return;
+		const goalRevision = this.goalEventRevision;
+		const todoRevision = this.todoEventRevision;
+		const [status, goal, todos] = await Promise.all([
+			session.getStatus().catch(() => null),
+			session.getGoal(),
+			session.getTodos()
+		]);
+		if (status !== null) this.cachedStatus = status;
+		if (this.goalEventRevision === goalRevision) this.cachedGoal = cloneSnapshot(goal.goal);
+		if (this.todoEventRevision === todoRevision) this.cachedTodos = cloneSnapshot(todos);
+	}
 	async refreshStatus() {
 		if (!this.session) return;
 		try {
@@ -146766,26 +146969,30 @@ var WebSession = class {
 					this.send(ws, {
 						type: "error",
 						code: "session.inactive",
-						message: "Session is archived (read-only)"
+						message: "Session is archived (read-only)",
+						clientMessageId
 					});
 					return;
 				}
-				if (!text || this.busy) {
+				if (!text || this.busy || this.pendingGoalMutations > 0) {
 					this.send(ws, {
 						type: "error",
 						code: "session.busy",
-						message: "Session is busy"
+						message: "Session is busy",
+						clientMessageId
 					});
 					return;
 				}
-				this.persistUserMessage(text, this.nextSeq);
+				this.busy = true;
+				this.persistUserMessage(text, this.nextSeq, clientMessageId);
 				this.broadcast({
 					type: "user_message",
 					clientMessageId,
 					text
 				}, false);
 				this.session.prompt(text).catch((error) => {
-					this.sendError(ws, error);
+					this.busy = false;
+					this.sendError(ws, error, clientMessageId);
 				});
 				break;
 			}
@@ -146848,7 +147055,7 @@ var WebSession = class {
 			});
 			return;
 		}
-		const missing = this.journal.slice(lastSeq);
+		const missing = this.journal.filter((entry) => entry.seq > lastSeq);
 		for (const entry of missing) if (!entry.volatile) this.send(ws, {
 			type: "event",
 			seq: entry.seq,
@@ -146856,11 +147063,12 @@ var WebSession = class {
 			payload: entry.payload
 		});
 	}
-	sendError(ws, error) {
+	sendError(ws, error, clientMessageId) {
 		const message = error instanceof Error ? error.message : String(error);
 		this.send(ws, {
 			type: "error",
-			message
+			message,
+			clientMessageId
 		});
 	}
 	async handleCommand(ws, command, args, pendingMsgId) {
@@ -146893,13 +147101,15 @@ var WebSession = class {
 					fail("会话忙碌中，无法压缩，请稍后再试。");
 					return;
 				}
-				ok("正在压缩会话上下文…");
+				if (this.pendingCompactionMsgId !== null) {
+					fail("正在压缩中，请稍候。");
+					return;
+				}
+				this.pendingCompactionMsgId = pendingMsgId ?? null;
 				try {
 					await this.session.compact();
-					await this.refreshStatus();
-					this.broadcastStatus();
-					ok("会话上下文已压缩。");
 				} catch (error) {
+					this.pendingCompactionMsgId = null;
 					fail(`压缩失败：${errMsg(error)}`);
 				}
 				return;
@@ -146943,7 +147153,7 @@ var WebSession = class {
 					return;
 				}
 				try {
-					const result = await this.onFork(this.session.id);
+					const result = await this.onFork(this.sessionId);
 					if (!result) {
 						fail("Fork 失败：无法复制当前会话。");
 						return;
@@ -147026,9 +147236,11 @@ var WebSession = class {
 		}, HEARTBEAT_INTERVAL_MS);
 	}
 	getSnapshot() {
-		return {
+		return cloneSnapshot({
 			sessionId: this.sessionId,
 			workDir: this.workDir,
+			seq: this.nextSeq - 1,
+			epoch: this.epoch,
 			model: this.cachedStatus?.model ?? "unknown",
 			permission: this.cachedStatus?.permission ?? this.permission,
 			messages: this.buildMessages(),
@@ -147050,8 +147262,10 @@ var WebSession = class {
 			},
 			busy: this.busy,
 			createdAt: this.createdAt,
-			title: this.title
-		};
+			title: this.title,
+			goal: this.cachedGoal,
+			todos: this.cachedTodos
+		});
 	}
 	getListItem() {
 		return {
@@ -147088,6 +147302,114 @@ var WebSession = class {
 			status: this.cachedStatus
 		}, false);
 	}
+	getCoreSessionId() {
+		return this.coreSessionId;
+	}
+	async refineGoalDescription(description) {
+		await this.ready;
+		return refineGoal(this.requireGoalSession(), description);
+	}
+	async createGoal(objective, completionCriterion, replace, budgets) {
+		return this.serializeGoalMutation(async (session) => {
+			let goal = await session.createGoal(objective, {
+				completionCriterion,
+				replace
+			});
+			try {
+				for (const budget of budgets) goal = await session.setGoalBudget(budget.value, budget.unit);
+			} catch (error) {
+				throw new HttpError(500, `Goal configuration failed and the new goal was ${await this.pauseOrClearUnsafeActiveGoal(session)}: ${errorMessage(error)}`);
+			}
+			try {
+				await this.startGoalExecution(session, objective);
+			} catch (error) {
+				throw new HttpError(500, `Goal was created but execution could not start; it was ${await this.pauseOrClearUnsafeActiveGoal(session)}: ${errorMessage(error)}`);
+			}
+			return cloneSnapshot(goal);
+		});
+	}
+	async updateGoal(objective, budgets) {
+		return this.serializeGoalMutation(async (session) => {
+			const current = await session.getGoal();
+			if (current.goal === null) throw new HttpError(404, "Goal not found", ErrorCodes.GOAL_NOT_FOUND);
+			let goal = current.goal;
+			if (objective !== void 0) goal = await session.updateGoalObjective(objective);
+			for (const budget of budgets) goal = await session.setGoalBudget(budget.value, budget.unit);
+			return cloneSnapshot(goal);
+		});
+	}
+	async pauseGoal() {
+		return this.serializeGoalMutation(async (session) => {
+			const goal = await session.updateGoalStatus("paused");
+			if (goal === null) throw new HttpError(404, "Goal not found", ErrorCodes.GOAL_NOT_FOUND);
+			return cloneSnapshot(goal);
+		}, true);
+	}
+	async resumeGoal() {
+		return this.serializeGoalMutation(async (session) => {
+			if ((await session.getGoal()).goal === null) throw new HttpError(404, "Goal not found", ErrorCodes.GOAL_NOT_FOUND);
+			const goal = await session.updateGoalStatus("active");
+			if (goal === null) throw new HttpError(404, "Goal not found", ErrorCodes.GOAL_NOT_FOUND);
+			try {
+				await this.startGoalExecution(session, "Continue working toward the active goal. Review current progress and remaining work before proceeding.");
+			} catch (error) {
+				throw new HttpError(500, `Goal was resumed but execution could not continue; it was ${await this.pauseOrClearUnsafeActiveGoal(session)}: ${errorMessage(error)}`);
+			}
+			return cloneSnapshot(goal);
+		});
+	}
+	async cancelGoal() {
+		await this.serializeGoalMutation(async (session) => {
+			if ((await session.getGoal()).goal === null) throw new HttpError(404, "Goal not found", ErrorCodes.GOAL_NOT_FOUND);
+			await session.cancelGoal();
+		}, true);
+	}
+	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);
+		return this.session;
+	}
+	serializeGoalMutation(mutation, allowBusy = false) {
+		this.pendingGoalMutations += 1;
+		const run = this.goalMutationTail.then(async () => {
+			await this.ready;
+			return mutation(this.requireGoalSession(allowBusy));
+		});
+		this.goalMutationTail = run.then(() => void 0, () => void 0);
+		return run.finally(() => {
+			this.pendingGoalMutations -= 1;
+		});
+	}
+	async startGoalExecution(session, prompt) {
+		this.busy = true;
+		await this.persistUserMessage(prompt, this.nextSeq);
+		this.broadcast({
+			type: "user_message",
+			text: prompt
+		}, false);
+		try {
+			await session.prompt(prompt);
+		} catch (error) {
+			this.busy = false;
+			throw error;
+		}
+	}
+	async clearUnsafeActiveGoal(session) {
+		try {
+			await session.cancelGoal();
+		} catch (rollbackError) {
+			throw new HttpError(500, `Goal setup failed and rollback also failed: ${errorMessage(rollbackError)}`);
+		}
+	}
+	async pauseOrClearUnsafeActiveGoal(session) {
+		try {
+			await session.updateGoalStatus("paused");
+			return "paused";
+		} catch {
+			await this.clearUnsafeActiveGoal(session);
+			return "cancelled";
+		}
+	}
 	get connectionCount() {
 		return this.connections.size;
 	}
@@ -147173,6 +147495,64 @@ var WebSession = class {
 		if (this.homeDir) await deletePersistedSession(this.homeDir, this.sessionId);
 	}
 };
+async function handleGoalRoute(req, res, url, resolveSession) {
+	const match = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/goal(?:/(refine|pause|resume|cancel))?$`).exec(url);
+	if (!match) return false;
+	const webSession = resolveSession(match[1]);
+	if (!webSession) {
+		sendJson(res, 404, {
+			code: ErrorCodes.SESSION_NOT_FOUND,
+			message: "Session not found"
+		});
+		return true;
+	}
+	const operation = match[2];
+	const method = req.method ?? "GET";
+	const expectedMethod = operation === void 0 ? new Set(["POST", "PATCH"]) : new Set(["POST"]);
+	if (!expectedMethod.has(method)) {
+		res.setHeader("Allow", [...expectedMethod].join(", "));
+		sendJson(res, 405, {
+			code: 405,
+			message: "Method not allowed"
+		});
+		return true;
+	}
+	try {
+		const body = await readJsonBody(req);
+		if (operation === "refine") {
+			sendJson(res, 200, { objective: await webSession.refineGoalDescription(requiredString(body, "description")) });
+			return true;
+		}
+		if (operation === "pause") {
+			await webSession.pauseGoal();
+			sendJson(res, 202, { ok: true });
+			return true;
+		}
+		if (operation === "resume") {
+			await webSession.resumeGoal();
+			sendJson(res, 202, { ok: true });
+			return true;
+		}
+		if (operation === "cancel") {
+			await webSession.cancelGoal();
+			sendJson(res, 202, { ok: true });
+			return true;
+		}
+		const budgets = parseGoalBudgets(body);
+		if (method === "POST") {
+			await webSession.createGoal(requiredString(body, "objective"), optionalString(body, "completionCriterion"), optionalBoolean(body, "replace", false), budgets);
+			sendJson(res, 202, { ok: true });
+			return true;
+		}
+		const objective = optionalString(body, "objective");
+		if (objective === void 0 && body["budgets"] === void 0) throw new HttpError(400, "PATCH requires objective or budgets", "request.invalid");
+		await webSession.updateGoal(objective, budgets);
+		sendJson(res, 202, { ok: true });
+	} catch (error) {
+		sendHttpError(res, error);
+	}
+	return true;
+}
 var SessionManager = class {
 	sessions = /* @__PURE__ */ new Map();
 	/** In-flight activation promises to deduplicate concurrent calls. */
@@ -147198,6 +147578,7 @@ var SessionManager = class {
 			const entries = await loadJournal(this.homeDir, meta.sessionId);
 			const ws = new WebSession(null, {
 				sessionId: meta.sessionId,
+				coreSessionId: meta.coreSessionId ?? meta.sessionId,
 				workDir: meta.workDir,
 				permission: meta.permission,
 				yolo: this.yolo,
@@ -147227,6 +147608,12 @@ var SessionManager = class {
 			createdAt,
 			onFork: (id) => this.forkSession(id)
 		});
+		try {
+			await webSession.ready;
+		} catch (error) {
+			await webSession.close();
+			throw error;
+		}
 		await saveMetadata(this.homeDir, webSession.getMetadata());
 		this.sessions.set(sessionId, webSession);
 		log.info("web: session created", {
@@ -147250,13 +147637,8 @@ var SessionManager = class {
 		const existing = this.sessions.get(sessionId);
 		if (!existing) return null;
 		if (existing.isActive) return existing;
-		const session = await this.harness.createSession({
-			workDir: existing.workDir,
-			model: this.model,
-			permission: this.permission
-		});
 		const meta = existing.getMetadata();
-		await existing.close();
+		const session = await this.harness.resumeSession({ id: meta.coreSessionId ?? meta.sessionId });
 		const reactivated = new WebSession(session, {
 			sessionId,
 			workDir: meta.workDir,
@@ -147265,10 +147647,18 @@ var SessionManager = class {
 			homeDir: this.homeDir,
 			createdAt: meta.createdAt,
 			title: meta.title,
+			coreSessionId: session.id,
 			onFork: (id) => this.forkSession(id)
 		});
 		const entries = await loadJournal(this.homeDir, sessionId);
 		reactivated.loadFromPersisted(entries);
+		try {
+			await reactivated.ready;
+		} catch (error) {
+			await reactivated.close();
+			throw error;
+		}
+		await existing.close();
 		this.sessions.set(sessionId, reactivated);
 		await saveMetadata(this.homeDir, reactivated.getMetadata());
 		log.info("web: session reactivated", { sessionId });
@@ -147286,7 +147676,7 @@ var SessionManager = class {
 		const source = this.sessions.get(sourceId);
 		if (!source || !source.isActive || source.isBusy) return null;
 		try {
-			const session = await this.harness.forkSession({ id: sourceId });
+			const session = await this.harness.forkSession({ id: source.getCoreSessionId() });
 			const newId = session.id;
 			const createdAt = Date.now();
 			const title = `${source.getTitle()} (fork)`;
@@ -147306,6 +147696,12 @@ var SessionManager = class {
 				await writeFile(getJournalPath(this.homeDir, newId), lines);
 			}
 			webSession.loadFromPersisted(entries);
+			try {
+				await webSession.ready;
+			} catch (error) {
+				await webSession.close();
+				throw error;
+			}
 			await saveMetadata(this.homeDir, webSession.getMetadata());
 			this.sessions.set(newId, webSession);
 			log.info("web: session forked", {
@@ -147439,7 +147835,10 @@ async function runWebServer(opts) {
 		yolo: opts.yolo
 	});
 	await manager.init();
-	if (!manager.list().some((s) => s.active)) await manager.createSession();
+	if (!manager.list().some((s) => s.active)) {
+		const recent = manager.list().find((s) => s.workDir === workDir);
+		if (recent) await manager.activateSession(recent.sessionId);
+	}
 	const baseDir = import.meta.dirname;
 	const prodPublicDir = join(baseDir, "public");
 	const devPublicDir = join(baseDir, "frontend", "dist");
@@ -147470,6 +147869,7 @@ async function runWebServer(opts) {
 			}
 			return;
 		}
+		if (await handleGoalRoute(req, res, url, (sessionId) => manager.get(sessionId))) return;
 		const snapshotMatch = new RegExp(`^${API_PREFIX}/sessions/([^/]+)/snapshot$`).exec(url);
 		if (snapshotMatch && method === "GET") {
 			const sessionId = snapshotMatch[1];
@@ -147482,8 +147882,12 @@ async function runWebServer(opts) {
 				}));
 				return;
 			}
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(ws.getSnapshot()));
+			try {
+				await ws.ready;
+				sendJson(res, 200, ws.getSnapshot());
+			} catch (error) {
+				sendHttpError(res, error);
+			}
 			return;
 		}
 		if (url === `${API_PREFIX}/git/status` && method === "GET") {
@@ -147651,12 +148055,24 @@ async function runWebServer(opts) {
 				manager.activateSession(sessionId).then((reactivated) => {
 					if (reactivated) reactivated.addConnection(ws);
 					else ws.close(1008, "Session not found");
+				}).catch((error) => {
+					log.warn("web: session activation failed", {
+						sessionId,
+						error: errorMessage(error)
+					});
+					ws.close(1011, "Session activation failed");
 				});
 				return;
 			}
 			manager.activateSession(sessionId).then((reactivated) => {
 				if (reactivated) reactivated.addConnection(ws);
 				else ws.close(1008, "Session not found");
+			}).catch((error) => {
+				log.warn("web: session activation failed", {
+					sessionId,
+					error: errorMessage(error)
+				});
+				ws.close(1011, "Session activation failed");
 			});
 			return;
 		}
@@ -147668,7 +148084,7 @@ async function runWebServer(opts) {
 				return;
 			}
 		}
-		ws.close(1008, "No active session available");
+		ws.send(JSON.stringify({ type: "server_empty" }));
 	});
 	await new Promise((resolve) => {
 		httpServer.listen(opts.port, "127.0.0.1", resolve);