@phnx-labs/agents-cli 1.22.47 → 1.22.49

package/dist/lib/usage-refresh.d.ts

@@ -93,7 +93,7 @@ export declare function orderUsageAccounts(accounts: LocalUsageAccount[], cache:
  * canonicalization `getUsageInfoByIdentity` uses). Each carries a closure that
  * live-fetches its usage. This is the daemon's `listAccounts`; because it only
  * ever lists local, signed-in accounts, each host is the sole writer for its own
- * accounts' caches. `runUsageRefreshTick` calls this only on the fleet publisher.
+ * accounts' caches. `runUsageRefreshTick` calls this on every host.
  */
 export declare function buildLocalUsageAccounts(): Promise<LocalUsageAccount[]>;
 /** Injectable side effects, so `runUsageRefresh` is drivable without the daemon. */

package/dist/lib/usage-refresh.js

@@ -1,17 +1,17 @@
 /**
- * Daemon-owned usage refresher (publisher host).
+ * Daemon-owned usage refresher — runs on every host.
  *
  * The routing hot path (`agents run` → collectRunCandidates) reads usage
  * CACHE-ONLY (`getUsageInfoForIdentity`, RUSH-2061) and never blocks
  * on a provider fetch. Something still has to keep that cache fresh — this
- * module is that something, running inside the daemon on the configured
- * `usage.primary-host` (or locally when no primary is configured).
+ * module is that something, running inside the daemon on every host
+ * (RUSH-3193 #15: no primary/subscriber split — each host refreshes only
+ * the accounts it holds credentials for).
  *
  * Design:
  *
- *  - **Fleet sole writer.** Only the configured primary lists credential-backed
- *    accounts and calls providers. It exports derived snapshots/headroom;
- *    subscriber hosts import that token-free envelope (`usage-fleet.ts`).
+ *  - **Per-host writer.** Each host lists its own credential-backed accounts
+ *    and calls providers directly; there is no cross-host broadcast.
  *  - **Fixed 5-minute cadence** (`REFRESH_INTERVAL_MS`). Enough to keep
  *    balanced/`agents view` off multi-hour stale data without thrashing
  *    provider APIs when the user runs agents frequently. The delay helpers
@@ -222,7 +222,7 @@ export function orderUsageAccounts(accounts, cache, tick) {
  * canonicalization `getUsageInfoByIdentity` uses). Each carries a closure that
  * live-fetches its usage. This is the daemon's `listAccounts`; because it only
  * ever lists local, signed-in accounts, each host is the sole writer for its own
- * accounts' caches. `runUsageRefreshTick` calls this only on the fleet publisher.
+ * accounts' caches. `runUsageRefreshTick` calls this on every host.
  */
 export async function buildLocalUsageAccounts() {
     const accounts = [];
@@ -296,7 +296,10 @@ export async function runUsageRefresh(deps) {
         }
         try {
             const usage = await account.fetch();
-            if (usage.snapshot?.source === 'live') {
+            if (usage.snapshot) {
+                // `source` is provenance, not freshness. A forced collection that just
+                // reread a local harness event returns `last_seen`; that is still a
+                // successful collection and belongs in the shared read cache.
                 deps.writeUsageCache(account.usageKey, usage.snapshot);
                 updates[account.usageKey] = nextHeadroomEntry(entry, usage.snapshot, now);
                 result.refreshed += 1;

package/dist/lib/workflows.d.ts

@@ -9,7 +9,7 @@ import type { AgentId } from './types.js';
 /**
  * The `loop:` block as it appears in WORKFLOW.md frontmatter (YAML, snake_case).
  * Parsed defensively and translated to the camelCase LoopConfig the driver
- * consumes (src/lib/loop.ts). See docs/entrypoints-and-loops.md.
+ * consumes (src/lib/loop.ts). See docs/execution.md.
  */
 export interface LoopConfigRaw {
     /** Stop condition. Only `signal` is supported today. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.22.47",
+  "version": "1.22.49",
   "description": "One CLI for all your AI coding agents - versions, config, cloud dispatch, sessions, and teams (now with first-class Grok Build CLI support)",
   "type": "module",
   "main": "dist/index.js",
@@ -25,8 +25,6 @@
     "dist/**/*.d.ts",
     "dist/**/*.json",
     "dist/**/*.sh",
-    "dist/lib/secrets/Agents CLI.app/**",
-    "dist/lib/menubar/MenubarHelper.app/**",
     "scripts/postinstall.js",
     "scripts/install-helper.js",
     "CHANGELOG.md",
@@ -45,10 +43,10 @@
     "url": "https://github.com/phnx-labs/agents-cli/issues"
   },
   "scripts": {
-    "build": "tsc && rm -rf 'dist/lib/secrets/AgentsKeychain.app' 'dist/lib/secrets/Agents CLI.app' 'dist/lib/menubar/MenubarHelper.app' && ([ -d 'bin/Agents CLI.app' ] && cp -R 'bin/Agents CLI.app' 'dist/lib/secrets/Agents CLI.app' || true) && ([ -d 'bin/MenubarHelper.app' ] && mkdir -p 'dist/lib/menubar' && cp -R 'bin/MenubarHelper.app' 'dist/lib/menubar/MenubarHelper.app' || true) && ([ -f 'bin/agents-macos' ] && mkdir -p dist/bin && cp -f 'bin/agents-macos' 'dist/bin/agents' && chmod 755 'dist/bin/agents' || true)",
+    "build": "tsc && rm -rf 'dist/lib/secrets/AgentsKeychain.app' 'dist/lib/secrets/Agents CLI.app' 'dist/lib/menubar/MenubarHelper.app' && ([ -f 'bin/agents-macos' ] && mkdir -p dist/bin && cp -f 'bin/agents-macos' 'dist/bin/agents' && chmod 755 'dist/bin/agents' || true)",
     "build:bin": "scripts/build-bin.sh",
     "prepare": "npm run build",
-    "prepack": "cp ../../README.md README.md && scripts/verify-keychain-helper.sh && scripts/verify-menubar-helper.sh",
+    "prepack": "cp ../README.md README.md",
     "postinstall": "node scripts/postinstall.js",
     "dev": "tsx src/index.ts",
     "changelog": "bun scripts/gen-changelog.ts",
@@ -58,7 +56,7 @@
     "test": "node ./node_modules/vitest/vitest.mjs run",
     "bench": "node ./node_modules/vitest/vitest.mjs bench --run",
     "typecheck:bench": "tsc --noEmit --ignoreConfig --skipLibCheck --module esnext --moduleResolution bundler --target es2022 --strict --esModuleInterop --lib es2022 --types node src/lib/*.bench.ts src/lib/**/*.bench.ts",
-    "test:remote": "scripts/sandbox.sh 'cd apps/cli && bun install && bun run build && bun run test'",
+    "test:remote": "scripts/sandbox.sh test",
     "verify-docs": "scripts/verify-docs.sh",
     "test:watch": "node ./node_modules/vitest/vitest.mjs"
   },

package/dist/lib/menubar/MenubarHelper.app/Contents/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleExecutable</key>
-    <string>MenubarHelper</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.phnx-labs.agents-menubar</string>
-    <key>CFBundleName</key>
-    <string>AGI Menu</string>
-    <key>CFBundleDisplayName</key>
-    <string>AGI Menu</string>
-    <key>CFBundleIconFile</key>
-    <string>AppIcon</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>0.1.0</string>
-    <key>CFBundleVersion</key>
-    <string>1</string>
-    <key>LSUIElement</key>
-    <true/>
-</dict>
-</plist>

package/dist/lib/menubar/MenubarHelper.app/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/AppIcon.icns</key>
-		<data>
-		jOjZVimcFRHoP2VPzgn8uM8mjkA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/AppIcon.icns</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			GFvSLeNYJ3ASxW3OzcuiB4aID0gZUBkpozmWZkbTFNw=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

package/dist/lib/secrets/Agents CLI.app/Contents/Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleIdentifier</key>
-  <string>com.phnx-labs.agents-keychain</string>
-  <key>CFBundleName</key>
-  <string>Agents CLI</string>
-  <key>CFBundleDisplayName</key>
-  <string>Agents CLI</string>
-  <key>CFBundleIconFile</key>
-  <string>AppIcon</string>
-  <key>CFBundleExecutable</key>
-  <string>Agents CLI</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleVersion</key>
-  <string>1</string>
-  <key>CFBundleShortVersionString</key>
-  <string>1.0</string>
-  <key>LSMinimumSystemVersion</key>
-  <string>12.0</string>
-  <key>LSUIElement</key>
-  <true/>
-</dict>
-</plist>

package/dist/lib/secrets/Agents CLI.app/Contents/_CodeSignature/CodeResources

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/AppIcon.icns</key>
-		<data>
-		DFq5H08EkhgWIC3UvGMR9B58BZw=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/AppIcon.icns</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			mBSjM6jlvN7J1jQowsvqTl7CHM0pur0e6qsHMuzk5k0=
-			</data>
-		</dict>
-		<key>embedded.provisionprofile</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			2vfA/eR3dTYgNc/fXhdADUPkp5tRIepPzE3FCLfDx4w=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

package/dist/lib/usage-fleet.d.ts

@@ -1,32 +0,0 @@
-import { type HeadroomEntry } from './usage-refresh.js';
-import { type UsageWindow } from './accounting/usage.js';
-export declare const USAGE_FLEET_VERSION = 1;
-export declare const USAGE_FLEET_FILE = ".usage-fleet.json";
-export interface UsageFleetWindow {
-    key: UsageWindow['key'];
-    label: string;
-    shortLabel: string;
-    usedPercent: number;
-    resetsAt: string | null;
-    windowMinutes: number | null;
-}
-export interface UsageFleetSnapshot {
-    capturedAt: string | null;
-    plan: string | null;
-    windows: UsageFleetWindow[];
-}
-export interface UsageFleetExport {
-    version: 1;
-    publishedAt: number;
-    usage: Record<string, UsageFleetSnapshot>;
-    headroom: Record<string, HeadroomEntry>;
-}
-/** Publisher/subscriber role selection, kept pure for the daemon gate test. */
-export declare function usageRefreshRole(primaryHost: string | undefined, self: string): 'publisher' | 'subscriber';
-export declare function setUsageFleetExportPathForTest(value: string | null): string | null;
-/** Build and persist the primary's safe cache envelope. */
-export declare function exportUsageFleet(now?: number): UsageFleetExport;
-/** Merge a primary-host envelope into the subscriber's existing caches. */
-export declare function importUsageFleet(value: unknown): UsageFleetExport;
-/** Fetch the primary's published envelope over the registered device SSH path. */
-export declare function importUsageFleetFromHost(host: string): Promise<UsageFleetExport>;

package/dist/lib/usage-fleet.js

@@ -1,125 +0,0 @@
-/**
- * Token-free usage replication from the configured primary host.
- *
- * The publisher writes only the already-derived usage windows and routing
- * headroom. Credentials, OAuth material, and provider responses never enter
- * this envelope. Subscribers fetch that file over the existing SSH trust path
- * and merge it into their local caches.
- */
-import { spawn } from 'node:child_process';
-import * as path from 'node:path';
-import { buildSshInvocation, writeAskpassShim } from './devices/connect.js';
-import { loadDevices } from './devices/registry.js';
-import { atomicWriteFileSync } from './fs-atomic.js';
-import { getCacheDir } from './state.js';
-import { readHeadroomCache, writeHeadroomEntries, } from './usage-refresh.js';
-import { readClaudeUsageCache, writeClaudeUsageCache, } from './accounting/usage.js';
-export const USAGE_FLEET_VERSION = 1;
-export const USAGE_FLEET_FILE = '.usage-fleet.json';
-/** Publisher/subscriber role selection, kept pure for the daemon gate test. */
-export function usageRefreshRole(primaryHost, self) {
-    return primaryHost && primaryHost !== self ? 'subscriber' : 'publisher';
-}
-let exportPathOverride = null;
-export function setUsageFleetExportPathForTest(value) {
-    const previous = exportPathOverride;
-    exportPathOverride = value;
-    return previous;
-}
-function exportPath() {
-    return exportPathOverride ?? path.join(getCacheDir(), USAGE_FLEET_FILE);
-}
-function safeSnapshot(snapshot) {
-    return {
-        capturedAt: snapshot.capturedAt?.toISOString() ?? null,
-        plan: snapshot.plan ?? null,
-        windows: snapshot.windows.map((window) => ({
-            key: window.key,
-            label: window.label,
-            shortLabel: window.shortLabel,
-            usedPercent: window.usedPercent,
-            resetsAt: window.resetsAt?.toISOString() ?? null,
-            windowMinutes: window.windowMinutes,
-        })),
-    };
-}
-function liveSnapshot(snapshot) {
-    return {
-        source: 'last_seen',
-        sourceLabel: 'primary host cache',
-        capturedAt: snapshot.capturedAt ? new Date(snapshot.capturedAt) : null,
-        plan: snapshot.plan,
-        windows: snapshot.windows.map((window) => ({
-            ...window,
-            resetsAt: window.resetsAt ? new Date(window.resetsAt) : null,
-        })),
-    };
-}
-/** Build and persist the primary's safe cache envelope. */
-export function exportUsageFleet(now = Date.now()) {
-    const headroom = readHeadroomCache();
-    const usage = {};
-    for (const usageKey of Object.keys(headroom)) {
-        const snapshot = readClaudeUsageCache(usageKey);
-        if (snapshot)
-            usage[usageKey] = safeSnapshot(snapshot);
-    }
-    const payload = {
-        version: USAGE_FLEET_VERSION,
-        publishedAt: now,
-        usage,
-        headroom,
-    };
-    atomicWriteFileSync(exportPath(), JSON.stringify(payload, null, 2), 'utf-8');
-    return payload;
-}
-function isUsageFleetExport(value) {
-    if (!value || typeof value !== 'object')
-        return false;
-    const payload = value;
-    return payload.version === USAGE_FLEET_VERSION
-        && typeof payload.publishedAt === 'number'
-        && !!payload.usage && typeof payload.usage === 'object'
-        && !!payload.headroom && typeof payload.headroom === 'object';
-}
-/** Merge a primary-host envelope into the subscriber's existing caches. */
-export function importUsageFleet(value) {
-    if (!isUsageFleetExport(value))
-        throw new Error('usage fleet export has an unsupported shape');
-    for (const [usageKey, snapshot] of Object.entries(value.usage)) {
-        writeClaudeUsageCache(usageKey, liveSnapshot(snapshot));
-    }
-    writeHeadroomEntries(value.headroom);
-    return value;
-}
-/** Fetch the primary's published envelope over the registered device SSH path. */
-export async function importUsageFleetFromHost(host) {
-    const device = (await loadDevices())[host];
-    if (!device)
-        throw new Error(`usage primary host '${host}' is not a registered device`);
-    const remoteRead = device.shell === 'powershell'
-        ? ['Get-Content', '-Raw', '(Join-Path $HOME \'.agents/.cache/.usage-fleet.json\')']
-        : ['cat', '"$HOME/.agents/.cache/.usage-fleet.json"'];
-    const { args, env } = buildSshInvocation(device, remoteRead, writeAskpassShim(), {}, { agentOnly: true });
-    const raw = await new Promise((resolve, reject) => {
-        const child = spawn('ssh', args, {
-            env: { ...process.env, ...env },
-            stdio: ['ignore', 'pipe', 'pipe'],
-            windowsHide: true,
-        });
-        let stdout = '';
-        let stderr = '';
-        child.stdout.setEncoding('utf-8');
-        child.stderr.setEncoding('utf-8');
-        child.stdout.on('data', (chunk) => { stdout += chunk; });
-        child.stderr.on('data', (chunk) => { stderr += chunk; });
-        child.on('error', reject);
-        child.on('close', (code) => {
-            if (code === 0)
-                resolve(stdout);
-            else
-                reject(new Error(`usage primary host '${host}' export failed: ${stderr.trim() || `ssh exited ${code}`}`));
-        });
-    });
-    return importUsageFleet(JSON.parse(raw));
-}