scream-code 0.10.0 → 0.10.2

package/dist/{app-Bda9iKUb.mjs → app-VZDNiLvJ.mjs}

@@ -5,8 +5,8 @@ const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import { a as __toESM, i as __require, r as __exportAll, t as __commonJSMin } from "./chunk-apG1qJts.mjs";
 import "./suppress-sqlite-warning-C2VB0doZ.mjs";
-import { C as join$1, D as resolve$1, E as relative$1, S as isAbsolute$1, T as parse$7, a as isSupportedFile, b as basename$1, i as ingestFile, r as ingestDirectory, t as multiSearch, w as normalize, x as dirname$2, y as KnowledgeStore } from "./src-1LHYB0xM.mjs";
-import { a as setLocale, i as getLocale, n as assertScreamHostIdentity, o as t, r as createScreamDefaultHeaders, t as TextInputDialogComponent } from "./text-input-dialog-os5jWxGT.mjs";
+import { C as join$1, D as resolve$1, E as relative$1, S as isAbsolute$1, T as parse$7, a as isSupportedFile, b as basename$1, i as ingestFile, r as ingestDirectory, t as multiSearch, w as normalize, x as dirname$2, y as KnowledgeStore } from "./src-oeUnRY3N.mjs";
+import { a as setLocale, i as getLocale, n as assertScreamHostIdentity, o as t, r as createScreamDefaultHeaders, t as TextInputDialogComponent } from "./text-input-dialog-Cj7OClhs.mjs";
 import { createRequire } from "node:module";
 import { createHash, randomBytes, randomInt, randomUUID } from "node:crypto";
 import Jn, { access, appendFile, chmod, copyFile, cp, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, rmdir, stat, unlink, writeFile } from "node:fs/promises";
@@ -22,7 +22,7 @@ import { finished, pipeline as pipeline$1 } from "node:stream/promises";
 import * as vs from "zlib";
 import Qr from "zlib";
 import * as fs$9 from "node:fs";
-import Vt, { appendFileSync, chmodSync, closeSync, constants, createReadStream, createWriteStream as createWriteStream$1, existsSync, fsyncSync, mkdirSync, openSync, promises, readFileSync, readSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
+import Vt, { appendFileSync, chmodSync, closeSync, constants, createReadStream, createWriteStream as createWriteStream$1, existsSync, fsyncSync, mkdirSync, openSync, promises, readFileSync, readSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import * as path$8 from "node:path";
 import path, { basename, dirname as dirname$1, extname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
 import { z } from "zod";
@@ -9190,7 +9190,7 @@ var AnthropicChatProvider = class {
 		const kwargs = {
 			thinking: {
 				type: "enabled",
-				budget_tokens: budgetTokensForEffort(effectiveEffort)
+				budget_tokens: budgetTokensForEffort(effectiveEffort === "xhigh" || effectiveEffort === "max" ? "high" : effectiveEffort)
 			},
 			betaFeatures: newBetas
 		};
@@ -37877,6 +37877,7 @@ function messagesToGoogleGenAIContents(messages) {
 				toolMessages.push(toolMsg);
 				j += 1;
 			}
+			if (toolMessages.length === 0) throw new ChatProviderError(`Missing tool responses for ids: ${expectedToolCallIds.join(", ")}`);
 			if (toolMessages.length > 0) {
 				const toolMsgById = /* @__PURE__ */ new Map();
 				const seenToolCallIds = /* @__PURE__ */ new Set();
@@ -48773,6 +48774,7 @@ var OpenAILegacyChatProvider = class {
 	_defaultHeaders;
 	_reasoningKey;
 	_reasoningEffort;
+	_thinkingExplicitlyOff = false;
 	_generationKwargs;
 	_toolMessageConversion;
 	_client;
@@ -48821,7 +48823,7 @@ var OpenAILegacyChatProvider = class {
 		for (const msg of normalizedHistory) messages.push(convertMessage$1(msg, this._reasoningKey, this._toolMessageConversion));
 		const kwargs = { ...this._generationKwargs };
 		let reasoningEffort = this._reasoningEffort;
-		if (reasoningEffort === void 0 && kwargs["reasoning_effort"] === void 0) {
+		if (!this._thinkingExplicitlyOff && reasoningEffort === void 0 && kwargs["reasoning_effort"] === void 0) {
 			if (history.some((message) => message.content.some((part) => part.type === "think"))) reasoningEffort = "medium";
 		}
 		for (const key of Object.keys(kwargs)) if (kwargs[key] === void 0) delete kwargs[key];
@@ -48844,6 +48846,7 @@ var OpenAILegacyChatProvider = class {
 		const reasoningEffort = thinkingEffortToReasoningEffort(effort);
 		const clone = this._clone();
 		clone._reasoningEffort = reasoningEffort;
+		clone._thinkingExplicitlyOff = effort === "off";
 		return clone;
 	}
 	withGenerationKwargs(kwargs) {
@@ -56837,7 +56840,10 @@ var MemoryMemoStore = class MemoryMemoStore {
 	initPromise = null;
 	async init() {
 		if (this.initPromise) return this.initPromise;
-		this.initPromise = this._doInit();
+		this.initPromise = this._doInit().catch((error) => {
+			this.initPromise = null;
+			throw error;
+		});
 		return this.initPromise;
 	}
 	async _doInit() {
@@ -56853,6 +56859,11 @@ var MemoryMemoStore = class MemoryMemoStore {
 	}
 	/** Close the database handle and checkpoint WAL. */
 	close() {
+		if (this.embeddingTimer !== void 0) {
+			clearTimeout(this.embeddingTimer);
+			this.embeddingTimer = void 0;
+		}
+		this.embeddingQueue.clear();
 		if (this.db !== void 0) {
 			this.db.exec("PRAGMA wal_checkpoint(TRUNCATE)");
 			this.db.close();
@@ -57126,6 +57137,7 @@ var MemoryMemoStore = class MemoryMemoStore {
 		try {
 			for (const memo of memos) {
 				const row = insert.get(memo.id, memo.sourceSessionId, memo.sourceSessionTitle ?? null, memo.userNeed, memo.approach, memo.outcome, memo.whatFailed, memo.whatWorked, memo.extractionSource, memo.recordedAt, memo.projectDir ?? "", JSON.stringify(memo.tags ?? []));
+				if (row === void 0) continue;
 				insertFts.run(row.rowid, toFtsText(memo.userNeed), toFtsText(memo.approach), toFtsText(memo.whatFailed), toFtsText(memo.whatWorked), toFtsText(memo.sourceSessionTitle ?? ""));
 			}
 			this.db.exec("COMMIT");
@@ -57188,6 +57200,7 @@ var MemoryMemoStore = class MemoryMemoStore {
 		const updateFts = this.db.prepare(`INSERT INTO memos_fts(rowid, user_need, approach, what_failed, what_worked, source_session_title)
        VALUES (?, ?, ?, ?, ?, ?)`);
 		const deleteFts = this.db.prepare("INSERT INTO memos_fts(memos_fts, rowid) VALUES ('delete', ?)");
+		const deleteEmbedding = this.db.prepare("DELETE FROM memory_embeddings WHERE memory_id = ?");
 		this.db.exec("BEGIN TRANSACTION");
 		try {
 			const oldRow = selectRow.get(id);
@@ -57202,7 +57215,9 @@ var MemoryMemoStore = class MemoryMemoStore {
 			}
 			deleteFts.run(oldRow.rowid);
 			updateFts.run(row.rowid, toFtsText(updated.userNeed), toFtsText(updated.approach), toFtsText(updated.whatFailed), toFtsText(updated.whatWorked), toFtsText(updated.sourceSessionTitle ?? ""));
+			deleteEmbedding.run(id);
 			this.db.exec("COMMIT");
+			this.scheduleEmbedding(updated);
 			return true;
 		} catch {
 			this.db.exec("ROLLBACK");
@@ -57613,6 +57628,7 @@ async function applyConsolidation(store, plan) {
 				whatWorked: worked || "none",
 				whatFailed: failed || "none",
 				tags: normalizeTags(plan.resolved.flatMap((m) => m.tags ?? [])),
+				projectDir: plan.resolved[0].projectDir,
 				extractionSource: "compaction"
 			});
 			await store.append(archive);
@@ -57631,6 +57647,7 @@ async function applyConsolidation(store, plan) {
 				whatWorked: worked || "none",
 				whatFailed: failed || "none",
 				tags: normalizeTags(plan.stale.flatMap((m) => m.tags ?? [])),
+				projectDir: plan.stale[0].projectDir,
 				extractionSource: "compaction"
 			});
 			await store.append(archive);
@@ -57649,6 +57666,7 @@ async function applyConsolidation(store, plan) {
 			whatFailed: group.merged.whatFailed,
 			whatWorked: group.merged.whatWorked,
 			tags: group.merged.tags ?? mergedTags,
+			projectDir: newest.projectDir,
 			extractionSource: "compaction"
 		});
 		await store.append(merged);
@@ -58334,7 +58352,7 @@ var KnowledgeLookupTool = class {
 				const llm = { generate: async (systemPrompt, userPrompt) => {
 					return this.agent.generateText(systemPrompt, userPrompt);
 				} };
-				const { multiSearchWithTrace } = await import("./src-DA9VZFf3.mjs");
+				const { multiSearchWithTrace } = await import("./src-B2kaYK-M.mjs");
 				const { results, trace } = await multiSearchWithTrace(store, llm, query, { topK });
 				if (results.length === 0) return {
 					isError: false,
@@ -62525,8 +62543,8 @@ function parseSkillText(options) {
 	if (!isRecord$6(frontmatter)) throw new SkillParseError(`Frontmatter in ${options.skillMdPath} must be a mapping at the top level`);
 	const metadata = normalizeMetadata(frontmatter);
 	if (!isSupportedSkillType(metadata.type)) throw new UnsupportedSkillTypeError(metadata.type ?? String(frontmatter["type"]));
-	const name = nonEmptyString$2(metadata.name);
-	const description = nonEmptyString$2(metadata.description);
+	const name = nonEmptyString$1(metadata.name);
+	const description = nonEmptyString$1(metadata.description);
 	if (isDirectorySkill && (name === void 0 || description === void 0)) throw new SkillParseError(`Missing required frontmatter field ${name === void 0 ? "\"name\"" : "\"description\""} in ${options.skillMdPath}`);
 	const skillPath = resolve$1(options.skillMdPath);
 	const content = parsed.body.trim();
@@ -62586,11 +62604,11 @@ function normalizeMetadata(raw) {
 		const key = METADATA_ALIASES[rawKey] ?? rawKey;
 		out[key] = value;
 	}
-	const type = nonEmptyString$2(out["type"]);
+	const type = nonEmptyString$1(out["type"]);
 	if (type !== void 0) out["type"] = type;
-	const name = nonEmptyString$2(out["name"]);
+	const name = nonEmptyString$1(out["name"]);
 	if (name !== void 0) out["name"] = name;
-	const description = nonEmptyString$2(out["description"]);
+	const description = nonEmptyString$1(out["description"]);
 	if (description !== void 0) out["description"] = description;
 	return out;
 }
@@ -62632,7 +62650,7 @@ function tokenizeArgs(raw) {
 	if (hasContent) out.push(current);
 	return out;
 }
-function nonEmptyString$2(value) {
+function nonEmptyString$1(value) {
 	return typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
 }
 function isRecord$6(value) {
@@ -69634,17 +69652,13 @@ const HookDefSchema = z.object({
 	command: z.string().min(1),
 	timeout: z.number().int().min(1).max(600).optional()
 }).strict();
-const ScreamCliServiceConfigSchema = z.object({
-	baseUrl: z.string().optional(),
-	apiKey: z.string().optional(),
-	oauth: OAuthRefSchema.optional(),
-	customHeaders: StringRecordSchema.optional()
-});
 const DuckDuckGoConfigSchema = z.object({ enabled: z.boolean().default(true) });
+const DomesticSearchConfigSchema = z.object({ enabled: z.boolean().default(true) });
 const ServicesConfigSchema = z.object({
-	screamCliSearch: ScreamCliServiceConfigSchema.optional(),
-	screamCliFetch: ScreamCliServiceConfigSchema.optional(),
-	duckduckgo: DuckDuckGoConfigSchema.optional()
+	duckduckgo: DuckDuckGoConfigSchema.optional(),
+	sogou: DomesticSearchConfigSchema.optional(),
+	so360: DomesticSearchConfigSchema.optional(),
+	baidu: DomesticSearchConfigSchema.optional()
 });
 const McpServerCommonFields = {
 	enabled: z.boolean().optional(),
@@ -69718,12 +69732,13 @@ const ThinkingConfigPatchSchema = ThinkingConfigSchema.partial();
 const PermissionConfigPatchSchema = PermissionConfigSchema.partial();
 const LoopControlPatchSchema = LoopControlSchema.partial();
 const BackgroundConfigPatchSchema = BackgroundConfigSchema.partial();
-const ScreamCliServiceConfigPatchSchema = ScreamCliServiceConfigSchema.partial();
 const DuckDuckGoConfigPatchSchema = DuckDuckGoConfigSchema.partial();
+const DomesticSearchConfigPatchSchema = DomesticSearchConfigSchema.partial();
 const ServicesConfigPatchSchema = z.object({
-	screamCliSearch: ScreamCliServiceConfigPatchSchema.optional(),
-	screamCliFetch: ScreamCliServiceConfigPatchSchema.optional(),
-	duckduckgo: DuckDuckGoConfigPatchSchema.optional()
+	duckduckgo: DuckDuckGoConfigPatchSchema.optional(),
+	sogou: DomesticSearchConfigPatchSchema.optional(),
+	so360: DomesticSearchConfigPatchSchema.optional(),
+	baidu: DomesticSearchConfigPatchSchema.optional()
 });
 const ScreamConfigPatchSchema = z.object({
 	providers: z.record(z.string(), ProviderConfigPatchSchema).optional(),
@@ -76673,7 +76688,8 @@ var ReadTool = class {
 			hasLf: false,
 			hasLoneCr: false
 		};
-		const rawBuffer = [];
+		const rawHash = createHash("sha256");
+		const normalizedHash = createHash("sha256");
 		let currentLineNo = 0;
 		let maxLinesReached = false;
 		let collectionClosed = false;
@@ -76684,7 +76700,8 @@ var ReadTool = class {
 			};
 			currentLineNo += 1;
 			updateLineEndingFlags(flags, rawLine);
-			rawBuffer.push(rawLine);
+			rawHash.update(rawLine);
+			normalizedHash.update(rawLine.replaceAll("\r\n", "\n"));
 			if (collectionClosed) {
 				if (effectiveLimit >= 1e3 && currentLineNo >= lineOffset) maxLinesReached = true;
 				continue;
@@ -76702,7 +76719,7 @@ var ReadTool = class {
 			if (selectedEntries.length >= effectiveLimit) collectionClosed = true;
 		}
 		const lineEndingStyle = lineEndingStyleFromFlags(flags);
-		const anchor = computeAnchor(toModelTextView(rawBuffer.join("")).text);
+		const anchor = (lineEndingStyle === "crlf" ? normalizedHash : rawHash).digest("hex").slice(0, 8);
 		const renderedLines = [];
 		const truncatedLineNumbers = [];
 		let bytes = 0;
@@ -76742,7 +76759,8 @@ var ReadTool = class {
 			hasLf: false,
 			hasLoneCr: false
 		};
-		const rawBuffer = [];
+		const rawHash = createHash("sha256");
+		const normalizedHash = createHash("sha256");
 		let currentLineNo = 0;
 		for await (const rawLine of this.jian.readLines(safePath, { errors: "strict" })) {
 			if (containsNulByte(rawLine)) return {
@@ -76751,7 +76769,8 @@ var ReadTool = class {
 			};
 			currentLineNo += 1;
 			updateLineEndingFlags(flags, rawLine);
-			rawBuffer.push(rawLine);
+			rawHash.update(rawLine);
+			normalizedHash.update(rawLine.replaceAll("\r\n", "\n"));
 			entries.push({
 				lineNo: currentLineNo,
 				rawContent: stripTrailingLf(rawLine)
@@ -76759,7 +76778,7 @@ var ReadTool = class {
 			if (entries.length > tailCount) entries.shift();
 		}
 		const lineEndingStyle = lineEndingStyleFromFlags(flags);
-		const anchor = computeAnchor(toModelTextView(rawBuffer.join("")).text);
+		const anchor = (lineEndingStyle === "crlf" ? normalizedHash : rawHash).digest("hex").slice(0, 8);
 		let renderedCandidates = entries.slice(0, effectiveLimit).map((entry) => {
 			return {
 				entry,
@@ -78086,7 +78105,7 @@ var BashTool = class {
 				const info = backgroundManager.getTask(taskId);
 				if (info && info.status === "running") backgroundManager.stop(taskId, "Timed out");
 			})();
-		}, timeoutMs);
+		}, timeoutMs).unref();
 		const status = backgroundManager.getTask(taskId).status;
 		const builder = new ToolResultBuilder();
 		builder.write(`task_id: ${taskId}\npid: ${String(proc.pid)}\ndescription: ${args.description.trim()}\nstatus: ${status}\nautomatic_notification: true\nnext_step: You will be automatically notified when it completes.
@@ -78330,9 +78349,12 @@ var WebSearchTool = class {
 			execute: (ctx) => this.execution(args, ctx)
 		};
 	}
-	async execution(args, { toolCallId }) {
+	async execution(args, { signal, toolCallId }) {
 		try {
-			const opts = { toolCallId };
+			const opts = {
+				signal,
+				toolCallId
+			};
 			if (args.limit !== void 0) opts.limit = args.limit;
 			if (args.include_content !== void 0) opts.includeContent = args.include_content;
 			const results = await this.provider.search(args.query, opts);
@@ -79152,7 +79174,10 @@ var FullCompaction = class {
 		if (this.compactionCountInTurn > this.strategy.maxCompactionPerTurn) return;
 		if (this.agent.records.restoring) return;
 		const compactedCount = this.strategy.computeCompactCount(this.agent.context.history, data.source);
-		if (compactedCount === 0) throw new ScreamError(ErrorCodes.COMPACTION_UNABLE, "No prefix that can be compacted in current history.");
+		if (compactedCount === 0) {
+			if (data.source === "manual") throw new ScreamError(ErrorCodes.COMPACTION_UNABLE, "No prefix that can be compacted in current history.");
+			return;
+		}
 		this.agent.records.logRecord({
 			type: "full_compaction.begin",
 			...data
@@ -80881,7 +80906,8 @@ var ContextMemory = class {
 			toolCalls: [],
 			origin: { kind: "compaction_summary" }
 		}, ...this._history.slice(summary.compactedCount)];
-		this.openSteps.clear();
+		const survivingMessages = new Set(this._history);
+		for (const [uuid, message] of this.openSteps) if (!survivingMessages.has(message)) this.openSteps.delete(uuid);
 		this.flushDeferredMessagesIfToolExchangeClosed();
 		this._tokenCount = summary.tokensAfter;
 		this.tokenCountCoveredMessageCount = this._history.length;
@@ -92274,8 +92300,7 @@ function parseToolCallArguments(raw) {
 */
 function repairTruncatedJson(raw) {
 	let repaired = raw.trimEnd();
-	let braceOpen = 0;
-	let bracketOpen = 0;
+	const openStack = [];
 	let inString = false;
 	let stringHasEscape = false;
 	let lastNonWhitespace = "";
@@ -92293,24 +92318,16 @@ function repairTruncatedJson(raw) {
 		}
 		stringHasEscape = false;
 		if (inString) continue;
-		if (ch === "{") braceOpen++;
-		if (ch === "}") braceOpen--;
-		if (ch === "[") bracketOpen++;
-		if (ch === "]") bracketOpen--;
+		if (ch === "{") openStack.push("}");
+		else if (ch === "[") openStack.push("]");
+		else if (ch === "}" || ch === "]") {
+			if (openStack.length > 0 && openStack[openStack.length - 1] === ch) openStack.pop();
+		}
 		if (!/\s/.test(ch)) lastNonWhitespace = ch;
 	}
 	if (inString) repaired += "\"";
 	if (lastNonWhitespace === ",") repaired += "null";
-	const closers = [];
-	while (bracketOpen > 0) {
-		closers.push("]");
-		bracketOpen--;
-	}
-	while (braceOpen > 0) {
-		closers.push("}");
-		braceOpen--;
-	}
-	if (closers.length > 0) repaired += closers.join("");
+	for (let i = openStack.length - 1; i >= 0; i--) repaired += openStack[i];
 	return repaired;
 }
 function validateExecutableToolArgs(tool, args) {
@@ -97920,7 +97937,7 @@ var TurnFlow = class {
 			});
 			return null;
 		}
-		if (this.turnId === -1) this.agent.dreamTracker.init().then(() => this.agent.dreamTracker.recordNewSession());
+		if (this.turnId === -1) this.agent.dreamTracker.init().then(() => this.agent.dreamTracker.recordNewSession()).catch(() => {});
 		const turnId = this.allocateTurnId();
 		const controller = new AbortController();
 		const promise = this.turnWorker(turnId, input, origin, controller.signal);
@@ -99951,17 +99968,18 @@ function permissionRuleToToml(rule) {
 }
 function servicesToToml(services, rawServices) {
 	const out = cloneRecord(rawServices);
-	if (services.screamCliSearch !== void 0) out["scream_cli_search"] = serviceToToml(services.screamCliSearch);
-	else delete out["scream_cli_search"];
-	if (services.screamCliFetch !== void 0) out["scream_cli_fetch"] = serviceToToml(services.screamCliFetch);
-	else delete out["scream_cli_fetch"];
-	return out;
-}
-function serviceToToml(service) {
-	const out = {};
-	for (const [key, value] of Object.entries(service)) if (key === "oauth" && value !== void 0) out[camelToSnake(key)] = oauthToToml(value);
-	else if (key === "customHeaders" && value !== void 0) out[camelToSnake(key)] = cloneUnknown(value);
-	else setDefined(out, camelToSnake(key), value);
+	for (const key of [
+		"duckduckgo",
+		"sogou",
+		"so360",
+		"baidu"
+	]) {
+		const toggle = services[key];
+		if (toggle?.enabled !== void 0) out[key] = {
+			...isPlainObject$1(out[key]) ? out[key] : {},
+			enabled: toggle.enabled
+		};
+	}
 	return out;
 }
 function loopControlToToml(loopControl, rawLoopControl) {
@@ -104227,7 +104245,7 @@ var Session$1 = class {
 			});
 			await this.options.jian.writeText(this.metadataPath, text);
 		};
-		this.writeMetadataPromise = this.writeMetadataPromise.then(() => write());
+		this.writeMetadataPromise = this.writeMetadataPromise.then(() => write(), () => write());
 		return this.writeMetadataPromise;
 	}
 	async readMetadata() {
@@ -117201,6 +117219,7 @@ setPrototypeOf(Document, Document$1).prototype = Document$1.prototype;
 */
 const DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36";
 const DEFAULT_MAX_BYTES = 10 * 1024 * 1024;
+const FETCH_TIMEOUT_MS = 3e4;
 const parseHTML = parseHTML$1;
 /**
 * SSRF guard — reject non-http(s) schemes and (by default) any hostname
@@ -117263,7 +117282,7 @@ function isPrivateIp(ip) {
 	}
 	return lower === "::1" || lower === "::" || lower.startsWith("fe80:") || lower.startsWith("fc") || lower.startsWith("fd");
 }
-function cacheKey$1(url, allowPrivate, maxBytes, userAgent) {
+function cacheKey(url, allowPrivate, maxBytes, userAgent) {
 	return `local:${url}:${String(allowPrivate)}:${String(maxBytes)}:${userAgent}`;
 }
 const defaultDnsLookup = async (hostname) => {
@@ -117285,7 +117304,7 @@ var LocalFetchURLProvider = class {
 		this.dnsLookup = options.dnsLookup ?? defaultDnsLookup;
 	}
 	async fetch(url, _options) {
-		const key = cacheKey$1(url, this.allowPrivateAddresses, this.maxBytes, this.userAgent);
+		const key = cacheKey(url, this.allowPrivateAddresses, this.maxBytes, this.userAgent);
 		const cached = this.cache.get(key);
 		if (cached !== void 0) return cached;
 		await assertSafeFetchTarget(url, this.allowPrivateAddresses, this.dnsLookup);
@@ -117296,7 +117315,8 @@ var LocalFetchURLProvider = class {
 	async fetchFresh(url) {
 		const response = await this.fetchImpl(url, {
 			method: "GET",
-			headers: { "User-Agent": this.userAgent }
+			headers: { "User-Agent": this.userAgent },
+			signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
 		});
 		if (response.status >= 400) {
 			await response.body?.cancel().catch(() => {});
@@ -117305,7 +117325,10 @@ var LocalFetchURLProvider = class {
 		const contentLengthRaw = response.headers.get("content-length");
 		if (contentLengthRaw !== null) {
 			const cl = Number(contentLengthRaw);
-			if (Number.isFinite(cl) && cl > this.maxBytes) throw new Error(`Response body too large: ${String(cl)} bytes exceeds maxBytes (${String(this.maxBytes)}).`);
+			if (Number.isFinite(cl) && cl > this.maxBytes) {
+				await response.body?.cancel().catch(() => {});
+				throw new Error(`Response body too large: ${String(cl)} bytes exceeds maxBytes (${String(this.maxBytes)}).`);
+			}
 		}
 		const body = await response.text();
 		const actualBytes = Buffer.byteLength(body, "utf8");
@@ -117340,268 +117363,220 @@ var LocalFetchURLProvider = class {
 	}
 };
 //#endregion
-//#region ../../packages/agent-core/src/tools/providers/scream-cli-fetch-url.ts
+//#region ../../packages/agent-core/src/tools/providers/search-timeout.ts
 /**
-* ScreamCliFetchURLProvider — host-side UrlFetcher.
+* Hard timeout for outbound web-search requests (omp pattern).
 *
-* Flow:
-*   1. Try ScreamCli coding-fetch service (POST {url}, Bearer token from a
-*      narrow token provider, Accept: text/markdown, host-provided headers).
-*   2. ScreamCli 200 → return the body as `extracted` content (the
-*      service has already extracted the main page text on its side).
-*   3. Any ScreamCli failure — non-200, network error, or token
-*      refresh failure — → delegate to `localFallback`, forwarding its
-*      content kind, so the LLM still gets *something* when the service
-*      is down.
-*   4. If localFallback also throws → propagate that error.
-*/
-function cacheKey(baseUrl, url) {
-	return `cli:${baseUrl}:${url}`;
-}
-var ScreamCliFetchURLProvider = class {
-	tokenProvider;
-	apiKey;
-	baseUrl;
-	defaultHeaders;
-	customHeaders;
-	localFallback;
-	fetchImpl;
-	cache;
-	constructor(options) {
-		this.tokenProvider = options.tokenProvider;
-		this.apiKey = options.apiKey;
-		this.baseUrl = options.baseUrl;
-		this.defaultHeaders = options.defaultHeaders ?? {};
-		this.customHeaders = options.customHeaders ?? {};
-		this.localFallback = options.localFallback;
-		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
-		this.cache = options.cache ?? new FetchCache();
-	}
-	async fetch(url, options) {
-		const key = cacheKey(this.baseUrl, url);
-		const cached = this.cache.get(key);
-		if (cached !== void 0) return cached;
-		const result = await this.fetchFresh(url, options?.toolCallId);
-		this.cache.set(key, result);
-		return result;
-	}
-	async fetchFresh(url, toolCallId) {
-		try {
-			return {
-				content: await this.fetchViaScreamCli(url, toolCallId),
-				kind: "extracted"
-			};
-		} catch {
-			return this.localFallback.fetch(url, { toolCallId });
-		}
-	}
-	async fetchViaScreamCli(url, toolCallId) {
-		const bodyJson = JSON.stringify({ url });
-		const response = await this.post(bodyJson, toolCallId);
-		if (response.status !== 200) {
-			let detail = "";
-			try {
-				detail = await response.text();
-			} catch {}
-			throw new HttpFetchError(response.status, `ScreamCli fetch request failed: HTTP ${String(response.status)}. ${detail}`.trim());
-		}
-		return response.text();
-	}
-	async post(bodyJson, toolCallId) {
-		const accessToken = await this.resolveApiKey();
-		return this.fetchImpl(this.baseUrl, {
-			method: "POST",
-			headers: {
-				...this.defaultHeaders,
-				Authorization: `Bearer ${accessToken}`,
-				Accept: "text/markdown",
-				"Content-Type": "application/json",
-				...toolCallId !== void 0 && toolCallId.length > 0 ? { "X-Msh-Tool-Call-Id": toolCallId } : {},
-				...this.customHeaders
-			},
-			body: bodyJson
-		});
-	}
-	async resolveApiKey() {
-		if (this.tokenProvider !== void 0) try {
-			const token = await this.tokenProvider.getAccessToken();
-			if (token.trim().length > 0) return token;
-			if (this.apiKey !== void 0 && this.apiKey.length > 0) return this.apiKey;
-		} catch (error) {
-			if (this.apiKey !== void 0 && this.apiKey.length > 0) return this.apiKey;
-			throw error;
-		}
-		if (this.apiKey !== void 0 && this.apiKey.length > 0) return this.apiKey;
-		throw new Error("ScreamCli fetch service is not configured: missing API key or token provider.");
-	}
-};
+* A stalled TCP/TLS connection can keep an undici fetch pending for minutes;
+* composing the caller's signal with a fixed ceiling guarantees the request
+* settles. Fires as a `TimeoutError` DOMException, which the tool layer maps
+* to "Search timed out".
+*/
+const SEARCH_HARD_TIMEOUT_MS = 6e4;
+function withHardTimeout(signal, ms = SEARCH_HARD_TIMEOUT_MS) {
+	const timeout = AbortSignal.timeout(ms);
+	return signal !== void 0 ? AbortSignal.any([signal, timeout]) : timeout;
+}
 //#endregion
 //#region ../../packages/agent-core/src/tools/providers/duckduckgo-search.ts
+const DUCKDUCKGO_HTML_URL = "https://html.duckduckgo.com/html/";
+/**
+* Browser-like UA so DDG serves the standard results page instead of the
+* mobile/noscript variants, and is less likely to trip bot detection.
+* DDG answers automation it suspects with HTTP 202 plus an anomaly modal;
+* the body check (not the status) is the reliable signal.
+*/
+const BROWSER_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36";
 var DuckDuckGoSearchProvider = class {
+	name = "duckduckgo";
 	fetchImpl;
 	constructor(options = {}) {
 		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
 	}
 	async search(query, options) {
 		const limit = options?.limit ?? 5;
-		let results = await this.searchViaApi(query, limit);
-		if (results.length === 0) results = await this.searchViaLite(query, limit);
-		return results;
-	}
-	/**
-	* Query the DuckDuckGo Instant Answer API.
-	*
-	* Returns up to `limit` results built from the abstract and flattened
-	* RelatedTopics. Returns `[]` on any failure (network error, non-2xx,
-	* parse failure) so callers can fall through to the next method.
-	*/
-	async searchViaApi(query, limit) {
-		const url = `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}&format=json&no_html=1&skip_disambig=1`;
-		let response;
-		try {
-			response = await this.fetchImpl(url);
-		} catch {
-			return [];
-		}
-		if (response.status !== 200) {
-			await drainBody(response);
-			return [];
-		}
-		let json;
-		try {
-			json = await response.json();
-		} catch {
-			return [];
-		}
-		return this.buildApiResults(json, limit);
-	}
-	buildApiResults(json, limit) {
-		const results = [];
-		if (json.AbstractText && json.AbstractURL && json.AbstractText.trim().length > 0) results.push({
-			title: json.Heading && json.Heading.trim().length > 0 ? json.Heading : json.AbstractSource ?? "DuckDuckGo",
-			url: json.AbstractURL,
-			snippet: json.AbstractText
-		});
-		if (json.RelatedTopics && json.RelatedTopics.length > 0) {
-			const flattened = flattenRelatedTopics(json.RelatedTopics);
-			for (const topic of flattened) {
-				if (results.length >= limit) break;
-				const url = topic.FirstURL ?? "";
-				const text = topic.Text ?? "";
-				if (url === "" || text === "") continue;
-				results.push({
-					title: text,
-					url,
-					snippet: text
-				});
-			}
-		}
-		return results.slice(0, limit);
-	}
-	/**
-	* Scrape DuckDuckGo Lite search results.
-	*
-	* Lite is a minimal HTML table with no JavaScript, designed for basic
-	* browsers. It may return a CAPTCHA page from datacenter IPs — in that
-	* case we return `[]` so the caller can fall through.
-	*/
-	async searchViaLite(query, limit) {
-		const url = `https://lite.duckduckgo.com/lite/?q=${encodeURIComponent(query)}`;
-		let response;
-		try {
-			response = await this.fetchImpl(url);
-		} catch {
-			return [];
-		}
-		if (response.status !== 200) {
-			await drainBody(response);
-			return [];
-		}
-		let html;
-		try {
-			html = await response.text();
-		} catch {
-			return [];
-		}
-		if (isCaptchaPage(html)) return [];
-		return parseLiteResults(html, limit);
+		const form = new URLSearchParams({
+			q: query,
+			kl: "us-en"
+		});
+		form.set("b", "");
+		const response = await this.fetchImpl(DUCKDUCKGO_HTML_URL, {
+			method: "POST",
+			body: form.toString(),
+			headers: {
+				Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+				"Accept-Language": "en,en-US;q=0.9",
+				"Content-Type": "application/x-www-form-urlencoded",
+				Referer: "https://html.duckduckgo.com/",
+				"Upgrade-Insecure-Requests": "1",
+				"User-Agent": BROWSER_USER_AGENT
+			},
+			signal: withHardTimeout(options?.signal)
+		});
+		const html = await response.text();
+		if (!response.ok && response.status !== 202) throw new Error(`DuckDuckGo request failed: HTTP ${String(response.status)}`);
+		if (isAnomalyResponse(html)) throw new Error("DuckDuckGo blocked the request with a bot-detection challenge (common from datacenter/shared-egress IPs)");
+		return parseHtmlResults(html).slice(0, limit);
 	}
 };
-/**
-* Recursively flatten DuckDuckGo RelatedTopics.
-*
-* The API nests topics in two ways:
-*   - A direct topic has `FirstURL` + `Text` (may lack `Topics`).
-*   - A category group has a `Name` and nested `Topics[]`.
-* We walk both shapes, returning a flat list of leaf topics.
-*/
-function flattenRelatedTopics(topics) {
-	const out = [];
-	for (const topic of topics) if (topic.Topics && topic.Topics.length > 0) out.push(...flattenRelatedTopics(topic.Topics));
-	else if (topic.FirstURL) out.push(topic);
-	return out;
+/** `true` when DDG returned the bot-challenge modal instead of results. */
+function isAnomalyResponse(html) {
+	return html.includes("anomaly-modal") || html.includes("anomaly.js");
 }
 /**
-* Return true if the HTML looks like a DuckDuckGo bot-detection / CAPTCHA page.
+* Each result lives in a `<div class="result …">` container with
+* `<a class="result__a">` for the title link and an optional
+* `<a|div|span class="result__snippet">` sibling for the preview text.
+* Sponsored rows, missing snippets, and the pagination row are tolerated.
 */
-function isCaptchaPage(html) {
-	return html.includes("anomaly-modal") || html.includes("challenge-form") || html.includes("g-recaptcha") || html.includes("data-testid=\"anomaly-modal\"");
+const RESULT_BLOCK_RE = /<div\b[^>]*\bclass="[^"]*\bresult\b[^"]*"[^>]*>([\s\S]*?)(?=<div\b[^>]*\bclass="[^"]*\bresult\b|<div\b[^>]*\bclass="[^"]*\bnav-link\b|$)/g;
+const RESULT_TITLE_RE = /<a\b[^>]*\bclass="[^"]*\bresult__a\b[^"]*"[^>]*\bhref="([^"]+)"[^>]*>([\s\S]*?)<\/a>/;
+const RESULT_SNIPPET_RE = /<(?:a|div|span)\b[^>]*\bclass="[^"]*\bresult__snippet\b[^"]*"[^>]*>([\s\S]*?)<\/(?:a|div|span)>/;
+/** Strip inline tags (DDG wraps query terms in `<b>`) and decode entities. */
+function decodeHtmlText$1(value) {
+	return value.replace(/<[^>]*>/g, " ").replace(/&#(\d+);/g, (_, code) => String.fromCharCode(Number(code))).replace(/&#x([0-9a-f]+);/gi, (_, code) => String.fromCharCode(Number.parseInt(code, 16))).replace(/&nbsp;/gi, " ").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, "\"").replace(/&#39;|&apos;/gi, "'").replace(/\s+/g, " ").trim();
 }
 /**
-* DuckDuckGo Lite result rows are inside `<tr>` blocks with a predictable
-* anchor shape. This regex extracts the `<a class="result-link"...>` block
-* and the following snippet text from the same row.
-*
-* The Lite markup is intentionally minimal (no JS, no CSS classes beyond a
-* handful of utility names), so a DOM parser is unnecessary overhead.
+* Resolve a DDG result href to the underlying target URL. DDG routes
+* outbound clicks through `//duckduckgo.com/l/?uddg=<encoded>`; handles
+* redirect wrappers, protocol-relative links, and plain absolute URLs.
 */
-const LITE_RESULT_RE = /<a\s[^>]*?\bclass\s*=\s*["'][^"']*result-link[^"']*["'][^>]*?\bhref\s*=\s*["']([^"']+)["'][^>]*>([\s\S]*?)<\/a>/gi;
-const LITE_SNIPPET_RE = /<td\s[^>]*?\bclass\s*=\s*["'][^"']*result-snippet[^"']*["'][^>]*>([\s\S]*?)<\/td>/gi;
-/** Strip HTML tags and decode common HTML entities. */
-function stripHtmlAndDecode(text) {
-	return text.replaceAll(/<[^>]*>/g, "").replaceAll("&amp;", "&").replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&quot;", "\"").replaceAll("&#x27;", "'").replaceAll("&#39;", "'").replaceAll("&nbsp;", " ").trim();
-}
-/** Unwrap a DuckDuckGo redirect URL to the real target if possible. */
-function unwrapDdgRedirect(url) {
-	const uddgMatch = url.match(/[?&]uddg=([^&]+)/);
-	if (uddgMatch?.[1]) try {
-		return decodeURIComponent(uddgMatch[1]);
+function unwrapResultUrl(href) {
+	if (href === "") return void 0;
+	const decoded = href.replace(/&amp;/gi, "&");
+	const wrapMatch = decoded.match(/[?&]uddg=([^&]+)/);
+	if (wrapMatch?.[1] !== void 0) try {
+		return decodeURIComponent(wrapMatch[1]);
 	} catch {
-		return url;
+		return;
 	}
-	return url;
+	if (decoded.startsWith("//")) return `https:${decoded}`;
+	if (decoded.startsWith("http://") || decoded.startsWith("https://")) return decoded;
 }
-function parseLiteResults(html, limit) {
+function parseHtmlResults(html) {
 	const results = [];
-	const linkMatches = html.matchAll(LITE_RESULT_RE);
-	for (const match of linkMatches) {
-		if (results.length >= limit) break;
-		const href = unwrapDdgRedirect(match[1] ?? "");
-		const title = stripHtmlAndDecode(match[2] ?? "");
-		if (href === "" || title === "") continue;
+	const seen = /* @__PURE__ */ new Set();
+	for (const match of html.matchAll(RESULT_BLOCK_RE)) {
+		const block = match[1] ?? "";
+		const title = RESULT_TITLE_RE.exec(block);
+		if (title === null) continue;
+		const url = unwrapResultUrl(title[1] ?? "");
+		if (url === void 0 || seen.has(url)) continue;
+		const titleText = decodeHtmlText$1(title[2] ?? "");
+		if (titleText === "") continue;
+		seen.add(url);
+		const snippet = RESULT_SNIPPET_RE.exec(block);
+		const snippetText = snippet !== null ? decodeHtmlText$1(snippet[1] ?? "") : "";
 		results.push({
-			title,
-			url: href,
-			snippet: title
+			title: titleText,
+			url,
+			snippet: snippetText !== "" ? snippetText : titleText
 		});
 	}
-	const snippetMatches = html.matchAll(LITE_SNIPPET_RE);
-	let snippetIndex = 0;
-	for (const match of snippetMatches) {
-		if (snippetIndex >= results.length) break;
-		const snippet = stripHtmlAndDecode(match[1] ?? "");
-		const entry = results[snippetIndex];
-		if (entry && snippet.length > 0) entry.snippet = snippet;
-		snippetIndex++;
-	}
 	return results;
 }
-/** Drain a response body so the connection can be reused. */
-async function drainBody(response) {
-	try {
-		await response.text();
-	} catch {}
+//#endregion
+//#region ../../packages/agent-core/src/tools/providers/domestic-search.ts
+const BROWSER_HEADERS = {
+	Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+	"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+	"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36"
+};
+/** Strip inline tags and decode the common named/numeric entities. */
+function decodeHtmlText(value) {
+	return value.replace(/<[^>]*>/g, " ").replace(/&#(\d+);/g, (_, code) => String.fromCharCode(Number(code))).replace(/&#x([0-9a-f]+);/gi, (_, code) => String.fromCharCode(Number.parseInt(code, 16))).replace(/&nbsp;/gi, " ").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, "\"").replace(/&#39;|&apos;/gi, "'").replace(/\s+/g, " ").trim();
 }
+async function searchEngine(spec, fetchImpl, query, options) {
+	const limit = options?.limit ?? 5;
+	const response = await fetchImpl(spec.url(query), {
+		headers: BROWSER_HEADERS,
+		signal: withHardTimeout(options?.signal)
+	});
+	const html = await response.text();
+	if (!response.ok) throw new Error(`${spec.label} request failed: HTTP ${String(response.status)}`);
+	if (spec.botMarkers.some((m) => html.includes(m))) throw new Error(`${spec.label} blocked the request with an anti-bot challenge`);
+	const results = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const match of html.matchAll(spec.blockRe)) {
+		if (results.length >= limit) break;
+		const block = match[1] ?? "";
+		const title = spec.titleRe.exec(block);
+		if (title === null) continue;
+		const rawHref = (title[1] ?? "").replace(/&amp;/gi, "&");
+		const url = spec.normalizeUrl !== void 0 ? spec.normalizeUrl(rawHref) : rawHref;
+		if (url === void 0 || url === "" || seen.has(url)) continue;
+		const titleText = decodeHtmlText(title[2] ?? "");
+		if (titleText === "") continue;
+		seen.add(url);
+		const snippetMatch = spec.snippetRe === void 0 ? null : spec.snippetRe.exec(block);
+		const snippetText = snippetMatch !== null ? decodeHtmlText(snippetMatch[1] ?? "") : "";
+		results.push({
+			title: titleText,
+			url,
+			snippet: snippetText !== "" ? snippetText : titleText
+		});
+	}
+	return results;
+}
+const SOGOU = {
+	label: "Sogou",
+	url: (q) => `https://www.sogou.com/web?query=${encodeURIComponent(q)}`,
+	blockRe: /<div\b[^>]*\bclass="[^"]*\b(?:vrwrap|rb)\b[^"]*"[^>]*>([\s\S]*?)(?=<div\b[^>]*\bclass="[^"]*\b(?:vrwrap|rb)\b|$)/g,
+	titleRe: /<h3[^>]*>[\s\S]*?<a[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/,
+	snippetRe: /<(?:p|div)\b[^>]*\bclass="[^"]*\b(?:str-text|str_info|text-layout)\b[^"]*"[^>]*>([\s\S]*?)<\/(?:p|div)>/,
+	normalizeUrl: (href) => {
+		if (href.startsWith("/link?")) return `https://www.sogou.com${href}`;
+		if (href.includes("sogou.com/sogou?")) return void 0;
+		if (href.startsWith("http://") || href.startsWith("https://")) return href;
+	},
+	botMarkers: ["antispider", "异常访问请求"]
+};
+var SogouSearchProvider = class {
+	name = "sogou";
+	fetchImpl;
+	constructor(options = {}) {
+		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
+	}
+	search(query, options) {
+		return searchEngine(SOGOU, this.fetchImpl, query, options);
+	}
+};
+const SO360 = {
+	label: "360 Search",
+	url: (q) => `https://www.so.com/s?q=${encodeURIComponent(q)}`,
+	blockRe: /<li\b[^>]*\bclass="[^"]*\bres-list\b[^"]*"[^>]*>([\s\S]*?)(?=<li\b[^>]*\bclass="[^"]*\bres-list\b|$)/g,
+	titleRe: /<h3[^>]*class="[^"]*\bres-title\b[^"]*"[^>]*>[\s\S]*?<a[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/,
+	snippetRe: /<p\b[^>]*\bclass="[^"]*\bres-desc\b[^"]*"[^>]*>([\s\S]*?)<\/p>/,
+	botMarkers: ["安全验证"]
+};
+var So360SearchProvider = class {
+	name = "360";
+	fetchImpl;
+	constructor(options = {}) {
+		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
+	}
+	search(query, options) {
+		return searchEngine(SO360, this.fetchImpl, query, options);
+	}
+};
+const BAIDU = {
+	label: "Baidu",
+	url: (q) => `https://www.baidu.com/s?wd=${encodeURIComponent(q)}`,
+	blockRe: /<div\b[^>]*\bclass="[^"]*\bc-container\b[^"]*"[^>]*>([\s\S]*?)(?=<div\b[^>]*\bclass="[^"]*\bc-container\b|$)/g,
+	titleRe: /<h3[^>]*class="[^"]*\bt\b[^"]*"[^>]*>[\s\S]*?<a[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/,
+	snippetRe: /<(?:span|div)\b[^>]*\bclass="[^"]*\b(?:c-abstract|content-right)[^"]*\b[^"]*"[^>]*>([\s\S]*?)<\/(?:span|div)>/,
+	botMarkers: ["百度安全验证", "wappass.baidu.com"]
+};
+var BaiduSearchProvider = class {
+	name = "baidu";
+	fetchImpl;
+	constructor(options = {}) {
+		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
+	}
+	search(query, options) {
+		return searchEngine(BAIDU, this.fetchImpl, query, options);
+	}
+};
 //#endregion
 //#region ../../packages/agent-core/src/tools/providers/fallback-search.ts
 var FallbackSearchProvider = class {
@@ -117611,94 +117586,31 @@ var FallbackSearchProvider = class {
 		this.providers = providers;
 	}
 	async search(query, options) {
-		for (const provider of this.providers) try {
-			const results = await provider.search(query, options);
-			if (results.length > 0) return results;
-		} catch {
-			continue;
-		}
-		return [];
-	}
-};
-//#endregion
-//#region ../../packages/agent-core/src/tools/providers/scream-cli-web-search.ts
-var ScreamCliWebSearchProvider = class {
-	tokenProvider;
-	apiKey;
-	baseUrl;
-	defaultHeaders;
-	customHeaders;
-	fetchImpl;
-	constructor(options) {
-		this.tokenProvider = options.tokenProvider;
-		this.apiKey = options.apiKey;
-		this.baseUrl = options.baseUrl;
-		this.defaultHeaders = options.defaultHeaders ?? {};
-		this.customHeaders = options.customHeaders ?? {};
-		this.fetchImpl = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
-	}
-	async search(query, options) {
-		const body = {
-			text_query: query,
-			limit: options?.limit ?? 5,
-			enable_page_crawling: options?.includeContent ?? false,
-			timeout_seconds: 30
-		};
-		const bodyJson = JSON.stringify(body);
-		const toolCallId = options?.toolCallId;
-		const response = await this.post(bodyJson, toolCallId);
-		if (response.status === 401) {
-			const detail = await safeReadText(response);
-			throw new Error(`ScreamCli search request failed: HTTP 401 (auth/unauthorized). ${detail}`.trim());
-		}
-		if (response.status !== 200) {
-			const detail = await safeReadText(response);
-			throw new Error(`ScreamCli search request failed: HTTP ${String(response.status)}. ${detail}`.trim());
-		}
-		const json = await response.json();
-		return (Array.isArray(json.search_results) ? json.search_results : []).map((r) => {
-			const out = {
-				title: r.title ?? "",
-				url: r.url ?? "",
-				snippet: r.snippet ?? ""
-			};
-			if (typeof r.date === "string" && r.date.length > 0) out.date = r.date;
-			if (typeof r.content === "string" && r.content.length > 0) out.content = r.content;
-			return out;
-		});
-	}
-	async post(bodyJson, toolCallId) {
-		const accessToken = await this.resolveApiKey();
-		return this.fetchImpl(this.baseUrl, {
-			method: "POST",
-			headers: {
-				...this.defaultHeaders,
-				Authorization: `Bearer ${accessToken}`,
-				"Content-Type": "application/json",
-				...toolCallId !== void 0 && toolCallId.length > 0 ? { "X-Msh-Tool-Call-Id": toolCallId } : {},
-				...this.customHeaders
-			},
-			body: bodyJson
-		});
-	}
-	async resolveApiKey() {
-		if (this.tokenProvider !== void 0) try {
-			return await this.tokenProvider.getAccessToken();
-		} catch (error) {
-			if (this.apiKey !== void 0 && this.apiKey.length > 0) return this.apiKey;
-			throw error;
+		const failures = [];
+		for (const [index, provider] of this.providers.entries()) {
+			options?.signal?.throwIfAborted();
+			try {
+				const results = await provider.search(query, options);
+				if (results.length > 0) return results;
+				failures.push({
+					provider: provider.name ?? `provider ${String(index + 1)}`,
+					reason: "no results"
+				});
+			} catch (error) {
+				options?.signal?.throwIfAborted();
+				failures.push({
+					provider: provider.name ?? `provider ${String(index + 1)}`,
+					reason: error instanceof Error ? error.message : String(error)
+				});
+			}
 		}
-		if (this.apiKey !== void 0 && this.apiKey.length > 0) return this.apiKey;
-		throw new Error("ScreamCli search service is not configured: missing API key or token provider.");
+		if (failures.every((f) => f.reason === "no results")) return [];
+		const last = failures[failures.length - 1];
+		if (this.providers.length === 1 && last !== void 0) throw new Error(last.reason);
+		const summary = failures.map((f) => `${f.provider}: ${f.reason}`).join("; ");
+		throw new Error(`All web search providers failed — ${summary}`);
 	}
 };
-async function safeReadText(response) {
-	try {
-		return await response.text();
-	} catch {
-		return "";
-	}
-}
 //#endregion
 //#region ../../packages/agent-core/src/session/export/manifest.ts
 const WIRE_PROTOCOL_VERSION = "1.3";
@@ -118888,7 +118800,7 @@ function providerApiKey(provider) {
 		case "openai_responses": return providerValue(provider.apiKey, provider.env, "OPENAI_API_KEY");
 		case "scream": return providerValue(provider.apiKey, provider.env, "SCREAM_API_KEY");
 		case "google-genai": return providerValue(provider.apiKey, provider.env, "GOOGLE_API_KEY");
-		case "vertexai": return nonEmptyString$1(provider.apiKey) ?? envValue(provider.env, "VERTEXAI_API_KEY") ?? envValue(provider.env, "GOOGLE_API_KEY");
+		case "vertexai": return nonEmptyString(provider.apiKey) ?? envValue(provider.env, "VERTEXAI_API_KEY") ?? envValue(provider.env, "GOOGLE_API_KEY");
 		default: {
 			const exhaustive = provider.type;
 			throw new ScreamError(ErrorCodes.MODEL_CONFIG_INVALID, `Unsupported provider type: ${String(exhaustive)}`);
@@ -118905,21 +118817,21 @@ function vertexAILocation(provider) {
 	return envValue(provider.env, "GOOGLE_CLOUD_LOCATION") ?? locationFromVertexAIBaseUrl(provider.baseUrl);
 }
 function providerValue(configured, env, envKey) {
-	return nonEmptyString$1(configured) ?? envValue(env, envKey);
+	return nonEmptyString(configured) ?? envValue(env, envKey);
 }
 function envValue(env, key) {
-	return nonEmptyString$1(env?.[key]);
+	return nonEmptyString(env?.[key]);
 }
-function nonEmptyString$1(value) {
+function nonEmptyString(value) {
 	const trimmed = value?.trim();
 	return trimmed === void 0 || trimmed.length === 0 ? void 0 : trimmed;
 }
 function locationFromVertexAIBaseUrl(baseUrl) {
-	const url = nonEmptyString$1(baseUrl);
+	const url = nonEmptyString(baseUrl);
 	if (url === void 0) return void 0;
 	try {
 		const host = new URL(url).hostname;
-		return host.endsWith("-aiplatform.googleapis.com") ? nonEmptyString$1(host.slice(0, -26)) : void 0;
+		return host.endsWith("-aiplatform.googleapis.com") ? nonEmptyString(host.slice(0, -26)) : void 0;
 	} catch {
 		return;
 	}
@@ -120464,7 +120376,6 @@ function waitForSpawn(child) {
 new AsyncLocalStorage();
 //#endregion
 //#region ../../packages/agent-core/src/rpc/core-impl.ts
-const SCREAM_CODE_PROVIDER_NAME = "managed:scream-code";
 var ScreamCore = class {
 	rpcClient;
 	sdk;
@@ -120945,11 +120856,7 @@ var ScreamCore = class {
 	}
 	async resolveRuntime(config) {
 		if (this.runtime !== void 0) return this.runtime;
-		const runtime = await createRuntimeConfig({
-			config,
-			screamRequestHeaders: this.screamRequestHeaders,
-			resolveOAuthTokenProvider: this.resolveOAuthTokenProvider
-		});
+		const runtime = await createRuntimeConfig({ config });
 		this.runtime = runtime;
 		return runtime;
 	}
@@ -121006,42 +120913,20 @@ var ScreamCore = class {
 	}
 };
 async function createRuntimeConfig(input) {
-	const fetchCache = new FetchCache();
-	const localFetcher = new LocalFetchURLProvider({ cache: fetchCache });
-	const fetchService = input.config.services?.screamCliFetch;
 	return {
-		urlFetcher: fetchService?.baseUrl === void 0 ? localFetcher : new ScreamCliFetchURLProvider({
-			baseUrl: fetchService.baseUrl,
-			localFallback: localFetcher,
-			defaultHeaders: input.screamRequestHeaders,
-			cache: fetchCache,
-			...serviceCredentials(fetchService, input.resolveOAuthTokenProvider)
-		}),
+		urlFetcher: new LocalFetchURLProvider({ cache: new FetchCache() }),
 		webSearcher: buildWebSearcher(input)
 	};
 }
 function buildWebSearcher(input) {
-	const searchService = input.config.services?.screamCliSearch;
-	const ddgEnabled = input.config.services?.duckduckgo?.enabled !== false;
-	const screamProvider = searchService?.baseUrl !== void 0 ? new ScreamCliWebSearchProvider({
-		baseUrl: searchService.baseUrl,
-		defaultHeaders: input.screamRequestHeaders,
-		...serviceCredentials(searchService, input.resolveOAuthTokenProvider)
-	}) : void 0;
-	const ddgProvider = ddgEnabled ? new DuckDuckGoSearchProvider() : void 0;
-	if (screamProvider && ddgProvider) return new FallbackSearchProvider([screamProvider, ddgProvider]);
-	return screamProvider ?? ddgProvider;
-}
-function serviceCredentials(service, resolveOAuthTokenProvider) {
-	return {
-		apiKey: nonEmptyString(service.apiKey),
-		tokenProvider: service.oauth !== void 0 ? resolveOAuthTokenProvider?.(SCREAM_CODE_PROVIDER_NAME, service.oauth) : void 0,
-		customHeaders: service.customHeaders
-	};
-}
-function nonEmptyString(value) {
-	const trimmed = value?.trim();
-	return trimmed === void 0 || trimmed.length === 0 ? void 0 : trimmed;
+	const services = input.config.services;
+	const providers = [];
+	if (services?.duckduckgo?.enabled !== false) providers.push(new DuckDuckGoSearchProvider());
+	if (services?.sogou?.enabled !== false) providers.push(new SogouSearchProvider());
+	if (services?.so360?.enabled !== false) providers.push(new So360SearchProvider());
+	if (services?.baidu?.enabled !== false) providers.push(new BaiduSearchProvider());
+	if (providers.length === 0) return void 0;
+	return providers.length === 1 ? providers[0] : new FallbackSearchProvider(providers);
 }
 function requiredWorkDir(operation, value) {
 	if (typeof value !== "string" || value.trim() === "") throw new ScreamError(ErrorCodes.REQUEST_WORK_DIR_REQUIRED, `${operation} requires workDir`);
@@ -122505,7 +122390,7 @@ function optionalBuildString(value) {
 	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 const SCREAM_BUILD_INFO = {
-	version: optionalBuildString("0.10.0"),
+	version: optionalBuildString("0.10.2"),
 	channel: optionalBuildString(""),
 	commit: optionalBuildString(""),
 	buildTarget: optionalBuildString("darwin-arm64")
@@ -122991,7 +122876,7 @@ async function resolvePromptSession(harness, opts, workDir, defaultModel, stderr
 			workDir
 		}))[0];
 		if (target === void 0) throw new Error(`未找到会话 "${opts.session}"。`);
-		if (target.workDir !== workDir) {
+		if (!sameWorkDir(target.workDir, workDir)) {
 			stderr.write(`${chalk.yellow(`会话 "${opts.session}" 是在其他目录下创建的。\n  cd "${target.workDir}" && scream -r ${opts.session}`)}\n\n`);
 			throw new Error(`会话 "${opts.session}" 是在其他目录下创建的。`);
 		}
@@ -123380,6 +123265,23 @@ function formatTurnEndedFailure(event) {
 	if (event.error !== void 0) return `${event.error.code}: ${event.error.message}`;
 	return `提示回合结束，原因：${event.reason}`;
 }
+/**
+* Compare two working directories tolerating symlink aliases (/tmp vs
+* /private/tmp on macOS), trailing separators, and Windows case
+* differences. Falls back to resolved-string compare when either path
+* doesn't exist on disk.
+*/
+function sameWorkDir(a, b) {
+	const normalize = (p) => {
+		let out = resolve(p);
+		try {
+			out = realpathSync(out);
+		} catch {}
+		out = out.replace(/[/\\]+$/, "");
+		return process.platform === "win32" ? out.toLowerCase() : out;
+	};
+	return normalize(a) === normalize(b);
+}
 //#endregion
 //#region src/tui/constant/rendering.ts
 const MAX_SHELL_OUTPUT_BYTES = 128 * 1024;
@@ -123838,12 +123740,13 @@ function isManagedUsageProvider(providerKey) {
 //#region src/tui/constant/streaming.ts
 const STREAMING_ARGS_FIELD_RE = /"(path|file_path|command|pattern|query|url|description|title|name)"\s*:\s*"((?:\\.|[^"\\])*)"/g;
 const STREAMING_ARGS_PREVIEW_MAX_CHARS = 8 * 1024;
+const STREAMING_ARGS_BUFFER_MAX_CHARS = 1024 * 1024;
 //#endregion
 //#region src/tui/utils/event-payload.ts
 function appendStreamingArgsPreview(current, next) {
-	const existing = (current ?? "").slice(0, STREAMING_ARGS_PREVIEW_MAX_CHARS);
+	const existing = (current ?? "").slice(0, STREAMING_ARGS_BUFFER_MAX_CHARS);
 	if (next === null || next === void 0 || next.length === 0) return existing;
-	const remaining = STREAMING_ARGS_PREVIEW_MAX_CHARS - existing.length;
+	const remaining = STREAMING_ARGS_BUFFER_MAX_CHARS - existing.length;
 	if (remaining <= 0) return existing;
 	return `${existing}${next.slice(0, remaining)}`;
 }
@@ -125769,7 +125672,7 @@ var FooterComponent = class {
 	gitCache;
 	gitCacheWorkDir;
 	transientHint = null;
-	shimmerTimer = null;
+	statusTimer = null;
 	/**
 	* Non-terminal background-task counts split by kind so the footer can
 	* render two distinct badges. `bashTasks` covers `bash-*` BPM tasks
@@ -125788,15 +125691,13 @@ var FooterComponent = class {
 		this.gitCache = createGitStatusCache(state.workDir, { onChange: this.onGitStatusChange });
 	}
 	setState(state) {
-		const wasThinking = this.state?.streamingPhase === "thinking";
+		const prevPhase = this.state?.streamingPhase;
 		if (state.workDir !== this.gitCacheWorkDir) {
 			this.gitCacheWorkDir = state.workDir;
 			this.gitCache = createGitStatusCache(state.workDir, { onChange: this.onGitStatusChange });
 		}
 		this.state = state;
-		const isThinking = state.streamingPhase === "thinking";
-		if (isThinking && !wasThinking) this.#startShimmer();
-		else if (!isThinking && wasThinking) this.#stopShimmer();
+		if (state.streamingPhase !== prevPhase) this.#restartStatusTimer(state.streamingPhase);
 	}
 	setColors(colors) {
 		this.colors = colors;
@@ -125821,29 +125722,29 @@ var FooterComponent = class {
 	}
 	invalidate() {}
 	/**
-	* Stop the shimmer animation timer. Idempotent — safe to call even when
+	* Stop the status timer. Idempotent — safe to call even when
 	* the timer isn't running. Call this when the component is disposed.
 	*/
 	dispose() {
-		this.#stopShimmer();
+		this.#stopStatusTimer();
 	}
-	#startShimmer() {
-		if (this.shimmerTimer) return;
-		this.shimmerTimer = setInterval(() => {
-			this.ui.requestRender();
-		}, 1e3 / 30);
+	#restartStatusTimer(phase) {
+		this.#stopStatusTimer();
+		if (phase === "idle") return;
+		const intervalMs = phase === "thinking" ? 1e3 / 30 : SPINNER_TICK_MS;
+		this.statusTimer = setInterval(() => {
+			this.ui.requestComponentRender(this);
+		}, intervalMs);
 	}
-	#stopShimmer() {
-		if (!this.shimmerTimer) return;
-		clearInterval(this.shimmerTimer);
-		this.shimmerTimer = null;
+	#stopStatusTimer() {
+		if (!this.statusTimer) return;
+		clearInterval(this.statusTimer);
+		this.statusTimer = null;
 	}
 	render(width) {
 		const colors = this.colors;
 		const state = this.state;
 		const left = [];
-		if (state.permissionMode === "auto") left.push(chalk.hex(colors.warning).bold(t("badge.auto")));
-		if (state.permissionMode === "yolo") left.push(chalk.hex(colors.warning).bold(t("badge.yes")));
 		if (state.planMode !== "off") {
 			const isFusion = state.planMode === "fusionplan";
 			left.push(chalk.hex(isFusion ? colors.fusionPlanMode : colors.planMode).bold(isFusion ? t("badge.fusion") : t("badge.plan")));
@@ -126727,7 +126628,6 @@ async function handleYoloCommand(host, args) {
 		}
 		await session.setPermission("yolo");
 		host.setAppState({ permissionMode: "yolo" });
-		host.showNotice(t("config.yolo_on"), t("config.yolo_on_desc"));
 		return;
 	}
 	if (subcmd === "off") {
@@ -126737,17 +126637,14 @@ async function handleYoloCommand(host, args) {
 		}
 		await session.setPermission("manual");
 		host.setAppState({ permissionMode: "manual" });
-		host.showNotice(t("config.yolo_off"));
 		return;
 	}
 	if (currentMode === "yolo") {
 		await session.setPermission("manual");
 		host.setAppState({ permissionMode: "manual" });
-		host.showNotice(t("config.yolo_off"));
 	} else {
 		await session.setPermission("yolo");
 		host.setAppState({ permissionMode: "yolo" });
-		host.showNotice(t("config.yolo_toggle_on"), t("config.yolo_toggle_on_desc"));
 	}
 }
 async function handleAutoCommand(host, args) {
@@ -126765,7 +126662,6 @@ async function handleAutoCommand(host, args) {
 		}
 		await session.setPermission("auto");
 		host.setAppState({ permissionMode: "auto" });
-		host.showNotice(t("config.auto_on"), t("config.auto_on_desc"));
 		return;
 	}
 	if (subcmd === "off") {
@@ -126775,17 +126671,14 @@ async function handleAutoCommand(host, args) {
 		}
 		await session.setPermission("manual");
 		host.setAppState({ permissionMode: "manual" });
-		host.showNotice(t("config.auto_off"));
 		return;
 	}
 	if (currentMode === "auto") {
 		await session.setPermission("manual");
 		host.setAppState({ permissionMode: "manual" });
-		host.showNotice(t("config.auto_off"));
 	} else {
 		await session.setPermission("auto");
 		host.setAppState({ permissionMode: "auto" });
-		host.showNotice(t("config.auto_toggle_on"), t("config.auto_toggle_on_desc"));
 	}
 }
 async function handleWolfpackCommand(host, args) {
@@ -127788,7 +127681,7 @@ async function createGoal(host, parsed) {
 	await showGoalConfigWizard(host, session, parsed.objective, parsed.replace);
 }
 async function showGoalConfigWizard(host, session, objective, replace) {
-	const { TextInputDialogComponent } = await import("./text-input-dialog-Yyssn7t3.mjs");
+	const { TextInputDialogComponent } = await import("./text-input-dialog-C8_8qYYi.mjs");
 	const turnInput = await promptNumber(host, TextInputDialogComponent, {
 		title: t("goal.wizard_title", { objective }),
 		subtitle: t("goal.budget_turns_hint"),
@@ -128537,7 +128430,7 @@ var AssistantMessageComponent = class {
 			const age = Date.now() - (this.fadeStartMs ?? 0);
 			this.cachedWidth = void 0;
 			this.cachedLines = void 0;
-			this.ui?.requestRender();
+			this.ui?.requestComponentRender(this);
 			if (age >= 1200) this.stopFade();
 		}, FADE_TICK_MS);
 		this.ui.requestRender();
@@ -129018,7 +128911,7 @@ var ThinkingComponent = class {
 		if (this.ui === void 0 || this.spinnerInterval !== void 0) return;
 		this.spinnerInterval = setInterval(() => {
 			this.spinnerFrame = (this.spinnerFrame + 1) % BRAILLE_SPINNER_FRAMES.length;
-			this.ui?.requestRender();
+			this.ui?.requestComponentRender(this);
 		}, 80);
 	}
 	stopSpinner() {
@@ -130205,23 +130098,20 @@ function unescapeJsonString(s) {
 	});
 }
 /**
-* Pull the live value of a JSON string field out of partially-streamed
-* arguments, even if the closing quote hasn't arrived yet. Handles the
-* common JSON string escapes so `\n` in a streamed `content` becomes a
-* real newline we can highlight. Returns `undefined` if the field hasn't
-* started streaming yet.
+* Scan a JSON string value starting at `start` (just after the opening
+* quote), unescaping into plain text. Stops at the closing quote or at
+* `end`, tolerating truncation (an incomplete escape at the boundary
+* simply ends the scan). Shared by the partial-args extractor and the
+* Write streaming tail preview.
 */
-function extractPartialStringField(text, key) {
-	const match = new RegExp(`"${key}"\\s*:\\s*"`).exec(text);
-	if (match === null) return void 0;
-	const start = match.index + match[0].length;
+function unescapeJsonStringValue(text, start, end = text.length) {
 	let out = "";
 	let i = start;
-	while (i < text.length) {
+	while (i < end) {
 		const ch = text[i];
 		if (ch === "\\") {
 			const next = text[i + 1];
-			if (next === void 0) return out;
+			if (next === void 0 || i + 1 >= end) return out;
 			switch (next) {
 				case "n":
 					out += "\n";
@@ -130248,7 +130138,7 @@ function extractPartialStringField(text, key) {
 					out += "/";
 					break;
 				case "u": {
-					if (i + 5 >= text.length) return out;
+					if (i + 5 >= end) return out;
 					const hex = text.slice(i + 2, i + 6);
 					const code = Number.parseInt(hex, 16);
 					if (Number.isNaN(code)) return out;
@@ -130267,6 +130157,16 @@ function extractPartialStringField(text, key) {
 	}
 	return out;
 }
+/**
+* Pull the live value of a JSON string field out of partially-streamed
+* arguments, even if the closing quote hasn't arrived yet. Returns
+* `undefined` if the field hasn't started streaming yet.
+*/
+function extractPartialStringField(text, key) {
+	const match = new RegExp(`"${key}"\\s*:\\s*"`).exec(text);
+	if (match === null) return void 0;
+	return unescapeJsonStringValue(text, match.index + match[0].length);
+}
 function parseArgsPreview(value) {
 	const previewText = value.slice(0, STREAMING_ARGS_PREVIEW_MAX_CHARS);
 	if (previewText.trim().length === 0) return {};
@@ -130409,6 +130309,11 @@ var ToolCallComponent = class ToolCallComponent extends CachedContainer {
 	subagentEndedAtMs;
 	progressLines = [];
 	static MAX_PROGRESS_LINES = 24;
+	writeStreamContentStart = -1;
+	writeStreamNlScanOffset = 0;
+	writeStreamNlCount = 0;
+	writeStreamLang;
+	static WRITE_STREAM_TAIL_RAW_CHARS = 4096;
 	/**
 	* Registered by a group container (`AgentGroupComponent` or
 	* `ReadGroupComponent`) when this component is borrowed as a hidden state
@@ -131178,21 +131083,12 @@ var ToolCallComponent = class ToolCallComponent extends CachedContainer {
 		const name = this.toolCall.name;
 		const previewText = streamText.slice(0, STREAMING_ARGS_PREVIEW_MAX_CHARS);
 		if (name === "Write") {
-			const content = extractPartialStringField(previewText, "content");
-			if (content === void 0 || content.length === 0) return;
-			const allLines = highlightLines(content, langFromPath(extractPartialStringField(previewText, "file_path") ?? extractPartialStringField(previewText, "path") ?? ""));
-			const maxLines = 10;
-			const scrollLines = allLines.length > maxLines ? allLines.slice(allLines.length - maxLines) : allLines;
-			for (const [i, line] of scrollLines.entries()) {
-				const originalLineNumber = allLines.length > maxLines ? allLines.length - maxLines + i : i;
-				const lineNum = chalk.dim(String(originalLineNumber + 1).padStart(4) + "  ");
-				this.addChild(new Text(lineNum + line, 2, 0));
-			}
+			this.buildWriteStreamingPreview(streamText);
 			return;
 		}
 		if (name === "Edit") {
 			const filePath = extractPartialStringField(previewText, "file_path") ?? extractPartialStringField(previewText, "path") ?? "";
-			const bytes = Buffer.byteLength(previewText, "utf8");
+			const bytes = Buffer.byteLength(streamText, "utf8");
 			const startedAtMs = this.toolCall.streamingStartedAtMs;
 			const elapsedSeconds = startedAtMs === void 0 ? 0 : Math.max(0, Math.floor((Date.now() - startedAtMs) / 1e3));
 			const progress = t("toolcall.preparing_changes", {
@@ -131214,6 +131110,54 @@ var ToolCallComponent = class ToolCallComponent extends CachedContainer {
 			}));
 		}
 	}
+	/**
+	* Live Write preview: renders the last COMMAND_PREVIEW_LINES lines of the
+	* file being written, reading from the TAIL of the accumulating args JSON
+	* so the window keeps scrolling for arbitrarily large files (the old
+	* head-bounded preview visibly froze once args passed 8KB). Line numbers
+	* stay exact via an incremental newline counter. Per-frame cost is
+	* O(delta + tail), independent of total file size.
+	*/
+	buildWriteStreamingPreview(streamText) {
+		if (streamText.length < this.writeStreamNlScanOffset) {
+			this.writeStreamContentStart = -1;
+			this.writeStreamLang = void 0;
+		}
+		if (this.writeStreamContentStart < 0) {
+			const opener = /"content"\s*:\s*"/.exec(streamText);
+			if (opener === null) return;
+			this.writeStreamContentStart = opener.index + opener[0].length;
+			this.writeStreamNlScanOffset = this.writeStreamContentStart;
+			this.writeStreamNlCount = 0;
+			const filePath = extractPartialStringField(streamText, "file_path") ?? extractPartialStringField(streamText, "path") ?? "";
+			this.writeStreamLang = langFromPath(filePath);
+		}
+		const contentStart = this.writeStreamContentStart;
+		const tailStart = Math.max(contentStart, streamText.length - ToolCallComponent.WRITE_STREAM_TAIL_RAW_CHARS);
+		while (this.writeStreamNlScanOffset < tailStart) {
+			const idx = streamText.indexOf("\\n", this.writeStreamNlScanOffset);
+			if (idx === -1 || idx >= tailStart) break;
+			this.writeStreamNlCount++;
+			this.writeStreamNlScanOffset = idx + 2;
+		}
+		let fragmentStart = tailStart;
+		if (tailStart > contentStart) {
+			const firstNl = streamText.indexOf("\\n", tailStart);
+			if (firstNl === -1) return;
+			fragmentStart = firstNl + 2;
+		}
+		const fragmentEnd = Math.min(streamText.length, fragmentStart + ToolCallComponent.WRITE_STREAM_TAIL_RAW_CHARS);
+		const fragment = unescapeJsonStringValue(streamText, fragmentStart, fragmentEnd);
+		if (fragment.length === 0) return;
+		const lines = highlightLines(fragment, this.writeStreamLang);
+		const displayLines = lines.slice(-10);
+		const firstFragmentLineNo = this.writeStreamNlCount + (tailStart > contentStart ? 2 : 1);
+		const skipped = lines.length - displayLines.length;
+		for (const [i, line] of displayLines.entries()) {
+			const lineNum = chalk.dim(String(firstFragmentLineNo + skipped + i).padStart(4) + "  ");
+			this.addChild(new Text(lineNum + line, 2, 0));
+		}
+	}
 	buildPlanPreview() {
 		const plan = this.resolvePlanForPreview();
 		if (plan.length === 0) return;
@@ -132341,35 +132285,39 @@ async function handleUpdateCommand(host) {
 * /mcp — MCP 服务器管理面板。
 *
 * 查看已安装的 MCP 服务器状态，一键安装推荐服务器。 */
-const RECOMMENDED = [{
-	name: "peekaboo",
-	displayName: "Peekaboo",
-	description: t("mcp.desktop_desc"),
-	command: "npx",
-	args: [
-		"-y",
-		"@steipete/peekaboo",
-		"mcp"
-	],
-	macOnly: true
-}, {
-	name: "chrome-devtools",
-	displayName: "Chrome DevTools",
-	description: t("mcp.browser_desc"),
-	command: "npx",
-	args: [
-		"-y",
-		"chrome-devtools-mcp@latest",
-		"--no-usage-statistics"
-	]
-}];
-const STATUS_LABELS = {
-	pending: t("mcp.connecting"),
-	connected: t("mcp.connected"),
-	failed: t("mcp.failed"),
-	disabled: t("mcp.disabled"),
-	"needs-auth": t("mcp.auth_required")
-};
+function getRecommended() {
+	return [{
+		name: "peekaboo",
+		displayName: "Peekaboo",
+		description: t("mcp.desktop_desc"),
+		command: "npx",
+		args: [
+			"-y",
+			"@steipete/peekaboo",
+			"mcp"
+		],
+		macOnly: true
+	}, {
+		name: "chrome-devtools",
+		displayName: "Chrome DevTools",
+		description: t("mcp.browser_desc"),
+		command: "npx",
+		args: [
+			"-y",
+			"chrome-devtools-mcp@latest",
+			"--no-usage-statistics"
+		]
+	}];
+}
+function getStatusLabels() {
+	return {
+		pending: t("mcp.connecting"),
+		connected: t("mcp.connected"),
+		failed: t("mcp.failed"),
+		disabled: t("mcp.disabled"),
+		"needs-auth": t("mcp.auth_required")
+	};
+}
 async function handleMcpCommand(host, _args) {
 	if (!host.session) {
 		host.showError(t("mcp.no_session"));
@@ -132438,7 +132386,7 @@ function buildRows(servers) {
 			status: "__section"
 		});
 		for (const s of servers) {
-			const statusLabel = STATUS_LABELS[s.status] ?? s.status;
+			const statusLabel = getStatusLabels()[s.status] ?? s.status;
 			const toolInfo = s.status === "connected" ? `${s.toolCount} tools` : "";
 			const errorInfo = s.error ? ` — ${sanitizeDesc(s.error)}` : "";
 			rows.push({
@@ -132467,7 +132415,7 @@ function buildRows(servers) {
 		label: "── " + t("mcp.recommended") + " ──",
 		status: "__section"
 	});
-	for (const rec of RECOMMENDED) {
+	for (const rec of getRecommended()) {
 		const alreadyInstalled = installedNames.has(rec.name);
 		const platformUnavailable = rec.macOnly && process.platform !== "darwin";
 		rows.push({
@@ -132486,7 +132434,7 @@ async function handleEnter(host, row) {
 			host.showStatus(t("mcp.already_installed", { name: row.label }));
 			return;
 		}
-		const rec = RECOMMENDED.find((r) => r.name === row.name);
+		const rec = getRecommended().find((r) => r.name === row.name);
 		if (!rec) return;
 		await installMcp(host, rec);
 	} else if (row.kind === "installed" && row.status && row.status !== "__section" && row.status !== "__empty") if (row.status === "connected") await disableMcp(host, row.name);
@@ -133189,7 +133137,7 @@ var MoonLoader = class extends Text {
 		const frame = this.frames[this.currentFrame];
 		const coloredFrame = this.colorFn ? this.colorFn(frame) : frame;
 		this.setText(this.label ? `${coloredFrame} ${this.label}` : coloredFrame);
-		this.ui.requestRender();
+		this.ui.requestComponentRender(this);
 	}
 };
 //#endregion
@@ -136492,6 +136440,9 @@ out.join('\n');
 function isWaylandSession(env) {
 	return Boolean(env["WAYLAND_DISPLAY"]) || env["XDG_SESSION_TYPE"] === "wayland";
 }
+function isX11Session(env) {
+	return Boolean(env["DISPLAY"]);
+}
 function isWSL(env) {
 	if (env["WSL_DISTRO_NAME"] !== void 0 || env["WSLENV"] !== void 0) return true;
 	try {
@@ -136829,7 +136780,7 @@ async function readClipboardMedia(options) {
 	if (platform === "linux") {
 		const wayland = isWaylandSession(env);
 		const wsl = isWSL(env);
-		if (wayland || wsl) {
+		if (wayland || wsl || isX11Session(env)) {
 			const fileMedia = readClipboardFileMediaViaWlPaste() ?? readClipboardFileMediaViaXclip();
 			if (fileMedia !== null) return fileMedia;
 			image = readClipboardImageViaWlPaste() ?? readClipboardImageViaXclip();
@@ -138122,9 +138073,9 @@ var SessionEventHandler = class {
 		const { streamingUI } = this.host;
 		const backgroundMeta = this.backgroundAgentMetadata.get(event.subagentId);
 		if (backgroundMeta !== void 0) {
+			const taskId = this.findAgentTaskId(event.subagentId);
 			this.backgroundAgentMetadata.delete(event.subagentId);
 			this.syncBackgroundAgentBadge();
-			const taskId = this.findAgentTaskId(event.subagentId);
 			if (taskId !== void 0 && this.backgroundTaskTranscriptedTerminal.has(taskId)) return;
 			if (taskId !== void 0) this.backgroundTaskTranscriptedTerminal.add(taskId);
 			const extras = event.resultSummary === void 0 ? void 0 : { resultSummary: event.resultSummary };
@@ -138145,6 +138096,7 @@ var SessionEventHandler = class {
 		const { streamingUI } = this.host;
 		const backgroundMeta = this.backgroundAgentMetadata.get(event.subagentId);
 		if (backgroundMeta !== void 0) {
+			const taskId = this.findAgentTaskId(event.subagentId);
 			this.backgroundAgentMetadata.delete(event.subagentId);
 			this.syncBackgroundAgentBadge();
 			streamingUI.applyBackgroundTaskTerminalStatus({
@@ -138153,7 +138105,6 @@ var SessionEventHandler = class {
 				status: "failed",
 				errorText: event.error
 			});
-			const taskId = this.findAgentTaskId(event.subagentId);
 			if (taskId !== void 0 && this.backgroundTaskTranscriptedTerminal.has(taskId)) return;
 			if (taskId !== void 0) this.backgroundTaskTranscriptedTerminal.add(taskId);
 			this.appendBackgroundAgentEntry("failed", backgroundMeta, { error: event.error });
@@ -138297,18 +138248,21 @@ var SessionEventHandler = class {
 };
 //#endregion
 //#region src/tui/utils/media-url.ts
-const MEDIA_KIND_LABELS = {
-	audio: t("mediaurl.audio"),
-	image: t("mediaurl.image"),
-	video: t("mediaurl.video")
-};
+function getMediaKindLabels() {
+	return {
+		audio: t("mediaurl.audio"),
+		image: t("mediaurl.image"),
+		video: t("mediaurl.video")
+	};
+}
 function mediaUrlPartToText(kind, url) {
+	const labels = getMediaKindLabels();
 	const summary = summarizeDataUrl(url);
 	if (summary !== void 0) {
 		const size = summary.bytes !== void 0 ? `, ${formatByteSize(summary.bytes)}` : "";
-		return `[${MEDIA_KIND_LABELS[kind]} ${summary.mime}${size}]`;
+		return `[${labels[kind]} ${summary.mime}${size}]`;
 	}
-	return `<${MEDIA_KIND_LABELS[kind]} url="${escapeAttribute$1(url)}">`;
+	return `<${labels[kind]} url="${escapeAttribute$1(url)}">`;
 }
 function summarizeDataUrl(url) {
 	if (!url.startsWith("data:")) return void 0;
@@ -141457,7 +141411,7 @@ var PulseWaveLoader = class extends Text {
 			2
 		].map((idx) => this.renderCell(idx, step.active, step.forward));
 		this.setText(cells.join(" "));
-		this.ui.requestRender();
+		this.ui.requestComponentRender(this);
 	}
 	renderCell(index, active, forward) {
 		const distance = forward ? active - index : index - active;
@@ -142194,7 +142148,7 @@ function hslToHex(h, s, l) {
 	const toHex = (v) => Math.round((v + m) * 255).toString(16).padStart(2, "0");
 	return `#${toHex(rf)}${toHex(gf)}${toHex(bf)}`;
 }
-var InputController = class {
+var InputController = class InputController {
 	host;
 	lastHistoryContent;
 	breatheTimer = null;
@@ -142215,12 +142169,38 @@ var InputController = class {
 		};
 		if (this.host.state.appState.planMode === "off") this.#startBreathing();
 	}
+	pendingLargeInput = null;
+	static LARGE_INPUT_THRESHOLD = 5e3;
 	handleInput(text) {
+		if (this.pendingLargeInput !== null) {
+			const answer = text.trim().toLowerCase();
+			if (answer === "y" || answer === "yes") {
+				const pending = this.pendingLargeInput;
+				this.pendingLargeInput = null;
+				this.persistInputHistory(pending);
+				dispatchInput(this.host, pending);
+				this.host.stopMemoryIdleTimer();
+			} else {
+				const pending = this.pendingLargeInput;
+				this.pendingLargeInput = null;
+				this.host.showStatus(t("input.large_cancelled"), this.host.state.theme.colors.textDim);
+				if (answer !== "n" && answer !== "no" && text.trim().length > 0) {
+					this.host.state.editor.setText(pending);
+					this.handleInput(text);
+				} else this.host.state.editor.setText(pending);
+			}
+			return;
+		}
 		if (text.trim().length === 0) return;
 		if (this.host.state.appState.isReplaying) {
 			this.host.showError(t("input.replay_blocked"));
 			return;
 		}
+		if (text.length > InputController.LARGE_INPUT_THRESHOLD) {
+			this.pendingLargeInput = text;
+			this.host.showStatus(t("input.large_confirm", { count: text.length }), this.host.state.theme.colors.warning);
+			return;
+		}
 		this.persistInputHistory(text);
 		dispatchInput(this.host, text);
 		this.host.stopMemoryIdleTimer();
@@ -143030,6 +143010,8 @@ var CustomEditor = class extends Editor {
 	thinking = false;
 	/** Current thinking effort level (e.g. low, medium, high). Used to annotate the think label. */
 	thinkingLevel = "off";
+	/** Current permission mode — always shown as a badge at the top-left of the input box border. */
+	permissionMode = "manual";
 	/** Current border colour hex — kept in sync with borderColor by the host. */
 	borderHex = "";
 	consumingPaste = false;
@@ -143090,7 +143072,13 @@ var CustomEditor = class extends Editor {
 			const withPrompt = injectPromptSymbol(firstContent);
 			if (withPrompt !== void 0) lines[firstContentIdx] = withPrompt;
 		}
-		if (this.thinking) injectThinkLabel(lines, width, this.thinkingLevel, this.borderColor ?? ((s) => s), this.borderHex);
+		injectBorderBadges(lines, width, {
+			mode: this.permissionMode,
+			thinking: this.thinking,
+			thinkingLevel: this.thinkingLevel,
+			paint: this.borderColor ?? ((s) => s),
+			borderHex: this.borderHex
+		});
 		return lines;
 	}
 	handleInput(data) {
@@ -143223,34 +143211,47 @@ function injectPromptSymbol(line) {
 	return "> " + line.slice(2);
 }
 const THINK_LABEL_MIN_WIDTH = 14;
+const MODE_BADGE_MIN_WIDTH = 10;
 function isLightBg(hex) {
 	const r = parseInt(hex.slice(1, 3), 16);
 	const g = parseInt(hex.slice(3, 5), 16);
 	const b = parseInt(hex.slice(5, 7), 16);
 	return (.299 * r + .587 * g + .114 * b) / 255 > .5;
 }
+function makeBadge(label, bgHex) {
+	return bgHex ? chalk.bgHex(bgHex).hex(isLightBg(bgHex) ? "#000000" : "#FFFFFF")(label) : chalk.bgBlack.white(label);
+}
 /**
-* Embed a small "think" badge into the top border line of the editor.
-* The label only appears when the active model has thinking enabled.
-* Works with pi-tui's flat two-line design (no side borders).
-*
-* The badge uses the border colour as background with black text for
-* maximum contrast against the bright border colours (yellow-green,
-* cyan, amber) used across themes.
+* Compose the editor's top border line with up to two badges: the
+* permission mode badge at the left (always shown) and the think badge at
+* the right (only when thinking is enabled). Each badge is a solid colour
+* block with black/white text picked by background luminance. When the
+* editor is scrolled, pi-tui's `↑ N more` indicator keeps the line — it
+* signals hidden content, which matters more than the badges. On narrow
+* terminals the think badge drops first, then the mode badge.
 */
-function injectThinkLabel(lines, width, thinkingLevel, paint, borderHex) {
-	if (width < THINK_LABEL_MIN_WIDTH) return;
+function injectBorderBadges(lines, width, opts) {
 	const topIdx = lines.findIndex((line) => {
 		const plain = stripSgr(line);
 		return plain.length > 0 && plain[0] === "─";
 	});
 	if (topIdx === -1) return;
-	const label = thinkingLevel !== "off" ? ` Think ${thinkingLevel} ` : " Think ";
-	const badge = borderHex ? chalk.bgHex(borderHex).hex(isLightBg(borderHex) ? "#000000" : "#FFFFFF")(label) : chalk.bgBlack.white(label);
-	const badgeVis = visibleWidth(badge);
-	const leftDashCount = width - 1 - badgeVis;
-	if (leftDashCount < 1) return;
-	lines[topIdx] = paint("─".repeat(leftDashCount)) + badge + paint("─");
+	if (stripSgr(lines[topIdx]).includes("↑")) return;
+	const { paint } = opts;
+	let left = "";
+	let right = paint("─");
+	if (width >= MODE_BADGE_MIN_WIDTH) {
+		const badgeText = ` ${opts.mode} `;
+		left = paint("──") + (opts.borderHex ? chalk.hex(opts.borderHex).bold(badgeText) : paint(badgeText));
+	}
+	if (opts.thinking && width >= THINK_LABEL_MIN_WIDTH) right = makeBadge(opts.thinkingLevel !== "off" ? ` Think ${opts.thinkingLevel} ` : " Think ", opts.borderHex) + paint("─");
+	const fill = width - visibleWidth(left) - visibleWidth(right);
+	if (fill < 0) {
+		const modeOnlyFill = width - visibleWidth(left) - 1;
+		lines[topIdx] = modeOnlyFill >= 0 ? left + paint("─".repeat(modeOnlyFill)) + paint("─") : paint("─".repeat(width));
+		return;
+	}
+	lines[topIdx] = left + paint("─".repeat(fill)) + right;
 }
 //#endregion
 //#region src/tui/utils/terminal-state.ts
@@ -143491,6 +143492,7 @@ function createTUIState(options) {
 	const editor = new CustomEditor(ui, theme.colors);
 	editor.thinking = initialAppState.thinkingLevel !== "off";
 	editor.thinkingLevel = initialAppState.thinkingLevel;
+	editor.permissionMode = initialAppState.permissionMode ?? "manual";
 	return {
 		ui,
 		terminal,
@@ -144110,11 +144112,17 @@ var SessionManager = class {
 		}
 		if (isBusy(this.host.state.appState)) {
 			this.host.showError(t("session.switch_streaming"));
-			return { switched: false };
+			return {
+				switched: false,
+				blocked: true
+			};
 		}
 		if (this.host.state.appState.isReplaying) {
 			this.host.showError(t("session.switch_replaying"));
-			return { switched: false };
+			return {
+				switched: false,
+				blocked: true
+			};
 		}
 		let session;
 		try {
@@ -146025,12 +146033,12 @@ var DialogManager = class {
 				const row = this.host.getSessions().find((s) => s.id === pickerId);
 				const isCc = row?.metadata?.["source"] === "cc-connect";
 				const realId = isCc ? row.metadata["agentSessionId"] : pickerId;
-				this.host.resumeSession(realId).then(async (switched) => {
+				this.host.resumeSession(realId).then(async ({ switched, blocked }) => {
 					if (switched) {
 						this.hideSessionPicker();
 						return;
 					}
-					if (isCc) try {
+					if (isCc && blocked !== true) try {
 						const session = await this.host.harness.createSession({
 							id: realId,
 							workDir: this.host.getCurrentWorkDir(),
@@ -146044,6 +146052,8 @@ var DialogManager = class {
 					} catch {
 						this.host.showError(t("dialog.create_session_failed"));
 					}
+				}).catch((error) => {
+					this.host.showError(error instanceof Error ? error.message : String(error));
 				});
 			},
 			onCancel,
@@ -146056,6 +146066,8 @@ var DialogManager = class {
 					await this.host.fetchSessions();
 					if (this.host.getSessions().length === 0) this.hideSessionPicker();
 					else if (this.host.state.activeDialog === "session-picker") this.mountSessionPicker(onCancel);
+				}).catch((error) => {
+					this.host.showError(error instanceof Error ? error.message : String(error));
 				});
 			}
 		}));
@@ -146576,6 +146588,7 @@ var ScreamTUI = class {
 			this.state.editor.thinking = patch.thinkingLevel !== "off";
 			this.state.editor.thinkingLevel = patch.thinkingLevel ?? "off";
 		}
+		if ("permissionMode" in patch) this.state.editor.permissionMode = patch.permissionMode ?? "manual";
 		if ("streamingPhase" in patch && patch.streamingPhase !== "idle") {
 			this.transcriptController.stopWelcomeBreathing();
 			this.inputController.stopBreathingForStreaming();
@@ -146630,7 +146643,11 @@ var ScreamTUI = class {
 		this.sessionManager.resetSessionRuntime();
 	}
 	async resumeSession(targetSessionId) {
-		return (await this.sessionManager.resumeSession(targetSessionId)).switched;
+		const result = await this.sessionManager.resumeSession(targetSessionId);
+		return {
+			switched: result.switched,
+			blocked: result.blocked
+		};
 	}
 	async switchToSession(session, statusMessage) {
 		await this.sessionManager.switchToSession(session, statusMessage);
@@ -146775,6 +146792,8 @@ const SHADOW_CHARS = new Set([
 const SHEEN_STEP = 4;
 const SHEEN_INTERVAL_MS = 60;
 const LOADING_DURATION_MS = 1500;
+const FULL_LOGO_MIN_COLS = 87;
+const COMPACT_LOGO = ["██▄▄▄██", "▐█▄▀▄█▌"];
 const THEME_PRIMARY = {
 	dark: [
 		204,
@@ -146963,7 +146982,9 @@ function supportsAnsi() {
 }
 function runLoadingAnimation(theme = "dark") {
 	if (!supportsAnsi()) {
-		for (const line of LOGO) stdout.write(`${fg(...LOGO_RGB)}${line}${RESET}\n`);
+		const { cols } = getTerminalSize();
+		if (cols >= FULL_LOGO_MIN_COLS) for (const line of LOGO) stdout.write(`${fg(...LOGO_RGB)}${line}${RESET}\n`);
+		else for (const line of COMPACT_LOGO) stdout.write(`${fg(...BLOCK_RGB)}${line}${RESET}\n`);
 		stdout.write(`${BOLD}${fg(...THEME_PRIMARY[theme])}${t("loading.waking")}${RESET}\n`);
 		return Promise.resolve();
 	}
@@ -146981,15 +147002,20 @@ function runLoadingAnimation(theme = "dark") {
 		function render() {
 			const { cols, rows } = getTerminalSize();
 			const lines = [];
-			const contentHeight = LOGO.length + 5;
+			const useFullLogo = cols >= FULL_LOGO_MIN_COLS;
+			const contentHeight = useFullLogo ? LOGO.length + 5 : COMPACT_LOGO.length + 5;
 			const topPad = Math.max(0, Math.floor((rows - contentHeight) / 2));
 			for (let i = 0; i < topPad; i++) lines.push("");
 			const breatheColor = breathePalette[breatheFrame] ?? primary;
-			for (const line of LOGO) {
+			if (useFullLogo) for (const line of LOGO) {
 				let colored = "";
 				for (let ci = 0; ci < line.length; ci++) colored += renderSheen(line[ci], ci, sheenPos, isReversing, breatheColor);
 				lines.push(centerPad(colored, cols));
 			}
+			else for (const line of COMPACT_LOGO) {
+				const colored = `${fg(...BLOCK_RGB)}${line}${RESET}`;
+				lines.push(centerPad(colored, cols));
+			}
 			lines.push("");
 			if (phase === "loading") lines.push(centerPad(renderShimmer(shimmerPulse, breatheColor), cols));
 			else lines.push(centerPad(`${BOLD}${fg(...breatheColor)}${t("loading.press_enter")}${RESET}`, cols));
@@ -147046,7 +147072,9 @@ function runLoadingAnimation(theme = "dark") {
 			process$1.off("SIGTERM", interrupt);
 			stdout.write("\x1B[?25h");
 			if (process$1.platform !== "win32") stdout.write("\x1B[?1049l");
-			for (const line of LOGO) stdout.write(`${fg(...LOGO_RGB)}${line}${RESET}\n`);
+			const { cols: fallbackCols } = getTerminalSize();
+			if (fallbackCols >= FULL_LOGO_MIN_COLS) for (const line of LOGO) stdout.write(`${fg(...LOGO_RGB)}${line}${RESET}\n`);
+			else for (const line of COMPACT_LOGO) stdout.write(`${fg(...BLOCK_RGB)}${line}${RESET}\n`);
 			stdout.write(`${BOLD}${fg(...primary)}${t("loading.waking")}${RESET}\n`);
 			resolve();
 			return;
@@ -147700,6 +147728,27 @@ async function runStreamJson(opts) {
 			hasAppendPrompt: appendPrompt.length > 0
 		});
 	}
+	let cleaned = false;
+	const runCleanup = async () => {
+		if (cleaned) return;
+		cleaned = true;
+		for (const [, pending] of pendingApprovals) pending.resolve({
+			decision: "rejected",
+			feedback: "会话已结束"
+		});
+		pendingApprovals.clear();
+		if (currentSessionId) writer.emitResumeHint(sessionKey);
+		try {
+			if (session) await session.close();
+			await harness.close();
+		} catch {}
+		if (injectedAgentsMd) try {
+			if (originalAgentsMd === void 0) {
+				if (existsSync(agentsMdPath)) unlinkSync(agentsMdPath);
+			} else writeFileSync(agentsMdPath, originalAgentsMd, "utf-8");
+		} catch {}
+	};
+	const uninstallTerminationHandlers = installStreamJsonTerminationHandlers(runCleanup);
 	try {
 		await harness.ensureConfigFile();
 		const config = await harness.getConfig();
@@ -147934,7 +147983,7 @@ async function runStreamJson(opts) {
 			});
 			session.prompt(userText).catch((error) => {
 				const msg = error instanceof Error ? error.message : String(error);
-				if (msg.includes("insufficient tool messages") || msg.includes("tool_calls")) {
+				if (msg.includes("insufficient tool messages") || msg.includes("tool_calls") && msg.includes("followed by tool messages")) {
 					log.warn("stream-json: resetting session after tool call mismatch", {
 						sessionId: session?.id,
 						error: msg
@@ -147952,7 +148001,9 @@ async function runStreamJson(opts) {
 				}
 				finish(error instanceof Error ? error : new Error(msg));
 			});
-			await turnPromise;
+			try {
+				await turnPromise;
+			} catch {}
 		}
 	} catch (error) {
 		if (process.exitCode === void 0) {
@@ -147961,23 +148012,35 @@ async function runStreamJson(opts) {
 			process.exitCode = 1;
 		} else log.error("stream-json: turn error (exitCode already set)", { error });
 	} finally {
-		for (const [, pending] of pendingApprovals) pending.resolve({
-			decision: "rejected",
-			feedback: "会话已结束"
-		});
-		pendingApprovals.clear();
-		if (currentSessionId) writer.emitResumeHint(sessionKey);
-		try {
-			if (session) await session.close();
-			await harness.close();
-		} catch {}
-		if (injectedAgentsMd) try {
-			if (originalAgentsMd === void 0) {
-				if (existsSync(agentsMdPath)) unlinkSync(agentsMdPath);
-			} else writeFileSync(agentsMdPath, originalAgentsMd, "utf-8");
-		} catch {}
+		uninstallTerminationHandlers();
+		await runCleanup();
 	}
 }
+/** Install termination handlers so we can clean up on SIGINT / SIGTERM. */
+function installStreamJsonTerminationHandlers(cleanup) {
+	let terminating = false;
+	const handler = async (signal) => {
+		if (terminating) return;
+		terminating = true;
+		try {
+			await cleanup();
+		} finally {
+			process.exit(signal === "SIGINT" ? 130 : 143);
+		}
+	};
+	const onSigint = () => {
+		handler("SIGINT");
+	};
+	const onSigterm = () => {
+		handler("SIGTERM");
+	};
+	process.once("SIGINT", onSigint);
+	process.once("SIGTERM", onSigterm);
+	return () => {
+		process.off("SIGINT", onSigint);
+		process.off("SIGTERM", onSigterm);
+	};
+}
 //#endregion
 //#region src/cli/startup-error.ts
 function formatUnknownErrorMessage(error) {