@mediagato/modelreins-channel 4.5.1 → 4.9.0

package/modelreins-channel.mjs

@@ -256,6 +256,14 @@ async function api(method, path, body = null) {
  * report the correct status in heartbeats.
  */
 let currentJobId = null;
+// Wall-clock timestamp of the last claim. The stuck-job watchdog uses this
+// to detect Claude crashing mid-stream or silently dropping the channel
+// notification (modelreins_complete never gets called). Without this, a
+// missed completion leaves currentJobId set forever and pollJobs early-
+// returns on every tick — the channel goes dead until restart. Reset to 0
+// alongside every currentJobId = null.
+let _jobClaimedAt = 0;
+const STUCK_JOB_MS = 30 * 60 * 1000;  // 30 min — generous Claude completion window
 
 // ── MCP Server ────────────────────────────────────────────────────────────────
 //
@@ -484,6 +492,7 @@ mcp.setRequestHandler(CallToolRequestSchema, async (req) => {
 
         // Clear current job slot so the poll loop can accept the next job.
         currentJobId = null;
+        _jobClaimedAt = 0;
 
         return {
             content: [{
@@ -1048,11 +1057,19 @@ async function pollJobs() {
         const job = jobs[0];
         currentJobId = job.id;
         claimedJobId = job.id;
+        _jobClaimedAt = Date.now();
 
         // Claim the job immediately so no other worker picks it up. If the
         // claim fails, roll back so a future poll can retry — without this,
         // a transient 5xx leaves currentJobId stuck and the channel deadlocks.
+        // 409 is the new atomic-claim conflict — another worker won this job
+        // first (same WORKER_NAME on a parallel process). Same treatment as
+        // any other claim failure: roll back local state, let the next poll
+        // try fresh.
         const claim = await api('PUT', `/jobs/${job.id}`, { status: 'running' });
+        if (claim.status === 409) {
+            throw new Error(`claim conflict: job ${job.id} already claimed by another worker`);
+        }
         if (claim.status < 200 || claim.status >= 300) {
             throw new Error(`claim PUT returned ${claim.status}: ${JSON.stringify(claim.data).slice(0, 120)}`);
         }
@@ -1080,6 +1097,7 @@ async function pollJobs() {
         // Roll back the optimistic local claim so the next poll can retry.
         if (claimedJobId !== null && currentJobId === claimedJobId) {
             currentJobId = null;
+            _jobClaimedAt = 0;
             // Best-effort: return the job to pending on the server too.
             // If this also fails, the server-side stale-running cleanup will
             // eventually reclaim it; we don't want to retry forever here.
@@ -1091,9 +1109,37 @@ async function pollJobs() {
     }
 }
 
+// Stuck-job watchdog: if currentJobId stays set for STUCK_JOB_MS without
+// modelreins_complete being called, clear it so the channel can accept
+// new work. Defends against Claude crashing mid-stream or silently
+// dropping the channel notification. Reports the stranded job as failed
+// best-effort so the dashboard doesn't show a phantom "running" forever.
+// See: 2026-04-26 ultrareview finding "MCP channel session permanently
+// stuck if Claude never calls modelreins_complete" (preserved in
+// modelreins#161 audit).
+async function stuckJobWatchdog() {
+    if (!currentJobId) return;
+    if (Date.now() - _jobClaimedAt < STUCK_JOB_MS) return;
+    const staleJobId = currentJobId;
+    console.error(`[channel] watchdog: job ${staleJobId} stale >${STUCK_JOB_MS/60000}min — clearing`);
+    currentJobId = null;
+    _jobClaimedAt = 0;
+    try {
+        await api('PUT', `/jobs/${staleJobId}`, {
+            status: 'failed',
+            exit_code: 1,
+            error: `channel watchdog: modelreins_complete never called within ${STUCK_JOB_MS/60000}min`,
+            error_type: 'channel_stuck',
+        });
+    } catch (e) {
+        console.error(`[channel] watchdog: failed to report stale job ${staleJobId}: ${e?.message || e}`);
+    }
+}
+
 // Kick off the background loops.
 setInterval(heartbeat, 30_000);
 setInterval(pollJobs, POLL_MS);
+setInterval(stuckJobWatchdog, 60_000);
 
 // Initial heartbeat fires immediately so the worker shows as online right away.
 heartbeat();

package/package.json

@@ -1,19 +1,22 @@
-{
-  "name": "@mediagato/modelreins-channel",
-  "version": "4.5.1",
-  "description": "ModelReins MCP Channel — turn any Claude Code session into a ModelReins worker",
-  "type": "module",
-  "main": "modelreins-channel.mjs",
-  "bin": {
-    "modelreins-channel": "./modelreins-channel.mjs"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.12.0"
-  },
-  "keywords": ["modelreins", "mcp", "claude-code", "channel", "ai-orchestration"],
-  "license": "BSL-1.1",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mediagato/modelreins"
-  }
-}
+{
+  "name": "@mediagato/modelreins-channel",
+  "version": "4.9.0",
+  "description": "ModelReins MCP Channel — turn any Claude Code session into a ModelReins worker",
+  "type": "module",
+  "main": "modelreins-channel.mjs",
+  "bin": {
+    "modelreins-channel": "./modelreins-channel.mjs"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.12.0"
+  },
+  "keywords": [
+    "modelreins",
+    "mcp",
+    "claude-code",
+    "channel",
+    "ai-orchestration"
+  ],
+  "license": "BSL-1.1",
+  "homepage": "https://modelreins.com"
+}