@shipers-dev/multi 0.44.0 → 0.46.0

package/dist/index.js

@@ -33352,12 +33352,24 @@ ${c.newText || ""}`.slice(0, 4000);
         break;
       }
       case "plan": {
-        const entries2 = (u.entries || []).map((e, i) => `${i + 1}. [${e.status || "pending"}] ${e.content}`).join(`
+        const rawEntries = u.entries || [];
+        if (!rawEntries.length)
+          break;
+        if (o.onPlanUpdate) {
+          const entries2 = rawEntries.map((e) => ({
+            status: String(e?.status ?? "pending"),
+            content: String(e?.content ?? "")
+          }));
+          await o.onPlanUpdate(entries2);
+        } else {
+          const text = rawEntries.map((e, i) => `${i + 1}. [${e.status || "pending"}] ${e.content}`).join(`
 `);
-        if (entries2)
           await o.onEvent({ event_type: "assistant_text", payload: { text: `**Plan**
 
-${entries2}` } });
+${text}
+
+` } });
+        }
         break;
       }
       case "current_mode_update": {
@@ -33521,7 +33533,7 @@ async function runAcpx(opts) {
       dlog(`[acpx stdout] ${line.slice(0, 500)}`);
       const events = parseAcpLine(line, (r) => {
         stopReason = r;
-      });
+      }, opts);
       for (const ev of events)
         await opts.onEvent(ev);
     }
@@ -33530,7 +33542,7 @@ async function runAcpx(opts) {
   if (buf.trim()) {
     const events = parseAcpLine(buf.trim(), (r) => {
       stopReason = r;
-    });
+    }, opts);
     for (const ev of events)
       await opts.onEvent(ev);
   }
@@ -33540,7 +33552,7 @@ async function runAcpx(opts) {
   }
   return { stopReason };
 }
-function parseAcpLine(line, setStop) {
+function parseAcpLine(line, setStop, opts) {
   let msg;
   try {
     msg = JSON.parse(line);
@@ -33549,7 +33561,7 @@ function parseAcpLine(line, setStop) {
   }
   const out = [];
   if (msg.method === "session/update" && msg.params?.update?.sessionUpdate) {
-    return handleSessionUpdate(msg.params);
+    return handleSessionUpdate(msg.params, opts);
   }
   if (msg.id && msg.result && typeof msg.result === "object" && "stopReason" in msg.result) {
     setStop(msg.result.stopReason);
@@ -33562,7 +33574,7 @@ function parseAcpLine(line, setStop) {
   }
   return out;
 }
-function handleSessionUpdate(params) {
+function handleSessionUpdate(params, opts) {
   const u = params.update || {};
   const kind = u.sessionUpdate;
   const out = [];
@@ -33602,12 +33614,24 @@ ${c.newText || ""}`.slice(0, 4000);
       break;
     }
     case "plan": {
-      const entries2 = (u.entries || []).map((e, i) => `${i + 1}. [${e.status || "pending"}] ${e.content}`).join(`
+      const rawEntries = u.entries || [];
+      if (!rawEntries.length)
+        break;
+      if (opts.onPlanUpdate) {
+        const entries2 = rawEntries.map((e) => ({
+          status: String(e?.status ?? "pending"),
+          content: String(e?.content ?? "")
+        }));
+        Promise.resolve(opts.onPlanUpdate(entries2));
+      } else {
+        const text = rawEntries.map((e, i) => `${i + 1}. [${e.status || "pending"}] ${e.content}`).join(`
 `);
-      if (entries2)
         out.push({ event_type: "assistant_text", payload: { text: `**Plan**
 
-${entries2}` } });
+${text}
+
+` } });
+      }
       break;
     }
   }
@@ -33990,7 +34014,7 @@ var init_plans = __esm(() => {
 });
 
 // ../lib/chat.ts
-var ChatScopeSchema, ChatMetaSchema, ChatAuthorKindSchema, ChatAuthorSchema, ChatAttachmentSchema, ChatMessageKindSchema, ChatToolKindSchema, ChatMessageSchema, CHAT_DOC, CreateChatBodySchema, UpdateChatBodySchema;
+var ChatScopeSchema, ChatMetaSchema, ChatAuthorKindSchema, ChatAuthorSchema, ChatAttachmentSchema, ChatMessageKindSchema, ChatToolKindSchema, ChatPlanEntryStatusSchema, ChatPlanEntrySchema, ChatMessageSchema, CHAT_DOC, CreateChatBodySchema, UpdateChatBodySchema;
 var init_chat = __esm(() => {
   init_zod();
   ChatScopeSchema = exports_external.enum(["project", "workspace"]);
@@ -34018,8 +34042,13 @@ var init_chat = __esm(() => {
     size: exports_external.number().optional(),
     url: exports_external.string().optional()
   });
-  ChatMessageKindSchema = exports_external.enum(["text", "tool_call", "tool_result"]);
+  ChatMessageKindSchema = exports_external.enum(["text", "tool_call", "tool_result", "plan"]);
   ChatToolKindSchema = exports_external.enum(["edit", "read", "write", "bash", "search", "other"]);
+  ChatPlanEntryStatusSchema = exports_external.enum(["pending", "in_progress", "completed"]);
+  ChatPlanEntrySchema = exports_external.object({
+    status: ChatPlanEntryStatusSchema.default("pending"),
+    content: exports_external.string()
+  });
   ChatMessageSchema = exports_external.object({
     id: exports_external.string(),
     author: ChatAuthorSchema,
@@ -34034,7 +34063,10 @@ var init_chat = __esm(() => {
     status: exports_external.enum(["pending", "in_progress", "completed", "failed"]).optional(),
     input: exports_external.unknown().optional(),
     tool_call_id: exports_external.string().optional(),
-    content: exports_external.string().optional()
+    content: exports_external.string().optional(),
+    plan_entries: exports_external.array(ChatPlanEntrySchema).optional(),
+    dispatched_at: exports_external.number().optional(),
+    delivered_to_acp_at: exports_external.number().optional()
   });
   CHAT_DOC = {
     MESSAGES_LIST: "messages",
@@ -35845,6 +35877,8 @@ function appendMessage(doc2, msg) {
     map20.set("tool_call_id", msg.tool_call_id);
   if (msg.content !== undefined)
     map20.set("content", msg.content);
+  if (msg.plan_entries !== undefined)
+    map20.set("plan_entries", msg.plan_entries);
   const mentions = map20.setContainer("mentions", new LoroList);
   for (const x of msg.mentions ?? [])
     mentions.push(x);
@@ -35876,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();
@@ -35909,6 +35956,7 @@ class ChatPeer {
   dirtySinceWrite = 0;
   seenIds = new Set;
   closed = false;
+  firstFrameSinceConnect = true;
   reconnectTimer = null;
   constructor(opts) {
     this.opts = opts;
@@ -35979,10 +36027,37 @@ class ChatPeer {
     this.flush();
     return containerId;
   }
+  upsertPlan(authorAgentId, authorName, entries2, containerId) {
+    if (containerId) {
+      patchMessage(this.doc, containerId, { plan_entries: entries2 });
+      this.flush();
+      return containerId;
+    }
+    const msg = {
+      id: crypto.randomUUID(),
+      author: { kind: "agent", id: authorAgentId, name: authorName },
+      kind: "plan",
+      text: "",
+      ts: Math.floor(Date.now() / 1000),
+      mentions: [],
+      attachments: [],
+      partial: false,
+      plan_entries: entries2
+    };
+    const cid = appendMessage(this.doc, msg);
+    this.seenIds.add(msg.id);
+    this.flush();
+    return cid;
+  }
   patchMessage(containerId, patch9) {
     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;
   }
@@ -36031,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`);
@@ -36062,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)
@@ -36074,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}`));
@@ -36128,6 +36222,7 @@ ${opts.prompt}`;
         prompt,
         cwd: opts.cwd,
         sessionName: `chat-${opts.chatId}`,
+        onPlanUpdate: opts.onPlanUpdate,
         onEvent: (ev) => {
           if (ev.event_type === "assistant_text") {
             const text = ev.payload?.text;
@@ -36180,6 +36275,7 @@ ${opts.prompt}`;
       onSession: (sid) => {
         chatSessions.set(opts.chatId, sid);
       },
+      onPlanUpdate: opts.onPlanUpdate,
       onEvent: (ev) => {
         if (ev.event_type === "assistant_text") {
           const text = ev.payload?.text;
@@ -36545,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 });
@@ -36558,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}` };
@@ -36647,6 +36726,7 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
   let lastFlush = Date.now();
   let agentReplyText = "";
   const toolMsgByCallId = new Map;
+  let planContainerId = null;
   const flushText = (force = false) => {
     const now = Date.now();
     if (!buffered || textContainerId == null)
@@ -36713,6 +36793,7 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
     return "other";
   };
   const preamble = buildChatPreamble({ projectId: chat2.project_id, agents: allAgents });
+  peer.markDelivered(userMsg.id);
   await new Promise((resolve2) => {
     handleChatTurn({
       chatId: chat2.id,
@@ -36782,6 +36863,10 @@ async function processUserMessage(chat2, userMsg, peer, ctx) {
         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()) {
@@ -36934,6 +37019,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, {
@@ -37553,7 +37763,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.44.0",
+  version: "0.46.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -38996,14 +39206,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 });
@@ -39191,6 +39399,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.0",
+  "version": "0.46.0",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"