@phnx-labs/agents-cli 1.22.28 → 1.22.29

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.22.29
+
+- **Menu bar: collapsible DEVICES roster, a Focus action on sessions, and richer routine submenus.** The dropdown now has a **DEVICES** section near the bottom — the full registered fleet as one accordion, folded by default so the long list never walls the menu, each row `<name> · <platform>` with live load% merged from the warm fleet cache (never a faked online/offline) and a Copy `agents ssh <name>` action; **NEW DEVICES** moved to sit just above it. Each live-session `›` submenu leads with **▶ Focus session** (attaches locally or SSHes to the owning box via `agents sessions focus`). Each routine submenu now leads with a last-run line — `● running now` (server-verified), `✓ completed · ran 45s · 2h ago`, or `✕ failed exit 1` — plus the next fire. The device roster rides the existing 3-minute `menubar snapshot --json` poll (a cheap local registry read, `MenubarSnapshot.devices`); everything else renders from fields the snapshot already carried, so no new timer and no per-open shell-out. Source: `apps/cli/src/lib/menubar/snapshot.ts`, `apps/cli/menubar/Sources/MenubarHelper/{StatusItemController,Models,LocalState}.swift`.
+
+- Fix `agents view` and `agents usage` labeling Codex's weekly or monthly quota as session usage when the native CLI publishes the long-duration limit in its `primary` rate-limit window. Codex windows are now labeled from their reported duration (`S`, `W`, or `M`) instead of their primary/secondary position.
+
 ## 1.22.28
 
 - **`agents run` / `agents teams` `--device`/`--host`: fail loud when a pinned harness version is not installed on the target (RUSH-2313).** A concrete pin like `codex@0.145.0` is checked against the remote `agents view --json` listing during `ensureHostReady` *before* the run is marked dispatched. Missing pins exit non-zero naming the box, the pin, what is installed there, and `agents ssh <box> -- agents add <agent>@<ver>` — so detached fleet drains no longer print `Dispatched` and then die only in the remote log. Aliases (`@latest` / …) still resolve on the remote; a bare agent name still only warns. Source: `apps/cli/src/lib/hosts/ready.ts`, `dispatch.ts`, `teams/agents.ts`.

package/dist/lib/menubar/snapshot.d.ts

@@ -1,10 +1,26 @@
 import type { WatchdogTickResult } from '../watchdog/runner.js';
+/**
+ * One registered fleet device, for the menu-bar's collapsible DEVICES section.
+ * Sourced from the local registry read (`loadDevices`) — no network probe — so
+ * it carries only what the registry knows for sure (name, platform, whether it
+ * is the interactive host, whether it is this machine). Live load% is merged in
+ * on the Swift side from the daemon-warmed `.fleet-stats.json`; online/offline
+ * is deliberately NOT claimed here (the registry's cached tailscale flag is
+ * documented as stale in both directions — registry.ts isLikelyOnline).
+ */
+export interface MenubarDevice {
+    name: string;
+    platform: string;
+    interactive: boolean;
+    isLocal: boolean;
+}
 export interface MenubarSnapshot {
     version: 1;
     capturedAt: string;
     routines: Record<string, unknown>[];
     recentSessions: Record<string, unknown>[];
     activeSessions: Record<string, unknown>[];
+    devices: MenubarDevice[];
     watchdog: {
         enabled: boolean;
         lastTick: Pick<WatchdogTickResult, 'didNudge' | 'counts'> | null;

package/dist/lib/menubar/snapshot.js

@@ -3,10 +3,29 @@ import * as path from 'path';
 import { buildRoutineListJson } from '../../commands/routines.js';
 import { backfillActiveRowsFromIndex, isRunningLiveSession, serializeActiveSessionsForJson, serializeSessionsJson } from '../../commands/sessions.js';
 import { getConfigValue } from '../device-config.js';
+import { loadDevices } from '../devices/registry.js';
 import { machineId } from '../machine-id.js';
 import { querySessions } from '../session/db.js';
 import { readActiveSessionsCache } from '../session/session-cache.js';
 import { getRuntimeStateDir } from '../state.js';
+/**
+ * The full registered-device roster for the menu bar, from the local registry
+ * file only (no ssh, no stats probe) — as cheap as `buildRoutineListJson()`, so
+ * it rides the same 3-minute snapshot poll instead of a second timer.
+ */
+async function buildMenubarDevices() {
+    const reg = await loadDevices();
+    const interactiveHost = getConfigValue('interactive.host').value;
+    const self = machineId();
+    return Object.keys(reg)
+        .sort()
+        .map((name) => ({
+        name,
+        platform: reg[name].platform,
+        interactive: name === interactiveHost,
+        isLocal: name === self,
+    }));
+}
 export function readLastWatchdogTick(stateDir = path.join(getRuntimeStateDir(), 'watchdog')) {
     try {
         return JSON.parse(fs.readFileSync(path.join(stateDir, 'last-tick.json'), 'utf-8'));
@@ -17,9 +36,10 @@ export function readLastWatchdogTick(stateDir = path.join(getRuntimeStateDir(),
 }
 /** One-process read model for AGI Menu's repeating three-minute refresh. */
 export async function computeMenubarSnapshot() {
-    const [routines, recent] = await Promise.all([
+    const [routines, recent, devices] = await Promise.all([
         Promise.resolve(buildRoutineListJson()),
         Promise.resolve(querySessions({ limit: 40, skipExistenceCheck: true })),
+        buildMenubarDevices(),
     ]);
     const active = readActiveSessionsCache('local');
     const rawSessions = active?.sessions ?? [];
@@ -42,6 +62,7 @@ export async function computeMenubarSnapshot() {
         routines,
         recentSessions: JSON.parse(serializeSessionsJson(recent)),
         activeSessions: serializeActiveSessionsForJson(activeSessions),
+        devices,
         watchdog: {
             enabled: getConfigValue('watchdog.enabled').value === true,
             lastTick: (() => {

package/dist/lib/usage.js

@@ -1186,29 +1186,37 @@ async function readLatestCodexRateLimits(filePath) {
 }
 /** Normalize Codex rate-limit windows into the common UsageWindow shape. */
 function normalizeCodexWindows(rateLimits) {
-    const windows = [];
-    const primary = normalizeCodexWindow(rateLimits.primary, 'session', 'Current session', 'S');
-    if (primary)
-        windows.push(primary);
-    const secondary = normalizeCodexWindow(rateLimits.secondary, 'week', 'Current week', 'W');
-    if (secondary)
-        windows.push(secondary);
-    return windows;
+    return [rateLimits.primary, rateLimits.secondary]
+        .map(normalizeCodexWindow)
+        .filter((window) => window !== null)
+        .sort((a, b) => (a.windowMinutes ?? 0) - (b.windowMinutes ?? 0));
 }
 /** Normalize a single Codex rate-limit window. */
-function normalizeCodexWindow(window, key, label, shortLabel) {
+function normalizeCodexWindow(window) {
     const usedPercent = normalizePercent(window?.used_percent);
     if (usedPercent === null)
         return null;
+    const windowMinutes = normalizeWindowMinutes(window?.window_minutes);
+    const { key, label, shortLabel } = classifyCodexWindow(windowMinutes);
     return {
         key,
         label,
         shortLabel,
         usedPercent,
         resetsAt: parseDateValue(window?.resets_at),
-        windowMinutes: normalizeWindowMinutes(window?.window_minutes),
+        windowMinutes,
     };
 }
+/** Codex assigns quota windows to primary/secondary by plan, so duration carries their meaning. */
+function classifyCodexWindow(windowMinutes) {
+    if (windowMinutes !== null && windowMinutes >= 28 * 24 * 60) {
+        return { key: 'month', label: 'Current month', shortLabel: 'M' };
+    }
+    if (windowMinutes !== null && windowMinutes >= 7 * 24 * 60) {
+        return { key: 'week', label: 'Current week', shortLabel: 'W' };
+    }
+    return { key: 'session', label: 'Current session', shortLabel: 'S' };
+}
 /** Normalize Claude API usage windows into the common UsageWindow shape. */
 function normalizeClaudeWindows(data) {
     const windows = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.22.28",
+  "version": "1.22.29",
   "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",