@h-rig/run-worker 0.0.6-alpha.135 → 0.0.6-alpha.137

package/dist/src/autohost.d.ts

@@ -1,6 +1,5 @@
 import type { ExtensionAPI, ExtensionContext, AgentEndEvent } from "@oh-my-pi/pi-coding-agent";
-import { type RigRunTimelineEntry, type RunInboxResolutionSentinel, type RunSessionCustomEntry } from "@rig/contracts";
-import { projectRunFromSession } from "@rig/runtime/control-plane/run-session-projection";
+import { type RigRunTimelineEntry, type RunInboxResolutionSentinel, type RunJournalProjection, type RunSessionCustomEntry } from "@rig/contracts";
 import { updateRunTaskSourceLifecycle } from "@rig/runtime/control-plane/tasks/source-lifecycle";
 import { type RegistryRunProjection } from "@rig/relay-registry";
 export interface RunProcessWorkerHooks {
@@ -23,7 +22,7 @@ export declare function reflectStoppedRunTaskSource(input: {
 }): Promise<boolean>;
 export declare function registryRunProjection(input: {
     readonly runId: string;
-    readonly folded: ReturnType<typeof projectRunFromSession>;
+    readonly folded: RunJournalProjection;
     readonly entries: readonly RunSessionCustomEntry[];
     readonly title: string;
     readonly joinLink?: string | null;

package/dist/src/autohost.js

@@ -1,6 +1,7 @@
 // @bun
 // packages/run-worker/src/autohost.ts
-import { runStagedCloseout } from "@rig/bundle-default-lifecycle/staged-closeout";
+import { runPipelineCloseout } from "@rig/bundle-default-lifecycle/pipeline-closeout";
+import { adoptPlacementKernel } from "@rig/composition/kernel-entrypoint";
 import { latestTimelineEntriesFromCustomEntries, parseInboxResolutionSentinel, parsePauseSentinel, parseResumeSentinel, parseStopSentinel, sessionIdFromSessionFile } from "@rig/contracts";
 import { Duration, Effect, Fiber, Stream } from "effect";
 import { createEnvCloseoutRunners } from "@rig/runtime/control-plane/native/closeout-runners";
@@ -12,7 +13,6 @@ import { resolveOwnerNamespaceKey } from "@rig/runtime/control-plane/remote-conf
 import { resolveRigIdentity } from "@rig/runtime/control-plane/identity";
 import { connectWorkerProjection, createRegistryClient } from "@rig/relay-registry";
 import { coerceRegistryStatus } from "@rig/relay-registry/schema";
-import { bootDefaultKernelIntoProcess } from "@rig/kernel/boot-default";
 
 // packages/run-worker/src/journal.ts
 import { createJournalSessionProvider } from "@rig/kernel/journal-session-provider";
@@ -108,6 +108,91 @@ function startRunProcessStallMonitor(opts) {
   return () => clearInterval(timer);
 }
 
+// packages/run-worker/src/panel-plugin.ts
+import { createProjectPluginHost, projectPluginResolutionWarningMessages } from "@rig/composition/project-plugins";
+var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
+var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
+var RIG_CAPABILITY_PANEL_SLOT = "capability";
+var RIG_SUPERVISOR_PANEL_ID = "supervisor";
+var PANEL_PRODUCER_TIMEOUT_MS = 2000;
+var RUN_SUPERVISOR_PANEL_REGISTRATION = {
+  id: RIG_SUPERVISOR_PANEL_ID,
+  slot: RIG_CAPABILITY_PANEL_SLOT,
+  title: "Supervisor",
+  capabilityId: "run.supervisor",
+  description: "Live run status, closeout progress, and operator stop control."
+};
+function buildSupervisorPanelPayload(context) {
+  const status = context.folded.status ?? "unknown";
+  const taskId = context.folded.record.taskId ?? context.taskIdAtStart;
+  const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+  return {
+    status,
+    currentTask: taskId ? { id: taskId, title: context.runDisplayTitle } : null,
+    processed: context.folded.closeoutPhases.length,
+    succeeded: context.folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
+    failed: context.folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
+    skipped: 0,
+    plannedOrder: taskId ? [{ id: taskId, title: context.runDisplayTitle, status }] : [],
+    idleReason: operatorActive ? null : status,
+    stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
+    closures: []
+  };
+}
+var RUN_SUPERVISOR_PANEL_PRODUCER = {
+  ...RUN_SUPERVISOR_PANEL_REGISTRATION,
+  produce(context) {
+    return buildSupervisorPanelPayload(context);
+  }
+};
+async function produceWorkerPanelPayload(producer, context) {
+  if (!producer.produce)
+    return;
+  let timeout;
+  try {
+    return await Promise.race([
+      Promise.resolve(producer.produce(context)),
+      new Promise((resolve2) => {
+        timeout = setTimeout(() => resolve2(undefined), PANEL_PRODUCER_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+var RUN_WORKER_PANEL_PLUGIN = {
+  name: "@rig/run-worker-panels",
+  version: "0.0.0-alpha.1",
+  contributes: {
+    panels: [RUN_SUPERVISOR_PANEL_REGISTRATION]
+  },
+  __runtime: {
+    panels: [RUN_SUPERVISOR_PANEL_PRODUCER]
+  }
+};
+async function loadWorkerPanelRegistry(projectRoot) {
+  try {
+    const { host, resolved } = await createProjectPluginHost(projectRoot, {
+      mode: "compatibility-default-injection",
+      surfaceName: "run-worker-panel-registry",
+      surfaceExtras: [RUN_WORKER_PANEL_PLUGIN]
+    });
+    for (const message of projectPluginResolutionWarningMessages(resolved)) {
+      console.warn(`[rig-run] ${message}`);
+    }
+    return {
+      registrations: host.listPanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT),
+      producers: host.listExecutablePanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT)
+    };
+  } catch (error) {
+    console.error(`[rig-run] panel-registry-build-failed ${error instanceof Error ? error.message : String(error)}`);
+    return {
+      registrations: [RUN_SUPERVISOR_PANEL_REGISTRATION],
+      producers: [RUN_SUPERVISOR_PANEL_PRODUCER]
+    };
+  }
+}
+
 // packages/run-worker/src/utils.ts
 import { createWorkflowStatusChanged, RIG_WORKFLOW_STATUS_CHANGED } from "@rig/contracts";
 import { resolveRegistryBaseUrl, resolveRelayUrl } from "@rig/runtime/control-plane/remote-config";
@@ -130,8 +215,6 @@ function rigRelayUrl() {
 }
 
 // packages/run-worker/src/autohost.ts
-var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
-var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
 function syntheticRegistryOwner(namespaceKey) {
   const githubUserId = namespaceKey.startsWith("gh:") ? namespaceKey.slice(3) : namespaceKey;
   return {
@@ -228,7 +311,16 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   const envRunId = process.env.RIG_RUN_ID?.trim();
   if (!envRunId)
     throw new Error("RIG_RUN_ID is required when RIG_RUN_PROCESS=1");
-  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) ?? envRunId;
+  const sessionManagerRunId = typeof ctx.sessionManager.getSessionId === "function" ? ctx.sessionManager.getSessionId().trim() : "";
+  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) || sessionManagerRunId;
+  if (!runId)
+    throw new Error("OMP session id is required when RIG_RUN_PROCESS=1; RIG_RUN_ID is only a dispatch handle.");
+  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const journal = await createRunJournal(ctx.sessionManager, runId);
+  await adoptPlacementKernel(projectRoot, {
+    entrypoint: "run-worker",
+    ...journal ? { journal: journal.kernel } : {}
+  });
   if (!ctx.hasUI)
     return null;
   const collab = ctx.collab;
@@ -236,12 +328,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   if (!startHost)
     throw new Error("OMP collab host facade is unavailable for Rig run process.");
   const identity = resolveRigIdentity(ctx);
-  const journal = await createRunJournal(ctx.sessionManager, runId);
-  await bootDefaultKernelIntoProcess({
-    entrypoint: "run-worker",
-    ...journal ? { journal: journal.kernel } : {}
-  });
-  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const panelRegistry = await loadWorkerPanelRegistry(projectRoot);
   let runProjection = projectRunFromSession(customEntries(ctx.sessionManager.getBranch()), runId);
   const taskIdAtStart = process.env.RIG_TASK_ID?.trim() || runProjection.record.taskId;
   const runDisplayTitle = (() => {
@@ -301,30 +388,43 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     });
   };
   let lastRigPanelsSnapshotJson = "";
-  const publishRigPanelsSnapshot = () => {
+  const publishRigPanelsSnapshot = async () => {
     const appendCustomMessageEntry = ctx.sessionManager.appendCustomMessageEntry?.bind(ctx.sessionManager);
     if (!appendCustomMessageEntry)
       return;
     const { folded } = currentProjectionParts();
-    const status = folded.status ?? "unknown";
-    const taskId = folded.record.taskId ?? taskIdAtStart;
-    const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+    const producerContext = {
+      projectRoot,
+      runId,
+      folded,
+      taskIdAtStart,
+      runDisplayTitle
+    };
+    const payloadEntries = await Promise.all(panelRegistry.producers.map(async (producer) => {
+      try {
+        const payload = await produceWorkerPanelPayload(producer, producerContext);
+        return payload === undefined ? null : [producer.id, payload];
+      } catch (error) {
+        console.error(`[rig-run] panel-producer-failed panel=${producer.id} ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+      }
+    }));
+    const payloads = Object.fromEntries(payloadEntries.filter((entry) => entry !== null));
+    const registrations = panelRegistry.registrations.map((panel) => ({
+      id: panel.id,
+      slot: panel.slot,
+      title: panel.title,
+      capabilityId: panel.capabilityId,
+      description: panel.description,
+      badge: panel.badge,
+      disabled: panel.disabled
+    }));
+    const activePanel = registrations.find((panel) => panel.id === RIG_SUPERVISOR_PANEL_ID)?.id ?? registrations.find((panel) => !panel.disabled)?.id ?? registrations[0]?.id ?? null;
     const frameBody = {
       kind: "snapshot",
-      activePanel: "supervisor",
-      registrations: [{ id: "supervisor", title: "Supervisor" }],
-      supervisor: {
-        status,
-        currentTask: taskId ? { id: taskId, title: runDisplayTitle } : null,
-        processed: folded.closeoutPhases.length,
-        succeeded: folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
-        failed: folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
-        skipped: 0,
-        plannedOrder: taskId ? [{ id: taskId, title: runDisplayTitle, status }] : [],
-        idleReason: operatorActive ? null : status,
-        stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
-        closures: []
-      }
+      activePanel,
+      registrations,
+      payloads
     };
     const serialized = JSON.stringify(frameBody);
     if (serialized === lastRigPanelsSnapshotJson)
@@ -332,6 +432,11 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     lastRigPanelsSnapshotJson = serialized;
     appendCustomMessageEntry(RIG_PANELS_CUSTOM_MESSAGE_TYPE, "", false, { ...frameBody, updatedAt: new Date().toISOString() }, "agent");
   };
+  const publishRigPanelsSnapshotBestEffort = () => {
+    publishRigPanelsSnapshot().catch((error) => {
+      console.error(`[rig-run] panel-snapshot-publish-failed ${error instanceof Error ? error.message : String(error)}`);
+    });
+  };
   const pushWorkerProjection = (links = runRegistryLinks) => {
     if (!workerProjectionConnection)
       return;
@@ -339,12 +444,12 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   };
   const publishRunProjection = async (status) => {
     const projection = buildCurrentRegistryProjection();
-    publishRigPanelsSnapshot();
     if (workerProjectionConnection)
       workerProjectionConnection.push(projection);
     if (runRegistry && runRegistryRoomId) {
       await runRegistry.heartbeatRoom(runRegistryRoomId, status, projection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
     }
+    publishRigPanelsSnapshotBestEffort();
   };
   const stopRunRegistry = (opts = {}) => {
     if (runRegistryHeartbeat) {
@@ -460,10 +565,14 @@ async function maybeStartRunProcessAutohost(api, ctx) {
         relayUrl: rigRelayUrl(),
         onPanelAction: handlePanelAction
       });
+      const roomId = projection.sessionId?.trim() || runId;
+      if (roomId !== runId) {
+        throw new Error(`Collab host session id mismatch: expected ${runId}, got ${roomId}`);
+      }
       runRegistryLinks = { joinLink: projection.joinLink, webLink: projection.webLink, relayUrl: projection.relayUrl ?? rigRelayUrl() };
       const timeline = {
         type: "collab-host-started",
-        roomId: projection.sessionId,
+        roomId,
         joinLink: projection.joinLink,
         webLink: projection.webLink,
         relayUrl: projection.relayUrl
@@ -471,13 +580,13 @@ async function maybeStartRunProcessAutohost(api, ctx) {
       journal?.appendTimeline(timeline);
       console.log(`[rig-run] collab-host-started joinLink=${projection.joinLink || "(empty)"} relayUrl=${projection.relayUrl || "(empty)"}`);
       ctx.ui.notify("Rig run collab host started.", "info");
-      publishRigPanelsSnapshot();
+      publishRigPanelsSnapshotBestEffort();
       if (runRegistry) {
         try {
-          runRegistryRoomId = projection.sessionId;
+          runRegistryRoomId = roomId;
           const initialProjection = buildCurrentRegistryProjection();
           await runRegistry.registerRoom({
-            roomId: projection.sessionId,
+            roomId,
             owner: runRegistryOwner,
             repo: runRegistryRepo,
             title: runDisplayTitle,
@@ -491,15 +600,15 @@ async function maybeStartRunProcessAutohost(api, ctx) {
             pid: process.pid,
             projection: initialProjection
           });
-          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: projection.sessionId });
+          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: roomId });
           workerProjectionConnection.ready.catch((err) => console.error(`[rig-run] worker-projection-degraded (heartbeat remains authoritative): ${err instanceof Error ? err.message : String(err)}`));
           pushWorkerProjection();
           workerProjectionFiber = Effect.runFork(localRunChanges(projectRoot).pipe(Stream.debounce(Duration.millis(500)), Stream.runForEach(() => Effect.sync(() => pushWorkerProjection()))));
-          journal?.appendTimeline({ type: "registry-registered", roomId: projection.sessionId });
-          console.log(`[rig-run] registry-registered roomId=${projection.sessionId}`);
+          journal?.appendTimeline({ type: "registry-registered", roomId });
+          console.log(`[rig-run] registry-registered roomId=${roomId}`);
           runRegistryHeartbeat = setInterval(() => {
             const heartbeatProjection = buildCurrentRegistryProjection();
-            runRegistry.heartbeatRoom(projection.sessionId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
+            runRegistry.heartbeatRoom(roomId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
           }, 15000);
           if (typeof runRegistryHeartbeat.unref === "function")
             runRegistryHeartbeat.unref();
@@ -508,15 +617,22 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           ctx.ui.notify("Rig run could not register to the discovery registry; it may not appear in Runs.", "warning");
         }
       }
+      return true;
     } catch (error) {
+      if (error instanceof Error && error.message.startsWith("Collab host session id mismatch:")) {
+        publishFatalTerminal(error);
+        return false;
+      }
       console.error(`[rig-run] collab-host-start-failed ${error instanceof Error ? error.message : String(error)}`);
       ctx.ui.notify("Rig run collab host could not reach the relay; session remains local.", "warning");
+      return true;
     }
   };
   journal?.appendTimeline({ type: "stage", stage: "Connect", status: "running", detail: "run process session_start" });
   journal?.appendTimeline({ type: "stage", stage: "Prepare", status: "completed", detail: "run process prepared" });
   journal?.appendStatus("running", { actor: { kind: "agent" }, reason: "run process session started", force: true });
-  await startRunCollabHost();
+  if (!await startRunCollabHost())
+    return null;
   if (taskIdAtStart) {
     journal?.appendTimeline({ type: "stage", stage: "GitHub-sync", status: "running", detail: "reflecting rig:running to task source" });
     try {
@@ -616,7 +732,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     const { command, gitCommand } = createEnvCloseoutRunners(process.env);
     let closeoutStatusAdvanced = false;
     try {
-      await runStagedCloseout({
+      await runPipelineCloseout({
         projectRoot,
         runId,
         taskId,
@@ -631,6 +747,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           journal?.appendStatus("validating", { actor: { kind: "agent" }, reason: "validating task before closeout", force: true });
           await publishRunProjection("validating");
         },
+        kernelJournal: journal?.kernel ?? null,
         journalPhase: async (phase, outcome, detail) => {
           journal?.appendCloseoutPhase({ phase, outcome, detail: detail ?? null });
           if (!closeoutStatusAdvanced && phase !== "queued" && outcome === "started") {

package/dist/src/extension.js

@@ -1,6 +1,7 @@
 // @bun
 // packages/run-worker/src/autohost.ts
-import { runStagedCloseout } from "@rig/bundle-default-lifecycle/staged-closeout";
+import { runPipelineCloseout } from "@rig/bundle-default-lifecycle/pipeline-closeout";
+import { adoptPlacementKernel } from "@rig/composition/kernel-entrypoint";
 import { latestTimelineEntriesFromCustomEntries, parseInboxResolutionSentinel, parsePauseSentinel, parseResumeSentinel, parseStopSentinel, sessionIdFromSessionFile } from "@rig/contracts";
 import { Duration, Effect, Fiber, Stream } from "effect";
 import { createEnvCloseoutRunners } from "@rig/runtime/control-plane/native/closeout-runners";
@@ -12,7 +13,6 @@ import { resolveOwnerNamespaceKey } from "@rig/runtime/control-plane/remote-conf
 import { resolveRigIdentity } from "@rig/runtime/control-plane/identity";
 import { connectWorkerProjection, createRegistryClient } from "@rig/relay-registry";
 import { coerceRegistryStatus } from "@rig/relay-registry/schema";
-import { bootDefaultKernelIntoProcess } from "@rig/kernel/boot-default";
 
 // packages/run-worker/src/journal.ts
 import { createJournalSessionProvider } from "@rig/kernel/journal-session-provider";
@@ -108,6 +108,91 @@ function startRunProcessStallMonitor(opts) {
   return () => clearInterval(timer);
 }
 
+// packages/run-worker/src/panel-plugin.ts
+import { createProjectPluginHost, projectPluginResolutionWarningMessages } from "@rig/composition/project-plugins";
+var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
+var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
+var RIG_CAPABILITY_PANEL_SLOT = "capability";
+var RIG_SUPERVISOR_PANEL_ID = "supervisor";
+var PANEL_PRODUCER_TIMEOUT_MS = 2000;
+var RUN_SUPERVISOR_PANEL_REGISTRATION = {
+  id: RIG_SUPERVISOR_PANEL_ID,
+  slot: RIG_CAPABILITY_PANEL_SLOT,
+  title: "Supervisor",
+  capabilityId: "run.supervisor",
+  description: "Live run status, closeout progress, and operator stop control."
+};
+function buildSupervisorPanelPayload(context) {
+  const status = context.folded.status ?? "unknown";
+  const taskId = context.folded.record.taskId ?? context.taskIdAtStart;
+  const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+  return {
+    status,
+    currentTask: taskId ? { id: taskId, title: context.runDisplayTitle } : null,
+    processed: context.folded.closeoutPhases.length,
+    succeeded: context.folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
+    failed: context.folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
+    skipped: 0,
+    plannedOrder: taskId ? [{ id: taskId, title: context.runDisplayTitle, status }] : [],
+    idleReason: operatorActive ? null : status,
+    stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
+    closures: []
+  };
+}
+var RUN_SUPERVISOR_PANEL_PRODUCER = {
+  ...RUN_SUPERVISOR_PANEL_REGISTRATION,
+  produce(context) {
+    return buildSupervisorPanelPayload(context);
+  }
+};
+async function produceWorkerPanelPayload(producer, context) {
+  if (!producer.produce)
+    return;
+  let timeout;
+  try {
+    return await Promise.race([
+      Promise.resolve(producer.produce(context)),
+      new Promise((resolve2) => {
+        timeout = setTimeout(() => resolve2(undefined), PANEL_PRODUCER_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+var RUN_WORKER_PANEL_PLUGIN = {
+  name: "@rig/run-worker-panels",
+  version: "0.0.0-alpha.1",
+  contributes: {
+    panels: [RUN_SUPERVISOR_PANEL_REGISTRATION]
+  },
+  __runtime: {
+    panels: [RUN_SUPERVISOR_PANEL_PRODUCER]
+  }
+};
+async function loadWorkerPanelRegistry(projectRoot) {
+  try {
+    const { host, resolved } = await createProjectPluginHost(projectRoot, {
+      mode: "compatibility-default-injection",
+      surfaceName: "run-worker-panel-registry",
+      surfaceExtras: [RUN_WORKER_PANEL_PLUGIN]
+    });
+    for (const message of projectPluginResolutionWarningMessages(resolved)) {
+      console.warn(`[rig-run] ${message}`);
+    }
+    return {
+      registrations: host.listPanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT),
+      producers: host.listExecutablePanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT)
+    };
+  } catch (error) {
+    console.error(`[rig-run] panel-registry-build-failed ${error instanceof Error ? error.message : String(error)}`);
+    return {
+      registrations: [RUN_SUPERVISOR_PANEL_REGISTRATION],
+      producers: [RUN_SUPERVISOR_PANEL_PRODUCER]
+    };
+  }
+}
+
 // packages/run-worker/src/utils.ts
 import { createWorkflowStatusChanged, RIG_WORKFLOW_STATUS_CHANGED } from "@rig/contracts";
 import { resolveRegistryBaseUrl, resolveRelayUrl } from "@rig/runtime/control-plane/remote-config";
@@ -130,8 +215,6 @@ function rigRelayUrl() {
 }
 
 // packages/run-worker/src/autohost.ts
-var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
-var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
 function syntheticRegistryOwner(namespaceKey) {
   const githubUserId = namespaceKey.startsWith("gh:") ? namespaceKey.slice(3) : namespaceKey;
   return {
@@ -228,7 +311,16 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   const envRunId = process.env.RIG_RUN_ID?.trim();
   if (!envRunId)
     throw new Error("RIG_RUN_ID is required when RIG_RUN_PROCESS=1");
-  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) ?? envRunId;
+  const sessionManagerRunId = typeof ctx.sessionManager.getSessionId === "function" ? ctx.sessionManager.getSessionId().trim() : "";
+  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) || sessionManagerRunId;
+  if (!runId)
+    throw new Error("OMP session id is required when RIG_RUN_PROCESS=1; RIG_RUN_ID is only a dispatch handle.");
+  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const journal = await createRunJournal(ctx.sessionManager, runId);
+  await adoptPlacementKernel(projectRoot, {
+    entrypoint: "run-worker",
+    ...journal ? { journal: journal.kernel } : {}
+  });
   if (!ctx.hasUI)
     return null;
   const collab = ctx.collab;
@@ -236,12 +328,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   if (!startHost)
     throw new Error("OMP collab host facade is unavailable for Rig run process.");
   const identity = resolveRigIdentity(ctx);
-  const journal = await createRunJournal(ctx.sessionManager, runId);
-  await bootDefaultKernelIntoProcess({
-    entrypoint: "run-worker",
-    ...journal ? { journal: journal.kernel } : {}
-  });
-  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const panelRegistry = await loadWorkerPanelRegistry(projectRoot);
   let runProjection = projectRunFromSession(customEntries(ctx.sessionManager.getBranch()), runId);
   const taskIdAtStart = process.env.RIG_TASK_ID?.trim() || runProjection.record.taskId;
   const runDisplayTitle = (() => {
@@ -301,30 +388,43 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     });
   };
   let lastRigPanelsSnapshotJson = "";
-  const publishRigPanelsSnapshot = () => {
+  const publishRigPanelsSnapshot = async () => {
     const appendCustomMessageEntry = ctx.sessionManager.appendCustomMessageEntry?.bind(ctx.sessionManager);
     if (!appendCustomMessageEntry)
       return;
     const { folded } = currentProjectionParts();
-    const status = folded.status ?? "unknown";
-    const taskId = folded.record.taskId ?? taskIdAtStart;
-    const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+    const producerContext = {
+      projectRoot,
+      runId,
+      folded,
+      taskIdAtStart,
+      runDisplayTitle
+    };
+    const payloadEntries = await Promise.all(panelRegistry.producers.map(async (producer) => {
+      try {
+        const payload = await produceWorkerPanelPayload(producer, producerContext);
+        return payload === undefined ? null : [producer.id, payload];
+      } catch (error) {
+        console.error(`[rig-run] panel-producer-failed panel=${producer.id} ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+      }
+    }));
+    const payloads = Object.fromEntries(payloadEntries.filter((entry) => entry !== null));
+    const registrations = panelRegistry.registrations.map((panel) => ({
+      id: panel.id,
+      slot: panel.slot,
+      title: panel.title,
+      capabilityId: panel.capabilityId,
+      description: panel.description,
+      badge: panel.badge,
+      disabled: panel.disabled
+    }));
+    const activePanel = registrations.find((panel) => panel.id === RIG_SUPERVISOR_PANEL_ID)?.id ?? registrations.find((panel) => !panel.disabled)?.id ?? registrations[0]?.id ?? null;
     const frameBody = {
       kind: "snapshot",
-      activePanel: "supervisor",
-      registrations: [{ id: "supervisor", title: "Supervisor" }],
-      supervisor: {
-        status,
-        currentTask: taskId ? { id: taskId, title: runDisplayTitle } : null,
-        processed: folded.closeoutPhases.length,
-        succeeded: folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
-        failed: folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
-        skipped: 0,
-        plannedOrder: taskId ? [{ id: taskId, title: runDisplayTitle, status }] : [],
-        idleReason: operatorActive ? null : status,
-        stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
-        closures: []
-      }
+      activePanel,
+      registrations,
+      payloads
     };
     const serialized = JSON.stringify(frameBody);
     if (serialized === lastRigPanelsSnapshotJson)
@@ -332,6 +432,11 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     lastRigPanelsSnapshotJson = serialized;
     appendCustomMessageEntry(RIG_PANELS_CUSTOM_MESSAGE_TYPE, "", false, { ...frameBody, updatedAt: new Date().toISOString() }, "agent");
   };
+  const publishRigPanelsSnapshotBestEffort = () => {
+    publishRigPanelsSnapshot().catch((error) => {
+      console.error(`[rig-run] panel-snapshot-publish-failed ${error instanceof Error ? error.message : String(error)}`);
+    });
+  };
   const pushWorkerProjection = (links = runRegistryLinks) => {
     if (!workerProjectionConnection)
       return;
@@ -339,12 +444,12 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   };
   const publishRunProjection = async (status) => {
     const projection = buildCurrentRegistryProjection();
-    publishRigPanelsSnapshot();
     if (workerProjectionConnection)
       workerProjectionConnection.push(projection);
     if (runRegistry && runRegistryRoomId) {
       await runRegistry.heartbeatRoom(runRegistryRoomId, status, projection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
     }
+    publishRigPanelsSnapshotBestEffort();
   };
   const stopRunRegistry = (opts = {}) => {
     if (runRegistryHeartbeat) {
@@ -460,10 +565,14 @@ async function maybeStartRunProcessAutohost(api, ctx) {
         relayUrl: rigRelayUrl(),
         onPanelAction: handlePanelAction
       });
+      const roomId = projection.sessionId?.trim() || runId;
+      if (roomId !== runId) {
+        throw new Error(`Collab host session id mismatch: expected ${runId}, got ${roomId}`);
+      }
       runRegistryLinks = { joinLink: projection.joinLink, webLink: projection.webLink, relayUrl: projection.relayUrl ?? rigRelayUrl() };
       const timeline = {
         type: "collab-host-started",
-        roomId: projection.sessionId,
+        roomId,
         joinLink: projection.joinLink,
         webLink: projection.webLink,
         relayUrl: projection.relayUrl
@@ -471,13 +580,13 @@ async function maybeStartRunProcessAutohost(api, ctx) {
       journal?.appendTimeline(timeline);
       console.log(`[rig-run] collab-host-started joinLink=${projection.joinLink || "(empty)"} relayUrl=${projection.relayUrl || "(empty)"}`);
       ctx.ui.notify("Rig run collab host started.", "info");
-      publishRigPanelsSnapshot();
+      publishRigPanelsSnapshotBestEffort();
       if (runRegistry) {
         try {
-          runRegistryRoomId = projection.sessionId;
+          runRegistryRoomId = roomId;
           const initialProjection = buildCurrentRegistryProjection();
           await runRegistry.registerRoom({
-            roomId: projection.sessionId,
+            roomId,
             owner: runRegistryOwner,
             repo: runRegistryRepo,
             title: runDisplayTitle,
@@ -491,15 +600,15 @@ async function maybeStartRunProcessAutohost(api, ctx) {
             pid: process.pid,
             projection: initialProjection
           });
-          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: projection.sessionId });
+          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: roomId });
           workerProjectionConnection.ready.catch((err) => console.error(`[rig-run] worker-projection-degraded (heartbeat remains authoritative): ${err instanceof Error ? err.message : String(err)}`));
           pushWorkerProjection();
           workerProjectionFiber = Effect.runFork(localRunChanges(projectRoot).pipe(Stream.debounce(Duration.millis(500)), Stream.runForEach(() => Effect.sync(() => pushWorkerProjection()))));
-          journal?.appendTimeline({ type: "registry-registered", roomId: projection.sessionId });
-          console.log(`[rig-run] registry-registered roomId=${projection.sessionId}`);
+          journal?.appendTimeline({ type: "registry-registered", roomId });
+          console.log(`[rig-run] registry-registered roomId=${roomId}`);
           runRegistryHeartbeat = setInterval(() => {
             const heartbeatProjection = buildCurrentRegistryProjection();
-            runRegistry.heartbeatRoom(projection.sessionId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
+            runRegistry.heartbeatRoom(roomId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
           }, 15000);
           if (typeof runRegistryHeartbeat.unref === "function")
             runRegistryHeartbeat.unref();
@@ -508,15 +617,22 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           ctx.ui.notify("Rig run could not register to the discovery registry; it may not appear in Runs.", "warning");
         }
       }
+      return true;
     } catch (error) {
+      if (error instanceof Error && error.message.startsWith("Collab host session id mismatch:")) {
+        publishFatalTerminal(error);
+        return false;
+      }
       console.error(`[rig-run] collab-host-start-failed ${error instanceof Error ? error.message : String(error)}`);
       ctx.ui.notify("Rig run collab host could not reach the relay; session remains local.", "warning");
+      return true;
     }
   };
   journal?.appendTimeline({ type: "stage", stage: "Connect", status: "running", detail: "run process session_start" });
   journal?.appendTimeline({ type: "stage", stage: "Prepare", status: "completed", detail: "run process prepared" });
   journal?.appendStatus("running", { actor: { kind: "agent" }, reason: "run process session started", force: true });
-  await startRunCollabHost();
+  if (!await startRunCollabHost())
+    return null;
   if (taskIdAtStart) {
     journal?.appendTimeline({ type: "stage", stage: "GitHub-sync", status: "running", detail: "reflecting rig:running to task source" });
     try {
@@ -616,7 +732,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     const { command, gitCommand } = createEnvCloseoutRunners(process.env);
     let closeoutStatusAdvanced = false;
     try {
-      await runStagedCloseout({
+      await runPipelineCloseout({
         projectRoot,
         runId,
         taskId,
@@ -631,6 +747,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           journal?.appendStatus("validating", { actor: { kind: "agent" }, reason: "validating task before closeout", force: true });
           await publishRunProjection("validating");
         },
+        kernelJournal: journal?.kernel ?? null,
         journalPhase: async (phase, outcome, detail) => {
           journal?.appendCloseoutPhase({ phase, outcome, detail: detail ?? null });
           if (!closeoutStatusAdvanced && phase !== "queued" && outcome === "started") {

package/dist/src/index.d.ts

@@ -2,5 +2,6 @@ export { default, __rigExtensionTest, __rigRunWorkerTest } from "./extension";
 export * from "./autohost";
 export * from "./constants";
 export * from "./journal";
+export * from "./panel-plugin";
 export * from "./notifications";
 export * from "./stall";

package/dist/src/index.js

@@ -1,6 +1,7 @@
 // @bun
 // packages/run-worker/src/autohost.ts
-import { runStagedCloseout } from "@rig/bundle-default-lifecycle/staged-closeout";
+import { runPipelineCloseout } from "@rig/bundle-default-lifecycle/pipeline-closeout";
+import { adoptPlacementKernel } from "@rig/composition/kernel-entrypoint";
 import { latestTimelineEntriesFromCustomEntries, parseInboxResolutionSentinel, parsePauseSentinel, parseResumeSentinel, parseStopSentinel, sessionIdFromSessionFile } from "@rig/contracts";
 import { Duration, Effect, Fiber, Stream } from "effect";
 import { createEnvCloseoutRunners } from "@rig/runtime/control-plane/native/closeout-runners";
@@ -12,7 +13,6 @@ import { resolveOwnerNamespaceKey } from "@rig/runtime/control-plane/remote-conf
 import { resolveRigIdentity } from "@rig/runtime/control-plane/identity";
 import { connectWorkerProjection, createRegistryClient } from "@rig/relay-registry";
 import { coerceRegistryStatus } from "@rig/relay-registry/schema";
-import { bootDefaultKernelIntoProcess } from "@rig/kernel/boot-default";
 
 // packages/run-worker/src/journal.ts
 import { createJournalSessionProvider } from "@rig/kernel/journal-session-provider";
@@ -108,6 +108,91 @@ function startRunProcessStallMonitor(opts) {
   return () => clearInterval(timer);
 }
 
+// packages/run-worker/src/panel-plugin.ts
+import { createProjectPluginHost, projectPluginResolutionWarningMessages } from "@rig/composition/project-plugins";
+var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
+var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
+var RIG_CAPABILITY_PANEL_SLOT = "capability";
+var RIG_SUPERVISOR_PANEL_ID = "supervisor";
+var PANEL_PRODUCER_TIMEOUT_MS = 2000;
+var RUN_SUPERVISOR_PANEL_REGISTRATION = {
+  id: RIG_SUPERVISOR_PANEL_ID,
+  slot: RIG_CAPABILITY_PANEL_SLOT,
+  title: "Supervisor",
+  capabilityId: "run.supervisor",
+  description: "Live run status, closeout progress, and operator stop control."
+};
+function buildSupervisorPanelPayload(context) {
+  const status = context.folded.status ?? "unknown";
+  const taskId = context.folded.record.taskId ?? context.taskIdAtStart;
+  const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+  return {
+    status,
+    currentTask: taskId ? { id: taskId, title: context.runDisplayTitle } : null,
+    processed: context.folded.closeoutPhases.length,
+    succeeded: context.folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
+    failed: context.folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
+    skipped: 0,
+    plannedOrder: taskId ? [{ id: taskId, title: context.runDisplayTitle, status }] : [],
+    idleReason: operatorActive ? null : status,
+    stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
+    closures: []
+  };
+}
+var RUN_SUPERVISOR_PANEL_PRODUCER = {
+  ...RUN_SUPERVISOR_PANEL_REGISTRATION,
+  produce(context) {
+    return buildSupervisorPanelPayload(context);
+  }
+};
+async function produceWorkerPanelPayload(producer, context) {
+  if (!producer.produce)
+    return;
+  let timeout;
+  try {
+    return await Promise.race([
+      Promise.resolve(producer.produce(context)),
+      new Promise((resolve2) => {
+        timeout = setTimeout(() => resolve2(undefined), PANEL_PRODUCER_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+var RUN_WORKER_PANEL_PLUGIN = {
+  name: "@rig/run-worker-panels",
+  version: "0.0.0-alpha.1",
+  contributes: {
+    panels: [RUN_SUPERVISOR_PANEL_REGISTRATION]
+  },
+  __runtime: {
+    panels: [RUN_SUPERVISOR_PANEL_PRODUCER]
+  }
+};
+async function loadWorkerPanelRegistry(projectRoot) {
+  try {
+    const { host, resolved } = await createProjectPluginHost(projectRoot, {
+      mode: "compatibility-default-injection",
+      surfaceName: "run-worker-panel-registry",
+      surfaceExtras: [RUN_WORKER_PANEL_PLUGIN]
+    });
+    for (const message of projectPluginResolutionWarningMessages(resolved)) {
+      console.warn(`[rig-run] ${message}`);
+    }
+    return {
+      registrations: host.listPanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT),
+      producers: host.listExecutablePanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT)
+    };
+  } catch (error) {
+    console.error(`[rig-run] panel-registry-build-failed ${error instanceof Error ? error.message : String(error)}`);
+    return {
+      registrations: [RUN_SUPERVISOR_PANEL_REGISTRATION],
+      producers: [RUN_SUPERVISOR_PANEL_PRODUCER]
+    };
+  }
+}
+
 // packages/run-worker/src/utils.ts
 import { createWorkflowStatusChanged, RIG_WORKFLOW_STATUS_CHANGED } from "@rig/contracts";
 import { resolveRegistryBaseUrl, resolveRelayUrl } from "@rig/runtime/control-plane/remote-config";
@@ -130,8 +215,6 @@ function rigRelayUrl() {
 }
 
 // packages/run-worker/src/autohost.ts
-var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
-var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
 function syntheticRegistryOwner(namespaceKey) {
   const githubUserId = namespaceKey.startsWith("gh:") ? namespaceKey.slice(3) : namespaceKey;
   return {
@@ -228,7 +311,16 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   const envRunId = process.env.RIG_RUN_ID?.trim();
   if (!envRunId)
     throw new Error("RIG_RUN_ID is required when RIG_RUN_PROCESS=1");
-  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) ?? envRunId;
+  const sessionManagerRunId = typeof ctx.sessionManager.getSessionId === "function" ? ctx.sessionManager.getSessionId().trim() : "";
+  const runId = sessionIdFromSessionFile(ctx.sessionManager.getSessionFile()) || sessionManagerRunId;
+  if (!runId)
+    throw new Error("OMP session id is required when RIG_RUN_PROCESS=1; RIG_RUN_ID is only a dispatch handle.");
+  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const journal = await createRunJournal(ctx.sessionManager, runId);
+  await adoptPlacementKernel(projectRoot, {
+    entrypoint: "run-worker",
+    ...journal ? { journal: journal.kernel } : {}
+  });
   if (!ctx.hasUI)
     return null;
   const collab = ctx.collab;
@@ -236,12 +328,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   if (!startHost)
     throw new Error("OMP collab host facade is unavailable for Rig run process.");
   const identity = resolveRigIdentity(ctx);
-  const journal = await createRunJournal(ctx.sessionManager, runId);
-  await bootDefaultKernelIntoProcess({
-    entrypoint: "run-worker",
-    ...journal ? { journal: journal.kernel } : {}
-  });
-  const projectRoot = process.env.PROJECT_RIG_ROOT ?? process.cwd();
+  const panelRegistry = await loadWorkerPanelRegistry(projectRoot);
   let runProjection = projectRunFromSession(customEntries(ctx.sessionManager.getBranch()), runId);
   const taskIdAtStart = process.env.RIG_TASK_ID?.trim() || runProjection.record.taskId;
   const runDisplayTitle = (() => {
@@ -301,30 +388,43 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     });
   };
   let lastRigPanelsSnapshotJson = "";
-  const publishRigPanelsSnapshot = () => {
+  const publishRigPanelsSnapshot = async () => {
     const appendCustomMessageEntry = ctx.sessionManager.appendCustomMessageEntry?.bind(ctx.sessionManager);
     if (!appendCustomMessageEntry)
       return;
     const { folded } = currentProjectionParts();
-    const status = folded.status ?? "unknown";
-    const taskId = folded.record.taskId ?? taskIdAtStart;
-    const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+    const producerContext = {
+      projectRoot,
+      runId,
+      folded,
+      taskIdAtStart,
+      runDisplayTitle
+    };
+    const payloadEntries = await Promise.all(panelRegistry.producers.map(async (producer) => {
+      try {
+        const payload = await produceWorkerPanelPayload(producer, producerContext);
+        return payload === undefined ? null : [producer.id, payload];
+      } catch (error) {
+        console.error(`[rig-run] panel-producer-failed panel=${producer.id} ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+      }
+    }));
+    const payloads = Object.fromEntries(payloadEntries.filter((entry) => entry !== null));
+    const registrations = panelRegistry.registrations.map((panel) => ({
+      id: panel.id,
+      slot: panel.slot,
+      title: panel.title,
+      capabilityId: panel.capabilityId,
+      description: panel.description,
+      badge: panel.badge,
+      disabled: panel.disabled
+    }));
+    const activePanel = registrations.find((panel) => panel.id === RIG_SUPERVISOR_PANEL_ID)?.id ?? registrations.find((panel) => !panel.disabled)?.id ?? registrations[0]?.id ?? null;
     const frameBody = {
       kind: "snapshot",
-      activePanel: "supervisor",
-      registrations: [{ id: "supervisor", title: "Supervisor" }],
-      supervisor: {
-        status,
-        currentTask: taskId ? { id: taskId, title: runDisplayTitle } : null,
-        processed: folded.closeoutPhases.length,
-        succeeded: folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
-        failed: folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
-        skipped: 0,
-        plannedOrder: taskId ? [{ id: taskId, title: runDisplayTitle, status }] : [],
-        idleReason: operatorActive ? null : status,
-        stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
-        closures: []
-      }
+      activePanel,
+      registrations,
+      payloads
     };
     const serialized = JSON.stringify(frameBody);
     if (serialized === lastRigPanelsSnapshotJson)
@@ -332,6 +432,11 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     lastRigPanelsSnapshotJson = serialized;
     appendCustomMessageEntry(RIG_PANELS_CUSTOM_MESSAGE_TYPE, "", false, { ...frameBody, updatedAt: new Date().toISOString() }, "agent");
   };
+  const publishRigPanelsSnapshotBestEffort = () => {
+    publishRigPanelsSnapshot().catch((error) => {
+      console.error(`[rig-run] panel-snapshot-publish-failed ${error instanceof Error ? error.message : String(error)}`);
+    });
+  };
   const pushWorkerProjection = (links = runRegistryLinks) => {
     if (!workerProjectionConnection)
       return;
@@ -339,12 +444,12 @@ async function maybeStartRunProcessAutohost(api, ctx) {
   };
   const publishRunProjection = async (status) => {
     const projection = buildCurrentRegistryProjection();
-    publishRigPanelsSnapshot();
     if (workerProjectionConnection)
       workerProjectionConnection.push(projection);
     if (runRegistry && runRegistryRoomId) {
       await runRegistry.heartbeatRoom(runRegistryRoomId, status, projection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
     }
+    publishRigPanelsSnapshotBestEffort();
   };
   const stopRunRegistry = (opts = {}) => {
     if (runRegistryHeartbeat) {
@@ -460,10 +565,14 @@ async function maybeStartRunProcessAutohost(api, ctx) {
         relayUrl: rigRelayUrl(),
         onPanelAction: handlePanelAction
       });
+      const roomId = projection.sessionId?.trim() || runId;
+      if (roomId !== runId) {
+        throw new Error(`Collab host session id mismatch: expected ${runId}, got ${roomId}`);
+      }
       runRegistryLinks = { joinLink: projection.joinLink, webLink: projection.webLink, relayUrl: projection.relayUrl ?? rigRelayUrl() };
       const timeline = {
         type: "collab-host-started",
-        roomId: projection.sessionId,
+        roomId,
         joinLink: projection.joinLink,
         webLink: projection.webLink,
         relayUrl: projection.relayUrl
@@ -471,13 +580,13 @@ async function maybeStartRunProcessAutohost(api, ctx) {
       journal?.appendTimeline(timeline);
       console.log(`[rig-run] collab-host-started joinLink=${projection.joinLink || "(empty)"} relayUrl=${projection.relayUrl || "(empty)"}`);
       ctx.ui.notify("Rig run collab host started.", "info");
-      publishRigPanelsSnapshot();
+      publishRigPanelsSnapshotBestEffort();
       if (runRegistry) {
         try {
-          runRegistryRoomId = projection.sessionId;
+          runRegistryRoomId = roomId;
           const initialProjection = buildCurrentRegistryProjection();
           await runRegistry.registerRoom({
-            roomId: projection.sessionId,
+            roomId,
             owner: runRegistryOwner,
             repo: runRegistryRepo,
             title: runDisplayTitle,
@@ -491,15 +600,15 @@ async function maybeStartRunProcessAutohost(api, ctx) {
             pid: process.pid,
             projection: initialProjection
           });
-          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: projection.sessionId });
+          workerProjectionConnection = connectWorkerProjection({ baseUrl: registryBaseUrl(), namespaceKey: runRegistryNamespace, runId: roomId });
           workerProjectionConnection.ready.catch((err) => console.error(`[rig-run] worker-projection-degraded (heartbeat remains authoritative): ${err instanceof Error ? err.message : String(err)}`));
           pushWorkerProjection();
           workerProjectionFiber = Effect.runFork(localRunChanges(projectRoot).pipe(Stream.debounce(Duration.millis(500)), Stream.runForEach(() => Effect.sync(() => pushWorkerProjection()))));
-          journal?.appendTimeline({ type: "registry-registered", roomId: projection.sessionId });
-          console.log(`[rig-run] registry-registered roomId=${projection.sessionId}`);
+          journal?.appendTimeline({ type: "registry-registered", roomId });
+          console.log(`[rig-run] registry-registered roomId=${roomId}`);
           runRegistryHeartbeat = setInterval(() => {
             const heartbeatProjection = buildCurrentRegistryProjection();
-            runRegistry.heartbeatRoom(projection.sessionId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
+            runRegistry.heartbeatRoom(roomId, coerceRegistryStatus(heartbeatProjection.status, "running"), heartbeatProjection).catch((err) => console.error(`[rig-run] registry-heartbeat-failed ${err instanceof Error ? err.message : String(err)}`));
           }, 15000);
           if (typeof runRegistryHeartbeat.unref === "function")
             runRegistryHeartbeat.unref();
@@ -508,15 +617,22 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           ctx.ui.notify("Rig run could not register to the discovery registry; it may not appear in Runs.", "warning");
         }
       }
+      return true;
     } catch (error) {
+      if (error instanceof Error && error.message.startsWith("Collab host session id mismatch:")) {
+        publishFatalTerminal(error);
+        return false;
+      }
       console.error(`[rig-run] collab-host-start-failed ${error instanceof Error ? error.message : String(error)}`);
       ctx.ui.notify("Rig run collab host could not reach the relay; session remains local.", "warning");
+      return true;
     }
   };
   journal?.appendTimeline({ type: "stage", stage: "Connect", status: "running", detail: "run process session_start" });
   journal?.appendTimeline({ type: "stage", stage: "Prepare", status: "completed", detail: "run process prepared" });
   journal?.appendStatus("running", { actor: { kind: "agent" }, reason: "run process session started", force: true });
-  await startRunCollabHost();
+  if (!await startRunCollabHost())
+    return null;
   if (taskIdAtStart) {
     journal?.appendTimeline({ type: "stage", stage: "GitHub-sync", status: "running", detail: "reflecting rig:running to task source" });
     try {
@@ -616,7 +732,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
     const { command, gitCommand } = createEnvCloseoutRunners(process.env);
     let closeoutStatusAdvanced = false;
     try {
-      await runStagedCloseout({
+      await runPipelineCloseout({
         projectRoot,
         runId,
         taskId,
@@ -631,6 +747,7 @@ async function maybeStartRunProcessAutohost(api, ctx) {
           journal?.appendStatus("validating", { actor: { kind: "agent" }, reason: "validating task before closeout", force: true });
           await publishRunProjection("validating");
         },
+        kernelJournal: journal?.kernel ?? null,
         journalPhase: async (phase, outcome, detail) => {
           journal?.appendCloseoutPhase({ phase, outcome, detail: detail ?? null });
           if (!closeoutStatusAdvanced && phase !== "queued" && outcome === "started") {
@@ -722,8 +839,10 @@ export {
   startRunProcessStallMonitor,
   registryRunProjection,
   reflectStoppedRunTaskSource,
+  produceWorkerPanelPayload,
   maybeStartSpikeAutohost,
   maybeStartRunProcessAutohost,
+  loadWorkerPanelRegistry,
   dispatchRunNotifications,
   detectRunControlText,
   rigWorkerExtension as default,
@@ -733,8 +852,13 @@ export {
   __rigRunWorkerTest,
   __rigExtensionTest,
   TRACKED_RUN_STALL_MS,
+  RUN_WORKER_PANEL_PLUGIN,
   RUN_PROCESS_STEER_TIMEOUT_MS,
   RUN_PROCESS_STALL_SWEEP_MS,
   RUN_PROCESS_STALL_DETAIL,
+  RIG_SUPERVISOR_PANEL_ID,
+  RIG_RUN_STOP_PANEL_ACTION,
+  RIG_PANELS_CUSTOM_MESSAGE_TYPE,
+  RIG_CAPABILITY_PANEL_SLOT,
   REGISTRY_PROJECTION_TIMELINE_LIMIT
 };

package/dist/src/panel-plugin.d.ts

@@ -0,0 +1,20 @@
+import type { PanelRegistration, RunJournalProjection } from "@rig/contracts";
+import type { RigPluginWithRuntime, RuntimePanelProducer } from "@rig/core";
+export declare const RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
+export declare const RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
+export declare const RIG_CAPABILITY_PANEL_SLOT = "capability";
+export declare const RIG_SUPERVISOR_PANEL_ID = "supervisor";
+export interface WorkerPanelProducerContext {
+    readonly projectRoot: string;
+    readonly runId: string;
+    readonly folded: RunJournalProjection;
+    readonly taskIdAtStart?: string | null;
+    readonly runDisplayTitle: string;
+}
+export interface WorkerPanelRegistrySnapshot {
+    readonly registrations: readonly PanelRegistration[];
+    readonly producers: readonly RuntimePanelProducer[];
+}
+export declare function produceWorkerPanelPayload(producer: RuntimePanelProducer, context: WorkerPanelProducerContext): Promise<unknown>;
+export declare const RUN_WORKER_PANEL_PLUGIN: RigPluginWithRuntime;
+export declare function loadWorkerPanelRegistry(projectRoot: string): Promise<WorkerPanelRegistrySnapshot>;

package/dist/src/panel-plugin.js

@@ -0,0 +1,94 @@
+// @bun
+// packages/run-worker/src/panel-plugin.ts
+import { createProjectPluginHost, projectPluginResolutionWarningMessages } from "@rig/composition/project-plugins";
+var RIG_PANELS_CUSTOM_MESSAGE_TYPE = "rig-panels";
+var RIG_RUN_STOP_PANEL_ACTION = "rig-run:stop";
+var RIG_CAPABILITY_PANEL_SLOT = "capability";
+var RIG_SUPERVISOR_PANEL_ID = "supervisor";
+var PANEL_PRODUCER_TIMEOUT_MS = 2000;
+var RUN_SUPERVISOR_PANEL_REGISTRATION = {
+  id: RIG_SUPERVISOR_PANEL_ID,
+  slot: RIG_CAPABILITY_PANEL_SLOT,
+  title: "Supervisor",
+  capabilityId: "run.supervisor",
+  description: "Live run status, closeout progress, and operator stop control."
+};
+function buildSupervisorPanelPayload(context) {
+  const status = context.folded.status ?? "unknown";
+  const taskId = context.folded.record.taskId ?? context.taskIdAtStart;
+  const operatorActive = status === "running" || status === "validating" || status === "closing-out" || status === "needs-attention";
+  return {
+    status,
+    currentTask: taskId ? { id: taskId, title: context.runDisplayTitle } : null,
+    processed: context.folded.closeoutPhases.length,
+    succeeded: context.folded.closeoutPhases.filter((phase) => phase.outcome === "completed").length,
+    failed: context.folded.closeoutPhases.filter((phase) => phase.outcome === "failed").length,
+    skipped: 0,
+    plannedOrder: taskId ? [{ id: taskId, title: context.runDisplayTitle, status }] : [],
+    idleReason: operatorActive ? null : status,
+    stopActionId: operatorActive ? RIG_RUN_STOP_PANEL_ACTION : null,
+    closures: []
+  };
+}
+var RUN_SUPERVISOR_PANEL_PRODUCER = {
+  ...RUN_SUPERVISOR_PANEL_REGISTRATION,
+  produce(context) {
+    return buildSupervisorPanelPayload(context);
+  }
+};
+async function produceWorkerPanelPayload(producer, context) {
+  if (!producer.produce)
+    return;
+  let timeout;
+  try {
+    return await Promise.race([
+      Promise.resolve(producer.produce(context)),
+      new Promise((resolve) => {
+        timeout = setTimeout(() => resolve(undefined), PANEL_PRODUCER_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+var RUN_WORKER_PANEL_PLUGIN = {
+  name: "@rig/run-worker-panels",
+  version: "0.0.0-alpha.1",
+  contributes: {
+    panels: [RUN_SUPERVISOR_PANEL_REGISTRATION]
+  },
+  __runtime: {
+    panels: [RUN_SUPERVISOR_PANEL_PRODUCER]
+  }
+};
+async function loadWorkerPanelRegistry(projectRoot) {
+  try {
+    const { host, resolved } = await createProjectPluginHost(projectRoot, {
+      mode: "compatibility-default-injection",
+      surfaceName: "run-worker-panel-registry",
+      surfaceExtras: [RUN_WORKER_PANEL_PLUGIN]
+    });
+    for (const message of projectPluginResolutionWarningMessages(resolved)) {
+      console.warn(`[rig-run] ${message}`);
+    }
+    return {
+      registrations: host.listPanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT),
+      producers: host.listExecutablePanels().filter((registration) => registration.slot === RIG_CAPABILITY_PANEL_SLOT)
+    };
+  } catch (error) {
+    console.error(`[rig-run] panel-registry-build-failed ${error instanceof Error ? error.message : String(error)}`);
+    return {
+      registrations: [RUN_SUPERVISOR_PANEL_REGISTRATION],
+      producers: [RUN_SUPERVISOR_PANEL_PRODUCER]
+    };
+  }
+}
+export {
+  produceWorkerPanelPayload,
+  loadWorkerPanelRegistry,
+  RUN_WORKER_PANEL_PLUGIN,
+  RIG_SUPERVISOR_PANEL_ID,
+  RIG_RUN_STOP_PANEL_ACTION,
+  RIG_PANELS_CUSTOM_MESSAGE_TYPE,
+  RIG_CAPABILITY_PANEL_SLOT
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/run-worker",
-  "version": "0.0.6-alpha.135",
+  "version": "0.0.6-alpha.137",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -26,12 +26,14 @@
     ]
   },
   "dependencies": {
-    "@rig/bundle-default-lifecycle": "npm:@h-rig/bundle-default-lifecycle@0.0.6-alpha.135",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.135",
-    "@rig/kernel": "npm:@h-rig/kernel@0.0.6-alpha.135",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.135",
-    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.135",
     "@oh-my-pi/pi-coding-agent": "16.0.4",
+    "@rig/bundle-default-lifecycle": "npm:@h-rig/bundle-default-lifecycle@0.0.6-alpha.137",
+    "@rig/composition": "npm:@h-rig/composition@0.0.6-alpha.137",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.137",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.137",
+    "@rig/kernel": "npm:@h-rig/kernel@0.0.6-alpha.137",
+    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.137",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.137",
     "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@8881a9b"
   }
 }