@standardagents/code 0.13.0 → 0.13.1

package/dist/index.js

@@ -632,6 +632,17 @@ var ApiClient = class {
   }
   /** Write one value to the signed-in user's account-wide KV (null deletes). */
   async userKvSet(key, value) {
+    if (key.startsWith("standardcode.machine.")) {
+      try {
+        await this.json(`/api/users/me/standardcode/machine_value`, {
+          method: "POST",
+          body: JSON.stringify({ key, value })
+        });
+        return;
+      } catch (error) {
+        if (!(error instanceof ApiHttpError) || error.status !== 404) throw error;
+      }
+    }
     await this.json(`/api/users/me/kv`, {
       method: "POST",
       body: JSON.stringify({ key, value })
@@ -3095,6 +3106,147 @@ var MessageStream = class {
     }
   }
 };
+var AccountUserStream = class {
+  constructor(api, clientId, options) {
+    this.api = api;
+    this.clientId = clientId;
+    this.options = options;
+  }
+  api;
+  clientId;
+  options;
+  ws = null;
+  closed = false;
+  started = false;
+  heartbeat = null;
+  reconnectAttempt = 0;
+  reconnectTimer = null;
+  eventListeners = /* @__PURE__ */ new Set();
+  connectionListeners = /* @__PURE__ */ new Set();
+  connected = false;
+  start() {
+    if (this.started || this.closed) return;
+    this.started = true;
+    this.openSocket();
+  }
+  onEvent(listener) {
+    this.eventListeners.add(listener);
+    return () => this.eventListeners.delete(listener);
+  }
+  onConnection(listener) {
+    this.connectionListeners.add(listener);
+    return () => this.connectionListeners.delete(listener);
+  }
+  /** Wait for a live socket. The timeout is local and performs no network work. */
+  waitUntilConnected(timeoutMs = 15e3) {
+    if (this.connected) return Promise.resolve();
+    this.start();
+    return new Promise((resolve, reject) => {
+      let timer;
+      const remove = this.onConnection((state) => {
+        if (state !== "connected") return;
+        clearTimeout(timer);
+        remove();
+        resolve();
+      });
+      timer = setTimeout(() => {
+        remove();
+        reject(new Error("The account stream did not connect in time."));
+      }, timeoutMs);
+    });
+  }
+  openSocket() {
+    if (this.closed) return;
+    const clientId = this.options.uniqueConnectionId ? `${this.clientId}:${crypto.randomBytes(8).toString("hex")}` : this.clientId;
+    let url = `${this.api.wsEndpoint}/api/users/me/stream?token=${encodeURIComponent(this.api.bearer)}&client_id=${encodeURIComponent(clientId)}&client_kind=${encodeURIComponent(this.options.clientKind)}`;
+    if (this.options.clientName) url += `&client_name=${encodeURIComponent(this.options.clientName)}`;
+    let ws;
+    try {
+      ws = new WebSocket(url);
+    } catch {
+      this.scheduleReconnect();
+      return;
+    }
+    this.ws = ws;
+    ws.addEventListener("open", () => {
+      if (this.ws !== ws) return;
+      this.connected = true;
+      this.reconnectAttempt = 0;
+      this.startHeartbeat(ws);
+      this.emitConnection("connected", 0);
+    });
+    ws.addEventListener("message", (event) => {
+      if (this.ws === ws) this.heartbeat?.markAlive();
+      this.onMessage(String(event.data));
+    });
+    ws.addEventListener("error", () => this.handleDrop(ws));
+    ws.addEventListener("close", () => this.handleDrop(ws));
+  }
+  onMessage(raw) {
+    let message;
+    try {
+      message = JSON.parse(raw);
+    } catch {
+      return;
+    }
+    if (!message || typeof message !== "object") return;
+    const frame = message;
+    if (typeof frame.event === "string") {
+      this.emitEvent(frame.event, frame.data);
+      return;
+    }
+    if (frame.type === "wake" && typeof frame.threadId === "string") {
+      this.emitEvent("standardagents.wake", { thread_id: frame.threadId });
+    }
+  }
+  emitEvent(event, data) {
+    for (const listener of this.eventListeners) listener(event, data);
+  }
+  emitConnection(state, attempt) {
+    for (const listener of this.connectionListeners) listener(state, attempt);
+  }
+  handleDrop(ws) {
+    if (this.ws !== ws) return;
+    this.ws = null;
+    this.connected = false;
+    this.stopHeartbeat();
+    this.scheduleReconnect();
+  }
+  scheduleReconnect() {
+    if (this.closed || this.reconnectTimer) return;
+    this.reconnectAttempt++;
+    this.emitConnection("reconnecting", this.reconnectAttempt);
+    const base = Math.min(500 * 2 ** (this.reconnectAttempt - 1), 15e3);
+    const delay = base + Math.floor(Math.random() * 400);
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
+      this.openSocket();
+    }, delay);
+  }
+  startHeartbeat(ws) {
+    this.stopHeartbeat();
+    this.heartbeat = new Heartbeat(ws, () => this.handleDrop(ws), { request: "stream_ping" });
+    this.heartbeat.start();
+  }
+  stopHeartbeat() {
+    this.heartbeat?.stop();
+    this.heartbeat = null;
+  }
+  close() {
+    this.closed = true;
+    this.connected = false;
+    this.stopHeartbeat();
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    const ws = this.ws;
+    this.ws = null;
+    ws?.close();
+    this.eventListeners.clear();
+    this.connectionListeners.clear();
+  }
+};
 
 // src/events-stream.ts
 var SystemEvents = class {
@@ -6492,7 +6644,7 @@ function readVersion() {
     if (typeof pkg.version === "string" && pkg.version) return pkg.version;
   } catch {
   }
-  return "0.13.0" ;
+  return "0.13.1" ;
 }
 function isLocalHost(host) {
   return host === "localhost" || host === "127.0.0.1" || host === "::1" || host.endsWith(".local") || host.endsWith(".localhost") || /^10\./.test(host) || /^192\.168\./.test(host) || /^172\.(1[6-9]|2\d|3[01])\./.test(host);
@@ -6607,6 +6759,68 @@ async function readFsResponse(api, machineId) {
 async function readFsRequest(api, machineId) {
   return parseFsRequest(await api.userKvGet(fsRequestKey(machineId)));
 }
+async function requestFsBrowse(api, accountStream, machineId, req, timeoutMs = 15e3) {
+  await accountStream.waitUntilConnected(timeoutMs);
+  const responseKey = fsResponseKey(machineId);
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    let reading = false;
+    let readAgain = false;
+    let timer;
+    let removeEvent = () => {
+    };
+    let removeConnection = () => {
+    };
+    const cleanup = () => {
+      clearTimeout(timer);
+      removeEvent();
+      removeConnection();
+    };
+    const fail = (error) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      reject(error);
+    };
+    const read = async () => {
+      if (settled) return;
+      if (reading) {
+        readAgain = true;
+        return;
+      }
+      reading = true;
+      try {
+        do {
+          readAgain = false;
+          const response = await readFsResponse(api, machineId);
+          if (response?.nonce === req.nonce) {
+            settled = true;
+            cleanup();
+            resolve(response);
+            return;
+          }
+        } while (readAgain && !settled);
+      } catch (error) {
+        fail(error);
+      } finally {
+        reading = false;
+      }
+    };
+    removeEvent = accountStream.onEvent((event, data) => {
+      if (event !== "standardcode.machine_changed") return;
+      const key = data && typeof data === "object" ? data.key : null;
+      if (key === responseKey) void read();
+    });
+    removeConnection = accountStream.onConnection((state) => {
+      if (state === "connected") void read();
+    });
+    timer = setTimeout(
+      () => fail(new Error("The remote machine did not answer in time.")),
+      timeoutMs
+    );
+    void writeFsRequest(api, machineId, req).catch(fail);
+  });
+}
 async function writeFsResponse(api, machineId, res) {
   await api.userKvSet(fsResponseKey(machineId), { ...res, responded_at: Date.now() });
 }
@@ -6756,8 +6970,11 @@ async function loadMachine(api, machineId) {
   overlayProjectNames(rec, projNames);
   return rec;
 }
+var CONNECTED_LAST_SEEN_AT = Number.MAX_SAFE_INTEGER;
 function daemonOnline(record2, now = Date.now()) {
-  return !!record2.daemon && now - record2.daemon.last_seen_at < DAEMON_ONLINE_WINDOW_MS;
+  if (!record2.daemon) return false;
+  if (typeof record2.daemon.connected === "boolean") return record2.daemon.connected;
+  return now - record2.daemon.last_seen_at < DAEMON_ONLINE_WINDOW_MS;
 }
 function newRecord(identity) {
   const now = Date.now();
@@ -6786,6 +7003,18 @@ async function updateOwnMachineRecord(api, identity, mutate) {
   await api.userKvSet(machineKey(identity.machine_id), record2);
   return record2;
 }
+async function setDaemonPresence(api, identity, version, connected, pid = process.pid) {
+  await updateOwnMachineRecord(api, identity, (record2) => {
+    const now = Date.now();
+    record2.daemon = {
+      version,
+      installed_at: record2.daemon?.installed_at ?? now,
+      last_seen_at: connected ? CONNECTED_LAST_SEEN_AT : 0,
+      connected,
+      pid
+    };
+  });
+}
 function projectRepository(projectDir) {
   try {
     const url = execFileSync("git", ["-C", projectDir, "remote", "get-url", "origin"], {
@@ -7028,22 +7257,20 @@ function parseBrowseResult(value) {
     error: typeof r.error === "string" ? r.error : void 0
   };
 }
-function remoteBrowseBackend(api, machineId, label) {
+function remoteBrowseBackend(api, accountStream, machineId, label) {
   const rpc = async (req) => {
     const nonce = crypto.randomBytes(8).toString("hex");
-    await writeFsRequest(api, machineId, { nonce, ...req });
-    const deadline = Date.now() + 15e3;
-    while (Date.now() < deadline) {
-      await new Promise((r) => setTimeout(r, 700));
-      const res = await readFsResponse(api, machineId).catch(() => null);
-      if (res && res.nonce === nonce) {
-        if (!res.ok) throw new Error(res.error || "Browse failed on the remote machine.");
-        const parsed = parseBrowseResult(res.result);
-        if (!parsed) throw new Error("The remote machine sent an unreadable listing.");
-        return parsed;
+    const res = await requestFsBrowse(api, accountStream, machineId, { nonce, ...req }).catch(
+      (error) => {
+        throw new Error(
+          error instanceof Error && error.message === "The remote machine did not answer in time." ? `${label} didn't answer \u2014 is its daemon online?` : error instanceof Error ? error.message : String(error)
+        );
       }
-    }
-    throw new Error(`${label} didn't answer \u2014 is its daemon online?`);
+    );
+    if (!res.ok) throw new Error(res.error || "Browse failed on the remote machine.");
+    const parsed = parseBrowseResult(res.result);
+    if (!parsed) throw new Error("The remote machine sent an unreadable listing.");
+    return parsed;
   };
   return {
     label,
@@ -7225,106 +7452,31 @@ async function awaitApprovalViaRelay(api, threadId, request, options = {}) {
     });
   }
 }
+
+// src/daemon-user-stream.ts
 var DaemonUserStream = class {
+  stream;
   constructor(api, clientId, hooks, clientName) {
-    this.api = api;
-    this.clientId = clientId;
-    this.hooks = hooks;
-    this.clientName = clientName;
-  }
-  api;
-  clientId;
-  hooks;
-  clientName;
-  ws = null;
-  closed = false;
-  heartbeat = null;
-  reconnectAttempt = 0;
-  reconnectTimer = null;
-  start() {
-    this.openSocket();
-  }
-  openSocket() {
-    if (this.closed) return;
-    const connectionClientId = `${this.clientId}:${crypto.randomBytes(8).toString("hex")}`;
-    let url = `${this.api.wsEndpoint}/api/users/me/stream?token=${encodeURIComponent(this.api.bearer)}&client_id=${encodeURIComponent(connectionClientId)}&client_kind=daemon`;
-    if (this.clientName) url += `&client_name=${encodeURIComponent(this.clientName)}`;
-    let ws;
-    try {
-      ws = new WebSocket(url);
-    } catch {
-      this.scheduleReconnect();
-      return;
-    }
-    this.ws = ws;
-    ws.addEventListener("open", () => {
-      this.reconnectAttempt = 0;
-      this.startHeartbeat(ws);
-      this.hooks.onConnection?.("connected", 0);
+    this.stream = new AccountUserStream(api, clientId, {
+      clientKind: "daemon",
+      clientName,
+      uniqueConnectionId: true
     });
-    ws.addEventListener("message", (event) => {
-      if (this.ws === ws) this.heartbeat?.markAlive();
-      this.onMessage(String(event.data));
-    });
-    ws.addEventListener("error", () => this.handleDrop(ws));
-    ws.addEventListener("close", () => this.handleDrop(ws));
-  }
-  onMessage(raw) {
-    let message;
-    try {
-      message = JSON.parse(raw);
-    } catch {
-      return;
-    }
-    if (!message || typeof message !== "object") return;
-    const frame = message;
-    if (typeof frame.event === "string") {
-      if (frame.event === "standardagents.wake") {
-        const threadId = frame.data?.thread_id;
-        if (typeof threadId === "string") this.hooks.onWake(threadId);
-      } else {
-        this.hooks.onEvent(frame.event, frame.data);
+    this.stream.onEvent((event, data) => {
+      if (event === "standardagents.wake") {
+        const threadId = data?.thread_id;
+        if (typeof threadId === "string") hooks.onWake(threadId);
+        return;
       }
-      return;
-    }
-    if (frame.type === "wake" && typeof frame.threadId === "string") {
-      this.hooks.onWake(frame.threadId);
-    }
-  }
-  handleDrop(ws) {
-    if (this.ws !== ws) return;
-    this.ws = null;
-    this.stopHeartbeat();
-    this.scheduleReconnect();
-  }
-  scheduleReconnect() {
-    if (this.closed || this.reconnectTimer) return;
-    this.reconnectAttempt++;
-    this.hooks.onConnection?.("reconnecting", this.reconnectAttempt);
-    const base = Math.min(500 * 2 ** (this.reconnectAttempt - 1), 15e3);
-    const delay = base + Math.floor(Math.random() * 400);
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = null;
-      this.openSocket();
-    }, delay);
-  }
-  startHeartbeat(ws) {
-    this.stopHeartbeat();
-    this.heartbeat = new Heartbeat(ws, () => this.handleDrop(ws), { request: "stream_ping" });
-    this.heartbeat.start();
+      hooks.onEvent(event, data);
+    });
+    if (hooks.onConnection) this.stream.onConnection(hooks.onConnection);
   }
-  stopHeartbeat() {
-    this.heartbeat?.stop();
-    this.heartbeat = null;
+  start() {
+    this.stream.start();
   }
   close() {
-    this.closed = true;
-    this.stopHeartbeat();
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
-    this.ws?.close();
+    this.stream.close();
   }
 };
 var PKG_NAME = "@standardagents/code";
@@ -7697,15 +7849,7 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
   process.on("unhandledRejection", (err) => {
     daemonLog(`unhandledRejection: ${err instanceof Error ? err.stack : String(err)}`);
   });
-  await updateOwnMachineRecord(api, identity, (record2) => {
-    const now = Date.now();
-    record2.daemon = {
-      version,
-      installed_at: record2.daemon?.installed_at ?? now,
-      last_seen_at: 0,
-      pid: process.pid
-    };
-  }).catch(
+  await setDaemonPresence(api, identity, version, false).catch(
     (e) => daemonLog(`machine registration failed: ${e instanceof Error ? e.message : String(e)}`)
   );
   const workers = /* @__PURE__ */ new Map();
@@ -7717,13 +7861,26 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
   let forcedUpdatePending = false;
   let restartInProgress = false;
   let shuttingDown = false;
-  function shutdown(code) {
+  let presenceWrite = Promise.resolve();
+  function publishPresence(connected) {
+    presenceWrite = presenceWrite.then(() => setDaemonPresence(api, identity, version, connected)).catch((error) => {
+      daemonLog(
+        `presence ${connected ? "publish" : "clear"} failed: ${error instanceof Error ? error.message : String(error)}`
+      );
+    });
+    return presenceWrite;
+  }
+  async function shutdown(code) {
     if (shuttingDown) return;
     shuttingDown = true;
     if (updateTimer) clearInterval(updateTimer);
     for (const worker of workers.values()) worker.stop();
     workers.clear();
     hub?.close();
+    await Promise.race([
+      publishPresence(false),
+      new Promise((resolve) => setTimeout(resolve, 2e3))
+    ]);
     daemonLog(`daemon exiting (code ${code})`);
     process.exit(code);
   }
@@ -7742,14 +7899,14 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
       daemonLog(`forced update ${ok ? "succeeded" : "failed"}: ${output4.trim().split("\n").slice(-2).join(" | ")}`);
       if (ok) {
         daemonLog("restarting to apply the forced update");
-        shutdown(0);
+        await shutdown(0);
         return;
       }
       restartInProgress = false;
     }
     if (updateReady) {
       daemonLog("restarting to apply the installed update");
-      shutdown(0);
+      await shutdown(0);
     }
   }
   const threadIsActive = (threadId) => lineActiveThreads.has(threadId) || samaActiveThreads.has(threadId);
@@ -7886,9 +8043,16 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
     }
     fsBusy = true;
     try {
-      const req = await readFsRequest(api, identity.machine_id).catch(() => null);
+      let req;
+      try {
+        req = await readFsRequest(api, identity.machine_id);
+      } catch (error2) {
+        daemonLog(`fs-browse request read failed: ${error2 instanceof Error ? error2.message : String(error2)}`);
+        return;
+      }
       if (!req || req.nonce === lastFsNonce) return;
       lastFsNonce = req.nonce;
+      daemonLog(`fs-browse ${req.op} received (${req.nonce})`);
       let ok = true;
       let result;
       let error;
@@ -7898,8 +8062,12 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
         ok = false;
         error = err instanceof Error ? err.message : "browse failed";
       }
-      await writeFsResponse(api, identity.machine_id, { nonce: req.nonce, ok, result, error }).catch(() => {
-      });
+      try {
+        await writeFsResponse(api, identity.machine_id, { nonce: req.nonce, ok, result, error });
+        daemonLog(`fs-browse ${req.op} ${ok ? "answered" : "failed"} (${req.nonce})${error ? `: ${error}` : ""}`);
+      } catch (writeError) {
+        daemonLog(`fs-browse response write failed (${req.nonce}): ${writeError instanceof Error ? writeError.message : String(writeError)}`);
+      }
     } finally {
       fsBusy = false;
       if (fsAgain) {
@@ -8001,9 +8169,11 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
         }
         if (event !== "standardcode.machine_changed") return;
         const key = data && typeof data === "object" ? data.key : null;
+        daemonLog(`machine event: ${typeof key === "string" ? key : "missing key"}`);
         if (key === `${machinePrefix}.cmd`) void drainCommands();
-        else if (key === `${machinePrefix}.fsreq`) void drainFsRequests();
-        else if (key === `${machinePrefix}.name`) {
+        else if (key === `${machinePrefix}.fsreq`) {
+          void drainFsRequests();
+        } else if (key === `${machinePrefix}.name`) {
           void getMachineName(api, identity.machine_id).then((name) => {
             displayName = name || os8.hostname();
           }).catch(() => {
@@ -8012,11 +8182,14 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
       },
       onConnection: (state, attempt) => {
         if (state === "reconnecting") {
-          if (attempt === 1) daemonLog("user stream: reconnecting");
+          if (attempt === 1) {
+            daemonLog("user stream: reconnecting");
+            void publishPresence(false);
+          }
           return;
         }
         daemonLog("user stream: connected");
-        void recoverOnConnect();
+        void publishPresence(true).then(() => recoverOnConnect());
       }
     },
     displayName
@@ -8024,8 +8197,8 @@ Run \`standardcode daemon install\` (or plain \`standardcode\`) once to sign in.
   hub.start();
   void checkUpdates();
   updateTimer = setInterval(() => void checkUpdates(), UPDATE_CHECK_MS);
-  process.on("SIGTERM", () => shutdown(0));
-  process.on("SIGINT", () => shutdown(0));
+  process.on("SIGTERM", () => void shutdown(0));
+  process.on("SIGINT", () => void shutdown(0));
   daemonLog(`daemon ready \u2014 waiting for work tagged ${runnerTag}`);
   await new Promise(() => {
   });
@@ -8372,8 +8545,8 @@ async function statusCommand() {
     return;
   }
   const online = daemonOnline(record2);
-  const streamConnected = !!record2.daemon && record2.daemon.last_seen_at > Date.now();
-  const seen = streamConnected && record2.daemon ? `user stream connected (v${record2.daemon.version})` : record2.daemon ? `last legacy heartbeat ${Math.round((Date.now() - record2.daemon.last_seen_at) / 1e3)}s ago (v${record2.daemon.version})` : "never";
+  const streamConnected = !!record2.daemon && (record2.daemon.connected ?? record2.daemon.last_seen_at > Date.now());
+  const seen = streamConnected && record2.daemon ? `user stream connected (v${record2.daemon.version})` : record2.daemon?.connected === false ? `user stream disconnected (v${record2.daemon.version})` : record2.daemon ? `last legacy heartbeat ${Math.round((Date.now() - record2.daemon.last_seen_at) / 1e3)}s ago (v${record2.daemon.version})` : "never";
   stdout.write(`${c3.bold}Registry:${c3.reset} ${online ? `${c3.green}online${c3.reset}` : `${c3.yellow}offline${c3.reset}`} \xB7 ${seen}
 `);
   const projects = Object.keys(record2.projects);
@@ -9028,6 +9201,12 @@ ${c5.dim}Press Control-C again to exit${c5.reset}
   handoffClosing = true;
   reader.rl?.close();
   const identity = loadMachineIdentity();
+  const accountStream = new AccountUserStream(api, interactiveClientId(identity), {
+    clientKind: "cli",
+    clientName: `${machine} (terminal)`
+  });
+  accountStream.start();
+  process.once("exit", () => accountStream.close());
   void registerProject(api, identity, projectDir).catch(() => {
   });
   const tui = new Tui(1);
@@ -9155,7 +9334,7 @@ ${c5.bold}This machine has no always-on daemon${c5.reset} ${c5.dim}\u2014 sessio
       session.remotePath = void 0;
       projectDir = launchDir;
       if (where) {
-        const remotePath = await pickRemoteProject(tui, api, where);
+        const remotePath = await pickRemoteProject(tui, api, accountStream, where);
         if (!remotePath) {
           step = "machine";
           continue;
@@ -9275,7 +9454,18 @@ ${c5.bold}This machine has no always-on daemon${c5.reset} ${c5.dim}\u2014 sessio
   }
   for (; ; ) {
     const agentTitle = AGENT_CHOICES.find((a) => a.id === selectedAgent)?.title ?? selectedAgent;
-    await runInteractive(tui, api, threadId, projectDir, machine, resumed, session, agentTitle, historySeed);
+    await runInteractive(
+      tui,
+      api,
+      accountStream,
+      threadId,
+      projectDir,
+      machine,
+      resumed,
+      session,
+      agentTitle,
+      historySeed
+    );
     historySeed = threadId;
     threadId = await createSessionThread();
     await api.kvSet(threadId, "lease_supersedes", historySeed);
@@ -9379,7 +9569,7 @@ async function pickLocalProject(tui, api, self, cwd, machineName) {
   if (picked !== NEW) return picked;
   return await pickDirectory(tui, localBrowseBackend(label), { startPath: cwd, loader: startLoader });
 }
-async function pickRemoteProject(tui, api, runner) {
+async function pickRemoteProject(tui, api, accountStream, runner) {
   const ENTER_PATH = "__enter_path__";
   const projects = Object.entries(runner.projects).sort(
     (a, b) => (b[1]?.last_used_at ?? 0) - (a[1]?.last_used_at ?? 0)
@@ -9401,7 +9591,7 @@ async function pickRemoteProject(tui, api, runner) {
   );
   if (!picked) return null;
   if (picked !== ENTER_PATH) return picked;
-  return await pickDirectory(tui, remoteBrowseBackend(api, runner.id, runner.name), {
+  return await pickDirectory(tui, remoteBrowseBackend(api, accountStream, runner.id, runner.name), {
     loader: startLoader
   });
 }
@@ -9469,7 +9659,7 @@ async function printHistory(api, threadId, tui) {
     else printAssistant(tui, text);
   }
 }
-async function runInteractive(tui, api, threadId, projectDir, machine, resumed, session, agentTitle, historySeedThreadId) {
+async function runInteractive(tui, api, accountStream, threadId, projectDir, machine, resumed, session, agentTitle, historySeedThreadId) {
   const remote = session.mode === "remote";
   const runnerName = session.runner?.name ?? "the remote machine";
   let currentOwner = null;
@@ -10129,7 +10319,7 @@ ${c5.gray}Close another session (its slot frees within ~90s), then resend your m
       name: "machines",
       label: "Your machines",
       hint: "list, rename, update, manage projects",
-      run: () => runMachinesMenu(tui, api, session.identity)
+      run: () => runMachinesMenu(tui, api, accountStream, session.identity)
     },
     {
       name: "daemon",
@@ -10606,7 +10796,7 @@ async function runLevelMenu(tui, perm) {
     perm.level = picked;
   }
 }
-async function runMachinesMenu(tui, api, self) {
+async function runMachinesMenu(tui, api, accountStream, self) {
   let machines;
   try {
     machines = await loadMachines(api);
@@ -10635,9 +10825,9 @@ async function runMachinesMenu(tui, api, self) {
   );
   if (!picked) return;
   const machine = machines.find((m) => m.id === picked);
-  await manageMachine(tui, api, self, machine);
+  await manageMachine(tui, api, accountStream, self, machine);
 }
-async function manageMachine(tui, api, self, machine) {
+async function manageMachine(tui, api, accountStream, self, machine) {
   const isSelf = machine.id === self.machine_id;
   const online = daemonOnline(machine);
   const canRunCommands = isSelf || !!machine.daemon;
@@ -10675,7 +10865,7 @@ async function manageMachine(tui, api, self, machine) {
       machine.icon = trimmed || void 0;
       tui.print(`${c5.green}\u2713${c5.reset} icon ${trimmed ? `set to ${trimmed}` : "reset"} for ${machine.name}`);
     }
-    return manageMachine(tui, api, self, machine);
+    return manageMachine(tui, api, accountStream, self, machine);
   }
   const dispatch = async (kind, args) => {
     if (isSelf) {
@@ -10703,10 +10893,10 @@ async function manageMachine(tui, api, self, machine) {
       tui.print(`${c5.green}\u2713${c5.reset} Update ${c5.gray}${applyNote} (its daemon updates and restarts on the new version).${c5.reset}`);
     }
   } else if (action === "projects") {
-    await manageMachineProjects(tui, api, self, machine, dispatch, applyNote);
+    await manageMachineProjects(tui, api, accountStream, self, machine, dispatch, applyNote);
   }
 }
-async function manageMachineProjects(tui, api, self, machine, dispatch, applyNote) {
+async function manageMachineProjects(tui, api, accountStream, self, machine, dispatch, applyNote) {
   const ADD = "__add__";
   const paths = Object.keys(machine.projects).sort();
   const projLabels = projectDisplayLabels(machine.projects);
@@ -10725,7 +10915,7 @@ async function manageMachineProjects(tui, api, self, machine, dispatch, applyNot
   if (!picked) return;
   if (picked === ADD) {
     const isSelf = machine.id === self.machine_id;
-    const backend = isSelf ? localBrowseBackend(machine.name) : remoteBrowseBackend(api, machine.id, machine.name);
+    const backend = isSelf ? localBrowseBackend(machine.name) : remoteBrowseBackend(api, accountStream, machine.id, machine.name);
     const chosen = await pickDirectory(tui, backend, {
       startPath: isSelf ? process.cwd() : null,
       loader: startLoader