@zhin.js/agent 1.0.1 → 1.0.3

package/lib/builtin/ask-user-session-service.js

@@ -0,0 +1,258 @@
+/**
+ * ask_user 常驻会话服务 — 单轨 middleware、排队、命令 bypass、Prompt/私聊统一。
+ */
+import { Prompt, } from '@zhin.js/core';
+import { errMsg } from '../discovery/utils.js';
+import { notifyGroupOwnerAskUserResolved, buildGroupAskUserFollowUp } from '../collaboration/ask-user-bridge.js';
+import { buildSensitiveOwnerQuestionText, formatOwnerResponse, } from './ask-user-tool.js';
+function ownerKey(endpointId, masterId) {
+    return `${endpointId}:${masterId}`;
+}
+function promptKey(message) {
+    return `${message.$adapter}-${message.$endpoint}-${message.$channel?.type}:${message.$channel?.id}-${message.$sender?.id}`;
+}
+function isSlashCommand(message) {
+    const raw = String(message.$raw ?? '').trim();
+    return raw.startsWith('/');
+}
+let serviceInstance;
+export class AskUserSessionService {
+    plugin;
+    ownerQueues = new Map();
+    promptWaits = new Map();
+    disposeMiddleware;
+    constructor(plugin) {
+        this.plugin = plugin;
+        this.disposeMiddleware = (plugin.root ?? plugin).addMiddleware(this.middleware.bind(this));
+    }
+    static install(plugin) {
+        if (!serviceInstance) {
+            serviceInstance = new AskUserSessionService(plugin);
+        }
+        return serviceInstance;
+    }
+    static resetForTests() {
+        serviceInstance = undefined;
+    }
+    static get() {
+        return serviceInstance;
+    }
+    matchInbound(message, root) {
+        if (isSlashCommand(message) && this.hasPendingForMessage(message, root)) {
+            return 'bypass';
+        }
+        if (this.tryMatchPrompt(message))
+            return 'consume';
+        if (this.tryMatchSensitiveDm(message, root))
+            return 'consume';
+        return 'ignore';
+    }
+    isPendingReply(message, root) {
+        return this.matchInbound(message, root) === 'consume';
+    }
+    async open(spec) {
+        if (spec.kind === 'prompt') {
+            return this.openPrompt(spec);
+        }
+        return this.openSensitiveDm(spec);
+    }
+    hasPendingForMessage(message, root) {
+        if (this.promptWaits.has(promptKey(message)))
+            return true;
+        const endpointId = String(message.$endpoint ?? '');
+        const senderId = String(message.$sender?.id ?? '');
+        if (endpointId && senderId) {
+            const direct = this.ownerQueues.get(ownerKey(endpointId, senderId));
+            if (direct?.active || direct?.waiting.length)
+                return true;
+        }
+        const ids = this.resolveEndpointMaster(message, root);
+        if (!ids)
+            return false;
+        const queue = this.ownerQueues.get(ownerKey(ids.endpointId, ids.masterId));
+        return Boolean(queue?.active || queue?.waiting.length);
+    }
+    tryMatchPrompt(message) {
+        return this.promptWaits.has(promptKey(message));
+    }
+    tryMatchSensitiveDm(message, root) {
+        if (message.$channel?.type !== 'private')
+            return false;
+        const senderId = String(message.$sender?.id ?? '');
+        const endpointId = String(message.$endpoint ?? '');
+        if (!senderId || !endpointId)
+            return false;
+        const direct = this.ownerQueues.get(ownerKey(endpointId, senderId));
+        if (direct?.active)
+            return true;
+        const ids = this.resolveEndpointMaster(message, root);
+        if (!ids || senderId !== ids.masterId)
+            return false;
+        return Boolean(this.ownerQueues.get(ownerKey(ids.endpointId, ids.masterId))?.active);
+    }
+    async openPrompt(spec) {
+        const host = this.plugin.root ?? this.plugin;
+        const prompt = new Prompt(host, spec.message);
+        const questionType = spec.questionType;
+        const args = spec.args;
+        const timeoutMs = spec.timeoutMs;
+        try {
+            switch (questionType) {
+                case 'number': {
+                    const defaultNum = args.default_value != null ? Number(args.default_value) : undefined;
+                    const result = await prompt.number(String(args.question ?? ''), timeoutMs, defaultNum, '输入超时，已取消');
+                    return String(result);
+                }
+                case 'confirm': {
+                    const result = await prompt.confirm(String(args.question ?? ''), 'yes', timeoutMs, false, '确认超时，已取消');
+                    return result ? 'yes' : 'no';
+                }
+                case 'pick': {
+                    const options = args.options;
+                    if (!options?.length) {
+                        return 'Error: type=pick 时必须提供 options 选项列表';
+                    }
+                    const pickOptions = options.map((o) => ({ label: o, value: o }));
+                    const result = await prompt.pick(String(args.question ?? ''), {
+                        type: 'text',
+                        options: pickOptions,
+                        timeout: timeoutMs,
+                    }, '选择超时，已取消');
+                    return String(result);
+                }
+                case 'text':
+                default: {
+                    const result = await prompt.text(String(args.question ?? ''), timeoutMs, String(args.default_value ?? ''), '输入超时，已取消');
+                    return result;
+                }
+            }
+        }
+        catch (e) {
+            return `Owner 未响应或输入错误: ${errMsg(e)}`;
+        }
+    }
+    openSensitiveDm(spec) {
+        const masterId = String(spec.botMaster ?? '');
+        const endpointId = String(spec.message.$endpoint ?? '');
+        const key = ownerKey(endpointId, masterId);
+        return new Promise((resolve) => {
+            const entry = {
+                spec,
+                resolve,
+                timer: setTimeout(() => { }, spec.timeoutMs),
+            };
+            entry.timer = setTimeout(() => {
+                this.finishOwnerEntry(key, entry, this.timeoutFallback(spec));
+            }, spec.timeoutMs);
+            const queue = this.ownerQueues.get(key) ?? { waiting: [] };
+            if (queue.active) {
+                queue.waiting.push(entry);
+                this.ownerQueues.set(key, queue);
+                return;
+            }
+            queue.active = entry;
+            this.ownerQueues.set(key, queue);
+            void this.sendSensitiveQuestion(spec);
+        });
+    }
+    async sendSensitiveQuestion(spec) {
+        const { message, args, questionType, botMaster, adapter } = spec;
+        if (!botMaster || !adapter)
+            return;
+        const sceneId = String(message.$channel?.id ?? '');
+        const parentType = message.$channel?.type === 'channel' ? 'channel' : 'group';
+        const questionText = buildSensitiveOwnerQuestionText(message, String(args.question ?? ''), questionType, args.options);
+        try {
+            await adapter.sendMessage({
+                context: message.$adapter,
+                endpoint: message.$endpoint,
+                id: botMaster,
+                type: 'private',
+                parent: { type: parentType, id: sceneId },
+                content: questionText,
+            });
+        }
+        catch (e) {
+            const key = ownerKey(String(message.$endpoint), botMaster);
+            const queue = this.ownerQueues.get(key);
+            const active = queue?.active;
+            if (active?.spec.sessionId === spec.sessionId) {
+                this.finishOwnerEntry(key, active, `Error: 无法向 Owner 发送私聊消息: ${errMsg(e)}`);
+            }
+        }
+    }
+    timeoutFallback(spec) {
+        if (spec.args.default_value != null)
+            return String(spec.args.default_value);
+        return 'Owner 未在规定时间内响应，操作已取消。';
+    }
+    finishOwnerEntry(key, entry, answer) {
+        clearTimeout(entry.timer);
+        const queue = this.ownerQueues.get(key);
+        if (!queue || queue.active !== entry)
+            return;
+        queue.active = undefined;
+        const groupOrigin = entry.spec.groupOrigin ?? entry.spec.message;
+        void notifyGroupOwnerAskUserResolved(groupOrigin, answer).catch(() => { });
+        entry.resolve(answer);
+        const next = queue.waiting.shift();
+        if (next) {
+            queue.active = next;
+            this.ownerQueues.set(key, queue);
+            void this.sendSensitiveQuestion(next.spec);
+            return;
+        }
+        this.ownerQueues.delete(key);
+    }
+    resolveEndpointMaster(message, root) {
+        const endpointId = String(message.$endpoint ?? '');
+        if (!endpointId || !root)
+            return undefined;
+        try {
+            const adapter = root.inject(message.$adapter);
+            const master = adapter?.endpoints?.get(endpointId)?.$config?.master;
+            if (master == null)
+                return undefined;
+            return { endpointId, masterId: String(master) };
+        }
+        catch {
+            return undefined;
+        }
+    }
+    middleware = async (message, next) => {
+        const match = this.matchInbound(message, this.plugin.root ?? this.plugin);
+        if (match === 'ignore')
+            return next();
+        if (match === 'bypass')
+            return next();
+        const promptWait = this.promptWaits.get(promptKey(message));
+        if (promptWait) {
+            clearTimeout(promptWait.timer);
+            this.promptWaits.delete(promptKey(message));
+            const raw = String(message.$raw ?? '');
+            promptWait.resolve(formatOwnerResponse(raw, promptWait.spec.questionType, promptWait.spec.args));
+            return;
+        }
+        const senderId = String(message.$sender?.id ?? '');
+        const endpointId = String(message.$endpoint ?? '');
+        let key = ownerKey(endpointId, senderId);
+        let queue = this.ownerQueues.get(key);
+        if (!queue?.active) {
+            const ids = this.resolveEndpointMaster(message, this.plugin.root ?? this.plugin);
+            if (ids) {
+                key = ownerKey(ids.endpointId, ids.masterId);
+                queue = this.ownerQueues.get(key);
+            }
+        }
+        const active = queue?.active;
+        if (!active)
+            return next();
+        const raw = String(message.$raw ?? '');
+        const formatted = formatOwnerResponse(raw, active.spec.questionType, active.spec.args);
+        const answer = active.spec.groupOrigin
+            ? buildGroupAskUserFollowUp(active.spec.groupOrigin, formatted)
+            : formatted;
+        this.finishOwnerEntry(key, active, answer);
+    };
+}
+//# sourceMappingURL=ask-user-session-service.js.map

package/lib/builtin/ask-user-session-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-user-session-service.js","sourceRoot":"","sources":["../../src/builtin/ask-user-session-service.ts"],"names":[],"mappings":"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"}

package/lib/builtin/ask-user-session.d.ts

@@ -0,0 +1,18 @@
+/**
+ * ask_user 挂起会话注册表 — 委托 AskUserSessionService（常驻 middleware）。
+ */
+import type { Message, Plugin } from '@zhin.js/core';
+import { AskUserSessionService } from './ask-user-session-service.js';
+export interface PendingAskUserSession {
+    endpointId: string;
+    masterId: string;
+    groupOrigin?: Message;
+    registeredAt: number;
+}
+export declare function registerPendingAskUser(_session: PendingAskUserSession): void;
+export declare function clearPendingAskUser(_endpointId: string, _masterId: string): void;
+export declare function getPendingAskUser(_endpointId: string, _masterId: string): PendingAskUserSession | undefined;
+/** 该私聊消息是否应作为 ask_user 回复消费（勿再触发 AI Handler）。 */
+export declare function isAskUserPendingReply(message: Message, root?: Plugin): boolean;
+export declare function ensureAskUserSessionService(plugin: Plugin): AskUserSessionService;
+//# sourceMappingURL=ask-user-session.d.ts.map

package/lib/builtin/ask-user-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-user-session.d.ts","sourceRoot":"","sources":["../../src/builtin/ask-user-session.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAE5E;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAEhF;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB,GAAG,SAAS,CAE3G;AAED,iDAAiD;AACjD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAIT;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,qBAAqB,CAEjF"}

package/lib/builtin/ask-user-session.js

@@ -0,0 +1,21 @@
+import { AskUserSessionService } from './ask-user-session-service.js';
+export function registerPendingAskUser(_session) {
+    // legacy no-op：排队与会话状态由 AskUserSessionService 管理
+}
+export function clearPendingAskUser(_endpointId, _masterId) {
+    // legacy no-op
+}
+export function getPendingAskUser(_endpointId, _masterId) {
+    return undefined;
+}
+/** 该私聊消息是否应作为 ask_user 回复消费（勿再触发 AI Handler）。 */
+export function isAskUserPendingReply(message, root) {
+    const service = AskUserSessionService.get();
+    if (!service)
+        return false;
+    return service.isPendingReply(message, root);
+}
+export function ensureAskUserSessionService(plugin) {
+    return AskUserSessionService.install(plugin);
+}
+//# sourceMappingURL=ask-user-session.js.map

package/lib/builtin/ask-user-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-user-session.js","sourceRoot":"","sources":["../../src/builtin/ask-user-session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAStE,MAAM,UAAU,sBAAsB,CAAC,QAA+B;IACpE,iDAAiD;AACnD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,WAAmB,EAAE,SAAiB;IACxE,eAAe;AACjB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,WAAmB,EAAE,SAAiB;IACtE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,IAAa;IAEb,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,OAAO,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAc;IACxD,OAAO,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}

package/lib/builtin/ask-user-tool.d.ts

@@ -1,28 +1,20 @@
 /**
- * ask_user — 基于 Prompt / 私聊 向 Endpoint Owner 确认或提问
+ * ask_user — 默认在当前会话（群/频道/私聊）Prompt 提问；敏感确认走私聊 master（群来源带 parent）。
  */
-import { type Plugin, type Message, type Tool, type ToolParametersSchema, type ToolResult } from '@zhin.js/core';
+import { type Plugin, type Message, type Tool, type ToolParametersSchema, type ToolResult, type Adapter } from '@zhin.js/core';
 import { BuiltinBaseTool } from './builtin-base-tool.js';
-/**
- * 私聊 Owner 场景：使用 Prompt 类直接交互（原有行为）
- */
-export declare function askViaPrompt(plugin: Plugin, message: any, args: Record<string, any>, questionType: string, timeoutMs: number): Promise<string>;
-/**
- * 将 Owner 私聊回复格式化为对应类型的结果
- */
-export declare function formatOwnerResponse(raw: string, questionType: string, args: Record<string, any>): string;
+export declare function askViaPrompt(plugin: Plugin, message: Message, args: Record<string, unknown>, questionType: string, timeoutMs: number): Promise<string>;
+export declare function formatOwnerResponse(raw: string, questionType: string, args: Record<string, unknown>): string;
+export declare function buildSensitiveOwnerQuestionText(commMessage: Message, question: string, questionType: string, options?: string[]): string;
+export declare function askOwnerViaPrivateWithParent(plugin: Plugin, commMessage: Message, args: Record<string, unknown>, questionType: string, timeoutMs: number, botMaster: string, adapter: Adapter): Promise<string>;
 export declare const ASK_USER_PARAMETERS: ToolParametersSchema;
-/**
- * 工厂：`createAskUserTool(plugin)` 或 `createAskUserTool({ plugin })`
- */
 export declare function createAskUserTool(plugin: Plugin): Tool;
 export declare class AskUserBuiltinTool extends BuiltinBaseTool {
     private readonly plugin;
     readonly name = "ask_user";
-    readonly description = "\u5411 Endpoint Owner \u53D1\u9001\u95EE\u9898\u5E76\u7B49\u5F85\u56DE\u590D\uFF1B\u7FA4\u804A\u573A\u666F\u4E0B\u901A\u8FC7\u79C1\u804A\u786E\u8BA4\u3002bash/icqq\uFF1AOwner \u79C1\u804A\u53EF\u7528\u300C/approve always bash\u300D\u300C/approve rule <\u6B63\u5219>\u300D\uFF08\u5339\u914D\u6574\u6BB5 shell \u5B50\u547D\u4EE4\uFF0C\u5982\u70B9\u8D5E\u7C7B icqq \u4E0D\u5FC5\u56FA\u5316\u89E3\u53C2\u6570\uFF09\u3001\u300C/approve list\u300D\u300C/approve revoke rule <id>\u300D\u300C/approve revoke\u300D\u3002write_file / edit_file / web_fetch \u7684\u786C\u7F16\u6392\u4ECD\u987B\u9010\u6B21\u786E\u8BA4\u3002";
+    readonly description = "Ask the user and wait for a reply. Default: prompt in the current session (group/channel/private) to the triggering user. Set sensitive=true only to confirm with the Endpoint Owner via private DM (group origin uses parent; no group-visible trace). Owner private chat: /approve always bash, /approve rule <regex>, /approve list, /approve revoke. write_file / edit_file / web_fetch hard-orchestration still requires per-action Owner confirm.";
     readonly parameters: ToolParametersSchema<Record<string, any>>;
     readonly kind = "interaction";
-    /** 默认等待 Owner 120s，须大于 Agent 默认 30s 工具超时 */
     readonly executionTimeoutMs = 150000;
     constructor(plugin: Plugin);
     run(args: Record<string, unknown>, commMessage?: Message): Promise<ToolResult>;

package/lib/builtin/ask-user-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ask-user-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/ask-user-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,OAAO,EAGZ,KAAK,IAAI,EACT,KAAK,oBAAoB,EACzB,KAAK,UAAU,EAChB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD;;GAEG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAmCjB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAgBxG;AAED,eAAO,MAAM,mBAAmB,EAAE,oBAkBjC,CAAC;AAEF;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEtD;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IASzC,OAAO,CAAC,QAAQ,CAAC,MAAM;IARnC,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,0mBACmO;IACvP,QAAQ,CAAC,UAAU,4CAAuB;IAC1C,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,4CAA4C;IAC5C,QAAQ,CAAC,kBAAkB,UAAW;gBAET,MAAM,EAAE,MAAM;IAgBrC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CA+ErF"}
+{"version":3,"file":"ask-user-tool.d.ts","sourceRoot":"","sources":["../../src/builtin/ask-user-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,KAAK,MAAM,EACX,KAAK,OAAO,EACZ,KAAK,IAAI,EACT,KAAK,oBAAoB,EACzB,KAAK,UAAU,EACf,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AASzD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAgB5G;AAED,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,MAAM,CAaR;AAOD,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,CAAC,CAajB;AAED,eAAO,MAAM,mBAAmB,EAAE,oBAuBjC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAGtD;AAED,qBAAa,kBAAmB,SAAQ,eAAe;IAQzC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAPnC,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,WAAW,6bACwa;IAC5b,QAAQ,CAAC,UAAU,4CAAuB;IAC1C,QAAQ,CAAC,IAAI,iBAAiB;IAC9B,QAAQ,CAAC,kBAAkB,UAAW;gBAET,MAAM,EAAE,MAAM;IAgBrC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;CAiDrF"}

package/lib/builtin/ask-user-tool.js

@@ -1,55 +1,21 @@
-/**
- * ask_user — 基于 Prompt / 私聊 向 Endpoint Owner 确认或提问
- */
-import { Prompt, } from '@zhin.js/core';
-import { errMsg } from '../discovery/utils.js';
+import { randomUUID } from 'node:crypto';
 import { BuiltinBaseTool } from './builtin-base-tool.js';
+import { shouldBlockDelegationAskUser } from '../collaboration/ask-user-bridge.js';
+import { ensureAskUserSessionService } from './ask-user-session.js';
 // ============================================================================
-// Prompt / Owner 回复格式化（原 builtin-tools 顶部辅助函数）
+// Prompt / Owner 回复格式化
 // ============================================================================
-/**
- * 私聊 Owner 场景：使用 Prompt 类直接交互（原有行为）
- */
 export async function askViaPrompt(plugin, message, args, questionType, timeoutMs) {
-    const host = plugin.root ?? plugin;
-    const prompt = new Prompt(host, message);
-    try {
-        switch (questionType) {
-            case 'number': {
-                const defaultNum = args.default_value != null ? Number(args.default_value) : undefined;
-                const result = await prompt.number(args.question, timeoutMs, defaultNum, '输入超时，已取消');
-                return String(result);
-            }
-            case 'confirm': {
-                const result = await prompt.confirm(args.question, 'yes', timeoutMs, false, '确认超时，已取消');
-                return result ? 'yes' : 'no';
-            }
-            case 'pick': {
-                if (!args.options?.length) {
-                    return 'Error: type=pick 时必须提供 options 选项列表';
-                }
-                const pickOptions = args.options.map((o) => ({ label: o, value: o }));
-                const result = await prompt.pick(args.question, {
-                    type: 'text',
-                    options: pickOptions,
-                    timeout: timeoutMs,
-                }, '选择超时，已取消');
-                return String(result);
-            }
-            case 'text':
-            default: {
-                const result = await prompt.text(args.question, timeoutMs, args.default_value || '', '输入超时，已取消');
-                return result;
-            }
-        }
-    }
-    catch (e) {
-        return `Owner 未响应或输入错误: ${errMsg(e)}`;
-    }
+    const service = ensureAskUserSessionService(plugin);
+    return service.open({
+        sessionId: randomUUID(),
+        kind: 'prompt',
+        message,
+        questionType,
+        args,
+        timeoutMs,
+    });
 }
-/**
- * 将 Owner 私聊回复格式化为对应类型的结果
- */
 export function formatOwnerResponse(raw, questionType, args) {
     switch (questionType) {
         case 'confirm':
@@ -68,38 +34,73 @@ export function formatOwnerResponse(raw, questionType, args) {
             return raw;
     }
 }
+export function buildSensitiveOwnerQuestionText(commMessage, question, questionType, options) {
+    const sourceInfo = commMessage.$channel?.type !== 'private'
+        ? `来源: ${commMessage.$channel?.type}(${commMessage.$channel?.id}) 用户: ${commMessage.$sender.id}`
+        : `来源: 私聊 用户: ${commMessage.$sender.id}`;
+    let questionText = `请求确认：\n${sourceInfo}\n\n${question}`;
+    if (questionType === 'confirm') {
+        questionText += '\n输入"yes"以确认';
+    }
+    else if (questionType === 'pick' && options?.length) {
+        questionText += '\n' + options.map((o, i) => `${i + 1}.${o}`).join('\n');
+    }
+    else if (questionType === 'number') {
+        questionText += '\n(请输入数字)';
+    }
+    return questionText;
+}
+function isGroupOrChannelScope(message) {
+    const scope = message.$channel?.type;
+    return scope === 'group' || scope === 'channel';
+}
+export async function askOwnerViaPrivateWithParent(plugin, commMessage, args, questionType, timeoutMs, botMaster, adapter) {
+    const service = ensureAskUserSessionService(plugin);
+    return service.open({
+        sessionId: randomUUID(),
+        kind: 'sensitive_dm',
+        message: commMessage,
+        questionType,
+        args,
+        timeoutMs,
+        botMaster,
+        adapter,
+        groupOrigin: commMessage,
+    });
+}
 export const ASK_USER_PARAMETERS = {
     type: 'object',
     properties: {
-        question: { type: 'string', description: '要向 Owner 提出的问题文本' },
+        question: { type: 'string', description: 'Question text to ask the user or Endpoint Owner' },
         type: {
             type: 'string',
             enum: ['text', 'number', 'confirm', 'pick'],
-            description: '问题类型: text(文本输入)、number(数字输入)、confirm(是/否确认)、pick(选项选择)。默认 text',
+            description: 'Response type: text, number, confirm (yes/no), or pick (numbered options). Default: text',
         },
         options: {
             type: 'array',
             items: { type: 'string' },
-            description: '选项列表（type=pick 时必填），每项为字符串，如 ["选项A","选项B","选项C"]',
+            description: 'Option labels when type=pick (required), e.g. ["Option A","Option B"]',
+        },
+        default_value: { type: 'string', description: 'Fallback value if the user does not reply before timeout' },
+        timeout: { type: 'number', description: 'Wait timeout in seconds. Default: 120' },
+        sensitive: {
+            type: 'boolean',
+            description: 'When true, send a private confirmation to the Endpoint Owner (group/channel origin includes parent scene). Use for exec approval, secrets, or other sensitive confirms. Do not set for ordinary clarification.',
         },
-        default_value: { type: 'string', description: 'Owner 超时未回复时使用的默认值' },
-        timeout: { type: 'number', description: '等待 Owner 回复的超时时间（秒），默认 120' },
     },
     required: ['question'],
 };
-/**
- * 工厂：`createAskUserTool(plugin)` 或 `createAskUserTool({ plugin })`
- */
 export function createAskUserTool(plugin) {
+    ensureAskUserSessionService(plugin);
     return new AskUserBuiltinTool(plugin).toTool();
 }
 export class AskUserBuiltinTool extends BuiltinBaseTool {
     plugin;
     name = 'ask_user';
-    description = '向 Endpoint Owner 发送问题并等待回复；群聊场景下通过私聊确认。bash/icqq：Owner 私聊可用「/approve always bash」「/approve rule <正则>」（匹配整段 shell 子命令，如点赞类 icqq 不必固化解参数）、「/approve list」「/approve revoke rule <id>」「/approve revoke」。write_file / edit_file / web_fetch 的硬编排仍须逐次确认。';
+    description = 'Ask the user and wait for a reply. Default: prompt in the current session (group/channel/private) to the triggering user. Set sensitive=true only to confirm with the Endpoint Owner via private DM (group origin uses parent; no group-visible trace). Owner private chat: /approve always bash, /approve rule <regex>, /approve list, /approve revoke. write_file / edit_file / web_fetch hard-orchestration still requires per-action Owner confirm.';
     parameters = ASK_USER_PARAMETERS;
     kind = 'interaction';
-    /** 默认等待 Owner 120s，须大于 Agent 默认 30s 工具超时 */
     executionTimeoutMs = 150_000;
     constructor(plugin) {
         super();
@@ -109,7 +110,7 @@ export class AskUserBuiltinTool extends BuiltinBaseTool {
     }
     async run(args, commMessage) {
         if (!commMessage) {
-            return 'Error: 当前上下文没有消息来源，无法向 Owner 提问。请改为在回复中直接询问。';
+            return 'Error: 当前上下文没有消息来源，无法提问。请改为在回复中直接询问。';
         }
         if (!this.plugin) {
             return 'Error: 插件实例不可用，无法创建交互式提问。请改为在回复中直接询问。';
@@ -117,6 +118,7 @@ export class AskUserBuiltinTool extends BuiltinBaseTool {
         const timeoutMs = (args.timeout ?? 120) * 1000;
         const questionType = args.type || 'text';
         const recordArgs = args;
+        const question = String(args.question ?? '');
         const platform = commMessage.$adapter;
         const endpointId = commMessage.$endpoint;
         const adapter = this.plugin.inject(platform);
@@ -127,62 +129,20 @@ export class AskUserBuiltinTool extends BuiltinBaseTool {
         if (isPrivateMaster) {
             return askViaPrompt(this.plugin, commMessage, recordArgs, questionType, timeoutMs);
         }
-        if (!botMaster) {
-            return 'Error: 当前 Endpoint 未配置 master，无法进行安全确认。请在 endpoints 配置中设置 master 字段。';
-        }
-        if (!adapter || typeof adapter.sendMessage !== 'function') {
-            return `Error: 无法获取适配器 ${platform}，无法向 Owner 发送私聊确认。`;
-        }
-        const sourceInfo = commMessage.$channel?.type !== 'private'
-            ? `来源: ${commMessage.$channel?.type}(${commMessage.$channel?.id}) 用户: ${commMessage.$sender.id}`
-            : `来源: 私聊 用户: ${commMessage.$sender.id}`;
-        let questionText = `🔐 AI 安全确认\n${sourceInfo}\n\n${args.question}`;
-        if (questionType === 'confirm') {
-            questionText += '\n输入"yes"以确认';
-        }
-        else if (questionType === 'pick' && args.options?.length) {
-            questionText += '\n' + args.options.map((o, i) => `${i + 1}.${o}`).join('\n');
-        }
-        else if (questionType === 'number') {
-            questionText += '\n(请输入数字)';
-        }
-        try {
-            await adapter.sendMessage({
-                context: platform,
-                endpoint: endpointId,
-                id: botMaster,
-                type: 'private',
-                content: questionText,
-            });
-        }
-        catch (e) {
-            return `Error: 无法向 Owner 发送私聊消息: ${errMsg(e)}`;
+        const delegationBlock = shouldBlockDelegationAskUser(commMessage, question, questionType);
+        if (delegationBlock)
+            return delegationBlock;
+        const sensitive = args.sensitive === true;
+        if (sensitive && isGroupOrChannelScope(commMessage)) {
+            if (!botMaster) {
+                return 'Error: 当前 Endpoint 未配置 master，无法进行敏感确认。请在 endpoints 配置中设置 master 字段。';
+            }
+            if (!adapter || typeof adapter.sendMessage !== 'function') {
+                return `Error: 无法获取适配器 ${platform}，无法向 Owner 发送私聊确认。`;
+            }
+            return askOwnerViaPrivateWithParent(this.plugin, commMessage, recordArgs, questionType, timeoutMs, botMaster, adapter);
         }
-        const hostPlugin = this.plugin.root ?? this.plugin;
-        return new Promise((resolve) => {
-            const middleware = async (message, next) => {
-                if (message.$channel?.type !== 'private')
-                    return next();
-                if (String(message.$sender.id) !== String(botMaster))
-                    return next();
-                if (String(message.$endpoint) !== String(endpointId))
-                    return next();
-                dispose();
-                clearTimeout(timer);
-                const raw = message.$raw;
-                resolve(formatOwnerResponse(raw, questionType, recordArgs));
-            };
-            const dispose = hostPlugin.addMiddleware(middleware);
-            const timer = setTimeout(() => {
-                dispose();
-                if (args.default_value != null) {
-                    resolve(String(args.default_value));
-                }
-                else {
-                    resolve('Owner 未在规定时间内响应，操作已取消。');
-                }
-            }, timeoutMs);
-        });
+        return askViaPrompt(this.plugin, commMessage, recordArgs, questionType, timeoutMs);
     }
 }
 //# sourceMappingURL=ask-user-tool.js.map