@runuai/host 0.9.139 → 0.9.141

package/src/cli.ts

@@ -1585,12 +1585,21 @@ async function cmdSetup(rest: string[]): Promise<void> {
     process.exitCode = 1;
     return;
   }
+  // ADR-136 step 4: a replace-machine enrollment answers with the EXISTING
+  // row's id — this machine adopts it instead of its own proposal, so the
+  // runner keeps its identity (and every task created against it).
+  const outcome =
+    success && typeof success === "object" && !Array.isArray(success)
+      ? (success as Record<string, unknown>)
+      : null;
+  const replacedHostId =
+    outcome?.replaced === true && typeof outcome.hostId === "string" && outcome.hostId.length > 0
+      ? outcome.hostId
+      : null;
   if (
-    !success ||
-    typeof success !== "object" ||
-    Array.isArray(success) ||
-    (success as Record<string, unknown>).ok !== true ||
-    (success as Record<string, unknown>).hostId !== pending.hostId
+    !outcome ||
+    outcome.ok !== true ||
+    (replacedHostId === null && outcome.hostId !== pending.hostId)
   ) {
     console.error(red("enrollment outcome did not match the proposed host identity"));
     console.error(dim("the proposed identity is saved locally; retry this exact command."));
@@ -1614,7 +1623,27 @@ async function cmdSetup(rest: string[]): Promise<void> {
     process.exitCode = 1;
     return;
   }
-  console.log(green("✓ enrolled") + dim(` — config written to ${envLocalPath()}`));
+  if (replacedHostId !== null) {
+    // The pending commit wrote the proposed id; the row this machine now
+    // answers as is the replaced one. Same secret, so the bridge admits it.
+    try {
+      writeEnvValuesAtomic(envLocalPath(), { UAI_HOST_ID: replacedHostId });
+    } catch (err) {
+      console.error(
+        red(
+          `replaced, but could not record the runner id in ${envLocalPath()}: ${err instanceof Error ? err.message : String(err)}`,
+        ),
+      );
+      console.error(dim(`set UAI_HOST_ID=${replacedHostId} there by hand before starting.`));
+      process.exitCode = 1;
+      return;
+    }
+    console.log(
+      green("✓ replaced") + dim(` — this machine now answers as runner ${replacedHostId}; config written to ${envLocalPath()}`),
+    );
+  } else {
+    console.log(green("✓ enrolled") + dim(` — config written to ${envLocalPath()}`));
+  }
   printTelemetryNotice();
   console.log("");
   console.log("Start the host:");

package/src/main.ts

@@ -264,6 +264,15 @@ import {
   signInBoxAllowsCommand,
   signInBoxMode,
 } from "../lib/signin-box";
+import {
+  deleteProjectEnvStoreOnly,
+  listProjectEnvKeysStoreOnly,
+  purgeLocalUserCredentialSecrets,
+  reconcileUserCredentialMetadataFromStore,
+  setProjectEnvStoreOnly,
+} from "../lib/signin-box-credentials";
+import { loadGithubTokenIntoCache } from "../lib/github-tokens";
+import { ensureSshKeyStoreFirst } from "../lib/ssh";
 import { resumeSidecarTask } from "../lib/sidecar-resume";
 import { declareAgentClisReady } from "../lib/standard-image";
 
@@ -557,12 +566,24 @@ async function startSignInBox(): Promise<void> {
     ownerHome: process.env.UAI_OWNER_HOME?.trim() || homedir(),
     envFile: join(env.uaiHome, ".env.local"),
   });
+  const users = purgeLocalUserCredentialSecrets();
   const purged =
-    secrets.stripped + secrets.removed + slots.files.length + slots.dirs.length + slots.envKeys.length;
+    secrets.stripped +
+    secrets.removed +
+    slots.files.length +
+    slots.dirs.length +
+    slots.envKeys.length +
+    users.githubStripped +
+    users.sshStripped +
+    users.mcpStripped +
+    users.projectEnvRemoved +
+    users.unmirroredRemoved;
   if (purged > 0 || secrets.errors > 0) {
     console.warn(
       `[signin-box] purged local credentials: ${secrets.stripped} account rows stripped, ${secrets.removed} removed, ` +
-        `${slots.files.length} default-slot files, ${slots.dirs.length} stray dirs, ${slots.envKeys.length} env keys` +
+        `${slots.files.length} default-slot files, ${slots.dirs.length} stray dirs, ${slots.envKeys.length} env keys, ` +
+        `${users.githubStripped} github, ${users.sshStripped} ssh, ${users.mcpStripped} mcp rows stripped, ` +
+        `${users.projectEnvRemoved} project env rows and ${users.unmirroredRemoved} unmirrored rows removed` +
         (secrets.errors > 0 ? `, ${secrets.errors} errors` : ""),
     );
   }
@@ -572,13 +593,25 @@ async function startSignInBox(): Promise<void> {
     timer.unref?.();
   });
   try {
-    const outcome = await Promise.race([reconcileEngineAccountMetadataFromStore(), deadline]);
+    const outcome = await Promise.race([
+      Promise.all([reconcileEngineAccountMetadataFromStore(), reconcileUserCredentialMetadataFromStore()]),
+      deadline,
+    ]);
     if (outcome === "timeout") {
-      console.warn("[signin-box] account metadata reconcile did not finish in time; the list fills on the next start");
-    } else if (!outcome.skipped) {
-      console.log(
-        `[signin-box] account metadata reconciled: ${outcome.imported} imported, ${outcome.removed} removed, ${outcome.errors} errors`,
-      );
+      console.warn("[signin-box] metadata reconcile did not finish in time; the lists fill on the next start");
+    } else {
+      const [accounts, users] = outcome;
+      if (!accounts.skipped) {
+        console.log(
+          `[signin-box] account metadata reconciled: ${accounts.imported} imported, ${accounts.removed} removed, ${accounts.errors} errors`,
+        );
+      }
+      if (!users.skipped) {
+        console.log(
+          `[signin-box] user credential metadata reconciled: ${users.imported} imported, ${users.removed} removed, ` +
+            `${users.tagged} legacy parameters tagged, ${users.unreadable} unreadable, ${users.errors} errors`,
+        );
+      }
     }
   } catch (error) {
     console.warn(
@@ -1628,6 +1661,11 @@ async function connect(): Promise<void> {
                   });
                 },
               };
+              // ADR-136 sign-in box: the prior grant is not on disk; read it
+              // into the cache so an account switch still revokes it remotely.
+              if (signInBoxMode()) {
+                await loadGithubTokenIntoCache(frame.userId).catch(() => false);
+              }
               let result: Awaited<ReturnType<typeof onConnectSet>>;
               try {
                 result = await onConnectSet(
@@ -1793,6 +1831,11 @@ async function connect(): Promise<void> {
                   error: "stale GitHub credential generation",
                 };
               }
+              // ADR-136 sign-in box: the grant is not on disk; read it into
+              // the cache so the disconnect still revokes it remotely.
+              if (signInBoxMode()) {
+                await loadGithubTokenIntoCache(frame.userId).catch(() => false);
+              }
               await onConnectClear(frame.userId, {
                 invalidateCredentials: invalidateTaskGithubGitCredentials,
                 reconcile: (taskId, userId) => {
@@ -1878,6 +1921,24 @@ async function connect(): Promise<void> {
           );
           break;
         }
+        if (frame.kind === "ssh.key.ensure" && signInBoxMode()) {
+          // ADR-136 sign-in box: the keypair goes to the store first; only
+          // the public half stays here.
+          void managedMutationDrain.track(() =>
+            ensureSshKeyStoreFirst(frame.userId).then(
+              (publicKey) =>
+                send(socket, { kind: "ssh.key.ack", userId: frame.userId, ok: true, publicKey }),
+              (err) =>
+                send(socket, {
+                  kind: "ssh.key.ack",
+                  userId: frame.userId,
+                  ok: false,
+                  error: err instanceof Error ? err.message : "ssh key op failed",
+                }),
+            ),
+          );
+          break;
+        }
         try {
           const publicKey =
             frame.kind === "ssh.key.ensure"
@@ -1920,6 +1981,30 @@ async function connect(): Promise<void> {
       case "env.var.list":
       case "env.var.set":
       case "env.var.delete": {
+        if (signInBoxMode()) {
+          // ADR-136 sign-in box: no local rows — every op is a store call,
+          // and the ack lists names from the store.
+          void managedMutationDrain.track(() =>
+            (frame.kind === "env.var.set"
+              ? setProjectEnvStoreOnly(frame.projectId, frame.key, frame.value, frame.orgId)
+              : frame.kind === "env.var.delete"
+                ? deleteProjectEnvStoreOnly(frame.projectId, frame.key)
+                : Promise.resolve()
+            )
+              .then(() => listProjectEnvKeysStoreOnly(frame.projectId))
+              .then(
+                (keys) => send(socket, { kind: "env.var.ack", opId: frame.opId, ok: true, keys }),
+                (err) =>
+                  send(socket, {
+                    kind: "env.var.ack",
+                    opId: frame.opId,
+                    ok: false,
+                    error: err instanceof Error ? err.message : "env var op failed",
+                  }),
+              ),
+          );
+          break;
+        }
         try {
           if (frame.kind === "env.var.set") {
             setProjectEnvVar(frame.projectId, frame.key, frame.value, frame.orgId);

package/src/protocol.ts

@@ -1489,27 +1489,33 @@ export interface HostCommands {
    * exactly like the local API; re-advertises capabilities on success. */
   engineAccountRemove(
     ctx: CommandContext,
-    input: { id: string; scope?: string },
+    input: { id: string; scope?: string; hostId?: string },
   ): Promise<HostCommandResult<{ removed: boolean; message?: string }>>;
   /** Manage-v1: relabel an extra account (never `default:*`); a scope may
    * rename only its own accounts. Re-advertises on success. */
   engineAccountRename(
     ctx: CommandContext,
-    input: { id: string; label: string; scope?: string },
+    input: { id: string; label: string; scope?: string; hostId?: string },
   ): Promise<HostCommandResult<{ renamed: boolean; message?: string }>>;
   /** Manage-v1: set the priority order of a kind's extra accounts within a
    * scope — `ids` must be exactly that set. Tasks pick the first healthy
    * account in this order. Re-advertises on success. */
   engineAccountReorder(
     ctx: CommandContext,
-    input: { kind: string; ids: string[]; scope?: string },
+    input: { kind: string; ids: string[]; scope?: string; hostId?: string },
   ): Promise<HostCommandResult<{ reordered: boolean; message?: string }>>;
   /** Disconnect-v1: forget the host's DEFAULT credential for an engine — the
    * .env.local key and/or the login file the adapter detects. Extras are
-   * untouched (remove them by id). Re-advertises on success. */
+   * untouched (remove them by id). Re-advertises on success.
+   *
+   * `hostId` on the four account commands above: the runner the account lives
+   * on. The cloud's bridge routes by it (2026-09-14: without it these fell to
+   * the any-open-host fallback and landed on whichever runner connected
+   * first — the label step after a sign-in answered "That account no longer
+   * exists" and Disconnect did nothing). The host ignores the field. */
   engineDisconnect(
     ctx: CommandContext,
-    input: { engine: EngineConnectKind },
+    input: { engine: EngineConnectKind; hostId?: string },
   ): Promise<HostCommandResult<{ disconnected: boolean; message?: string }>>;
   cloneRepo(
     ctx: CommandContext,