agentroam 0.2.0-preview.36 → 0.2.0-preview.37

package/dist/codex-desktop-command.js

@@ -24,7 +24,7 @@ export async function runCodexDesktopCommand(options, context = {}) {
         const codex = await (context.codexResolver ?? resolveCodexRuntime)({
             dataDir: options.dataDir,
             target: detectPlatform(platform, process.arch, process.versions.node),
-            environment,
+            environment: { ...environment },
             platform,
             nodeExecutable: process.execPath,
             onProgress: (message) => log(`… ${message}`),
@@ -32,13 +32,17 @@ export async function runCodexDesktopCommand(options, context = {}) {
         environment.AGENT_CODEX_BIN = codex.executable;
     }
     const args = [scriptPath];
+    if (!options.desktopDryRun) {
+        environment.AGENTROAM_CODEX_DESKTOP_PREFLIGHT_NODE = process.execPath;
+        environment.AGENTROAM_CODEX_DESKTOP_PREFLIGHT = fileURLToPath(new URL("./codex-desktop-preflight.js", import.meta.url));
+    }
     if (options.desktopRestart)
         args.push("--restart");
     if (options.desktopDryRun)
         args.push("--dry-run");
     try {
         const { stdout, stderr } = await (context.execute ?? execFileAsync)("/bin/bash", args, {
-            env: environment, encoding: "utf8", timeout: 30_000, maxBuffer: 1024 * 1024,
+            env: environment, encoding: "utf8", timeout: 60_000, maxBuffer: 1024 * 1024,
         });
         if (stdout.trim())
             log(stdout.trimEnd());

package/dist/codex-desktop-preflight.js

@@ -0,0 +1,57 @@
+import { execFile } from "node:child_process";
+import { homedir } from "node:os";
+import { promisify } from "node:util";
+import { pathToFileURL } from "node:url";
+import { DesktopProbeRpcError, readDesktopActivity, withDesktopRpc } from "./codex-desktop-probe.js";
+const execFileAsync = promisify(execFile);
+async function inspectBackend(endpoint) {
+    return withDesktopRpc(endpoint, async (request, becameActive) => {
+        try {
+            await request("config/read", {});
+            try {
+                await request("account/gatewayOAuth/read", {});
+            }
+            catch (error) {
+                // Older servers may not have the Desktop gateway RPC.
+                if (!(error instanceof DesktopProbeRpcError && error.code === -32601))
+                    throw error;
+            }
+            return true;
+        }
+        catch (error) {
+            if (!(error instanceof DesktopProbeRpcError) || !/No such file or directory|os error 2/.test(error.message))
+                throw error;
+            const activity = await readDesktopActivity(request);
+            if (activity.state !== "idle" || becameActive())
+                throw new Error("共享后端配置失效，但任务忙碌或状态无法确认；已保留桌面和共享后端");
+            return false;
+        }
+    });
+}
+/** Repair only a missing-directory backend after two complete idle snapshots. */
+export async function preflightCodexDesktop(endpoint, executable, context = {}) {
+    if (await inspectBackend(endpoint))
+        return;
+    if (await inspectBackend(endpoint))
+        return;
+    (context.log ?? console.log)("共享后端的工作目录已失效，已确认全部任务空闲，正在从稳定目录重建…");
+    await (context.restart ?? (async () => {
+        await execFileAsync(executable, ["app-server", "daemon", "restart"], {
+            cwd: homedir(), env: process.env, timeout: 15_000, maxBuffer: 1024 * 1024,
+        });
+    }))();
+    if (!await inspectBackend(endpoint))
+        throw new Error("共享后端重建后仍无法读取配置；已保留桌面");
+}
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+    const [endpoint, executable] = process.argv.slice(2);
+    if (!endpoint || !executable) {
+        console.error("Missing shared backend endpoint or Codex executable");
+        process.exitCode = 1;
+    }
+    else
+        preflightCodexDesktop(endpoint, executable).catch(error => {
+            console.error(`共享后端检查失败：${error instanceof Error ? error.message : error}`);
+            process.exitCode = 1;
+        });
+}

package/dist/codex-desktop-probe.js

@@ -1,6 +1,24 @@
 import { Agent, WebSocket } from "undici";
+export class DesktopProbeRpcError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+    }
+}
 /** Read live state only. Never resume, subscribe, interrupt or unload a thread. */
 export async function probeDesktopActivity(endpoint, timeoutMs = 5_000) {
+    try {
+        return await withDesktopRpc(endpoint, async (request, becameActive) => {
+            const activity = await readDesktopActivity(request);
+            return becameActive() && activity.state === "idle" ? { state: "busy", activeCount: 1 } : activity;
+        }, timeoutMs);
+    }
+    catch {
+        return { state: "unknown", reason: "无法完整查询桌面端的实时任务状态" };
+    }
+}
+export async function withDesktopRpc(endpoint, operation, timeoutMs = 5_000) {
     let dispatcher;
     let socket;
     let timer;
@@ -49,7 +67,7 @@ export async function probeDesktopActivity(endpoint, timeoutMs = 5_000) {
                     return;
                 pending.delete(message.id);
                 if (message.error)
-                    item.reject(new Error("Desktop probe RPC failed"));
+                    item.reject(new DesktopProbeRpcError(message.error.code, String(message.error.message ?? "Desktop probe RPC failed")));
                 else
                     item.resolve(message.result);
             }
@@ -68,21 +86,17 @@ export async function probeDesktopActivity(endpoint, timeoutMs = 5_000) {
                 reject(error);
             }
         });
-        const operation = async () => {
+        const run = async () => {
             await opened;
-            await request("initialize", { clientInfo: { name: "agentroam_desktop_setup", version: "1" } });
+            await request("initialize", { clientInfo: { name: "agentroam_desktop_setup", version: "1" }, capabilities: { experimentalApi: true } });
             connection.send(JSON.stringify({ method: "initialized", params: {} }));
-            const activity = await readDesktopActivity(request);
-            return changedToActive && activity.state === "idle" ? { state: "busy", activeCount: 1 } : activity;
+            return operation(request, () => changedToActive);
         };
         return await Promise.race([
-            operation(),
+            run(),
             new Promise((_, reject) => { timer = setTimeout(() => reject(new Error("Desktop probe timed out")), timeoutMs); }),
         ]);
     }
-    catch {
-        return { state: "unknown", reason: "无法完整查询桌面端的实时任务状态" };
-    }
     finally {
         if (timer)
             clearTimeout(timer);

package/dist/service/launcher-cleanup.js

@@ -1,5 +1,18 @@
 import { lstat, readFile, readdir, realpath, rm } from "node:fs/promises";
 import { relative, resolve, sep } from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+const execFileAsync = promisify(execFile);
+async function processPathsInUse() {
+    // Windows has no reliable cwd inventory here: retain old installs instead.
+    if (process.platform === "win32")
+        throw new Error("Process paths unavailable");
+    const { stdout } = await execFileAsync(process.platform === "darwin" ? "/usr/sbin/lsof" : "lsof", ["-nP", "-d", "cwd,txt", "-Fn"], { timeout: 5_000, maxBuffer: 16 * 1024 * 1024 });
+    const paths = stdout.split("\n").filter(line => line.startsWith("n/")).map(line => line.slice(1));
+    if (!paths.length)
+        throw new Error("Incomplete process paths");
+    return [process.cwd(), ...paths];
+}
 function versionParts(version) {
     const match = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-preview\.(0|[1-9]\d*))?$/.exec(version);
     return match ? [Number(match[1]), Number(match[2]), Number(match[3]), match[4] === undefined ? Infinity : Number(match[4])] : null;
@@ -18,7 +31,7 @@ function contains(parent, child) {
     return path === "" || (!path.startsWith(`..${sep}`) && path !== ".." && !path.startsWith(sep));
 }
 /** Remove only recognized managed launcher versions after the replacement service is ready. */
-export async function cleanupOldLaunchers(config, log) {
+export async function cleanupOldLaunchers(config, log, context = {}) {
     try {
         const dataDir = await realpath(config.dataDir);
         const launcherDir = resolve(dataDir, "launcher");
@@ -47,6 +60,11 @@ export async function cleanupOldLaunchers(config, log) {
                 const manifest = JSON.parse(await readFile(manifestPath, "utf8"));
                 if (manifest.name !== "agentroam" || manifest.version !== entry.name)
                     continue;
+                const usedPaths = await (context.pathsInUse ?? processPathsInUse)();
+                if (usedPaths.some(path => contains(candidate, path))) {
+                    log(`旧版 CLI ${entry.name} 仍被进程使用，已保留。`);
+                    continue;
+                }
                 await rm(candidate, { recursive: true });
                 log(`✓ 已清理旧版 CLI ${entry.name}，配置和数据已保留`);
             }

package/install/start-codex-desktop-shared.sh

@@ -99,12 +99,19 @@ if [[ -n "$codex_desktop_running_pid" && "$codex_desktop_restart" != true ]]; th
 fi
 
 # Check daemon availability before asking the existing Desktop to quit.
-"$codex_shared_cli" app-server daemon start
+(cd "$HOME" && "$codex_shared_cli" app-server daemon start)
 if [[ ! -S "$codex_shared_socket" ]]; then
   echo "Shared app-server socket not found: $codex_shared_socket" >&2
   exit 1
 fi
 "$codex_shared_cli" app-server daemon version >/dev/null
+codex_desktop_preflight_node="${AGENTROAM_CODEX_DESKTOP_PREFLIGHT_NODE:-$(command -v node || true)}"
+codex_desktop_preflight="${AGENTROAM_CODEX_DESKTOP_PREFLIGHT:-$(dirname "$0")/../dist/codex-desktop-preflight.js}"
+if [[ -z "$codex_desktop_preflight_node" || ! -f "$codex_desktop_preflight" ]]; then
+  echo "Shared backend configuration check unavailable; Desktop was preserved." >&2
+  exit 1
+fi
+"$codex_desktop_preflight_node" "$codex_desktop_preflight" "$codex_shared_url" "$codex_shared_cli"
 
 # Recheck after daemon preflight; never quit a different Desktop instance.
 codex_desktop_preflight_pid="$codex_desktop_running_pid"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentroam",
-  "version": "0.2.0-preview.36",
+  "version": "0.2.0-preview.37",
   "description": "Zero-install mobile remote terminal and file console",
   "type": "module",
   "bin": {
@@ -26,8 +26,8 @@
     "undici": "^6.25.0"
   },
   "optionalDependencies": {
-    "agentroam-runtime-darwin-arm64": "0.2.0-preview.36",
-    "agentroam-runtime-win32-x64": "0.2.0-preview.36",
+    "agentroam-runtime-darwin-arm64": "0.2.0-preview.37",
+    "agentroam-runtime-win32-x64": "0.2.0-preview.37",
     "agentroam-cloudflared-darwin-arm64": "0.2.0-preview.36",
     "agentroam-cloudflared-win32-x64": "0.2.0-preview.36",
     "agentroam-tui-darwin-arm64": "0.2.0-preview.36",