@h-rig/pi-rig 0.0.6-alpha.6 → 0.0.6-alpha.60

package/dist/src/client.js

@@ -79,8 +79,9 @@ function createRigContextFromEnv(env = process.env) {
   const discovered = discoverRigContext(env);
   const serverUrl = env.RIG_SERVER_URL ?? env.RIG_SERVER_BASE_URL ?? discovered.serverUrl;
   const projectRoot = env.RIG_PROJECT_ROOT ?? env.PROJECT_RIG_ROOT ?? discovered.projectRoot;
-  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_GITHUB_TOKEN ?? env.GITHUB_TOKEN ?? env.GH_TOKEN ?? discovered.authToken;
+  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_SERVER_AUTH_TOKEN ?? discovered.authToken;
   const steeringPollMs = cleanNonNegativeInteger(env.RIG_STEERING_POLL_MS);
+  const operatorSession = env.RIG_PI_OPERATOR_SESSION === "1" || env.RIG_PI_OPERATOR_SESSION === "true";
   const active = Boolean(runId || taskId || serverUrl || projectRoot);
   if (!active)
     return { active: false };
@@ -91,7 +92,8 @@ function createRigContextFromEnv(env = process.env) {
     ...serverUrl ? { serverUrl } : {},
     ...projectRoot ? { projectRoot } : {},
     ...authToken ? { authToken } : {},
-    ...steeringPollMs !== null ? { steeringPollMs } : {}
+    ...steeringPollMs !== null ? { steeringPollMs } : {},
+    ...operatorSession ? { operatorSession } : {}
   };
 }
 function joinUrl(baseUrl, pathname) {
@@ -157,6 +159,20 @@ class RigBridgeClient {
     const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}`);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { runId };
   }
+  async runLogs(runId = this.context.runId, limit = 20) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}/logs?limit=${encodeURIComponent(String(limit))}`);
+    const entries = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.entries : null;
+    return Array.isArray(entries) ? entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  }
+  async runTimeline(runId = this.context.runId, limit = 20) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}/timeline?limit=${encodeURIComponent(String(limit))}`);
+    const entries = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.entries : null;
+    return Array.isArray(entries) ? entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  }
   async steer(message, runId = this.context.runId) {
     if (!runId)
       throw new Error("runId is required");
@@ -167,6 +183,16 @@ class RigBridgeClient {
     });
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
   }
+  async stop(runId = this.context.runId) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request("/api/runs/stop", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ runId })
+    });
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true, runId };
+  }
   async pollSteering(runId = this.context.runId) {
     if (!runId)
       return [];

package/dist/src/commands.js

@@ -1,5 +1,13 @@
 // @bun
 // packages/pi-rig/src/commands.ts
+function runRecordFromPayload(payload) {
+  return payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
+}
+function formatEntry(entry) {
+  const type = String(entry.type ?? entry.title ?? "event");
+  const text = typeof entry.text === "string" ? entry.text : typeof entry.detail === "string" ? entry.detail : typeof entry.message === "string" ? entry.message : JSON.stringify(entry);
+  return `${type}: ${text}`;
+}
 function createRigSlashCommands(input) {
   const notify = input.notify ?? (() => {});
   async function handleRig(args) {
@@ -28,18 +36,40 @@ function createRigSlashCommands(input) {
       }
       if (first === "attach") {
         const run = await input.client.attach(second);
-        const runRecord = run.run && typeof run.run === "object" ? run.run : run;
+        const runRecord = runRecordFromPayload(run);
         notify(`Attached to ${String(runRecord.runId ?? second ?? input.context.runId ?? "run")}: ${String(runRecord.status ?? "unknown")}`, "info");
         return;
       }
-      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id]", "error");
+      if (first === "timeline" || first === "logs") {
+        const runId = second || input.context.runId;
+        const entries = first === "timeline" ? await input.client.runTimeline(runId, 20) : await input.client.runLogs(runId, 20);
+        notify(entries.length > 0 ? entries.slice(-10).map(formatEntry).join(`
+`) : `No ${first} entries for ${runId ?? "run"}.`, "info");
+        return;
+      }
+      if (first === "steer") {
+        const message = args.trim().slice("steer".length).trim();
+        if (!message) {
+          notify("Usage: /rig steer <message>", "error");
+          return;
+        }
+        await input.client.steer(message);
+        notify("Rig steering message queued.", "info");
+        return;
+      }
+      if (first === "stop") {
+        await input.client.stop(second || input.context.runId);
+        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");
     } catch (error) {
       notify(error instanceof Error ? error.message : String(error), "error");
     }
   }
   return {
     rig: {
-      description: "Rig control-plane commands: status, task list, task run, attach",
+      description: "Rig control-plane commands: status, task list, task run, attach, timeline, logs, steer, stop",
       handler: handleRig
     }
   };

package/dist/src/index.js

@@ -79,8 +79,9 @@ function createRigContextFromEnv(env = process.env) {
   const discovered = discoverRigContext(env);
   const serverUrl = env.RIG_SERVER_URL ?? env.RIG_SERVER_BASE_URL ?? discovered.serverUrl;
   const projectRoot = env.RIG_PROJECT_ROOT ?? env.PROJECT_RIG_ROOT ?? discovered.projectRoot;
-  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_GITHUB_TOKEN ?? env.GITHUB_TOKEN ?? env.GH_TOKEN ?? discovered.authToken;
+  const authToken = env.RIG_AUTH_TOKEN ?? env.RIG_SERVER_AUTH_TOKEN ?? discovered.authToken;
   const steeringPollMs = cleanNonNegativeInteger(env.RIG_STEERING_POLL_MS);
+  const operatorSession = env.RIG_PI_OPERATOR_SESSION === "1" || env.RIG_PI_OPERATOR_SESSION === "true";
   const active = Boolean(runId || taskId || serverUrl || projectRoot);
   if (!active)
     return { active: false };
@@ -91,7 +92,8 @@ function createRigContextFromEnv(env = process.env) {
     ...serverUrl ? { serverUrl } : {},
     ...projectRoot ? { projectRoot } : {},
     ...authToken ? { authToken } : {},
-    ...steeringPollMs !== null ? { steeringPollMs } : {}
+    ...steeringPollMs !== null ? { steeringPollMs } : {},
+    ...operatorSession ? { operatorSession } : {}
   };
 }
 function joinUrl(baseUrl, pathname) {
@@ -157,6 +159,20 @@ class RigBridgeClient {
     const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}`);
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { runId };
   }
+  async runLogs(runId = this.context.runId, limit = 20) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}/logs?limit=${encodeURIComponent(String(limit))}`);
+    const entries = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.entries : null;
+    return Array.isArray(entries) ? entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  }
+  async runTimeline(runId = this.context.runId, limit = 20) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request(`/api/runs/${encodeURIComponent(runId)}/timeline?limit=${encodeURIComponent(String(limit))}`);
+    const entries = payload && typeof payload === "object" && !Array.isArray(payload) ? payload.entries : null;
+    return Array.isArray(entries) ? entries.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))) : [];
+  }
   async steer(message, runId = this.context.runId) {
     if (!runId)
       throw new Error("runId is required");
@@ -167,6 +183,16 @@ class RigBridgeClient {
     });
     return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true };
   }
+  async stop(runId = this.context.runId) {
+    if (!runId)
+      throw new Error("runId is required");
+    const payload = await this.request("/api/runs/stop", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ runId })
+    });
+    return payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { ok: true, runId };
+  }
   async pollSteering(runId = this.context.runId) {
     if (!runId)
       return [];
@@ -201,6 +227,14 @@ class RigBridgeClient {
 }
 
 // packages/pi-rig/src/commands.ts
+function runRecordFromPayload(payload) {
+  return payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
+}
+function formatEntry(entry) {
+  const type = String(entry.type ?? entry.title ?? "event");
+  const text = typeof entry.text === "string" ? entry.text : typeof entry.detail === "string" ? entry.detail : typeof entry.message === "string" ? entry.message : JSON.stringify(entry);
+  return `${type}: ${text}`;
+}
 function createRigSlashCommands(input) {
   const notify = input.notify ?? (() => {});
   async function handleRig(args) {
@@ -229,18 +263,40 @@ function createRigSlashCommands(input) {
       }
       if (first === "attach") {
         const run = await input.client.attach(second);
-        const runRecord = run.run && typeof run.run === "object" ? run.run : run;
+        const runRecord = runRecordFromPayload(run);
         notify(`Attached to ${String(runRecord.runId ?? second ?? input.context.runId ?? "run")}: ${String(runRecord.status ?? "unknown")}`, "info");
         return;
       }
-      notify("Usage: /rig status | /rig task list | /rig task run [id] | /rig attach [run-id]", "error");
+      if (first === "timeline" || first === "logs") {
+        const runId = second || input.context.runId;
+        const entries = first === "timeline" ? await input.client.runTimeline(runId, 20) : await input.client.runLogs(runId, 20);
+        notify(entries.length > 0 ? entries.slice(-10).map(formatEntry).join(`
+`) : `No ${first} entries for ${runId ?? "run"}.`, "info");
+        return;
+      }
+      if (first === "steer") {
+        const message = args.trim().slice("steer".length).trim();
+        if (!message) {
+          notify("Usage: /rig steer <message>", "error");
+          return;
+        }
+        await input.client.steer(message);
+        notify("Rig steering message queued.", "info");
+        return;
+      }
+      if (first === "stop") {
+        await input.client.stop(second || input.context.runId);
+        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");
     } catch (error) {
       notify(error instanceof Error ? error.message : String(error), "error");
     }
   }
   return {
     rig: {
-      description: "Rig control-plane commands: status, task list, task run, attach",
+      description: "Rig control-plane commands: status, task list, task run, attach, timeline, logs, steer, stop",
       handler: handleRig
     }
   };
@@ -318,6 +374,35 @@ function notify(ctx, message, level = "info") {
     notifyFn.call(ui, message, level);
   }
 }
+function setWidget(ctx, id, lines) {
+  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
+  const setWidgetFn = ui && typeof ui === "object" ? ui.setWidget : null;
+  if (typeof setWidgetFn === "function") {
+    setWidgetFn.call(ui, id, lines);
+  }
+}
+function setStatus(ctx, id, text) {
+  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
+  const setStatusFn = ui && typeof ui === "object" ? ui.setStatus : null;
+  if (typeof setStatusFn === "function") {
+    setStatusFn.call(ui, id, text);
+  }
+}
+function setFooter(ctx, line) {
+  const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
+  const setFooterFn = ui && typeof ui === "object" ? ui.setFooter : null;
+  if (typeof setFooterFn !== "function")
+    return;
+  setFooterFn.call(ui, () => ({
+    render(width) {
+      const max = Math.max(0, Math.trunc(width));
+      if (max === 0)
+        return [""];
+      return [line.length > max ? `${line.slice(0, Math.max(0, max - 1))}\u2026` : line];
+    },
+    invalidate() {}
+  }));
+}
 function steeringText(message) {
   const text = typeof message.message === "string" ? message.message.trim() : "";
   if (!text)
@@ -327,7 +412,7 @@ function steeringText(message) {
 ${text}`;
 }
 async function consumeQueuedSteering(pi, state, ctx) {
-  if (!state.active || !state.runId || typeof pi.sendUserMessage !== "function")
+  if (state.operatorSession || !state.active || !state.runId || typeof pi.sendUserMessage !== "function")
     return;
   try {
     const messages = await state.client.consumeSteering(state.runId);
@@ -344,8 +429,86 @@ async function consumeQueuedSteering(pi, state, ctx) {
     notify(ctx, `Rig steering sync failed: ${error instanceof Error ? error.message : String(error)}`, "error");
   }
 }
+function inputText(event) {
+  if (!event || typeof event !== "object" || Array.isArray(event))
+    return null;
+  const text = event.text;
+  return typeof text === "string" && text.trim() ? text.trim() : null;
+}
+async function handleOperatorInput(event, state, ctx) {
+  if (!state.operatorSession || !state.active || !state.runId)
+    return;
+  const text = inputText(event);
+  if (!text || text.startsWith("/"))
+    return;
+  try {
+    await state.client.steer(text, state.runId);
+    notify(ctx, "Rig steering message queued.");
+  } catch (error) {
+    notify(ctx, `Rig steering failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+  }
+  return { action: "handled" };
+}
+function shortEntry(entry) {
+  const type = String(entry.type ?? entry.title ?? "event");
+  const text = typeof entry.text === "string" ? entry.text : typeof entry.detail === "string" ? entry.detail : typeof entry.message === "string" ? entry.message : "";
+  return `${type}: ${text}`.slice(0, 160);
+}
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function runLocation(run) {
+  const worktree = typeof run.worktreePath === "string" && run.worktreePath.trim() ? run.worktreePath.trim() : null;
+  const projectRoot = typeof run.projectRoot === "string" && run.projectRoot.trim() ? run.projectRoot.trim() : null;
+  return worktree ?? projectRoot ?? "remote/local worker workspace";
+}
+function runPayload(payload) {
+  return payload.run && typeof payload.run === "object" && !Array.isArray(payload.run) ? payload.run : payload;
+}
+function startOperatorRunWidget(state, ctx) {
+  if (!state.operatorSession || !state.active || !state.runId)
+    return;
+  let inFlight = false;
+  let frame = 0;
+  const refresh = async () => {
+    if (inFlight)
+      return;
+    inFlight = true;
+    const spinner = SPINNER_FRAMES[frame++ % SPINNER_FRAMES.length] ?? "\u2022";
+    try {
+      const [runPayloadRecord, timeline] = await Promise.all([
+        state.client.attach(state.runId),
+        state.client.runTimeline(state.runId, 8).catch(() => [])
+      ]);
+      const run = runPayload(runPayloadRecord);
+      const status = String(run.status ?? "unknown");
+      const header = `${spinner} Rig ${String(run.runId ?? state.runId)} \xB7 ${status}`;
+      const location = runLocation(run);
+      const detail = typeof run.statusDetail === "string" && run.statusDetail.trim() ? run.statusDetail.trim() : String(run.title ?? run.taskId ?? "");
+      const lines = [
+        header,
+        `worker: ${location}`.slice(0, 200),
+        ...detail ? [detail.slice(0, 160)] : [],
+        ...timeline.slice(-5).map(shortEntry)
+      ];
+      setStatus(ctx, "rig", `${spinner} Rig ${status}`);
+      setFooter(ctx, `${spinner} Rig ${String(run.runId ?? state.runId)} \xB7 ${status} \xB7 worker ${location}`);
+      setWidget(ctx, "rig-run", lines);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      setStatus(ctx, "rig", `${spinner} Rig unavailable`);
+      setFooter(ctx, `${spinner} Rig ${state.runId} \xB7 unavailable \xB7 ${message}`);
+      setWidget(ctx, "rig-run", [`${spinner} Rig ${state.runId} \xB7 unavailable`, message]);
+    } finally {
+      inFlight = false;
+    }
+  };
+  refresh();
+  const timer = setInterval(() => void refresh(), 1000);
+  if (typeof timer.unref === "function") {
+    timer.unref();
+  }
+}
 function startLiveSteeringPoll(pi, state, ctx) {
-  if (!state.active || !state.runId || typeof pi.sendUserMessage !== "function")
+  if (state.operatorSession || !state.active || !state.runId || typeof pi.sendUserMessage !== "function")
     return;
   const intervalMs = state.steeringPollMs ?? 1000;
   if (intervalMs <= 0)
@@ -389,14 +552,12 @@ function createPiRigExtension(pi, options = {}) {
     }
     startLiveSteeringPoll(pi, state, globalThis);
   }
+  pi.on?.("input", async (event, ctx) => handleOperatorInput(event, state, ctx));
   pi.on?.("session_start", async (_event, ctx) => {
     if (!state.active || !state.runId)
       return;
-    const ui = ctx && typeof ctx === "object" ? ctx.ui : null;
-    const setStatus = ui && typeof ui === "object" ? ui.setStatus : null;
-    if (typeof setStatus === "function") {
-      setStatus.call(ui, "rig", `Rig ${state.runId}`);
-    }
+    setStatus(ctx, "rig", `Rig ${state.runId}`);
+    startOperatorRunWidget(state, ctx);
     await consumeQueuedSteering(pi, state, ctx);
   });
   pi.on?.("turn_end", async (_event, ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/pi-rig",
-  "version": "0.0.6-alpha.6",
+  "version": "0.0.6-alpha.60",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -33,7 +33,7 @@
     ]
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.60",
     "typebox": "*"
   }
 }