@ai21/gateway 0.5.3 → 0.6.0

package/dist/login/credentials.d.ts

@@ -0,0 +1,34 @@
+export interface StoredCredential {
+    readonly refreshToken: string;
+    readonly firebaseApiKey: string;
+    readonly projectId: string;
+    readonly userId: string;
+    readonly userEmail: string;
+    readonly workspaceId?: string | undefined;
+    /** ISO 8601, for `whoami` to say how old the session is. */
+    readonly obtainedAt: string;
+}
+/** Injected so tests never touch a real home directory. */
+export interface CredentialPaths {
+    readonly home: string;
+}
+export declare function credentialsPath(ctx: CredentialPaths): string;
+export type LoadOutcome = {
+    readonly kind: "none";
+} | {
+    readonly kind: "credential";
+    readonly credential: StoredCredential;
+}
+/** The file exists but cannot be trusted or read — the message says what to do. */
+ | {
+    readonly kind: "unusable";
+    readonly reason: string;
+};
+export declare function load(gateway: string, ctx: CredentialPaths): LoadOutcome;
+/**
+ * Writes one gateway's credential, leaving the others alone. Created at 0600 rather than
+ * chmodded after: the gap between the two is openable by another local user.
+ */
+export declare function save(gateway: string, credential: StoredCredential, ctx: CredentialPaths): void;
+/** Forgets one gateway's session. Returns false when there was nothing to forget. */
+export declare function clear(gateway: string, ctx: CredentialPaths): boolean;

package/dist/login/credentials.js

@@ -0,0 +1,98 @@
+/**
+ * Where a signed-in session lives between runs: one owner-only file holding a Firebase
+ * refresh token, which is long-lived and acts as the user. Keyed by gateway URL, so a
+ * staging or local session cannot be handed to production.
+ */
+import { chmodSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+const DIR_MODE = 0o700;
+const FILE_MODE = 0o600;
+export function credentialsPath(ctx) {
+    return join(ctx.home, ".config", "ai21-gateway", "credentials.json");
+}
+function readFile(path) {
+    try {
+        const parsed = JSON.parse(readFileSync(path, "utf8"));
+        return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function isComplete(value) {
+    if (typeof value !== "object" || value === null)
+        return false;
+    const c = value;
+    return (typeof c["refreshToken"] === "string" &&
+        typeof c["firebaseApiKey"] === "string" &&
+        typeof c["projectId"] === "string" &&
+        typeof c["userId"] === "string" &&
+        typeof c["userEmail"] === "string");
+}
+export function load(gateway, ctx) {
+    const path = credentialsPath(ctx);
+    let mode;
+    try {
+        mode = statSync(path).mode & 0o777;
+    }
+    catch {
+        return { kind: "none" };
+    }
+    /* Checked on read too: the file may predate this version or have been copied in, and a
+     * readable refresh token is another local user's session.
+     *
+     * Skipped on Windows, which has no POSIX mode: Node reports 0o666 for an ordinary
+     * writable file, so this would refuse every session and advise a `chmod` that does not
+     * exist there. ACLs are the equivalent, and checking them is not this function's job. */
+    if (process.platform !== "win32" && (mode & 0o077) !== 0) {
+        return {
+            kind: "unusable",
+            reason: `${path} is readable by other users (mode ${mode.toString(8)}). Run \`chmod 600 ${path}\`, or delete it and sign in again.`,
+        };
+    }
+    const file = readFile(path);
+    if (file === undefined) {
+        return { kind: "unusable", reason: `${path} is not readable as JSON. Delete it and sign in again.` };
+    }
+    const entry = file[gateway];
+    if (entry === undefined)
+        return { kind: "none" };
+    return isComplete(entry)
+        ? { kind: "credential", credential: entry }
+        : { kind: "unusable", reason: `the stored session for ${gateway} is incomplete. Sign in again.` };
+}
+/**
+ * Writes one gateway's credential, leaving the others alone. Created at 0600 rather than
+ * chmodded after: the gap between the two is openable by another local user.
+ */
+export function save(gateway, credential, ctx) {
+    const path = credentialsPath(ctx);
+    mkdirSync(dirname(path), { recursive: true, mode: DIR_MODE });
+    const existing = readFile(path) ?? {};
+    const merged = { ...existing, [gateway]: credential };
+    // Temp then rename, so an interrupted write cannot replace a whole session with half of one.
+    const temp = `${path}.tmp`;
+    writeFileSync(temp, `${JSON.stringify(merged, null, 2)}\n`, { mode: FILE_MODE });
+    chmodSync(temp, FILE_MODE);
+    renameSync(temp, path);
+}
+/** Forgets one gateway's session. Returns false when there was nothing to forget. */
+export function clear(gateway, ctx) {
+    const path = credentialsPath(ctx);
+    const existing = readFile(path);
+    if (existing === undefined || existing[gateway] === undefined)
+        return false;
+    const rest = Object.fromEntries(Object.entries(existing).filter(([key]) => key !== gateway));
+    if (Object.keys(rest).length === 0) {
+        rmSync(path, { force: true });
+        return true;
+    }
+    const temp = `${path}.tmp`;
+    writeFileSync(temp, `${JSON.stringify(rest, null, 2)}\n`, { mode: FILE_MODE });
+    chmodSync(temp, FILE_MODE);
+    renameSync(temp, path);
+    return true;
+}
+//# sourceMappingURL=credentials.js.map

package/dist/login/credentials.js.map

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

package/dist/login/loopback.d.ts

@@ -1,9 +1,9 @@
-import { type CliCallback } from "./contract.js";
-/** Two minutes: long enough to sign in, short enough not to look wedged. */
-export declare const LOGIN_TIMEOUT_MS = 120000;
+import { type CallbackOutcome } from "./contract.js";
+/** Matches the `exp` the consent screen is told, so both sides give up together. */
+export declare const LOGIN_TIMEOUT_MS = 180000;
 export type LoopbackOutcome = {
     readonly kind: "callback";
-    readonly payload: CliCallback;
+    readonly outcome: CallbackOutcome;
 } | {
     readonly kind: "timeout";
 } | {
@@ -11,14 +11,12 @@ export type LoopbackOutcome = {
     readonly reason: string;
 };
 export interface Listener {
-    /** Open this in the browser; it redirects to the sign-in page. */
-    readonly startUrl: string;
-    /** Where the sign-in page is redirected to, and what to print if no browser opens. */
+    /** The consent screen to open, and what to print if no browser opens. */
     readonly signInUrl: string;
-    /** The URL to hand the webapp. Always loopback, always an ephemeral port. */
+    /** The URL to hand the webapp. */
     readonly callbackUrl: string;
     readonly state: string;
-    /** The interface the socket is actually bound to — asserted in tests. */
+    /** The interface the socket is actually bound to. */
     readonly host: string;
     readonly port: number;
     /** Settles once a valid callback arrives, on timeout, or on a listener error. */
@@ -26,7 +24,7 @@ export interface Listener {
     /** Idempotent; safe to call after the promise has settled. */
     readonly close: () => void;
 }
-/** 256 bits from the CSPRNG. Guessing it is not a threat model we need to model. */
+/** 256 bits from the CSPRNG. */
 export declare function newState(): string;
 export interface LoopbackOptions {
     /** Origin allowed to POST here — the webapp's, never `*`. */

package/dist/login/loopback.js

@@ -1,20 +1,16 @@
 /**
- * The loopback listener that receives the login callback.
- *
- * This is the security surface of the whole handshake, so the invariants are
- * asserted by tests rather than trusted: bound to `127.0.0.1` only, one valid
- * callback accepted and no more, `state` compared before the payload is handed
- * over, a hard timeout so the CLI cannot sit open indefinitely, and a body size
- * cap so a stray client cannot make us buffer without bound.
+ * The loopback listener that receives the login callback. Security surface of the
+ * handshake, so its invariants are asserted in test/login.test.ts: 127.0.0.1 only,
+ * single-use, `state` compared before the body is trusted, hard timeout, body cap.
  */
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import { createServer } from "node:http";
-import { CALLBACK_PATH, START_PATH, parseCallback } from "./contract.js";
-/** Two minutes: long enough to sign in, short enough not to look wedged. */
-export const LOGIN_TIMEOUT_MS = 120_000;
+import { CALLBACK_PATH, parseCallback } from "./contract.js";
+/** Matches the `exp` the consent screen is told, so both sides give up together. */
+export const LOGIN_TIMEOUT_MS = 180_000;
 const MAX_BODY_BYTES = 8_192;
 const LOOPBACK_HOST = "127.0.0.1";
-/** 256 bits from the CSPRNG. Guessing it is not a threat model we need to model. */
+/** 256 bits from the CSPRNG. */
 export function newState() {
     return randomBytes(32).toString("base64url");
 }
@@ -34,8 +30,7 @@ function readBody(req) {
             body += chunk.toString("utf8");
             if (body.length > MAX_BODY_BYTES) {
                 tooBig = true;
-                // Destroy rather than keep reading: the only client we expect sends a few
-                // hundred bytes, so anything larger is not the flow we are in.
+                // Destroy rather than keep reading; the real client sends a few hundred bytes.
                 req.destroy();
             }
         });
@@ -43,6 +38,39 @@ function readBody(req) {
         req.on("error", () => resolve(undefined));
     });
 }
+/* Served to the tab that delivered the outcome — which on the form-POST path is where
+ * the user ends up, so a decline must not read as a success. Self-contained by necessity. */
+function landingPage(outcome) {
+    const message = outcome.kind === "credential"
+        ? "Signed in. You can close this tab and return to your terminal."
+        : "Sign-in was not completed. You can close this tab and return to your terminal.";
+    return `<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><title>ai21-gateway</title></head>
+<body style="font-family: system-ui, sans-serif; margin: 4rem; color: #111;">
+<p>${message}</p>
+</body></html>`;
+}
+/* JSON, or the form encoding the consent screen falls back to (deliverCliCredential.ts).
+ * A form POST is a "simple request", so no preflight ran — hence the Host and state
+ * checks before the body is read. */
+function parseBody(contentType, raw) {
+    const type = ((contentType ?? "").split(";")[0] ?? "").trim().toLowerCase();
+    if (type === "application/json") {
+        try {
+            const parsed = JSON.parse(raw);
+            return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)
+                ? parsed
+                : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    if (type === "application/x-www-form-urlencoded") {
+        return Object.fromEntries(new URLSearchParams(raw));
+    }
+    return undefined;
+}
 /**
  * Starts the listener. Resolves once it is bound, so the caller can put the real
  * port into the URL it opens.
@@ -55,10 +83,7 @@ export function startLoopback(options) {
         settle = resolve;
     });
     let done = false;
-    /**
-     * The single-use latch. A second callback — a replayed POST, a double-submitting
-     * page — must not overwrite credentials we have already accepted.
-     */
+    /** Single-use latch: a replay or double-submit must not overwrite what we accepted. */
     const finish = (outcome) => {
         if (done)
             return;
@@ -69,38 +94,26 @@ export function startLoopback(options) {
         void handle(req, res);
     });
     const cors = (res) => {
-        // The page POSTing here is on the webapp's origin, so without CORS the browser
-        // refuses the request outright. Named explicitly rather than `*`: any origin
-        // being able to talk to this port is the thing we are trying to avoid.
+        // Named explicitly, never `*` — any origin reaching this port is what we are avoiding.
         res.setHeader("Access-Control-Allow-Origin", options.allowedOrigin);
         res.setHeader("Access-Control-Allow-Headers", "content-type");
         res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
-        // Chrome's Private Network Access: a public HTTPS page reaching a loopback address
-        // must be granted it explicitly, or the preflight fails and the POST never happens.
+        // Chrome's Private Network Access grant; without it the preflight fails.
         res.setHeader("Access-Control-Allow-Private-Network", "true");
         res.setHeader("Vary", "Origin");
     };
-    // Single-use: an attacker who guesses the port and beats the browser to /start
-    // gets the state, but the browser then fails visibly instead of the run being
-    // hijacked in silence.
-    let redirected = false;
     let signInUrl = "";
+    let expectedHost = "";
+    /* DNS rebinding arrives same-origin, so CORS never runs and Origin cannot see it.
+     * Host is what gives it away: browsers send the name dialled, not the address. */
+    const hostIsLoopback = (req) => (req.headers.host ?? "") === expectedHost;
     async function handle(req, res) {
-        cors(res);
         const path = (req.url ?? "").split("?")[0];
-        if (path === START_PATH) {
-            if (req.method !== "GET") {
-                res.writeHead(405).end();
-            }
-            else if (redirected) {
-                res.writeHead(410, { "content-type": "text/plain" }).end("This sign-in link has already been used.");
-            }
-            else {
-                redirected = true;
-                res.writeHead(302, { location: signInUrl }).end();
-            }
+        if (!hostIsLoopback(req)) {
+            res.writeHead(403).end();
             return;
         }
+        cors(res);
         if (path !== CALLBACK_PATH) {
             res.writeHead(404).end();
             return;
@@ -110,41 +123,48 @@ export function startLoopback(options) {
             return;
         }
         if (req.method !== "POST") {
-            // Notably this rejects GET, which is what a credential-in-the-URL flow would
-            // use. The secret must arrive in a body.
+            // Rejects GET, so a credential cannot arrive in a URL.
             res.writeHead(405).end();
             return;
         }
+        /* Wrong origin refused; absent or opaque tolerated. The form-POST fallback is a
+         * navigation from an https page to http loopback, which browsers report as the
+         * literal `null` rather than omitting the header — refusing that would 403 the one
+         * path that works on a deployed dashboard. `state` carries the weight in both cases. */
+        const origin = req.headers.origin;
+        const stated = origin !== undefined && origin !== "null";
+        if (stated && origin.replace(/\/$/, "") !== options.allowedOrigin.replace(/\/$/, "")) {
+            res.writeHead(403).end();
+            return;
+        }
         const raw = await readBody(req);
         if (raw === undefined) {
             res.writeHead(413).end();
             return;
         }
-        let parsed;
-        try {
-            parsed = JSON.parse(raw);
-        }
-        catch {
+        const parsed = parseBody(req.headers["content-type"], raw);
+        if (parsed === undefined) {
             res.writeHead(400).end();
             return;
         }
-        const payload = parseCallback(parsed);
-        if (payload === undefined) {
+        /* Rejected without abandoning the run: a stale tab must not cancel a live login. */
+        const offered = parsed["state"];
+        if (typeof offered !== "string" || !statesMatch(state, offered)) {
             res.writeHead(400).end();
             return;
         }
-        if (!statesMatch(state, payload.state)) {
-            // Rejected, and the run is *not* abandoned: a spoofed or stale POST must not
-            // be able to cancel a legitimate login that is still in progress.
-            res.writeHead(403).end();
+        const outcome = parseCallback(parsed);
+        if (outcome === undefined) {
+            res.writeHead(400).end();
             return;
         }
         if (done) {
             res.writeHead(409).end();
             return;
         }
-        res.writeHead(200, { "content-type": "application/json" }).end('{"ok":true}');
-        finish({ kind: "callback", payload });
+        // The form POST is a navigation, so this response is the page the user lands on.
+        res.writeHead(200, { "content-type": "text/html; charset=utf-8" }).end(landingPage(outcome));
+        finish({ kind: "callback", outcome });
     }
     const timer = setTimeout(() => finish({ kind: "timeout" }), timeoutMs);
     // Never hold the process open on our own account.
@@ -153,31 +173,26 @@ export function startLoopback(options) {
         clearTimeout(timer);
         server.close();
     };
-    // Closing on settle rather than making the caller remember to: a listener left
-    // open after the flow ends is an open port nobody is watching.
+    // Closed on settle, so the flow cannot leave an unwatched port open.
     void result.then(close);
     return new Promise((resolve, reject) => {
         const onError = (err) => {
-            // Nothing bound, so nothing to close — and the timer would otherwise
-            // outlive a run that never started.
+            // Nothing bound, and the timer would outlive a run that never started.
             clearTimeout(timer);
             reject(err);
         };
         server.once("error", onError);
-        // Port 0 asks the OS for an ephemeral one. The CLI tells the browser where it
-        // landed, so nothing has to guess — and there is no fixed port to collide over.
+        // Ephemeral: the CLI tells the browser where it landed, so no fixed port to collide over.
         server.listen({ port: 0, host: LOOPBACK_HOST }, () => {
             server.removeListener("error", onError);
-            /* Swapped only now that the socket is bound: until then an error is a bind
-             * failure, which rejects the promise rather than settling a run that never
-             * started. */
+            /* Only now that it is bound: until here an error is a bind failure, which rejects. */
             server.on("error", (err) => finish({ kind: "failed", reason: err.message }));
             const address = server.address();
             const origin = `http://${LOOPBACK_HOST}:${address.port}`;
             const callbackUrl = `${origin}${CALLBACK_PATH}`;
+            expectedHost = `${LOOPBACK_HOST}:${address.port}`;
             signInUrl = options.signInUrl(callbackUrl, state);
             resolve({
-                startUrl: `${origin}${START_PATH}`,
                 signInUrl,
                 callbackUrl,
                 state,

package/dist/login/loopback.js.map

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

package/dist/login/session.d.ts

@@ -1,36 +1,35 @@
-/**
- * `login` orchestration: open the browser, wait on the loopback listener, hand
- * whatever comes back to the ordinary config writer.
- *
- * The credentials live in a local variable for the length of one run and are
- * written only into `settings.json`. Nothing else is persisted — no token cache, no
- * `~/.ai21/credentials` — so there is nothing for an attacker to find later.
- */
 import { type ResolvedUrls } from "../args.js";
+import type { FetchLike } from "./tokens.js";
+import { type CliCredential } from "./contract.js";
 import { type Listener, type LoopbackOptions } from "./loopback.js";
 export interface LoginDeps {
     readonly startListener: (options: LoopbackOptions) => Promise<Listener>;
     readonly openBrowser: (url: string) => boolean;
+    /** For the token exchange and workspace listing; injected so tests make no calls. */
+    readonly fetchImpl: FetchLike;
 }
 export type LoginOutcome = {
-    readonly kind: "credentials";
-    readonly agentId: string;
-    readonly ai21Key: string;
-    /** Present only when the callback supplied a well-formed one. */
-    readonly workspaceId?: string | undefined;
+    readonly kind: "credential";
+    readonly credential: CliCredential;
 } | {
     readonly kind: "timeout";
 } | {
-    readonly kind: "rejected";
+    readonly kind: "declined";
     readonly reason: string;
 } | {
     readonly kind: "failed";
     readonly reason: string;
 };
-/** The `/welcome` URL, carrying where to call back and the nonce to echo. */
-export declare function loginUrl(urls: ResolvedUrls, callbackUrl: string, state: string): string;
 export interface LoginProgress {
-    /** Told what to say while waiting; the caller decides which stream it lands on. */
+    /** The caller decides which stream this lands on. */
     readonly notify: (message: string) => void;
 }
+/**
+ * The consent screen's URL.
+ *
+ * `exp` is here because the listener does not outlive the deadline but the tab does: once
+ * the port is freed, whatever binds it next would receive the credential if the user came
+ * back and approved. The code cannot catch that — it is rendered from this same URL.
+ */
+export declare function loginUrl(urls: ResolvedUrls, callbackUrl: string, state: string, code: string, expiresAtSeconds: number): string;
 export declare function runLogin(urls: ResolvedUrls, deps: LoginDeps, io: LoginProgress): Promise<LoginOutcome>;

package/dist/login/session.js

@@ -1,75 +1,61 @@
 /**
- * `login` orchestration: open the browser, wait on the loopback listener, hand
- * whatever comes back to the ordinary config writer.
+ * `login` orchestration: bind the listener, send the user to the consent screen, and hand
+ * back the credential. Bound before the browser opens, so the page is never told to post
+ * to a port nothing is listening on.
+ */
+import { randomInt } from "node:crypto";
+import { CLIENT_ID, CLIENT_PARAM, CLI_LOGIN_PATH, CODE_PARAM, EXPIRES_PARAM, REDIRECT_PARAM, STATE_PARAM, verificationCode, } from "./contract.js";
+import { LOGIN_TIMEOUT_MS } from "./loopback.js";
+/**
+ * The consent screen's URL.
  *
- * The credentials live in a local variable for the length of one run and are
- * written only into `settings.json`. Nothing else is persisted — no token cache, no
- * `~/.ai21/credentials` — so there is nothing for an attacker to find later.
+ * `exp` is here because the listener does not outlive the deadline but the tab does: once
+ * the port is freed, whatever binds it next would receive the credential if the user came
+ * back and approved. The code cannot catch that — it is rendered from this same URL.
  */
-import { containsControlCharacters } from "../args.js";
-import { CALLBACK_PARAM, STATE_PARAM } from "./contract.js";
-/** The `/welcome` URL, carrying where to call back and the nonce to echo. */
-export function loginUrl(urls, callbackUrl, state) {
-    const url = new URL("/welcome", urls.app);
-    url.searchParams.set(CALLBACK_PARAM, callbackUrl);
+export function loginUrl(urls, callbackUrl, state, code, expiresAtSeconds) {
+    const url = new URL(CLI_LOGIN_PATH, urls.app);
+    url.searchParams.set(REDIRECT_PARAM, callbackUrl);
     url.searchParams.set(STATE_PARAM, state);
+    url.searchParams.set(CODE_PARAM, code);
+    url.searchParams.set(EXPIRES_PARAM, String(expiresAtSeconds));
+    // So the screen names this CLI and not another.
+    url.searchParams.set(CLIENT_PARAM, CLIENT_ID);
     return url.toString();
 }
-/**
- * Callback values are remote input, so they are validated by exactly the rule the
- * flags use. They land in the same `\n`-joined header string, where a newline
- * forges a header that Claude Code would then send on every request — and unlike a
- * flag, nobody typed this.
- */
-function rejectBadValues(payload) {
-    for (const [name, value] of [
-        ["agentId", payload.agentId],
-        ["ai21Key", payload.ai21Key],
-    ]) {
-        if (containsControlCharacters(value)) {
-            return `the ${name} in the login response contains control characters`;
-        }
-    }
-    return undefined;
-}
 export async function runLogin(urls, deps, io) {
+    const code = verificationCode((max) => randomInt(max));
+    // Stamped early, so the page gives up a moment before the listener, not after.
+    const expiresAtSeconds = Math.floor((Date.now() + LOGIN_TIMEOUT_MS) / 1000);
     let listener;
     try {
         listener = await deps.startListener({
             allowedOrigin: urls.app,
-            signInUrl: (callbackUrl, state) => loginUrl(urls, callbackUrl, state),
+            signInUrl: (callbackUrl, state) => loginUrl(urls, callbackUrl, state, code, expiresAtSeconds),
         });
     }
     catch (err) {
         return { kind: "failed", reason: err instanceof Error ? err.message : "the local listener could not be started" };
     }
-    // The browser is pointed at the loopback redirect, so the nonce never reaches its
-    // command line. The printed URL is the real one, since a manual path needs it.
-    //
-    // Claims nothing about whether a browser appeared: `spawn` reports a missing binary
-    // asynchronously, so a failed launch still looks like a success from here.
-    deps.openBrowser(listener.startUrl);
-    io.notify(`Sign in to continue — your browser should open. If it does not, visit:\n\n  ${listener.signInUrl}\n\nWaiting…`);
+    /* Printed as well as opened: `openBrowser` cannot tell us a browser appeared, and over
+     * SSH the URL is the only way in. */
+    deps.openBrowser(listener.signInUrl);
+    io.notify(`Sign in to continue — your browser should open. If it does not, visit:\n\n  ${listener.signInUrl}\n\n` +
+        `  verification code: ${code}\n\n` +
+        `The page will show this code. If it shows anything else, choose Deny — something\n` +
+        `other than this terminal is asking to sign in.\n\nWaiting…`);
     return settle(await listener.result);
 }
-/** Shared tail: turn a listener outcome into the credentials, or say why not. */
 function settle(outcome) {
     switch (outcome.kind) {
         case "timeout":
             return { kind: "timeout" };
         case "failed":
             return { kind: "failed", reason: outcome.reason };
-        case "callback": {
-            const problem = rejectBadValues(outcome.payload);
-            if (problem !== undefined)
-                return { kind: "rejected", reason: problem };
-            return {
-                kind: "credentials",
-                agentId: outcome.payload.agentId,
-                ai21Key: outcome.payload.ai21Key,
-                ...(outcome.payload.workspaceId === undefined ? {} : { workspaceId: outcome.payload.workspaceId }),
-            };
-        }
+        case "callback":
+            return outcome.outcome.kind === "declined"
+                ? { kind: "declined", reason: outcome.outcome.reason }
+                : { kind: "credential", credential: outcome.outcome.credential };
     }
 }
 //# sourceMappingURL=session.js.map