@1presence/bridge 0.58.0 → 0.60.0

package/dist/claude.js

@@ -41,6 +41,16 @@ import { getBridgeModel } from './config.js';
 // Track whether we've already announced the model this process — printing it
 // per-spawn is noisy; once on startup is what the user actually wants to see.
 let modelAnnounced = false;
+// Claude Code engine version driving the turns, captured from the SDK init
+// event (`claude_code_version`). Constant per process, so cached module-level
+// and read by the after-turn status line — mirrors the `v2.x.x` segment of the
+// local statusline. Null until the first turn's init event arrives.
+let cliVersion = null;
+export function getCliVersion() { return cliVersion; }
+const rateLimitWindows = new Map();
+export function getRateLimitWindow(type) {
+    return rateLimitWindows.get(type);
+}
 // Verbose flag — when set via --verbose, log full tool inputs and outputs
 // PLUS the entire system prompt. Great for prompt debugging, noisy for
 // message debugging (the prompt dump buries the conversation).
@@ -384,10 +394,13 @@ export function spawnClaude(params) {
             const keySource = event['apiKeySource'];
             const model = event['model'];
             const sid = event['session_id'];
+            const ccv = event['claude_code_version'];
             if (sid)
                 currentSessionId = sid;
             if (model)
                 extractedModel = model;
+            if (ccv)
+                cliVersion = ccv;
             if (!modelAnnounced) {
                 const source = keySource === 'none' || !keySource ? 'claude.ai subscription' : keySource;
                 const pin = getBridgeModel() ? '  (selected at startup)' : '';
@@ -647,7 +660,7 @@ export function spawnClaude(params) {
                         const subtype = m.subtype;
                         if (subtype === 'init') {
                             const init = m;
-                            const event = { type: 'system', subtype: 'init', model: init.model, apiKeySource: init.apiKeySource };
+                            const event = { type: 'system', subtype: 'init', model: init.model, apiKeySource: init.apiKeySource, claude_code_version: init.claude_code_version };
                             if (handleEvent(event))
                                 onEvent(event);
                         }
@@ -739,6 +752,16 @@ export function spawnClaude(params) {
                         // a notice when the user is actually warned or throttled.
                         const info = m.rate_limit_info;
                         const status = info?.status;
+                        // Retain the latest reading for this window so the after-turn status
+                        // line can render the full 5h/7d picture even though each event only
+                        // carries one window. utilization is a 0–100 used-percentage.
+                        if (info?.rateLimitType && typeof info.utilization === 'number') {
+                            rateLimitWindows.set(info.rateLimitType, {
+                                utilization: info.utilization,
+                                resetsAt: info.resetsAt,
+                                status: status ?? 'allowed',
+                            });
+                        }
                         if (status === 'allowed_warning' || status === 'rejected') {
                             // Admin-only ephemeral notice — jargon is fine in Local Mode.
                             onNotice?.(formatRateLimitNotice(status, info?.resetsAt));

package/dist/config.js

@@ -79,8 +79,8 @@ function detectClaudeDefaultModel() {
 // NB on `[1m]` (1M-context Opus): the bridge always runs on the user's claude.ai
 // subscription (it strips ANTHROPIC_API_KEY — see claude.ts), and it is UNCONFIRMED
 // whether the 1M context window (a tier-gated API beta) is servable on subscription
-// auth. It is offered but is NOT the default — auto-selecting a maybe-unsupported
-// variant is the risk we avoid; deliberately picking it to test is fine. (An earlier
+// auth. It is the default (see DEFAULT_OPTION_NUM below); if it proves unservable on
+// a given plan, the user can arrow to option 2 for the plain variant. (An earlier
 // every-turn `400 / "unknown"` was first blamed on this but was actually a tool-schema
 // bug that hit every model — see vault/Bugs.md.) `num` must stay contiguous 1..N in
 // array order — the jump-key handler maps a typed digit `n` to `idx = n - 1`.
@@ -93,9 +93,11 @@ const MODEL_OPTIONS = [
     { num: 6, model: 'claude-haiku-4-5', label: 'claude-haiku-4-5' },
 ];
 const PROMPT_TIMEOUT_MS = 10_000;
-// Default to plain claude-opus-4-8 (definitely servable on a subscription), not
-// the experimental `[1m]` variant.
-const DEFAULT_OPTION_NUM = 2;
+// Default to the 1M-context Opus (`claude-opus-4-8[1m]`). The `[1m]` window is a
+// tier-gated API beta whose availability on subscription auth is unconfirmed (see
+// the NB above), but it's our preferred default — anyone can arrow to option 2 for
+// the plain variant if `[1m]` proves unservable on their plan.
+const DEFAULT_OPTION_NUM = 3;
 function promptForModel(defaultModel) {
     return new Promise((resolve) => {
         const initialIdx = Math.max(0, MODEL_OPTIONS.findIndex((o) => o.num === DEFAULT_OPTION_NUM));

package/dist/index.js

@@ -7,7 +7,7 @@ import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { getValidAuth, ensureFreshToken, forceRefreshToken, isTokenValid, AuthCancelledError } from './auth.js';
-import { spawnClaude, killAll, cancelConversation, setVerbose, setDebug, paint, SECTION_COLORS } from './claude.js';
+import { spawnClaude, killAll, cancelConversation, setVerbose, setDebug, paint, SECTION_COLORS, getCliVersion, getRateLimitWindow } from './claude.js';
 import { ensureModelChoice } from './config.js';
 import { checkAndUpdate } from './update.js';
 import { makeBridgeAccumulator, postSaveTurn } from './accumulator.js';
@@ -101,6 +101,51 @@ function contextWindowFor(model) {
     }
     return DEFAULT_CONTEXT_WINDOW;
 }
+// ─── Rate-limit window rendering ──────────────────────────────────────────────
+// Mirrors the local Claude Code statusline's ⏱️ line: a 10-cell bar + used % +
+// reset time per subscription window. Data comes from the SDK's rate_limit_event
+// (captured across turns in claude.ts), so no auth/header probe is needed.
+// 7-day usage may arrive as the generic `seven_day` window or a model-specific
+// variant; surface whichever the SDK has reported, preferring the generic one.
+function sevenDayWindow() {
+    return getRateLimitWindow('seven_day')
+        ?? getRateLimitWindow('seven_day_opus')
+        ?? getRateLimitWindow('seven_day_sonnet');
+}
+function makeBar(pct) {
+    const width = 10;
+    const filled = Math.max(0, Math.min(width, Math.floor((pct * width) / 100)));
+    return '█'.repeat(filled) + '░'.repeat(width - filled);
+}
+// Green < 70%, yellow 70–89%, red ≥ 90% — same thresholds as the statusline.
+function rlColor(pct) {
+    return pct >= 90 ? '31' : pct >= 70 ? '33' : '32';
+}
+// "12:20a.m." within a day, "Mon 11:00p.m." when the reset is > 24h out.
+function formatReset(resetsAt) {
+    if (!resetsAt)
+        return '';
+    const ms = resetsAt < 1e12 ? resetsAt * 1000 : resetsAt;
+    const d = new Date(ms);
+    const h24 = d.getHours();
+    const h12 = h24 % 12 === 0 ? 12 : h24 % 12;
+    const mm = String(d.getMinutes()).padStart(2, '0');
+    const time = `${h12}:${mm}${h24 < 12 ? 'a.m.' : 'p.m.'}`;
+    if (ms - Date.now() > 86_400_000) {
+        const wd = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][d.getDay()];
+        return `${wd} ${time}`;
+    }
+    return time;
+}
+// One coloured "5h ██░░░░░░░░ 20% resets 12:20a.m." segment; null if unknown.
+function formatWindow(label, w) {
+    if (!w)
+        return null;
+    const pct = Math.round(w.utilization);
+    const reset = formatReset(w.resetsAt);
+    const seg = `${label} ${makeBar(pct)} ${pct}%${reset ? ` resets ${reset}` : ''}`;
+    return paint(rlColor(pct), seg);
+}
 // ─── System prompt fetch ──────────────────────────────────────────────────────
 // Pulls the fully-built system prompt from agent-api (via gateway proxy).
 // This MUST match the hosted runtime exactly — STATIC_SYSTEM_PROMPT + dynamic
@@ -436,14 +481,26 @@ async function handleMessage(conversationId, text, sessionId, history, auth, vau
             parts.push(costStr);
             const suffix = `  ${parts.join('  ')}`;
             console.log(`[${new Date().toLocaleTimeString()}] ✓ done${suffix}`);
-            // Status-bar line, mirroring local Claude Code: model · context fill ·
-            // session cost. Dimmed and indented so it groups under the done line
-            // without competing with it. The cost segment falls back to "plan usage"
-            // whenever the running total is 0 (the subscription case).
+            // Status-bar line, mirroring the local Claude Code statusline:
+            //   🤖 model v<version> | 🧠 context% | 💰 cost
+            //   ⏱️ 5h <bar> n% resets … | 7d <bar> n% resets …
+            // Dimmed and indented so it groups under the done line without competing
+            // with it. The cost segment falls back to "plan usage" whenever the running
+            // total is 0 (the subscription case). The ⏱️ window line is only printed
+            // once the SDK has reported at least one window this process.
             sessionCostUsd += costUsd;
             const ctxPct = Math.max(0, Math.min(100, Math.round((contextTokens / contextWindowFor(model)) * 100)));
             const costSeg = sessionCostUsd > 0 ? `$${sessionCostUsd.toFixed(2)} session` : 'plan usage';
-            console.log(paint('90', `             🤖 ${friendlyModelName(model)} · 🧠 ${ctxPct}% · 💰 ${costSeg}`));
+            const ver = getCliVersion();
+            const verSeg = ver ? ` v${ver}` : '';
+            console.log(paint('90', `             🤖 ${friendlyModelName(model)}${verSeg} | 🧠 ${ctxPct}% | 💰 ${costSeg}`));
+            const windows = [
+                formatWindow('5h', getRateLimitWindow('five_hour')),
+                formatWindow('7d', sevenDayWindow()),
+            ].filter((s) => s !== null);
+            if (windows.length > 0) {
+                console.log(`             ${paint('90', '⏱️')} ${windows.join(paint('90', ' | '))}`);
+            }
             const mapped = toBridgeUsage(usage);
             if (currentWs?.readyState === WebSocket.OPEN) {
                 currentWs.send(JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1presence/bridge",
-  "version": "0.58.0",
+  "version": "0.60.0",
   "description": "Run 1Presence on your Mac and use your Claude.ai Pro subscription from any device",
   "type": "module",
   "bin": {