@runuai/host 0.8.1 → 0.8.2

package/lib/codex-auth.ts

@@ -0,0 +1,155 @@
+/**
+ * Codex credential re-injection — the symmetric partner to the GitHub reinject
+ * in {@link ./github-tokens} (ADR-027/033 → host 0.8.1).
+ *
+ * The host owner's `~/.codex` is docker-cp'd into each task container ONCE, at
+ * task-up (`scripts/agent/task-up.sh`). When the owner re-logs into Codex —
+ * the refresh token gets revoked (a login elsewhere) and `codex login` rewrites
+ * `~/.codex/auth.json` — already-running containers keep their stale copy, so a
+ * re-login otherwise only helps NEW tasks. This re-copies the fresh `~/.codex`
+ * into the running task containers so live tasks self-heal.
+ *
+ * Two triggers, covering both re-login paths:
+ *   - {@link watchCodexAuth} — fs.watch on `~/.codex`, for `codex login` run
+ *     from a terminal while the host stays up.
+ *   - {@link reinjectCodexRunningTasks} at host start — for the desktop
+ *     "Connect Codex" flow, which writes `~/.codex` then restarts the host
+ *     (durable sessions reattach to containers that still hold the old creds).
+ *
+ * Codex auth is host-wide (the operator's single `~/.codex`, not per-user), so
+ * this targets ALL running tasks — matching task-up, which copies it into every
+ * container regardless of roster.
+ */
+import { existsSync, watch } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+import { isNull } from "drizzle-orm";
+
+import { getDb, schema } from "./db";
+import { dockerCli } from "./docker-exec";
+
+/** The exact set task-up.sh copies into `/home/node/.codex`. */
+const CODEX_ITEMS = [
+  "auth.json",
+  "config.toml",
+  "AGENTS.md",
+  "version.json",
+  "installation_id",
+  "rules",
+] as const;
+const EXEC_TIMEOUT_MS = 15_000;
+
+/** Injectable seams (defaults hit the real DB / docker / fs) so the copy logic
+ *  is testable without either. */
+export interface CodexDeps {
+  exec?: (args: string[]) => Promise<{ status: number | null; stderr: string }>;
+  runningContainers?: () => string[];
+  fileExists?: (path: string) => boolean;
+}
+
+function ownerCodexDir(): string {
+  return join(process.env.UAI_OWNER_HOME?.trim() || homedir(), ".codex");
+}
+
+const defaultExec: NonNullable<CodexDeps["exec"]> = async (args) => {
+  const res = await dockerCli(args, { timeoutMs: EXEC_TIMEOUT_MS });
+  return { status: res.status, stderr: res.stderr };
+};
+
+function defaultRunningContainers(): string[] {
+  return getDb()
+    .select({ taskId: schema.hostTasks.taskId })
+    .from(schema.hostTasks)
+    .where(isNull(schema.hostTasks.endedAt))
+    .all()
+    .map((r) => `task-${r.taskId}-app-1`);
+}
+
+/**
+ * Re-copy `~/.codex/<items>` into one container — mirrors task-up.sh exactly:
+ * ensure the dir (root), cp each item that exists, chown back to node. Best
+ * effort; a stopped/removed container makes the exec fail and is caught by the
+ * caller.
+ */
+async function copyCodexInto(container: string, deps: CodexDeps): Promise<void> {
+  const exec = deps.exec ?? defaultExec;
+  const exists = deps.fileExists ?? existsSync;
+  const dir = ownerCodexDir();
+  await exec(["exec", "-u", "root", container, "mkdir", "-p", "/home/node/.codex"]);
+  for (const item of CODEX_ITEMS) {
+    const src = join(dir, item);
+    if (!exists(src)) continue;
+    await exec(["cp", src, `${container}:/home/node/.codex/`]);
+  }
+  await exec([
+    "exec",
+    "-u",
+    "root",
+    container,
+    "chown",
+    "-R",
+    "node:node",
+    "/home/node/.codex",
+  ]);
+}
+
+/**
+ * Re-copy the freshly (re)logged-in `~/.codex` into every running task
+ * container on this host. No-op when there is no `~/.codex/auth.json` (nothing
+ * to inject) or no running tasks. Best-effort per container.
+ */
+export async function reinjectCodexRunningTasks(deps: CodexDeps = {}): Promise<void> {
+  const exists = deps.fileExists ?? existsSync;
+  if (!exists(join(ownerCodexDir(), "auth.json"))) return;
+  const containers = (deps.runningContainers ?? defaultRunningContainers)();
+  if (containers.length === 0) return;
+  console.log(`[codex] re-copying ~/.codex into ${containers.length} running task(s)`);
+  for (const container of containers) {
+    try {
+      await copyCodexInto(container, deps);
+    } catch (err) {
+      console.warn(
+        `[codex] reinject into ${container} failed: ${err instanceof Error ? err.message : err}`,
+      );
+    }
+  }
+}
+
+let watcher: ReturnType<typeof watch> | null = null;
+let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+
+/**
+ * Watch `~/.codex` for `auth.json` changes (a re-login) and re-inject into
+ * running tasks, debounced (a login writes several files). Idempotent; a
+ * missing `~/.codex` dir is a no-op — the host-start reinject already handles
+ * a first login that flips Codex available. UAI_CODEX_REINJECT=0 disables it.
+ */
+export function watchCodexAuth(): void {
+  if (watcher || process.env.UAI_CODEX_REINJECT === "0") return;
+  const dir = ownerCodexDir();
+  if (!existsSync(dir)) return;
+  try {
+    watcher = watch(dir, (_event, filename) => {
+      // filename is null on some platforms — then we can't tell, so proceed.
+      if (filename && filename !== "auth.json") return;
+      if (debounceTimer) clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(() => void reinjectCodexRunningTasks(), 2_000);
+      debounceTimer.unref?.();
+    });
+  } catch (err) {
+    console.warn(
+      `[codex] could not watch ${dir}: ${err instanceof Error ? err.message : err}`,
+    );
+  }
+}
+
+/** Test/teardown hook. */
+export function stopWatchingCodexAuth(): void {
+  watcher?.close();
+  watcher = null;
+  if (debounceTimer) {
+    clearTimeout(debounceTimer);
+    debounceTimer = null;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runuai/host",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Uai host — runs ephemeral AI coding tasks in Docker on a machine you control.",
   "license": "MIT",
   "author": "Diogo Perillo <diogo.perillo@gmail.com>",

package/src/main.ts

@@ -32,6 +32,7 @@ import {
   onGithubChange,
   setAuthExpiredHandler,
 } from "../lib/github-tokens";
+import { reinjectCodexRunningTasks, watchCodexAuth } from "../lib/codex-auth";
 import {
   deleteKey as deleteSshKey,
   ensureKeyForUser as ensureSshKeyForUser,
@@ -154,6 +155,12 @@ setAuthExpiredHandler((taskId, _userId, reason) => {
 // Best-effort: build the standard image + asdf volume if missing. Logs and
 // continues on failure (e.g. docker unavailable) so the host still boots.
 void ensureStandardImage();
+// Codex creds are docker-cp'd into containers at task-up. A re-login (revoked
+// token → `codex login`) otherwise reaches only NEW tasks — re-copy into
+// running tasks on start (covers the desktop "Connect Codex", which restarts
+// the host) and watch ~/.codex for future logins (a terminal `codex login`).
+void reinjectCodexRunningTasks();
+watchCodexAuth();
 connect();
 // Local browser UI (ADR-028) — same single process, alongside the WSS client.
 // Best-effort: a UI bind failure must not take the host service down.