@h-rig/cli 0.0.6-alpha.87 → 0.0.6-alpha.88

package/dist/src/app-opentui/adapters/tasks.js

@@ -65,6 +65,21 @@ function patchData(ctx, data) {
 function patchFooter(ctx, footer) {
   ctx.emit({ type: "footer.patch", footer });
 }
+async function releaseRendererForExternalTui(ctx) {
+  const renderer = ctx.renderer;
+  if (!renderer)
+    return;
+  if (renderer.suspend) {
+    await renderer.suspend();
+    return;
+  }
+  if (renderer.destroy) {
+    await renderer.destroy();
+  }
+}
+async function resumeRendererAfterExternalTui(ctx) {
+  await ctx.renderer?.resume?.();
+}
 function arrayFromPayload(value) {
   if (Array.isArray(value)) {
     return value.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
@@ -1714,6 +1729,14 @@ var init__async_ui = __esm(() => {
 });
 
 // packages/cli/src/commands/_pi-frontend.ts
+var exports__pi_frontend = {};
+__export(exports__pi_frontend, {
+  shouldRequireOperatorTranscript: () => shouldRequireOperatorTranscript,
+  runWithProcessExitGuard: () => runWithProcessExitGuard,
+  missingOperatorTranscriptMessage: () => missingOperatorTranscriptMessage,
+  buildOperatorPiEnv: () => buildOperatorPiEnv,
+  attachRunBundledPiFrontend: () => attachRunBundledPiFrontend
+});
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, mkdtempSync, readFileSync as readFileSync3, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir2, tmpdir } from "os";
 import { join } from "path";
@@ -1826,6 +1849,29 @@ function installRigPiTheme() {
     }
   } catch {}
 }
+async function runWithProcessExitGuard(body) {
+  const realExit = process.exit;
+  let exitCode = 0;
+  let signalQuit = () => {};
+  const quit = new Promise((resolve3) => {
+    signalQuit = resolve3;
+  });
+  const guardedExit = (code) => {
+    exitCode = typeof code === "number" ? code : 0;
+    signalQuit();
+    return;
+  };
+  process.exit = guardedExit;
+  try {
+    await Promise.race([Promise.resolve().then(body), quit]);
+  } finally {
+    process.exit = realExit;
+  }
+  return exitCode;
+}
+function runPiMainReturningOnQuit(args, options) {
+  return runWithProcessExitGuard(() => runPiMain(args, options));
+}
 async function attachRunBundledPiFrontend(context, input) {
   const tempSessionDir = mkdtempSync(join(tmpdir(), "rig-pi-frontend-sessions-"));
   const { server, sessionFileArg } = await withSpinner(`Opening Pi console for run ${input.runId}\u2026`, () => prepareOperatorConsole(context, input.runId, tempSessionDir), { outputMode: context.outputMode });
@@ -1841,16 +1887,20 @@ async function attachRunBundledPiFrontend(context, input) {
   };
   let detached = false;
   try {
-    await runPiMain([
+    const piArgs = [
       "--offline",
       "--no-extensions",
       "--no-skills",
       "--no-prompt-templates",
       "--no-context-files",
       ...sessionFileArg
-    ], {
-      extensionFactories: [piRigExtensionFactory]
-    });
+    ];
+    const piOptions = { extensionFactories: [piRigExtensionFactory] };
+    if (input.returnOnQuit) {
+      await runPiMainReturningOnQuit(piArgs, piOptions);
+    } else {
+      await runPiMain(piArgs, piOptions);
+    }
     detached = true;
   } finally {
     restoreEnv();
@@ -3238,390 +3288,6 @@ var init_task = __esm(() => {
   init__connection_state();
 });
 
-// packages/cli/src/app-opentui/pi-pty-host.ts
-import { fileURLToPath } from "url";
-import { basename } from "path";
-import { RGBA, StyledText, TextAttributes } from "@opentui/core";
-import { Terminal as XtermTerminal } from "@xterm/headless";
-function clampCols(cols) {
-  return Math.max(MIN_COLS, Math.trunc(cols || 100));
-}
-function clampRows(rows) {
-  return Math.max(MIN_ROWS, Math.min(MAX_ROWS, Math.trunc(rows || 35)));
-}
-function rgbaFromXtermColor(mode, value) {
-  if (mode === 1 || mode === 2 || mode === XTERM_COLOR_MODE_INDEXED_16 || mode === XTERM_COLOR_MODE_INDEXED_256) {
-    return RGBA.fromIndex(value);
-  }
-  if (mode === 3 || mode === XTERM_COLOR_MODE_RGB) {
-    return RGBA.fromInts(value >> 16 & 255, value >> 8 & 255, value & 255);
-  }
-  return;
-}
-function textAttributesFromCell(cell) {
-  let attributes = TextAttributes.NONE;
-  if (cell.isBold())
-    attributes |= TextAttributes.BOLD;
-  if (cell.isDim())
-    attributes |= TextAttributes.DIM;
-  if (cell.isItalic())
-    attributes |= TextAttributes.ITALIC;
-  if (cell.isUnderline())
-    attributes |= TextAttributes.UNDERLINE;
-  if (cell.isBlink())
-    attributes |= TextAttributes.BLINK;
-  if (cell.isInverse())
-    attributes |= TextAttributes.INVERSE;
-  if (cell.isInvisible())
-    attributes |= TextAttributes.HIDDEN;
-  if (cell.isStrikethrough())
-    attributes |= TextAttributes.STRIKETHROUGH;
-  return attributes;
-}
-function sameRgba(a, b) {
-  if (!a && !b)
-    return true;
-  return Boolean(a && b && a.equals(b));
-}
-function sameStyle(a, b) {
-  return sameRgba(a.fg, b.fg) && sameRgba(a.bg, b.bg) && (a.attributes ?? 0) === (b.attributes ?? 0);
-}
-function styleFromCell(cell) {
-  return {
-    fg: rgbaFromXtermColor(cell.getFgColorMode(), cell.getFgColor()),
-    bg: rgbaFromXtermColor(cell.getBgColorMode(), cell.getBgColor()),
-    attributes: textAttributesFromCell(cell)
-  };
-}
-function lineToStyledText(line, cols) {
-  if (!line)
-    return new StyledText([{ __isChunk: true, text: "" }]);
-  const chunks = [];
-  let run = "";
-  let runStyle = null;
-  const flush = () => {
-    if (!run)
-      return;
-    chunks.push({
-      __isChunk: true,
-      text: run,
-      ...runStyle?.fg ? { fg: runStyle.fg } : {},
-      ...runStyle?.bg ? { bg: runStyle.bg } : {},
-      ...(runStyle?.attributes ?? 0) !== 0 ? { attributes: runStyle.attributes } : {}
-    });
-    run = "";
-  };
-  for (let index = 0;index < cols; index += 1) {
-    const cell = line.getCell(index);
-    if (!cell) {
-      if (runStyle !== null)
-        flush();
-      runStyle = null;
-      run += " ";
-      continue;
-    }
-    if (cell.getWidth() === 0)
-      continue;
-    const style = styleFromCell(cell);
-    if (!runStyle || !sameStyle(runStyle, style)) {
-      flush();
-      runStyle = style;
-    }
-    run += cell.getChars() || " ";
-  }
-  flush();
-  return new StyledText(chunks.length > 0 ? chunks : [{ __isChunk: true, text: "" }]);
-}
-function childCommandPrefix() {
-  const execName = basename(process.execPath).toLowerCase();
-  const currentEntry = process.argv[1];
-  if (execName === "bun" || execName === "bun.exe") {
-    return currentEntry ? [process.execPath, currentEntry, "__opentui-pi-host"] : [process.execPath, fallbackChildScriptPath];
-  }
-  return [process.execPath, "__opentui-pi-host"];
-}
-function withEnv(base) {
-  const env = {};
-  for (const [key, value] of Object.entries(base ?? process.env)) {
-    if (key === "RIG_PLAIN" || key === "RIG_CLI_PLAIN_HELP" || key === "NO_COLOR")
-      continue;
-    if (typeof value === "string")
-      env[key] = value;
-  }
-  return {
-    ...env,
-    TERM: "xterm-256color",
-    COLORTERM: "truecolor",
-    FORCE_COLOR: env.FORCE_COLOR ?? "1",
-    RIG_OPENTUI_PI_HOST: "1"
-  };
-}
-async function startPiPtyHost(options) {
-  activeHost?.dispose("replace");
-  const host = new PiPtyHost(options);
-  activeHost = host;
-  await host.start();
-  return host;
-}
-
-class PiPtyHost {
-  runId;
-  projectRoot;
-  onSnapshot;
-  onExit;
-  onError;
-  terminal;
-  disposables = [];
-  decoder = new TextDecoder("utf-8");
-  proc = null;
-  pty = null;
-  status = "starting";
-  cols;
-  rows;
-  message = "starting bundled Pi";
-  lastResizeError = null;
-  exitCode;
-  signal;
-  notifyTimer = null;
-  lastStreamKey = "";
-  _disposed = false;
-  constructor(options) {
-    this.runId = options.runId;
-    this.projectRoot = options.projectRoot;
-    this.cols = clampCols(options.cols);
-    this.rows = clampRows(options.rows);
-    this.onSnapshot = options.onSnapshot;
-    this.onExit = options.onExit;
-    this.onError = options.onError;
-    this.terminal = new XtermTerminal({
-      allowProposedApi: true,
-      cols: this.cols,
-      rows: this.rows,
-      scrollback: 1000
-    });
-    this.registerTerminalResponders();
-    this.disposables.push(this.terminal.onWriteParsed(() => {
-      if (this._disposed)
-        return;
-      const snapshot = this.createSnapshot();
-      const key = snapshot.lines.join(`
-`);
-      if (key === this.lastStreamKey)
-        return;
-      this.lastStreamKey = key;
-      this.onSnapshot?.(snapshot);
-    }));
-  }
-  get disposed() {
-    return this._disposed;
-  }
-  get snapshot() {
-    return this.createSnapshot();
-  }
-  async start() {
-    if (this._disposed)
-      throw new Error("Pi PTY host is disposed.");
-    if (typeof Bun.Terminal !== "function") {
-      throw new Error("Bun native PTY is unavailable in this runtime. Pi host requires Bun.Terminal.");
-    }
-    const spawnOptions = {
-      cwd: this.projectRoot,
-      env: withEnv(process.env),
-      terminal: {
-        cols: this.cols,
-        rows: this.rows,
-        name: "xterm-256color",
-        data: (_terminal, data) => this.handlePtyData(data)
-      }
-    };
-    const proc = Bun.spawn([
-      ...childCommandPrefix(),
-      "--run-id",
-      this.runId,
-      "--project-root",
-      this.projectRoot
-    ], spawnOptions);
-    if (!proc.terminal)
-      throw new Error("Bun did not attach a terminal to the bundled Pi child process.");
-    this.proc = proc;
-    this.pty = proc.terminal;
-    this.status = "running";
-    this.message = "bundled Pi running inside this app";
-    this.emitSnapshotSoon(0);
-    proc.exited.then((exitCode) => {
-      if (this._disposed)
-        return;
-      this.status = exitCode === 0 ? "exited" : "failed";
-      this.exitCode = exitCode;
-      this.signal = null;
-      this.message = exitCode === 0 ? "bundled Pi exited" : `bundled Pi exited with code ${exitCode}`;
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onExit?.(snapshot);
-      if (activeHost === this)
-        activeHost = null;
-      this.dispose("exit", { kill: false, notify: false });
-    }).catch((error) => {
-      if (this._disposed)
-        return;
-      this.status = "failed";
-      this.message = error instanceof Error ? error.message : String(error);
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onError?.(error, snapshot);
-      if (activeHost === this)
-        activeHost = null;
-      this.dispose("error", { kill: false, notify: false });
-    });
-  }
-  write(data) {
-    if (this._disposed || !this.pty)
-      return;
-    try {
-      this.pty.write(data);
-    } catch (error) {
-      this.status = "failed";
-      this.message = error instanceof Error ? error.message : String(error);
-      const snapshot = this.createSnapshot();
-      this.onSnapshot?.(snapshot);
-      this.onError?.(error, snapshot);
-    }
-  }
-  resize(cols, rows) {
-    const nextCols = clampCols(cols);
-    const nextRows = clampRows(rows);
-    if (nextCols === this.cols && nextRows === this.rows)
-      return;
-    this.cols = nextCols;
-    this.rows = nextRows;
-    this.terminal.resize(nextCols, nextRows);
-    try {
-      this.pty?.resize(nextCols, nextRows);
-      this.lastResizeError = null;
-    } catch (error) {
-      this.lastResizeError = error instanceof Error ? error.message : String(error);
-    }
-    this.emitSnapshotSoon(0);
-  }
-  detach() {
-    this.dispose("detach");
-    return this.createSnapshot("detached from bundled Pi");
-  }
-  dispose(reason = "dispose", options = {}) {
-    if (this._disposed)
-      return;
-    this._disposed = true;
-    if (this.notifyTimer)
-      clearTimeout(this.notifyTimer);
-    this.notifyTimer = null;
-    for (const disposable of this.disposables.splice(0)) {
-      try {
-        disposable.dispose();
-      } catch {}
-    }
-    if (options.kill !== false) {
-      try {
-        this.proc?.kill("SIGTERM");
-      } catch {}
-    }
-    try {
-      this.pty?.close();
-    } catch {}
-    try {
-      this.terminal.dispose();
-    } catch {}
-    if (activeHost === this)
-      activeHost = null;
-    if (options.notify) {
-      this.message = reason;
-      this.onSnapshot?.(this.createSnapshot(reason));
-    }
-  }
-  handlePtyData(data) {
-    if (this._disposed)
-      return;
-    const text = this.decoder.decode(data, { stream: true });
-    this.respondToRawTerminalQueries(text);
-    this.terminal.write(data);
-  }
-  emitSnapshotSoon(delayMs = SNAPSHOT_DELAY_MS) {
-    if (this._disposed || this.notifyTimer)
-      return;
-    this.notifyTimer = setTimeout(() => {
-      this.notifyTimer = null;
-      if (this._disposed)
-        return;
-      this.onSnapshot?.(this.createSnapshot());
-    }, delayMs);
-  }
-  createSnapshot(message2 = this.message) {
-    const buffer = this.terminal.buffer.active;
-    const end = buffer.length;
-    const start = Math.max(0, end - MAX_SNAPSHOT_LINES);
-    const styledStart = Math.max(start, end - this.rows - STYLED_SNAPSHOT_MARGIN);
-    const lines = [];
-    const styledLines = [];
-    for (let row = start;row < end; row += 1) {
-      const line = buffer.getLine(row);
-      lines.push((line?.translateToString(false) ?? "").slice(0, this.cols));
-      if (row >= styledStart)
-        styledLines[lines.length - 1] = lineToStyledText(line, this.cols);
-    }
-    while (lines.length < this.rows) {
-      lines.push("");
-      styledLines[lines.length - 1] = new StyledText([{ __isChunk: true, text: "" }]);
-    }
-    const resolvedMessage = this.lastResizeError ? `resize degraded: ${this.lastResizeError}` : message2;
-    return {
-      runId: this.runId,
-      status: this.status,
-      cols: this.cols,
-      rows: this.rows,
-      lines,
-      styledLines,
-      message: resolvedMessage,
-      ...this.lastResizeError ? { resizeError: this.lastResizeError } : {},
-      ...this.exitCode !== undefined ? { exitCode: this.exitCode } : {},
-      ...this.signal !== undefined ? { signal: this.signal } : {}
-    };
-  }
-  registerTerminalResponders() {
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ final: "c" }, (params) => {
-      if (params.length === 0 || params[0] === 0)
-        this.write("\x1B[?62;22c");
-      return false;
-    }));
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ prefix: ">", final: "c" }, (params) => {
-      if (params.length === 0 || params[0] === 0)
-        this.write("\x1B[>0;0;0c");
-      return false;
-    }));
-    this.disposables.push(this.terminal.parser.registerCsiHandler({ final: "n" }, (params) => {
-      if (params[0] === 5) {
-        this.write("\x1B[0n");
-      } else if (params[0] === 6) {
-        const row = this.terminal.buffer.active.cursorY + 1;
-        const col = this.terminal.buffer.active.cursorX + 1;
-        this.write(`\x1B[${row};${col}R`);
-      }
-      return false;
-    }));
-  }
-  respondToRawTerminalQueries(text) {
-    if (!text)
-      return;
-    const decrqm = /\x1b\[\?(\d+)\$p/g;
-    let match;
-    while ((match = decrqm.exec(text)) !== null) {
-      this.write(`\x1B[?${match[1]};2$y`);
-    }
-  }
-}
-var MIN_COLS = 40, MIN_ROWS = 12, MAX_ROWS = 300, MAX_SNAPSHOT_LINES = 360, STYLED_SNAPSHOT_MARGIN = 6, SNAPSHOT_DELAY_MS = 120, fallbackChildScriptPath, activeHost = null, XTERM_COLOR_MODE_INDEXED_16 = 16777216, XTERM_COLOR_MODE_INDEXED_256 = 33554432, XTERM_COLOR_MODE_RGB = 50331648;
-var init_pi_pty_host = __esm(() => {
-  fallbackChildScriptPath = fileURLToPath(new URL("./pi-host-child.ts", import.meta.url));
-});
-
 // packages/cli/src/app-opentui/adapters/fleet.ts
 function normalizeRunRecord(record) {
   const runId = stringField(record, ["runId", "id"]);
@@ -3887,14 +3553,6 @@ function recordStep(ctx, runId, label, emitLabel) {
   });
   emitProgress(ctx, emitLabel, label);
 }
-function settleSteps(ctx, runId) {
-  const now = Date.now();
-  const previous = currentAttachState(ctx, runId);
-  if (!previous?.steps)
-    return;
-  const steps = previous.steps.map((step) => step.status === "running" ? { ...step, status: "done", endedAtMs: step.endedAtMs ?? now } : step);
-  patchData(ctx, { piAttach: { ...previous, steps } });
-}
 async function preparePiAttachHandoff(ctx, runId) {
   const cleanRunId = runId.trim();
   const label = `Preparing Pi ${cleanRunId.slice(0, 8)}`;
@@ -3942,85 +3600,41 @@ async function attachRunWithBundledPi(ctx, runId) {
     throw error;
   }
   emitStarted(ctx, label, { piAttach: { runId: cleanRunId, status: "entering-pi" } });
-  patchData(ctx, { piAttach: { runId: cleanRunId, status: "entering-pi", message: "starting bundled Pi", steps: [] } });
+  patchData(ctx, { piAttach: { runId: cleanRunId, status: "entering-pi", message: "handing the terminal to worker Pi\u2026" } });
+  const projectRoot = projectRootOf(ctx);
+  const outputMode = ctx.rig?.outputMode ?? "text";
+  await releaseRendererForExternalTui(ctx);
+  let outcome = null;
+  let attachError = null;
   try {
-    recordStep(ctx, cleanRunId, "connecting to server and fetching run transcript", label);
-    await preparePiAttachHandoff(ctx, cleanRunId).catch((error) => {
-      patchData(ctx, { lastRefreshError: normalizeAppError(error).message });
-      return null;
-    });
-    recordStep(ctx, cleanRunId, "spawning Bun PTY host for bundled Pi", label);
-    const projectRoot = projectRootOf(ctx);
-    const cols = typeof process.stdout.columns === "number" ? process.stdout.columns : 100;
-    const rows = Math.max(1, (typeof process.stdout.rows === "number" ? process.stdout.rows : 35) - 1);
-    const patchTerminal = (snapshot) => {
-      const previousSteps = currentAttachState(ctx, cleanRunId)?.steps;
-      const failed = snapshot.status === "failed";
-      const reason = failed ? snapshot.message ?? `bundled Pi exited with code ${snapshot.exitCode ?? "unknown"}` : undefined;
-      patchData(ctx, {
-        piTerminal: snapshot,
-        piAttach: {
-          runId: cleanRunId,
-          status: failed ? "failed" : snapshot.status === "exited" ? "returned" : "entering-pi",
-          message: snapshot.message ?? "bundled Pi running",
-          result: { runId: cleanRunId, status: snapshot.status, exitCode: snapshot.exitCode },
-          ...previousSteps ? { steps: previousSteps } : {},
-          ...reason ? { failureReason: reason } : {}
-        }
-      });
-    };
-    recordStep(ctx, cleanRunId, "starting bundled Pi", label);
-    await startPiPtyHost({
-      runId: cleanRunId,
-      projectRoot,
-      cols,
-      rows,
-      onSnapshot: (snapshot) => {
-        if (snapshot.status === "running" && snapshot.lines.some((entry) => entry.trim().length > 0)) {
-          settleSteps(ctx, cleanRunId);
-        }
-        patchTerminal(snapshot);
-      },
-      onExit: (snapshot) => {
-        patchTerminal(snapshot);
-        if (snapshot.status === "failed") {
-          Promise.resolve().then(() => (init_inspect(), exports_inspect)).then(({ loadInspect: loadInspect2 }) => loadInspect2(ctx, cleanRunId)).catch(() => null);
-          emitFailed(ctx, label, new Error(snapshot.message ?? `bundled Pi exited with code ${snapshot.exitCode ?? "unknown"}`), { runId: cleanRunId, result: { status: snapshot.status, exitCode: snapshot.exitCode } });
-          return;
-        }
-        emitCompleted(ctx, label, { runId: cleanRunId, result: { status: snapshot.status, exitCode: snapshot.exitCode } });
-        ctx.emit({ type: "scene.change", scene: "fleet", intent: { scene: "fleet", argv: ["runs"], action: { kind: "refresh", label: "Opening runs" } } });
-        refreshFleet(ctx).catch((error) => emitFailed(ctx, "Refresh runs", error));
-      },
-      onError: (error, snapshot) => {
-        patchTerminal(snapshot);
-        emitFailed(ctx, label, error, { runId: cleanRunId });
-      }
-    });
-    const record = {
-      runId: cleanRunId,
-      status: "running",
-      rendered: "bundled Pi embedded via Bun.Terminal + @xterm/headless"
-    };
-    emitProgress(ctx, label, "bundled Pi is running", { piAttach: { runId: cleanRunId, status: "entering-pi", message: "bundled Pi running", result: record } });
-    return record;
+    const { attachRunBundledPiFrontend: attachRunBundledPiFrontend2 } = await Promise.resolve().then(() => (init__pi_frontend(), exports__pi_frontend));
+    outcome = await attachRunBundledPiFrontend2({ projectRoot, outputMode }, { runId: cleanRunId, returnOnQuit: true });
   } catch (error) {
-    const reason = error instanceof Error ? error.message : String(error);
+    attachError = error;
+  } finally {
+    await resumeRendererAfterExternalTui(ctx);
+  }
+  if (attachError) {
+    const reason = normalizeAppError(attachError).message;
     patchData(ctx, {
-      piAttach: {
-        runId: cleanRunId,
-        status: "failed",
-        message: reason,
-        failureReason: reason,
-        ...currentAttachState(ctx, cleanRunId)?.steps ? { steps: currentAttachState(ctx, cleanRunId).steps } : {}
-      }
+      piTerminal: undefined,
+      piAttach: { runId: cleanRunId, status: "failed", message: reason, failureReason: reason }
     });
-    emitFailed(ctx, label, error, { runId: cleanRunId });
-    throw error;
+    Promise.resolve().then(() => (init_inspect(), exports_inspect)).then(({ loadInspect: loadInspect2 }) => loadInspect2(ctx, cleanRunId)).catch(() => null);
+    emitFailed(ctx, label, attachError, { runId: cleanRunId });
+    throw attachError;
   }
+  const detached = outcome?.detached === true;
+  patchData(ctx, {
+    piTerminal: undefined,
+    piAttach: { runId: cleanRunId, status: "returned", message: detached ? "detached from worker Pi" : "returned from worker Pi" }
+  });
+  emitCompleted(ctx, label, { runId: cleanRunId, result: { runId: cleanRunId, detached } });
+  ctx.emit({ type: "scene.change", scene: "fleet", intent: { scene: "fleet", argv: ["runs"], action: { kind: "refresh", label: "Opening runs" } } });
+  refreshFleet(ctx).catch((error) => emitFailed(ctx, "Refresh runs", error));
+  return { runId: cleanRunId, status: "returned", detached };
 }
 var init_pi_attach = __esm(() => {
-  init_pi_pty_host();
   init_fleet();
 });