@dsh-workbench/core 0.2.3 → 0.2.4

package/client.js

@@ -2216,23 +2216,37 @@ window.__ModuleLoader__.load({
       function tailLines(text, lines = 6) {
       	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
       }
+      function candidateStarts(raw) {
+      	const starts = [];
+      	for (let index = 0; index < raw.length; index += 1) {
+      		const char = raw[index];
+      		if (char !== "[" && char !== "{") continue;
+      		if (index === 0 || raw[index - 1] === "\n") starts.push(index);
+      	}
+      	const earliest = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
+      	if (earliest.length > 0) {
+      		const head = Math.min(...earliest);
+      		if (!starts.includes(head)) starts.push(head);
+      	}
+      	return starts;
+      }
       function parseJsonLoose(text) {
       	const raw = String(text ?? "").trim();
       	if (!raw) return void 0;
       	try {
       		return JSON.parse(raw);
       	} catch {
-      		const starts = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
-      		if (starts.length === 0) return void 0;
-      		const from = Math.min(...starts);
-      		const close = raw[from] === "[" ? "]" : "}";
-      		const to = raw.lastIndexOf(close);
-      		if (to <= from) return void 0;
-      		try {
-      			return JSON.parse(raw.slice(from, to + 1));
-      		} catch {
-      			return;
+      		for (const from of candidateStarts(raw)) {
+      			const close = raw[from] === "[" ? "]" : "}";
+      			const to = raw.lastIndexOf(close);
+      			if (to <= from) continue;
+      			try {
+      				return JSON.parse(raw.slice(from, to + 1));
+      			} catch {
+      				continue;
+      			}
       		}
+      		return;
       	}
       }
       var MARKDOWN_IMAGE = /!\[[^\]]*\]\([^)]*\)/g;

package/dist/client/client.body.js

@@ -2209,23 +2209,37 @@ function quoteShellArg(value) {
 function tailLines(text, lines = 6) {
 	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
 }
+function candidateStarts(raw) {
+	const starts = [];
+	for (let index = 0; index < raw.length; index += 1) {
+		const char = raw[index];
+		if (char !== "[" && char !== "{") continue;
+		if (index === 0 || raw[index - 1] === "\n") starts.push(index);
+	}
+	const earliest = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
+	if (earliest.length > 0) {
+		const head = Math.min(...earliest);
+		if (!starts.includes(head)) starts.push(head);
+	}
+	return starts;
+}
 function parseJsonLoose(text) {
 	const raw = String(text ?? "").trim();
 	if (!raw) return void 0;
 	try {
 		return JSON.parse(raw);
 	} catch {
-		const starts = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
-		if (starts.length === 0) return void 0;
-		const from = Math.min(...starts);
-		const close = raw[from] === "[" ? "]" : "}";
-		const to = raw.lastIndexOf(close);
-		if (to <= from) return void 0;
-		try {
-			return JSON.parse(raw.slice(from, to + 1));
-		} catch {
-			return;
+		for (const from of candidateStarts(raw)) {
+			const close = raw[from] === "[" ? "]" : "}";
+			const to = raw.lastIndexOf(close);
+			if (to <= from) continue;
+			try {
+				return JSON.parse(raw.slice(from, to + 1));
+			} catch {
+				continue;
+			}
 		}
+		return;
 	}
 }
 var MARKDOWN_IMAGE = /!\[[^\]]*\]\([^)]*\)/g;

package/dist/client/index.js

@@ -2212,23 +2212,37 @@ function quoteShellArg(value) {
 function tailLines(text, lines = 6) {
 	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
 }
+function candidateStarts(raw) {
+	const starts = [];
+	for (let index = 0; index < raw.length; index += 1) {
+		const char = raw[index];
+		if (char !== "[" && char !== "{") continue;
+		if (index === 0 || raw[index - 1] === "\n") starts.push(index);
+	}
+	const earliest = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
+	if (earliest.length > 0) {
+		const head = Math.min(...earliest);
+		if (!starts.includes(head)) starts.push(head);
+	}
+	return starts;
+}
 function parseJsonLoose(text) {
 	const raw = String(text ?? "").trim();
 	if (!raw) return void 0;
 	try {
 		return JSON.parse(raw);
 	} catch {
-		const starts = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
-		if (starts.length === 0) return void 0;
-		const from = Math.min(...starts);
-		const close = raw[from] === "[" ? "]" : "}";
-		const to = raw.lastIndexOf(close);
-		if (to <= from) return void 0;
-		try {
-			return JSON.parse(raw.slice(from, to + 1));
-		} catch {
-			return;
+		for (const from of candidateStarts(raw)) {
+			const close = raw[from] === "[" ? "]" : "}";
+			const to = raw.lastIndexOf(close);
+			if (to <= from) continue;
+			try {
+				return JSON.parse(raw.slice(from, to + 1));
+			} catch {
+				continue;
+			}
 		}
+		return;
 	}
 }
 var MARKDOWN_IMAGE = /!\[[^\]]*\]\([^)]*\)/g;

package/dist/host/index.js

@@ -201,23 +201,37 @@ function quoteShellArg(value) {
 function tailLines(text, lines = 6) {
 	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
 }
+function candidateStarts(raw) {
+	const starts = [];
+	for (let index = 0; index < raw.length; index += 1) {
+		const char = raw[index];
+		if (char !== "[" && char !== "{") continue;
+		if (index === 0 || raw[index - 1] === "\n") starts.push(index);
+	}
+	const earliest = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
+	if (earliest.length > 0) {
+		const head = Math.min(...earliest);
+		if (!starts.includes(head)) starts.push(head);
+	}
+	return starts;
+}
 function parseJsonLoose(text) {
 	const raw = String(text ?? "").trim();
 	if (!raw) return void 0;
 	try {
 		return JSON.parse(raw);
 	} catch {
-		const starts = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
-		if (starts.length === 0) return void 0;
-		const from = Math.min(...starts);
-		const close = raw[from] === "[" ? "]" : "}";
-		const to = raw.lastIndexOf(close);
-		if (to <= from) return void 0;
-		try {
-			return JSON.parse(raw.slice(from, to + 1));
-		} catch {
-			return;
+		for (const from of candidateStarts(raw)) {
+			const close = raw[from] === "[" ? "]" : "}";
+			const to = raw.lastIndexOf(close);
+			if (to <= from) continue;
+			try {
+				return JSON.parse(raw.slice(from, to + 1));
+			} catch {
+				continue;
+			}
 		}
+		return;
 	}
 }
 var PANEL_STATE_MAX_TEXT = 2e3;
@@ -2126,6 +2140,18 @@ function textOutput(text) {
 		text
 	}];
 }
+function textRender(_args, value) {
+	const text = value?.text;
+	return textOutput(typeof text === "string" ? text : JSON.stringify(value));
+}
+var TEXT_OUTPUT = {
+	schema: {
+		type: "object",
+		properties: {},
+		additionalProperties: true
+	},
+	render: textRender
+};
 function jsonText(value) {
 	return JSON.stringify(value);
 }
@@ -7657,6 +7683,8 @@ function parseCommandRows(stdout) {
 			name,
 			description: textOf(record["description"]),
 			access: textOf(record["access"]),
+			browser: record["browser"] === true,
+			siteSession: textOf(record["siteSession"]),
 			...textOf(record["domain"]) === "" ? {} : { domain: textOf(record["domain"]) },
 			args: argsOf(record["args"])
 		});
@@ -7669,6 +7697,9 @@ function commandOf(plugin, row) {
 		name: row.name,
 		description: row.description,
 		access: row.access,
+		browser: row.browser,
+		siteSession: row.siteSession,
+		...row.domain === void 0 ? {} : { domain: row.domain },
 		args: row.args
 	};
 }
@@ -7842,6 +7873,8 @@ var SCHEMA_TYPE = {
 	string: "string"
 };
 var KEY_ARG_LIMIT = 3;
+var RUN_CODE_TOOL = "run_code";
+var PLUGIN_PROMPT_BUDGET = 4e3;
 function pluginToolName(plugin, command) {
 	return `${plugin}_${command}`.toLowerCase().replace(/[^a-z0-9_]+/g, "_").replace(/_{2,}/g, "_").replace(/^_+|_+$/g, "");
 }
@@ -7850,7 +7883,7 @@ function schemaTypeOf(arg) {
 }
 function propertyOf(arg) {
 	const type = schemaTypeOf(arg);
-	const enumValues = arg.choices.length > 0 ? arg.choices.map((choice) => choice) : void 0;
+	const enumValues = type === "string" && arg.choices.length > 0 ? [...arg.choices] : void 0;
 	return {
 		type,
 		...arg.help.trim() === "" ? {} : { description: arg.help.trim() },
@@ -7858,6 +7891,9 @@ function propertyOf(arg) {
 		...arg.defaultValue === void 0 ? {} : { default: arg.defaultValue }
 	};
 }
+function pluginPromptChars(command) {
+	return pluginToolDescription(command).length + command.args.reduce((sum, arg) => sum + arg.help.trim().length, 0);
+}
 function pluginToolParameters(command) {
 	const properties = {};
 	for (const arg of command.args) properties[arg.name] = propertyOf(arg);
@@ -7877,6 +7913,11 @@ function pluginToolDescription(command) {
 function pluginToolWrites(command) {
 	return command.access !== "read";
 }
+function pluginToolSession(command) {
+	if (!command.browser) return "none";
+	if (command.siteSession === "persistent" || command.siteSession === "ephemeral") return command.siteSession;
+	return command.access === "read" ? "persistent" : "ephemeral";
+}
 function valuesOf(raw) {
 	return typeof raw === "object" && raw !== null ? raw : {};
 }
@@ -7893,9 +7934,9 @@ function pluginToolArgv(command, raw) {
 		if (arg.positional) continue;
 		const value = values[arg.name];
 		if (value === void 0 || value === null) continue;
-		if (typeof value === "boolean") argv.push(`--${arg.name}`, value ? "true" : "false");
-		else if (Array.isArray(value)) argv.push(`--${arg.name}`, value.map((item) => String(item)).join(","));
-		else argv.push(`--${arg.name}`, String(value));
+		if (typeof value === "boolean") argv.push(`--${arg.name}=${value ? "true" : "false"}`);
+		else if (Array.isArray(value)) argv.push(`--${arg.name}=${value.map((item) => String(item)).join(",")}`);
+		else argv.push(`--${arg.name}=${String(value)}`);
 	}
 	return argv;
 }
@@ -7933,11 +7974,6 @@ function pluginApprovalFor(command) {
 }
 //#endregion
 //#region src/shared/api/host/plugin-units.ts
-var TOOL_OUTPUT_SCHEMA = {
-	type: "object",
-	properties: {},
-	additionalProperties: true
-};
 function signatureOf(version, commands) {
 	return [version, ...commands.map((command) => `${command.name}:${command.access}:${command.args.map((arg) => `${arg.name}${arg.required ? "!" : ""}`).join("+")}`)].join("|");
 }
@@ -7947,6 +7983,10 @@ function toolsOf(plugin, commands, taken) {
 	const claimed = /* @__PURE__ */ new Set();
 	for (const command of commands) {
 		const name = pluginToolName(plugin, command.name);
+		if (name === "run_code") {
+			problems.push(`工具名 ${RUN_CODE_TOOL}（${plugin} ${command.name}）是 dsh 的保留名（PTC 的传送工具）—— 这条命令这次不合成`);
+			continue;
+		}
 		if (taken.has(name) || claimed.has(name)) {
 			problems.push(`工具名 ${name}（${plugin} ${command.name}）已经被占着 —— 这条命令这次不合成（先来的那份说了算）`);
 			continue;
@@ -7989,12 +8029,15 @@ function planOf(options, registered) {
 		problems.push(...built.problems);
 		for (const tool of built.tools) taken.add(tool.name);
 		if (built.tools.length === 0 && commands.length === set.commands.length) problems.push(`「${plugin}」的命令一条都没能合成工具`);
+		const chars = built.tools.reduce((sum, tool) => sum + pluginPromptChars(tool.command), 0);
+		if (chars > 4e3) problems.push(`「${plugin}」合成出来的 ${String(built.tools.length)} 把工具，描述与参数说明合起来 ${String(chars)} 字，超过 ${String(PLUGIN_PROMPT_BUDGET)} 字的合成面预算 —— 这些字每一步请求都跟着走，插件该精简或按工作区少开一点`);
 		rows.push({
 			plugin,
 			pkg: row.pkg,
 			version: set.version,
 			commands: set.commands.length,
 			synthesized: built.tools.length,
+			chars,
 			tools: built.tools.map((tool) => tool.name)
 		});
 		if (built.tools.length === 0) continue;
@@ -8015,7 +8058,7 @@ function planOf(options, registered) {
 		problems
 	};
 }
-function faceOf(unit, opencliFor) {
+function faceOf(unit, opencliFor, note) {
 	const byTool = new Map(unit.tools.map((tool) => [tool.name, tool.command]));
 	const manifest = {
 		id: unit.id,
@@ -8043,14 +8086,14 @@ function faceOf(unit, opencliFor) {
 				name: tool.name,
 				description: pluginToolDescription(tool.command),
 				parameters: pluginToolParameters(tool.command),
-				output: {
-					schema: TOOL_OUTPUT_SCHEMA,
-					render: (_args, value) => textOutput(jsonText(value))
-				},
+				output: TEXT_OUTPUT,
 				async execute(raw, exec) {
 					const workspace = sessionWorkspace(exec);
 					try {
-						return (await opencli.json([tool.command.name, ...pluginToolArgv(tool.command, raw)], workspace === null ? {} : { workdir: workspace })).value;
+						return { text: jsonText((await opencli.json([tool.command.name, ...pluginToolArgv(tool.command, raw)], {
+							session: pluginToolSession(tool.command),
+							...workspace === null ? {} : { workdir: workspace }
+						})).value) };
 					} catch (error) {
 						throw new Error(pluginLoginHint(error, tool.command.domain), { cause: error });
 					}
@@ -8059,7 +8102,15 @@ function faceOf(unit, opencliFor) {
 			return {
 				routes: {},
 				factsOf: () => [],
-				registerTools: () => definitions.map((definition) => tools.register(definition)),
+				registerTools: () => {
+					const disposers = [];
+					for (const definition of definitions) try {
+						disposers.push(tools.register(definition));
+					} catch (error) {
+						note(`「${unit.plugin}」的 ${definition.name} 这把工具没注册上（${error instanceof Error ? error.message : String(error)}）—— 只废这一把，同插件其余命令照常`);
+					}
+					return disposers;
+				},
 				needsApproval: (call) => {
 					const command = call.name === void 0 ? void 0 : byTool.get(call.name);
 					return command === void 0 ? void 0 : pluginApprovalFor(command)(call);
@@ -8068,7 +8119,7 @@ function faceOf(unit, opencliFor) {
 		}
 	};
 }
-function reconcile(registered, units, options) {
+function reconcile(registered, units, options, note) {
 	const wanted = new Map(units.map((unit) => [unit.id, unit]));
 	for (const [id, item] of [...registered]) {
 		const next = wanted.get(id);
@@ -8081,12 +8132,13 @@ function reconcile(registered, units, options) {
 		registered.set(unit.id, {
 			signature: unit.signature,
 			tools: unit.tools.map((tool) => tool.name),
-			drop: options.registry.registerPlugin(faceOf(unit, options.opencliFor))
+			drop: options.registry.registerPlugin(faceOf(unit, options.opencliFor, note))
 		});
 	}
 }
 function createPluginUnits(options) {
 	const registered = /* @__PURE__ */ new Map();
+	const mountProblems = /* @__PURE__ */ new Set();
 	let report = {
 		ok: false,
 		at: 0,
@@ -8096,6 +8148,18 @@ function createPluginUnits(options) {
 	let inflight;
 	let lastTouch = 0;
 	let warned = "";
+	function note(problem) {
+		if (mountProblems.has(problem)) return;
+		mountProblems.add(problem);
+		options.logger?.warn?.(`[dsh-workbench] ${problem}`);
+	}
+	function snapshot() {
+		const extra = [...mountProblems];
+		return extra.length === 0 ? report : {
+			...report,
+			problems: [...report.problems, ...extra]
+		};
+	}
 	function warn(problems) {
 		const text = [...problems].sort().join("\n");
 		if (text === "" || text === warned) return;
@@ -8103,6 +8167,7 @@ function createPluginUnits(options) {
 		options.logger?.warn?.(`[dsh-workbench] opencli 插件命令面：\n${text}`);
 	}
 	async function run(force) {
+		mountProblems.clear();
 		const probed = await options.catalog.refresh(force ? { force: true } : {});
 		if (!probed.ok) {
 			const problems = [...probed.problems, "这次探测没成功：上面这些插件行的工具面维持在上一份（不是\"这些插件没有命令\"）"];
@@ -8113,10 +8178,10 @@ function createPluginUnits(options) {
 				problems
 			};
 			warn(problems);
-			return report;
+			return snapshot();
 		}
 		const plan = planOf(options, registered);
-		reconcile(registered, plan.units, options);
+		reconcile(registered, plan.units, options, note);
 		report = {
 			ok: true,
 			at: Date.now(),
@@ -8124,7 +8189,7 @@ function createPluginUnits(options) {
 			problems: plan.problems
 		};
 		warn(plan.problems);
-		return report;
+		return snapshot();
 	}
 	function refresh(callOptions = {}) {
 		if (inflight !== void 0) return inflight;
@@ -8145,7 +8210,7 @@ function createPluginUnits(options) {
 				options.logger?.warn?.(`[dsh-workbench] 探 opencli 插件命令面时抛了错：${String(error)}`);
 			});
 		},
-		report: () => report,
+		report: () => snapshot(),
 		dispose() {
 			for (const item of registered.values()) item.drop();
 			registered.clear();

package/dist/types/modules/panels/__tests__/plugin-tool-units-harness.d.ts

@@ -0,0 +1,69 @@
+import type { DshToolDefinition } from '@dsh-workbench/shared';
+import { type WorkspaceStore } from '@dsh-workbench/shared/host';
+import { createPluginUnits } from '../../../shared/api/host/plugin-units';
+import { type UnitRegistry } from '../../../shared/api/host/unit-registry';
+import type { PluginLedger } from '../model/plugin-ledger';
+import { type PanelsService } from '../model/service';
+export declare const COMMANDS: ({
+    site: string;
+    name: string;
+    description: string;
+    access: string;
+    browser: boolean;
+    siteSession: string;
+    domain: string;
+    args: {
+        name: string;
+        type: string;
+        required: boolean;
+        help: string;
+    }[];
+} | {
+    site: string;
+    name: string;
+    description: string;
+    access: string;
+    browser: boolean;
+    args: {
+        name: string;
+        type: string;
+        required: boolean;
+        help: string;
+    }[];
+    siteSession?: undefined;
+    domain?: undefined;
+})[];
+export interface Harness {
+    readonly registry: UnitRegistry;
+    readonly panels: PanelsService;
+    readonly tools: Map<string, DshToolDefinition>;
+    readonly gate: {
+        deniedTools(workspace: string | null): readonly string[];
+    };
+    readonly manager: ReturnType<typeof createPluginUnits>;
+    readonly problems: string[];
+    readonly definitions: () => DshToolDefinition[];
+    readonly commands: () => readonly string[];
+    readonly opencliCalls: () => readonly {
+        readonly args: readonly string[];
+        readonly workdir?: string;
+        readonly session?: string;
+    }[];
+    readonly toolOf: (name: string) => DshToolDefinition | undefined;
+    readonly ownerOf: (name: string) => {
+        readonly needsApproval?: unknown;
+        readonly manifest: unknown;
+    } | undefined;
+    readonly units: () => readonly string[];
+}
+export declare function deny(h: Harness, workspace: string): string[];
+export declare function harnessOf(options: {
+    readonly store: WorkspaceStore;
+    readonly ledger: PluginLedger;
+    readonly pluginRows: () => unknown;
+    readonly commands?: unknown;
+    readonly declared?: ReadonlyMap<string, ReadonlySet<string>>;
+    readonly moduleTools?: readonly string[];
+    readonly opencliReplies?: readonly unknown[];
+    readonly failTools?: readonly string[];
+}): Harness;

package/dist/types/shared/api/host/plugin-catalog.d.ts

@@ -14,6 +14,8 @@ export interface PluginCommand {
     readonly name: string;
     readonly description: string;
     readonly access: string;
+    readonly browser: boolean;
+    readonly siteSession: string;
     readonly domain?: string;
     readonly args: readonly PluginCommandArg[];
 }
@@ -32,6 +34,9 @@ export interface CommandRow {
     readonly name: string;
     readonly description: string;
     readonly access: string;
+    readonly browser: boolean;
+    readonly siteSession: string;
+    readonly domain?: string;
     readonly args: readonly PluginCommandArg[];
 }
 export interface PluginCatalogSnapshot {

package/dist/types/shared/api/host/plugin-tools.d.ts

@@ -1,9 +1,13 @@
-import type { ApprovalDetail, ApprovalPolicy } from '@dsh-workbench/shared/host';
+import type { ApprovalDetail, ApprovalPolicy, OpencliSession } from '@dsh-workbench/shared/host';
 import type { PluginCommand } from './plugin-catalog';
+export declare const RUN_CODE_TOOL = "run_code";
+export declare const PLUGIN_PROMPT_BUDGET = 4000;
 export declare function pluginToolName(plugin: string, command: string): string;
+export declare function pluginPromptChars(command: PluginCommand): number;
 export declare function pluginToolParameters(command: PluginCommand): Record<string, unknown>;
 export declare function pluginToolDescription(command: PluginCommand): string;
 export declare function pluginToolWrites(command: PluginCommand): boolean;
+export declare function pluginToolSession(command: PluginCommand): OpencliSession;
 export declare function pluginToolArgv(command: PluginCommand, raw: unknown): string[];
 export declare function pluginKeyArgs(command: PluginCommand, raw: unknown): string;
 export declare function pluginApprovalQuestion(command: PluginCommand, raw: unknown): ApprovalDetail;

package/dist/types/shared/api/host/plugin-units.d.ts

@@ -16,6 +16,7 @@ export interface PluginUnitRow {
     readonly version: string;
     readonly commands: number;
     readonly synthesized: number;
+    readonly chars: number;
     readonly tools: readonly string[];
 }
 export interface PluginUnitReport {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/core",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "个人工作台：Agent 工作台外壳（左栏 + 常驻对话 + 自研右侧数据面板）。",
   "type": "module",
   "icon": "./icon.svg",
@@ -87,7 +87,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@dsh-workbench/shared": "0.2.3"
+    "@dsh-workbench/shared": "0.2.4"
   },
   "scripts": {
     "build": "node scripts/build.mjs && node scripts/build-types.mjs",