agent-bridge-abweb 1.0.12 → 1.0.15

package/dist/src-ts/agent.js

@@ -1,7 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentOperationError = exports.AgentError = void 0;
+exports.abortable = abortable;
 exports.errorDetails = errorDetails;
+async function abortable(promise, signal) {
+    if (!signal)
+        return promise;
+    if (signal.aborted) {
+        // promise 已在调用方启动，先观察其拒绝，避免预取消时产生未处理拒绝。
+        void promise.catch(() => undefined);
+        signal.throwIfAborted();
+    }
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const cleanup = () => signal.removeEventListener("abort", abort);
+        const abort = () => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            reject(signal.reason);
+        };
+        signal.addEventListener("abort", abort, { once: true });
+        promise.then((value) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            resolve(value);
+        }, (error) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            reject(error);
+        });
+    });
+}
 class AgentError extends Error {
     constructor(message, options) {
         super(message, options);

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

@@ -5,7 +5,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const MANIFEST = {
     id: "abweb",
-    version: "1.0.12",
+    version: "1.0.15",
     displayName: "Agent Bridge Web",
     entry: "dist/index.js",
     apiVersion: "1",

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

@@ -34,6 +34,7 @@
     let logHasNext = false;
     let loading = false;
     const installingPackages = new Set();
+    let assistantOriginal = {};
     function error(message) { errorNode.textContent = message; errorNode.hidden = !message; }
     function showResult(title, message, failed) {
         node("#operation-result-title").textContent = title;
@@ -76,7 +77,7 @@
         head.append(headRow);
         const body = document.createElement("tbody");
         for (const plugin of items) {
-            const installed = plugins.find((item) => item.id === plugin.name.replace(/^agent-bridge-/, ""));
+            const installed = plugins.find((item) => item.id === (plugin.id ?? plugin.name.replace(/^agent-bridge-/, "")));
             const versionStatus = installed ? pluginVersions[installed.id] : undefined;
             const isUpgrade = Boolean(installed && versionStatus?.packageName === plugin.name && newerVersion(plugin.version, installed.version));
             const row = document.createElement("tr");
@@ -218,7 +219,8 @@
         versionsNode.replaceChildren(...entries.map((entry) => {
             const row = document.createElement("div");
             row.className = "version-row";
-            row.textContent = `${entry.packageName} · 当前 ${entry.currentVersion} · ${entry.latestVersion ? `最新 ${entry.latestVersion}` : "最新版本未知"} · ${entry.state}${entry.error ? ` · ${entry.error}` : ""}`;
+            const state = entry.state === "unpublished" ? "未发布" : entry.state;
+            row.textContent = `${entry.packageName} · 当前 ${entry.currentVersion} · ${entry.latestVersion ? `最新 ${entry.latestVersion}` : "最新版本未知"} · ${state}${entry.error ? ` · ${entry.error}` : ""}`;
             return row;
         }));
         if (!entries.length)
@@ -344,6 +346,8 @@
             controls.className = "controls";
             if (plugin.manifest?.executionMode === "cli")
                 controls.append(button("配置", `配置 ${plugin.id}`, () => configureCli(plugin)));
+            if (plugin.id === "personal-assistant")
+                controls.append(button("配置模型", "配置个人助理模型来源", () => configureAssistant(plugin)));
             if (pluginVersions[plugin.id]?.state === "update-available" && plugin.path.includes("node_modules")) {
                 controlsUpgrade(plugin.id);
                 controls.append(button("下载", `下载 ${plugin.id}`, async () => { await request(`/api/plugins/${encodeURIComponent(plugin.id)}/download`, "POST", { packageName: plugin.packageName, version: pluginVersions[plugin.id]?.latestVersion }); await load(); }));
@@ -401,6 +405,70 @@
             detail.hidden = false;
         }).finally(() => { save.disabled = false; });
     };
+    node("#assistant-config-cancel").onclick = () => node("#assistant-config-dialog").close();
+    async function configureAssistant(plugin) {
+        const [config, sourceResult] = await Promise.all([
+            request(`/api/plugins/${encodeURIComponent(plugin.id)}/config`),
+            request("/api/model-providers"),
+        ]);
+        assistantOriginal = config;
+        const select = node("#assistant-model-provider");
+        select.replaceChildren();
+        const add = (value, label, disabled = false) => { const option = document.createElement("option"); option.value = value; option.textContent = label; option.disabled = disabled; select.append(option); };
+        add("openai", "OpenAI 兼容接口");
+        if (config.modelProvider === "claude-cli")
+            add("claude-cli", "Claude CLI（原有配置，用户默认模型）");
+        for (const provider of sourceResult.providers ?? [])
+            add(`plugin:${provider.id}`, `${provider.displayName || provider.id}${provider.available ? "" : `（不可用：${provider.reason || provider.status}）`}`, !provider.available);
+        if (config.modelProvider === "plugin" && config.modelPlugin && !(sourceResult.providers ?? []).some((item) => item.id === config.modelPlugin))
+            add(`plugin:${config.modelPlugin}`, `${config.modelPlugin}（未安装或未声明模型来源）`, true);
+        select.value = config.modelProvider === "plugin" && config.modelPlugin ? `plugin:${config.modelPlugin}` : config.modelProvider ?? "openai";
+        node("#assistant-model").value = config.model ?? "";
+        node("#assistant-endpoint").value = config.endpoint ?? "";
+        node("#assistant-api-key").value = "";
+        node("#assistant-api-key").placeholder = config.apiKey ? "已配置，留空保留" : "可选，本地免认证服务可留空";
+        node("#assistant-timeout").value = String(config.timeoutMs ?? 120000);
+        node("#assistant-allowed-peers").value = config.allowedPeers?.includes("*") ? "" : (config.allowedPeers ?? []).join("\n");
+        node("#assistant-allowed-agents").value = config.allowedAgents?.includes("*") ? "" : (config.allowedAgents ?? []).join("\n");
+        node("#assistant-config-error").hidden = true;
+        node("#assistant-config-dialog").showModal();
+    }
+    node("#assistant-config-form").onsubmit = event => {
+        event.preventDefault();
+        const save = node("#assistant-config-save");
+        save.disabled = true;
+        const source = node("#assistant-model-provider").value;
+        const provider = source.startsWith("plugin:") ? "plugin" : source;
+        const modelPlugin = source.startsWith("plugin:") ? source.slice("plugin:".length) : undefined;
+        const body = {};
+        if (provider !== (assistantOriginal.modelProvider ?? "openai"))
+            body.modelProvider = provider;
+        if (provider === "plugin" && modelPlugin !== assistantOriginal.modelPlugin)
+            body.modelPlugin = modelPlugin;
+        const model = node("#assistant-model").value.trim();
+        const endpoint = node("#assistant-endpoint").value.trim();
+        const apiKey = node("#assistant-api-key").value;
+        if (model && model !== String(assistantOriginal.model ?? ""))
+            body.model = model;
+        if (endpoint && endpoint !== String(assistantOriginal.endpoint ?? ""))
+            body.endpoint = endpoint;
+        if (apiKey.trim())
+            body.apiKey = apiKey.trim();
+        const timeoutMs = Number(node("#assistant-timeout").value);
+        if (timeoutMs !== Number(assistantOriginal.timeoutMs ?? 120000))
+            body.timeoutMs = timeoutMs;
+        for (const [field, selector] of [["allowedPeers", "#assistant-allowed-peers"], ["allowedAgents", "#assistant-allowed-agents"]]) {
+            const entries = [...new Set(node(selector).value.split(/[\s,，]+/).filter(Boolean))];
+            const values = entries.includes("*") ? [] : entries;
+            if (JSON.stringify(values) !== JSON.stringify(assistantOriginal[field]))
+                body[field] = values;
+        }
+        void request("/api/plugins/personal-assistant/config", "PATCH", body).then(result => {
+            node("#assistant-config-dialog").close();
+            showResult("个人助理配置已保存", result.restartRequired || result.action === "restart" ? "配置已保存，需要重启后台后生效。" : "模型来源配置已更新。", false);
+            return load(false);
+        }).catch(cause => { const detail = node("#assistant-config-error"); detail.textContent = String(cause); detail.hidden = false; }).finally(() => { save.disabled = false; });
+    };
     function renderMessages(messages) {
         messagesNode.replaceChildren();
         messagesEmpty.hidden = messages.length > 0;
@@ -453,8 +521,8 @@
     node("#check-versions").onclick = () => void request("/api/versions/check", "POST", {}).then(() => load()).catch((cause) => error(String(cause)));
     node("#save-update-policy").onclick = () => void request("/api/update-policy", "PATCH", { mode: policyNode.value }).then(() => load()).catch((cause) => error(String(cause)));
     node("#save-plugin-trust").onclick = () => { const button = node("#save-plugin-trust"); button.disabled = true; trustStatusNode.textContent = "正在保存…"; void request("/api/plugin-trust", "PATCH", pluginTrustConfig).then(() => { pluginTrustDirty = false; trustStatusNode.textContent = "信任设置已保存"; return load(false); }).catch((cause) => { trustStatusNode.textContent = String(cause); }).finally(() => { button.disabled = false; }); };
-    node("#update-core").onclick = () => { if (confirm("确认升级后台并自动重启？"))
-        void request("/api/update", "POST", {}).then(() => { error("后台正在升级，页面将在几秒后恢复"); }).catch((cause) => error(String(cause))); };
+    node("#update-core").onclick = () => { if (confirm("确认检查后台更新？有更高版本时将升级并自动重启"))
+        void request("/api/update", "POST", {}).then(() => { error("后台正在检查更新，有更高版本时升级并重启；结果请查看运行日志"); }).catch((cause) => error(String(cause))); };
     node("#pair-button").onclick = () => {
         const code = pairCodeNode.value.trim();
         if (!/^\d{6}$/.test(code))

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

@@ -32,6 +32,7 @@
   let logHasNext = false;
   let loading = false;
   const installingPackages = new Set<string>();
+  let assistantOriginal: Record<string, unknown> = {};
 
   function error(message: string): void { errorNode.textContent = message; errorNode.hidden = !message; }
   function showResult(title: string, message: string, failed: boolean): void {
@@ -51,7 +52,7 @@
   });
   async function loadCatalog(): Promise<void> {
     const result = await request(`/api/plugins/catalog?q=${encodeURIComponent(packageSearchNode.value.trim())}`);
-    const items: Array<{ name: string; version: string; description: string; type: string }> = result.plugins ?? [];
+    const items: Array<{ id?: string; name: string; version: string; description: string; type: string }> = result.plugins ?? [];
     catalogNode.replaceChildren();
     if (!items.length) { catalogNode.textContent = "未找到已声明类型的 npm 插件"; return; }
     const typeNames: Record<string, string> = { agent: "Agent", channel: "通道", management: "管理" };
@@ -62,7 +63,7 @@
     head.append(headRow);
     const body = document.createElement("tbody");
     for (const plugin of items) {
-      const installed = plugins.find((item) => item.id === plugin.name.replace(/^agent-bridge-/, ""));
+      const installed = plugins.find((item) => item.id === (plugin.id ?? plugin.name.replace(/^agent-bridge-/, "")));
       const versionStatus = installed ? pluginVersions[installed.id] : undefined;
       const isUpgrade = Boolean(installed && versionStatus?.packageName === plugin.name && newerVersion(plugin.version, installed.version));
       const row = document.createElement("tr");
@@ -149,7 +150,8 @@
     const entries = [data.core, ...(data.plugins ?? []).map((plugin: any) => plugin.versionStatus)].filter(Boolean);
     versionsNode.replaceChildren(...entries.map((entry: any) => {
       const row = document.createElement("div"); row.className = "version-row";
-      row.textContent = `${entry.packageName} · 当前 ${entry.currentVersion} · ${entry.latestVersion ? `最新 ${entry.latestVersion}` : "最新版本未知"} · ${entry.state}${entry.error ? ` · ${entry.error}` : ""}`;
+      const state = entry.state === "unpublished" ? "未发布" : entry.state;
+      row.textContent = `${entry.packageName} · 当前 ${entry.currentVersion} · ${entry.latestVersion ? `最新 ${entry.latestVersion}` : "最新版本未知"} · ${state}${entry.error ? ` · ${entry.error}` : ""}`;
       return row;
     }));
     if (!entries.length) versionsNode.textContent = "尚未检查版本";
@@ -207,6 +209,7 @@
       }
       const controls = document.createElement("td"); controls.className = "controls";
       if (plugin.manifest?.executionMode === "cli") controls.append(button("配置", `配置 ${plugin.id}`, () => configureCli(plugin)));
+      if (plugin.id === "personal-assistant") controls.append(button("配置模型", "配置个人助理模型来源", () => configureAssistant(plugin)));
       if (pluginVersions[plugin.id]?.state === "update-available" && plugin.path.includes("node_modules")) { controlsUpgrade(plugin.id); controls.append(button("下载", `下载 ${plugin.id}`, async () => { await request(`/api/plugins/${encodeURIComponent(plugin.id)}/download`, "POST", { packageName: plugin.packageName, version: pluginVersions[plugin.id]?.latestVersion }); await load(); })); }
       for (const [label, action] of [["启动", "start"], ["停止", "stop"], ["重载", "reload"]]) {
         controls.append(button(label, `${label} ${plugin.id}`, async () => { await request(`/api/plugins/${encodeURIComponent(plugin.id)}/${action}`, "POST"); await load(); }));
@@ -246,6 +249,55 @@
       const detail = node<HTMLElement>("#cli-config-error"); detail.textContent = String(cause); detail.hidden = false;
     }).finally(() => { save.disabled = false; });
   };
+  node<HTMLButtonElement>("#assistant-config-cancel").onclick = () => node<HTMLDialogElement>("#assistant-config-dialog").close();
+  async function configureAssistant(plugin: Plugin): Promise<void> {
+    const [config, sourceResult] = await Promise.all([
+      request(`/api/plugins/${encodeURIComponent(plugin.id)}/config`),
+      request("/api/model-providers"),
+    ]);
+    assistantOriginal = config;
+    const select = node<HTMLSelectElement>("#assistant-model-provider");
+    select.replaceChildren();
+    const add = (value: string, label: string, disabled = false) => { const option = document.createElement("option"); option.value = value; option.textContent = label; option.disabled = disabled; select.append(option); };
+    add("openai", "OpenAI 兼容接口");
+    if (config.modelProvider === "claude-cli") add("claude-cli", "Claude CLI（原有配置，用户默认模型）");
+    for (const provider of sourceResult.providers ?? []) add(`plugin:${provider.id}`, `${provider.displayName || provider.id}${provider.available ? "" : `（不可用：${provider.reason || provider.status}）`}`, !provider.available);
+    if (config.modelProvider === "plugin" && config.modelPlugin && !(sourceResult.providers ?? []).some((item: any) => item.id === config.modelPlugin)) add(`plugin:${config.modelPlugin}`, `${config.modelPlugin}（未安装或未声明模型来源）`, true);
+    select.value = config.modelProvider === "plugin" && config.modelPlugin ? `plugin:${config.modelPlugin}` : config.modelProvider ?? "openai";
+    node<HTMLInputElement>("#assistant-model").value = config.model ?? "";
+    node<HTMLInputElement>("#assistant-endpoint").value = config.endpoint ?? "";
+    node<HTMLInputElement>("#assistant-api-key").value = "";
+    node<HTMLInputElement>("#assistant-api-key").placeholder = config.apiKey ? "已配置，留空保留" : "可选，本地免认证服务可留空";
+    node<HTMLInputElement>("#assistant-timeout").value = String(config.timeoutMs ?? 120000);
+    node<HTMLTextAreaElement>("#assistant-allowed-peers").value = config.allowedPeers?.includes("*") ? "" : (config.allowedPeers ?? []).join("\n");
+    node<HTMLTextAreaElement>("#assistant-allowed-agents").value = config.allowedAgents?.includes("*") ? "" : (config.allowedAgents ?? []).join("\n");
+    node<HTMLElement>("#assistant-config-error").hidden = true;
+    node<HTMLDialogElement>("#assistant-config-dialog").showModal();
+  }
+  node<HTMLFormElement>("#assistant-config-form").onsubmit = event => {
+    event.preventDefault();
+    const save = node<HTMLButtonElement>("#assistant-config-save"); save.disabled = true;
+    const source = node<HTMLSelectElement>("#assistant-model-provider").value;
+    const provider = source.startsWith("plugin:") ? "plugin" : source;
+    const modelPlugin = source.startsWith("plugin:") ? source.slice("plugin:".length) : undefined;
+    const body: Record<string, unknown> = {};
+    if (provider !== (assistantOriginal.modelProvider ?? "openai")) body.modelProvider = provider;
+    if (provider === "plugin" && modelPlugin !== assistantOriginal.modelPlugin) body.modelPlugin = modelPlugin;
+    const model = node<HTMLInputElement>("#assistant-model").value.trim(); const endpoint = node<HTMLInputElement>("#assistant-endpoint").value.trim(); const apiKey = node<HTMLInputElement>("#assistant-api-key").value;
+    if (model && model !== String(assistantOriginal.model ?? "")) body.model = model;
+    if (endpoint && endpoint !== String(assistantOriginal.endpoint ?? "")) body.endpoint = endpoint;
+    if (apiKey.trim()) body.apiKey = apiKey.trim();
+    const timeoutMs = Number(node<HTMLInputElement>("#assistant-timeout").value);
+    if (timeoutMs !== Number(assistantOriginal.timeoutMs ?? 120000)) body.timeoutMs = timeoutMs;
+    for (const [field, selector] of [["allowedPeers", "#assistant-allowed-peers"], ["allowedAgents", "#assistant-allowed-agents"]]) {
+      const entries = [...new Set(node<HTMLTextAreaElement>(selector).value.split(/[\s,，]+/).filter(Boolean))];
+      const values = entries.includes("*") ? [] : entries;
+      if (JSON.stringify(values) !== JSON.stringify(assistantOriginal[field])) body[field] = values;
+    }
+    void request("/api/plugins/personal-assistant/config", "PATCH", body).then(result => {
+      node<HTMLDialogElement>("#assistant-config-dialog").close(); showResult("个人助理配置已保存", result.restartRequired || result.action === "restart" ? "配置已保存，需要重启后台后生效。" : "模型来源配置已更新。", false); return load(false);
+    }).catch(cause => { const detail = node<HTMLElement>("#assistant-config-error"); detail.textContent = String(cause); detail.hidden = false; }).finally(() => { save.disabled = false; });
+  };
   function renderMessages(messages: Array<{ time: string; pluginId: string; direction: "request" | "reply" | "error"; text: string; peer?: string; agentAid?: string }>): void {
     messagesNode.replaceChildren();
     messagesEmpty.hidden = messages.length > 0;
@@ -280,7 +332,7 @@
   node<HTMLButtonElement>("#check-versions").onclick = () => void request("/api/versions/check", "POST", {}).then(() => load()).catch((cause) => error(String(cause)));
   node<HTMLButtonElement>("#save-update-policy").onclick = () => void request("/api/update-policy", "PATCH", { mode: policyNode.value }).then(() => load()).catch((cause) => error(String(cause)));
   node<HTMLButtonElement>("#save-plugin-trust").onclick = () => { const button = node<HTMLButtonElement>("#save-plugin-trust"); button.disabled = true; trustStatusNode.textContent = "正在保存…"; void request("/api/plugin-trust", "PATCH", pluginTrustConfig).then(() => { pluginTrustDirty = false; trustStatusNode.textContent = "信任设置已保存"; return load(false); }).catch((cause) => { trustStatusNode.textContent = String(cause); }).finally(() => { button.disabled = false; }); };
-  node<HTMLButtonElement>("#update-core").onclick = () => { if (confirm("确认升级后台并自动重启？")) void request("/api/update", "POST", {}).then(() => { error("后台正在升级，页面将在几秒后恢复"); }).catch((cause) => error(String(cause))); };
+  node<HTMLButtonElement>("#update-core").onclick = () => { if (confirm("确认检查后台更新？有更高版本时将升级并自动重启")) void request("/api/update", "POST", {}).then(() => { error("后台正在检查更新，有更高版本时升级并重启；结果请查看运行日志"); }).catch((cause) => error(String(cause))); };
   node<HTMLButtonElement>("#pair-button").onclick = () => {
     const code = pairCodeNode.value.trim();
     if (!/^\d{6}$/.test(code)) return error("请输入 6 位配置码");

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-abweb",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "agent-bridge 的网页管理插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "abweb",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "type": "management",
   "displayName": "Agent Bridge Web",
   "entry": "dist/src-ts/plugins/abweb/index.js",