borgmcp 1.0.5 → 1.0.7

package/dist/role-resolver.js

@@ -1,36 +1 @@
-/**
- * Normalize a role-name argument or stored name into a slug used for
- * both worktree-path construction and role lookup. Single source of
- * truth so the path and the matched role always agree.
- *
- * Path-safe: strips characters outside `[a-z0-9-]` after the
- * underscore/whitespace collapse. The no-arg path bypasses
- * validateName (the matched role's name comes from the DB, which
- * has no charset constraint on role names — CreateRoleSchema is
- * `min(1).max(64)` only), so the safety has to live here.
- */
-export function roleSlug(raw) {
-    return raw.toLowerCase().replace(/[_\s]+/g, '-').replace(/[^a-z0-9-]/g, '');
-}
-/**
- * Case- and separator-insensitive lookup against the cube's roles.
- */
-export function matchRoleByName(roles, query) {
-    const slug = roleSlug(query);
-    return roles.find((r) => roleSlug(r.name) === slug);
-}
-/**
- * Default-role picker for the no-arg case:
- *   - First drone in cube + a human-seat role exists → that role
- *   - Otherwise → the is_default role
- *   - Neither available → undefined (caller errors out)
- */
-export function pickDefaultRole(roles, opts) {
-    if (opts.isFirstDrone) {
-        const humanSeat = roles.find((r) => r.is_human_seat);
-        if (humanSeat)
-            return humanSeat;
-    }
-    return roles.find((r) => r.is_default);
-}
-//# sourceMappingURL=role-resolver.js.map
+function a(e){return e.toLowerCase().replace(/[_\s]+/g,"-").replace(/[^a-z0-9-]/g,"")}function i(e,t){const n=a(t);return e.find(r=>a(r.name)===n)}function o(e,t){if(t.isFirstDrone){const n=e.find(r=>r.is_human_seat);if(n)return n}return e.find(n=>n.is_default)}export{i as matchRoleByName,o as pickDefaultRole,a as roleSlug};

package/dist/role-section.js

@@ -1,208 +1,8 @@
-// gh#496-A(b) + gh#513 — SINGLE canonical role-section parser, shared by BOTH
-// the client and the worker (the prior two-copy drift is eliminated). The
-// client render compression (`regen-format.ts`) splits role text with this
-// parser to decide which `… rationale:` sections to stub; the worker's
-// `getRoleRationale` (cubes.ts) resolves those stub headings and `sync-plan.ts`
-// diffs role sections — all import THIS module, so heading derivation
-// (sans-colon, isLabelLine rules) is identical by construction (no parity
-// test needed; agreement is structural).
-//
-// The worker imports this via `../client/src/role-section` (mirrors the
-// existing `workers/mcp-server.ts → ../client/src/templates` precedent). KEEP
-// THIS MODULE SELF-CONTAINED (no runtime imports) so the worker bundle
-// resolves it cleanly; the client tsconfig `rootDir: ./src` also requires the
-// shared canonical to live under `client/src/`.
-/**
- * Test whether a single line is a plain-label section heading.
- *
- * Rules (deliberately narrow to avoid false positives against prose
- * that merely contains a colon):
- *   - no leading whitespace (label lines start at column 0);
- *   - the line ends with exactly one `:`;
- *   - the text before the colon is non-empty, contains no other `:`,
- *     and is "short" (≤ 60 chars) — long colon-terminated prose lines
- *     are not labels;
- *   - the label is not a markdown emphasis run (does not start with
- *     `*`, `-`, `#`, `>` or backtick) — those are list/markdown lines,
- *     not plain labels (the woven `**Dense communication discipline:**`
- *     constant headings must NOT be treated as section boundaries).
- */
-export function isLabelLine(line) {
-    // Leading whitespace disqualifies (label lines are flush-left).
-    if (/^\s/.test(line))
-        return false;
-    if (!line.endsWith(':'))
-        return false;
-    const label = line.slice(0, -1);
-    if (label.length === 0)
-        return false;
-    if (label.length > 60)
-        return false;
-    // Exactly one colon total (the trailing one).
-    if (label.includes(':'))
-        return false;
-    // Markdown/list/quote/code lead-ins are not plain labels.
-    if (/^[*\-#>`]/.test(label))
-        return false;
-    return true;
-}
-/**
- * Parse role `detailed_description` text into ordered sections.
- *
- * The result always round-trips byte-identical through
- * `serializeSections`. An empty string yields a single empty preamble
- * section so callers always have a stable shape to address.
- */
-export function parseRoleSections(text) {
-    const sections = [];
-    const lines = text.split('\n');
-    // Reconstruct each line WITH its terminating newline so that the
-    // concatenation is lossless. `split('\n')` drops the separators; we
-    // re-append '\n' to every line except the last (which had no trailing
-    // newline in the source unless the source ended with one — in which
-    // case the final split element is '' and contributes nothing).
-    const lineWithSep = (idx) => idx < lines.length - 1 ? lines[idx] + '\n' : lines[idx];
-    let currentHeading = null;
-    let currentKind = 'preamble';
-    let currentBody = '';
-    let started = false;
-    const flush = () => {
-        sections.push({ heading: currentHeading, kind: currentKind, body: currentBody });
-    };
-    for (let i = 0; i < lines.length; i++) {
-        const raw = lines[i];
-        if (isLabelLine(raw)) {
-            // Close the in-progress section (preamble or previous label) and
-            // open a new label section headed by this line.
-            flush();
-            currentHeading = raw.slice(0, -1).trim();
-            currentKind = 'label';
-            currentBody = lineWithSep(i);
-            started = true;
-        }
-        else {
-            currentBody += lineWithSep(i);
-            started = true;
-        }
-    }
-    // Always emit the final in-progress section. For empty input this is a
-    // single empty preamble (started === false, currentBody === '').
-    if (started || sections.length === 0) {
-        flush();
-    }
-    return sections;
-}
-/** Concatenate sections back into the original field text. */
-export function serializeSections(sections) {
-    return sections.map((s) => s.body).join('');
-}
-function normalizeHeading(value) {
-    return value.trim().toLowerCase();
-}
-/**
- * Build the body for a freshly inserted/replaced label section from a
- * heading + caller-supplied body text.
- *
- * The heading line is rendered as `<heading>:` on its own line. The
- * caller's `body` is the text BELOW the heading. We guarantee the
- * section body ends with a single trailing newline so adjacent sections
- * stay separated when re-serialized (matching how real role text
- * separates label sections with blank lines is the caller's choice via
- * their body text; we only ensure the structural newline).
- */
-function renderLabelSection(heading, body) {
-    const headingLine = `${heading.trim()}:\n`;
-    if (body === '')
-        return headingLine;
-    // Ensure the body ends with a newline so the next section's heading
-    // starts on its own line.
-    const normalizedBody = body.endsWith('\n') ? body : body + '\n';
-    return headingLine + normalizedBody;
-}
-/**
- * Guarantee the section at `idx` ends in a newline before a new section
- * heading is glued on after it.
- *
- * Real role `detailed_description` text (every template role) ends WITHOUT
- * a trailing newline — it closes on the woven `${...DISCIPLINE}` constant.
- * Appending a `<heading>:` line directly onto such text would fuse the
- * heading onto the prior section's last line, so the heading is no longer
- * a flush-left label and the inserted section is LOST on re-parse. Adding
- * the structural newline here keeps the inserted heading on its own line.
- *
- * No-ops when the preceding body is empty (an empty preamble needs no
- * separator) or already ends in '\n' (preserves the already-correct case
- * byte-for-byte).
- */
-function ensureTrailingNewline(sections, idx) {
-    if (idx < 0 || idx >= sections.length)
-        return;
-    const prev = sections[idx];
-    if (prev.body !== '' && !prev.body.endsWith('\n')) {
-        sections[idx] = { ...prev, body: prev.body + '\n' };
-    }
-}
-/**
- * Apply a single section-level patch to role text, returning the new
- * full field text. Every other byte is preserved.
- *
- *   - replace: overwrite the matched section's body with a re-rendered
- *     `<heading>:\n<body>` block. The heading match is case-insensitive
- *     on the label; the re-rendered heading uses the supplied casing.
- *   - insert: add a new label section. Placed after the section named by
- *     `after` (case-insensitive), or appended at the end when `after` is
- *     omitted/null. Rejects if a section with the same heading already
- *     exists (use replace instead).
- *   - delete: drop the matched section entirely.
- *
- * Throws when the target section is missing (replace/delete) or already
- * present (insert), or when `after` does not resolve.
- */
-export function patchRoleSectionText(text, op) {
-    const sections = parseRoleSections(text);
-    const targetKey = normalizeHeading(op.heading);
-    if (op.action === 'replace') {
-        const idx = sections.findIndex((s) => s.kind === 'label' && s.heading != null && normalizeHeading(s.heading) === targetKey);
-        if (idx === -1) {
-            throw new Error(`Role section "${op.heading}" not found. Use action="insert" to add it.`);
-        }
-        sections[idx] = {
-            heading: op.heading.trim(),
-            kind: 'label',
-            body: renderLabelSection(op.heading, op.body),
-        };
-        return serializeSections(sections);
-    }
-    if (op.action === 'delete') {
-        const idx = sections.findIndex((s) => s.kind === 'label' && s.heading != null && normalizeHeading(s.heading) === targetKey);
-        if (idx === -1) {
-            throw new Error(`Role section "${op.heading}" not found.`);
-        }
-        sections.splice(idx, 1);
-        return serializeSections(sections);
-    }
-    // insert
-    const exists = sections.some((s) => s.kind === 'label' && s.heading != null && normalizeHeading(s.heading) === targetKey);
-    if (exists) {
-        throw new Error(`Role section "${op.heading}" already exists. Use action="replace" to overwrite it.`);
-    }
-    const newSection = {
-        heading: op.heading.trim(),
-        kind: 'label',
-        body: renderLabelSection(op.heading, op.body),
-    };
-    if (op.after == null) {
-        ensureTrailingNewline(sections, sections.length - 1);
-        sections.push(newSection);
-        return serializeSections(sections);
-    }
-    const afterKey = normalizeHeading(op.after);
-    const afterIdx = sections.findIndex((s) => s.kind === 'label' && s.heading != null && normalizeHeading(s.heading) === afterKey);
-    if (afterIdx === -1) {
-        throw new Error(`Cannot insert after section "${op.after}" — it does not exist.`);
-    }
-    ensureTrailingNewline(sections, afterIdx);
-    sections.splice(afterIdx + 1, 0, newSection);
-    return serializeSections(sections);
-}
-//# sourceMappingURL=role-section.js.map
+function b(t){if(/^\s/.test(t)||!t.endsWith(":"))return!1;const e=t.slice(0,-1);return!(e.length===0||e.length>60||e.includes(":")||/^[*\-#>`]/.test(e))}function w(t){const e=[],n=t.split(`
+`),l=i=>i<n.length-1?n[i]+`
+`:n[i];let f=null,s="preamble",d="",a=!1;const r=()=>{e.push({heading:f,kind:s,body:d})};for(let i=0;i<n.length;i++){const u=n[i];b(u)?(r(),f=u.slice(0,-1).trim(),s="label",d=l(i),a=!0):(d+=l(i),a=!0)}return(a||e.length===0)&&r(),e}function c(t){return t.map(e=>e.body).join("")}function o(t){return t.trim().toLowerCase()}function h(t,e){const n=`${t.trim()}:
+`;if(e==="")return n;const l=e.endsWith(`
+`)?e:e+`
+`;return n+l}function g(t,e){if(e<0||e>=t.length)return;const n=t[e];n.body!==""&&!n.body.endsWith(`
+`)&&(t[e]={...n,body:n.body+`
+`})}function y(t,e){const n=w(t),l=o(e.heading);if(e.action==="replace"){const r=n.findIndex(i=>i.kind==="label"&&i.heading!=null&&o(i.heading)===l);if(r===-1)throw new Error(`Role section "${e.heading}" not found. Use action="insert" to add it.`);return n[r]={heading:e.heading.trim(),kind:"label",body:h(e.heading,e.body)},c(n)}if(e.action==="delete"){const r=n.findIndex(i=>i.kind==="label"&&i.heading!=null&&o(i.heading)===l);if(r===-1)throw new Error(`Role section "${e.heading}" not found.`);return n.splice(r,1),c(n)}if(n.some(r=>r.kind==="label"&&r.heading!=null&&o(r.heading)===l))throw new Error(`Role section "${e.heading}" already exists. Use action="replace" to overwrite it.`);const s={heading:e.heading.trim(),kind:"label",body:h(e.heading,e.body)};if(e.after==null)return g(n,n.length-1),n.push(s),c(n);const d=o(e.after),a=n.findIndex(r=>r.kind==="label"&&r.heading!=null&&o(r.heading)===d);if(a===-1)throw new Error(`Cannot insert after section "${e.after}" \u2014 it does not exist.`);return g(n,a),n.splice(a+1,0,s),c(n)}export{b as isLabelLine,w as parseRoleSections,y as patchRoleSectionText,c as serializeSections};

package/dist/roster-render.js

@@ -1,96 +1,3 @@
-/**
- * Pure renderer for the `borg:roster` MCP tool output.
- *
- * Split out from `index.ts` so the T2.1 sender-side liveness probe
- * (the `awake`/`stale-since-X` column rendering when a `since` arg is
- * passed) can be unit-tested without spinning up the MCP server. Same
- * pure-function + injected-`humanAgo` pattern as `stream-status.ts`.
- *
- * Two modes:
- *   - No `since` provided: classic roster — one line per drone with
- *     label, role, and `last seen` relative time.
- *   - `since` provided: each line additionally carries an `awake`
- *     marker if the drone's `last_seen` is after the resolved
- *     timestamp, otherwise a `stale-since-<relative>` marker derived
- *     from the resolved timestamp the server echoed back.
- */
-/**
- * gh#503 — render-layer display labels for the wake-path wire enum.
- *
- * The gh#406 SLI MEASURES a streak of unanswered directed challenges; it
- * cannot confirm a genuinely broken wake path ("deaf") — a seat that is
- * alive but idle-and-text-only looks identical past the SLA. So the
- * roster shows the measured-confidence label, not the unconfirmed verdict:
- *   degraded (1 miss)  → `unverified`   (signal seen, not yet corroborated)
- *   deaf     (2+ miss) → `unresponsive` (no response past the SLA)
- *
- * The wire enum VALUES (`live`/`degraded`/`deaf`), computed server-side by
- * `wakePathFromStreak`, are intentionally UNCHANGED — this is a display-only
- * relabel within gh#503's copy-only scope (renaming the enum would be a
- * wire + schema change). An operator who wants a confirmed read cross-checks
- * `borg:stream-status` on the affected seat. Unknown wire values fall back
- * to the raw value so a newer server can't break an older client's roster.
- */
-const WAKE_PATH_DISPLAY = {
-    degraded: 'unverified',
-    deaf: 'unresponsive',
-};
-export function formatRoleAgentLabel(roleName, agentKind) {
-    return agentKind ? `${roleName}, ${agentKind}` : roleName;
-}
-export function renderRoster(inputs) {
-    const { cubeName, drones, roles, resolvedSince, humanAgo } = inputs;
-    const roleById = new Map();
-    for (const r of roles)
-        roleById.set(r.id, r);
-    const lines = [];
-    lines.push(`# Drones in cube: ${cubeName}`);
-    lines.push('');
-    if (resolvedSince) {
-        // Surface the liveness-probe context so the reader knows what the
-        // `awake`/`stale-since-X` column is measured against.
-        lines.push(`_Liveness probe since ${resolvedSince} (${humanAgo(resolvedSince)}). \`awake\` = drone posted to the cube log after that point._`);
-        lines.push('');
-    }
-    if (!drones.length) {
-        lines.push('_(no drones connected)_');
-        return lines.join('\n');
-    }
-    for (const d of drones) {
-        const role = roleById.get(d.role_id);
-        const roleName = role?.name ?? 'unknown';
-        const roleLabel = formatRoleAgentLabel(roleName, d.agent_kind);
-        const lastSeen = humanAgo(d.last_seen);
-        const wakePathMarker = d.wake_path && d.wake_path !== 'live'
-            ? ` · \`wake-path:${WAKE_PATH_DISPLAY[d.wake_path] ?? d.wake_path}\``
-            : '';
-        const wakePathClassMarker = d.wake_path_alert_class && d.wake_path_alert_class !== 'independent'
-            ? ` · \`wake-path-class:${d.wake_path_alert_class}\``
-            : '';
-        const regenCountMarker = typeof d.regen_count === 'number' ? ` · \`regen-count:${d.regen_count}\`` : '';
-        if (resolvedSince) {
-            // T2.1 awake/stale column. `seen_since === true` → drone called a
-            // tool after the resolved timestamp; treat as awake. False or
-            // missing → stale. Missing should not happen when the server
-            // echoed a since, but defending against a shape mismatch is
-            // cheap and matches the renderer's no-server-assumptions
-            // discipline established in stream-status.ts.
-            //
-            // Per drone-4's polish NIT on the original T2.1 ship: the marker
-            // is just `stale` (not `stale-since-<relative>`) because the
-            // header already anchors the reference point and per-row "since
-            // when" would be identical across all stale rows in a single
-            // probe call — pure redundancy. The per-row `last seen X ago`
-            // field carries the diagnostic detail for "how stale is this
-            // particular drone."
-            const isAwake = d.seen_since === true;
-            const marker = isAwake ? '`awake`' : '`stale`';
-            lines.push(`- **${d.label}** (${roleLabel}) — last seen ${lastSeen} · ${marker}${regenCountMarker}${wakePathMarker}${wakePathClassMarker}`);
-        }
-        else {
-            lines.push(`- **${d.label}** (${roleLabel}) — last seen ${lastSeen}${regenCountMarker}${wakePathMarker}${wakePathClassMarker}`);
-        }
-    }
-    return lines.join('\n');
-}
-//# sourceMappingURL=roster-render.js.map
+const d={degraded:"unverified",deaf:"unresponsive"};function w(t,s){return s?`${t}, ${s}`:t}function b(t){const{cubeName:s,drones:o,roles:h,resolvedSince:a,humanAgo:r}=t,c=new Map;for(const e of h)c.set(e.id,e);const n=[];if(n.push(`# Drones in cube: ${s}`),n.push(""),a&&(n.push(`_Liveness probe since ${a} (${r(a)}). \`awake\` = drone posted to the cube log after that point._`),n.push("")),!o.length)return n.push("_(no drones connected)_"),n.join(`
+`);for(const e of o){const k=c.get(e.role_id)?.name??"unknown",l=w(k,e.agent_kind),p=r(e.last_seen),u=e.wake_path&&e.wake_path!=="live"?` \xB7 \`wake-path:${d[e.wake_path]??e.wake_path}\``:"",_=e.wake_path_alert_class&&e.wake_path_alert_class!=="independent"?` \xB7 \`wake-path-class:${e.wake_path_alert_class}\``:"",i=typeof e.regen_count=="number"?` \xB7 \`regen-count:${e.regen_count}\``:"";if(a){const $=e.seen_since===!0?"`awake`":"`stale`";n.push(`- **${e.label}** (${l}) \u2014 last seen ${p} \xB7 ${$}${i}${u}${_}`)}else n.push(`- **${e.label}** (${l}) \u2014 last seen ${p}${i}${u}${_}`)}return n.join(`
+`)}export{w as formatRoleAgentLabel,b as renderRoster};

package/dist/setup.js

@@ -1,252 +1,37 @@
 #!/usr/bin/env node
-/**
- * Borg MCP Setup Wizard
- *
- * Interactive setup flow:
- * 1. Configure Claude Code MCP settings
- * 2. Google OAuth authentication
- * 3. Subscription setup (web dashboard or Stripe)
- */
-import prompts from 'prompts';
-import chalk from 'chalk';
-import open from 'open';
-import which from 'which';
-import { authenticateWithGoogle } from './auth.js';
-import { checkSubscriptionStatus, createSubscription } from './remote-client.js';
-import { retrySubscriptionCheck } from './subscription-retry.js';
-import { addMcpServer, addSessionStartHook, addUserPromptSubmitHook, addCodexMcpServer, addCodexSessionStartHook, addCodexUserPromptSubmitHook, isMcpServerConfigured, isCodexMcpServerConfigured, } from './config-utils.js';
-import { isAuthenticated } from './config.js';
-import { handleVersionFlag } from './version.js';
-import { initDebugFromArgv } from './debug.js';
-/**
- * Main setup wizard
- */
-async function main() {
-    // `--debug` / BORG_DEBUG observability. Wired here as well as in the
-    // top-level dispatcher because `borg-setup` is its own bin (dist/setup.js)
-    // and can be invoked directly, not only via `borg setup`. Idempotent.
-    initDebugFromArgv(process.argv);
-    handleVersionFlag();
-    console.log(chalk.blue.bold('\n◼ Borg MCP Setup Wizard ◼'));
-    // gh#557: `--no-browser` (alias `--device`) forces the device-code OAuth
-    // flow for SSH / headless / container terminals. Scanned from argv so it
-    // works both as `borg setup --no-browser` and `borg-setup --no-browser`.
-    // (SSH/headless are auto-detected too; the flag is the explicit override.)
-    const noBrowser = process.argv.includes('--no-browser') || process.argv.includes('--device');
-    // Step 0: Check which agent CLIs exist
-    let claudeCliPath = null;
-    let codexCliPath = null;
-    try {
-        claudeCliPath = which.sync('claude');
-    }
-    catch (error) {
-        // Optional: Borg can also run with Codex.
-    }
-    try {
-        codexCliPath = which.sync('codex');
-    }
-    catch (error) {
-        // Optional: Borg can also run with Claude Code.
-    }
-    if (claudeCliPath)
-        console.log(chalk.gray(`Found Claude CLI: ${claudeCliPath}`));
-    if (codexCliPath)
-        console.log(chalk.gray(`Found Codex CLI: ${codexCliPath}`));
-    if (claudeCliPath || codexCliPath)
-        console.log('');
-    if (!claudeCliPath && !codexCliPath) {
-        console.error(chalk.red('◼ No supported agent CLI found\n'));
-        console.error(chalk.yellow('Please install Claude Code or Codex first:'));
-        console.error(chalk.gray('  Claude Code: https://claude.ai/download'));
-        console.error(chalk.gray('  Codex: https://developers.openai.com/codex\n'));
-        process.exit(1);
-    }
-    // Step 1: Configure every detected agent CLI. Idempotent; re-running
-    // setup is the normal path for OAuth refresh and CLI self-healing.
-    console.log(chalk.blue('◼ Agent CLI Integration'));
-    if (claudeCliPath) {
-        try {
-            if (!isMcpServerConfigured())
-                addMcpServer();
-            addSessionStartHook();
-            addUserPromptSubmitHook();
-            console.log(chalk.green('◼ borg configured for Claude Code'));
-        }
-        catch (error) {
-            console.error(chalk.red(`\n◼ Failed to configure Claude Code: ${error.message}\n`));
-            process.exit(1);
-        }
-    }
-    if (codexCliPath) {
-        try {
-            if (!isCodexMcpServerConfigured())
-                addCodexMcpServer();
-            addCodexSessionStartHook();
-            addCodexUserPromptSubmitHook();
-            console.log(chalk.green('◼ borg configured for Codex'));
-        }
-        catch (error) {
-            console.error(chalk.red(`\n◼ Failed to configure Codex: ${error.message}\n`));
-            process.exit(1);
-        }
-    }
-    console.log('');
-    // Step 2: Authentication
-    console.log(chalk.blue('◼ Google Authentication'));
-    const authed = await isAuthenticated();
-    if (!authed) {
-        try {
-            await authenticateWithGoogle(noBrowser ? { noBrowser: true } : undefined);
-        }
-        catch (error) {
-            console.error(chalk.red(`\n◼ Authentication failed: ${error.message}\n`));
-            // gh#557 NOTE-2: device-flow errors (access_denied / expired_token) and
-            // any other auth failure exit here — give the remote user a recovery
-            // path instead of a bare exit.
-            console.error(chalk.yellow('Re-run `borg setup` to try again.\n'));
-            process.exit(1);
-        }
-    }
-    else {
-        console.log(chalk.green('◼ Already authenticated\n'));
-    }
-    // Step 3: Subscription
-    console.log(chalk.blue('◼ Subscription Check'));
-    let status;
-    try {
-        status = await checkSubscriptionStatus();
-    }
-    catch (error) {
-        console.error(chalk.red(`\n◼ Failed to check subscription: ${error.message}\n`));
-        process.exit(1);
-    }
-    // gh#521: a user who just subscribed via web hits propagation lag — retry a
-    // few times (non-alarmingly) before declaring no subscription, instead of
-    // flashing a scary "not found" immediately after payment.
-    status = await retrySubscriptionCheck(status, {
-        check: checkSubscriptionStatus,
-        sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
-        onRetry: (attempt, total) => console.log(chalk.gray(`◼ Checking subscription... (attempt ${attempt}/${total})`)),
-    });
-    if (!status.hasAccess) {
-        // gh#687: a fresh user has no subscription BY DESIGN — the Free tier is the
-        // permanent entry point (no trial). Lead with that as a WIN, not a
-        // "not found" failure, and present upgrading as an OFFER (Continue on Free
-        // is the default). The gh#521 just-subscribed propagation-lag retry already
-        // ran above; the "I already subscribed — re-check" choice covers the tail.
-        console.log(chalk.green("◼ You're on the Free tier — permanent, no card needed: 1 cube + 3 drones + 100 req/hr."));
-        console.log(chalk.gray('◼ Start using borgmcp right now. Upgrade any time for unlimited cubes + drones ($1/cube/month).\n'));
-        const { subscribeMethod } = await prompts({
-            type: 'select',
-            name: 'subscribeMethod',
-            message: "You're ready on the Free tier. Want to do more?",
-            choices: [
-                {
-                    title: '◼ Continue on the Free tier (recommended)',
-                    value: 'skip',
-                    description: 'Start now — 1 cube, 3 drones, 100 req/hr. No payment required.'
-                },
-                {
-                    title: '◼ Upgrade to Cube tier — $1/cube/month',
-                    value: 'web',
-                    description: 'Unlimited cubes + drones + 1000 req/hr. Opens the subscribe page in your browser.'
-                },
-                {
-                    title: '◼ Quick Stripe checkout',
-                    value: 'stripe',
-                    description: 'Fast upgrade checkout in the browser'
-                },
-                {
-                    title: '◼ I already subscribed — re-check',
-                    value: 'recheck',
-                    description: 'Re-check now — a just-completed subscription can take a moment to activate'
-                }
-            ]
-        });
-        switch (subscribeMethod) {
-            case 'web':
-                console.log(chalk.blue('\n◼ Opening: https://borgmcp.ai/subscribe'));
-                try {
-                    await open('https://borgmcp.ai/subscribe');
-                    console.log(chalk.gray('◼ Waiting for subscription (checking every 5s for 2 min)...\n'));
-                    await pollForSubscription();
-                }
-                catch (error) {
-                    console.error(chalk.yellow(`\n◼ ${error.message}`));
-                }
-                break;
-            case 'stripe':
-                try {
-                    const checkoutUrl = await createSubscription();
-                    console.log(chalk.blue(`\n◼ Opening Stripe: ${checkoutUrl}`));
-                    await open(checkoutUrl);
-                    console.log(chalk.gray('◼ Waiting for subscription...\n'));
-                    await pollForSubscription();
-                }
-                catch (error) {
-                    console.error(chalk.red(`\n◼ Failed to create checkout: ${error.message}\n`));
-                }
-                break;
-            case 'recheck':
-                try {
-                    const recheckStatus = await checkSubscriptionStatus();
-                    if (recheckStatus.hasAccess) {
-                        console.log(chalk.green('\n◼ Subscription found!\n'));
-                    }
-                    else {
-                        console.log(chalk.yellow('\n◼ No subscription found\n'));
-                    }
-                }
-                catch (error) {
-                    console.error(chalk.red(`\n◼ Failed to recheck: ${error.message}\n`));
-                }
-                break;
-            case 'skip':
-                console.log(chalk.green("\n◼ You're all set on the Free tier: 1 cube, 3 drones, 100 req/hr.\n"));
-                break;
-        }
-    }
-    else {
-        console.log(chalk.green('◼ Active subscription found'));
-        if (status.expiresAt) {
-            const expiresAt = new Date(status.expiresAt);
-            console.log(chalk.gray(`  Expires: ${expiresAt.toLocaleDateString()}\n`));
-        }
-        else {
-            console.log('');
-        }
-    }
-    // Success message
-    console.log(chalk.green.bold('Setup complete!\n'));
-    console.log(chalk.yellow('🔄 Restart Claude Code/Codex (or open a new session) for the changes to take effect.\n'));
-    console.log(chalk.gray('◼ Next steps:'));
-    console.log(chalk.gray('1. Run "borg" to start Claude Code or Codex with your cube'));
-    console.log(chalk.gray('2. Manage cubes and subscription at https://borgmcp.ai/dashboard\n'));
-}
-/**
- * Poll for subscription activation
- * Checks every 5 seconds for 2 minutes (24 attempts)
- */
-async function pollForSubscription() {
-    const maxAttempts = 24;
-    for (let i = 0; i < maxAttempts; i++) {
-        await new Promise(resolve => setTimeout(resolve, 5000));
-        try {
-            const status = await checkSubscriptionStatus();
-            if (status.hasAccess) {
-                console.log(chalk.green('◼ Subscription activated!\n'));
-                return;
-            }
-        }
-        catch (error) {
-            // Continue polling even on errors
-        }
-    }
-    throw new Error('Timeout - Run setup again after subscribing');
-}
-// Run wizard
-main().catch((error) => {
-    console.error(chalk.red(`\n◼ Setup failed: ${error.message}\n`));
-    process.exit(1);
-});
-//# sourceMappingURL=setup.js.map
+import d from"prompts";import e from"chalk";import a from"open";import l from"which";import{authenticateWithGoogle as g}from"./auth.js";import{checkSubscriptionStatus as i,createSubscription as p}from"./remote-client.js";import{retrySubscriptionCheck as h}from"./subscription-retry.js";import{addMcpServer as b,addSessionStartHook as m,addUserPromptSubmitHook as f,addCodexMcpServer as y,addCodexSessionStartHook as w,addCodexUserPromptSubmitHook as C,isMcpServerConfigured as k,isCodexMcpServerConfigured as S}from"./config-utils.js";import{isAuthenticated as x}from"./config.js";import{handleVersionFlag as v}from"./version.js";import{initDebugFromArgv as $}from"./debug.js";async function A(){$(process.argv),v(),console.log(e.blue.bold(`
+\u25FC Borg MCP Setup Wizard \u25FC`));const c=process.argv.includes("--no-browser")||process.argv.includes("--device");let s=null,t=null;try{s=l.sync("claude")}catch{}try{t=l.sync("codex")}catch{}if(s&&console.log(e.gray(`Found Claude CLI: ${s}`)),t&&console.log(e.gray(`Found Codex CLI: ${t}`)),(s||t)&&console.log(""),!s&&!t&&(console.error(e.red(`\u25FC No supported agent CLI found
+`)),console.error(e.yellow("Please install Claude Code or Codex first:")),console.error(e.gray("  Claude Code: https://claude.ai/download")),console.error(e.gray(`  Codex: https://developers.openai.com/codex
+`)),process.exit(1)),console.log(e.blue("\u25FC Agent CLI Integration")),s)try{k()||b(),m(),f(),console.log(e.green("\u25FC borg configured for Claude Code"))}catch(o){console.error(e.red(`
+\u25FC Failed to configure Claude Code: ${o.message}
+`)),process.exit(1)}if(t)try{S()||y(),w(),C(),console.log(e.green("\u25FC borg configured for Codex"))}catch(o){console.error(e.red(`
+\u25FC Failed to configure Codex: ${o.message}
+`)),process.exit(1)}if(console.log(""),console.log(e.blue("\u25FC Google Authentication")),await x())console.log(e.green(`\u25FC Already authenticated
+`));else try{await g(c?{noBrowser:!0}:void 0)}catch(o){console.error(e.red(`
+\u25FC Authentication failed: ${o.message}
+`)),console.error(e.yellow("Re-run `borg setup` to try again.\n")),process.exit(1)}console.log(e.blue("\u25FC Subscription Check"));let n;try{n=await i()}catch(o){console.error(e.red(`
+\u25FC Failed to check subscription: ${o.message}
+`)),process.exit(1)}if(n=await h(n,{check:i,sleep:o=>new Promise(r=>setTimeout(r,o)),onRetry:(o,r)=>console.log(e.gray(`\u25FC Checking subscription... (attempt ${o}/${r})`))}),n.hasAccess)if(console.log(e.green("\u25FC Active subscription found")),n.expiresAt){const o=new Date(n.expiresAt);console.log(e.gray(`  Expires: ${o.toLocaleDateString()}
+`))}else console.log("");else{console.log(e.green("\u25FC You're on the Free tier \u2014 permanent, no card needed: 1 cube + 3 drones + 100 req/hr.")),console.log(e.gray(`\u25FC Start using borgmcp right now. Upgrade any time for unlimited cubes + drones ($1/cube/month).
+`));const{subscribeMethod:o}=await d({type:"select",name:"subscribeMethod",message:"You're ready on the Free tier. Want to do more?",choices:[{title:"\u25FC Continue on the Free tier (recommended)",value:"skip",description:"Start now \u2014 1 cube, 3 drones, 100 req/hr. No payment required."},{title:"\u25FC Upgrade to Cube tier \u2014 $1/cube/month",value:"web",description:"Unlimited cubes + drones + 1000 req/hr. Opens the subscribe page in your browser."},{title:"\u25FC Quick Stripe checkout",value:"stripe",description:"Fast upgrade checkout in the browser"},{title:"\u25FC I already subscribed \u2014 re-check",value:"recheck",description:"Re-check now \u2014 a just-completed subscription can take a moment to activate"}]});switch(o){case"web":console.log(e.blue(`
+\u25FC Opening: https://borgmcp.ai/subscribe`));try{await a("https://borgmcp.ai/subscribe"),console.log(e.gray(`\u25FC Waiting for subscription (checking every 5s for 2 min)...
+`)),await u()}catch(r){console.error(e.yellow(`
+\u25FC ${r.message}`))}break;case"stripe":try{const r=await p();console.log(e.blue(`
+\u25FC Opening Stripe: ${r}`)),await a(r),console.log(e.gray(`\u25FC Waiting for subscription...
+`)),await u()}catch(r){console.error(e.red(`
+\u25FC Failed to create checkout: ${r.message}
+`))}break;case"recheck":try{(await i()).hasAccess?console.log(e.green(`
+\u25FC Subscription found!
+`)):console.log(e.yellow(`
+\u25FC No subscription found
+`))}catch(r){console.error(e.red(`
+\u25FC Failed to recheck: ${r.message}
+`))}break;case"skip":console.log(e.green(`
+\u25FC You're all set on the Free tier: 1 cube, 3 drones, 100 req/hr.
+`));break}}console.log(e.green.bold(`Setup complete!
+`)),console.log(e.yellow(`\u{1F504} Restart Claude Code/Codex (or open a new session) for the changes to take effect.
+`)),console.log(e.gray("\u25FC Next steps:")),console.log(e.gray('1. Run "borg" to start Claude Code or Codex with your cube')),console.log(e.gray(`2. Manage cubes and subscription at https://borgmcp.ai/dashboard
+`))}async function u(){for(let s=0;s<24;s++){await new Promise(t=>setTimeout(t,5e3));try{if((await i()).hasAccess){console.log(e.green(`\u25FC Subscription activated!
+`));return}}catch{}}throw new Error("Timeout - Run setup again after subscribing")}A().catch(c=>{console.error(e.red(`
+\u25FC Setup failed: ${c.message}
+`)),process.exit(1)});