@oh-hai/cli 0.1.0-beta.0

package/README.md

@@ -0,0 +1,154 @@
+# `@oh-hai/cli` — the `oh-hai` command-line tool
+
+One universal, runtime-agnostic way for an autonomous agent to reach a human through an
+MA2H Hub: `oh-hai notify | ask | task`. Shell-out is the lowest common denominator (Claude
+skills are Claude-only, MCP is partial); a small, well-behaved binary works everywhere.
+
+The design contract is [`docs/specs/cli.md`](../docs/specs/cli.md) (the command surface,
+auth/token model, config resolution, exit codes, and the `--json` envelope). This package
+implements that contract.
+
+> **The one invariant:** the agent bearer token **never passes through the LLM**. `oh-hai
+> login` puts the token in the OS keychain; the agent invokes `oh-hai` **by reference** and
+> never sees, prints, or reasons over the secret ([spec §5](../docs/specs/cli.md)).
+
+## Status
+
+#105 shipped **package placement + the machine contract + the publish pipeline + docs**;
+#106 wired the **auth commands** (token storage + login/logout/whoami); #107 wired the
+**messaging commands** (notify/ask/task). The remaining command *bodies* land in downstream
+issues:
+
+| Works today | Lands in |
+|---|---|
+| `--help`, `--version` (and `--version --json`) | — |
+| Global-flag parsing, command dispatch | — |
+| Exit-code table (§7), `--json` envelope (§8), config resolution (§6) | — |
+| `login --token-stdin` / `logout` / `whoami` (OS keychain + `0600` file fallback) | ✅ #106 |
+| `oh-hai login` **device-code** acquisition (server device-authz + web approval) | **#166** |
+| `notify` / `ask submit\|await` / `task submit\|await` (account-aware; `--json`; pull-await) | ✅ #107 |
+| `agents list\|create\|revoke` | later |
+| `doctor` | **#108** |
+
+Every not-yet-implemented command exits **1** with a stable `not_implemented` error and a
+pointer to its owning issue — it never silently no-ops or fakes success.
+
+### Auth (`login` / `logout` / `whoami`)
+
+The agent bearer token is stored in the **OS keychain** (macOS Keychain, Linux Secret
+Service) or, where no keychain is available, a **`0600` file** at `~/.config/oh-hai/credentials`
+(with a loud one-time warning). It is keyed per Hub (`<origin>|<agent id>`), **never printed**,
+and **never** accepted as a flag value ([spec §5](../docs/specs/cli.md)).
+
+```bash
+# Store a token minted in the web app / via `oh-hai agents create` (never typed, never logged):
+printf %s "$AGENT_TOKEN" | oh-hai login --account my-agent --token-stdin
+
+oh-hai whoami                 # agent id + base URL + token presence (…last4) + source
+oh-hai whoami --check         # also probe the Hub for token validity
+oh-hai logout                 # remove this identity's token   (--all clears every identity)
+```
+
+Bare `oh-hai login` (the browser **device-code** flow) is not available yet — it needs a
+server device-authorization grant + a web approval page (tracked in **#166**); until then it
+declines with a pointer to `--token-stdin`.
+
+### Messaging (`notify` / `ask` / `task`)
+
+The productized counterparts of the `@oh-hai/scripts` wrappers ([spec §4.4](../docs/specs/cli.md)):
+the bearer is resolved **account-aware** (keychain / `0600` file / `MA2H_AGENT_TOKEN` env — not
+raw env), output follows the `--json` envelope, and Hub statuses map to the §7 exit codes.
+
+```bash
+oh-hai notify --title "Build finished" --body "All green" --priority normal
+oh-hai ask submit --mode select --option ship:Ship --option hold:Hold \
+    --resolver human:owner --title "Ship v1?"
+oh-hai ask await --id msg_02A…                 # poll until the human answers; prints the outcome
+oh-hai task submit --instructions "Rotate the signing key" --title "Rotate key" \
+    --resolver human:owner                     # terminal by default (--callback opts into a return leg)
+oh-hai <ask|task> submit --dry-run …           # compose + print the envelope, POST nothing
+oh-hai ask submit --envelope @captured.json    # idempotent replay of a captured envelope (§4.7)
+```
+
+> **`--state` (sealed resume) is not yet available in the CLI.** The AES-256-GCM state seal is
+> vendored crypto that the self-contained published bin can't import; sealing needs the shared
+> MA2H core extracted first (follow-up). Passing `--state` is rejected with a pointer; use the
+> `@oh-hai/scripts` wrappers for sealed state until then.
+
+## Install
+
+```bash
+# npm (global)
+npm install -g @oh-hai/cli
+
+# Homebrew (tap)
+brew install autnmy/tap/oh-hai
+
+# curl installer (served at ohhai.app once DNS lands — issue #99)
+curl -fsSL https://ohhai.app/install | sh
+```
+
+## Command surface (see [spec §4](../docs/specs/cli.md))
+
+```
+oh-hai [global flags] <command> [subcommand] [flags]
+
+  Auth      login | logout | whoami
+  Messaging notify | ask | task
+  Agents    agents list | create | revoke
+  Health    doctor
+
+Global flags: --base-url --account --json --quiet --verbose --no-color --timeout
+```
+
+### Usage examples
+
+```bash
+$ oh-hai --version
+0.0.0
+
+$ oh-hai --version --json
+{"ok":true,"command":"version","data":{"version":"0.0.0","wire_version":"v0.3"},"error":null}
+
+$ oh-hai notify --title "Build finished" --body "All green" --priority normal
+$ oh-hai ask submit --mode select --option ship:Ship --option hold:Hold \
+    --resolver human:owner --title "Ship v1?" --json
+$ oh-hai ask await --id msg_02A… --json
+```
+
+## Machine contract
+
+- **Exit codes (§7):** `0` success · `1` generic · `2` usage · `3` auth · `4` not-found ·
+  `5` network · `6` server · `7` timeout · `8` conflict · `9` invalid-request. (The scaffold
+  adds a `not_implemented` error string that maps to exit `1`.)
+- **`--json` envelope (§8):** every command emits one uniform shape:
+  ```json
+  { "ok": true, "command": "ask.submit", "data": { "id": "…" }, "error": null }
+  ```
+  Absent optional fields are **omitted** from `data`, not set to `null`. On failure `ok` is
+  `false`, `data` is `null`, and `error` is `{ code, message }`. The token is **never** in
+  the envelope ([spec §5.4](../docs/specs/cli.md)).
+- **Config precedence (§6):** `flag > env > config file > default`, resolved per value. The
+  token is special-cased (keychain / `MA2H_AGENT_TOKEN` env — never a config value), and
+  per-project config is credential-safe: it may set only `output` / `timeout` / `color`, never
+  `base_url` / `account`.
+
+## Develop
+
+Node ≥ 24, run from the repo root:
+
+```bash
+pnpm --filter @oh-hai/cli start --help      # run the CLI from source via tsx (or: pnpm oh-hai --help)
+pnpm --filter @oh-hai/cli typecheck         # tsc --noEmit
+pnpm --filter @oh-hai/cli test              # node:test unit suite
+pnpm --filter @oh-hai/cli build             # publish-time compile → dist/ (gitignored)
+```
+
+Dev + test run the `.ts` sources directly via `tsx` (repo convention — no build step). The
+**published** artifact is compiled to `dist/` because end users have `node`, not `tsx`.
+
+## Release
+
+Tag-driven: push `cli-vX.Y.Z` (matching `package.json`) and the
+[`cli-release`](../.github/workflows/cli-release.yml) workflow builds + publishes to npm.
+See the runbook: [`docs/runbooks/cli-release.md`](../docs/runbooks/cli-release.md).

package/dist/auth/file-backend.d.ts

@@ -0,0 +1,16 @@
+import type { SecretBackend } from "./token-store.js";
+/** Resolve the credentials file path, honoring `$XDG_CONFIG_HOME` then `~/.config` (§5.2).
+ *  `env`/`home` are injectable so tests point at a temp dir instead of the real HOME. */
+export declare function credentialsPath(env?: NodeJS.ProcessEnv, home?: string): string;
+/** The file-backed `SecretBackend`. Construct with an explicit path (tests) or let it resolve
+ *  the XDG path. All ops are synchronous fs calls wrapped in the async `SecretBackend` shape. */
+export declare class FileBackend implements SecretBackend {
+    readonly name: "file";
+    private readonly path;
+    constructor(path?: string);
+    get(key: string): Promise<string | undefined>;
+    set(key: string, token: string): Promise<void>;
+    delete(key: string): Promise<boolean>;
+    listKeys(): Promise<string[]>;
+    clearAll(): Promise<number>;
+}

package/dist/auth/file-backend.js

@@ -0,0 +1,98 @@
+// The `0600` file-fallback credential backend (docs/specs/cli.md §5.2). Used precisely when
+// the OS keychain is unavailable or locked (headless Linux without a Secret Service, a locked
+// login keychain on an unattended session, minimal containers). The token is stored on disk
+// UNENCRYPTED — the store emits a loud one-time warning when it falls back here (§5.2). The
+// file lives at `~/.config/oh-hai/credentials` (honoring `$XDG_CONFIG_HOME`) with permissions
+// `0600` and a `0700` parent dir.
+//
+// On-disk format: a single JSON object mapping the Hub-scoped key `<origin>|<agent id>` (§5.1)
+// to the raw token. Keys never contain a token value; only this map's *values* are secrets, so
+// enumeration (`listKeys`) is redaction-safe. The map is small (one entry per logged-in agent).
+import { readFileSync, rmSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { writeSecureFile } from "./secure-write.js";
+/** Resolve the credentials file path, honoring `$XDG_CONFIG_HOME` then `~/.config` (§5.2).
+ *  `env`/`home` are injectable so tests point at a temp dir instead of the real HOME. */
+export function credentialsPath(env = process.env, home = homedir()) {
+    const xdg = env.XDG_CONFIG_HOME?.trim();
+    const base = xdg !== undefined && xdg !== "" ? xdg : join(home, ".config");
+    return join(base, "oh-hai", "credentials");
+}
+/** Read + parse the credentials map. A missing file (or unreadable/corrupt JSON) is treated as
+ *  an empty store — the store must never throw just because nothing has been written yet. */
+function readMap(path) {
+    let raw;
+    try {
+        raw = readFileSync(path, "utf8");
+    }
+    catch {
+        return {};
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+            return {};
+        }
+        // Keep only string values — a hand-edited file with a non-string value can't be a token.
+        const out = {};
+        for (const [key, value] of Object.entries(parsed)) {
+            if (typeof value === "string") {
+                out[key] = value;
+            }
+        }
+        return out;
+    }
+    catch {
+        return {};
+    }
+}
+/** Write the map atomically at `0600` (parent dir `0700`) via `writeSecureFile` — temp file +
+ *  rename, so there is no window where a pre-existing looser file exposes the new secret and no
+ *  partial file survives a crash. */
+function writeMap(path, map) {
+    writeSecureFile(path, JSON.stringify(map));
+}
+/** The file-backed `SecretBackend`. Construct with an explicit path (tests) or let it resolve
+ *  the XDG path. All ops are synchronous fs calls wrapped in the async `SecretBackend` shape. */
+export class FileBackend {
+    name = "file";
+    path;
+    constructor(path = credentialsPath()) {
+        this.path = path;
+    }
+    get(key) {
+        return Promise.resolve(readMap(this.path)[key]);
+    }
+    set(key, token) {
+        const map = readMap(this.path);
+        map[key] = token;
+        writeMap(this.path, map);
+        return Promise.resolve();
+    }
+    delete(key) {
+        const map = readMap(this.path);
+        if (!(key in map)) {
+            return Promise.resolve(false);
+        }
+        delete map[key];
+        writeMap(this.path, map);
+        return Promise.resolve(true);
+    }
+    listKeys() {
+        return Promise.resolve(Object.keys(readMap(this.path)));
+    }
+    clearAll() {
+        const count = Object.keys(readMap(this.path)).length;
+        // Remove the file entirely rather than leaving an empty `{}` on disk.
+        try {
+            rmSync(this.path, { force: true });
+        }
+        catch {
+            // A best-effort scrub; if it can't be removed, overwrite with an empty map.
+            writeMap(this.path, {});
+        }
+        return Promise.resolve(count);
+    }
+}
+//# sourceMappingURL=file-backend.js.map

package/dist/auth/file-backend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-backend.js","sourceRoot":"","sources":["../../src/auth/file-backend.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAC5F,8FAA8F;AAC9F,4FAA4F;AAC5F,4FAA4F;AAC5F,8FAA8F;AAC9F,kCAAkC;AAClC,EAAE;AACF,+FAA+F;AAC/F,+FAA+F;AAC/F,gGAAgG;AAEhG,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD;yFACyF;AACzF,MAAM,UAAU,eAAe,CAAC,MAAyB,OAAO,CAAC,GAAG,EAAE,OAAe,OAAO,EAAE;IAC5F,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IACxC,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;AAC7C,CAAC;AAED;6FAC6F;AAC7F,SAAS,OAAO,CAAC,IAAY;IAC3B,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QAC1C,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3E,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,yFAAyF;QACzF,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAiC,CAAC,EAAE,CAAC;YAC7E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;qCAEqC;AACrC,SAAS,QAAQ,CAAC,IAAY,EAAE,GAA2B;IACzD,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED;iGACiG;AACjG,MAAM,OAAO,WAAW;IACb,IAAI,GAAG,MAAe,CAAC;IACf,IAAI,CAAS;IAE9B,YAAY,OAAe,eAAe,EAAE;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAa;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAChB,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,QAAQ;QACN,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,QAAQ;QACN,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QACrD,sEAAsE;QACtE,IAAI,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;YAC5E,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;CACF"}

package/dist/auth/keychain.d.ts

@@ -0,0 +1,54 @@
+import type { SecretBackend } from "./token-store.js";
+/** The result of a single keychain operation, normalized across the platform CLIs. */
+export interface KeychainRunResult {
+    /** `ok` — succeeded (read carries `value`); `not_found` — no such item; `unavailable` — the
+     *  platform tool is missing / no Secret Service (→ file fallback); `error` — unexpected. */
+    status: "ok" | "not_found" | "unavailable" | "error";
+    /** The secret, present only for a successful `get`. */
+    value?: string;
+    /** A human-readable detail for `error` (never contains the token). */
+    message?: string;
+}
+/** A keychain operation. `token` is present only for `set`. */
+export interface KeychainOp {
+    action: "get" | "set" | "delete";
+    key: string;
+    token?: string;
+}
+/** Runs one keychain op. Injected into `KeychainBackend` so tests use an in-memory fake and
+ *  never touch the real OS keychain. `signal` (used only by the availability probe) cancels a
+ *  hung/locked-keychain spawn so it can't keep the CLI alive after the file fallback wins. */
+export type KeychainRunner = (op: KeychainOp, signal?: AbortSignal) => Promise<KeychainRunResult>;
+/** Low-level process result. `spawnError` is set (e.g. `"ENOENT"`) when the binary is missing. */
+interface ProcResult {
+    code: number | null;
+    stdout: string;
+    stderr: string;
+    spawnError?: string;
+}
+/** Spawn a process with an argv array (no shell), optionally writing `input` to stdin, and
+ *  capture stdout/stderr. Never rejects — a spawn failure is reported via `spawnError`. An
+ *  aborted `signal` kills the child so a hung probe can't outlive the CLI. */
+export type ProcRunner = (file: string, args: string[], input?: string, signal?: AbortSignal) => Promise<ProcResult>;
+/** Build the platform's system keychain runner. `platform`/`proc` are injectable for tests
+ *  (assert argv/stdin per platform) — production uses `process.platform` and a real spawn. */
+export declare function systemKeychainRunner(platform?: NodeJS.Platform, proc?: ProcRunner): KeychainRunner;
+/** The keychain-backed `SecretBackend`. Delegates secret storage to the injected `runner` and
+ *  maintains a keys-only index at `indexPath` for enumeration (`listKeys`/`clearAll`). */
+export declare class KeychainBackend implements SecretBackend {
+    readonly name: "keychain";
+    private readonly runner;
+    private readonly indexPath;
+    constructor(runner: KeychainRunner, indexPath: string);
+    /** Side-effect-free availability probe: a `get` of a sentinel key, cancellable via `signal`.
+     *  Only a clean response (`ok`/`not_found`) means the keychain is usable — `unavailable` (tool
+     *  missing / no Secret Service) AND `error` (a locked keychain returning "user interaction is
+     *  not allowed", etc.) both fall back to the `0600` file, which is the documented §5.2 path. */
+    available(signal?: AbortSignal): Promise<boolean>;
+    get(key: string): Promise<string | undefined>;
+    set(key: string, token: string): Promise<void>;
+    delete(key: string): Promise<boolean>;
+    listKeys(): Promise<string[]>;
+    clearAll(): Promise<number>;
+}
+export {};

package/dist/auth/keychain.js

@@ -0,0 +1,232 @@
+// The OS-keychain credential backend (docs/specs/cli.md §5.1). Zero-runtime-dependency by
+// design (#105): instead of a native module like `keytar`, we shell out to the platform's
+// own credential CLI through `node:child_process` —
+//   - macOS  → `security …-generic-password` (Keychain Services)
+//   - Linux  → `secret-tool` (libsecret / Secret Service: GNOME Keyring, KWallet)
+//   - other  → reported UNAVAILABLE, so the store transparently uses the `0600` file fallback.
+//     (A Windows Credential Manager backend is a follow-up; until then Windows uses the file
+//      fallback, which is a valid headless setup per §5.2/§5.3.)
+//
+// The item is stored under service `oh-hai`, account = the Hub-scoped key `<origin>|<agent id>`
+// (§5.1). The KEYCHAIN itself does not let us reliably enumerate our own items, so the backend
+// maintains a small keys-only index file alongside (redaction-safe: it holds `<origin>|<agent
+// id>` strings, NEVER tokens) so `logout --all` / `list` can enumerate.
+//
+// SECURITY: the token is passed on stdin where the CLI supports it (`secret-tool`). macOS
+// `security add-generic-password` only accepts the password as an argv value (`-w <token>`),
+// which is briefly visible in a process listing — an accepted, documented residual; we spawn
+// with an argv array (no shell) so there is no additional shell-history/interpolation exposure.
+import { spawn } from "node:child_process";
+import { readFileSync, rmSync } from "node:fs";
+import { writeSecureFile } from "./secure-write.js";
+const SERVICE = "oh-hai";
+const defaultProc = (file, args, input, signal) => new Promise((resolve) => {
+    if (signal?.aborted === true) {
+        resolve({ code: null, stdout: "", stderr: "", spawnError: "ABORTED" });
+        return;
+    }
+    const child = spawn(file, args, { stdio: ["pipe", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    // Kill the child if the caller aborts (probe timeout) — SIGKILL because a locked keychain's
+    // `security` may ignore softer signals while blocked on a GUI prompt.
+    const onAbort = () => {
+        child.kill("SIGKILL");
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    child.stdout.on("data", (chunk) => (stdout += chunk.toString("utf8")));
+    child.stderr.on("data", (chunk) => (stderr += chunk.toString("utf8")));
+    child.on("error", (err) => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve({ code: null, stdout, stderr, spawnError: err.code ?? err.message });
+    });
+    child.on("close", (code) => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve({ code, stdout, stderr });
+    });
+    // A child that exits before consuming stdin (an immediate error) makes stdin emit EPIPE;
+    // without a listener that 'error' becomes an uncaught exception that crashes the CLI. We
+    // swallow it — the exit code / stderr already carry the failure via the 'close' handler.
+    child.stdin.on("error", () => { });
+    child.stdin.end(input ?? undefined);
+});
+/** A binary-missing spawn error means the platform's credential tool isn't installed → the
+ *  store should fall back to the file backend rather than surface an error. */
+function isMissingBinary(spawnError) {
+    return spawnError === "ENOENT" || spawnError === "EACCES";
+}
+/** On Linux, `secret-tool` present but with NO usable Secret Service (headless, no D-Bus, keyring
+ *  not unlocked) exits non-zero just like a normal miss — but it's really "unavailable", and the
+ *  store must fall back to the file rather than commit to a keychain that can't store anything.
+ *  Detect the service-unavailable signatures in stderr. */
+function isSecretServiceUnavailable(stderr) {
+    return /secret\s*service|dbus|d-bus|org\.freedesktop\.secrets|was not provided|not provided by any|cannot autolaunch|no such interface|no such object/i.test(stderr);
+}
+/** macOS `security` runner. Not-found is exit 44; a missing binary → unavailable. */
+async function runMac(op, proc, signal) {
+    if (op.action === "get") {
+        const r = await proc("security", ["find-generic-password", "-s", SERVICE, "-a", op.key, "-w"], undefined, signal);
+        if (isMissingBinary(r.spawnError))
+            return { status: "unavailable" };
+        if (r.code === 0)
+            return { status: "ok", value: r.stdout.replace(/\n$/, "") };
+        if (r.code === 44)
+            return { status: "not_found" };
+        return { status: "error", message: `security find failed (code ${r.code ?? "?"})` };
+    }
+    if (op.action === "set") {
+        // `-U` updates in place if the item already exists (silent overwrite, §4.3).
+        const r = await proc("security", [
+            "add-generic-password", "-U", "-s", SERVICE, "-a", op.key, "-w", op.token ?? "",
+        ]);
+        if (isMissingBinary(r.spawnError))
+            return { status: "unavailable" };
+        return r.code === 0 ? { status: "ok" } : { status: "error", message: `security add failed (code ${r.code ?? "?"})` };
+    }
+    const r = await proc("security", ["delete-generic-password", "-s", SERVICE, "-a", op.key]);
+    if (isMissingBinary(r.spawnError))
+        return { status: "unavailable" };
+    if (r.code === 0)
+        return { status: "ok" };
+    if (r.code === 44)
+        return { status: "not_found" };
+    return { status: "error", message: `security delete failed (code ${r.code ?? "?"})` };
+}
+/** Linux `secret-tool` runner. Token is written on stdin for `store` (no argv exposure). A
+ *  non-zero exit whose stderr names a Secret Service / D-Bus failure is `unavailable` (→ file
+ *  fallback), NOT a miss — otherwise a headless box with no keyring would commit to a keychain
+ *  it can't actually write to. */
+async function runLinux(op, proc, signal) {
+    if (op.action === "get") {
+        const r = await proc("secret-tool", ["lookup", "service", SERVICE, "account", op.key], undefined, signal);
+        if (isMissingBinary(r.spawnError))
+            return { status: "unavailable" };
+        if (r.code === 0 && r.stdout !== "")
+            return { status: "ok", value: r.stdout.replace(/\n$/, "") };
+        if (r.code !== 0 && isSecretServiceUnavailable(r.stderr))
+            return { status: "unavailable" };
+        // Otherwise secret-tool exits non-zero (or empty) when the item is simply absent.
+        return { status: "not_found" };
+    }
+    if (op.action === "set") {
+        const r = await proc("secret-tool", ["store", "--label", `oh-hai ${op.key}`, "service", SERVICE, "account", op.key], op.token ?? "");
+        if (isMissingBinary(r.spawnError))
+            return { status: "unavailable" };
+        if (r.code !== 0 && isSecretServiceUnavailable(r.stderr))
+            return { status: "unavailable" };
+        return r.code === 0 ? { status: "ok" } : { status: "error", message: `secret-tool store failed (code ${r.code ?? "?"})` };
+    }
+    const r = await proc("secret-tool", ["clear", "service", SERVICE, "account", op.key]);
+    if (isMissingBinary(r.spawnError))
+        return { status: "unavailable" };
+    if (r.code !== 0 && isSecretServiceUnavailable(r.stderr))
+        return { status: "unavailable" };
+    return r.code === 0 ? { status: "ok" } : { status: "not_found" };
+}
+/** Build the platform's system keychain runner. `platform`/`proc` are injectable for tests
+ *  (assert argv/stdin per platform) — production uses `process.platform` and a real spawn. */
+export function systemKeychainRunner(platform = process.platform, proc = defaultProc) {
+    if (platform === "darwin")
+        return (op, signal) => runMac(op, proc, signal);
+    if (platform === "linux")
+        return (op, signal) => runLinux(op, proc, signal);
+    // No supported credential CLI (Windows, etc.) → always unavailable so the store falls back.
+    return () => Promise.resolve({ status: "unavailable" });
+}
+// --- keys-only index (enumeration) --------------------------------------------------------
+function readIndex(path) {
+    try {
+        const parsed = JSON.parse(readFileSync(path, "utf8"));
+        return Array.isArray(parsed) ? parsed.filter((k) => typeof k === "string") : [];
+    }
+    catch {
+        return [];
+    }
+}
+function writeIndex(path, keys) {
+    writeSecureFile(path, JSON.stringify([...new Set(keys)]));
+}
+/** The keychain-backed `SecretBackend`. Delegates secret storage to the injected `runner` and
+ *  maintains a keys-only index at `indexPath` for enumeration (`listKeys`/`clearAll`). */
+export class KeychainBackend {
+    name = "keychain";
+    runner;
+    indexPath;
+    constructor(runner, indexPath) {
+        this.runner = runner;
+        this.indexPath = indexPath;
+    }
+    /** Side-effect-free availability probe: a `get` of a sentinel key, cancellable via `signal`.
+     *  Only a clean response (`ok`/`not_found`) means the keychain is usable — `unavailable` (tool
+     *  missing / no Secret Service) AND `error` (a locked keychain returning "user interaction is
+     *  not allowed", etc.) both fall back to the `0600` file, which is the documented §5.2 path. */
+    async available(signal) {
+        const r = await this.runner({ action: "get", key: "__oh_hai_probe__" }, signal);
+        return r.status === "ok" || r.status === "not_found";
+    }
+    async get(key) {
+        const r = await this.runner({ action: "get", key });
+        if (r.status === "ok")
+            return r.value;
+        if (r.status === "error")
+            throw new Error(r.message ?? "keychain read failed");
+        return undefined;
+    }
+    async set(key, token) {
+        const r = await this.runner({ action: "set", key, token });
+        // A mutating op that comes back `unavailable` (the keychain vanished BETWEEN the probe and
+        // this write) stored nothing — treat it as a failure and DON'T record a phantom index entry,
+        // rather than silently reporting success (§5.2: an unavailable keychain must fall back/fail).
+        if (r.status === "error" || r.status === "unavailable") {
+            throw new Error(r.message ?? "keychain became unavailable; token not stored");
+        }
+        const keys = readIndex(this.indexPath);
+        if (!keys.includes(key))
+            writeIndex(this.indexPath, [...keys, key]);
+    }
+    async delete(key) {
+        const r = await this.runner({ action: "delete", key });
+        // Throw BEFORE touching the index (on `error` OR `unavailable`): pruning the key would strip
+        // it from the enumeration index while the secret is still in the keychain — orphaning a
+        // bearer that `logout`/`logout --all` could then never find or scrub.
+        if (r.status === "error" || r.status === "unavailable") {
+            throw new Error(r.message ?? "keychain became unavailable; token not removed");
+        }
+        const keys = readIndex(this.indexPath);
+        if (keys.includes(key))
+            writeIndex(this.indexPath, keys.filter((k) => k !== key));
+        return r.status === "ok";
+    }
+    listKeys() {
+        return Promise.resolve(readIndex(this.indexPath));
+    }
+    async clearAll() {
+        const keys = readIndex(this.indexPath);
+        // Delete each secret, but never drop a key from the index unless its keychain delete
+        // actually succeeded — a silently-ignored error would wipe the index while leaving the
+        // token in the keychain, orphaning it. Failed keys stay enumerable for a retry.
+        const failed = [];
+        let cleared = 0;
+        for (const key of keys) {
+            const r = await this.runner({ action: "delete", key });
+            if (r.status === "error") {
+                failed.push(key);
+            }
+            else {
+                cleared += 1;
+            }
+        }
+        if (failed.length > 0) {
+            writeIndex(this.indexPath, failed);
+            throw new Error(`keychain delete failed for ${failed.length} of ${keys.length} identities`);
+        }
+        try {
+            rmSync(this.indexPath, { force: true });
+        }
+        catch {
+            writeIndex(this.indexPath, []);
+        }
+        return cleared;
+    }
+}
+//# sourceMappingURL=keychain.js.map

package/dist/auth/keychain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../../src/auth/keychain.ts"],"names":[],"mappings":"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"}

package/dist/auth/resolve-token.d.ts

@@ -0,0 +1,34 @@
+import type { ResolvedConfig, TokenSource } from "../config.js";
+import type { CredentialStore } from "./token-store.js";
+export interface ResolvedToken {
+    token: string | undefined;
+    source: TokenSource;
+}
+/** The effective identity: the resolved bearer plus the agent id it belongs to. `account` may be
+ *  DISCOVERED (below) rather than configured, so it rides along with the token instead of the caller
+ *  reading it off `config.account`. */
+export interface ResolvedIdentity {
+    account: string | undefined;
+    token: string | undefined;
+    source: TokenSource;
+}
+/** Derive the Hub origin (scheme+host+port) from a resolved base URL, for Hub-scoped keying
+ *  (§5.1). Falls back to the raw string if the URL can't be parsed (resolveConfig guarantees a
+ *  valid default, so this is belt-and-suspenders). */
+export declare function originOf(baseUrl: string): string;
+/** Resolve the effective bearer token and where it came from, per §6. `store` may be omitted
+ *  when the caller already knows resolution won't touch it (an env token, or no account). */
+export declare function resolveToken(config: ResolvedConfig, store?: CredentialStore): Promise<ResolvedToken>;
+/**
+ * Resolve the effective identity (§6): the account plus its bearer. Extends `resolveToken` with a
+ * zero-config fallback for the device-code login path, where the bearer is stored under a
+ * Hub-chosen agent id but no `--account`/`MA2H_AGENT_ID`/config account is set. When no account is
+ * configured and the token isn't the CI env credential, fall back to the SOLE stored identity for
+ * the current Hub origin — so a fresh `oh-hai login` then `oh-hai whoami` resolves without a manual
+ * `--account`. Ambiguity is never guessed: with zero or more-than-one stored identity for the
+ * origin, the account stays undefined and the user selects with `--account` (§6). The env path is
+ * never discovered — the env credential is authoritative and its agent id may differ from a stored
+ * login. Discovery keys on the origin (derived from the flag/env/user-config `base_url`, never a
+ * repo-controlled value), so it preserves §5.1 isolation and can't leak a bearer to a chosen Hub.
+ */
+export declare function resolveIdentity(config: ResolvedConfig, store?: CredentialStore): Promise<ResolvedIdentity>;