@dsh-workbench/core 0.2.15 → 0.3.0

package/dist/host/index.js

@@ -13,7 +13,10 @@ var PREFS_PREFIX = `${API_PREFIX}/prefs`;
 var EVENTS_PATH = "/workbench/events";
 var ACTIONS_PREFIX = `${API_PREFIX}/actions`;
 var PROVISION_PREFIX = `${API_PREFIX}/provision`;
-var PANEL_STATE_PREFIX = `${API_PREFIX}/panel-state`;
+var PANEL_STATE_PATH = "panel-state";
+var DIY_DEBUG_PATH = "diy-debug";
+`${DIY_DEBUG_PATH}`;
+var PANEL_STATE_PREFIX = `${API_PREFIX}/${PANEL_STATE_PATH}`;
 var OPENCLI_PIN = "1.8.8";
 var PANELS_SERVICE = "workbenchPanels";
 var UNITS_SERVICE = "workbenchUnits";
@@ -435,6 +438,33 @@ function createPanelStateStore() {
 		}
 	};
 }
+//#endregion
+//#region ../shared/dist/lib/board-fact.js
+function insideWorkshop$1(root, target) {
+	if (target === root) return true;
+	const base = root.endsWith("/") ? root : `${root}/`;
+	return target.startsWith(base);
+}
+function boardFactOf(probe, workshop) {
+	if (!probe.workbench) return "unknown";
+	if (!probe.bar || !probe.open || !probe.drawn) return "hidden";
+	if (probe.board === "" || workshop === null) return "unknown";
+	return insideWorkshop$1(workshop, probe.board) ? "workshop" : "other";
+}
+function boardSituation(probe, workshop) {
+	if (!probe.workbench || workshop === null) return "unknown";
+	if (probe.bar && probe.open && probe.drawn) {
+		if (probe.board === "") return "unknown";
+		return insideWorkshop$1(workshop, probe.board) ? "ok" : "other-board";
+	}
+	if (probe.where !== "" && !insideWorkshop$1(workshop, probe.where)) return "off-workspace";
+	return "panel-closed";
+}
+//#endregion
+//#region ../shared/dist/lib/diy-debug.js
+function parseDebugIntent(value) {
+	return value === "pause" || value === "resume" || value === "stop" ? value : null;
+}
 function alive(state, now) {
 	if (state === null) return null;
 	return now - state.at <= 144e5 ? state : null;
@@ -471,27 +501,6 @@ function createDebugStore() {
 				state
 			};
 		},
-		stall(sessionId, now) {
-			const found = ownerOf(held, sessionId, now);
-			if (typeof found === "string") return {
-				ok: false,
-				code: found
-			};
-			if (found.phase === "paused") return {
-				ok: false,
-				code: "already-paused"
-			};
-			const state = {
-				...found,
-				phase: "paused",
-				at: now
-			};
-			held = state;
-			return {
-				ok: true,
-				state
-			};
-		},
 		pause(sessionId, now) {
 			const found = ownerOf(held, sessionId, now);
 			if (typeof found === "string") return {
@@ -1775,6 +1784,15 @@ function registerPanelState(ctx, store) {
 		}]
 	});
 }
+function registerDiyDebugAct(ctx, resource, log) {
+	return registerPost(ctx, {
+		prefix: `${API_PREFIX}/${DIY_DEBUG_PATH}`,
+		what: "工作台 DIY 调试动作",
+		refusedCode: "action-refused",
+		resources: [resource],
+		wrote: () => log?.bump(["diy-debug"])
+	});
+}
 //#endregion
 //#region ../shared/dist/host/long-task.js
 var LIVE = /* @__PURE__ */ new Set(["running", "needs-login"]);
@@ -2917,9 +2935,7 @@ function workshopPackagesDir(ctx) {
 	return root === null ? null : join(root, "packages");
 }
 function insideWorkshop(root, target) {
-	const base = existsSync(root) ? realpathSync(root) : resolve(root);
-	const real = existsSync(target) ? realpathSync(target) : resolve(target);
-	return real === base || real.startsWith(base + sep);
+	return insideWorkshop$1(existsSync(root) ? realpathSync(root) : resolve(root), existsSync(target) ? realpathSync(target) : resolve(target));
 }
 function workshopModules(packagesDir, installed = []) {
 	if (!existsSync(packagesDir)) return [];
@@ -3730,18 +3746,28 @@ function numberIn$1(value, fallback) {
 }
 var PAGE_PROBE = `(async () => {
   const answer = await fetch('/workbench/api/health').then((one) => one.json()).catch(() => null);
+  const root = document.querySelector('.wb-root');
+  const where = root === null ? '' : (root.getAttribute('data-wb-where') ?? '');
   const bar = document.querySelector('.wb-rightbar');
   const board = bar === null ? '' : (bar.getAttribute('data-wb-board') ?? '');
   const open = bar === null ? null : bar.hasAttribute('data-wb-open');
-  const shown = bar === null ? false : getComputedStyle(bar).visibility !== 'hidden';
+  const style = bar === null ? null : getComputedStyle(bar);
+  const box = bar === null ? null : bar.getBoundingClientRect();
+  const drawn =
+    bar !== null &&
+    style.visibility !== 'hidden' &&
+    style.display !== 'none' &&
+    box.width > 0 &&
+    box.height > 0;
   return JSON.stringify({
     plugin: answer === null ? null : answer.plugin,
     pid: answer === null ? null : answer.pid,
     url: location.href,
     title: document.title,
+    where,
     board,
     open,
-    shown,
+    shown: drawn,
   });
 })()`;
 function cardSelectorOf(unit) {
@@ -4052,6 +4078,7 @@ async function workbenchPageOf(shell, command, session) {
 		ok: false,
 		url: "",
 		title: "",
+		where: "",
 		board: "",
 		open: null,
 		shown: false
@@ -4061,6 +4088,7 @@ async function workbenchPageOf(shell, command, session) {
 		ok: textOf$4(parsed["plugin"]) === "@dsh-workbench/core",
 		url: textOf$4(parsed["url"]),
 		title: textOf$4(parsed["title"]),
+		where: textOf$4(parsed["where"]),
 		board: textOf$4(parsed["board"]),
 		open: typeof raw === "boolean" ? raw : null,
 		shown: parsed["shown"] === true
@@ -4202,18 +4230,28 @@ function debugPausedText(held) {
 function debugForeignPactText(held) {
 	return `另一场调试正占着那块屏（${held.sessionId} 在调试 ${held.unit}）—— 一台机器同时只允许一场：让它先 workbench_diy_debug_stop，或等它收工。`;
 }
-function debugStalledText(held) {
-	return `你现在这一页画的不是工坊那块板 —— ${held.unit} 这场调试算**搁置**（已自动落 paused）：说好别离开那一屏。请用户在左栏切回「工作台DIY」；回到那一屏之后再 workbench_diy_debug_resume 接着看。`;
+function debugOffBoardText(held, situation = "other-board") {
+	const what = situation === "off-workspace" ? "用户现在不在 DIY 工作区（外壳选中的是别的工作区）" : situation === "panel-closed" ? "工作台面板没画在屏上（右栏收着，或那一列让给了别的面板）" : "你现在这一页画的不是工坊那块板";
+	const next = situation === "off-workspace" ? "让用户在左栏切回「工作台DIY」那个工作区" : situation === "panel-closed" ? "让用户把「工作台面板」切回来（或把右栏展开）" : "让用户把那一页切回「工作台DIY」";
+	return `${what} —— 看 / 动 / 网络这一族现在发不出去，我不拿别的板当目标。${held.unit} 这场调试仍然**进行中**（我没有自动替你落 paused）：${next}；要停下来就自己 workbench_diy_debug_pause（不问审批），页面切回来了就接着看。`;
+}
+function boardProbeOf(page) {
+	return {
+		workbench: page.ok,
+		where: page.where,
+		bar: page.open !== null,
+		board: page.board,
+		open: page.open === true,
+		drawn: page.shown
+	};
 }
 function boardStateOf(page, workshop) {
-	if (page.open === null) return "unknown";
-	if (!page.open || !page.shown) return "hidden";
-	if (page.board === "" || workshop === null) return "unknown";
-	return insideWorkshop(workshop, page.board) ? "workshop" : "other";
+	return boardFactOf(boardProbeOf(page), workshop);
 }
-function boardGateText(board, unit, page, workshop) {
-	if (board === "hidden") return `右栏收着 —— 面板没画在屏上（锚点还在页面里，但看不见它）。让用户把面板展开、或切回「工作台DIY」，我再接着看 ${unit}。`;
-	return `你现在这一页画的是 ${page.board || "(不知道哪一块)"} 的面板，工坊那块板（${workshop ?? "(不知道)"}）没在这一屏 —— ${unit} 的这张卡不在屏上，我不拿别的板当目标。请用户在左栏切回「工作台DIY」；这之前我可以继续改源码 / build / 跑门禁。`;
+function boardGateText(situation, unit, page) {
+	if (situation === "off-workspace") return `用户现在不在 DIY 工作区 —— 外壳选中的是 ${page.where || "(问不出来是哪一块)"}。工坊那块板没在屏上，${unit} 的这张卡我看不到，也不拿别的板当目标。让用户在左栏切回「工作台DIY」；这之前我可以继续改源码 / build / 跑门禁。`;
+	if (situation === "panel-closed") return `工作台面板没画在屏上（右栏收着，或者这一页让给了别的面板：文件预览、模块市场等）。让用户把「工作台面板」切回来（或把右栏展开），我再接着看 ${unit}。`;
+	return `你现在这一页画的是 ${page.board || "(不知道哪一块)"} 的面板，工坊那块板没在这一屏 —— ${unit} 的这张卡不在屏上，我不拿别的板当目标。请用户在左栏切回「工作台DIY」；这之前我可以继续改源码 / build / 跑门禁。`;
 }
 async function pageAt(ctx, exec, raw, options = {}) {
 	const { packagesDir } = workshopOf(ctx, exec);
@@ -4234,18 +4272,15 @@ async function pageAt(ctx, exec, raw, options = {}) {
 	}
 	const workshop = workshopPathOf(ctx);
 	const board = boardStateOf(handshake.page, workshop);
-	const store = ctx.get(DIY_DEBUG_SERVICE);
-	const held = store?.live(Date.now()) ?? null;
+	const situation = boardSituation(boardProbeOf(handshake.page), workshop);
+	const held = ctx.get("workbenchDiyDebug")?.live(Date.now()) ?? null;
 	const sessionId = sessionIdOf(exec);
 	if (options.requirePact !== false && held !== null) {
 		if (held.sessionId !== sessionId) throw new Error(debugForeignPactText(held));
 		if (held.phase === "paused") throw new Error(debugPausedText(held));
-		if (board === "other" || board === "hidden") {
-			store?.stall(sessionId ?? "", Date.now());
-			throw new Error(debugStalledText(held));
-		}
+		if (board === "other" || board === "hidden") throw new Error(debugOffBoardText(held, situation));
 	}
-	if (options.requireBoard !== false && (board === "other" || board === "hidden")) throw new Error(boardGateText(board, wanted, handshake.page, workshop));
+	if (options.requireBoard !== false && (board === "other" || board === "hidden")) throw new Error(boardGateText(situation, wanted, handshake.page));
 	return {
 		packagesDir,
 		unit: wanted,
@@ -4518,12 +4553,11 @@ async function scrollIntoView(shell, command, session, unit, selector) {
 async function reloadPage(shell, command, session) {
 	return actBrowser(shell, command, session, ["eval", `(() => { setTimeout(() => location.reload(), 30); return JSON.stringify({ ok: true }); })()`]);
 }
-async function shootAtWidth(shell, command, session, file, width, height) {
+async function shootAtWidth(shell, command, session, file, width = 0, height = 0) {
 	const step = await actBrowser(shell, command, session, [
 		"screenshot",
 		file,
-		"--width",
-		String(width),
+		...width > 0 ? ["--width", String(width)] : [],
 		...height > 0 ? ["--height", String(height)] : []
 	], LOOK_TIMEOUT_MS);
 	return {
@@ -5434,24 +5468,26 @@ function registerActTools(ctx, tools) {
 	};
 	const viewportTool = {
 		name: DIY_VIEWPORT_TOOL,
-		description: "按某个宽度重拍一张整屏图（看窄屏/宽屏下这张卡挤不挤）—— 只在这一拍里换视口。",
+		description: "拍整屏图。不给宽高 = 按用户当前窗口拍；给了才换视口 —— 会回流一次。",
 		parameters: pageSchema({
 			width: {
 				type: "number",
-				description: "视口宽度（CSS px，例如 390）。"
+				description: "视口宽度（CSS px，如 390）；不填按当前窗口。"
 			},
 			height: {
 				type: "number",
 				description: "视口高度（可不要）。"
 			}
-		}, ["width"]),
+		}, []),
 		output: OUTPUT$2,
 		async execute(raw, exec) {
 			const page = await pageAt(ctx, exec, raw, { requireUnit: false });
-			const width = asNumber(page.args["width"]);
-			if (width === void 0 || width <= 0) throw new Error("多宽？给 width（CSS px）。");
+			const width = asNumber(page.args["width"]) ?? 0;
+			if (width < 0) throw new Error("width 得是正的 CSS px；不给就按用户当前窗口拍。");
 			const height = asNumber(page.args["height"]) ?? 0;
-			const file = join(dirname(page.packagesDir), "shots", `${page.unit || "page"}-${String(width)}-${String(Date.now())}.png`);
+			const overrode = width > 0 || height > 0;
+			const stamp = overrode ? `${String(width)}x${String(height)}` : "now";
+			const file = join(dirname(page.packagesDir), "shots", `${page.unit || "page"}-${stamp}-${String(Date.now())}.png`);
 			await writeShotsDir(page.shell, dirname(file));
 			const shot = await shootAtWidth(page.shell, page.command, page.session, file, width, height);
 			return plainJson({
@@ -5459,12 +5495,13 @@ function registerActTools(ctx, tools) {
 				unit: page.unit,
 				ok: shot.ok,
 				file: shot.file,
-				width,
-				viewport: {
+				overrode,
+				width: overrode ? width : null,
+				viewport: overrode ? {
 					width,
 					height
-				},
-				text: shot.ok ? `按 ${String(width)}px 宽重拍了一张：${shot.file}（页面按新视口回流，只在这一拍里生效）。` : `没拍成：${shot.reason}`
+				} : null,
+				text: shot.ok ? overrode ? `重拍了一张：${shot.file}（临时换了视口${width > 0 ? ` 宽 ${String(width)}px` : ""}${height > 0 ? ` 高 ${String(height)}px` : ""}，你那一屏会回流一次、拍完就恢复）。` : `按你当前窗口拍了一张：${shot.file}（没动你的视口）。` : `没拍成：${shot.reason}`
 			});
 		}
 	};
@@ -9240,6 +9277,122 @@ function createPostChannels(deps) {
 	};
 }
 //#endregion
+//#region src/shared/api/host/diy-debug-act.ts
+var DEBUG_NOTICE_KIND = "workbench-diy";
+var INTENT_WORD = {
+	pause: "暂停",
+	resume: "继续",
+	stop: "结束"
+};
+function debugNoticeText(intent, state) {
+	const head = `［工作台 DIY］用户按了「${INTENT_WORD[intent]}」：`;
+	if (intent === "pause") return `${head}${state.unit} 这场调试暂停了 —— 现在别再把那一屏当目标（看 / 动 / 网络那一族发不出去）。要接着看屏就等用户按「继续」；在那之前照常改源码 / build / 跑门禁。`;
+	if (intent === "resume") return `${head}${state.unit} 这场调试重新开始了 —— 那一屏又归你看。屏 / 板不对的话照旧会被拒，拒了就照实说清是哪种不对。`;
+	return `${head}${state.unit} 这场调试收工了（占用解除）。要再调试就重新 start 一场。`;
+}
+function debugNoticeSummary(intent, state) {
+	return `工作台 DIY：用户按了${INTENT_WORD[intent]}（${state.unit}）`;
+}
+function debugNotice(intent, state) {
+	const summary = debugNoticeSummary(intent, state);
+	return {
+		summary,
+		message: {
+			role: "user",
+			id: randomUUID(),
+			content: [{
+				type: "text",
+				text: debugNoticeText(intent, state)
+			}],
+			source: {
+				kind: DEBUG_NOTICE_KIND,
+				form: "notice",
+				summary
+			}
+		}
+	};
+}
+var NOTICE_MODE = {
+	resume: "wake",
+	pause: "hold",
+	stop: "drop"
+};
+var held = /* @__PURE__ */ new Map();
+function holdNotice(sessionId, message) {
+	const list = held.get(sessionId);
+	if (list === void 0) held.set(sessionId, [message]);
+	else list.push(message);
+}
+function takeHeldNotices(sessionId) {
+	const list = held.get(sessionId) ?? [];
+	held.delete(sessionId);
+	return list;
+}
+function deliverDebugNotice(agents, sessionId, message, mode = "wake") {
+	const agent = agents?.get(sessionId);
+	if (agent === void 0) {
+		if (mode === "drop") return "none";
+		holdNotice(sessionId, message);
+		return "held";
+	}
+	if (agent.status !== "idle") {
+		agent.inject(message);
+		return "inject";
+	}
+	if (mode === "wake") {
+		agent.followup(message);
+		return "followup";
+	}
+	if (mode === "hold") {
+		holdNotice(sessionId, message);
+		return "held";
+	}
+	return "skipped-idle";
+}
+var REFUSAL = {
+	"already-paused": "这一场已经是暂停态了",
+	"already-debugging": "这一场本来就在调试中",
+	none: "现在没有调试态",
+	"not-owner": "这场调试不是这个会话的"
+};
+function debugActResource(deps) {
+	const now = () => deps.now?.() ?? Date.now();
+	return {
+		resource: "act",
+		handle(payload) {
+			const intent = parseDebugIntent(payload?.intent);
+			if (intent === null) return {
+				ok: false,
+				text: "不认识的意图（只认 pause / resume / stop）"
+			};
+			const store = deps.store();
+			if (store === void 0) return {
+				ok: false,
+				text: "现在没有调试态 —— 没什么可暂停 / 继续 / 结束的"
+			};
+			const at = now();
+			const held = store.live(at);
+			if (held === null) return {
+				ok: false,
+				text: "现在没有调试态 —— 没什么可暂停 / 继续 / 结束的"
+			};
+			const move = intent === "pause" ? store.pause(held.sessionId, at) : intent === "resume" ? store.resume(held.sessionId, at) : store.stop(held.sessionId, at);
+			if (!move.ok) return {
+				ok: false,
+				text: REFUSAL[move.code] ?? `按不动：${move.code}`
+			};
+			const notice = deps.notice?.(intent, move.state) ?? debugNotice(intent, move.state);
+			return {
+				ok: true,
+				intent,
+				delivered: deliverDebugNotice(deps.agents(), held.sessionId, notice.message, NOTICE_MODE[intent]),
+				summary: notice.summary,
+				state: store.live(now())
+			};
+		}
+	};
+}
+//#endregion
 //#region src/shared/api/host/events.ts
 var HEARTBEAT_MS = 25e3;
 function frame(payload) {
@@ -11369,15 +11522,17 @@ function createToolScope(options) {
 	};
 }
 //#endregion
-//#region src/app/host.ts
-var name = "dsh-workbench";
-var inject = ["webServer"];
+//#region src/shared/api/host/host-args.ts
 function asArgs(value) {
 	return typeof value === "object" && value !== null ? value : {};
 }
 function warn(ctx, message) {
 	ctx.logger?.warn?.(`[dsh-workbench] ${message}`);
 }
+//#endregion
+//#region src/app/host.ts
+var name = "dsh-workbench";
+var inject = ["webServer"];
 function seedWorkbenchRuntime(ctx) {
 	const root = runtimeSeedRootOf(ctx);
 	if (root === null) return;
@@ -11749,9 +11904,10 @@ function apply(ctx) {
 			if (decision.kind === "reject") return decision;
 			try {
 				const message = await injector.inject(decision.messages ?? [], payload?.agent);
-				return message === void 0 ? decision : {
+				const extra = [...takeHeldNotices(String((payload?.agent)?.id ?? "")), ...message === void 0 ? [] : [message]];
+				return extra.length === 0 ? decision : {
 					...decision,
-					messages: [...decision.messages ?? [], message]
+					messages: [...decision.messages ?? [], ...extra]
 				};
 			} catch (error) {
 				ctx.logger?.warn?.(`[dsh-workbench] 对话引用注入失败：${String(error)}`);
@@ -11762,6 +11918,12 @@ function apply(ctx) {
 	}, `${PLUGIN_ID}: 对话引用注入`);
 	ctx.effect(() => registerFactStream(ctx, facts), `${PLUGIN_ID}: 变更流`);
 	ctx.effect(() => registerPanelState(ctx, panelState), `${PLUGIN_ID}: 面板运行态上报（浏览器半侧报自己的取数与渲染收尾）`);
+	ctx.effect(() => {
+		return registerDiyDebugAct(ctx, debugActResource({
+			store: () => ctx.get(DIY_DEBUG_SERVICE),
+			agents: () => ctx.get("agents")
+		}), { bump: (names) => facts.bump(names) });
+	}, `${PLUGIN_ID}: DIY 调试的三个键（用户按的）`);
 	ctx.effect(() => registerApi(ctx, routes), `${PLUGIN_ID}: HTTP 投影`);
 }
 //#endregion