@zonease/happy 0.6.39 → 0.6.41

package/dist/{spawnHappyCLI-D_V-AAoP.cjs → spawnHappyCLI-CarRI4GM.cjs}

@@ -3,7 +3,7 @@
 var child_process = require('child_process');
 var path = require('node:path');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
-var logger = require('./persistence-JLUn_Nou.cjs');
+var logger = require('./persistence-DrfN7TzY.cjs');
 var fs = require('node:fs');
 
 let cachedRuntime = null;

package/dist/{spawnHappyCLI-CoORX0YW.mjs → spawnHappyCLI-D3EkTFIn.mjs}

@@ -1,7 +1,7 @@
 import { spawn } from 'child_process';
 import { join } from 'node:path';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
-import { l as logger } from './persistence-BFjvtUad.mjs';
+import { l as logger } from './persistence-CIUFyOwz.mjs';
 import { existsSync } from 'node:fs';
 
 let cachedRuntime = null;

package/dist/{ssh-DL_AkRAD.mjs → ssh-B0hvEYIl.mjs}

@@ -1,105 +1,27 @@
 import { io } from 'socket.io-client';
-import { c as configuration, f as encodeBase64, e as decodeBase64, h as decrypt, g as encrypt } from './persistence-BFjvtUad.mjs';
-import { d as deviceExec, l as listDevices } from './deviceExec-D93AOVV4.mjs';
-import axios from 'axios';
-import tweetnacl from 'tweetnacl';
-import { existsSync } from 'node:fs';
-import { mkdir, writeFile, readFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
-import { hostname } from 'node:os';
-import { decryptWithEphemeralKey } from './auth-BE8dD20T.mjs';
+import { c as configuration, g as decrypt, h as decodeBase64, e as encodeBase64, f as encrypt } from './persistence-CIUFyOwz.mjs';
+import { e as ensureDeviceKey, l as listDevices, r as readCachedDeviceNames, a as readCachedDeviceKey, p as pruneDeviceAliases, d as deviceExec } from './deviceKeys-CejCdWpw.mjs';
+import { execOnDeviceViaDaemon } from './controlClient-DgjVRN8D.mjs';
+import 'node:fs/promises';
+import 'node:fs';
+import 'node:os';
+import 'node:path';
 import 'zod';
 import 'node:crypto';
+import 'tweetnacl';
 import 'chalk';
 import 'fs';
+import 'axios';
+import './auth-DS8fzlin.mjs';
 import 'qrcode-terminal';
 import './time-DgsBLJA_.mjs';
-import './browser-Dll5hxOV.mjs';
+import './browser-C05Ak6RL.mjs';
 import 'open';
 import 'react';
 import 'ink';
-
-const POLL_INTERVAL_MS = 2e3;
-const POLL_TIMEOUT_MS = 10 * 60 * 1e3;
-function deviceKeysFile() {
-  return join(configuration.happyHomeDir, "device-keys.json");
-}
-async function readDeviceKeys() {
-  const file = deviceKeysFile();
-  if (!existsSync(file)) return {};
-  try {
-    const parsed = JSON.parse(await readFile(file, "utf8"));
-    return parsed && typeof parsed === "object" ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-async function writeDeviceDirectory(entries) {
-  const file = deviceKeysFile();
-  await mkdir(dirname(file), { recursive: true });
-  const keys = await readDeviceKeys();
-  for (const entry of entries) {
-    keys[entry.id] = { name: entry.name, key: entry.key, variant: entry.variant ?? "dataKey" };
-  }
-  await writeFile(file, JSON.stringify(keys, null, 2), { mode: 384 });
-}
-async function readCachedDeviceKey(machineId) {
-  const keys = await readDeviceKeys();
-  const stored = keys[machineId];
-  if (!stored?.key) return null;
-  return { key: decodeBase64(stored.key), variant: stored.variant ?? "dataKey" };
-}
-async function readCachedDeviceNames() {
-  const keys = await readDeviceKeys();
-  return Object.fromEntries(Object.entries(keys).map(([id, entry]) => [id, entry.name]));
-}
-async function ensureDeviceKey(credentials, machineId, onPending) {
-  const cached = await readCachedDeviceKey(machineId);
-  if (cached) return cached;
-  const seed = tweetnacl.randomBytes(32);
-  const secretKey = tweetnacl.hash(seed).slice(0, 32);
-  const publicKey = tweetnacl.box.keyPair.fromSecretKey(secretKey).publicKey;
-  const created = await axios.post(
-    `${configuration.serverUrl}/v1/devices/key-requests`,
-    { machineId, publicKey: encodeBase64(publicKey), label: `happy ssh from ${hostname()}` },
-    { headers: { Authorization: `Bearer ${credentials.token}` }, timeout: 15e3 }
-  );
-  onPending?.({ id: created.data.id });
-  const deadline = Date.now() + POLL_TIMEOUT_MS;
-  while (Date.now() < deadline) {
-    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-    const status = await axios.get(
-      `${configuration.serverUrl}/v1/devices/key-requests/${created.data.id}`,
-      { headers: { Authorization: `Bearer ${credentials.token}` }, timeout: 15e3 }
-    );
-    if (status.data.expired) {
-      throw new Error("Authorization request expired. Run the command again.");
-    }
-    if (status.data.approved && status.data.response) {
-      const opened = decryptWithEphemeralKey(decodeBase64(status.data.response), secretKey);
-      if (!opened) {
-        throw new Error("Could not open the device directory returned by the app");
-      }
-      let parsed;
-      try {
-        parsed = JSON.parse(Buffer.from(opened).toString("utf8"));
-      } catch {
-        throw new Error("Device directory from the app was malformed");
-      }
-      const devices = parsed.devices ?? [];
-      if (devices.length === 0) {
-        throw new Error("The app returned an empty device directory");
-      }
-      await writeDeviceDirectory(devices);
-      const target = devices.find((device) => device.id === machineId);
-      if (!target) {
-        throw new Error("The app did not include this device in the directory");
-      }
-      return { key: decodeBase64(target.key), variant: target.variant ?? "dataKey" };
-    }
-  }
-  throw new Error("Timed out waiting for approval in the Happy app");
-}
+import './projectPath-BTBIMB57.mjs';
+import 'path';
+import 'url';
 
 function matchDevice(devices, query) {
   const lowered = query.trim().toLowerCase();
@@ -112,7 +34,12 @@ function parseSshArgs(args) {
   const command = separator >= 0 ? args.slice(separator + 1).join(" ") : null;
   let target = null;
   let timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS;
+  let stream = false;
   for (let i = 0; i < head.length; i++) {
+    if (head[i] === "--stream" || head[i] === "-s") {
+      stream = true;
+      continue;
+    }
     if (head[i] === "--timeout" || head[i] === "-t") {
       const seconds = Number(head[++i]);
       if (Number.isFinite(seconds) && seconds > 0) timeoutMs = seconds * 1e3;
@@ -120,22 +47,134 @@ function parseSshArgs(args) {
     }
     if (!target && !head[i].startsWith("-")) target = head[i];
   }
-  return { target, command: command && command.trim() ? command : null, timeoutMs };
+  return { target, command: command && command.trim() ? command : null, timeoutMs, stream };
 }
-async function runOnDevice(credentials, query, command, options = {}) {
+async function resolveFromCache(query) {
+  const names = await readCachedDeviceNames();
+  const id = pickCachedDeviceId(names, query);
+  if (!id) return null;
+  const material = await readCachedDeviceKey(id);
+  return material ? { device: { id, name: names[id] }, ...material } : null;
+}
+function pickCachedDeviceId(names, query) {
+  if (names[query]) return query;
+  const lowered = query.trim().toLowerCase();
+  for (const test of [
+    (name) => name === lowered,
+    (name) => name.startsWith(lowered),
+    (name) => name.includes(lowered)
+  ]) {
+    const matches = Object.keys(names).filter((id) => test(names[id].toLowerCase()));
+    if (matches.length === 1) return matches[0];
+    if (matches.length > 1) return null;
+  }
+  return null;
+}
+async function resolveFromServer(credentials, query) {
   const { devices } = await listDevicesWithNames(credentials);
   const device = matchDevice(devices, query);
   if (!device) {
     console.error(`No enrolled device matches "${query}". Run "happy ssh" with no arguments to list devices.`);
-    return 1;
+    return null;
   }
   if (!device.active) {
     console.error(`Device "${device.name}" is offline.`);
-    return 1;
+    return null;
   }
   const { key, variant } = await ensureDeviceKey(credentials, device.id, () => {
     console.error("Waiting for approval in the Happy app (Devices \u2192 pending request)...");
   });
+  await pruneDeviceAliases(device.id, device.name);
+  return { device, key, variant };
+}
+async function resolveDeviceForCommand(credentials, query) {
+  return await resolveFromCache(query) ?? await resolveFromServer(credentials, query);
+}
+async function runOnDevice(credentials, query, command, options = {}) {
+  const cached = await resolveFromCache(query);
+  const resolved = cached ?? await resolveFromServer(credentials, query);
+  if (!resolved) return 1;
+  if (options.stream) {
+    return await streamOnResolved(credentials, resolved, command, options);
+  }
+  const viaDaemon = await execOnDeviceViaDaemon(
+    resolved.device.id,
+    command,
+    options.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS
+  ).catch(() => null);
+  if (viaDaemon) {
+    return reportResult(viaDaemon);
+  }
+  try {
+    return await execOnResolved(credentials, resolved, command, options);
+  } catch (error) {
+    if (!cached) throw error;
+    const fresh = await resolveFromServer(credentials, query);
+    if (!fresh) return 1;
+    return await execOnResolved(credentials, fresh, command, options);
+  }
+}
+function reportResult(result) {
+  if (result.stdout) process.stdout.write(result.stdout);
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.error && !result.error.startsWith("Command failed:")) {
+    console.error(result.error);
+  }
+  return result.exitCode ?? (result.success ? 0 : 1);
+}
+async function streamOnResolved(credentials, { device, key, variant }, command, options) {
+  const socket = io(configuration.serverUrl, {
+    auth: { token: credentials.token, clientType: "user-scoped" },
+    path: "/v1/updates",
+    transports: ["websocket"]
+  });
+  await new Promise((resolve, reject) => {
+    socket.once("connect", () => resolve());
+    socket.once("connect_error", reject);
+  });
+  const timeoutMs = options.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS;
+  try {
+    const answer = await socket.timeout(3e4).emitWithAck("rpc-call", {
+      method: `${device.id}:pty-start`,
+      params: encodeBase64(encrypt(key, variant, {
+        cols: process.stdout.columns || 80,
+        rows: process.stdout.rows || 24,
+        exec: { command, timeoutMs }
+      }))
+    });
+    if (!answer?.ok) throw new Error(answer?.error || "pty-start failed");
+    const started = decrypt(key, variant, decodeBase64(answer.result));
+    if (!started?.ok || !started.ptyId) {
+      throw new Error(started?.error ?? "Device refused to start the command");
+    }
+    return await new Promise((resolve) => {
+      const execId = started.ptyId;
+      const guard = setTimeout(() => resolve(1), timeoutMs + 3e4);
+      socket.on("pty-output", (envelope) => {
+        if (envelope?.sessionId !== device.id || envelope?.ptyId !== execId) return;
+        try {
+          const frame = decrypt(key, variant, decodeBase64(envelope.data));
+          if (typeof frame?.chunk !== "string") return;
+          const target = frame.stream === "stderr" ? process.stderr : process.stdout;
+          target.write(Buffer.from(frame.chunk, "base64"));
+        } catch {
+        }
+      });
+      socket.on("pty-exit", (envelope) => {
+        if (envelope?.sessionId !== device.id || envelope?.ptyId !== execId) return;
+        clearTimeout(guard);
+        resolve(typeof envelope.exitCode === "number" ? envelope.exitCode : 1);
+      });
+      socket.on("disconnect", () => {
+        clearTimeout(guard);
+        resolve(1);
+      });
+    });
+  } finally {
+    socket.close();
+  }
+}
+async function execOnResolved(credentials, { device, key, variant }, command, options) {
   const socket = io(configuration.serverUrl, {
     auth: { token: credentials.token, clientType: "user-scoped" },
     path: "/v1/updates",
@@ -153,12 +192,7 @@ async function runOnDevice(credentials, query, command, options = {}) {
       // matchDevice already read the listing and rejected offline devices.
       skipMachineLookup: true
     });
-    if (result.stdout) process.stdout.write(result.stdout);
-    if (result.stderr) process.stderr.write(result.stderr);
-    if (result.error && !result.error.startsWith("Command failed:")) {
-      console.error(result.error);
-    }
-    return result.exitCode ?? (result.success ? 0 : 1);
+    return reportResult(result);
   } finally {
     socket.close();
   }
@@ -325,4 +359,4 @@ async function sshPickAndConnect(credentials) {
   return await sshDevice(credentials, chosen.id);
 }
 
-export { parseSshArgs, runOnDevice, sshDevice, sshPickAndConnect };
+export { parseSshArgs, pickCachedDeviceId, resolveDeviceForCommand, runOnDevice, sshDevice, sshPickAndConnect };

package/dist/{ssh-BTOlhhxi.cjs → ssh-CBgVwKsB.cjs}

@@ -1,107 +1,29 @@
 'use strict';
 
 var socket_ioClient = require('socket.io-client');
-var logger = require('./persistence-JLUn_Nou.cjs');
-var deviceExec = require('./deviceExec-CU1R9CRb.cjs');
-var axios = require('axios');
-var tweetnacl = require('tweetnacl');
-var fs = require('node:fs');
-var promises = require('node:fs/promises');
-var path = require('node:path');
-var os = require('node:os');
-var auth = require('./auth-BIleVCw0.cjs');
+var logger = require('./persistence-DrfN7TzY.cjs');
+var deviceKeys = require('./deviceKeys-BpIAWz13.cjs');
+var controlClient = require('./controlClient-DgELDZgM.cjs');
+require('node:fs/promises');
+require('node:fs');
+require('node:os');
+require('node:path');
 require('zod');
 require('node:crypto');
+require('tweetnacl');
 require('chalk');
 require('fs');
+require('axios');
+require('./auth-BQvEuSs5.cjs');
 require('qrcode-terminal');
 require('./time-Bj2HRkKH.cjs');
-require('./browser-Cc08m7of.cjs');
+require('./browser-C05SP_Tt.cjs');
 require('open');
 require('react');
 require('ink');
-
-const POLL_INTERVAL_MS = 2e3;
-const POLL_TIMEOUT_MS = 10 * 60 * 1e3;
-function deviceKeysFile() {
-  return path.join(logger.configuration.happyHomeDir, "device-keys.json");
-}
-async function readDeviceKeys() {
-  const file = deviceKeysFile();
-  if (!fs.existsSync(file)) return {};
-  try {
-    const parsed = JSON.parse(await promises.readFile(file, "utf8"));
-    return parsed && typeof parsed === "object" ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-async function writeDeviceDirectory(entries) {
-  const file = deviceKeysFile();
-  await promises.mkdir(path.dirname(file), { recursive: true });
-  const keys = await readDeviceKeys();
-  for (const entry of entries) {
-    keys[entry.id] = { name: entry.name, key: entry.key, variant: entry.variant ?? "dataKey" };
-  }
-  await promises.writeFile(file, JSON.stringify(keys, null, 2), { mode: 384 });
-}
-async function readCachedDeviceKey(machineId) {
-  const keys = await readDeviceKeys();
-  const stored = keys[machineId];
-  if (!stored?.key) return null;
-  return { key: logger.decodeBase64(stored.key), variant: stored.variant ?? "dataKey" };
-}
-async function readCachedDeviceNames() {
-  const keys = await readDeviceKeys();
-  return Object.fromEntries(Object.entries(keys).map(([id, entry]) => [id, entry.name]));
-}
-async function ensureDeviceKey(credentials, machineId, onPending) {
-  const cached = await readCachedDeviceKey(machineId);
-  if (cached) return cached;
-  const seed = tweetnacl.randomBytes(32);
-  const secretKey = tweetnacl.hash(seed).slice(0, 32);
-  const publicKey = tweetnacl.box.keyPair.fromSecretKey(secretKey).publicKey;
-  const created = await axios.post(
-    `${logger.configuration.serverUrl}/v1/devices/key-requests`,
-    { machineId, publicKey: logger.encodeBase64(publicKey), label: `happy ssh from ${os.hostname()}` },
-    { headers: { Authorization: `Bearer ${credentials.token}` }, timeout: 15e3 }
-  );
-  onPending?.({ id: created.data.id });
-  const deadline = Date.now() + POLL_TIMEOUT_MS;
-  while (Date.now() < deadline) {
-    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-    const status = await axios.get(
-      `${logger.configuration.serverUrl}/v1/devices/key-requests/${created.data.id}`,
-      { headers: { Authorization: `Bearer ${credentials.token}` }, timeout: 15e3 }
-    );
-    if (status.data.expired) {
-      throw new Error("Authorization request expired. Run the command again.");
-    }
-    if (status.data.approved && status.data.response) {
-      const opened = auth.decryptWithEphemeralKey(logger.decodeBase64(status.data.response), secretKey);
-      if (!opened) {
-        throw new Error("Could not open the device directory returned by the app");
-      }
-      let parsed;
-      try {
-        parsed = JSON.parse(Buffer.from(opened).toString("utf8"));
-      } catch {
-        throw new Error("Device directory from the app was malformed");
-      }
-      const devices = parsed.devices ?? [];
-      if (devices.length === 0) {
-        throw new Error("The app returned an empty device directory");
-      }
-      await writeDeviceDirectory(devices);
-      const target = devices.find((device) => device.id === machineId);
-      if (!target) {
-        throw new Error("The app did not include this device in the directory");
-      }
-      return { key: logger.decodeBase64(target.key), variant: target.variant ?? "dataKey" };
-    }
-  }
-  throw new Error("Timed out waiting for approval in the Happy app");
-}
+require('./projectPath-ChLhdOyt.cjs');
+require('path');
+require('url');
 
 function matchDevice(devices, query) {
   const lowered = query.trim().toLowerCase();
@@ -114,7 +36,12 @@ function parseSshArgs(args) {
   const command = separator >= 0 ? args.slice(separator + 1).join(" ") : null;
   let target = null;
   let timeoutMs = DEFAULT_COMMAND_TIMEOUT_MS;
+  let stream = false;
   for (let i = 0; i < head.length; i++) {
+    if (head[i] === "--stream" || head[i] === "-s") {
+      stream = true;
+      continue;
+    }
     if (head[i] === "--timeout" || head[i] === "-t") {
       const seconds = Number(head[++i]);
       if (Number.isFinite(seconds) && seconds > 0) timeoutMs = seconds * 1e3;
@@ -122,22 +49,134 @@ function parseSshArgs(args) {
     }
     if (!target && !head[i].startsWith("-")) target = head[i];
   }
-  return { target, command: command && command.trim() ? command : null, timeoutMs };
+  return { target, command: command && command.trim() ? command : null, timeoutMs, stream };
 }
-async function runOnDevice(credentials, query, command, options = {}) {
+async function resolveFromCache(query) {
+  const names = await deviceKeys.readCachedDeviceNames();
+  const id = pickCachedDeviceId(names, query);
+  if (!id) return null;
+  const material = await deviceKeys.readCachedDeviceKey(id);
+  return material ? { device: { id, name: names[id] }, ...material } : null;
+}
+function pickCachedDeviceId(names, query) {
+  if (names[query]) return query;
+  const lowered = query.trim().toLowerCase();
+  for (const test of [
+    (name) => name === lowered,
+    (name) => name.startsWith(lowered),
+    (name) => name.includes(lowered)
+  ]) {
+    const matches = Object.keys(names).filter((id) => test(names[id].toLowerCase()));
+    if (matches.length === 1) return matches[0];
+    if (matches.length > 1) return null;
+  }
+  return null;
+}
+async function resolveFromServer(credentials, query) {
   const { devices } = await listDevicesWithNames(credentials);
   const device = matchDevice(devices, query);
   if (!device) {
     console.error(`No enrolled device matches "${query}". Run "happy ssh" with no arguments to list devices.`);
-    return 1;
+    return null;
   }
   if (!device.active) {
     console.error(`Device "${device.name}" is offline.`);
-    return 1;
+    return null;
   }
-  const { key, variant } = await ensureDeviceKey(credentials, device.id, () => {
+  const { key, variant } = await deviceKeys.ensureDeviceKey(credentials, device.id, () => {
     console.error("Waiting for approval in the Happy app (Devices \u2192 pending request)...");
   });
+  await deviceKeys.pruneDeviceAliases(device.id, device.name);
+  return { device, key, variant };
+}
+async function resolveDeviceForCommand(credentials, query) {
+  return await resolveFromCache(query) ?? await resolveFromServer(credentials, query);
+}
+async function runOnDevice(credentials, query, command, options = {}) {
+  const cached = await resolveFromCache(query);
+  const resolved = cached ?? await resolveFromServer(credentials, query);
+  if (!resolved) return 1;
+  if (options.stream) {
+    return await streamOnResolved(credentials, resolved, command, options);
+  }
+  const viaDaemon = await controlClient.execOnDeviceViaDaemon(
+    resolved.device.id,
+    command,
+    options.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS
+  ).catch(() => null);
+  if (viaDaemon) {
+    return reportResult(viaDaemon);
+  }
+  try {
+    return await execOnResolved(credentials, resolved, command, options);
+  } catch (error) {
+    if (!cached) throw error;
+    const fresh = await resolveFromServer(credentials, query);
+    if (!fresh) return 1;
+    return await execOnResolved(credentials, fresh, command, options);
+  }
+}
+function reportResult(result) {
+  if (result.stdout) process.stdout.write(result.stdout);
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.error && !result.error.startsWith("Command failed:")) {
+    console.error(result.error);
+  }
+  return result.exitCode ?? (result.success ? 0 : 1);
+}
+async function streamOnResolved(credentials, { device, key, variant }, command, options) {
+  const socket = socket_ioClient.io(logger.configuration.serverUrl, {
+    auth: { token: credentials.token, clientType: "user-scoped" },
+    path: "/v1/updates",
+    transports: ["websocket"]
+  });
+  await new Promise((resolve, reject) => {
+    socket.once("connect", () => resolve());
+    socket.once("connect_error", reject);
+  });
+  const timeoutMs = options.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS;
+  try {
+    const answer = await socket.timeout(3e4).emitWithAck("rpc-call", {
+      method: `${device.id}:pty-start`,
+      params: logger.encodeBase64(logger.encrypt(key, variant, {
+        cols: process.stdout.columns || 80,
+        rows: process.stdout.rows || 24,
+        exec: { command, timeoutMs }
+      }))
+    });
+    if (!answer?.ok) throw new Error(answer?.error || "pty-start failed");
+    const started = logger.decrypt(key, variant, logger.decodeBase64(answer.result));
+    if (!started?.ok || !started.ptyId) {
+      throw new Error(started?.error ?? "Device refused to start the command");
+    }
+    return await new Promise((resolve) => {
+      const execId = started.ptyId;
+      const guard = setTimeout(() => resolve(1), timeoutMs + 3e4);
+      socket.on("pty-output", (envelope) => {
+        if (envelope?.sessionId !== device.id || envelope?.ptyId !== execId) return;
+        try {
+          const frame = logger.decrypt(key, variant, logger.decodeBase64(envelope.data));
+          if (typeof frame?.chunk !== "string") return;
+          const target = frame.stream === "stderr" ? process.stderr : process.stdout;
+          target.write(Buffer.from(frame.chunk, "base64"));
+        } catch {
+        }
+      });
+      socket.on("pty-exit", (envelope) => {
+        if (envelope?.sessionId !== device.id || envelope?.ptyId !== execId) return;
+        clearTimeout(guard);
+        resolve(typeof envelope.exitCode === "number" ? envelope.exitCode : 1);
+      });
+      socket.on("disconnect", () => {
+        clearTimeout(guard);
+        resolve(1);
+      });
+    });
+  } finally {
+    socket.close();
+  }
+}
+async function execOnResolved(credentials, { device, key, variant }, command, options) {
   const socket = socket_ioClient.io(logger.configuration.serverUrl, {
     auth: { token: credentials.token, clientType: "user-scoped" },
     path: "/v1/updates",
@@ -148,19 +187,14 @@ async function runOnDevice(credentials, query, command, options = {}) {
     socket.once("connect_error", reject);
   });
   try {
-    const result = await deviceExec.deviceExec(socket, credentials, device.id, command, {
+    const result = await deviceKeys.deviceExec(socket, credentials, device.id, command, {
       deviceKeyBase64: logger.encodeBase64(key),
       deviceKeyVariant: variant,
       timeout: options.timeoutMs ?? DEFAULT_COMMAND_TIMEOUT_MS,
       // matchDevice already read the listing and rejected offline devices.
       skipMachineLookup: true
     });
-    if (result.stdout) process.stdout.write(result.stdout);
-    if (result.stderr) process.stderr.write(result.stderr);
-    if (result.error && !result.error.startsWith("Command failed:")) {
-      console.error(result.error);
-    }
-    return result.exitCode ?? (result.success ? 0 : 1);
+    return reportResult(result);
   } finally {
     socket.close();
   }
@@ -176,7 +210,7 @@ async function sshDevice(credentials, query) {
     console.error(`Device "${device.name}" is offline.`);
     return 1;
   }
-  const { key, variant } = await ensureDeviceKey(credentials, device.id, () => {
+  const { key, variant } = await deviceKeys.ensureDeviceKey(credentials, device.id, () => {
     console.log("Waiting for approval in the Happy app (Devices \u2192 pending request)...");
   });
   const socket = socket_ioClient.io(logger.configuration.serverUrl, {
@@ -300,7 +334,7 @@ function pickDevice(devices) {
   });
 }
 async function listDevicesWithNames(credentials) {
-  const [devices, names] = await Promise.all([deviceExec.listDevices(credentials), readCachedDeviceNames()]);
+  const [devices, names] = await Promise.all([deviceKeys.listDevices(credentials), deviceKeys.readCachedDeviceNames()]);
   let named = false;
   const withNames = devices.map((device) => {
     const cached = names[device.id];
@@ -328,6 +362,8 @@ async function sshPickAndConnect(credentials) {
 }
 
 exports.parseSshArgs = parseSshArgs;
+exports.pickCachedDeviceId = pickCachedDeviceId;
+exports.resolveDeviceForCommand = resolveDeviceForCommand;
 exports.runOnDevice = runOnDevice;
 exports.sshDevice = sshDevice;
 exports.sshPickAndConnect = sshPickAndConnect;

package/dist/{task-CSpaC9HX.cjs → task-CMunPKCV.cjs}

@@ -2,9 +2,9 @@
 
 var chalk = require('chalk');
 var path = require('node:path');
-var logger = require('./persistence-JLUn_Nou.cjs');
-var sessionList = require('./sessionList-ICJsjNtJ.cjs');
-var sessionSummary = require('./sessionSummary-Bkz52BPh.cjs');
+var logger = require('./persistence-DrfN7TzY.cjs');
+var sessionList = require('./sessionList-DmmtC7uR.cjs');
+var sessionSummary = require('./sessionSummary-DGLoVOxd.cjs');
 var workflowCommon = require('./workflowCommon-Bl568-rt.cjs');
 require('node:fs/promises');
 require('node:fs');
@@ -14,14 +14,14 @@ require('node:crypto');
 require('tweetnacl');
 require('fs');
 require('axios');
-require('./auth-BIleVCw0.cjs');
+require('./auth-BQvEuSs5.cjs');
 require('qrcode-terminal');
 require('./time-Bj2HRkKH.cjs');
-require('./browser-Cc08m7of.cjs');
+require('./browser-C05SP_Tt.cjs');
 require('open');
 require('react');
 require('ink');
-require('./sessionKeyCache-4Tp8pJ3N.cjs');
+require('./sessionKeyCache-dDquDzn0.cjs');
 
 function printTaskHelp() {
   console.log(`