mu-agent-bridge 1.0.71 → 1.0.78

package/dist/src-ts/dsh-agent.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DshAgent = void 0;
+exports.readPresentedFiles = readPresentedFiles;
 const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
@@ -19,7 +20,7 @@ function digest(data) { return (0, node_crypto_1.createHash)("sha256").update(da
 function outputContentType(filename, data) {
     return (0, attachments_1.detectImageContentType)(data) ?? outputMimeTypes[(0, node_path_1.extname)(filename).toLowerCase()] ?? "application/octet-stream";
 }
-async function readPresentedFiles(directory, paths, cwd, inputs, returnPaths) {
+async function readPresentedFiles(directory, paths, cwd, inputs = [], returnPaths = []) {
     if (paths.length > attachments_1.MAX_ATTACHMENTS)
         throw new Error("单条消息最多包含 8 个附件");
     const result = [];
@@ -72,9 +73,10 @@ class DshAgent {
         this.spawnProcess = options.spawn ?? node_child_process_1.spawn;
         this.defaultTimeoutMs = options.defaultTimeoutMs ?? 300_000;
     }
-    async send(request) {
+    async send(request, modelRequest = false) {
         if (!request.task.trim())
             throw new agent_1.AgentError("DSH task must not be empty");
+        request.signal?.throwIfAborted();
         (0, attachments_1.validateAttachments)(request.attachments);
         const paths = this.paths ?? await (0, dsh_paths_1.resolveDshPaths)(this.options.patchPath);
         const workDirectory = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "agent-bridge-dsh-"));
@@ -87,7 +89,11 @@ class DshAgent {
             const inputPaths = (request.attachments ?? []).map((item, index) => ({ path: (0, node_path_1.join)(workDirectory, `${index}-${(0, attachments_1.attachmentFilename)(item.filename)}`), returnPath: (0, node_path_1.join)(outputDirectory, `${index}-${(0, attachments_1.attachmentFilename)(item.filename)}`), filename: item.filename, contentType: item.contentType }));
             for (const [index, item] of (request.attachments ?? []).entries())
                 await (0, promises_1.writeFile)(inputPaths[index].returnPath, item.data, { mode: 0o600 });
-            const task = `${request.task}\n\n请使用真实文件工具读取输入附件；生成的回传文件必须写入 outputDirectory 的直接子文件，并调用 present 工具声明文件。原附件已准备 returnPath 副本，原样回传时直接 present 此路径，无需 shell 复制。图片或视频无法理解时请明确说明，仍可原样回传。\n附件传输：\n${JSON.stringify({ inputs: inputPaths, outputDirectory })}`;
+            const task = modelRequest ? request.task : inputPaths.length
+                ? `${request.task}\n\n请读取输入附件；如需回传文件，将文件写入 outputDirectory 的直接子文件并调用 present。原附件可直接使用 returnPath。\n附件传输：\n${JSON.stringify({ inputs: inputPaths, outputDirectory })}`
+                : request.attachmentOutput
+                    ? `${request.task}\n\n如需回传文件，将文件写入 outputDirectory 的直接子文件并调用 present。\n附件传输：\n${JSON.stringify({ outputDirectory })}`
+                    : request.task;
             const args = ["--expose-internals", paths.cli, "--profile", "headless", "--patch", paths.patch, "--json"];
             if (request.sessionId && !request.newSession)
                 args.push("--session-id", request.sessionId);
@@ -129,18 +135,30 @@ class DshAgent {
             });
             child.stderr.on("data", (chunk) => { errors += chunk; });
             await new Promise((resolve, reject) => {
-                const timer = setTimeout(() => {
-                    child.kill();
-                    reject(new agent_1.AgentError(`DSH task timed out after ${request.timeoutMs ?? this.defaultTimeoutMs}ms`));
-                }, request.timeoutMs ?? this.defaultTimeoutMs);
-                child.once("error", (error) => { clearTimeout(timer); reject(new agent_1.AgentError("failed to start DSH", { cause: error })); });
-                child.once("close", (code) => {
+                let timedOut = false;
+                const finish = (action) => {
                     clearTimeout(timer);
-                    if (code !== 0 && !finalText)
-                        reject(new agent_1.AgentError(errors.trim() || `DSH exited with code ${code}`));
-                    else
-                        resolve();
+                    request.signal?.removeEventListener("abort", abort);
+                    action();
+                };
+                const abort = () => { child.kill(); };
+                const timer = setTimeout(() => { timedOut = true; child.kill(); }, request.timeoutMs ?? this.defaultTimeoutMs);
+                child.once("error", (error) => finish(() => reject(new agent_1.AgentError("failed to start DSH", { cause: error }))));
+                child.once("close", (code) => {
+                    finish(() => {
+                        if (request.signal?.aborted)
+                            reject(request.signal.reason instanceof Error ? request.signal.reason : new agent_1.AgentError("DSH task canceled"));
+                        else if (timedOut)
+                            reject(new agent_1.AgentError(`DSH task timed out after ${request.timeoutMs ?? this.defaultTimeoutMs}ms`));
+                        else if (code !== 0 && !finalText)
+                            reject(new agent_1.AgentError(errors.trim() || `DSH exited with code ${code}`));
+                        else
+                            resolve();
+                    });
                 });
+                request.signal?.addEventListener("abort", abort, { once: true });
+                if (request.signal?.aborted)
+                    abort();
                 child.stdin.end(task, "utf8");
             });
             if (request.newSession && !sessionId)

package/dist/src-ts/http-agent.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpAgent = void 0;
+const agent_1 = require("./agent");
+// 仅供独立 HTTP 通信验收使用，不接入桌面插件的生产调用链。
+class HttpAgent {
+    endpoint;
+    model;
+    name = "dsh-http";
+    constructor(endpoint, model = "qwenwork") {
+        this.endpoint = endpoint;
+        this.model = model;
+    }
+    async send(request) {
+        const response = await fetch(`${this.endpoint.replace(/\/$/, "")}/chat/completions`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ model: this.model, messages: [{ role: "user", content: request.task }], stream: false }),
+            signal: AbortSignal.timeout(request.timeoutMs ?? 300_000),
+        });
+        const body = await response.text();
+        if (!response.ok)
+            throw new agent_1.AgentError(`HTTP Agent 请求失败 (${response.status}): ${body.slice(0, 500)}`);
+        try {
+            const value = JSON.parse(body);
+            const text = value.choices?.[0]?.message?.content?.trim();
+            if (!text)
+                throw new Error("响应 choices[0].message.content 为空");
+            return { text };
+        }
+        catch (error) {
+            throw new agent_1.AgentError("HTTP Agent 返回了无效响应", { cause: error });
+        }
+    }
+}
+exports.HttpAgent = HttpAgent;

package/dist/src-ts/plugin-catalog.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePluginId = resolvePluginId;
 exports.searchPluginCatalog = searchPluginCatalog;
 const registry = "https://registry.npmjs.org";
 const pluginName = /^agent-bridge-[a-z0-9-]+$/;
+const pluginId = /^[a-z][a-z0-9-]{1,63}$/;
+function resolvePluginId(packageName, declaredId) {
+    if (!pluginName.test(packageName))
+        return;
+    const id = declaredId === undefined ? packageName.slice("agent-bridge-".length) : declaredId;
+    return typeof id === "string" && pluginId.test(id) ? id : undefined;
+}
 async function getJson(url) {
     const response = await fetch(url, { signal: AbortSignal.timeout(10_000) });
     if (!response.ok)
@@ -24,9 +32,10 @@ async function searchPluginCatalog(query = "", get = getJson) {
             const version = metadata?.["dist-tags"]?.latest;
             const pkg = metadata?.versions?.[version];
             const type = pkg?.agentBridge?.type;
-            if (!pkg?.agentBridge?.plugin || !["agent", "channel", "management"].includes(type))
+            const id = resolvePluginId(name, pkg?.agentBridge?.id);
+            if (!id || !pkg?.agentBridge?.plugin || !["agent", "channel", "management"].includes(type))
                 return;
-            return { name, version, description: typeof entry.package.description === "string" ? entry.package.description : "", type };
+            return { name, id, version, description: typeof entry.package.description === "string" ? entry.package.description : "", type };
         }
         catch {
             return;