mu-agent-bridge 1.0.41 → 1.0.42

package/dist/tests-ts/installer-assets.test.js

@@ -13,18 +13,27 @@ const node_util_1 = require("node:util");
     strict_1.default.match(stdout, /验证通过/);
 });
 (0, node_test_1.default)("Windows 安装包包括中文向导、四类 Agent 和 per-user 卸载定义", async () => {
-    const [wxs, setup, launcher, build, qwenPlugin, workbuddyPlugin] = await Promise.all([
+    const [wxs, setup, launcher, build, uninstall, qwenPlugin, workbuddyPlugin] = await Promise.all([
         (0, promises_1.readFile)("installer/Product.wxs", "utf8"),
         (0, promises_1.readFile)("installer/setup.ps1", "utf8"),
-        (0, promises_1.readFile)("installer/launch.cmd", "utf8"),
+        (0, promises_1.readFile)("installer/launch.vbs", "utf8"),
         (0, promises_1.readFile)("scripts/build-installer.ps1", "utf8"),
+        (0, promises_1.readFile)("installer/uninstall.ps1", "utf8"),
         (0, promises_1.readFile)("plugins/qwenwork/plugin.json", "utf8"),
         (0, promises_1.readFile)("plugins/workbuddy/plugin.json", "utf8"),
     ]);
     strict_1.default.match(wxs, /Scope="perUser"/);
     strict_1.default.match(wxs, /On="uninstall"/);
     strict_1.default.match(wxs, /LaunchWizard/);
+    strict_1.default.match(wxs, /launch\.vbs/);
+    strict_1.default.match(wxs, /Source="\$\(var\.SourceDir\)\\uninstall\.ps1"/);
+    strict_1.default.match(wxs, /<CustomAction Id="CleanupBridge"[^>]*Execute="deferred"[^>]*Return="ignore"/);
+    strict_1.default.match(wxs, /<Custom Action="CleanupBridge" Before="RemoveFiles" Condition="REMOVE=&quot;ALL&quot;"/);
+    strict_1.default.match(uninstall, /api\/plugins/);
+    strict_1.default.match(uninstall, /Stop-Process/);
+    strict_1.default.match(uninstall, /node_modules.*mu-agent-bridge/);
     strict_1.default.match(launcher, /setup\.ps1/);
+    strict_1.default.match(launcher, /WindowStyle Hidden/);
     strict_1.default.match(build, /ProductVersion=\$installerVersion/);
     strict_1.default.match(build, /\$packageVersion\.Build \+ 1/);
     strict_1.default.match(setup, /22\.16\.0/);
@@ -38,7 +47,13 @@ const node_util_1 = require("node:util");
     strict_1.default.doesNotMatch(setup, /mu-agent-bridge@\d+\.\d+\.\d+/);
     strict_1.default.match(setup, /api\/agents\/availability/);
     strict_1.default.match(setup, /function Find-AgentExecutable/);
-    strict_1.default.match(setup, /Get-ChildItem -LiteralPath \$root -Filter \$app\.File -File -Recurse/);
+    strict_1.default.match(setup, /CheckedListBox/);
+    strict_1.default.match(setup, /DataGridViewComboBoxColumn/);
+    strict_1.default.match(setup, /\[void\]\$grid\.EndEdit\(\)/);
+    strict_1.default.match(setup, /\$grid\.Rows\.Add\(\$true, \$aid, \$null\)/);
+    strict_1.default.match(setup, /显示详细信息/);
+    strict_1.default.match(setup, /环境与桥接服务/);
+    strict_1.default.match(setup, /Get-ChildItem -LiteralPath \$root -Filter \$fileName -File -Recurse/);
     strict_1.default.match(setup, /api\/plugins\/\$agent\/config/);
     strict_1.default.match(setup, /TopMost = \$true/);
     strict_1.default.match(setup, /BringToFront\(\)/);
@@ -58,6 +73,10 @@ const node_util_1 = require("node:util");
     strict_1.default.equal(condition[1], "NOT REMOVE AND NOT UPGRADINGPRODUCTCODE");
     strict_1.default.match(wxs, /<InstallUISequence>\s*<Custom Action="LaunchWizard" After="ExecuteAction"/);
 });
+(0, node_test_1.default)("Windows 卸载时先停止插件再结束 mab 后台", { skip: process.platform !== "win32" }, async () => {
+    const { stdout } = await (0, node_util_1.promisify)(node_child_process_1.execFile)("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "tests/windows-uninstall.test.ps1"]);
+    strict_1.default.match(stdout, /卸载清理验证通过/);
+});
 (0, node_test_1.default)("向导后台启动服务并提供缺失客户端的下载和重试入口", async () => {
     const setup = await (0, promises_1.readFile)("installer/setup.ps1", "utf8");
     strict_1.default.doesNotMatch(setup, /& mab\.cmd start/);
@@ -72,17 +91,17 @@ const node_util_1 = require("node:util");
     const setup = await (0, promises_1.readFile)("installer/setup.ps1", "utf8");
     const selectAid = setup.indexOf("$aid = Resolve-SetupAid");
     const detect = setup.indexOf("$agents = Invoke-RestMethod");
-    const bind = setup.indexOf("Invoke-AunCommand @('bind'");
+    const bind = setup.indexOf("Invoke-GuiBindingPlan @(");
     strict_1.default.ok(detect > 0 && detect < selectAid && selectAid < bind);
     strict_1.default.match(setup, /新 AID（示例：workbuddy11\.agentid\.cn）/);
     strict_1.default.match(setup, /Owner AID（示例：lihui7\.agentid\.cn）/);
     strict_1.default.match(setup, /\$readyAgents.Count -lt 4/);
-    strict_1.default.match(setup, /\$InstalledIds -notcontains \$_.Id/);
+    strict_1.default.match(setup, /\$InstalledIds -contains \$_.Id/);
     strict_1.default.match(setup, /尚未就绪/);
     strict_1.default.match(setup, /AID 关联失败/);
     strict_1.default.match(setup, /setup\.log/);
     strict_1.default.match(setup, /Write-SetupLog/);
-    strict_1.default.match(setup, /WorkBuddy 正在运行但未开启 CDP/);
+    strict_1.default.match(setup, /包括已有 CDP 进程/);
     strict_1.default.match(setup, /taskkill\.exe \/PID/);
     strict_1.default.match(setup, /function Stop-BridgeDaemons/);
     strict_1.default.match(setup, /api\/plugins\/aun\/commands/);
@@ -91,9 +110,13 @@ const node_util_1 = require("node:util");
     strict_1.default.match(setup, /确认改为 \$agent？输入 YES 继续\"\)\.Trim\(\) -ne 'YES'/);
     strict_1.default.doesNotMatch(setup, /-cne 'YES'/);
     strict_1.default.match(setup, /qwenwork\.cn\/download/);
-    strict_1.default.match(setup, /检测到本机已有 AID/);
+    strict_1.default.match(setup, /选择本机已有 AID/);
     strict_1.default.match(setup, /IdentityConflictError/);
     strict_1.default.match(setup, /返回 AID 输入步骤/);
+    strict_1.default.match(setup, /MessageBox\]::Show\(\$script:WizardForm, \$message, 'AID 已注册'/);
     strict_1.default.match(setup, /transport = 'cdp'/);
     strict_1.default.match(setup, /workbuddy\/stop/);
+    strict_1.default.match(setup, /workbuddy\/restart-desktop/);
+    const prepare = setup.slice(setup.indexOf('function Initialize-WorkbuddyCdp'), setup.indexOf('function Invoke-GuiBindingPlan'));
+    strict_1.default.doesNotMatch(prepare, /taskkill|Stop-Process|cdpReady/);
 });

package/dist/tests-ts/plugin-manager.test.js

@@ -45,6 +45,24 @@ const node_http_1 = require("node:http");
 const plugin_manager_1 = require("../src-ts/plugin-manager");
 const version_manager_1 = require("../src-ts/version-manager");
 const channel_sessions_1 = require("../src-ts/channel-sessions");
+(0, node_test_1.default)("后台桌面重启先停止插件再启动，拒绝无关插件", { skip: process.platform === "win32" }, async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-desktop-restart-"));
+    const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state") });
+    const calls = [];
+    manager.config = async () => ({ transport: "cdp", executablePath: (0, node_path_1.join)(root, "WorkBuddyAI.exe") });
+    manager.stop = async (id) => { calls.push(`stop:${id}`); };
+    manager.start = async (id) => { calls.push(`start:${id}`); };
+    try {
+        await (0, promises_1.writeFile)((0, node_path_1.join)(root, "WorkBuddyAI.exe"), "");
+        await manager.restartDesktop("workbuddy");
+        strict_1.default.deepEqual(calls, ["stop:workbuddy", "start:workbuddy"]);
+        await strict_1.default.rejects(() => manager.restartDesktop("other"), /不支持桌面重启/);
+        strict_1.default.equal(calls.length, 2);
+    }
+    finally {
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("插件重载同时刷新内部依赖，其他插件的缓存保持不变", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-reload-dependency-"));
     const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state") });

package/dist/tests-ts/workbuddy-plugin.test.js

@@ -8,6 +8,13 @@ const promises_1 = require("node:fs/promises");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_test_1 = __importDefault(require("node:test"));
+(0, node_test_1.default)("WorkBuddy 登录页阻止新建验证任务并提示先登录", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    let calls = 0;
+    client.evaluate = async () => { calls++; return { loginRequired: true }; };
+    await strict_1.default.rejects(() => client.createTask(), /尚未登录.*桌面端登录/);
+    strict_1.default.equal(calls, 1);
+});
 const node_vm_1 = require("node:vm");
 const workbuddy_1 = require("../src-ts/plugins/workbuddy");
 const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-agent-bridge",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

package/plugins/chatgpt/config.schema.json

@@ -1 +1 @@
-{"type":"object","properties":{"sshHost":{"type":"string","description":"Windows 主机地址"},"sshUser":{"type":"string","description":"SSH 用户名"},"sshPort":{"type":"integer","minimum":1,"maximum":65535,"default":22},"sshKeyPath":{"type":"string","description":"SSH 私钥路径"},"remoteCdpPort":{"type":"integer","minimum":1,"maximum":65535,"default":9230},"localCdpPort":{"type":"integer","minimum":1,"maximum":65535,"default":9230},"timeoutMs":{"type":"integer","minimum":1,"default":30000}},"additionalProperties":false}
+{"type":"object","properties":{"sshHost":{"type":"string","description":"Windows 主机地址"},"sshUser":{"type":"string","description":"SSH 用户名"},"sshPort":{"type":"integer","minimum":1,"maximum":65535,"default":22},"sshKeyPath":{"type":"string","description":"SSH 私钥路径"},"remoteCdpPort":{"type":"integer","minimum":1,"maximum":65535,"default":9230},"localCdpPort":{"type":"integer","minimum":1,"maximum":65535,"default":9230},"executablePath":{"type":"string","description":"ChatGPT.exe 路径，省略时自动查找 Windows Store 安装版本"},"autoStart":{"type":"boolean","default":true,"description":"本机 CDP 未连接时自动启动 ChatGPT；配置 SSH 时不在 bridge 主机启动"},"startupTimeoutMs":{"type":"integer","minimum":1000,"default":30000},"timeoutMs":{"type":"integer","minimum":1,"default":30000}},"additionalProperties":false}

package/plugins/chatgpt/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/plugins/chatgpt/dist/src-ts/plugins/desktop-launch.js

@@ -0,0 +1,191 @@
+"use strict";
+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) {
+    if (configured?.trim()) {
+        const configuredPath = (0, node_path_1.resolve)(configured);
+        if (fileName.toLowerCase() === "doubao.exe") {
+            let root = (0, node_path_1.dirname)(configuredPath);
+            while (/^app$/i.test((0, node_path_1.basename)(root)) || versionDirectory.test((0, node_path_1.basename)(root)))
+                root = (0, node_path_1.dirname)(root);
+            const latest = await findExecutableInTree(root, fileName, /^/, 3);
+            if (latest)
+                return latest;
+        }
+        // 千问升级会保留或删除旧版本目录，从同一安装位置重新定位新版。
+        if (fileName.toLowerCase() === "qwenworkcn.exe" && /^v?\d+(?:[.-]\d+)+$/i.test((0, node_path_1.basename)((0, node_path_1.dirname)(configuredPath)))) {
+            const latest = await findExecutableInTree((0, node_path_1.dirname)((0, node_path_1.dirname)(configuredPath)), fileName, /^/, 1);
+            if (latest)
+                return latest;
+        }
+        if ((0, node_fs_1.existsSync)(configuredPath))
+            return configuredPath;
+    }
+    if (process.platform !== "win32")
+        return undefined;
+    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)"],
+            ...Array.from({ length: 24 }, (_, index) => `${String.fromCharCode(67 + index)}:\\`),
+        ].filter((value) => typeof value === "string" && (0, node_fs_1.existsSync)(value)))];
+    for (const root of roots) {
+        const found = await findExecutableInTree(root, fileName, pattern, 6);
+        if (found)
+            return found;
+    }
+    return undefined;
+}
+async function findExecutableInTree(directory, fileName, pattern, depth) {
+    return search(directory, fileName, pattern, depth, pattern.test(directory));
+}
+async function search(directory, fileName, pattern, depth, insideProduct) {
+    try {
+        const entries = await (0, promises_1.readdir)(directory, { withFileTypes: true });
+        // 豆包上层文件是启动器，优先查找新版目录或 app 中的实际程序。
+        if (insideProduct && depth > 0 && fileName.toLowerCase() === "doubao.exe") {
+            const versions = entries.filter(entry => entry.isDirectory() && (versionDirectory.test(entry.name) || /^app$/i.test(entry.name)));
+            versions.sort((left, right) => right.name.replace(/^\D+/, "").localeCompare(left.name.replace(/^\D+/, ""), "en", { numeric: true }));
+            for (const entry of versions) {
+                const found = await search((0, node_path_1.join)(directory, entry.name), fileName, pattern, depth - 1, true);
+                if (found)
+                    return found;
+            }
+        }
+        for (const entry of entries)
+            if (entry.isFile() && insideProduct && entry.name.toLowerCase() === fileName.toLowerCase())
+                return (0, node_path_1.join)(directory, entry.name);
+        if (depth <= 0)
+            return undefined;
+        // 按数字比较版本目录，避免 1.2.5 排在 1.2.10 之前。
+        entries.sort((left, right) => right.name.localeCompare(left.name, "en", { numeric: true }));
+        for (const entry of entries)
+            if (entry.isDirectory() && !entry.name.startsWith(".") && (insideProduct || pattern.test(entry.name) || /^(?:Program Files(?: \(x86\))?|Programs)$/i.test(entry.name))) {
+                const found = await search((0, node_path_1.join)(directory, entry.name), fileName, pattern, depth - 1, insideProduct || pattern.test(entry.name));
+                if (found)
+                    return found;
+            }
+    }
+    catch { /* 无权限或目录在扫描期间消失时继续查找 */ }
+    return undefined;
+}
+async function launchAndWait(executable, args, connect, timeoutMs, launch = (file, argv) => (0, node_child_process_1.spawn)(file, argv, { detached: true, stdio: "ignore", windowsHide: false })) {
+    const child = launch(executable, args);
+    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;
+    while (Date.now() < deadline) {
+        try {
+            return await action();
+        }
+        catch (error) {
+            last = error;
+            await new Promise((resolve) => setTimeout(resolve, intervalMs));
+        }
+    }
+    throw last instanceof Error ? last : new Error("桌面程序启动超时");
+}

package/plugins/doubao/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/plugins/doubao/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";
     }