@shipers-dev/multi 0.25.0 → 0.32.0

package/dist/index.js

@@ -15001,7 +15001,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.25.0",
+  version: "0.32.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -15705,8 +15705,12 @@ multi-managed: true
 `;
   writeFileSync4(out, fm + (agent.prompt || ""));
 }
-async function materializeBundle(apiUrl, deviceId, log3) {
-  const res = await apiClient.get(`${apiUrl}/api/devices/${deviceId}/agent_bundle`);
+async function materializeBundle(apiUrl, wsId, deviceId, log3) {
+  if (!wsId) {
+    log3("materialize: skipped (no workspace id)");
+    return null;
+  }
+  const res = await apiClient.get(`${apiUrl}/api/workspaces/${wsId}/devices/${deviceId}/agent_bundle`);
   if (!res.success || !res.data) {
     log3(`materialize: bundle fetch failed: ${res.error || "unknown"}`);
     return null;
@@ -15775,11 +15779,11 @@ class Materializer extends exports_Effect.Service()("cli/Materializer", {
   effect: exports_Effect.gen(function* () {
     const logger = yield* Logger4;
     const sync5 = (f = () => {}) => f;
-    const materialize = (apiUrl, deviceId) => exports_Effect.tryPromise({
-      try: () => materializeBundle(apiUrl, deviceId, (m) => {
+    const materialize = (apiUrl, wsId, deviceId) => exports_Effect.tryPromise({
+      try: () => materializeBundle(apiUrl, wsId, deviceId, (m) => {
         exports_Effect.runPromise(logger.log(m));
       }),
-      catch: (cause3) => new ApiError({ url: `${apiUrl}/api/devices/${deviceId}/agent_bundle`, message: String(cause3) })
+      catch: (cause3) => new ApiError({ url: `${apiUrl}/api/workspaces/${wsId}/devices/${deviceId}/agent_bundle`, message: String(cause3) })
     });
     const lastRevision = () => exports_Effect.sync(() => lastMaterializedRevision());
     return { materialize, lastRevision };
@@ -31543,7 +31547,10 @@ ${entries2}` } });
       if (allowOpt)
         return { outcome: { outcome: "selected", optionId: allowOpt.optionId } };
     }
-    const created = await apiClient.post(`${o.apiUrl}/api/permissions`, {
+    if (!o.tenantWsId)
+      return { outcome: { outcome: "cancelled" } };
+    const permBase = `${o.apiUrl}/api/workspaces/${o.tenantWsId}/permissions`;
+    const created = await apiClient.post(permBase, {
       issue_id: o.issueId,
       device_id: o.deviceId,
       tool_call_id: tc.id || tc.toolCallId,
@@ -31557,7 +31564,7 @@ ${entries2}` } });
     const deadline = Date.now() + 5 * 60 * 1000;
     while (Date.now() < deadline) {
       await new Promise((r) => setTimeout(r, 500));
-      const got = await apiClient.get(`${o.apiUrl}/api/permissions/${permId}`);
+      const got = await apiClient.get(`${permBase}/${permId}`);
       const row = got.data;
       if (!row)
         break;
@@ -31867,7 +31874,11 @@ var statusCmd = exports_Effect.fn("statusCmd")(function* () {
   const apiUrl = cfg.apiUrl || "https://multi-api.adnb3r.workers.dev";
   if (cfg.authToken)
     yield* api2.setAuthToken(cfg.authToken);
-  const res = yield* api2.get(`${apiUrl}/api/devices/${cfg.deviceId}`);
+  if (!cfg.workspaceId) {
+    console.log("❌ Device has no workspace id. Re-run setup.");
+    process.exit(1);
+  }
+  const res = yield* api2.get(`${apiUrl}/api/workspaces/${cfg.workspaceId}/devices/${cfg.deviceId}`);
   if (!res.success) {
     console.log("❌", res.error);
     process.exit(1);
@@ -31960,11 +31971,11 @@ class Materializer2 extends exports_Effect.Service()("cli/Materializer", {
   effect: exports_Effect.gen(function* () {
     const logger = yield* Logger4;
     const sync5 = (f = () => {}) => f;
-    const materialize = (apiUrl, deviceId) => exports_Effect.tryPromise({
-      try: () => materializeBundle(apiUrl, deviceId, (m) => {
+    const materialize = (apiUrl, wsId, deviceId) => exports_Effect.tryPromise({
+      try: () => materializeBundle(apiUrl, wsId, deviceId, (m) => {
         exports_Effect.runPromise(logger.log(m));
       }),
-      catch: (cause3) => new ApiError({ url: `${apiUrl}/api/devices/${deviceId}/agent_bundle`, message: String(cause3) })
+      catch: (cause3) => new ApiError({ url: `${apiUrl}/api/workspaces/${wsId}/devices/${deviceId}/agent_bundle`, message: String(cause3) })
     });
     const lastRevision = () => exports_Effect.sync(() => lastMaterializedRevision());
     return { materialize, lastRevision };
@@ -32037,11 +32048,10 @@ var setupCmd = exports_Effect.fn("setupCmd")(function* (name, apiUrl) {
 ✅ Device paired. ID: ${a.device_id}`);
   yield* config2.save({ deviceId: a.device_id, authToken: a.token, dispatchSecret: a.dispatch_secret, apiUrl });
   yield* api2.setAuthToken(a.token);
-  const dev = yield* api2.get(`${apiUrl}/api/devices/${a.device_id}`);
-  const workspaceId = dev.data?.workspace_id;
+  const workspaceId = a.workspace_id || undefined;
   if (workspaceId) {
     yield* config2.update({ workspaceId });
-    yield* materializer.materialize(apiUrl, a.device_id).pipe(exports_Effect.catchAll((e) => exports_Effect.sync(() => console.log(`   materialize failed: ${e.message}`))));
+    yield* materializer.materialize(apiUrl, workspaceId, a.device_id).pipe(exports_Effect.catchAll((e) => exports_Effect.sync(() => console.log(`   materialize failed: ${e.message}`))));
   }
   console.log(`
 Next: link to an agent with: multi-agent link --agent <agentId>`);
@@ -32059,7 +32069,10 @@ var linkCmd = exports_Effect.fn("linkCmd")(function* (apiUrl, agentId) {
   }
   if (cfg.authToken)
     yield* api2.setAuthToken(cfg.authToken);
-  const url2 = `${apiUrl}/api/devices/${cfg.deviceId}/link`;
+  if (!cfg.workspaceId) {
+    return yield* exports_Effect.fail(new UsageError({ message: "Device has no workspace id. Re-run setup." }));
+  }
+  const url2 = `${apiUrl}/api/workspaces/${cfg.workspaceId}/devices/${cfg.deviceId}/link`;
   const res = yield* api2.post(url2, { agent_id: agentId });
   if (!res.success) {
     return yield* exports_Effect.fail(new ApiError({ url: url2, status: res.status, message: res.error || "link failed" }));
@@ -32264,7 +32277,9 @@ function bumpFailed(ids3, reason) {
        WHERE id = ?`, attempts, Date.now() + backoff, reason, id);
   }
 }
-async function flushOutboxOnce(apiUrl) {
+async function flushOutboxOnce(apiUrl, wsId) {
+  if (!wsId)
+    return { attempted: 0, accepted: 0, rejected: 0 };
   const rows = pickPending(BATCH_SIZE);
   if (!rows.length)
     return { attempted: 0, accepted: 0, rejected: 0 };
@@ -32276,7 +32291,7 @@ async function flushOutboxOnce(apiUrl) {
     created_at: r.created_at
   }));
   try {
-    const res = await apiClient.post(`${apiUrl}/api/streams/ingest`, { events });
+    const res = await apiClient.post(`${apiUrl}/api/workspaces/${wsId}/streams/ingest`, { events });
     if (!res.success || !res.data) {
       bumpFailed(rows.map((r) => r.id), res.error ?? "ingest_post_failed");
       return { attempted: rows.length, accepted: 0, rejected: rows.length };
@@ -32309,7 +32324,7 @@ function tryParse(s) {
     return s;
   }
 }
-function startOutboxFlusher(apiUrl) {
+function startOutboxFlusher(apiUrl, wsId) {
   let stopped = false;
   let timer = null;
   const tick = async () => {
@@ -32317,7 +32332,7 @@ function startOutboxFlusher(apiUrl) {
       return;
     try {
       while (!stopped) {
-        const r = await flushOutboxOnce(apiUrl);
+        const r = await flushOutboxOnce(apiUrl, wsId);
         if (r.attempted < BATCH_SIZE)
           break;
       }
@@ -32339,7 +32354,7 @@ import { join as join9, dirname as dirname8 } from "path";
 // package.json
 var package_default2 = {
   name: "@shipers-dev/multi",
-  version: "0.25.0",
+  version: "0.32.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -32388,20 +32403,31 @@ function log3(msg) {
   appendFileSync4(LOG_PATH3, line);
   process.stdout.write(line);
 }
-async function patchIssueStatus(apiUrl, issueId, status) {
-  return apiClient.post(`${apiUrl}/api/issues/agent/mutate`, { action: "update", id: issueId, status });
+function nestedIssueBase(apiUrl, wsId, projectId, issueId) {
+  return `${apiUrl}/api/workspaces/${wsId}/projects/${projectId}/issues/${issueId}`;
+}
+async function patchIssueStatus(apiUrl, wsId, issueId, status) {
+  if (!wsId)
+    return { success: false, error: "no workspace id" };
+  return apiClient.post(`${apiUrl}/api/workspaces/${wsId}/agent/issues/mutate`, { action: "update", id: issueId, status });
 }
-async function markStopped(apiUrl, issueId, reason) {
+async function markStopped(apiUrl, task, reason) {
+  const wsId = task?.tenant_workspace_id ?? null;
+  const pid = task?.project_id ?? null;
+  const issueId = task?.issue_id;
   try {
-    await patchIssueStatus(apiUrl, issueId, "stopped");
+    if (wsId)
+      await patchIssueStatus(apiUrl, wsId, issueId, "stopped");
   } catch {}
   try {
-    await apiClient.post(`${apiUrl}/api/issues/${issueId}/comments`, {
-      author_type: "agent",
-      author_id: "daemon",
-      author_name: "daemon",
-      body: `⏹ Stopped: ${reason}`
-    });
+    if (wsId && pid) {
+      await apiClient.post(`${nestedIssueBase(apiUrl, wsId, pid, issueId)}/comments`, {
+        author_type: "agent",
+        author_id: "daemon",
+        author_name: "daemon",
+        body: `⏹ Stopped: ${reason}`
+      });
+    }
   } catch {}
   await postStream(apiUrl, issueId, "stopped", { reason });
 }
@@ -32428,6 +32454,9 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
   const issueId = task.issue_id;
   const isFollowup = !!task.followup;
   const baseWorkingDir = task.working_dir && existsSync9(task.working_dir) ? task.working_dir : undefined;
+  const tenantWsId = task.tenant_workspace_id ?? null;
+  const projectId = task.project_id ?? null;
+  const ISSUE_BASE = tenantWsId && projectId ? `${apiUrl}/api/workspaces/${tenantWsId}/projects/${projectId}/issues/${issueId}` : null;
   let workingDir = baseWorkingDir;
   let worktreeBranch = "";
   if (baseWorkingDir) {
@@ -32436,9 +32465,9 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
       workingDir = wt.path;
       worktreeBranch = wt.branch;
       await postStream(apiUrl, issueId, "worktree_created", { path: wt.path, branch: wt.branch, reused: !wt.created });
-      if (task.workspace_id && task.project_id) {
+      if (task.workspace_id && task.project_id && task.tenant_workspace_id) {
         try {
-          await apiClient.post(`${apiUrl}/api/agent-workspaces/${task.workspace_id}/ready?project_id=${encodeURIComponent(task.project_id)}`, { status: "ready", worktree_path: wt.path });
+          await apiClient.post(`${apiUrl}/api/workspaces/${task.tenant_workspace_id}/agent-workspaces/${task.workspace_id}/ready?project_id=${encodeURIComponent(task.project_id)}`, { status: "ready", worktree_path: wt.path });
         } catch (e) {
           await postStream(apiUrl, issueId, "worktree_error", { message: `agent-workspace ack failed: ${fmtError(e)}` });
         }
@@ -32448,13 +32477,14 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
     }
   }
   log3(`▶ run_task ${task.key}: ${isFollowup ? "(follow-up) " : ""}${task.title}${workingDir ? ` [cwd: ${workingDir}${worktreeBranch ? ` @${worktreeBranch}` : ""}]` : ""}`);
-  await patchIssueStatus(apiUrl, issueId, "in_progress");
+  if (tenantWsId)
+    await patchIssueStatus(apiUrl, tenantWsId, issueId, "in_progress");
   await postStream(apiUrl, issueId, "progress", { message: `Device ${deviceId} picked up ${isFollowup ? "follow-up" : "task"}` });
   let attachmentRefs = [];
-  if (task.from_comment_id) {
+  if (task.from_comment_id && task.tenant_workspace_id && task.project_id) {
     const baseDir = workingDir || join9(MULTI_DIR4, "tmp", issueId);
     const inDir = join9(baseDir, ".multi-in", task.from_comment_id);
-    attachmentRefs = await downloadCommentAttachments(apiUrl, task.from_comment_id, inDir);
+    attachmentRefs = await downloadCommentAttachments(apiUrl, task.tenant_workspace_id, task.project_id, issueId, task.from_comment_id, inDir);
     if (attachmentRefs.length)
       log3(`  fetched ${attachmentRefs.length} attachment(s) → ${inDir}`);
   }
@@ -32467,8 +32497,10 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
   const ensureLiveComment = () => {
     if (liveCommentId)
       return Promise.resolve();
+    if (!ISSUE_BASE)
+      return Promise.resolve();
     if (!liveCommentPromise) {
-      liveCommentPromise = apiClient.post(`${apiUrl}/api/issues/${issueId}/comments`, {
+      liveCommentPromise = apiClient.post(`${ISSUE_BASE}/comments`, {
         author_type: "agent",
         author_id: task.agent_id,
         author_name: "agent",
@@ -32480,15 +32512,17 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
     return liveCommentPromise;
   };
   const patchLive = async (body) => {
-    if (!liveCommentId)
+    if (!liveCommentId || !ISSUE_BASE)
       return;
     try {
-      await apiClient.patch(`${apiUrl}/api/issues/${issueId}/comments/${liveCommentId}`, { body: body || "…" });
+      await apiClient.patch(`${ISSUE_BASE}/comments/${liveCommentId}`, { body: body || "…" });
     } catch {}
   };
   const postComment = async (body) => {
+    if (!ISSUE_BASE)
+      return;
     try {
-      await apiClient.post(`${apiUrl}/api/issues/${issueId}/comments`, { author_type: "agent", author_id: task.agent_id, author_name: "agent", body });
+      await apiClient.post(`${ISSUE_BASE}/comments`, { author_type: "agent", author_id: task.agent_id, author_name: "agent", body });
     } catch {}
   };
   const turn = {
@@ -32680,9 +32714,11 @@ _${bits.join(" · ")}_`);
   let preferType = task.agent_runtime || undefined;
   if (!preferType) {
     try {
-      const a = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
-      if (a.data?.type)
-        preferType = a.data.type;
+      if (tenantWsId) {
+        const a = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}`);
+        if (a.data?.type)
+          preferType = a.data.type;
+      }
     } catch {}
   }
   const acpCapable = detected.filter((d) => d.type === "claude-code");
@@ -32724,35 +32760,36 @@ Respond in the chat. Only if you produce large artifact files (screenshots, data
       }
       let preamble = "";
       try {
-        const agentRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
-        const agent = agentRes.data;
-        if (agent?.prompt)
-          preamble += `# Agent instructions
+        if (tenantWsId) {
+          const agentRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}`);
+          const agent = agentRes.data;
+          if (agent?.prompt)
+            preamble += `# Agent instructions
 
 ${agent.prompt}
 
 `;
-        const skillsRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}/skills`);
-        const skillList = Array.isArray(skillsRes.data) ? skillsRes.data : [];
-        if (skillList.length) {
-          preamble += `# Attached skills (${skillList.length})
+          const skillsRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}/skills`);
+          const skillList = Array.isArray(skillsRes.data) ? skillsRes.data : [];
+          if (skillList.length) {
+            preamble += `# Attached skills (${skillList.length})
 
 `;
-          for (const s of skillList) {
-            const body = String(s.body || s.description || "").trim();
-            if (!body)
-              continue;
-            preamble += `## ${s.name}${s.version ? ` v${s.version}` : ""}
+            for (const s of skillList) {
+              const body = String(s.body || s.description || "").trim();
+              if (!body)
+                continue;
+              preamble += `## ${s.name}${s.version ? ` v${s.version}` : ""}
 
 ${body}
 
 `;
+            }
           }
         }
       } catch (e) {
         log3(`preamble fetch failed: ${String(e)}`);
       }
-      preamble += await fetchMemoryPreamble(apiUrl, task);
       preamble += await buildPlanningPreamble(apiUrl, task);
       const prompt = preamble ? `${preamble}
 ---
@@ -32770,6 +32807,7 @@ ${userPart}` : userPart;
         issueId,
         deviceId,
         prompt,
+        tenantWsId,
         workspaceId: task.workspace_id || issueId,
         workspaceSessionId: task.workspace_session_id || null,
         sessionId: task.session_id || null,
@@ -32779,11 +32817,14 @@ ${userPart}` : userPart;
         onEvent: eventHandler,
         onSession: async (sid) => {
           try {
-            await apiClient.post(`${apiUrl}/api/issues/${issueId}/session`, { session_id: sid });
+            if (ISSUE_BASE)
+              await apiClient.post(`${ISSUE_BASE}/session`, { session_id: sid });
           } catch {}
           if (task.workspace_session_id) {
             try {
-              await apiClient.patch(`${apiUrl}/api/sessions/${task.workspace_session_id}?workspace_id=${encodeURIComponent(task.workspace_id || issueId)}`, { provider_session_id: sid, status: "running" });
+              if (tenantWsId) {
+                await apiClient.patch(`${apiUrl}/api/workspaces/${tenantWsId}/sessions/${task.workspace_session_id}?session_workspace_id=${encodeURIComponent(task.workspace_id || issueId)}`, { provider_session_id: sid, status: "running" });
+              }
             } catch {}
           }
         },
@@ -32800,32 +32841,33 @@ ${userPart}` : userPart;
     } else if (useAcpx) {
       let preamble = "";
       try {
-        const agentRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
-        const agent = agentRes.data;
-        if (agent?.prompt)
-          preamble += `# Agent instructions
+        if (tenantWsId) {
+          const agentRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}`);
+          const agent = agentRes.data;
+          if (agent?.prompt)
+            preamble += `# Agent instructions
 
 ${agent.prompt}
 
 `;
-        const skillsRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}/skills`);
-        const skillList = Array.isArray(skillsRes.data) ? skillsRes.data : [];
-        if (skillList.length) {
-          preamble += `# Attached skills (${skillList.length})
+          const skillsRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}/skills`);
+          const skillList = Array.isArray(skillsRes.data) ? skillsRes.data : [];
+          if (skillList.length) {
+            preamble += `# Attached skills (${skillList.length})
 
 `;
-          for (const s of skillList) {
-            const body = String(s.body || s.description || "").trim();
-            if (body)
-              preamble += `## ${s.name}${s.version ? ` v${s.version}` : ""}
+            for (const s of skillList) {
+              const body = String(s.body || s.description || "").trim();
+              if (body)
+                preamble += `## ${s.name}${s.version ? ` v${s.version}` : ""}
 
 ${body}
 
 `;
+            }
           }
         }
       } catch {}
-      preamble += await fetchMemoryPreamble(apiUrl, task);
       preamble += await buildPlanningPreamble(apiUrl, task);
       const issueContext = `## Issue ${task.key}: ${task.title}${task.description ? `
 
@@ -32885,8 +32927,8 @@ ${userPart}` : userPart;
       for await (const event of runner(task))
         await eventHandler(event);
     }
-    if (liveCommentId) {
-      const n = await uploadOutputDir(apiUrl, liveCommentId, outDir, task.issue_id);
+    if (liveCommentId && task.tenant_workspace_id && task.project_id) {
+      const n = await uploadOutputDir(apiUrl, task.tenant_workspace_id, task.project_id, task.issue_id, liveCommentId, outDir);
       if (n > 0)
         log3(`  \uD83D\uDCCE uploaded ${n} output file(s)`);
     }
@@ -32898,7 +32940,8 @@ ${userPart}` : userPart;
         const summary5 = await executePlanActions(apiUrl, task, actions, ctx);
         if (summary5) {
           try {
-            await apiClient.post(`${apiUrl}/api/issues/${issueId}/comments`, { author_type: "agent", author_id: task.agent_id, author_name: "agent", body: summary5 });
+            if (ISSUE_BASE)
+              await apiClient.post(`${ISSUE_BASE}/comments`, { author_type: "agent", author_id: task.agent_id, author_name: "agent", body: summary5 });
           } catch {}
         }
       }
@@ -32909,15 +32952,17 @@ ${userPart}` : userPart;
       log3(`  ⚠ ${task.key} produced no assistant output (stopReason=${stopReason})`);
     }
     if (ctx?.runEntry?.stopped) {
-      await markStopped(apiUrl, issueId, ctx.runEntry.stopReason || "stopped");
+      await markStopped(apiUrl, task, ctx.runEntry.stopReason || "stopped");
       log3(`  ⏹ ${task.key} stopped`);
     } else if (hadError) {
-      await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
+      if (ISSUE_BASE)
+        await apiClient.post(`${ISSUE_BASE}/fail`, {});
       log3(`  ✗ ${task.key} failed`);
       if (baseWorkingDir)
         await gcWorktreeAfterTerminal(baseWorkingDir, task.key || issueId);
     } else {
-      await apiClient.post(`${apiUrl}/api/issues/${issueId}/complete`, {});
+      if (ISSUE_BASE)
+        await apiClient.post(`${ISSUE_BASE}/complete`, {});
       log3(`  ✓ ${task.key} complete`);
       if (baseWorkingDir)
         await gcWorktreeAfterTerminal(baseWorkingDir, task.key || issueId);
@@ -32925,64 +32970,18 @@ ${userPart}` : userPart;
   } catch (e) {
     const msg = fmtError(e);
     if (ctx?.runEntry?.stopped) {
-      await markStopped(apiUrl, issueId, ctx.runEntry.stopReason || "stopped");
+      await markStopped(apiUrl, task, ctx.runEntry.stopReason || "stopped");
       log3(`  ⏹ ${task.key} stopped (${msg})`);
     } else {
       await postStream(apiUrl, issueId, "error", { message: msg });
       await postComment(`❌ spawn error: ${msg}`);
-      await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
+      if (ISSUE_BASE)
+        await apiClient.post(`${ISSUE_BASE}/fail`, {});
       log3(`  ✗ ${task.key} failed: ${msg}`);
     }
   }
 }
-async function fetchMemoryPreamble(apiUrl, task) {
-  if (process.env.MULTI_MEMORY_ENABLED !== "1")
-    return "";
-  try {
-    const issueRes = await apiClient.get(`${apiUrl}/api/issues/${task.issue_id}`);
-    const projectId = issueRes.data?.project_id;
-    if (!projectId)
-      return "";
-    const title = String(task.title || "").trim();
-    const desc = String(task.description || "").trim();
-    const followup = String(task.followup || "").trim();
-    const query = [title, desc, followup].filter(Boolean).join(`
-`).slice(0, 4000);
-    if (!query)
-      return "";
-    const res = await apiClient.post(`${apiUrl}/api/memory/recall`, {
-      project_id: projectId,
-      issue_id: task.issue_id,
-      query,
-      k: 10
-    });
-    if (!res.success)
-      return "";
-    const synthesis = String(res.data?.synthesis || "").trim();
-    if (!synthesis)
-      return "";
-    const cites = Array.isArray(res.data?.citations) ? res.data.citations : [];
-    let block = `## Project memory
-
-${synthesis}
-`;
-    if (cites.length) {
-      block += `
-`;
-      for (let i = 0;i < cites.length; i++) {
-        const c = cites[i];
-        block += `[${i + 1}] ${String(c.snippet || "").replace(/\s+/g, " ").trim()}
-`;
-      }
-    }
-    return `${block}
-`;
-  } catch (e) {
-    log3(`memory recall failed: ${String(e?.message || e)}`);
-    return "";
-  }
-}
-async function buildPlanningPreamble(apiUrl, task) {
+async function buildPlanningPreamble(apiUrl, task, _wsId) {
   const depth = typeof task.planning_depth === "number" ? task.planning_depth : 0;
   if (depth >= PLANNING_DEPTH_LIMIT) {
     return `# Planning (sub-task context)
@@ -32995,20 +32994,25 @@ You are acting on a sub-issue spawned by another agent. You MAY emit a \`multi-p
 
 `;
   }
-  let projectId = "";
+  let projectId = task.project_id || "";
   let agentsBlock = "";
   try {
-    const issueRes = await apiClient.get(`${apiUrl}/api/issues/${task.issue_id}`);
-    projectId = issueRes.data?.project_id || "";
-    const agentRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
-    const workspaceId = agentRes.data?.workspace_id;
-    if (workspaceId) {
-      const ag = await apiClient.get(`${apiUrl}/api/agents?workspace_id=${workspaceId}`);
-      const list = Array.isArray(ag.data) ? ag.data : [];
-      const others = list.filter((a) => a.id !== task.agent_id);
-      if (others.length) {
-        agentsBlock = others.map((a) => `- \`${a.id}\` (${a.name}${a.type ? `, ${a.type}` : ""})`).join(`
+    if (!projectId && task.tenant_workspace_id) {
+      const issueRes = await apiClient.get(`${apiUrl}/api/workspaces/${task.tenant_workspace_id}/issues/${task.issue_id}`);
+      projectId = issueRes.data?.project_id || "";
+    }
+    const tenantWsIdLocal = task.tenant_workspace_id;
+    if (tenantWsIdLocal) {
+      const agentRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsIdLocal}/agents/${task.agent_id}`);
+      const workspaceId = agentRes.data?.workspace_id;
+      if (workspaceId) {
+        const ag = await apiClient.get(`${apiUrl}/api/workspaces/${workspaceId}/agents`);
+        const list = Array.isArray(ag.data) ? ag.data : [];
+        const others = list.filter((a) => a.id !== task.agent_id);
+        if (others.length) {
+          agentsBlock = others.map((a) => `- \`${a.id}\` (${a.name}${a.type ? `, ${a.type}` : ""})`).join(`
 `);
+        }
       }
     }
   } catch {}
@@ -33022,10 +33026,18 @@ Issue actions:
 {"actions":[
   {"type":"create","title":"...","description":"... (required, non-empty: relays full task context to the assignee)","assignee_type":"agent","assignee_id":"<agent id>"},
   {"type":"update","id":"<issue id>","status":"done"},
-  {"type":"delegate","id":"<issue id>","assignee_id":"<agent id>"}
+  {"type":"delegate","id":"<issue id>","assignee_id":"<agent id>"},
+  {"type":"issue.delete","id":"<issue id or key>"},
+  {"type":"issue.delete_where","status":"todo"},
+  {"type":"issue.list","status":"todo","assignee_id":"<agent id>","limit":20},
+  {"type":"issue.search","query":"flaky tests","limit":10}
 ]}
 \`\`\`
 
+Prefer the bulk \`issue.delete_where\` over \`issue.list\` + per-issue \`issue.delete\` when the user's intent matches a filter ("delete all todo issues", "remove anything assigned to agent X"). It runs in one turn instead of two.
+
+Read actions (\`issue.list\`, \`issue.search\`) return the matched rows in the action summary comment. Use them to look up issue ids/keys before \`update\` / \`delegate\` / \`issue.delete\` ONLY when the per-row filter isn't enough (e.g. you need to inspect titles before acting).
+
 Agent + skill self-service (use sparingly — only when you genuinely need a new capability that isn't covered by an existing agent or skill):
 
 \`\`\`multi-plan
@@ -33045,7 +33057,9 @@ Rules:
 - \`agent.create\` is auto-approved on auto-autonomy issues. Caps + rate limits prevent abuse.
 - \`skill.create\` ALWAYS waits for human review (skill bodies become future system prompts).
 - \`allowed_tools\` on a new agent must be a subset of your own tools.
-- \`create\` / \`update\` / \`delegate\` target issues only in the current project (${projectId || "this project"}).
+- \`create\` / \`update\` / \`delegate\` / \`issue.delete\` target issues only in the current project (${projectId || "this project"}).
+- \`issue.list\` / \`issue.search\` / \`issue.delete_where\` default to the current project; pass \`project_id\` only when crossing into another project in the same workspace.
+- \`issue.delete_where\` requires \`status\` or \`assignee_id\` (no unfiltered project-wipe). Cap 50 per call.
 
 ${agentsBlock ? `Available agents you can delegate to:
 ${agentsBlock}
@@ -33082,7 +33096,7 @@ async function executePlanActions(apiUrl, parentTask, actions, ctx) {
     const blocked3 = actions.filter((a) => a.type !== "update").length;
     actions = actions.filter((a) => a.type === "update");
     if (blocked3)
-      lines.push(`- ⚠ ${blocked3} non-update action(s) blocked (planning depth limit ${PLANNING_DEPTH_LIMIT})`);
+      lines.push(`- [warn] ${blocked3} non-update action(s) blocked (planning depth limit ${PLANNING_DEPTH_LIMIT})`);
   }
   const SUBCAPS = { "agent.create": 2, "skill.create": 3, "skill.attach": 5, "skill.detach": 5, "agent.update": 5, "session.create": 3 };
   const counts = {};
@@ -33092,21 +33106,26 @@ async function executePlanActions(apiUrl, parentTask, actions, ctx) {
       return true;
     counts[a.type] = (counts[a.type] || 0) + 1;
     if (counts[a.type] > cap) {
-      lines.push(`- ⚠ ${a.type} sub-cap ${cap} hit, dropping extra`);
+      lines.push(`- [warn] ${a.type} sub-cap ${cap} hit, dropping extra`);
       return false;
     }
     return true;
   });
   const parentId = parentTask.issue_id;
-  const parentProjectId = await (async () => {
+  const parentWsId = parentTask.tenant_workspace_id ?? null;
+  const parentProjectId = parentTask.project_id ?? await (async () => {
+    if (!parentWsId)
+      return null;
     try {
-      const r = await apiClient.get(`${apiUrl}/api/issues/${parentId}`);
+      const r = await apiClient.get(`${apiUrl}/api/workspaces/${parentWsId}/issues/${parentId}`);
       return r.data?.project_id;
     } catch {
       return null;
     }
   })();
   const headers = { "x-agent-id": parentTask.agent_id, "x-origin-issue-id": parentTask.issue_id };
+  const mutateUrl = parentWsId ? `${apiUrl}/api/workspaces/${parentWsId}/agent/issues/mutate` : "";
+  const queryUrl = parentWsId ? `${apiUrl}/api/workspaces/${parentWsId}/agent/issues/query` : "";
   if (typeof ctx.refreshLocalAgents === "function") {
     try {
       await ctx.refreshLocalAgents();
@@ -33125,83 +33144,172 @@ async function executePlanActions(apiUrl, parentTask, actions, ctx) {
           assignee_id: a.assignee_id,
           parent_id: a.parent_id || parentId
         };
-        const res = await apiClient.post(`${apiUrl}/api/issues/agent/mutate`, body, { headers });
+        const res = await apiClient.post(mutateUrl, body, { headers });
         if (!res.success) {
-          lines.push(`- ❌ create "${a.title}": ${res.error || res.status}`);
+          lines.push(`- [err] create "${a.title}": ${res.error || res.status}`);
           continue;
         }
         const created = res.data;
-        lines.push(`- ✓ created **${created.key}** — ${created.title}${created.assignee_id ? ` → @${created.assignee_id}` : ""} (autonomy=${created.autonomy_level || "auto"})`);
+        lines.push(`- [ok] created **${created.key}** - ${created.title}${created.assignee_id ? ` -> @${created.assignee_id}` : ""} (autonomy=${created.autonomy_level || "auto"})`);
       } else if (a.type === "update") {
-        const res = await apiClient.post(`${apiUrl}/api/issues/agent/mutate`, { action: "update", ...a }, { headers });
+        const res = await apiClient.post(mutateUrl, { action: "update", ...a }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ update ${a.id}: ${res.error || res.status}`);
+          lines.push(`- [err] update ${a.id}: ${res.error || res.status}`);
           continue;
         }
-        lines.push(`- ✓ updated ${res.data.key}`);
+        lines.push(`- [ok] updated ${res.data.key}`);
         if ((a.status === "done" || a.status === "cancelled") && parentTask.working_dir && existsSync9(parentTask.working_dir)) {
           const targetKey = res.data?.key;
           if (targetKey)
             await gcWorktreeAfterTerminal(parentTask.working_dir, targetKey);
         }
       } else if (a.type === "delegate") {
-        const res = await apiClient.post(`${apiUrl}/api/issues/agent/mutate`, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "todo" }, { headers });
+        const res = await apiClient.post(mutateUrl, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "todo" }, { headers });
+        if (!res.success) {
+          lines.push(`- [err] delegate ${a.id}: ${res.error || res.status}`);
+          continue;
+        }
+        lines.push(`- [ok] delegated ${res.data.key} -> ${a.assignee_id}`);
+      } else if (a.type === "issue.delete") {
+        const res = await apiClient.post(mutateUrl, { action: "delete", id: a.id }, { headers });
+        if (!res.success) {
+          lines.push(`- [err] issue.delete ${a.id}: ${res.error || res.status}`);
+          continue;
+        }
+        lines.push(`- [ok] deleted ${res.data?.key || a.id}`);
+      } else if (a.type === "issue.delete_where") {
+        const res = await apiClient.post(mutateUrl, {
+          action: "delete_where",
+          project_id: a.project_id || parentProjectId,
+          status: a.status,
+          assignee_id: a.assignee_id,
+          limit: a.limit ?? 50
+        }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ delegate ${a.id}: ${res.error || res.status}`);
+          lines.push(`- [err] issue.delete_where: ${res.error || res.status}`);
+          continue;
+        }
+        const rows = Array.isArray(res.data?.deleted) ? res.data.deleted : [];
+        const count = res.data?.count ?? rows.length;
+        if (!count) {
+          lines.push(`- [ok] issue.delete_where: 0 matches`);
+          continue;
+        }
+        lines.push(`- [ok] issue.delete_where: deleted ${count} issue(s)`);
+        for (const r of rows)
+          lines.push(`  - ${r.key}`);
+      } else if (a.type === "issue.list") {
+        const res = await apiClient.post(queryUrl, {
+          kind: "list",
+          project_id: a.project_id || parentProjectId,
+          status: a.status,
+          assignee_id: a.assignee_id,
+          limit: a.limit ?? 20
+        }, { headers });
+        if (!res.success) {
+          lines.push(`- [err] issue.list: ${res.error || res.status}`);
+          continue;
+        }
+        const rows = Array.isArray(res.data) ? res.data : Array.isArray(res.data?.results) ? res.data.results : [];
+        if (!rows.length) {
+          lines.push(`- [ok] issue.list: 0 issues`);
+          continue;
+        }
+        lines.push(`- [ok] issue.list: ${rows.length} issue(s)`);
+        for (const r of rows) {
+          lines.push(`  - **${r.key}** [${r.status}] ${r.title}${r.assignee_id ? ` (@${r.assignee_id})` : ""}`);
+        }
+      } else if (a.type === "issue.search") {
+        const res = await apiClient.post(queryUrl, {
+          kind: "search",
+          project_id: a.project_id || parentProjectId,
+          query: a.query,
+          limit: a.limit ?? 10
+        }, { headers });
+        if (!res.success) {
+          lines.push(`- [err] issue.search "${a.query}": ${res.error || res.status}`);
+          continue;
+        }
+        const rows = Array.isArray(res.data) ? res.data : Array.isArray(res.data?.results) ? res.data.results : [];
+        if (!rows.length) {
+          lines.push(`- [ok] issue.search "${a.query}": 0 hits`);
           continue;
         }
-        lines.push(`- ✓ delegated ${res.data.key} → ${a.assignee_id}`);
+        lines.push(`- [ok] issue.search "${a.query}": ${rows.length} hit(s)`);
+        for (const r of rows) {
+          lines.push(`  - **${r.key}** [${r.status}] ${r.title}`);
+        }
       } else if (a.type === "agent.create") {
-        const res = await apiClient.post(`${apiUrl}/api/agent_ops/agents/mutate`, { action: "create", name: a.name, type: a.agent_type, prompt: a.prompt, skill_ids: a.skill_ids, allowed_tools: a.allowed_tools }, { headers });
+        if (!parentWsId) {
+          lines.push(`- [err] agent.create "${a.name}": no tenant workspace id`);
+          continue;
+        }
+        const res = await apiClient.post(`${apiUrl}/api/workspaces/${parentWsId}/agent_ops/agents/mutate`, { action: "create", name: a.name, type: a.agent_type, prompt: a.prompt, skill_ids: a.skill_ids, allowed_tools: a.allowed_tools }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ agent.create "${a.name}": ${res.error || res.status}`);
+          lines.push(`- [err] agent.create "${a.name}": ${res.error || res.status}`);
           continue;
         }
-        lines.push(`- ✓ agent.create "${a.name}" → ${res.data?.agent_id}`);
+        lines.push(`- [ok] agent.create "${a.name}" -> ${res.data?.agent_id}`);
       } else if (a.type === "agent.update") {
-        const res = await apiClient.post(`${apiUrl}/api/agent_ops/agents/mutate`, { action: "update", ...a }, { headers });
+        if (!parentWsId) {
+          lines.push(`- [err] agent.update ${a.id}: no tenant workspace id`);
+          continue;
+        }
+        const res = await apiClient.post(`${apiUrl}/api/workspaces/${parentWsId}/agent_ops/agents/mutate`, { action: "update", ...a }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ agent.update ${a.id}: ${res.error || res.status}`);
+          lines.push(`- [err] agent.update ${a.id}: ${res.error || res.status}`);
           continue;
         }
         if (res.data?.queued)
-          lines.push(`- ⏳ agent.update ${a.id} queued`);
+          lines.push(`- [pending] agent.update ${a.id} queued`);
         else
-          lines.push(`- ✓ agent.update ${a.id}`);
+          lines.push(`- [ok] agent.update ${a.id}`);
       } else if (a.type === "skill.create") {
-        const res = await apiClient.post(`${apiUrl}/api/agent_ops/skills/mutate`, { action: "create", name: a.name, version: a.version, description: a.description, body: a.body, files: a.files }, { headers });
+        if (!parentWsId) {
+          lines.push(`- [err] skill.create "${a.name}": no tenant workspace id`);
+          continue;
+        }
+        const res = await apiClient.post(`${apiUrl}/api/workspaces/${parentWsId}/agent_ops/skills/mutate`, { action: "create", name: a.name, version: a.version, description: a.description, body: a.body, files: a.files }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ skill.create "${a.name}": ${res.error || res.status}`);
+          lines.push(`- [err] skill.create "${a.name}": ${res.error || res.status}`);
           continue;
         }
-        lines.push(`- ⏳ skill.create "${a.name}" queued for human review (op ${res.data?.pending_op_id})`);
+        lines.push(`- [pending] skill.create "${a.name}" queued for human review (op ${res.data?.pending_op_id})`);
       } else if (a.type === "session.create") {
-        const res = await apiClient.post(`${apiUrl}/api/sessions`, { workspace_id: a.workspace_id, agent_id: a.agent_id, role: a.role, device_id: a.device_id }, { headers });
+        if (!parentWsId) {
+          lines.push(`- [err] session.create role=${a.role}: no tenant workspace id`);
+          continue;
+        }
+        const res = await apiClient.post(`${apiUrl}/api/workspaces/${parentWsId}/sessions`, { workspace_id: a.workspace_id, agent_id: a.agent_id, role: a.role, device_id: a.device_id }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ session.create role=${a.role}: ${res.error || res.status}`);
+          lines.push(`- [err] session.create role=${a.role}: ${res.error || res.status}`);
           continue;
         }
         const sess = res.data?.session;
         const reused = res.data?.reused;
-        lines.push(`- ${reused ? "↺" : "✓"} session.${reused ? "reuse" : "create"} ${sess?.id?.slice(0, 8) || "?"} (role=${a.role})`);
+        lines.push(`- [${reused ? "reuse" : "ok"}] session.${reused ? "reuse" : "create"} ${sess?.id?.slice(0, 8) || "?"} (role=${a.role})`);
       } else if (a.type === "skill.attach" || a.type === "skill.detach") {
         const action = a.type === "skill.attach" ? "attach_skill" : "detach_skill";
-        const res = await apiClient.post(`${apiUrl}/api/agent_ops/agents/mutate`, { action, agent_id: a.agent_id, skill_id: a.skill_id }, { headers });
+        if (!parentWsId) {
+          lines.push(`- [err] ${a.type}: no tenant workspace id`);
+          continue;
+        }
+        const res = await apiClient.post(`${apiUrl}/api/workspaces/${parentWsId}/agent_ops/agents/mutate`, { action, agent_id: a.agent_id, skill_id: a.skill_id }, { headers });
         if (!res.success) {
-          lines.push(`- ❌ ${a.type} ${a.skill_id}→${a.agent_id}: ${res.error || res.status}`);
+          lines.push(`- [err] ${a.type} ${a.skill_id}->${a.agent_id}: ${res.error || res.status}`);
           continue;
         }
         if (res.data?.queued)
-          lines.push(`- ⏳ ${a.type} queued`);
+          lines.push(`- [pending] ${a.type} queued`);
         else
-          lines.push(`- ✓ ${a.type} ${a.skill_id} ↔ ${a.agent_id}`);
+          lines.push(`- [ok] ${a.type} ${a.skill_id} <-> ${a.agent_id}`);
       }
     } catch (e) {
-      lines.push(`- ❌ ${a.type} failed: ${String(e)}`);
+      lines.push(`- [err] ${a.type} failed: ${String(e)}`);
     }
   }
   if (truncated)
-    lines.push(`- ⚠ action list truncated at ${PLAN_ACTION_LIMIT}`);
+    lines.push(`- [warn] action list truncated at ${PLAN_ACTION_LIMIT}`);
   if (!lines.length)
     return "";
   return `**Planning actions**
@@ -33289,9 +33397,10 @@ async function postStream(_apiUrl, issueId, event_type, payload) {
     } catch {}
   }
 }
-async function downloadCommentAttachments(apiUrl, commentId, destDir) {
+async function downloadCommentAttachments(apiUrl, wsId, projectId, issueId, commentId, destDir) {
+  const issueBase = `${apiUrl}/api/workspaces/${wsId}/projects/${projectId}/issues/${issueId}`;
   try {
-    const list = await apiClient.get(`${apiUrl}/api/attachments/comments/${commentId}`);
+    const list = await apiClient.get(`${issueBase}/comments/${commentId}/attachments`);
     const items = list.data?.results || list.data || [];
     if (!Array.isArray(items) || items.length === 0)
       return [];
@@ -33299,7 +33408,7 @@ async function downloadCommentAttachments(apiUrl, commentId, destDir) {
     const token = authTokenHeader();
     const out = [];
     for (const it of items) {
-      const res = await fetch(`${apiUrl}/api/attachments/${it.id}`, { headers: token ? { Authorization: token } : {} });
+      const res = await fetch(`${issueBase}/attachments/${it.id}`, { headers: token ? { Authorization: token } : {} });
       if (!res.ok)
         continue;
       const buf = new Uint8Array(await res.arrayBuffer());
@@ -33317,7 +33426,7 @@ function authTokenHeader() {
   const cfg = loadConfig();
   return cfg.token ? `Bearer ${cfg.token}` : null;
 }
-async function uploadOutputDir(apiUrl, commentId, dir, issueId) {
+async function uploadOutputDir(apiUrl, wsId, projectId, issueId, commentId, dir) {
   if (!existsSync9(dir))
     return 0;
   const files = [];
@@ -33339,6 +33448,7 @@ async function uploadOutputDir(apiUrl, commentId, dir, issueId) {
   if (!files.length)
     return 0;
   const token = authTokenHeader();
+  const issueBase = `${apiUrl}/api/workspaces/${wsId}/projects/${projectId}/issues/${issueId}`;
   let uploaded = 0;
   for (const f of files) {
     try {
@@ -33349,9 +33459,7 @@ async function uploadOutputDir(apiUrl, commentId, dir, issueId) {
       const headers = {};
       if (token)
         headers.Authorization = token;
-      if (issueId)
-        headers["x-issue-id"] = issueId;
-      const res = await fetch(`${apiUrl}/api/attachments/comments/${commentId}`, {
+      const res = await fetch(`${issueBase}/comments/${commentId}/attachments`, {
         method: "POST",
         body: form,
         headers
@@ -33606,6 +33714,14 @@ function sleep6(ms) {
 function openTasksDb() {
   ensureDirs2();
   const db2 = new Database3(TASKS_DB_PATH4);
+  const existing = db2.query("PRAGMA table_info(tasks)").all();
+  if (existing.length) {
+    const have = new Set(existing.map((c) => c.name));
+    const wanted = ["id", "status", "payload", "attempts", "created_at", "started_at", "finished_at", "error", "agent_id", "issue_id"];
+    const compatible = wanted.every((col) => have.has(col));
+    if (!compatible)
+      db2.exec("DROP TABLE tasks");
+  }
   db2.exec(`
     CREATE TABLE IF NOT EXISTS tasks (
       id TEXT PRIMARY KEY,
@@ -33615,23 +33731,15 @@ function openTasksDb() {
       created_at INTEGER NOT NULL DEFAULT (unixepoch()),
       started_at INTEGER,
       finished_at INTEGER,
-      error TEXT
+      error TEXT,
+      agent_id TEXT,
+      issue_id TEXT
     );
     CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status);
-  `);
-  const cols = db2.query("PRAGMA table_info(tasks)").all();
-  const have = new Set(cols.map((c) => c.name));
-  if (!have.has("agent_id"))
-    db2.exec("ALTER TABLE tasks ADD COLUMN agent_id TEXT");
-  if (!have.has("issue_id"))
-    db2.exec("ALTER TABLE tasks ADD COLUMN issue_id TEXT");
-  db2.exec(`
     CREATE INDEX IF NOT EXISTS idx_tasks_agent ON tasks(agent_id, status);
     CREATE INDEX IF NOT EXISTS idx_tasks_issue ON tasks(issue_id);
   `);
   db2.run("UPDATE tasks SET status = 'queued' WHERE status = 'pending'");
-  db2.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)");
-  db2.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 db2;
 }
 async function pickFreePort() {
@@ -33753,16 +33861,20 @@ async function probeTunnel(url2) {
     return false;
   }
 }
-async function announceTunnel(apiUrl, deviceId, tunnelUrl) {
+async function announceTunnel(apiUrl, wsId, deviceId, tunnelUrl) {
+  if (!wsId) {
+    log3(`announce-tunnel skipped: no workspace id`);
+    return;
+  }
   try {
-    await apiClient.post(`${apiUrl}/api/devices/${deviceId}/announce-tunnel`, { tunnel_url: tunnelUrl });
+    await apiClient.post(`${apiUrl}/api/workspaces/${wsId}/devices/${deviceId}/announce-tunnel`, { tunnel_url: tunnelUrl });
   } catch (e) {
     log3(`announce-tunnel failed: ${String(e?.message ?? e)}`);
   }
 }
-async function ackDispatch(apiUrl, dispatchId, secret) {
+async function ackDispatch(apiUrl, wsId, dispatchId, secret) {
   try {
-    await fetch(`${apiUrl}/api/issues/dispatches/${dispatchId}/ack`, {
+    await fetch(`${apiUrl}/api/workspaces/${wsId}/dispatches/${dispatchId}/ack`, {
       method: "POST",
       headers: { authorization: `Bearer ${secret}` }
     });
@@ -33770,12 +33882,12 @@ async function ackDispatch(apiUrl, dispatchId, secret) {
     log3(`ack dispatch ${dispatchId} failed: ${String(e)}`);
   }
 }
-async function drainOfflineDispatches(apiUrl, deviceId, secret, db2, onEnqueued, isAlive) {
+async function drainOfflineDispatches(apiUrl, deviceId, wsId, secret, db2, onEnqueued, isAlive) {
   if (!isAlive())
     return;
   let list;
   try {
-    list = await apiClient.get(`${apiUrl}/api/devices/${deviceId}/dispatches/pending`);
+    list = await apiClient.get(`${apiUrl}/api/workspaces/${wsId}/devices/${deviceId}/dispatches/pending`);
   } catch (e) {
     log3(`drain list failed: ${String(e)}`);
     return;
@@ -33790,7 +33902,7 @@ async function drainOfflineDispatches(apiUrl, deviceId, secret, db2, onEnqueued,
       return;
     }
     try {
-      const res = await fetch(`${apiUrl}/api/issues/dispatches/${r.id}/claim`, {
+      const res = await fetch(`${apiUrl}/api/workspaces/${wsId}/dispatches/${r.id}/claim`, {
         method: "POST",
         headers: { authorization: `Bearer ${secret}` }
       });
@@ -33803,7 +33915,7 @@ async function drainOfflineDispatches(apiUrl, deviceId, secret, db2, onEnqueued,
       db2.run("INSERT INTO tasks (id, status, payload, agent_id, issue_id) VALUES (?, 'queued', ?, ?, ?)", [taskId, JSON.stringify(task), task.agent_id ?? null, task.issue_id ?? null]);
       if (task.issue_id)
         postStream(apiUrl, task.issue_id, "queued", { drained: true });
-      ackDispatch(apiUrl, r.id, secret);
+      ackDispatch(apiUrl, wsId, r.id, secret);
     } catch (e) {
       log3(`drain ${r.id} failed: ${String(e)}`);
     }
@@ -33901,8 +34013,8 @@ async function daemonMain({ cfg, apiUrl }) {
             const pos = db2.query("SELECT COUNT(*) AS c FROM tasks WHERE status = 'queued' AND created_at <= (SELECT created_at FROM tasks WHERE id = ?)").get(taskId)?.c ?? 1;
             if (t.issue_id)
               postStream(apiUrl, t.issue_id, "queued", { queue_position: pos });
-            if (t.dispatch_id)
-              ackDispatch(apiUrl, t.dispatch_id, cfg.dispatchSecret);
+            if (t.dispatch_id && cfg.workspaceId)
+              ackDispatch(apiUrl, cfg.workspaceId, t.dispatch_id, cfg.dispatchSecret);
             queueMicrotask(() => schedule2());
             return Response.json({ accepted: true, task_id: taskId }, { status: 202 });
           } catch (e) {
@@ -33967,11 +34079,13 @@ async function daemonMain({ cfg, apiUrl }) {
     log3(`☁️  Tunnel up: ${tunnel.url}`);
   }
   let alive = true;
-  await announceTunnel(apiUrl, cfg.deviceId, tunnel?.url ?? null);
+  await announceTunnel(apiUrl, cfg.workspaceId, cfg.deviceId, tunnel?.url ?? null);
   try {
-    await materializeBundle(apiUrl, cfg.deviceId, log3);
+    await materializeBundle(apiUrl, cfg.workspaceId, cfg.deviceId, log3);
   } catch {}
-  drainOfflineDispatches(apiUrl, cfg.deviceId, cfg.dispatchSecret, db2, () => schedule2(), () => alive);
+  if (cfg.workspaceId) {
+    drainOfflineDispatches(apiUrl, cfg.deviceId, cfg.workspaceId, cfg.dispatchSecret, db2, () => schedule2(), () => alive);
+  }
   const shutdown = async (reason) => {
     if (!alive)
       return;
@@ -33984,7 +34098,7 @@ async function daemonMain({ cfg, apiUrl }) {
       tunnel?.child?.kill();
     } catch {}
     try {
-      await announceTunnel(apiUrl, cfg.deviceId, null);
+      await announceTunnel(apiUrl, cfg.workspaceId, cfg.deviceId, null);
     } catch {}
     if (existsSync10(PID_PATH3))
       unlinkSync5(PID_PATH3);
@@ -34016,8 +34130,10 @@ async function daemonMain({ cfg, apiUrl }) {
         if (next) {
           tunnel = next;
           log3(`☁️  Tunnel up: ${tunnel.url}`);
-          await announceTunnel(apiUrl, cfg.deviceId, tunnel.url);
-          drainOfflineDispatches(apiUrl, cfg.deviceId, cfg.dispatchSecret, db2, () => schedule2(), () => alive);
+          await announceTunnel(apiUrl, cfg.workspaceId, cfg.deviceId, tunnel.url);
+          if (cfg.workspaceId) {
+            drainOfflineDispatches(apiUrl, cfg.deviceId, cfg.workspaceId, cfg.dispatchSecret, db2, () => schedule2(), () => alive);
+          }
           return;
         }
         const wait = Math.min(30000, 2000 * attempt);
@@ -34168,10 +34284,20 @@ var connectCmd = exports_Effect.fn("connectCmd")(function* () {
     process.on("exit", () => releasePidLock(PID_PATH));
   }
   yield* logger.log(`connect: device=${cfg.deviceId}`);
-  const stopFlusher = startOutboxFlusher(cfg.apiUrl);
+  if (!cfg.workspaceId) {
+    return yield* exports_Effect.fail(new UsageError({ message: "config.workspaceId missing — re-pair via 'multi-agent setup'." }));
+  }
+  const stopFlusher = startOutboxFlusher(cfg.apiUrl, cfg.workspaceId);
   yield* exports_Effect.tryPromise({
     try: () => daemonMain({ cfg, apiUrl: cfg.apiUrl }),
-    catch: (cause3) => new DaemonError({ message: "daemon failed", cause: cause3 })
+    catch: (cause3) => {
+      try {
+        const err = cause3;
+        console.error(`[daemon] crash: ${err?.message ?? String(err)}
+${err?.stack ?? ""}`);
+      } catch {}
+      return new DaemonError({ message: "daemon failed", cause: cause3 });
+    }
   }).pipe(exports_Effect.ensuring(exports_Effect.sync(() => stopFlusher())));
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.25.0",
+  "version": "0.32.0",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"
@@ -21,6 +21,6 @@
     "undici": "^7.0.0"
   },
   "devDependencies": {
-    "@multi/lib": "workspace:*"
+    "@multi/lib": "0.1.0"
   }
 }