dsh-agent-toolkit 0.2.3 → 0.2.4

package/lib/client.js

@@ -67,15 +67,15 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var delegate_card_module_css_default = {
-			"result": "_8wQUq_result",
-			"chip": "_8wQUq_chip",
-			"summary": "_8wQUq_summary",
-			"childLink": "_8wQUq_childLink",
 			"prompt": "_8wQUq_prompt",
 			"row": "_8wQUq_row",
+			"result": "_8wQUq_result",
 			"body": "_8wQUq_body",
+			"visuallyHidden": "_8wQUq_visuallyHidden",
+			"childLink": "_8wQUq_childLink",
+			"chip": "_8wQUq_chip",
 			"root": "_8wQUq_root",
-			"visuallyHidden": "_8wQUq_visuallyHidden"
+			"summary": "_8wQUq_summary"
 		};
 		//#endregion
 		//#region src/client/delegate/delegate-card.tsx
@@ -311,8 +311,8 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var entry_module_css_default$1 = {
-			"trigger": "VJWWsa_trigger",
-			"rail": "VJWWsa_rail"
+			"rail": "VJWWsa_rail",
+			"trigger": "VJWWsa_trigger"
 		};
 		//#endregion
 		//#region src/client/shared/entry.tsx
@@ -411,33 +411,33 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var agents_module_css_default = {
-			"error": "KsfSLW_error",
-			"builtinBadge": "KsfSLW_builtinBadge",
-			"actions": "KsfSLW_actions",
-			"field": "KsfSLW_field",
+			"readonlyId": "KsfSLW_readonlyId",
 			"listPane": "KsfSLW_listPane",
-			"toolMode": "KsfSLW_toolMode",
-			"select": "KsfSLW_select",
-			"toolGrid": "KsfSLW_toolGrid",
+			"agentRowActive": "KsfSLW_agentRowActive",
+			"agentDesc": "KsfSLW_agentDesc",
 			"split": "KsfSLW_split",
+			"toolGrid": "KsfSLW_toolGrid",
 			"block": "KsfSLW_block",
-			"toolGroupTitle": "KsfSLW_toolGroupTitle",
-			"agentDesc": "KsfSLW_agentDesc",
-			"readonlyId": "KsfSLW_readonlyId",
+			"toolCheck": "KsfSLW_toolCheck",
+			"blockTitle": "KsfSLW_blockTitle",
+			"hint": "KsfSLW_hint",
 			"dangerButton": "KsfSLW_dangerButton",
-			"textarea": "KsfSLW_textarea",
-			"toolGroupSet": "KsfSLW_toolGroupSet",
-			"editor": "KsfSLW_editor",
 			"input": "KsfSLW_input",
-			"blockTitle": "KsfSLW_blockTitle",
+			"textarea": "KsfSLW_textarea",
+			"editorPane": "KsfSLW_editorPane",
+			"field": "KsfSLW_field",
+			"dialog": "KsfSLW_dialog",
+			"error": "KsfSLW_error",
 			"agentRow": "KsfSLW_agentRow",
 			"agentName": "KsfSLW_agentName",
-			"toolCheck": "KsfSLW_toolCheck",
-			"hint": "KsfSLW_hint",
+			"editor": "KsfSLW_editor",
+			"select": "KsfSLW_select",
+			"actions": "KsfSLW_actions",
 			"createButton": "KsfSLW_createButton",
-			"agentRowActive": "KsfSLW_agentRowActive",
-			"editorPane": "KsfSLW_editorPane",
-			"dialog": "KsfSLW_dialog"
+			"toolMode": "KsfSLW_toolMode",
+			"builtinBadge": "KsfSLW_builtinBadge",
+			"toolGroupSet": "KsfSLW_toolGroupSet",
+			"toolGroupTitle": "KsfSLW_toolGroupTitle"
 		};
 		//#endregion
 		//#region src/client/agents/AgentEditor.tsx
@@ -951,24 +951,24 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var prompt_module_css_default = {
-			"field": "VZk1fa_field",
+			"editor": "VZk1fa_editor",
+			"error": "VZk1fa_error",
+			"editorPane": "VZk1fa_editorPane",
 			"tab": "VZk1fa_tab",
-			"textarea": "VZk1fa_textarea",
-			"hint": "VZk1fa_hint",
 			"layerOrder": "VZk1fa_layerOrder",
-			"layerRow": "VZk1fa_layerRow",
-			"tabs": "VZk1fa_tabs",
-			"actions": "VZk1fa_actions",
-			"tabActive": "VZk1fa_tabActive",
-			"listPane": "VZk1fa_listPane",
-			"layerRowActive": "VZk1fa_layerRowActive",
+			"field": "VZk1fa_field",
 			"dialog": "VZk1fa_dialog",
+			"listPane": "VZk1fa_listPane",
+			"hint": "VZk1fa_hint",
+			"tabs": "VZk1fa_tabs",
+			"layerRow": "VZk1fa_layerRow",
 			"split": "VZk1fa_split",
-			"readonlyTag": "VZk1fa_readonlyTag",
-			"editorPane": "VZk1fa_editorPane",
-			"error": "VZk1fa_error",
+			"tabActive": "VZk1fa_tabActive",
 			"layerName": "VZk1fa_layerName",
-			"editor": "VZk1fa_editor"
+			"textarea": "VZk1fa_textarea",
+			"actions": "VZk1fa_actions",
+			"layerRowActive": "VZk1fa_layerRowActive",
+			"readonlyTag": "VZk1fa_readonlyTag"
 		};
 		//#endregion
 		//#region src/client/prompt/PromptLayersModal.tsx
@@ -1310,8 +1310,8 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var entry_module_css_default = {
-			"rail": "QVHFVG_rail",
-			"trigger": "QVHFVG_trigger"
+			"trigger": "QVHFVG_trigger",
+			"rail": "QVHFVG_rail"
 		};
 		//#endregion
 		//#region ../usage/src/client/shared/entry.tsx
@@ -1452,13 +1452,13 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var chart_module_css_default = {
-			"chartTheme": "_8LXSJW_chartTheme",
 			"swatchCached": "_8LXSJW_swatchCached",
+			"legend": "_8LXSJW_legend",
 			"swatchFresh": "_8LXSJW_swatchFresh",
 			"tooltipTitle": "_8LXSJW_tooltipTitle",
-			"legend": "_8LXSJW_legend",
 			"tooltip": "_8LXSJW_tooltip",
-			"tooltipTotal": "_8LXSJW_tooltipTotal"
+			"tooltipTotal": "_8LXSJW_tooltipTotal",
+			"chartTheme": "_8LXSJW_chartTheme"
 		};
 		//#endregion
 		//#region \0dsh-css:D:\work\github\dsh\dsh-agent-toolkit\packages\usage\src\client\usage\ActivityHeatmap.module.css.mjs
@@ -1472,14 +1472,14 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ActivityHeatmap_module_css_default = {
-			"level0": "hjrYrq_level0",
-			"months": "hjrYrq_months",
-			"level3": "hjrYrq_level3",
 			"level2": "hjrYrq_level2",
 			"level4": "hjrYrq_level4",
-			"level1": "hjrYrq_level1",
+			"level0": "hjrYrq_level0",
 			"grid": "hjrYrq_grid",
-			"week": "hjrYrq_week"
+			"months": "hjrYrq_months",
+			"week": "hjrYrq_week",
+			"level3": "hjrYrq_level3",
+			"level1": "hjrYrq_level1"
 		};
 		//#endregion
 		//#region ../usage/src/client/usage/ActivityHeatmap.tsx
@@ -52516,19 +52516,19 @@ ${te.current.stack}
 			document.head.appendChild(tag);
 		}
 		var UsageModal_module_css_default = {
-			"row": "MODeXa_row",
+			"dialog": "MODeXa_dialog",
 			"dateLabel": "MODeXa_dateLabel",
-			"pager": "MODeXa_pager",
-			"tab": "MODeXa_tab",
-			"rowName": "MODeXa_rowName",
+			"pagerButton": "MODeXa_pagerButton",
 			"compaction": "MODeXa_compaction",
 			"tabActive": "MODeXa_tabActive",
+			"rowName": "MODeXa_rowName",
 			"sectionTitle": "MODeXa_sectionTitle",
-			"rowCalls": "MODeXa_rowCalls",
-			"dialog": "MODeXa_dialog",
-			"pagerButton": "MODeXa_pagerButton",
 			"tabs": "MODeXa_tabs",
-			"total": "MODeXa_total"
+			"row": "MODeXa_row",
+			"total": "MODeXa_total",
+			"rowCalls": "MODeXa_rowCalls",
+			"pager": "MODeXa_pager",
+			"tab": "MODeXa_tab"
 		};
 		//#endregion
 		//#region ../usage/src/client/usage/UsageModal.tsx
@@ -55153,29 +55153,29 @@ ${te.current.stack}
 			document.head.appendChild(tag);
 		}
 		var bots_module_css_default = {
-			"tabActive": "vTbXga_tabActive",
 			"botRow": "vTbXga_botRow",
-			"step": "vTbXga_step",
+			"tabActive": "vTbXga_tabActive",
+			"dialog": "vTbXga_dialog",
+			"error": "vTbXga_error",
+			"group": "vTbXga_group",
+			"createButton": "vTbXga_createButton",
 			"tabs": "vTbXga_tabs",
-			"select": "vTbXga_select",
+			"stepSeparator": "vTbXga_stepSeparator",
+			"stepActive": "vTbXga_stepActive",
 			"hint": "vTbXga_hint",
+			"botName": "vTbXga_botName",
+			"select": "vTbXga_select",
 			"channelBadge": "vTbXga_channelBadge",
-			"groupTitle": "vTbXga_groupTitle",
+			"scanSection": "vTbXga_scanSection",
+			"textarea": "vTbXga_textarea",
+			"steps": "vTbXga_steps",
 			"field": "vTbXga_field",
 			"formActions": "vTbXga_formActions",
-			"createButton": "vTbXga_createButton",
 			"tab": "vTbXga_tab",
-			"status": "vTbXga_status",
-			"stepActive": "vTbXga_stepActive",
-			"group": "vTbXga_group",
+			"step": "vTbXga_step",
+			"groupTitle": "vTbXga_groupTitle",
 			"input": "vTbXga_input",
-			"scanSection": "vTbXga_scanSection",
-			"error": "vTbXga_error",
-			"stepSeparator": "vTbXga_stepSeparator",
-			"dialog": "vTbXga_dialog",
-			"steps": "vTbXga_steps",
-			"botName": "vTbXga_botName",
-			"textarea": "vTbXga_textarea"
+			"status": "vTbXga_status"
 		};
 		//#endregion
 		//#region src/client/bots/BotForm.tsx

package/lib/index.js

@@ -12,6 +12,7 @@ import { SessionId } from "@deepseek-ai/dsh-session";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import * as lark from "@larksuiteoapi/node-sdk";
 import { randomBytes, randomUUID } from "node:crypto";
+import { bindScopeParent, createScope, scopeOf } from "@deepseek-ai/dsh-scope";
 import { setupUsage } from "@dsh-agent-toolkit/token-usage";
 //#region src/agents/store.ts
 /** agents 注册表存储域声明：记录 schema + domain 布局的单一来源。 */
@@ -1668,18 +1669,15 @@ function setupCreateAgentCommand(ctx, deps) {
 //#region src/channels/agent-setup.ts
 /** bot 会话角色 persona 的 scoped 段名：与全局 persona 层同名，scoped 注册即 shadow 覆盖主 Agent persona。 */
 const TOOLKIT_PERSONA_SECTION = "prompt-stack:persona";
-/** 默认加载器：复刻 preset mount 的模块解析——loader 的 unwrapExports 取 `default ?? 命名导出模块`。 */
-async function loadToolModule(specifier) {
-	const mod = await import(specifier);
-	return mod.default ?? mod;
-}
 /**
-* 组合 agent 作用域：先 scoped 挂载基础工具行（persona/instructions/shell/fs/fs-search，
-* 与原生 UI 会话的 standard preset 同源），再叠 bot 的 persona 与 tools 白名单。
-* 顺序敏感：restrict 必须在工具行挂载之后，否则白名单命中不到挂载带入的工具名。
+* 组合 agent 作用域：先把 agent scope 父链挂到基础工具行 standing scope（工具成为
+* 继承面），再叠 bot 的 persona 与 tools 白名单。
+* 顺序敏感：restrict 必须在 join 之后——宿主 tools.restrict() 只校验并过滤继承面
+* （global + 祖先 scope 层），own 层（agentCtx 直接挂载）的名字既不可 restrict 也
+* 不受 restrict 影响，直接挂进 agentCtx 的白名单会抛 unknown global tools。
 */
-async function setupAgentScope(agentCtx, hooks, loadTool = loadToolModule) {
-	for (const tool of BASIC_TOOLS) await agentCtx.plugin(await loadTool(tool.id), tool.config);
+async function setupAgentScope(agentCtx, hooks, toolsScope) {
+	await toolsScope.join(agentCtx);
 	if (hooks.persona !== void 0) agentCtx.systemPrompt.section({
 		name: TOOLKIT_PERSONA_SECTION,
 		order: 10,
@@ -2747,6 +2745,55 @@ var BotRuntime = class {
 	}
 };
 //#endregion
+//#region src/channels/tool-scope.ts
+/** 默认加载器：复刻 preset mount 的模块解析——loader 的 unwrapExports 取 `default ?? 命名导出模块`。 */
+async function loadToolModule(specifier) {
+	const mod = await import(specifier);
+	return mod.default ?? mod;
+}
+/** 建一个 bot 会话共用的工具行 standing scope（所有 bot 会话挂同一套 BASIC_TOOLS）。 */
+function createToolsScope(ctx, loadTool = loadToolModule) {
+	let scope;
+	let mount;
+	let generation = 0;
+	function ensure() {
+		mount ??= (async () => {
+			const key = {
+				origin: "dsh-agent-toolkit",
+				kind: "bots-tools",
+				gen: ++generation
+			};
+			const created = createScope(ctx, key);
+			scope = created;
+			try {
+				for (const tool of BASIC_TOOLS) await created.ctx.plugin(await loadTool(tool.id), tool.config);
+			} catch (error) {
+				if (scope === created) scope = void 0;
+				mount = void 0;
+				await created.dispose().catch(() => void 0);
+				throw error;
+			}
+			return key;
+		})();
+		return mount;
+	}
+	return {
+		async join(agentCtx) {
+			const agentKey = scopeOf(agentCtx);
+			if (agentKey === void 0) throw new Error("tools-scope: refusing to join an unscoped agent context; per-agent composition requires a scope key");
+			const standing = await ensure();
+			bindScopeParent(agentKey, standing);
+			return standing;
+		},
+		async dispose() {
+			mount = void 0;
+			const current = scope;
+			scope = void 0;
+			await current?.dispose();
+		}
+	};
+}
+//#endregion
 //#region src/bots/api.ts
 /** 浏览器半 RPC：单前缀路由 /dsh-agent-toolkit/api/bots + 内部路径分发。 */
 const MAX_BODY_BYTES = 65536;
@@ -3089,21 +3136,22 @@ function setupBots(ctx, config, deps) {
 		await ctx.credentials.set(credentialRef(ref), secret);
 		return ref;
 	};
-	/** 创作期注入已迁至 agent-setup.ts（基础工具 scoped 挂载 + persona/tools），preset 机制整体移除。 */
+	/** 创作期注入已迁至 agent-setup.ts + tool-scope.ts（基础工具行 standing scope 挂载 + persona/tools），preset 机制整体移除。 */
+	const toolsScope = createToolsScope(ctx);
 	const agentsPort = {
 		async create(input) {
 			return adaptAgent(await ctx.agents.create({
 				sessionId: SessionId(input.sessionId),
 				meta: { cwd: input.cwd },
 				...input.agentOptions !== void 0 ? { agentOptions: input.agentOptions } : {},
-				setup: (agentCtx) => setupAgentScope(agentCtx, input.hooks)
+				setup: (agentCtx) => setupAgentScope(agentCtx, input.hooks, toolsScope)
 			}));
 		},
 		async resume(input) {
 			return adaptAgent(await ctx.agents.resume({
 				resumeSessionId: SessionId(input.sessionId),
 				...input.agentOptions !== void 0 ? { agentOptions: input.agentOptions } : {},
-				setup: (agentCtx) => setupAgentScope(agentCtx, input.hooks)
+				setup: (agentCtx) => setupAgentScope(agentCtx, input.hooks, toolsScope)
 			}));
 		}
 	};
@@ -3207,6 +3255,9 @@ function setupBots(ctx, config, deps) {
 		});
 		return () => dispose();
 	});
+	ctx.effect(() => async () => {
+		await toolsScope.dispose();
+	});
 	ctx.effect(() => async () => {
 		registerAppService.dispose();
 	});