agentroam 0.2.0-preview.39 → 0.2.0-preview.40

package/dist/desktop-authorization-prompt.js

@@ -0,0 +1,84 @@
+import { createInterface } from "node:readline";
+import { Readable } from "node:stream";
+export class DesktopAuthorizationInterrupted extends Error {
+    kind;
+    constructor(kind) {
+        super(kind === "skip" ? "已跳过远程桌面授权。" : "远程桌面授权等待超时，已跳过。");
+        this.kind = kind;
+    }
+}
+/** One terminal owns confirmation and cancellation, including curl | sh installs. */
+export class DesktopAuthorizationPrompt {
+    options;
+    signal;
+    controller = new AbortController();
+    timer;
+    reader;
+    answer;
+    constructor(options) {
+        this.options = options;
+        this.signal = options.signal ? AbortSignal.any([options.signal, this.controller.signal]) : this.controller.signal;
+        this.timer = setTimeout(() => this.controller.abort(new DesktopAuthorizationInterrupted("timeout")), options.timeoutMs);
+        process.on("SIGINT", this.skip);
+        if (options.input) {
+            // The controlling tty echoes canonical input; readline must not echo it again.
+            this.reader = createInterface({ input: options.input, terminal: false });
+            this.reader.on("line", this.onLine);
+            this.reader.on("close", this.skip);
+            this.reader.on("SIGINT", this.skip);
+            this.reader.on("error", this.skip);
+        }
+    }
+    skip = () => { this.controller.abort(new DesktopAuthorizationInterrupted("skip")); };
+    onLine = (line) => {
+        if (this.answer) {
+            const answer = this.answer;
+            this.answer = undefined;
+            answer(/^(y|yes)$/i.test(line.trim()));
+        }
+        else if (/^(s|skip|n|no|跳过)$/i.test(line.trim()))
+            this.skip();
+    };
+    confirm() {
+        if (!this.reader)
+            return Promise.resolve(false);
+        return new Promise((resolve) => {
+            this.answer = resolve;
+            this.options.log("现在授权远程桌面，允许已配对设备查看和控制这台电脑？[y/N]（回车跳过）：");
+        });
+    }
+    close() {
+        clearTimeout(this.timer);
+        process.off("SIGINT", this.skip);
+        this.reader?.off("line", this.onLine);
+        this.reader?.off("close", this.skip);
+        this.reader?.off("SIGINT", this.skip);
+        this.reader?.off("error", this.skip);
+        this.reader?.close();
+        this.answer?.(false);
+        this.answer = undefined;
+        if (this.options.ownsInput && this.options.input instanceof Readable)
+            this.options.input.destroy();
+    }
+}
+/** A deadline must also cover a request or injected operation that never settles. */
+export function withAuthorizationSignal(operation, signal) {
+    signal.throwIfAborted();
+    return new Promise((resolve, reject) => {
+        const abort = () => { signal.removeEventListener("abort", abort); reject(signal.reason); };
+        signal.addEventListener("abort", abort, { once: true });
+        try {
+            operation().then((value) => {
+                signal.removeEventListener("abort", abort);
+                if (signal.aborted)
+                    reject(signal.reason);
+                else
+                    resolve(value);
+            }, (error) => { signal.removeEventListener("abort", abort); reject(error); });
+        }
+        catch (error) {
+            signal.removeEventListener("abort", abort);
+            reject(error);
+        }
+    });
+}

package/dist/desktop-authorization.js

@@ -1,16 +1,15 @@
 import { execFile } from "node:child_process";
-import { createInterface } from "node:readline/promises";
-import { Readable } from "node:stream";
 import { setTimeout as delay } from "node:timers/promises";
 import { promisify } from "node:util";
 import { resolveApprovalInput, terminalText } from "./device-pairing.js";
 import { localServiceRequest } from "./local-service-request.js";
+import { DesktopAuthorizationInterrupted, DesktopAuthorizationPrompt, withAuthorizationSignal } from "./desktop-authorization-prompt.js";
 import { withCliProgress, withoutCliProgress } from "../bin/cli-progress.mjs";
 const runFile = promisify(execFile);
 const endpoint = "/api/remote-authorization";
-async function requestAuthorization(dataDir, body) {
+async function requestAuthorization(dataDir, body, signal) {
     const status = await localServiceRequest(dataDir, endpoint, {
-        method: body ? "POST" : "GET", body, timeoutMs: body?.action === "request-permission" ? 135_000 : 30_000,
+        method: body ? "POST" : "GET", body, signal, timeoutMs: body?.action === "request-permission" ? 135_000 : 30_000,
     });
     if (status.local !== true || typeof status.supported !== "boolean" || typeof status.installed !== "boolean"
         || typeof status.enabled !== "boolean" || typeof status.screen !== "boolean" || typeof status.accessibility !== "boolean"
@@ -20,31 +19,11 @@ async function requestAuthorization(dataDir, body) {
     }
     return status;
 }
-/** A native macOS dialog; no browser, shell interpolation, or piped stdin. */
-export async function confirmDesktopAuthorization(platform) {
-    if (platform === "darwin") {
-        const script = 'display dialog "是否启用 AgentRoam 远程桌面？\n接下来将请求屏幕录制和辅助功能权限。授权后，已配对的设备可以查看和控制这台电脑。" with title "AgentRoam 远程桌面授权" buttons {"稍后", "开始授权"} default button "开始授权" cancel button "稍后" giving up after 120';
-        try {
-            const { stdout } = await runFile("/usr/bin/osascript", ["-e", script], { timeout: 125_000, maxBuffer: 4096 });
-            return stdout.includes("button returned:开始授权") && !stdout.includes("gave up:true");
-        }
-        catch {
-            return false;
-        }
-    }
-    const input = resolveApprovalInput({ interactive: true });
-    if (!input)
-        return false;
-    const reader = createInterface({ input, output: process.stdout });
-    try {
-        const answer = await withoutCliProgress(() => reader.question("启用远程桌面，允许已配对设备查看和控制这台电脑？[y/N]："));
-        return /^(y|yes)$/i.test(answer.trim());
-    }
-    finally {
-        reader.close();
-        if (input !== process.stdin && input instanceof Readable)
-            input.destroy();
-    }
+/** Clear only this app's stale permission; deleting the old bundle does not clear TCC. */
+export async function resetMacDesktopPermission(permission, signal, run = runFile) {
+    await run("/usr/bin/tccutil", ["reset", permission === "screen" ? "ScreenCapture" : "Accessibility", "com.agentroam.remote-desktop"], {
+        signal, timeout: 5000, maxBuffer: 4096,
+    });
 }
 function recoveryHint(log) {
     log("稍后重新授权：agentroam desktop authorize；也可在本机浏览器的“远程授权”面板中操作。");
@@ -61,61 +40,85 @@ export async function authorizeRemoteDesktop(dataDir, context = {}) {
         return false;
     }
     const request = context.request ?? requestAuthorization;
-    let status = await withCliProgress("正在检查本机远程桌面权限", () => request(dataDir));
-    if (!status.supported)
-        throw new Error("远程桌面支持 macOS 14 及以上的 Apple Silicon 电脑和 Windows 10/11 x64");
-    if (!status.installed)
-        throw new Error("当前 CLI 未包含远程授权组件，请升级 CLI");
-    if (status.enabled) {
-        status = await request(dataDir, { action: "recheck" });
-        if (complete(status)) {
-            log("✓ 远程桌面已授权并开启共享。");
-            return true;
+    const input = context.input === undefined ? resolveApprovalInput({ interactive: true }) : context.input ?? undefined;
+    const prompt = new DesktopAuthorizationPrompt({ input, ownsInput: context.input === undefined && input !== process.stdin,
+        signal: context.signal, timeoutMs: context.timeoutMs ?? 60_000, log });
+    const run = (operation) => withAuthorizationSignal(operation, prompt.signal);
+    const check = (body) => run(() => request(dataDir, body, prompt.signal));
+    log("远程桌面授权可选；输入 s 后回车或按 Ctrl+C 可跳过，稍后可重新授权。");
+    try {
+        let status = await withCliProgress("正在检查本机远程桌面权限", () => check());
+        if (!status.supported)
+            throw new Error("远程桌面支持 macOS 14 及以上的 Apple Silicon 电脑和 Windows 10/11 x64");
+        if (!status.installed)
+            throw new Error("当前 CLI 未包含远程授权组件，请升级 CLI");
+        if (status.enabled) {
+            status = await check({ action: "recheck" });
+            if (complete(status)) {
+                log("✓ 远程桌面已授权并开启共享。");
+                return true;
+            }
         }
-    }
-    const platform = context.platform ?? process.platform;
-    const confirm = context.confirm ?? (() => confirmDesktopAuthorization(platform));
-    const confirmed = await (platform === "darwin"
-        ? withCliProgress("正在等待本机授权弹窗确认", confirm)
-        : withoutCliProgress(confirm));
-    if (!confirmed) {
-        log("已跳过远程桌面授权。");
-        recoveryHint(log);
-        return false;
-    }
-    status = await request(dataDir, { action: "recheck" });
-    const wait = context.wait ?? delay;
-    if (platform === "darwin") {
-        for (const permission of ["screen", "accessibility"]) {
-            if (status[permission])
-                continue;
-            const name = permission === "screen" ? "屏幕录制" : "辅助功能";
-            log(`正在请求${name}权限，请在系统设置中允许 AgentRoam Remote Desktop…`);
-            status = await withCliProgress(`正在等待${name}权限，请在系统弹窗或设置中允许`, async () => {
-                let current = await request(dataDir, { action: "request-permission", permission });
-                for (let attempt = 0; !current[permission] && attempt < (context.pollAttempts ?? 60); attempt++) {
-                    await wait(2000);
-                    current = await request(dataDir, { action: "recheck" });
+        const platform = context.platform ?? process.platform;
+        const confirm = context.confirm ?? (() => prompt.confirm());
+        const confirmed = await withoutCliProgress(() => run(confirm));
+        if (!confirmed) {
+            log("已跳过远程桌面授权。");
+            recoveryHint(log);
+            return false;
+        }
+        status = await check({ action: "recheck" });
+        const wait = context.wait ?? ((milliseconds) => delay(milliseconds, undefined, { signal: prompt.signal }));
+        if (platform === "darwin") {
+            for (const permission of ["screen", "accessibility"]) {
+                if (status[permission])
+                    continue;
+                const name = permission === "screen" ? "屏幕录制" : "辅助功能";
+                log(`正在清理 AgentRoam 的旧${name}授权记录，以便重新请求权限…`);
+                try {
+                    await run(() => (context.resetPermission ?? resetMacDesktopPermission)(permission, prompt.signal));
+                }
+                catch (error) {
+                    prompt.signal.throwIfAborted();
+                    log(`未能清理旧${name}授权：${terminalText(error instanceof Error ? error.message : String(error))}。可在系统设置中移除 AgentRoam Remote Desktop 后重试。`);
+                }
+                log(`正在请求${name}权限，请在系统设置中允许 AgentRoam Remote Desktop…`);
+                status = await withCliProgress(`正在等待${name}权限；输入 s 后回车可跳过`, async () => {
+                    let current = await check({ action: "request-permission", permission });
+                    for (let attempt = 0; !current[permission] && attempt < (context.pollAttempts ?? 60); attempt++) {
+                        await run(() => wait(2000));
+                        current = await check({ action: "recheck" });
+                    }
+                    return current;
+                });
+                if (!status[permission]) {
+                    log(`${name}权限尚未授予，本次未开启共享。`);
+                    recoveryHint(log);
+                    return false;
                 }
-                return current;
-            });
-            if (!status[permission]) {
-                log(`${name}权限尚未授予，本次未开启共享。`);
-                recoveryHint(log);
-                return false;
             }
         }
+        if (!status.screen || !status.accessibility) {
+            log("远程桌面尚不可用，请确认系统权限及当前桌面状态，本次未开启共享。");
+            recoveryHint(log);
+            return false;
+        }
+        status = await withCliProgress("正在开启并检查远程桌面共享", () => check({ action: "enable" }));
+        if (!complete(status))
+            throw new Error(status.error ? terminalText(status.error) : "远程桌面共享未就绪，请重新检查系统权限");
+        log("✓ 远程桌面授权完成，已开启共享。手机首次连接仍需设备配对。");
+        return true;
     }
-    if (!status.screen || !status.accessibility) {
-        log("远程桌面尚不可用，请确认系统权限及当前桌面状态，本次未开启共享。");
+    catch (error) {
+        if (!prompt.signal.aborted)
+            throw error;
+        log(prompt.signal.reason instanceof DesktopAuthorizationInterrupted ? prompt.signal.reason.message : "已取消远程桌面授权。");
         recoveryHint(log);
         return false;
     }
-    status = await withCliProgress("正在开启并检查远程桌面共享", () => request(dataDir, { action: "enable" }));
-    if (!complete(status))
-        throw new Error(status.error ? terminalText(status.error) : "远程桌面共享未就绪，请重新检查系统权限");
-    log("✓ 远程桌面授权完成，已开启共享。手机首次连接仍需设备配对。");
-    return true;
+    finally {
+        prompt.close();
+    }
 }
 export async function runDesktopCommand(options, context = {}) {
     const log = context.log ?? console.log;

package/dist/device-pairing.js

@@ -1,6 +1,7 @@
 import { createInterface } from "node:readline/promises";
 import { setTimeout as delay } from "node:timers/promises";
-import { createReadStream, openSync } from "node:fs";
+import { openSync } from "node:fs";
+import { ReadStream } from "node:tty";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
@@ -66,7 +67,9 @@ function openControllingTerminal() {
     catch {
         return undefined;
     }
-    return createReadStream("/dev/tty", { fd, autoClose: true });
+    // Use libuv's cancellable TTY handle. A filesystem read on /dev/tty can keep
+    // the process alive after destroy(), waiting for one more line of input.
+    return new ReadStream(fd);
 }
 /**
  * Pick the stream the approval phrase is read from.

package/dist/local-service-request.js

@@ -13,6 +13,9 @@ export async function localServiceRequest(dataDir, path, options = {}) {
     if (!path.startsWith("/api/"))
         throw new Error("无效的本机服务路径");
     const request = options.request ?? fetch;
+    options.signal?.throwIfAborted();
+    const requestSignal = (timeoutMs) => options.signal
+        ? AbortSignal.any([options.signal, AbortSignal.timeout(timeoutMs)]) : AbortSignal.timeout(timeoutMs);
     const directory = options.registry ?? process.env.AGENTROAM_DISCOVERY_DIR ?? join(homedir(), ".agentroam", "services");
     const names = await readdir(directory).catch((error) => { if (error.code === "ENOENT")
         return []; throw error; });
@@ -25,15 +28,19 @@ export async function localServiceRequest(dataDir, path, options = {}) {
                 continue;
             if (url.protocol !== "http:" || url.hostname !== "127.0.0.1" || !url.port || url.pathname !== "/" || url.username || url.password || url.search || url.hash)
                 continue;
-            const response = await request(new URL("/api/desktop/identity", url), { headers: { "x-agentroam-desktop-token": d.token }, redirect: "error", signal: AbortSignal.timeout(1500) });
+            options.signal?.throwIfAborted();
+            const response = await request(new URL("/api/desktop/identity", url), { headers: { "x-agentroam-desktop-token": d.token }, redirect: "error", signal: requestSignal(1500) });
             if (!response.ok)
                 continue;
             const identity = await response.json();
             if (identity.protocol === 1 && identity.instanceId === d.instanceId && identity.dataDir === d.dataDir)
                 candidates.push(d);
         }
-        catch { /* Stale descriptors are expected after a process crash. */ }
+        catch {
+            options.signal?.throwIfAborted(); /* Stale descriptors are expected after a process crash. */
+        }
     }
+    options.signal?.throwIfAborted();
     if (candidates.length !== 1)
         throw new Error(candidates.length ? "多个服务使用此数据目录，请先停止多余实例" : "未找到运行中的 AgentRoam 服务，请先启动服务或指定 --data-dir");
     const d = candidates[0];
@@ -44,7 +51,7 @@ export async function localServiceRequest(dataDir, path, options = {}) {
         method: options.method ?? "GET",
         headers: { "x-agentroam-desktop-token": d.token, "content-type": "application/json", origin: new URL(d.url).origin },
         ...(options.body === undefined ? {} : { body: JSON.stringify(options.body) }),
-        redirect: "error", signal: AbortSignal.timeout(options.timeoutMs ?? 5000),
+        redirect: "error", signal: requestSignal(options.timeoutMs ?? 5000),
     });
     if (!response.ok)
         throw new LocalServiceHttpError(response.status);

package/dist/service/service-command.js

@@ -71,7 +71,7 @@ export async function runServiceCommand(options, context) {
                 }
                 else {
                     try {
-                        await (context.desktopAuthorization ?? authorizeRemoteDesktop)(options.dataDir, { platform, isTTY: stdoutIsTTY, log });
+                        await (context.desktopAuthorization ?? authorizeRemoteDesktop)(options.dataDir, { platform, isTTY: stdoutIsTTY, timeoutMs: 60_000, log });
                     }
                     catch (error) {
                         log(`远程桌面授权未完成：${error instanceof Error ? error.message : error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentroam",
-  "version": "0.2.0-preview.39",
+  "version": "0.2.0-preview.40",
   "description": "Zero-install mobile remote terminal and file console",
   "type": "module",
   "bin": {