mu-agent-bridge 1.0.41 → 1.0.42

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

package/dist/src-ts/plugins/workbuddy/cdp-client.js

@@ -91,7 +91,9 @@ class WorkbuddyCdpClient {
         pending.reject(new Error("WorkBuddy CDP 已关闭")); this.pending.clear(); }
     async createTask() {
         const snapshot = `(() => { const selected = [...document.querySelectorAll('[data-conversation-id]')].find((item) => String(item.className).includes('_selected_')); const editor = document.querySelector(${JSON.stringify(exports.editorSelector)}); const text = editor?.cloneNode(true); text?.querySelectorAll('[data-slate-placeholder="true"],[data-slate-zero-width]').forEach((item) => item.remove()); return { url: location.href, conversationId: selected?.getAttribute('data-conversation-id') ?? null, selected: Boolean(selected), messages: document.querySelectorAll('.cr-agent[data-message-id]').length, editor: text?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() ?? null, home: Boolean(editor?.querySelector('[data-slate-placeholder="true"]')) }; })()`;
-        const before = await this.evaluate(snapshot);
+        const before = await this.evaluate(`(() => { const state = ${snapshot}; const loginRequired = [...document.querySelectorAll('a,button,[role="button"]')].some(item => /^(?:登录|立即登录|sign in)$/i.test(item.textContent?.trim() ?? '')); return { ...state, loginRequired }; })()`);
+        if (before.loginRequired)
+            throw new Error("WorkBuddy 尚未登录，请先在桌面端登录后重试");
         if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"]')].find((item) => item.textContent?.trim() === '新建任务'); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
             throw new Error("WorkBuddy 新建任务入口未找到或不可用");
         // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkbuddyPlugin = exports.workbuddyManifest = void 0;
 exports.extractExpertQuery = extractExpertQuery;
 exports.findExecutable = findExecutable;
-const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_os_1 = require("node:os");
@@ -13,6 +12,7 @@ const plugin_1 = require("../../plugin");
 const cdp_client_1 = require("./cdp-client");
 const cli_client_1 = require("./cli-client");
 const session_history_1 = require("./session-history");
+const desktop_launch_1 = require("../desktop-launch");
 exports.workbuddyManifest = {
     id: "workbuddy", version: "1.1.13", displayName: "WorkBuddy", type: "agent",
     entry: "dist/index.js", apiVersion: "1", process: "in-process",
@@ -28,13 +28,19 @@ function findExecutable(configured) {
     if (configured)
         return (0, node_fs_1.existsSync)((0, node_path_1.resolve)(configured)) ? (0, node_path_1.resolve)(configured) : undefined;
     const local = process.env.LOCALAPPDATA ?? (0, node_path_1.join)((0, node_os_1.homedir)(), "AppData", "Local");
-    return [(0, node_path_1.join)(local, "Programs", "WorkBuddy", "WorkBuddy.exe"), "D:\\Programs\\WorkBuddy\\WorkBuddy.exe"].find(node_fs_1.existsSync);
+    return [
+        (0, node_path_1.join)(local, "Programs", "WorkBuddy", "WorkBuddy.exe"),
+        (0, node_path_1.join)(local, "Programs", "WorkBuddyAI", "WorkBuddyAI.exe"),
+        "D:\\Programs\\WorkBuddy\\WorkBuddy.exe",
+        "D:\\Programs\\WorkBuddyAI\\WorkBuddyAI.exe",
+    ].find(node_fs_1.existsSync);
 }
 class WorkbuddyPlugin {
     options;
     manifest = exports.workbuddyManifest;
     client;
     process;
+    reconnect;
     cliPath;
     model;
     transport = "auto";
@@ -125,10 +131,11 @@ class WorkbuddyPlugin {
     async deactivate(_reason) {
         await this.queue;
         await this.sessionWrites.catch(() => { });
+        await (0, desktop_launch_1.terminateOwnedProcess)(this.process).catch(() => undefined);
         this.client?.close();
         this.client = undefined;
-        // WorkBuddy 是用户桌面应用，插件停止时不结束桌面进程。
         this.process = undefined;
+        this.reconnect = undefined;
     }
     async health() {
         if (this.client?.connected())
@@ -165,6 +172,8 @@ class WorkbuddyPlugin {
             throw new Error("WorkBuddy 新会话缺少 sessionId");
         if (this.transport === "cli" || (this.transport !== "cdp" && this.cliPath) || !this.client?.createTask)
             throw new Error("WorkBuddy 当前传输不支持新建会话");
+        if (!this.client.connected())
+            await this.reconnect?.();
         if (!this.client.connected())
             throw new Error("WorkBuddy CDP 未连接");
         return this.enqueue(async () => {
@@ -181,6 +190,8 @@ class WorkbuddyPlugin {
         const hasAttachments = Array.isArray(request.attachments) && request.attachments.length > 0;
         if (hasAttachments && !this.attachmentInput)
             throw new Error("WorkBuddy 当前传输不支持附件输入");
+        if (!usesCli && !this.client?.connected())
+            await this.reconnect?.();
         const pendingInteractionSessionId = this.client?.pendingInteractionSessionId?.();
         if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== request.sessionId)
             throw new Error("WorkBuddy 正在等待另一个会话的选择");
@@ -304,6 +315,21 @@ class WorkbuddyPlugin {
         return run;
     }
     async connectOrStart(config, logger, port) {
+        const executable = findExecutable(typeof config.executablePath === "string" ? config.executablePath : this.options.executablePath);
+        // 沿用 WorkBuddy 的默认用户目录，保留用户在桌面端的登录状态。
+        const profile = undefined;
+        const timeoutMs = typeof config.startupTimeoutMs === "number" ? config.startupTimeoutMs : 30_000;
+        this.reconnect = async () => {
+            try {
+                await this.client.connect();
+                return;
+            }
+            catch (first) {
+                if (config.autoStart === false || this.options.client || !executable)
+                    throw first;
+                await (0, desktop_launch_1.restartOwnedAndWait)(this.process, executable, [`--remote-debugging-port=${port}`], profile, () => this.client.connect(), timeoutMs, child => { this.process = child; });
+            }
+        };
         try {
             await this.client.connect();
             return;
@@ -311,25 +337,10 @@ class WorkbuddyPlugin {
         catch (first) {
             if (config.autoStart === false || this.options.client)
                 throw first;
-            const executable = findExecutable(typeof config.executablePath === "string" ? config.executablePath : this.options.executablePath);
             if (!executable)
                 throw new Error("未找到 WorkBuddy.exe，请配置 executablePath");
-            this.process = (0, node_child_process_1.spawn)(executable, [`--remote-debugging-port=${port}`], { detached: true, stdio: "ignore", windowsHide: false });
-            this.process.unref();
             logger.info(`WorkBuddy 已启动，等待 CDP ${port}`);
-            const deadline = Date.now() + (typeof config.startupTimeoutMs === "number" ? config.startupTimeoutMs : 30_000);
-            let last = first;
-            while (Date.now() < deadline) {
-                await new Promise((resolve) => setTimeout(resolve, 500));
-                try {
-                    await this.client.connect();
-                    return;
-                }
-                catch (error) {
-                    last = error;
-                }
-            }
-            throw last instanceof Error ? last : new Error("WorkBuddy CDP 启动超时");
+            await (0, desktop_launch_1.launchManagedAndWait)(executable, [`--remote-debugging-port=${port}`], profile, () => this.client.connect(), timeoutMs, child => { this.process = child; });
         }
     }
 }

package/dist/tests-ts/agent-availability.test.js

@@ -9,19 +9,33 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_test_1 = __importDefault(require("node:test"));
 const agent_availability_1 = require("../src-ts/agent-availability");
+const workbuddy_1 = require("../src-ts/plugins/workbuddy");
 (0, node_test_1.default)("办公 Agent 根据可执行文件和就绪状态决定是否可选", async () => {
     const dir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "office-agent-"));
+    const previousLocalAppData = process.env.LOCALAPPDATA;
     try {
         const file = (0, node_path_1.join)(dir, "WorkBuddy.exe");
+        const dshFile = (0, node_path_1.join)(dir, "DeepSeek Harness.exe");
         strict_1.default.deepEqual(await (0, agent_availability_1.agentAvailability)("workbuddy", { executablePath: file }, "ready"), { available: false, reason: "未找到可执行文件" });
         await (0, promises_1.writeFile)(file, "测试程序");
         strict_1.default.deepEqual(await (0, agent_availability_1.agentAvailability)("workbuddy", { executablePath: file }, "ready"), { available: true, reason: "" });
+        const workbuddyAi = (0, node_path_1.join)(dir, "Programs", "WorkBuddyAI", "WorkBuddyAI.exe");
+        await (0, promises_1.mkdir)((0, node_path_1.join)(dir, "Programs", "WorkBuddyAI"), { recursive: true });
+        await (0, promises_1.writeFile)(workbuddyAi, "测试程序");
+        process.env.LOCALAPPDATA = dir;
+        strict_1.default.equal((0, workbuddy_1.findExecutable)(), workbuddyAi);
         strict_1.default.equal((await (0, agent_availability_1.agentAvailability)("workbuddy", { executablePath: file }, "failed")).available, false);
         strict_1.default.equal((await (0, agent_availability_1.agentAvailability)("qwenwork", { executablePath: (0, node_path_1.join)(dir, "missing.exe") }, "ready")).available, false);
         strict_1.default.equal((await (0, agent_availability_1.agentAvailability)("doubao", { executablePath: file }, "ready")).available, true);
-        strict_1.default.equal((await (0, agent_availability_1.agentAvailability)("dsh", {}, "ready")).available, true);
+        strict_1.default.deepEqual(await (0, agent_availability_1.agentAvailability)("dsh", {}, "ready"), { available: false, reason: "未找到可执行文件" });
+        await (0, promises_1.writeFile)(dshFile, "测试程序");
+        strict_1.default.deepEqual(await (0, agent_availability_1.agentAvailability)("dsh", { executablePath: dshFile }, "ready"), { available: true, reason: "" });
     }
     finally {
+        if (previousLocalAppData === undefined)
+            delete process.env.LOCALAPPDATA;
+        else
+            process.env.LOCALAPPDATA = previousLocalAppData;
         await (0, promises_1.rm)(dir, { recursive: true, force: true });
     }
 });

package/dist/tests-ts/control-server.test.js

@@ -48,6 +48,26 @@ const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_crypto_1 = require("node:crypto");
 const plugin_manager_1 = require("../src-ts/plugin-manager");
+(0, node_test_1.default)("桌面重启请求交给 mab 后台执行并保留失败原因", async () => {
+    const calls = [];
+    const manager = { restartDesktop: async (id) => { calls.push(id); if (id !== "workbuddy")
+            throw new Error("不支持桌面重启"); } };
+    const server = new control_server_1.ControlServer({ manager, host: "127.0.0.1", port: 0 });
+    const address = await server.start();
+    const base = `http://${address.host}:${address.port}`;
+    try {
+        const response = await fetch(`${base}/api/plugins/workbuddy/restart-desktop`, { method: "POST" });
+        strict_1.default.equal(response.status, 200);
+        strict_1.default.deepEqual(await response.json(), { ok: true });
+        const failed = await fetch(`${base}/api/plugins/other/restart-desktop`, { method: "POST" });
+        strict_1.default.equal(failed.status, 400);
+        strict_1.default.deepEqual(await failed.json(), { error: "不支持桌面重启" });
+        strict_1.default.deepEqual(calls, ["workbuddy", "other"]);
+    }
+    finally {
+        await server.stop();
+    }
+});
 (0, node_test_1.default)("关联 EvolCore AID 时配置相应的 Agent 路由", async () => {
     const calls = [];
     await (0, evolcore_1.configureAidForPlugin)("dsh", "test.agentid.cn", 26107, async (args) => { calls.push(args); return { ok: true }; });

package/dist/tests-ts/desktop-launch.test.js

@@ -1,10 +1,44 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const promises_1 = require("node:fs/promises");
+const node_child_process_1 = require("node:child_process");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_test_1 = __importDefault(require("node:test"));
@@ -77,6 +111,70 @@ const desktop_launch_1 = require("../src-ts/plugins/desktop-launch");
     strict_1.default.equal(launches, 1);
     strict_1.default.equal(attempts, 3);
 });
+(0, node_test_1.default)("结束桌面程序时只按插件保存的 PID 结束进程树", async () => {
+    const calls = [];
+    await (0, desktop_launch_1.terminateOwnedProcess)({ pid: 3210, exitCode: null, signalCode: null, unref() { } }, "win32", async (file, args) => { calls.push({ file, args }); });
+    await (0, desktop_launch_1.terminateOwnedProcess)(undefined, "win32", async (file, args) => { calls.push({ file, args }); });
+    strict_1.default.deepEqual(calls, [{ file: "taskkill.exe", args: ["/PID", "3210", "/T", "/F"] }]);
+});
+(0, node_test_1.default)("管理式启动增加独立用户目录并只记录本次启动进程", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "desktop-profile-"));
+    let ownedPid;
+    let launchArgs = [];
+    try {
+        const result = await (await Promise.resolve().then(() => __importStar(require("../src-ts/plugins/desktop-launch")))).launchManagedAndWait("client.exe", ["--remote-debugging-port=9229"], (0, node_path_1.join)(root, "profile"), async () => "connected", 1000, child => { ownedPid = child?.pid; }, (_file, args) => { launchArgs = args; return { pid: 4567, exitCode: null, signalCode: null, unref() { } }; });
+        strict_1.default.equal(result, "connected");
+        strict_1.default.equal(ownedPid, 4567);
+        strict_1.default.deepEqual(launchArgs, ["--remote-debugging-port=9229", `--user-data-dir=${(0, node_path_1.join)(root, "profile")}`]);
+    }
+    finally {
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("使用客户端原有用户目录时，管理式启动不覆盖用户数据目录", async () => {
+    const { launchManagedAndWait } = await Promise.resolve().then(() => __importStar(require("../src-ts/plugins/desktop-launch")));
+    let args = [];
+    const result = await launchManagedAndWait("WorkBuddyAI.exe", ["--remote-debugging-port=9229"], undefined, async () => "connected", 1000, () => { }, (_file, argv) => {
+        args = argv;
+        return { pid: 1234, exitCode: null, signalCode: null, unref() { } };
+    });
+    strict_1.default.equal(result, "connected");
+    strict_1.default.deepEqual(args, ["--remote-debugging-port=9229"]);
+});
+(0, node_test_1.default)("Windows 后台清理已有 CDP 桌面进程，保留不同安装路径的同名程序", { skip: process.platform !== "win32" }, async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-kill-desktop-"));
+    const children = [];
+    try {
+        for (const folder of ["selected", "other"]) {
+            await (0, promises_1.mkdir)((0, node_path_1.join)(root, folder));
+            const executable = (0, node_path_1.join)(root, folder, "WorkBuddyAI.exe");
+            await (0, promises_1.copyFile)((0, node_path_1.join)(process.env.SystemRoot, "System32", "cmd.exe"), executable);
+            const child = (0, node_child_process_1.spawn)(executable, ["/d", "/s", "/c", "ping -n 60 127.0.0.1 >nul & rem --remote-debugging-port=9229"], { windowsHide: true, stdio: "ignore" });
+            await new Promise((resolve, reject) => { child.once("spawn", resolve); child.once("error", reject); });
+            children.push(child);
+        }
+        const pids = await (0, desktop_launch_1.terminateWindowsDesktop)((0, node_path_1.join)(root, "selected", "WorkBuddyAI.exe"));
+        strict_1.default.deepEqual(pids, [children[0].pid]);
+        process.kill(children[1].pid, 0);
+        strict_1.default.deepEqual(await (0, desktop_launch_1.terminateWindowsDesktop)((0, node_path_1.join)(root, "selected", "WorkBuddyAI.exe")), []);
+    }
+    finally {
+        for (const child of children)
+            await (0, desktop_launch_1.terminateOwnedProcess)(child);
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("ChatGPT 可执行文件支持显式配置路径", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "chatgpt-executable-"));
+    try {
+        const executable = (0, node_path_1.join)(root, "ChatGPT.exe");
+        await (0, promises_1.writeFile)(executable, "");
+        strict_1.default.equal(await (await Promise.resolve().then(() => __importStar(require("../src-ts/plugins/desktop-launch")))).findChatgptExecutable(executable), executable);
+    }
+    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)(), "doubao-upgrade-"));
     try {