mu-agent-bridge 1.0.71 → 1.0.73

package/dist/src-ts/plugins/abweb/public/app.js

@@ -34,6 +34,7 @@
     let logHasNext = false;
     let loading = false;
     const installingPackages = new Set();
+    let assistantOriginal = {};
     function error(message) { errorNode.textContent = message; errorNode.hidden = !message; }
     function showResult(title, message, failed) {
         node("#operation-result-title").textContent = title;
@@ -76,7 +77,7 @@
         head.append(headRow);
         const body = document.createElement("tbody");
         for (const plugin of items) {
-            const installed = plugins.find((item) => item.id === plugin.name.replace(/^agent-bridge-/, ""));
+            const installed = plugins.find((item) => item.id === (plugin.id ?? plugin.name.replace(/^agent-bridge-/, "")));
             const versionStatus = installed ? pluginVersions[installed.id] : undefined;
             const isUpgrade = Boolean(installed && versionStatus?.packageName === plugin.name && newerVersion(plugin.version, installed.version));
             const row = document.createElement("tr");
@@ -309,7 +310,7 @@
             status.className = `status status-${plugin.status}`;
             status.textContent = plugin.status;
             if (plugin.type === "agent")
-                type.textContent += ` · ${{ cli: "CLI", cdp: "CDP" }[plugin.manifest?.executionMode ?? ""] ?? "未声明"}`;
+                type.textContent += plugin.manifest?.executionMode === "cli" ? " · CLI" : " · 桌面";
             const dependencies = Object.entries(plugin.manifest?.dependencies ?? {});
             if (dependencies.length) {
                 const detail = document.createElement("small");
@@ -344,6 +345,8 @@
             controls.className = "controls";
             if (plugin.manifest?.executionMode === "cli")
                 controls.append(button("配置", `配置 ${plugin.id}`, () => configureCli(plugin)));
+            if (plugin.id === "personal-assistant")
+                controls.append(button("配置模型", "配置个人助理模型来源", () => configureAssistant(plugin)));
             if (pluginVersions[plugin.id]?.state === "update-available" && plugin.path.includes("node_modules")) {
                 controlsUpgrade(plugin.id);
                 controls.append(button("下载", `下载 ${plugin.id}`, async () => { await request(`/api/plugins/${encodeURIComponent(plugin.id)}/download`, "POST", { packageName: plugin.packageName, version: pluginVersions[plugin.id]?.latestVersion }); await load(); }));
@@ -401,6 +404,69 @@
             detail.hidden = false;
         }).finally(() => { save.disabled = false; });
     };
+    node("#assistant-config-cancel").onclick = () => node("#assistant-config-dialog").close();
+    async function configureAssistant(plugin) {
+        const [config, sourceResult] = await Promise.all([
+            request(`/api/plugins/${encodeURIComponent(plugin.id)}/config`),
+            request("/api/model-providers"),
+        ]);
+        assistantOriginal = config;
+        const select = node("#assistant-model-provider");
+        select.replaceChildren();
+        const add = (value, label, disabled = false) => { const option = document.createElement("option"); option.value = value; option.textContent = label; option.disabled = disabled; select.append(option); };
+        add("openai", "OpenAI 兼容接口");
+        if (config.modelProvider === "claude-cli")
+            add("claude-cli", "Claude CLI（原有配置，用户默认模型）");
+        for (const provider of sourceResult.providers ?? [])
+            add(`plugin:${provider.id}`, `${provider.displayName || provider.id}${provider.available ? "" : `（不可用：${provider.reason || provider.status}）`}`, !provider.available);
+        if (config.modelProvider === "plugin" && config.modelPlugin && !(sourceResult.providers ?? []).some((item) => item.id === config.modelPlugin))
+            add(`plugin:${config.modelPlugin}`, `${config.modelPlugin}（未安装或未声明模型来源）`, true);
+        select.value = config.modelProvider === "plugin" && config.modelPlugin ? `plugin:${config.modelPlugin}` : config.modelProvider ?? "openai";
+        node("#assistant-model").value = config.model ?? "";
+        node("#assistant-endpoint").value = config.endpoint ?? "";
+        node("#assistant-api-key").value = "";
+        node("#assistant-api-key").placeholder = config.apiKey ? "已配置，留空保留" : "可选，本地免认证服务可留空";
+        node("#assistant-timeout").value = String(config.timeoutMs ?? 120000);
+        node("#assistant-allowed-peers").value = (config.allowedPeers ?? []).join("\n");
+        node("#assistant-allowed-agents").value = (config.allowedAgents ?? []).join("\n");
+        node("#assistant-config-error").hidden = true;
+        node("#assistant-config-dialog").showModal();
+    }
+    node("#assistant-config-form").onsubmit = event => {
+        event.preventDefault();
+        const save = node("#assistant-config-save");
+        save.disabled = true;
+        const source = node("#assistant-model-provider").value;
+        const provider = source.startsWith("plugin:") ? "plugin" : source;
+        const modelPlugin = source.startsWith("plugin:") ? source.slice("plugin:".length) : undefined;
+        const body = {};
+        if (provider !== (assistantOriginal.modelProvider ?? "openai"))
+            body.modelProvider = provider;
+        if (provider === "plugin" && modelPlugin !== assistantOriginal.modelPlugin)
+            body.modelPlugin = modelPlugin;
+        const model = node("#assistant-model").value.trim();
+        const endpoint = node("#assistant-endpoint").value.trim();
+        const apiKey = node("#assistant-api-key").value;
+        if (model && model !== String(assistantOriginal.model ?? ""))
+            body.model = model;
+        if (endpoint && endpoint !== String(assistantOriginal.endpoint ?? ""))
+            body.endpoint = endpoint;
+        if (apiKey.trim())
+            body.apiKey = apiKey.trim();
+        const timeoutMs = Number(node("#assistant-timeout").value);
+        if (timeoutMs !== Number(assistantOriginal.timeoutMs ?? 120000))
+            body.timeoutMs = timeoutMs;
+        for (const [field, selector] of [["allowedPeers", "#assistant-allowed-peers"], ["allowedAgents", "#assistant-allowed-agents"]]) {
+            const values = [...new Set(node(selector).value.split(/[\s,，]+/).filter(Boolean))];
+            if (JSON.stringify(values) !== JSON.stringify(assistantOriginal[field]))
+                body[field] = values;
+        }
+        void request("/api/plugins/personal-assistant/config", "PATCH", body).then(result => {
+            node("#assistant-config-dialog").close();
+            showResult("个人助理配置已保存", result.restartRequired || result.action === "restart" ? "配置已保存，需要重启后台后生效。" : "模型来源配置已更新。", false);
+            return load(false);
+        }).catch(cause => { const detail = node("#assistant-config-error"); detail.textContent = String(cause); detail.hidden = false; }).finally(() => { save.disabled = false; });
+    };
     function renderMessages(messages) {
         messagesNode.replaceChildren();
         messagesEmpty.hidden = messages.length > 0;

package/dist/src-ts/plugins/abweb/public/index.html

@@ -31,6 +31,21 @@
       <div><button id="cli-config-save" type="submit">保存配置</button><button id="cli-config-cancel" type="button">取消</button></div>
     </form>
   </dialog>
+  <dialog id="assistant-config-dialog" aria-labelledby="assistant-config-title">
+    <h2 id="assistant-config-title">个人助理模型配置</h2>
+    <form id="assistant-config-form">
+      <label for="assistant-model-provider">模型来源</label><select id="assistant-model-provider" required></select>
+      <label for="assistant-model">OpenAI 兼容模型名称</label><input id="assistant-model" placeholder="仅 HTTP 来源需要">
+      <label for="assistant-endpoint">OpenAI 兼容地址</label><input id="assistant-endpoint" type="url" placeholder="http://127.0.0.1:11434/v1/chat/completions">
+      <label for="assistant-api-key">API 密钥（留空保留已有密钥）</label><input id="assistant-api-key" type="password" autocomplete="new-password">
+      <label for="assistant-timeout">模型超时（毫秒）</label><input id="assistant-timeout" type="number" min="1000" max="120000" required>
+      <label for="assistant-allowed-peers">允许使用助理的 Peer AID（每行一个）</label><textarea id="assistant-allowed-peers" rows="3" placeholder="example.agentid.cn"></textarea>
+      <label for="assistant-allowed-agents">允许调用的 Agent 插件 ID（每行一个）</label><textarea id="assistant-allowed-agents" rows="3" placeholder="workbuddy&#10;dsh"></textarea>
+      <p class="muted">插件来源沿用客户端登录及当前模型；留空白名单表示不授权。AID 关联请在 Channel 设置中完成。</p>
+      <p id="assistant-config-error" class="error" role="alert" hidden></p>
+      <div><button id="assistant-config-save" type="submit">保存配置</button><button id="assistant-config-cancel" type="button">取消</button></div>
+    </form>
+  </dialog>
   <dialog id="operation-result" aria-labelledby="operation-result-title" aria-describedby="operation-result-message">
     <h2 id="operation-result-title">操作结果</h2><p id="operation-result-message"></p><button id="operation-result-close" type="button" autofocus>确定</button>
   </dialog>

package/dist/src-ts/plugins/abweb/public/style.css

@@ -63,3 +63,7 @@ th:nth-child(1) { width: 145px; } th:nth-child(2) { width: 100px; } th:nth-child
 
 #cli-config-form { display: grid; min-width: min(70vw, 480px); }
 #cli-config-form input { width: 100%; }
+#assistant-config-form { display: grid; min-width: min(70vw, 480px); }
+#assistant-config-form input, #assistant-config-form select, #assistant-config-form textarea { width: 100%; }
+#assistant-config-dialog { max-height: 90vh; overflow: auto; }
+#assistant-config-form textarea { font: inherit; padding: 6px 9px; border: 1px solid #bfc9c5; border-radius: 5px; }

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

@@ -81,6 +81,60 @@ class AunPlugin {
         this.sdk = options.sdk;
         this.ingress = options.ingress;
     }
+    aunManagement = {
+        list: async () => {
+            const groups = await this.identity.list();
+            const aids = [...new Set([...groups.evolcore, ...groups.muAgentBridge, ...(groups.localMuAgentBridge ?? []), ...this.listStoreAids()])]
+                .filter((aid) => aidPattern.test(aid)).sort();
+            const bindings = Object.fromEntries(Object.entries(this.bindings)
+                .filter(([aid, agentId]) => aidPattern.test(aid) && /^[a-z][a-z0-9-]{1,63}$/.test(agentId) && agentId !== "aun" && agentId !== "abweb")
+                .sort(([left], [right]) => left.localeCompare(right)));
+            return { aids, bindings };
+        },
+        create: async ({ aid, ownerAid }) => {
+            if (typeof aid !== "string" || !aidPattern.test(aid.trim()))
+                throw new AunCommandError("AID 格式无效");
+            const validAid = aid.trim();
+            const owner = typeof ownerAid === "string" && ownerAid.trim()
+                ? ownerAid.trim()
+                : typeof this.config.owner_aid === "string" ? this.config.owner_aid.trim() : "";
+            if (!owner)
+                throw new AunCommandError("未提供 Owner AID，且未配置默认 Owner");
+            if (!aidPattern.test(owner))
+                throw new AunCommandError("Owner AID 格式无效");
+            const result = await this.createIdentity(validAid, owner);
+            const connection = result.connection === "ready" ? "ready" : "degraded";
+            if (connection !== "ready")
+                throw new AunCommandError("AID 已创建但连接失败，请先查询 AID 列表确认状态，不要重试创建", 502, { created: true, aid: validAid, connection });
+            return { aid: validAid, status: result.status, connection };
+        },
+        bind: async ({ aid, agentId, replace }) => {
+            if (typeof aid !== "string" || !aidPattern.test(aid.trim()))
+                throw new AunCommandError("AID 格式无效");
+            if (typeof agentId !== "string" || !/^[a-z][a-z0-9-]{1,63}$/.test(agentId) || agentId === "aun" || agentId === "abweb")
+                throw new AunCommandError("Agent 插件 ID 无效");
+            if (typeof replace !== "boolean")
+                throw new AunCommandError("必须明确指定是否替换现有绑定");
+            const validAid = aid.trim();
+            const previousAgent = this.bindings[validAid];
+            const existing = Object.entries(this.bindings)
+                .filter(([, target]) => target === agentId)
+                .map(([boundAid]) => boundAid)
+                .filter((previousAid) => previousAid !== validAid)
+                .sort();
+            if (previousAgent && previousAgent !== agentId)
+                throw new AunCommandError("该 AID 已绑定到其他 Agent，不能通过替换转移");
+            if (existing.length && !replace)
+                throw new AunCommandError("目标 Agent 已有其他 AID 绑定；如需替换请明确设置 replace");
+            try {
+                await this.patchAgentAid(agentId, validAid);
+            }
+            catch {
+                throw new AunCommandError("AUN 身份关联失败", 502);
+            }
+            return { aid: validAid, agent: agentId, replacedAids: existing };
+        },
+    };
     identity = {
         list: async () => {
             const own = new Set([...this.createdAids, ...this.legacyCreatedAids]);
@@ -672,16 +726,7 @@ class AunPlugin {
             this.validatePluginId(agent);
             await this.requireAgent(agent);
         }
-        let created;
-        try {
-            created = await this.identity.create(aid, owner);
-        }
-        catch (error) {
-            const exists = this.identities.has(aid) || this.listStoreAids().includes(aid);
-            if (exists)
-                throw new AunCommandError("AID 可能已创建，但后续连接或保存失败；请先执行 mab aun list 确认，不要重试创建", 502, { created: true, aid });
-            throw new AunCommandError(`AID 创建失败：${safeError(error).replaceAll(owner, "[已隐藏]")}`, 502);
-        }
+        const created = await this.createIdentity(aid, owner);
         const data = { created: true, aid, connection: created.connection ?? "ready" };
         if (created.connection !== "ready")
             throw new AunCommandError("AID 已创建，但连接失败；请先执行 mab aun list 确认，不要重试创建", 502, { ...data, connectionError: created.connectionError });
@@ -699,6 +744,17 @@ class AunPlugin {
             data: { ...data, ...(agent ? { agent } : {}) },
         };
     }
+    async createIdentity(aid, owner) {
+        try {
+            return await this.identity.create(aid, owner);
+        }
+        catch (error) {
+            if (this.identities.has(aid) || this.listStoreAids().includes(aid)) {
+                throw new AunCommandError("AID 可能已创建，但后续连接或保存失败；请先执行 mab aun list 确认，不要重试创建", 502, { created: true, aid });
+            }
+            throw new AunCommandError(`AID 创建失败：${safeError(error).replaceAll(owner, "[已隐藏]")}`, 502);
+        }
+    }
     async agents(readyOnly = true) {
         const payload = await this.controlRequest("/api/plugins");
         if (!Array.isArray(payload.plugins))

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

@@ -13,6 +13,9 @@ function normalizeAunMessage(payload, selfAid, allowFrom) {
     if (!peerId || peerId === selfAid || (rules.length > 0 && !rules.includes(peerId)))
         return undefined;
     const body = data.payload && typeof data.payload === "object" ? data.payload : {};
+    // 对端的系统事件只作通知，转为任务回复会导致两个 Agent 循环互答。
+    if (body.type === "error" || body.type === "notice")
+        return undefined;
     const text = typeof data.payload === "string" ? data.payload : typeof body.text === "string" ? body.text : "";
     let attachments = [];
     let attachmentError;

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;
@@ -156,6 +162,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 +332,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 +388,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 +412,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.2", 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/doubao/cdp-client.js

@@ -355,8 +355,9 @@ class DoubaoCdpClient {
         const uploaded = attachments?.length ? await this.uploadAttachments(attachments, requestSignal) : [];
         await this.evaluate(buildInjection(requestBody(text, target, this.options.botId, this.options.pluginList, uploaded)));
         const deadline = Date.now() + this.options.timeoutMs;
-        while (Date.now() < deadline) {
-            await sleep(1000, requestSignal);
+        while (Date.now() < deadline || signal?.aborted) {
+            // 上游取消只结束等待，页面请求结束前继续占用原队列。
+            await sleep(1000, this.closeController.signal);
             const result = await this.evaluate("window.__mab_doubao_result");
             if (typeof result !== "string")
                 continue;
@@ -395,6 +396,8 @@ class DoubaoCdpClient {
                 this.conversationId = backendId;
                 return { text: reply || "附件已生成。", sessionId: backendId, ...(output.length ? { attachments: output } : {}), ...(images.length ? { images } : {}) };
             }
+            if (signal?.aborted && parsed.pending !== true && !parsed.expectVideo)
+                throw new Error("豆包请求已取消，已确认本轮页面请求结束，未返回正文或附件");
         }
         throw new Error("等待豆包回复超时");
     }