mu-agent-bridge 1.0.71 → 1.0.78

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

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

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

@@ -16,8 +16,8 @@ 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) {
+/** 先从 Windows 注册信息和开始菜单解析，失败时再查常见安装目录。 */
+async function findWindowsExecutable(fileName, configured, run = execFileAsync) {
     if (configured?.trim()) {
         const configuredPath = (0, node_path_1.resolve)(configured);
         if (fileName.toLowerCase() === "doubao.exe") {
@@ -42,12 +42,16 @@ async function findWindowsExecutable(fileName, configured) {
     }
     if (process.platform !== "win32")
         return undefined;
-    const pattern = /doubao|豆包|qwen|qwwork|千问|deepseek|harness|dsh/i;
+    const registered = await findRegisteredWindowsExecutable(fileName, run);
+    if (registered)
+        return registered;
+    const pattern = /doubao|豆包|qwen|qwwork|千问|deepseek|harness|dsh|zcode/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.LOCALAPPDATA,
             process.env.ProgramFiles,
             process.env["ProgramFiles(x86)"],
             ...Array.from({ length: 24 }, (_, index) => `${String.fromCharCode(67 + index)}:\\`),
@@ -59,6 +63,36 @@ async function findWindowsExecutable(fileName, configured) {
     }
     return undefined;
 }
+async function findRegisteredWindowsExecutable(fileName, run) {
+    const target = fileName.replace(/'/g, "''");
+    const script = `$ErrorActionPreference='SilentlyContinue';[Console]::OutputEncoding=[Text.Encoding]::UTF8;$target='${target}'
+function Emit-Path($value){if(-not $value){return};$value=[Environment]::ExpandEnvironmentVariables(([string]$value).Trim());if($value.StartsWith('"')){$end=$value.IndexOf('"',1);if($end -gt 1){$value=$value.Substring(1,$end-1)}}elseif($value -match '^(\S+?\.exe)(?:\s|$)'){$value=$Matches[1]};if($value -match '(?i)\.exe$'){[Console]::WriteLine($value)}}
+$keys=@("HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKLM:\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKLM:\\Software\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\App Paths\\$target","HKCU:\\Software\\Classes\\Applications\\$target\\shell\\open\\command","HKLM:\\Software\\Classes\\Applications\\$target\\shell\\open\\command")
+foreach($key in $keys){$item=Get-Item $key -ErrorAction SilentlyContinue;if($item){Emit-Path $item.GetValue('')}}
+$dirs=@();if($env:APPDATA){$dirs+=[IO.Path]::Combine($env:APPDATA,'Microsoft\\Windows\\Start Menu\\Programs')};if($env:ProgramData){$dirs+=[IO.Path]::Combine($env:ProgramData,'Microsoft\\Windows\\Start Menu\\Programs')};$shell=New-Object -ComObject WScript.Shell
+foreach($dir in $dirs){Get-ChildItem $dir -Filter '*.lnk' -File -Recurse -ErrorAction SilentlyContinue|ForEach-Object{$link=$shell.CreateShortcut($_.FullName);if($link.TargetPath -and [IO.Path]::GetFileName($link.TargetPath) -ieq $target){Emit-Path $link.TargetPath}}}`;
+    try {
+        const { stdout } = await run("powershell.exe", ["-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { timeout: 10_000, windowsHide: true });
+        for (const candidate of stdout.split(/\r?\n/).map(value => value.trim()).filter(Boolean)) {
+            const found = await resolveRegisteredCandidate(fileName, candidate);
+            if (found)
+                return found;
+        }
+    }
+    catch { /* 注册表或开始菜单不可读时继续使用目录兜底 */ }
+    return undefined;
+}
+async function resolveRegisteredCandidate(fileName, candidate) {
+    const candidatePath = (0, node_path_1.resolve)(candidate.replace(/^"|"$/g, ""));
+    if (fileName.toLowerCase() === "doubao.exe" && (0, node_path_1.basename)((0, node_path_1.dirname)(candidatePath)).toLowerCase() === "application") {
+        const client = (0, node_path_1.join)((0, node_path_1.dirname)(candidatePath), "app", fileName);
+        if ((0, node_fs_1.existsSync)(client))
+            return client;
+    }
+    if ((0, node_fs_1.existsSync)(candidatePath) && (0, node_path_1.basename)(candidatePath).toLowerCase() === fileName.toLowerCase())
+        return candidatePath;
+    return findExecutableInTree((0, node_path_1.dirname)(candidatePath), fileName, /^/, 3);
+}
 async function findExecutableInTree(directory, fileName, pattern, depth) {
     return search(directory, fileName, pattern, depth, pattern.test(directory));
 }
@@ -104,9 +138,16 @@ async function launchManagedAndWait(executable, args, profileDirectory, connect,
     if (profileDirectory)
         await (0, promises_1.mkdir)(profileDirectory, { recursive: true });
     const child = launch(executable, profileDirectory ? [...args, `--user-data-dir=${profileDirectory}`] : args);
+    // 先等待 spawn，避免异步 error 终止 daemon 或在启动失败后继续轮询。
+    const events = child;
+    const started = typeof events.once === "function" ? new Promise((resolve, reject) => {
+        events.once("error", reject);
+        events.once("spawn", resolve);
+    }) : Promise.resolve();
     child.unref();
     onProcess(child);
     try {
+        await started;
         return await waitFor(connect, timeoutMs, 250);
     }
     catch (error) {