@h-rig/run-worker 0.0.6-alpha.157 → 0.0.6-alpha.159

package/dist/src/{runs → read-model-backend}/control.d.ts

@@ -16,7 +16,6 @@ export interface DeliverRemoteControlDeps {
 }
 export type RemoteControlTarget = Pick<RunRecord, "runId" | "joinLink">;
 export declare function collabControlFrames(runId: string, control: RunControl): readonly CollabFrame[];
-export declare function collabControlFrame(runId: string, control: RunControl): CollabFrame;
 export declare function deliverRemoteRunControl(projectRoot: string, target: RemoteControlTarget | string, control: RunControl, deps?: DeliverRemoteControlDeps): Promise<void>;
 export declare function deliverRunControl(projectRoot: string, target: RunRecord | string, control: RunControl, deps?: DeliverRemoteControlDeps & {
     readonly getRun?: (projectRoot: string, runId: string) => Promise<RunRecord | null>;

package/dist/src/{runs → read-model-backend}/control.js

@@ -1,20 +1,328 @@
 // @bun
 var __require = import.meta.require;
 
-// packages/run-worker/src/runs/control.ts
-import { buildPauseSentinel, buildResumeSentinel, buildStopSentinel } from "@rig/contracts";
+// packages/run-worker/src/read-model-backend/control.ts
+import { RIG_CONTROL_SENTINEL_END as RIG_CONTROL_SENTINEL_END2, RIG_PAUSE_SENTINEL as RIG_PAUSE_SENTINEL2, RIG_RESUME_SENTINEL as RIG_RESUME_SENTINEL2, RIG_STOP_SENTINEL as RIG_STOP_SENTINEL2, RIG_STOP_SENTINEL_END as RIG_STOP_SENTINEL_END2 } from "@rig/contracts";
 
-// packages/run-worker/src/runs/projection.ts
+// packages/run-worker/src/read-model-backend/projection.ts
 import { isAbsolute, relative, resolve } from "path";
-import { Duration, Effect, Option, Stream } from "effect";
+import { RUN_DISCOVERY } from "@rig/contracts";
+
+// packages/run-worker/src/session-journal.ts
+import { Schema } from "effect";
 import {
-  foldRunSessionEntries,
-  isTerminalRunStatus,
-  timelineEntriesFromCustomEntries
+  CUSTOM_TYPE_FOR,
+  RIG_CONTROL_SENTINEL_END,
+  RIG_INBOX_RESOLUTION_SENTINEL,
+  RIG_PAUSE_SENTINEL,
+  RIG_RESUME_SENTINEL,
+  RIG_STOP_SENTINEL,
+  RIG_STOP_SENTINEL_END,
+  RIG_WORKFLOW_STATUS_CHANGED,
+  RunJournalEvent,
+  TYPE_FOR_CUSTOM
 } from "@rig/contracts";
-import { registrySnapshotStream } from "@rig/runtime/control-plane/discovery";
+var decodeRunJournalEvent = Schema.decodeUnknownSync(RunJournalEvent);
+var RUN_STATUS_TRANSITIONS = {
+  created: ["queued", "preparing", "running", "failed", "stopped"],
+  queued: ["preparing", "running", "failed", "stopped"],
+  preparing: ["queued", "running", "needs-attention", "failed", "stopped"],
+  running: [
+    "queued",
+    "waiting-approval",
+    "waiting-user-input",
+    "paused",
+    "validating",
+    "reviewing",
+    "closing-out",
+    "needs-attention",
+    "completed",
+    "failed",
+    "stopped"
+  ],
+  "waiting-approval": ["running", "needs-attention", "failed", "stopped"],
+  "waiting-user-input": ["running", "needs-attention", "failed", "stopped"],
+  paused: ["running", "failed", "stopped"],
+  validating: ["running", "reviewing", "closing-out", "needs-attention", "completed", "failed", "stopped"],
+  reviewing: ["running", "validating", "closing-out", "needs-attention", "completed", "failed", "stopped"],
+  "closing-out": ["running", "needs-attention", "completed", "failed", "stopped"],
+  "needs-attention": ["queued", "preparing", "running", "closing-out", "completed", "failed", "stopped"],
+  completed: [],
+  failed: ["queued", "preparing", "running", "closing-out"],
+  stopped: ["queued", "preparing", "running", "closing-out"]
+};
+var TERMINAL_RUN_STATUSES = ["completed", "failed", "stopped"];
+function isTerminalRunStatus(status) {
+  return TERMINAL_RUN_STATUSES.includes(status);
+}
+function canTransitionRunStatus(from, to) {
+  if (from === null)
+    return true;
+  if (from === to)
+    return true;
+  return RUN_STATUS_TRANSITIONS[from].includes(to);
+}
+function assertRunStatusTransition(from, to) {
+  if (!canTransitionRunStatus(from, to)) {
+    throw new Error(`Illegal run status transition: ${from ?? "(none)"} -> ${to}. ` + `Allowed from ${from ?? "(none)"}: ${from ? RUN_STATUS_TRANSITIONS[from].join(", ") : "(any)"}.`);
+  }
+}
+function reduceRunJournal(events, runId = null) {
+  let record = {};
+  let status = null;
+  const statusHistory = [];
+  const pendingApprovals = new Map;
+  const resolvedApprovals = [];
+  const pendingUserInputs = new Map;
+  const resolvedUserInputs = [];
+  const closeoutPhases = [];
+  let resolvedPipeline = null;
+  const stageOutcomes = [];
+  const anomalies = [];
+  let steeringCount = 0;
+  let stallCount = 0;
+  let lastSeq = 0;
+  let lastEventAt = null;
+  const projectedRunId = runId ?? events[0]?.runId ?? null;
+  for (const event of events) {
+    lastSeq = event.seq;
+    lastEventAt = event.at;
+    switch (event.type) {
+      case "status-changed": {
+        if (!canTransitionRunStatus(status, event.to)) {
+          anomalies.push({ seq: event.seq, kind: "illegal-transition", detail: `${status ?? "(none)"} -> ${event.to}` });
+        }
+        statusHistory.push({ seq: event.seq, at: event.at, from: status, to: event.to, reason: event.reason ?? null });
+        const wasTerminal = status !== null && isTerminalRunStatus(status);
+        status = event.to;
+        record = { ...record, updatedAt: event.at };
+        if (isTerminalRunStatus(event.to) && !record.completedAt)
+          record = { ...record, completedAt: event.at };
+        if (!isTerminalRunStatus(event.to) && wasTerminal)
+          record = { ...record, completedAt: null };
+        if (event.to === "running" && !record.startedAt)
+          record = { ...record, startedAt: event.at };
+        break;
+      }
+      case "record-patch": {
+        const next = { ...record };
+        for (const [key, value] of Object.entries(event.patch)) {
+          if (value !== undefined)
+            next[key] = value;
+        }
+        next.updatedAt = event.patch.updatedAt ?? event.at;
+        record = next;
+        break;
+      }
+      case "approval-requested": {
+        pendingApprovals.set(event.requestId, {
+          requestId: event.requestId,
+          requestKind: event.requestKind,
+          actionId: event.actionId ?? null,
+          payload: event.payload,
+          requestedAt: event.at
+        });
+        break;
+      }
+      case "approval-resolved": {
+        const pending = pendingApprovals.get(event.requestId);
+        if (!pending) {
+          const alreadyResolved = resolvedApprovals.some((entry) => entry.requestId === event.requestId);
+          anomalies.push({ seq: event.seq, kind: alreadyResolved ? "duplicate-resolution" : "unknown-request", detail: `approval ${event.requestId}` });
+          break;
+        }
+        pendingApprovals.delete(event.requestId);
+        resolvedApprovals.push({ ...pending, decision: event.decision, note: event.note ?? null, actor: event.actor, resolvedAt: event.at });
+        break;
+      }
+      case "input-requested": {
+        pendingUserInputs.set(event.requestId, {
+          requestId: event.requestId,
+          requestKind: "user-input",
+          actionId: null,
+          payload: event.payload,
+          requestedAt: event.at
+        });
+        break;
+      }
+      case "input-resolved": {
+        const pending = pendingUserInputs.get(event.requestId);
+        if (!pending) {
+          const alreadyResolved = resolvedUserInputs.some((entry) => entry.requestId === event.requestId);
+          anomalies.push({ seq: event.seq, kind: alreadyResolved ? "duplicate-resolution" : "unknown-request", detail: `user-input ${event.requestId}` });
+          break;
+        }
+        pendingUserInputs.delete(event.requestId);
+        resolvedUserInputs.push({ ...pending, answers: event.answers, actor: event.actor, resolvedAt: event.at });
+        break;
+      }
+      case "steering":
+        steeringCount += 1;
+        break;
+      case "adopted":
+        record = { ...record, pid: event.pid, updatedAt: event.at };
+        break;
+      case "stall-detected":
+        stallCount += 1;
+        break;
+      case "closeout-phase":
+        closeoutPhases.push({ seq: event.seq, at: event.at, phase: event.phase, outcome: event.outcome, detail: event.detail ?? null });
+        break;
+      case "pipeline-resolved":
+        resolvedPipeline = event.pipeline;
+        break;
+      case "stage-outcome":
+        stageOutcomes.push({ seq: event.seq, at: event.at, outcome: event.outcome });
+        break;
+      case "timeline-entry":
+      case "log-entry":
+        break;
+    }
+  }
+  return {
+    runId: projectedRunId,
+    record,
+    status,
+    statusHistory,
+    pendingApprovals: [...pendingApprovals.values()],
+    resolvedApprovals,
+    pendingUserInputs: [...pendingUserInputs.values()],
+    resolvedUserInputs,
+    steeringCount,
+    stallCount,
+    closeoutPhases,
+    resolvedPipeline,
+    stageOutcomes,
+    lastSeq,
+    lastEventAt,
+    anomalies
+  };
+}
+function isRunSessionCustomType(customType) {
+  return customType !== undefined && Object.hasOwn(TYPE_FOR_CUSTOM, customType);
+}
+function foldRunSessionEntries(entries, runId) {
+  const events = [];
+  entries.forEach((entry, index) => {
+    if (entry.type !== "custom" || !isRunSessionCustomType(entry.customType))
+      return;
+    const data = entry.data !== null && typeof entry.data === "object" ? entry.data : {};
+    const stamped = {
+      v: 1,
+      seq: index + 1,
+      at: typeof data.at === "string" ? data.at : new Date(0).toISOString(),
+      runId,
+      ...data,
+      type: TYPE_FOR_CUSTOM[entry.customType]
+    };
+    try {
+      events.push(decodeRunJournalEvent(stamped));
+    } catch {}
+  });
+  return reduceRunJournal(events, runId);
+}
+function isRecord(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function timelineEntryFromCustomEntry(entry) {
+  if (entry.customType !== CUSTOM_TYPE_FOR["timeline-entry"] || !isRecord(entry.data))
+    return null;
+  const payload = isRecord(entry.data.payload) ? entry.data.payload : entry.data;
+  const type = typeof payload.type === "string" ? payload.type : "timeline";
+  const stage = typeof payload.stage === "string" ? payload.stage : typeof payload.name === "string" ? payload.name : null;
+  const status = typeof payload.status === "string" ? payload.status : typeof payload.outcome === "string" ? payload.outcome : null;
+  const detail = typeof payload.detail === "string" ? payload.detail : typeof payload.message === "string" ? payload.message : null;
+  const at = typeof entry.data.at === "string" ? entry.data.at : typeof payload.at === "string" ? payload.at : null;
+  return { at, type, stage, status, detail };
+}
+function timelineEntriesFromCustomEntries(entries) {
+  return entries.flatMap((entry) => {
+    const timelineEntry = timelineEntryFromCustomEntry(entry);
+    return timelineEntry ? [timelineEntry] : [];
+  });
+}
+function asCustomEntries(entries) {
+  return entries.filter((entry) => entry.type === "custom");
+}
 
-// packages/run-worker/src/runs/diagnostics.ts
+class RunSessionJournal {
+  sm;
+  runId;
+  constructor(sm, runId) {
+    this.sm = sm;
+    this.runId = runId;
+  }
+  #append(init) {
+    this.sm.appendCustomEntry(CUSTOM_TYPE_FOR[init.type], { ...init, at: new Date().toISOString() });
+  }
+  appendStatus(to, opts = {}) {
+    const from = foldRunSessionEntries(asCustomEntries(this.sm.getEntries()), this.runId).status;
+    if (!opts.force)
+      assertRunStatusTransition(from, to);
+    if (opts.errorText !== undefined)
+      this.#append({ type: "record-patch", patch: { errorText: opts.errorText } });
+    this.#append({
+      type: "status-changed",
+      from,
+      to,
+      ...opts.reason !== undefined ? { reason: opts.reason } : {},
+      ...opts.actor !== undefined ? { actor: opts.actor } : {}
+    });
+  }
+  appendTimeline(payload) {
+    this.#append({ type: "timeline-entry", payload });
+  }
+  appendCloseoutPhase(input) {
+    this.#append({
+      type: "closeout-phase",
+      phase: input.phase,
+      outcome: input.outcome,
+      ...input.detail !== undefined ? { detail: input.detail } : {}
+    });
+  }
+  appendApprovalResolved(input) {
+    this.#append({
+      type: "approval-resolved",
+      requestId: input.requestId,
+      decision: input.decision,
+      actor: input.actor,
+      ...input.note !== undefined ? { note: input.note } : {}
+    });
+  }
+  appendInputResolved(input) {
+    this.#append({ type: "input-resolved", requestId: input.requestId, answers: input.answers, actor: input.actor });
+  }
+  appendStall(input) {
+    this.#append({ type: "stall-detected", detail: input.detail });
+  }
+}
+
+// packages/run-worker/src/read-model-backend/projection.ts
+import { loadCapabilityForRoot } from "@rig/core/capability-loaders";
+import { defineCapability } from "@rig/core/capability";
+
+// packages/run-worker/src/read-model-backend/run-status.ts
+import { OPERATOR_INACTIVE_RUN_STATUSES } from "@rig/contracts";
+var TERMINAL_RUN_STATUSES2 = ["completed", "failed", "stopped"];
+var ACTIVE_RUN_STATUSES = [
+  "created",
+  "queued",
+  "preparing",
+  "running",
+  "waiting-approval",
+  "waiting-user-input",
+  "paused",
+  "validating",
+  "reviewing",
+  "closing-out",
+  "needs-attention"
+];
+var KNOWN_RUN_STATUS = Object.fromEntries([...ACTIVE_RUN_STATUSES, ...TERMINAL_RUN_STATUSES2].map((status) => [status, true]));
+function asRunStatus(status) {
+  return KNOWN_RUN_STATUS[status] ? status : null;
+}
+
+// packages/run-worker/src/read-model-backend/diagnostics.ts
 function normalizeString(value) {
   if (typeof value !== "string")
     return null;
@@ -62,7 +370,27 @@ function summarizeRunError(projection) {
   return categorizeUsefulRunError(nonGeneric) ?? nonGeneric.at(-1) ?? normalizeString(projection.record.errorText);
 }
 
-// packages/run-worker/src/runs/projection.ts
+// packages/run-worker/src/read-model-backend/projection.ts
+var RunDiscoveryCap = defineCapability(RUN_DISCOVERY);
+function registryEntryFromCollab(collab) {
+  const record = collab;
+  return {
+    roomId: collab.sessionId,
+    title: collab.title,
+    status: record.registryStatus ?? (collab.stale ? "stale" : "running"),
+    startedAt: collab.startedAt ?? null,
+    heartbeatAt: collab.updatedAt ?? null,
+    sessionPath: collab.sessionPath ?? null,
+    cwd: collab.cwd ?? null,
+    joinLink: collab.joinLink ?? null,
+    webLink: collab.webLink ?? null,
+    relayUrl: collab.relayUrl ?? null,
+    stale: collab.stale,
+    repo: collab.selectedRepo ?? null,
+    ...collab.pid === undefined ? {} : { pid: collab.pid },
+    projection: record.registryProjection ?? null
+  };
+}
 var EMPTY_PROJECTION = foldRunSessionEntries([], "");
 var DISCOVERY_DIAGNOSTIC_RUN_ID = "__registry_discovery_error__";
 function stringOrNull(value) {
@@ -79,22 +407,7 @@ function registryStatusAsRunStatus(status) {
     return "waiting-user-input";
   if (status === "starting")
     return "preparing";
-  return typeof status === "string" && [
-    "created",
-    "queued",
-    "preparing",
-    "running",
-    "waiting-approval",
-    "waiting-user-input",
-    "paused",
-    "validating",
-    "reviewing",
-    "closing-out",
-    "needs-attention",
-    "completed",
-    "failed",
-    "stopped"
-  ].includes(status) ? status : null;
+  return typeof status === "string" ? asRunStatus(status) : null;
 }
 function payloadString(payload, keys) {
   if (!payload || typeof payload !== "object")
@@ -117,12 +430,14 @@ function payloadOptions(payload) {
 }
 function inboxRequest(request, kind) {
   const fallback = kind === "approval" ? "Approval requested" : "Input requested";
+  const body = payloadString(request.payload, ["body", "description", "detail", "details"]);
+  const options = payloadOptions(request.payload);
   return {
     requestId: request.requestId,
     kind,
     title: payloadString(request.payload, ["title", "message", "reason", "prompt", "summary"]) ?? fallback,
-    body: payloadString(request.payload, ["body", "description", "detail", "details"]),
-    ...payloadOptions(request.payload) ? { options: payloadOptions(request.payload) } : {},
+    ...body !== undefined ? { body } : {},
+    ...options ? { options } : {},
     requestedAt: request.requestedAt ?? null,
     source: "run"
   };
@@ -231,8 +546,8 @@ function runRecordFromRegistryEntry(projectRoot, entry) {
     projection: folded
   };
 }
-function runRecordsFromRegistrySnapshot(projectRoot, snapshot) {
-  return sortByRecency(snapshot.entries.map((entry) => runRecordFromRegistryEntry(projectRoot, entry)).filter((record) => record !== null));
+function runRecordsFromCollab(projectRoot, collabs) {
+  return sortByRecency(collabs.map((collab) => runRecordFromRegistryEntry(projectRoot, registryEntryFromCollab(collab))).filter((record) => record !== null));
 }
 function sortByRecency(records) {
   return [...records].sort((a, b) => {
@@ -280,8 +595,11 @@ function discoveryDiagnosticRunRecord(projectRoot, error) {
 }
 async function listRunProjections(projectRoot, filter = {}) {
   try {
-    const snapshot = await Effect.runPromise(registrySnapshotStream(projectRoot, filter).pipe(Stream.runHead, Effect.timeout(Duration.seconds(15)), Effect.map(Option.getOrNull)));
-    return snapshot ? runRecordsFromRegistrySnapshot(projectRoot, snapshot) : [discoveryDiagnosticRunRecord(projectRoot, "registry discovery stream ended without a snapshot")];
+    const discovery = await loadCapabilityForRoot(projectRoot, RunDiscoveryCap);
+    if (!discovery)
+      return [discoveryDiagnosticRunRecord(projectRoot, "run discovery capability unavailable")];
+    const collabs = await discovery.listActiveRunCollab(projectRoot, filter);
+    return runRecordsFromCollab(projectRoot, collabs);
   } catch (error) {
     return [discoveryDiagnosticRunRecord(projectRoot, error)];
   }
@@ -308,7 +626,16 @@ async function getRunProjection(projectRoot, runId, filter = {}) {
 }
 var getRun = getRunProjection;
 
-// packages/run-worker/src/runs/control.ts
+// packages/run-worker/src/read-model-backend/control.ts
+function buildPauseSentinel(runId) {
+  return `${RIG_PAUSE_SENTINEL2} runId=${runId} requestedBy=operator ${RIG_CONTROL_SENTINEL_END2}`;
+}
+function buildResumeSentinel(runId) {
+  return `${RIG_RESUME_SENTINEL2} runId=${runId} requestedBy=operator ${RIG_CONTROL_SENTINEL_END2}`;
+}
+function buildStopSentinel(runId, reason) {
+  return `${RIG_STOP_SENTINEL2} runId=${runId} reason=${reason} ${RIG_STOP_SENTINEL_END2}`;
+}
 async function loadCollabControlDeps() {
   const [{ importRoomKey, seal }, { COLLAB_PROTO, packEnvelope, parseCollabLink }] = await Promise.all([
     import("@oh-my-pi/pi-coding-agent/collab/crypto"),
@@ -337,9 +664,6 @@ Stop this run and do not continue after the interruption settles.` },
       ];
   }
 }
-function collabControlFrame(runId, control) {
-  return collabControlFrames(runId, control)[0];
-}
 async function sendSealedCollabFrames(joinLink, frames, deps = {}) {
   const { importRoomKey, seal, COLLAB_PROTO, packEnvelope, parseCollabLink } = await loadCollabControlDeps();
   const parsed = parseCollabLink(joinLink);
@@ -393,6 +717,5 @@ async function deliverRunControl(projectRoot, target, control, deps = {}) {
 export {
   deliverRunControl,
   deliverRemoteRunControl,
-  collabControlFrames,
-  collabControlFrame
+  collabControlFrames
 };

package/dist/src/{runs → read-model-backend}/diagnostics.d.ts

@@ -7,4 +7,3 @@ import type { RunJournalProjection } from "@rig/contracts";
  * status reasons, closeout details, and reducer anomalies.
  */
 export declare function summarizeRunError(projection: RunJournalProjection): string | null;
-export declare const summarizeUsefulRunError: typeof summarizeRunError;

package/dist/src/{runs → read-model-backend}/diagnostics.js

@@ -1,5 +1,5 @@
 // @bun
-// packages/run-worker/src/runs/diagnostics.ts
+// packages/run-worker/src/read-model-backend/diagnostics.ts
 function normalizeString(value) {
   if (typeof value !== "string")
     return null;
@@ -46,8 +46,6 @@ function summarizeRunError(projection) {
   const nonGeneric = candidates.filter((candidate) => !isGenericRunFailure(candidate));
   return categorizeUsefulRunError(nonGeneric) ?? nonGeneric.at(-1) ?? normalizeString(projection.record.errorText);
 }
-var summarizeUsefulRunError = summarizeRunError;
 export {
-  summarizeUsefulRunError,
   summarizeRunError
 };

package/dist/src/{runs → read-model-backend}/guard.js

@@ -1,7 +1,6 @@
 // @bun
-// packages/run-worker/src/runs/guard.ts
-import { TERMINAL_RUN_STATUSES } from "@rig/contracts";
-var TERMINAL = new Set(TERMINAL_RUN_STATUSES);
+// packages/run-worker/src/read-model-backend/guard.ts
+var TERMINAL = new Set(["completed", "failed", "stopped"]);
 function runBlocksNewRunForTask(run) {
   return run.live && !run.stale && !TERMINAL.has(run.status) && run.status !== "needs-attention" && run.status !== "needs_attention";
 }