dsh-agent-toolkit 0.2.2 → 0.2.4

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,
@@ -2266,20 +2264,23 @@ const feishuChannel = {
 			appSecret: bot.secret
 		}));
 		const dedup = new MessageDedup();
-		const dispatcher = new lark.EventDispatcher({}).register({ "im.message.receive_v1": async (data) => {
-			const parsed = parseMessageEvent(data);
-			if (parsed === null || !dedup.check(parsed.messageId)) return;
-			const reply = new FeishuReplyHandle(api, parsed.chatId, tunables, log);
-			io.onMessage({
-				botId: bot.record.id,
-				chatId: parsed.chatId,
-				userId: parsed.userId,
-				messageId: parsed.messageId,
-				text: parsed.text,
-				reply,
-				ackProcessing: makeAck(api, parsed.messageId, tunables.processingReactionEmoji)
-			});
-		} });
+		const dispatcher = new lark.EventDispatcher({}).register({
+			"im.message.message_read_v1": async () => void 0,
+			"im.message.receive_v1": async (data) => {
+				const parsed = parseMessageEvent(data);
+				if (parsed === null || !dedup.check(parsed.messageId)) return;
+				const reply = new FeishuReplyHandle(api, parsed.chatId, tunables, log);
+				io.onMessage({
+					botId: bot.record.id,
+					chatId: parsed.chatId,
+					userId: parsed.userId,
+					messageId: parsed.messageId,
+					text: parsed.text,
+					reply,
+					ackProcessing: makeAck(api, parsed.messageId, tunables.processingReactionEmoji)
+				});
+			}
+		});
 		const ws = new lark.WSClient({
 			appId,
 			appSecret: bot.secret,
@@ -2342,66 +2343,6 @@ const projectBotDomain = defineDomain({
 function bindingKey(botId, chatId) {
 	return `${botId}:${chatId}`;
 }
-//#endregion
-//#region src/channels/inbound.ts
-/** 入站：指令分流 → 路由 → 单 in-flight 准入 → 表情回复 → followup 投递。 */
-var Inbound = class {
-	deps;
-	constructor(deps) {
-		this.deps = deps;
-	}
-	onMessage(msg) {
-		this.handle(msg).catch(async (error) => {
-			this.deps.onError(`[project-bot] 入站处理失败：${error instanceof Error ? error.message : String(error)}`);
-			await msg.reply.notice("处理失败，请稍后再试").catch(() => void 0);
-		});
-	}
-	async handle(msg) {
-		const bot = this.deps.bots.get(msg.botId);
-		if (bot === void 0) return;
-		const directive = parseDirective(msg.text);
-		if (directive === "new") {
-			await this.deps.router.reset(bot, msg.chatId, msg.reply);
-			await msg.reply.notice("已开启新会话");
-			return;
-		}
-		if (directive === "stop") {
-			const rt = this.deps.router.lookup(bot.id, msg.chatId);
-			if (rt?.inflight !== void 0) {
-				rt.agent.cancel();
-				await msg.reply.notice("已请求停止当前任务");
-			} else await msg.reply.notice("当前没有进行中的任务");
-			return;
-		}
-		if (directive === "status") {
-			const rt = this.deps.router.lookup(bot.id, msg.chatId);
-			await msg.reply.notice(rt === void 0 ? `项目：${bot.project}\n会话：未创建（发送消息即创建）` : `项目：${bot.project}\n会话：${rt.sessionId}\n状态：${rt.inflight !== void 0 ? "处理中" : "空闲"}`);
-			return;
-		}
-		const rt = await this.deps.router.ensure(bot, msg.chatId, msg.reply);
-		if (rt.inflight !== void 0) {
-			await msg.reply.notice("上一条还在处理中，请稍候（或发送 /stop 取消）");
-			return;
-		}
-		rt.inflight = { ack: void 0 };
-		rt.inflight.ack = await msg.ackProcessing().catch(() => void 0) ?? void 0;
-		const message = createUserMessage({
-			content: [{
-				type: "text",
-				text: msg.text
-			}],
-			source: { kind: "user" }
-		});
-		try {
-			rt.agent.followup(message);
-		} catch (error) {
-			const ack = rt.inflight.ack;
-			rt.inflight = void 0;
-			await ack?.();
-			throw error;
-		}
-	}
-};
 /** 向段序列追加内容：与尾段同类则合并，异类开新段。 */
 function appendToSegments(segments, kind, text) {
 	const tail = segments[segments.length - 1];
@@ -2519,6 +2460,67 @@ var Outbound = class {
 	}
 };
 //#endregion
+//#region src/channels/inbound.ts
+/** 入站：指令分流 → 路由 → 单 in-flight 准入 → 表情回复 → followup 投递。 */
+var Inbound = class {
+	deps;
+	constructor(deps) {
+		this.deps = deps;
+	}
+	onMessage(msg) {
+		this.handle(msg).catch(async (error) => {
+			const detail = truncateDetail(error instanceof Error ? error.message : String(error), this.deps.maxErrorDetailChars);
+			this.deps.onError(`[project-bot] 入站处理失败：${detail}`);
+			await msg.reply.notice(`处理失败：${detail}`).catch(() => void 0);
+		});
+	}
+	async handle(msg) {
+		const bot = this.deps.bots.get(msg.botId);
+		if (bot === void 0) return;
+		const directive = parseDirective(msg.text);
+		if (directive === "new") {
+			await this.deps.router.reset(bot, msg.chatId, msg.reply);
+			await msg.reply.notice("已开启新会话");
+			return;
+		}
+		if (directive === "stop") {
+			const rt = this.deps.router.lookup(bot.id, msg.chatId);
+			if (rt?.inflight !== void 0) {
+				rt.agent.cancel();
+				await msg.reply.notice("已请求停止当前任务");
+			} else await msg.reply.notice("当前没有进行中的任务");
+			return;
+		}
+		if (directive === "status") {
+			const rt = this.deps.router.lookup(bot.id, msg.chatId);
+			await msg.reply.notice(rt === void 0 ? `项目：${bot.project}\n会话：未创建（发送消息即创建）` : `项目：${bot.project}\n会话：${rt.sessionId}\n状态：${rt.inflight !== void 0 ? "处理中" : "空闲"}`);
+			return;
+		}
+		const rt = await this.deps.router.ensure(bot, msg.chatId, msg.reply);
+		if (rt.inflight !== void 0) {
+			await msg.reply.notice("上一条还在处理中，请稍候（或发送 /stop 取消）");
+			return;
+		}
+		rt.inflight = { ack: void 0 };
+		rt.inflight.ack = await msg.ackProcessing().catch(() => void 0) ?? void 0;
+		const message = createUserMessage({
+			content: [{
+				type: "text",
+				text: msg.text
+			}],
+			source: { kind: "user" }
+		});
+		try {
+			rt.agent.followup(message);
+		} catch (error) {
+			const ack = rt.inflight.ack;
+			rt.inflight = void 0;
+			await ack?.();
+			throw error;
+		}
+	}
+};
+//#endregion
 //#region src/channels/ports.ts
 /** 从 bot 记录提取创作期注入（主 Agent 绑定形态）。 */
 function hooksOf(bot) {
@@ -2659,6 +2661,7 @@ var BotRuntime = class {
 		this.inbound = new Inbound({
 			router: this.router,
 			bots: deps.bots,
+			maxErrorDetailChars: deps.maxErrorDetailChars,
 			onError: (m) => deps.log.warn(m)
 		});
 		this.outbound = new Outbound(this.sessions, (m) => deps.log.warn(m), deps.maxErrorDetailChars);
@@ -2742,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;
@@ -2993,6 +3045,18 @@ function createApiHandler(deps) {
 //#endregion
 //#region src/bots/register-app.ts
 /** 扫码一键创建飞书应用：lark.registerApp（OAuth 2.0 Device Authorization Grant）的状态机封装。 */
+/** 扫码创建应用时申请的权限/事件（流式卡片 + 收发消息 + 表情 + 通讯录基础信息）。
+* 故意不加 as const：readonly 元组不可赋值给 SDK AppAddons 的 mutable string[]，
+* 否则 bots/index.ts 的 lark.registerApp(options) 透传会 typecheck 失败。 */
+const FEISHU_REGISTER_APP_ADDONS = {
+	scopes: { tenant: [
+		"im:message",
+		"im:message:send_as_bot",
+		"cardkit:card:write",
+		"contact:user.base:readonly"
+	] },
+	events: { items: { tenant: ["im.message.receive_v1"] } }
+};
 var RegisterAppService = class {
 	deps;
 	sessions = /* @__PURE__ */ new Map();
@@ -3013,6 +3077,7 @@ var RegisterAppService = class {
 		this.sessions.set(id, entry);
 		this.deps.registerApp({
 			signal: controller.signal,
+			addons: FEISHU_REGISTER_APP_ADDONS,
 			onQRCodeReady: (info) => {
 				entry.state = {
 					status: "pending",
@@ -3071,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)
 			}));
 		}
 	};
@@ -3189,6 +3255,9 @@ function setupBots(ctx, config, deps) {
 		});
 		return () => dispose();
 	});
+	ctx.effect(() => async () => {
+		await toolsScope.dispose();
+	});
 	ctx.effect(() => async () => {
 		registerAppService.dispose();
 	});