@shipers-dev/multi 0.9.1 → 0.9.3

package/dist/index.js

@@ -5169,6 +5169,25 @@ class RequestError extends Error {
 // src/acp-runner.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
 import { dirname } from "path";
+function fmtErr(e) {
+  if (e == null)
+    return "unknown error";
+  if (typeof e === "string")
+    return e;
+  if (e instanceof Error)
+    return e.message;
+  if (typeof e === "object") {
+    const inner = e.error ?? e.cause ?? e;
+    const msg = inner?.message ?? e.message ?? e.reason ?? e.statusText;
+    const code = inner?.code ?? e.code ?? e.status;
+    if (msg)
+      return code ? `${msg} (code ${code})` : String(msg);
+    try {
+      return JSON.stringify(e).slice(0, 500);
+    } catch {}
+  }
+  return String(e);
+}
 async function runAcp(opts) {
   const cleanEnv = {};
   for (const [k, v] of Object.entries(process.env)) {
@@ -5221,7 +5240,7 @@ async function runAcp(opts) {
 `) : content;
         return { content: sliced };
       } catch (e) {
-        throw new Error(`readTextFile failed: ${String(e)}`);
+        throw new Error(`readTextFile failed: ${fmtErr(e)}`);
       }
     },
     async writeTextFile(params) {
@@ -5232,7 +5251,7 @@ async function runAcp(opts) {
         writeFileSync(params.path, params.content, "utf8");
         return {};
       } catch (e) {
-        throw new Error(`writeTextFile failed: ${String(e)}`);
+        throw new Error(`writeTextFile failed: ${fmtErr(e)}`);
       }
     }
   };
@@ -5259,7 +5278,7 @@ async function runAcp(opts) {
         await conn.loadSession?.({ sessionId: activeSessionId, cwd: opts.cwd || process.cwd(), mcpServers: [] });
         await opts.onEvent({ event_type: "progress", payload: { message: `ACP session ${activeSessionId.slice(0, 8)} resumed` } });
       } catch (e) {
-        await opts.onEvent({ event_type: "progress", payload: { message: `load_session failed; starting new. ${String(e)}` } });
+        await opts.onEvent({ event_type: "progress", payload: { message: `load_session failed; starting new. ${fmtErr(e)}` } });
         const { sessionId } = await conn.newSession({ cwd: opts.cwd || process.cwd(), mcpServers: [] });
         activeSessionId = sessionId;
         if (opts.onSession)
@@ -5286,7 +5305,7 @@ async function runAcp(opts) {
         res = await runPrompt();
         stopReason = res.stopReason;
       } catch (e) {
-        await opts.onEvent({ event_type: "error", payload: { message: `retry with fresh session failed: ${String(e)}` } });
+        await opts.onEvent({ event_type: "error", payload: { message: `retry with fresh session failed: ${fmtErr(e)}` } });
       }
     }
     if (chunkCount === 0) {
@@ -5689,7 +5708,7 @@ var LOG_PATH2 = join3(MULTI_DIR, "logs", "agent.log");
 var SKILLS_DIR = join3(MULTI_DIR, "skills");
 var STOP_PATH = join3(MULTI_DIR, "stop.flag");
 var TASKS_DB_PATH = join3(MULTI_DIR, "tasks.db");
-var VERSION = "0.9.1";
+var VERSION = "0.9.2";
 var COMMANDS = {
   setup: "Register this device with a workspace",
   connect: "Connect device to realtime hub and execute assigned tasks",
@@ -5928,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);
@@ -5952,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());
         }
       })();
@@ -5995,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 });
@@ -6164,7 +6212,7 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
       worktreeBranch = wt.branch;
       await postStream(apiUrl, issueId, "worktree_created", { path: wt.path, branch: wt.branch, reused: !wt.created });
     } catch (e) {
-      await postStream(apiUrl, issueId, "worktree_error", { message: String(e) });
+      await postStream(apiUrl, issueId, "worktree_error", { message: fmtError(e) });
     }
   }
   log(`\u25B6 run_task ${task.key}: ${isFollowup ? "(follow-up) " : ""}${task.title}${workingDir ? ` [cwd: ${workingDir}${worktreeBranch ? ` @${worktreeBranch}` : ""}]` : ""}`);
@@ -6633,14 +6681,15 @@ ${userPart}` : userPart;
       log(`  \u2713 ${task.key} complete`);
     }
   } catch (e) {
+    const msg = fmtError(e);
     if (ctx?.runEntry?.stopped) {
       await markStopped(apiUrl, issueId, ctx.runEntry.stopReason || "stopped");
-      log(`  \u23F9 ${task.key} stopped (${String(e)})`);
+      log(`  \u23F9 ${task.key} stopped (${msg})`);
     } else {
-      await postStream(apiUrl, issueId, "error", { message: String(e) });
-      await postComment(`\u274C spawn error: ${String(e)}`);
+      await postStream(apiUrl, issueId, "error", { message: msg });
+      await postComment(`\u274C spawn error: ${msg}`);
       await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
-      log(`  \u2717 ${task.key} failed: ${String(e)}`);
+      log(`  \u2717 ${task.key} failed: ${msg}`);
     }
   }
 }
@@ -6802,6 +6851,25 @@ function stripMd(s) {
 function stripSelfMention(prompt, _agentType) {
   return prompt.replace(/^@[A-Za-z0-9_\-]+\s*/, "").trim();
 }
+function fmtError(e) {
+  if (e == null)
+    return "unknown error";
+  if (typeof e === "string")
+    return e;
+  if (e instanceof Error)
+    return e.stack ? `${e.message}` : String(e);
+  if (typeof e === "object") {
+    const inner = e.error ?? e.cause ?? e;
+    const msg = inner?.message ?? e.message ?? e.reason ?? e.statusText;
+    const code = inner?.code ?? e.code ?? e.status;
+    if (msg)
+      return code ? `${msg} (code ${code})` : String(msg);
+    try {
+      return JSON.stringify(e).slice(0, 500);
+    } catch {}
+  }
+  return String(e);
+}
 function statusIcon(status) {
   switch (status) {
     case "pending":
@@ -6956,7 +7024,7 @@ Context (original task ${task.key}): ${task.title}` : base || task.title;
     try {
       proc = Bun.spawn([agent.path, ...args], { stdout: "pipe", stderr: "pipe", stdin: "ignore", cwd: task?.working_dir || undefined });
     } catch (e) {
-      yield { event_type: "error", payload: { message: `spawn failed: ${String(e)}` } };
+      yield { event_type: "error", payload: { message: `spawn failed: ${fmtError(e)}` } };
       return;
     }
     const queue = [];
@@ -7249,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.1",
+  "version": "0.9.3",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"

package/src/acp-runner.ts

@@ -8,6 +8,20 @@ import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'fs';
 import { dirname } from 'path';
 import { apiClient } from './client';
 
+function fmtErr(e: any): string {
+  if (e == null) return 'unknown error';
+  if (typeof e === 'string') return e;
+  if (e instanceof Error) return e.message;
+  if (typeof e === 'object') {
+    const inner = e.error ?? e.cause ?? e;
+    const msg = inner?.message ?? e.message ?? e.reason ?? e.statusText;
+    const code = inner?.code ?? e.code ?? e.status;
+    if (msg) return code ? `${msg} (code ${code})` : String(msg);
+    try { return JSON.stringify(e).slice(0, 500); } catch {}
+  }
+  return String(e);
+}
+
 export type AcpEvent =
   | { event_type: 'progress'; payload: any }
   | { event_type: 'assistant_text'; payload: { text: string } }
@@ -79,7 +93,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
           : content;
         return { content: sliced };
       } catch (e) {
-        throw new Error(`readTextFile failed: ${String(e)}`);
+        throw new Error(`readTextFile failed: ${fmtErr(e)}`);
       }
     },
     async writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
@@ -89,7 +103,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
         writeFileSync(params.path, params.content, 'utf8');
         return {};
       } catch (e) {
-        throw new Error(`writeTextFile failed: ${String(e)}`);
+        throw new Error(`writeTextFile failed: ${fmtErr(e)}`);
       }
     },
   };
@@ -118,7 +132,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
         await conn.loadSession?.({ sessionId: activeSessionId, cwd: opts.cwd || process.cwd(), mcpServers: [] } as any);
         await opts.onEvent({ event_type: 'progress', payload: { message: `ACP session ${activeSessionId.slice(0, 8)} resumed` } });
       } catch (e) {
-        await opts.onEvent({ event_type: 'progress', payload: { message: `load_session failed; starting new. ${String(e)}` } });
+        await opts.onEvent({ event_type: 'progress', payload: { message: `load_session failed; starting new. ${fmtErr(e)}` } });
         const { sessionId } = await conn.newSession({ cwd: opts.cwd || process.cwd(), mcpServers: [] } as any);
         activeSessionId = sessionId;
         if (opts.onSession) await opts.onSession(sessionId);
@@ -148,7 +162,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
         res = await runPrompt();
         stopReason = (res as any).stopReason;
       } catch (e) {
-        await opts.onEvent({ event_type: 'error', payload: { message: `retry with fresh session failed: ${String(e)}` } });
+        await opts.onEvent({ event_type: 'error', payload: { message: `retry with fresh session failed: ${fmtErr(e)}` } });
       }
     }
 

package/src/index.ts

@@ -18,7 +18,7 @@ const LOG_PATH = join(MULTI_DIR, 'logs', 'agent.log');
 const SKILLS_DIR = join(MULTI_DIR, 'skills');
 const STOP_PATH = join(MULTI_DIR, 'stop.flag');
 const TASKS_DB_PATH = join(MULTI_DIR, 'tasks.db');
-const VERSION = '0.9.1';
+const VERSION = '0.9.2';
 
 const COMMANDS = {
   setup: 'Register this device with a workspace',
@@ -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;
@@ -501,7 +530,7 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       worktreeBranch = wt.branch;
       await postStream(apiUrl, issueId, 'worktree_created', { path: wt.path, branch: wt.branch, reused: !wt.created });
     } catch (e) {
-      await postStream(apiUrl, issueId, 'worktree_error', { message: String(e) });
+      await postStream(apiUrl, issueId, 'worktree_error', { message: fmtError(e) });
     }
   }
 
@@ -875,14 +904,15 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
     } else if (hadError) { await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {}); log(`  ✗ ${task.key} failed`); }
     else { await apiClient.post(`${apiUrl}/api/issues/${issueId}/complete`, {}); log(`  ✓ ${task.key} complete`); }
   } catch (e) {
+    const msg = fmtError(e);
     if (ctx?.runEntry?.stopped) {
       await markStopped(apiUrl, issueId, ctx.runEntry.stopReason || 'stopped');
-      log(`  ⏹ ${task.key} stopped (${String(e)})`);
+      log(`  ⏹ ${task.key} stopped (${msg})`);
     } else {
-      await postStream(apiUrl, issueId, 'error', { message: String(e) });
-      await postComment(`❌ spawn error: ${String(e)}`);
+      await postStream(apiUrl, issueId, 'error', { message: msg });
+      await postComment(`❌ spawn error: ${msg}`);
       await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
-      log(`  ✗ ${task.key} failed: ${String(e)}`);
+      log(`  ✗ ${task.key} failed: ${msg}`);
     }
   }
 }
@@ -1040,6 +1070,23 @@ function stripSelfMention(prompt: string, _agentType?: string): string {
   return prompt.replace(/^@[A-Za-z0-9_\-]+\s*/, '').trim();
 }
 
+// Best-effort error → string. Plain Error, ACP error envelopes ({error:{message,code,data}}),
+// fetch Response-shaped rejections, and arbitrary objects all stringify to something readable
+// instead of "[object Object]".
+function fmtError(e: any): string {
+  if (e == null) return 'unknown error';
+  if (typeof e === 'string') return e;
+  if (e instanceof Error) return e.stack ? `${e.message}` : String(e);
+  if (typeof e === 'object') {
+    const inner = e.error ?? e.cause ?? e;
+    const msg = inner?.message ?? e.message ?? e.reason ?? e.statusText;
+    const code = inner?.code ?? e.code ?? e.status;
+    if (msg) return code ? `${msg} (code ${code})` : String(msg);
+    try { return JSON.stringify(e).slice(0, 500); } catch {}
+  }
+  return String(e);
+}
+
 function statusIcon(status?: string): string {
   switch (status) {
     case 'pending': return '⏳';
@@ -1183,7 +1230,7 @@ function makeCliRunner(agent: { type: string; path: string }): Runner {
     try {
       proc = Bun.spawn([agent.path, ...args], { stdout: 'pipe', stderr: 'pipe', stdin: 'ignore', cwd: (task as any)?.working_dir || undefined });
     } catch (e) {
-      yield { event_type: 'error', payload: { message: `spawn failed: ${String(e)}` } };
+      yield { event_type: 'error', payload: { message: `spawn failed: ${fmtError(e)}` } };
       return;
     }
 
@@ -1440,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;
 }
 

package/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "mcp__acp__Write",
-      "Bash(npm install:*)",
-      "Bash(npx tsc:*)",
-      "Bash(npx vite build:*)",
-      "mcp__acp__Edit"
-    ]
-  }
-}