trantor 0.18.95 → 0.18.96

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.95",
+  "version": "0.18.96",
   "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/hooks/sessionstart.mjs

@@ -405,6 +405,11 @@ try {
   // A RESUMED session must never claim a handoff: it already carries its history, so the takeover banner
   // would land in the same maxed-out context and look right while the window never reset.
   const isResume = source === "resume";
+  // A print-mode one-shot (`claude -p`) is never the successor either (#11577): SessionStart fires
+  // for it with source "startup" — the hook INPUT is indistinguishable from a human start — but
+  // the CLI marks the hook ENV (CLAUDE_CODE_ENTRYPOINT=sdk-cli; interactive "cli", SDKs sdk-*).
+  // Unguarded, it claimed the waiting handoff and superseded the live orchestrator.
+  const isPrintRun = String(process.env.CLAUDE_CODE_ENTRYPOINT || "cli").startsWith("sdk-");
   const orchEnv = process.env.TRANTOR_ORCH || "";
   const isOrchPane = !!orchEnv && (orchEnv === "1" || orchEnv === project);   // project-matched: a child claude in another dir must not inherit the badge
   const orchSid = readOrchSession(project);
@@ -413,19 +418,24 @@ try {
   const orchOrigin = !!(peek && orchSid && peek.session_id && peek.session_id === orchSid);
   const ageMs = peek ? Date.now() - (Number(peek.stamp) || 0) * 1000 : 0;
   const held = orchOrigin && !isOrchPane && !isCompact && ageMs < holdMs;
-  const handoff = !peek ? null
+  const handoff = !peek || isPrintRun ? null
     : (isCompact || held || isResume) ? peek
     : loadPendingHandoff(basename(projectDir), {
         claim: true,
         freshSession: { session_id: stdinObj.session_id || "", transcript_path: stdinObj.transcript_path || "" },
       });
   const claimed = !!handoff && !isCompact && !held && !isResume;
+  // The handoff banner never rides a one-shot either: it is not the successor and nobody asked it
+  // to recap, so a print start with a pending handoff gets one quiet stderr line and nothing else.
+  if (isPrintRun && peek && !isCompact) {
+    process.stderr.write(`[trantor] pending handoff ${peek.id} NOT claimed — print-mode one-shot (claude -p) is never the successor\n`);
+  }
   // Follow the thread: claiming the orchestrator's baton makes THIS session the orchestrator
   // thread, so the map `trantor open` resumes and the app's chat reads moves with it. The pane
   // also records itself on every fresh start — that keeps the map honest even if a future
   // claude forks the session id on resume.
   if (claimed && orchOrigin && stdinObj.session_id) writeOrchSession(project, String(stdinObj.session_id), "sessionstart-claim");
-  if (isOrchPane && !isCompact && stdinObj.session_id) writeOrchSession(project, String(stdinObj.session_id), "orch-pane-start");
+  if (isOrchPane && !isCompact && !isPrintRun && stdinObj.session_id) writeOrchSession(project, String(stdinObj.session_id), "orch-pane-start");
   if (handoff && held) {
     process.stderr.write(`[trantor] pending handoff ${handoff.id} HELD for the orch pane (${Math.round(ageMs / 60000)}m old)\n`);
     const mins = Math.max(1, Math.round((holdMs - ageMs) / 60000));

package/lib/project.mjs

@@ -1,17 +1,23 @@
 // trantor — canonical project identity (client side): one repo = one lane, keyed by the id recorded
 // in the checkout (.trantor/project.json) or, unmarked, by the git repo root basename; an explicit
 // RELAY_PROJECT always wins and the hub folds aliases on top.
-import { execSync } from "node:child_process";
+import { execSync, execFileSync } from "node:child_process";
 import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync, readdirSync, statSync, realpathSync } from "node:fs";
 import { basename, join, dirname, resolve, sep } from "node:path";
 import { homedir, hostname } from "node:os";
 import { asRecord, asString } from "./decode.mjs";
 
 export function gitRoot(dir) {
-  try {
-    return execSync(`git -C ${JSON.stringify(dir)} rev-parse --show-toplevel`,
-      { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 2000 }).trim();
-  } catch { return ""; }
+  // A loaded runner can miss the short deadline; retry timeouts, not non-repository errors (#11580).
+  for (const timeout of [2000, 10000]) {
+    try {
+      return execFileSync("git", ["-C", dir, "rev-parse", "--show-toplevel"],
+        { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout }).trim();
+    } catch (error) {
+      if (error.code !== "ETIMEDOUT") return "";
+    }
+  }
+  return "";
 }
 
 // A BUS SEAT WORKTREE is named for its project BY CONSTRUCTION — the bus creates

package/mcp.mjs

@@ -4,12 +4,10 @@
 // via the agent's MCP config. Identity + hub URL come from env (RELAY_SESSION, RELAY_URL).
 // Loading this server AUTO-REGISTERS the session — so presence works on every agent.
 import { writeFileSync, readFileSync, existsSync, mkdirSync } from "node:fs";
-import { join, basename, dirname } from "node:path";
+import { join, basename } from "node:path";
 import { homedir, hostname } from "node:os";
 import { execSync, spawnSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
-import { createRequire } from "node:module";
-import { fileURLToPath, pathToFileURL } from "node:url";
 import { advise, loadWorld } from "./bin/advise.mjs";
 import { loadSeatRecord } from "./lib/seat-record.mjs";
 import { resolveProject, hostId, resolveHubInfo, nonSeatReason, handoffDir, orchWriterSid } from "./lib/project.mjs";
@@ -20,43 +18,7 @@ import { assertNoSecrets } from "./lib/scrub.mjs";
 import { isMessageCardTitle, OPEN_CARD_STATUSES } from "./lib/turn-policy.mjs";
 import { markDoing, hollowVerdict, blastRadius, blastLine } from "./hooks/lib/hollow-move.mjs";
 
-// Runtime dep resolution: `claude plugin install` snapshots the repo, not an npm tarball, so a
-// GitHub-sourced plugin ships no node_modules and a static SDK import dies with
-// ERR_MODULE_NOT_FOUND before any line runs — silently: every relay tool just disappears.
-// Resolve ourselves: plain import(spec) first; on NOT_FOUND borrow the global trantor's tree.
-const HERE = dirname(fileURLToPath(import.meta.url));
-const req = createRequire(import.meta.url);
-
-let fallbackRoots = null;
-function borrowRoots() {
-  if (fallbackRoots) return fallbackRoots;
-  const roots = [];
-  const add = (p) => { if (p && !roots.includes(p)) roots.push(p); };
-  // Cheap guesses first — every one of these is a string join, no process spawn.
-  if (process.env.npm_config_prefix) add(join(process.env.npm_config_prefix, "lib", "node_modules"));
-  add(join(dirname(process.execPath), "..", "lib", "node_modules"));   // homebrew, nvm, volta, asdf
-  // Only shell out if the guesses missed — `npm root -g` costs ~0.5s of MCP startup.
-  if (!roots.some((r) => existsSync(join(r, "trantor")))) {
-    try { add(execSync("npm root -g", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim()); } catch {}
-  }
-  fallbackRoots = roots.flatMap((r) => [join(r, "trantor"), r]);
-  return fallbackRoots;
-}
-
-async function dep(spec) {
-  try {
-    return await import(spec);
-  } catch (err) {
-    if (err?.code !== "ERR_MODULE_NOT_FOUND" && err?.code !== "ERR_PACKAGE_PATH_NOT_EXPORTED") throw err;
-  }
-  for (const path of [HERE, ...borrowRoots()]) {
-    try { return await import(pathToFileURL(req.resolve(spec, { paths: [path] })).href); } catch {}
-  }
-  throw new Error(
-    `[trantor-mcp] cannot resolve '${spec}'. This plugin snapshot has no node_modules and no global ` +
-    `trantor install was found to borrow from. Fix: npm i -g trantor  (or: cd ${HERE} && npm install --omit=dev)`,
-  );
-}
+import { dep } from "./lib/dep.mjs";
 
 const { McpServer } = await dep("@modelcontextprotocol/sdk/server/mcp.js");
 const { StdioServerTransport } = await dep("@modelcontextprotocol/sdk/server/stdio.js");

package/package.json

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