@bridge_gpt/mcp-server 0.2.21 → 0.2.24

package/build/install-bridge.js

@@ -6,6 +6,12 @@
  * Collapses the previously five-step manual setup into a single CLI subcommand.
  * It does the DETERMINISTIC work in the shell:
  *
+ *   Step 0  Resolve the repository name. `--repo` / `BAPI_REPO_NAME` short-circuit
+ *           deterministically; otherwise, on the consume-an-existing-key flow, a
+ *           compatible server resolves the unique repo from the API key via a
+ *           read-only `GET <base>/setup/resolve-repo` (BAPI-616) BEFORE the
+ *           connectivity check. An old server / unresolvable key / failure falls
+ *           back to the existing local prompt/inference — never a hard failure.
  *   Step 1  Scaffold via `runInit` (commands, agents, pipelines, secret-free
  *           per-host MCP config placeholders, .bridge/config).
  *   Step 2  Verify connectivity over HTTP (`GET <base>/jira/ping?repo_name=…`
@@ -22,19 +28,42 @@
  *           (`~/.config/bridge/credentials.json`, target `bapi:<repo>`) via
  *           `upsertBapiCredential`. Non-blocking (fail-open) — mirrors Stage 6.
  *
- * then SPAWNS a fresh agent session (Step 5) for the agentic remainder
- * (`/install-bridge` config-field derivation, then `/learn-repository`). The
+ * then SPAWNS a fresh agent session (Step 5) for the CONFIGURE-ONLY agentic
+ * remainder: `/install-bridge` config-field derivation → the read-after-write
+ * capability report → a single optional indexing-consent question. It does NOT
+ * chain `/learn-repository` and does NOT index without explicit consent. The
  * fresh session is required because a CLI cannot force the running editor to
  * reload the just-written `.mcp.json`, and field derivation needs an agent
  * runtime the shell does not have.
  *
- * SECRET DISCIPLINE: the API key is NEVER printed or logged — not in stdout,
- * stderr, error messages, or --dry-run output (it is redacted to `<REDACTED>`).
- * The ONLY place the key is durably written is the per-host MCP config (Step 3,
- * gitignored) and the user-scoped credential store (Step 4).
+ * BOOTSTRAP-INVITE MODE (BAPI-606) — the one exception to "this command consumes
+ * a key, it does not create one". With `--invite` (or `BAPI_INVITE`) there is no
+ * API key yet, so the pre-flight ping of Step 2 CANNOT be made: the exchange is
+ * what mints the key, and it REPLACES that ping. The order becomes:
+ *
+ *   resolve bootstrap-invite token (no-echo prompt by DEFAULT — the delivered
+ *   one-liner is secret-free) → resolve repo name → scaffold → generate
+ *   `key_secret` (CSPRNG) and **fsync it to a pending credential record** →
+ *   `POST <base>/setup/bootstrap` {token, repo_name, key_secret} → ping with the
+ *   newly-minted key → write host configs → promote pending → `bapi:<repo>` →
+ *   spawn. Everything from the ping onward is the existing flow, unchanged.
+ *
+ * The persist-before-exchange ordering is LOAD-BEARING PROTOCOL (see the comment
+ * at the pending-preparation call site): the local `key_secret` is the ONLY proof
+ * that can replay a redemption, so a successful exchange with a failed local write
+ * would leave an unrecoverable admin key and a permanently spent invite.
+ *
+ * SECRET DISCIPLINE: THREE secrets now — the API key, the bootstrap-invite token,
+ * and the client-generated `key_secret`. NONE is ever printed or logged — not in
+ * stdout, stderr, error messages, or --dry-run output (they are redacted to
+ * `<REDACTED>`). The ONLY places a secret is durably written are the per-host MCP
+ * config (Step 3, gitignored) and the user-scoped credential store (Step 4 / the
+ * pending record). The bootstrap-invite token itself is NEVER written to disk —
+ * only a SHA-256 fingerprint of it, to key the pending record.
  */
-import { readFile, writeFile, mkdir, stat, rename, chmod, unlink } from "fs/promises";
+import { readFile, writeFile, mkdir, stat, rename, chmod, unlink, open } from "fs/promises";
 import { spawn } from "child_process";
+import { randomBytes as cryptoRandomBytes, createHash } from "crypto";
 import os from "os";
 import path from "path";
 import readline from "readline";
@@ -42,7 +71,7 @@ import { runInit, buildBridgeApiEntry } from "./init.js";
 import { VERSION } from "./version.generated.js";
 import { validateRepoName } from "./bridge-config.js";
 import { resolveStartTicketsRepoName } from "./start-tickets-repo.js";
-import { upsertBapiCredential, getPrimaryCredentialStorePath, } from "./credential-store.js";
+import { upsertBapiCredential, getPrimaryCredentialStorePath, prepareBootstrapPendingCredential, repointBootstrapPendingCredential, promoteBootstrapPendingCredential, } from "./credential-store.js";
 import { DEFAULT_AGENT_NAME, resolveAgentSpec, isAgentName, formatValidAgentNames, } from "./agent-registry.js";
 import { buildGenericAgentShellCommand, getDefaultSpawnTerminalTabForPlatform, detectTerminal, createDefaultStartTicketsDeps, } from "./start-tickets.js";
 /** Redaction sentinel — the API-key value is NEVER printed; this stands in. */
@@ -64,15 +93,44 @@ export function buildPrewarmArgs() {
 export function buildPrewarmCommandPreview() {
     return `npx ${buildPrewarmArgs().join(" ")}`;
 }
-/** The natural-language sequential prompt handed to the spawned agent session. */
-export const INSTALL_BRIDGE_AGENT_PROMPT = "Please execute the /install-bridge command. Once it completes successfully, execute the " +
-    "/learn-repository command. After /learn-repository completes, ask the user for consent to start " +
-    "repository indexing; with consent, call the parse_repository MCP tool once and report that the " +
-    "job was queued (progress is checked with get_parse_status — do not poll it to completion). " +
-    "When you are done, end with an explicit summary line stating how " +
-    "many config fields the apply_install_manifest call applied (e.g. 'Applied 8 of 9 derived " +
-    "fields') and whether indexing was queued — if 0 fields were applied, say so loudly and explain " +
-    "what is still pending.";
+/**
+ * The natural-language prompt handed to the spawned agent session. It is
+ * CONFIGURE-ONLY: it derives and applies configuration, presents the capability
+ * report, and ends with exactly one indexing-consent question. It never chains
+ * /learn-repository and never indexes before explicit consent.
+ *
+ * The index-consent beat is AGENT-OWNED (asked inside this spawned session), not
+ * parent-CLI-owned, because `spawnTerminalTab()` opens an asynchronous terminal
+ * session: the parent CLI returns immediately and cannot reliably ask a question
+ * that must appear AFTER the spawned session's capability report. Asking it via
+ * the parent's `deps.promptLine` would display the question before the report
+ * even exists. `deps.promptLine` therefore stays the owner of the parent-CLI
+ * prompts (repository / overwrite / invite confirmation) and is intentionally
+ * NOT used for this post-report question.
+ */
+export const INSTALL_BRIDGE_AGENT_PROMPT = "Execute the /install-bridge command in the install-spawn context (tell the command it is running " +
+    "in the install-spawn context so it SKIPS its Stage 8 and Stage 9 offers — this session's only " +
+    "closing interaction is the single indexing question below). Do NOT run /learn-repository. Do NOT " +
+    "call parse_repository (or otherwise start indexing) before the capability report and explicit " +
+    "consent below. " +
+    "Complete the command's read-after-write five-section capability report first: 'Connected ✓', " +
+    "'Not yet connected ✗', 'Tools you can use now', 'Tools you'll unlock', and 'Recommended next " +
+    "step + why'. " +
+    "Only AFTER that report is fully presented, ask exactly one question using this visible prompt: " +
+    "'[Y/n] Index repository now?'. Only an explicit affirmative answer (e.g. 'y'/'yes') starts " +
+    "indexing; a blank answer, a negative answer, EOF, an unavailable interaction, and any " +
+    "non-interactive/headless run all resolve to NO. " +
+    "On an affirmative answer: call the parse_repository MCP tool exactly once, describe the accepted " +
+    "job as QUEUED, and direct later progress checks to get_parse_status or /check-parse-status " +
+    "(do NOT poll it to completion). If parse_repository returns a blocking refusal or error, do NOT " +
+    "claim the job was queued — report the sanitized result and leave indexing pending. " +
+    "On NO (or any unavailable/non-interactive resolution): do not index; print the exact copy-paste " +
+    "continuation command '/parse-repository' on its own line and state that indexing remains pending. " +
+    "Never request, echo, or transport any credential — only ever direct the human to the setup UI via " +
+    "the command's configure_in pointer. " +
+    "End with an explicit summary line stating how many config fields the apply_install_manifest call " +
+    "applied (e.g. 'Applied 8 of 9 derived fields') and whether indexing was queued or left pending — " +
+    "if 0 fields were applied, say so loudly and explain what is still pending.";
 /** Default base URL when `BAPI_BASE_URL` is unset (mirrors index.ts). */
 export const DEFAULT_BAPI_BASE_URL = "https://bridgegpt-api.com";
 /** Default docs dir when `BAPI_DOCS_DIR` is unset (mirrors index.ts). */
@@ -86,39 +144,85 @@ export function getInstallBridgeUsage() {
         "One-command Bridge API project bootstrap. Scaffolds the project, writes the",
         "per-host MCP config with your credentials, verifies connectivity, persists the",
         "routing credential, then opens a fresh agent session to derive the remaining",
-        "config and run /learn-repository.",
+        "config, present a capability report, and offer optional repository indexing.",
         "",
         "Inputs (the only two irreducible ones):",
         "  --api-key <key>   Bridge API key. Falls back to the BAPI_API_KEY env var,",
         "                    then an interactive (no-echo) prompt. Generate one in the",
         "                    Bridge API web UI Security page — this command consumes a",
-        "                    key, it does not create one. NEVER printed or logged.",
-        "  --repo <name>     Repository name. Falls back to BAPI_REPO_NAME, then an",
-        "                    inferred default you confirm interactively. MUST match the",
-        "                    server-side repo registration (it keys the credential",
-        "                    store as bapi:<repo>). Required (no inference) when stdin",
-        "                    is non-interactive.",
+        "                    key, it does not create one (--invite is the one exception:",
+        "                    it CREATES the project and its first admin key). NEVER",
+        "                    printed or logged.",
+        "  --repo <name>     Repository name. --repo and BAPI_REPO_NAME still take",
+        "                    priority and short-circuit before any network call. When",
+        "                    neither is set, a compatible server resolves the unique",
+        "                    repository from your existing API key automatically; if the",
+        "                    server is older, the key is unresolvable, or resolution",
+        "                    fails, it falls back to an inferred default you confirm",
+        "                    interactively (and to a required --repo when stdin is",
+        "                    non-interactive). MUST match the server-side repo",
+        "                    registration (it keys the credential store as bapi:<repo>).",
+        "                    With --invite it is the name your NEW project is created",
+        "                    under (globally unique).",
+        "",
+        "Self-serve onboarding (no account, no API key, no pre-issued invite):",
+        "  --email <addr>    Create a brand-new Bridge workspace from just an email —",
+        "                    the primary path for a first-time user with nothing yet.",
+        "                    It requests a fresh workspace for that email, then creates",
+        "                    the project and mints your own admin API key in one command.",
+        "                    Falls back to the BAPI_SIGNUP_EMAIL env var, then a visible",
+        "                    interactive prompt. The email is NOT a secret (it is shown",
+        "                    as you type), but it is never printed to a log. Mutually",
+        "                    exclusive with --api-key and --invite. No email verification",
+        "                    is performed and no message is sent to the address — it only",
+        "                    labels the new workspace.",
+        "",
+        "Bootstrap-invite onboarding (no web UI, no pre-existing key):",
+        "  --invite [token]  Redeem a bootstrap invite you were already given: creates",
+        "                    the project and mints your own admin API key in one command.",
+        "                    Mutually exclusive with --api-key and --email (in this mode",
+        "                    the key is created, not consumed).",
+        "",
+        "                    Run it WITHOUT a value — `install-bridge --invite` — and the",
+        "                    token is read from an interactive prompt with echo",
+        "                    suppressed, then sent only in the request body. This is the",
+        "                    default and the recommended path: 'a copy/paste one-liner'",
+        "                    and 'the token never touches shell history' are",
+        "                    contradictory, so the one-liner your operator sends you is",
+        "                    SECRET-FREE and the CLI asks for the token.",
+        "",
+        "                    Passing the token inline (--invite <token>, --invite=<token>)",
+        "                    or via BAPI_INVITE is for SCRIPTING ONLY: both forms EXPOSE",
+        "                    THE TOKEN to your shell history and to the process list.",
         "",
         "Flags:",
         "  --force                       Overwrite an existing real BAPI_API_KEY in a",
-        "                                host config without prompting.",
+        "                                host config (or in the credential store) without",
+        "                                prompting.",
         "  --dry-run                     Preview every step (scaffold targets, config",
         "                                files + keys with the key REDACTED, ping",
         "                                target, credential target, spawn command)",
         "                                without writing, pinging, or spawning anything.",
+        "                                With --invite it also never calls the exchange",
+        "                                endpoint and never generates or stores a secret.",
         "  --agent claude|cursor-agent   Agent to launch for the agentic remainder",
         "                                (default: claude).",
         "  -h, --help                    Show this help.",
         "",
         "Environment: BAPI_BASE_URL (default https://bridgegpt-api.com) and BAPI_DOCS_DIR",
         "(default docs/tmp) are read from the environment with the shown fallbacks.",
+        "BAPI_SIGNUP_EMAIL supplies the self-serve signup email non-interactively (it is",
+        "visible input, not a secret). BAPI_INVITE supplies the bootstrap-invite token",
+        "non-interactively (scripting only — it is exposed to shell history; prefer the",
+        "prompt).",
     ].join("\n");
 }
 /**
  * Parse argv strictly. Supports `--api-key`, `--repo`, `--agent` (each with a
- * `--flag value` or `--flag=value` form), the boolean `--force` / `--dry-run`,
- * and `-h`/`--help`. Unknown flags and positional args are rejected. The API key
- * value is captured but never echoed (no error message includes it).
+ * `--flag value` or `--flag=value` form), the OPTIONAL-value `--invite`, the
+ * boolean `--force` / `--dry-run`, and `-h`/`--help`. Unknown flags and positional
+ * args are rejected. The API-key and bootstrap-invite values are captured but
+ * never echoed (no error message includes either).
  */
 export function parseInstallBridgeArgs(argv) {
     if (argv.includes("-h") || argv.includes("--help")) {
@@ -129,6 +233,13 @@ export function parseInstallBridgeArgs(argv) {
     let force = false;
     let dryRun = false;
     let agentName = DEFAULT_AGENT_NAME;
+    let invite;
+    let email;
+    // Track SUPPLIED-ness separately from the values: `--invite` is legitimately
+    // valueless (prompt path) and `--api-key ""` is still a contradiction with it.
+    let inviteSupplied = false;
+    let apiKeySupplied = false;
+    let emailSupplied = false;
     /** Read a `--flag value` or `--flag=value` value, advancing the index. */
     const readValue = (arg, flag, i) => {
         if (arg.startsWith(`${flag}=`)) {
@@ -154,6 +265,39 @@ export function parseInstallBridgeArgs(argv) {
             if ("error" in r)
                 return { status: "error", message: r.error };
             apiKey = r.value;
+            apiKeySupplied = true;
+            i = r.nextIndex;
+            continue;
+        }
+        if (arg === "--invite" || arg.startsWith("--invite=")) {
+            inviteSupplied = true;
+            if (arg.startsWith("--invite=")) {
+                invite = arg.slice("--invite=".length);
+            }
+            else {
+                // OPTIONAL value: a bare `--invite` selects bootstrap-invite mode and the
+                // token is prompted for (no echo). Only a following non-flag token is
+                // consumed as the value — a bootstrap-invite token never starts with '-'.
+                const next = argv[i + 1];
+                if (typeof next === "string" && !next.startsWith("-")) {
+                    invite = next;
+                    i += 1;
+                }
+            }
+            continue;
+        }
+        if (arg === "--email" || arg.startsWith("--email=")) {
+            // REQUIRED-value flag (unlike --invite): the email is what selects and drives
+            // the self-serve mint, so a bare or blank `--email` is a hard error rather
+            // than a prompt trigger. The value is NOT echoed in any error message.
+            const r = readValue(arg, "--email", i);
+            if ("error" in r)
+                return { status: "error", message: r.error };
+            if (r.value.trim().length === 0) {
+                return { status: "error", message: "--email requires a non-empty value." };
+            }
+            email = r.value.trim();
+            emailSupplied = true;
             i = r.nextIndex;
             continue;
         }
@@ -187,38 +331,109 @@ export function parseInstallBridgeArgs(argv) {
             message: `Unexpected positional argument: '${arg}'. install-bridge does not accept positional arguments.`,
         };
     }
-    return { status: "ok", options: { apiKey, repo, force, dryRun, agentName } };
+    // Mutually exclusive by construction: bootstrap-invite mode CREATES the key, so
+    // consuming one is a contradiction. Names the flags only — never their values.
+    if (inviteSupplied && apiKeySupplied) {
+        return {
+            status: "error",
+            message: "--invite and --api-key are mutually exclusive: a bootstrap invite creates your API key, " +
+                "it does not consume an existing one.",
+        };
+    }
+    // --email selects self-serve mode, which CREATES the key — so it conflicts with
+    // both consuming an existing one (--api-key) and redeeming a pre-issued invite
+    // (--invite). Names the flags only — never the email or token values (BAPI-618).
+    if (emailSupplied && apiKeySupplied) {
+        return {
+            status: "error",
+            message: "--email and --api-key are mutually exclusive: self-serve signup creates your API key, " +
+                "it does not consume an existing one.",
+        };
+    }
+    if (emailSupplied && inviteSupplied) {
+        return {
+            status: "error",
+            message: "--email and --invite are mutually exclusive: use --email for self-serve signup (no " +
+                "pre-issued invite), or --invite to redeem an invite you already have.",
+        };
+    }
+    return {
+        status: "ok",
+        options: { apiKey, repo, force, dryRun, agentName, invite, inviteMode: inviteSupplied, email },
+    };
 }
-/** No-echo secret prompt on stderr (so it never lands in piped stdout). */
-function promptSecretViaReadline(promptText) {
+/**
+ * No-echo secret prompt on stderr (so it never lands in piped stdout).
+ *
+ * `input`/`output` are injectable for tests ONLY — production always uses the real
+ * stdin/stderr. They exist because this function is the one piece of the install
+ * flow that talks to a live terminal, and stubbing it out at the deps seam left the
+ * terminal behavior itself (prompt visibility, echo suppression) fully unverified.
+ */
+export function promptSecretViaReadline(promptText, input = process.stdin, output = process.stderr) {
     return new Promise((resolve) => {
         const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stderr,
+            input,
+            output,
             terminal: true,
         });
-        // Suppress echo of typed characters: override the internal writer so only the
-        // prompt (written explicitly below) is shown, never the keystrokes.
+        // The prompt MUST be owned by readline (passed to `question` below), never
+        // written to stderr by hand. On every redraw readline emits cursorTo(0) +
+        // clearScreenDown straight to `output`, bypassing the `_writeToOutput` hook
+        // — so a hand-written prompt is erased on the first redraw, leaving a blank
+        // line with muted echo that is indistinguishable from a hang.
+        //
+        // Echo suppression therefore works by reprinting the prompt and swallowing
+        // everything else: readline redraws the line as `prompt + typed input`, so a
+        // write containing the prompt is a redraw (reprint the prompt alone, drop the
+        // secret) and any other write is a keystroke echo (drop it).
         const mutable = rl;
         let muted = false;
         mutable._writeToOutput = (s) => {
-            if (!muted)
-                process.stderr.write(s);
+            if (!muted) {
+                output.write(s);
+            }
+            else if (s.includes(promptText)) {
+                output.write(promptText);
+            }
         };
-        process.stderr.write(promptText);
-        muted = true;
-        rl.question("", (answer) => {
+        // `close` fires without an answer when stdin hits EOF (piped/closed input).
+        // Resolving empty lets the caller emit its real "no key entered" error; left
+        // unresolved this promise deadlocks the top-level await and Node exits 13
+        // with only an "unsettled top-level await" warning.
+        //
+        // `answered` is load-bearing: `rl.close()` emits `close` SYNCHRONOUSLY, so on
+        // the happy path this handler runs before `resolve(answer)` below and would
+        // otherwise settle the promise empty — silently discarding the typed key.
+        let answered = false;
+        rl.on("close", () => {
+            if (!answered)
+                resolve("");
+        });
+        rl.question(promptText, (answer) => {
+            answered = true;
             rl.close();
-            process.stderr.write("\n");
+            output.write("\n");
             resolve(answer.trim());
         });
+        // Only mute AFTER `question` has drawn the prompt at full visibility.
+        muted = true;
     });
 }
 /** Echoed single-line prompt on stderr (used for repo confirmation / value). */
 function promptLineViaReadline(promptText) {
     return new Promise((resolve) => {
         const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+        // See promptSecretViaReadline: EOF must resolve rather than deadlock the
+        // top-level await, and `answered` guards the synchronous `close` from
+        // discarding a real answer.
+        let answered = false;
+        rl.on("close", () => {
+            if (!answered)
+                resolve("");
+        });
         rl.question(promptText, (answer) => {
+            answered = true;
             rl.close();
             resolve(answer.trim());
         });
@@ -233,10 +448,25 @@ function promptLineViaReadline(promptText) {
  * Always resolves (never rejects): a spawn error / non-zero exit / timeout becomes
  * `{ ok: false, warning }` with secret-free warning text.
  */
+/**
+ * The env clone handed to the pre-warm child, with every credential/PII variable
+ * removed: `BAPI_API_KEY` and the bootstrap-invite token (`BAPI_INVITE`) are
+ * secrets that must never reach an npm lifecycle script, and the self-serve signup
+ * email (`BAPI_SIGNUP_EMAIL`, BAPI-618) is invitee PII with no business in a
+ * `--version` probe. Extracted as a pure, exported helper so the strip is directly
+ * unit-testable (the default spawner below uses the real `spawn`, which is not
+ * injectable).
+ */
+export function sanitizePrewarmEnv(env) {
+    const sanitized = { ...env };
+    delete sanitized.BAPI_API_KEY;
+    delete sanitized.BAPI_INVITE;
+    delete sanitized.BAPI_SIGNUP_EMAIL;
+    return sanitized;
+}
 function spawnPrewarmDefault(command, args, env) {
     return new Promise((resolve) => {
-        const sanitizedEnv = { ...env };
-        delete sanitizedEnv.BAPI_API_KEY;
+        const sanitizedEnv = sanitizePrewarmEnv(env);
         try {
             const child = spawn(command, args, {
                 shell: false,
@@ -265,6 +495,11 @@ function spawnPrewarmDefault(command, args, env) {
 /** Build default deps from the live process. */
 export function createDefaultInstallBridgeDeps() {
     const isTTY = Boolean(process.stdin.isTTY);
+    // One production fetch, reused for both the `fetch` seam and the default
+    // resolver, so a direct caller of this factory gets a resolver bound to the
+    // same client. (runInstallBridgeCli re-binds the resolver to the FINAL merged
+    // fetch when the caller did not override the resolver — see below.)
+    const productionFetch = (...args) => fetch(...args);
     return {
         env: process.env,
         cwd: process.cwd(),
@@ -278,12 +513,25 @@ export function createDefaultInstallBridgeDeps() {
         rename: (a, b) => rename(a, b),
         chmod: (p, m) => chmod(p, m),
         unlink: (p) => unlink(p),
+        open: async (p, flags, mode) => {
+            const handle = await open(p, flags, mode);
+            return {
+                writeFile: (data) => handle.writeFile(data, { encoding: "utf-8" }),
+                sync: () => handle.sync(),
+                close: () => handle.close(),
+            };
+        },
+        randomBytes: (size) => cryptoRandomBytes(size),
         promptSecret: isTTY ? promptSecretViaReadline : undefined,
         promptLine: isTTY ? promptLineViaReadline : undefined,
-        fetch: (...args) => fetch(...args),
+        fetch: productionFetch,
+        resolveRepoViaServer: (baseUrl, apiKey) => resolveRepoViaServer(productionFetch, baseUrl, apiKey),
         spawnPrewarm: spawnPrewarmDefault,
         runInit,
         upsertCredential: upsertBapiCredential,
+        prepareBootstrapPending: prepareBootstrapPendingCredential,
+        repointBootstrapPending: repointBootstrapPendingCredential,
+        promoteBootstrapPending: promoteBootstrapPendingCredential,
         buildShellCommand: buildGenericAgentShellCommand,
         spawnTerminalTab: getDefaultSpawnTerminalTabForPlatform(process.platform),
         startTicketsDeps: createDefaultStartTicketsDeps(),
@@ -317,20 +565,128 @@ export async function resolveApiKey(options, deps) {
     };
 }
 /**
- * Resolve the repo name: `--repo` → `BAPI_REPO_NAME` env → inferred default
- * (from .bridge/config, else the cwd basename) confirmed interactively. Fails
- * fast (no inference) when neither is supplied and stdin is non-interactive —
- * the repo identity keys the credential store and must match server-side
- * registration, so it is never silently inferred non-interactively.
+ * Resolve the BOOTSTRAP-INVITE token: `--invite <token>` → `BAPI_INVITE` env →
+ * interactive no-echo prompt. Fails (secret-free) when none is available and
+ * stdin is non-interactive.
+ *
+ * The order mirrors {@link resolveApiKey}, but the EMPHASIS is inverted, and that
+ * inversion is the point: "a copy/paste one-liner" and "the token never touches
+ * shell history" are contradictory — both `--invite <token>` and
+ * `BAPI_INVITE=… npx …` land in shell history and in `ps`. So the one-liner an
+ * operator hands an invitee is SECRET-FREE (`install-bridge --invite`), and the
+ * no-echo prompt below is the DEFAULT path rather than a last-resort fallback. The
+ * token then travels only in the exchange request body. The inline/env forms remain
+ * for scripting and are documented as history-exposing.
+ *
+ * The token value is never echoed: not in the prompt, not in any error here.
  */
-export async function resolveRepoName(options, deps) {
-    if (typeof options.repo === "string" && options.repo.trim().length > 0) {
-        return { ok: true, value: options.repo.trim() };
+export async function resolveInviteToken(options, deps) {
+    if (typeof options.invite === "string" && options.invite.trim().length > 0) {
+        return { ok: true, value: options.invite.trim() };
     }
-    const fromEnv = deps.env.BAPI_REPO_NAME;
+    const fromEnv = deps.env.BAPI_INVITE;
     if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
         return { ok: true, value: fromEnv.trim() };
     }
+    if (deps.isTTY && deps.promptSecret) {
+        const entered = (await deps.promptSecret("Bootstrap invite token (input hidden): ")).trim();
+        if (entered.length > 0) {
+            return { ok: true, value: entered };
+        }
+        return { ok: false, error: "No bootstrap invite token entered." };
+    }
+    return {
+        ok: false,
+        error: "A bootstrap invite token is required. Pass --invite <token> or set the BAPI_INVITE " +
+            "environment variable (no interactive terminal is available to prompt for it). Note that " +
+            "both forms expose the token to your shell history and process list — prefer running " +
+            "'install-bridge --invite' interactively.",
+    };
+}
+/**
+ * Resolve the SELF-SERVE signup email: `--email <addr>` → `BAPI_SIGNUP_EMAIL` env →
+ * interactive VISIBLE prompt (BAPI-618). Fails (secret-free) when none is available
+ * and stdin is non-interactive.
+ *
+ * The precedence mirrors {@link resolveInviteToken}, but the input is NOT a secret:
+ * an email is not a credential, so it uses the ECHOED {@link InstallBridgeDeps.promptLine}
+ * — never `promptSecret`. (It IS invitee PII, so like every value in this module it
+ * is never written to a log line; it is only ever echoed as the user's own keystrokes
+ * and placed in the mint request body.)
+ *
+ * No email-format validation is performed here — only surrounding whitespace is
+ * trimmed, matching the other CLI input seams and the server's deliberately
+ * permissive "stored unvalidated" contract (D-2). The entered value is never echoed
+ * back in an error message.
+ */
+export async function resolveSignupEmail(options, deps) {
+    if (typeof options.email === "string" && options.email.trim().length > 0) {
+        return { ok: true, value: options.email.trim() };
+    }
+    const fromEnv = deps.env.BAPI_SIGNUP_EMAIL;
+    if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
+        return { ok: true, value: fromEnv.trim() };
+    }
+    if (deps.isTTY && deps.promptLine) {
+        const entered = (await deps.promptLine("Email for Bridge workspace setup: ")).trim();
+        if (entered.length > 0) {
+            return { ok: true, value: entered };
+        }
+        return { ok: false, error: "No email entered." };
+    }
+    return {
+        ok: false,
+        error: "An email is required to create a Bridge workspace. Pass --email <addr> or set the " +
+            "BAPI_SIGNUP_EMAIL environment variable (no interactive terminal is available to prompt " +
+            "for it).",
+    };
+}
+/**
+ * Select the onboarding branch as pure logic (deterministic, no I/O, no prompt):
+ *
+ *   - `--invite` (with or without a value) or a non-empty `BAPI_INVITE` selects
+ *     the `bootstrap-invite` need-key branch.
+ *   - otherwise, `--email` or a non-empty `BAPI_SIGNUP_EMAIL` selects the
+ *     `self-serve` need-key branch (BAPI-618).
+ *   - every other invocation selects `have-key`.
+ *
+ * Precedence is explicit: an invite input wins over an email input (both are
+ * need-key, but a pre-issued invite is the more specific intent), and any
+ * need-key input wins over the have-key default. The parser already rejects
+ * `--email` alongside `--api-key`/`--invite`, so a flag-level conflict never
+ * reaches here; the precedence only disambiguates env-var combinations.
+ */
+export function resolveInstallBridgeOnboardingBranch(options, env) {
+    const inviteMode = options.inviteMode === true || (env.BAPI_INVITE ?? "").trim().length > 0;
+    if (inviteMode)
+        return { kind: "need-key", method: "bootstrap-invite" };
+    const emailMode = (options.email ?? "").trim().length > 0 ||
+        (env.BAPI_SIGNUP_EMAIL ?? "").trim().length > 0;
+    if (emailMode)
+        return { kind: "need-key", method: "self-serve" };
+    return { kind: "have-key" };
+}
+/**
+ * Return the explicitly configured repository name (`--repo`, then
+ * `BAPI_REPO_NAME`), trimmed, or `undefined` when neither is supplied. Pure: no
+ * prompting, no inference, no I/O. `--repo` takes priority over the environment.
+ * This is the deterministic short-circuit that runs BEFORE any server resolution.
+ */
+export function resolveConfiguredRepoName(options, env) {
+    if (typeof options.repo === "string" && options.repo.trim().length > 0) {
+        return options.repo.trim();
+    }
+    const fromEnv = env.BAPI_REPO_NAME;
+    if (typeof fromEnv === "string" && fromEnv.trim().length > 0) {
+        return fromEnv.trim();
+    }
+    return undefined;
+}
+export async function resolveRepoName(options, deps) {
+    const configured = resolveConfiguredRepoName(options, deps.env);
+    if (configured !== undefined) {
+        return { ok: true, value: configured };
+    }
     // Non-interactive: fail fast and require --repo. Inference is an interactive
     // convenience only (the user must confirm it).
     if (!deps.isTTY || !deps.promptLine) {
@@ -489,11 +845,13 @@ export async function verifyConnectivity(deps, baseUrl, repoName, apiKey) {
             signal: AbortSignal.timeout(10_000),
         });
     }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
+    catch {
+        // The caught exception message is NOT interpolated: some fetch/undici errors
+        // echo request detail (which carries the X-API-Key header) into the message,
+        // so a fixed, secret-free string is used instead (BAPI-616).
         return {
             ok: false,
-            message: `Could not reach the Bridge API at ${baseUrl} (${msg}). Check BAPI_BASE_URL and your network.`,
+            message: `Could not reach the Bridge API at ${baseUrl}. Check BAPI_BASE_URL and your network.`,
         };
     }
     if (resp.ok)
@@ -518,14 +876,275 @@ export async function verifyConnectivity(deps, baseUrl, repoName, apiKey) {
         message: `Connectivity check failed (HTTP ${resp.status}). Verify your repo, API key, and BAPI_BASE_URL.`,
     };
 }
+/** The resolve endpoint: `<base>/setup/resolve-repo`. No query string — ever. */
+export function buildResolveRepoUrl(baseUrl) {
+    return `${baseUrl.replace(/\/+$/, "")}/setup/resolve-repo`;
+}
 /**
- * Render the --dry-run preview lines. The API key is ALWAYS redacted — the
- * spawnCommand and config preview never embed the secret.
+ * Resolve the repository name server-side from an existing API key. The key
+ * travels ONLY in the `X-API-Key` header (never the URL, never the body), bounded
+ * by the same 10s timeout as {@link verifyConnectivity}.
+ *
+ * Status mapping is the whole compatibility story: `404` → `not-deployed` (old
+ * server), `409` → `unresolved` (ambiguous/shared/client-scoped/legacy), every
+ * other non-OK (`401`, `403`, `5xx`, unexpected) → `error`, and any
+ * network/timeout/malformed-body failure → `error`. A caught exception or a
+ * response body is NEVER read into the result.
+ */
+export async function resolveRepoViaServer(fetchImpl, baseUrl, apiKey) {
+    const url = buildResolveRepoUrl(baseUrl);
+    let resp;
+    try {
+        resp = await fetchImpl(url, {
+            headers: { "X-API-Key": apiKey },
+            signal: AbortSignal.timeout(10_000),
+        });
+    }
+    catch {
+        // Network failure / timeout. The exception may echo the request (and thus the
+        // X-API-Key header), so it is never inspected or propagated.
+        return { status: "error" };
+    }
+    if (resp.status === 404)
+        return { status: "not-deployed" };
+    if (resp.status === 409)
+        return { status: "unresolved" };
+    if (!resp.ok)
+        return { status: "error" };
+    let body;
+    try {
+        body = await resp.json();
+    }
+    catch {
+        return { status: "error" };
+    }
+    const repoName = body?.repo_name;
+    const validated = validateRepoName(repoName);
+    if (!validated.ok)
+        return { status: "error" };
+    return { status: "resolved", repoName: validated.value };
+}
+// ---------------------------------------------------------------------------
+// Bootstrap-invite exchange (BAPI-606) — replaces the pre-flight ping in invite mode
+// ---------------------------------------------------------------------------
+/** Bytes of CSPRNG entropy behind `key_secret` (server requires exactly 32). */
+export const BOOTSTRAP_KEY_SECRET_BYTES = 32;
+/**
+ * Generate the client-side `key_secret`: exactly 32 CSPRNG bytes, base64url,
+ * which yields exactly the 43 unpadded characters the server validates. The
+ * length is EXACT, not a floor — the server rejects 42 and 44, because ">= 43"
+ * had no upper bound and an over-72-byte input is a bcrypt-truncation hazard.
+ *
+ * The returned value is a SECRET. It is never logged, never previewed, and never
+ * placed in an error.
+ */
+export function generateBootstrapKeySecret(randomBytes) {
+    return randomBytes(BOOTSTRAP_KEY_SECRET_BYTES).toString("base64url");
+}
+/**
+ * SHA-256 hex digest of the bootstrap-invite token — the key under which the
+ * pending record is stored. The TOKEN ITSELF IS NEVER WRITTEN TO DISK; only this
+ * one-way fingerprint, so a retry can recognize "same invite, same repo" and reuse
+ * the exact pending `key_secret` (the replay proof).
+ */
+export function fingerprintBootstrapInvite(token) {
+    return createHash("sha256").update(token, "utf-8").digest("hex");
+}
+/** The exchange endpoint: `<base>/setup/bootstrap`. No query string — ever. */
+export function buildBootstrapExchangeUrl(baseUrl) {
+    return `${baseUrl.replace(/\/+$/, "")}/setup/bootstrap`;
+}
+/**
+ * POST the bootstrap-invite exchange. The token and `key_secret` travel ONLY in
+ * the JSON request body (never a query string, never a header, never a log line).
+ * Bounded by the same 10s timeout as the connectivity ping.
+ */
+export async function exchangeBootstrapInvite(deps, baseUrl, token, repoName, keySecret) {
+    const url = buildBootstrapExchangeUrl(baseUrl);
+    let resp;
+    try {
+        resp = await deps.fetch(url, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ token, repo_name: repoName, key_secret: keySecret }),
+            signal: AbortSignal.timeout(10_000),
+        });
+    }
+    catch (err) {
+        // The message may contain the request (some fetch impls echo it), so it is
+        // deliberately NOT interpolated here.
+        void err;
+        return {
+            ok: false,
+            kind: "failed",
+            message: `Could not reach the Bridge API at ${baseUrl} to redeem the bootstrap invite. Check ` +
+                "BAPI_BASE_URL and your network, then re-run — the invite has not been used, and the " +
+                "re-run will reuse the same locally-stored secret.",
+        };
+    }
+    if (resp.ok) {
+        let repo;
+        try {
+            const body = (await resp.json());
+            repo = body?.repo_name;
+        }
+        catch {
+            return {
+                ok: false,
+                kind: "failed",
+                message: "The Bridge API returned an unreadable response to the bootstrap exchange.",
+            };
+        }
+        // Validate the authoritative name before it reaches a path, a config target, or
+        // the credential store.
+        const validated = validateRepoName(repo);
+        if (!validated.ok) {
+            return {
+                ok: false,
+                kind: "failed",
+                message: "The Bridge API returned an unexpected repo name for the bootstrap exchange.",
+            };
+        }
+        return { ok: true, repoName: validated.value };
+    }
+    if (resp.status === 409) {
+        return {
+            ok: false,
+            kind: "repo-name-taken",
+            message: `The repo name '${repoName}' is already taken (HTTP 409). Repo names are globally unique.`,
+        };
+    }
+    if (resp.status === 401) {
+        return { ok: false, kind: "invalid-invite", message: `The Bridge API rejected the bootstrap invite (HTTP ${resp.status}).` };
+    }
+    return {
+        ok: false,
+        kind: "failed",
+        message: `The bootstrap exchange failed (HTTP ${resp.status}). Verify BAPI_BASE_URL and try again.`,
+    };
+}
+// ---------------------------------------------------------------------------
+// Self-serve mint (BAPI-618): email -> invite token
+// ---------------------------------------------------------------------------
+/**
+ * The self-serve invite-token prefix, mirroring the server's
+ * ``BOOTSTRAP_INVITE_TOKEN_PREFIX`` (``bapi_inv_``). A well-formed token
+ * self-identifies with this prefix; a success response whose token does not is
+ * treated as a `failed` mint rather than fed into the redemption path.
+ */
+export const BOOTSTRAP_INVITE_TOKEN_PREFIX = "bapi_inv_";
+/** The self-serve mint endpoint: `<base>/setup/bootstrap/self-serve`. No query string — ever. */
+export function buildSelfServeMintUrl(baseUrl) {
+    return `${baseUrl.replace(/\/+$/, "")}/setup/bootstrap/self-serve`;
+}
+/**
+ * POST the self-serve mint: an email in, an invite token out. Mirrors
+ * {@link exchangeBootstrapInvite}'s fetch/timeout/secret-free-result discipline.
+ *
+ * The email travels ONLY in the JSON request body (never a query string, never a
+ * header, never a log line). Bounded by the same 10s timeout as the exchange and
+ * the connectivity ping. On any non-success status the failure body is NOT read —
+ * the status alone decides the category — because an untrusted upstream body could
+ * echo the email or carry internals. A caught fetch exception is likewise never
+ * inspected or interpolated; some fetch impls embed the request (and thus the
+ * email) in the message.
+ */
+export async function mintSelfServeInvite(deps, baseUrl, email) {
+    const url = buildSelfServeMintUrl(baseUrl);
+    let resp;
+    try {
+        resp = await deps.fetch(url, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ invitee_email: email }),
+            signal: AbortSignal.timeout(10_000),
+        });
+    }
+    catch (err) {
+        // The message may contain the request (some fetch impls echo it), so it is
+        // deliberately NOT inspected or interpolated here.
+        void err;
+        return { ok: false, category: "failed" };
+    }
+    if (resp.ok) {
+        let token;
+        try {
+            const body = (await resp.json());
+            token = body?.token;
+        }
+        catch {
+            // An unreadable success body is not actionable and must not be exposed.
+            return { ok: false, category: "failed" };
+        }
+        if (typeof token !== "string" ||
+            token.trim().length === 0 ||
+            !token.startsWith(BOOTSTRAP_INVITE_TOKEN_PREFIX)) {
+            return { ok: false, category: "failed" };
+        }
+        return { ok: true, token };
+    }
+    // Non-success: the status alone decides the category. The failure body is NEVER
+    // read — it is untrusted and could echo the email or leak internals.
+    if (resp.status === 429) {
+        return { ok: false, category: "rate-limited" };
+    }
+    if (resp.status === 400 || resp.status === 422) {
+        return { ok: false, category: "invalid" };
+    }
+    return { ok: false, category: "failed" };
+}
+/**
+ * The 401 message for a run that had to GENERATE a fresh secret — i.e. no local
+ * pending record existed. Besides a simply-wrong token, this is exactly what a lost
+ * `~/.config/bridge` looks like after a successful redemption: the retry sends a
+ * NEW secret, so the server's replay branch cannot match and correctly answers 401
+ * (letting a different secret replace the key would turn a spent token back into a
+ * bearer credential).
+ *
+ * The recovery is therefore NOT "re-run" and NOT "re-mint" — re-running sends
+ * another new secret and gets 401 again, and a fresh invite cannot reuse the repo
+ * name, which is globally unique and now taken by the project already created. Do
+ * not suggest either.
+ */
+export const BOOTSTRAP_INVITE_LOST_SECRET_MESSAGE = [
+    "The Bridge API rejected the bootstrap invite (HTTP 401).",
+    "",
+    "Either the invite is invalid, expired, or revoked — or it was ALREADY redeemed from this",
+    "machine and the local secret has since been lost (e.g. ~/.config/bridge was deleted).",
+    "",
+    "If it was already redeemed, you cannot recover it yourself:",
+    "  • Re-running will NOT work: each run without the original local secret sends a new one,",
+    "    which cannot match what the server stored, so it will keep returning 401.",
+    "  • A new bootstrap invite will NOT work either: your repo name is globally unique and is",
+    "    now taken by the project you already created, so it cannot be redeemed again.",
+    "",
+    "Ask your Bridge API operator to recover it for you: they revoke the orphaned key",
+    "(DELETE /setup/keys/{id}) and issue a replacement key for the EXISTING project",
+    "(POST /setup/keys), then send you that key. Run install-bridge with --api-key <that key>.",
+].join("\n");
+/**
+ * The 401 message for a run that REUSED an existing pending secret — the replay
+ * proof was sent and still rejected, so the invite itself is not usable.
+ */
+export const BOOTSTRAP_INVITE_REJECTED_MESSAGE = "The Bridge API rejected the bootstrap invite (HTTP 401). The invite is invalid, expired, or " +
+    "revoked — ask your Bridge API operator for a new one. (Your locally-stored secret was sent " +
+    "unchanged, so this is not a lost-secret problem.)";
+/**
+ * Render the --dry-run preview lines. Every secret is ALWAYS redacted — the
+ * spawnCommand, config preview, and (in bootstrap-invite mode) the exchange body
+ * never embed the API key, the invite token, or the generated `key_secret`.
+ *
+ * The plan itself holds no secret and no invite fingerprint, so this function
+ * CANNOT leak one: in bootstrap-invite mode it is called before any secret exists.
  */
 export function buildDryRunPreview(plan) {
+    if (plan.bootstrapInvite)
+        return buildBootstrapDryRunPreview(plan);
     return [
-        "install-bridge --dry-run (no writes, no network, no spawns)",
-        `Repo name:        ${plan.repoName}`,
+        plan.attemptedServerResolution
+            ? "install-bridge --dry-run (one read-only repository-resolution GET may already have occurred; no writes, no state-changing requests, no spawns)"
+            : "install-bridge --dry-run (no writes, no network, no spawns)",
+        `Repo name:        ${plan.repoName}${plan.attemptedServerResolution ? " (resolved server-side from your API key)" : ""}`,
         `Base URL (ping):  ${plan.baseUrl}`,
         `Docs dir:         ${plan.docsDir}`,
         `Agent:            ${plan.agentName}`,
@@ -543,6 +1162,61 @@ export function buildDryRunPreview(plan) {
         `Step 5 — spawn agent session: ${plan.spawnCommand}`,
     ];
 }
+/**
+ * Bootstrap-invite dry-run preview. A --dry-run must not consume the invite OR
+ * LEAVE STATE BEHIND: skipping the HTTP call is not enough — a preview that wrote
+ * a pending `key_secret` would have left credential material on disk for a
+ * redemption that never happened. So the caller returns here BEFORE the CSPRNG
+ * runs and before anything is written.
+ */
+function buildBootstrapDryRunPreview(plan) {
+    const pendingTarget = `bootstrap-pending:${plan.repoName}`;
+    // Self-serve signup (BAPI-618): the ONLY structural difference from a pre-issued
+    // invite is a mint-from-email step (Step 2·pre) that turns an email into the
+    // invite token before the unchanged redemption below. The preview states plainly
+    // that in --dry-run that signup/mint is previewed-and-skipped: no account is
+    // created, no mint request is sent, no email leaves the machine. The email and
+    // any synthetic token are deliberately absent from this output.
+    const header = plan.selfServeSignup
+        ? "install-bridge --email --dry-run (no writes, no network, no spawns, no account created, no secret generated)"
+        : "install-bridge --invite --dry-run (no writes, no network, no spawns, no secret generated)";
+    const repoLine = plan.selfServeSignup
+        ? `Repo name:        ${plan.repoName} (created by the self-serve exchange; globally unique)`
+        : `Repo name:        ${plan.repoName} (created by the exchange; globally unique)`;
+    const selfServeStep = plan.selfServeSignup
+        ? [
+            "Step 2·pre — self-serve signup (PREVIEWED, SKIPPED in --dry-run): no Bridge workspace",
+            "          signup is requested, no mint call is made, and no email is sent or transmitted;",
+            "          a real run would request a fresh workspace for your email and receive an invite",
+            "          token, which then feeds the SAME redemption protocol below.",
+        ]
+        : [];
+    return [
+        header,
+        repoLine,
+        `Base URL:         ${plan.baseUrl}`,
+        `Docs dir:         ${plan.docsDir}`,
+        `Agent:            ${plan.agentName}`,
+        "",
+        "Step 1 — scaffold (runInit): commands, agents, pipelines, .bridge/config, secret-free MCP placeholders.",
+        ...selfServeStep,
+        `Step 2a — generate key_secret (32 CSPRNG bytes) and fsync it to ${pendingTarget} at ${plan.credentialStorePath}`,
+        "          BEFORE the exchange. If that write fails the run ABORTS and no invite is spent.",
+        `Step 2b — redeem the bootstrap invite (replaces the pre-flight ping — there is no key yet):`,
+        `          POST ${plan.exchangeUrl}`,
+        `          body: {"token": "${REDACTED_API_KEY}", "repo_name": "${plan.repoName}", "key_secret": "${REDACTED_API_KEY}"}`,
+        `Step 2c — connectivity ping with the newly-minted key (before any durable key write): GET ${plan.pingUrl} (X-API-Key: ${REDACTED_API_KEY})`,
+        "Step 3 — write per-host MCP config (read-merge-write, launcher version-pinned):",
+        ...plan.configTargets.map((t) => `  ${t}: BAPI_REPO_NAME=${plan.repoName}, BAPI_API_KEY=${REDACTED_API_KEY}, BAPI_BASE_URL=${plan.baseUrl}, BAPI_DOCS_DIR=${plan.docsDir}`),
+        ...(plan.manualEditors.length > 0
+            ? [`  ${plan.manualEditors.join(" + ")}: detected (global config) — manual setup instructions would be printed.`]
+            : []),
+        `Step 3b — pre-warm the version-pinned launcher bucket (fail-open, env sanitized — BAPI_API_KEY / BAPI_INVITE removed): ${plan.prewarmCommand}`,
+        MCP_TIMEOUT_GUIDANCE,
+        `Step 4 — promote ${pendingTarget} → ${plan.credentialTarget} at ${plan.credentialStorePath} (only after the exchange succeeds)`,
+        `Step 5 — spawn agent session: ${plan.spawnCommand}`,
+    ];
+}
 /**
  * Detect global-config editors that install-bridge cannot safely write into
  * (their configs live outside the project). Windsurf is detected from the
@@ -608,6 +1282,12 @@ function buildManualHostInstructions(entry, editors) {
  */
 export async function runInstallBridgeCli(argv, overrides = {}) {
     const deps = { ...createDefaultInstallBridgeDeps(), ...overrides };
+    // When the caller overrode only `fetch` (the common test seam), bind the
+    // default resolver to the FINAL merged fetch so server resolution still routes
+    // through the override. An explicit `resolveRepoViaServer` override is honored.
+    if (!overrides.resolveRepoViaServer) {
+        deps.resolveRepoViaServer = (baseUrl, apiKey) => resolveRepoViaServer(deps.fetch, baseUrl, apiKey);
+    }
     const { log, errorLog } = deps;
     const parsed = parseInstallBridgeArgs(argv);
     if (parsed.status === "help") {
@@ -621,23 +1301,101 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
         return 1;
     }
     const options = parsed.options;
+    // Onboarding branch (pure, deterministic): have-key vs. a need-key method
+    // (`bootstrap-invite` = redeem a pre-issued invite, `self-serve` = mint one from
+    // an email, BAPI-618). BOTH need-key methods share the downstream redemption
+    // protocol, so `bootstrapInviteMode` is true for both; `selfServeSignupMode`
+    // discriminates the one extra step (mint-from-email) the self-serve path adds.
+    const branch = resolveInstallBridgeOnboardingBranch(options, deps.env);
+    const bootstrapInviteMode = branch.kind === "need-key";
+    const selfServeSignupMode = branch.kind === "need-key" && branch.method === "self-serve";
     // ---- Resolve inputs (may prompt when interactive) ----
-    // Resolve the API key first so a fully-empty non-interactive invocation fails
-    // with the (more security-relevant) missing-key message before the repo one.
-    const keyResult = await resolveApiKey(options, deps);
-    if (!keyResult.ok) {
-        errorLog(`Error: ${keyResult.error}`);
-        return 1;
+    // Resolve the credential/entry input first so a fully-empty non-interactive
+    // invocation fails with the (more relevant) missing-input message before the repo
+    // one. In either need-key mode there is no API key to resolve — the exchange
+    // MINTS it. Self-serve resolves the email here (up-front, before the dry-run
+    // guard) so a missing email fails fast; the actual MINT happens later, strictly
+    // after the dry-run return, so a preview neither mints nor sends anything.
+    let apiKey = "";
+    let inviteToken = "";
+    let signupEmail = "";
+    if (selfServeSignupMode) {
+        const emailResult = await resolveSignupEmail(options, deps);
+        if (!emailResult.ok) {
+            errorLog(`Error: ${emailResult.error}`);
+            return 1;
+        }
+        signupEmail = emailResult.value;
     }
-    const apiKey = keyResult.value;
-    const repoResult = await resolveRepoName(options, deps);
-    if (!repoResult.ok) {
-        errorLog(`Error: ${repoResult.error}`);
-        return 1;
+    else if (bootstrapInviteMode) {
+        const inviteResult = await resolveInviteToken(options, deps);
+        if (!inviteResult.ok) {
+            errorLog(`Error: ${inviteResult.error}`);
+            return 1;
+        }
+        inviteToken = inviteResult.value;
     }
-    const repoName = repoResult.value;
+    else {
+        const keyResult = await resolveApiKey(options, deps);
+        if (!keyResult.ok) {
+            errorLog(`Error: ${keyResult.error}`);
+            return 1;
+        }
+        apiKey = keyResult.value;
+    }
+    // baseUrl is resolved BEFORE repository input because the have-key branch needs
+    // it for the server-resolution request.
     const baseUrl = deps.env.BAPI_BASE_URL ?? DEFAULT_BAPI_BASE_URL;
     const docsDir = deps.env.BAPI_DOCS_DIR ?? DEFAULT_BAPI_DOCS_DIR;
+    // ---- Resolve the repository name ----
+    // Bootstrap-invite: unchanged (choose-a-name for the new project). Have-key:
+    // `--repo`/`BAPI_REPO_NAME` short-circuit deterministically; otherwise resolve
+    // it server-side from the API key (BAPI-616), and on ANY non-resolution outcome
+    // (unresolved / not-deployed / error) fall back to the existing local
+    // prompt/inference — never a hard failure.
+    let repoName;
+    let attemptedServerResolution = false;
+    if (bootstrapInviteMode) {
+        const repoResult = await resolveRepoName(options, deps);
+        if (!repoResult.ok) {
+            errorLog(`Error: ${repoResult.error}`);
+            return 1;
+        }
+        // Invite mode creates the project, so the name must be valid BEFORE any
+        // pending state or exchange.
+        const validated = validateRepoName(repoResult.value);
+        if (!validated.ok) {
+            errorLog(`Error: invalid repo name — ${validated.error}.`);
+            return 1;
+        }
+        repoName = validated.value;
+    }
+    else {
+        const configured = resolveConfiguredRepoName(options, deps.env);
+        if (configured !== undefined) {
+            // Deterministic short-circuit: no server round-trip when the name is known.
+            repoName = configured;
+        }
+        else {
+            attemptedServerResolution = true;
+            log("Resolving repository…");
+            const resolution = await deps.resolveRepoViaServer(baseUrl, apiKey);
+            if (resolution.status === "resolved") {
+                repoName = resolution.repoName;
+            }
+            else {
+                // Feature-detect + degrade: 404 (old server), 409 (unresolved/ambiguous/
+                // client-scoped), and network/other errors all fall back to the existing
+                // local resolution WITHOUT a cause-specific message or leaked detail.
+                const repoResult = await resolveRepoName(options, deps);
+                if (!repoResult.ok) {
+                    errorLog(`Error: ${repoResult.error}`);
+                    return 1;
+                }
+                repoName = repoResult.value;
+            }
+        }
+    }
     const agent = resolveAgentSpec(options.agentName) ?? resolveAgentSpec(DEFAULT_AGENT_NAME);
     const spawnCommand = deps.buildShellCommand(agent, INSTALL_BRIDGE_AGENT_PROMPT, deps.cwd, deps.platform);
     const credentialStorePath = getPrimaryCredentialStorePath({
@@ -659,16 +1417,36 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
         pingUrl: buildPingUrl(baseUrl, repoName),
         prewarmCommand: buildPrewarmCommandPreview(),
         spawnCommand,
+        ...(bootstrapInviteMode
+            ? { bootstrapInvite: true, exchangeUrl: buildBootstrapExchangeUrl(baseUrl) }
+            : {}),
+        ...(selfServeSignupMode ? { selfServeSignup: true } : {}),
+        ...(attemptedServerResolution ? { attemptedServerResolution: true } : {}),
     };
     // ---- --dry-run: preview every step, strictly no side effects ----
+    // Positioned BEFORE the CSPRNG, the pending write, the exchange, the scaffold,
+    // the config writes, the pre-warm, and the spawn: in bootstrap-invite mode a
+    // preview must neither consume the invite NOR leave a pending secret on disk.
     if (options.dryRun) {
         for (const line of buildDryRunPreview(plan))
             log(line);
         return 0;
     }
-    const entry = buildInstallBridgeServerEntry(deps.cwd, repoName, apiKey, baseUrl, docsDir);
+    const credentialWriteDeps = {
+        env: deps.env,
+        homedir: deps.homedir,
+        platform: deps.platform,
+        readFile: deps.readFile,
+        mkdir: deps.mkdir,
+        writeFile: (p, d, o) => deps.writeFile(p, d, o),
+        rename: deps.rename,
+        chmod: deps.chmod,
+        unlink: deps.unlink,
+        open: deps.open,
+    };
     // ---- Overwrite consent: a real existing key requires --force or a prompt ----
     const hasRealKey = await detectExistingRealKey(deps, targets);
+    let overwriteConsent = options.force;
     if (hasRealKey && !options.force) {
         if (deps.isTTY && deps.promptLine) {
             const answer = (await deps.promptLine("A host config already contains a BAPI_API_KEY. Overwrite it? [y/N]: ")).trim().toLowerCase();
@@ -676,6 +1454,7 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
                 errorLog("Aborted: existing API key left unchanged (re-run with --force to overwrite).");
                 return 1;
             }
+            overwriteConsent = true;
         }
         else {
             errorLog("Error: a host config already contains a BAPI_API_KEY. Re-run with --force to overwrite it " +
@@ -686,18 +1465,191 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
     // ---- Step 1 — scaffold (secret-free placeholders only) ----
     log("Step 1/5 — scaffolding project (commands, agents, pipelines, config placeholders)…");
     await deps.runInit(deps.cwd);
-    // ---- Step 2 — verify connectivity BEFORE writing the key anywhere durable ----
+    // ---- Step 2 — mint (invite mode) or verify (normal mode) the credential ----
+    let inviteFingerprint = "";
+    if (bootstrapInviteMode) {
+        // ---- Self-serve signup (BAPI-618): mint the invite token from the email ----
+        // This is the ONE step that precedes the unchanged BAPI-606 redemption below.
+        // It sits AFTER the --dry-run return above, so a preview never mints, never
+        // sends the email, and never writes a pending secret. On success the minted
+        // token is assigned to `inviteToken` and the flow falls into the existing
+        // persist-before-exchange block VERBATIM — identical to a --invite token from
+        // here on. On failure we return BEFORE any CSPRNG/pending write, so nothing is
+        // persisted. The email and the token are never logged.
+        if (selfServeSignupMode) {
+            log("Step 2/5 — requesting Bridge self-serve setup…");
+            const mint = await mintSelfServeInvite(deps, baseUrl, signupEmail);
+            if (!mint.ok) {
+                if (mint.category === "rate-limited") {
+                    errorLog("Error: Self-serve setup is temporarily rate limited. Try again later.");
+                }
+                else if (mint.category === "invalid") {
+                    errorLog("Error: Self-serve setup could not be requested. Check the email value and try again.");
+                }
+                else {
+                    errorLog("Error: Unable to complete self-serve setup. Check connectivity and retry.");
+                }
+                return 1;
+            }
+            // Treated identically to a manually supplied invite token from here on.
+            inviteToken = mint.token;
+        }
+        // ===================================================================
+        // LOAD-BEARING ORDERING — NOT DEFENSIVE POLISH. DO NOT "TIDY" THIS.
+        //
+        // The key_secret is generated HERE, fsynced to a pending record HERE, and
+        // only THEN sent to the exchange. That order is the protocol:
+        //
+        //   * The locally-stored key_secret is the ONLY proof that can replay a
+        //     redemption. The server's replay branch matches on (repo_name, bcrypt of
+        //     key_secret); it never returns a recoverable credential.
+        //   * So a successful exchange followed by a failed local write = an
+        //     unrecoverable admin key AND a permanently spent invite. The user cannot
+        //     re-run (a new secret gets a correct 401) and cannot re-mint (the repo
+        //     name is now globally taken by the project they just created); only an
+        //     operator can dig them out.
+        //
+        // Therefore the write is FAIL-CLOSED: if it does not land (including its
+        // fsync), we abort with a non-zero exit and NEVER call fetch. Nothing is
+        // consumed. Moving this persist after the exchange — the "natural" order —
+        // reintroduces exactly the bug above. (Contrast Step 4 in normal mode, which
+        // is deliberately fail-open: there, the key already exists server-side and a
+        // persist failure only degrades start-tickets routing.)
+        // ===================================================================
+        inviteFingerprint = fingerprintBootstrapInvite(inviteToken);
+        log("Step 2/5 — redeeming the bootstrap invite…");
+        let prepared = await deps.prepareBootstrapPending({
+            repoName,
+            inviteFingerprint,
+            generateKeySecret: () => generateBootstrapKeySecret(deps.randomBytes),
+            allowOverwriteExistingCredential: overwriteConsent,
+        }, credentialWriteDeps);
+        // An existing bapi:<repo> credential is never clobbered without consent. The
+        // gate mirrors the host-config gate above: --force, else an interactive prompt,
+        // else a hard non-interactive failure — all BEFORE the exchange.
+        if (!prepared.ok && prepared.kind === "credential-conflict") {
+            if (deps.isTTY && deps.promptLine) {
+                const answer = (await deps.promptLine(`The credential store already holds a key for ${prepared.target}. Overwrite it? [y/N]: `)).trim().toLowerCase();
+                if (answer !== "y" && answer !== "yes") {
+                    errorLog("Aborted: existing credential left unchanged (re-run with --force to overwrite).");
+                    return 1;
+                }
+                overwriteConsent = true;
+                prepared = await deps.prepareBootstrapPending({
+                    repoName,
+                    inviteFingerprint,
+                    generateKeySecret: () => generateBootstrapKeySecret(deps.randomBytes),
+                    allowOverwriteExistingCredential: true,
+                }, credentialWriteDeps);
+            }
+            else {
+                errorLog(`Error: ${prepared.error} Re-run with --force to overwrite it (refusing to overwrite a ` +
+                    "credential non-interactively without consent).");
+                return 1;
+            }
+        }
+        // A pending record left by a DIFFERENT invite is that redemption's only replay
+        // proof. Unlike the credential conflict above there is no consent path — not
+        // even --force — so re-running is not the fix and must not be advised.
+        if (!prepared.ok && prepared.kind === "pending-conflict") {
+            errorLog(`Error: ${prepared.error} This invite has NOT been used, and re-running will not clear ` +
+                "the conflict.");
+            return 1;
+        }
+        if (!prepared.ok) {
+            // Fail closed: the exchange has NOT been called, so the invite is unspent.
+            errorLog(`Error: could not durably store the bootstrap credential (${prepared.kind}). ${prepared.error} ` +
+                "The bootstrap invite has NOT been used — fix the problem and re-run.");
+            return 1;
+        }
+        const keySecret = prepared.keySecret;
+        const reusedPendingSecret = prepared.reused;
+        log(`  saved the pending credential for ${prepared.target} (fsynced before the exchange)`);
+        // The exchange REPLACES the pre-flight ping: in invite mode there is no key to
+        // ping with — this call is what mints it.
+        let exchange = await exchangeBootstrapInvite(deps, baseUrl, inviteToken, repoName, keySecret);
+        // 409 repo_name_taken: the server ROLLED BACK, so the invite is NOT consumed and
+        // the SAME token can be retried under a new name — with the SAME pending secret,
+        // re-pointed to that name.
+        while (!exchange.ok && exchange.kind === "repo-name-taken") {
+            if (!deps.isTTY || !deps.promptLine) {
+                errorLog(`Error: ${exchange.message} Re-run with a different --repo (the bootstrap invite has NOT ` +
+                    "been used).");
+                return 1;
+            }
+            errorLog(exchange.message);
+            const answer = (await deps.promptLine("Choose a different repo name: ")).trim();
+            const validated = validateRepoName(answer);
+            if (!validated.ok) {
+                errorLog(`Error: invalid repo name — ${validated.error}.`);
+                return 1;
+            }
+            const nextRepo = validated.value;
+            const repointed = await deps.repointBootstrapPending({
+                fromRepoName: repoName,
+                toRepoName: nextRepo,
+                inviteFingerprint,
+                allowOverwriteExistingCredential: overwriteConsent,
+            }, credentialWriteDeps);
+            if (!repointed.ok) {
+                errorLog(`Error: could not re-point the pending bootstrap credential to '${nextRepo}' ` +
+                    `(${repointed.kind}). ${repointed.error} The bootstrap invite has NOT been used.`);
+                return 1;
+            }
+            repoName = nextRepo;
+            // Same token, same key_secret — never regenerated inside the rename loop.
+            exchange = await exchangeBootstrapInvite(deps, baseUrl, inviteToken, repoName, keySecret);
+        }
+        if (!exchange.ok) {
+            if (exchange.kind === "invalid-invite") {
+                errorLog(reusedPendingSecret
+                    ? BOOTSTRAP_INVITE_REJECTED_MESSAGE
+                    : BOOTSTRAP_INVITE_LOST_SECRET_MESSAGE);
+            }
+            else {
+                errorLog(`Error: ${exchange.message}`);
+            }
+            // The pending record is deliberately LEFT INTACT: it is the replay proof for a
+            // retry (network failure / transient error), and destroying it would be the
+            // unrecoverable case above.
+            return 1;
+        }
+        // The server-returned name is authoritative from here on: config, ping,
+        // credential target, and the spawned session all key off it.
+        if (exchange.repoName !== repoName) {
+            const repointed = await deps.repointBootstrapPending({
+                fromRepoName: repoName,
+                toRepoName: exchange.repoName,
+                inviteFingerprint,
+                allowOverwriteExistingCredential: overwriteConsent,
+            }, credentialWriteDeps);
+            if (!repointed.ok) {
+                errorLog(`Error: the project was created as '${exchange.repoName}' but the pending credential could ` +
+                    `not be re-pointed to it (${repointed.kind}). ${repointed.error}`);
+                return 1;
+            }
+            repoName = exchange.repoName;
+        }
+        log(`  bootstrap invite redeemed — project '${repoName}' is ready`);
+        // The minted key. From here the flow rejoins the existing path unchanged.
+        apiKey = keySecret;
+    }
+    // ---- Step 2 (cont.) — verify connectivity BEFORE writing the key anywhere durable ----
     // R5: ping before persisting anything durably. Pinging before writeHostConfigs
     // (and the credential store) means a bad key on a first-time install halts
     // WITHOUT leaving an invalid key in the config — which would otherwise trip the
-    // overwrite-consent gate on every retry (a trapped state).
-    log("Step 2/5 — verifying connectivity…");
+    // overwrite-consent gate on every retry (a trapped state). In invite mode this
+    // runs AFTER the exchange, with the just-minted key; the pending record is the one
+    // deliberate write that precedes it, for the protocol reason above.
+    if (!bootstrapInviteMode)
+        log("Step 2/5 — verifying connectivity…");
     const ping = await verifyConnectivity(deps, baseUrl, repoName, apiKey);
     if (!ping.ok) {
         errorLog(`Error: ${ping.message}`);
         return 1;
     }
     log("  connectivity OK");
+    const entry = buildInstallBridgeServerEntry(deps.cwd, repoName, apiKey, baseUrl, docsDir);
     // ---- Step 3 — write per-host MCP config with real values ----
     log("Step 3/5 — writing per-host MCP config…");
     const written = await writeHostConfigs(deps, targets, entry);
@@ -726,42 +1678,51 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
         errorLog(`Warning: could not pre-warm the version-pinned launcher bucket${prewarm.warning ? ` (${prewarm.warning})` : ""}. ` +
             `The first MCP launch may pay a one-time cold install and could be slow. ${MCP_TIMEOUT_GUIDANCE}`);
     }
-    // ---- Step 4 — persist routing credential (non-blocking / fail-open) ----
-    log("Step 4/5 — persisting routing credential…");
-    try {
-        const writeDeps = {
-            env: deps.env,
-            homedir: deps.homedir,
-            platform: deps.platform,
-            readFile: deps.readFile,
-            mkdir: deps.mkdir,
-            writeFile: (p, d, o) => deps.writeFile(p, d, o),
-            rename: deps.rename,
-            chmod: deps.chmod,
-            unlink: deps.unlink,
-        };
-        const result = await deps.upsertCredential(repoName, apiKey, writeDeps);
-        if (result.ok) {
-            log(`  stored routing credential for ${result.target} at ${result.path}`);
+    // ---- Step 4 — persist the credential ----
+    if (bootstrapInviteMode) {
+        // FAIL-CLOSED (unlike normal mode below). The pending secret IS the minted admin
+        // key — if it never lands under bapi:<repo>, the user has a live key they cannot
+        // resolve. Promotion removes the pending record and writes the credential in one
+        // durable replacement; on failure the pending record survives so a re-run replays
+        // the same redemption. The agent session is NOT spawned until this succeeds.
+        log("Step 4/5 — promoting the bootstrap credential…");
+        const promoted = await deps.promoteBootstrapPending({ repoName, inviteFingerprint, allowOverwriteExistingCredential: overwriteConsent }, credentialWriteDeps);
+        if (!promoted.ok) {
+            errorLog(`Error: the project and API key were created, but the credential could not be stored ` +
+                `(${promoted.kind}). ${promoted.error} Your key is still saved locally as a pending ` +
+                "record — re-run install-bridge with the same bootstrap invite to finish (the redemption " +
+                "will replay and return the same key).");
+            return 1;
         }
-        else {
-            log(`  warning: could not persist the routing credential (${result.kind}). ` +
-                `start-tickets model routing may not resolve the key for ${plan.credentialTarget} ` +
-                "and will fail open to the premium/Opus tier (the most expensive) — " +
-                "set BAPI_API_KEY in the shell or re-run install-bridge, then verify with " +
+        log(`  stored routing credential for ${promoted.target} at ${promoted.path}`);
+    }
+    else {
+        // ---- persist routing credential (non-blocking / fail-open) ----
+        log("Step 4/5 — persisting routing credential…");
+        try {
+            const result = await deps.upsertCredential(repoName, apiKey, credentialWriteDeps);
+            if (result.ok) {
+                log(`  stored routing credential for ${result.target} at ${result.path}`);
+            }
+            else {
+                log(`  warning: could not persist the routing credential (${result.kind}). ` +
+                    `start-tickets model routing may not resolve the key for bapi:${repoName} ` +
+                    "and will fail open to the premium/Opus tier (the most expensive) — " +
+                    "set BAPI_API_KEY in the shell or re-run install-bridge, then verify with " +
+                    "'npx -y @bridge_gpt/mcp-server doctor'.");
+            }
+        }
+        catch {
+            // Fail-open: persistence is best-effort (mirrors Stage 6). The secret is never
+            // included in the warning.
+            log("  warning: could not persist the routing credential (unexpected error). " +
+                "start-tickets model routing may need BAPI_API_KEY in the shell and will fail open " +
+                "to the premium/Opus tier (the most expensive) until fixed — verify with " +
                 "'npx -y @bridge_gpt/mcp-server doctor'.");
         }
     }
-    catch {
-        // Fail-open: persistence is best-effort (mirrors Stage 6). The secret is never
-        // included in the warning.
-        log("  warning: could not persist the routing credential (unexpected error). " +
-            "start-tickets model routing may need BAPI_API_KEY in the shell and will fail open " +
-            "to the premium/Opus tier (the most expensive) until fixed — verify with " +
-            "'npx -y @bridge_gpt/mcp-server doctor'.");
-    }
     // ---- Step 5 — spawn a fresh agent session for the agentic remainder ----
-    log(`Step 5/5 — opening a ${agent.name} session for /install-bridge + /learn-repository…`);
+    log(`Step 5/5 — opening a ${agent.name} session for /install-bridge configuration + capability report…`);
     const terminal = detectTerminal(undefined, deps.env);
     const spawnResult = await deps.spawnTerminalTab(deps.startTicketsDeps, terminal, spawnCommand, {
         key: "install",
@@ -774,16 +1735,17 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
         // user can run the agentic remainder by hand. Mirrors start-tickets treating a
         // spawn failure as non-fatal to the run.
         errorLog(`Warning: setup steps completed, but the agent session could not be opened (${spawnResult.error}). ` +
-            "The project is NOT configured yet — run /install-bridge then /learn-repository manually " +
-            "in this project to derive and apply the config fields.");
+            "The project is NOT configured yet — run /install-bridge manually in this project to derive " +
+            "and apply the config fields and see the capability report, then choose whether to run " +
+            "/parse-repository to index the repository.");
         return 0;
     }
     log("");
-    log(`install-bridge setup steps complete. A fresh ${agent.name} session is now running ` +
-        "/install-bridge then /learn-repository.");
+    log(`install-bridge setup steps complete. A fresh ${agent.name} session is now applying ` +
+        "configuration, presenting the capability report, and ending with one indexing-consent question.");
     log("NOTE: the install is not finished until that session's apply reports applied fields — " +
-        "it will pause to ask you to approve the project description. Verify afterwards on the " +
-        "project's Get Started page (install status panel) or via the session's " +
-        "'Applied N of M' summary.");
+        "it will pause to ask you to approve the project description, and it will close by asking " +
+        "'[Y/n] Index repository now?'. Verify afterwards on the project's Get Started page " +
+        "(install status panel) or via the session's 'Applied N of M' summary.");
     return 0;
 }