@h-rig/server 0.0.6-alpha.34 → 0.0.6-alpha.36

package/dist/src/scheduler.js

@@ -2,7 +2,7 @@
 // packages/server/src/scheduler.ts
 import { normalizeTaskLifecycleStatus } from "@rig/runtime/control-plane/state-sync/types";
 var TERMINAL_RUN_STATUSES = new Set(["done", "completed", "error", "failed", "stopped", "cancelled"]);
-var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued"]);
+var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued", "in_progress"]);
 var REMOTE_READY_STATUSES = new Set(["ready", "idle", "connected"]);
 function resolveLocalSchedulerWorkerCount(env = process.env) {
   const raw = env.RIG_SCHEDULER_LOCAL_WORKERS?.trim();

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

@@ -824,7 +824,7 @@ import {
 // packages/server/src/scheduler.ts
 import { normalizeTaskLifecycleStatus } from "@rig/runtime/control-plane/state-sync/types";
 var TERMINAL_RUN_STATUSES = new Set(["done", "completed", "error", "failed", "stopped", "cancelled"]);
-var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued"]);
+var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued", "in_progress"]);
 var REMOTE_READY_STATUSES = new Set(["ready", "idle", "connected"]);
 
 // packages/server/src/server-helpers/validation-failure.ts
@@ -4902,8 +4902,6 @@ data: ${JSON.stringify({ connectedAt: new Date().toISOString() })}
               return `${sessionPath}/shell`;
             if (action === "commands/run" && req.method === "POST")
               return `${sessionPath}/commands/run`;
-            if (action === "commands/respond" && req.method === "POST")
-              return `${sessionPath}/commands/respond`;
             if (action === "extension-ui/respond" && req.method === "POST")
               return `${sessionPath}/extension-ui/respond`;
             if (action === "abort" && req.method === "POST")

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

@@ -25,7 +25,7 @@ import {
 // packages/server/src/scheduler.ts
 import { normalizeTaskLifecycleStatus } from "@rig/runtime/control-plane/state-sync/types";
 var TERMINAL_RUN_STATUSES = new Set(["done", "completed", "error", "failed", "stopped", "cancelled"]);
-var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued"]);
+var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued", "in_progress"]);
 var REMOTE_READY_STATUSES = new Set(["ready", "idle", "connected"]);
 function resolveLocalSchedulerWorkerCount(env = process.env) {
   const raw = env.RIG_SCHEDULER_LOCAL_WORKERS?.trim();
@@ -281,6 +281,20 @@ function readQueueState(projectRoot) {
 function writeQueueState(projectRoot, queue) {
   writeJsonFile(resolveQueueStatePath(projectRoot), queue);
 }
+function enqueueTaskState(projectRoot, taskId, score) {
+  const queue = readQueueState(projectRoot).filter((entry) => entry.taskId !== taskId);
+  const next = [
+    ...queue,
+    {
+      taskId,
+      score: Math.max(0, Math.trunc(score)),
+      unblockCount: 0,
+      position: queue.length
+    }
+  ].sort((left, right) => right.score - left.score || left.position - right.position).map((entry, index) => ({ ...entry, position: index }));
+  writeQueueState(projectRoot, next);
+  return next;
+}
 
 // packages/server/src/server-helpers/remote-snapshots.ts
 import { listAuthorityRemoteEndpoints } from "@rig/runtime/control-plane/authority-files";
@@ -2283,10 +2297,14 @@ function recoverStaleLocalRun(projectRoot, run) {
   if (hasLiveRecordedProcess && serverPid === process.pid)
     return false;
   const completedAt = new Date().toISOString();
+  const taskId = normalizeString(record.taskId);
+  if (taskId) {
+    enqueueTaskState(projectRoot, taskId, 0);
+  }
   patchRunRecord(projectRoot, run.runId, {
     status: "failed",
     completedAt,
-    errorText: `Recovered stale local run ${run.runId} after server startup; no active server-owned process was tracking it.`
+    errorText: taskId ? `Recovered stale local run ${run.runId} after server startup; no active server-owned process was tracking it. Task ${taskId} was re-queued for automatic restart.` : `Recovered stale local run ${run.runId} after server startup; no active server-owned process was tracking it.`
   });
   return true;
 }

package/dist/src/server-helpers/snapshot-orchestrator.js

@@ -1,5 +1,6 @@
 // @bun
 // packages/server/src/server-helpers/snapshot-orchestrator.ts
+import { existsSync as existsSync3, readFileSync } from "fs";
 import { dirname as dirname4, resolve as resolve5 } from "path";
 import {
   listAuthorityRuns as listAuthorityRuns3,
@@ -668,6 +669,28 @@ function buildConversationSnapshot(projectRoot, options = {}) {
 }
 
 // packages/server/src/server-helpers/snapshot-orchestrator.ts
+function readPriorPrProgress(projectRoot, taskId) {
+  for (const candidate of [
+    resolve5(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve5(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    if (!existsSync3(candidate))
+      continue;
+    try {
+      const raw = JSON.parse(readFileSync(candidate, "utf-8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 async function buildTaskPrompt(projectRoot, taskId, readers) {
   const task = (await readers.readWorkspaceTasks(projectRoot)).find((entry) => entry.id === taskId);
   if (!task) {
@@ -685,6 +708,7 @@ ${task.acceptanceCriteria}` : null,
     task.validation.length > 0 ? `Validation:
 - ${task.validation.join(`
 - `)}` : null,
+    readPriorPrProgress(projectRoot, String(task.id)),
     "Work directly in the assigned runtime workspace and leave the result in a reviewable state."
   ];
   return sections.filter((value) => Boolean(value)).join(`

package/dist/src/server-helpers/snapshot-service.js

@@ -5,6 +5,7 @@ var __require = import.meta.require;
 import { listAgentRuntimes } from "@rig/runtime/control-plane/runtime/isolation";
 
 // packages/server/src/server-helpers/snapshot-orchestrator.ts
+import { existsSync as existsSync3, readFileSync } from "fs";
 import { dirname as dirname4, resolve as resolve5 } from "path";
 import {
   listAuthorityRuns as listAuthorityRuns3,
@@ -680,6 +681,28 @@ function buildConversationSnapshot(projectRoot, options = {}) {
 }
 
 // packages/server/src/server-helpers/snapshot-orchestrator.ts
+function readPriorPrProgress(projectRoot, taskId) {
+  for (const candidate of [
+    resolve5(projectRoot, ".worktrees", taskId, "artifacts", taskId, "pr-state.json"),
+    resolve5(projectRoot, "artifacts", taskId, "pr-state.json")
+  ]) {
+    if (!existsSync3(candidate))
+      continue;
+    try {
+      const raw = JSON.parse(readFileSync(candidate, "utf-8"));
+      const entries = Array.isArray(raw) ? raw : [raw];
+      const first = entries.find((entry) => entry && typeof entry === "object" && typeof entry.url === "string");
+      if (!first)
+        continue;
+      return [
+        `Prior progress exists for this task: PR ${first.url}${first.branch ? ` (branch ${first.branch})` : ""} was opened by an earlier run.`,
+        "Check its current state first (diff, checks, review). If the work is already complete and checks are green,",
+        "run `rig-agent completion-verification` to merge and close instead of re-implementing anything."
+      ].join(" ");
+    } catch {}
+  }
+  return null;
+}
 async function buildTaskPrompt(projectRoot, taskId, readers) {
   const task = (await readers.readWorkspaceTasks(projectRoot)).find((entry) => entry.id === taskId);
   if (!task) {
@@ -697,6 +720,7 @@ ${task.acceptanceCriteria}` : null,
     task.validation.length > 0 ? `Validation:
 - ${task.validation.join(`
 - `)}` : null,
+    readPriorPrProgress(projectRoot, String(task.id)),
     "Work directly in the assigned runtime workspace and leave the result in a reviewable state."
   ];
   return sections.filter((value) => Boolean(value)).join(`
@@ -838,7 +862,7 @@ async function buildEngineSnapshotPayload(inputs) {
 }
 
 // packages/server/src/server-helpers/plugin-host-cache.ts
-import { existsSync as existsSync3, statSync as statSync3 } from "fs";
+import { existsSync as existsSync4, statSync as statSync3 } from "fs";
 import { resolve as resolve6 } from "path";
 var contextCache = new Map;
 var taskListCache = new Map;
@@ -846,7 +870,7 @@ var DEFAULT_TASK_LIST_TTL_MS = 2000;
 function getPluginHostConfigMtime(projectRoot) {
   for (const name of ["rig.config.ts", "rig.config.json"]) {
     const path = resolve6(projectRoot, name);
-    if (existsSync3(path)) {
+    if (existsSync4(path)) {
       try {
         return statSync3(path).mtimeMs;
       } catch {

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

@@ -385,7 +385,7 @@ import {
 // packages/server/src/scheduler.ts
 import { normalizeTaskLifecycleStatus } from "@rig/runtime/control-plane/state-sync/types";
 var TERMINAL_RUN_STATUSES = new Set(["done", "completed", "error", "failed", "stopped", "cancelled"]);
-var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued"]);
+var RUNNABLE_TASK_STATUSES = new Set(["draft", "open", "ready", "queued", "in_progress"]);
 var REMOTE_READY_STATUSES = new Set(["ready", "idle", "connected"]);
 
 // packages/server/src/server-helpers/validation-failure.ts