@clearlysh/beehaven 0.8.35 → 0.8.37

package/dist/agent-sessions.js

@@ -14,6 +14,7 @@ import { writeFileSync, readFileSync, renameSync, chmodSync, mkdirSync, existsSy
 import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
+import { ReconnectBackoff } from './reconnect-backoff.js';
 const CONFIG_DIR = join(homedir(), '.beehaven');
 function scopedPresenceFile(scope) {
     const digest = createHash('sha256').update(String(scope || 'local')).digest('hex').slice(0, 24);
@@ -31,8 +32,6 @@ export class AgentSessions {
     presenceBroadcast = null;
     /** A desktop identity is presence, not a permanent login badge. */
     static IDLE_TIMEOUT_MS = 30 * 60 * 1000;
-    static RECONNECT_MIN_MS = 1_000;
-    static RECONNECT_MAX_MS = 30_000;
     /** @param wsBase returns the relay ws base, e.g. wss://…/  (no trailing path) */
     constructor(wsBase, presenceScope = 'local') {
         this.wsBase = wsBase;
@@ -188,8 +187,7 @@ export class AgentSessions {
     scheduleReconnect(agentId, spec) {
         if (this.specs.get(agentId) !== spec || spec.reconnectTimer)
             return;
-        const delay = spec.reconnectDelay;
-        spec.reconnectDelay = Math.min(spec.reconnectDelay * 2, AgentSessions.RECONNECT_MAX_MS);
+        const delay = spec.backoff.next();
         spec.reconnectTimer = setTimeout(() => {
             spec.reconnectTimer = null;
             this.openSocket(agentId, spec);
@@ -213,6 +211,7 @@ export class AgentSessions {
         const url = `${base}/my/workspace/ws?token=${encodeURIComponent(spec.token)}&clientType=agent&client=agent&deviceId=agent-${encodeURIComponent(agentId)}`;
         let ws;
         let opened = false;
+        let openedAt = null;
         let settled = false;
         let timer = null;
         const settleFirst = (result) => {
@@ -253,7 +252,10 @@ export class AgentSessions {
             // Reconnecting transport is not agent activity. A new socket stays inactive until a
             // verified call touches the identity; a persisted interaction keeps its existing clock.
             this.scheduleIdleExpiry(agentId);
-            spec.reconnectDelay = AgentSessions.RECONNECT_MIN_MS;
+            // ⚠ PPO-532: opening is not recovering — this reset-on-open made a workspace that drops
+            // every new socket while hydrating (1006) see a reconnect every ~1 s, in step with the
+            // daemon's own socket. The backoff now resets only after the socket stays open 60 s.
+            openedAt = spec.backoff.opened();
             this.syncPersistedInteractions();
             this.syncActiveSessionsFile();
             settleFirst({ ok: true });
@@ -290,6 +292,7 @@ export class AgentSessions {
                 return;
             }
             this.syncActiveSessionsFile();
+            spec.backoff.closed(openedAt);
             this.scheduleReconnect(agentId, spec);
         };
     }
@@ -300,7 +303,7 @@ export class AgentSessions {
         const spec = {
             token,
             reconnectTimer: null,
-            reconnectDelay: AgentSessions.RECONNECT_MIN_MS,
+            backoff: new ReconnectBackoff(),
         };
         this.specs.set(agentId, spec);
         return new Promise((resolve) => this.openSocket(agentId, spec, resolve));

package/dist/agents-md-text.js

@@ -22,6 +22,22 @@ export const LEGACY_BLOCK_MARKERS = [
     ['<!-- clearly:cli:start -->', '<!-- clearly:cli:end -->'],
     ['<!-- clearly:mcp:start -->', '<!-- clearly:mcp:end -->'],
 ];
+/**
+ * The opt-out (AWO-403): a project whose AGENTS.md or CLAUDE.md carries this exact line is not tracked in Clearly.
+ * The global block (agentsGlobal.ts) and the MCP standing instructions name it, so the opt-out is a literal an agent
+ * matches, not a sentence it interprets. `beehaven agents-md --not-tracked` writes it between Clearly's markers.
+ */
+export const AGENTS_MD_OPT_OUT_LINE = 'Clearly: not tracked';
+/** The opted-out project's block: the line, inside the same markers, so re-running the setup turns tracking back on. */
+export function agentsMdOptOutBlock() {
+    return [
+        AGENTS_MD_START,
+        '<!-- managed-by: clearly. Run `beehaven agents-md` to track this project in Clearly again. -->',
+        '',
+        AGENTS_MD_OPT_OUT_LINE,
+        AGENTS_MD_END,
+    ].join('\n');
+}
 /** How Claude Code runs the MCP server's `clearly-agents-md` prompt, which writes the block. */
 export const MCP_AGENTS_MD_SLASH = '/mcp__clearly__clearly-agents-md';
 /** What goes in CLAUDE.md so Claude Code reads the AGENTS.md block too. */
@@ -68,13 +84,17 @@ export function agentsMdBlock(agentName) {
         '   Record decisions, open questions and progress as comments (`clearly_comment`).',
         '5. Mark it done only after verifying the result, with the resolution and any remaining risk.',
         '',
+        'Questions and reads need no ticket.',
+        '',
         '### End of every session',
         '',
         '- Leave a handoff: what you did and what is next. CLI: `beehaven agent handoff "<done · next>"`.',
         '  MCP: a comment on the work ticket.',
         '',
         'If this session has neither the `clearly_*` tools nor `beehaven`, stop and ask the person to connect',
-        'Clearly (clearly.sh/docs/mcp or clearly.sh/docs/cli). Do not skip the tracking.',
+        'Clearly (clearly.sh/docs/mcp or clearly.sh/docs/cli). Do not skip the tracking. In CI or a cloud',
+        'agent, where nobody can sign in, connect over MCP with an agent token from the agent\'s details in',
+        'Clearly, kept as a secret.',
         AGENTS_MD_END,
     ].join('\n');
 }

package/dist/browser-login.js

@@ -291,3 +291,97 @@ export async function browserLogin() {
     persistBrowserLogin(captured);
     return captured;
 }
+/** The relay's HTTPS origin for the configured env (prod when unconfigured). */
+export function relayHttpFromConfig(cfg = readConfig(), env = process.env) {
+    const override = env.BEEHAVEN_RELAY_HTTP_URL;
+    if (override)
+        return override.replace(/\/+$/, '');
+    return resolveRelaySelection(cfg).url.replace(/^wss:\/\//, 'https://').replace(/^ws:\/\//, 'http://').replace(/\/+$/, '');
+}
+/**
+ * True where a browser on this machine is unlikely: an SSH session, CI, or Linux with no display.
+ * `beehaven login --browser` overrides it; `--device-code` forces the device flow anywhere.
+ */
+export function preferDeviceLogin(env = process.env, platform = process.platform) {
+    if (env.SSH_CONNECTION || env.SSH_TTY || env.CI)
+        return true;
+    return platform === 'linux' && !env.DISPLAY && !env.WAYLAND_DISPLAY;
+}
+/** The approval page, optionally with the code filled in. */
+export function deviceAuthUrl(authOrigin, userCode) {
+    return withUtm(`${authOrigin}/cli/device${userCode ? `?code=${encodeURIComponent(userCode)}` : ''}`);
+}
+/** Email and name from the ID token's payload, for the "Signed in as" line. Display only. */
+function idTokenClaims(idToken) {
+    try {
+        const payload = JSON.parse(Buffer.from(idToken.split('.')[1] ?? '', 'base64url').toString('utf8'));
+        return { email: typeof payload.email === 'string' ? payload.email : undefined, name: typeof payload.name === 'string' ? payload.name : undefined };
+    }
+    catch {
+        return {};
+    }
+}
+export function captureDeviceLogin(opts) {
+    const { relayOrigin, authOrigin, client, fetchImpl = fetch, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), now = Date.now, log = (line) => console.log(line), } = opts;
+    const post = async (path, body) => {
+        const res = await fetchImpl(`${relayOrigin}${path}`, {
+            method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body),
+        });
+        const json = await res.json().catch(() => ({}));
+        return { res, json };
+    };
+    return (async () => {
+        let start;
+        try {
+            const { res, json } = await post('/cli/device/start', { client });
+            if (!res.ok || !json?.ok)
+                throw new Error(json?.error === 'slow_down' ? 'Too many sign-in attempts from here. Wait a while and try again.' : (json?.error || `relay answered ${res.status}`));
+            start = json;
+        }
+        catch (err) {
+            throw new Error(`Couldn't start a device sign-in: ${err?.message ?? err}`);
+        }
+        log('');
+        log(`  On any device with a browser, open  ${color.cyan(deviceAuthUrl(authOrigin))}`);
+        log(`  and enter this code:                 ${color.bold(start.userCode)}`);
+        log('');
+        log(color.dim(`  Direct link: ${deviceAuthUrl(authOrigin, start.userCode)}`));
+        log(color.dim(`  Waiting for approval (the code expires in ${Math.round(start.expiresIn / 60)} minutes)…`));
+        let interval = Math.max(1, start.interval) * 1000;
+        const deadline = now() + start.expiresIn * 1000;
+        while (now() < deadline) {
+            await sleep(interval);
+            let res;
+            let json;
+            try {
+                ({ res, json } = await post('/cli/device/token', { deviceCode: start.deviceCode }));
+            }
+            catch {
+                continue; // a dropped poll is retried at the next tick
+            }
+            if (res.ok && json?.ok && json.idToken && json.refreshToken && json.userId) {
+                const { email, name } = idTokenClaims(json.idToken);
+                return { idToken: json.idToken, refreshToken: json.refreshToken, userId: json.userId, email, displayName: name };
+            }
+            switch (json?.error) {
+                case 'authorization_pending': continue;
+                case 'slow_down':
+                    interval += 5000;
+                    continue;
+                case 'access_denied': throw new Error('The sign-in was denied in the browser.');
+                case 'expired_token': throw new Error('The code expired. Run `beehaven login --device-code` again.');
+                default:
+                    if (res.status >= 500)
+                        throw new Error(json?.error || `relay answered ${res.status}`);
+            }
+        }
+        throw new Error('The code expired. Run `beehaven login --device-code` again.');
+    })();
+}
+/** Device-code sign-in end to end: start, show the code, poll, persist like the browser flow. */
+export async function deviceLogin(opts = {}) {
+    const { authOrigin } = resolveAuthOrigin();
+    const captured = await captureDeviceLogin({ relayOrigin: relayHttpFromConfig(), authOrigin, client: opts.client });
+    persistBrowserLogin(captured);
+    return captured;
+}

package/dist/build-channel.js

@@ -53,9 +53,9 @@ export const PUBLIC_BUILD = true;
  * ⚠ REWRITTEN IN `dist/` AT BUILD TIME, like `PUBLIC_BUILD`. `unstamped` is what a source checkout
  * carries and what `tsx`/`vitest` see, and it is honest: nothing has stamped them.
  */
-export const BUILD_SHA = 'f866489dd2f1';
+export const BUILD_SHA = '7674ddaca41b';
 /** ISO-8601 minute precision, UTC. Rewritten in `dist/` by `scripts/stamp-build-channel.mjs`. */
-export const BUILD_TIME = '2026-10-28T16:02Z';
+export const BUILD_TIME = '2026-10-29T21:35Z';
 /**
  * The build identity as one short string, for `--version`.
  *

package/dist/call-brief.js

@@ -0,0 +1,157 @@
+/**
+ * `beehaven call <action> … --brief` — a receipt a person (or an agent's context window) can read.
+ *
+ * ⚠⚠ WHY THIS EXISTS. A `canvas-act` batch answers with every step's full value plus the lint of
+ * every touched artboard — routinely tens of kilobytes. Agents learned to pipe it into a summariser
+ * they wrote on the spot (`… 2>&1 | node summ.mjs`), and in the first recorded canvas take (MCP2-20)
+ * that improvisation cost four failed tool calls: shell pipes and `/tmp` redirects need approval in
+ * a headless agent, and the summariser crashed on the stderr breadcrumb it was fed. The receipt the
+ * agent wanted is printed here instead, from the same result, with the exit code unchanged.
+ *
+ * ⚠ IT DROPS NOTHING THAT DECIDES THE NEXT STEP: failed steps (with their error), rollbacks and
+ * skips, lint findings that need fixing, a review's verdict and blocking count. What it leaves out
+ * is bulk — per-step echoes, previews, font metadata. `--json` still prints the whole payload.
+ */
+const clip = (s, n) => {
+    const t = String(s ?? '').replace(/\s+/g, ' ').trim();
+    return t.length > n ? `${t.slice(0, n - 1)}…` : t;
+};
+const plural = (n, one, many = `${one}s`) => `${n} ${n === 1 ? one : many}`;
+/** `canvas.create-node` → `create-node`; `frame.create` stays as written. */
+const verb = (a) => (a.startsWith('canvas.') ? a.slice(7) : a);
+export function briefReceipt(action, result) {
+    const r = (result && typeof result === 'object' ? result : { value: result });
+    const error = typeof r.error === 'string' && r.error ? r.error : null;
+    /**
+     * MCP2-28 (codex review) — A FAILED BATCH IS STILL A BATCH. This returned the one-line refusal for
+     * any `ok:false`, before looking at `results`, so a rolled-back canvas-act (step 2 of 2 refused)
+     * printed a truncated error with no step number and no "rolled back". The batch receipt is read
+     * first; the top-level failure is kept on it, so the exit code still says it failed.
+     */
+    if (Array.isArray(r.results) && r.results.length) {
+        const b = batchReceipt(action, r);
+        if (error || r.ok === false) {
+            b.ok = false;
+            b.lines[0] = b.lines[0].replace(/^✓/, '✗');
+            const why = clip(error ?? r.message ?? r.code ?? '', 200);
+            // Not repeated when a failed step already says it (the step line clips at 140, this at 200).
+            if (why && !b.lines.some((l) => l.includes(why.slice(0, 60))))
+                b.lines.splice(1, 0, `  ${why}`);
+        }
+        return b;
+    }
+    if (error || r.ok === false) {
+        return { ok: false, lines: [`✗ ${action} · ${clip(error ?? r.message ?? r.code ?? 'refused', 160)}`] };
+    }
+    if (Array.isArray(r.results))
+        return batchReceipt(action, r);
+    return { ok: true, lines: [`✓ ${action}${describeValue(r)}`] };
+}
+function batchReceipt(action, r) {
+    const steps = r.results;
+    const failed = steps.map((s, i) => ({ s, i })).filter(({ s }) => s?.ok === false);
+    const lines = [];
+    // What ran: a review or a set of measurements reads better as its result than as a step count.
+    const reviews = steps.filter((s) => /canvas\.review/.test(s?.action) && s?.ok !== false);
+    const measures = steps.filter((s) => s?.action === 'canvas.measure-text' && s?.ok !== false);
+    const counts = new Map();
+    for (const s of steps)
+        counts.set(verb(s?.action ?? '?'), (counts.get(verb(s?.action ?? '?')) ?? 0) + 1);
+    const mix = [...counts].sort((a, b) => b[1] - a[1]).slice(0, 3).map(([a, n]) => (n > 1 ? `${a} ×${n}` : a)).join(', ');
+    let added = 0, changed = 0, removed = 0, sawDelta = false;
+    for (const s of steps) {
+        const d = s?.value?.canvasChanges;
+        if (d && typeof d === 'object' && !Array.isArray(d)) {
+            sawDelta = true;
+            added += Number(d.added || 0);
+            changed += Number(d.changed || 0);
+            removed += Number(d.removed || 0);
+        }
+    }
+    const rev = r.canvasNodesRev ?? [...steps].reverse().find((s) => s?.value?.canvasNodesRev != null)?.value?.canvasNodesRev;
+    const head = [`${failed.length ? '✗' : '✓'} ${action}`, `${plural(steps.length, 'step')}${mix ? ` (${mix})` : ''}`];
+    if (sawDelta && added + changed + removed)
+        head.push(`+${added} ~${changed} −${removed} layers`);
+    if (rev != null)
+        head.push(`rev ${rev}`);
+    if (r.rolledBack)
+        head.push('rolled back');
+    if (r.partial)
+        head.push('partly applied');
+    if (Array.isArray(r.skipped) ? r.skipped.length : r.skipped)
+        head.push(`${Array.isArray(r.skipped) ? r.skipped.length : r.skipped} skipped`);
+    lines.push(head.join(' · '));
+    for (const { s, i } of failed.slice(0, 3)) {
+        lines.push(`  ✗ step ${i + 1} ${verb(s.action ?? '?')}: ${clip(s.error ?? s.value?.error ?? 'failed', 140)}`);
+    }
+    if (failed.length > 3)
+        lines.push(`  … ${failed.length - 3} more failed steps`);
+    for (const m of measures.slice(0, 6)) {
+        const v = m.value ?? {};
+        lines.push(`  ${Math.round(v.width ?? 0)}×${Math.round(v.height ?? 0)} · ${plural(v.lineCount ?? 1, 'line')}${v.exact === false ? ' · estimated' : ''} — ${v.family ?? ''} ${v.size ?? ''}/${v.fontWeight ?? ''}`.trimEnd());
+    }
+    for (const rv of reviews) {
+        const v = rv.value ?? {};
+        const reports = Array.isArray(v.reviews) ? v.reviews : [v];
+        for (const rep of reports) {
+            const blocking = rep.blocking?.craft ?? 0;
+            const where = rep.scope?.name ?? rep.scope?.ids?.[0] ?? '';
+            lines.push(`  review${where ? ` ${clip(where, 40)}` : ''}: ${rep.verdict ?? 'unknown'}${blocking ? ` · ${plural(blocking, 'blocking finding')}` : ''}`);
+            for (const f of (rep.craft?.findings ?? []).filter((x) => x.severity === 'warn').slice(0, 3)) {
+                lines.push(`    ${f.check}: ${clip(f.detail, 120)}`);
+            }
+        }
+    }
+    // Lint of the touched artboards: what must be fixed next, never the whole report.
+    for (const d of (Array.isArray(r.diagnostics) ? r.diagnostics : [])) {
+        const errors = d.errors ?? [];
+        if (!errors.length && d.verdict !== 'fix')
+            continue;
+        lines.push(`  lint ${clip(d.artboard ?? d.id, 40)}: ${d.verdict ?? 'fix'}`);
+        for (const e of errors.slice(0, 3))
+            lines.push(`    ${clip(e, 140)}`);
+        if (errors.length > 3 || d.moreErrors)
+            lines.push(`    … ${(errors.length - 3 > 0 ? errors.length - 3 : 0) + (d.moreErrors ?? 0)} more`);
+    }
+    const clean = (Array.isArray(r.diagnostics) ? r.diagnostics : []).filter((d) => d.verdict && d.verdict !== 'fix');
+    if (clean.length)
+        lines.push(`  lint ${[...new Set(clean.map((d) => d.verdict))].join('/')} on ${plural(clean.length, 'artboard')}`);
+    /**
+     * MCP2-25 — THE CARRIED TICKET'S OUTCOME DECIDES THE NEXT STEP TOO. A batch carrying `ticket` moves
+     * it only when its review passes; the receipt said nothing either way, so an agent could not tell a
+     * done commit from one the review held back.
+     */
+    const t = r.ticket;
+    if (t && typeof t === 'object') {
+        if (t.applied)
+            lines.push(`  ticket ${t.key ?? t.id} → ${t.status ?? 'updated'}${t.frame?.url ? ` · frame ${t.frame.url}` : ''}`);
+        else
+            lines.push(`  ✗ ticket ${t.id ?? ''} not moved: ${clip(t.reason ?? t.error ?? 'refused', 200)}`);
+    }
+    return { ok: failed.length === 0, lines };
+}
+/** A one-line description of an ordinary result: its identity and what it holds. */
+function describeValue(r) {
+    const bits = [];
+    const id = r.key ?? r.id ?? r.compositionId ?? r.documentId;
+    if (id)
+        bits.push(String(id).length > 24 ? String(id).slice(0, 8) : String(id));
+    const title = r.title ?? r.name;
+    if (typeof title === 'string' && title)
+        bits.push(`"${clip(title, 60)}"`);
+    if (typeof r.status === 'string')
+        bits.push(r.status);
+    if (r.verdict)
+        bits.push(`verdict ${r.verdict}`);
+    for (const [k, v] of Object.entries(r)) {
+        if (Array.isArray(v) && v.length && bits.length < 4 && !['results', 'diagnostics'].includes(k))
+            bits.push(`${v.length} ${k}`);
+    }
+    if (typeof r.count === 'number' && !bits.some((b) => b.endsWith(' items')))
+        bits.push(`count ${r.count}`);
+    if (typeof r.url === 'string')
+        bits.push(r.url);
+    if (r.value !== undefined && typeof r.value !== 'object')
+        bits.push(clip(r.value, 120));
+    return bits.length ? ` · ${bits.join(' · ')}` : '';
+}

package/dist/claude-bridge.js

@@ -22,6 +22,7 @@ import { homedir } from 'os';
 import { EventEmitter } from 'events';
 import { activeAgentWrap } from './agent-attribution.js';
 import { ipcSocketPath, watcherSocketPath, socketMayExist } from './ipc-path.js';
+import { utf8Stream } from './utf8-stream.js';
 const CONFIG_DIR = join(homedir(), '.beehaven');
 export class ClaudeBridge extends EventEmitter {
     socket = null;
@@ -56,8 +57,10 @@ export class ClaudeBridge extends EventEmitter {
                 this.send({ type: 'session:announce', label: 'claude-code', app: 'bridge' });
                 resolve(true);
             });
+            // CA-63 — decode the stream, not each chunk: a character split across two reads stays whole.
+            const decode = utf8Stream();
             socket.on('data', (data) => {
-                this.buffer += data.toString();
+                this.buffer += decode(data);
                 const lines = this.buffer.split('\n');
                 this.buffer = lines.pop() || '';
                 for (const line of lines) {

package/dist/cli.js

@@ -284,6 +284,7 @@ ${DEV_ONLY_HELP ? `  PROJECT — build your own Durable Object backend  (HIVE_DE
     mcp status                               Which clients are configured
     mcp remove                               Remove the entries + revoke the token
     mcp-config [--name N]                    Print the block instead of writing it
+    mcp-config --token-only --expires <days> Print ONLY the token, for a secret store
 
     Anywhere else — claude.ai, Claude Desktop, another machine — point the client
     at the endpoint and let it log you in; nothing to install and no token to paste:
@@ -407,7 +408,7 @@ ${DEV_ONLY_HELP ? `
     beehaven actions --all         …including ones this caller cannot invoke
     beehaven actions --search <q>  Find one by substring
     beehaven explain <action>      Its exact arguments, from the live schema
-    beehaven call <action> [json]  Invoke it; returns the raw JSON result
+    beehaven call <action> [json]  Invoke it; returns the raw JSON result (--brief: a short receipt; --out <file>: the JSON to a file)
 
     # discover, then run
     beehaven actions --search ticket
@@ -1417,6 +1418,10 @@ async function run() {
             // (a live client) when none is connected; `--dev` → localhost.
             launch: { type: 'boolean', default: false },
             browser: { type: 'boolean', default: false },
+            // `beehaven login --device-code` — sign in by approving a code on another device (AWO-402).
+            'device-code': { type: 'boolean', default: false },
+            // `beehaven agents-md --not-tracked` — write the opt-out line instead of the tracked block (AWO-403).
+            'not-tracked': { type: 'boolean', default: false },
             dev: { type: 'boolean', default: false },
             // `beehaven canvas perceive --pixels --max 80`, `canvas verify --keep`
             pixels: { type: 'boolean', default: false },
@@ -1438,6 +1443,8 @@ async function run() {
             address: { type: 'string' },
             protocol: { type: 'string' },
             json: { type: 'boolean', default: false },
+            // `beehaven call … --brief`: a short receipt instead of the full JSON (call-brief.ts).
+            brief: { type: 'boolean', default: false },
             // `--conversation <id>` threads `beehaven agent "<msg>"` onto an existing
             // Omni thread instead of minting a new one per invocation.
             conversation: { type: 'string' },
@@ -1461,6 +1468,8 @@ async function run() {
             client: { type: 'string' },
             /** `beehaven mcp install --rotate` — mint a new token instead of reusing the installed one. */
             rotate: { type: 'boolean' },
+            /** `beehaven mcp-config --token-only --expires <days>` — the raw token alone on stdout, for piping. */
+            'token-only': { type: 'boolean' },
             password: { type: 'string' },
             email: { type: 'string' },
             expires: { type: 'string' },
@@ -2083,6 +2092,8 @@ async function run() {
         'slides', 'deck',
         // `brand tokens -o tokens.css` · `component render -o button.svg`
         'brand', 'brands', 'component', 'components',
+        // MCP2-25 — `call <action> … --out result.json`: the whole result to a file, the receipt to the console.
+        'call',
     ]);
     /**
      * ⚠ ONE REFUSAL, because there is now one flag. Both spellings are named in the message so a
@@ -3033,10 +3044,19 @@ async function run() {
             // own copy aimed at /auth/beehaven, a route the web app no longer serves.
             // What follows the sign-in — restarting the daemon, teaching the agents —
             // stays here, because the daemon fallback must not restart itself.
+            // AWO-402 — the device-code flow for a machine with no browser of its own: forced with
+            // `--device-code`, chosen automatically over SSH / CI / a display-less Linux, and never when
+            // the person asked for `--browser`.
             let captured;
             try {
-                const { browserLogin } = await import('./browser-login.js');
-                captured = await browserLogin();
+                const { browserLogin, deviceLogin, preferDeviceLogin } = await import('./browser-login.js');
+                const useDevice = Boolean(values['device-code']) || (!values.browser && preferDeviceLogin());
+                if (useDevice && !values['device-code']) {
+                    console.log(color.dim('  No browser on this machine, so signing in with a code (`beehaven login --browser` to open one here).'));
+                }
+                captured = useDevice
+                    ? await deviceLogin({ client: `beehaven ${getVersion()} (${process.platform})` })
+                    : await browserLogin();
             }
             catch (err) {
                 console.error(`  ${color.red('✗')} ${err?.message ?? err}`);
@@ -3170,6 +3190,7 @@ async function run() {
                 mcp: !!values.mcp,
                 print: !!values.print,
                 remove: !!values.remove,
+                notTracked: Boolean(values['not-tracked']),
             });
             break;
         }
@@ -4073,10 +4094,82 @@ complete -F _beehaven_completions beehaven`);
             const tgtAddress = tgt?.address ?? 'home';
             const mcpEntry = entryNameFor(tgtAddress);
             const wsId = isHomeAddress(tgtAddress) ? '' : tgtAddress.split('/').slice(1).join('/');
-            const label = values.name || `${mcpEntry} · ${new Date().toISOString().slice(0, 10)}`;
+            const defaultMcpLabel = `${mcpEntry} · ${new Date().toISOString().slice(0, 10)}`;
             const { rpcOnce: _rpc } = await import('./ipc-client.js');
             const { resolveActiveAgent } = await import('./agent-state.js');
+            const { mcpMintInput, runMcpTokenOnly } = await import('./commands/mcp-token.js');
             const activeMcpAgent = resolveActiveAgent(values);
+            /**
+             * ⚠⚠ DO NOT ECHO THE RAW ERROR — IT SENT PEOPLE TO THE WRONG FIX.
+             *
+             * Observed: this printed "Cannot connect to daemon. Run `beehaven start --headless`" in the
+             * same second that `beehaven status` reported "Daemon: running". The daemon was up and the
+             * RELAY had dropped. Following the advice runs into the single-instance guard, which
+             * refuses — so the message costs a cycle and teaches the wrong model of the failure.
+             *
+             * The CLI already distinguishes these three states carefully (see `status`), precisely
+             * because the fixes are mutually exclusive: a restart will NOT refresh an expired token,
+             * and a re-login will NOT revive a dropped socket. This path bypassed all of it by
+             * forwarding whatever string the transport happened to raise.
+             *
+             * Re-probe and say what is actually true. Stderr only, and it returns the exit code, so the
+             * `--token-only` path can use it without touching stdout.
+             */
+            const explainMintFailure = async (err) => {
+                const { isDaemonRunning } = await import('./daemon-client.js');
+                let up = false;
+                try {
+                    up = await isDaemonRunning();
+                }
+                catch {
+                    up = false;
+                }
+                let expired = false;
+                try {
+                    const cfg = JSON.parse(readFileSync(join(homedir(), '.beehaven', 'config.json'), 'utf8'));
+                    const payload = JSON.parse(Buffer.from(String(cfg.token).split('.')[1], 'base64').toString());
+                    expired = !payload.exp || Date.now() / 1000 > payload.exp - 60;
+                }
+                catch {
+                    expired = true;
+                }
+                console.error(`  ${color.red('✗')} Could not mint a token.`);
+                console.error(!up
+                    ? '    The daemon is not running — `beehaven start --headless`'
+                    : expired
+                        ? '    The daemon is up but your token has EXPIRED — `beehaven login` (a restart will not refresh it)'
+                        : '    The daemon is up and your token is valid; the relay socket dropped — `beehaven restart`');
+                console.error(color.dim(`    (${err?.message ?? err})`));
+                return 1;
+            };
+            /**
+             * ⚠⚠ `--token-only`: THE RAW TOKEN ON STDOUT AND NOTHING ELSE, for
+             * `… | gh secret set CLEARLY_MCP_TOKEN`. The rules (stderr for every message, `--expires`
+             * required, the caller's own agent) live in commands/mcp-token.ts, where the tests call them.
+             * It branches off HERE, before the reuse check (print never reuses) and before anything below
+             * writes to stdout.
+             */
+            if (values['token-only']) {
+                process.exitCode = await runMcpTokenOnly({
+                    sub: mcpSub,
+                    flags: values,
+                    defaultLabel: defaultMcpLabel,
+                    agentId: activeMcpAgent?.agentId,
+                    mint: (input) => _rpc('create-mcp-token', input, 30_000),
+                    out: (s) => { process.stdout.write(s); },
+                    err: (s) => { process.stderr.write(s); },
+                    stdoutIsTTY: Boolean(process.stdout.isTTY),
+                    onMintError: explainMintFailure,
+                });
+                break;
+            }
+            // `--label` (else `--name`), `--expires <days>` and the caller's agent, for every mint below.
+            const mintInput = mcpMintInput(values, { label: defaultMcpLabel, agentId: activeMcpAgent?.agentId });
+            if ('error' in mintInput) {
+                console.error(`  ${color.red('✗')} ${mintInput.error}`);
+                process.exit(2);
+            }
+            const label = mintInput.input.label;
             let res;
             /**
              * ⚠⚠ REUSE THE TOKEN ALREADY INSTALLED RATHER THAN MINTING ANOTHER. Minting
@@ -4121,54 +4214,11 @@ complete -F _beehaven_completions beehaven`);
                 }
             }
             try {
-                if (!res) {
-                    res = await _rpc('create-mcp-token', {
-                        label,
-                        ...(activeMcpAgent?.agentId ? { agentId: activeMcpAgent.agentId } : {}),
-                    }, 30_000);
-                }
+                if (!res)
+                    res = await _rpc('create-mcp-token', mintInput.input, 30_000);
             }
             catch (err) {
-                /**
-                 * ⚠⚠ DO NOT ECHO THE RAW ERROR — IT SENT PEOPLE TO THE WRONG FIX.
-                 *
-                 * Observed: this printed "Cannot connect to daemon. Run `beehaven start --headless`" in the
-                 * same second that `beehaven status` reported "Daemon: running". The daemon was up and the
-                 * RELAY had dropped. Following the advice runs into the single-instance guard, which
-                 * refuses — so the message costs a cycle and teaches the wrong model of the failure.
-                 *
-                 * The CLI already distinguishes these three states carefully (see `status`), precisely
-                 * because the fixes are mutually exclusive: a restart will NOT refresh an expired token,
-                 * and a re-login will NOT revive a dropped socket. This path bypassed all of it by
-                 * forwarding whatever string the transport happened to raise.
-                 *
-                 * Re-probe and say what is actually true.
-                 */
-                const { isDaemonRunning } = await import('./daemon-client.js');
-                let up = false;
-                try {
-                    up = await isDaemonRunning();
-                }
-                catch {
-                    up = false;
-                }
-                let expired = false;
-                try {
-                    const cfg = JSON.parse(readFileSync(join(homedir(), '.beehaven', 'config.json'), 'utf8'));
-                    const payload = JSON.parse(Buffer.from(String(cfg.token).split('.')[1], 'base64').toString());
-                    expired = !payload.exp || Date.now() / 1000 > payload.exp - 60;
-                }
-                catch {
-                    expired = true;
-                }
-                console.error(`  ${color.red('✗')} Could not mint a token.`);
-                console.error(!up
-                    ? '    The daemon is not running — `beehaven start --headless`'
-                    : expired
-                        ? '    The daemon is up but your token has EXPIRED — `beehaven login` (a restart will not refresh it)'
-                        : '    The daemon is up and your token is valid; the relay socket dropped — `beehaven restart`');
-                console.error(color.dim(`    (${err?.message ?? err})`));
-                process.exit(1);
+                process.exit(await explainMintFailure(err));
             }
             if (!res?.key) {
                 console.error(`  ${color.red('✗')} ${res?.error ?? 'No token returned.'}`);