@h-rig/runtime 0.0.6-alpha.2 → 0.0.6-alpha.21

package/dist/src/control-plane/native/run-ops.js

@@ -621,10 +621,6 @@ function runBelongsToProject(projectRoot, run, runsDir) {
   if (recordedProjectRoot) {
     return resolve3(recordedProjectRoot) === normalizedRoot;
   }
-  const projectLocalRunsDir = resolve3(normalizedRoot, ".rig", "runs");
-  if (isPathWithin(projectLocalRunsDir, resolve3(runsDir))) {
-    return true;
-  }
   const pathFields = [
     run.worktreePath,
     run.artifactRoot,
@@ -632,10 +628,20 @@ function runBelongsToProject(projectRoot, run, runsDir) {
     run.sessionPath,
     run.sessionLogPath
   ].filter((value) => typeof value === "string" && value.trim().length > 0);
-  if (pathFields.length === 0) {
+  if (pathFields.length > 0) {
+    if (pathFields.some((value) => isPathWithin(normalizedRoot, resolve3(value)))) {
+      return true;
+    }
+    const pointsAtManagedWorkspace = pathFields.some((value) => /(?:^|[/\\])\.worktrees(?:[/\\]|$)/.test(value));
+    if (pointsAtManagedWorkspace) {
+      return false;
+    }
+  }
+  const projectLocalRunsDir = resolve3(normalizedRoot, ".rig", "runs");
+  if (isPathWithin(projectLocalRunsDir, resolve3(runsDir))) {
     return true;
   }
-  return pathFields.some((value) => isPathWithin(normalizedRoot, resolve3(value)));
+  return pathFields.length === 0;
 }
 function isPathWithin(root, candidate) {
   const relativePath = relative(root, candidate);
@@ -2713,11 +2719,13 @@ function runStatus(projectRoot, runtimeContext) {
     recentRuns: runs.slice(0, 10)
   };
 }
-async function runResume(projectRoot, runtimeContext) {
-  const resumable = listAuthorityRuns(projectRoot).map((entry) => readAuthorityRun(projectRoot, entry.runId)).filter((run2) => Boolean(run2)).filter((run2) => run2.mode === "local" && (run2.status === "stopped" || run2.status === "failed" || run2.status === "created")).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")));
-  const run = resumable[0];
+function latestLocalRunForResume(projectRoot) {
+  return listAuthorityRuns(projectRoot).map((entry) => readAuthorityRun(projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.mode === "local" && ["created", "preparing", "running", "validating", "reviewing", "stopped", "failed", "needs_attention"].includes(String(run.status ?? ""))).sort((left, right) => String(right.updatedAt ?? "").localeCompare(String(left.updatedAt ?? "")))[0] ?? null;
+}
+async function submitRunResumeRequest(projectRoot, input) {
+  const run = latestLocalRunForResume(projectRoot);
   if (!run) {
-    throw new RemoteCliError("RIG_RUN_NOTHING_TO_RESUME", "No stopped local run is available to resume.", 2);
+    throw new RemoteCliError(input.failureCode, input.nothingMessage, 2);
   }
   const server = await ensureServerForRuns(projectRoot);
   const response = await fetch(`${server.baseUrl}/api/runs/resume`, {
@@ -2726,14 +2734,28 @@ async function runResume(projectRoot, runtimeContext) {
       "content-type": "application/json",
       ...server.authToken ? { authorization: `Bearer ${server.authToken}` } : {}
     },
-    body: JSON.stringify({ runId: run.runId, createdAt: new Date().toISOString() })
+    body: JSON.stringify({ runId: run.runId, createdAt: new Date().toISOString(), restart: input.restart })
   });
   if (!response.ok) {
     const text = await response.text();
-    throw new RemoteCliError("RIG_RUN_RESUME_FAILED", text || response.statusText, 1, { runId: run.runId });
+    throw new RemoteCliError(input.restart ? "RIG_RUN_RESTART_FAILED" : "RIG_RUN_RESUME_FAILED", text || response.statusText, 1, { runId: run.runId });
   }
   return { runId: run.runId };
 }
+async function runResume(projectRoot, runtimeContext) {
+  return submitRunResumeRequest(projectRoot, {
+    restart: false,
+    failureCode: "RIG_RUN_NOTHING_TO_RESUME",
+    nothingMessage: "No resumable local run is available."
+  });
+}
+async function runRestart(projectRoot, runtimeContext) {
+  return submitRunResumeRequest(projectRoot, {
+    restart: true,
+    failureCode: "RIG_RUN_NOTHING_TO_RESTART",
+    nothingMessage: "No local run is available to restart."
+  });
+}
 async function runStop(projectRoot) {
   const activeRuns = listAuthorityRuns(projectRoot).map((entry) => readAuthorityRun(projectRoot, entry.runId)).filter((run) => Boolean(run)).filter((run) => run.mode === "local" && ACTIVE_RUN_STATUSES.has(String(run.status ?? "")));
   if (activeRuns.length === 0) {
@@ -3267,6 +3289,7 @@ export {
   runStop,
   runStatus,
   runResume,
+  runRestart,
   resolvePreferredShellBinary,
   resolveLocalControlBinarySourceRoot,
   resolveDefaultEpic,