dsh-agent-toolkit 0.1.0 → 0.2.1

package/lib/index.js

@@ -60,7 +60,42 @@ function migrateAgentRecord(record) {
 	} : rest;
 }
 //#endregion
+//#region src/channels/basic-tools.ts
+const BASIC_TOOLS = [
+	{
+		id: "@deepseek-ai/dsh-persona",
+		config: { text: "You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}." }
+	},
+	{
+		id: "@deepseek-ai/dsh-agent-instructions",
+		config: { maxBytes: 65536 }
+	},
+	...process.platform === "win32" ? [{ id: "@deepseek-ai/dsh-tool-pwsh" }] : [{ id: "@deepseek-ai/dsh-tool-bash" }],
+	{ id: "@deepseek-ai/dsh-tool-fs" },
+	{
+		id: "@deepseek-ai/dsh-tool-fs-search",
+		config: { sampleOverCapGlobResults: false }
+	}
+];
+/** 原生工具名（白名单 UI 与存量迁移用）：与 BASIC_TOOLS 挂载插件注册的工具名一一对应。
+*  名字来源（摘自 deepseek-harness 源码）：dsh-tool-pwsh/dsh-tool-bash → 'pwsh'/'bash'（平台互斥）；
+*  dsh-tool-fs → 'read'/'write'/'edit'/'read_image'；dsh-tool-fs-search → 'glob'/'grep'。
+*  这些工具 scoped 挂载在 agentCtx，不出现在顶层 ctx.tools.schemas()，故需显式常量。 */
+const NATIVE_TOOL_NAMES = [
+	process.platform === "win32" ? "pwsh" : "bash",
+	"read",
+	"write",
+	"edit",
+	"read_image",
+	"glob",
+	"grep"
+];
+//#endregion
 //#region src/agents/builtin.ts
+/** 内置保底 Agent 记录：main + explorer（只读白名单）/ general（不限制）。 */
+/** explorer 默认白名单：原生工具去掉写类（write/edit）。shell 名平台互斥（win32=pwsh、其余=bash），
+*  必须从 NATIVE_TOOL_NAMES 派生不可写死——宿主 tools.restrict 对未知名响亮失败。 */
+const EXPLORER_READONLY_ALLOW = NATIVE_TOOL_NAMES.filter((n) => n !== "write" && n !== "edit");
 const BUILTIN_AGENTS = [
 	{
 		id: "main",
@@ -74,7 +109,8 @@ const BUILTIN_AGENTS = [
 		persona: `你是代码库探索员。快速定位与任务相关的文件与符号，回答关于代码结构、
 调用关系、实现位置的问题。你只读不写：不修改任何文件、不运行有副作用的命令。
 输出结论清单，每条附文件路径与行号；信息不足时说明缺口，不要猜测。`,
-		builtin: true
+		builtin: true,
+		tools: { allow: [...EXPLORER_READONLY_ALLOW] }
 	},
 	{
 		id: "general",
@@ -97,20 +133,16 @@ const RoleYamlSchema = z$1.object({
 	persona: z$1.string().min(1),
 	provider: z$1.string().optional(),
 	model: z$1.string().optional(),
-	tools: z$1.object({
-		allow: z$1.array(z$1.string()).optional(),
-		deny: z$1.array(z$1.string()).optional()
-	}).optional()
+	tools: z$1.object({ allow: z$1.array(z$1.string()).optional() }).optional()
 });
 /**
 * 解析校验单个角色 YAML 文件并转成 AgentRecord。
 * @param text - 文件内容。
 * @param source - 用于错误信息的来源名（通常是文件路径）。
 * @param fileName - 文件名（去 .yml），name 省略时的取值；显式 name 须与它一致。
-* @param warn - 非致命丢弃（如 tools.deny）的通知通道。
 * @throws YAML 语法错误、结构非法、name 与文件名不一致、id 非法、tools 空。
 */
-function parseRoleYaml(text, source, fileName, warn) {
+function parseRoleYaml(text, source, fileName) {
 	let parsed;
 	try {
 		parsed = yaml.load(text);
@@ -127,8 +159,7 @@ function parseRoleYaml(text, source, fileName, warn) {
 	const id = raw.name ?? fileName;
 	if (raw.name !== void 0 && raw.name !== fileName) throw new Error(`dsh-agent-toolkit: 角色文件 ${source} 的 name "${raw.name}" 与文件名 "${fileName}" 不一致（省略 name 即取文件名）`);
 	if (!AGENT_ID_RE.test(id)) throw new Error(`dsh-agent-toolkit: 角色 id "${id}" 非法（${source}）：只允许小写字母、数字、-，且以小写字母开头`);
-	if (hasTools && raw.tools !== void 0 && (raw.tools.allow?.length ?? 0) === 0 && (raw.tools.deny?.length ?? 0) === 0) throw new Error(`dsh-agent-toolkit: 角色文件 ${source} 的 tools 为空：allow/deny 至少配一个`);
-	if (raw.tools?.deny !== void 0 && raw.tools.deny.length > 0) warn?.(`dsh-agent-toolkit: 角色文件 ${source} 的 tools.deny 已忽略（注册表仅支持 allow 白名单）`);
+	if (hasTools && raw.tools !== void 0 && (raw.tools.allow?.length ?? 0) === 0) throw new Error(`dsh-agent-toolkit: 角色文件 ${source} 的 tools 为空：allow 至少配一个（不需要限制请整段省略 tools）`);
 	const model = raw.provider !== void 0 && raw.model !== void 0 ? {
 		provider: raw.provider,
 		model: raw.model
@@ -186,7 +217,7 @@ async function importRolesYaml(ctx, rolesDir) {
 		return result;
 	}
 	for (const ref of refs) try {
-		const record = parseRoleYaml(await readFile(ref.path, "utf8"), ref.path, ref.fileName, ctx.warn);
+		const record = parseRoleYaml(await readFile(ref.path, "utf8"), ref.path, ref.fileName);
 		await ctx.agents.put(record.id, record);
 		result.imported++;
 	} catch (error) {
@@ -200,47 +231,17 @@ async function markImported(ctx) {
 	await ctx.meta.put(ROLES_YAML_IMPORTED_KEY, { value: "1" });
 }
 //#endregion
-//#region src/channels/basic-tools.ts
-const BASIC_TOOLS = [
-	{
-		id: "@deepseek-ai/dsh-persona",
-		config: { text: "You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}." }
-	},
-	{
-		id: "@deepseek-ai/dsh-agent-instructions",
-		config: { maxBytes: 65536 }
-	},
-	...process.platform === "win32" ? [{ id: "@deepseek-ai/dsh-tool-pwsh" }] : [{ id: "@deepseek-ai/dsh-tool-bash" }],
-	{ id: "@deepseek-ai/dsh-tool-fs" },
-	{
-		id: "@deepseek-ai/dsh-tool-fs-search",
-		config: { sampleOverCapGlobResults: false }
-	}
-];
-/** 原生工具名（白名单 UI 与存量迁移用）：与 BASIC_TOOLS 挂载插件注册的工具名一一对应。
-*  名字来源（摘自 deepseek-harness 源码）：dsh-tool-pwsh/dsh-tool-bash → 'pwsh'/'bash'（平台互斥）；
-*  dsh-tool-fs → 'read'/'write'/'edit'/'read_image'；dsh-tool-fs-search → 'glob'/'grep'。
-*  这些工具 scoped 挂载在 agentCtx，不出现在顶层 ctx.tools.schemas()，故需显式常量。 */
-const NATIVE_TOOL_NAMES = [
-	process.platform === "win32" ? "pwsh" : "bash",
-	"read",
-	"write",
-	"edit",
-	"read_image",
-	"glob",
-	"grep"
-];
-//#endregion
 //#region src/agents/registry.ts
 /** tools.allow 一次性并入原生工具名的 meta 表标记键。 */
 const TOOLS_NATIVE_MIGRATED_KEY = "tools_native_migrated";
+/** explorer 只读白名单一次性并入的 meta 表标记键。 */
+const EXPLORER_READONLY_MIGRATED_KEY = "explorer_readonly_migrated";
 /**
-* 打开 dsh_agent_toolkit 域 → 缺 main/explorer/general 时种入内置 → 首启 YAML 导入 →
-* 构建内存缓存。域由 apply 统一 open（storage-domain 同名单开），此处只消费表句柄。
+* 打开 dsh_agent_toolkit 域 → 首启 YAML 导入 → 旧记录迁移（promptLayers/原生并入/explorer 只读）→
+* 缺 main/explorer/general 时种入内置 → 构建内存缓存。域由 apply 统一 open（storage-domain 同名单开），此处只消费表句柄。
 */
 async function createRegistry(warn, tables) {
 	const { agents, meta } = tables;
-	await seedBuiltins(agents);
 	await importRolesYaml({
 		agents,
 		meta,
@@ -260,6 +261,15 @@ async function createRegistry(warn, tables) {
 		if (next !== record) await agents.put(id, next);
 	}
 	if (!nativeMigrated) await meta.put(TOOLS_NATIVE_MIGRATED_KEY, { value: "1" });
+	if (!(meta.get("explorer_readonly_migrated") !== void 0)) {
+		const explorer = agents.get("explorer");
+		if (explorer !== void 0 && explorer.tools === void 0) await agents.put("explorer", {
+			...explorer,
+			tools: { allow: [...EXPLORER_READONLY_ALLOW] }
+		});
+		await meta.put(EXPLORER_READONLY_MIGRATED_KEY, { value: "1" });
+	}
+	await seedBuiltins(agents);
 	const cache = /* @__PURE__ */ new Map();
 	for (const [id, record] of agents.entries()) cache.set(id, record);
 	const listeners = /* @__PURE__ */ new Set();
@@ -1192,7 +1202,7 @@ function withPartialText(error, output) {
 	return text.length === 0 ? error : `${error}\n成员中断前的部分产出：\n${text}`;
 }
 /** 收集并释放一次前台运行；dispose 失败不掩盖独立的结果失败。 */
-async function settleForegroundRun(run, roleId) {
+async function settleForegroundRun(run, roleId, route) {
 	const childSessionId = String(run.id);
 	const [execution] = await Promise.allSettled([run.result.then((result) => {
 		const error = stopReasonError(result);
@@ -1202,7 +1212,11 @@ async function settleForegroundRun(run, roleId) {
 			role: roleId,
 			runId: String(run.id),
 			childSessionId,
-			output: result.output
+			output: result.output,
+			...route !== void 0 ? {
+				provider: route.provider,
+				model: route.model
+			} : {}
 		};
 	})]);
 	const [disposal] = await Promise.allSettled([Promise.resolve().then(() => run.dispose())]);
@@ -1269,7 +1283,9 @@ function createDelegateTool(toolName, deps) {
 						type: "array",
 						required: true,
 						items: { type: "json" }
-					}
+					},
+					provider: { type: "string" },
+					model: { type: "string" }
 				}
 			},
 			render: (_args, value) => [{
@@ -1279,7 +1295,11 @@ function createDelegateTool(toolName, deps) {
 			presentationMeta: (_args, value) => ({
 				role: value.role,
 				runId: value.runId,
-				childSessionId: value.childSessionId
+				childSessionId: value.childSessionId,
+				...typeof value.provider === "string" && typeof value.model === "string" ? {
+					provider: value.provider,
+					model: value.model
+				} : {}
 			})
 		},
 		isConcurrencySafe: () => true,
@@ -1312,7 +1332,19 @@ function createDelegateTool(toolName, deps) {
 				} } : {},
 				...role.tools !== void 0 ? { toolFilter: { allow: [...role.tools.allow] } } : {}
 			};
-			return settleForegroundRun(await deps.startRun(deps.provider, request), role.id);
+			const route = (role.model !== void 0 && role.model.provider !== "" && role.model.model !== "" ? role.model : void 0) ?? (typeof parent.options.provider === "string" && parent.options.provider !== "" && typeof parent.options.model === "string" && parent.options.model !== "" ? {
+				provider: parent.options.provider,
+				model: parent.options.model
+			} : void 0);
+			const parentSessionId = String(parent.session.id);
+			if (route !== void 0) deps.active.set(parentSessionId, role.id, route);
+			try {
+				const run = await deps.startRun(deps.provider, request);
+				if (route !== void 0) await deps.recordRoute(String(run.id), route).catch(() => void 0);
+				return await settleForegroundRun(run, role.id, route);
+			} finally {
+				if (route !== void 0) deps.active.delete(parentSessionId, role.id);
+			}
 		}
 	});
 }
@@ -1326,7 +1358,7 @@ const TEAM_SECTION_ORDER = 116.6;
 * 工具随 provider 在场与否挂载/摘除。名册来自注册表（main 排除），工具与提示段都经
 * 闭包读取 registry，UI 改角色后新会话即生效。
 */
-function setupDelegate(ctx, config, registry) {
+function setupDelegate(ctx, config, registry, channels) {
 	const { provider, toolName } = config;
 	let disposeTool;
 	let providerFailed = false;
@@ -1339,7 +1371,9 @@ function setupDelegate(ctx, config, registry) {
 			roster: () => registry.list(),
 			provider,
 			buildPersona: (role) => buildAgentPersona({ rules: config.rules }, role, role.model),
-			startRun: (pr, request) => ctx.subagents.start(pr, request)
+			startRun: (pr, request) => ctx.subagents.start(pr, request),
+			active: channels.active,
+			recordRoute: channels.recordRoute
 		}));
 	};
 	ctx.on("subagent/provider-added", (p) => {
@@ -1372,6 +1406,86 @@ function setupDelegate(ctx, config, registry) {
 	});
 }
 //#endregion
+//#region src/delegate/active.ts
+function createActiveRoutes() {
+	const map = /* @__PURE__ */ new Map();
+	const key = (sessionId, roleId) => `${sessionId}:${roleId}`;
+	return {
+		set: (sessionId, roleId, route) => {
+			map.set(key(sessionId, roleId), route);
+		},
+		get: (sessionId, roleId) => map.get(key(sessionId, roleId)),
+		delete: (sessionId, roleId) => {
+			map.delete(key(sessionId, roleId));
+		}
+	};
+}
+//#endregion
+//#region src/delegate/routes.ts
+/** 委派路由持久存储域：子会话头部 chip 的数据源（schema 与 domain 布局的单一来源在本文件）。 */
+const DelegationRouteRecordSchema = z$1.object({
+	provider: z$1.string(),
+	model: z$1.string(),
+	at: z$1.number()
+});
+const delegationRoutesDomain = defineDomain({
+	name: "dsh_agent_toolkit_routes",
+	version: 1,
+	tables: { routes: domainTable(DelegationRouteRecordSchema) }
+});
+//#endregion
+//#region src/delegate/api.ts
+function createDelegateApiHandler(deps) {
+	return async (req, res) => {
+		const url = new URL(req.url ?? "/", "http://127.0.0.1");
+		const sub = url.pathname.replace(/^\/dsh-agent-toolkit\/api/, "") || "/";
+		if (req.method !== "GET") {
+			json$1(res, 405, { error: "method not allowed" });
+			return;
+		}
+		if (sub === "/delegate/active") {
+			const route = deps.active.get(url.searchParams.get("session") ?? "", url.searchParams.get("role") ?? "");
+			if (route === void 0) {
+				json$1(res, 404, { error: "not found" });
+				return;
+			}
+			json$1(res, 200, {
+				provider: route.provider,
+				model: route.model
+			});
+			return;
+		}
+		if (sub === "/delegate/route") {
+			const record = deps.routes.get(url.searchParams.get("session") ?? "");
+			if (record === void 0) {
+				json$1(res, 404, { error: "not found" });
+				return;
+			}
+			json$1(res, 200, {
+				provider: record.provider,
+				model: record.model
+			});
+			return;
+		}
+		json$1(res, 404, { error: "not found" });
+	};
+}
+/**
+* 注册 delegate 路由（恒启用，与 agents 同策略）。webServer 为可选服务：
+* 缺席时经 registerOptionalRoutes 惰性不注册。prefix 先于 /api 兜底前缀命中。
+*/
+function setupDelegateApi(ctx, deps) {
+	const handler = createDelegateApiHandler(deps);
+	registerOptionalRoutes(ctx, (webCtx) => {
+		const unregister = webCtx.webServer.register({
+			kind: "prefix",
+			path: "/dsh-agent-toolkit/api/delegate",
+			handler
+		});
+		return () => unregister();
+	});
+}
+//#endregion
 //#region src/agents/api.ts
 function createAgentsApiHandler(deps) {
 	return async (req, res) => {
@@ -3107,11 +3221,26 @@ async function apply(ctx, config) {
 		source: layerSource,
 		rules: config.rules
 	});
+	const routesTable = (await openDomainSafely(ctx, delegationRoutesDomain, warn)).table("routes");
+	const activeRoutes = createActiveRoutes();
 	setupDelegate(ctx, {
 		provider: config.provider,
 		toolName: config.toolName,
 		rules: config.rules
-	}, registry);
+	}, registry, {
+		active: activeRoutes,
+		recordRoute: async (childSessionId, route) => {
+			await routesTable.put(childSessionId, {
+				provider: route.provider,
+				model: route.model,
+				at: Date.now()
+			});
+		}
+	});
+	setupDelegateApi(ctx, {
+		active: activeRoutes,
+		routes: routesTable
+	});
 	setupAgentsApi(ctx, {
 		registry,
 		listTools: () => ctx.tools.schemas().map((s) => s.name),