mu-agent-bridge 1.0.71 → 1.0.73

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

@@ -3,6 +3,7 @@ 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 agent_1 = require("../../agent");
 const cdp_client_1 = require("./cdp-client");
 const session_history_1 = require("./session-history");
 const plugin_1 = require("../../plugin");
@@ -10,17 +11,22 @@ const desktop_launch_1 = require("../desktop-launch");
 const node_os_1 = require("node:os");
 exports.doubaoManifest = {
     id: "doubao",
-    version: "1.0.23",
+    version: "1.0.24",
     displayName: "豆包",
     entry: "dist/index.js",
     apiVersion: "1",
     process: "in-process",
-    capabilities: ["chat", "health"],
+    capabilities: ["chat", "health", "model-provider"],
     configSchema: "config.schema.json",
 };
 class DoubaoPlugin {
     injectedClient;
     manifest = exports.doubaoManifest;
+    get modelProvider() {
+        if (!this.client?.complete || !this.client.createSession)
+            return undefined;
+        return { complete: (request) => this.completeModelProvider(request) };
+    }
     attachmentInput = true;
     sessionOperations = [];
     sessionHistory;
@@ -145,9 +151,9 @@ class DoubaoPlugin {
             if (request.attachments?.length && !client.complete)
                 throw new Error("当前豆包客户端不支持附件输入");
             if (!client.complete)
-                return { text: await client.direct(request.task) };
+                return { text: await client.direct(request.task, request.signal) };
             const conversationId = request.sessionId ? this.bindings.get(request.sessionId) ?? "" : undefined;
-            const response = await client.complete(request.task, undefined, request.attachments, conversationId);
+            const response = await client.complete(request.task, request.signal, request.attachments, conversationId);
             if (!request.sessionId)
                 return response;
             if (!response.sessionId || !/^\d+$/.test(response.sessionId))
@@ -156,6 +162,32 @@ class DoubaoPlugin {
             return { ...response, sessionId: request.sessionId };
         });
     }
+    async completeModelProvider(request) {
+        let stage = "豆包模型排队（queue）";
+        try {
+            request.signal.throwIfAborted();
+            const run = this.enqueue(async () => {
+                request.signal.throwIfAborted();
+                stage = "连接豆包模型（connect）";
+                const client = this.client;
+                if (this.state !== "ready" || !client?.connected() || !client.complete)
+                    throw new Error("豆包 CDP 未连接，模型请求不会启动或重启桌面");
+                stage = "等待豆包模型生成（generate）";
+                // 空服务端标识会原子创建独立会话，无需切换用户桌面页面。
+                const response = await client.complete(request.prompt, request.signal, undefined, this.bindings.get(request.sessionId) ?? "");
+                if (!response.sessionId || !/^\d+$/.test(response.sessionId))
+                    throw new Error("豆包未返回有效的服务端会话标识");
+                await this.remember(request.sessionId, response.sessionId);
+                return { text: response.text };
+            });
+            return await (0, agent_1.abortable)(run, request.signal);
+        }
+        catch (error) {
+            if (error instanceof agent_1.AgentOperationError)
+                throw error;
+            throw new agent_1.AgentOperationError("DOUBAO_MODEL_FAILED", stage, error);
+        }
+    }
     enqueue(task) {
         this.pending++;
         const run = this.queue.then(task);

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

@@ -1,23 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DshPlugin = exports.dshManifest = void 0;
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const agent_1 = require("../../agent");
 const dsh_agent_1 = require("../../dsh-agent");
 const dsh_paths_1 = require("../../dsh-paths");
 const openai_adapter_1 = require("../qwenwork/openai-adapter");
 const session_history_1 = require("./session-history");
 exports.dshManifest = {
     id: "dsh",
-    version: "1.0.11",
+    version: "1.0.12",
     displayName: "DeepSeek Harness",
     entry: "dist/index.js",
     apiVersion: "1",
     process: "in-process",
-    capabilities: ["chat", "health"],
+    capabilities: ["chat", "health", "model-provider"],
     configSchema: "config.schema.json",
 };
 class DshPlugin {
     manifest = exports.dshManifest;
+    modelProvider = { complete: (request) => this.completeModelProvider(request) };
     attachmentInput = true;
     sessionOperations = ["new"];
     sessionHistory;
@@ -26,8 +29,27 @@ class DshPlugin {
     message = "插件尚未启动";
     adapter;
     activeRequests = 0;
+    queue = Promise.resolve();
+    modelSessions = new Map();
+    modelSessionsPath;
     unregister = [];
     async activate(context) {
+        this.modelSessions.clear();
+        this.modelSessionsPath = context.dataDir ? (0, node_path_1.join)(context.dataDir, "model-provider-sessions.json") : undefined;
+        if (this.modelSessionsPath) {
+            try {
+                const saved = JSON.parse(await (0, promises_1.readFile)(this.modelSessionsPath, "utf8"));
+                const valid = (value) => typeof value === "string" && value.trim() && value.length <= 512 && !/[\u0000-\u001f]/.test(value);
+                if (!saved || typeof saved !== "object" || Array.isArray(saved) || Object.entries(saved).some(([key, value]) => !valid(key) || !valid(value)))
+                    throw new Error("DSH 个人助理模型会话记录无效");
+                for (const [key, value] of Object.entries(saved))
+                    this.modelSessions.set(key, value);
+            }
+            catch (error) {
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
+        }
         const configured = context.config.patchPath;
         const patchPath = typeof configured === "string" && configured.trim()
             ? configured
@@ -52,6 +74,7 @@ class DshPlugin {
         context.logger?.info?.("dsh plugin activated");
     }
     async deactivate() {
+        await this.queue;
         for (const dispose of this.unregister.splice(0))
             dispose();
         await this.adapter?.close();
@@ -67,12 +90,61 @@ class DshPlugin {
     async handle(request) {
         if (!this.agent || this.status !== "ready")
             throw new Error("dsh 插件未就绪");
-        this.activeRequests++;
+        const run = this.queue.then(async () => {
+            this.activeRequests++;
+            try {
+                return await this.agent.send(request);
+            }
+            finally {
+                this.activeRequests--;
+            }
+        });
+        this.queue = run.then(() => undefined, () => undefined);
+        return run;
+    }
+    async completeModelProvider(request) {
+        let stage = "DSH 模型排队（queue）";
         try {
-            return await this.agent.send(request);
+            request.signal.throwIfAborted();
+            const run = this.queue.then(async () => {
+                request.signal.throwIfAborted();
+                stage = "连接 DSH 模型（connect）";
+                if (!this.agent || this.status !== "ready")
+                    throw new Error("DSH 插件未就绪");
+                this.activeRequests++;
+                try {
+                    const sessionId = this.modelSessions.get(request.sessionId);
+                    stage = "等待 DSH 模型生成（generate）";
+                    const response = await this.agent.send({
+                        task: request.prompt,
+                        timeoutMs: request.timeoutMs,
+                        signal: request.signal,
+                        ...(sessionId ? { sessionId } : { newSession: true }),
+                    }, true);
+                    if (!sessionId) {
+                        if (!response.sessionId)
+                            throw new Error("DSH 未返回个人助理模型会话标识");
+                        const next = new Map(this.modelSessions).set(request.sessionId, response.sessionId);
+                        if (this.modelSessionsPath) {
+                            await (0, promises_1.mkdir)((0, node_path_1.resolve)(this.modelSessionsPath, ".."), { recursive: true });
+                            await (0, promises_1.writeFile)(`${this.modelSessionsPath}.tmp`, JSON.stringify(Object.fromEntries(next)), { mode: 0o600 });
+                            await (0, promises_1.rename)(`${this.modelSessionsPath}.tmp`, this.modelSessionsPath);
+                        }
+                        this.modelSessions.set(request.sessionId, response.sessionId);
+                    }
+                    return { text: response.text };
+                }
+                finally {
+                    this.activeRequests--;
+                }
+            });
+            this.queue = run.then(() => undefined, () => undefined);
+            return await (0, agent_1.abortable)(run, request.signal);
         }
-        finally {
-            this.activeRequests--;
+        catch (error) {
+            if (error instanceof agent_1.AgentOperationError)
+                throw error;
+            throw new agent_1.AgentOperationError("DSH_MODEL_FAILED", stage, error);
         }
     }
 }

package/dist/src-ts/plugins/local-cli/agent.js

@@ -6,6 +6,7 @@ const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const node_os_1 = require("node:os");
 const node_crypto_1 = require("node:crypto");
 const nativeId = /^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i;
 const maximumOutput = 4 * 1024 * 1024;
@@ -22,6 +23,21 @@ function diagnostic(value) {
     } })
         .slice(0, 2000);
 }
+function modelDiagnostic(error) {
+    const message = String(error);
+    const code = /CLI 退出码 (?:\d+|[A-Z][A-Z0-9_]+)/.exec(message)?.[0];
+    if (code)
+        return `${code}：请检查 CLI 登录、权限和网络`;
+    if (message.includes("CLI 调用超时"))
+        return "CLI 模型调用超时，请检查登录、网络或权限审批";
+    if (message.includes("CLI 请求已取消"))
+        return "CLI 模型请求已取消";
+    if (message.includes("插件已停止"))
+        return "插件已停止，当前 CLI 模型任务已终止";
+    if (message.includes("CLI 输出超过"))
+        return "CLI 模型输出超过 4MB 限制";
+    return "CLI 模型调用或结构化输出失败，请检查 CLI 状态";
+}
 async function resolveWindowsCliShim(file, provider) {
     const modules = (0, node_path_1.basename)((0, node_path_1.dirname)(file)) === ".bin" ? (0, node_path_1.dirname)((0, node_path_1.dirname)(file)) : (0, node_path_1.join)((0, node_path_1.dirname)(file), "node_modules");
     const root = (0, node_path_1.join)(modules, ...(provider === "codex" ? ["@openai", "codex"] : ["@anthropic-ai", "claude-code"]));
@@ -76,6 +92,8 @@ class LocalCliAgent {
     ready = false;
     message = "插件尚未启动";
     version = "";
+    modelModeSupported = false;
+    get modelInput() { return this.ready && this.modelModeSupported; }
     sessions = new Map();
     writes = Promise.resolve();
     pending = new Map();
@@ -108,6 +126,9 @@ class LocalCliAgent {
             const help = (await this.run(this.provider === "codex" ? ["exec", "--help"] : ["--help"], "", 10000)).stdout;
             if (this.provider === "codex" ? !help.includes("--json") || !help.includes("resume") : !help.includes("--output-format") || !help.includes("--resume"))
                 throw new Error("CLI 版本不支持所需的结构化输出和会话恢复，请升级 CLI");
+            this.modelModeSupported = this.provider === "claude"
+                ? ["--json-schema", "--tools", "--strict-mcp-config", "--mcp-config", "--no-session-persistence", "--settings", "--setting-sources"].every(flag => help.includes(flag))
+                : ["--output-schema", "--ephemeral", "--sandbox", "--disable", "--config", "--ignore-rules"].every(flag => help.includes(flag));
             this.sessions = new Map();
             try {
                 const data = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(context.dataDir, "cli-sessions.json"), "utf8"));
@@ -128,7 +149,9 @@ class LocalCliAgent {
             throw new Error(this.message);
         }
     }
-    run(args, input, timeout) {
+    run(args, input, timeout, signal) {
+        if (signal?.aborted)
+            return Promise.reject(new Error("CLI 请求已取消"));
         const command = this.command;
         let child;
         let stop;
@@ -153,8 +176,10 @@ class LocalCliAgent {
                 }
             };
             stop = () => terminate("插件已停止，当前 CLI 任务已终止");
+            const abort = () => terminate("CLI 请求已取消");
+            signal?.addEventListener("abort", abort, { once: true });
             const timer = setTimeout(() => terminate(`CLI 调用超时（${timeout}ms），请检查登录、网络或权限审批`), timeout);
-            const cleanup = () => { clearTimeout(timer); this.children.delete(child); };
+            const cleanup = () => { clearTimeout(timer); signal?.removeEventListener("abort", abort); this.children.delete(child); };
             child.stdout.setEncoding("utf8");
             child.stderr.setEncoding("utf8");
             const collect = (value, error) => {
@@ -227,35 +252,70 @@ class LocalCliAgent {
             throw new Error(`${this.manifest.displayName} 本期不支持附件输入`);
         if (!request.task?.trim())
             throw new Error("CLI 任务文本不能为空");
+        return this.executeCli(request, request.modelResponseSchema);
+    }
+    /**
+     * 模型来源的独立入口。调用方只提供最小模型契约，不能通过普通 Agent handle 进入管理路径。
+     */
+    async completeStructuredModel(request, responseSchema) {
+        if (!request.prompt?.trim())
+            throw new Error("模型请求文本不能为空");
+        if (!request.sessionId?.trim())
+            throw new Error("模型请求会话标识不能为空");
+        const response = await this.executeCli({ task: request.prompt, sessionId: request.sessionId, timeoutMs: request.timeoutMs, signal: request.signal }, responseSchema);
+        return { text: response.text };
+    }
+    async executeCli(request, modelSchema) {
+        const modelMode = modelSchema !== undefined;
+        if (modelMode && !this.modelModeSupported)
+            throw new Error("当前 CLI 不支持无工具结构化模型请求，请升级 CLI");
+        const schema = modelMode ? JSON.stringify(modelSchema) : undefined;
+        if (modelMode && (!modelSchema || typeof modelSchema !== "object" || Array.isArray(modelSchema) || !schema || Buffer.byteLength(schema) > 64_000))
+            throw new Error("模型输出 Schema 无效或过大");
         const logical = request.sessionId || (0, node_crypto_1.randomUUID)();
         return this.serial(logical, async () => {
             this.requireReady();
-            const id = request.newSession ? undefined : this.sessions.get(logical);
+            const id = modelMode || request.newSession ? undefined : this.sessions.get(logical);
+            let schemaFile;
+            let schemaDirectory;
             const args = this.provider === "codex"
                 ? ["exec", ...(id ? ["resume", id] : []), "--json", "-"]
                 : ["--print", "--output-format", "json", ...(id ? ["--resume", id] : [])];
+            if (modelMode && this.provider === "claude")
+                args.push("--json-schema", schema, "--tools", "", "--strict-mcp-config", "--mcp-config", '{"mcpServers":{}}', "--settings", '{"disableAllHooks":true}', "--setting-sources", "user", "--no-session-persistence");
             const timeout = request.timeoutMs ?? this.timeoutMs;
             if (!Number.isInteger(timeout) || timeout <= 0 || timeout > 2147483647)
                 throw new Error("任务超时必须是有效的正整数毫秒数");
             const started = Date.now();
             this.context.logger.info("本地 CLI 任务开始", { plugin: this.manifest.id, sessionId: logical, resume: Boolean(id) });
             try {
-                const output = await this.run(args, request.task, timeout);
-                const response = this.parse(output.stdout);
+                if (modelMode && this.provider === "codex") {
+                    schemaDirectory = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-codex-model-"));
+                    schemaFile = (0, node_path_1.join)(schemaDirectory, "response-schema.json");
+                    await (0, promises_1.writeFile)(schemaFile, schema, { flag: "wx", mode: 0o600 });
+                    args.splice(-1, 0, "--ephemeral", "--sandbox", "read-only", "--output-schema", schemaFile, "--disable", "shell_tool", "--disable", "apps", "--disable", "plugins", "--disable", "hooks", "--ignore-rules", "--config", "mcp_servers={}");
+                }
+                const output = await this.run(args, request.task, timeout, request.signal);
+                const response = this.parse(output.stdout, modelMode);
                 if (id && response.id !== id)
                     throw new Error("CLI 恢复返回的会话 ID 与指定会话不一致，保留原会话绑定");
-                await this.save(logical, response.id);
+                if (!modelMode)
+                    await this.save(logical, response.id);
                 this.context.logger.info("本地 CLI 任务完成", { plugin: this.manifest.id, sessionId: logical, durationMs: Date.now() - started, exitCode: 0 });
-                return { text: response.text, sessionId: logical };
+                return { text: response.text, ...(!modelMode ? { sessionId: logical } : {}) };
             }
             catch (error) {
-                const detail = diagnostic(String(error));
+                const detail = modelMode ? modelDiagnostic(error) : diagnostic(String(error));
                 this.context.logger.error("本地 CLI 任务失败", { plugin: this.manifest.id, sessionId: logical, durationMs: Date.now() - started, error: detail });
                 throw new Error(`${this.manifest.displayName}：${detail}`);
             }
+            finally {
+                if (schemaFile && schemaDirectory)
+                    await (0, promises_1.rm)(schemaDirectory, { recursive: true, force: true });
+            }
         });
     }
-    parse(stdout) {
+    parse(stdout, modelMode = false) {
         let id = "", text = "";
         try {
             if (this.provider === "codex") {
@@ -287,6 +347,11 @@ class LocalCliAgent {
                     throw new Error(JSON.stringify(event.errors ?? event));
                 id = event.session_id;
                 text = event.result;
+                if (modelMode) {
+                    if (!event.structured_output || typeof event.structured_output !== "object" || Array.isArray(event.structured_output))
+                        throw new Error("缺少有效结构化模型输出");
+                    text = JSON.stringify(event.structured_output);
+                }
             }
             if (typeof id !== "string" || !nativeId.test(id))
                 throw new Error("缺少有效原生会话 ID");

package/dist/src-ts/plugins/personal-assistant/claude-cli-model.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.responseSchema = void 0;
+exports.claudeCliCompletion = claudeCliCompletion;
+const tools_1 = require("./tools");
+exports.responseSchema = {
+    type: "object", additionalProperties: false, required: ["role", "content", "tool_calls"],
+    properties: {
+        role: { type: "string", enum: ["assistant"] },
+        content: { type: ["string", "null"], maxLength: 32_000 },
+        tool_calls: { type: "array", maxItems: 8, items: {
+                type: "object", additionalProperties: false, required: ["id", "type", "function"],
+                properties: {
+                    id: { type: "string", minLength: 1, maxLength: 128 }, type: { type: "string", enum: ["function"] },
+                    function: { type: "object", additionalProperties: false, required: ["name", "arguments"], properties: {
+                            name: { type: "string", enum: [...tools_1.TOOL_NAMES] }, arguments: { type: "string", maxLength: 64_000 },
+                        } },
+                },
+            } },
+    },
+};
+function claudeCliCompletion(callPlugin, timeoutMs) {
+    return async (messages, signal) => {
+        const response = await callPlugin("claude-cli", {
+            task: JSON.stringify({ instructions: "你是个人助理的模型推理器。按照 messages 中的系统要求处理最后一条用户消息；tools 仅描述宿主提供的管理工具。需要查询或执行任务时返回 tool_calls，待工具结果返回后再回答；不要编造结果。每次调用使用不同 id。最终回答时 tool_calls 为空数组。仅返回 Schema 规定的 JSON。", messages, tools: (0, tools_1.toolDefinitions)() }),
+            modelResponseSchema: exports.responseSchema, timeoutMs, signal,
+        });
+        return response.text;
+    };
+}

package/dist/src-ts/plugins/personal-assistant/coordination.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCoordinator = createCoordinator;
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
+const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
+const isAid = (value) => typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9._-]{2,255}$/.test(value);
+const isAgentId = (value) => typeof value === "string" && /^[a-z0-9][a-z0-9-]{0,63}$/.test(value);
+const isThreadId = (value) => typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9._:-]{0,255}$/.test(value);
+function createCoordinator(options) {
+    if (!isAid(options.selfAid))
+        throw new Error("selfAid 无效");
+    const allowed = new Map();
+    for (const agent of options.allowedAgents) {
+        if (!isAgentId(agent.id) || !Array.isArray(agent.aids) || agent.aids.some((aid) => !isAid(aid)))
+            throw new Error("Agent 白名单无效");
+        allowed.set(agent.id, new Set(agent.aids));
+    }
+    const run = options.execFile ?? (async (file, args) => execFileAsync(file, args, { timeout: 30_000, maxBuffer: 1024 * 1024, encoding: "utf8", windowsHide: true }));
+    const command = async (args) => {
+        const { stdout } = await run(options.ecPath ?? "ec", args);
+        let value;
+        try {
+            value = JSON.parse(stdout);
+        }
+        catch {
+            throw new Error("EvolCore 返回了无效 JSON");
+        }
+        if (!value || typeof value !== "object" || Array.isArray(value) || value.ok === false)
+            throw new Error("EvolCore 命令失败");
+        return value;
+    };
+    return {
+        async dispatch({ agentId, aid, task }) {
+            if (!isAgentId(agentId) || !isAid(aid) || !allowed.get(agentId)?.has(aid))
+                throw new Error("目标 Agent/AID 不在白名单中");
+            if (typeof task !== "string" || !task.trim() || task.length > 20_000)
+                throw new Error("任务长度无效");
+            const thread = await command(["thread", "create", aid, "--name", `个人助理派活-${agentId}`, "--format", "json"]);
+            const threadId = thread.thread_id ?? thread.threadId ?? thread.id;
+            if (!isThreadId(threadId))
+                throw new Error("EvolCore 未返回有效 threadId");
+            await command(["msg", "send", options.selfAid, aid, "--text", task, "--thread", threadId, "--return", "required", "--format", "json"]);
+            return { status: "pending", agentId, aid, threadId };
+        },
+        async getStatus({ aid, threadId }) {
+            if (!isAid(aid))
+                throw new Error("AID 无效");
+            if (!isThreadId(threadId))
+                throw new Error("threadId 无效");
+            const history = await command(["thread", "history", threadId, "--format", "json"]);
+            const state = history.status ?? history.state;
+            const status = state === "completed" || state === "failed" || state === "cancelled" ? state : "pending";
+            return { status, aid, threadId, history };
+        },
+    };
+}