mu-agent-bridge 1.0.71 → 1.0.78

package/plugins/qwenwork/dist/src-ts/plugins/desktop-launch.js

@@ -16,8 +16,8 @@ const node_path_1 = require("node:path");
 const node_util_1 = require("node:util");
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
 const versionDirectory = /^(?:app[-_ ]?)?v?\d+(?:[.-]\d+)+$/i;
-/** 在 Windows 常见安装目录中查找桌面程序，避免依赖单一盘符。 */
-async function findWindowsExecutable(fileName, configured) {
+/** 先从 Windows 注册信息和开始菜单解析，失败时再查常见安装目录。 */
+async function findWindowsExecutable(fileName, configured, run = execFileAsync) {
     if (configured?.trim()) {
         const configuredPath = (0, node_path_1.resolve)(configured);
         if (fileName.toLowerCase() === "doubao.exe") {
@@ -42,12 +42,16 @@ async function findWindowsExecutable(fileName, configured) {
     }
     if (process.platform !== "win32")
         return undefined;
-    const pattern = /doubao|豆包|qwen|qwwork|千问|deepseek|harness|dsh/i;
+    const registered = await findRegisteredWindowsExecutable(fileName, run);
+    if (registered)
+        return registered;
+    const pattern = /doubao|豆包|qwen|qwwork|千问|deepseek|harness|dsh|zcode/i;
     const roots = [...new Set([
             process.env.DSH_INSTALL_DIR,
             "D:\\Programs\\DeepSeek Harness",
             "D:\\DSH",
             process.env.LOCALAPPDATA && (0, node_path_1.join)(process.env.LOCALAPPDATA, "Programs"),
+            process.env.LOCALAPPDATA,
             process.env.ProgramFiles,
             process.env["ProgramFiles(x86)"],
             ...Array.from({ length: 24 }, (_, index) => `${String.fromCharCode(67 + index)}:\\`),
@@ -59,6 +63,36 @@ async function findWindowsExecutable(fileName, configured) {
     }
     return undefined;
 }
+async function findRegisteredWindowsExecutable(fileName, run) {
+    const target = fileName.replace(/'/g, "''");
+    const script = `$ErrorActionPreference='SilentlyContinue';[Console]::OutputEncoding=[Text.Encoding]::UTF8;$target='${target}'
+function Emit-Path($value){if(-not $value){return};$value=[Environment]::ExpandEnvironmentVariables(([string]$value).Trim());if($value.StartsWith('"')){$end=$value.IndexOf('"',1);if($end -gt 1){$value=$value.Substring(1,$end-1)}}elseif($value -match '^(\S+?\.exe)(?:\s|$)'){$value=$Matches[1]};if($value -match '(?i)\.exe$'){[Console]::WriteLine($value)}}
+$keys=@("HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKLM:\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKLM:\\Software\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKCU:\\Software\\Classes\\Applications\\$target\\shell\\open\\command","HKLM:\\Software\\Classes\\Applications\\$target\\shell\\open\\command")
+foreach($key in $keys){$item=Get-Item $key -ErrorAction SilentlyContinue;if($item){Emit-Path $item.GetValue('')}}
+$dirs=@();if($env:APPDATA){$dirs+=[IO.Path]::Combine($env:APPDATA,'Microsoft\\Windows\\Start Menu\\Programs')};if($env:ProgramData){$dirs+=[IO.Path]::Combine($env:ProgramData,'Microsoft\\Windows\\Start Menu\\Programs')};$shell=New-Object -ComObject WScript.Shell
+foreach($dir in $dirs){Get-ChildItem $dir -Filter '*.lnk' -File -Recurse -ErrorAction SilentlyContinue|ForEach-Object{$link=$shell.CreateShortcut($_.FullName);if($link.TargetPath -and [IO.Path]::GetFileName($link.TargetPath) -ieq $target){Emit-Path $link.TargetPath}}}`;
+    try {
+        const { stdout } = await run("powershell.exe", ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { timeout: 10_000, windowsHide: true });
+        for (const candidate of stdout.split(/\r?\n/).map(value => value.trim()).filter(Boolean)) {
+            const found = await resolveRegisteredCandidate(fileName, candidate);
+            if (found)
+                return found;
+        }
+    }
+    catch { /* 注册表或开始菜单不可读时继续使用目录兜底 */ }
+    return undefined;
+}
+async function resolveRegisteredCandidate(fileName, candidate) {
+    const candidatePath = (0, node_path_1.resolve)(candidate.replace(/^"|"$/g, ""));
+    if (fileName.toLowerCase() === "doubao.exe" && (0, node_path_1.basename)((0, node_path_1.dirname)(candidatePath)).toLowerCase() === "application") {
+        const client = (0, node_path_1.join)((0, node_path_1.dirname)(candidatePath), "app", fileName);
+        if ((0, node_fs_1.existsSync)(client))
+            return client;
+    }
+    if ((0, node_fs_1.existsSync)(candidatePath) && (0, node_path_1.basename)(candidatePath).toLowerCase() === fileName.toLowerCase())
+        return candidatePath;
+    return findExecutableInTree((0, node_path_1.dirname)(candidatePath), fileName, /^/, 3);
+}
 async function findExecutableInTree(directory, fileName, pattern, depth) {
     return search(directory, fileName, pattern, depth, pattern.test(directory));
 }
@@ -104,9 +138,16 @@ async function launchManagedAndWait(executable, args, profileDirectory, connect,
     if (profileDirectory)
         await (0, promises_1.mkdir)(profileDirectory, { recursive: true });
     const child = launch(executable, profileDirectory ? [...args, `--user-data-dir=${profileDirectory}`] : args);
+    // 先等待 spawn，避免异步 error 终止 daemon 或在启动失败后继续轮询。
+    const events = child;
+    const started = typeof events.once === "function" ? new Promise((resolve, reject) => {
+        events.once("error", reject);
+        events.once("spawn", resolve);
+    }) : Promise.resolve();
     child.unref();
     onProcess(child);
     try {
+        await started;
         return await waitFor(connect, timeoutMs, 250);
     }
     catch (error) {

package/plugins/qwenwork/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("千问输入框含有未发送内容或正在生成回复，未发送新消息");
@@ -234,15 +256,45 @@ class QwenCdpClient {
             const addedIds = attachments?.length ? await this.injectAttachments(attachments) : [];
             stage = "向千问办公提交任务（尚未确认发送）";
             code = "QWEN_SUBMIT_FAILED";
+            let submitUrl = "";
+            let inserted = false;
+            let submitAttempted = false;
             try {
+                submitUrl = String(await this.evaluate("location.href"));
+                const readyToSubmit = `(() => {
+          const input = document.querySelector(${JSON.stringify(exports.inputSelector)});
+          const button = document.querySelector('button[aria-label="发送消息"]');
+          const generating = document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]');
+          return Boolean(!document.hidden && location.href === ${JSON.stringify(submitUrl)} && input && input.innerText.trim() === ${JSON.stringify(text.trim())}
+            && button && !button.disabled && button.getAttribute('aria-disabled') !== 'true' && !generating);
+        })()`;
                 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("千问发送按钮未就绪或输入校验失败，未发送消息");
+                inserted = true;
+                // 只有复查确认尚未点击时才再试一次，不能重发提交结果未知的任务。
+                for (let attempt = 0; attempt < 2; attempt++) {
+                    await this.waitFor(readyToSubmit, "千问发送按钮未就绪或输入校验失败，未发送消息");
+                    submitAttempted = true;
+                    const sent = await this.evaluate(`(() => {
+            if (!${readyToSubmit}) return false;
+            document.querySelector('button[aria-label="发送消息"]').click();
+            return true;
+          })()`);
+                    if (sent === true)
+                        break;
+                    submitAttempted = false;
+                    if (attempt === 1)
+                        throw new Error("千问发送按钮未就绪或输入校验失败，未发送消息");
+                }
                 await this.waitFor(`(() => { const input = document.querySelector(${JSON.stringify(exports.inputSelector)}); return Boolean(input && !input.innerText.trim()); })()`, "千问未确认消息已提交");
             }
             catch (error) {
                 // CDP 断开时清理也可能失败，保留最初的发送错误。
+                if (inserted && !submitAttempted) {
+                    try {
+                        await this.recoverDraft({ text, url: submitUrl });
+                    }
+                    catch { /* 清理失败不能覆盖原错。 */ }
+                }
                 try {
                     await this.cleanupAttachments(addedIds);
                 }
@@ -254,23 +306,38 @@ 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);
+                await this.restoreVisible();
                 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);
@@ -510,9 +577,8 @@ class QwenCdpClient {
         try {
             await this.evaluate(`(async () => {
       if (document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]')) throw new Error('千问桌面端正在生成回复');
-      // 隐藏窗口会暂停消息渲染，使桌面端的提交前检查一直等不到确认。
-      if (document.hidden && typeof window.desktopApi?.focusMainWindow === 'function') await window.desktopApi.focusMainWindow();
     })()`);
+            await this.restoreVisible();
         }
         catch (error) {
             let permission;
@@ -525,8 +591,13 @@ class QwenCdpClient {
             throw error;
         }
     }
-    recoverDraft() {
-        return (0, cdp_draft_1.recoverCdpDraft)(this.evaluate.bind(this), exports.inputSelector, 'button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]', this.options.dataDir);
+    async restoreVisible() {
+        await this.evaluate(`(async () => {
+      if (document.hidden && typeof window.desktopApi?.focusMainWindow === 'function') await window.desktopApi.focusMainWindow();
+    })()`);
+    }
+    recoverDraft(expected) {
+        return (0, cdp_draft_1.recoverCdpDraft)(this.evaluate.bind(this), exports.inputSelector, 'button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"]', this.options.dataDir, expected);
     }
     async cdp(method, params = {}, timeoutMs = this.options.timeoutMs) {
         if (!this.socket)
@@ -588,6 +659,7 @@ class QwenCdpClient {
     async waitFor(expression, message) {
         const deadline = Date.now() + this.options.timeoutMs;
         while (Date.now() < deadline) {
+            await this.restoreVisible();
             if (await this.evaluate(expression))
                 return;
             await wait(200);

package/plugins/qwenwork/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;
     }

package/plugins/qwenwork/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-qwenwork",
-  "version": "1.0.24",
+  "version": "1.0.28",
   "description": "agent-bridge 的千问办公插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugins/qwenwork/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "qwenwork",
-  "version": "1.0.24",
+  "version": "1.0.28",
   "type": "agent",
   "displayName": "千问办公",
   "entry": "dist/src-ts/plugins/qwenwork/index.js",
@@ -9,7 +9,8 @@
   "capabilities": [
     "chat",
     "openai-compatible",
-    "health"
+    "health",
+    "model-provider"
   ],
   "configSchema": "config.schema.json",
   "clientDownloadUrl": "https://qwenwork.cn/download"

package/plugins/workbuddy/config.schema.json

@@ -9,7 +9,7 @@
     "cdpPort": { "type": "integer", "minimum": 1, "maximum": 65535, "default": 9229 },
     "autoStart": { "type": "boolean", "default": true, "description": "未连接时自动启动 WorkBuddy" },
     "startupTimeoutMs": { "type": "integer", "minimum": 1000, "default": 30000 },
-    "timeoutMs": { "type": "integer", "minimum": 1, "default": 3600000, "description": "单次回复等待时间（毫秒），默认一小时；超时不终止桌面任务" },
+    "timeoutMs": { "type": "integer", "minimum": 1, "default": 1200000, "description": "单次回复等待时间（毫秒），最多二十分钟；较短配置继续生效，超时不终止桌面任务" },
     "dailyPoints": { "type": "boolean", "default": true, "description": "每天自动检查并领取页面明确提供的免费积分" },
     "dailyPointsHour": { "type": "integer", "minimum": 0, "maximum": 23, "default": 9, "description": "每日免费积分领取时间（本机小时）" },
     "dailyPointsMinute": { "type": "integer", "minimum": 0, "maximum": 59, "default": 0, "description": "每日免费积分领取时间（本机分钟）" }