@shipers-dev/multi 0.9.2 → 0.9.3

package/dist/index.js

@@ -5947,21 +5947,48 @@ async function cmdConnect(apiUrl, config) {
   db.run("UPDATE tasks SET status = 'queued' WHERE status = 'running'");
   const MAX_DEVICE = Math.max(1, parseInt(process.env.MULTI_MAX_CONCURRENT ?? "3", 10) || 3);
   const running = new Map;
+  function resolvePayloadIds(row) {
+    let agent_id = row.agent_id;
+    let issue_id = row.issue_id;
+    if (!agent_id || !issue_id) {
+      try {
+        const p = JSON.parse(row.payload);
+        agent_id ??= p?.agent_id ?? null;
+        issue_id ??= p?.issue_id ?? null;
+      } catch {}
+    }
+    return { agent_id, issue_id };
+  }
   function pickNext() {
-    const busyAgents = Array.from(running.values()).map((e) => e.agentId).filter(Boolean);
-    const notIn = busyAgents.length ? `AND (agent_id IS NULL OR agent_id NOT IN (${busyAgents.map(() => "?").join(",")}))` : "";
-    const sql = `SELECT id, payload, agent_id, issue_id FROM tasks WHERE status = 'queued' ${notIn} ORDER BY created_at ASC LIMIT 1`;
-    return db.query(sql).get(...busyAgents);
+    const busyAgents = Array.from(running.values()).map((e) => e.agentId).filter((v) => !!v);
+    const busyIssues = Array.from(running.values()).map((e) => e.issueId).filter((v) => !!v);
+    const clauses = [];
+    const binds = [];
+    if (busyAgents.length) {
+      clauses.push(`(agent_id IS NULL OR agent_id NOT IN (${busyAgents.map(() => "?").join(",")}))`);
+      binds.push(...busyAgents);
+    }
+    if (busyIssues.length) {
+      clauses.push(`(issue_id IS NULL OR issue_id NOT IN (${busyIssues.map(() => "?").join(",")}))`);
+      binds.push(...busyIssues);
+    }
+    const where = clauses.length ? `AND ${clauses.join(" AND ")}` : "";
+    const sql = `SELECT id, payload, agent_id, issue_id FROM tasks WHERE status = 'queued' ${where} ORDER BY created_at ASC LIMIT 1`;
+    return db.query(sql).get(...binds);
   }
   function schedule() {
     while (running.size < MAX_DEVICE) {
       const row = pickNext();
       if (!row)
         return;
+      const ids = resolvePayloadIds(row);
+      if (ids.agent_id && Array.from(running.values()).some((e) => e.agentId === ids.agent_id))
+        return;
+      if (ids.issue_id && Array.from(running.values()).some((e) => e.issueId === ids.issue_id))
+        return;
       db.run("UPDATE tasks SET status = 'running', started_at = unixepoch(), attempts = attempts + 1 WHERE id = ?", [row.id]);
-      const entry = { agentId: row.agent_id || "", startedAt: Date.now(), child: null, worktreePath: "" };
-      const issueKey = row.issue_id || row.id;
-      running.set(issueKey, entry);
+      const entry = { agentId: ids.agent_id || "", issueId: ids.issue_id, startedAt: Date.now(), child: null, worktreePath: "" };
+      running.set(row.id, entry);
       (async () => {
         try {
           const task = JSON.parse(row.payload);
@@ -5971,7 +5998,7 @@ async function cmdConnect(apiUrl, config) {
           log(`task ${row.id} error: ${String(e)}`);
           db.run("UPDATE tasks SET status = 'failed', finished_at = unixepoch(), error = ? WHERE id = ?", [String(e), row.id]);
         } finally {
-          running.delete(issueKey);
+          running.delete(row.id);
           queueMicrotask(() => schedule());
         }
       })();
@@ -6014,22 +6041,24 @@ async function cmdConnect(apiUrl, config) {
             const { issue_id } = await req.json();
             if (!issue_id)
               return Response.json({ error: "issue_id required" }, { status: 400 });
-            const entry = running.get(issue_id);
-            if (!entry) {
+            const entries = Array.from(running.values()).filter((e) => e.issueId === issue_id);
+            if (!entries.length) {
               db.run("UPDATE tasks SET status = 'failed', error = 'stopped before start', finished_at = unixepoch() WHERE issue_id = ? AND status = 'queued'", [issue_id]);
               await markStopped(apiUrl, issue_id, "stopped before start");
               return Response.json({ ok: true, state: "queued-cancelled" });
             }
-            entry.stopped = true;
-            entry.stopReason = "user requested";
-            try {
-              entry.child?.kill("SIGTERM");
-            } catch {}
-            setTimeout(() => {
+            for (const entry of entries) {
+              entry.stopped = true;
+              entry.stopReason = "user requested";
               try {
-                entry.child?.kill("SIGKILL");
+                entry.child?.kill("SIGTERM");
               } catch {}
-            }, 5000);
+              setTimeout(() => {
+                try {
+                  entry.child?.kill("SIGKILL");
+                } catch {}
+              }, 5000);
+            }
             return Response.json({ ok: true, state: "running-signalled" });
           } catch (e) {
             return Response.json({ error: String(e) }, { status: 400 });
@@ -7288,6 +7317,8 @@ function openTasksDb() {
     CREATE INDEX IF NOT EXISTS idx_tasks_issue ON tasks(issue_id);
   `);
   db.run("UPDATE tasks SET status = 'queued' WHERE status = 'pending'");
+  db.run("UPDATE tasks SET agent_id = json_extract(payload, '$.agent_id') WHERE agent_id IS NULL AND payload IS NOT NULL AND json_valid(payload)");
+  db.run("UPDATE tasks SET issue_id = json_extract(payload, '$.issue_id') WHERE issue_id IS NULL AND payload IS NOT NULL AND json_valid(payload)");
   return db;
 }
 function loadConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"

package/src/index.ts

@@ -261,26 +261,52 @@ async function cmdConnect(apiUrl: string, config: Config) {
   db.run("UPDATE tasks SET status = 'queued' WHERE status = 'running'");
 
   const MAX_DEVICE = Math.max(1, parseInt(process.env.MULTI_MAX_CONCURRENT ?? '3', 10) || 3);
+  // Keyed by task row id — unique per dispatch. Duplicate issue_id / agent_id still
+  // serialize via busyAgents/busyIssues filters.
   const running = new Map<string, RunEntry>();
 
+  function resolvePayloadIds(row: { payload: string; agent_id: string | null; issue_id: string | null }): { agent_id: string | null; issue_id: string | null } {
+    let agent_id = row.agent_id;
+    let issue_id = row.issue_id;
+    if (!agent_id || !issue_id) {
+      try {
+        const p = JSON.parse(row.payload) as any;
+        agent_id ??= p?.agent_id ?? null;
+        issue_id ??= p?.issue_id ?? null;
+      } catch {}
+    }
+    return { agent_id, issue_id };
+  }
+
   function pickNext(): { id: string; payload: string; agent_id: string | null; issue_id: string | null } | null {
-    const busyAgents = Array.from(running.values()).map((e) => e.agentId).filter(Boolean) as string[];
-    // Emulate NOT IN (:list) via string construction (safe: only ids from DB).
-    const notIn = busyAgents.length
-      ? `AND (agent_id IS NULL OR agent_id NOT IN (${busyAgents.map(() => '?').join(',')}))`
-      : '';
-    const sql = `SELECT id, payload, agent_id, issue_id FROM tasks WHERE status = 'queued' ${notIn} ORDER BY created_at ASC LIMIT 1`;
-    return db.query(sql).get(...busyAgents) as any;
+    const busyAgents = Array.from(running.values()).map((e) => e.agentId).filter((v): v is string => !!v);
+    const busyIssues = Array.from(running.values()).map((e) => e.issueId).filter((v): v is string => !!v);
+    const clauses: string[] = [];
+    const binds: string[] = [];
+    if (busyAgents.length) {
+      clauses.push(`(agent_id IS NULL OR agent_id NOT IN (${busyAgents.map(() => '?').join(',')}))`);
+      binds.push(...busyAgents);
+    }
+    if (busyIssues.length) {
+      clauses.push(`(issue_id IS NULL OR issue_id NOT IN (${busyIssues.map(() => '?').join(',')}))`);
+      binds.push(...busyIssues);
+    }
+    const where = clauses.length ? `AND ${clauses.join(' AND ')}` : '';
+    const sql = `SELECT id, payload, agent_id, issue_id FROM tasks WHERE status = 'queued' ${where} ORDER BY created_at ASC LIMIT 1`;
+    return db.query(sql).get(...binds) as any;
   }
 
   function schedule() {
     while (running.size < MAX_DEVICE) {
       const row = pickNext();
       if (!row) return;
+      const ids = resolvePayloadIds(row);
+      // Defensive: if DB saw NULL agent/issue but payload has them, skip if busy.
+      if (ids.agent_id && Array.from(running.values()).some((e) => e.agentId === ids.agent_id)) return;
+      if (ids.issue_id && Array.from(running.values()).some((e) => e.issueId === ids.issue_id)) return;
       db.run("UPDATE tasks SET status = 'running', started_at = unixepoch(), attempts = attempts + 1 WHERE id = ?", [row.id]);
-      const entry: RunEntry = { agentId: row.agent_id || '', startedAt: Date.now(), child: null, worktreePath: '' };
-      const issueKey = row.issue_id || row.id;
-      running.set(issueKey, entry);
+      const entry: RunEntry = { agentId: ids.agent_id || '', issueId: ids.issue_id, startedAt: Date.now(), child: null, worktreePath: '' };
+      running.set(row.id, entry);
       void (async () => {
         try {
           const task = JSON.parse(row.payload);
@@ -290,7 +316,7 @@ async function cmdConnect(apiUrl: string, config: Config) {
           log(`task ${row.id} error: ${String(e)}`);
           db.run("UPDATE tasks SET status = 'failed', finished_at = unixepoch(), error = ? WHERE id = ?", [String(e), row.id]);
         } finally {
-          running.delete(issueKey);
+          running.delete(row.id);
           queueMicrotask(() => schedule());
         }
       })();
@@ -334,16 +360,18 @@ async function cmdConnect(apiUrl: string, config: Config) {
           try {
             const { issue_id } = await req.json() as { issue_id: string };
             if (!issue_id) return Response.json({ error: 'issue_id required' }, { status: 400 });
-            const entry = running.get(issue_id);
-            if (!entry) {
+            const entries = Array.from(running.values()).filter((e) => e.issueId === issue_id);
+            if (!entries.length) {
               db.run("UPDATE tasks SET status = 'failed', error = 'stopped before start', finished_at = unixepoch() WHERE issue_id = ? AND status = 'queued'", [issue_id]);
               await markStopped(apiUrl, issue_id, 'stopped before start');
               return Response.json({ ok: true, state: 'queued-cancelled' });
             }
-            entry.stopped = true;
-            entry.stopReason = 'user requested';
-            try { entry.child?.kill('SIGTERM'); } catch {}
-            setTimeout(() => { try { entry.child?.kill('SIGKILL'); } catch {} }, 5000);
+            for (const entry of entries) {
+              entry.stopped = true;
+              entry.stopReason = 'user requested';
+              try { entry.child?.kill('SIGTERM'); } catch {}
+              setTimeout(() => { try { entry.child?.kill('SIGKILL'); } catch {} }, 5000);
+            }
             return Response.json({ ok: true, state: 'running-signalled' });
           } catch (e) {
             return Response.json({ error: String(e) }, { status: 400 });
@@ -462,6 +490,7 @@ async function parseTunnelUrl(stream: ReadableStream<Uint8Array>): Promise<strin
 
 interface RunEntry {
   agentId: string;
+  issueId: string | null;
   startedAt: number;
   child: any | null;
   worktreePath: string;
@@ -1458,6 +1487,11 @@ function openTasksDb(): Database {
   `);
   // Old rows used 'pending'; normalize to 'queued'.
   db.run("UPDATE tasks SET status = 'queued' WHERE status = 'pending'");
+  // Backfill agent_id/issue_id from payload JSON for rows predating the columns.
+  // Without this, the scheduler cannot serialize per-agent / per-issue and fires
+  // concurrent dispatches for the same agent on the same issue.
+  db.run("UPDATE tasks SET agent_id = json_extract(payload, '$.agent_id') WHERE agent_id IS NULL AND payload IS NOT NULL AND json_valid(payload)");
+  db.run("UPDATE tasks SET issue_id = json_extract(payload, '$.issue_id') WHERE issue_id IS NULL AND payload IS NOT NULL AND json_valid(payload)");
   return db;
 }