@dsh-workbench/core 1.1.14 → 1.1.16

package/dist/host/index.js

@@ -1,7 +1,7 @@
 import { homedir, tmpdir } from "node:os";
 import dayjs from "dayjs";
-import fs, { accessSync, closeSync, constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
-import path, { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import fs, { accessSync, appendFileSync, closeSync, constants, copyFileSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import path, { basename, dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 import writeFileAtomic from "write-file-atomic";
 import utc from "dayjs/plugin/utc.js";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -782,6 +782,15 @@ function writeTextFile(path, text, options = {}) {
 	writeFileAtomic.sync(path, text, atomicOptionsOf(mode, options));
 }
 /**
+* 往文件末尾追加文本；文件或目录不存在就建。追加不是原子写，只给「日志/采集」这类只增不改的流。
+* @param path 目标文件。
+* @param text 追加内容。
+*/
+function appendTextFile(path, text) {
+	mkdirSync(dirname(path), { recursive: true });
+	appendFileSync(path, text, { mode: modeOf(path, "keep") });
+}
+/**
 * `writeTextFile` 的异步版；语义与默认值相同。
 * @param path 目标文件。
 * @param text 文本内容。
@@ -3805,7 +3814,7 @@ function registerDiyRecordAct(ctx, resource, log) {
 }
 //#endregion
 //#region ../shared/dist/host/long-task.js
-var LIVE = /* @__PURE__ */ new Set(["running", "needs-login"]);
+var LIVE$1 = /* @__PURE__ */ new Set(["running", "needs-login"]);
 var RECENT_MS = 6e5;
 function createLongTaskRegistry(deps) {
 	const runs = /* @__PURE__ */ new Map();
@@ -3817,7 +3826,7 @@ function createLongTaskRegistry(deps) {
 	const listeners = /* @__PURE__ */ new Set();
 	const live = (id) => {
 		const current = runs.get(id);
-		if (current === void 0 || !LIVE.has(current.status)) return null;
+		if (current === void 0 || !LIVE$1.has(current.status)) return null;
 		return current;
 	};
 	const notify = (change) => {
@@ -3854,13 +3863,13 @@ function createLongTaskRegistry(deps) {
 				if (snapshot.workspace !== workspace) continue;
 				newest.set(snapshot.target, snapshot);
 			}
-			return [...newest.values()].filter((snapshot) => LIVE.has(snapshot.status) || epochOf(snapshot.at) >= floor).reverse().map((snapshot) => ({
+			return [...newest.values()].filter((snapshot) => LIVE$1.has(snapshot.status) || epochOf(snapshot.at) >= floor).reverse().map((snapshot) => ({
 				...deps.view(snapshot),
 				id: snapshot.id
 			}));
 		},
 		live() {
-			return [...runs.values()].filter((snapshot) => LIVE.has(snapshot.status));
+			return [...runs.values()].filter((snapshot) => LIVE$1.has(snapshot.status));
 		},
 		start(options) {
 			const running = this.active(options.workspace, options.target);
@@ -5137,6 +5146,33 @@ function createWorkspaceStore(options) {
 	};
 }
 //#endregion
+//#region ../shared/dist/host/shell-render.js
+var QUOTED_HEAD = /^\s*['"]/;
+function callOperatorOf(kind, script) {
+	if (kind !== "pwsh" || !QUOTED_HEAD.test(script)) return script;
+	return `& ${script}`;
+}
+function invocationOf(kind, script) {
+	return kind === "pwsh" ? {
+		file: "pwsh",
+		args: [
+			"-NoProfile",
+			"-NonInteractive",
+			"-Command",
+			callOperatorOf("pwsh", script)
+		]
+	} : {
+		file: "bash",
+		args: ["-c", script]
+	};
+}
+function quotedArgvLine(argv, platform = process.platform) {
+	return argv.map((one) => quoteShellArgFor(one, platform)).join(" ");
+}
+function quotedLineOf(invocation, platform = process.platform) {
+	return quotedArgvLine([invocation.file, ...invocation.args], platform);
+}
+//#endregion
 //#region ../shared/dist/host/shell.js
 var DEFAULT_MAX_BYTES$3 = 8388608;
 var GUARD_SLACK_MS = 1e3;
@@ -5208,7 +5244,7 @@ function insideOf(root, path) {
 }
 function productPolicy(ceiling, productRoot) {
 	return {
-		mode: ceiling === "read-only" ? "read-only" : "workspace-write",
+		mode: ceiling === "read-only" ? "read-only" : ceiling === "danger-full-access" ? "danger-full-access" : "workspace-write",
 		workspaceRoot: resolve(productRoot)
 	};
 }
@@ -5221,6 +5257,9 @@ function workspacePolicy(ceiling, grant) {
 		workspaceRoot: resolve(grant.workspaceRoot)
 	};
 }
+function atFilesystemRoot(path) {
+	return parse(path).root === path;
+}
 function commonDirectory(paths) {
 	const dirs = paths.map((path) => dirname(resolve(path)));
 	let shared = dirs[0];
@@ -5233,8 +5272,8 @@ function pathsPolicy(ceiling, paths) {
 	if (!paths.every((path) => isAbsolute(path))) throw new SeamError("paths-span-trees", "外部路径必须是绝对路径");
 	if (ceiling === "read-only") throw new SeamError("read-only", "当前部署是只读模式：这条命令不能写外部路径");
 	const root = commonDirectory(paths);
-	if (root === void 0 || root === sep && paths.length > 1) throw new SeamError("paths-span-trees", "这次写入跨了多个目录：请分开做，或把产物改到工作台目录");
-	if (root === sep) throw new SeamError("paths-span-trees", "不能把整个文件系统声明成写入域");
+	if (root === void 0) throw new SeamError("paths-span-trees", "这次写入没有给出任何路径");
+	if (atFilesystemRoot(root)) throw new SeamError("paths-span-trees", paths.length > 1 ? "这次写入跨了多个目录：请分开做，或把产物改到工作台目录" : "不能把整个文件系统声明成写入域");
 	return {
 		mode: "workspace-write",
 		workspaceRoot: root
@@ -5422,23 +5461,9 @@ function targetOf(request) {
 	throw new SeamError("scope-not-declared", "这条执行请求要么给 argv，要么给一条命令行，不能两个都给或都不给");
 }
 function displayOf(target) {
-	return "argv" in target ? target.argv.map((one) => quoteShellArg(one)).join(" ") : target.line;
+	return "argv" in target ? quotedArgvLine(target.argv) : target.line;
 }
-function shellInvocationOf(shellKind, line) {
-	return shellKind === "pwsh" ? {
-		file: "pwsh",
-		args: [
-			"-NoProfile",
-			"-NonInteractive",
-			"-Command",
-			line
-		]
-	} : {
-		file: "bash",
-		args: ["-c", line]
-	};
-}
-function invocationOf(target, shellKind) {
+function targetInvocationOf(target, shellKind) {
 	if ("argv" in target) {
 		const [file, ...args] = target.argv;
 		if (file === void 0) throw new SeamError("scope-not-declared", "argv 是空的：至少给一个可执行文件");
@@ -5447,13 +5472,12 @@ function invocationOf(target, shellKind) {
 			args
 		};
 	}
-	return shellInvocationOf(shellKind ?? shellKindOf(), target.line);
+	return invocationOf(shellKind ?? shellKindOf(), target.line);
 }
 function sandboxedLineOf(target, shellKind) {
-	if ("argv" in target) return target.argv.map((one) => quoteShellArg(one)).join(" ");
-	if (shellKind === void 0) return target.line;
-	const invocation = shellInvocationOf(shellKind, target.line);
-	return [invocation.file, ...invocation.args].map((one) => quoteShellArg(one)).join(" ");
+	const line = "argv" in target ? quotedArgvLine(target.argv) : target.line;
+	if (shellKind === void 0) return callOperatorOf(shellKindOf(), line);
+	return callOperatorOf(shellKindOf(), quotedLineOf(invocationOf(shellKind, line)));
 }
 function createSeam(ports) {
 	const runtimeRoot = ports.runtimeRoot ?? workbenchRoot();
@@ -5505,7 +5529,7 @@ function createSeam(ports) {
 		}
 	}
 	async function runHost(request, target) {
-		const invocation = invocationOf(target, request.shellKind);
+		const invocation = targetInvocationOf(target, request.shellKind);
 		const child = processes.spawn({
 			file: invocation.file,
 			args: invocation.args,
@@ -5561,7 +5585,7 @@ function createSeam(ports) {
 		};
 	}
 	function spawnHost(request) {
-		const invocation = invocationOf(request.target, void 0);
+		const invocation = targetInvocationOf(request.target, void 0);
 		const logFile = request.logFile ?? join(runtimeRoot, "logs", `${request.label ?? "spawn"}-${String(now())}.log`);
 		mkdirSync(dirname(logFile), { recursive: true });
 		const child = processes.spawn({
@@ -5625,7 +5649,7 @@ function createSeam(ports) {
 		};
 	}
 	function openHost(request) {
-		const invocation = invocationOf(request.target, void 0);
+		const invocation = targetInvocationOf(request.target, void 0);
 		const child = processes.spawn({
 			file: invocation.file,
 			args: invocation.args,
@@ -10130,25 +10154,6 @@ function actErrorOf(step) {
 	return step.stderr || step.stdout || "运行时报了个错";
 }
 var SWEEP_TIMEOUT_MS = 4e3;
-async function stopNetworkExact(seam, file, timeoutMs = SWEEP_TIMEOUT_MS) {
-	const pidFile = quoteShellArg(`${file}.pid`);
-	const reaperFile = quoteShellArg(`${file}.reaper`);
-	const line = [
-		`p="$(cat ${pidFile} 2>/dev/null)"`,
-		`r="$(cat ${reaperFile} 2>/dev/null)"`,
-		`[ -n "$p" ] && pkill -P "$p" 2>/dev/null`,
-		`[ -n "$p" ] && kill "$p" 2>/dev/null`,
-		`[ -n "$r" ] && pkill -P "$r" 2>/dev/null`,
-		`[ -n "$r" ] && kill "$r" 2>/dev/null`,
-		`if [ "$(cat ${pidFile} 2>/dev/null)" = "$p" ]; then rm -f ${pidFile} ${reaperFile}; fi`,
-		"true"
-	].join("; ");
-	return (await seam.run({
-		command: line,
-		intent: productWrite(),
-		timeoutMs
-	})).exitCode === 0;
-}
 //#endregion
 //#region src/modules/panels/model/diy-logs.ts
 var LOGS_KEY = "__dshDiyLogs";
@@ -10639,7 +10644,7 @@ function wrapFirst(argv, card) {
 	if (first === void 0 || first.startsWith("-")) return [...argv];
 	return [evalWrapped(first, card), ...argv.slice(1)];
 }
-function argvOf(row, raw, unit) {
+function argvOf$1(row, raw, unit) {
 	const card = cardSelectorIn(unit);
 	const declared = stringsOf$1(raw["args"]);
 	const tokens = withToken(row.evalInCard === true && asText(raw["in"]) === "card" ? wrapFirst(declared, card) : declared, card);
@@ -10925,7 +10930,7 @@ async function runBrowserTool(row, ctx, raw, exec) {
 	if (needsCardOf(row, page.args) && page.unit === "") throw new Error("要卡作用域（scope=card / $card / in=card）就得给一个 unit —— 这个工作区里不止一个模块时，我不知道你说哪一张卡。");
 	const requested = asNumber(page.args["timeoutMs"]);
 	const timeoutMs = requested !== void 0 && requested > 0 ? requested : DEFAULT_TIMEOUT_MS$4;
-	const argv = argvOf(row, page.args, page.unit);
+	const argv = argvOf$1(row, page.args, page.unit);
 	const clip = row.clip === true ? clipOf(page.args["clip"]) : void 0;
 	const clipAsked = row.clip === true && page.args["clip"] !== void 0;
 	let file = "";
@@ -11076,8 +11081,17 @@ function prepareStaging(unit, resume) {
 		force: true
 	});
 	mkdirSync(staging, { recursive: true });
+	if (resume) seedJournal(staging, unit);
 	return staging;
 }
+function seedJournal(staging, unit) {
+	const to = journalFileOf(staging, unit);
+	if (existsSync(to)) return;
+	const from = join(workbenchRoot(), "releases", `${unit}.json`);
+	if (!existsSync(from)) return;
+	mkdirSync(dirname(to), { recursive: true });
+	copyFileSync(from, to);
+}
 function cleanupStaging(unit) {
 	rmSync(stagingDirOf(unit), {
 		recursive: true,
@@ -11136,13 +11150,34 @@ function resumablePayload(payload, unit) {
 }
 function outcomeOf$1(result, unit) {
 	const payload = jsonOf(result.stdout);
-	if (result.exitCode === 3 && payload !== void 0) return { payload: needsUserPayload(payload) };
-	if (result.exitCode === 4 && payload !== void 0) return { payload: resumablePayload(payload, unit) };
+	if (result.exitCode === 3 && payload !== void 0) return {
+		kind: "needs-user",
+		payload: needsUserPayload(payload)
+	};
+	if (result.exitCode === 4 && payload !== void 0) return {
+		kind: "resumable",
+		payload: resumablePayload(payload, unit)
+	};
 	if (result.exitCode !== 0 || payload === void 0) {
 		const tail = `${result.stderr}\n${result.stdout}`.trim().split("\n").slice(-6).join(" | ");
-		return { error: /* @__PURE__ */ new Error(`发布没走通（exit ${String(result.exitCode)}）${tail === "" ? "" : `：${tail}`}`) };
+		return {
+			kind: "failed",
+			error: /* @__PURE__ */ new Error(`发布没走通（exit ${String(result.exitCode)}）${tail === "" ? "" : `：${tail}`}`)
+		};
+	}
+	return {
+		kind: "done",
+		payload
+	};
+}
+function publishProblemOf(payload) {
+	if (payload["ok"] === false) {
+		const reason = asText(payload["text"]);
+		return `市场索引这一步回的是失败，这次没发出去${reason === "" ? "" : `：${reason}`}`;
 	}
-	return { payload };
+	if (asText(payload["target"]) !== "market") return void 0;
+	if (asText(asRecord$1(payload["market"])["url"]) !== "" && asText(payload["install"]) !== "") return void 0;
+	return "市场索引这一步没给出市场地址或安装命令 —— 这次没发出去。重发一次；再这样先把本地索引镜像同步到 origin 再发。";
 }
 function successPayloadOf(payload, found, options) {
 	const name = asText(payload["name"]);
@@ -11313,7 +11348,8 @@ function registerPublishTool(ctx, tools, deps) {
 			});
 			if (verify || refresh) {
 				const outcome = outcomeOf$1(await run([], { intent: productWrite() }), found.unit);
-				if ("error" in outcome) throw outcome.error;
+				if (outcome.kind === "failed") throw outcome.error;
+				if (outcome.kind !== "done") return plainJson(outcome.payload);
 				return plainJson(successPayloadOf(outcome.payload, found, { verify }));
 			}
 			const staging = prepareStaging(found.unit, resume);
@@ -11325,7 +11361,8 @@ function registerPublishTool(ctx, tools, deps) {
 				env
 			}), found.unit);
 			mirrorJournal(staging, found.unit);
-			if ("error" in firstOutcome) throw firstOutcome.error;
+			if (firstOutcome.kind === "failed") throw firstOutcome.error;
+			if (firstOutcome.kind !== "done") return plainJson(firstOutcome.payload);
 			const first = firstOutcome.payload;
 			if (first["stop"] !== "workspace-only" || asText(first["target"]) === "local") {
 				cleanupStaging(found.unit);
@@ -11336,9 +11373,13 @@ function registerPublishTool(ctx, tools, deps) {
 				env
 			}), found.unit);
 			mirrorJournal(staging, found.unit);
-			if ("error" in indexOutcome) throw indexOutcome.error;
+			if (indexOutcome.kind === "failed") throw indexOutcome.error;
+			if (indexOutcome.kind !== "done") return plainJson(indexOutcome.payload);
+			const merged = adoptTarball(withPhasePayloads(first, indexOutcome.payload), found.unit);
+			const problem = publishProblemOf(merged);
+			if (problem !== void 0) throw new Error(problem);
 			cleanupStaging(found.unit);
-			return plainJson(successPayloadOf(adoptTarball(withPhasePayloads(first, indexOutcome.payload), found.unit), found, { verify: false }));
+			return plainJson(successPayloadOf(merged, found, { verify: false }));
 		}
 	};
 	return tools.register(publishTool);
@@ -11718,7 +11759,7 @@ function ageText(at, now) {
 function stampOf(at) {
 	return `${dayjs(at).utc().format("HH:mm:ss")}Z`;
 }
-function readText$1(read, now) {
+function readText$2(read, now) {
 	const when = `${stampOf(read.at)} · ${ageText(read.at, now)}`;
 	if (read.phase === "ready") return `${read.route} 读到了（${when}）`;
 	if (read.phase === "loading") return `${read.route} 正在读（${when}）`;
@@ -11735,7 +11776,7 @@ function renderPanel(options) {
 		const title = `—— ${row.unit}${row.name === "" ? "" : `（${row.name}）`} · ${healthText(row.health)}`;
 		const report = row.report;
 		if (report === void 0) return [title, `   没上报：卡片没渲染出来，或者用户那一页还没刷新到带这份补丁的版本`].join("\n");
-		const reads = report.cards.slice(0, 6).map((one) => `   数据 · ${readText$1(one, now)}`);
+		const reads = report.cards.slice(0, 6).map((one) => `   数据 · ${readText$2(one, now)}`);
 		const more = report.cards.length > 6 ? [`   数据 · …还有 ${String(report.cards.length - 6)} 条`] : [];
 		const crash = report.crash === void 0 ? "   崩过：没有" : `   崩过：是 —— ${report.crash.reason}（${stampOf(report.crash.at)} · 共 ${String(report.crash.count)} 次）`;
 		return [
@@ -12344,6 +12385,197 @@ function changelogOf(dir, version, note, kind) {
 	};
 }
 //#endregion
+//#region src/shared/api/host/diy-capture-live.ts
+var LIVE_POLL_MS = 3e3;
+var LIVE_ARM_MS = 2e3;
+var LIVE_SNAP_TIMEOUT_MS = 15e3;
+var LIVE_TAIL_LINES = 2e4;
+var STATIC_URL = new RegExp(`^(data:)|(\\.(js|css|png|jpe?g|gif|svg|woff2?|ico|map|webp|mp4)(\\?|$))`, "i");
+var LIVE = /* @__PURE__ */ new Map();
+function plainOf(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function argvOf(command, session, args) {
+	return [
+		command === "" ? "runtime" : command,
+		"browser",
+		session,
+		...args,
+		"--window",
+		"background"
+	];
+}
+function parsedRecord(text) {
+	let parsed;
+	try {
+		parsed = JSON.parse(text);
+	} catch {
+		return;
+	}
+	return plainOf(parsed);
+}
+function withoutStatic(record) {
+	const inside = (Array.isArray(record["entries"]) ? record["entries"] : []).filter((one) => !STATIC_URL.test(String(plainOf(one)?.["url"] ?? "")));
+	return inside.length === 0 ? "" : JSON.stringify({
+		...record,
+		entries: inside
+	});
+}
+function filterStaticLines(raw) {
+	const document = parsedRecord(raw.trim());
+	if (document !== void 0 && Array.isArray(document["entries"])) return withoutStatic(document);
+	const kept = [];
+	for (const line of raw.split("\n")) {
+		const text = line.trim();
+		if (text === "") continue;
+		const record = parsedRecord(text);
+		if (record === void 0 || !Array.isArray(record["entries"])) {
+			kept.push(text);
+			continue;
+		}
+		const compact = withoutStatic(record);
+		if (compact !== "") kept.push(compact);
+	}
+	return kept.join("\n");
+}
+async function captureTickOnce(seam, command, session, file, timeoutMs = LIVE_SNAP_TIMEOUT_MS) {
+	const step = await seam.run({
+		argv: argvOf(command, session, [
+			"network",
+			"--all",
+			"--raw"
+		]),
+		intent: productWrite(),
+		timeoutMs
+	});
+	const round = step.exitCode === 0 ? "ok" : "fail";
+	writeTextFile(`${file}.first`, round);
+	const text = filterStaticLines(step.stdout);
+	if (text !== "") appendTextFile(file, `${text}\n`);
+	return round;
+}
+async function startLiveCapture(input) {
+	const { seam, command, session, file } = input;
+	stopLiveCapture(file);
+	writeTextFile(file, "");
+	for (const suffix of [
+		".first",
+		".last",
+		".round",
+		".pid",
+		".reaper"
+	]) rmSync(`${file}${suffix}`, { force: true });
+	try {
+		const arm = await seam.run({
+			argv: argvOf(command, session, [
+				"network",
+				"--follow",
+				"--all"
+			]),
+			intent: productWrite(),
+			timeoutMs: LIVE_ARM_MS
+		});
+		if (!arm.timedOut && arm.exitCode !== 0) return false;
+		const text = arm.stdout.trim();
+		if (text !== "") appendTextFile(file, `${text}\n`);
+	} catch {
+		return false;
+	}
+	const entry = {
+		file,
+		seam,
+		command,
+		session,
+		timer: void 0,
+		stopped: false
+	};
+	LIVE.set(file, entry);
+	scheduleTick(entry);
+	return true;
+}
+function scheduleTick(entry) {
+	entry.timer = setTimeout(() => {
+		runTick(entry);
+	}, LIVE_POLL_MS);
+	entry.timer.unref?.();
+}
+async function runTick(entry) {
+	if (entry.stopped) return;
+	try {
+		await captureTickOnce(entry.seam, entry.command, entry.session, entry.file);
+	} catch {
+		entry.timer = void 0;
+	}
+	if (entry.stopped) return;
+	scheduleTick(entry);
+}
+function stopLiveCapture(file) {
+	const live = LIVE.get(file);
+	for (const suffix of [
+		".pid",
+		".reaper",
+		".round"
+	]) rmSync(`${file}${suffix}`, { force: true });
+	if (live !== void 0) {
+		live.stopped = true;
+		if (live.timer !== void 0) clearTimeout(live.timer);
+		LIVE.delete(file);
+	}
+	return live !== void 0 || existsSync(`${file}.last`) || existsSync(`${file}.first`);
+}
+function liveCaptureOf(file) {
+	return LIVE.has(file);
+}
+function readText$1(file) {
+	try {
+		return readFileSync(file, "utf8");
+	} catch {
+		return "";
+	}
+}
+function readCaptureLines(file) {
+	return (readText$1(file).match(/\n/g) ?? []).length;
+}
+function readCaptureRound(file) {
+	const text = readText$1(`${file}.first`).trim();
+	return text === "ok" || text === "fail" ? text : "";
+}
+function readCaptureText(file) {
+	const text = readText$1(file);
+	if (text === "") return {
+		text: "",
+		truncated: false
+	};
+	const lines = text.split("\n");
+	if (text.endsWith("\n")) lines.pop();
+	const kept = lines.slice(-2e4);
+	return {
+		text: kept.length === 0 ? "" : `${kept.join("\n")}\n`,
+		truncated: lines.length > LIVE_TAIL_LINES
+	};
+}
+function readCaptureLinesWithKey(file, key) {
+	const text = readText$1(file);
+	if (text === "") return "";
+	const compact = `"key":"${key}"`;
+	const spaced = `"key": "${key}"`;
+	const out = [];
+	for (const line of text.split("\n")) {
+		if (out.length >= 20) break;
+		if (line.includes(compact) || line.includes(spaced)) out.push(line);
+	}
+	return out.length === 0 ? "" : `${out.join("\n")}\n`;
+}
+function keepCaptureFile(file) {
+	const last = `${file}.last`;
+	try {
+		renameSync(file, last);
+		return statSync(last).size > 0;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/modules/panels/model/diy-observers.ts
 async function stopObservers(ctx, workspace, session = BROWSER_SCREEN_SESSION) {
 	const seam = seamOf(ctx);
@@ -12353,9 +12585,9 @@ async function stopObservers(ctx, workspace, session = BROWSER_SCREEN_SESSION) {
 	};
 	const file = join(artifactsDirOf(workspace), `net-${session}.jsonl`);
 	const command = cliCommandOf(ctx);
-	const [net, step] = await Promise.all([stopNetworkExact(seam, file), actBrowser(seam, command, session, ["eval", LOGS_STOP_SCRIPT], SWEEP_TIMEOUT_MS)]);
+	const [stopped, step] = await Promise.all([Promise.resolve(stopLiveCapture(file)), actBrowser(seam, command, session, ["eval", LOGS_STOP_SCRIPT], SWEEP_TIMEOUT_MS)]);
 	return {
-		net,
+		net: stopped || !liveCaptureOf(file),
 		logs: typeof step.payload?.["unhooked"] === "number"
 	};
 }
@@ -13160,19 +13392,13 @@ function pickOf(entries, key, at = null) {
 //#endregion
 //#region src/modules/panels/model/diy-record.ts
 var OPEN_TIMEOUT_MS = 3e4;
-var START_TIMEOUT_MS = 8e3;
 var SETTLE_MS = 2e3;
 var WAIT_CAP_MS = 9e5;
 var POLL_MS = 1e3;
-var CAPTURE_TAIL_LINES = 2e4;
-var CAPTURE_POLL_S = 3;
-var CAPTURE_ARM_S = 2;
-var STATIC_URL_PATTERN = `^(data:)|(\\.(js|css|png|jpe?g|gif|svg|woff2?|ico|map|webp|mp4)(\\?|$))`;
+var CAPTURE_TAIL_LINES = LIVE_TAIL_LINES;
 var RECORD_WATCH_MS = 3e3;
 var RECORD_WATCH_TRIES = 5;
-var DROP_STATIC_JS = "let s=\"\";process.stdin.on(\"data\",(d)=>s+=d).on(\"end\",()=>{const re=new RegExp(process.argv[1],\"i\");for(const line of s.split(\"\\n\")){const t=line.trim();if(t===\"\")continue;let one;try{one=JSON.parse(t)}catch{process.stdout.write(t+\"\\n\");continue}if(Array.isArray(one.entries)){one.entries=one.entries.filter((e)=>!re.test(String((e||{}).url||\"\")));if(one.entries.length===0)continue}process.stdout.write(JSON.stringify(one)+\"\\n\")}});";
 var DETAIL_MAX_BYTES = 6e4;
-var HOST_PID = String(process.pid);
 var pauseFor = (ms) => new Promise((resolve) => {
 	setTimeout(resolve, ms);
 });
@@ -13221,40 +13447,13 @@ async function takeShotOf(input, held, n) {
 		}, Date.now());
 	}
 }
-async function startRecordCapture(seam, command, session, file, makeLine = plainLine) {
-	const bin = command === "" ? "runtime" : command;
-	const arm = makeLine(bin, [
-		"browser",
-		session,
-		"network",
-		"--follow",
-		"--all",
-		"--window",
-		"background"
-	]);
-	const snap = makeLine(bin, [
-		"browser",
+async function startRecordCapture(seam, command, session, file) {
+	return startLiveCapture({
+		seam,
+		command,
 		session,
-		"network",
-		"--all",
-		"--raw",
-		"--window",
-		"background"
-	]);
-	const line = [
-		`f=${quoteShellArg(file)}`,
-		`r=${quoteShellArg(`${file}.round`)}`,
-		": > \"$f\"",
-		"rm -f \"$f.last\" \"$f.first\" \"$r\"",
-		`( ${arm} >> "$f" 2>/dev/null & p=$!; sleep ${String(CAPTURE_ARM_S)}; kill "$p" 2>/dev/null )`,
-		`( while kill -0 ${HOST_PID} 2>/dev/null; do if ${snap} > "$r" 2>/dev/null; then printf ok > "$f.first"; else printf fail > "$f.first"; fi; if [ -s "$r" ]; then if command -v node >/dev/null 2>&1; then tr -d '\\n' < "$r" | node -e ${quoteShellArg(DROP_STATIC_JS)} ${quoteShellArg(STATIC_URL_PATTERN)} >> "$f"; else tr -d '\\n' < "$r" >> "$f"; printf '\\n' >> "$f"; fi; fi; rm -f "$r"; sleep ${String(CAPTURE_POLL_S)}; done & echo $! > "$f.pid" ) & echo $! > "$f.reaper"`,
-		"kill -0 \"$(cat \"$f.pid\" 2>/dev/null)\" 2>/dev/null"
-	].join("; ");
-	return (await seam.run({
-		command: line,
-		intent: productWrite(),
-		timeoutMs: START_TIMEOUT_MS
-	})).exitCode === 0;
+		file
+	});
 }
 async function releaseLeftoversOf(input) {
 	await releaseQuietly({
@@ -13267,7 +13466,7 @@ async function releaseLeftoversOf(input) {
 }
 async function stopCaptureQuiet(input) {
 	try {
-		return await stopNetworkExact(input.seam, input.captureFile);
+		return stopLiveCapture(input.captureFile);
 	} catch {
 		return false;
 	}
@@ -13372,64 +13571,22 @@ function watchRecordFinish(input) {
 	};
 	setTimeout(tick, 0);
 }
-async function captureLinesOf(seam, file, timeoutMs = START_TIMEOUT_MS) {
-	const step = await seam.run({
-		command: `wc -l < ${quoteShellArg(file)} 2>/dev/null || echo 0`,
-		intent: productWrite(),
-		timeoutMs
-	});
-	const value = Number.parseInt(step.stdout.trim() === "" ? "0" : step.stdout.trim(), 10);
-	return Number.isFinite(value) ? value : 0;
-}
-async function captureRoundOf(seam, file, timeoutMs = START_TIMEOUT_MS) {
-	const value = (await seam.run({
-		command: `cat ${quoteShellArg(`${file}.first`)} 2>/dev/null || true`,
-		intent: productWrite(),
-		timeoutMs
-	})).stdout.trim();
-	return value === "ok" || value === "fail" ? value : "";
-}
-async function captureTextOf(seam, file, timeoutMs = START_TIMEOUT_MS) {
-	const step = await seam.run({
-		command: `tail -n ${String(CAPTURE_TAIL_LINES)} ${quoteShellArg(file)} 2>/dev/null || true`,
-		intent: productWrite(),
-		timeoutMs
-	});
+function captureReadOf(file) {
+	const totalLines = readCaptureLines(file);
+	const text = readCaptureText(file);
 	return {
-		text: step.stdout,
-		truncated: step.truncated
-	};
-}
-async function captureReadOf(seam, file, timeoutMs = START_TIMEOUT_MS) {
-	const totalLines = await captureLinesOf(seam, file, timeoutMs);
-	const read = await captureTextOf(seam, file, timeoutMs);
-	const round = await captureRoundOf(seam, file, timeoutMs);
-	return {
-		text: read.text,
+		text: text.text,
 		totalLines,
 		tailLimit: CAPTURE_TAIL_LINES,
-		truncated: read.truncated || totalLines > CAPTURE_TAIL_LINES,
-		round
+		truncated: text.truncated || totalLines > CAPTURE_TAIL_LINES,
+		round: readCaptureRound(file)
 	};
 }
-async function keepCaptureOf(seam, file, timeoutMs = START_TIMEOUT_MS) {
-	const line = `[ -f ${quoteShellArg(file)} ] && mv ${quoteShellArg(file)} ${quoteShellArg(lastCaptureFileOf(file))} && [ -s ${quoteShellArg(lastCaptureFileOf(file))} ]`;
-	return (await seam.run({
-		command: line,
-		intent: productWrite(),
-		timeoutMs
-	})).exitCode === 0;
-}
-async function captureLinesWithKeyOf(seam, file, key, timeoutMs = START_TIMEOUT_MS) {
-	const quoted = quoteShellArg(file);
-	const compact = quoteShellArg(`"key":"${key}"`);
-	const spaced = quoteShellArg(`"key": "${key}"`);
-	const line = [`[ -f ${quoted} ] || exit 0`, `grep -m 20 -F ${compact} ${quoted} 2>/dev/null || grep -m 20 -F ${spaced} ${quoted} 2>/dev/null || true`].join("; ");
-	return (await seam.run({
-		command: line,
-		intent: productWrite(),
-		timeoutMs
-	})).stdout;
+function keepCaptureOf(file) {
+	return keepCaptureFile(file);
+}
+function captureLinesWithKeyOf(file, key) {
+	return readCaptureLinesWithKey(file, key);
 }
 function bundleOf(capture, page, state) {
 	const entries = captureEntriesOf(capture.text);
@@ -13562,7 +13719,7 @@ async function closeRecordTab(seam, command, session, url) {
 	return (await actBrowser(seam, command, session, ["close"])).ok;
 }
 async function releaseRecord(input) {
-	const capture = await stopNetworkExact(input.seam, input.captureFile);
+	const capture = stopLiveCapture(input.captureFile);
 	return {
 		tab: await closeRecordTab(input.seam, input.command, input.session, input.url),
 		capture
@@ -13734,7 +13891,7 @@ function registerRecordTools(ctx, store) {
 				const armed = await actBrowser(seam, command, BROWSER_RECORD_SESSION, ["eval", RECORD_ARM_SCRIPT]);
 				const page = recordPageOf(armed.payload);
 				if (!armed.ok || !page.ok) throw new Error(`浮条没装上：${armed.stderr || armed.stdout || "那一页还在加载"} —— 等用户那一页站稳了再试。`);
-				await stopNetworkExact(seam, captureFile);
+				stopLiveCapture(captureFile);
 				const capture = await startRecordCapture(seam, command, BROWSER_RECORD_SESSION, captureFile);
 				watchRecordFinish({
 					ctx,
@@ -13832,7 +13989,7 @@ function registerRecordTools(ctx, store) {
 			}
 			const state = store.live(Date.now()) ?? held;
 			const ledger = state.shots;
-			const capture = await captureReadOf(seam, state.captureFile);
+			const capture = captureReadOf(state.captureFile);
 			const bundle = bundleOf(capture, page, state);
 			const hookCaught = page.calls.length;
 			const nav = page.href !== "" && page.here !== "" && page.href !== page.here;
@@ -13943,7 +14100,7 @@ function registerRecordTools(ctx, store) {
 				if (index === null) throw new Error("给一个 key（清单里那一条的）或 index（清单里的序号）。");
 				if (held === null) throw new Error("收工之后只能用 key —— index 是\"那一场清单里\"的序号，这一场已经清掉了。");
 				page = recordPageOf((await actBrowser(seam, command, BROWSER_RECORD_SESSION, ["eval", RECORD_READ_SCRIPT])).payload);
-				const bundle = bundleOf(await captureReadOf(seam, file), page, held);
+				const bundle = bundleOf(captureReadOf(file), page, held);
 				const row = bundle.rows[index];
 				if (row === void 0) throw new Error(`这一段清单里没有第 ${String(index)} 条（一共 ${String(bundle.rows.length)} 条）—— 先 ${DIY_RECORD_READ_TOOL} 拿一份新的清单。`);
 				key = row.key;
@@ -13953,7 +14110,7 @@ function registerRecordTools(ctx, store) {
 					if (only !== null) return detailOfCall(only, maxBytes);
 				}
 			}
-			const candidates = pickAllOf(captureEntriesOf(await captureLinesWithKeyOf(seam, file, key)), key);
+			const candidates = pickAllOf(captureEntriesOf(captureLinesWithKeyOf(file, key)), key);
 			const fromCapture = pickOf(candidates, key, at);
 			if (fromCapture !== null) return detailOfEntry(fromCapture, maxBytes, candidates.length);
 			const over = held === null || held.phase === "finished";
@@ -14009,10 +14166,10 @@ function registerRecordTools(ctx, store) {
 			const command = cliCommandOf(ctx);
 			await actBrowser(seam, command, BROWSER_RECORD_SESSION, ["eval", RECORD_ARM_SCRIPT]);
 			const page = recordPageOf((await actBrowser(seam, command, BROWSER_RECORD_SESSION, ["eval", RECORD_STOP_SCRIPT])).payload);
-			const bundle = bundleOf(await captureReadOf(seam, held.captureFile), page, held);
+			const bundle = bundleOf(captureReadOf(held.captureFile), page, held);
 			const hookCaught = page.calls.length;
 			const noBody = bodyMissingOf(bundle.merged);
-			const kept = await keepCaptureOf(seam, held.captureFile);
+			const kept = keepCaptureOf(held.captureFile);
 			const cleaned = await releaseQuietly({
 				seam,
 				command,

package/dist/types/modules/panels/model/diy-browser-act.d.ts

@@ -7,4 +7,3 @@ export interface ActStep extends BrowserStep {
 export declare function actBrowser(seam: Seam, command: string, session: string, argv: readonly string[], timeoutMs?: number, line?: LineMaker): Promise<ActStep>;
 export declare function actErrorOf(step: ActStep): string;
 export declare const SWEEP_TIMEOUT_MS = 4000;
-export declare function stopNetworkExact(seam: Seam, file: string, timeoutMs?: number): Promise<boolean>;

package/dist/types/modules/panels/model/diy-record.d.ts

@@ -1,14 +1,13 @@
 import type { DshHostContext } from '@dsh-workbench/shared';
 import type { RecordState, RecordStore } from '@dsh-workbench/shared/host';
 import { type Seam } from '@dsh-workbench/shared/host';
-import { type LineMaker } from './diy-browser';
 import type { CaptureEntry } from './diy-record-capture';
 import type { RecordCall, RecordListRow, RecordPageRead } from './diy-record-text';
 export declare const OPEN_TIMEOUT_MS = 30000;
 export declare const SETTLE_MS = 2000;
 export declare const WAIT_CAP_MS: number;
 export declare const POLL_MS = 1000;
-export declare const STATIC_URL_PATTERN = "^(data:)|(\\.(js|css|png|jpe?g|gif|svg|woff2?|ico|map|webp|mp4)(\\?|$))";
+export { STATIC_URL_PATTERN } from '../../../shared/api/host/diy-capture-live';
 export declare const DETAIL_MAX_BYTES = 60000;
 export declare const pauseFor: (ms: number) => Promise<void>;
 export declare function waitOf(value: unknown): number;
@@ -17,7 +16,7 @@ export declare function captureFileOf(artifactsDir: string, unit: string): strin
 export declare function lastCaptureFileOf(file: string): string;
 export declare function shotFileOf(captureFile: string, unit: string, n: number): string;
 export declare function takeShotOf(input: WatchFinishDeps, held: RecordState, n: number): Promise<void>;
-export declare function startRecordCapture(seam: Seam, command: string, session: string, file: string, makeLine?: LineMaker): Promise<boolean>;
+export declare function startRecordCapture(seam: Seam, command: string, session: string, file: string): Promise<boolean>;
 export interface WatchFinishDeps {
     readonly ctx: DshHostContext;
     readonly seam: Seam;
@@ -44,15 +43,15 @@ export interface CaptureRead {
     readonly truncated: boolean;
     readonly round: string;
 }
-export declare function captureLinesOf(seam: Seam, file: string, timeoutMs?: number): Promise<number>;
-export declare function captureRoundOf(seam: Seam, file: string, timeoutMs?: number): Promise<string>;
-export declare function captureTextOf(seam: Seam, file: string, timeoutMs?: number): Promise<{
+export declare function captureLinesOf(file: string): number;
+export declare function captureRoundOf(file: string): string;
+export declare function captureTextOf(file: string): {
     readonly text: string;
     readonly truncated: boolean;
-}>;
-export declare function captureReadOf(seam: Seam, file: string, timeoutMs?: number): Promise<CaptureRead>;
-export declare function keepCaptureOf(seam: Seam, file: string, timeoutMs?: number): Promise<boolean>;
-export declare function captureLinesWithKeyOf(seam: Seam, file: string, key: string, timeoutMs?: number): Promise<string>;
+};
+export declare function captureReadOf(file: string): CaptureRead;
+export declare function keepCaptureOf(file: string): boolean;
+export declare function captureLinesWithKeyOf(file: string, key: string): string;
 export interface SegmentBundle {
     readonly capture: CaptureRead;
     readonly entries: readonly CaptureEntry[];

package/dist/types/shared/api/host/diy-capture-live.d.ts

@@ -0,0 +1,25 @@
+import { type Seam } from '@dsh-workbench/shared/host';
+export declare const LIVE_POLL_MS = 3000;
+export declare const LIVE_ARM_MS = 2000;
+export declare const LIVE_SNAP_TIMEOUT_MS = 15000;
+export declare const LIVE_TAIL_LINES = 20000;
+export declare const LIVE_KEY_LINES = 20;
+export declare const STATIC_URL_PATTERN = "^(data:)|(\\.(js|css|png|jpe?g|gif|svg|woff2?|ico|map|webp|mp4)(\\?|$))";
+export declare function filterStaticLines(raw: string): string;
+export declare function captureTickOnce(seam: Seam, command: string, session: string, file: string, timeoutMs?: number): Promise<string>;
+export declare function startLiveCapture(input: {
+    readonly seam: Seam;
+    readonly command: string;
+    readonly session: string;
+    readonly file: string;
+}): Promise<boolean>;
+export declare function stopLiveCapture(file: string): boolean;
+export declare function liveCaptureOf(file: string): boolean;
+export declare function readCaptureLines(file: string): number;
+export declare function readCaptureRound(file: string): string;
+export declare function readCaptureText(file: string): {
+    readonly text: string;
+    readonly truncated: boolean;
+};
+export declare function readCaptureLinesWithKey(file: string, key: string): string;
+export declare function keepCaptureFile(file: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/core",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "个人工作台：Agent 工作台（左栏 + 常驻对话 + 自研右侧数据面板）。",
   "type": "module",
   "icon": "./icon.svg",
@@ -97,8 +97,8 @@
     "proper-lockfile": "^4.1.2",
     "which": "^7.0.0",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/adapters-default": "1.1.14",
-    "@dsh-workbench/shared": "1.1.14"
+    "@dsh-workbench/adapters-default": "1.1.16",
+    "@dsh-workbench/shared": "1.1.16"
   },
   "license": "MIT",
   "repository": {