clawmoney 0.15.69 → 0.15.70

package/dist/commands/relay-setup.js

@@ -6,7 +6,7 @@ import * as readline from "node:readline";
 import { intro, outro, multiselect, select, spinner, isCancel, cancel, log, } from "@clack/prompts";
 import chalk from "chalk";
 import { apiPost } from "../utils/api.js";
-import { loadConfig, requireConfig } from "../utils/config.js";
+import { loadConfig, requireConfig, saveConfig } from "../utils/config.js";
 import { setupCommand } from "./setup.js";
 import { API_PRICES, PLATFORM_FEE } from "../relay/pricing.js";
 import { hasClaudeFingerprint, bootstrapClaudeFingerprint, } from "../relay/upstream/claude-bootstrap.js";
@@ -31,9 +31,10 @@ import { hasCodexFingerprint, bootstrapCodexFingerprint, } from "../relay/upstre
 // falls through to modelsForCli(cli) which returns EVERY priced
 // model in that family.
 const RECOMMENDED_MODELS = {
-    // Claude Code /model menu: Default(Sonnet 4.6) / Sonnet(1M) / Opus(1M) / Haiku
-    // → 3 unique model IDs (Sonnet 1M = same model + context-1m beta)
-    claude: ["claude-sonnet-4-6", "claude-opus-4-6", "claude-haiku-4-5"],
+    // Claude Code /model menu (post 2026-04-16 Opus 4.7 release):
+    //   Default(Opus 4.7 1M) / Sonnet 4.6 / Haiku 4.5
+    // Opus 4.7 released 2026-04-16 and became the default model.
+    claude: ["claude-opus-4-7", "claude-sonnet-4-6", "claude-opus-4-6", "claude-haiku-4-5"],
     // Codex CLI /model menu for ChatGPT sign-in (post 2026-04-14 cleanup):
     //   gpt-5.4             — latest frontier agentic coding (current default)
     //   gpt-5.4-mini        — smaller frontier agentic coding
@@ -358,37 +359,50 @@ export async function relaySetupCommand() {
     // pricing × number of providers; we can't predict that, so we don't
     // pretend to.
     const concurrency = 5;
-    const dailyLimitChoice = await select({
-        message: "Daily quota share per model? (applies independently to each model you register)",
+    const quotaShareChoice = await select({
+        message: "How much of your 5h session window can relay use?",
         options: [
             {
-                value: 15,
-                label: "~25%  ·  Light",
+                value: 25,
+                label: "25%  ·  Light",
                 hint: "share a quarter, leaves 75% for your personal use",
             },
             {
-                value: 30,
-                label: "~50%  ·  Balanced  (recommended)",
-                hint: "splits each model's quota evenly between you and the relay",
+                value: 50,
+                label: "50%  ·  Balanced  (recommended)",
+                hint: "splits your quota evenly between you and the relay",
             },
             {
-                value: 45,
-                label: "~75%  ·  Heavy",
+                value: 75,
+                label: "75%  ·  Heavy",
                 hint: "most of your subscription goes to relay, 25% reserved for personal use",
             },
             {
-                value: 60,
-                label: "~100% ·  Full",
+                value: 100,
+                label: "100% ·  Full",
                 hint: "dedicates your subscription to relay — best for accounts you don't use personally",
             },
         ],
-        initialValue: 30,
+        initialValue: 50,
     });
-    if (isCancel(dailyLimitChoice)) {
+    if (isCancel(quotaShareChoice)) {
         cancel("Setup cancelled");
         process.exit(0);
     }
-    const dailyLimit = dailyLimitChoice;
+    const maxRelayUtilization = quotaShareChoice;
+    // daily_limit_usd is kept as a high fallback — the real cap is now
+    // maxRelayUtilization enforced by the daemon's rate-guard. Set it
+    // generously so it doesn't interfere.
+    const dailyLimit = 60;
+    // Persist max_relay_utilization into config.yaml so the daemon's
+    // rate-guard reads it on startup.
+    saveConfig({
+        relay: {
+            rate_guard: {
+                max_relay_utilization: maxRelayUtilization,
+            },
+        },
+    });
     // ── Step 5: register everything under one spinner ──
     //
     // We deliberately skip the old per-model Summary block: pricing is on
@@ -404,7 +418,7 @@ export async function relaySetupCommand() {
     // subscriptions + quota share above; Ctrl-C still aborts, and the
     // backend is idempotent so mid-way aborts are safe to re-run.
     const limitLabel = {
-        15: "~25%", 30: "~50%", 45: "~75%", 60: "~100%",
+        25: "25%", 50: "50%", 75: "75%", 100: "100%",
     };
     const earnPct = Math.round((1 - PLATFORM_FEE) * 100);
     // Single batch POST — one round-trip, one DB session, no
@@ -454,7 +468,7 @@ export async function relaySetupCommand() {
     if (failed === 0) {
         const breakdown = cliSummary.length > 0 ? `: ${cliSummary.join(chalk.dim(" · "))}` : "";
         regSpin.stop(`${chalk.green(`✓ Registered${breakdown}`)}  ` +
-            chalk.dim(`(${limitLabel[dailyLimit] ?? `$${dailyLimit}`} quota share · you earn ~${earnPct}%)`));
+            chalk.dim(`(${limitLabel[maxRelayUtilization] ?? `${maxRelayUtilization}%`} of 5h window · you earn ~${earnPct}%)`));
     }
     else {
         regSpin.stop(`${chalk.yellow(`${succeeded} registered, ${failed} failed`)}`);

package/dist/relay/pricing.js

@@ -19,6 +19,7 @@ export const API_PRICES = {
     // ── Anthropic (Claude) ──
     // Verified against LiteLLM pricing DB. cache_read = 0.1x input,
     // cache_write = 1.25x input (Anthropic ephemeral cache).
+    "claude-opus-4-7": { input: 5, output: 25 }, // released 2026-04-16
     "claude-opus-4-6": { input: 5, output: 25 },
     "claude-opus-4-5": { input: 5, output: 25 },
     "claude-sonnet-4-6": { input: 3, output: 15 },

package/dist/relay/provider.js

@@ -7,7 +7,7 @@ import { callClaudeApi, callClaudeApiPassthrough, preflightClaudeApi, getRateGua
 import { callCodexApi, callCodexApiPassthrough, preflightCodexApi, getRateGuardSnapshot as getCodexRateGuardSnapshot, } from "./upstream/codex-api.js";
 import { callGeminiApi, preflightGeminiApi, getGeminiRateGuardSnapshot, } from "./upstream/gemini-api.js";
 import { callAntigravityApi, preflightAntigravityApi, getAntigravityRateGuardSnapshot, } from "./upstream/antigravity-api.js";
-import { apiGet } from "../utils/api.js";
+import { apiGet, apiPost } from "../utils/api.js";
 /**
  * Pick the rate-guard snapshot matching this request's cli_type. Fixes a
  * pre-existing bug where gemini/codex responses were piggy-backing Claude's
@@ -551,6 +551,85 @@ export function runRelayProvider(cliOverride) {
         });
     }
     const activeTasks = new Set();
+    async function syncModelCatalog() {
+        try {
+            // Step 1: existing providers (gives us cli_types + default settings).
+            const myResp = await apiGet("/api/v1/relay/providers/me", config.api_key);
+            if (!myResp.ok || !Array.isArray(myResp.data)) {
+                logger.warn(`[catalog-sync] skipped: /providers/me returned ${myResp.status}`);
+                return;
+            }
+            const existing = myResp.data;
+            if (existing.length === 0) {
+                logger.info("[catalog-sync] no existing providers yet — skipping auto-sync");
+                return;
+            }
+            // Settings template per cli_type (from any existing provider in that family).
+            const settingsByCli = new Map();
+            const knownModels = new Set();
+            for (const p of existing) {
+                knownModels.add(`${p.cli_type}/${p.model}`);
+                if (!settingsByCli.has(p.cli_type)) {
+                    settingsByCli.set(p.cli_type, {
+                        concurrency: p.concurrency,
+                        daily_limit_usd: p.daily_limit_usd,
+                    });
+                }
+            }
+            // Step 2: fetch catalog.
+            const catalogResp = await apiGet("/api/v1/relay/model-catalog");
+            if (!catalogResp.ok || !catalogResp.data?.catalog) {
+                logger.warn(`[catalog-sync] skipped: /model-catalog returned ${catalogResp.status}`);
+                return;
+            }
+            const catalog = catalogResp.data.catalog;
+            // Step 3: build batch for cli_types the agent has at least one provider for.
+            const batch = [];
+            const newModels = [];
+            for (const [cliType, settings] of settingsByCli) {
+                const recommended = catalog[cliType] ?? [];
+                for (const entry of recommended) {
+                    if (!knownModels.has(`${cliType}/${entry.model}`)) {
+                        newModels.push(`${cliType}/${entry.model}`);
+                    }
+                    batch.push({
+                        cli_type: cliType,
+                        model: entry.model,
+                        mode: "chat",
+                        concurrency: settings.concurrency,
+                        daily_limit_usd: settings.daily_limit_usd,
+                        price_input_per_m: entry.input,
+                        price_output_per_m: entry.output,
+                    });
+                }
+            }
+            if (batch.length === 0) {
+                return;
+            }
+            // Step 4: upsert via batch register (already idempotent).
+            const regResp = await apiPost("/api/v1/relay/providers/batch", { providers: batch }, config.api_key);
+            if (!regResp.ok) {
+                logger.warn(`[catalog-sync] batch register failed: ${regResp.status}`);
+                return;
+            }
+            const created = regResp.data.created?.length ?? 0;
+            const failed = regResp.data.failed?.length ?? 0;
+            if (newModels.length > 0 || created > 0) {
+                logger.info(`[catalog-sync] OK: ${batch.length} entries, ${created} newly created, ${failed} failed` +
+                    (newModels.length > 0 ? ` (new: ${newModels.join(", ")})` : ""));
+            }
+            else {
+                logger.info(`[catalog-sync] OK: ${batch.length} entries, no changes`);
+            }
+        }
+        catch (err) {
+            logger.warn(`[catalog-sync] error: ${err.message}`);
+        }
+    }
+    // Initial sync, then every 30 min.
+    syncModelCatalog().catch((err) => logger.warn(`[catalog-sync] initial sync failed: ${err.message}`));
+    const catalogTimer = setInterval(() => syncModelCatalog().catch((err) => logger.warn(`[catalog-sync] periodic sync failed: ${err.message}`)), 30 * 60 * 1000);
+    catalogTimer.unref();
     // Create WS client
     const wsClient = new RelayWsClient(config, (event) => {
         handleEvent(event);

package/dist/relay/types.d.ts

@@ -86,6 +86,7 @@ export interface RelayRateGuardConfig {
     min_request_gap_ms?: number;
     jitter_ms?: number;
     daily_budget_usd?: number;
+    max_relay_utilization?: number;
 }
 export interface RelayProviderSettings {
     cli_type: string;

package/dist/relay/upstream/antigravity-api.js

@@ -507,6 +507,7 @@ export function configureAntigravityRateGuard(config) {
             minRequestGapMs: config.min_request_gap_ms,
             jitterMs: config.jitter_ms,
             dailyBudgetUsd: config.daily_budget_usd,
+            maxRelayUtilization: config.max_relay_utilization,
         }
         : {};
     const cleaned = Object.fromEntries(Object.entries(mapped).filter(([, v]) => v !== undefined));

package/dist/relay/upstream/claude-api.js

@@ -726,6 +726,7 @@ export function configureRateGuard(config) {
             minRequestGapMs: config.min_request_gap_ms,
             jitterMs: config.jitter_ms,
             dailyBudgetUsd: config.daily_budget_usd,
+            maxRelayUtilization: config.max_relay_utilization,
         }
         : {};
     // Filter out undefined so defaults apply.
@@ -896,7 +897,19 @@ async function doCallClaudeApi(opts) {
         // account harder and extend the ban. Parse the reset headers, mark
         // cooldown, and fail this request. Subsequent requests will immediately
         // short-circuit via checkCooldown().
+        //
+        // Exception: "Extra usage is required" is NOT a rate limit — it's a
+        // billing/feature gate (e.g. Sonnet 1M context requires Extra usage
+        // credits on Claude Max). Triggering a global 5-minute cooldown for
+        // this would block ALL subsequent requests (including Opus, Haiku,
+        // non-1M Sonnet) even though they don't need Extra usage. Instead,
+        // fail only this request and let others through.
         if (resp.status === 429) {
+            const isExtraUsage = errText.toLowerCase().includes("extra usage");
+            if (isExtraUsage) {
+                logger.warn("[claude-api] 429 Extra usage required — skipping cooldown (not a rate limit)");
+                throw new Error(`Anthropic 429 extra-usage-required: ${errText.slice(0, 300)}`);
+            }
             const cooldown = extractCooldownUntilFromHeaders(resp.headers);
             if (cooldown && rateGuard) {
                 rateGuard.triggerCooldown(cooldown.untilMs, cooldown.reason);
@@ -1307,6 +1320,11 @@ async function doCallClaudeApiPassthrough(opts) {
         }
         const errText = await resp.text();
         if (resp.status === 429) {
+            const isExtraUsage = errText.toLowerCase().includes("extra usage");
+            if (isExtraUsage) {
+                logger.warn("[claude-api] 429 Extra usage required (passthrough) — skipping cooldown");
+                throw new Error(`Anthropic 429 extra-usage-required: ${errText.slice(0, 300)}`);
+            }
             const cooldown = extractCooldownUntilFromHeaders(resp.headers);
             if (cooldown && rateGuard) {
                 rateGuard.triggerCooldown(cooldown.untilMs, cooldown.reason);

package/dist/relay/upstream/codex-api.js

@@ -371,6 +371,7 @@ export function configureRateGuard(config) {
             minRequestGapMs: config.min_request_gap_ms,
             jitterMs: config.jitter_ms,
             dailyBudgetUsd: config.daily_budget_usd,
+            maxRelayUtilization: config.max_relay_utilization,
         }
         : {};
     const cleaned = Object.fromEntries(Object.entries(mapped).filter(([, v]) => v !== undefined));

package/dist/relay/upstream/gemini-api.js

@@ -243,6 +243,7 @@ export function configureGeminiRateGuard(config) {
             minRequestGapMs: config.min_request_gap_ms,
             jitterMs: config.jitter_ms,
             dailyBudgetUsd: config.daily_budget_usd,
+            maxRelayUtilization: config.max_relay_utilization,
         }
         : {};
     const cleaned = Object.fromEntries(Object.entries(mapped).filter(([, v]) => v !== undefined));

package/dist/relay/upstream/rate-guard.d.ts

@@ -35,11 +35,23 @@ export interface RateGuardConfig {
     jitterMs: number;
     /** Hard daily cost cap in USD. Default 15. */
     dailyBudgetUsd: number;
+    /**
+     * Max relay utilization of the 5h session window (0-100).
+     * When relay's own accumulated utilization delta reaches this %,
+     * further relay requests are refused until the window resets.
+     * Provider's direct usage does NOT count against this budget —
+     * only the delta observed across relay requests is tracked.
+     * Default 50 (relay can use up to 50% of the 5h window).
+     */
+    maxRelayUtilization: number;
 }
 export declare const DEFAULT_RATE_GUARD_CONFIG: RateGuardConfig;
 export declare class RateGuardBudgetExceededError extends Error {
     constructor(spent: number, limit: number);
 }
+export declare class RateGuardRelayUtilizationExceededError extends Error {
+    constructor(used: number, limit: number, resetMins: number);
+}
 /**
  * Thrown when the rate-guard is in a hard cooldown after observing a real
  * upstream 429. The `untilMs` field is an absolute UNIX ms timestamp — after
@@ -71,15 +83,19 @@ export declare class RateGuard {
     private cooldownUntilMs;
     private cooldownReason;
     private sessionWindow;
+    private relayWindowUsed;
+    private relayWindowEndMs;
+    private lastSeenUtilization;
     constructor(config?: Partial<RateGuardConfig>);
     /** Record an upstream-imposed cooldown. Called after parsing a real 429. */
     triggerCooldown(untilMs: number, reason: string): void;
-    /** Update the 5h session window tracker from parsed upstream headers. */
+    /** Update the 5h session window tracker from parsed upstream headers.
+     *  Also accumulates relay's own utilization delta for quota enforcement. */
     setSessionWindow(window: SessionWindow): void;
     getSessionWindow(): SessionWindow | null;
     private currentMaxConcurrency;
     private rotateDailyCounterIfNeeded;
-    /** Check whether a new request would exceed the daily budget. */
+    /** Check whether a new request would exceed the daily budget or relay utilization cap. */
     checkBudget(): void;
     /** Check upstream-imposed cooldown. Throws RateGuardCooldownError if still cooling. */
     checkCooldown(): void;
@@ -93,6 +109,8 @@ export declare class RateGuard {
         cooldownUntilMs: number;
         cooldownReason: string;
         sessionWindow: SessionWindow | null;
+        relayWindowUsed: number;
+        maxRelayUtilization: number;
     };
     /**
      * Wrap an upstream call. Blocks until:

package/dist/relay/upstream/rate-guard.js

@@ -30,6 +30,7 @@ export const DEFAULT_RATE_GUARD_CONFIG = {
     minRequestGapMs: 500,
     jitterMs: 1500,
     dailyBudgetUsd: 15,
+    maxRelayUtilization: 50,
 };
 export class RateGuardBudgetExceededError extends Error {
     constructor(spent, limit) {
@@ -37,6 +38,12 @@ export class RateGuardBudgetExceededError extends Error {
         this.name = "RateGuardBudgetExceededError";
     }
 }
+export class RateGuardRelayUtilizationExceededError extends Error {
+    constructor(used, limit, resetMins) {
+        super(`Relay utilization quota reached: ${used.toFixed(1)}% / ${limit}% of 5h window used by relay (resets in ${resetMins}min)`);
+        this.name = "RateGuardRelayUtilizationExceededError";
+    }
+}
 /**
  * Thrown when the rate-guard is in a hard cooldown after observing a real
  * upstream 429. The `untilMs` field is an absolute UNIX ms timestamp — after
@@ -66,6 +73,12 @@ export class RateGuard {
     cooldownReason = "";
     // Rolling 5h session window surfaced by Anthropic headers.
     sessionWindow = null;
+    // Relay utilization tracking — accumulated delta of session_window
+    // utilization across relay requests within the current 5h window.
+    // Resets when the window resets (endMs changes).
+    relayWindowUsed = 0; // accumulated relay % (0-100)
+    relayWindowEndMs = 0; // which window we're tracking
+    lastSeenUtilization = null; // for delta computation
     constructor(config = {}) {
         this.cfg = { ...DEFAULT_RATE_GUARD_CONFIG, ...config };
     }
@@ -81,11 +94,34 @@ export class RateGuard {
             logger.warn(`[rate-guard] cooldown engaged (${reason}): ${seconds}s until reset`);
         }
     }
-    /** Update the 5h session window tracker from parsed upstream headers. */
+    /** Update the 5h session window tracker from parsed upstream headers.
+     *  Also accumulates relay's own utilization delta for quota enforcement. */
     setSessionWindow(window) {
+        // Detect window reset — if endMs changed, we're in a new window.
+        if (window.endMs !== this.relayWindowEndMs) {
+            if (this.relayWindowEndMs > 0 && this.relayWindowUsed > 0) {
+                logger.info(`[rate-guard] relay window reset (previous relay_used=${this.relayWindowUsed.toFixed(1)}%)`);
+            }
+            this.relayWindowUsed = 0;
+            this.relayWindowEndMs = window.endMs;
+            this.lastSeenUtilization = null;
+        }
+        // Compute relay delta: how much utilization increased since last observation.
+        // This is called AFTER each relay request, so the delta is (approximately)
+        // the utilization cost of that one relay request. If the provider was also
+        // using the account directly during this request, the delta includes their
+        // usage too — accepted trade-off (see design discussion).
+        if (typeof window.utilization === "number" &&
+            this.lastSeenUtilization !== null) {
+            const delta = window.utilization - this.lastSeenUtilization;
+            if (delta > 0) {
+                this.relayWindowUsed += delta;
+            }
+        }
+        this.lastSeenUtilization = window.utilization ?? null;
         this.sessionWindow = window;
         const mins = Math.round((window.endMs - Date.now()) / 60_000);
-        logger.info(`[rate-guard] session window: ${window.utilization ?? "?"}% used, resets in ${mins}min (status=${window.status ?? "unknown"})`);
+        logger.info(`[rate-guard] session window: ${window.utilization ?? "?"}% used (relay_used=${this.relayWindowUsed.toFixed(1)}%/${this.cfg.maxRelayUtilization}%), resets in ${mins}min (status=${window.status ?? "unknown"})`);
     }
     getSessionWindow() {
         if (!this.sessionWindow)
@@ -114,12 +150,20 @@ export class RateGuard {
             this.dailySpentUsd = 0;
         }
     }
-    /** Check whether a new request would exceed the daily budget. */
+    /** Check whether a new request would exceed the daily budget or relay utilization cap. */
     checkBudget() {
         this.rotateDailyCounterIfNeeded();
         if (this.dailySpentUsd >= this.cfg.dailyBudgetUsd) {
             throw new RateGuardBudgetExceededError(this.dailySpentUsd, this.cfg.dailyBudgetUsd);
         }
+        // Check relay utilization cap against 5h window.
+        // Only enforce if we've seen at least one session window update
+        // (otherwise we don't know the utilization yet — fail open).
+        if (this.relayWindowEndMs > 0 &&
+            this.relayWindowUsed >= this.cfg.maxRelayUtilization) {
+            const resetMins = Math.max(0, Math.round((this.relayWindowEndMs - Date.now()) / 60_000));
+            throw new RateGuardRelayUtilizationExceededError(this.relayWindowUsed, this.cfg.maxRelayUtilization, resetMins);
+        }
     }
     /** Check upstream-imposed cooldown. Throws RateGuardCooldownError if still cooling. */
     checkCooldown() {
@@ -147,6 +191,8 @@ export class RateGuard {
             cooldownUntilMs: this.cooldownUntilMs,
             cooldownReason: this.cooldownReason,
             sessionWindow: this.getSessionWindow(),
+            relayWindowUsed: this.relayWindowUsed,
+            maxRelayUtilization: this.cfg.maxRelayUtilization,
         };
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.15.69",
+  "version": "0.15.70",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {