trantor 0.18.82 → 0.18.86

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.82",
+  "version": "0.18.86",
   "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/cli.mjs

@@ -24,6 +24,7 @@ switch (cmd) {
   case "profile": run("bin/profile.mjs"); break;
   case "provider": case "providers": run("bin/provider.mjs"); break;
   case "secrets": run("bin/secrets.mjs"); break;
+  case "keys":    run("bin/keys.mjs"); break;
   case "models": run("bin/models.mjs"); break;
   case "advise":  run("bin/advise.mjs"); break;
   case "verify":  run("bin/crew-verify.mjs"); break;
@@ -70,6 +71,10 @@ switch (cmd) {
       }
       break;
     }
+    // Local throwaway: the hub's default is RELAY_AUTH=enforce (#11368), but a foreground
+    // `trantor hub` on loopback is a dev convenience — keep it usable (warn) unless the
+    // operator asked for a mode explicitly.
+    if (!process.env.RELAY_AUTH) process.env.RELAY_AUTH = "warn";
     run("hub.mjs"); break;
   }
   case "project": {
@@ -103,6 +108,7 @@ switch (cmd) {
   case "watch":   run("bin/relay-watch.mjs"); break;
   case "catchup": run("bin/catchup.mjs"); break;
   case "agents":  run("bin/agents.mjs"); break;
+  case "gate":    run("bin/gate.mjs"); break;
   case "gates":   run("bin/gates.mjs"); break;
   case "backfill": run("bin/git-backfill.mjs"); break;
   case "sweep": run("bin/sweep.mjs"); break;
@@ -234,6 +240,7 @@ switch (cmd) {
   trantor profile     declare your plans:  trantor profile set claude=max codex=plus deepseek=api
   trantor provider    bring ANY model (BYOM): list · status [--json] · verify <name> --key … · add <name> --key … · remove <name>
   trantor secrets     provider keys in the OS keychain: list · set <NAME> (stdin) · remove <NAME> · migrate [--dry-run]
+  trantor keys        identity keys in the OS keychain: status · migrate [--dry-run] — ~/.agent-bus/keys keeps public material only
   trantor models      browse live models behind each seat + the router's pick per difficulty
   trantor up …        spawn a crew here:   trantor up codex kimi deepseek:deepseek glm:zai-coding-plan
   trantor open        host THIS session as the project's orchestrator pane (trantor down spares it)
@@ -250,6 +257,7 @@ switch (cmd) {
   trantor app         the DESKTOP app: status | install | update — pulls the latest DMG from GitHub Releases
   trantor catchup     "where are we?" — the continuous board + git, with a synthesized brief
   trantor agents      what this session's sub-agents did (task · returned? · files written · survived on disk) — [<sessionId>] [--json]
+  trantor gate go|nogo <id>   decide a conflicting file edit
   trantor gates       verification gates: "must verify before shipping" claims that survive handoffs — [--all] [--json]
   trantor backfill    card past GIT work onto the board (solo commits that were never carded) — [--since "14 days ago"] [--dry-run]
   trantor init-hooks  install a git post-commit hook so EVERY commit auto-cards on the board (reliable solo-work backstop) — [--uninstall]

package/bin/crew/cmux.mjs

@@ -110,13 +110,13 @@ export function spawnCmux(ctx, specs, resolve, prune) {
   for (let index = 0; index < specs.length; index += 1) {
     const seat = resolve(specs[index]);
     if (!seat) continue;
-    const launcher = seatLauncher(ctx, seat.agent, runnerCommand(ctx, seat.agent, seat.model, seat.effort));
-    const old = reuse ? readRows(ctx).filter(row => row.project === ctx.project && row.kind === "cmux" && row.agent === seat.agent).at(-1)?.handle || "" : "";
+    const launcher = seatLauncher(ctx, (seat.persona || seat.agent), runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona));
+    const old = reuse ? readRows(ctx).filter(row => row.project === ctx.project && row.kind === "cmux" && row.persona === (seat.persona || seat.agent)).at(-1)?.handle || "" : "";
     let pane = "";
     if (reuse) {
-      console.log(ctx.dry ? `[dry] cmux: reuse workspace ${workspace} — new-split for ${seat.agent}${old ? ` (replacing ${old})` : ""}` : `  → reusing workspace ${workspace}`);
+      console.log(ctx.dry ? `[dry] cmux: reuse workspace ${workspace} — new-split for ${(seat.persona || seat.agent)}${old ? ` (replacing ${old})` : ""}` : `  → reusing workspace ${workspace}`);
       pane = ctx.dry ? `%DRYT${index}` : split(ctx, workspace, "right", old || panes.at(-1) || "", launcher);
-      if (old) { closePane(ctx, old); dropState(ctx, ctx.project, "cmux", seat.agent); }
+      if (old) { closePane(ctx, old); dropState(ctx, ctx.project, "cmux", (seat.persona || seat.agent)); }
     } else if (index === 0) {
       if (ctx.dry) {
         console.log(`[dry] cmux: new-workspace (cwd ${ctx.dir}) --command 'bash ${launcher}' → rename 'trantor:${ctx.project}'`);
@@ -133,8 +133,8 @@ export function spawnCmux(ctx, specs, resolve, prune) {
       } else pane = split(ctx, workspace, direction, target, launcher);
     }
     panes.push(pane);
-    recordState(ctx, ctx.project, "cmux", seat.agent, pane);
-    console.log(`  → ${seat.agent} seat in cmux workspace (${ctx.project})`);
+    recordState(ctx, ctx.project, "cmux", (seat.persona || seat.agent), pane, seat);
+    console.log(`  → ${(seat.persona || seat.agent)} seat in cmux workspace (${ctx.project})`);
   }
   console.log(`— crew grouped in cmux: ONE workspace tab for ${ctx.project}, seats tiled + sidebar status. Teardown (this project only): trantor down —`);
 }
@@ -150,8 +150,8 @@ function spawnAppleScript(ctx, specs, resolve) {
   for (let index = 0; index < specs.length; index += 1) {
     const seat = resolve(specs[index]);
     if (!seat) continue;
-    const launcher = seatLauncher(ctx, seat.agent, runnerCommand(ctx, seat.agent, seat.model, seat.effort));
-    const old = reuse ? readRows(ctx).filter(row => row.project === ctx.project && row.kind === "cmux" && row.agent === seat.agent).at(-1)?.handle || "" : "";
+    const launcher = seatLauncher(ctx, (seat.persona || seat.agent), runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona));
+    const old = reuse ? readRows(ctx).filter(row => row.project === ctx.project && row.kind === "cmux" && row.persona === (seat.persona || seat.agent)).at(-1)?.handle || "" : "";
     let pane;
     if (!tab && index === 0) {
       if (ctx.dry) {
@@ -167,11 +167,11 @@ function spawnAppleScript(ctx, specs, resolve) {
         console.log(`[dry] cmux(AppleScript): split ${direction} from ${target || "<focused>"} + run 'bash ${launcher}'`);
         pane = `%DRYT${index}`;
       } else pane = splitAppleScriptPane(ctx, tab, target, direction, launcher);
-      if (old && pane && pane !== "ERR") { closePane(ctx, old); dropState(ctx, ctx.project, "cmux", seat.agent); }
+      if (old && pane && pane !== "ERR") { closePane(ctx, old); dropState(ctx, ctx.project, "cmux", (seat.persona || seat.agent)); }
     }
     panes.push(pane);
-    recordState(ctx, ctx.project, "cmux", seat.agent, pane);
-    console.log(`  → ${seat.agent} seat in cmux workspace (${ctx.project})`);
+    recordState(ctx, ctx.project, "cmux", (seat.persona || seat.agent), pane, seat);
+    console.log(`  → ${(seat.persona || seat.agent)} seat in cmux workspace (${ctx.project})`);
   }
   console.log(`— crew grouped in cmux (AppleScript): ONE workspace tab for ${ctx.project}, seats tiled. Teardown: trantor down —`);
 }

package/bin/crew/core.mjs

@@ -139,7 +139,7 @@ export function gridColumns(size) {
 // flag documented there finally arms the seat that reads it.
 const FORWARDED_ENV = STATE_FLAGS;
 
-export function runnerCommand(ctx, agent, model = "", effort = null) {
+export function runnerCommand(ctx, agent, model = "", effort = null, persona = agent) {
   const forwarded = FORWARDED_ENV
     .filter((name) => process.env[name])
     .map((name) => `${name}=${shellQuote(process.env[name])} `)
@@ -147,8 +147,9 @@ export function runnerCommand(ctx, agent, model = "", effort = null) {
   // #7777: the launcher resolved the catalog's per-difficulty effort for this seat; the runner
   // reads CREW_EFFORT, applies what the CLI accepts and logs the one-line summary.
   const swapEnv = ctx.swap ? ` CREW_SWAP_STAGE=${shellQuote(ctx.swap.path)} CREW_SWAP_LABEL=${shellQuote(ctx.swap.label)} CREW_SWAP_AGENT=${shellQuote(ctx.swap.agent)} CREW_SWAP_DRIVER=${shellQuote(ctx.swap.driver || "")}` : "";
+  const personaEnv = ` CREW_AGENT=${shellQuote(agent)} CREW_PERSONA=${shellQuote(ctx.swap?.persona || persona)}`;
   const effortEnv = effort ? ` CREW_EFFORT=${shellQuote(JSON.stringify(effort))}` : "";
-  return `cd ${shellQuote(ctx.dir)} && ${forwarded}CREW_MODEL=${shellQuote(model)}${effortEnv}${swapEnv} RELAY_PROJECT=${shellQuote(ctx.project)} RELAY_URL=${shellQuote(ctx.hub)} node ${shellQuote(join(ROOT, "bin/crew-runner.mjs"))} ${shellQuote(agent)} ${shellQuote(ctx.dir)}`;
+  return `cd ${shellQuote(ctx.dir)} && ${forwarded}CREW_MODEL=${shellQuote(model)}${effortEnv}${swapEnv}${personaEnv} RELAY_PROJECT=${shellQuote(ctx.project)} RELAY_URL=${shellQuote(ctx.hub)} node ${shellQuote(join(ROOT, "bin/crew-runner.mjs"))} ${shellQuote(persona)} ${shellQuote(ctx.dir)}`;
 }
 
 export function listPids(pattern) {

package/bin/crew/herdr.mjs

@@ -159,18 +159,18 @@ function prepareWorkspace(ctx, prune) {
 function replacementPane(ctx, workspace, spec, hostPane, resolve) {
   const seat = resolve(spec);
   if (!seat) return null;
-  const old = readRows(ctx).filter(row => row.project === ctx.project && row.kind === "herdr" && row.agent === seat.agent).at(-1)?.handle || "";
+  const old = readRows(ctx).filter(row => row.project === ctx.project && row.kind === "herdr" && row.persona === (seat.persona || seat.agent)).at(-1)?.handle || "";
   let pane;
   if (ctx.dry) {
-    console.log(`[dry] herdr: reuse workspace ${workspace} — pane split for ${seat.agent}${old ? ` (replacing ${old})` : ""}`);
+    console.log(`[dry] herdr: reuse workspace ${workspace} — pane split for ${(seat.persona || seat.agent)}${old ? ` (replacing ${old})` : ""}`);
     pane = `%DRYT${spec.index}`;
   } else {
     pane = splitPane(ctx, hostPane, "right", ctx.dir);
-    runSeat(ctx, pane, seat.agent, runnerCommand(ctx, seat.agent, seat.model, seat.effort));
+    runSeat(ctx, pane, (seat.persona || seat.agent), runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona));
   }
   if (old) {
     closePane(ctx, old);
-    dropState(ctx, ctx.project, "herdr", seat.agent);
+    dropState(ctx, ctx.project, "herdr", (seat.persona || seat.agent));
   }
   return { ...seat, pane };
 }
@@ -194,8 +194,8 @@ export function spawnHerdr(ctx, specs, resolve, prune) {
     workspace = seat.workspace || workspace;
     panes.push(seat.pane);
     reportAgent(ctx, seat.pane, seat.agent);
-    recordState(ctx, ctx.project, "herdr", seat.agent, seat.pane);
-    console.log(`  → ${seat.agent} seat in herdr workspace (${ctx.project})`);
+    recordState(ctx, ctx.project, "herdr", (seat.persona || seat.agent), seat.pane, seat);
+    console.log(`  → ${(seat.persona || seat.agent)} seat in herdr workspace (${ctx.project})`);
   }
   console.log(`— crew grouped in herdr: ONE workspace for ${ctx.project}, seats as named panes in its server. Teardown (this project only): trantor down —`);
 }
@@ -203,7 +203,7 @@ export function spawnHerdr(ctx, specs, resolve, prune) {
 function freshPane(ctx, workspace, spec, panes, columns, resolve) {
   const seat = resolve(spec.value);
   if (!seat) return null;
-  const command = runnerCommand(ctx, seat.agent, seat.model, seat.effort);
+  const command = runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona);
   let pane = "";
   if (spec.index === 0) {
     if (ctx.dry) {
@@ -221,7 +221,7 @@ function freshPane(ctx, workspace, spec, panes, columns, resolve) {
       pane = `%DRYT${spec.index}`;
     } else pane = splitPane(ctx, target, direction, ctx.dir);
   }
-  runSeat(ctx, pane, seat.agent, command);
+  runSeat(ctx, pane, (seat.persona || seat.agent), command);
   return { ...seat, pane, workspace };
 }
 

package/bin/crew/state.mjs

@@ -1,4 +1,5 @@
-import { existsSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { seatProcesses, signalProcesses } from "./processes.mjs";
 import { call, listPids, run } from "./core.mjs";
 import { hostId } from "../../lib/project.mjs";
@@ -6,9 +7,9 @@ import { statePathFor as dockerStatePathFor, sweep as dockerSweep } from "../../
 
 export function parseRow(line) {
   const fields = line.split("\t");
-  if (fields.length >= 4) return { project: fields[0], kind: fields[1], agent: fields[2], handle: fields[3] };
-  if (fields.length === 2) return { project: "", kind: "win", agent: fields[0], handle: fields[1] };
-  return { project: "", kind: "win", agent: fields[0] || "", handle: fields[1] || "" };
+  if (fields.length >= 4) return { project: fields[0], kind: fields[1], persona: fields[2], agent: fields[4] || fields[2], model: fields[5] || "", handle: fields[3] };
+  if (fields.length === 2) return { project: "", kind: "win", persona: fields[0], model: "", agent: fields[0], handle: fields[1] };
+  return { project: "", kind: "win", persona: fields[0], model: "", agent: fields[0] || "", handle: fields[1] || "" };
 }
 
 export function readRows(ctx) {
@@ -23,24 +24,24 @@ export function writeRows(ctx, rows) {
     return;
   }
   const tmp = `${ctx.statePath}.tmp`;
-  writeFileSync(tmp, `${rows.map(row => [row.project, row.kind, row.agent, row.handle].join("\t")).join("\n")}\n`);
+  writeFileSync(tmp, `${rows.map(row => [row.project, row.kind, row.persona || row.agent, row.handle, ...((row.persona && row.persona !== row.agent) || row.model ? [row.agent, row.model || ""] : [])].join("\t")).join("\n")}\n`);
   renameSync(tmp, ctx.statePath);
 }
 
-export function recordState(ctx, project, kind, agent, handle) {
+export function recordState(ctx, project, kind, persona, handle, metadata = {}) {
   if (ctx.dry) return;
   const rows = readRows(ctx);
   // #7285: an exact duplicate carries no new fact, and a doubled herdrws row is how `up` came to
   // see the live workspace as its own stale copy. One row per fact — refuse the push.
-  if (rows.some(row => row.project === project && row.kind === kind && row.agent === agent && row.handle === handle)) return;
-  rows.push({ project, kind, agent, handle });
+  if (rows.some(row => row.project === project && row.kind === kind && row.persona === persona && row.handle === handle)) return;
+  rows.push({ project, kind, persona, agent: metadata.agent || persona, model: metadata.model || "", handle });
   writeRows(ctx, rows);
 }
 
 export function dropState(ctx, project, kind, agent = "", handle = "") {
   const rows = readRows(ctx).filter(row => !(
     row.project === project && row.kind === kind &&
-    (!agent || row.agent === agent) && (!handle || row.handle === handle)
+    (!agent || row.persona === agent) && (!handle || row.handle === handle)
   ));
   writeRows(ctx, rows);
 }
@@ -107,7 +108,7 @@ async function closeRow(ctx, row, selected, orchProjects, adapters, tmuxClosed)
   if (row.kind === "herdr" && (perSeat || hasOrch)) adapters.herdr.closePane(row.handle);
   if (row.kind === "tmux") closeTmux(ctx, row, perSeat, tmuxClosed);
   if ((row.kind === "win" || row.kind === "attach") && !(perSeat && row.kind === "attach")) killTerminal(ctx, row.handle);
-  if (!["cmuxws", "attach", "herdrws", "orch"].includes(row.kind)) await killSeatProcesses(ctx, row.project, row.agent);
+  if (!["cmuxws", "attach", "herdrws", "orch"].includes(row.kind)) await killSeatProcesses(ctx, row.project, row.persona);
 }
 
 function closeTmux(ctx, row, perSeat, seen) {
@@ -127,11 +128,11 @@ export async function down(ctx, args, adapters) {
   if (options.error) return 1;
   const rows = readRows(ctx);
   if (!rows.length) { console.log("no tracked crew windows"); return 0; }
-  const scoped = rows.filter(row => (options.all || row.project === ctx.project) && (!options.agents.length || options.agents.includes(row.agent)));
+  const scoped = rows.filter(row => (options.all || row.project === ctx.project) && (!options.agents.length || options.agents.includes(row.persona)));
   const scope = options.all ? "all projects" : `project \"${ctx.project}\"`;
   if (!scoped.length) { console.log(`nothing to tear down for ${scope}`); return 0; }
   console.log(`— tearing down (${scope}):`);
-  for (const row of scoped) if (!["attach", "cmuxws", "herdrws", "orch"].includes(row.kind)) console.log(`  • ${row.project || "<legacy>"} · ${row.agent} (${row.kind})`);
+  for (const row of scoped) if (!["attach", "cmuxws", "herdrws", "orch"].includes(row.kind)) console.log(`  • ${row.project || "<legacy>"} · ${row.persona} (${row.kind})`);
   if (options.all && !options.yes) {
     console.log("— this is EVERY project's crew. Re-run with --yes to confirm:  trantor down --all --yes");
     return 0;
@@ -139,10 +140,24 @@ export async function down(ctx, args, adapters) {
   const orchProjects = new Set(rows.filter(row => row.kind === "orch").map(row => row.project));
   const tmuxClosed = new Set();
   for (const row of scoped) await closeRow(ctx, row, options.agents, orchProjects, adapters, tmuxClosed);
-  const removed = new Set(scoped.map(row => `${row.project}|${row.kind}|${row.agent}|${row.handle}`));
-  const kept = rows.filter(row => !removed.has(`${row.project}|${row.kind}|${row.agent}|${row.handle}`) || (orchProjects.has(row.project) && ["herdrws", "cmuxws", "orch"].includes(row.kind)));
+  const removed = new Set(scoped.map(row => `${row.project}|${row.kind}|${row.persona}|${row.handle}`));
+  const kept = rows.filter(row => !removed.has(`${row.project}|${row.kind}|${row.persona}|${row.handle}`) || (orchProjects.has(row.project) && ["herdrws", "cmuxws", "orch"].includes(row.kind)));
   writeRows(ctx, kept);
-  console.log(`— crew torn down (${scope})`);
+  const seatRows = scoped.filter(row => !["attach", "cmuxws", "herdrws", "orch"].includes(row.kind));
+  if (!ctx.dry) {
+    const logDir = join(dirname(ctx.statePath), "logs");
+    mkdirSync(logDir, { recursive: true });
+    for (const row of new Map(seatRows.map(row => [`${row.project}/${row.persona}`, row])).values()) {
+      appendFileSync(join(logDir, `${row.persona}-${row.project}.jsonl`),
+        `${JSON.stringify({ ts: Date.now(), agent: row.persona, project: row.project, stopped: true })}\n`);
+    }
+  }
+  if (options.agents.length) {
+    const stopped = [...new Set(seatRows.map(row => row.persona))];
+    const remaining = [...new Set(kept.filter(row => row.project === ctx.project &&
+      !["attach", "cmuxws", "herdrws", "orch"].includes(row.kind)).map(row => row.persona))];
+    console.log(`— ${stopped.join(", ") || options.agents.join(", ")} stopped${remaining.length ? ` (${remaining.join(", ")} still running)` : ""} (${scope})`);
+  } else console.log(`— crew torn down (${scope})`);
   return 0;
 }
 

package/bin/crew/swap.mjs

@@ -1,3 +1,4 @@
+import { updatePersona } from "../../lib/persona.mjs";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { randomUUID } from "node:crypto";
@@ -89,12 +90,11 @@ export function swapRuntime(ctx, adapters, spawn) {
   let replacementPid;
   return {
     validate: options => {
-      if (options.agent !== options.from && readRows(ctx).some(row => row.project === ctx.project && row.agent === options.agent)) throw new Error(`replacement seat ${options.agent} already exists; old seat unchanged`);
       return validateReplacement(ctx, options);
     },
     async start(seat, stage) {
       const staged = { ...ctx, swap: { ...stage, agent: seat.agent, driver: seat.driver } };
-      spawn(staged, { ...seat, agent: stage.label });
+      spawn(staged, { ...seat, persona: stage.label });
     },
     async ready(stage) {
       const deadline = Date.now() + 30000;
@@ -118,10 +118,11 @@ export function swapRuntime(ctx, adapters, spawn) {
       signalProcesses(pids, "SIGKILL");
     },
     async cancel(stage) { await down(ctx, [stage.label], adapters); },
-    release(stage, agent, cursor) {
-      writeRows(ctx, readRows(ctx).map(row => row.project === ctx.project && row.agent === stage.label ? { ...row, agent } : row));
-      writeFileSync(runnerRecord(ctx, ctx.project, agent), JSON.stringify({ label: stage.label, dir: ctx.dir }));
-      writeFileSync(`${stage.path}.release`, JSON.stringify({ agent, cursor }));
+    release(stage, persona, cursor) {
+      writeRows(ctx, readRows(ctx).map(row => row.project === ctx.project && row.persona === stage.label ? { ...row, persona } : row));
+      writeFileSync(runnerRecord(ctx, ctx.project, persona), JSON.stringify({ label: stage.label, dir: ctx.dir }));
+      updatePersona({ dir: join(ctx.home, ".agent-bus"), project: ctx.project, persona, agent: stage.agent, model: stage.model });
+      writeFileSync(`${stage.path}.release`, JSON.stringify({ agent: stage.agent, persona, cursor }));
     },
   };
 }
@@ -133,23 +134,22 @@ export async function performSwap(ctx, options, runtime) {
     const seat = await runtime.validate(options);
     const label = `${options.agent}-swap-${randomUUID().slice(0, 8)}`;
     mkdirSync(ctx.seatDir, { recursive: true });
-    stage = { label, path: join(ctx.seatDir, label) };
+    stage = { label, path: join(ctx.seatDir, label), persona: options.from, agent: seat.agent, model: seat.model };
     await runtime.start(seat, stage);
     const readySession = await runtime.ready(stage);
     frozen = true;
     await runtime.freeze(options.from);
     const pending = readPending(ctx, options.from);
-    const target = options.agent === options.from ? pending : readPending(ctx, options.agent);
-    const from = `${options.from}:${ctx.project}`, to = `${options.agent}:${ctx.project}`;
+    const target = pending;
+    const from = `${options.from}:${ctx.project}`, to = from;
     const handoff = await runtime.transfer({ from, to, project: ctx.project, readySession, _op: `swap-${stage.label}`, heldAsk: pending.ask || 0, pendingIds: pending.wake.map(m => m.id) });
     transferred = true;
     result.moved = [...new Set([...pending.wake.map(m => m.id), ...handoff.moved])];
     const wake = new Map([...target.wake, ...pending.wake, ...handoff.messages].map(m => [m.id, { ...m, to }]));
-    savePending(ctx, options.agent, { ...target, wake: [...wake.values()], bcast: [...new Map([...target.bcast, ...pending.bcast].map(m => [m.id, m])).values()], ask: handoff.messages.some(m => m.re === pending.ask) ? 0 : pending.ask || target.ask, askTo: pending.askTo || target.askTo });
+    savePending(ctx, options.from, { ...target, wake: [...wake.values()], bcast: [...new Map([...target.bcast, ...pending.bcast].map(m => [m.id, m])).values()], ask: handoff.messages.some(m => m.re === pending.ask) ? 0 : pending.ask || target.ask, askTo: pending.askTo || target.askTo });
     await runtime.stop(options.from);
     frozen = false;
-    if (options.agent !== options.from) savePending(ctx, options.from, { ...pending, wake: [], bcast: [], ask: 0, askTo: "" });
-    await runtime.release(stage, options.agent, handoff.cursor);
+    await runtime.release(stage, options.from, handoff.cursor);
     return { ...result, ok: true };
   } catch (error) {
     if (!transferred) {

package/bin/crew/tmux.mjs

@@ -7,7 +7,7 @@ export function spawnTmux(ctx, specs, resolve) {
   for (const spec of specs) {
     const seat = resolve(spec);
     if (!seat) continue;
-    const command = runnerCommand(ctx, seat.agent, seat.model, seat.effort);
+    const command = runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona);
     let pane = ctx.dry ? "%DRY" : "";
     if (first) {
       run(ctx, "tmux", ["new-session", "-d", "-s", session, "-n", "crew", "-x", "260", "-y", "60"], { rendered: `tmux new-session -d -s '${session}' -n crew -x 260 -y 60` });
@@ -18,9 +18,9 @@ export function spawnTmux(ctx, specs, resolve) {
       run(ctx, "tmux", ["select-layout", "-t", session, "tiled"], { rendered: `tmux select-layout -t '${session}' tiled >/dev/null 2>&1` });
     }
     if (!ctx.dry) pane = call("tmux", ["display-message", "-p", "-t", session, "#{pane_id}"], { env: ctx.env }).stdout;
-    run(ctx, "tmux", ["select-pane", "-t", pane || session, "-T", seat.agent.toUpperCase()], { rendered: `tmux select-pane -t '${pane || session}' -T ${seat.agent.toUpperCase()}` });
-    recordState(ctx, ctx.project, "tmux", seat.agent, pane || "%?");
-    console.log(`  → ${seat.agent} pane in ${session}`);
+    run(ctx, "tmux", ["select-pane", "-t", pane || session, "-T", (seat.persona || seat.agent).toUpperCase()], { rendered: `tmux select-pane -t '${pane || session}' -T ${(seat.persona || seat.agent).toUpperCase()}` });
+    recordState(ctx, ctx.project, "tmux", (seat.persona || seat.agent), pane || "%?", seat);
+    console.log(`  → ${(seat.persona || seat.agent)} pane in ${session}`);
   }
   run(ctx, "tmux", ["set-option", "-t", session, "pane-border-status", "top"], { rendered: `tmux set-option -t '${session}' pane-border-status top >/dev/null 2>&1` });
   run(ctx, "tmux", ["set-option", "-t", session, "pane-border-format", " #{pane_title} "], { rendered: `tmux set-option -t '${session}' pane-border-format ' #{pane_title} ' >/dev/null 2>&1` });
@@ -48,17 +48,17 @@ export function spawnTerminal(ctx, specs, resolve) {
     const x = rect.x + (index % columns) * width;
     const y = rect.y + Math.floor(index / columns) * height;
     if (ctx.dry) {
-      console.log(`[dry] Terminal window for ${seat.agent} at ${x},${y}`);
-      recordState(ctx, ctx.project, "win", seat.agent, `%DRYWIN${index}`);
+      console.log(`[dry] Terminal window for ${(seat.persona || seat.agent)} at ${x},${y}`);
+      recordState(ctx, ctx.project, "win", (seat.persona || seat.agent), `%DRYWIN${index}`, seat);
       continue;
     }
-    const command = `clear && ${runnerCommand(ctx, seat.agent, seat.model, seat.effort)}`;
-    const title = `${ctx.project} · ${seat.agent.toUpperCase()}`;
+    const command = `clear && ${runnerCommand(ctx, seat.agent, seat.model, seat.effort, seat.persona)}`;
+    const title = `${ctx.project} · ${(seat.persona || seat.agent).toUpperCase()}`;
     const result = appleScript(`tell application "Terminal"\nset w to do script "${appleScriptString(command)}"\nset custom title of w to "${appleScriptString(title)}"\nset theWin to first window whose tabs contains w\nset bounds of theWin to {${x}, ${y}, ${x + width}, ${y + height}}\nreturn id of theWin\nend tell\n`);
     if (result.stdout) {
-      recordState(ctx, ctx.project, "win", seat.agent, result.stdout);
-      console.log(`  → ${seat.agent} window spawned (${ctx.project} · ${seat.agent})`);
-    } else console.log(`  ✗ ${seat.agent} osascript spawn ERROR`);
+      recordState(ctx, ctx.project, "win", (seat.persona || seat.agent), result.stdout, seat);
+      console.log(`  → ${(seat.persona || seat.agent)} window spawned (${ctx.project} · ${(seat.persona || seat.agent)})`);
+    } else console.log(`  ✗ ${(seat.persona || seat.agent)} osascript spawn ERROR`);
     call("sleep", ["1.2"]);
   }
 }