mu-agent-bridge 1.0.62 → 1.0.64

package/dist/src-ts/agent.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentError = void 0;
+exports.AgentOperationError = exports.AgentError = void 0;
+exports.errorDetails = errorDetails;
 class AgentError extends Error {
     constructor(message, options) {
         super(message, options);
@@ -8,3 +9,26 @@ class AgentError extends Error {
     }
 }
 exports.AgentError = AgentError;
+/** 保留底层错误码，避免只留下 fetch failed 或超时这类表层提示。 */
+function errorDetails(error) {
+    const parts = [];
+    const seen = new Set();
+    for (let current = error; current && !seen.has(current) && seen.size < 5;) {
+        seen.add(current);
+        const value = current;
+        const message = typeof value.message === "string" ? value.message : String(current);
+        parts.push(`${message}${value.code ? `（${String(value.code)}）` : ""}`);
+        current = value.cause;
+    }
+    return parts.join("；原因：") || String(error);
+}
+class AgentOperationError extends AgentError {
+    code;
+    stage;
+    constructor(code, stage, cause) {
+        super(`${code}：${stage}失败：${errorDetails(cause)}`, { cause });
+        this.code = code;
+        this.stage = stage;
+    }
+}
+exports.AgentOperationError = AgentOperationError;

package/dist/src-ts/control-server.js

@@ -169,13 +169,13 @@ class ControlServer {
                 const id = decodeURIComponent(parts[2]);
                 if (["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"].some((name) => req.headers[name] !== undefined) && !authorized && !isLoopback(req.socket.remoteAddress))
                     return this.json(res, 401, { error: "会话身份仅允许已认证或本机调用方使用" });
-                const adapter = new openai_adapter_1.OpenAIAdapter(async (task, _signal, context) => {
+                const adapter = new openai_adapter_1.OpenAIAdapter(async (task, _signal, context, onMessage) => {
                     if (!context)
-                        return (await this.options.manager.handle(id, { task })).text;
+                        return (await this.options.manager.handle(id, { task, ...(onMessage ? { onMessage } : {}) })).text;
                     // 客户端标识只在认证调用方或本机信任范围内生效，不能直接恢复其他入口的会话。
                     const caller = authorized ? (0, node_crypto_1.createHash)("sha256").update(authorization).digest("hex") : "loopback";
                     const sessionId = `openai:${(0, node_crypto_1.createHash)("sha256").update(JSON.stringify([caller, id, context.agentAid ?? "", context.peerId ?? "", context.sessionId])).digest("hex")}`;
-                    return (await this.options.manager.handle(id, { task, sessionId })).text;
+                    return (await this.options.manager.handle(id, { task, sessionId, ...(onMessage ? { onMessage } : {}) })).text;
                 }, { model: id, prefix: `/api/agents/${encodeURIComponent(id)}/v1`, onExchange: (direction, text, peer, aid) => this.options.manager.recordMessage(id, direction, text, peer, aid) });
                 await adapter.handle(req, res);
                 return;

package/dist/src-ts/daemon-process.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDaemonCommand = isDaemonCommand;
+const node_fs_1 = require("node:fs");
 /** 只识别直接运行本安装 CLI 的后台进程，避免旧地址文件中的 PID 被其他程序复用。 */
 function isDaemonCommand(commandLine, cli) {
-    const normalize = (value) => value.replace(/[\\/]+/g, "/").toLowerCase();
+    const normalize = (value) => {
+        try {
+            value = node_fs_1.realpathSync.native(value);
+        }
+        catch { /* 不存在的路径仍按原始路径比较。 */ }
+        return value.replace(/[\\/]+/g, "/").toLowerCase();
+    };
     const args = [...commandLine.matchAll(/"([^"]*)"|(\S+)/g)].map((match) => normalize(match[1] ?? match[2]));
     return args[1] === normalize(cli) && ["start", "--serve"].includes(args[2]);
 }

package/dist/src-ts/plugins/aun/attachments.js

@@ -8,6 +8,7 @@ exports.uploadAunAttachments = uploadAunAttachments;
 const node_crypto_1 = require("node:crypto");
 const node_util_1 = require("node:util");
 const attachments_1 = require("../../attachments");
+const agent_1 = require("../../agent");
 const aidPattern = /^[a-z0-9][a-z0-9_-]{2,63}\.[a-z0-9-]+(?:\.[a-z0-9-]+)+$/;
 const mimePattern = /^[A-Za-z0-9!#$&^_.+-]+\/[A-Za-z0-9!#$&^_.+-]+$/;
 const imageTypes = new Set(["image/png", "image/jpeg", "image/webp"]);
@@ -252,13 +253,15 @@ async function uploadAunAttachments(client, ownerAid, peerAid, items) {
         // 视频播放器不携带 AID 凭据，沿用 EvolCore 的标准可读对象上传方式。
         const video = contentType.startsWith("video/");
         const ref = { ownerAid, bucket: "default", objectKey, filename, contentType, sizeBytes: item.data.byteLength, sha256 };
-        const uploaded = await client.storage.writeBytes(`/${objectKey}`, item.data, { contentType, public: video, overwrite: video });
+        const uploaded = await client.storage.writeBytes(`/${objectKey}`, item.data, { contentType, public: video, overwrite: video })
+            .catch(error => { throw new agent_1.AgentOperationError("AUN_FS_UPLOAD_FAILED", `上传 AUN FS 文件“${filename}”`, error); });
         checkedMetadata({ ...uploaded, size: uploaded.size ?? uploaded.size_bytes ?? item.data.byteLength }, ref);
         if (video) {
             result.push({ owner_aid: ownerAid, object_key: objectKey, filename, content_type: contentType, size_bytes: item.data.byteLength, sha256 });
             continue;
         }
-        const share = await client.storage.lowlevel.createShareLink({ owner: ownerAid, bucket: "default", objectKey, allowedAids: [peerAid], expireInSeconds: 86400 });
+        const share = await client.storage.lowlevel.createShareLink({ owner: ownerAid, bucket: "default", objectKey, allowedAids: [peerAid], expireInSeconds: 86400 })
+            .catch(error => { throw new agent_1.AgentOperationError("AUN_FS_SHARE_FAILED", `创建 AUN FS 文件“${filename}”的接收方授权`, error); });
         if (share.owner_aid && share.owner_aid !== ownerAid || share.bucket && share.bucket !== "default" || share.object_key && share.object_key !== objectKey)
             throw new Error("AUN 附件分享对象不一致");
         if (share.allowed_aids !== undefined && (!Array.isArray(share.allowed_aids) || share.allowed_aids.length !== 1 || share.allowed_aids[0] !== peerAid))

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

@@ -8,10 +8,11 @@ const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 const node_url_1 = require("node:url");
+const agent_1 = require("../../agent");
 const messages_1 = require("./messages");
 const attachments_1 = require("./attachments");
 const manifest = {
-    id: "aun", version: "1.0.31", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.33", type: "channel", displayName: "AUN 通道",
     entry: "dist/src-ts/plugins/aun/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["channel", "channel.identity.create", "channel.receive", "channel.send", "health", "cli"],
     configSchema: "config.schema.json",
@@ -82,10 +83,11 @@ class AunPlugin {
     identity = {
         list: async () => {
             const own = new Set([...this.createdAids, ...this.legacyCreatedAids]);
+            const known = new Set([...this.clients.keys(), ...this.listStoreAids()]);
             return {
-                evolcore: [...this.clients.keys()].filter((aid) => !own.has(aid)).sort(),
+                evolcore: [...known].filter((aid) => !own.has(aid)).sort(),
                 muAgentBridge: [...this.clients.keys()].filter((aid) => own.has(aid)).sort(),
-                localMuAgentBridge: [...own].filter((aid) => !this.clients.has(aid)).sort(),
+                localMuAgentBridge: [...own].filter((aid) => !known.has(aid)).sort(),
             };
         },
         create: async (aid, owner) => {
@@ -799,7 +801,9 @@ class AunPlugin {
         }
     }
     async processMessage(message, aid, agentPlugin) {
-        let replyAttempted = false;
+        let deliveryFailed = false;
+        const trace = { aid, peer: message.peerId, threadId: message.threadId ?? "", messageId: message.messageId ?? "", agentPlugin };
+        this.context?.logger.info("AUN 收到任务", { ...trace, stage: "接收消息", attachments: message.attachments?.length ?? 0 });
         const client = this.clients.get(aid)?.client;
         let attachments = [];
         let uploadedItems;
@@ -824,9 +828,9 @@ class AunPlugin {
             }
         }
         catch (error) {
-            this.context?.logger.warn("AUN 附件下载失败", { error: safeError(error), ...(error instanceof attachments_1.AunDownloadUrlError ? { downloadUrl: error.diagnostic } : {}) });
+            this.context?.logger.warn("AUN 附件下载失败", { ...trace, stage: "下载入站附件", error: safeError((0, agent_1.errorDetails)(error)), ...(error instanceof attachments_1.AunDownloadUrlError ? { downloadUrl: error.diagnostic } : {}) });
             try {
-                await this.sendText(aid, message.peerId, `附件接收失败：${safeError(error)}`, message.threadId);
+                await this.sendText(aid, message.peerId, `附件接收失败：下载入站附件失败：${safeError((0, agent_1.errorDetails)(error))}`, message.threadId);
             }
             catch { /* 尽力反馈 */ }
             return;
@@ -838,13 +842,18 @@ class AunPlugin {
             reply: async (text) => {
                 if (!text.trim())
                     return;
-                replyAttempted = true;
-                await this.sendText(aid, message.peerId, text, message.threadId);
+                try {
+                    await this.sendText(aid, message.peerId, text, message.threadId);
+                    this.context?.logger.info("AUN 文本已发送", { ...trace, stage: "发送文本消息" });
+                }
+                catch (error) {
+                    deliveryFailed = true;
+                    throw new agent_1.AgentOperationError("AUN_TEXT_SEND_FAILED", "发送 AUN 文本消息（结果未确认，不自动重发）", error);
+                }
             },
             replyAttachments: async (items, text) => {
                 if (!items.length)
                     return;
-                replyAttempted = true;
                 let sent = 0;
                 let groupsCount = 0;
                 let sending = false;
@@ -852,6 +861,7 @@ class AunPlugin {
                     if (!client?.storage)
                         throw new Error("AUN SDK 不支持附件存储接口");
                     const refs = uploadedRefs && uploadedItems === items ? uploadedRefs : await (0, attachments_1.uploadAunAttachments)({ storage: client.storage }, aid, message.peerId, items);
+                    this.context?.logger.info("AUN FS 文件上传与授权完成", { ...trace, stage: "上传并授权附件", files: items.map(item => ({ filename: item.filename, sizeBytes: item.data.byteLength })) });
                     if (!uploadedRefs || uploadedItems !== items) {
                         uploadedItems = items;
                         uploadedRefs = refs;
@@ -873,32 +883,37 @@ class AunPlugin {
                         sending = true;
                         // message.send 失败时可能已送达，不自动重试或降级明文，避免重复发送和泄露引用。
                         await client.call("message.send", { to: message.peerId, payload, encrypt: true });
+                        this.context?.logger.info("AUN 附件消息已发送", { ...trace, stage: "发送附件消息", kind, count: group.length });
                         sending = false;
                         sent++;
                     }
                 }
                 catch (error) {
+                    deliveryFailed = true;
+                    const failure = sending ? new agent_1.AgentOperationError("AUN_ATTACHMENT_SEND_FAILED", "发送 AUN 附件消息（FS 上传已完成）", error) : error;
                     const progress = sending ? `（已确认发送 ${sent}/${groupsCount} 组，当前组结果未确认，请勿重复发送）` : "";
                     try {
-                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError(error)}`, message.threadId);
+                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError((0, agent_1.errorDetails)(failure))}`, message.threadId);
                     }
                     catch { /* 尽力反馈 */ }
-                    throw error;
+                    throw failure;
                 }
             },
         };
         try {
+            this.context?.logger.info("AUN 开始调用 Agent", { ...trace, stage: "调用 Agent" });
             await this.ingress.publish(channelMessage);
+            this.context?.logger.info("AUN 任务处理完成", { ...trace, stage: "回复已发送" });
         }
         catch (error) {
-            this.context?.logger.warn("AUN 消息处理失败", { error: safeError(error) });
-            if (!replyAttempted) {
+            this.context?.logger.warn("AUN 消息处理失败", { ...trace, stage: deliveryFailed ? "回传回复" : "执行 Agent 任务", error: safeError((0, agent_1.errorDetails)(error)) });
+            if (!deliveryFailed) {
                 const action = attachments.length > 0 ? "附件处理失败" : newSessionCommand.test(message.text.trim()) ? "新建会话失败" : "消息处理失败";
                 try {
-                    await channelMessage.reply(`${action}：${safeError(error)}`);
+                    await channelMessage.reply(`${action}：${safeError((0, agent_1.errorDetails)(error))}`);
                 }
                 catch (replyError) {
-                    this.context?.logger.warn("AUN 错误回复失败", { error: safeError(replyError) });
+                    this.context?.logger.warn("AUN 错误回复失败", { ...trace, stage: "发送最终错误消息", error: safeError((0, agent_1.errorDetails)(replyError)) });
                 }
             }
         }
@@ -931,7 +946,7 @@ class AunPlugin {
 exports.AunPlugin = AunPlugin;
 exports.default = AunPlugin;
 function safeError(error) {
-    return redact(error instanceof Error ? error.message : String(error)).slice(0, 240);
+    return redact(error instanceof Error ? error.message : String(error));
 }
 async function readResponse(response, limit) {
     if (!response.body) {

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

@@ -11,6 +11,7 @@ exports.decodeQwenDataImage = decodeQwenDataImage;
 exports.parseQwenFinalFileDetails = parseQwenFinalFileDetails;
 const node_crypto_1 = require("node:crypto");
 const cdp_draft_1 = require("../cdp-draft");
+const agent_1 = require("../../agent");
 const attachments_1 = require("../../attachments");
 exports.assistantMessageSelector = '[data-message-id][data-part-type="text"]:not([data-conversation-user-text="true"])';
 exports.inputSelector = '.chat-input-editor-text[contenteditable="true"]';
@@ -203,66 +204,87 @@ 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) {
-        (0, attachments_1.validateAttachments)(attachments);
-        if (expectedReply) {
-            const draft = await this.evaluate(`document.querySelector(${JSON.stringify(exports.inputSelector)})?.innerText ?? ''`);
-            if (typeof draft === "string" && draft.trim() && !isQwenBridgeHealthPrompt(draft))
-                throw new Error("千问输入框有用户草稿，跳过后台健康检测");
-        }
-        await this.ensureVisible();
-        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("千问输入框含有未发送内容或正在生成回复，未发送新消息");
-        const snapshot = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.assistantMessageSelector)})].map(element => ({ id: element.getAttribute('data-message-id'), text: element.innerText })))`);
-        const before = JSON.parse(snapshot || "[]");
-        const beforeIds = new Set(before.map((message) => message.id).filter((id) => Boolean(id)));
-        const focused = await this.evaluate(`(() => {
-      const element = document.querySelector(${JSON.stringify(exports.inputSelector)});
-      if (!element) return false;
-      element.focus();
-      return true;
-    })()`);
-        if (!focused)
-            throw new Error("千问输入框未找到");
-        const addedIds = attachments?.length ? await this.injectAttachments(attachments) : [];
+    async complete(text, timeoutMs = 240_000, signal, expectedReply, attachments, onMessage) {
+        let stage = "准备千问办公桌面任务";
+        let code = "QWEN_TASK_FAILED";
         try {
-            await this.cdp("Input.insertText", { text });
-            const sent = await this.evaluate(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); const button = document.querySelector('button[aria-label="发送消息"]'); if (!input || input.innerText.trim() !== ${JSON.stringify(text.trim())} || !button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`);
-            if (sent !== true)
-                throw new Error("千问发送按钮未就绪或输入校验失败，未发送消息");
-            await this.waitFor(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); return Boolean(input && !input.innerText.trim()); })()`, "千问未确认消息已提交");
-        }
-        catch (error) {
-            // CDP 断开时清理也可能失败，保留最初的发送错误。
+            (0, attachments_1.validateAttachments)(attachments);
+            if (expectedReply) {
+                const draft = await this.evaluate(`document.querySelector(${JSON.stringify(exports.inputSelector)})?.innerText ?? ''`);
+                if (typeof draft === "string" && draft.trim() && !isQwenBridgeHealthPrompt(draft))
+                    throw new Error("千问输入框有用户草稿，跳过后台健康检测");
+            }
+            await this.ensureVisible();
+            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("千问输入框含有未发送内容或正在生成回复，未发送新消息");
+            const snapshot = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.assistantMessageSelector)})].map(element => ({ id: element.getAttribute('data-message-id'), text: element.innerText })))`);
+            const before = JSON.parse(snapshot || "[]");
+            const beforeIds = new Set(before.map((message) => message.id).filter((id) => Boolean(id)));
+            const focused = await this.evaluate(`(() => {
+        const element = document.querySelector(${JSON.stringify(exports.inputSelector)});
+        if (!element) return false;
+        element.focus();
+        return true;
+      })()`);
+            if (!focused)
+                throw new Error("千问输入框未找到");
+            stage = "向千问办公上传入站附件（任务尚未提交）";
+            const addedIds = attachments?.length ? await this.injectAttachments(attachments) : [];
+            stage = "向千问办公提交任务（尚未确认发送）";
+            code = "QWEN_SUBMIT_FAILED";
             try {
-                await this.cleanupAttachments(addedIds);
+                await this.cdp("Input.insertText", { text });
+                const sent = await this.evaluate(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); const button = document.querySelector('button[aria-label="发送消息"]'); if (!input || input.innerText.trim() !== ${JSON.stringify(text.trim())} || !button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`);
+                if (sent !== true)
+                    throw new Error("千问发送按钮未就绪或输入校验失败，未发送消息");
+                await this.waitFor(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); return Boolean(input && !input.innerText.trim()); })()`, "千问未确认消息已提交");
             }
-            catch { /* 清理失败不能覆盖原错。 */ }
-            throw error;
-        }
-        const sessionUrl = String(await this.evaluate("location.href"));
-        let previousReply = "";
-        let stablePolls = 0;
-        const deadline = Date.now() + timeoutMs;
-        while (Date.now() < deadline) {
-            await wait(2_000, signal);
-            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 reply = fresh.at(-1)?.text.trim() ?? "";
-            stablePolls = reply && reply === previousReply ? stablePolls + 1 : 0;
-            previousReply = reply;
-            if (reply && stablePolls >= 3 && isQwenApiUnavailableReply(reply))
-                throw new Error("千问生成接口不可用");
-            const generating = await this.evaluate(`Boolean(document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]'))`);
-            if (!generating && (expectedReply ? isQwenHeartbeatReplyComplete(reply, expectedReply) && stablePolls >= 1 : reply && stablePolls >= 3)) {
-                const attachments = expectedReply ? [] : await this.readArtifacts(beforeIds, sessionUrl);
-                return { text: reply, ...(attachments.length ? { attachments } : {}) };
+            catch (error) {
+                // CDP 断开时清理也可能失败，保留最初的发送错误。
+                try {
+                    await this.cleanupAttachments(addedIds);
+                }
+                catch { /* 清理失败不能覆盖原错。 */ }
+                throw error;
             }
+            const sessionUrl = String(await this.evaluate("location.href"));
+            stage = "等待千问办公回复（任务已提交，桌面未被停止）";
+            code = "QWEN_REPLY_FAILED";
+            let previousReply = "";
+            let stablePolls = 0;
+            const forwarded = new Set();
+            const deadline = Date.now() + timeoutMs;
+            while (Date.now() < deadline) {
+                await wait(2_000, signal);
+                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 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"]'))`);
+                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 } : {}) };
+                }
+                if (onMessage && generating && reply && stablePolls >= 1 && !forwarded.has(reply) && !isQwenApiUnavailableReply(reply)) {
+                    await onMessage(reply);
+                    forwarded.add(reply);
+                }
+            }
+            const permission = await this.permissionStatus(sessionUrl);
+            throw new Error(permission ?? `QWEN_REPLY_TIMEOUT：千问办公 UI 超时未返回回复（已等待 ${Math.round(timeoutMs / 1000)} 秒）；桌面任务未被停止`);
+        }
+        catch (error) {
+            if (error instanceof agent_1.AgentOperationError)
+                throw error;
+            throw new agent_1.AgentOperationError(code, stage, error);
         }
-        const permission = await this.permissionStatus(sessionUrl);
-        throw new Error(permission ?? `QWEN_REPLY_TIMEOUT：千问办公 UI 超时未返回回复（已等待 ${Math.round(timeoutMs / 1000)} 秒）；桌面任务未被停止`);
     }
     async permissionStatus(sessionUrl) {
         try {
@@ -528,8 +550,12 @@ class QwenCdpClient {
     }
     async evaluate(expression) {
         const response = await this.cdp("Runtime.evaluate", { expression, returnByValue: true, awaitPromise: true });
-        if (response.result?.exceptionDetails)
-            throw new Error(`页面 JS 异常: ${JSON.stringify(response.result.exceptionDetails).slice(0, 300)}`);
+        if (response.error)
+            throw new Error(`千问 CDP Runtime.evaluate 失败：${response.error.message ?? response.error.code}`);
+        if (response.result?.exceptionDetails) {
+            const details = response.result.exceptionDetails;
+            throw new Error(`千问页面 JS 异常：${details.exception?.description ?? details.text ?? JSON.stringify(details)}`);
+        }
         return response.result?.result?.value;
     }
     async trpc(path, type, input) {

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QwenworkPlugin = exports.qwenworkManifest = void 0;
 exports.createQwenworkPlugin = createQwenworkPlugin;
-const node_child_process_1 = require("node:child_process");
-const node_util_1 = require("node:util");
+const agent_1 = require("../../agent");
 const openai_adapter_1 = require("./openai-adapter");
 const cdp_client_1 = require("./cdp-client");
 const plugin_1 = require("../../plugin");
@@ -11,7 +10,7 @@ const desktop_launch_1 = require("../desktop-launch");
 const session_history_1 = require("./session-history");
 exports.qwenworkManifest = {
     id: "qwenwork",
-    version: "1.0.22",
+    version: "1.0.24",
     displayName: "千问办公",
     entry: "dist/index.js",
     apiVersion: "1",
@@ -43,10 +42,8 @@ class QwenworkPlugin {
     state = "stopped";
     message = "";
     healthIntervalMs;
-    restartDesktop;
     healthTimer;
     recovery;
-    restart;
     context;
     checking = false;
     failures = 0;
@@ -61,7 +58,6 @@ class QwenworkPlugin {
         this.configuredCdpPort = options.cdpPort;
         this.configuredHttpPort = options.httpPort;
         this.healthIntervalMs = options.healthIntervalMs ?? 30_000;
-        this.restartDesktop = options.restartDesktop;
     }
     async activate(context) {
         if (this.state === "ready")
@@ -100,26 +96,6 @@ class QwenworkPlugin {
                     workspace: typeof config.workspace === "string" ? config.workspace : undefined,
                 });
                 this.client = client;
-                this.restart = async () => {
-                    if (config.autoStart === false)
-                        throw new Error("千问自动启动已禁用");
-                    if (process.platform !== "win32")
-                        throw new Error("仅支持在 Windows 上自动重启千问办公");
-                    const executable = await (0, desktop_launch_1.findWindowsExecutable)("QwenWorkCN.exe", typeof config.executablePath === "string" ? config.executablePath : undefined);
-                    if (!executable)
-                        throw new Error("未找到 QwenWorkCN.exe，请配置 executablePath");
-                    context.logger?.info("正在自动重启千问办公", { executablePath: executable });
-                    await (0, node_util_1.promisify)(node_child_process_1.execFile)("taskkill", ["/IM", "QwenWorkCN.exe", "/T", "/F"], { timeout: 10_000 }).catch(() => undefined);
-                    await (0, desktop_launch_1.launchAndWait)(executable, [`--remote-debugging-port=${this.activeCdpPort}`], async () => {
-                        try {
-                            await client.connect();
-                        }
-                        catch (error) {
-                            client.close();
-                            throw error;
-                        }
-                    }, asNumber(config.startupTimeoutMs, 60_000));
-                };
                 try {
                     await client.connect();
                 }
@@ -138,7 +114,7 @@ class QwenworkPlugin {
                     }
                 }
             }
-            this.adapter = new openai_adapter_1.OpenAIAdapter((prompt, signal) => this.enqueueTask(() => this.complete(prompt, asNumber(config.timeoutMs, 240_000), signal)), {
+            this.adapter = new openai_adapter_1.OpenAIAdapter((prompt, signal, _context, onMessage) => this.enqueueTask(() => this.complete(prompt, asNumber(config.timeoutMs, 240_000), signal, onMessage)), {
                 onLog: (message) => context.logger?.info(message),
                 onExchange: (direction, text, peer, agentAid) => context.logger?.info("千问通信", { direction, text, peer, agentAid }),
             });
@@ -201,7 +177,7 @@ class QwenworkPlugin {
             return { text: "千问办公已创建新会话", sessionId };
         });
     }
-    async complete(prompt, timeoutMs, signal) {
+    async complete(prompt, timeoutMs, signal, onMessage) {
         if (this.relayTarget) {
             const response = await this.callPlugin(this.relayTarget, { task: prompt, timeoutMs });
             return response.text;
@@ -211,9 +187,9 @@ class QwenworkPlugin {
         try {
             if (!this.client.connected())
                 throw new Error("千问 CDP 已断开，等待空闲后自动恢复");
-            const reply = await this.client.direct(prompt, timeoutMs, signal);
+            const reply = this.client.complete ? (await this.client.complete(prompt, timeoutMs, signal, undefined, undefined, onMessage)).text : await this.client.direct(prompt, timeoutMs, signal);
             if ((0, cdp_client_1.isQwenApiUnavailableReply)(reply))
-                throw new Error("千问生成接口不可用");
+                throw new agent_1.AgentOperationError("QWEN_REMOTE_ERROR", "等待千问办公回复", new Error("千问生成接口不可用；桌面未提供具体服务端错误码，CDP 仍连接，未重启或重新提交任务"));
             this.failures = 0;
             this.state = "ready";
             this.message = "";
@@ -239,11 +215,12 @@ class QwenworkPlugin {
                 throw new Error("千问 CDP 已断开，等待空闲后自动恢复");
             if (request.attachments?.length && (!this.client.attachmentInput || !this.client.complete))
                 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, request.timeoutMs ?? 240_000, undefined, undefined, request.attachments)
-                : { text: await this.complete(request.task, request.timeoutMs ?? 240_000) };
+                ? await this.client.complete(request.task, timeoutMs, undefined, undefined, request.attachments, request.onMessage)
+                : { text: await this.complete(request.task, timeoutMs) };
             if ((0, cdp_client_1.isQwenApiUnavailableReply)(response.text))
-                throw new Error("千问生成接口不可用");
+                throw new agent_1.AgentOperationError("QWEN_REMOTE_ERROR", "等待千问办公回复", new Error("千问生成接口不可用；桌面未提供具体服务端错误码，CDP 仍连接，未重启或重新提交任务"));
             this.failures = 0;
             this.state = "ready";
             this.message = "";
@@ -286,7 +263,7 @@ class QwenworkPlugin {
         this.pluginStatus = undefined;
     }
     startHealthWatch() {
-        if (this.relayTarget || (!this.client?.healthCheck && !this.client?.chatHeartbeat) || this.healthTimer)
+        if (this.relayTarget || !this.client || this.healthTimer)
             return;
         this.healthTimer = setInterval(() => { void this.checkHealth(); }, this.healthIntervalMs);
         this.healthTimer.unref();
@@ -316,12 +293,8 @@ class QwenworkPlugin {
             return;
         this.recovery = (async () => {
             this.state = "starting";
-            this.context?.logger?.info("千问自动恢复开始", { reason: this.message });
+            this.context?.logger?.info("千问 CDP 自动重连开始", { reason: this.message });
             client.close();
-            if (this.restartDesktop)
-                await this.restartDesktop();
-            else if (this.restart)
-                await this.restart();
             await client.connect();
             await this.verifyConnection(client);
             if (this.stopped) {
@@ -332,13 +305,13 @@ class QwenworkPlugin {
             this.message = "";
             this.failures = 0;
             this.restarts += 1;
-            this.context?.logger?.info("千问自动恢复成功", { restarts: this.restarts });
+            this.context?.logger?.info("千问 CDP 自动重连成功", { restarts: this.restarts });
         })().catch((error) => {
             if (this.stopped)
                 return;
             this.state = "failed";
             this.message = error instanceof Error ? error.message : String(error);
-            this.context?.logger?.error(`千问自动恢复失败，下次心跳继续重试：${this.message}`);
+            this.context?.logger?.error(`千问 CDP 重连失败，桌面未重启，下次空闲检查重试：${this.message}`);
         }).finally(() => { this.recovery = undefined; });
         return this.recovery;
     }

package/dist/src-ts/plugins/qwenwork/openai-adapter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIAdapter = void 0;
 exports.messageText = messageText;
+const agent_1 = require("../../agent");
 const node_http_1 = require("node:http");
 const node_crypto_1 = require("node:crypto");
 function json(res, status, value) {
@@ -88,6 +89,9 @@ class OpenAIAdapter {
         const onClose = () => { if (!res.writableEnded)
             abort.abort(); };
         res.once("close", onClose);
+        let heartbeat;
+        let emit;
+        let finish;
         try {
             const payload = JSON.parse(await readBody(req));
             const lastUser = [...(payload.messages ?? [])].reverse().find((message) => message.role === "user");
@@ -99,21 +103,37 @@ class OpenAIAdapter {
             this.onLog?.(`chat request model=${payload.model ?? this.model} stream=${Boolean(payload.stream)}`);
             this.onExchange?.("request", prompt, peerId, agentAid);
             const hasSessionContext = typeof session === "string" || peerId !== undefined || agentAid !== undefined;
-            const content = await this.complete(prompt, abort.signal, hasSessionContext ? { sessionId: typeof session === "string" ? session : "", peerId, agentAid } : undefined);
-            this.onExchange?.("reply", content, peerId, agentAid);
-            if (abort.signal.aborted || res.destroyed)
-                return;
             const now = Math.floor(Date.now() / 1000);
             const id = `chatcmpl-${(0, node_crypto_1.randomUUID)()}`;
             const model = payload.model ?? this.model;
+            const forwarded = new Set();
             if (payload.stream) {
                 res.statusCode = 200;
                 res.setHeader("Content-Type", "text/event-stream; charset=utf-8");
                 res.setHeader("Cache-Control", "no-cache");
                 res.setHeader("Connection", "keep-alive");
-                res.write(`data: ${JSON.stringify({ id, object: "chat.completion.chunk", created: now, model, choices: [{ index: 0, delta: { role: "assistant", content }, finish_reason: null }] })}\n\n`);
-                res.write(`data: ${JSON.stringify({ id, object: "chat.completion.chunk", created: now, model, choices: [{ index: 0, delta: {}, finish_reason: "stop" }] })}\n\n`);
-                res.end("data: [DONE]\n\n");
+                res.flushHeaders();
+                const chunk = (delta, finish_reason) => {
+                    if (!abort.signal.aborted && !res.destroyed)
+                        res.write(`data: ${JSON.stringify({ id, object: "chat.completion.chunk", created: now, model, choices: [{ index: 0, delta, finish_reason }] })}\n\n`);
+                };
+                emit = text => { if (text.trim() && !forwarded.has(text)) {
+                    chunk({ role: "assistant", content: `${forwarded.size ? "\n\n" : ""}${text}` }, null);
+                    forwarded.add(text);
+                } };
+                finish = () => { chunk({}, "stop"); res.end("data: [DONE]\n\n"); };
+                // 只保持 HTTP 连接，不探测或操作桌面任务。
+                heartbeat = setInterval(() => { if (!res.destroyed && !abort.signal.aborted)
+                    res.write(": keep-alive\n\n"); }, 15_000);
+                heartbeat.unref();
+            }
+            const content = await this.complete(prompt, abort.signal, hasSessionContext ? { sessionId: typeof session === "string" ? session : "", peerId, agentAid } : undefined, payload.stream ? async (text) => { emit?.(text); } : undefined);
+            this.onExchange?.("reply", content, peerId, agentAid);
+            if (abort.signal.aborted || res.destroyed)
+                return;
+            if (emit && finish) {
+                emit(content);
+                finish();
                 return;
             }
             json(res, 200, {
@@ -126,9 +146,19 @@ class OpenAIAdapter {
             this.onExchange?.("error", error instanceof Error ? error.message : String(error), peerId, agentAid);
             if (abort.signal.aborted || res.destroyed)
                 return;
-            json(res, 500, { error: { message: error instanceof Error ? error.message : String(error), type: "server_error" } });
+            const details = (0, agent_1.errorDetails)(error);
+            if (emit && finish) {
+                emit(`任务处理失败：${details}`);
+                finish();
+            }
+            else {
+                const operation = error;
+                json(res, operation.stage ? 422 : 500, { error: { message: details, type: operation.stage ? "agent_task_error" : "server_error", ...(operation.code ? { code: operation.code } : {}) } });
+            }
         }
         finally {
+            if (heartbeat)
+                clearInterval(heartbeat);
             res.off("close", onClose);
         }
     }