mu-agent-bridge 1.0.56 → 1.0.58

package/dist/src-ts/cli.js

@@ -207,6 +207,17 @@ async function startUpdatedDaemon() {
     };
     return { healthy };
 }
+let coreUpdateCheckRunning = false;
+function scheduleCoreUpdateCheck() {
+    if (coreUpdateCheckRunning)
+        return;
+    coreUpdateCheckRunning = true;
+    const env = { ...process.env, AGENT_BRIDGE_CORE_UPDATE_ONLY: "1" };
+    const child = (0, node_child_process_1.spawn)(process.execPath, [(0, node_path_1.resolve)(__dirname, "cli.js"), "start"], { detached: true, stdio: "ignore", windowsHide: true, env });
+    child.once("exit", () => { coreUpdateCheckRunning = false; });
+    child.once("error", () => { coreUpdateCheckRunning = false; });
+    child.unref();
+}
 async function stop() {
     await stopDaemon();
     console.log("旧 daemon 已停止");
@@ -304,6 +315,8 @@ async function serve() {
     const intervalMs = Math.max(60_000, Number(process.env.AGENT_BRIDGE_PLUGIN_UPDATE_INTERVAL_MS ?? 300_000) || 300_000);
     const updateTimer = setInterval(() => void checkAndUpgradePlugins(manager), intervalMs);
     updateTimer.unref?.();
+    const coreUpdateTimer = setInterval(scheduleCoreUpdateCheck, intervalMs);
+    coreUpdateTimer.unref?.();
     let stopping = false;
     const shutdown = async () => {
         if (stopping)
@@ -325,6 +338,7 @@ async function serve() {
         }
         catch { /* 地址文件可能已被清理 */ }
         clearInterval(updateTimer);
+        clearInterval(coreUpdateTimer);
     };
     process.once("SIGINT", () => void shutdown().finally(() => process.exit(0)));
     process.once("SIGTERM", () => void shutdown().finally(() => process.exit(0)));
@@ -399,6 +413,10 @@ async function main() {
             await logs.flush();
             return 0;
         }
+        if (process.env.AGENT_BRIDGE_CORE_UPDATE_ONLY === "1") {
+            await logs.flush();
+            return 0;
+        }
         await stopDaemon(false);
         return serve();
     }

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

@@ -167,7 +167,7 @@ class ControlServer {
             }
             if (parts[0] === "api" && parts[1] === "agents" && parts[2] && parts[3] === "v1") {
                 const id = decodeURIComponent(parts[2]);
-                if (req.headers["x-evolcore-session-id"] !== undefined && !authorized && !isLoopback(req.socket.remoteAddress))
+                if (["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"].some((name) => req.headers[name] !== undefined) && !authorized && !isLoopback(req.socket.remoteAddress))
                     return this.json(res, 401, { error: "会话身份仅允许已认证或本机调用方使用" });
                 const adapter = new openai_adapter_1.OpenAIAdapter(async (task, _signal, context) => {
                     if (!context)

package/dist/src-ts/core-updater.js

@@ -66,6 +66,7 @@ async function updateCoreAtStartup(options) {
             await (0, promises_1.rm)(packageRoot, { recursive: true, force: true });
             await (0, promises_1.cp)(backup, packageRoot, { recursive: true });
             options.log?.("error", "daemon 自动升级失败，已恢复旧版本", { error: error instanceof Error ? error.message : String(error), version: metadata.version });
+            await options.startDaemon().catch((restartError) => options.log?.("error", "旧 daemon 恢复启动失败", { error: restartError instanceof Error ? restartError.message : String(restartError), version: metadata.version }));
             await (0, promises_1.rm)(backupRoot, { recursive: true, force: true });
             return false;
         }

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

@@ -169,6 +169,7 @@ class ChatgptCdpClient {
         return { supported: true, turns: result.turns, complete: false, missingReasons };
     }
     async switchSession(session) {
+        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)}
@@ -192,6 +193,7 @@ class ChatgptCdpClient {
     })()`, "ChatGPT 会话切换未确认，未发送消息");
     }
     async createSession(_name) {
+        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)})) })`);
@@ -336,6 +338,7 @@ class ChatgptCdpClient {
     }
     async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt) {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
+        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 || "[]"));
@@ -658,6 +661,9 @@ class ChatgptCdpClient {
         }
         throw new Error(message);
     }
+    waitForGeneration() {
+        return this.waitFor(`!Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)}))`, "ChatGPT 桌面端仍在生成回复，等待超时；未清理输入或切换会话");
+    }
     rejectPending(error) {
         for (const pending of this.pending.values())
             pending.reject(error);

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

@@ -73,13 +73,11 @@ class OpenAIAdapter {
             return;
         }
         const session = req.headers["x-evolcore-session-id"];
-        if (session !== undefined) {
-            for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
-                const value = req.headers[name];
-                if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
-                    json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
-                    return;
-                }
+        for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
+            const value = req.headers[name];
+            if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
+                json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
+                return;
             }
         }
         const abort = new AbortController();
@@ -100,7 +98,8 @@ class OpenAIAdapter {
             }
             this.onLog?.(`chat request model=${payload.model ?? this.model} stream=${Boolean(payload.stream)}`);
             this.onExchange?.("request", prompt, peerId, agentAid);
-            const content = await this.complete(prompt, abort.signal, typeof session === "string" ? { sessionId: session, peerId, agentAid } : undefined);
+            const hasSessionContext = typeof session === "string" || peerId !== undefined || agentAid !== undefined;
+            const content = await this.complete(prompt, abort.signal, hasSessionContext ? { sessionId: typeof session === "string" ? session : "", peerId, agentAid } : undefined);
             this.onExchange?.("reply", content, peerId, agentAid);
             if (abort.signal.aborted || res.destroyed)
                 return;

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

@@ -120,7 +120,7 @@ class WorkbuddyCdpClient {
         const before = await this.evaluate(`(() => { const state = ${snapshot}; const loginRequired = [...document.querySelectorAll('a,button,[role="button"]')].some(item => /^(?:登录|立即登录|sign in)$/i.test(item.textContent?.trim() ?? '')); return { ...state, loginRequired }; })()`);
         if (before.loginRequired)
             throw new Error("WorkBuddy 尚未登录，请先在桌面端登录后重试");
-        if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"]')].find(item => { const label = [item.innerText, item.textContent, item.getAttribute('aria-label'), item.getAttribute('title'), item.getAttribute('data-testid')].filter(Boolean).map(value => String(value).normalize('NFKC').replace(/\\s+/g, ' ').trim().toLowerCase()); return label.some(value => /^(?:新建任务|新建会话|新建对话|开始新任务|new (?:task|chat|conversation))$/.test(value)) && (!item.getClientRects || item.getClientRects().length > 0); }); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
+        if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"],[role="tab"]')].find(item => { const label = [item.innerText, item.textContent, item.getAttribute('aria-label'), item.getAttribute('title'), item.getAttribute('data-testid')].filter(Boolean).map(value => String(value).normalize('NFKC').replace(/\\s+/g, ' ').trim().toLowerCase()); return label.some(value => /^(?:新建任务|新建会话|新建对话|开始新任务|new (?:task|chat|conversation))$/.test(value)) && (!item.getClientRects || item.getClientRects().length > 0); }); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
             throw new Error("WorkBuddy 新建任务入口未找到或不可用");
         // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。
         await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; return blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected)); })()`, "WorkBuddy 新任务状态校验失败");

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

@@ -15,7 +15,7 @@ const session_history_1 = require("./session-history");
 const desktop_launch_1 = require("../desktop-launch");
 const desktop_launch_2 = require("./desktop-launch");
 exports.workbuddyManifest = {
-    id: "workbuddy", version: "1.1.18", displayName: "WorkBuddy", type: "agent",
+    id: "workbuddy", version: "1.1.19", displayName: "WorkBuddy", type: "agent",
     entry: "dist/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["chat", "health"], configSchema: "config.schema.json",
 };
@@ -52,6 +52,7 @@ class WorkbuddyPlugin {
     /** 重载后待恢复的会话身份。 */
     recoverableSessionId;
     recoverableConversationId;
+    sessionBindings = new Map();
     activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
@@ -81,6 +82,7 @@ class WorkbuddyPlugin {
         this.activeSessionId = undefined;
         this.recoverableSessionId = undefined;
         this.recoverableConversationId = undefined;
+        this.sessionBindings.clear();
         this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
@@ -94,6 +96,8 @@ class WorkbuddyPlugin {
             const saved = await this.loadKnownSessions(this.sessionDataDir);
             for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            for (const [sessionId, binding] of Object.entries(saved.bindings ?? {}))
+                this.sessionBindings.set(sessionId, binding);
             savedBinding = saved.active;
         }
         this.sessionOperations = [];
@@ -265,22 +269,22 @@ class WorkbuddyPlugin {
         const timeout = request.timeoutMs ?? this.timeoutMs;
         const expert = extractExpertQuery(request.task);
         const usesCli = Boolean(this.cliPath && this.transport !== "cdp" && !expert);
-        // 内部恢复消息可能没有 sessionId，沿用当前桌面会话，避免恢复任务被会话保护拒绝。
-        const sessionId = request.sessionId ?? this.activeSessionId;
         const hasAttachments = Array.isArray(request.attachments) && request.attachments.length > 0;
         if (hasAttachments && !this.attachmentInput)
             throw new Error("WorkBuddy 当前传输不支持附件输入");
         if (!usesCli && !this.client?.connected())
             await this.reconnect?.();
         const pendingInteractionSessionId = this.client?.pendingInteractionSessionId?.();
-        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== sessionId)
+        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== request.sessionId)
             throw new Error("WorkBuddy 正在等待另一个会话的选择");
         if (usesCli && request.sessionId)
             throw new Error("CodeBuddy CLI 会话隔离未验证，不能处理带 sessionId 的请求");
-        if (!usesCli && !sessionId && !this.desktopSessionValid)
+        if (!usesCli && !request.sessionId && this.activeSessionId)
+            throw new Error("WorkBuddy 已绑定逻辑会话，请使用相同 sessionId 或先执行 /new");
+        if (!usesCli && !request.sessionId && !this.desktopSessionValid)
             throw new Error("WorkBuddy 桌面任务状态未知，请先创建新会话");
         if (!usesCli)
-            await this.ensureSession(sessionId);
+            await this.ensureSession(request.sessionId);
         if (expert) {
             if (!this.client?.connected())
                 throw new Error(`专家请求需要已连接的 WorkBuddy 桌面端：${expert}`);
@@ -336,11 +340,14 @@ class WorkbuddyPlugin {
             return;
         }
         if (this.knownSessions.has(sessionId)) {
-            if (this.recoverableSessionId !== sessionId || !this.recoverableConversationId || !this.client.activateConversation)
+            const binding = this.sessionBindings.get(sessionId);
+            const conversationId = binding?.conversationId ?? (this.recoverableSessionId === sessionId ? this.recoverableConversationId : undefined);
+            if (!conversationId || !this.client.activateConversation)
                 throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
-            await this.client.activateConversation(this.recoverableConversationId);
+            await this.client.activateConversation(conversationId);
             this.activeSessionId = sessionId;
-            this.activeDesktopConversationId = this.recoverableConversationId;
+            this.activeDesktopConversationId = conversationId;
+            this.activeExpert = binding?.expert;
             this.desktopSessionValid = true;
             this.recoverableSessionId = undefined;
             this.recoverableConversationId = undefined;
@@ -374,7 +381,14 @@ class WorkbuddyPlugin {
             const active = parsed.active;
             if (active !== undefined && (!active || typeof active.sessionId !== "string" || !sessionIds.includes(active.sessionId) || typeof active.conversationId !== "string" || !active.conversationId.trim() || (active.expert !== undefined && active.expert !== null && typeof active.expert !== "string")))
                 throw new Error("活动会话绑定无效");
-            return { sessionIds: new Set(sessionIds), ...(active ? { active: active } : {}) };
+            const activeBinding = active;
+            const bindingsValue = parsed.bindings;
+            if (bindingsValue !== undefined && (!bindingsValue || typeof bindingsValue !== "object" || Array.isArray(bindingsValue) || Object.entries(bindingsValue).some(([sessionId, binding]) => !sessionIds.includes(sessionId) || !binding || typeof binding !== "object" || typeof binding.conversationId !== "string" || !binding.conversationId.trim() || (binding.expert !== undefined && binding.expert !== null && typeof binding.expert !== "string"))))
+                throw new Error("会话绑定列表无效");
+            const bindings = (bindingsValue ?? {});
+            if (activeBinding && !bindings[activeBinding.sessionId])
+                bindings[activeBinding.sessionId] = { conversationId: activeBinding.conversationId, expert: activeBinding.expert };
+            return { sessionIds: new Set(sessionIds), ...(activeBinding ? { active: activeBinding } : {}), bindings };
         }
         catch (error) {
             if (error.code === "ENOENT")
@@ -391,7 +405,9 @@ class WorkbuddyPlugin {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
             const active = this.desktopSessionValid && this.activeSessionId && this.activeDesktopConversationId ? { sessionId: this.activeSessionId, conversationId: this.activeDesktopConversationId, expert: this.activeExpert } : undefined;
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active })}\n`, { mode: 0o600 });
+            if (active)
+                this.sessionBindings.set(active.sessionId, { conversationId: active.conversationId, expert: active.expert });
+            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active, bindings: Object.fromEntries(this.sessionBindings) })}\n`, { mode: 0o600 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;

package/dist/tests-ts/chatgpt-plugin.test.js

@@ -367,7 +367,7 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     strict_1.default.equal(sends, 1);
     await plugin.deactivate();
 });
-(0, node_test_1.default)("ChatGPT 固定 CDP 操作读取侧栏并按主机和 ID 切换，正在生成时阻止切换", async () => {
+(0, node_test_1.default)("ChatGPT 固定 CDP 操作按主机和 ID 切换，生成中等待且超时不切换", async () => {
     const { runInNewContext } = await Promise.resolve().then(() => __importStar(require("node:vm")));
     const entries = [{ id: 'a"\\', host: "h1", title: "旧会话" }, { id: 'a"\\', host: "h2", title: "目标会话" }];
     let selected = 0;
@@ -384,6 +384,7 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     };
     let onMessage = null;
     const client = new chatgpt_1.ChatgptCdpClient({
+        timeoutMs: 300,
         fetchImpl: async () => new Response(JSON.stringify([{ type: "page", url: "app://-/index.html", webSocketDebuggerUrl: "ws://localhost:9230/a" }])),
         webSocketFactory: () => ({
             set onmessage(fn) { onMessage = fn; },
@@ -409,8 +410,9 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
         strict_1.default.equal(selected, 1);
         strict_1.default.deepEqual(await client.activeSession(), entries[1]);
         generating = true;
-        await strict_1.default.rejects(client.switchSession(entries[0]), /正在生成/);
-        strict_1.default.equal(selected, 1);
+        setTimeout(() => { generating = false; }, 100);
+        await client.switchSession(entries[0]);
+        strict_1.default.equal(selected, 0);
     }
     finally {
         client.close();

package/dist/tests-ts/control-server.test.js

@@ -447,16 +447,39 @@ const plugin_manager_1 = require("../src-ts/plugin-manager");
         await server.stop();
     }
 });
+(0, node_test_1.default)("OpenAI 未提供会话头时按对端和本端 AID建立稳定会话", async () => {
+    const calls = [];
+    const server = new control_server_1.ControlServer({ manager: { handle: async (id, request) => { calls.push({ id, request }); return { text: "回复" }; }, recordMessage() { } }, host: "127.0.0.1", port: 0 });
+    const address = await server.start();
+    try {
+        const send = async (peer, aid = "workassists.agentid.cn") => {
+            const response = await fetch(`http://127.0.0.1:${address.port}/api/agents/workbuddy/v1/chat/completions`, {
+                method: "POST", headers: { "x-aun-peer": peer, "x-evolcore-agent-aid": aid },
+                body: JSON.stringify({ messages: [{ role: "user", content: "继续当前任务" }] }),
+            });
+            strict_1.default.equal(response.status, 200);
+            return calls.at(-1).request.sessionId;
+        };
+        const first = await send("peer-a.agentid.cn");
+        strict_1.default.match(first, /^openai:[a-f0-9]{64}$/);
+        strict_1.default.equal(await send("peer-a.agentid.cn"), first);
+        strict_1.default.notEqual(await send("peer-b.agentid.cn"), first);
+        strict_1.default.notEqual(await send("peer-a.agentid.cn", "other.agentid.cn"), first);
+    }
+    finally {
+        await server.stop();
+    }
+});
 (0, node_test_1.default)("未认证远程调用不能使用会话身份，旧请求仍兼容", async () => {
     const calls = [];
     const server = new control_server_1.ControlServer({ manager: { handle: async (_id, request) => { calls.push(request); return { text: "回复" }; }, recordMessage() { } } });
-    for (const headers of [{ "x-evolcore-session-id": "client-id" }, { "x-evolcore-session-id": "client-id", authorization: "Bearer undefined" }, {}]) {
+    for (const headers of [{ "x-evolcore-session-id": "client-id" }, { "x-evolcore-session-id": "client-id", authorization: "Bearer undefined" }, { "x-aun-peer": "peer.agentid.cn", "x-evolcore-agent-aid": "local.agentid.cn" }, {}]) {
         const req = Object.assign(node_stream_1.Readable.from([JSON.stringify({ messages: [{ role: "user", content: "测试" }] })]), {
             method: "POST", url: "/api/agents/workbuddy/v1/chat/completions", headers, socket: { remoteAddress: "192.168.31.10" },
         });
         const res = Object.assign(new node_events_1.EventEmitter(), { statusCode: 0, writableEnded: false, setHeader() { }, end() { this.writableEnded = true; } });
         await server.handle(req, res);
-        strict_1.default.equal(res.statusCode, "x-evolcore-session-id" in headers ? 401 : 200);
+        strict_1.default.equal(res.statusCode, "x-evolcore-session-id" in headers || "x-aun-peer" in headers ? 401 : 200);
     }
     strict_1.default.deepEqual(calls, [{ task: "测试" }]);
 });

package/dist/tests-ts/core-updater.test.js

@@ -48,6 +48,7 @@ async function fixture() {
 });
 (0, node_test_1.default)("新 daemon 健康检查失败时恢复旧核心包并继续旧进程", async () => {
     const value = await fixture();
+    const events = [];
     try {
         const updated = await (0, core_updater_1.updateCoreAtStartup)({
             packageRoot: value.packageRoot,
@@ -59,12 +60,13 @@ async function fixture() {
                 await (0, promises_1.writeFile)((0, node_path_1.join)(value.packageRoot, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version: "1.1.0" }));
                 return "";
             },
-            stopDaemon: async () => undefined,
-            startDaemon: async () => undefined,
-            waitForHealth: async () => false,
+            stopDaemon: async () => { events.push("stop"); },
+            startDaemon: async () => { events.push("start"); },
+            waitForHealth: async () => { events.push("health"); return false; },
         });
         strict_1.default.equal(updated, false);
         strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.0.0");
+        strict_1.default.deepEqual(events, ["stop", "start", "health", "stop", "start"]);
     }
     finally {
         await (0, promises_1.rm)(value.root, { recursive: true, force: true });

package/dist/tests-ts/installer-assets.test.js

@@ -44,6 +44,8 @@ const node_util_1 = require("node:util");
     strict_1.default.match(setup, /\$npmCommand\.Source prefix --global/);
     strict_1.default.match(setup, /@\(\$nodeDirectory, \$npmDirectory, \$npmPrefix\)/);
     strict_1.default.match(setup, /mu-agent-bridge@latest --engine-strict/);
+    strict_1.default.match(setup, /--prefer-online/);
+    strict_1.default.match(setup, /npm 安装遇到版本尚未同步或文件占用.*重试/);
     strict_1.default.doesNotMatch(setup, /mu-agent-bridge@\d+\.\d+\.\d+/);
     strict_1.default.match(setup, /api\/agents\/availability/);
     strict_1.default.match(setup, /function Find-AgentExecutable/);

package/dist/tests-ts/workbuddy-plugin.test.js

@@ -209,19 +209,6 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
     strict_1.default.equal((await plugin.health()).status, "ready");
     await plugin.deactivate("stop");
 });
-(0, node_test_1.default)("workbuddy 内部恢复消息无 sessionId 时沿用当前桌面会话", async () => {
-    const calls = [];
-    const client = {
-        connect: async () => undefined, close() { }, connected: () => true,
-        direct: async (task) => { calls.push(task); return "恢复成功"; },
-    };
-    const plugin = new workbuddy_1.WorkbuddyPlugin({ client });
-    await plugin.activate({ config: { transport: "cdp" }, logger: { info() { }, warn() { }, error() { } } });
-    plugin.activeSessionId = "session-active";
-    await strict_1.default.doesNotReject(() => plugin.handle({ task: "继续当前任务" }));
-    strict_1.default.deepEqual(calls, ["继续当前任务"]);
-    await plugin.deactivate("stop");
-});
 (0, node_test_1.default)("workbuddy 结构化客户端接收附件并保留附件响应和逻辑会话", async () => {
     const attachment = { kind: "file", data: new Uint8Array([1, 2]), filename: "输入.txt", contentType: "text/plain" };
     const output = { kind: "file", data: new Uint8Array([3]), filename: "输出.txt", contentType: "text/plain" };
@@ -991,6 +978,22 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
     strict_1.default.equal(conversationId, null);
     strict_1.default.equal(messages, 0);
 });
+(0, node_test_1.default)("workbuddy CDP 识别新版侧栏 role=tab 新建任务入口", async () => {
+    let conversationId = "old-conversation";
+    let messages = 1;
+    const button = { innerText: "新建任务", disabled: false, getAttribute: () => null, getClientRects: () => [{}], click: () => { conversationId = null; messages = 0; } };
+    const editor = { innerText: "今天帮你做些什么？", querySelector: () => conversationId === null ? {} : null, cloneNode: () => ({ textContent: "", querySelectorAll: () => [] }) };
+    const document = {
+        querySelectorAll: (selector) => selector === '.cr-agent[data-message-id]' ? Array(messages).fill({}) : selector === '[data-conversation-id]' ? conversationId ? [{ className: "_selected_old", getAttribute: () => conversationId }] : [] : selector.includes('[role="tab"]') ? [button] : [],
+        querySelector: () => editor,
+    };
+    const client = new cdp_client_1.WorkbuddyCdpClient({ timeoutMs: 1 });
+    const internal = client;
+    internal.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, { document, location: { href: "app://workbuddy/task/old" } });
+    await client.createTask();
+    strict_1.default.equal(conversationId, null);
+    strict_1.default.equal(messages, 0);
+});
 (0, node_test_1.default)("workbuddy CDP 新建不接受缺少任务身份的旧消息界面直接清空", async () => {
     let messages = 1;
     const button = { textContent: "新建任务", disabled: false, getAttribute: () => null, click: () => { messages = 0; } };
@@ -1134,6 +1137,42 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
         await (0, promises_1.rm)(dataDir, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("workbuddy 多个 AUN 会话交替后重载仍分别恢复桌面会话", async () => {
+    const dataDir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "wb-multiple-sessions-"));
+    let creates = 0;
+    let desktopId = "desktop-initial";
+    const calls = [];
+    const client = {
+        connect: async () => undefined, close() { }, connected: () => true,
+        conversationId: async () => desktopId,
+        activateConversation: async (id) => { desktopId = id; },
+        createTask: async () => { desktopId = `desktop-${++creates}`; },
+        direct: async (task) => { calls.push(`${desktopId}:${task}`); return task; },
+    };
+    const context = { dataDir, config: { transport: "cdp" }, logger: { info() { }, warn() { }, error() { } } };
+    try {
+        const first = new workbuddy_1.WorkbuddyPlugin({ client });
+        await first.activate(context);
+        await first.handle({ task: "peer-a 首条", sessionId: "session-a" });
+        await first.handle({ task: "peer-b 首条", sessionId: "session-b" });
+        await first.handle({ task: "peer-a 续聊", sessionId: "session-a" });
+        await first.deactivate("reload");
+        desktopId = "desktop-after-restart";
+        const second = new workbuddy_1.WorkbuddyPlugin({ client });
+        await second.activate(context);
+        await second.handle({ task: "peer-b 重载后续聊", sessionId: "session-b" });
+        await second.handle({ task: "peer-a 重载后续聊", sessionId: "session-a" });
+        strict_1.default.deepEqual(calls, [
+            "desktop-1:peer-a 首条", "desktop-2:peer-b 首条", "desktop-1:peer-a 续聊",
+            "desktop-2:peer-b 重载后续聊", "desktop-1:peer-a 重载后续聊",
+        ]);
+        strict_1.default.equal(creates, 2);
+        await second.deactivate("stop");
+    }
+    finally {
+        await (0, promises_1.rm)(dataDir, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("workbuddy 新建失败的会话 ID 重启后仍禁止重试", async () => {
     const dataDir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "wb-failed-session-"));
     let creates = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-agent-bridge",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

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

@@ -169,6 +169,7 @@ class ChatgptCdpClient {
         return { supported: true, turns: result.turns, complete: false, missingReasons };
     }
     async switchSession(session) {
+        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)}
@@ -192,6 +193,7 @@ class ChatgptCdpClient {
     })()`, "ChatGPT 会话切换未确认，未发送消息");
     }
     async createSession(_name) {
+        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)})) })`);
@@ -336,6 +338,7 @@ class ChatgptCdpClient {
     }
     async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt) {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
+        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 || "[]"));
@@ -658,6 +661,9 @@ class ChatgptCdpClient {
         }
         throw new Error(message);
     }
+    waitForGeneration() {
+        return this.waitFor(`!Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)}))`, "ChatGPT 桌面端仍在生成回复，等待超时；未清理输入或切换会话");
+    }
     rejectPending(error) {
         for (const pending of this.pending.values())
             pending.reject(error);

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

@@ -73,13 +73,11 @@ class OpenAIAdapter {
             return;
         }
         const session = req.headers["x-evolcore-session-id"];
-        if (session !== undefined) {
-            for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
-                const value = req.headers[name];
-                if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
-                    json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
-                    return;
-                }
+        for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
+            const value = req.headers[name];
+            if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
+                json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
+                return;
             }
         }
         const abort = new AbortController();
@@ -100,7 +98,8 @@ class OpenAIAdapter {
             }
             this.onLog?.(`chat request model=${payload.model ?? this.model} stream=${Boolean(payload.stream)}`);
             this.onExchange?.("request", prompt, peerId, agentAid);
-            const content = await this.complete(prompt, abort.signal, typeof session === "string" ? { sessionId: session, peerId, agentAid } : undefined);
+            const hasSessionContext = typeof session === "string" || peerId !== undefined || agentAid !== undefined;
+            const content = await this.complete(prompt, abort.signal, hasSessionContext ? { sessionId: typeof session === "string" ? session : "", peerId, agentAid } : undefined);
             this.onExchange?.("reply", content, peerId, agentAid);
             if (abort.signal.aborted || res.destroyed)
                 return;

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

@@ -73,13 +73,11 @@ class OpenAIAdapter {
             return;
         }
         const session = req.headers["x-evolcore-session-id"];
-        if (session !== undefined) {
-            for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
-                const value = req.headers[name];
-                if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
-                    json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
-                    return;
-                }
+        for (const name of ["x-evolcore-session-id", "x-aun-peer", "x-evolcore-agent-aid"]) {
+            const value = req.headers[name];
+            if (value !== undefined && (typeof value !== "string" || !value.trim() || value.length > 256 || /[\x00-\x1f\x7f-\x9f]/.test(value))) {
+                json(res, 400, { error: { message: `${name} 必须是 1 到 256 个字符且不含控制字符的字符串`, type: "invalid_request_error" } });
+                return;
             }
         }
         const abort = new AbortController();
@@ -100,7 +98,8 @@ class OpenAIAdapter {
             }
             this.onLog?.(`chat request model=${payload.model ?? this.model} stream=${Boolean(payload.stream)}`);
             this.onExchange?.("request", prompt, peerId, agentAid);
-            const content = await this.complete(prompt, abort.signal, typeof session === "string" ? { sessionId: session, peerId, agentAid } : undefined);
+            const hasSessionContext = typeof session === "string" || peerId !== undefined || agentAid !== undefined;
+            const content = await this.complete(prompt, abort.signal, hasSessionContext ? { sessionId: typeof session === "string" ? session : "", peerId, agentAid } : undefined);
             this.onExchange?.("reply", content, peerId, agentAid);
             if (abort.signal.aborted || res.destroyed)
                 return;

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

@@ -120,7 +120,7 @@ class WorkbuddyCdpClient {
         const before = await this.evaluate(`(() => { const state = ${snapshot}; const loginRequired = [...document.querySelectorAll('a,button,[role="button"]')].some(item => /^(?:登录|立即登录|sign in)$/i.test(item.textContent?.trim() ?? '')); return { ...state, loginRequired }; })()`);
         if (before.loginRequired)
             throw new Error("WorkBuddy 尚未登录，请先在桌面端登录后重试");
-        if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"]')].find(item => { const label = [item.innerText, item.textContent, item.getAttribute('aria-label'), item.getAttribute('title'), item.getAttribute('data-testid')].filter(Boolean).map(value => String(value).normalize('NFKC').replace(/\\s+/g, ' ').trim().toLowerCase()); return label.some(value => /^(?:新建任务|新建会话|新建对话|开始新任务|new (?:task|chat|conversation))$/.test(value)) && (!item.getClientRects || item.getClientRects().length > 0); }); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
+        if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"],[role="tab"]')].find(item => { const label = [item.innerText, item.textContent, item.getAttribute('aria-label'), item.getAttribute('title'), item.getAttribute('data-testid')].filter(Boolean).map(value => String(value).normalize('NFKC').replace(/\\s+/g, ' ').trim().toLowerCase()); return label.some(value => /^(?:新建任务|新建会话|新建对话|开始新任务|new (?:task|chat|conversation))$/.test(value)) && (!item.getClientRects || item.getClientRects().length > 0); }); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
             throw new Error("WorkBuddy 新建任务入口未找到或不可用");
         // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。
         await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; return blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected)); })()`, "WorkBuddy 新任务状态校验失败");

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

@@ -15,7 +15,7 @@ const session_history_1 = require("./session-history");
 const desktop_launch_1 = require("../desktop-launch");
 const desktop_launch_2 = require("./desktop-launch");
 exports.workbuddyManifest = {
-    id: "workbuddy", version: "1.1.18", displayName: "WorkBuddy", type: "agent",
+    id: "workbuddy", version: "1.1.19", displayName: "WorkBuddy", type: "agent",
     entry: "dist/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["chat", "health"], configSchema: "config.schema.json",
 };
@@ -52,6 +52,7 @@ class WorkbuddyPlugin {
     /** 重载后待恢复的会话身份。 */
     recoverableSessionId;
     recoverableConversationId;
+    sessionBindings = new Map();
     activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
@@ -81,6 +82,7 @@ class WorkbuddyPlugin {
         this.activeSessionId = undefined;
         this.recoverableSessionId = undefined;
         this.recoverableConversationId = undefined;
+        this.sessionBindings.clear();
         this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
@@ -94,6 +96,8 @@ class WorkbuddyPlugin {
             const saved = await this.loadKnownSessions(this.sessionDataDir);
             for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            for (const [sessionId, binding] of Object.entries(saved.bindings ?? {}))
+                this.sessionBindings.set(sessionId, binding);
             savedBinding = saved.active;
         }
         this.sessionOperations = [];
@@ -265,22 +269,22 @@ class WorkbuddyPlugin {
         const timeout = request.timeoutMs ?? this.timeoutMs;
         const expert = extractExpertQuery(request.task);
         const usesCli = Boolean(this.cliPath && this.transport !== "cdp" && !expert);
-        // 内部恢复消息可能没有 sessionId，沿用当前桌面会话，避免恢复任务被会话保护拒绝。
-        const sessionId = request.sessionId ?? this.activeSessionId;
         const hasAttachments = Array.isArray(request.attachments) && request.attachments.length > 0;
         if (hasAttachments && !this.attachmentInput)
             throw new Error("WorkBuddy 当前传输不支持附件输入");
         if (!usesCli && !this.client?.connected())
             await this.reconnect?.();
         const pendingInteractionSessionId = this.client?.pendingInteractionSessionId?.();
-        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== sessionId)
+        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== request.sessionId)
             throw new Error("WorkBuddy 正在等待另一个会话的选择");
         if (usesCli && request.sessionId)
             throw new Error("CodeBuddy CLI 会话隔离未验证，不能处理带 sessionId 的请求");
-        if (!usesCli && !sessionId && !this.desktopSessionValid)
+        if (!usesCli && !request.sessionId && this.activeSessionId)
+            throw new Error("WorkBuddy 已绑定逻辑会话，请使用相同 sessionId 或先执行 /new");
+        if (!usesCli && !request.sessionId && !this.desktopSessionValid)
             throw new Error("WorkBuddy 桌面任务状态未知，请先创建新会话");
         if (!usesCli)
-            await this.ensureSession(sessionId);
+            await this.ensureSession(request.sessionId);
         if (expert) {
             if (!this.client?.connected())
                 throw new Error(`专家请求需要已连接的 WorkBuddy 桌面端：${expert}`);
@@ -336,11 +340,14 @@ class WorkbuddyPlugin {
             return;
         }
         if (this.knownSessions.has(sessionId)) {
-            if (this.recoverableSessionId !== sessionId || !this.recoverableConversationId || !this.client.activateConversation)
+            const binding = this.sessionBindings.get(sessionId);
+            const conversationId = binding?.conversationId ?? (this.recoverableSessionId === sessionId ? this.recoverableConversationId : undefined);
+            if (!conversationId || !this.client.activateConversation)
                 throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
-            await this.client.activateConversation(this.recoverableConversationId);
+            await this.client.activateConversation(conversationId);
             this.activeSessionId = sessionId;
-            this.activeDesktopConversationId = this.recoverableConversationId;
+            this.activeDesktopConversationId = conversationId;
+            this.activeExpert = binding?.expert;
             this.desktopSessionValid = true;
             this.recoverableSessionId = undefined;
             this.recoverableConversationId = undefined;
@@ -374,7 +381,14 @@ class WorkbuddyPlugin {
             const active = parsed.active;
             if (active !== undefined && (!active || typeof active.sessionId !== "string" || !sessionIds.includes(active.sessionId) || typeof active.conversationId !== "string" || !active.conversationId.trim() || (active.expert !== undefined && active.expert !== null && typeof active.expert !== "string")))
                 throw new Error("活动会话绑定无效");
-            return { sessionIds: new Set(sessionIds), ...(active ? { active: active } : {}) };
+            const activeBinding = active;
+            const bindingsValue = parsed.bindings;
+            if (bindingsValue !== undefined && (!bindingsValue || typeof bindingsValue !== "object" || Array.isArray(bindingsValue) || Object.entries(bindingsValue).some(([sessionId, binding]) => !sessionIds.includes(sessionId) || !binding || typeof binding !== "object" || typeof binding.conversationId !== "string" || !binding.conversationId.trim() || (binding.expert !== undefined && binding.expert !== null && typeof binding.expert !== "string"))))
+                throw new Error("会话绑定列表无效");
+            const bindings = (bindingsValue ?? {});
+            if (activeBinding && !bindings[activeBinding.sessionId])
+                bindings[activeBinding.sessionId] = { conversationId: activeBinding.conversationId, expert: activeBinding.expert };
+            return { sessionIds: new Set(sessionIds), ...(activeBinding ? { active: activeBinding } : {}), bindings };
         }
         catch (error) {
             if (error.code === "ENOENT")
@@ -391,7 +405,9 @@ class WorkbuddyPlugin {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
             const active = this.desktopSessionValid && this.activeSessionId && this.activeDesktopConversationId ? { sessionId: this.activeSessionId, conversationId: this.activeDesktopConversationId, expert: this.activeExpert } : undefined;
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active })}\n`, { mode: 0o600 });
+            if (active)
+                this.sessionBindings.set(active.sessionId, { conversationId: active.conversationId, expert: active.expert });
+            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active, bindings: Object.fromEntries(this.sessionBindings) })}\n`, { mode: 0o600 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;

package/plugins/workbuddy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-workbuddy",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "mu-agent-bridge 的 WorkBuddy 桌面端插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugins/workbuddy/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "workbuddy",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "type": "agent",
   "displayName": "WorkBuddy",
   "entry": "dist/src-ts/plugins/workbuddy/index.js",