mu-agent-bridge 1.0.71 → 1.0.78

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

@@ -170,9 +170,11 @@ class ChatgptCdpClient {
         missingReasons.push("仅包含当前页面已加载的可验证正文，页面虚拟化或未加载历史导致完整性无法确认");
         return { supported: true, turns: result.turns, complete: false, missingReasons };
     }
-    async switchSession(session) {
-        await this.waitForGeneration();
-        await this.recoverDraft();
+    async switchSession(session, preserveDraft = false) {
+        if (!preserveDraft) {
+            await this.waitForGeneration();
+            await this.recoverDraft();
+        }
         const locate = `[...document.querySelectorAll(${JSON.stringify(sidebarSelector)})].find(item =>
       item.getAttribute('data-app-action-sidebar-thread-id') === ${JSON.stringify(session.id)}
       && item.getAttribute('data-app-action-sidebar-thread-host-id') === ${JSON.stringify(session.host)})`;
@@ -194,15 +196,18 @@ class ChatgptCdpClient {
         && Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}));
     })()`, "ChatGPT 会话切换未确认，未发送消息");
     }
-    async createSession(_name) {
-        await this.waitForGeneration();
-        await this.recoverDraft();
+    async createSession(_name, preserveDraft = false) {
+        if (!preserveDraft) {
+            await this.waitForGeneration();
+            await this.recoverDraft();
+        }
         const before = await this.activeSession();
         const state = await this.evaluate(`JSON.stringify({ editor: document.querySelector(${JSON.stringify(exports.editorSelector)})?.innerText ?? null, turns: document.querySelectorAll(${JSON.stringify(exports.turnSelector)}).length, generating: Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)})) })`);
         const initial = JSON.parse(String(state));
         if (initial.editor?.trim() || initial.generating)
             throw new Error("ChatGPT 当前有未发送内容或正在生成回复，不能新建会话");
         const clicked = await this.evaluate(`(() => {
+      if (document.querySelector(${JSON.stringify(exports.editorSelector)})?.innerText.trim() || document.querySelector(${JSON.stringify(stopButtonSelector)})) throw new Error('ChatGPT 当前有未发送内容或正在生成回复，不能新建会话');
       const labels = /^(?:新聊天|新对话|new chat|new conversation)$/i;
       const item = [...document.querySelectorAll(${JSON.stringify(newSessionSelector)})].find((node) => {
         const label = [node.getAttribute('aria-label'), node.getAttribute('title'), node.textContent].filter(Boolean).join(' ').trim();
@@ -304,7 +309,7 @@ class ChatgptCdpClient {
         this.tunnel = undefined;
         this.rejectPending(new Error("ChatGPT CDP 已关闭"));
     }
-    async direct(text, timeoutMs = 240_000, attachments) {
+    async direct(text, timeoutMs = 240_000, attachments, signal, preserveDraft = false) {
         (0, attachments_1.validateAttachments)(attachments);
         const slot = `__agentBridgeChatgpt_${(0, node_crypto_1.randomUUID)().replaceAll("-", "")}`;
         const outputDirectory = `agent-bridge-chatgpt-${(0, node_crypto_1.randomUUID)()}`;
@@ -312,7 +317,7 @@ class ChatgptCdpClient {
         const instruction = `附件回传约定：如果本轮需要返回文件、图片或视频，请把要返回的文件副本写入本轮新建的临时目录（Linux/macOS：/tmp/${outputDirectory}；Windows：C:/Users/<当前用户>/AppData/Local/Temp/${outputDirectory}），并在最终回复给出文件链接。仅需文字时无需创建目录。`;
         let failure;
         try {
-            return await this.directTurn(`${text} ${instruction}`, timeoutMs, attachments, slot, outputDirectory, startedAt);
+            return await this.directTurn(preserveDraft ? text : `${text} ${instruction}`, timeoutMs, attachments, slot, outputDirectory, startedAt, signal, preserveDraft);
         }
         catch (error) {
             failure = error;
@@ -338,10 +343,12 @@ class ChatgptCdpClient {
             }
         }
     }
-    async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt) {
+    async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt, signal, preserveDraft = false) {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
-        await this.waitForGeneration();
-        await this.recoverDraft();
+        if (!preserveDraft) {
+            await this.waitForGeneration();
+            await this.recoverDraft();
+        }
         const beforeTurnsJson = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.turnSelector)})].map(turn => ({ id: turn.getAttribute(${JSON.stringify(turnIdAttribute)}), users: turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).length })))`);
         const beforeTurns = JSON.parse(String(beforeTurnsJson || "[]"));
         const beforeAssistantCount = Number(await this.evaluate(`document.querySelectorAll(${JSON.stringify(assistantMessageSelector)}).length`));
@@ -393,7 +400,9 @@ class ChatgptCdpClient {
         const deadline = Date.now() + timeoutMs;
         let previous = "";
         let stable = 0;
-        while (Date.now() < deadline) {
+        let seenActive = false;
+        let inactivePolls = 0;
+        while (Date.now() < deadline || signal?.aborted) {
             await sleep(800);
             const raw = await this.evaluate(`(() => {
         const previous = new Set(${JSON.stringify(Array.isArray(beforeMessages) ? beforeMessages : [])}.map(item => JSON.stringify(item)));
@@ -439,6 +448,11 @@ class ChatgptCdpClient {
       })()`);
             const state = JSON.parse(String(raw));
             const reply = state.reply.trim();
+            seenActive ||= state.active === true;
+            inactivePolls = seenActive && state.submitted === true && state.active === false ? inactivePolls + 1 : 0;
+            if (signal?.aborted && inactivePolls >= 2 && state.artifacts?.length && !reply && !state.hasArtifacts) {
+                throw new Error("ChatGPT 请求已取消，已确认本轮桌面生成结束，未返回正文或附件");
+            }
             const signature = JSON.stringify([reply, state.artifacts, state.hasArtifacts]);
             stable = (reply || state.hasArtifacts) && signature === previous ? stable + 1 : 0;
             previous = signature;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatgptCdpClient = exports.ChatgptPlugin = exports.chatgptManifest = void 0;
+const agent_1 = require("../../agent");
 const node_crypto_1 = require("node:crypto");
 const cdp_client_1 = require("./cdp-client");
 const session_store_1 = require("./session-store");
@@ -9,13 +10,13 @@ const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 exports.chatgptManifest = {
     id: "chatgpt",
-    version: "1.0.11",
+    version: "1.0.12",
     displayName: "ChatGPT（Codex）",
     type: "agent",
     entry: "dist/index.js",
     apiVersion: "1",
     process: "in-process",
-    capabilities: ["chat", "health"],
+    capabilities: ["chat", "health", "model-provider"],
     configSchema: "config.schema.json",
 };
 function port(value, fallback) {
@@ -26,6 +27,11 @@ function port(value, fallback) {
 class ChatgptPlugin {
     options;
     manifest = exports.chatgptManifest;
+    get modelProvider() {
+        if (!this.client?.createSession || !this.client.listSessions || !this.client.activeSession || !this.client.switchSession || !this.store)
+            return undefined;
+        return { complete: (request) => this.completeModelProvider(request) };
+    }
     sessionOperations = [];
     get attachmentInput() { return this.client?.attachmentInput === true; }
     client;
@@ -132,11 +138,12 @@ class ChatgptPlugin {
                 throw connectionError;
         }
     }
-    async deactivate() {
+    async deactivate(_reason = "stop", options) {
         await this.queue;
         await this.store?.drain();
         this.client?.close();
-        await (0, desktop_launch_1.terminateOwnedProcess)(this.ownedProcess).catch(() => undefined);
+        if (!options?.preserveDesktop)
+            await (0, desktop_launch_1.terminateOwnedProcess)(this.ownedProcess).catch(() => undefined);
         this.ownedProcess = undefined;
         this.reconnect = undefined;
         this.client = undefined;
@@ -156,6 +163,51 @@ class ChatgptPlugin {
         const result = await run;
         return { ...(typeof result === "string" ? { text: result } : result), sessionId: request.sessionId };
     }
+    async completeModelProvider(request) {
+        let stage = "ChatGPT 模型排队（queue）";
+        try {
+            request.signal.throwIfAborted();
+            const run = this.enqueue(async () => {
+                request.signal.throwIfAborted();
+                stage = "连接 ChatGPT 模型（connect）";
+                const store = this.store;
+                const client = this.client;
+                if (!store || !client?.connected())
+                    throw new Error("ChatGPT CDP 未连接，模型请求不会启动或重启桌面");
+                const previous = await client.activeSession();
+                try {
+                    stage = "准备 ChatGPT 模型会话（submit）";
+                    if (!store.bindings[request.sessionId]) {
+                        const existing = new Set((await client.listSessions()).map(item => JSON.stringify([item.host, item.id])));
+                        const created = await client.createSession(undefined, true);
+                        if (created) {
+                            store.remember(created, "", "");
+                            store.bindings[request.sessionId] = created;
+                            delete store.pendingBindings[request.sessionId];
+                        }
+                        else {
+                            store.pendingBindings[request.sessionId] = [...existing];
+                        }
+                        this.persist();
+                    }
+                    request.signal.throwIfAborted();
+                    stage = "等待 ChatGPT 模型生成（generate）";
+                    const result = await this.run({ task: request.prompt, sessionId: request.sessionId, timeoutMs: request.timeoutMs, signal: request.signal }, true);
+                    return { text: typeof result === "string" ? result : result.text };
+                }
+                finally {
+                    if (previous && client.connected())
+                        await this.select(previous, 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("CHATGPT_MODEL_FAILED", stage, error);
+        }
+    }
     async controlSession(request) {
         if (request.operation !== "new")
             throw new Error(`ChatGPT 不支持会话操作：${String(request.operation)}`);
@@ -281,41 +333,47 @@ class ChatgptPlugin {
     persist() {
         void this.store.save().catch(error => this.logger?.warn("ChatGPT 会话缓存保存失败", { error: String(error) }));
     }
-    async synchronize() {
-        if (!this.client.connected())
+    async synchronize(modelRequest = false) {
+        if (!this.client.connected()) {
+            if (modelRequest)
+                throw new Error("ChatGPT CDP 已断开，模型请求不会启动或重启桌面");
             await (this.reconnect?.() ?? this.client.connect());
+        }
         if (!this.client.listSessions)
             throw new Error("当前 ChatGPT 客户端不支持会话列表");
         this.store.synchronize(await this.client.listSessions());
         this.persist();
     }
-    async select(session) {
-        if (!this.client.connected())
+    async select(session, modelRequest = false) {
+        if (!this.client.connected()) {
+            if (modelRequest)
+                throw new Error("ChatGPT CDP 已断开，模型请求不会启动或重启桌面");
             await (this.reconnect?.() ?? this.client.connect());
+        }
         if (!this.client.switchSession)
             throw new Error("当前 ChatGPT 客户端不支持会话切换");
         const active = await this.client.activeSession?.();
         if (active?.id === session.id && active.host === session.host)
             return;
         try {
-            await this.client.switchSession(session);
+            await this.client.switchSession(session, modelRequest);
         }
         catch (error) {
             // 目标消失时只重新同步一次；不在其他会话中代替发送。
             if (!String(error).includes("找不到目标会话"))
                 throw error;
-            await this.synchronize();
+            await this.synchronize(modelRequest);
             const updated = this.store.sessions.find(item => item.id === session.id && item.host === session.host);
             if (!updated)
                 throw new Error("ChatGPT 目标会话已删除或不在当前侧栏，请刷新最近任务");
-            await this.client.switchSession(updated);
+            await this.client.switchSession(updated, modelRequest);
         }
     }
-    async run(request) {
+    async run(request, modelRequest = false) {
         const store = this.store;
         const text = request.task.trim();
-        const refresh = /^(?:刷新最近任务|刷新任务列表|刷新最近会话)$/.test(text);
-        const listing = /^(?:最近任务|列出最近会话|有哪些已保存的 ChatGPT 任务)[？?。]?$/.test(text);
+        const refresh = !modelRequest && /^(?:刷新最近任务|刷新任务列表|刷新最近会话)$/.test(text);
+        const listing = !modelRequest && /^(?:最近任务|列出最近会话|有哪些已保存的 ChatGPT 任务)[？?。]?$/.test(text);
         if (refresh || listing) {
             if (refresh || !store.fresh()) {
                 try {
@@ -331,7 +389,7 @@ class ChatgptPlugin {
         }
         const explicit = text.match(/^切换会话\s*[:：]\s*([^；;\n]+)(?:[；;\n]\s*([\s\S]+))?$/);
         const natural = text.match(/^(?:继续处理|接着处理|继续任务|切换到)\s*(.+?)[。]?$/);
-        const query = explicit?.[1].trim() ?? natural?.[1].trim();
+        const query = modelRequest ? undefined : explicit?.[1].trim() ?? natural?.[1].trim();
         let selected;
         if (query) {
             if (!store.fresh())
@@ -355,13 +413,16 @@ class ChatgptPlugin {
         }
         else if (request.sessionId && store.bindings[request.sessionId]) {
             selected = store.bindings[request.sessionId];
-            await this.select(selected);
+            await this.select(selected, modelRequest);
         }
-        if (!this.client.connected())
+        if (!this.client.connected()) {
+            if (modelRequest)
+                throw new Error("ChatGPT CDP 已断开，模型请求不会启动或重启桌面");
             await (this.reconnect?.() ?? this.client.connect());
+        }
         selected ??= await this.client.activeSession?.();
-        const message = explicit?.[2]?.trim() || request.task;
-        const reply = await this.client.direct(message, request.timeoutMs, request.attachments);
+        const message = (modelRequest ? undefined : explicit?.[2]?.trim()) || request.task;
+        const reply = await this.client.direct(message, request.timeoutMs, request.attachments, request.signal, modelRequest);
         const baseline = request.sessionId ? store.pendingBindings[request.sessionId] : undefined;
         if (baseline) {
             try {

package/dist/src-ts/plugins/claude-cli/index.js

@@ -3,12 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClaudeCliPlugin = exports.manifest = void 0;
 const agent_1 = require("../local-cli/agent");
 exports.manifest = {
-    id: "claude-cli", version: "1.0.1", displayName: "Claude Code CLI", type: "agent", executionMode: "cli",
+    id: "claude-cli", version: "1.0.3", displayName: "Claude Code CLI", type: "agent", executionMode: "cli",
     entry: "dist/src-ts/plugins/claude-cli/index.js", apiVersion: "1", process: "in-process",
-    capabilities: ["chat", "health"], configSchema: "config.schema.json",
+    capabilities: ["chat", "health", "model-provider"], configSchema: "config.schema.json",
 };
 class ClaudeCliPlugin extends agent_1.LocalCliAgent {
     constructor() { super(exports.manifest, "claude"); }
+    get modelProvider() {
+        if (!this.modelInput)
+            return undefined;
+        return { complete: (request) => this.completeModelProvider(request) };
+    }
+    async completeModelProvider(request) {
+        let responseSchema;
+        try {
+            responseSchema = JSON.parse(request.prompt)?.responseSchema;
+        }
+        catch {
+            throw new Error("Claude CLI 模型请求必须是包含 responseSchema 的 JSON 对象");
+        }
+        if (!responseSchema || typeof responseSchema !== "object" || Array.isArray(responseSchema))
+            throw new Error("Claude CLI 模型请求缺少有效 responseSchema");
+        return this.completeStructuredModel(request, responseSchema);
+    }
 }
 exports.ClaudeCliPlugin = ClaudeCliPlugin;
 exports.default = ClaudeCliPlugin;

package/dist/src-ts/plugins/codex-cli/index.js

@@ -3,12 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodexCliPlugin = exports.manifest = void 0;
 const agent_1 = require("../local-cli/agent");
 exports.manifest = {
-    id: "codex-cli", version: "1.0.1", displayName: "Codex CLI", type: "agent", executionMode: "cli",
+    id: "codex-cli", version: "1.0.2", displayName: "Codex CLI", type: "agent", executionMode: "cli",
     entry: "dist/src-ts/plugins/codex-cli/index.js", apiVersion: "1", process: "in-process",
-    capabilities: ["chat", "health"], configSchema: "config.schema.json",
+    capabilities: ["chat", "health", "model-provider"], configSchema: "config.schema.json",
 };
 class CodexCliPlugin extends agent_1.LocalCliAgent {
     constructor() { super(exports.manifest, "codex"); }
+    get modelProvider() {
+        if (!this.modelInput)
+            return undefined;
+        return { complete: (request) => this.completeModelProvider(request) };
+    }
+    async completeModelProvider(request) {
+        let responseSchema;
+        try {
+            responseSchema = JSON.parse(request.prompt)?.responseSchema;
+        }
+        catch {
+            throw new Error("Codex CLI 模型请求必须是包含 responseSchema 的 JSON 对象");
+        }
+        if (!responseSchema || typeof responseSchema !== "object" || Array.isArray(responseSchema))
+            throw new Error("Codex CLI 模型请求缺少有效 responseSchema");
+        return this.completeStructuredModel(request, responseSchema);
+    }
 }
 exports.CodexCliPlugin = CodexCliPlugin;
 exports.default = CodexCliPlugin;

package/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) {