mu-agent-bridge 1.0.71 → 1.0.78

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.28",
     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 = [];
@@ -42,6 +52,7 @@ class QwenworkPlugin {
     state = "stopped";
     message = "";
     healthIntervalMs;
+    restartDesktopHook;
     healthTimer;
     recovery;
     context;
@@ -53,11 +64,14 @@ class QwenworkPlugin {
     busy = false;
     taskCount = 0;
     stopped = true;
+    modelSessions = new Map();
+    modelSessionsPath;
     constructor(options = {}) {
         this.injectedClient = options.client;
         this.configuredCdpPort = options.cdpPort;
         this.configuredHttpPort = options.httpPort;
         this.healthIntervalMs = options.healthIntervalMs ?? 30_000;
+        this.restartDesktopHook = options.restartDesktop;
     }
     async activate(context) {
         if (this.state === "ready")
@@ -68,6 +82,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")
@@ -106,6 +135,7 @@ class QwenworkPlugin {
                     if (!executable)
                         throw new Error("未找到 QwenWorkCN.exe，请配置 executablePath");
                     context.logger?.info(`正在启动千问办公，等待 CDP ${this.activeCdpPort}`, { executablePath: executable });
+                    await this.restartDesktopProcess(executable);
                     try {
                         await (0, desktop_launch_1.launchAndWait)(executable, [`--remote-debugging-port=${this.activeCdpPort}`], () => client.connect(), typeof config.startupTimeoutMs === "number" ? config.startupTimeoutMs : 30_000);
                     }
@@ -140,8 +170,15 @@ class QwenworkPlugin {
             throw error;
         }
     }
-    async deactivate(_reason) {
+    async deactivate(reason, options) {
+        const reloadDesktop = !options?.preserveDesktop && reason === "reload" && Boolean(this.client) && !this.relayTarget;
         await this.cleanup();
+        if (reloadDesktop) {
+            if (this.restartDesktopHook)
+                await this.restartDesktopHook();
+            else if (!this.injectedClient && process.platform === "win32")
+                await this.restartDesktopProcess();
+        }
         this.state = "stopped";
         this.stopped = true;
     }
@@ -154,8 +191,6 @@ class QwenworkPlugin {
         return { status: this.state, ...(this.message ? { message: this.message } : {}), details };
     }
     async handle(request) {
-        if (this.recovery)
-            await this.recovery;
         if (this.state === "stopped" || (!this.relayTarget && !this.client))
             throw new Error("qwenwork 插件未就绪");
         return this.enqueueTask(() => this.completeRequest(request));
@@ -170,9 +205,8 @@ class QwenworkPlugin {
             throw new Error("千问办公当前忙，无法创建新会话");
         if (!this.client?.createSession)
             throw new Error("千问办公当前传输不支持新建会话");
-        if (!this.client.connected())
-            throw new Error("千问办公 CDP 未连接");
         return this.enqueueTask(async () => {
+            await this.ensureConnected();
             await this.client.createSession(request.name);
             return { text: "千问办公已创建新会话", sessionId };
         });
@@ -185,8 +219,7 @@ class QwenworkPlugin {
         if (!this.client)
             throw new Error("qwenwork 插件未就绪");
         try {
-            if (!this.client.connected())
-                throw new Error("千问 CDP 已断开，等待空闲后自动恢复");
+            await this.ensureConnected(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 agent_1.AgentOperationError("QWEN_REMOTE_ERROR", "等待千问办公回复", new Error("千问生成接口不可用；桌面未提供具体服务端错误码，CDP 仍连接，未重启或重新提交任务"));
@@ -196,7 +229,7 @@ class QwenworkPlugin {
             return reply;
         }
         catch (error) {
-            if (!signal?.aborted) {
+            if (!this.stopped && !signal?.aborted) {
                 this.message = error instanceof Error ? error.message : String(error);
                 this.failures = this.client.connected() ? 0 : 2;
                 this.state = "degraded";
@@ -204,21 +237,23 @@ class QwenworkPlugin {
             throw error;
         }
     }
-    async completeRequest(request) {
+    async completeRequest(request, modelRequest = false) {
         if (this.relayTarget) {
             return this.callPlugin(this.relayTarget, request);
         }
         if (!this.client)
             throw new Error("qwenwork 插件未就绪");
         try {
-            if (!this.client.connected())
-                throw new Error("千问 CDP 已断开，等待空闲后自动恢复");
+            if (modelRequest && !this.client.connected())
+                throw new Error("千问 CDP 已断开，模型请求不会启动或重启桌面");
+            if (!modelRequest)
+                await this.ensureConnected(request.signal);
             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, 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 +262,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 (!this.stopped && !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;
@@ -262,6 +351,14 @@ class QwenworkPlugin {
         this.callPlugin = undefined;
         this.pluginStatus = undefined;
     }
+    async restartDesktopProcess(configuredExecutable) {
+        const config = this.context?.config;
+        const executable = configuredExecutable ?? await (0, desktop_launch_1.findWindowsExecutable)("QwenWorkCN.exe", typeof config?.executablePath === "string" ? config.executablePath : undefined);
+        if (!executable)
+            throw new Error("未找到 QwenWorkCN.exe，请配置 executablePath");
+        const processIds = await (0, desktop_launch_1.terminateWindowsDesktop)(executable);
+        this.context?.logger?.info("千问办公重载前已清理旧进程，将以 CDP 模式启动", { processIds, executable });
+    }
     startHealthWatch() {
         if (this.relayTarget || !this.client || this.healthTimer)
             return;
@@ -284,9 +381,26 @@ class QwenworkPlugin {
         });
     }
     async recover() {
+        if (this.stopped || this.busy)
+            return;
+        try {
+            await this.reconnect();
+        }
+        catch { /* 失败已记录，留待下次空闲检查。 */ }
+    }
+    async ensureConnected(signal) {
+        signal?.throwIfAborted();
+        if (this.stopped || !this.client)
+            throw new Error("qwenwork 插件未就绪");
+        await this.reconnect();
+        signal?.throwIfAborted();
+        if (this.stopped)
+            throw new Error("qwenwork 插件未就绪");
+    }
+    async reconnect() {
         if (this.recovery)
             return this.recovery;
-        if (this.stopped || this.busy)
+        if (this.stopped)
             return;
         const client = this.client;
         if (!client || client.connected())
@@ -307,11 +421,12 @@ class QwenworkPlugin {
             this.restarts += 1;
             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(`千问 CDP 重连失败，桌面未重启，下次空闲检查重试：${this.message}`);
+            if (!this.stopped) {
+                this.state = "failed";
+                this.message = error instanceof Error ? error.message : String(error);
+                this.context?.logger?.error(`千问 CDP 重连失败，桌面未重启，下次空闲检查重试：${this.message}`);
+            }
+            throw error;
         }).finally(() => { this.recovery = undefined; });
         return this.recovery;
     }