trantor 0.18.16 → 0.18.17

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.16",
+  "version": "0.18.17",
   "description": "Trantor \u2014 the hub-world for AI agent crews: live message bus, presence, project Kanban/flow board + crew orchestration for independent AI coding agents (Claude, Codex, Gemini, Kimi, DeepSeek)",
   "mcpServers": {
     "relay": {

package/bin/drill-surface.mjs

@@ -234,15 +234,23 @@ let predecessorSid = null;
 step("S4 · handoff machine: warn → arm → fire → WRITTEN → successor claims → RECAPPED");
 {
   // A turn that uses a tool: the heartbeat is PostToolUse, so only tool use can arm the baton.
-  const raw = await socketRequest({ id: "trantor:agent.prompt", method: "agent.prompt", params: {
-    target: pane, text: "Use the Bash tool to run exactly `pwd`, then reply with just DONE-S4." } });
-  if (JSON.parse(raw).result?.type !== "agent_prompted") FAIL("S4 prompt accepted", raw.slice(0, 100));
-  const handoffFile = await waitFor("handoff written", () => {
+  // The heartbeat is PostToolUse: only a REAL tool call can arm the baton. Models sometimes
+  // answer without the tool (observed: run 2 of 3 on 2026-08-30 — 1-in-3 prompt fragility,
+  // not a seam), so ask, verify tool use in the transcript, and re-ask up to twice.
+  const findHandoff = () => {
     try {
       const f = readdirSync(join(bus, "handoffs")).find(x => x.startsWith(`${projectName}-`) && x.endsWith(".json"));
       return f ? join(bus, "handoffs", f) : null;
     } catch { return null; }
-  }, { timeoutMs: 180_000, everyMs: 2_000 });
+  };
+  let handoffFile = null;
+  for (let attempt = 1; attempt <= 3 && !handoffFile; attempt++) {
+    const raw = await socketRequest({ id: "trantor:agent.prompt", method: "agent.prompt", params: {
+      target: pane, text: `You MUST call the Bash tool now and run exactly: pwd — do not answer without calling it. Then reply with just DONE-S4-${attempt}.` } });
+    if (JSON.parse(raw).result?.type !== "agent_prompted") { FAIL("S4 prompt accepted", raw.slice(0, 100)); break; }
+    handoffFile = await waitFor("handoff written", findHandoff, { timeoutMs: 120_000, everyMs: 2_000 });
+    if (!handoffFile) console.log(`  ${D}attempt ${attempt}: no handoff yet — re-asking with the tool requirement${R}`);
+  }
   if (!handoffFile) {
     FAIL("the armed baton fired and WROTE a handoff at the turn boundary");
   } else {

package/lib/balances.mjs

@@ -51,7 +51,15 @@ export const ADAPTERS = [
       const win = (w, name) => (w && w.utilization != null)
         ? { name, usedPct: Math.round(w.utilization), resetsAt: w.resets_at || null, locked: w.locked_reason || null }
         : null;
-      return { windows: [win(d.five_hour, "5h"), win(d.seven_day, "7d")].filter(Boolean) };
+      // Model-scoped weekly limits ride limits[] (kind "weekly_scoped", scope.model.display_name
+      // e.g. "Fable") — Orca shows these as their own segment ("36% used Fable") and so do we.
+      // Captured live 2026-08-30: session/weekly_all in limits[] duplicate five_hour/seven_day,
+      // so only the scoped entries add information.
+      const scoped = (Array.isArray(d.limits) ? d.limits : [])
+        .filter((l) => l && l.kind === "weekly_scoped" && l.percent != null && l.scope?.model?.display_name)
+        .map((l) => ({ name: String(l.scope.model.display_name), usedPct: Math.round(l.percent),
+                       resetsAt: l.resets_at || null, locked: null, scoped: true }));
+      return { windows: [win(d.five_hour, "5h"), win(d.seven_day, "7d"), ...scoped].filter(Boolean) };
     },
   },
 
@@ -168,17 +176,51 @@ export async function fetchBalances(env = process.env, opts = {}) {
     catch (e) { return { ...base, ok: false, error: String(e?.message || e) }; }
   });
   const rows = (await Promise.all(jobs)).filter(Boolean);
-  // Codex has no balance API to query — it authenticates by `codex login` and bills a
-  // subscription. The fleet list must still show it, honestly, or the header reads as if the
-  // seat does not exist. Evidence of configuration is the login artifact, not an env key.
-  if (!only || only.has("codex") || only.has("openai")) {
+  // Codex: OpenAI publishes no public balance API, but the Codex CLI's OWN token can read the
+  // ChatGPT backend's usage windows — the same source Orca's footer reads (#5570; verified live
+  // 2026-08-30: plan_type + primary/secondary_window {used_percent, reset_at}). Evidence of
+  // configuration is the login artifact (~/.codex/auth.json), not an env key. The token never
+  // leaves the process; only percentages are reported. If the endpoint is unreachable, fall
+  // back to the honest subscription row this used to be — never an error row for a seat that
+  // bills flat.
+  // Same profile gate as every adapter (latent bug from the v6 static row, surfaced 2026-08-30:
+  // `!only ||` made a codex row appear with NO profile at all — "better empty than wrong").
+  if (only && (only.has("codex") || only.has("openai"))) {
     try {
-      const { existsSync } = await import("node:fs");
+      const { existsSync, readFileSync } = await import("node:fs");
       const { join } = await import("node:path");
       const { homedir } = await import("node:os");
-      if (existsSync(join(homedir(), ".codex", "auth.json"))) {
-        rows.push({ provider: "codex", label: "Codex", kind: "subscription", via: "codex login",
-          ok: true, plan: "OpenAI subscription", note: "no balance API — flat subscription" });
+      const authPath = join(homedir(), ".codex", "auth.json");
+      if (existsSync(authPath)) {
+        const base = { provider: "codex", label: "Codex", via: "codex login", ok: true };
+        try {
+          const tok = JSON.parse(readFileSync(authPath, "utf8"))?.tokens || {};
+          if (!tok.access_token) throw new Error("no codex token");
+          const r = await fetch("https://chatgpt.com/backend-api/wham/usage", {
+            headers: {
+              authorization: `Bearer ${tok.access_token}`,
+              "ChatGPT-Account-Id": tok.account_id || "",
+              "User-Agent": "codex-cli", "OpenAI-Beta": "codex-1", originator: "Codex Desktop",
+            },
+            signal: AbortSignal.timeout(8000),
+          });
+          if (!r.ok) throw new Error(`wham/usage ${r.status}`);
+          const d = await r.json();
+          const win = (w, fallbackName) => {
+            if (!w || w.used_percent == null) return null;
+            const secs = Number(w.limit_window_seconds) || 0;
+            const name = secs === 604800 ? "7d" : secs > 0 && secs <= 21600 ? "5h"
+              : secs > 0 ? `${Math.round(secs / 3600)}h` : fallbackName;
+            return { name, usedPct: Math.round(w.used_percent),
+                     resetsAt: w.reset_at ? Number(w.reset_at) * 1000 : null, locked: null };
+          };
+          const windows = [win(d.rate_limit?.primary_window, "5h"), win(d.rate_limit?.secondary_window, "7d")].filter(Boolean);
+          if (!windows.length) throw new Error("no usage windows in response");
+          rows.push({ ...base, kind: "windows", plan: d.plan_type ? `ChatGPT ${d.plan_type}` : "OpenAI subscription", windows });
+        } catch {
+          rows.push({ ...base, kind: "subscription",
+            plan: "OpenAI subscription", note: "usage endpoint unreachable — flat subscription" });
+        }
       }
     } catch { /* no fs access → no row, never an error */ }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.16",
+  "version": "0.18.17",
   "type": "module",
   "bin": {
     "trantor": "bin/cli.mjs"