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

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

@@ -1,6 +1,4 @@
 // @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";
@@ -229,6 +227,66 @@ async function steerRunViaServer(context, runId, message) {
   });
   return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
 }
+async function getRunPiSessionViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+}
+async function getRunPiMessagesViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/messages`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { messages: [] };
+}
+async function getRunPiStatusViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/status`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
+}
+async function getRunPiCommandsViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/commands`);
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { commands: [] };
+}
+async function sendRunPiPromptViaServer(context, runId, text, streamingBehavior) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/prompt`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ text, streamingBehavior })
+  });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { accepted: true };
+}
+async function sendRunPiShellViaServer(context, runId, text) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/shell`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ text })
+  });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { accepted: true };
+}
+async function runRunPiCommandViaServer(context, runId, text) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/commands/run`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ text })
+  });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { type: "done" };
+}
+async function respondRunPiExtensionUiViaServer(context, runId, requestId, valueOrCancel) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/extension-ui/respond`, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ requestId, ...valueOrCancel })
+  });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { accepted: true };
+}
+async function abortRunPiViaServer(context, runId) {
+  const payload = await requestServerJson(context, `/api/runs/${encodeURIComponent(runId)}/pi/abort`, { method: "POST" });
+  return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { aborted: true };
+}
+async function buildRunPiEventsWebSocketUrl(context, runId) {
+  const server = await ensureServerForCli(context.projectRoot);
+  const url = new URL(`${server.baseUrl.replace(/\/+$/, "")}/api/runs/${encodeURIComponent(runId)}/pi/events`);
+  url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+  if (server.authToken)
+    url.searchParams.set("token", server.authToken);
+  return url.toString();
+}
 
 // packages/cli/src/commands/_operator-surface.ts
 import { createInterface } from "readline";
@@ -406,52 +464,593 @@ function createOperatorSurface(options = {}) {
   };
 }
 
-// packages/cli/src/commands/_operator-view.ts
+// packages/cli/src/commands/_pi-frontend.ts
+import { mkdtempSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { main as runPiMain } from "@earendil-works/pi-coding-agent";
+
+// packages/cli/src/commands/_pi-worker-bridge-extension.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() {
+var MAX_TRANSCRIPT_LINES = 120;
+function recordOf(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function asText(value) {
+  if (typeof value === "string")
+    return value;
+  if (value === null || value === undefined)
+    return "";
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
   try {
-    return await import("@earendil-works/pi-tui");
+    return JSON.stringify(value);
   } 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 String(value);
+  }
+}
+function textFromContent(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return asText(content);
+  return content.flatMap((part) => {
+    const item = recordOf(part);
+    if (!item)
+      return [];
+    if (typeof item.text === "string")
+      return [item.text];
+    if (typeof item.content === "string")
+      return [item.content];
+    if (item.type === "toolCall")
+      return [`\u23FA ${String(item.name ?? "tool")} ${asText(item.arguments ?? "")}`.trim()];
+    if (item.type === "toolResult")
+      return [`\u21B3 ${asText(item.content ?? item.result ?? "")}`.trim()];
+    return [];
+  }).join(`
+`);
+}
+function appendTranscript(state, label, text) {
+  const trimmed = text.trimEnd();
+  if (!trimmed)
+    return;
+  const lines = trimmed.split(/\r?\n/);
+  state.transcript.push(`${label}: ${lines[0] ?? ""}`);
+  for (const line of lines.slice(1))
+    state.transcript.push(`  ${line}`);
+  if (state.transcript.length > MAX_TRANSCRIPT_LINES) {
+    state.transcript.splice(0, state.transcript.length - MAX_TRANSCRIPT_LINES);
+  }
+}
+function nativePiUi(ctx) {
+  const ui = ctx.ui;
+  return typeof ui.emitSessionEvent === "function" && typeof ui.appendSessionMessages === "function" ? ui : null;
+}
+function syncNativeDisplayCwd(ctx, state) {
+  const ui = nativePiUi(ctx);
+  if (ui?.setDisplayCwd && state.cwd)
+    ui.setDisplayCwd(state.cwd);
+}
+function parseExtensionUiRequest(value) {
+  const request = recordOf(value) ?? {};
+  const requestId = String(request.requestId ?? request.id ?? `ui-${Date.now()}`);
+  const method = String(request.method ?? request.type ?? "input");
+  const prompt = asText(request.prompt ?? request.message ?? request.title ?? method);
+  const rawOptions = Array.isArray(request.options) ? request.options : Array.isArray(request.items) ? request.items : [];
+  const options = rawOptions.map((option) => {
+    const record = recordOf(option);
+    return record ? asText(record.label ?? record.value ?? record.name ?? option) : asText(option);
+  }).filter(Boolean);
+  return { requestId, method, prompt, options };
+}
+function renderBridgeWidget(state) {
+  const statusParts = [
+    state.wsConnected ? "live WS" : "WS pending",
+    state.status,
+    state.model,
+    state.cwd
+  ].filter(Boolean);
+  const lines = [`Worker Pi daemon bridge \xB7 ${statusParts.join(" \xB7 ")}`];
+  if (state.activity)
+    lines.push(state.activity);
+  if (state.commands.length > 0) {
+    lines.push(`Worker commands: ${state.commands.slice(0, 10).join(", ")}${state.commands.length > 10 ? ", \u2026" : ""}`);
+  }
+  lines.push("");
+  if (state.transcript.length > 0) {
+    lines.push(...state.transcript.slice(-MAX_TRANSCRIPT_LINES));
+  } else {
+    lines.push("Waiting for worker Pi daemon transcript\u2026");
+  }
+  if (state.pendingUi) {
+    lines.push("");
+    lines.push(`Extension UI request \xB7 ${state.pendingUi.method}`);
+    lines.push(state.pendingUi.prompt);
+    state.pendingUi.options.forEach((option, index) => lines.push(`${index + 1}. ${option}`));
+    lines.push("Reply in the Pi editor. /cancel cancels this request.");
+  }
+  return lines;
+}
+function updatePiUi(ctx, state) {
+  ctx.ui.setTitle("Pi \xB7 Rig worker daemon");
+  ctx.ui.setStatus("rig-worker-pi", state.wsConnected ? "worker Pi WS live" : state.status);
+  syncNativeDisplayCwd(ctx, state);
+  if (state.nativeStream && nativePiUi(ctx)) {
+    ctx.ui.setWidget("rig-worker-pi-transcript", undefined);
+    return;
+  }
+  ctx.ui.setWorkingVisible(false);
+  ctx.ui.setWidget("rig-worker-pi-transcript", [`Worker Pi daemon bridge \xB7 degraded widget transcript`, ...renderBridgeWidget(state)], { placement: "aboveEditor" });
+}
+function applyStatus(state, payload) {
+  const status = recordOf(payload.status) ?? payload;
+  state.streaming = status.isStreaming === true || status.isCompacting === true || status.isBashRunning === true;
+  state.cwd = typeof status.cwd === "string" ? status.cwd : state.cwd;
+  state.model = typeof status.model === "string" ? status.model : state.model;
+  const pending = typeof status.pendingMessageCount === "number" ? status.pendingMessageCount : 0;
+  state.status = `${state.streaming ? "streaming" : "idle"}${pending ? ` \xB7 ${pending} queued` : ""}`;
+}
+function applyMessage(state, message) {
+  const record = recordOf(message);
+  if (!record)
+    return;
+  const role = String(record.role ?? "system");
+  const label = role === "assistant" ? "Pi" : role === "user" ? "You" : role === "tool" || role === "toolResult" ? "Tool" : "System";
+  appendTranscript(state, label, textFromContent(record.content ?? record.message ?? record.text ?? ""));
+}
+function applyPiEvent(ctx, state, eventValue) {
+  const event = recordOf(eventValue);
+  if (!event)
+    return;
+  const type = String(event.type ?? "event");
+  if (type === "agent_start") {
+    state.streaming = true;
+    state.status = "streaming";
+  } else if (type === "agent_end") {
+    state.streaming = false;
+    state.status = "idle";
+  } else if (type === "queue_update") {
+    const steering = Array.isArray(event.steering) ? event.steering.length : 0;
+    const followUp = Array.isArray(event.followUp) ? event.followUp.length : 0;
+    state.status = `queued \xB7 steer ${steering} \xB7 follow-up ${followUp}`;
+  }
+  const native = nativePiUi(ctx);
+  if (state.nativeStream && native?.emitSessionEvent) {
+    native.emitSessionEvent(eventValue);
+    return;
+  }
+  if (type === "agent_end") {
+    appendTranscript(state, "System", "Agent turn complete.");
+    return;
+  }
+  if (type === "message_start" || type === "message_end" || type === "turn_end") {
+    applyMessage(state, event.message);
+    return;
+  }
+  if (type === "message_update") {
+    const assistantEvent = recordOf(event.assistantMessageEvent);
+    const delta = typeof assistantEvent?.delta === "string" ? assistantEvent.delta : typeof assistantEvent?.text === "string" ? assistantEvent.text : "";
+    if (delta)
+      appendTranscript(state, assistantEvent?.type === "thinking_delta" ? "Thinking" : "Pi", delta);
+    return;
+  }
+  if (type === "tool_execution_start") {
+    appendTranscript(state, "Tool", `${String(event.toolName ?? "tool")} ${asText(event.args ?? "")}`.trim());
+    return;
+  }
+  if (type === "tool_execution_update") {
+    appendTranscript(state, "Tool", asText(event.partialResult ?? ""));
+    return;
+  }
+  if (type === "tool_execution_end") {
+    appendTranscript(state, event.isError === true ? "Error" : "Tool", asText(event.result ?? `${String(event.toolName ?? "tool")} complete`));
+  }
+}
+function firstPendingShell(state) {
+  return state.pendingShells[0];
+}
+function finishPendingShell(state, shell, result) {
+  const index = state.pendingShells.indexOf(shell);
+  if (index !== -1)
+    state.pendingShells.splice(index, 1);
+  shell.resolve(result);
+}
+function failPendingShell(state, shell, error) {
+  const index = state.pendingShells.indexOf(shell);
+  if (index !== -1)
+    state.pendingShells.splice(index, 1);
+  shell.reject(error);
+}
+function applyUiEvent(state, value) {
+  const event = recordOf(value);
+  if (!event)
+    return;
+  const type = String(event.type ?? "ui");
+  if (type === "shell.chunk") {
+    const pending = firstPendingShell(state);
+    const chunk = asText(event.chunk);
+    if (pending) {
+      pending.sawChunk = true;
+      pending.onData(Buffer.from(chunk));
+    } else {
+      appendTranscript(state, "Tool", chunk);
+    }
+    return;
+  }
+  if (type === "shell.end") {
+    const pending = firstPendingShell(state);
+    const output = asText(event.output ?? "");
+    const exitCode = typeof event.exitCode === "number" ? event.exitCode : event.isError === true ? 1 : 0;
+    if (pending) {
+      if (output && !pending.sawChunk)
+        pending.onData(Buffer.from(output));
+      finishPendingShell(state, pending, { exitCode });
+    } else {
+      appendTranscript(state, event.isError === true ? "Error" : "Tool", output || `exit ${String(exitCode)}`);
+    }
+    return;
+  }
+  if (type === "shell.start") {
+    if (!firstPendingShell(state))
+      appendTranscript(state, "Tool", `$ ${asText(event.command)}`);
+    return;
+  }
+  appendTranscript(state, "System", `${type}: ${asText(event)}`);
+}
+function applyEnvelope(ctx, state, envelopeValue) {
+  const envelope = recordOf(envelopeValue);
+  if (!envelope)
+    return;
+  const type = String(envelope.type ?? "");
+  if (type === "ready") {
+    const metadata = recordOf(envelope.metadata);
+    state.cwd = typeof metadata?.cwd === "string" ? metadata.cwd : state.cwd;
+    state.status = "worker Pi daemon ready";
+    if (!state.nativeStream)
+      appendTranscript(state, "System", "Connected to worker Pi daemon.");
+  } else if (type === "status.update") {
+    applyStatus(state, envelope);
+  } else if (type === "activity.update") {
+    const activity = recordOf(envelope.activity);
+    state.activity = [activity?.label, activity?.detail].map(asText).filter(Boolean).join(" \u2014 ");
+  } else if (type === "extension_ui_request") {
+    state.pendingUi = parseExtensionUiRequest(envelope.request);
+    appendTranscript(state, "System", `Extension UI request: ${state.pendingUi.prompt}`);
+  } else if (type === "pi.ui_event") {
+    applyUiEvent(state, envelope.event);
+  } else if (type === "pi.event") {
+    applyPiEvent(ctx, state, envelope.event);
+  } else if (type === "error") {
+    appendTranscript(state, "Error", asText(envelope.message ?? envelope.detail ?? "unknown error"));
+  }
+  syncNativeDisplayCwd(ctx, state);
+}
+async function waitForWorkerReady(options, ctx, state) {
+  while (true) {
+    const session = await getRunPiSessionViaServer(options.context, options.runId).catch((error) => ({
+      ready: false,
+      status: error instanceof Error ? error.message : String(error),
+      retryAfterMs: 1000
+    }));
+    if (session.ready === false) {
+      const status = String(session.status ?? "starting");
+      state.status = `waiting for worker Pi daemon \xB7 ${status}`;
+      updatePiUi(ctx, state);
+      if (TERMINAL_RUN_STATUSES.has(status.toLowerCase())) {
+        appendTranscript(state, "Error", `Run ended before worker Pi daemon became ready: ${status}`);
+        return false;
+      }
+      await Bun.sleep(typeof session.retryAfterMs === "number" ? session.retryAfterMs : 750);
+      continue;
+    }
+    const sessionRecord = recordOf(session) ?? {};
+    applyEnvelope(ctx, state, { type: "ready", metadata: sessionRecord.metadata ?? sessionRecord });
+    updatePiUi(ctx, state);
+    return true;
+  }
+}
+function parseWsPayload(message) {
+  if (typeof message.data === "string")
+    return JSON.parse(message.data);
+  return JSON.parse(Buffer.from(message.data).toString("utf8"));
+}
+async function connectWorkerStream(options, ctx, state) {
+  const ready = await waitForWorkerReady(options, ctx, state);
+  if (!ready)
+    return;
+  let catchupDone = false;
+  const buffered = [];
+  const wsUrl = await buildRunPiEventsWebSocketUrl(options.context, options.runId);
+  const socket = new WebSocket(wsUrl);
+  const closePromise = new Promise((resolve3) => {
+    socket.onopen = () => {
+      state.wsConnected = true;
+      state.status = "live worker Pi WebSocket connected";
+      updatePiUi(ctx, state);
+    };
+    socket.onmessage = (message) => {
+      try {
+        const payload = parseWsPayload(message);
+        if (!catchupDone)
+          buffered.push(payload);
+        else {
+          applyEnvelope(ctx, state, payload);
+          updatePiUi(ctx, state);
+        }
+      } catch (error) {
+        appendTranscript(state, "Error", `Unparseable worker Pi event: ${error instanceof Error ? error.message : String(error)}`);
+        updatePiUi(ctx, state);
+      }
+    };
+    socket.onerror = () => socket.close();
+    socket.onclose = () => {
+      state.wsConnected = false;
+      state.status = "worker Pi WebSocket disconnected";
+      updatePiUi(ctx, state);
+      resolve3();
+    };
+  });
+  try {
+    const [messagesPayload, statusPayload, commandsPayload] = await Promise.all([
+      getRunPiMessagesViaServer(options.context, options.runId),
+      getRunPiStatusViaServer(options.context, options.runId),
+      getRunPiCommandsViaServer(options.context, options.runId)
     ]);
-    return {
-      Container: tui.Container,
-      TUI: tui.TUI,
-      Input: input.Input,
-      ProcessTerminal: terminal.ProcessTerminal,
-      matchesKey: keys.matchesKey,
-      truncateToWidth: utils.truncateToWidth
+    const messages = Array.isArray(messagesPayload.messages) ? messagesPayload.messages : [];
+    const native = nativePiUi(ctx);
+    if (state.nativeStream && native?.appendSessionMessages)
+      native.appendSessionMessages(messages);
+    else
+      for (const message of messages)
+        applyMessage(state, message);
+    applyStatus(state, statusPayload);
+    const commands = Array.isArray(commandsPayload.commands) ? commandsPayload.commands : [];
+    state.commands = commands.flatMap((command) => {
+      const record = recordOf(command);
+      return typeof record?.name === "string" ? [`/${record.name}`] : [];
+    });
+    catchupDone = true;
+    for (const payload of buffered.splice(0))
+      applyEnvelope(ctx, state, payload);
+    updatePiUi(ctx, state);
+  } catch (error) {
+    appendTranscript(state, "Error", `Worker Pi catch-up failed: ${error instanceof Error ? error.message : String(error)}`);
+    catchupDone = true;
+    updatePiUi(ctx, state);
+  }
+  await closePromise;
+}
+function createRemoteBashOperations(options, state, excludeFromContext) {
+  return {
+    exec(command, _cwd, execOptions) {
+      return new Promise((resolve3, reject) => {
+        const pending = {
+          command,
+          onData: execOptions.onData,
+          resolve: resolve3,
+          reject,
+          sawChunk: false
+        };
+        const cleanup = () => {
+          execOptions.signal?.removeEventListener("abort", onAbort);
+          if (timer)
+            clearTimeout(timer);
+        };
+        const onAbort = () => {
+          cleanup();
+          failPendingShell(state, pending, new Error("Remote worker shell command aborted locally."));
+        };
+        const timeoutMs = typeof execOptions.timeout === "number" && execOptions.timeout > 0 ? execOptions.timeout : 0;
+        const timer = timeoutMs > 0 ? setTimeout(() => {
+          cleanup();
+          failPendingShell(state, pending, new Error(`Remote worker shell command timed out after ${timeoutMs}ms.`));
+        }, timeoutMs) : null;
+        const wrappedResolve = pending.resolve;
+        const wrappedReject = pending.reject;
+        pending.resolve = (result) => {
+          cleanup();
+          wrappedResolve(result);
+        };
+        pending.reject = (error) => {
+          cleanup();
+          wrappedReject(error);
+        };
+        execOptions.signal?.addEventListener("abort", onAbort, { once: true });
+        state.pendingShells.push(pending);
+        sendRunPiShellViaServer(options.context, options.runId, `${excludeFromContext ? "!!" : "!"}${command}`).catch((error) => {
+          cleanup();
+          failPendingShell(state, pending, error instanceof Error ? error : new Error(String(error)));
+        });
+      });
+    }
+  };
+}
+async function answerPendingUi(options, state, line) {
+  const pending = state.pendingUi;
+  if (!pending)
+    return false;
+  if (line === "/cancel") {
+    await respondRunPiExtensionUiViaServer(options.context, options.runId, pending.requestId, { cancelled: true });
+  } else if (pending.method === "confirm") {
+    const confirmed = /^(y|yes|true|1)$/i.test(line);
+    await respondRunPiExtensionUiViaServer(options.context, options.runId, pending.requestId, { value: confirmed, confirmed });
+  } else if (pending.options.length > 0 && /^\d+$/.test(line)) {
+    const selected = pending.options[Math.max(0, Number(line) - 1)] ?? line;
+    await respondRunPiExtensionUiViaServer(options.context, options.runId, pending.requestId, { value: selected });
+  } else {
+    await respondRunPiExtensionUiViaServer(options.context, options.runId, pending.requestId, { value: line });
+  }
+  appendTranscript(state, "System", `Responded to extension UI request ${pending.requestId}.`);
+  state.pendingUi = null;
+  return true;
+}
+async function routeInput(options, ctx, state, line) {
+  const text = line.trim();
+  if (!text)
+    return;
+  if (await answerPendingUi(options, state, text)) {
+    updatePiUi(ctx, state);
+    return;
+  }
+  if (text === "/detach" || text === "/quit" || text === "/q") {
+    appendTranscript(state, "System", "Detached locally; worker Pi daemon continues.");
+    updatePiUi(ctx, state);
+    ctx.shutdown();
+    return;
+  }
+  if (text === "/stop") {
+    await abortRunPiViaServer(options.context, options.runId);
+    appendTranscript(state, "System", "Stop requested for worker Pi daemon.");
+    updatePiUi(ctx, state);
+    ctx.shutdown();
+    return;
+  }
+  if (text.startsWith("!")) {
+    appendTranscript(state, "You", text);
+    await sendRunPiShellViaServer(options.context, options.runId, text);
+  } else if (text.startsWith("/")) {
+    appendTranscript(state, "You", text);
+    const result = await runRunPiCommandViaServer(options.context, options.runId, text);
+    const message = typeof result.message === "string" ? result.message : "worker command accepted";
+    appendTranscript(state, "System", message);
+  } else {
+    appendTranscript(state, "You", text);
+    await sendRunPiPromptViaServer(options.context, options.runId, text, state.streaming ? "steer" : undefined);
+  }
+  updatePiUi(ctx, state);
+}
+function createRigWorkerPiBridgeExtension(options) {
+  return (pi) => {
+    const state = {
+      transcript: [],
+      status: "starting worker Pi daemon bridge",
+      activity: "",
+      cwd: "",
+      model: "",
+      commands: [],
+      streaming: false,
+      pendingUi: null,
+      pendingShells: [],
+      wsConnected: false,
+      nativeStream: false
     };
+    if (options.initialMessageSent)
+      appendTranscript(state, "System", "Initial message sent to worker Pi daemon.");
+    let nativePiUiContextAvailable = false;
+    pi.on("user_bash", (event) => {
+      state.nativeStream = Boolean(state.nativeStream || nativePiUiContextAvailable);
+      return { operations: createRemoteBashOperations(options, state, event.excludeFromContext === true) };
+    });
+    pi.on("session_start", async (_event, ctx) => {
+      nativePiUiContextAvailable = Boolean(nativePiUi(ctx));
+      state.nativeStream = nativePiUiContextAvailable;
+      updatePiUi(ctx, state);
+      ctx.ui.notify(nativePiUiContextAvailable ? "Rig worker Pi native stream bridge loaded" : "Rig worker Pi bridge extension loaded (degraded widget fallback)", "info");
+      ctx.ui.onTerminalInput((data) => {
+        if (data.includes("\x04")) {
+          ctx.shutdown();
+          return { consume: true };
+        }
+        if (!data.includes("\r") && !data.includes(`
+`))
+          return;
+        const inlineText = data.replace(/[\r\n]+/g, "").trim();
+        const editorText = ctx.ui.getEditorText().trim();
+        const text = [editorText, inlineText].filter(Boolean).join(" ").trim();
+        if (!text)
+          return;
+        if (text.startsWith("!"))
+          return;
+        ctx.ui.setEditorText("");
+        routeInput(options, ctx, state, text).catch((error) => {
+          appendTranscript(state, "Error", error instanceof Error ? error.message : String(error));
+          updatePiUi(ctx, state);
+        });
+        return { consume: true };
+      });
+      connectWorkerStream(options, ctx, state).catch((error) => {
+        appendTranscript(state, "Error", error instanceof Error ? error.message : String(error));
+        updatePiUi(ctx, state);
+      });
+    });
+    pi.on("session_shutdown", () => {});
+  };
+}
+
+// packages/cli/src/commands/_pi-frontend.ts
+function setTemporaryEnv(updates) {
+  const previous = new Map;
+  for (const [key, value] of Object.entries(updates)) {
+    previous.set(key, process.env[key]);
+    process.env[key] = value;
+  }
+  return () => {
+    for (const [key, value] of previous) {
+      if (value === undefined)
+        delete process.env[key];
+      else
+        process.env[key] = value;
+    }
+  };
+}
+async function attachRunBundledPiFrontend(context, input) {
+  const tempRoot = mkdtempSync(join(tmpdir(), "rig-pi-frontend-"));
+  const cwd = join(tempRoot, "workspace");
+  const agentDir = join(tempRoot, "agent");
+  const sessionDir = join(tempRoot, "sessions");
+  const previousCwd = process.cwd();
+  const restoreEnv = setTemporaryEnv({
+    PI_CODING_AGENT_DIR: agentDir,
+    PI_CODING_AGENT_SESSION_DIR: sessionDir,
+    PI_OFFLINE: "1",
+    PI_SKIP_VERSION_CHECK: "1"
+  });
+  let detached = false;
+  try {
+    await Bun.$`mkdir -p ${cwd} ${agentDir} ${sessionDir}`.quiet();
+    process.chdir(cwd);
+    await runPiMain([
+      "--offline",
+      "--no-session",
+      "--no-tools",
+      "--no-builtin-tools",
+      "--no-skills",
+      "--no-prompt-templates",
+      "--no-themes",
+      "--no-context-files",
+      "--no-approve"
+    ], {
+      extensionFactories: [
+        createRigWorkerPiBridgeExtension({
+          context,
+          runId: input.runId,
+          initialMessageSent: input.steered === true
+        })
+      ]
+    });
+    detached = true;
+  } finally {
+    process.chdir(previousCwd);
+    restoreEnv();
+    rmSync(tempRoot, { recursive: true, force: true });
   }
+  let run = { runId: input.runId, status: "unknown" };
+  try {
+    run = await getRunDetailsViaServer(context, input.runId);
+  } catch {}
+  return {
+    run,
+    logs: [],
+    timeline: [],
+    timelineCursor: null,
+    steered: input.steered === true,
+    detached,
+    rendered: "actual bundled Pi frontend hosted Rig worker Pi bridge extension"
+  };
 }
+
+// packages/cli/src/commands/_operator-view.ts
+var TERMINAL_RUN_STATUSES2 = new Set(["completed", "failed", "stopped", "cancelled", "canceled", "closed", "merged", "needs_attention", "needs-attention"]);
 function runStatusFromPayload(payload) {
   const run = payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
   return String(run.status ?? "unknown").toLowerCase();
@@ -490,198 +1089,15 @@ 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());
+    await sendRunPiPromptViaServer(context, input.runId, input.message.trim(), "steer").catch(() => 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, {
+    return attachRunBundledPiFrontend(context, {
       runId: input.runId,
-      pollMs: input.pollMs,
       steered
     });
   }
@@ -692,7 +1108,7 @@ async function attachRunOperatorView(context, input) {
     surface.renderTimeline(snapshot.timeline);
     surface.renderLogs(snapshot.logs);
     if (steered)
-      surface.info("Steering message queued.");
+      surface.info("Message submitted to worker Pi.");
   }
   let detached = false;
   let commandInput = null;
@@ -711,7 +1127,7 @@ async function attachRunOperatorView(context, input) {
     }
     const pollMs = Math.max(250, Math.trunc(input.pollMs ?? 2000));
     let timelineCursor = snapshot.timelineCursor;
-    while (!detached && !TERMINAL_RUN_STATUSES.has(runStatusFromPayload(snapshot.run))) {
+    while (!detached && !TERMINAL_RUN_STATUSES2.has(runStatusFromPayload(snapshot.run))) {
       await Bun.sleep(pollMs);
       snapshot = await readOperatorSnapshot(context, input.runId, { timelineCursor });
       timelineCursor = snapshot.timelineCursor;