trantor 0.18.112 → 0.18.113

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.112",
+  "version": "0.18.113",
   "description": "Trantor — 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/provider.mjs

@@ -46,18 +46,27 @@ function opencodeModelCount(providerOc) {
   catch { return 0; }
 }
 
-function listSeats() {
-  const world = loadWorld();
+export function crewSeats(world = loadWorld(), countModels = opencodeModelCount) {
   const { roster, agents, profile } = world;
+  return Object.entries(roster).map(([agent, seat]) => ({
+    agent,
+    spec: seat.launch,
+    tier: profile?.providers?.[seat.provider]?.tier || (seat.cli === "opencode" ? "—" : ""),
+    available: agents.includes(agent),
+    brought: !!seat.discovered,
+    models: seat.cli === "opencode" ? countModels(seat.providerOc) : null,
+  }));
+}
+
+function listSeats(opts) {
+  const rows = crewSeats();
+  if (opts.json) { console.log(JSON.stringify(rows, null, 2)); return; }
   console.log("CREW SEATS — built-in + brought (BYOM). ● = available now\n");
-  for (const [label, s] of Object.entries(roster)) {
-    const live = agents.includes(label);
-    const tier = profile?.providers?.[s.provider]?.tier || (s.cli === "opencode" ? "—" : "");
-    const kind = s.discovered ? "brought " : "built-in";
-    const models = s.cli === "opencode" ? opencodeModelCount(s.providerOc) : null;
+  for (const { agent, spec, tier, available, brought, models } of rows) {
+    const kind = brought ? "brought " : "built-in";
     const mtxt = models == null ? "" : `${models} models`;
-    const dot = live ? `${C.grn}●${C.off}` : `${C.dim}○${C.off}`;
-    console.log(`  ${dot} ${label.padEnd(14)} ${C.dim}${kind}${C.off}  launch: ${s.launch.padEnd(26)} ${tier ? `tier=${tier}` : ""} ${C.dim}${mtxt}${C.off}`);
+    const dot = available ? `${C.grn}●${C.off}` : `${C.dim}○${C.off}`;
+    console.log(`  ${dot} ${agent.padEnd(14)} ${C.dim}${kind}${C.off}  launch: ${spec.padEnd(26)} ${tier ? `tier=${tier}` : ""} ${C.dim}${mtxt}${C.off}`);
   }
   console.log(`\n${C.dim}add one:${C.off} trantor provider add <name> --key sk-… --plan api`);
   console.log(`${C.dim}browse models:${C.off} trantor models [<provider>]`);
@@ -279,7 +288,8 @@ if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href)
   // The default list leads with the seats roster and closes with the provider status board —
   // one command answers both "what can I launch" and "what is actually alive" (#6390).
   const defaultList = async () => {
-    listSeats();
+    listSeats(opts);
+    if (opts.json) return;
     console.log("");
     printStatusRows(await providerStatus());
   };

package/hub/auth.mjs

@@ -55,7 +55,7 @@ const AUTH_HEADERS = ["x-trantor-pubkey", "x-trantor-sig", "x-trantor-ts", "x-tr
 const PUBLIC_ENDPOINTS = new Set(["/", "/ui", "/health", "/enroll"]);
 const OWNER_ENDPOINTS = new Set(["/project/delete", "/sweep", "/reconcile", "/invite", "/import", "/policy", "/session/prompts", "/session/prompt/claim", "/session/prompt/ack"]);
 const DEVICE_ENDPOINTS = new Set(["/device/register", "/device/unregister", "/devices"]);
-const READ_ENDPOINTS = new Set(["/peers", "/tasks", "/events", "/inbox", "/peer", "/card", "/stream", "/history", "/projects", "/catchup", "/phases", "/recent", "/handoffs", "/verify-gates", "/claims", "/proposals", "/grants", "/overseer/context", "/overseer/status", "/session/chat", "/session/prompt"]);
+const READ_ENDPOINTS = new Set(["/peers", "/tasks", "/events", "/inbox", "/peer", "/card", "/stream", "/history", "/projects", "/catchup", "/phases", "/recent", "/handoffs", "/verify-gates", "/claims", "/proposals", "/grants", "/overseer/context", "/overseer/status", "/session/chat", "/session/prompt", "/crew/roster"]);
 const roleRank = { read: 1, write: 2, approver: 3, owner: 4 };
 const hasAuthHeaders = (req) => AUTH_HEADERS.some(h => !!req.headers[h]);
 const authPath = (u) => `${u.pathname}${u.search || ""}`;

package/hub/routes/session.mjs

@@ -15,6 +15,14 @@ const EXPIRED_REASON = "No Mac is relaying this project. Is the Trantor app open
 const ACK_OUTCOMES = new Set(["delivered", "blocked", "not_ready", "stalled", "no_agent", "stale"]);
 const ANSWER_PICKS_MAX = 10;
 const ANSWER_OTHER_MAX = 2000;
+// #12140: crew commands from the phone. The hub validates and queues; the desktop relay runs the
+// trantor CLI and acks done|failed with the output tail. A seat spec is "agent[:project]".
+const CREW_SPEC = /^[a-z][a-z0-9-]{0,30}(:[A-Za-z0-9._/-]{1,80})?$/;
+const CREW_SEATS_MAX = 6;
+const CREW_OUTPUT_MAX = 2000;   // the CLI's LAST 2000 chars, ANSI stripped
+const CREW_CLAUDE_REFUSAL = "The claude seat draws your own Claude quota; start it on the Mac.";
+// oxlint-disable-next-line no-control-regex -- stripping ANSI escape sequences IS matching control characters
+const stripAnsi = (s) => String(s).replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
 
 export function createSessionRuntime({ state, markDirty, appendEvent, pushEventToStreams, notifier }) {
   const now = () => Date.now();
@@ -123,13 +131,20 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
     }
   }
 
+  // #12140: the desktop publishes the seats its Mac can spawn (from `trantor provider status
+  // --json`) at boot and every 10 minutes. Memory-only like the chat mirror — a restarted hub
+  // has no roster until the desktop republishes.
+  const roster = new Map();     // machine -> { machine, updatedAt, seats }
+
   async function route({ req, res, q, P, auth, ctx }) {
     const isChat = P === "/session/chat";
     const isPrompts = P === "/session/prompts";
     const isPrompt = P === "/session/prompt" || P === "/session/prompt/claim" || P === "/session/prompt/ack";
     const isAnswer = P === "/session/answer";
-    if (!isChat && !isPrompts && !isPrompt && !isAnswer) return false;
-    const { body, json, canon } = ctx;
+    const isCrewCommand = P === "/crew/command";
+    const isCrewRoster = P === "/crew/roster";
+    if (!isChat && !isPrompts && !isPrompt && !isAnswer && !isCrewCommand && !isCrewRoster) return false;
+    const { body, json, canon, scopeAllows } = ctx;
 
     // #12137: the phone's answer to an AskUserQuestion joins the SAME queue as a plain prompt,
     // as kind "answer" — same claim, ack, expiry and audit trail; the desktop relay maps the
@@ -161,6 +176,74 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
       return json(res, 200, { id: p.id, status: "queued" });
     }
 
+    // #12140: the phone drives crew lifecycle through the SAME prompt queue as chat prompts and
+    // answers, as kind "crew" — same claim, ack, TTL expiry and audit trail. The hub validates the
+    // specs and refuses the dangerous shapes; the desktop relay re-validates and runs the CLI.
+    if (req.method === "POST" && isCrewCommand) {
+      const b = await body(req);
+      const project = canon(String(b.project || "").slice(0, 80));
+      if (!project) return json(res, 400, { error: "project required" });
+      // Approver or owner on the project — authorize() only proves write for an unknown POST path.
+      if (!scopeAllows(auth?.identity, project, "approver")) return json(res, 403, { error: "approver role required" });
+      const action = String(b.action || "");
+      if (!["up", "down", "swap"].includes(action)) return json(res, 400, { error: "action must be up, down or swap" });
+      const seats = (Array.isArray(b.seats) ? b.seats : []).map(s => String(s ?? "").slice(0, 120));
+      if (seats.length > CREW_SEATS_MAX) return json(res, 400, { error: `at most ${CREW_SEATS_MAX} seats per command` });
+      const from = String(b.from || "").slice(0, 120);
+      const to = String(b.to || "").slice(0, 120);
+      const specs = [...seats, from, to].filter(Boolean);
+      const flagged = specs.find(v => v.startsWith("-"));
+      if (flagged) return json(res, 400, { error: `flag-like value refused: ${flagged}` });
+      const invalid = specs.find(v => !CREW_SPEC.test(v));
+      if (invalid) return json(res, 400, { error: `invalid seat spec: ${invalid}` });
+      // numbered claude seats (claude-2) draw the same quota as claude
+      if (specs.some(v => /^claude(-\d+)?$/.test(v.split(":")[0]))) return json(res, 400, { error: CREW_CLAUDE_REFUSAL });
+      if (action === "up" && !seats.length) return json(res, 400, { error: "up needs at least one seat" });
+      if (action === "swap" && (!from || !to)) return json(res, 400, { error: "swap needs from and to" });
+      expireQueued();
+      state.sessionPromptSeq += 1;
+      // down with an empty seat list means the whole project.
+      const text = action === "swap" ? `swap ${from} ${to}` : seats.length ? `${action} ${seats.join(" ")}` : `${action} ${project}`;
+      const p = { id: state.sessionPromptSeq, project, kind: "crew", action, seats, text,
+        by: String(auth?.identity?.name || "").slice(0, 120), ts: now(), status: "queued" };
+      if (from) p.from = from;
+      if (to) p.to = to;
+      state.sessionPrompts.push(p);
+      while (state.sessionPrompts.length > PROMPT_CAP) {
+        const ti = state.sessionPrompts.findIndex(x => x.status !== "queued" && x.status !== "claimed");
+        state.sessionPrompts.splice(ti >= 0 ? ti : 0, 1);
+      }
+      markDirty();
+      appendEvent("chat.prompt.queued", project, p.by, { promptId: p.id, kind: "crew", action, text: text.slice(0, EVENT_TEXT_MAX) });
+      pushEventToStreams({ ts: p.ts, type: "chat.prompt", id: p.id, project });
+      return json(res, 200, { id: p.id, status: "queued" });
+    }
+
+    // The roster row is keyed on the SIGNER's identity name (any body machine is
+    // ignored) so it matches the chat mirror's host.
+    if (req.method === "POST" && isCrewRoster) {
+      const b = await body(req);
+      if (!scopeAllows(auth?.identity, "", "owner")) return json(res, 403, { error: "owner role required" });
+      const machine = String(auth?.identity?.name || b.machine || "").slice(0, 120);
+      if (!machine) return json(res, 400, { error: "machine required" });
+      const seats = (Array.isArray(b.seats) ? b.seats : []).slice(0, 50).map(s => ({
+        agent: String(s?.agent || "").slice(0, 40),
+        // what `trantor up` takes for this seat (glm:zai-coding-plan); only a valid spec is kept
+        spec: CREW_SPEC.test(String(s?.spec || "")) ? String(s.spec) : "",
+        label: String(s?.label || "").slice(0, 120),
+        plan: String(s?.plan || "").slice(0, 40),
+        metered: !!s?.metered,
+        available: !!s?.available,
+        reason: String(s?.reason || "").slice(0, 200),
+      })).filter(s => s.agent);
+      roster.set(machine, { machine, updatedAt: now(), seats });
+      return json(res, 200, { ok: true, machine, seats: seats.length });
+    }
+
+    if (req.method === "GET" && isCrewRoster) {
+      return json(res, 200, { machines: [...roster.values()] });
+    }
+
     if (req.method === "POST" && isChat) {
       const b = await body(req);
       // the same canon the GET reads with, or a publish and a read could name two mirrors
@@ -201,13 +284,19 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
     }
 
     // The public view of a queue row: plain prompts are kind "prompt"; answers carry their
-    // session, toolId, picks and other so the claiming desktop has everything it needs.
+    // session, toolId, picks and other; crew commands carry action, seats, from and to —
+    // so the claiming desktop has everything it needs.
     const promptView = (p) => {
       const view = { id: p.id, project: p.project, text: p.text, by: p.by, ts: p.ts, status: p.status, kind: p.kind || "prompt" };
       if (p.kind === "answer") {
         view.session = p.session; view.toolId = p.toolId; view.picks = p.picks;
         if (p.other && p.other.trim()) view.other = p.other;   // absent, never "", when nothing was typed
       }
+      if (p.kind === "crew") {
+        view.action = p.action; view.seats = p.seats;
+        if (p.from) view.from = p.from;
+        if (p.to) view.to = p.to;
+      }
       return view;
     };
 
@@ -239,17 +328,28 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
       const p = findPrompt(b.id);
       if (!p) return json(res, 404, { error: "prompt not found" });
       const outcome = String(b.outcome || "");
-      if (!ACK_OUTCOMES.has(outcome)) return json(res, 400, { error: `outcome must be one of: ${[...ACK_OUTCOMES].join(", ")}` });
-      if (p.status === "delivered" || p.status === "failed" || p.status === "expired") {
+      // #12140: a crew command acks done|failed with the CLI output tail, and the status IS the
+      // outcome — never "delivered". Other kinds keep the delivered/blocked/… vocabulary.
+      if (p.kind === "crew") {
+        if (outcome !== "done" && outcome !== "failed") return json(res, 400, { error: "crew outcome must be done or failed" });
+      } else if (!ACK_OUTCOMES.has(outcome)) {
+        return json(res, 400, { error: `outcome must be one of: ${[...ACK_OUTCOMES].join(", ")}` });
+      }
+      if (p.status === "delivered" || p.status === "done" || p.status === "failed" || p.status === "expired") {
         return json(res, 409, { error: `prompt already ${p.status}`, status: p.status });
       }
       const error = String(b.error || "").slice(0, EVENT_TEXT_MAX);
       p.outcome = outcome; p.error = error; p.ackedAt = now();
-      p.status = outcome === "delivered" ? "delivered" : "failed";
+      if (p.kind === "crew") {
+        p.output = stripAnsi(String(b.output || "")).slice(-CREW_OUTPUT_MAX);
+        p.status = outcome;   // "done" or "failed"
+      } else {
+        p.status = outcome === "delivered" ? "delivered" : "failed";
+      }
       markDirty();
       const extra = { promptId: p.id, outcome };
       if (error) extra.error = error;
-      appendEvent(outcome === "delivered" ? "chat.prompt.delivered" : "chat.prompt.failed", p.project,
+      appendEvent(p.status === "failed" ? "chat.prompt.failed" : "chat.prompt.delivered", p.project,
         String(auth?.identity?.name || ""), extra);
       return json(res, 200, { ok: true, status: p.status });
     }
@@ -258,7 +358,7 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
       expireQueued();
       const p = findPrompt(q.id);
       if (!p) return json(res, 404, { error: "prompt not found" });
-      return json(res, 200, { id: p.id, status: p.status, outcome: p.outcome || "", error: p.error || "" });
+      return json(res, 200, { id: p.id, status: p.status, outcome: p.outcome || "", output: p.output || "", error: p.error || "" });
     }
 
     return false;

package/package.json

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