mu-agent-bridge 1.0.34 → 1.0.39

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

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoubaoPlugin = exports.doubaoManifest = void 0;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const cdp_client_1 = require("./cdp-client");
+const session_history_1 = require("./session-history");
 const plugin_1 = require("../../plugin");
 const desktop_launch_1 = require("../desktop-launch");
 exports.doubaoManifest = {
     id: "doubao",
-    version: "1.0.14",
+    version: "1.0.20",
     displayName: "豆包",
     entry: "dist/index.js",
     apiVersion: "1",
@@ -17,14 +20,36 @@ exports.doubaoManifest = {
 class DoubaoPlugin {
     injectedClient;
     manifest = exports.doubaoManifest;
+    attachmentInput = true;
+    sessionOperations = [];
+    sessionHistory;
     client;
     state = "stopped";
     message = "";
+    queue = Promise.resolve();
+    pending = 0;
+    bindings = new Map();
+    dataDir;
     constructor(injectedClient) {
         this.injectedClient = injectedClient;
     }
     disposer;
+    reconnect;
     async activate(context) {
+        this.dataDir = context.dataDir;
+        this.bindings.clear();
+        if (this.dataDir) {
+            try {
+                const saved = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(this.dataDir, "sessions.json"), "utf8"));
+                if (!saved || typeof saved !== "object" || Array.isArray(saved) || Object.values(saved).some(value => typeof value !== "string" || !/^\d*$/.test(value)))
+                    throw new Error("豆包会话绑定记录无效");
+                this.bindings = new Map(Object.entries(saved));
+            }
+            catch (error) {
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
+        }
         this.client = this.injectedClient ?? new cdp_client_1.DoubaoCdpClient({
             port: (0, plugin_1.resolveRuntimePort)(context.config, context.runtime, "doubao", "DOUBAO_CDP_PORT", 9227),
             conversationId: typeof context.config.conversationId === "string" ? context.config.conversationId : undefined,
@@ -32,41 +57,54 @@ class DoubaoPlugin {
             pluginList: Array.isArray(context.config.pluginList) ? context.config.pluginList.filter((value) => typeof value === "string") : undefined,
             timeoutMs: typeof context.config.timeoutMs === "number" ? context.config.timeoutMs : undefined,
         });
+        this.sessionHistory = new session_history_1.DoubaoSessionHistoryProvider({
+            scope: `doubao:${(0, plugin_1.resolveRuntimePort)(context.config, context.runtime, "doubao", "DOUBAO_CDP_PORT", 9227)}`,
+            client: () => this.client,
+        });
+        this.sessionOperations = this.client.createSession && this.client.complete ? ["new"] : [];
+        this.reconnect = async () => {
+            try {
+                await this.client.connect();
+            }
+            catch (first) {
+                if (context.config.autoStart !== false && !this.injectedClient && process.platform === "win32") {
+                    const port = (0, plugin_1.resolveRuntimePort)(context.config, context.runtime, "doubao", "DOUBAO_CDP_PORT", 9227);
+                    const executable = await (0, desktop_launch_1.findWindowsExecutable)("Doubao.exe", typeof context.config.executablePath === "string" ? context.config.executablePath : undefined);
+                    if (executable) {
+                        context.logger?.warn?.(`正在启动豆包：${executable}，等待 CDP ${port}`);
+                        try {
+                            await (0, desktop_launch_1.launchAndWait)(executable, [`--remote-debugging-port=${port}`], () => this.client.connect(), typeof context.config.startupTimeoutMs === "number" ? context.config.startupTimeoutMs : 30_000);
+                            return;
+                        }
+                        catch (error) {
+                            first = new Error(`已启动豆包，但 CDP ${port} 未就绪：${error instanceof Error ? error.message : String(error)}`);
+                        }
+                    }
+                    else
+                        first = new Error("未找到 Doubao.exe，请配置 executablePath");
+                }
+                throw first;
+            }
+        };
         try {
-            await this.client.connect();
+            await this.reconnect();
             if (context.http)
                 this.disposer = context.http.register({ method: "POST", path: "/doubao/v1/chat/completions", handler: (request, response) => this.handleHttp(request, response) }) || undefined;
             this.state = "ready";
             this.message = "";
         }
-        catch (first) {
-            if (context.config.autoStart !== false && !this.injectedClient && process.platform === "win32") {
-                const port = (0, plugin_1.resolveRuntimePort)(context.config, context.runtime, "doubao", "DOUBAO_CDP_PORT", 9227);
-                const executable = await (0, desktop_launch_1.findWindowsExecutable)("Doubao.exe", typeof context.config.executablePath === "string" ? context.config.executablePath : undefined);
-                if (executable) {
-                    context.logger?.warn?.(`豆包已启动，等待 CDP ${port}`);
-                    try {
-                        await (0, desktop_launch_1.launchAndWait)(executable, [`--remote-debugging-port=${port}`], () => this.client.connect(), typeof context.config.startupTimeoutMs === "number" ? context.config.startupTimeoutMs : 30_000);
-                        this.state = "ready";
-                        this.message = "";
-                        return;
-                    }
-                    catch (error) {
-                        first = new Error(`已启动豆包，但 CDP ${port} 未就绪：${error instanceof Error ? error.message : String(error)}`);
-                    }
-                }
-                else
-                    first = new Error("未找到 Doubao.exe，请配置 executablePath");
-            }
+        catch (error) {
             this.state = "failed";
-            this.message = first instanceof Error ? first.message : String(first);
+            this.message = error instanceof Error ? error.message : String(error);
             context.logger?.warn?.(this.message);
-            throw first;
+            throw error;
         }
     }
     async deactivate() {
+        await this.queue;
         this.disposer?.();
         this.disposer = undefined;
+        this.reconnect = undefined;
         await this.client?.close();
         this.client = undefined;
         this.state = "stopped";
@@ -76,10 +114,61 @@ class DoubaoPlugin {
             ? { status: "ready", details: { adapter: "doubao", cdp: true } }
             : { status: "degraded", message: this.message || "豆包 CDP 未连接", details: { adapter: "doubao", cdp: false } };
     }
-    async handle(request) {
+    async controlSession(request) {
+        if (request.operation !== "new")
+            throw new Error(`豆包不支持会话操作：${String(request.operation)}`);
+        if (!request.sessionId?.trim())
+            throw new Error("豆包新会话缺少 sessionId");
+        if (this.pending)
+            throw new Error("豆包当前忙，无法创建新会话");
+        if (!this.sessionOperations.includes("new"))
+            throw new Error("豆包当前传输不支持新建会话");
+        return this.enqueue(async () => {
+            await this.ensureConnected();
+            await this.client.createSession(request.name);
+            await this.remember(request.sessionId, "");
+            return { text: "豆包已创建新会话", sessionId: request.sessionId };
+        });
+    }
+    async ensureConnected() {
         if (this.state !== "ready" || !this.client)
             throw new Error("豆包插件未就绪");
-        return this.client.complete ? this.client.complete(request.task) : { text: await this.client.direct(request.task) };
+        if (!this.client.connected())
+            await this.reconnect?.();
+    }
+    async handle(request) {
+        return this.enqueue(async () => {
+            await this.ensureConnected();
+            const client = this.client;
+            if (request.attachments?.length && !client.complete)
+                throw new Error("当前豆包客户端不支持附件输入");
+            if (!client.complete)
+                return { text: await client.direct(request.task) };
+            const conversationId = request.sessionId ? this.bindings.get(request.sessionId) ?? "" : undefined;
+            const response = await client.complete(request.task, undefined, request.attachments, conversationId);
+            if (!request.sessionId)
+                return response;
+            if (!response.sessionId || !/^\d+$/.test(response.sessionId))
+                throw new Error("豆包未返回有效的服务端会话标识");
+            await this.remember(request.sessionId, response.sessionId);
+            return { ...response, sessionId: request.sessionId };
+        });
+    }
+    enqueue(task) {
+        this.pending++;
+        const run = this.queue.then(task);
+        this.queue = run.then(() => undefined, () => undefined);
+        return run.finally(() => { this.pending--; });
+    }
+    async remember(sessionId, conversationId) {
+        const next = new Map(this.bindings).set(sessionId, conversationId);
+        if (this.dataDir) {
+            await (0, promises_1.mkdir)(this.dataDir, { recursive: true });
+            const file = (0, node_path_1.join)(this.dataDir, "sessions.json");
+            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify(Object.fromEntries(next), null, 2)}\n`, { mode: 0o600 });
+            await (0, promises_1.rename)(`${file}.tmp`, file);
+        }
+        this.bindings = next;
     }
     async handleHttp(request, response) {
         let raw = "";

package/dist/src-ts/plugins/doubao/session-history.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DoubaoSessionHistoryProvider = void 0;
+const unsupported = (reason) => ({ supported: false, reason });
+class DoubaoSessionHistoryProvider {
+    options;
+    mode = "all";
+    limitation = "豆包通过原生历史目录和单会话消息链分页只读读取对话正文。";
+    listed = new Map();
+    listedSessions = new Map();
+    readAt = "";
+    snapshotAt = 0;
+    constructor(options) {
+        this.options = options;
+    }
+    get scope() { return this.options.scope; }
+    async listSessions(query) {
+        if (!Number.isInteger(query.limit) || query.limit < 1 || query.limit > 50)
+            return unsupported("豆包每页会话数量必须为 1–50");
+        if (query.cursor !== undefined && (typeof query.cursor !== "string" || !query.cursor.trim()))
+            return unsupported("豆包会话目录游标无效");
+        const client = this.options.client();
+        if (!client?.connected() || !client.listHistory)
+            return unsupported("豆包 CDP 未连接或当前客户端不提供只读历史目录接口");
+        try {
+            const page = await client.listHistory(query.cursor, query.limit);
+            if (!Array.isArray(page.conversations) || typeof page.complete !== "boolean" || !Array.isArray(page.missingReasons))
+                return unsupported("豆包会话目录格式无效");
+            if (query.cursor === undefined) {
+                this.listed.clear();
+                this.listedSessions.clear();
+            }
+            this.readAt = new Date().toISOString();
+            this.snapshotAt = Date.now();
+            for (const conversation of page.conversations) {
+                if (!conversation || typeof conversation.id !== "string" || !conversation.id || !Array.isArray(conversation.messages))
+                    return unsupported("豆包会话目录包含无效条目");
+                this.listed.set(conversation.id, conversation);
+                this.listedSessions.set(conversation.id, { id: conversation.id, title: conversation.title, ...(conversation.updatedAt ? { updatedAt: conversation.updatedAt } : {}) });
+            }
+            const missingReasons = [...new Set(page.missingReasons)];
+            return {
+                supported: true,
+                sessions: page.conversations.map(item => ({ id: item.id, title: item.title, ...(item.updatedAt ? { updatedAt: item.updatedAt } : {}) })),
+                ...(page.nextCursor ? { nextCursor: page.nextCursor } : {}),
+                complete: page.complete,
+                missingReasons,
+                readAt: this.readAt,
+            };
+        }
+        catch (error) {
+            return unsupported("豆包历史目录读取失败，请检查桌面端接口或版本兼容性");
+        }
+    }
+    async readSession(query) {
+        if (!Number.isInteger(query.limit) || query.limit < 1 || query.limit > 100)
+            return unsupported("豆包每页消息数量必须为 1–100");
+        const since = query.since;
+        const sinceMs = since === undefined ? undefined : Date.parse(since);
+        if (since !== undefined && !Number.isFinite(sinceMs))
+            return unsupported("豆包会话正文起始时间无效");
+        let nativeCursor;
+        if (query.cursor !== undefined) {
+            const bound = query.cursor.match(/^db-read:(\d+):([1-9]\d*)$/);
+            if (bound) {
+                if (sinceMs !== Number(bound[1]))
+                    return unsupported("豆包会话正文游标与起始时间不匹配");
+                nativeCursor = bound[2];
+            }
+            else if (/^[1-9]\d*$/.test(query.cursor) && sinceMs === undefined)
+                nativeCursor = query.cursor;
+            else
+                return unsupported("豆包会话正文游标无效");
+        }
+        const session = this.listedSessions.get(query.sessionId);
+        if (!session)
+            return unsupported("请先分页列出豆包会话目录，再读取该会话");
+        if (Date.now() - this.snapshotAt > 120_000) {
+            this.listed.clear();
+            this.listedSessions.clear();
+            return unsupported("豆包历史快照已过期，请重新列出会话目录");
+        }
+        const client = this.options.client();
+        if (!client?.connected() || !client.readHistory)
+            return unsupported("豆包 CDP 未连接或当前客户端不提供只读会话正文分页接口");
+        let page;
+        try {
+            page = await client.readHistory(query.sessionId, nativeCursor, query.limit, since);
+        }
+        catch {
+            return unsupported("豆包会话正文读取失败，请检查桌面端接口或版本兼容性");
+        }
+        if (page.conversationId !== query.sessionId || !Array.isArray(page.messages) || typeof page.hasMore !== "boolean" || typeof page.complete !== "boolean" || !Array.isArray(page.missingReasons))
+            return unsupported("豆包会话正文格式或会话身份无效");
+        if (page.nextCursor !== undefined && (!/^[1-9]\d*$/.test(page.nextCursor) || page.nextCursor === nativeCursor))
+            return unsupported("豆包会话正文返回无效或重复游标");
+        const pageTimes = page.messages.map(message => message.time ? Date.parse(message.time) : NaN).filter(Number.isFinite);
+        const oldest = pageTimes.length ? Math.min(...pageTimes) : undefined;
+        const reachedSince = sinceMs !== undefined && (page.reachedSince === true || oldest !== undefined && oldest < sinceMs);
+        const visible = sinceMs === undefined ? page.messages : page.messages.filter(message => !message.time || Date.parse(message.time) >= sinceMs);
+        const turns = visible.map(message => ({
+            ...(message.id ? { id: message.id } : {}),
+            role: message.role,
+            text: message.text,
+            ...(message.time ? { time: message.time } : {}),
+        }));
+        const missingReasons = [...page.missingReasons];
+        if (page.hasMore && !page.nextCursor && !reachedSince)
+            missingReasons.push("豆包会话正文仍有后续消息，但分页游标缺失。");
+        if (!turns.every(turn => Boolean(turn.id && turn.time)))
+            missingReasons.push("部分豆包消息缺少稳定标识或发送时间，无法确认正文完整性。");
+        return {
+            supported: true,
+            session,
+            turns,
+            ...(page.nextCursor && !reachedSince ? { nextCursor: sinceMs === undefined ? page.nextCursor : `db-read:${sinceMs}:${page.nextCursor}` } : {}),
+            complete: page.complete && (!page.hasMore || Boolean(page.nextCursor) || reachedSince) && missingReasons.length === 0,
+            missingReasons: [...new Set(missingReasons)],
+            readAt: this.readAt,
+        };
+    }
+}
+exports.DoubaoSessionHistoryProvider = DoubaoSessionHistoryProvider;

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

@@ -4,9 +4,10 @@ exports.DshPlugin = exports.dshManifest = void 0;
 const node_path_1 = require("node:path");
 const dsh_agent_1 = require("../../dsh-agent");
 const openai_adapter_1 = require("../qwenwork/openai-adapter");
+const session_history_1 = require("./session-history");
 exports.dshManifest = {
     id: "dsh",
-    version: "1.0.4",
+    version: "1.0.9",
     displayName: "DeepSeek Harness",
     entry: "dist/index.js",
     apiVersion: "1",
@@ -16,10 +17,14 @@ exports.dshManifest = {
 };
 class DshPlugin {
     manifest = exports.dshManifest;
+    attachmentInput = true;
+    sessionOperations = ["new"];
+    sessionHistory;
     agent;
     status = "failed";
     message = "插件尚未启动";
     adapter;
+    activeRequests = 0;
     unregister = [];
     async activate(context) {
         const configured = context.config.patchPath;
@@ -27,6 +32,10 @@ class DshPlugin {
             ? configured
             : (0, node_path_1.resolve)(__dirname, "..", "..", "headless-account.patch.yml");
         this.agent = new dsh_agent_1.DshAgent({ patchPath });
+        this.sessionHistory = new session_history_1.DshSessionHistoryProvider({
+            sessionsRoot: typeof context.config.sessionsRoot === "string" ? context.config.sessionsRoot : undefined,
+            unavailableReason: () => this.status !== "ready" ? "DSH 插件尚未就绪" : this.activeRequests ? "DSH 正在处理任务，暂不读取持久化历史" : "",
+        });
         this.adapter = new openai_adapter_1.OpenAIAdapter((prompt) => this.handle({ task: prompt, timeoutMs: 240_000 }).then((result) => result.text), { model: "dsh", prefix: "/dsh/v1", onExchange: (direction, text, peer, agentAid) => context.logger?.info?.("DSH 通信", { direction, text, peer, agentAid }) });
         if (context.http) {
             for (const [method, path] of [["GET", "/dsh/v1/models"], ["POST", "/dsh/v1/chat/completions"], ["OPTIONS", "/dsh/v1/chat/completions"]]) {
@@ -45,6 +54,7 @@ class DshPlugin {
         await this.adapter?.close();
         this.adapter = undefined;
         this.agent = undefined;
+        this.sessionHistory = undefined;
         this.status = "failed";
         this.message = "插件已停止";
     }
@@ -54,7 +64,13 @@ class DshPlugin {
     async handle(request) {
         if (!this.agent || this.status !== "ready")
             throw new Error("dsh 插件未就绪");
-        return this.agent.send(request);
+        this.activeRequests++;
+        try {
+            return await this.agent.send(request);
+        }
+        finally {
+            this.activeRequests--;
+        }
     }
 }
 exports.DshPlugin = DshPlugin;