trantor 0.18.1 → 0.18.3

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "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/crew-runner.mjs

@@ -12,7 +12,7 @@ import { execSync, spawnSync } from "node:child_process";
 import { readFileSync, writeFileSync, unlinkSync, existsSync, appendFileSync } from "node:fs";
 import { join, basename } from "node:path";
 import { homedir } from "node:os";
-import { resolveProject, resolveHub } from "../lib/project.mjs";
+import { resolveProject, resolveHub, withEnvFiles } from "../lib/project.mjs";
 import { loadOrCreate } from "../lib/identity.mjs";
 import { signedHeaders } from "../lib/signed-fetch.mjs";
 import { ensureEnrolled } from "../lib/enroll.mjs";
@@ -301,8 +301,16 @@ function runTurn(prompt, isFirst, trigger = "kickoff") {
   let cmd = (isFirst || (cli.sid && !sid)) ? cli.first : cli.next;
   const mfrag = MODEL && cli.mflag ? `${cli.mflag}${MODEL}` : "";
   cmd = cmd.replaceAll("{M}", mfrag).replaceAll("{P}", pf).replaceAll("{SID}", sid);
+  // PRECEDENCE, and it is easy to get backwards — this is the second time.
+  // Each file is PREPENDED, so the one prepended LAST runs FIRST, and in shell the file that runs
+  // LAST wins. To make ~/.agent-bus/.env (the CREW layer) win it must be prepended FIRST, i.e.
+  // iterate the list in its written order — highest priority first. A `.reverse()` here inverted it
+  // and handed every seat Scrooge's key instead of the crew's, which is why one key was paying for
+  // both and no provider bill could tell them apart. `.reverse()` also mutated the array in place.
+  // Verified by test-crew-env.mjs, which runs the real shell rather than reading this comment.
+  // Priority order: the CREW layer first, the agent's own fallback (Scrooge's .env) after it.
   const envs = [join(homedir(), ".agent-bus", ".env"), cli.env].filter(f => f && existsSync(f));
-  for (const f of envs.reverse()) cmd = `set -a; source ${f}; set +a; ${cmd}`;   // ~/.agent-bus/.env wins
+  cmd = withEnvFiles(cmd, envs);
   log(`turn starting (${isFirst ? "fresh session" : "resume"})${MODEL ? ` · model=${MODEL}` : ""}`);
   cmuxStatus("building", "#4a90d9", "hammer", { priority: 50 });
   // inherit stdio so the window shows the agent working live; also capture for sid-parsing.

package/bin/doctor.mjs

@@ -153,6 +153,24 @@ if (!installed) warn("no crew CLIs found", "install at least one of: codex, gemi
 //   3. ~/.token-scrooge/.env  — the SCROOGE layer (cheap-model grunt routing)
 section("provider keys (who spends on what)");
 const KEY_VARS = ["DEEPSEEK_API_KEY", "OPENROUTER_API_KEY", "MOONSHOT_API_KEY", "ZAI_API_KEY", "OPENAI_API_KEY", "GEMINI_API_KEY", "XAI_API_KEY"];
+// Only some of these are a CREW credential. A seat that authenticates through its own config never
+// reads the env var at all, so a shared value there costs nothing and flagging it is noise:
+//   glm    → opencode.json provider["zai-coding-plan"].options.apiKey  (and a coding plan is flat
+//            rate, so there is no per-token bill to attribute even in principle)
+//   kimi   → ~/.kimi/credentials      codex → its own login      gemini → retired
+// The opencode-driven seats that DO take their key from the env layer are deepseek and openrouter,
+// and even then only when opencode.json has not already given that provider its own key.
+// Getting this wrong cries wolf: the first version flagged all seven and five were false positives,
+// which is how a doctor becomes something you skip.
+const OPENCODE_CFG = read(join(H, ".config", "opencode", "opencode.json")) || {};
+const SEAT_ENV_VARS = { DEEPSEEK_API_KEY: "deepseek", OPENROUTER_API_KEY: "openrouter" };
+const crewUsesVar = (v) => {
+  const provider = SEAT_ENV_VARS[v];
+  if (!provider) return false;
+  const configured = OPENCODE_CFG?.provider?.[provider]?.options?.apiKey;
+  if (typeof configured === "string" && configured.includes("{env:")) return true;   // resolves from env at run time
+  return !configured;                                                                 // a LITERAL key bypasses the env layer
+};
 const CREW_ENV = join(H, ".agent-bus", ".env");
 const SCROOGE_ENV = join(H, ".token-scrooge", ".env");
 const readEnvFile = (f) => {
@@ -177,7 +195,9 @@ for (const v of KEY_VARS) {
   const crewSrc = process.env[v] ? "process env" : crewEnv[v] ? "~/.agent-bus/.env (crew)" : scroogeEnv[v] ? "~/.token-scrooge/.env (FALLBACK)" : "none";
   const crewKey = crew || scrooge;
   const scroogeFileKey = scroogeEnv[v] || "";
-  if (crewKey && scroogeFileKey && crewKey === scroogeFileKey) {
+  if (!crewUsesVar(v)) {
+    ok(`${v}: Scrooge only ${mask(scroogeFileKey || crewKey)} — no crew seat reads this var`);
+  } else if (crewKey && scroogeFileKey && crewKey === scroogeFileKey) {
     shared++; sharedVars.push(v);
     note(`${v}: crew + Scrooge share ONE key ${mask(crewKey)} — spend is indistinguishable on the bill`);
   } else {

package/lib/project.mjs

@@ -152,6 +152,21 @@ export function unsetProjectHub(project) {
 // to ~/.agent-bus/machine-id so it never drifts: RELAY_HOST_ID > persisted id > macOS LocalHostName
 // (stable, no domain) > hostname() without its domain suffix.
 let _hostId = null;
+// Wrap a command so it runs with the seat's provider keys loaded, highest-priority file FIRST.
+//
+// The ordering is the whole point and it has been wrong twice. Each file is PREPENDED, so the one
+// prepended LAST runs FIRST — and in shell, whichever runs LAST wins. Therefore the highest-priority
+// file must be prepended FIRST. Callers pass files in priority order (crew layer, then fallbacks).
+//
+// Getting it backwards silently handed every crew seat Scrooge's API key, so one key authenticated
+// both and no provider bill could attribute a spend spike to either. test-crew-env.mjs proves this
+// against a REAL shell, because the last time it was wrong the comment above it said it was right.
+export function withEnvFiles(cmd, files = []) {
+  let out = cmd;
+  for (const f of files) if (f) out = `set -a; source ${f}; set +a; ${out}`;
+  return out;
+}
+
 export function hostId() {
   if (_hostId) return _hostId;
   if (process.env.RELAY_HOST_ID) return (_hostId = process.env.RELAY_HOST_ID.slice(0, 60));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "type": "module",
   "bin": {
     "trantor": "bin/cli.mjs"
@@ -11,7 +11,7 @@
     "zod": "^4.4.3"
   },
   "scripts": {
-    "test": "node bin/slop-gate.mjs --surface desktop/src && node test.mjs && node test-scenarios.mjs && node test-failure.mjs && node test-redelivery.mjs && node test-crew-completion.mjs && node test-contracts.mjs && node test-handoff.mjs && node test-handoff-summarizer.mjs && node test-baton-turn-boundary.mjs && node test-agents.mjs && node test-update.mjs && node test-handoff-guard.mjs && node test-baton-latest.mjs && node test-balances.mjs && node test-subagent-cost.mjs && node test-inbox.mjs && node test-inflight.mjs && node test-notify.mjs && node test-focus.mjs && node test-cardlog.mjs && node test-relay-note.mjs && node test-reaper.mjs && node test-events.mjs && node test-proposals.mjs && node test-scrub.mjs && node test-store-delta.mjs && node test-message-re.mjs && node test-claims.mjs && node test-adopt.mjs && node test-summarize.mjs && node test-identity-core.mjs && node test-identity.mjs && node test-identity-instances.mjs && node test-duty.mjs && node test-duty-seat.mjs && node test-discovery.mjs && node test-doctor.mjs && node test-splitbrain.mjs && node test-overseer.mjs && node test-overseer-lib.mjs && node test-overseer-warn.mjs && node test-provider-keys.mjs && node test-inbox-delivery.mjs && node test-identity-drift.mjs && node test-inbox-staleness.mjs && node test-seats.mjs && node test-seat-identity.mjs && node test-hub-routing.mjs && node test-hook-routing.mjs && node test-relay-wait.mjs && node test-dsh-seat.mjs && node test-kimi-bridge.mjs && node test-kimi-events.mjs && python3 engine/test-routing.py && node test-reconcile.mjs && node test-resources.mjs && node test-patrol.mjs && node test-bridge.mjs && bash test-crew.sh"
+    "test": "node bin/slop-gate.mjs --surface desktop/src && node test.mjs && node test-scenarios.mjs && node test-failure.mjs && node test-redelivery.mjs && node test-crew-completion.mjs && node test-contracts.mjs && node test-handoff.mjs && node test-handoff-summarizer.mjs && node test-baton-turn-boundary.mjs && node test-agents.mjs && node test-update.mjs && node test-handoff-guard.mjs && node test-baton-latest.mjs && node test-balances.mjs && node test-subagent-cost.mjs && node test-inbox.mjs && node test-inflight.mjs && node test-notify.mjs && node test-focus.mjs && node test-cardlog.mjs && node test-relay-note.mjs && node test-reaper.mjs && node test-events.mjs && node test-proposals.mjs && node test-scrub.mjs && node test-store-delta.mjs && node test-message-re.mjs && node test-claims.mjs && node test-adopt.mjs && node test-summarize.mjs && node test-identity-core.mjs && node test-identity.mjs && node test-identity-instances.mjs && node test-duty.mjs && node test-duty-seat.mjs && node test-discovery.mjs && node test-doctor.mjs && node test-crew-env.mjs && node test-splitbrain.mjs && node test-overseer.mjs && node test-overseer-lib.mjs && node test-overseer-warn.mjs && node test-provider-keys.mjs && node test-inbox-delivery.mjs && node test-identity-drift.mjs && node test-inbox-staleness.mjs && node test-seats.mjs && node test-seat-identity.mjs && node test-hub-routing.mjs && node test-hook-routing.mjs && node test-relay-wait.mjs && node test-dsh-seat.mjs && node test-kimi-bridge.mjs && node test-kimi-events.mjs && python3 engine/test-routing.py && node test-reconcile.mjs && node test-resources.mjs && node test-patrol.mjs && node test-bridge.mjs && bash test-crew.sh"
   },
   "description": "The hub-world for AI agent crews \u2014 orchestrate Claude Code, Codex, GLM, Kimi, DeepSeek & any OpenRouter model as live crews with a plan-aware Advisor, a Kanban/flow command center, a testing gate, and an economics brain (Scrooge).",
   "files": [