clawmoney 0.15.65 → 0.15.67

package/dist/commands/relay-setup.js

@@ -34,23 +34,23 @@ 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"],
-    // Codex CLI /model menu (verified April 2026, v0.12x):
-    //   gpt-5.3-codex (default)  — latest frontier agentic coding
-    //   gpt-5.4 (current)        — latest frontier agentic coding
-    //   gpt-5.2-codex            — prior frontier agentic coding
-    //   gpt-5.1-codex-max        — Codex-optimized flagship (deep+fast)
-    //   gpt-5.2                  — latest frontier general model
-    //   gpt-5.1-codex-mini       — cheap/fast/smaller Codex
-    // gpt-5.4-mini is NOT in Codex CLI's menu — ChatGPT's Plus API offers
-    // it but Codex CLI doesn't expose it, so serving it as a Codex-family
-    // provider would never see traffic. Dropped from the recommended list.
+    // 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
+    //   gpt-5.3-codex       — industry-leading Codex-optimized model
+    //   gpt-5.2             — previous general-purpose model
+    //   gpt-5.3-codex-spark — Pro-only preview, excluded from auto-register
+    // OpenAI removed gpt-5.2-codex / gpt-5.1-codex-max / gpt-5.1-codex-mini /
+    // gpt-5.1-codex / gpt-5.1 / gpt-5 from the ChatGPT-sign-in picker on
+    // 2026-04-07 and fully dropped them on 2026-04-14. Requests for those
+    // models now fail upstream with "The '<model>' model is not supported
+    // when using Codex with a ChatGPT account", so they're no longer
+    // auto-registered.
     codex: [
-        "gpt-5.3-codex",
         "gpt-5.4",
-        "gpt-5.2-codex",
-        "gpt-5.1-codex-max",
+        "gpt-5.4-mini",
+        "gpt-5.3-codex",
         "gpt-5.2",
-        "gpt-5.1-codex-mini",
     ],
     // Gemini CLI exposes a long list; mainstream picks are the production-
     // stable 2.5 line (pro + flash) and the latest 3.x preview (pro + flash).

package/dist/relay/pricing.js

@@ -24,28 +24,23 @@ export const API_PRICES = {
     "claude-sonnet-4-6": { input: 3, output: 15 },
     "claude-sonnet-4-5": { input: 3, output: 15 },
     "claude-haiku-4-5": { input: 1, output: 5 },
-    // ── OpenAI (ChatGPT Plus / Codex subscriptions) ──
-    // Verified against LiteLLM. Codex CLI may expose any of these depending
-    // on the user's subscription tier and which models ChatGPT enables.
+    // ── OpenAI (ChatGPT Plus / Pro via Codex CLI) ──
+    // Verified against LiteLLM. Per OpenAI's 2026-04-14 Codex changelog,
+    // ChatGPT-sign-in users can only pick gpt-5.4 / gpt-5.4-mini /
+    // gpt-5.3-codex / gpt-5.2, plus gpt-5.3-codex-spark on Pro. The old
+    // 5 / 5.1 / 5.2-codex families were fully removed that day. Anything
+    // below this comment that's deprecated was removed from the CLI-side
+    // pricing table so `modelsForCli("codex")` no longer offers them.
     "gpt-5.4": { input: 2.50, output: 15 },
     "gpt-5.4-mini": { input: 0.75, output: 4.50 },
-    "gpt-5.4-nano": { input: 0.20, output: 1.25 },
-    // gpt-5.4-pro is not in LiteLLM as of April 2026. Keeping the manually
-    // verified values from OpenAI's enterprise pricing page.
-    "gpt-5.4-pro": { input: 30, output: 180 },
     "gpt-5.3-codex": { input: 1.75, output: 14 },
     // gpt-5.3-codex-spark is not in LiteLLM — sub2api falls back to
     // gpt-5.1-codex pricing (see pricing_service.go SparkBilling handling).
     "gpt-5.3-codex-spark": { input: 1.25, output: 10 },
     "gpt-5.2": { input: 1.75, output: 14 },
-    "gpt-5.2-codex": { input: 1.75, output: 14 },
-    "gpt-5.1": { input: 1.25, output: 10 },
-    "gpt-5.1-codex": { input: 1.25, output: 10 },
-    "gpt-5.1-codex-mini": { input: 0.25, output: 2 },
-    "gpt-5.1-codex-max": { input: 1.25, output: 10 },
-    "gpt-5": { input: 1.25, output: 10 },
     // Reasoning models (o-series). Previously had incorrect values — LiteLLM
     // confirms o3 is $2/$8 (not $5/$20) and o4-mini is $1.1/$4.4 (not $4/$16).
+    // These are API-only (not Codex CLI), kept for OpenAI SDK callers.
     "o3": { input: 2, output: 8 },
     "o4-mini": { input: 1.1, output: 4.4 },
     // ── Google Antigravity (Ultra-bundled IDE quota pool) ──

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

@@ -1060,20 +1060,34 @@ function ensureClaudeCodeShell(body, fingerprint) {
     // Position: right after the billing header slot (idx 1), or right
     // after any buyer-prefixed system blocks (at head) if we're also
     // inserting the billing header.
+    //
+    // Anthropic has a hard ordering rule within the system array: any
+    // cache_control block with `ttl="1h"` MUST come before any block with
+    // `ttl="5m"`. Our injected marker uses the default ephemeral TTL
+    // (5m), so if the buyer's original system array contains a 1h block
+    // further down, naively inserting at index 1 puts the 1h block AFTER
+    // our 5m block and Anthropic 400s with
+    //   system.N.cache_control.ttl: a ttl='1h' cache_control block must
+    //   not come after a ttl='5m' cache_control block.
+    // Walk from the end to find the last 1h block; if one exists, drop
+    // the marker immediately after it so the 1h-before-5m invariant
+    // holds. Otherwise fall back to the original "index 1 (or 0)" slot.
     if (!hasCcMarker) {
         const markerBlock = {
             type: "text",
             text: `${CLAUDE_CODE_SYSTEM_PROMPT_LEAD}\n\n${RELAY_INSTRUCTIONS}`,
             cache_control: { type: "ephemeral" },
         };
-        // Insert at index 1 (slot after billing header), or 0 if we'll be
-        // unshifting the billing header next.
-        if (hasBillingHeaderFirst) {
-            system.splice(1, 0, markerBlock);
-        }
-        else {
-            system.unshift(markerBlock);
+        let insertAt = hasBillingHeaderFirst ? 1 : 0;
+        for (let i = system.length - 1; i >= 0; i--) {
+            const cc = system[i]
+                ?.cache_control;
+            if (cc && typeof cc === "object" && cc.ttl === "1h") {
+                insertAt = i + 1;
+                break;
+            }
         }
+        system.splice(insertAt, 0, markerBlock);
     }
     // ── Update or inject billing header at index 0 ──
     if (hasBillingHeaderFirst) {

package/package.json

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