gaslamp 2.1.1 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaslamp",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Let Claude Code and Codex consult each other from the shell.",
   "type": "module",
   "bin": {

package/src/consult.mjs

@@ -386,7 +386,11 @@ export function runConsult(backend, argv) {
           costUsd: j.total_cost_usd ?? null,
         };
       } else if (backend === "codex" && j.type === "turn.completed" && j.usage) {
-        usageAcc.input += (j.usage.input_tokens ?? 0) + (j.usage.cached_input_tokens ?? 0);
+        // OpenAI semantics differ from Anthropic's: input_tokens already
+        // INCLUDES the cached portion (cached_input_tokens is a subset, and
+        // codex's own total_tokens = input + output), so adding it again
+        // double-counts cache hits.
+        usageAcc.input += j.usage.input_tokens ?? 0;
         usageAcc.output += j.usage.output_tokens ?? 0;
         meta.usage = { inputTokens: usageAcc.input, outputTokens: usageAcc.output, costUsd: null };
       } else if (backend === "codex" && j.type === "item.completed") {

package/src/setup.mjs

@@ -91,25 +91,30 @@ Fleets default to \`--sandbox read-only\` (N writers in one cwd race) — pass \
 
 ## Picking a model
 
+Both ladders, strongest first: fable ≈ astra > opus ≈ sol > terra > sonnet ≈ luna > haiku.
+
 ${other === "codex"
-    ? `Codex tiers, strongest first — pass the full id to \`--model\` (bare tier names are rejected):
+    ? `Codex tiers — pass the full id to \`--model\` (bare tier names are rejected):
 
 | tier | \`--model\` | ≈ claude | reach for it when |
 |------|-----------|----------|-------------------|
-| sol | \`gpt-5.6-sol\` | fable | the hardest reasoning: adversarial verification, design spars, proofs |
-| terra | \`gpt-5.6-terra\` | opus | substantial work: reviews, diagnosis, real implementation |
+| astra | \`gpt-6-astra\` | fable | the hardest reasoning: adversarial verification, design spars, proofs |
+| sol | \`gpt-5.6-sol\` | opus | substantial work: reviews, diagnosis, real implementation |
+| terra | \`gpt-5.6-terra\` | (between opus and sonnet) | everyday work: routine reviews, well-scoped changes |
 | luna | \`gpt-5.6-luna\` | sonnet | quick checks, mechanical transforms, high-N fleets |`
-    : `Claude tiers, strongest first — \`--model\` takes the bare alias:
+    : `Claude tiers — \`--model\` takes the bare alias:
 
 | \`--model\` | ≈ codex | reach for it when |
 |-----------|---------|-------------------|
-| \`fable\` | sol | the hardest reasoning: adversarial verification, design spars, proofs |
-| \`opus\` | terra | substantial work: reviews, diagnosis, real implementation |
+| \`fable\` | astra | the hardest reasoning: adversarial verification, design spars, proofs |
+| \`opus\` | sol | substantial work: reviews, diagnosis, real implementation |
 | \`sonnet\` | luna | quick checks, mechanical transforms, high-N fleets |
 | \`haiku\` | (below luna) | pings, one-word sanity checks, the cheapest fan-outs |`}
 
 Omit \`--model\` to use ${Other}'s own configured default. Match the tier to the stakes: verification you'll rely on deserves the top tier; a fleet vote usually doesn't.
 
+\`--effort\` takes \`low\` / \`medium\` / \`high\` / \`xhigh\` / \`max\`${other === "codex" ? "; astra, sol and terra also take `ultra` (max reasoning plus automatic task delegation). Omitted = Codex's configured `model_reasoning_effort`, else the model's own default — sol's is `low`, so pass it explicitly when the consult matters." : ". Omitted = Claude's own default."}
+
 ## Reading the records
 
     gaslamp jobs [--json]                 # recent consults: status, label, thread, tokens