@beeuni/agent-tunnel 0.1.1 → 0.1.3

package/README.md

@@ -68,7 +68,10 @@ It starts at login, and the supervisor restarts it after every exit (launchd
 `KeepAlive` with a 10 s throttle, systemd `Restart=always`, a 5 s Windows loop).
 On Linux, install enables `loginctl enable-linger` so the user service keeps
 running after logout and starts at boot; when that is not allowed, install
-prints a warning. The Windows task runs hidden, on battery, with no time limit.
+prints a warning. The Windows task runs PowerShell under `conhost --headless`
+(no console window, also where Windows Terminal is the default terminal), on
+battery, with no time limit. Every process the agent starts on Windows sets
+`windowsHide`, so no console window opens.
 The agent itself never stops on its own:
 
 - It reconnects with exponential backoff from 1 s to 30 s, ±20 % jitter, forever.
@@ -181,9 +184,10 @@ change to the agent as `tunnel.access.set`:
 A pairing made from the Beeuni desktop app starts in `ask`: the app shows the
 prompt. A pairing made with this CLI alone starts in `always`, because nothing
 on the machine could answer a prompt. This is a deliberate deviation from
-"new pairings default to ask". Every new pairing resets `access.json`, so a
-grant or `always` from an earlier pairing never carries over, and `logout`
-deletes it. The agent home (`config.json`, `access.json`, `desktop-app.json`)
+"new pairings default to ask". The mode and keep awake are the owner's
+machine settings: pairing again (`--reauth`, a rejected or stale credential)
+keeps them, and only a grant or a denial from the earlier pairing is dropped.
+`logout` deletes `access.json`, so the next pairing starts from the default. The agent home (`config.json`, `access.json`, `desktop-app.json`)
 is always a blocked path: no file or shell call can change these files.
 
 The agent reports its state to Beeuni as the signed notification
@@ -233,9 +237,16 @@ you trust with this computer.
 
 ## Computer Use driver
 
-Agent Tunnel never downloads or executes a desktop driver. Install `cua-driver`
-locally before enabling Computer Use. The tunnel uses an existing binary from
-`CUA_DRIVER_BIN`, `~/.local/bin`, `/usr/local/bin`, or `/opt/homebrew/bin`.
+Agent Tunnel never downloads or executes a desktop driver. The Beeuni desktop
+app bundles `cua-driver` on macOS and Windows (x64), and the agent it runs uses
+that copy. A CLI install uses an existing binary from `CUA_DRIVER_BIN`,
+`~/.local/bin`, `/usr/local/bin`, or `/opt/homebrew/bin`.
+
+An approved `desktop` registers whenever the driver is present. Missing macOS
+grants do not unregister it: the agent reports `desktopPermissions` and the
+setup asks for them. When the driver is missing or rejected (wrong owner,
+group-writable), `desktop` does not register and the reason is reported as
+`unavailableCapabilities.desktop` in `status --json` and in `machineInfo`.
 Treat that binary as trusted local code. Agent Tunnel does not verify or update
 it.
 

package/dist/agent-cli.js

@@ -3516,6 +3516,15 @@ function writePrivateJson(file, home, value) {
 function writeAccess(state, home = agentTunnelHome()) {
   writePrivateJson(accessFilePath(home), home, state);
 }
+function accessAfterPairing(home, desktopApp) {
+  const kept = existsSync2(accessFilePath(home)) ? readAccess(home) : null;
+  return {
+    mode: kept?.mode ?? (desktopApp ? "ask" : "always"),
+    grantedUntil: null,
+    deniedUntil: null,
+    keepAwake: kept?.keepAwake ?? false
+  };
+}
 function decideAccess(state, now = Date.now()) {
   if (state.mode === "always")
     return "run";
@@ -3803,7 +3812,7 @@ function machineDisplayName({
   os = platform2(),
   host = hostname(),
   env = process.env,
-  run = (command, args) => execFileSync(command, args, { encoding: "utf8", timeout: 1000, stdio: ["ignore", "pipe", "ignore"] })
+  run = (command, args) => execFileSync(command, args, { encoding: "utf8", timeout: 1000, stdio: ["ignore", "pipe", "ignore"], windowsHide: true })
 } = {}) {
   const fallback = host.replace(/\.local$/i, "") || host;
   try {
@@ -3815,7 +3824,7 @@ function machineDisplayName({
 }
 function machineId({
   os = platform2(),
-  run = (command, args) => execFileSync(command, args, { encoding: "utf8", timeout: 2000, stdio: ["ignore", "pipe", "ignore"] }),
+  run = (command, args) => execFileSync(command, args, { encoding: "utf8", timeout: 2000, stdio: ["ignore", "pipe", "ignore"], windowsHide: true }),
   read = (path) => readFileSync4(path, "utf8")
 } = {}) {
   const attempt = (source) => {
@@ -4036,6 +4045,10 @@ function verifyMessageSignature(signingKey, payload, nonce, signature) {
 
 // src/agent/agent.ts
 var AGENT_VERSION = agentTunnelVersion();
+function openRelaySocket(url) {
+  const RelaySocket = WebSocket;
+  return new RelaySocket(url, { headers: { "User-Agent": `beeuni-agent-tunnel/${AGENT_VERSION}` } });
+}
 var AUTH_REJECTED_CLOSE_CODES = [4001, 4003];
 var RELAY_FAULT_4001_REASONS = new Set(["auth timeout", "authentication error", "authentication response failed"]);
 function isCredentialRejection(code, reason = "") {
@@ -4137,7 +4150,7 @@ class TunnelAgent {
     this.connectStartedAt = this.now();
     this.setStatus("connecting");
     try {
-      this.ws = new WebSocket(new URL(wsUrl));
+      this.ws = openRelaySocket(new URL(wsUrl).href);
       this.setupWsHandlers();
     } catch (err) {
       log(`${c.red}✗${c.reset}`, `Connection failed`);
@@ -4456,7 +4469,8 @@ class TunnelAgent {
           osVersion: release(),
           agentVersion: AGENT_VERSION,
           homeDir: this.config.workingDir,
-          allowedPaths: this.config.allowedPaths
+          allowedPaths: this.config.allowedPaths,
+          unavailableCapabilities: Object.fromEntries(this.registry.unavailable)
         }
       }
     });
@@ -4581,7 +4595,7 @@ class TunnelAgent {
     const blocker = keepAwakeCommand(platform3(), process.pid);
     if (!blocker)
       return;
-    const child = spawn3(blocker.command, blocker.args, { stdio: "ignore" });
+    const child = spawn3(blocker.command, blocker.args, { stdio: "ignore", windowsHide: true });
     child.on("error", () => {
       this.keepAwakeFailed = true;
       log(`${c.yellow}!${c.reset}`, `Keep awake is unavailable: ${blocker.command} could not start`);
@@ -4749,6 +4763,7 @@ async function printStartupBanner({
 // src/agent/capabilities/index.ts
 class CapabilityRegistry {
   capabilities = new Map;
+  unavailable = new Map;
   register(capability) {
     this.capabilities.set(capability.name, capability);
   }
@@ -4774,7 +4789,7 @@ class CapabilityRegistry {
 // src/agent/capabilities/desktop/cua-driver.ts
 import { spawn as spawn4 } from "child_process";
 import { existsSync as existsSync3, readFileSync as readFileSync6, realpathSync, rmSync as rmSync2, statSync as statSync2 } from "fs";
-import { homedir as homedir3, platform as platform5, tmpdir } from "os";
+import { homedir as homedir3, platform as platform5, tmpdir, userInfo } from "os";
 import { basename as basename2, dirname as dirname3, join as join5 } from "path";
 var MAX_DRIVER_OUTPUT_BYTES = 5 * 1024 * 1024;
 var DRIVER_ENV_KEYS = [
@@ -4789,7 +4804,19 @@ var DRIVER_ENV_KEYS = [
   "WAYLAND_DISPLAY",
   "XDG_RUNTIME_DIR",
   "XAUTHORITY",
-  "DBUS_SESSION_BUS_ADDRESS"
+  "DBUS_SESSION_BUS_ADDRESS",
+  "SystemRoot",
+  "windir",
+  "USERPROFILE",
+  "USERNAME",
+  "USERDOMAIN",
+  "APPDATA",
+  "LOCALAPPDATA",
+  "ProgramData",
+  "TEMP",
+  "TMP",
+  "ComSpec",
+  "PATHEXT"
 ];
 function driverEnvironment(extra = {}) {
   const env = { CUA_DRIVER_RS_TELEMETRY_ENABLED: "0" };
@@ -4852,7 +4879,8 @@ function execFile(cmd, args, timeoutMs = 30000, env = driverEnvironment()) {
   return new Promise((resolve2, reject) => {
     const proc = spawn4(cmd, args, {
       stdio: ["ignore", "pipe", "pipe"],
-      env
+      env,
+      windowsHide: true
     });
     let stdout = "";
     let stderr = "";
@@ -4939,9 +4967,8 @@ class CuaDriver {
   constructor(options = {}) {
     this.binary = options.binary ?? null;
     this.embedded = options.embedded;
-    const uid = typeof process.getuid === "function" ? process.getuid() : "user";
     const home = serviceLabelFor(agentTunnelHome()).slice(SERVICE_LABEL.length);
-    this.socketPath = options.socketPath ?? join5(tmpdir(), `beeuni-cua-${uid}${home}.sock`);
+    this.socketPath = options.socketPath ?? (process.platform === "win32" ? `\\\\.\\pipe\\beeuni-cua-${userInfo().username}${home}` : join5(tmpdir(), `beeuni-cua-${typeof process.getuid === "function" ? process.getuid() : "user"}${home}.sock`));
     this.hostBundleId = options.hostBundleId;
   }
   isEmbedded(binary) {
@@ -4950,10 +4977,11 @@ class CuaDriver {
   mode(binary) {
     if (!this.isEmbedded(binary))
       return { env: driverEnvironment(), socket: [] };
+    const bundleId = this.hostBundleId ?? hostBundleId();
     return {
       env: driverEnvironment({
         CUA_DRIVER_EMBEDDED: "1",
-        CUA_DRIVER_HOST_BUNDLE_ID: this.hostBundleId ?? hostBundleId()
+        ...bundleId ? { CUA_DRIVER_HOST_BUNDLE_ID: bundleId } : {}
       }),
       socket: ["--socket", this.socketPath]
     };
@@ -5027,7 +5055,8 @@ class CuaDriver {
       const child = spawn4("open", ["-n", "-g", "-a", "CuaDriver", "--args", "serve"], {
         detached: true,
         stdio: "ignore",
-        env: driverEnvironment()
+        env: driverEnvironment(),
+        windowsHide: true
       });
       child.unref();
       await sleep2(750);
@@ -5035,7 +5064,8 @@ class CuaDriver {
       const child = spawn4(bin, ["serve"], {
         detached: true,
         stdio: "ignore",
-        env: driverEnvironment()
+        env: driverEnvironment(),
+        windowsHide: true
       });
       child.unref();
       await sleep2(750);
@@ -5052,7 +5082,11 @@ class CuaDriver {
     if (this.daemon && this.daemon.exitCode === null)
       return;
     const { env, socket } = this.mode(bin);
-    if (existsSync3(this.socketPath)) {
+    if (process.platform === "win32") {
+      await execFile(bin, ["stop", ...socket], 1e4, env).catch(() => {
+        return;
+      });
+    } else if (existsSync3(this.socketPath)) {
       await execFile(bin, ["stop", ...socket], 1e4, env).catch(() => {
         return;
       });
@@ -5060,7 +5094,8 @@ class CuaDriver {
     }
     const child = spawn4(bin, ["serve", "--embedded", "--no-permissions-gate", ...socket], {
       stdio: "ignore",
-      env
+      env,
+      windowsHide: true
     });
     child.unref();
     child.on("exit", () => {
@@ -5071,16 +5106,23 @@ class CuaDriver {
     });
     this.daemon = child;
     process.once("exit", () => child.kill());
-    for (let waited = 0;waited < 1e4 && !existsSync3(this.socketPath); waited += 50) {
+    const started = Date.now();
+    while (Date.now() - started < 1e4 && !await this.endpointUp(bin)) {
       if (child.exitCode !== null)
         break;
       await sleep2(50);
     }
-    if (!existsSync3(this.socketPath)) {
+    if (!await this.endpointUp(bin)) {
       child.kill();
       throw new Error("cua-driver did not start (no socket after 10 s)");
     }
   }
+  async endpointUp(bin) {
+    if (process.platform !== "win32")
+      return existsSync3(this.socketPath);
+    const { env, socket } = this.mode(bin);
+    return execFile(bin, ["status", ...socket], 5000, env).then(({ stdout }) => !/not\s+running|unhealthy/i.test(stdout), () => false);
+  }
   async permissionOwner() {
     return this.isEmbedded(await this.ensureInstalled()) ? "Beeuni" : "CuaDriver";
   }
@@ -5101,7 +5143,7 @@ class CuaDriver {
   async ensureDaemonReady() {
     const bin = await this.ensureInstalled();
     if (this.isEmbedded(bin)) {
-      if (this.daemon?.exitCode === null && existsSync3(this.socketPath))
+      if (this.daemon?.exitCode === null && (process.platform === "win32" ? this.daemonReady : existsSync3(this.socketPath)))
         return;
       this.stop();
       await this.startDaemon();
@@ -5547,7 +5589,8 @@ function createShellCapability(config) {
         cwd,
         shell: false,
         timeout,
-        env: safeEnv
+        env: safeEnv,
+        windowsHide: true
       });
       let stdout = "";
       let stderr = "";
@@ -5603,6 +5646,14 @@ function createShellCapability(config) {
 }
 
 // src/agent/capabilities/enabled-registry.ts
+var DRIVER_NOT_FOUND = "cua-driver was not found. The Beeuni desktop app bundles it on macOS and Windows; a CLI install needs it in CUA_DRIVER_BIN, ~/.local/bin, /usr/local/bin or /opt/homebrew/bin.";
+function desktopUnavailableReason(findDesktopDriver = findCuaDriverBinary) {
+  try {
+    return findDesktopDriver() ? null : DRIVER_NOT_FOUND;
+  } catch (error) {
+    return error instanceof Error ? error.message : String(error);
+  }
+}
 function createEnabledCapabilityRegistry(config, findDesktopDriver = findCuaDriverBinary, desktop = {}) {
   const registry = new CapabilityRegistry;
   const enabled = new Set(config.enabledCapabilities ?? ["filesystem", "shell", "desktop"]);
@@ -5610,8 +5661,12 @@ function createEnabledCapabilityRegistry(config, findDesktopDriver = findCuaDriv
     registry.register(createFilesystemCapability(config));
   if (enabled.has("shell"))
     registry.register(createShellCapability(config));
-  if (enabled.has("desktop") && findDesktopDriver()) {
-    registry.register(createDesktopCapability(desktop));
+  if (enabled.has("desktop")) {
+    const reason = desktopUnavailableReason(findDesktopDriver);
+    if (reason)
+      registry.unavailable.set("desktop", reason);
+    else
+      registry.register(createDesktopCapability(desktop));
   }
   return registry;
 }
@@ -5677,17 +5732,17 @@ function probeCredentials(config, options = {}) {
   return new Promise((resolve3) => {
     let socket;
     try {
-      socket = new WebSocket(new URL(buildTunnelWsUrl(config)));
+      socket = openRelaySocket(new URL(buildTunnelWsUrl(config)).href);
     } catch {
       resolve3("unreachable");
       return;
     }
     const settle = (result) => {
       clearTimeout(timer);
+      resolve3(result);
       try {
         socket.close(1000, "probe complete");
       } catch {}
-      resolve3(result);
     };
     const timer = setTimeout(() => settle("unreachable"), options.timeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS);
     socket.addEventListener("open", () => {
@@ -5760,7 +5815,7 @@ import { join as join10 } from "path";
 // src/agent/service-drivers.ts
 import { spawnSync } from "child_process";
 import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync8, rmSync as rmSync4, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir4, platform as platform6, userInfo } from "os";
+import { homedir as homedir4, platform as platform6, userInfo as userInfo2 } from "os";
 import { dirname as dirname6, join as join9 } from "path";
 
 // src/agent/service-quoting.ts
@@ -5783,7 +5838,7 @@ function posixShellCommand(runner) {
 }
 var supervisor = {
   run(command, args) {
-    const result = spawnSync(command, args, { encoding: "utf8" });
+    const result = spawnSync(command, args, { encoding: "utf8", windowsHide: true });
     return {
       ok: result.status === 0,
       detail: [result.stdout, result.stderr].filter(Boolean).join(`
@@ -5801,7 +5856,7 @@ function joinDetails(...results) {
 `);
 }
 function launchdTarget() {
-  const uid = typeof process.getuid === "function" ? process.getuid() : userInfo().uid;
+  const uid = typeof process.getuid === "function" ? process.getuid() : userInfo2().uid;
   return `gui/${uid}`;
 }
 function logPaths(paths) {
@@ -5874,7 +5929,8 @@ function renderWindowsPowerShellScript(runner) {
   const args = runner.args.map(powershellQuote).join(" ");
   const env = Object.entries(runner.env ?? {}).map(([key, value]) => `$env:${key} = ${powershellQuote(value)}
 `).join("");
-  return `$ErrorActionPreference = 'Continue'
+  return `# Run by the Beeuni task under conhost --headless: no console window.
+$ErrorActionPreference = 'Continue'
 ${env}while ($true) {
   # The pipe makes PowerShell wait for a GUI-subsystem binary (the desktop
   # app's Beeuni.exe) and set $LASTEXITCODE; a bare call returns at once.
@@ -5934,7 +5990,7 @@ var launchd = {
   },
   status(paths, installed) {
     const disabled = run("launchctl", ["print-disabled", launchdTarget()]);
-    const enabled = !new RegExp(`"${paths.label.replace(/\./g, "\\.")}" => (disabled|true)`).test(disabled.detail);
+    const enabled = ![`"${paths.label}" => disabled`, `"${paths.label}" => true`].some((line) => disabled.detail.includes(line));
     const status = run("launchctl", ["print", `${launchdTarget()}/${paths.label}`]);
     return {
       active: status.ok,
@@ -5989,7 +6045,7 @@ var systemd = {
   }
 };
 function ensureLinger() {
-  const user = userInfo().username;
+  const user = userInfo2().username;
   const linger = run("loginctl", ["show-user", user, "-p", "Linger"]);
   if (/Linger=yes/.test(linger.detail))
     return { ok: true, detail: "" };
@@ -6014,11 +6070,11 @@ function renderWindowsTaskXml(paths, user) {
     <StartWhenAvailable>true</StartWhenAvailable>
     <Enabled>true</Enabled>
   </Settings>
-  <Actions Context="Author"><Exec><Command>powershell.exe</Command><Arguments>${xmlEscape(`-NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "${paths.windowsScript}"`)}</Arguments></Exec></Actions>
+  <Actions Context="Author"><Exec><Command>conhost.exe</Command><Arguments>${xmlEscape(`--headless powershell.exe -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -File "${paths.windowsScript}"`)}</Arguments></Exec></Actions>
 </Task>
 `;
 }
-var windowsUser = () => process.env.USERDOMAIN ? `${process.env.USERDOMAIN}\\${userInfo().username}` : userInfo().username;
+var windowsUser = () => process.env.USERDOMAIN ? `${process.env.USERDOMAIN}\\${userInfo2().username}` : userInfo2().username;
 var windowsTaskXmlPath = (paths) => paths.windowsScript.replace(/\.ps1$/, ".xml");
 var scheduledTask = {
   unitPath: (paths) => paths.windowsScript,
@@ -6382,9 +6438,9 @@ function startAgent(config, options = {}) {
   const registry = createEnabledCapabilityRegistry(config, undefined, {
     onPermissionMissing: restart?.permissionMissing
   });
-  if (config.enabledCapabilities?.includes("desktop") && !registry.has("desktop")) {
-    console.error("[agent-tunnel] Computer Use is approved but unavailable: install the trusted cua-driver locally, then restart Agent Tunnel.");
-  }
+  const desktopReason = registry.unavailable.get("desktop");
+  if (desktopReason)
+    console.error(`[agent-tunnel] Computer Use is approved but unavailable: ${desktopReason}`);
   if (options.service) {
     process.stdout.write(`[agent-tunnel] service starting: ${config.tunnelId} -> ${config.apiUrl}
 `);
@@ -6401,7 +6457,6 @@ function startAgent(config, options = {}) {
     persistent: options.service === true,
     reloadConfig: () => loadConfig({ apiUrl: config.apiUrl })
   });
-  agent.connect();
   const shutdown = () => {
     if (!options.service)
       console.log(`
@@ -6411,6 +6466,7 @@ ${c.dim}  Shutting down…${c.reset}`);
   };
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
+  agent.connect();
 }
 function chooseBackgroundMode(flags) {
   if (anyFlag(flags, BACKGROUND_FLAGS))
@@ -6521,12 +6577,7 @@ async function pairThisMachine(apiUrl, flags, lease) {
     process.exit(1);
   }
   saveCredentials(outcome.tunnelId, outcome.token, apiUrl, outcome.capabilities);
-  writeAccess({
-    mode: existsSync7(desktopAppPath()) ? "ask" : "always",
-    grantedUntil: null,
-    deniedUntil: null,
-    keepAwake: readAccess().keepAwake
-  });
+  writeAccess(accessAfterPairing(agentTunnelHome(), existsSync7(desktopAppPath())));
   if (jsonMode) {
     emit("approved", { tunnelId: outcome.tunnelId, capabilities: outcome.capabilities });
   } else {
@@ -6633,12 +6684,14 @@ function commandStatus(flags) {
   const service = getServiceStatus();
   const paired = Boolean(config.token && config.tunnelId);
   const approved = new Set(config.enabledCapabilities ?? []);
+  const desktopReason = approved.has("desktop") ? desktopUnavailableReason() : null;
   if (isTruthyFlag(flags.json)) {
     console.log(JSON.stringify({
       paired,
       tunnelId: paired ? config.tunnelId : null,
       apiUrl: config.apiUrl,
       capabilities: [...approved],
+      unavailableCapabilities: desktopReason ? { desktop: desktopReason } : {},
       version: agentTunnelVersion(),
       home: agentTunnelHome(),
       serviceLabel: getServicePaths().label,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beeuni/agent-tunnel",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "private": false,
   "type": "module",
   "description": "Tunnel relay between cloud AI agents and local machines — server relay, local agent, client SDK, JSON-RPC, HMAC signing",
@@ -12,6 +12,12 @@
     "dist/",
     "README.md"
   ],
+  "scripts": {
+    "build": "bun build src/agent/cli.ts --target=node --outfile=dist/agent-cli.js --banner='#!/usr/bin/env node' && bun build src/client/cli.ts --target=node --outfile=dist/client-cli.js --banner='#!/usr/bin/env node' && node -e \"const fs=require('node:fs'); fs.chmodSync('dist/agent-cli.js', 0o755); fs.chmodSync('dist/client-cli.js', 0o755);\"",
+    "prepack": "bun run build",
+    "typecheck": "tsc --noEmit",
+    "test": "bun test --timeout ${BEEUNI_TEST_TIMEOUT_MS:-15000}"
+  },
   "dependencies": {
     "hono": "^4.13.7",
     "ws": "^8.18.0"