@h-rig/pi-rig 0.0.6-alpha.72 → 0.0.6-alpha.74

package/dist/src/client.js

@@ -255,6 +255,36 @@ class RigBridgeClient {
     const payload = await this.request(`/api/workspace/tasks/${encodeURIComponent(taskId)}`);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   }
+  async piProxy(action, init, runId = this.context.runId) {
+    if (!runId)
+      throw new Error("runId is required");
+    return this.request(`/api/runs/${encodeURIComponent(runId)}/pi/${action}`, init);
+  }
+  async workerCommands(runId = this.context.runId) {
+    const payload = await this.piProxy("commands", undefined, runId);
+    const commands = Array.isArray(payload) ? payload : payload && typeof payload === "object" && !Array.isArray(payload) && Array.isArray(payload.commands) ? payload.commands : [];
+    return commands.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
+  }
+  async workerRunCommand(command, args, runId = this.context.runId) {
+    const payload = await this.piProxy("commands/run", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command, args })
+    }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
+  async workerShell(command, runId = this.context.runId) {
+    const payload = await this.piProxy("shell", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command })
+    }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
+  async workerAbort(runId = this.context.runId) {
+    const payload = await this.piProxy("abort", { method: "POST" }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
 }
 function buildRigWebSocketUrl(serverUrl, authToken) {
   const url = new URL(serverUrl);
@@ -425,9 +455,139 @@ class RigBridgeSocket {
     }
   }
 }
+function buildRunPiEventsWebSocketUrl(context) {
+  if (!context.serverUrl || !context.runId)
+    return null;
+  const url = new URL(`${context.serverUrl.replace(/\/+$/, "")}/api/runs/${encodeURIComponent(context.runId)}/pi/events`);
+  url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+  if (context.authToken)
+    url.searchParams.set("token", context.authToken);
+  if (context.projectRoot)
+    url.searchParams.set("rigProjectRoot", context.projectRoot);
+  return url.toString();
+}
+
+class RigWorkerEventsSocket {
+  context;
+  handlers;
+  factory;
+  reconnectBaseMs;
+  reconnectMaxMs;
+  socket = null;
+  connectedFlag = false;
+  closed = false;
+  started = false;
+  attempt = 0;
+  reconnectTimer = null;
+  constructor(input) {
+    this.context = input.context;
+    this.handlers = input.handlers ?? {};
+    this.factory = input.webSocketFactory ?? defaultWebSocketFactory();
+    this.reconnectBaseMs = input.reconnectBaseMs ?? 1000;
+    this.reconnectMaxMs = input.reconnectMaxMs ?? 30000;
+  }
+  get connected() {
+    return this.connectedFlag;
+  }
+  start() {
+    if (this.closed)
+      return false;
+    if (this.started)
+      return true;
+    if (!buildRunPiEventsWebSocketUrl(this.context) || !this.factory)
+      return false;
+    this.started = true;
+    this.connect();
+    return true;
+  }
+  close() {
+    this.closed = true;
+    this.connectedFlag = false;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    try {
+      this.socket?.close();
+    } catch {}
+    this.socket = null;
+  }
+  connect() {
+    const target = buildRunPiEventsWebSocketUrl(this.context);
+    if (this.closed || !target || !this.factory)
+      return;
+    let socket;
+    try {
+      socket = this.factory(target);
+    } catch {
+      this.scheduleReconnect();
+      return;
+    }
+    this.socket = socket;
+    let gone = false;
+    socket.addEventListener("open", () => {
+      if (this.closed || gone)
+        return;
+      this.attempt = 0;
+      this.connectedFlag = true;
+      this.handlers.onConnect?.();
+    });
+    const onGone = () => {
+      if (gone)
+        return;
+      gone = true;
+      const wasConnected = this.connectedFlag;
+      this.connectedFlag = false;
+      try {
+        socket.close();
+      } catch {}
+      if (this.socket === socket)
+        this.socket = null;
+      if (this.closed)
+        return;
+      if (wasConnected)
+        this.handlers.onDisconnect?.();
+      this.scheduleReconnect();
+    };
+    socket.addEventListener("close", onGone);
+    socket.addEventListener("error", onGone);
+    socket.addEventListener("message", (event) => {
+      if (this.closed)
+        return;
+      const text = webSocketEventText(event.data);
+      if (!text)
+        return;
+      let parsed;
+      try {
+        parsed = JSON.parse(text);
+      } catch {
+        return;
+      }
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        this.handlers.onFrame?.(parsed);
+      }
+    });
+  }
+  scheduleReconnect() {
+    if (this.closed || this.reconnectTimer)
+      return;
+    const delay = Math.min(this.reconnectBaseMs * 2 ** this.attempt, this.reconnectMaxMs);
+    this.attempt += 1;
+    const timer = setTimeout(() => {
+      this.reconnectTimer = null;
+      this.connect();
+    }, delay);
+    this.reconnectTimer = timer;
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+  }
+}
 export {
   createRigContextFromEnv,
+  buildRunPiEventsWebSocketUrl,
   buildRigWebSocketUrl,
+  RigWorkerEventsSocket,
   RigBridgeSocket,
   RigBridgeClient,
   RIG_PROTOCOL_VERSION,

package/dist/src/commands.js

@@ -62,7 +62,22 @@ function createRigSlashCommands(input) {
         notify("Rig stop requested.", "info");
         return;
       }
-      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id] | /rig timeline [run-id] | /rig logs [run-id] | /rig steer <message> | /rig stop [run-id]", "error");
+      if (first === "abort") {
+        await input.client.workerAbort(second || input.context.runId);
+        notify("Worker turn abort requested.", "info");
+        return;
+      }
+      if (first === "sh") {
+        const command = args.trim().slice("sh".length).trim();
+        if (!command) {
+          notify("Usage: /rig sh <command> \u2014 runs in the WORKER workspace", "error");
+          return;
+        }
+        await input.client.workerShell(command, input.context.runId);
+        notify("Shell command sent to the worker workspace.", "info");
+        return;
+      }
+      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id] | /rig timeline [run-id] | /rig logs [run-id] | /rig steer <message> | /rig stop [run-id] | /rig abort [run-id] | /rig sh <command>", "error");
     } catch (error) {
       notify(error instanceof Error ? error.message : String(error), "error");
     }

package/dist/src/index.js

@@ -255,6 +255,36 @@ class RigBridgeClient {
     const payload = await this.request(`/api/workspace/tasks/${encodeURIComponent(taskId)}`);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : {};
   }
+  async piProxy(action, init, runId = this.context.runId) {
+    if (!runId)
+      throw new Error("runId is required");
+    return this.request(`/api/runs/${encodeURIComponent(runId)}/pi/${action}`, init);
+  }
+  async workerCommands(runId = this.context.runId) {
+    const payload = await this.piProxy("commands", undefined, runId);
+    const commands = Array.isArray(payload) ? payload : payload && typeof payload === "object" && !Array.isArray(payload) && Array.isArray(payload.commands) ? payload.commands : [];
+    return commands.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry)));
+  }
+  async workerRunCommand(command, args, runId = this.context.runId) {
+    const payload = await this.piProxy("commands/run", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command, args })
+    }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
+  async workerShell(command, runId = this.context.runId) {
+    const payload = await this.piProxy("shell", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ command })
+    }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
+  async workerAbort(runId = this.context.runId) {
+    const payload = await this.piProxy("abort", { method: "POST" }, runId);
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
+  }
 }
 function buildRigWebSocketUrl(serverUrl, authToken) {
   const url = new URL(serverUrl);
@@ -425,6 +455,134 @@ class RigBridgeSocket {
     }
   }
 }
+function buildRunPiEventsWebSocketUrl(context) {
+  if (!context.serverUrl || !context.runId)
+    return null;
+  const url = new URL(`${context.serverUrl.replace(/\/+$/, "")}/api/runs/${encodeURIComponent(context.runId)}/pi/events`);
+  url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+  if (context.authToken)
+    url.searchParams.set("token", context.authToken);
+  if (context.projectRoot)
+    url.searchParams.set("rigProjectRoot", context.projectRoot);
+  return url.toString();
+}
+
+class RigWorkerEventsSocket {
+  context;
+  handlers;
+  factory;
+  reconnectBaseMs;
+  reconnectMaxMs;
+  socket = null;
+  connectedFlag = false;
+  closed = false;
+  started = false;
+  attempt = 0;
+  reconnectTimer = null;
+  constructor(input) {
+    this.context = input.context;
+    this.handlers = input.handlers ?? {};
+    this.factory = input.webSocketFactory ?? defaultWebSocketFactory();
+    this.reconnectBaseMs = input.reconnectBaseMs ?? 1000;
+    this.reconnectMaxMs = input.reconnectMaxMs ?? 30000;
+  }
+  get connected() {
+    return this.connectedFlag;
+  }
+  start() {
+    if (this.closed)
+      return false;
+    if (this.started)
+      return true;
+    if (!buildRunPiEventsWebSocketUrl(this.context) || !this.factory)
+      return false;
+    this.started = true;
+    this.connect();
+    return true;
+  }
+  close() {
+    this.closed = true;
+    this.connectedFlag = false;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    try {
+      this.socket?.close();
+    } catch {}
+    this.socket = null;
+  }
+  connect() {
+    const target = buildRunPiEventsWebSocketUrl(this.context);
+    if (this.closed || !target || !this.factory)
+      return;
+    let socket;
+    try {
+      socket = this.factory(target);
+    } catch {
+      this.scheduleReconnect();
+      return;
+    }
+    this.socket = socket;
+    let gone = false;
+    socket.addEventListener("open", () => {
+      if (this.closed || gone)
+        return;
+      this.attempt = 0;
+      this.connectedFlag = true;
+      this.handlers.onConnect?.();
+    });
+    const onGone = () => {
+      if (gone)
+        return;
+      gone = true;
+      const wasConnected = this.connectedFlag;
+      this.connectedFlag = false;
+      try {
+        socket.close();
+      } catch {}
+      if (this.socket === socket)
+        this.socket = null;
+      if (this.closed)
+        return;
+      if (wasConnected)
+        this.handlers.onDisconnect?.();
+      this.scheduleReconnect();
+    };
+    socket.addEventListener("close", onGone);
+    socket.addEventListener("error", onGone);
+    socket.addEventListener("message", (event) => {
+      if (this.closed)
+        return;
+      const text = webSocketEventText(event.data);
+      if (!text)
+        return;
+      let parsed;
+      try {
+        parsed = JSON.parse(text);
+      } catch {
+        return;
+      }
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        this.handlers.onFrame?.(parsed);
+      }
+    });
+  }
+  scheduleReconnect() {
+    if (this.closed || this.reconnectTimer)
+      return;
+    const delay = Math.min(this.reconnectBaseMs * 2 ** this.attempt, this.reconnectMaxMs);
+    this.attempt += 1;
+    const timer = setTimeout(() => {
+      this.reconnectTimer = null;
+      this.connect();
+    }, delay);
+    this.reconnectTimer = timer;
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+  }
+}
 
 // packages/pi-rig/src/commands.ts
 function runRecordFromPayload(payload) {
@@ -489,7 +647,22 @@ function createRigSlashCommands(input) {
         notify("Rig stop requested.", "info");
         return;
       }
-      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id] | /rig timeline [run-id] | /rig logs [run-id] | /rig steer <message> | /rig stop [run-id]", "error");
+      if (first === "abort") {
+        await input.client.workerAbort(second || input.context.runId);
+        notify("Worker turn abort requested.", "info");
+        return;
+      }
+      if (first === "sh") {
+        const command = args.trim().slice("sh".length).trim();
+        if (!command) {
+          notify("Usage: /rig sh <command> \u2014 runs in the WORKER workspace", "error");
+          return;
+        }
+        await input.client.workerShell(command, input.context.runId);
+        notify("Shell command sent to the worker workspace.", "info");
+        return;
+      }
+      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id] | /rig timeline [run-id] | /rig logs [run-id] | /rig steer <message> | /rig stop [run-id] | /rig abort [run-id] | /rig sh <command>", "error");
     } catch (error) {
       notify(error instanceof Error ? error.message : String(error), "error");
     }
@@ -700,6 +873,18 @@ async function handleOperatorInput(event, state, ctx, gate) {
     return;
   if (!(await gate(ctx)).allowed)
     return;
+  if (text.startsWith("!")) {
+    const command = text.slice(1).trim();
+    if (!command)
+      return;
+    try {
+      await state.client.workerShell(command, state.runId);
+      notify(ctx, "Shell command sent to the worker workspace.");
+    } catch (error) {
+      notify(ctx, `Worker shell failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+    }
+    return { action: "handled" };
+  }
   try {
     await state.client.steer(text, state.runId);
     notify(ctx, "Rig steering message queued.");
@@ -827,6 +1012,146 @@ function startOperatorBridge(state, ctx) {
     }
   };
 }
+var MIRROR_TEXT_LIMIT = 2000;
+function clipMirrorText(text) {
+  const trimmed = text.trim();
+  return trimmed.length > MIRROR_TEXT_LIMIT ? `${trimmed.slice(0, MIRROR_TEXT_LIMIT)}
+\u2026 [clipped; full output in the worker session]` : trimmed;
+}
+function workerMirrorText(message) {
+  const role = typeof message.role === "string" ? message.role : "assistant";
+  const content = message.content;
+  const parts = [];
+  if (typeof content === "string") {
+    parts.push(content);
+  } else if (Array.isArray(content)) {
+    for (const block of content) {
+      if (!block || typeof block !== "object" || Array.isArray(block))
+        continue;
+      const record = block;
+      if (record.type === "text" && typeof record.text === "string" && record.text.trim()) {
+        parts.push(record.text);
+        continue;
+      }
+      if (record.type === "toolCall") {
+        const name = typeof record.name === "string" ? record.name : "tool";
+        let args = "";
+        try {
+          args = record.arguments === undefined ? "" : JSON.stringify(record.arguments);
+        } catch {
+          args = "";
+        }
+        parts.push(`\u2699 ${name}(${args.length > 160 ? `${args.slice(0, 160)}\u2026` : args})`);
+      }
+    }
+  }
+  const body = parts.join(`
+`).trim();
+  if (!body)
+    return null;
+  const label = role === "assistant" ? "worker" : role === "user" ? "worker \u21D0 input" : role === "toolResult" ? `worker \u2937 ${typeof message.toolName === "string" ? message.toolName : "tool"} result` : `worker (${role})`;
+  return `[${label}]
+${clipMirrorText(body)}`;
+}
+function workerStatusLine(status) {
+  const model = status.model && typeof status.model === "object" && !Array.isArray(status.model) ? status.model : null;
+  const modelId = model && typeof model.id === "string" ? model.id : null;
+  const usage = status.contextUsage && typeof status.contextUsage === "object" && !Array.isArray(status.contextUsage) ? status.contextUsage : null;
+  const percent = usage && typeof usage.percent === "number" ? `${Math.round(usage.percent)}% ctx` : null;
+  const streaming = status.isStreaming === true ? "streaming" : null;
+  const parts = [modelId, percent, streaming].filter((value) => Boolean(value));
+  return parts.length > 0 ? `worker ${parts.join(" \xB7 ")}` : "worker session connected";
+}
+function startWorkerSessionMirror(pi, state, ctx) {
+  if (!state.operatorSession || !state.active || !state.runId)
+    return;
+  if (typeof pi.sendMessage !== "function")
+    return;
+  const mirrored = new Set;
+  const rememberMirrored = (key) => {
+    if (mirrored.has(key))
+      return false;
+    mirrored.add(key);
+    if (mirrored.size > 1000) {
+      const oldest = mirrored.values().next().value;
+      if (typeof oldest === "string")
+        mirrored.delete(oldest);
+    }
+    return true;
+  };
+  const socket = new RigWorkerEventsSocket({
+    context: state,
+    webSocketFactory: state.webSocketFactory,
+    handlers: {
+      onFrame: (frame) => {
+        if (frame.type === "status.update") {
+          const status = frame.status && typeof frame.status === "object" && !Array.isArray(frame.status) ? frame.status : null;
+          if (status)
+            setStatus(ctx, "rig-worker", workerStatusLine(status));
+          return;
+        }
+        if (frame.type !== "pi.event")
+          return;
+        const event = frame.event && typeof frame.event === "object" && !Array.isArray(frame.event) ? frame.event : null;
+        if (!event || event.type !== "message_end")
+          return;
+        const message = event.message && typeof event.message === "object" && !Array.isArray(event.message) ? event.message : null;
+        if (!message)
+          return;
+        const key = typeof message.id === "string" && message.id.trim() ? message.id : `${String(message.role ?? "message")}:${String(message.timestamp ?? "")}`;
+        if (!rememberMirrored(key))
+          return;
+        const text = workerMirrorText(message);
+        if (!text)
+          return;
+        pi.sendMessage?.({ customType: "rig-worker-mirror", content: text, display: true }, { triggerTurn: false });
+      },
+      onConnect: () => {
+        setStatus(ctx, "rig-worker", "worker session connected");
+      },
+      onDisconnect: () => {
+        setStatus(ctx, "rig-worker", "worker session disconnected (reconnecting\u2026)");
+      }
+    }
+  });
+  socket.start();
+}
+async function registerWorkerCommands(pi, state, ctx) {
+  if (!state.operatorSession || !state.active || !state.runId)
+    return;
+  if (typeof pi.registerCommand !== "function")
+    return;
+  let commands = [];
+  try {
+    commands = await state.client.workerCommands(state.runId);
+  } catch {
+    return;
+  }
+  let registered = 0;
+  for (const command of commands) {
+    const name = typeof command.name === "string" && command.name.trim() ? command.name.trim() : null;
+    if (!name || name === "rig")
+      continue;
+    const description = typeof command.description === "string" && command.description.trim() ? `[worker] ${command.description.trim()}` : "[worker] remote session command";
+    try {
+      pi.registerCommand(name, {
+        description,
+        handler: async (args, commandCtx) => {
+          try {
+            await state.client.workerRunCommand(name, args, state.runId);
+            notify(commandCtx, `Sent /${name} to the worker session.`);
+          } catch (error) {
+            notify(commandCtx, `Worker /${name} failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+          }
+        }
+      });
+      registered += 1;
+    } catch {}
+  }
+  if (registered > 0) {
+    notify(ctx, `Worker session commands available: ${registered} registered from the run's Pi session.`);
+  }
+}
 function startSteeringBridge(pi, state, ctx, gate, deliveredIds) {
   if (state.operatorSession || !state.active || !state.runId || typeof pi.sendUserMessage !== "function")
     return;
@@ -954,6 +1279,10 @@ function createPiRigExtension(pi, options = {}) {
     setStatus(ctx, "rig", `Rig ${state.runId}`);
     const live = gateResult.status === "compatible" ? startOperatorBridge(state, ctx) : undefined;
     startOperatorRunWidget(state, ctx, live);
+    if (state.operatorSession && gateResult.status === "compatible") {
+      startWorkerSessionMirror(pi, state, ctx);
+      registerWorkerCommands(pi, state, ctx);
+    }
     await consumeQueuedSteering(pi, state, ctx, gate, deliveredSteeringIds);
   });
   pi.on?.("turn_end", async (_event, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/pi-rig",
-  "version": "0.0.6-alpha.72",
+  "version": "0.0.6-alpha.74",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -33,7 +33,7 @@
     ]
   },
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.72"
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.74"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.79.0",