@h-rig/cli 0.0.6-alpha.21 → 0.0.6-alpha.22

package/dist/src/commands/_operator-view.js

@@ -1,4 +1,6 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/cli/src/commands/_server-client.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
@@ -406,6 +408,50 @@ function createOperatorSurface(options = {}) {
 
 // packages/cli/src/commands/_operator-view.ts
 var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
+var CANONICAL_STAGES2 = [
+  "Connect",
+  "GitHub/task sync",
+  "Prepare workspace",
+  "Launch Pi",
+  "Plan",
+  "Implement",
+  "Validate",
+  "Commit",
+  "Open PR",
+  "Review/CI",
+  "Merge",
+  "Complete"
+];
+var GREEN = "\x1B[32m";
+var BLUE = "\x1B[34m";
+var MAGENTA = "\x1B[35m";
+var YELLOW = "\x1B[33m";
+var RED = "\x1B[31m";
+var DIM = "\x1B[2m";
+var BOLD = "\x1B[1m";
+var RESET = "\x1B[0m";
+async function loadPiTuiRuntime() {
+  try {
+    return await import("@earendil-works/pi-tui");
+  } catch {
+    const base = new URL("../../../pi/packages/tui/src/", import.meta.url);
+    const [tui, input, terminal, keys, utils] = await Promise.all([
+      import(new URL("tui.ts", base).href),
+      import(new URL("components/input.ts", base).href),
+      import(new URL("terminal.ts", base).href),
+      import(new URL("keys.ts", base).href),
+      import(new URL("utils.ts", base).href)
+    ]);
+    return {
+      Container: tui.Container,
+      TUI: tui.TUI,
+      Input: input.Input,
+      ProcessTerminal: terminal.ProcessTerminal,
+      matchesKey: keys.matchesKey,
+      truncateToWidth: utils.truncateToWidth
+    };
+  }
+}
 function runStatusFromPayload(payload) {
   const run = payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
   return String(run.status ?? "unknown").toLowerCase();
@@ -444,12 +490,201 @@ async function readOperatorSnapshot(context, runId, options = {}) {
   const timelineCursor = typeof timelinePage.nextCursor === "string" ? timelinePage.nextCursor : options.timelineCursor ?? null;
   return { run, logs, timeline, timelineCursor, rendered: renderOperatorSnapshot({ run, logs, timeline }) };
 }
+function unwrapRun(runPayload) {
+  return runPayload.run && typeof runPayload.run === "object" && !Array.isArray(runPayload.run) ? runPayload.run : runPayload;
+}
+function logDetail2(log) {
+  return typeof log.detail === "string" ? log.detail.trim() : "";
+}
+function logTitle(log) {
+  return typeof log.title === "string" ? log.title.trim() : "";
+}
+function renderAssistantTextFromTimeline(entries) {
+  const assistant = entries.filter((entry) => entry.type === "assistant_message" && typeof entry.text === "string").at(-1);
+  const text = typeof assistant?.text === "string" ? assistant.text.trimEnd() : "";
+  if (!text)
+    return [];
+  return [`${BLUE}${BOLD}Remote Pi assistant${RESET}`, ...text.split(/\r?\n/).slice(-18)];
+}
+function renderToolLines(entries) {
+  return entries.filter((entry) => entry.type === "tool_execution_start" || entry.type === "tool_execution_update" || entry.type === "tool_execution_end" || entry.type === "mcp_tool_call").slice(-8).map((entry) => `${DIM}[tool]${RESET} ${String(entry.toolName ?? entry.name ?? entry.title ?? entry.type)} ${String(entry.status ?? entry.state ?? "")}`.trim());
+}
+function renderStageLines(logs) {
+  const latestByStage = new Map;
+  for (const log of logs) {
+    const title = logTitle(log).toLowerCase();
+    const stageName = String(log.stage ?? "").toLowerCase();
+    const stage = CANONICAL_STAGES2.find((candidate) => candidate.toLowerCase() === title || candidate.toLowerCase() === stageName);
+    if (stage)
+      latestByStage.set(stage, log);
+  }
+  return CANONICAL_STAGES2.map((stage) => {
+    const log = latestByStage.get(stage);
+    const status = String(log?.status ?? "pending");
+    const detail = log ? logDetail2(log) : "";
+    const color = status === "completed" ? GREEN : status === "failed" || status === "rejected" ? RED : status === "pending" ? DIM : YELLOW;
+    const mark = status === "completed" ? "\u2713" : status === "pending" ? "\xB7" : status === "failed" ? "\u2717" : "\u25B6";
+    return `${color}${mark} ${stage}${RESET}${detail ? ` ${DIM}\u2014 ${detail.slice(0, 140)}${RESET}` : ""}`;
+  });
+}
+function renderEventLines(logs) {
+  return logs.filter((log) => !CANONICAL_STAGES2.some((stage) => stage.toLowerCase() === logTitle(log).toLowerCase())).slice(-12).flatMap((log) => {
+    const title = logTitle(log) || "Rig event";
+    const detail = logDetail2(log);
+    if (!detail)
+      return [];
+    const tone = String(log.tone ?? "");
+    const color = tone === "error" ? RED : tone === "tool" ? MAGENTA : DIM;
+    return [`${color}[${title}]${RESET} ${detail.slice(0, 220)}`];
+  });
+}
+
+class RigRunComponent {
+  truncateToWidth;
+  snapshot = { run: {}, logs: [], timeline: [] };
+  localEvents = [];
+  constructor(truncateToWidth) {
+    this.truncateToWidth = truncateToWidth;
+  }
+  update(snapshot) {
+    this.snapshot = snapshot;
+  }
+  addLocalEvent(message) {
+    this.localEvents.push(`${new Date().toLocaleTimeString()} ${message}`);
+    this.localEvents = this.localEvents.slice(-8);
+  }
+  invalidate() {}
+  render(width) {
+    const run = unwrapRun(this.snapshot.run);
+    const runId = String(run.runId ?? run.id ?? "run");
+    const status = String(run.status ?? "unknown");
+    const worker = typeof run.worktreePath === "string" && run.worktreePath.trim() ? run.worktreePath.trim() : typeof run.projectRoot === "string" && run.projectRoot.trim() ? run.projectRoot.trim() : "worker workspace pending";
+    const lines = [
+      `${BOLD}Rig Pi frontend${RESET} ${DIM}(local Pi TUI \u2192 Rig server \u2192 worker Pi backend)${RESET}`,
+      `${BOLD}${runId}${RESET} \xB7 ${status} \xB7 ${DIM}${worker}${RESET}`,
+      "",
+      `${BOLD}Rig flow${RESET}`,
+      ...renderStageLines(this.snapshot.logs ?? []),
+      "",
+      ...renderAssistantTextFromTimeline(this.snapshot.timeline ?? []),
+      ...renderToolLines(this.snapshot.timeline ?? []),
+      "",
+      `${BOLD}Rig / Pi events${RESET}`,
+      ...renderEventLines(this.snapshot.logs ?? []),
+      ...this.localEvents.map((event) => `${GREEN}[frontend]${RESET} ${event}`),
+      ""
+    ];
+    return lines.slice(-42).map((line) => this.truncateToWidth(line, Math.max(10, width)));
+  }
+}
+
+class RigInputComponent {
+  matchesKey;
+  truncateToWidth;
+  input;
+  status = "Type text, /skill:..., or remote Pi slash commands. Local: /stop /detach.";
+  constructor(InputCtor, matchesKey, truncateToWidth, onSubmit, onEscape) {
+    this.matchesKey = matchesKey;
+    this.truncateToWidth = truncateToWidth;
+    this.input = new InputCtor;
+    this.input.onSubmit = (value) => {
+      const text = value.trim();
+      this.input.setValue("");
+      if (text)
+        Promise.resolve(onSubmit(text));
+    };
+    this.input.onEscape = onEscape;
+  }
+  handleInput(data) {
+    if (this.matchesKey(data, "ctrl+d")) {
+      this.input.onEscape?.();
+      return;
+    }
+    this.input.handleInput?.(data);
+  }
+  setStatus(status) {
+    this.status = status;
+  }
+  invalidate() {
+    this.input.invalidate();
+  }
+  render(width) {
+    return [
+      `${DIM}${this.truncateToWidth(this.status, Math.max(10, width))}${RESET}`,
+      `${GREEN}${BOLD}You \u2192 worker Pi:${RESET}`,
+      ...this.input.render(width)
+    ];
+  }
+}
+async function attachRunPiTuiFrontend(context, input) {
+  const piTui = await loadPiTuiRuntime();
+  const terminal = new piTui.ProcessTerminal;
+  const tui = new piTui.TUI(terminal);
+  const root = new piTui.Container;
+  const runView = new RigRunComponent(piTui.truncateToWidth);
+  let detached = false;
+  let steered = input.steered === true;
+  let latest = await readOperatorSnapshot(context, input.runId);
+  let timelineCursor = latest.timelineCursor;
+  runView.update(latest);
+  if (steered)
+    runView.addLocalEvent("initial message queued to worker Pi.");
+  const stop = () => {
+    detached = true;
+    tui.stop();
+  };
+  const inputView = new RigInputComponent(piTui.Input, piTui.matchesKey, piTui.truncateToWidth, async (line) => {
+    if (line === "/detach" || line === "/quit" || line === "/q") {
+      runView.addLocalEvent("detached from run.");
+      stop();
+      return;
+    }
+    if (line === "/stop") {
+      await stopRunViaServer(context, input.runId);
+      runView.addLocalEvent("stop requested.");
+      stop();
+      return;
+    }
+    await steerRunViaServer(context, input.runId, line);
+    steered = true;
+    runView.addLocalEvent(`queued to worker Pi: ${line.slice(0, 160)}`);
+    tui.requestRender();
+  }, stop);
+  root.addChild(runView);
+  root.addChild(inputView);
+  tui.addChild(root);
+  tui.setFocus(inputView.input);
+  tui.start();
+  tui.requestRender(true);
+  const pollMs = Math.max(250, Math.trunc(input.pollMs ?? 1000));
+  try {
+    while (!detached && !TERMINAL_RUN_STATUSES.has(runStatusFromPayload(latest.run))) {
+      await Bun.sleep(pollMs);
+      latest = await readOperatorSnapshot(context, input.runId, { timelineCursor });
+      timelineCursor = latest.timelineCursor;
+      runView.update(latest);
+      inputView.setStatus(`Remote worker ${runStatusFromPayload(latest.run)}. Input is forwarded to worker Pi; /stop /detach are local controls.`);
+      tui.requestRender();
+    }
+  } finally {
+    if (!detached)
+      tui.stop();
+  }
+  return { ...latest, timelineCursor, steered, detached, rendered: renderOperatorSnapshot(latest) };
+}
 async function attachRunOperatorView(context, input) {
   let steered = false;
   if (input.message?.trim()) {
     await steerRunViaServer(context, input.runId, input.message.trim());
     steered = true;
   }
+  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+    return attachRunPiTuiFrontend(context, {
+      runId: input.runId,
+      pollMs: input.pollMs,
+      steered
+    });
+  }
   const surface = createOperatorSurface({ interactive: input.interactive !== false });
   let snapshot = await readOperatorSnapshot(context, input.runId);
   if (context.outputMode === "text") {

package/dist/src/commands/run.js

@@ -1,4 +1,6 @@
 // @bun
+var __require = import.meta.require;
+
 // packages/cli/src/commands/run.ts
 import { createInterface as createInterface2 } from "readline/promises";
 
@@ -10,9 +12,6 @@ import { PluginManager } from "@rig/runtime/control-plane/runtime/plugins";
 import { loadRuntimeContextFromEnv } from "@rig/runtime/control-plane/runtime/context";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
 import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
-function formatCommand(parts) {
-  return parts.map((part) => /[^a-zA-Z0-9_./:-]/.test(part) ? JSON.stringify(part) : part).join(" ");
-}
 function takeFlag(args, flag) {
   const rest = [];
   let value = false;
@@ -487,6 +486,50 @@ function createOperatorSurface(options = {}) {
 
 // packages/cli/src/commands/_operator-view.ts
 var TERMINAL_RUN_STATUSES = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
+var CANONICAL_STAGES2 = [
+  "Connect",
+  "GitHub/task sync",
+  "Prepare workspace",
+  "Launch Pi",
+  "Plan",
+  "Implement",
+  "Validate",
+  "Commit",
+  "Open PR",
+  "Review/CI",
+  "Merge",
+  "Complete"
+];
+var GREEN = "\x1B[32m";
+var BLUE = "\x1B[34m";
+var MAGENTA = "\x1B[35m";
+var YELLOW = "\x1B[33m";
+var RED = "\x1B[31m";
+var DIM = "\x1B[2m";
+var BOLD = "\x1B[1m";
+var RESET = "\x1B[0m";
+async function loadPiTuiRuntime() {
+  try {
+    return await import("@earendil-works/pi-tui");
+  } catch {
+    const base = new URL("../../../pi/packages/tui/src/", import.meta.url);
+    const [tui, input, terminal, keys, utils] = await Promise.all([
+      import(new URL("tui.ts", base).href),
+      import(new URL("components/input.ts", base).href),
+      import(new URL("terminal.ts", base).href),
+      import(new URL("keys.ts", base).href),
+      import(new URL("utils.ts", base).href)
+    ]);
+    return {
+      Container: tui.Container,
+      TUI: tui.TUI,
+      Input: input.Input,
+      ProcessTerminal: terminal.ProcessTerminal,
+      matchesKey: keys.matchesKey,
+      truncateToWidth: utils.truncateToWidth
+    };
+  }
+}
 function runStatusFromPayload(payload) {
   const run = payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
   return String(run.status ?? "unknown").toLowerCase();
@@ -525,12 +568,201 @@ async function readOperatorSnapshot(context, runId, options = {}) {
   const timelineCursor = typeof timelinePage.nextCursor === "string" ? timelinePage.nextCursor : options.timelineCursor ?? null;
   return { run, logs, timeline, timelineCursor, rendered: renderOperatorSnapshot({ run, logs, timeline }) };
 }
+function unwrapRun(runPayload) {
+  return runPayload.run && typeof runPayload.run === "object" && !Array.isArray(runPayload.run) ? runPayload.run : runPayload;
+}
+function logDetail2(log) {
+  return typeof log.detail === "string" ? log.detail.trim() : "";
+}
+function logTitle(log) {
+  return typeof log.title === "string" ? log.title.trim() : "";
+}
+function renderAssistantTextFromTimeline(entries) {
+  const assistant = entries.filter((entry) => entry.type === "assistant_message" && typeof entry.text === "string").at(-1);
+  const text = typeof assistant?.text === "string" ? assistant.text.trimEnd() : "";
+  if (!text)
+    return [];
+  return [`${BLUE}${BOLD}Remote Pi assistant${RESET}`, ...text.split(/\r?\n/).slice(-18)];
+}
+function renderToolLines(entries) {
+  return entries.filter((entry) => entry.type === "tool_execution_start" || entry.type === "tool_execution_update" || entry.type === "tool_execution_end" || entry.type === "mcp_tool_call").slice(-8).map((entry) => `${DIM}[tool]${RESET} ${String(entry.toolName ?? entry.name ?? entry.title ?? entry.type)} ${String(entry.status ?? entry.state ?? "")}`.trim());
+}
+function renderStageLines(logs) {
+  const latestByStage = new Map;
+  for (const log of logs) {
+    const title = logTitle(log).toLowerCase();
+    const stageName = String(log.stage ?? "").toLowerCase();
+    const stage = CANONICAL_STAGES2.find((candidate) => candidate.toLowerCase() === title || candidate.toLowerCase() === stageName);
+    if (stage)
+      latestByStage.set(stage, log);
+  }
+  return CANONICAL_STAGES2.map((stage) => {
+    const log = latestByStage.get(stage);
+    const status = String(log?.status ?? "pending");
+    const detail = log ? logDetail2(log) : "";
+    const color = status === "completed" ? GREEN : status === "failed" || status === "rejected" ? RED : status === "pending" ? DIM : YELLOW;
+    const mark = status === "completed" ? "\u2713" : status === "pending" ? "\xB7" : status === "failed" ? "\u2717" : "\u25B6";
+    return `${color}${mark} ${stage}${RESET}${detail ? ` ${DIM}\u2014 ${detail.slice(0, 140)}${RESET}` : ""}`;
+  });
+}
+function renderEventLines(logs) {
+  return logs.filter((log) => !CANONICAL_STAGES2.some((stage) => stage.toLowerCase() === logTitle(log).toLowerCase())).slice(-12).flatMap((log) => {
+    const title = logTitle(log) || "Rig event";
+    const detail = logDetail2(log);
+    if (!detail)
+      return [];
+    const tone = String(log.tone ?? "");
+    const color = tone === "error" ? RED : tone === "tool" ? MAGENTA : DIM;
+    return [`${color}[${title}]${RESET} ${detail.slice(0, 220)}`];
+  });
+}
+
+class RigRunComponent {
+  truncateToWidth;
+  snapshot = { run: {}, logs: [], timeline: [] };
+  localEvents = [];
+  constructor(truncateToWidth) {
+    this.truncateToWidth = truncateToWidth;
+  }
+  update(snapshot) {
+    this.snapshot = snapshot;
+  }
+  addLocalEvent(message) {
+    this.localEvents.push(`${new Date().toLocaleTimeString()} ${message}`);
+    this.localEvents = this.localEvents.slice(-8);
+  }
+  invalidate() {}
+  render(width) {
+    const run = unwrapRun(this.snapshot.run);
+    const runId = String(run.runId ?? run.id ?? "run");
+    const status = String(run.status ?? "unknown");
+    const worker = typeof run.worktreePath === "string" && run.worktreePath.trim() ? run.worktreePath.trim() : typeof run.projectRoot === "string" && run.projectRoot.trim() ? run.projectRoot.trim() : "worker workspace pending";
+    const lines = [
+      `${BOLD}Rig Pi frontend${RESET} ${DIM}(local Pi TUI \u2192 Rig server \u2192 worker Pi backend)${RESET}`,
+      `${BOLD}${runId}${RESET} \xB7 ${status} \xB7 ${DIM}${worker}${RESET}`,
+      "",
+      `${BOLD}Rig flow${RESET}`,
+      ...renderStageLines(this.snapshot.logs ?? []),
+      "",
+      ...renderAssistantTextFromTimeline(this.snapshot.timeline ?? []),
+      ...renderToolLines(this.snapshot.timeline ?? []),
+      "",
+      `${BOLD}Rig / Pi events${RESET}`,
+      ...renderEventLines(this.snapshot.logs ?? []),
+      ...this.localEvents.map((event) => `${GREEN}[frontend]${RESET} ${event}`),
+      ""
+    ];
+    return lines.slice(-42).map((line) => this.truncateToWidth(line, Math.max(10, width)));
+  }
+}
+
+class RigInputComponent {
+  matchesKey;
+  truncateToWidth;
+  input;
+  status = "Type text, /skill:..., or remote Pi slash commands. Local: /stop /detach.";
+  constructor(InputCtor, matchesKey, truncateToWidth, onSubmit, onEscape) {
+    this.matchesKey = matchesKey;
+    this.truncateToWidth = truncateToWidth;
+    this.input = new InputCtor;
+    this.input.onSubmit = (value) => {
+      const text = value.trim();
+      this.input.setValue("");
+      if (text)
+        Promise.resolve(onSubmit(text));
+    };
+    this.input.onEscape = onEscape;
+  }
+  handleInput(data) {
+    if (this.matchesKey(data, "ctrl+d")) {
+      this.input.onEscape?.();
+      return;
+    }
+    this.input.handleInput?.(data);
+  }
+  setStatus(status) {
+    this.status = status;
+  }
+  invalidate() {
+    this.input.invalidate();
+  }
+  render(width) {
+    return [
+      `${DIM}${this.truncateToWidth(this.status, Math.max(10, width))}${RESET}`,
+      `${GREEN}${BOLD}You \u2192 worker Pi:${RESET}`,
+      ...this.input.render(width)
+    ];
+  }
+}
+async function attachRunPiTuiFrontend(context, input) {
+  const piTui = await loadPiTuiRuntime();
+  const terminal = new piTui.ProcessTerminal;
+  const tui = new piTui.TUI(terminal);
+  const root = new piTui.Container;
+  const runView = new RigRunComponent(piTui.truncateToWidth);
+  let detached = false;
+  let steered = input.steered === true;
+  let latest = await readOperatorSnapshot(context, input.runId);
+  let timelineCursor = latest.timelineCursor;
+  runView.update(latest);
+  if (steered)
+    runView.addLocalEvent("initial message queued to worker Pi.");
+  const stop = () => {
+    detached = true;
+    tui.stop();
+  };
+  const inputView = new RigInputComponent(piTui.Input, piTui.matchesKey, piTui.truncateToWidth, async (line) => {
+    if (line === "/detach" || line === "/quit" || line === "/q") {
+      runView.addLocalEvent("detached from run.");
+      stop();
+      return;
+    }
+    if (line === "/stop") {
+      await stopRunViaServer(context, input.runId);
+      runView.addLocalEvent("stop requested.");
+      stop();
+      return;
+    }
+    await steerRunViaServer(context, input.runId, line);
+    steered = true;
+    runView.addLocalEvent(`queued to worker Pi: ${line.slice(0, 160)}`);
+    tui.requestRender();
+  }, stop);
+  root.addChild(runView);
+  root.addChild(inputView);
+  tui.addChild(root);
+  tui.setFocus(inputView.input);
+  tui.start();
+  tui.requestRender(true);
+  const pollMs = Math.max(250, Math.trunc(input.pollMs ?? 1000));
+  try {
+    while (!detached && !TERMINAL_RUN_STATUSES.has(runStatusFromPayload(latest.run))) {
+      await Bun.sleep(pollMs);
+      latest = await readOperatorSnapshot(context, input.runId, { timelineCursor });
+      timelineCursor = latest.timelineCursor;
+      runView.update(latest);
+      inputView.setStatus(`Remote worker ${runStatusFromPayload(latest.run)}. Input is forwarded to worker Pi; /stop /detach are local controls.`);
+      tui.requestRender();
+    }
+  } finally {
+    if (!detached)
+      tui.stop();
+  }
+  return { ...latest, timelineCursor, steered, detached, rendered: renderOperatorSnapshot(latest) };
+}
 async function attachRunOperatorView(context, input) {
   let steered = false;
   if (input.message?.trim()) {
     await steerRunViaServer(context, input.runId, input.message.trim());
     steered = true;
   }
+  if (input.follow && !input.once && input.interactive !== false && context.outputMode === "text" && Boolean(process.stdin.isTTY && process.stdout.isTTY)) {
+    return attachRunPiTuiFrontend(context, {
+      runId: input.runId,
+      pollMs: input.pollMs,
+      steered
+    });
+  }
   const surface = createOperatorSurface({ interactive: input.interactive !== false });
   let snapshot = await readOperatorSnapshot(context, input.runId);
   if (context.outputMode === "text") {
@@ -622,105 +854,6 @@ function formatRunList(runs, options = {}) {
 `);
 }
 
-// packages/cli/src/commands/_pi-session.ts
-import { spawn } from "child_process";
-
-// packages/cli/src/commands/_pi-install.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, rmSync } from "fs";
-import { resolve as resolve3 } from "path";
-var PI_RIG_PACKAGE_NAME = "@h-rig/pi-rig";
-function resolvePiRigPackageSource(projectRoot, exists = existsSync3) {
-  const localPackage = resolve3(projectRoot, "packages", "pi-rig");
-  if (exists(resolve3(localPackage, "package.json")))
-    return localPackage;
-  return `npm:${PI_RIG_PACKAGE_NAME}`;
-}
-
-// packages/cli/src/commands/_pi-session.ts
-function buildPiRigSessionEnv(input) {
-  return {
-    RIG_PROJECT_ROOT: input.projectRoot,
-    PROJECT_RIG_ROOT: input.projectRoot,
-    RIG_RUN_ID: input.runId,
-    RIG_SERVER_RUN_ID: input.runId,
-    RIG_RUNTIME_ADAPTER: "pi",
-    RIG_SERVER_URL: input.serverUrl,
-    RIG_SERVER_BASE_URL: input.serverUrl,
-    RIG_STEERING_POLL_MS: process.env.RIG_STEERING_POLL_MS?.trim() || "1000",
-    RIG_PI_OPERATOR_SESSION: "1",
-    ...input.taskId ? { RIG_TASK_ID: input.taskId } : {},
-    ...input.authToken ? { RIG_AUTH_TOKEN: input.authToken } : {}
-  };
-}
-function shellBinary(name) {
-  const explicit = process.env.RIG_PI_BINARY?.trim();
-  if (explicit)
-    return explicit;
-  return Bun.which(name) || name;
-}
-function buildPiRigSessionCommand(input) {
-  const configuredExtension = input.extensionSource ?? process.env.RIG_PI_RIG_EXTENSION_SOURCE?.trim();
-  const extensionSource = configuredExtension && configuredExtension.length > 0 ? configuredExtension : resolvePiRigPackageSource(input.projectRoot);
-  const initialCommand = `/rig attach ${input.runId}`;
-  return [
-    shellBinary("pi"),
-    "--no-extensions",
-    "--extension",
-    extensionSource,
-    initialCommand
-  ];
-}
-async function launchPiRigSession(context, input) {
-  if (context.outputMode !== "text" || !process.stdin.isTTY || !process.stdout.isTTY) {
-    return { launched: false, exitCode: null, command: [] };
-  }
-  if (process.env.RIG_DISABLE_PI_LAUNCH === "1") {
-    return { launched: false, exitCode: null, command: [] };
-  }
-  const server = await ensureServerForCli(context.projectRoot);
-  const command = buildPiRigSessionCommand({ ...input, projectRoot: context.projectRoot });
-  const env = {
-    ...process.env,
-    ...buildPiRigSessionEnv({
-      projectRoot: context.projectRoot,
-      runId: input.runId,
-      taskId: input.taskId,
-      serverUrl: server.baseUrl,
-      authToken: server.authToken
-    })
-  };
-  process.stdout.write(`Launching Pi for Rig run ${input.runId}\u2026
-`);
-  process.stdout.write(`Pi command: ${formatCommand(command)}
-`);
-  const launchedAt = Date.now();
-  const child = spawn(command[0], command.slice(1), {
-    cwd: context.projectRoot,
-    env,
-    stdio: "inherit"
-  });
-  const launchError = await new Promise((resolve4) => {
-    child.once("error", (error) => {
-      resolve4({ error: error.message });
-    });
-    child.once("close", (code) => resolve4({ code }));
-  });
-  if ("error" in launchError) {
-    process.stderr.write(`Failed to launch Pi; falling back to Rig attach view: ${launchError.error}
-`);
-    return { launched: false, exitCode: null, command, error: launchError.error };
-  }
-  const exitCode = launchError.code;
-  const elapsedMs = Date.now() - launchedAt;
-  if (typeof exitCode === "number" && exitCode !== 0 && elapsedMs < 5000) {
-    const error = `Pi exited during startup with code ${exitCode}.`;
-    process.stderr.write(`${error} Falling back to Rig attach view.
-`);
-    return { launched: false, exitCode, command, error };
-  }
-  return { launched: true, exitCode, command };
-}
-
 // packages/cli/src/commands/run.ts
 function normalizeRemoteRunDetails(payload) {
   const run = payload.run;
@@ -945,20 +1078,13 @@ async function executeRun(context, args) {
         throw new CliError2("run attach requires a run id.", 2);
       }
       let steered = false;
-      const shouldTryPiAttach = context.outputMode === "text" && follow.value && !once.value && Boolean(process.stdin.isTTY && process.stdout.isTTY) && process.env.RIG_DISABLE_PI_LAUNCH !== "1";
-      if (shouldTryPiAttach && messageOption.value?.trim()) {
+      if (messageOption.value?.trim()) {
         await steerRunViaServer(context, runId, messageOption.value.trim());
         steered = true;
       }
-      if (shouldTryPiAttach) {
-        const piSession = await launchPiRigSession(context, { runId });
-        if (piSession.launched) {
-          return { ok: true, group: "run", command, details: { runId, steered, mode: "pi", ...piSession } };
-        }
-      }
       const attached = await attachRunOperatorView(context, {
         runId,
-        message: shouldTryPiAttach ? null : messageOption.value ?? null,
+        message: null,
         once: once.value,
         follow: follow.value,
         pollMs: parsePositiveInt(pollMs.value, "--poll-ms", 2000)