mu-agent-bridge 1.0.41 → 1.0.43

package/README.md

@@ -162,3 +162,7 @@ mab feishu unbind cli_你的应用ID
 ```
 
 `configure` 保存凭据及可选关联后，需要在 ABWeb 重载飞书插件以连接机器人。非交互终端请使用网页密码框；不要把 Secret 写进命令行、脚本或仓库。
+
+### 本地 CLI Agent
+
+新增两个独立插件：`agent-bridge-codex-cli`（Codex CLI）与 `agent-bridge-claude-cli`（Claude Code CLI），随核心默认打包。支持在 abweb 配置、启停及通过通道关联 AID，沿用本机 CLI 的登录和默认模型。详见 [本地 CLI 插件使用说明](docs/local-cli-agents.md)。

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

@@ -7,7 +7,8 @@ async function agentAvailability(id, config, status) {
     const configured = typeof config.executablePath === "string" ? config.executablePath : undefined;
     const executable = id === "workbuddy" ? (0, workbuddy_1.findExecutable)(configured)
         : id === "qwenwork" ? await (0, desktop_launch_1.findWindowsExecutable)("QwenWorkCN.exe", configured)
-            : id === "doubao" ? await (0, desktop_launch_1.findWindowsExecutable)("Doubao.exe", configured) : true;
+            : id === "doubao" ? await (0, desktop_launch_1.findWindowsExecutable)("Doubao.exe", configured)
+                : id === "dsh" ? await (0, desktop_launch_1.findWindowsExecutable)("DeepSeek Harness.exe", configured) : true;
     if (!executable)
         return { available: false, reason: "未找到可执行文件" };
     return { available: status === "ready", reason: status === "ready" ? "" : "插件未就绪" };

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

@@ -273,6 +273,10 @@ class ControlServer {
                     await this.options.manager.reload(id);
                     return this.json(res, 200, { ok: true });
                 }
+                if (method === "POST" && parts[3] === "restart-desktop") {
+                    await this.options.manager.restartDesktop(id);
+                    return this.json(res, 200, { ok: true });
+                }
                 if (method === "POST" && parts[3] === "update") {
                     const body = await this.body(req);
                     return this.json(res, 200, { ok: true, plugin: await this.options.manager.upgradePackage(id, body.packageName, body.version) });

package/dist/src-ts/headless-account.patch.yml

@@ -1,4 +1,14 @@
 # 复用 DeepSeek Harness 桌面端登录账号的模型。
+# 新版 headless 默认禁用凭据及账号服务，桥接需要显式恢复才能复用桌面登录。
+- id: credentials
+  disabled: false
+
+- id: authorization
+  disabled: false
+
+- id: deepseek-account
+  disabled: false
+
 - id: agent-default-model
   config:
     provider: deepseek-account

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

@@ -21,6 +21,8 @@ const channel_sessions_1 = require("./channel-sessions");
 const session_management_1 = require("./session-management");
 const _2020_1 = __importDefault(require("ajv/dist/2020"));
 const attachments_1 = require("./attachments");
+const desktop_launch_1 = require("./plugins/desktop-launch");
+const workbuddy_1 = require("./plugins/workbuddy");
 const logger = { info() { }, warn() { }, error() { } };
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
 class PluginManager {
@@ -507,6 +509,20 @@ class PluginManager {
         await this.logs.flush();
     }
     async reload(id) { await this.stop(id, "reload"); await this.start(id); }
+    async restartDesktop(id) {
+        if (id !== "workbuddy")
+            throw new agent_1.AgentError(`不支持桌面重启：${id}`);
+        const config = await this.config(id);
+        if (config.transport !== "cdp")
+            throw new agent_1.AgentError("请先将 WorkBuddy 设置为 CDP 模式");
+        const executable = (0, workbuddy_1.findExecutable)(typeof config.executablePath === "string" ? config.executablePath : undefined);
+        if (!executable)
+            throw new agent_1.AgentError("未找到 WorkBuddy 桌面程序，无法重启");
+        await this.stop(id);
+        const processIds = await (0, desktop_launch_1.terminateWindowsDesktop)(executable);
+        this.log("info", "后台已清理 WorkBuddy 旧进程，将以 CDP 模式启动", { processIds, executable }, id);
+        await this.start(id);
+    }
     async uninstall(id) {
         const loaded = this.plugins.get(id);
         if (!loaded)

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

@@ -21,6 +21,8 @@ function validateManifest(value, baseDir) {
         throw new agent_1.AgentError("invalid plugin capabilities");
     if (m.type && !["agent", "channel", "management", "other"].includes(m.type))
         throw new agent_1.AgentError("invalid plugin type");
+    if (m.executionMode !== undefined && m.executionMode !== "cli" && m.executionMode !== "cdp")
+        throw new agent_1.AgentError("插件运行方式无效");
     const inferredType = m.capabilities.includes("channel") ? "channel" : m.capabilities.includes("chat") ? "agent" : m.capabilities.includes("management") ? "management" : "other";
     if (m.type && inferredType !== "other" && m.type !== inferredType)
         throw new agent_1.AgentError("插件类型与能力不匹配");
@@ -39,5 +41,5 @@ function validateManifest(value, baseDir) {
         if ((0, node_path_1.isAbsolute)(m.entry) || rel.startsWith(`..${node_path_1.sep}`) || rel === "..")
             throw new agent_1.AgentError("plugin entry path escapes plugin directory");
     }
-    return { id: m.id, version: m.version, displayName: m.displayName ?? m.id, type: m.type ?? inferredType, entry: m.entry, apiVersion: m.apiVersion, process: m.process ?? "in-process", capabilities: [...m.capabilities], configSchema: m.configSchema, routes: m.routes, ...(m.dependencies ? { dependencies: { ...m.dependencies } } : {}), ...(m.managementPage ? { managementPage: m.managementPage } : {}), ...(m.clientDownloadUrl ? { clientDownloadUrl: m.clientDownloadUrl } : {}) };
+    return { id: m.id, version: m.version, displayName: m.displayName ?? m.id, type: m.type ?? inferredType, entry: m.entry, apiVersion: m.apiVersion, process: m.process ?? "in-process", capabilities: [...m.capabilities], ...(m.executionMode ? { executionMode: m.executionMode } : {}), configSchema: m.configSchema, routes: m.routes, ...(m.dependencies ? { dependencies: { ...m.dependencies } } : {}), ...(m.managementPage ? { managementPage: m.managementPage } : {}), ...(m.clientDownloadUrl ? { clientDownloadUrl: m.clientDownloadUrl } : {}) };
 }

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

@@ -308,6 +308,8 @@
             const status = document.createElement("span");
             status.className = `status status-${plugin.status}`;
             status.textContent = plugin.status;
+            if (plugin.type === "agent")
+                type.textContent += ` · ${{ cli: "CLI", cdp: "CDP" }[plugin.manifest?.executionMode ?? ""] ?? "未声明"}`;
             const dependencies = Object.entries(plugin.manifest?.dependencies ?? {});
             if (dependencies.length) {
                 const detail = document.createElement("small");
@@ -340,6 +342,8 @@
             }
             const controls = document.createElement("td");
             controls.className = "controls";
+            if (plugin.manifest?.executionMode === "cli")
+                controls.append(button("配置", `配置 ${plugin.id}`, () => configureCli(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(); }));
@@ -367,6 +371,36 @@
             pluginsNode.append(row);
         }
     }
+    let configuringCli = "";
+    async function configureCli(plugin) {
+        const config = await request(`/api/plugins/${encodeURIComponent(plugin.id)}/config`);
+        configuringCli = plugin.id;
+        node("#cli-config-title").textContent = `${plugin.displayName} 配置`;
+        node("#cli-config-cwd").value = config.cwd ?? "";
+        node("#cli-config-executable").value = config.executablePath ?? "";
+        node("#cli-config-timeout").value = String(config.timeoutMs ?? 240000);
+        node("#cli-config-error").hidden = true;
+        node("#cli-config-dialog").showModal();
+    }
+    node("#cli-config-cancel").onclick = () => node("#cli-config-dialog").close();
+    node("#cli-config-form").onsubmit = event => {
+        event.preventDefault();
+        const save = node("#cli-config-save");
+        save.disabled = true;
+        void request(`/api/plugins/${encodeURIComponent(configuringCli)}/config`, "PATCH", {
+            cwd: node("#cli-config-cwd").value.trim(),
+            executablePath: node("#cli-config-executable").value.trim(),
+            timeoutMs: Number(node("#cli-config-timeout").value),
+        }).then(() => {
+            node("#cli-config-dialog").close();
+            showResult("CLI 配置已保存", "请启动插件，然后在 Channel 设置中关联 AID。", false);
+            return load(false);
+        }).catch(cause => {
+            const detail = node("#cli-config-error");
+            detail.textContent = String(cause);
+            detail.hidden = false;
+        }).finally(() => { save.disabled = false; });
+    };
     function renderMessages(messages) {
         messagesNode.replaceChildren();
         messagesEmpty.hidden = messages.length > 0;

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

@@ -21,6 +21,16 @@
     <div id="logs-panel" role="tabpanel" aria-labelledby="logs-tab" hidden><section><div class="section-heading"><h2>运行日志</h2><button id="logs-refresh" type="button">刷新日志</button></div><div class="table-scroll"><table><thead><tr><th>时间</th><th>级别</th><th>来源</th><th>消息</th><th>详细字段</th></tr></thead><tbody id="logs"></tbody></table></div><p id="logs-empty" class="muted" hidden>暂无运行日志</p><div class="section-heading"><button id="logs-prev" type="button">上一页</button><span id="logs-page" class="muted">第 1 页</span><button id="logs-next" type="button">下一页</button></div></section></div>
     <p id="error" class="error" role="alert" hidden></p>
   </main>
+  <dialog id="cli-config-dialog" aria-labelledby="cli-config-title">
+    <h2 id="cli-config-title">CLI 配置</h2><p class="muted">沿用后台运行用户的 CLI 登录、默认模型及权限。AID 请在 Channel 设置关联。</p>
+    <form id="cli-config-form">
+      <label for="cli-config-cwd">工作目录（必填，绝对路径）</label><input id="cli-config-cwd" required placeholder="C:\Users\用户名\projects\demo">
+      <label for="cli-config-executable">CLI 程序路径（可选，留空使用 PATH）</label><input id="cli-config-executable" placeholder="例如 C:\Users\用户名\AppData\Roaming\npm\codex.cmd">
+      <label for="cli-config-timeout">任务超时（毫秒）</label><input id="cli-config-timeout" type="number" min="1" max="2147483647" required value="240000">
+      <p id="cli-config-error" class="error" role="alert" hidden></p>
+      <div><button id="cli-config-save" type="submit">保存配置</button><button id="cli-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

@@ -60,3 +60,6 @@ th:nth-child(1) { width: 145px; } th:nth-child(2) { width: 100px; } th:nth-child
 #operation-result { width: min(520px, calc(100% - 32px)); border: 1px solid #bfc9c5; border-radius: 8px; padding: 24px; }
 #operation-result::backdrop { background: rgb(0 0 0 / 35%); }
 #operation-result-message { white-space: pre-wrap; overflow-wrap: anywhere; margin: 16px 0; }
+
+#cli-config-form { display: grid; min-width: min(70vw, 480px); }
+#cli-config-form input { width: 100%; }

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

@@ -214,7 +214,7 @@ class AunPlugin {
             if (typeof aid === "string" && aidPattern.test(aid))
                 this.createdAids.add(aid);
         }
-        for (const key of ["aid", "owner_aid", "aun_path", "encryption_seed", "root_ca_path", "allow_from", "agent_plugin"]) {
+        for (const key of ["aid", "owner_aid", "aun_path", "encryption_seed", "root_ca_path", "allow_from"]) {
             if (this.config[key] !== undefined && typeof this.config[key] !== "string")
                 throw new Error(`${key} 必须是字符串`);
         }
@@ -419,12 +419,12 @@ class AunPlugin {
                     throw new Error("请求内容过大");
             }
             const body = JSON.parse(raw || "{}");
-            for (const key of ["agent_plugin", "allow_from", "aun_path"])
+            for (const key of ["allow_from", "aun_path"])
                 if (typeof body[key] !== "string")
                     return this.json(response, 400, { error: `${key} 必须是字符串` });
             if (body.encryption_seed !== undefined && typeof body.encryption_seed !== "string")
                 return this.json(response, 400, { error: "encryption_seed 必须是字符串" });
-            this.config = { ...this.config, agent_plugin: body.agent_plugin, allow_from: body.allow_from, aun_path: body.aun_path, ...(body.encryption_seed ? { encryption_seed: body.encryption_seed } : {}) };
+            this.config = { ...this.config, allow_from: body.allow_from, aun_path: body.aun_path, ...(body.encryption_seed ? { encryption_seed: body.encryption_seed } : {}) };
             await this.persist();
             this.context?.logger.info("AUN 通道配置已保存");
             this.json(response, 200, { ok: true });
@@ -741,7 +741,7 @@ class AunPlugin {
         }
     };
     async onMessage(payload, aid) {
-        if (!this.acceptingMessages)
+        if (!this.acceptingMessages || !this.bindings[aid])
             return;
         const message = (0, messages_1.normalizeAunMessage)(payload, aid, typeof this.config.allow_from === "string" ? this.config.allow_from : undefined);
         if (!message || !this.seen.add(message.messageId ? `${aid}:${message.messageId}` : ""))
@@ -793,7 +793,7 @@ class AunPlugin {
         const channelMessage = {
             channel: "aun", recipientId: aid, peerId: message.peerId, messageId: message.messageId, text: message.text, threadId: message.threadId,
             ...(attachments.length ? { attachments } : {}),
-            agentPlugin: this.bindings[aid] || (typeof this.config.agent_plugin === "string" && this.config.agent_plugin.trim() ? this.config.agent_plugin.trim() : "qwenwork"),
+            agentPlugin: this.bindings[aid],
             reply: async (text) => {
                 if (!text.trim())
                     return;

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

@@ -29,10 +29,7 @@
       agents = (plugins.plugins || []).filter((plugin) => plugin.type === "agent");
       if (refreshForm) createForm.elements.ownerAid.value = config.owner_aid || "";
       await Promise.all(agents.map(async (agent) => { agent.configAid = (await request(`/api/plugins/${encodeURIComponent(agent.id)}/config`)).aid || ""; }));
-      const target = configForm.elements.agent_plugin;
       if (refreshForm) {
-        target.replaceChildren(new Option("默认 Agent", ""), ...agents.map((agent) => new Option(agent.displayName || agent.id, agent.id)));
-        target.value = config.agent_plugin || "";
         for (const key of ["allow_from", "aun_path"]) configForm.elements[key].value = config[key] || "";
         configForm.elements.encryption_seed.value = "";
       }
@@ -76,7 +73,7 @@
       return load();
     }).catch((error) => notify("创建 AID 失败", errorMessage(error), true));
   };
-  configForm.onsubmit = (event) => { event.preventDefault(); const changes = { agent_plugin: configForm.elements.agent_plugin.value, allow_from: configForm.elements.allow_from.value, aun_path: configForm.elements.aun_path.value };
+  configForm.onsubmit = (event) => { event.preventDefault(); const changes = { allow_from: configForm.elements.allow_from.value, aun_path: configForm.elements.aun_path.value };
     if (configForm.elements.encryption_seed.value) changes.encryption_seed = configForm.elements.encryption_seed.value;
     void request("/api/plugins/aun/settings", "POST", changes).then(() => request("/api/plugins/aun/reload", "POST")).then(() => load()).then(() => notify("保存成功", "配置已保存")).catch((error) => notify("保存配置失败", errorMessage(error), true));
   };

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

@@ -7,7 +7,7 @@
     <p id="status" role="status"></p>
     <div class="table-scroll"><table><thead><tr><th>AID</th><th>来源</th><th>已关联 Agent</th><th>操作</th></tr></thead><tbody id="identities"></tbody></table></div>
     <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="例如：example.agentid.cn"></label><label>Owner AID<input name="ownerAid" placeholder="例如：owner.agentid.cn"><small class="hint">留空时使用已配置的默认 Owner；未配置时需填写。Owner 保存为本地归属配置；不代表 AUN 协议中的 Owner 关系已激活。</small></label></div><button type="submit">创建</button></form>
-    <form id="config-form"><h2>通道配置</h2><div class="fields"><label>默认 Agent<select name="agent_plugin"></select></label><label>允许的来源<input name="allow_from"></label><label>AUN 存储路径<input name="aun_path"></label><label>加密种子<input name="encryption_seed" type="password" autocomplete="new-password" placeholder="留空则不修改"></label></div><button type="submit">保存配置</button></form>
+    <form id="config-form"><h2>通道配置</h2><div class="fields"><label>允许的来源<input name="allow_from"></label><label>AUN 存储路径<input name="aun_path"></label><label>加密种子<input name="encryption_seed" type="password" autocomplete="new-password" placeholder="留空则不修改"></label></div><button type="submit">保存配置</button></form>
   </main>
   <script src="/abweb/channels/aun/app.js"></script>
 </body>

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

@@ -4,6 +4,9 @@ exports.ChatgptCdpClient = exports.ChatgptPlugin = exports.chatgptManifest = voi
 const node_crypto_1 = require("node:crypto");
 const cdp_client_1 = require("./cdp-client");
 const session_store_1 = require("./session-store");
+const desktop_launch_1 = require("../desktop-launch");
+const node_path_1 = require("node:path");
+const node_os_1 = require("node:os");
 exports.chatgptManifest = {
     id: "chatgpt",
     version: "1.0.10",
@@ -35,6 +38,8 @@ class ChatgptPlugin {
     historyScope = "";
     historyGeneration = 0;
     historyProvider;
+    ownedProcess;
+    reconnect;
     constructor(options = {}) {
         this.options = options;
     }
@@ -87,21 +92,52 @@ class ChatgptPlugin {
             timeoutMs: typeof config.timeoutMs === "number" && config.timeoutMs > 0 ? config.timeoutMs : 30_000,
             ssh,
         });
+        const desktopExecutable = !ssh && config.autoStart !== false && !this.options.client && process.platform === "win32"
+            ? await (0, desktop_launch_1.findChatgptExecutable)(typeof config.executablePath === "string" ? config.executablePath : undefined)
+            : undefined;
+        const desktopProfile = (0, node_path_1.join)(context.dataDir ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".agent-bridge", "chatgpt"), "desktop-profile");
+        const desktopArgs = [`--remote-debugging-port=${port(config.localCdpPort, 9230)}`];
+        const startupTimeoutMs = typeof config.startupTimeoutMs === "number" ? config.startupTimeoutMs : 30_000;
+        this.reconnect = async () => {
+            try {
+                await this.client.connect();
+                return;
+            }
+            catch (first) {
+                if (!desktopExecutable)
+                    throw first;
+                await (0, desktop_launch_1.restartOwnedAndWait)(this.ownedProcess, desktopExecutable, desktopArgs, desktopProfile, () => this.client.connect(), startupTimeoutMs, child => { this.ownedProcess = child; });
+            }
+        };
         this.sessionOperations = this.client.createSession ? ["new"] : [];
         try {
             await this.client.connect();
         }
         catch (error) {
-            this.failure = error instanceof Error ? error.message : String(error);
+            let connectionError = error;
+            if (desktopExecutable) {
+                try {
+                    await (0, desktop_launch_1.launchManagedAndWait)(desktopExecutable, desktopArgs, desktopProfile, () => this.client.connect(), startupTimeoutMs, child => { this.ownedProcess = child; });
+                    this.failure = undefined;
+                    return;
+                }
+                catch (launchError) {
+                    connectionError = launchError;
+                }
+            }
+            this.failure = connectionError instanceof Error ? connectionError.message : String(connectionError);
             context.logger.warn(this.failure);
             if (!this.store.sessions.length)
-                throw error;
+                throw connectionError;
         }
     }
     async deactivate() {
         await this.queue;
         await this.store?.drain();
         this.client?.close();
+        await (0, desktop_launch_1.terminateOwnedProcess)(this.ownedProcess).catch(() => undefined);
+        this.ownedProcess = undefined;
+        this.reconnect = undefined;
         this.client = undefined;
         this.remote = false;
     }
@@ -246,7 +282,7 @@ class ChatgptPlugin {
     }
     async synchronize() {
         if (!this.client.connected())
-            await this.client.connect();
+            await (this.reconnect?.() ?? this.client.connect());
         if (!this.client.listSessions)
             throw new Error("当前 ChatGPT 客户端不支持会话列表");
         this.store.synchronize(await this.client.listSessions());
@@ -254,7 +290,7 @@ class ChatgptPlugin {
     }
     async select(session) {
         if (!this.client.connected())
-            await this.client.connect();
+            await (this.reconnect?.() ?? this.client.connect());
         if (!this.client.switchSession)
             throw new Error("当前 ChatGPT 客户端不支持会话切换");
         const active = await this.client.activeSession?.();
@@ -321,7 +357,7 @@ class ChatgptPlugin {
             await this.select(selected);
         }
         if (!this.client.connected())
-            await this.client.connect();
+            await (this.reconnect?.() ?? this.client.connect());
         selected ??= await this.client.activeSession?.();
         const message = explicit?.[2]?.trim() || request.task;
         const reply = await this.client.direct(message, request.timeoutMs, request.attachments);

package/dist/src-ts/plugins/claude-cli/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClaudeCliPlugin = exports.manifest = void 0;
+const agent_1 = require("../local-cli/agent");
+exports.manifest = {
+    id: "claude-cli", version: "1.0.0", displayName: "Claude Code CLI", type: "agent", executionMode: "cli",
+    entry: "dist/src-ts/plugins/claude-cli/index.js", apiVersion: "1", process: "in-process",
+    capabilities: ["chat", "health"], configSchema: "config.schema.json",
+};
+class ClaudeCliPlugin extends agent_1.LocalCliAgent {
+    constructor() { super(exports.manifest, "claude"); }
+}
+exports.ClaudeCliPlugin = ClaudeCliPlugin;
+exports.default = ClaudeCliPlugin;

package/dist/src-ts/plugins/codex-cli/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CodexCliPlugin = exports.manifest = void 0;
+const agent_1 = require("../local-cli/agent");
+exports.manifest = {
+    id: "codex-cli", version: "1.0.0", displayName: "Codex CLI", type: "agent", executionMode: "cli",
+    entry: "dist/src-ts/plugins/codex-cli/index.js", apiVersion: "1", process: "in-process",
+    capabilities: ["chat", "health"], configSchema: "config.schema.json",
+};
+class CodexCliPlugin extends agent_1.LocalCliAgent {
+    constructor() { super(exports.manifest, "codex"); }
+}
+exports.CodexCliPlugin = CodexCliPlugin;
+exports.default = CodexCliPlugin;

package/dist/src-ts/plugins/desktop-launch.js

@@ -3,10 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findWindowsExecutable = findWindowsExecutable;
 exports.findExecutableInTree = findExecutableInTree;
 exports.launchAndWait = launchAndWait;
+exports.launchManagedAndWait = launchManagedAndWait;
+exports.restartOwnedAndWait = restartOwnedAndWait;
+exports.terminateWindowsDesktop = terminateWindowsDesktop;
+exports.terminateOwnedProcess = terminateOwnedProcess;
+exports.findChatgptExecutable = findChatgptExecutable;
 exports.waitFor = waitFor;
+const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
+const node_util_1 = require("node:util");
+const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
 const versionDirectory = /^(?:app[-_ ]?)?v?\d+(?:[.-]\d+)+$/i;
 /** 在 Windows 常见安装目录中查找桌面程序，避免依赖单一盘符。 */
 async function findWindowsExecutable(fileName, configured) {
@@ -31,8 +39,11 @@ async function findWindowsExecutable(fileName, configured) {
     }
     if (process.platform !== "win32")
         return undefined;
-    const pattern = /doubao|豆包|qwen|qwwork|千问/i;
+    const pattern = /doubao|豆包|qwen|qwwork|千问|deepseek|harness|dsh/i;
     const roots = [...new Set([
+            process.env.DSH_INSTALL_DIR,
+            "D:\\Programs\\DeepSeek Harness",
+            "D:\\DSH",
             process.env.LOCALAPPDATA && (0, node_path_1.join)(process.env.LOCALAPPDATA, "Programs"),
             process.env.ProgramFiles,
             process.env["ProgramFiles(x86)"],
@@ -83,6 +94,87 @@ async function launchAndWait(executable, args, connect, timeoutMs, launch = (fil
     child.unref();
     return waitFor(connect, timeoutMs, 250);
 }
+async function launchManagedAndWait(executable, args, profileDirectory, connect, timeoutMs, onProcess, launch = (file, argv) => (0, node_child_process_1.spawn)(file, argv, { detached: true, stdio: "ignore", windowsHide: false })) {
+    if (profileDirectory)
+        await (0, promises_1.mkdir)(profileDirectory, { recursive: true });
+    const child = launch(executable, profileDirectory ? [...args, `--user-data-dir=${profileDirectory}`] : args);
+    child.unref();
+    onProcess(child);
+    try {
+        return await waitFor(connect, timeoutMs, 250);
+    }
+    catch (error) {
+        await terminateOwnedProcess(child).catch(() => undefined);
+        onProcess(undefined);
+        throw error;
+    }
+}
+async function restartOwnedAndWait(child, executable, args, profileDirectory, connect, timeoutMs, onProcess) {
+    await terminateOwnedProcess(child);
+    onProcess(undefined);
+    return launchManagedAndWait(executable, args, profileDirectory, connect, timeoutMs, onProcess);
+}
+/** 仅在用户确认重启后清理同一用户、同一安装路径的桌面进程。 */
+async function terminateWindowsDesktop(executable) {
+    if (process.platform !== "win32")
+        return [];
+    const script = `
+$ErrorActionPreference = 'Stop'
+$target = '${(0, node_path_1.resolve)(executable).replace(/'/g, "''")}'
+$sid = [Security.Principal.WindowsIdentity]::GetCurrent().User.Value
+$processes = @(Get-CimInstance Win32_Process | Where-Object { $_.ExecutablePath -ieq $target } | Where-Object { (Invoke-CimMethod -InputObject $_ -MethodName GetOwnerSid).Sid -eq $sid })
+$ids = @($processes.ProcessId)
+$roots = @($processes | Where-Object { $ids -notcontains $_.ParentProcessId })
+foreach ($item in $roots) {
+  $current = Get-CimInstance Win32_Process -Filter "ProcessId=$($item.ProcessId)"
+  if (-not $current -or $current.CreationDate -ne $item.CreationDate) { continue }
+  & taskkill.exe /PID $item.ProcessId /T /F | Out-Null
+  if ($LASTEXITCODE -ne 0 -and (Get-Process -Id $item.ProcessId -ErrorAction SilentlyContinue)) { throw "无法结束桌面进程 $($item.ProcessId)" }
+  $remaining = Get-Process -Id $item.ProcessId -ErrorAction SilentlyContinue
+  if ($remaining -and -not $remaining.WaitForExit(10000)) { throw "等待桌面进程退出超时 $($item.ProcessId)" }
+}
+ConvertTo-Json -Compress -InputObject @($roots | ForEach-Object { [int]$_.ProcessId })
+`;
+    const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { timeout: 30_000, windowsHide: true });
+    return JSON.parse(stdout.trim());
+}
+async function terminateOwnedProcess(child, platform = process.platform, run = async (file, args) => execFileAsync(file, args, { timeout: 10_000 })) {
+    const pid = child?.pid;
+    if (!Number.isSafeInteger(pid) || !pid || child?.exitCode !== null && child?.exitCode !== undefined || child?.signalCode)
+        return;
+    if (platform === "win32") {
+        try {
+            await run("taskkill.exe", ["/PID", String(pid), "/T", "/F"]);
+        }
+        catch (error) {
+            if (!child.exitCode && !child.signalCode && error.code !== "ESRCH")
+                throw error;
+        }
+    }
+    else {
+        try {
+            process.kill(pid, "SIGTERM");
+        }
+        catch (error) {
+            if (error.code !== "ESRCH")
+                throw error;
+        }
+    }
+}
+async function findChatgptExecutable(configured) {
+    if (configured?.trim() && (0, node_fs_1.existsSync)((0, node_path_1.resolve)(configured)))
+        return (0, node_path_1.resolve)(configured);
+    if (process.platform !== "win32")
+        return undefined;
+    const script = "$candidates = foreach ($package in (Get-AppxPackage | Where-Object { $_.Name -like 'OpenAI.Codex*' })) { $appDir = Join-Path $package.InstallLocation 'app'; $path = Join-Path $appDir 'ChatGPT.exe'; if (-not (Test-Path -LiteralPath $path)) { $path = Get-ChildItem -LiteralPath $appDir -Filter 'ChatGPT*.exe' -File -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName }; if ($path) { [pscustomobject]@{ Version = [version]$package.Version; Executable = $path } } }; $candidate = $candidates | Sort-Object Version -Descending | Select-Object -First 1; if ($candidate) { $candidate.Executable }";
+    try {
+        const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], { timeout: 10_000 });
+        return stdout.trim().split(/\r?\n/).at(-1)?.trim() || undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 async function waitFor(action, timeoutMs, intervalMs = 500) {
     const deadline = Date.now() + timeoutMs;
     let last;
@@ -97,4 +189,3 @@ async function waitFor(action, timeoutMs, intervalMs = 500) {
     }
     throw last instanceof Error ? last : new Error("桌面程序启动超时");
 }
-const node_child_process_1 = require("node:child_process");

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

@@ -7,6 +7,7 @@ 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");
+const node_os_1 = require("node:os");
 exports.doubaoManifest = {
     id: "doubao",
     version: "1.0.20",
@@ -35,6 +36,7 @@ class DoubaoPlugin {
     }
     disposer;
     reconnect;
+    ownedProcess;
     async activate(context) {
         this.dataDir = context.dataDir;
         this.bindings.clear();
@@ -68,20 +70,18 @@ class DoubaoPlugin {
             }
             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)}`);
-                        }
+                    if (!executable)
+                        throw new Error("未找到 Doubao.exe，请配置 executablePath");
+                    const port = (0, plugin_1.resolveRuntimePort)(context.config, context.runtime, "doubao", "DOUBAO_CDP_PORT", 9227);
+                    context.logger?.warn?.(`正在恢复豆包：${executable}，等待 CDP ${port}`);
+                    try {
+                        await (0, desktop_launch_1.restartOwnedAndWait)(this.ownedProcess, executable, [`--remote-debugging-port=${port}`], (0, node_path_1.join)(this.dataDir ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".agent-bridge", "doubao"), "desktop-profile"), () => this.client.connect(), typeof context.config.startupTimeoutMs === "number" ? context.config.startupTimeoutMs : 30_000, child => { this.ownedProcess = child; });
+                        return;
+                    }
+                    catch (error) {
+                        first = new Error(`已启动豆包，但 CDP ${port} 未就绪：${error instanceof Error ? error.message : String(error)}`);
                     }
-                    else
-                        first = new Error("未找到 Doubao.exe，请配置 executablePath");
                 }
                 throw first;
             }
@@ -106,6 +106,8 @@ class DoubaoPlugin {
         this.disposer = undefined;
         this.reconnect = undefined;
         await this.client?.close();
+        await (0, desktop_launch_1.terminateOwnedProcess)(this.ownedProcess).catch(() => undefined);
+        this.ownedProcess = undefined;
         this.client = undefined;
         this.state = "stopped";
     }