@shipers-dev/multi 0.44.1 → 0.47.0

package/dist/index.js

@@ -34065,7 +34065,8 @@ var init_chat = __esm(() => {
     tool_call_id: exports_external.string().optional(),
     content: exports_external.string().optional(),
     plan_entries: exports_external.array(ChatPlanEntrySchema).optional(),
-    dispatched_at: exports_external.number().optional()
+    dispatched_at: exports_external.number().optional(),
+    delivered_to_acp_at: exports_external.number().optional()
   });
   CHAT_DOC = {
     MESSAGES_LIST: "messages",
@@ -35909,6 +35910,19 @@ function finalizeMessage(doc2, mapId) {
     return;
   map20.set("partial", false);
 }
+function setMessageField(doc2, msgId, key, value3) {
+  const list = doc2.getMovableList(CHAT_DOC.MESSAGES_LIST);
+  for (let i = 0;i < list.length; i++) {
+    const child = list.get(i);
+    if (!child || typeof child.get !== "function")
+      continue;
+    if (child.get("id") === msgId) {
+      child.set(key, value3);
+      return true;
+    }
+  }
+  return false;
+}
 function listMessages(doc2) {
   const list = doc2.getMovableList(CHAT_DOC.MESSAGES_LIST);
   return list.toJSON();
@@ -35942,6 +35956,7 @@ class ChatPeer {
   dirtySinceWrite = 0;
   seenIds = new Set;
   closed = false;
+  firstFrameSinceConnect = true;
   reconnectTimer = null;
   constructor(opts) {
     this.opts = opts;
@@ -36038,6 +36053,11 @@ class ChatPeer {
     patchMessage(this.doc, containerId, patch9);
     this.flush();
   }
+  markDelivered(msgId) {
+    if (setMessageField(this.doc, msgId, "delivered_to_acp_at", Math.floor(Date.now() / 1000))) {
+      this.flush();
+    }
+  }
   getDoc() {
     return this.doc;
   }
@@ -36086,7 +36106,11 @@ class ChatPeer {
       return;
     }
     ws.binaryType = "arraybuffer";
-    ws.addEventListener("open", () => this.opts.log(`[chat ${this.chatId}] ws open`));
+    ws.addEventListener("open", () => {
+      this.opts.log(`[chat ${this.chatId}] ws open`);
+      this.firstFrameSinceConnect = true;
+      this.sendJson({ type: "daemon_subscribed" });
+    });
     ws.addEventListener("message", (ev) => this.onFrame(ev.data));
     ws.addEventListener("close", () => {
       this.opts.log(`[chat ${this.chatId}] ws close`);
@@ -36117,6 +36141,17 @@ class ChatPeer {
       this.ws.send(frame);
     } catch {}
   }
+  sendJson(obj) {
+    if (!this.ws || this.ws.readyState !== 1)
+      return;
+    const body = new TextEncoder().encode(JSON.stringify(obj));
+    const frame = new Uint8Array(1 + body.byteLength);
+    frame[0] = FRAME_JSON;
+    frame.set(body, 1);
+    try {
+      this.ws.send(frame);
+    } catch {}
+  }
   onFrame(raw) {
     const buf = raw instanceof ArrayBuffer ? new Uint8Array(raw) : raw instanceof Uint8Array ? raw : null;
     if (!buf || buf.byteLength < 1)
@@ -36129,10 +36164,14 @@ class ChatPeer {
       } catch {
         return;
       }
+      const isFirstFrame = this.firstFrameSinceConnect;
+      this.firstFrameSinceConnect = false;
       for (const m of listMessages(this.doc)) {
         if (before2.has(m.id))
           continue;
         this.seenIds.add(m.id);
+        if (isFirstFrame)
+          continue;
         if (m.author?.kind === "user" && !m.partial && this.opts.onUserMessage) {
           const cb = this.opts.onUserMessage;
           Promise.resolve().then(() => cb(m, this)).catch((e) => this.opts.log(`[chat ${this.chatId}] onUserMessage error: ${e.message}`));
@@ -36602,11 +36641,7 @@ var init_chat_plan_actions = __esm(() => {
 });
 
 // src/_impl/chat-supervisor.ts
-var exports_chat_supervisor = {};
-__export(exports_chat_supervisor, {
-  runChatTurn: () => runChatTurn
-});
-async function runChatTurn(opts) {
+async function runChatTurnWithPeer(peer, opts) {
   const { apiUrl, authToken: authToken2, workspaceId, chatId, messageId, log: log4 } = opts;
   const headers = { authorization: `Bearer ${authToken2}` };
   const metaR = await fetch(`${apiUrl}/api/workspaces/${workspaceId}/chats/${chatId}`, { headers });
@@ -36615,25 +36650,12 @@ async function runChatTurn(opts) {
     return;
   }
   const chat2 = await metaR.json();
-  const peer = new ChatPeer({
-    apiUrl,
-    authToken: authToken2,
-    workspaceId,
-    chatId,
-    primaryAgentId: chat2.primary_agent_id,
-    log: log4
-  });
-  peer.start();
-  try {
-    const msg = await peer.awaitMessage(messageId, 7000);
-    if (!msg) {
-      log4(`[chat ${chatId}] message ${messageId} not visible after sync; aborting`);
-      return;
-    }
-    await processUserMessage(chat2, msg, peer, { apiUrl, authToken: authToken2, workspaceId, log: log4 });
-  } finally {
-    peer.close();
+  const msg = await peer.awaitMessage(messageId, 7000);
+  if (!msg) {
+    log4(`[chat ${chatId}] message ${messageId} not visible after sync; aborting`);
+    return;
   }
+  await processUserMessage(chat2, msg, peer, { apiUrl, authToken: authToken2, workspaceId, log: log4 });
 }
 async function fetchAgents(apiUrl, workspaceId, authToken2) {
   const headers = { authorization: `Bearer ${authToken2}` };
@@ -36703,6 +36725,7 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
   let buffered = "";
   let lastFlush = Date.now();
   let agentReplyText = "";
+  const fullReplyParts = [];
   const toolMsgByCallId = new Map;
   let planContainerId = null;
   const flushText = (force = false) => {
@@ -36771,92 +36794,99 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
     return "other";
   };
   const preamble = buildChatPreamble({ projectId: chat2.project_id, agents: allAgents });
-  await new Promise((resolve2) => {
-    handleChatTurn({
-      chatId: chat2.id,
-      prompt: userMsg.text,
-      preferredRuntime: runtime4,
-      cwd,
-      systemPreamble: preamble,
-      log: log4,
-      onChunk: (text) => {
-        ensureTextOpen();
-        buffered += text;
-        agentReplyText += text;
-        flushText();
-      },
-      onToolCall: (ev) => {
-        closeText();
-        const partial2 = ev.status !== "completed" && ev.status !== "failed";
-        const status3 = ev.status || "in_progress";
-        if (ev.id) {
-          const existing = toolMsgByCallId.get(ev.id);
-          if (existing) {
-            peer.patchMessage(existing, {
-              partial: partial2,
-              status: status3,
-              tool: ev.tool,
-              tool_kind: mapToolKind(ev.kind),
-              input: summarizeInput(ev.input)
-            });
-            return;
+  peer.markDelivered(userMsg.id);
+  const runOneTurn = async (prompt, sendPreamble) => {
+    agentReplyText = "";
+    await new Promise((resolve2) => {
+      handleChatTurn({
+        chatId: chat2.id,
+        prompt,
+        preferredRuntime: runtime4,
+        cwd,
+        systemPreamble: sendPreamble ? preamble : undefined,
+        log: log4,
+        onChunk: (text) => {
+          ensureTextOpen();
+          buffered += text;
+          agentReplyText += text;
+          flushText();
+        },
+        onToolCall: (ev) => {
+          closeText();
+          const partial2 = ev.status !== "completed" && ev.status !== "failed";
+          const status3 = ev.status || "in_progress";
+          if (ev.id) {
+            const existing = toolMsgByCallId.get(ev.id);
+            if (existing) {
+              peer.patchMessage(existing, {
+                partial: partial2,
+                status: status3,
+                tool: ev.tool,
+                tool_kind: mapToolKind(ev.kind),
+                input: summarizeInput(ev.input)
+              });
+              return;
+            }
           }
+          const id3 = `tc_${ev.id || Math.random().toString(36).slice(2)}`;
+          const containerId = peer.appendStructured({
+            id: id3,
+            author: { kind: "agent", id: agentAuthorId, name: agentDisplayName },
+            kind: "tool_call",
+            text: "",
+            ts: Math.floor(Date.now() / 1000),
+            mentions: [],
+            attachments: [],
+            partial: partial2,
+            tool: ev.tool,
+            tool_kind: mapToolKind(ev.kind),
+            status: status3,
+            input: summarizeInput(ev.input),
+            tool_call_id: ev.id
+          });
+          if (ev.id)
+            toolMsgByCallId.set(ev.id, containerId);
+        },
+        onToolResult: (ev) => {
+          closeText();
+          const summary5 = summarizeContent(ev.content);
+          peer.appendStructured({
+            id: `tr_${ev.tool_call_id || Math.random().toString(36).slice(2)}_${Date.now()}`,
+            author: { kind: "agent", id: agentAuthorId, name: agentDisplayName },
+            kind: "tool_result",
+            text: `${summary5.lines} lines · ${summary5.bytes} bytes`,
+            ts: Math.floor(Date.now() / 1000),
+            mentions: [],
+            attachments: [],
+            partial: false,
+            tool_call_id: ev.tool_call_id,
+            content: summary5.content
+          });
+          const cid = ev.tool_call_id ? toolMsgByCallId.get(ev.tool_call_id) : undefined;
+          if (cid)
+            peer.patchMessage(cid, { partial: false, status: "completed" });
+        },
+        onPlanUpdate: (entries2) => {
+          closeText();
+          planContainerId = peer.upsertPlan(agentAuthorId, agentDisplayName, entries2, planContainerId);
+        },
+        onDone: (stopReason) => {
+          closeText();
+          for (const cid of toolMsgByCallId.values()) {
+            peer.patchMessage(cid, { partial: false, status: "completed" });
+          }
+          log4(`[chat ${chat2.id}] done: ${stopReason}`);
+          resolve2();
         }
-        const id3 = `tc_${ev.id || Math.random().toString(36).slice(2)}`;
-        const containerId = peer.appendStructured({
-          id: id3,
-          author: { kind: "agent", id: agentAuthorId, name: agentDisplayName },
-          kind: "tool_call",
-          text: "",
-          ts: Math.floor(Date.now() / 1000),
-          mentions: [],
-          attachments: [],
-          partial: partial2,
-          tool: ev.tool,
-          tool_kind: mapToolKind(ev.kind),
-          status: status3,
-          input: summarizeInput(ev.input),
-          tool_call_id: ev.id
-        });
-        if (ev.id)
-          toolMsgByCallId.set(ev.id, containerId);
-      },
-      onToolResult: (ev) => {
-        closeText();
-        const summary5 = summarizeContent(ev.content);
-        peer.appendStructured({
-          id: `tr_${ev.tool_call_id || Math.random().toString(36).slice(2)}_${Date.now()}`,
-          author: { kind: "agent", id: agentAuthorId, name: agentDisplayName },
-          kind: "tool_result",
-          text: `${summary5.lines} lines · ${summary5.bytes} bytes`,
-          ts: Math.floor(Date.now() / 1000),
-          mentions: [],
-          attachments: [],
-          partial: false,
-          tool_call_id: ev.tool_call_id,
-          content: summary5.content
-        });
-        const cid = ev.tool_call_id ? toolMsgByCallId.get(ev.tool_call_id) : undefined;
-        if (cid)
-          peer.patchMessage(cid, { partial: false, status: "completed" });
-      },
-      onPlanUpdate: (entries2) => {
-        closeText();
-        planContainerId = peer.upsertPlan(agentAuthorId, agentDisplayName, entries2, planContainerId);
-      },
-      onDone: (stopReason) => {
-        closeText();
-        for (const cid of toolMsgByCallId.values()) {
-          peer.patchMessage(cid, { partial: false, status: "completed" });
-        }
-        log4(`[chat ${chat2.id}] done: ${stopReason}`);
-        resolve2();
-      }
+      });
     });
-  });
-  try {
-    const { actions, errors: errors3 } = parsePlanBlocks(agentReplyText);
-    if (actions.length || errors3.length) {
+    fullReplyParts.push(agentReplyText);
+  };
+  const execAndPostPlan = async () => {
+    try {
+      const { actions, errors: errors3 } = parsePlanBlocks(agentReplyText);
+      if (!actions.length && !errors3.length)
+        return null;
       const res = await executeChatPlanActions(actions, errors3, {
         apiUrl,
         wsId: workspaceId,
@@ -36879,17 +36909,42 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
         });
       }
       log4(`[chat ${chat2.id}] plan exec: ${res.ok} ok, ${res.fail} fail, ${errors3.length} parse-err`);
+      return { ok: res.ok, fail: res.fail };
+    } catch (e) {
+      log4(`[chat ${chat2.id}] post-turn err: ${e.message}`);
+      return null;
     }
-    const ui = parseUiBlocks(agentReplyText);
+  };
+  await runOneTurn(userMsg.text, true);
+  const firstPlan = await execAndPostPlan();
+  if (firstPlan && firstPlan.ok > 0) {
+    const followupPrompt = `[multi system note — auto-injected, not from the user]
+
+` + `Your previous plan block was executed. Results:
+
+${fullReplyParts.length ? "(see system message in chat)" : ""}
+
+` + `If those results need a follow-up multi-plan action (e.g. commenting on a newly-created issue using its returned KEY, or chaining work that depends on freshly-created ids), append ONE more multi-plan block now. Otherwise reply with a short confirmation to the user. Do NOT repeat actions you already ran successfully.`;
+    await runOneTurn(followupPrompt, false);
+    await execAndPostPlan();
+  }
+  try {
+    const combined = fullReplyParts.join(`
+
+`);
+    const ui = parseUiBlocks(combined);
     if (ui.blocks.length)
       log4(`[chat ${chat2.id}] ui blocks: ${ui.blocks.length}`);
     if (ui.errors.length)
       log4(`[chat ${chat2.id}] ui parse err: ${ui.errors.length}`);
   } catch (e) {
-    log4(`[chat ${chat2.id}] post-turn err: ${e.message}`);
+    log4(`[chat ${chat2.id}] ui parse err: ${e.message}`);
   }
-  if (/^new chat$/i.test(chat2.title) && agentReplyText.trim()) {
-    autoTitle(chat2, userMsg.text, agentReplyText, ctx).catch((e) => log4(`[chat ${chat2.id}] auto-title failed: ${e.message}`));
+  const fullReply = fullReplyParts.join(`
+
+`);
+  if (/^new chat$/i.test(chat2.title) && fullReply.trim()) {
+    autoTitle(chat2, userMsg.text, fullReply, ctx).catch((e) => log4(`[chat ${chat2.id}] auto-title failed: ${e.message}`));
   }
 }
 async function autoTitle(chat2, userMsg, agentReply, ctx) {
@@ -36940,7 +36995,7 @@ ${args2.agents.slice(0, 30).map((a) => `- \`${a.id}\` (${a.name})`).join(`
 ` : "";
   return `# multi platform — tool surface
 
-You are running inside the multi platform. To create issues, agents, skills, or sessions, append ONE fenced \`multi-plan\` block at the end of your reply (JSON; either an array of actions, or {"actions":[...]}). The host parses it and executes immediately. Do NOT call \`gh\`, GitHub APIs, Linear, Jira, or any external tracker unless the user explicitly names that platform — multi is the default.
+You are running inside the multi platform. To create issues, agents, skills, or sessions, append ONE fenced \`multi-plan\` block at the end of your reply (JSON; either an array of actions, or {"actions":[...]}). The host parses it and executes immediately. Do NOT call \`gh\`, GitHub APIs, Linear, Jira, or any external tracker unless the user explicitly names that platform — multi is the default. In prose, refer to these as "issues" or by their KEY (e.g. \`ABC-12\`). Never call them "GitHub issues", "Linear issues", or "Jira tickets".
 
 ${projectLine}
 
@@ -36970,6 +37025,7 @@ Rules:
 - Max 10 actions per turn. Sub-caps: agent.create=2, skill.create=3, agent.update=5, skill.attach/detach=5, session.create=3, issue.comment=5.
 - Chat-initiated agent.create / agent.update / skill.attach are auto-approved (the user is reading this reply right now). skill.create still queues for human review.
 - Use \`issue.comment\` with \`@<agent name>\` mention to dispatch an agent on an existing issue. Plain comments without an @mention are recorded but do not trigger a run. Issues whose autonomy is \`manual\` will not dispatch.
+- To create an issue AND assign/dispatch it to an agent in the same turn, set \`assignee_type\` + \`assignee_id\` directly on the \`create\` action. Do NOT emit a separate \`delegate\` or \`issue.comment\` action referring to a brand-new issue in the same plan block — actions execute as a flat list and the new issue's id/key is not available to later actions in the same block. \`delegate\` and \`issue.comment\` are for issues that already exist before this turn.
 - \`allowed_tools\` on a new agent must be a subset of generally available tools.
 
 To draw an inline panel for the user, append a separate fenced \`multi-ui\` block. The host uploads it to a Cloudflare Worker (24h TTL), serves the rendered HTML at a public URL, and embeds it in a sandboxed iframe (\`allow-scripts allow-forms\`). No reactive runtime — write plain HTML with optional inline \`<script>\` for interactivity. \`window.data\` inside your script is the JSON you sent.
@@ -36996,6 +37052,131 @@ var init_chat_supervisor = __esm(() => {
   init_lib();
 });
 
+// src/_impl/chat-session-registry.ts
+var exports_chat_session_registry = {};
+__export(exports_chat_session_registry, {
+  chatSessionRegistry: () => chatSessionRegistry
+});
+function key(wsId, chatId) {
+  return `${wsId}:${chatId}`;
+}
+function clearIdle(s) {
+  if (s.idleTimer) {
+    clearTimeout(s.idleTimer);
+    s.idleTimer = null;
+  }
+}
+function scheduleIdle(k, s, log4) {
+  clearIdle(s);
+  s.idleTimer = setTimeout(() => {
+    if (s.inFlight) {
+      scheduleIdle(k, s, log4);
+      return;
+    }
+    log4(`[chat ${k}] idle evict`);
+    try {
+      s.peer.close();
+    } catch {}
+    sessions.delete(k);
+  }, idleTtlMs);
+}
+function ensureSession(wsId, chatId, ctx) {
+  const k = key(wsId, chatId);
+  const existing = sessions.get(k);
+  if (existing) {
+    clearIdle(existing);
+    return existing;
+  }
+  const peer = new ChatPeer({
+    apiUrl: ctx.apiUrl,
+    authToken: ctx.authToken,
+    workspaceId: wsId,
+    chatId,
+    primaryAgentId: null,
+    log: ctx.log,
+    onUserMessage: (msg) => {
+      chatSessionRegistry.ensureAndProcess(wsId, chatId, msg.id, ctx);
+    }
+  });
+  peer.start();
+  const now = Date.now();
+  const s = {
+    peer,
+    ctx,
+    chatId,
+    startedAt: now,
+    lastTurnAt: 0,
+    inFlight: null,
+    pending: [],
+    processed: new Set,
+    idleTimer: null
+  };
+  sessions.set(k, s);
+  ctx.log(`[chat ${k}] session opened`);
+  return s;
+}
+async function runTurn(s, k, messageId, ctx, chatId) {
+  try {
+    await runChatTurnWithPeer(s.peer, {
+      apiUrl: ctx.apiUrl,
+      authToken: ctx.authToken,
+      workspaceId: ctx.workspaceId,
+      deviceId: ctx.deviceId,
+      chatId,
+      messageId,
+      log: ctx.log
+    });
+  } catch (e) {
+    ctx.log(`[chat ${k}] turn ${messageId} error: ${e.message}`);
+  } finally {
+    s.lastTurnAt = Date.now();
+    const next4 = s.pending.shift();
+    if (next4) {
+      s.inFlight = runTurn(s, k, next4, ctx, chatId);
+    } else {
+      s.inFlight = null;
+      scheduleIdle(k, s, ctx.log);
+    }
+  }
+}
+var DEFAULT_IDLE_TTL_MS, sessions, idleTtlMs, chatSessionRegistry;
+var init_chat_session_registry = __esm(() => {
+  init_chat_peer();
+  init_chat_supervisor();
+  DEFAULT_IDLE_TTL_MS = 10 * 60 * 1000;
+  sessions = new Map;
+  idleTtlMs = DEFAULT_IDLE_TTL_MS;
+  chatSessionRegistry = {
+    setIdleTtl(ms) {
+      idleTtlMs = ms;
+    },
+    async ensureAndProcess(wsId, chatId, messageId, ctx) {
+      const s = ensureSession(wsId, chatId, ctx);
+      const k = key(wsId, chatId);
+      if (s.processed.has(messageId))
+        return;
+      s.processed.add(messageId);
+      if (s.inFlight) {
+        s.pending.push(messageId);
+        return;
+      }
+      s.inFlight = runTurn(s, k, messageId, ctx, chatId);
+    },
+    async closeAll() {
+      for (const [k, s] of sessions) {
+        clearIdle(s);
+        try {
+          s.peer.close();
+        } catch {}
+        sessions.delete(k);
+      }
+    },
+    size() {
+      return sessions.size;
+    }
+  };
+});
+
 // src/_impl/supervisor-tick.ts
 var exports_supervisor_tick = {};
 __export(exports_supervisor_tick, {
@@ -37615,7 +37796,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.44.1",
+  version: "0.47.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -39058,14 +39239,12 @@ var daemonProgram = ({ cfg, apiUrl }) => exports_Effect.gen(function* () {
             if (!cfg.workspaceId || !cfg.authToken || !cfg.deviceId) {
               return Response.json({ error: "daemon not configured" }, { status: 503 });
             }
-            const { runChatTurn: runChatTurn2 } = await Promise.resolve().then(() => (init_chat_supervisor(), exports_chat_supervisor));
-            runChatTurn2({
+            const { chatSessionRegistry: chatSessionRegistry2 } = await Promise.resolve().then(() => (init_chat_session_registry(), exports_chat_session_registry));
+            chatSessionRegistry2.ensureAndProcess(cfg.workspaceId, body.chat_id, body.message_id, {
               apiUrl,
               authToken: cfg.authToken,
               workspaceId: cfg.workspaceId,
               deviceId: cfg.deviceId,
-              chatId: body.chat_id,
-              messageId: body.message_id,
               log: log3
             }).catch((e) => log3(`[chat ${body.chat_id}] runChatTurn error: ${e.message}`));
             return Response.json({ accepted: true }, { status: 202 });
@@ -39253,6 +39432,12 @@ var daemonProgram = ({ cfg, apiUrl }) => exports_Effect.gen(function* () {
   try {
     tunnel?.child?.kill();
   } catch {}
+  yield* exports_Effect.promise(async () => {
+    try {
+      const { chatSessionRegistry: chatSessionRegistry2 } = await Promise.resolve().then(() => (init_chat_session_registry(), exports_chat_session_registry));
+      await chatSessionRegistry2.closeAll();
+    } catch {}
+  });
   yield* announceTunnel(apiUrl, cfg.workspaceId, cfg.deviceId, null).pipe(exports_Effect.catchAll(() => exports_Effect.void));
   const inFlight = [];
   for (const e of running3.values())

package/package.json

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