patchwarden 0.6.4 → 1.1.0

package/src/watcherStatus.ts

@@ -191,9 +191,105 @@ export function derivePendingReason(
     if (watcher.status === "unreadable") return "queued_but_watcher_unreadable";
     return "queued_waiting_for_watcher";
   }
-  if (task.status !== "running") return null;
+  if (task.status !== "running" && task.status !== "collecting_artifacts") return null;
   if (task.phase === "executing_agent") return "agent_running";
   if (task.phase === "running_tests") return "verification_running";
   if (task.phase === "collecting_artifacts") return "collecting_artifacts";
   return "preparing";
 }
+
+// ── v0.7.0: Watcher ownership helpers ─────────────────────────────
+
+/**
+ * Read the current watcher's instance_id from the heartbeat file.
+ * Returns null when the heartbeat is missing or unreadable.
+ *
+ * This is the source of truth for "which watcher is currently alive".
+ * Tasks whose runtime.watcher_instance_id differs from this value are
+ * considered orphaned by the diagnosis layer.
+ */
+export function readWatcherInstanceId(
+  config: PatchWardenConfig = getConfig()
+): string | null {
+  const heartbeatPath = getWatcherHeartbeatPath(config);
+  if (!existsSync(heartbeatPath)) return null;
+  try {
+    const raw = readFileSync(heartbeatPath, "utf-8");
+    const data = JSON.parse(raw.charCodeAt(0) === 0xfeff ? raw.slice(1) : raw);
+    return typeof data.instance_id === "string" ? data.instance_id : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * v0.7.0: Determine whether the current watcher still owns a task.
+ *
+ * Ownership is established by comparing the watcher_instance_id recorded in
+ * the task's runtime.json with the instance_id of the currently alive
+ * watcher. A task is considered "owned" only when:
+ *   - the current watcher heartbeat is healthy, AND
+ *   - the task runtime recorded a watcher_instance_id, AND
+ *   - both instance IDs match.
+ *
+ * If the task has no recorded watcher_instance_id (legacy tasks created
+ * before v0.7.0), ownership cannot be confirmed and this returns false.
+ * The diagnosis layer treats "no owner" as a stale signal, not as active.
+ */
+export function isWatcherOwningTask(
+  taskDir: string,
+  config: PatchWardenConfig = getConfig()
+): { owned: boolean; reason: "owned" | "no_runtime_record" | "watcher_missing" | "instance_mismatch" | "watcher_unhealthy"; task_watcher_instance_id: string | null; current_watcher_instance_id: string | null } {
+  const runtimePath = join(taskDir, "runtime.json");
+  let taskWatcherInstanceId: string | null = null;
+  if (existsSync(runtimePath)) {
+    try {
+      const runtime = JSON.parse(readFileSync(runtimePath, "utf-8"));
+      if (typeof runtime.watcher_instance_id === "string") {
+        taskWatcherInstanceId = runtime.watcher_instance_id;
+      }
+    } catch {
+      // corrupted runtime — treat as no record
+    }
+  }
+  if (!taskWatcherInstanceId) {
+    return {
+      owned: false,
+      reason: "no_runtime_record",
+      task_watcher_instance_id: null,
+      current_watcher_instance_id: null,
+    };
+  }
+  const watcher = readWatcherStatus(config);
+  if (watcher.status !== "healthy") {
+    return {
+      owned: false,
+      reason: watcher.status === "missing" ? "watcher_missing" : "watcher_unhealthy",
+      task_watcher_instance_id: taskWatcherInstanceId,
+      current_watcher_instance_id: watcher.instance_id,
+    };
+  }
+  const currentInstanceId = watcher.instance_id;
+  if (!currentInstanceId) {
+    return {
+      owned: false,
+      reason: "watcher_missing",
+      task_watcher_instance_id: taskWatcherInstanceId,
+      current_watcher_instance_id: null,
+    };
+  }
+  if (currentInstanceId !== taskWatcherInstanceId) {
+    return {
+      owned: false,
+      reason: "instance_mismatch",
+      task_watcher_instance_id: taskWatcherInstanceId,
+      current_watcher_instance_id: currentInstanceId,
+    };
+  }
+  return {
+    owned: true,
+    reason: "owned",
+    task_watcher_instance_id: taskWatcherInstanceId,
+    current_watcher_instance_id: currentInstanceId,
+  };
+}