@h-rig/server 0.0.6-alpha.22 → 0.0.6-alpha.23

package/dist/src/server-helpers/run-mutations.js

@@ -6,7 +6,7 @@ import { existsSync as existsSync7, mkdirSync as mkdirSync6, readFileSync as rea
 import { dirname as dirname6, relative as relative2, resolve as resolve10 } from "path";
 import {
   listAuthorityRuns as listAuthorityRuns7,
-  readAuthorityRun as readAuthorityRun8,
+  readAuthorityRun as readAuthorityRun9,
   resolveAuthorityRunDir as resolveAuthorityRunDir4,
   writeJsonFile as writeJsonFile4
 } from "@rig/runtime/control-plane/authority-files";
@@ -363,6 +363,12 @@ function patchRunRecord(projectRoot, runId, patch) {
   writeJsonFile2(resolve6(resolveAuthorityRunDir2(projectRoot, runId), "run.json"), next);
   return next;
 }
+function patchRunPiSessionMetadata(projectRoot, runId, metadata) {
+  return patchRunRecord(projectRoot, runId, {
+    piSession: metadata?.public ?? null,
+    piSessionPrivate: metadata
+  });
+}
 function buildRunStartPatch(startedAt) {
   return {
     status: "preparing",
@@ -460,7 +466,7 @@ var DEFAULT_TERMINAL_SHELL = process.env.SHELL || "/bin/zsh";
 // packages/server/src/server-helpers/http-router.ts
 import {
   listAuthorityRuns as listAuthorityRuns4,
-  readAuthorityRun as readAuthorityRun5,
+  readAuthorityRun as readAuthorityRun6,
   resolveAuthorityPaths,
   writeJsonFile as writeJsonFile3
 } from "@rig/runtime/control-plane/authority-files";
@@ -480,8 +486,11 @@ import {
   RemoteWsClient
 } from "@rig/runtime/control-plane/remote";
 
+// packages/server/src/server-helpers/pi-session-proxy.ts
+import { readAuthorityRun as readAuthorityRun4 } from "@rig/runtime/control-plane/authority-files";
+
 // packages/server/src/server-helpers/run-steering.ts
-import { appendJsonlRecord as appendJsonlRecord2, readAuthorityRun as readAuthorityRun4, resolveAuthorityRunDir as resolveAuthorityRunDir3 } from "@rig/runtime/control-plane/authority-files";
+import { appendJsonlRecord as appendJsonlRecord2, readAuthorityRun as readAuthorityRun5, resolveAuthorityRunDir as resolveAuthorityRunDir3 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/server-helpers/http-router.ts
 import { buildRigInitConfigSource } from "@rig/core";
@@ -925,7 +934,7 @@ import {
   RemoteWsClient as RemoteWsClient2
 } from "@rig/runtime/control-plane/remote";
 import { deleteRunState } from "@rig/runtime/control-plane/native/run-ops";
-import { readAuthorityRun as readAuthorityRun6 } from "@rig/runtime/control-plane/authority-files";
+import { readAuthorityRun as readAuthorityRun7 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/server-helpers/inspector-jobs.ts
 import { readJsonFile as readJsonFile2 } from "@rig/runtime/control-plane/authority-files";
@@ -938,7 +947,7 @@ import {
 } from "@rig/runtime/control-plane/native/run-ops";
 import {
   listAuthorityRuns as listAuthorityRuns5,
-  readAuthorityRun as readAuthorityRun7
+  readAuthorityRun as readAuthorityRun8
 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/inspector/service.ts
@@ -1326,10 +1335,10 @@ function closeoutPhasePatch(phase, status, extra = {}) {
   const updatedAt = new Date().toISOString();
   return {
     serverCloseout: {
+      ...extra,
       phase,
       status,
-      updatedAt,
-      ...extra
+      updatedAt
     }
   };
 }
@@ -1447,8 +1456,60 @@ async function updateRunTaskSourceLifecycle(projectRoot, run, status, summary, o
     });
   }
 }
+async function markServerOwnedCloseoutFailed(state, runId, error) {
+  const detail = error instanceof Error ? error.message : String(error);
+  const current = readAuthorityRun9(state.projectRoot, runId);
+  patchRunRecord(state.projectRoot, runId, {
+    status: "failed",
+    completedAt: new Date().toISOString(),
+    errorText: detail,
+    ...closeoutPhasePatch("failed", "failed", { error: detail })
+  });
+  appendRunLogEntryAndBroadcast(state, runId, {
+    id: `log:${runId}:server-closeout-failed`,
+    title: "Server-owned closeout failed",
+    detail,
+    tone: "error",
+    status: "failed",
+    createdAt: new Date().toISOString()
+  }, "server-closeout-failed");
+  if (current?.taskId) {
+    await updateRunTaskSourceLifecycle(state.projectRoot, { ...current, status: "failed", errorText: detail }, "failed", "Rig server-owned closeout failed.", { errorText: detail }).catch((sourceError) => {
+      appendRunLogEntry(state.projectRoot, runId, {
+        id: `log:${runId}:task-source-closeout-failed-update`,
+        title: "Task source closeout failure update failed",
+        detail: sourceError instanceof Error ? sourceError.message : String(sourceError),
+        tone: "error",
+        status: "failed",
+        createdAt: new Date().toISOString()
+      });
+    });
+  }
+}
+function scheduleServerOwnedPrCloseout(state, runId, reason) {
+  const startedAt = new Date().toISOString();
+  state.runProcesses.set(runId, {
+    runId,
+    child: null,
+    startedAt,
+    stopped: false
+  });
+  queueMicrotask(() => {
+    withServerAuthorityEnvIfNeeded(state.projectRoot, async () => {
+      try {
+        await runServerOwnedPrCloseout(state, runId);
+      } catch (error) {
+        await markServerOwnedCloseoutFailed(state, runId, error);
+      } finally {
+        state.runProcesses.delete(runId);
+        broadcastSnapshotInvalidation(state, `server-closeout-${reason}-terminal`);
+        await reconcileScheduler(state, `server-closeout-${reason}-terminal`);
+      }
+    });
+  });
+}
 async function runServerOwnedPrCloseout(state, runId) {
-  const run = readAuthorityRun8(state.projectRoot, runId);
+  const run = readAuthorityRun9(state.projectRoot, runId);
   if (!run)
     throw new Error(`Run not found: ${runId}`);
   const closeout = closeoutRecord(run);
@@ -1458,7 +1519,7 @@ async function runServerOwnedPrCloseout(state, runId) {
   if (!taskId)
     throw new Error("Server-owned closeout requires a task id.");
   const workspace = normalizeString(closeout.runtimeWorkspace) ?? normalizeString(run.worktreePath) ?? state.projectRoot;
-  const branch = normalizeString(closeout.branch) ?? `rig/${taskId}-${runId}`;
+  let branch = normalizeString(closeout.branch) ?? `rig/${taskId}-${runId}`;
   const config = await loadRigLifecycleConfig(state.projectRoot);
   const runPrMode = normalizeString(run.prMode);
   const prMode = runPrMode === "auto" || runPrMode === "ask" || runPrMode === "off" ? runPrMode : config?.pr?.mode ?? "off";
@@ -1471,7 +1532,7 @@ async function runServerOwnedPrCloseout(state, runId) {
       autoFixReview: false
     }
   };
-  const readCurrentRun = () => readAuthorityRun8(state.projectRoot, runId) ?? run;
+  const readCurrentRun = () => readAuthorityRun9(state.projectRoot, runId) ?? run;
   const sourceTask = runSourceTaskIdentity(run);
   const closeoutPhase = normalizeString(closeout.phase)?.toLowerCase() ?? "";
   const closeoutStatus = normalizeString(closeout.status)?.toLowerCase() ?? "";
@@ -1532,6 +1593,12 @@ async function runServerOwnedPrCloseout(state, runId) {
   const githubEnv = githubToken ? { RIG_GITHUB_TOKEN: githubToken, GITHUB_TOKEN: githubToken, GH_TOKEN: githubToken } : {};
   const gitCommand = createCommandRunner("git", githubEnv);
   const ghCommand = createCommandRunner("gh", githubEnv);
+  const workspaceBranch = await gitCommand(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: workspace });
+  const currentWorkspaceBranch = workspaceBranch.exitCode === 0 ? normalizeString(workspaceBranch.stdout) : null;
+  if (currentWorkspaceBranch && currentWorkspaceBranch !== "HEAD" && currentWorkspaceBranch !== branch) {
+    appendCloseoutStage(state, runId, "branch", `Using runtime workspace branch ${currentWorkspaceBranch} instead of recorded branch ${branch}.`, "reviewing", "info");
+    branch = currentWorkspaceBranch;
+  }
   const setCloseout = (phase, status, extra = {}) => {
     const previous = closeoutRecord(readCurrentRun()) ?? closeout;
     patchRunRecord(state.projectRoot, runId, {
@@ -1768,7 +1835,7 @@ async function createRunRecord(projectRoot, input, readTasks = readWorkspaceTask
   }
 }
 async function startLocalRun(state, runId, options) {
-  const run = readAuthorityRun8(state.projectRoot, runId);
+  const run = readAuthorityRun9(state.projectRoot, runId);
   if (!run) {
     throw new Error(`Run not found: ${runId}`);
   }
@@ -1902,6 +1969,25 @@ async function startLocalRun(state, runId, options) {
             broadcastSnapshotInvalidation(state);
             continue;
           }
+          if (line.startsWith("__RIG_WRAPPER_EVENT__")) {
+            try {
+              const wrapperEvent = JSON.parse(line.slice("__RIG_WRAPPER_EVENT__".length));
+              const eventType = normalizeString(wrapperEvent.type);
+              const payload = wrapperEvent.payload && typeof wrapperEvent.payload === "object" && !Array.isArray(wrapperEvent.payload) ? wrapperEvent.payload : {};
+              if (eventType === "pi.session.ready" && payload.privateMetadata && typeof payload.privateMetadata === "object" && !Array.isArray(payload.privateMetadata)) {
+                patchRunPiSessionMetadata(state.projectRoot, runId, payload.privateMetadata);
+              }
+              appendRunTimelineEntry(state.projectRoot, runId, {
+                id: `timeline:${runId}:${Date.now()}:wrapper:${eventType ?? "event"}`,
+                type: "wrapper-event",
+                eventType,
+                payload,
+                createdAt: normalizeString(wrapperEvent.at) ?? new Date().toISOString()
+              });
+            } catch {}
+            broadcastSnapshotInvalidation(state, "wrapper-event");
+            continue;
+          }
           appendRunLogEntryAndBroadcast(state, runId, {
             id: `log:${runId}:${Date.now()}`,
             title,
@@ -1926,11 +2012,17 @@ async function startLocalRun(state, runId, options) {
         if (exit.error) {
           throw new Error(`Failed to start task run: ${exit.error.message}`);
         }
-        const current = readAuthorityRun8(state.projectRoot, runId);
+        const current = readAuthorityRun9(state.projectRoot, runId);
         if (!current) {
           return;
         }
-        if (exit.code !== 0 && current.status !== "completed" && current.status !== "stopped") {
+        if (closeoutRecord(current)?.status === "pending") {
+          try {
+            await runServerOwnedPrCloseout(state, runId);
+          } catch (closeoutError) {
+            await markServerOwnedCloseoutFailed(state, runId, closeoutError);
+          }
+        } else if (exit.code !== 0 && current.status !== "completed" && current.status !== "stopped") {
           const completedAt = current.completedAt ?? new Date().toISOString();
           const failureSummary = normalizeString(current.errorText) ?? summarizeRunValidationFailure(state.projectRoot, current) ?? `Rig task-run exited with code ${String(exit.code ?? "unknown")}`;
           if (current.status !== "failed") {
@@ -1965,38 +2057,6 @@ ${sourceFailure}` });
             agent: current.runtimeAdapter,
             summary: failureSummary
           });
-        } else if (closeoutRecord(current)?.status === "pending") {
-          try {
-            await runServerOwnedPrCloseout(state, runId);
-          } catch (closeoutError) {
-            const closeoutFailure = closeoutError instanceof Error ? closeoutError.message : String(closeoutError);
-            patchRunRecord(state.projectRoot, runId, {
-              status: "failed",
-              completedAt: new Date().toISOString(),
-              errorText: closeoutFailure,
-              ...closeoutPhasePatch("failed", "failed", { error: closeoutFailure })
-            });
-            appendRunLogEntryAndBroadcast(state, runId, {
-              id: `log:${runId}:server-closeout-failed`,
-              title: "Server-owned closeout failed",
-              detail: closeoutFailure,
-              tone: "error",
-              status: "failed",
-              createdAt: new Date().toISOString()
-            }, "server-closeout-failed");
-            if (current.taskId) {
-              await updateRunTaskSourceLifecycle(state.projectRoot, { ...current, status: "failed", errorText: closeoutFailure }, "failed", "Rig server-owned closeout failed.", { errorText: closeoutFailure }).catch((error) => {
-                appendRunLogEntry(state.projectRoot, runId, {
-                  id: `log:${runId}:task-source-closeout-failed-update`,
-                  title: "Task source closeout failure update failed",
-                  detail: error instanceof Error ? error.message : String(error),
-                  tone: "error",
-                  status: "failed",
-                  createdAt: new Date().toISOString()
-                });
-              });
-            }
-          }
         }
         broadcastSnapshotInvalidation(state);
       } catch (error) {
@@ -2070,7 +2130,7 @@ function resolveLocalRunCliProjectRoot(projectRoot) {
   return projectRoot;
 }
 async function resumeRunRecord(state, input) {
-  const run = readAuthorityRun8(state.projectRoot, input.runId);
+  const run = readAuthorityRun9(state.projectRoot, input.runId);
   if (!run) {
     throw new Error(`Run not found: ${input.runId}`);
   }
@@ -2085,14 +2145,20 @@ async function resumeRunRecord(state, input) {
   }
   const closeout = closeoutRecord(run);
   const closeoutStatus = normalizeString(closeout?.status)?.toLowerCase() ?? "";
-  if (RESUMABLE_SERVER_CLOSEOUT_STATUSES.has(closeoutStatus)) {
-    await runServerOwnedPrCloseout(state, input.runId);
+  if (EXPLICIT_RESUMABLE_SERVER_CLOSEOUT_STATUSES.has(closeoutStatus)) {
+    patchRunRecord(state.projectRoot, input.runId, {
+      status: "reviewing",
+      completedAt: null,
+      errorText: null,
+      ...closeoutPhasePatch("queued", "pending", { ...closeout, resumedAt: input.createdAt })
+    });
+    scheduleServerOwnedPrCloseout(state, input.runId, "explicit-resume");
     return;
   }
   await startLocalRun(state, input.runId, { promptOverride: input.promptOverride ?? null, resume: input.restart !== true });
 }
 function appendRunMessage(projectRoot, input) {
-  const run = readAuthorityRun8(projectRoot, input.runId);
+  const run = readAuthorityRun9(projectRoot, input.runId);
   if (!run) {
     throw new Error(`Run not found: ${input.runId}`);
   }
@@ -2116,7 +2182,7 @@ ${nextLine}
 }
 async function stopRunRecord(stateOrProjectRoot, input) {
   const projectRoot = typeof stateOrProjectRoot === "string" ? stateOrProjectRoot : stateOrProjectRoot.projectRoot;
-  const run = readAuthorityRun8(projectRoot, input.runId);
+  const run = readAuthorityRun9(projectRoot, input.runId);
   if (!run) {
     throw new Error(`Run not found: ${input.runId}`);
   }
@@ -2174,6 +2240,7 @@ function removeTaskIdsFromQueueState2(projectRoot, taskIds) {
   return next;
 }
 var RESUMABLE_SERVER_CLOSEOUT_STATUSES = new Set(["pending", "running"]);
+var EXPLICIT_RESUMABLE_SERVER_CLOSEOUT_STATUSES = new Set(["pending", "running", "needs_attention"]);
 var ACTIVE_LOCAL_RUN_STATUSES = new Set(["created", "preparing", "running", "validating", "reviewing"]);
 function processExists(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
@@ -2189,7 +2256,23 @@ function recoverStaleLocalRun(projectRoot, run) {
   const record = run;
   if (run.mode !== "local")
     return false;
+  const closeout = closeoutRecord(record);
+  const closeoutStatus = normalizeString(closeout?.status)?.toLowerCase() ?? "";
   const status = normalizeString(record.status)?.toLowerCase() ?? "";
+  if (RESUMABLE_SERVER_CLOSEOUT_STATUSES.has(closeoutStatus))
+    return false;
+  if (closeoutStatus === "needs_attention") {
+    if (!ACTIVE_LOCAL_RUN_STATUSES.has(status))
+      return false;
+    const completedAt2 = record.completedAt ?? new Date().toISOString();
+    patchRunRecord(projectRoot, run.runId, {
+      status: "needs_attention",
+      completedAt: completedAt2,
+      errorText: normalizeString(record.errorText) ?? (Array.isArray(closeout?.feedback) ? closeout.feedback.map(String).join(`
+`) : null)
+    });
+    return true;
+  }
   if (!ACTIVE_LOCAL_RUN_STATUSES.has(status))
     return false;
   const serverPid = typeof record.serverPid === "number" ? record.serverPid : null;
@@ -2246,15 +2329,7 @@ async function reconcileScheduler(state, reason) {
             status: "reviewing",
             createdAt: new Date().toISOString()
           });
-          await runServerOwnedPrCloseout(state, run.runId).catch((error) => {
-            const detail = error instanceof Error ? error.message : String(error);
-            patchRunRecord(state.projectRoot, run.runId, {
-              status: "failed",
-              completedAt: new Date().toISOString(),
-              errorText: detail,
-              ...closeoutPhasePatch("failed", "failed", { error: detail })
-            });
-          });
+          scheduleServerOwnedPrCloseout(state, run.runId, "auto-resume");
           changed = true;
         }
         if (changed) {

package/dist/src/server-helpers/run-writers.js

@@ -58,6 +58,12 @@ function patchRunRecord(projectRoot, runId, patch) {
   writeJsonFile(resolve2(resolveAuthorityRunDir2(projectRoot, runId), "run.json"), next);
   return next;
 }
+function patchRunPiSessionMetadata(projectRoot, runId, metadata) {
+  return patchRunRecord(projectRoot, runId, {
+    piSession: metadata?.public ?? null,
+    piSessionPrivate: metadata
+  });
+}
 function buildRunStartPatch(startedAt) {
   return {
     status: "preparing",
@@ -68,6 +74,7 @@ function buildRunStartPatch(startedAt) {
 }
 export {
   patchRunRecord,
+  patchRunPiSessionMetadata,
   buildRunStartPatch,
   appendRunTimelineEntry,
   appendRunLogEntry

package/dist/src/server-helpers/ws-router.js

@@ -14,7 +14,7 @@ import {
   RemoteWsClient as RemoteWsClient2
 } from "@rig/runtime/control-plane/remote";
 import { deleteRunState } from "@rig/runtime/control-plane/native/run-ops";
-import { readAuthorityRun as readAuthorityRun8 } from "@rig/runtime/control-plane/authority-files";
+import { readAuthorityRun as readAuthorityRun9 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/server.ts
 import {
@@ -409,12 +409,13 @@ var TERMINAL_RUN_STATUSES2 = new Set([
   "stopped"
 ]);
 var RESUMABLE_SERVER_CLOSEOUT_STATUSES = new Set(["pending", "running"]);
+var EXPLICIT_RESUMABLE_SERVER_CLOSEOUT_STATUSES = new Set(["pending", "running", "needs_attention"]);
 var ACTIVE_LOCAL_RUN_STATUSES = new Set(["created", "preparing", "running", "validating", "reviewing"]);
 
 // packages/server/src/server-helpers/http-router.ts
 import {
   listAuthorityRuns as listAuthorityRuns5,
-  readAuthorityRun as readAuthorityRun6,
+  readAuthorityRun as readAuthorityRun7,
   resolveAuthorityPaths,
   writeJsonFile as writeJsonFile4
 } from "@rig/runtime/control-plane/authority-files";
@@ -434,8 +435,11 @@ import {
   RemoteWsClient
 } from "@rig/runtime/control-plane/remote";
 
+// packages/server/src/server-helpers/pi-session-proxy.ts
+import { readAuthorityRun as readAuthorityRun5 } from "@rig/runtime/control-plane/authority-files";
+
 // packages/server/src/server-helpers/run-steering.ts
-import { appendJsonlRecord as appendJsonlRecord2, readAuthorityRun as readAuthorityRun5, resolveAuthorityRunDir as resolveAuthorityRunDir4 } from "@rig/runtime/control-plane/authority-files";
+import { appendJsonlRecord as appendJsonlRecord2, readAuthorityRun as readAuthorityRun6, resolveAuthorityRunDir as resolveAuthorityRunDir4 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/server-helpers/http-router.ts
 import { buildRigInitConfigSource } from "@rig/core";
@@ -460,7 +464,7 @@ import {
 } from "@rig/runtime/control-plane/native/run-ops";
 import {
   listAuthorityRuns as listAuthorityRuns6,
-  readAuthorityRun as readAuthorityRun7
+  readAuthorityRun as readAuthorityRun8
 } from "@rig/runtime/control-plane/authority-files";
 
 // packages/server/src/inspector/service.ts
@@ -786,7 +790,7 @@ async function routeWebSocketRequest(state, deps, request) {
         if (!runId || !messageId || text === null) {
           throw new Error("runId, messageId, and text are required");
         }
-        const run = readAuthorityRun8(state.projectRoot, runId);
+        const run = readAuthorityRun9(state.projectRoot, runId);
         if (!run) {
           throw new Error(`Run not found: ${runId}`);
         }