@phnx-labs/agents-cli 1.22.42 → 1.22.44

package/dist/lib/analytics/mix-commands.d.ts

@@ -7,9 +7,8 @@
  * usage.db) still exists — it is now `agents insights mix` and the recipe
  * subcommands below. Latency stays on `agents perf`; quota on `agents usage`.
  *
- * `agents trends` remains a thin deprecated alias registered from
- * `commands/trends.ts` that shares this same registration — no second copy of
- * the recipe tree.
+ * Former top-level `agents trends` is gone. The nested spelling
+ * `agents insights trends` is an alias of `agents insights mix`.
  */
 import type { Command } from 'commander';
 export declare function parseMixDays(raw: string | undefined): number;
@@ -19,35 +18,14 @@ export declare function printMixSection(section: {
     rows: Array<Record<string, string | number | null>>;
 }): void;
 export declare function renderMixDashboard(days: number, asJson: boolean, bannerLabel?: string): void;
-/** One-line deprecation for the retired top-level `agents trends` spelling. */
-export declare function printTrendsDeprecation(): void;
-export interface RegisterMixCommandsOptions {
-    /**
-     * When true, every action prints the trends deprecation line first. Used only
-     * by the thin top-level `agents trends` alias — the real tree under insights
-     * never sets this.
-     */
-    deprecated?: boolean;
-    /**
-     * Banner label for the multi-recipe dashboard (default: agents insights mix).
-     * The deprecated alias passes `agents insights mix` still, so callers learn
-     * the new name even when they typed trends.
-     */
-    dashboardBanner?: string;
-}
 /**
- * Attach counter-mix subcommands to a parent (typically `insights` or the
- * deprecated `trends` alias).
+ * Attach counter-mix subcommands to a parent (typically `insights`).
  *
  * Layout:
- *   <parent> mix                 multi-recipe board (default for trends alias)
+ *   <parent> mix                 multi-recipe board
+ *   <parent> trends              alias of mix (former top-level `agents trends`)
  *   <parent> recipes             list recipe ids
  *   <parent> query               raw usage.db rows
  *   <parent> harness-mix|…       one baked recipe
  */
-export declare function registerMixCommands(parent: Command, opts?: RegisterMixCommandsOptions): void;
-/**
- * Thin top-level `agents trends` alias: same mix tree, deprecation on every path,
- * default action = mix board (old `agents trends` with no subcommand).
- */
-export declare function registerDeprecatedTrendsAlias(program: Command): void;
+export declare function registerMixCommands(parent: Command): void;

package/dist/lib/analytics/mix-commands.js

@@ -7,9 +7,8 @@
  * usage.db) still exists — it is now `agents insights mix` and the recipe
  * subcommands below. Latency stays on `agents perf`; quota on `agents usage`.
  *
- * `agents trends` remains a thin deprecated alias registered from
- * `commands/trends.ts` that shares this same registration — no second copy of
- * the recipe tree.
+ * Former top-level `agents trends` is gone. The nested spelling
+ * `agents insights trends` is an alias of `agents insights mix`.
  */
 import chalk from 'chalk';
 import { setHelpSections } from '../help.js';
@@ -56,33 +55,24 @@ export function renderMixDashboard(days, asJson, bannerLabel = 'agents insights
     for (const section of dash.sections)
         printMixSection(section);
 }
-/** One-line deprecation for the retired top-level `agents trends` spelling. */
-export function printTrendsDeprecation() {
-    console.error(chalk.yellow('agents trends is deprecated — use `agents insights mix` (or `agents insights <recipe>`).'));
-}
 /**
- * Attach counter-mix subcommands to a parent (typically `insights` or the
- * deprecated `trends` alias).
+ * Attach counter-mix subcommands to a parent (typically `insights`).
  *
  * Layout:
- *   <parent> mix                 multi-recipe board (default for trends alias)
+ *   <parent> mix                 multi-recipe board
+ *   <parent> trends              alias of mix (former top-level `agents trends`)
  *   <parent> recipes             list recipe ids
  *   <parent> query               raw usage.db rows
  *   <parent> harness-mix|…       one baked recipe
  */
-export function registerMixCommands(parent, opts = {}) {
-    const before = () => {
-        if (opts.deprecated)
-            printTrendsDeprecation();
-    };
-    const banner = opts.dashboardBanner ?? 'agents insights mix';
+export function registerMixCommands(parent) {
+    const banner = 'agents insights mix';
     const mix = parent
         .command('mix')
         .description('Counter recipes — harness/model mix, token ratios, resource frequency (sessions index + usage.db)')
         .option('--days <n>', 'Days of history to include', '7')
         .option('--json', 'Emit JSON instead of tables')
         .action(function summary() {
-        before();
         const o = this.opts();
         renderMixDashboard(parseMixDays(o.days), Boolean(o.json), banner);
     });
@@ -115,7 +105,6 @@ export function registerMixCommands(parent, opts = {}) {
         .description('List baked mix-recipe ids')
         .option('--json', 'Emit JSON')
         .action((o) => {
-        before();
         const list = listRecipes();
         if (o.json) {
             console.log(JSON.stringify(list, null, 2));
@@ -134,7 +123,6 @@ export function registerMixCommands(parent, opts = {}) {
         .option('--limit <n>', 'Max rows', '40')
         .option('--json', 'Emit JSON')
         .action((o) => {
-        before();
         const win = analyticsWindow(parseMixDays(o.days));
         const kind = o.kind && USAGE_KINDS.includes(o.kind)
             ? o.kind
@@ -177,7 +165,6 @@ export function registerMixCommands(parent, opts = {}) {
             .option('--days <n>', 'Days of history', '7')
             .option('--json', 'Emit JSON')
             .action(function recipeAction() {
-            before();
             const parentOpts = this.parent?.opts?.();
             const o = { ...parentOpts, ...this.opts() };
             const win = analyticsWindow(parseMixDays(o.days));
@@ -193,37 +180,24 @@ export function registerMixCommands(parent, opts = {}) {
             printMixSection(section);
         });
     }
-}
-/**
- * Thin top-level `agents trends` alias: same mix tree, deprecation on every path,
- * default action = mix board (old `agents trends` with no subcommand).
- */
-export function registerDeprecatedTrendsAlias(program) {
-    const trends = program
+    // Nested home for the former top-level `agents trends` spelling.
+    const trends = parent
         .command('trends')
-        .description('Deprecated alias of `agents insights mix` — counter recipes over sessions + usage.db')
+        .description('Alias of `mix` — former top-level `agents trends`')
         .option('--days <n>', 'Days of history to include', '7')
         .option('--json', 'Emit JSON instead of tables')
         .action(function summary() {
-        printTrendsDeprecation();
         const o = this.opts();
-        renderMixDashboard(parseMixDays(o.days), Boolean(o.json), 'agents insights mix');
+        renderMixDashboard(parseMixDays(o.days), Boolean(o.json), banner);
     });
     setHelpSections(trends, {
         examples: `
-      # Prefer the canonical spelling
+      agents insights trends
       agents insights mix
-
-      # Still works (prints a deprecation line)
-      agents trends
-      agents trends harness-mix --json
     `,
         notes: `
-      \`agents trends\` is a compatibility alias. New code and agent briefs should use
-      \`agents insights mix\` / \`agents insights <recipe>\`. Behavioural report remains
-      bare \`agents insights\`. Latency remains \`agents perf\`.
+      \`agents insights trends\` is the nested spelling of the former top-level
+      \`agents trends\`. Prefer \`agents insights mix\`.
     `,
     });
-    // Same subcommands as insights, with deprecation on every fire.
-    registerMixCommands(trends, { deprecated: true, dashboardBanner: 'agents insights mix' });
 }

package/dist/lib/audit/log.d.ts

@@ -6,7 +6,7 @@
  * NOT append there. Operators list run outcomes with:
  *
  *   agents events --include runs
- *   agents audit                 # alias of the above
+ *   agents events audit          # nested alias of the above
  */
 /** First record's `prevHash` — a fixed anchor so the chain has a root. */
 export declare const GENESIS_HASH = "GENESIS";
@@ -59,7 +59,7 @@ export declare function verifyAuditChain(logPath?: string): {
     ok: boolean;
     brokenAt?: number;
 };
-/** Read the whole chain, oldest-first. Exposed for `agents audit list`. */
+/** Read the whole chain, oldest-first. Exposed for `agents events audit verify`. */
 export declare function readAuditLog(logPath?: string): AuditRecord[];
 /**
  * Record ONE dispatched run at the single exec chokepoint into the unified

package/dist/lib/audit/log.js

@@ -6,7 +6,7 @@
  * NOT append there. Operators list run outcomes with:
  *
  *   agents events --include runs
- *   agents audit                 # alias of the above
+ *   agents events audit          # nested alias of the above
  */
 import * as fs from 'fs';
 import * as path from 'path';
@@ -116,7 +116,7 @@ export function verifyAuditChain(logPath = getAuditLogPath()) {
     }
     return { ok: true };
 }
-/** Read the whole chain, oldest-first. Exposed for `agents audit list`. */
+/** Read the whole chain, oldest-first. Exposed for `agents events audit verify`. */
 export function readAuditLog(logPath = getAuditLogPath()) {
     return readRecords(logPath);
 }

package/dist/lib/beta.js

@@ -86,5 +86,5 @@ export function setBetaEnabled(features, enabled) {
     return { ...location, enabledFeatures };
 }
 export function betaEnableHint(feature) {
-    return `Enable it with: agents beta enable ${feature}`;
+    return `Enable it with: agents setup beta enable ${feature}`;
 }

package/dist/lib/browser/domain-skills.d.ts

@@ -2,7 +2,9 @@
  * Domain-skill discovery for `agents browser start`.
  *
  * When a browser task opens a URL, look up a site-specific SKILL.md from
- * `~/.agents/skills/browser/domain-skills/<dir>/SKILL.md` and surface its
+ * `skills/browser/domain-skills/<dir>/SKILL.md` in the layered DotAgents
+ * repos — project > user > system, first layer with a match wins, the same
+ * precedence `resolveResource` in `../resources.ts` applies — and surface its
  * contents so the calling agent gets per-site operating instructions
  * (selectors, gotchas, sign-in quirks) before it starts driving the page.
  *
@@ -24,8 +26,21 @@ export interface ResolvedDomainSkill {
     /** Hostname the match was made against (post-www strip). */
     hostname: string;
 }
-/** Where domain-skills live. Override via $AGENTS_BROWSER_DOMAIN_SKILLS_DIR for tests. */
-export declare function domainSkillsRoot(): string;
+/**
+ * Where domain-skills live, in precedence order: project > user > system >
+ * extra repos — the same layering `resolveResource` applies. A layer whose
+ * root does not exist is simply skipped at resolve time.
+ *
+ * The project layer resolves from `cwd` (default `process.cwd()`). The
+ * browser daemon is shared and long-lived, and its IPC request does not yet
+ * carry the calling CLI's cwd, so at that call site the project layer follows
+ * the daemon's own cwd until the caller's cwd is threaded through
+ * (RUSH-2996); user/system/extra-repo layers are cwd-independent.
+ *
+ * $AGENTS_BROWSER_DOMAIN_SKILLS_DIR overrides the whole list with a single
+ * root, for tests.
+ */
+export declare function domainSkillsRoots(cwd?: string): string[];
 /**
  * Derive match candidates from a hostname. Order matters — earlier candidates
  * are tried first.
@@ -40,12 +55,17 @@ export declare function hostnameMatchCandidates(hostname: string): string[];
 /**
  * Resolve a URL to its matching domain-skill, or null if none.
  *
- * Two-pass strategy:
+ * Roots are searched in `domainSkillsRoots` order (project > user > system);
+ * the first layer with a match wins outright — an earlier layer's
+ * directory-name match beats a later layer's `domains:` pin, mirroring
+ * `resolveResource`'s layer precedence. Within one layer, two passes:
  *   1. Index every SKILL.md in the root and read its `domains:` frontmatter.
  *      If any pinned domain matches a candidate, return that skill.
  *   2. Fall back to directory-name match against the candidate list.
  *
  * Errors (missing root, unreadable file, invalid URL) are swallowed and
- * yield null — domain-skill discovery must never break browser start.
+ * yield null — domain-skill discovery must never break browser start. A miss
+ * logs the roots searched at debug level (AGENTS_DEBUG/DEBUG) so a skill
+ * sitting in an unsearched layer is diagnosable rather than silent.
  */
-export declare function resolveDomainSkill(url: string): ResolvedDomainSkill | null;
+export declare function resolveDomainSkill(url: string, cwd?: string): ResolvedDomainSkill | null;

package/dist/lib/browser/domain-skills.js

@@ -2,7 +2,9 @@
  * Domain-skill discovery for `agents browser start`.
  *
  * When a browser task opens a URL, look up a site-specific SKILL.md from
- * `~/.agents/skills/browser/domain-skills/<dir>/SKILL.md` and surface its
+ * `skills/browser/domain-skills/<dir>/SKILL.md` in the layered DotAgents
+ * repos — project > user > system, first layer with a match wins, the same
+ * precedence `resolveResource` in `../resources.ts` applies — and surface its
  * contents so the calling agent gets per-site operating instructions
  * (selectors, gotchas, sign-in quirks) before it starts driving the page.
  *
@@ -14,14 +16,37 @@
  * the directory-name match.
  */
 import * as fs from 'fs';
-import * as os from 'os';
 import * as path from 'path';
-/** Where domain-skills live. Override via $AGENTS_BROWSER_DOMAIN_SKILLS_DIR for tests. */
-export function domainSkillsRoot() {
+import { getEnabledExtraRepos, getProjectAgentsDir, getSystemAgentsDir, getUserAgentsDir, } from '../state.js';
+/**
+ * Where domain-skills live, in precedence order: project > user > system >
+ * extra repos — the same layering `resolveResource` applies. A layer whose
+ * root does not exist is simply skipped at resolve time.
+ *
+ * The project layer resolves from `cwd` (default `process.cwd()`). The
+ * browser daemon is shared and long-lived, and its IPC request does not yet
+ * carry the calling CLI's cwd, so at that call site the project layer follows
+ * the daemon's own cwd until the caller's cwd is threaded through
+ * (RUSH-2996); user/system/extra-repo layers are cwd-independent.
+ *
+ * $AGENTS_BROWSER_DOMAIN_SKILLS_DIR overrides the whole list with a single
+ * root, for tests.
+ */
+export function domainSkillsRoots(cwd) {
     const override = process.env.AGENTS_BROWSER_DOMAIN_SKILLS_DIR;
     if (override)
-        return override;
-    return path.join(os.homedir(), '.agents', 'skills', 'browser', 'domain-skills');
+        return [override];
+    const sub = ['skills', 'browser', 'domain-skills'];
+    const roots = [];
+    const projectDir = getProjectAgentsDir(cwd);
+    if (projectDir)
+        roots.push(path.join(projectDir, ...sub));
+    roots.push(path.join(getUserAgentsDir(), ...sub));
+    roots.push(path.join(getSystemAgentsDir(), ...sub));
+    for (const extra of getEnabledExtraRepos()) {
+        roots.push(path.join(extra.dir, ...sub));
+    }
+    return roots;
 }
 /**
  * Derive match candidates from a hostname. Order matters — earlier candidates
@@ -85,18 +110,28 @@ function parseDomainsFrontmatter(content) {
     }
     return [];
 }
+/** Stderr debug line, gated on AGENTS_DEBUG/DEBUG — same convention as `../teams/debug.ts`. */
+function debug(message) {
+    if (process.env.AGENTS_DEBUG || process.env.DEBUG)
+        console.error(message);
+}
 /**
  * Resolve a URL to its matching domain-skill, or null if none.
  *
- * Two-pass strategy:
+ * Roots are searched in `domainSkillsRoots` order (project > user > system);
+ * the first layer with a match wins outright — an earlier layer's
+ * directory-name match beats a later layer's `domains:` pin, mirroring
+ * `resolveResource`'s layer precedence. Within one layer, two passes:
  *   1. Index every SKILL.md in the root and read its `domains:` frontmatter.
  *      If any pinned domain matches a candidate, return that skill.
  *   2. Fall back to directory-name match against the candidate list.
  *
  * Errors (missing root, unreadable file, invalid URL) are swallowed and
- * yield null — domain-skill discovery must never break browser start.
+ * yield null — domain-skill discovery must never break browser start. A miss
+ * logs the roots searched at debug level (AGENTS_DEBUG/DEBUG) so a skill
+ * sitting in an unsearched layer is diagnosable rather than silent.
  */
-export function resolveDomainSkill(url) {
+export function resolveDomainSkill(url, cwd) {
     let hostname;
     try {
         hostname = new URL(url).hostname;
@@ -106,52 +141,55 @@ export function resolveDomainSkill(url) {
     }
     if (!hostname)
         return null;
-    const root = domainSkillsRoot();
-    let entries;
-    try {
-        entries = fs.readdirSync(root, { withFileTypes: true });
-    }
-    catch {
-        return null;
-    }
     const candidates = hostnameMatchCandidates(hostname);
     if (candidates.length === 0)
         return null;
     const candidateSet = new Set(candidates);
-    const indexed = [];
-    for (const e of entries) {
-        if (!e.isDirectory())
-            continue;
-        const skillPath = path.join(root, e.name, 'SKILL.md');
-        let content;
+    const roots = domainSkillsRoots(cwd);
+    for (const root of roots) {
+        let entries;
         try {
-            content = fs.readFileSync(skillPath, 'utf-8');
+            entries = fs.readdirSync(root, { withFileTypes: true });
         }
         catch {
             continue;
         }
-        indexed.push({
-            name: e.name,
-            skillPath,
-            content,
-            pinned: parseDomainsFrontmatter(content),
-        });
-    }
-    // Pass 1: explicit `domains:` overrides.
-    for (const s of indexed) {
-        for (const d of s.pinned) {
-            if (candidateSet.has(d)) {
-                return { name: s.name, path: s.skillPath, content: s.content, hostname };
+        const indexed = [];
+        for (const e of entries) {
+            if (!e.isDirectory())
+                continue;
+            const skillPath = path.join(root, e.name, 'SKILL.md');
+            let content;
+            try {
+                content = fs.readFileSync(skillPath, 'utf-8');
+            }
+            catch {
+                continue;
             }
+            indexed.push({
+                name: e.name,
+                skillPath,
+                content,
+                pinned: parseDomainsFrontmatter(content),
+            });
         }
-    }
-    // Pass 2: directory-name match, walking candidates in priority order.
-    const byName = new Map(indexed.map((s) => [s.name.toLowerCase(), s]));
-    for (const c of candidates) {
-        const hit = byName.get(c);
-        if (hit) {
-            return { name: hit.name, path: hit.skillPath, content: hit.content, hostname };
+        // Pass 1: explicit `domains:` overrides.
+        for (const s of indexed) {
+            for (const d of s.pinned) {
+                if (candidateSet.has(d)) {
+                    return { name: s.name, path: s.skillPath, content: s.content, hostname };
+                }
+            }
+        }
+        // Pass 2: directory-name match, walking candidates in priority order.
+        const byName = new Map(indexed.map((s) => [s.name.toLowerCase(), s]));
+        for (const c of candidates) {
+            const hit = byName.get(c);
+            if (hit) {
+                return { name: hit.name, path: hit.skillPath, content: hit.content, hostname };
+            }
         }
     }
+    debug(`[browser] no domain-skill for ${hostname}; searched: ${roots.join(', ')}`);
     return null;
 }

package/dist/lib/cloud/rush.d.ts

@@ -25,21 +25,6 @@ export interface AccountManifest {
     fp: string;
     versions: AccountManifestEntry[];
 }
-/**
- * Read the raw OAuth credentials for one Claude version. On Mac, prefer the
- * Keychain blob (canonical). On Linux/CI, fall back to `.claude/.credentials.json`
- * inside the version home (where the Linux Claude CLI stores its OAuth).
- *
- * Returns null when no credentials are findable — caller treats as "version
- * is installed but not signed in" and skips it from the manifest.
- *
- * NOTE: the darwin branch returns the UNWRAPPED oauth sub-object (what the Rush
- * server re-wraps). It is NOT the shape Claude Code reads back from
- * `.credentials.json`. The lease exporter (crabbox/runtimes.ts) therefore only
- * reuses the Linux `.credentials.json` branch here and reads the wrapped raw
- * Keychain payload itself on darwin.
- */
-export declare function readClaudeCredentialsBlob(home: string): Promise<string | null>;
 /**
  * Build a manifest of the user's local Claude installations to send on every
  * cloud dispatch. The manifest is the contract the server uses to detect when

package/dist/lib/cloud/rush.js

@@ -13,7 +13,6 @@ import { resolveDispatchRepos, normalizeProviderStatus, MAX_IMAGES_PER_DISPATCH
 import { parseSSE } from './stream.js';
 import { listInstalledVersions, getVersionHomePath } from '../installations/versions.js';
 import { getAccountInfo } from '../agents.js';
-import { loadClaudeOauth } from '../accounting/usage.js';
 import { selectBalancedVersion } from '../accounting/rotate.js';
 const PROXY_BASE = process.env.RUSH_PROXY_BASE ?? 'https://api.prix.dev';
 const USER_YAML = path.join(os.homedir(), '.rush', 'user.yaml');
@@ -112,40 +111,6 @@ function parsePromptCode(body) {
         return null;
     }
 }
-/**
- * Read the raw OAuth credentials for one Claude version. On Mac, prefer the
- * Keychain blob (canonical). On Linux/CI, fall back to `.claude/.credentials.json`
- * inside the version home (where the Linux Claude CLI stores its OAuth).
- *
- * Returns null when no credentials are findable — caller treats as "version
- * is installed but not signed in" and skips it from the manifest.
- *
- * NOTE: the darwin branch returns the UNWRAPPED oauth sub-object (what the Rush
- * server re-wraps). It is NOT the shape Claude Code reads back from
- * `.credentials.json`. The lease exporter (crabbox/runtimes.ts) therefore only
- * reuses the Linux `.credentials.json` branch here and reads the wrapped raw
- * Keychain payload itself on darwin.
- */
-export async function readClaudeCredentialsBlob(home) {
-    if (process.platform === 'darwin') {
-        const oauth = await loadClaudeOauth(home);
-        if (oauth && oauth.accessToken) {
-            return JSON.stringify(oauth);
-        }
-    }
-    const credsPath = path.join(home, '.claude', '.credentials.json');
-    try {
-        if (fs.existsSync(credsPath)) {
-            const raw = fs.readFileSync(credsPath, 'utf-8').trim();
-            if (raw)
-                return raw;
-        }
-    }
-    catch {
-        // fall through to null
-    }
-    return null;
-}
 /**
  * Build a manifest of the user's local Claude installations to send on every
  * cloud dispatch. The manifest is the contract the server uses to detect when

package/dist/lib/crabbox/runtimes.d.ts

@@ -85,8 +85,12 @@ export declare const CLAUDE_TOKEN_REMOTE = ".claude/.credentials.json";
  * versioned home) uses a hash-suffixed service, so we try the bare service first,
  * then enumerate installed version homes (preferring the account whose email
  * matches `preferEmail`, so the token matches the `.claude.json` config we copy).
- * Off macOS the local Claude CLI stores the token in `.credentials.json` already —
- * reuse the rush.ts Linux branch verbatim.
+ * Off macOS the local Claude CLI stores the wrapped rotating blob in
+ * `.credentials.json` already. Read that file here with a shape check
+ * (`claudeAiOauth.accessToken`). Do not reintroduce a shared helper that
+ * also serves Rush Cloud dispatch — dispatch is email-only (SING-1b) and
+ * the old `readClaudeCredentialsBlob` path was the #1767 TTY-banner leak
+ * (RUSH-2359).
  *
  * The reader/service/version helpers are injected so unit tests never touch the
  * real Keychain.

package/dist/lib/crabbox/runtimes.js

@@ -19,7 +19,6 @@ import { getAccountInfo } from '../agents.js';
 import { getKeychainToken } from '../secrets/index.js';
 import { getClaudeKeychainService } from '../accounting/usage.js';
 import { listInstalledVersions, getVersionHomePath } from '../installations/versions.js';
-import { readClaudeCredentialsBlob } from '../cloud/rush.js';
 export const LEASE_RUNTIMES = [
     { id: 'claude', label: 'Claude Code', localCandidates: ['.claude/.claude.json', '.claude.json'], remote: '.claude.json' },
     { id: 'codex', label: 'Codex CLI', localCandidates: ['.codex/auth.json'], remote: '.codex/auth.json' },
@@ -193,8 +192,12 @@ function isClaudeCredentialsBlob(s) {
  * versioned home) uses a hash-suffixed service, so we try the bare service first,
  * then enumerate installed version homes (preferring the account whose email
  * matches `preferEmail`, so the token matches the `.claude.json` config we copy).
- * Off macOS the local Claude CLI stores the token in `.credentials.json` already —
- * reuse the rush.ts Linux branch verbatim.
+ * Off macOS the local Claude CLI stores the wrapped rotating blob in
+ * `.credentials.json` already. Read that file here with a shape check
+ * (`claudeAiOauth.accessToken`). Do not reintroduce a shared helper that
+ * also serves Rush Cloud dispatch — dispatch is email-only (SING-1b) and
+ * the old `readClaudeCredentialsBlob` path was the #1767 TTY-banner leak
+ * (RUSH-2359).
  *
  * The reader/service/version helpers are injected so unit tests never touch the
  * real Keychain.
@@ -248,9 +251,22 @@ export async function resolveClaudeCredentialsBlob(opts) {
         }
         return null;
     }
-    // Off darwin: the local Claude CLI already stores the wrapped blob on disk.
+    // Off darwin: the local Claude CLI stores the wrapped rotating blob on disk.
+    // Read it directly so a file-based setup-token (Rush Cloud dispatch) is not
+    // mistaken for a native OAuth login that SING-1b must refuse to copy.
     const home = process.env.AGENTS_REAL_HOME || os.homedir();
-    return readClaudeCredentialsBlob(home);
+    const credsPath = path.join(home, '.claude', '.credentials.json');
+    try {
+        if (fs.existsSync(credsPath)) {
+            const raw = fs.readFileSync(credsPath, 'utf-8').trim();
+            if (raw && isClaudeCredentialsBlob(raw))
+                return raw;
+        }
+    }
+    catch {
+        /* no readable credentials file */
+    }
+    return null;
 }
 /**
  * The credential-provisioning snippet for a `--lease` box.