mu-agent-bridge 1.0.71 → 1.0.73

package/dist/src-ts/plugins/personal-assistant/tools.js

@@ -0,0 +1,166 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TOOL_NAMES = void 0;
+exports.toolDefinitions = toolDefinitions;
+exports.parseToolArguments = parseToolArguments;
+exports.executeTool = executeTool;
+exports.parseExplicitCommand = parseExplicitCommand;
+exports.stringifyToolResult = stringifyToolResult;
+const ajv_1 = __importDefault(require("ajv"));
+const coordination_1 = require("./coordination");
+exports.TOOL_NAMES = ["agents_list", "agents_call", "aun_identity_list", "sessions_command", "sessions_today", "self_status", "ability_discover", "ability_call", "ability_request_get", "coordination_dispatch", "coordination_status", "owner_context_read"];
+const ajv = new ajv_1.default({ allErrors: false, strict: false });
+const schemas = {
+    agents_list: ajv.compile({ type: "object", additionalProperties: false, properties: {} }),
+    agents_call: ajv.compile({ type: "object", additionalProperties: false, required: ["id", "task"], properties: { id: { type: "string", minLength: 1, maxLength: 128 }, task: { type: "string", minLength: 1, maxLength: 20_000 } } }),
+    aun_identity_list: ajv.compile({ type: "object", additionalProperties: false, properties: {} }),
+    sessions_command: ajv.compile({ type: "object", additionalProperties: false, required: ["command"], properties: { command: { type: "string", minLength: 1, maxLength: 512 } } }),
+    sessions_today: ajv.compile({ type: "object", additionalProperties: false, properties: {} }),
+    self_status: ajv.compile({ type: "object", additionalProperties: false, properties: {} }),
+    ability_discover: ajv.compile({ type: "object", additionalProperties: false, required: ["providerAid"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 } } }),
+    ability_call: ajv.compile({ type: "object", additionalProperties: false, required: ["providerAid", "path", "params"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 }, path: { type: "string", minLength: 1, maxLength: 256 }, params: { type: "object" } } }),
+    ability_request_get: ajv.compile({ type: "object", additionalProperties: false, required: ["providerAid", "requestId"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 }, requestId: { type: "string", minLength: 1, maxLength: 256 } } }),
+    coordination_dispatch: ajv.compile({ type: "object", additionalProperties: false, required: ["agentId", "aid", "task"], properties: { agentId: { type: "string", minLength: 1, maxLength: 64 }, aid: { type: "string", minLength: 3, maxLength: 256 }, task: { type: "string", minLength: 1, maxLength: 20000 } } }),
+    coordination_status: ajv.compile({ type: "object", additionalProperties: false, required: ["aid", "threadId"], properties: { aid: { type: "string", minLength: 3, maxLength: 256 }, threadId: { type: "string", minLength: 1, maxLength: 256 } } }),
+    owner_context_read: ajv.compile({ type: "object", additionalProperties: false, properties: {} }),
+};
+const toolDescriptions = {
+    agents_list: { name: "agents_list", description: "列出当前可调用的 Agent 及其 AID。", parameters: { type: "object", additionalProperties: false, properties: {} } },
+    agents_call: { name: "agents_call", description: "向白名单中的 Agent 发送一项独立任务。", parameters: { type: "object", additionalProperties: false, required: ["id", "task"], properties: { id: { type: "string", minLength: 1, maxLength: 128 }, task: { type: "string", minLength: 1, maxLength: 20_000 } } } },
+    aun_identity_list: { name: "aun_identity_list", description: "列出本机已知 AUN 身份及绑定状态。", parameters: { type: "object", additionalProperties: false, properties: {} } },
+    sessions_command: { name: "sessions_command", description: "执行只读的 /sessions 管理命令。", parameters: { type: "object", additionalProperties: false, required: ["command"], properties: { command: { type: "string", minLength: 1, maxLength: 512 } } } },
+    sessions_today: { name: "sessions_today", description: "生成今天工作的小结。", parameters: { type: "object", additionalProperties: false, properties: {} } },
+    self_status: { name: "self_status", description: "报告个人助理自身状态。", parameters: { type: "object", additionalProperties: false, properties: {} } },
+    ability_discover: { name: "ability_discover", description: "发现已配置 Provider 的只读 AUN Ability。", parameters: { type: "object", additionalProperties: false, required: ["providerAid"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 } } } },
+    ability_call: { name: "ability_call", description: "调用无需认证和确认的纯只读 AUN Ability。", parameters: { type: "object", additionalProperties: false, required: ["providerAid", "path", "params"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 }, path: { type: "string", minLength: 1, maxLength: 256 }, params: { type: "object" } } } },
+    ability_request_get: { name: "ability_request_get", description: "查询已发送 AUN Ability 的请求状态，不重新发送。", parameters: { type: "object", additionalProperties: false, required: ["providerAid", "requestId"], properties: { providerAid: { type: "string", minLength: 3, maxLength: 256 }, requestId: { type: "string", minLength: 1, maxLength: 256 } } } },
+    coordination_dispatch: { name: "coordination_dispatch", description: "显式向白名单 Agent 派发任务并创建独立 thread。", parameters: { type: "object", additionalProperties: false, required: ["agentId", "aid", "task"], properties: { agentId: { type: "string", minLength: 1, maxLength: 64 }, aid: { type: "string", minLength: 3, maxLength: 256 }, task: { type: "string", minLength: 1, maxLength: 20000 } } } },
+    coordination_status: { name: "coordination_status", description: "读取派发任务对应 thread 的当前状态和历史。", parameters: { type: "object", additionalProperties: false, required: ["aid", "threadId"], properties: { aid: { type: "string", minLength: 3, maxLength: 256 }, threadId: { type: "string", minLength: 1, maxLength: 256 } } } },
+    owner_context_read: { name: "owner_context_read", description: "读取管理员配置的 Owner 共享资料，仅作为参考。", parameters: { type: "object", additionalProperties: false, properties: {} } },
+};
+function toolDefinitions() {
+    return exports.TOOL_NAMES.map((name) => ({ type: "function", function: { ...toolDescriptions[name], parameters: { ...toolDescriptions[name].parameters } } }));
+}
+function parseToolArguments(name, raw) {
+    if (!exports.TOOL_NAMES.includes(name))
+        throw new Error("未知的管理工具");
+    let value;
+    try {
+        value = JSON.parse(raw);
+    }
+    catch {
+        throw new Error("管理工具参数不是有效 JSON");
+    }
+    const validate = schemas[name];
+    if (!validate(value))
+        throw new Error("管理工具参数不符合要求");
+    return value;
+}
+async function executeTool(name, args, management, allowedAgents, runtime = {}) {
+    if (!exports.TOOL_NAMES.includes(name))
+        throw new Error("未知的管理工具");
+    if (!schemas[name](args))
+        throw new Error("管理工具参数不符合要求");
+    switch (name) {
+        case "agents_list": {
+            const agents = await management.listAgents();
+            return allowedAgents ? agents.map((agent) => allowedAgents.includes(agent.id) ? agent : { ...agent, callable: false, reason: "未加入个人助理 Agent 白名单" }) : agents;
+        }
+        case "agents_call": {
+            if (allowedAgents && !allowedAgents.includes(String(args.id)))
+                throw new Error("目标 Agent 未加入个人助理白名单");
+            const result = await management.callAgent(String(args.id), String(args.task));
+            return {
+                text: result.text,
+                ...(result.sessionId ? { sessionId: result.sessionId } : {}),
+            };
+        }
+        case "aun_identity_list": return management.listAunIdentities();
+        case "sessions_command": {
+            const command = String(args.command).trim();
+            if (!/^\/sessions(?:\s|$)/.test(command) || /[\r\n]/.test(command))
+                throw new Error("只支持单行 /sessions 只读命令");
+            return management.runSessionCommand(command);
+        }
+        case "sessions_today": return management.summarizeToday();
+        case "self_status": return { status: "ready", capabilities: exports.TOOL_NAMES };
+        case "ability_discover": {
+            const providerAid = String(args.providerAid);
+            if (!runtime.allowedProviders?.includes(providerAid) || !runtime.remoteAbility)
+                throw new Error("Provider 未加入远程 Ability 白名单");
+            return runtime.remoteAbility.discover(providerAid);
+        }
+        case "ability_call": {
+            const providerAid = String(args.providerAid);
+            if (!runtime.allowedProviders?.includes(providerAid) || !runtime.remoteAbility)
+                throw new Error("Provider 未加入远程 Ability 白名单");
+            return runtime.remoteAbility.call(providerAid, String(args.path), args.params);
+        }
+        case "ability_request_get": {
+            const providerAid = String(args.providerAid);
+            if (!runtime.allowedProviders?.includes(providerAid) || !runtime.remoteAbility)
+                throw new Error("Provider 未加入远程 Ability 白名单");
+            return runtime.remoteAbility.getRequest(providerAid, String(args.requestId));
+        }
+        case "coordination_dispatch": {
+            if (!allowedAgents?.includes(String(args.agentId)) || !runtime.selfAid)
+                throw new Error("目标 Agent 未加入个人助理白名单");
+            const abilities = await management.listAgents();
+            const agent = abilities.find((item) => item.id === args.agentId && item.callable && item.aids.includes(String(args.aid)));
+            if (!agent)
+                throw new Error("目标 Agent/AID 当前不可派活");
+            const coordinator = (0, coordination_1.createCoordinator)({ selfAid: runtime.selfAid, ecPath: runtime.ecPath, allowedAgents: [{ id: agent.id, aids: agent.aids }] });
+            const result = await coordinator.dispatch({ agentId: agent.id, aid: String(args.aid), task: String(args.task) });
+            if (runtime.threads && runtime.threads.size >= 128)
+                runtime.threads.delete(runtime.threads.keys().next().value);
+            runtime.threads?.set(result.threadId, result.aid);
+            return result;
+        }
+        case "coordination_status": {
+            if (!runtime.selfAid)
+                throw new Error("个人助理 AID 未配置");
+            if (runtime.threads?.get(String(args.threadId)) !== String(args.aid))
+                throw new Error("thread 不属于本个人助理已派发的任务");
+            const coordinator = (0, coordination_1.createCoordinator)({ selfAid: runtime.selfAid, ecPath: runtime.ecPath, allowedAgents: [] });
+            return coordinator.getStatus({ aid: String(args.aid), threadId: String(args.threadId) });
+        }
+        case "owner_context_read": {
+            if (!runtime.ownerContext)
+                throw new Error("Owner 共享上下文尚未配置");
+            return runtime.ownerContext.get();
+        }
+    }
+}
+function parseExplicitCommand(task) {
+    if (!task.startsWith("/assistant ") && !task.startsWith("/sessions"))
+        return undefined;
+    if (/[\r\n]/.test(task))
+        return { kind: "invalid" };
+    if (task.startsWith("/sessions"))
+        return /^\/sessions(?:\s|$)/.test(task) ? { kind: "sessions", command: task } : { kind: "invalid" };
+    if (task === "/assistant context refresh")
+        return { kind: "context-refresh" };
+    const agentCall = task.match(/^\/assistant agent call ([a-z0-9][a-z0-9-]{0,63}) ([\s\S]{1,20000})$/);
+    if (agentCall)
+        return { kind: "agent-call", agentId: agentCall[1], task: agentCall[2] };
+    const create = task.match(/^\/assistant aid create ([A-Za-z0-9][A-Za-z0-9._-]{2,255})(?: --owner ([A-Za-z0-9][A-Za-z0-9._-]{2,255}))?$/);
+    if (create)
+        return { kind: "create", aid: create[1], ...(create[2] ? { ownerAid: create[2] } : {}) };
+    const bind = task.match(/^\/assistant aid bind ([A-Za-z0-9][A-Za-z0-9._-]{2,255}) ([A-Za-z0-9][A-Za-z0-9._-]{0,127})( --replace)?$/);
+    if (bind)
+        return { kind: "bind", aid: bind[1], agentId: bind[2], replace: Boolean(bind[3]) };
+    return { kind: "invalid" };
+}
+function stringifyToolResult(value) {
+    let text;
+    try {
+        text = typeof value === "string" ? value : JSON.stringify(value);
+    }
+    catch {
+        text = "工具返回结果不可序列化";
+    }
+    return text.length > 64_000 ? `${text.slice(0, 64_000)}\n[结果已截断]` : text;
+}

package/dist/src-ts/plugins/qwenwork/cdp-client.js

@@ -127,19 +127,40 @@ class QwenCdpClient {
         const reply = await this.direct(`这是后台健康检测。请只回复 ${token}，不要添加任何其它文字。`, 45_000, undefined, token);
         verifyQwenHeartbeatReply(token, reply);
     }
-    async createSession(_name) {
+    async createSession(_name, forceNew = false, preserveDraft = false) {
         await this.ensureVisible();
-        await this.recoverDraft();
+        if (!preserveDraft)
+            await this.recoverDraft();
         const snapshot = `(() => ({ url: location.href, messages: document.querySelectorAll('[data-message-id]').length, input: document.querySelector(${JSON.stringify(exports.inputSelector)})?.innerText ?? null, blank: Boolean(document.querySelector('.new-task-model-selector')) }))()`;
         const before = await this.evaluate(snapshot);
         if (before.input?.trim())
             throw new Error("千问输入框含有未发送内容，不能新建会话");
-        if (before.input !== null && before.messages === 0 && before.blank)
-            return;
-        const clicked = await this.evaluate(`(() => { const button = document.querySelector('button[aria-label="新任务"]'); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`);
+        if (!forceNew && before.input !== null && before.messages === 0 && before.blank)
+            return this.currentSessionId();
+        const clicked = await this.evaluate(`(() => { if (document.querySelector(${JSON.stringify(exports.inputSelector)})?.innerText.trim() || document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]')) throw new Error('千问当前有未发送内容或正在生成回复，不能新建会话'); const button = document.querySelector('button[aria-label="新任务"]'); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`);
         if (clicked !== true)
             throw new Error("千问新任务入口未找到或不可用");
         await this.waitFor(`(() => { const state = ${snapshot}; return state.input !== null && state.input.trim() === '' && state.messages === 0 && state.url !== ${JSON.stringify(before.url)}; })()`, "千问新会话状态校验失败");
+        return this.currentSessionId();
+    }
+    async currentSessionId() {
+        const href = String(await this.evaluate("location.href"));
+        try {
+            return new URL(href).searchParams.get("chat") ?? undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    async activateSession(sessionId) {
+        if (!sessionId.trim() || sessionId.length > 512 || /[\u0000-\u001f]/.test(sessionId))
+            throw new Error("千问模型会话标识无效");
+        await this.ensureVisible();
+        const target = new URL(String(await this.evaluate("location.href")));
+        target.searchParams.set("chat", sessionId);
+        if (target.href !== String(await this.evaluate("location.href")))
+            await this.evaluate(`(() => { if (document.querySelector(${JSON.stringify(exports.inputSelector)})?.innerText.trim() || document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]')) throw new Error('千问当前有未发送内容或正在生成回复，不能切换会话'); location.href = ${JSON.stringify(target.href)}; })()`);
+        await this.waitFor(`location.href === ${JSON.stringify(target.href)} && Boolean(document.querySelector(${JSON.stringify(exports.inputSelector)}))`, "千问个人助理模型会话恢复失败");
     }
     async connect() {
         if (this.connected())
@@ -204,7 +225,7 @@ class QwenCdpClient {
     async direct(text, timeoutMs = 240_000, signal, expectedReply) {
         return (await this.complete(text, timeoutMs, signal, expectedReply)).text;
     }
-    async complete(text, timeoutMs = 240_000, signal, expectedReply, attachments, onMessage) {
+    async complete(text, timeoutMs = 240_000, signal, expectedReply, attachments, onMessage, preserveDraft = false) {
         let stage = "准备千问办公桌面任务";
         let code = "QWEN_TASK_FAILED";
         try {
@@ -215,7 +236,8 @@ class QwenCdpClient {
                     throw new Error("千问输入框有用户草稿，跳过后台健康检测");
             }
             await this.ensureVisible();
-            await this.recoverDraft();
+            if (!preserveDraft)
+                await this.recoverDraft();
             const ready = await this.evaluate(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); return Boolean(input && !input.innerText.trim() && !document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]')); })()`);
             if (!ready)
                 throw new Error("千问输入框含有未发送内容或正在生成回复，未发送新消息");
@@ -254,23 +276,37 @@ class QwenCdpClient {
             code = "QWEN_REPLY_FAILED";
             let previousReply = "";
             let stablePolls = 0;
+            let seenGenerating = false;
+            let stoppedPolls = 0;
             const forwarded = new Set();
             const deadline = Date.now() + timeoutMs;
-            while (Date.now() < deadline) {
-                await wait(2_000, signal);
+            while (Date.now() < deadline || signal?.aborted) {
+                // 上游取消不停止桌面生成；确认结束前保留插件队列。
+                await wait(2_000);
                 const messagesJson = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.assistantMessageSelector)})].map(element => ({ id: element.getAttribute('data-message-id'), text: element.innerText })))`);
-                const fresh = freshAssistantMessages(beforeIds, JSON.parse(messagesJson || "[]"));
+                const messages = JSON.parse(messagesJson || "[]");
+                const fresh = freshAssistantMessages(beforeIds, messages);
                 const reply = fresh.at(-1)?.text.trim() ?? "";
                 stablePolls = reply && reply === previousReply ? stablePolls + 1 : 0;
                 previousReply = reply;
                 if (reply && stablePolls >= 3 && isQwenApiUnavailableReply(reply))
                     throw new Error("QWEN_REMOTE_ERROR：千问生成接口不可用；桌面仅返回通用错误，未提供服务端错误码；CDP 仍连接，未重启或重新提交任务");
                 const generating = await this.evaluate(`Boolean(document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]'))`);
+                seenGenerating ||= generating === true;
+                stoppedPolls = seenGenerating && generating === false ? stoppedPolls + 1 : 0;
+                if (signal?.aborted && !reply && stoppedPolls >= 2 && messages.some(message => message.id && !beforeIds.has(message.id))) {
+                    const attachments = expectedReply ? [] : await this.readArtifacts(beforeIds, sessionUrl);
+                    if (attachments.length)
+                        return { text: "", sessionId: new URL(sessionUrl).searchParams.get("chat") ?? undefined, attachments };
+                    code = "QWEN_REQUEST_CANCELLED";
+                    throw new Error("请求已取消，已确认本轮桌面生成结束，未返回正文或附件");
+                }
                 if (!generating && (expectedReply ? isQwenHeartbeatReplyComplete(reply, expectedReply) && stablePolls >= 1 : reply && stablePolls >= 3)) {
                     stage = "读取千问办公已完成任务的产物（尚未上传 AUN FS）";
                     code = "QWEN_ARTIFACT_READ_FAILED";
                     const attachments = expectedReply ? [] : await this.readArtifacts(beforeIds, sessionUrl);
-                    return { text: reply, ...(attachments.length ? { attachments } : {}) };
+                    const sessionId = new URL(sessionUrl).searchParams.get("chat") ?? undefined;
+                    return { text: reply, ...(sessionId ? { sessionId } : {}), ...(attachments.length ? { attachments } : {}) };
                 }
                 if (onMessage && generating && reply && stablePolls >= 1 && !forwarded.has(reply) && !isQwenApiUnavailableReply(reply)) {
                     await onMessage(reply);

package/dist/src-ts/plugins/qwenwork/index.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QwenworkPlugin = exports.qwenworkManifest = void 0;
 exports.createQwenworkPlugin = createQwenworkPlugin;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const agent_1 = require("../../agent");
 const openai_adapter_1 = require("./openai-adapter");
 const cdp_client_1 = require("./cdp-client");
@@ -10,21 +12,29 @@ const desktop_launch_1 = require("../desktop-launch");
 const session_history_1 = require("./session-history");
 exports.qwenworkManifest = {
     id: "qwenwork",
-    version: "1.0.24",
+    version: "1.0.25",
     displayName: "千问办公",
     entry: "dist/index.js",
     apiVersion: "1",
     process: "in-process",
-    capabilities: ["chat", "openai-compatible", "health"],
+    capabilities: ["chat", "openai-compatible", "health", "model-provider"],
     configSchema: "config.schema.json",
     defaults: { cdpPort: 9228, httpPort: 17893 },
 };
 function asNumber(value, fallback) {
     return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
+function validModelSessionId(value) {
+    return typeof value === "string" && Boolean(value.trim()) && value.length <= 512 && !/[\u0000-\u001f]/.test(value);
+}
 /** 千问插件由后台守护，所有通道共用请求队列和恢复流程。 */
 class QwenworkPlugin {
     manifest = exports.qwenworkManifest;
+    get modelProvider() {
+        if (this.relayTarget || !this.client?.complete || !this.client.createSession || !this.client.activateSession)
+            return undefined;
+        return { complete: (request) => this.completeModelProvider(request) };
+    }
     sessionHistory;
     get attachmentInput() { return Boolean(this.relayTarget || this.client?.attachmentInput); }
     sessionOperations = [];
@@ -53,6 +63,8 @@ class QwenworkPlugin {
     busy = false;
     taskCount = 0;
     stopped = true;
+    modelSessions = new Map();
+    modelSessionsPath;
     constructor(options = {}) {
         this.injectedClient = options.client;
         this.configuredCdpPort = options.cdpPort;
@@ -68,6 +80,21 @@ class QwenworkPlugin {
         this.lastHeartbeat = undefined;
         this.context = context;
         try {
+            this.modelSessions.clear();
+            this.modelSessionsPath = typeof context.dataDir === "string" && context.dataDir ? (0, node_path_1.join)(context.dataDir, "model-provider-sessions.json") : undefined;
+            try {
+                if (!this.modelSessionsPath)
+                    throw Object.assign(new Error("无持久化目录"), { code: "ENOENT" });
+                const saved = JSON.parse(await (0, promises_1.readFile)(this.modelSessionsPath, "utf8"));
+                if (!saved || typeof saved !== "object" || Array.isArray(saved) || Object.entries(saved).some(([key, value]) => !validModelSessionId(key) || !validModelSessionId(value)))
+                    throw new Error("千问个人助理模型会话记录无效");
+                for (const [key, value] of Object.entries(saved))
+                    this.modelSessions.set(key, value);
+            }
+            catch (error) {
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
             const config = context.config;
             const relayTarget = config.relayTarget;
             if (relayTarget !== undefined && relayTarget !== "dsh")
@@ -204,7 +231,7 @@ class QwenworkPlugin {
             throw error;
         }
     }
-    async completeRequest(request) {
+    async completeRequest(request, modelRequest = false) {
         if (this.relayTarget) {
             return this.callPlugin(this.relayTarget, request);
         }
@@ -217,8 +244,8 @@ class QwenworkPlugin {
                 throw new Error("千问当前客户端不支持附件输入");
             const timeoutMs = request.timeoutMs ?? asNumber(this.context?.config.timeoutMs, 240_000);
             const response = this.client.complete
-                ? await this.client.complete(request.task, timeoutMs, undefined, undefined, request.attachments, request.onMessage)
-                : { text: await this.complete(request.task, timeoutMs) };
+                ? await this.client.complete(request.task, timeoutMs, request.signal, undefined, request.attachments, request.onMessage, modelRequest)
+                : { text: await this.complete(request.task, timeoutMs, request.signal) };
             if ((0, cdp_client_1.isQwenApiUnavailableReply)(response.text))
                 throw new agent_1.AgentOperationError("QWEN_REMOTE_ERROR", "等待千问办公回复", new Error("千问生成接口不可用；桌面未提供具体服务端错误码，CDP 仍连接，未重启或重新提交任务"));
             this.failures = 0;
@@ -227,12 +254,66 @@ class QwenworkPlugin {
             return response;
         }
         catch (error) {
-            this.message = error instanceof Error ? error.message : String(error);
-            this.failures = this.client.connected() ? 0 : 2;
-            this.state = "degraded";
+            if (!request.signal?.aborted && !modelRequest) {
+                this.message = error instanceof Error ? error.message : String(error);
+                this.failures = this.client.connected() ? 0 : 2;
+                this.state = "degraded";
+            }
             throw error;
         }
     }
+    async completeModelProvider(request) {
+        let stage = "千问办公模型排队（queue）";
+        try {
+            request.signal.throwIfAborted();
+            const run = this.enqueueTask(async () => {
+                request.signal.throwIfAborted();
+                stage = "连接千问办公模型（connect）";
+                const client = this.client;
+                if (this.state !== "ready" || !client?.connected() || !client.createSession || !client.activateSession || !client.complete)
+                    throw new Error("千问办公未连接或不支持隔离模型会话，模型请求不会启动或重启桌面");
+                const previousSessionId = await client.currentSessionId?.();
+                try {
+                    stage = "准备千问办公模型会话（submit）";
+                    const desktopSessionId = this.modelSessions.get(request.sessionId);
+                    if (desktopSessionId)
+                        await client.activateSession(desktopSessionId);
+                    else
+                        await client.createSession(undefined, true, true);
+                    request.signal.throwIfAborted();
+                    stage = "等待千问办公模型生成（generate）";
+                    const response = await this.completeRequest({ task: request.prompt, sessionId: request.sessionId, timeoutMs: request.timeoutMs, signal: request.signal }, true);
+                    const actualSessionId = response.sessionId ?? await client.currentSessionId?.();
+                    if (!validModelSessionId(actualSessionId))
+                        throw new Error("千问未返回可恢复的个人助理模型会话标识");
+                    if (actualSessionId !== desktopSessionId) {
+                        this.modelSessions.set(request.sessionId, actualSessionId);
+                        const path = this.modelSessionsPath;
+                        if (path) {
+                            await (0, promises_1.mkdir)(this.context.dataDir ?? ".", { recursive: true });
+                            await (0, promises_1.writeFile)(`${path}.tmp`, JSON.stringify(Object.fromEntries(this.modelSessions)), { mode: 0o600 });
+                            await (0, promises_1.rename)(`${path}.tmp`, path);
+                        }
+                    }
+                    return { text: response.text };
+                }
+                finally {
+                    if (client.connected()) {
+                        if (previousSessionId)
+                            await client.activateSession(previousSessionId);
+                        else
+                            await client.createSession(undefined, false, true);
+                    }
+                }
+            });
+            return await (0, agent_1.abortable)(run, request.signal);
+        }
+        catch (error) {
+            if (error instanceof agent_1.AgentOperationError)
+                throw error;
+            throw new agent_1.AgentOperationError("QWEN_MODEL_FAILED", stage, error);
+        }
+    }
     registerRoutes(http) {
         if (!this.adapter)
             return;

package/dist/src-ts/plugins/workbuddy/cdp-client.js

@@ -46,11 +46,12 @@ class WorkbuddyCdpClient {
         const value = await this.evaluate(`([...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_')))?.getAttribute('data-conversation-id')`);
         return typeof value === "string" && value.trim() ? value : undefined;
     }
-    async activateConversation(conversationId) {
+    async activateConversation(conversationId, preserveDraft = false) {
         const id = conversationId.trim();
         if (!id)
             throw new Error("WorkBuddy 会话标识不能为空");
         const clicked = await this.evaluate(`(() => {
+      if (${preserveDraft}) { const editor = document.querySelector(${JSON.stringify(exports.editorSelector)})?.cloneNode(true); editor?.querySelectorAll('[data-slate-placeholder="true"],[data-slate-zero-width]').forEach(item => item.remove()); if (editor?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() || document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"],[aria-busy="true"]') || document.querySelector(${JSON.stringify(interactionOptionSelector)})) throw new Error('WorkBuddy 当前有用户草稿、待确认操作或正在生成回复，模型请求未切换会话'); }
       const button = [...document.querySelectorAll('[data-conversation-id]')]
         .filter(element => element.getAttribute('data-conversation-id') === ${JSON.stringify(id)})
         .map(item => item.matches('[role="button"],button') ? item : item.querySelector('[role="button"],button') || item.closest('[role="button"],button'))
@@ -93,6 +94,8 @@ class WorkbuddyCdpClient {
         return await this.evaluate(`(() => ({
       conversationId: [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id') || undefined,
       waiting: Boolean(document.querySelector(${JSON.stringify(interactionOptionSelector)})),
+      generating: Boolean(document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"],[aria-busy="true"]')),
+      draft: (() => { const text = document.querySelector(${JSON.stringify(exports.editorSelector)})?.cloneNode(true); text?.querySelectorAll('[data-slate-placeholder="true"],[data-slate-zero-width]').forEach(item => item.remove()); return Boolean(text?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim()); })(),
     }))()`);
     }
     async connect() {
@@ -248,7 +251,7 @@ class WorkbuddyCdpClient {
                 if (!await this.evaluate(`(() => { const button = document.querySelector('button[aria-label="发送"]'); if (!button || button.disabled) return false; button.click(); return true; })()`))
                     throw new Error("WorkBuddy 发送按钮不可用");
                 stage = "等待 WorkBuddy 回复（任务已提交，桌面未被停止）";
-                const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage);
+                const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage, request.signal);
                 if (this.pendingInteraction && temporaryPaths.length)
                     this.pendingInteractionCleanup = temporaryPaths;
                 return response;
@@ -314,12 +317,12 @@ class WorkbuddyCdpClient {
             }
         }
     }
-    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage) {
+    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage, signal) {
         const deadline = Date.now() + timeoutMs;
         const previousText = new Map();
         const stablePolls = new Map();
         const forwarded = new Set();
-        while (Date.now() < deadline) {
+        while (Date.now() < deadline || signal?.aborted) {
             await sleep(1_000);
             const current = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => { const content = element.querySelector('[data-assistant-content]'); let text = content?.innerText?.trim() || ''; for (const thought of content?.querySelectorAll?.('.cr-reasoning') || []) text = text.replace(thought.innerText || '', ''); text = text.trim(); const finished = Boolean(element.querySelector('[data-testid="conversation-finished-footer"]')); const stopped = Boolean(text) && !document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"],[aria-busy="true"]'); return { id: element.getAttribute('data-message-id'), text, finished: finished, stopped: stopped }; }))`)));
             const interaction = await this.readInteraction();
@@ -353,6 +356,8 @@ class WorkbuddyCdpClient {
                     return { text: reply ?? "", attachments };
                 if (reply || forwarded.size)
                     return { text: reply };
+                if (signal?.aborted && latest.finished)
+                    throw new agent_1.AgentOperationError("WORKBUDDY_REQUEST_CANCELLED", "等待 WorkBuddy 取消后的任务结束", new Error("请求已取消，已确认本轮桌面生成结束，未返回正文或附件"));
             }
             if (onMessage) {
                 for (const item of candidates) {