@shipers-dev/multi 0.38.0 → 0.38.5

package/dist/index.js

@@ -33220,7 +33220,11 @@ async function runAcp(opts) {
       } catch (e) {
         throw new Error(`writeTextFile failed: ${fmtErr(e)}`);
       }
-    }
+    },
+    async extMethod(_method, _params) {
+      return {};
+    },
+    async extNotification(_method, _params) {}
   };
   const conn = new ClientSideConnection(() => client, stream2);
   try {
@@ -33289,8 +33293,7 @@ async function runAcp(opts) {
     const u = params.update;
     const kind = u.sessionUpdate;
     switch (kind) {
-      case "agent_message_chunk":
-      case "agent_thought_chunk": {
+      case "agent_message_chunk": {
         const text = extractText(u.content);
         if (text) {
           chunkCount++;
@@ -33298,6 +33301,9 @@ async function runAcp(opts) {
         }
         break;
       }
+      case "agent_thought_chunk": {
+        break;
+      }
       case "tool_call":
       case "tool_call_update": {
         chunkCount++;
@@ -33540,13 +33546,15 @@ function handleSessionUpdate(params) {
   const kind = u.sessionUpdate;
   const out = [];
   switch (kind) {
-    case "agent_message_chunk":
-    case "agent_thought_chunk": {
+    case "agent_message_chunk": {
       const text = extractText2(u.content);
       if (text)
         out.push({ event_type: "assistant_text", payload: { text } });
       break;
     }
+    case "agent_thought_chunk": {
+      break;
+    }
     case "tool_call":
     case "tool_call_update": {
       out.push({ event_type: "tool_call", payload: {
@@ -33758,6 +33766,25 @@ var init_agent_workspaces = __esm(() => {
 });
 
 // ../lib/plans.ts
+function parseUiBlocks(text) {
+  const blocks = [];
+  const errors3 = [];
+  if (!text)
+    return { blocks, errors: errors3 };
+  let i = 0;
+  let m;
+  UI_FENCE_RE.lastIndex = 0;
+  while ((m = UI_FENCE_RE.exec(text)) !== null) {
+    i++;
+    try {
+      const parsed = UiBlockSchema.parse(JSON.parse(m[1]));
+      blocks.push(parsed);
+    } catch (e) {
+      errors3.push({ index: i, type: "multi-ui", message: e?.message || "invalid ui block" });
+    }
+  }
+  return { blocks, errors: errors3 };
+}
 function parsePlanBlocks(text) {
   const actions = [];
   const errors3 = [];
@@ -33807,52 +33834,13 @@ function parsePlanBlocks(text) {
   }
   return { actions, errors: errors3 };
 }
-function parseUiBlocks(text) {
-  const blocks = [];
-  const spans = [];
-  const errors3 = [];
-  if (!text)
-    return { blocks, spans, errors: errors3 };
-  let i = 0;
-  let m;
-  UI_FENCE_RE.lastIndex = 0;
-  while ((m = UI_FENCE_RE.exec(text)) !== null) {
-    i += 1;
-    const start3 = m.index;
-    const end3 = m.index + m[0].length;
-    let parsed;
-    try {
-      parsed = JSON.parse(m[1]);
-    } catch (e) {
-      errors3.push({ index: i, type: "multi-ui", message: `block ${i}: invalid JSON (${e.message})` });
-      continue;
-    }
-    const r = UiBlockSchema.safeParse(parsed);
-    if (!r.success) {
-      const issues = r.error.issues.map((iss) => `${iss.path.join(".") || "<root>"}: ${iss.message}`);
-      errors3.push({ index: i, type: "multi-ui", message: `block ${i}: ${issues.join("; ")}` });
-      continue;
-    }
-    blocks.push(r.data);
-    spans.push({ block: r.data, start: start3, end: end3 });
-  }
-  return { blocks, spans, errors: errors3 };
-}
-var PLAN_SCHEMA_VERSION = 4, EvalPolicy, Priority, AssigneeType, IssueStatus, SessionRole, Capabilities, HandoffExpect, SkillFile, PlanActionSchema, PlanEnvelopeSchema, FENCE_RE, UiBlockSchema, UI_FENCE_RE;
+var PLAN_SCHEMA_VERSION = 1, Priority, AssigneeType, IssueStatus, SessionRole, SkillFile, PlanActionSchema, PlanEnvelopeSchema, UiBlockSchema, UI_FENCE_RE, FENCE_RE;
 var init_plans = __esm(() => {
   init_zod();
-  EvalPolicy = exports_external.object({
-    evaluator_agent_id: exports_external.string().min(1),
-    threshold: exports_external.number().min(0).max(1),
-    on_fail: exports_external.enum(["retry", "reroute", "escalate"]).optional(),
-    max_retries: exports_external.number().int().min(0).max(10).optional()
-  });
   Priority = exports_external.enum(["low", "medium", "high"]);
   AssigneeType = exports_external.enum(["human", "agent"]);
   IssueStatus = exports_external.enum(["todo", "in_progress", "done", "failed", "stopped", "cancelled"]);
   SessionRole = exports_external.enum(["implementer", "reviewer", "test-fixer"]);
-  Capabilities = exports_external.record(exports_external.string(), exports_external.unknown());
-  HandoffExpect = exports_external.enum(["summary", "json", "none"]);
   SkillFile = exports_external.object({ path: exports_external.string().min(1), content: exports_external.string() });
   PlanActionSchema = exports_external.discriminatedUnion("type", [
     exports_external.object({
@@ -33864,9 +33852,7 @@ var init_plans = __esm(() => {
       assignee_type: AssigneeType.optional(),
       assignee_id: exports_external.string().optional(),
       parent_id: exports_external.string().optional(),
-      blocked_by: exports_external.array(exports_external.string().min(1)).optional(),
-      eval_policy: EvalPolicy.optional(),
-      await_children: exports_external.boolean().optional()
+      blocked_by: exports_external.array(exports_external.string().min(1)).optional()
     }),
     exports_external.object({
       type: exports_external.literal("update"),
@@ -33877,22 +33863,13 @@ var init_plans = __esm(() => {
       priority: Priority.optional(),
       assignee_type: AssigneeType.optional(),
       assignee_id: exports_external.string().optional(),
-      blocked_by: exports_external.array(exports_external.string().min(1)).optional(),
-      eval_policy: EvalPolicy.nullable().optional()
+      blocked_by: exports_external.array(exports_external.string().min(1)).optional()
     }),
     exports_external.object({
       type: exports_external.literal("delegate"),
       id: exports_external.string().min(1),
       assignee_id: exports_external.string().min(1)
     }),
-    exports_external.object({
-      type: exports_external.literal("handoff"),
-      target_agent_id: exports_external.string().min(1),
-      prompt: exports_external.string().min(1),
-      expect: HandoffExpect.optional(),
-      return_to: exports_external.string().optional(),
-      title: exports_external.string().min(1).max(500).optional()
-    }),
     exports_external.object({
       type: exports_external.literal("issue.delete"),
       id: exports_external.string().min(1)
@@ -33923,16 +33900,14 @@ var init_plans = __esm(() => {
       agent_type: exports_external.string().min(1),
       prompt: exports_external.string().optional(),
       skill_ids: exports_external.array(exports_external.string()).optional(),
-      allowed_tools: exports_external.array(exports_external.string()).optional(),
-      capabilities: Capabilities.optional()
+      allowed_tools: exports_external.array(exports_external.string()).optional()
     }),
     exports_external.object({
       type: exports_external.literal("agent.update"),
       id: exports_external.string().min(1),
       name: exports_external.string().min(1).max(120).optional(),
       prompt: exports_external.string().nullable().optional(),
-      allowed_tools: exports_external.array(exports_external.string()).nullable().optional(),
-      capabilities: Capabilities.nullable().optional()
+      allowed_tools: exports_external.array(exports_external.string()).nullable().optional()
     }),
     exports_external.object({
       type: exports_external.literal("skill.create"),
@@ -33958,25 +33933,18 @@ var init_plans = __esm(() => {
       agent_id: exports_external.string().min(1),
       role: SessionRole,
       device_id: exports_external.string().optional()
-    }),
-    exports_external.object({
-      type: exports_external.literal("eval.submit"),
-      id: exports_external.string().min(1).optional(),
-      score: exports_external.number().min(0).max(1),
-      feedback: exports_external.string().min(1).max(8000),
-      scores: exports_external.record(exports_external.string(), exports_external.number().min(0).max(1)).optional()
     })
   ]);
   PlanEnvelopeSchema = exports_external.object({
     actions: exports_external.array(exports_external.unknown())
   });
-  FENCE_RE = /```multi-plan\s*\n([\s\S]*?)\n```/g;
   UiBlockSchema = exports_external.object({
     template: exports_external.string().min(1).max(20000),
     data: exports_external.unknown().optional(),
     height: exports_external.number().int().min(40).max(1200).optional()
   });
   UI_FENCE_RE = /```multi-ui\s*\n([\s\S]*?)\n```/g;
+  FENCE_RE = /```multi-plan\s*\n([\s\S]*?)\n```/g;
 });
 
 // ../lib/chat.ts
@@ -33991,6 +33959,7 @@ var init_chat = __esm(() => {
     title: exports_external.string(),
     primary_agent_id: exports_external.string().nullable(),
     device_id: exports_external.string().nullable(),
+    runtime: exports_external.string().nullable(),
     created_at: exports_external.number(),
     updated_at: exports_external.number()
   });
@@ -34032,12 +34001,14 @@ var init_chat = __esm(() => {
   CreateChatBodySchema = exports_external.object({
     title: exports_external.string().min(1).max(200),
     primary_agent_id: exports_external.string().nullable().optional(),
-    device_id: exports_external.string().nullable().optional()
+    device_id: exports_external.string().nullable().optional(),
+    runtime: exports_external.string().nullable().optional()
   });
   UpdateChatBodySchema = exports_external.object({
     title: exports_external.string().min(1).max(200).optional(),
     primary_agent_id: exports_external.string().nullable().optional(),
-    device_id: exports_external.string().nullable().optional()
+    device_id: exports_external.string().nullable().optional(),
+    runtime: exports_external.string().nullable().optional()
   });
 });
 
@@ -40384,12 +40355,6 @@ async function handleChatTurn(opts) {
     return;
   }
   const chosen = opts.preferredRuntime && detected.find((d) => d.type === opts.preferredRuntime) || detected.find((d) => d.type === "claude-code") || detected[0];
-  const adapter = await resolveAcpAdapter(chosen.type, chosen.path);
-  if (!adapter) {
-    opts.onDone(`error: no ACP adapter for ${chosen.type}`);
-    return;
-  }
-  const sessionId = chatSessions.get(opts.chatId) || null;
   let prompt = opts.prompt;
   if (opts.systemPreamble && !chatPreambleSent.has(opts.chatId)) {
     prompt = `${opts.systemPreamble}
@@ -40399,6 +40364,52 @@ async function handleChatTurn(opts) {
 ${opts.prompt}`;
     chatPreambleSent.add(opts.chatId);
   }
+  if (ACPX_RUNTIMES.has(chosen.type)) {
+    try {
+      const { stopReason } = await runAcpx({
+        agentType: chosen.type,
+        prompt,
+        cwd: opts.cwd,
+        sessionName: `chat-${opts.chatId}`,
+        onEvent: (ev) => {
+          if (ev.event_type === "assistant_text") {
+            const text = ev.payload?.text;
+            if (typeof text === "string" && text.length)
+              opts.onChunk(text);
+          } else if (ev.event_type === "tool_call") {
+            const p = ev.payload;
+            opts.onToolCall?.({
+              id: String(p?.id ?? ""),
+              tool: String(p?.tool ?? "tool"),
+              kind: p?.kind ? String(p.kind) : undefined,
+              status: p?.status ? String(p.status) : undefined,
+              input: p?.input
+            });
+          } else if (ev.event_type === "tool_result") {
+            const p = ev.payload;
+            opts.onToolResult?.({
+              tool_call_id: String(p?.tool_use_id ?? p?.id ?? ""),
+              content: typeof p?.content === "string" ? p.content : JSON.stringify(p?.content ?? "")
+            });
+          } else if (ev.event_type === "error") {
+            const m = String(ev.payload?.message ?? "agent error");
+            opts.onDone(`error: ${m}`);
+          }
+        }
+      });
+      opts.onDone(stopReason || "ok");
+    } catch (e) {
+      opts.log(`[chat-turn] ${opts.chatId} acpx crash: ${e.message}`);
+      opts.onDone(`error: ${e.message}`);
+    }
+    return;
+  }
+  const adapter = await resolveAcpAdapter(chosen.type, chosen.path);
+  if (!adapter) {
+    opts.onDone(`error: no ACP adapter for ${chosen.type}`);
+    return;
+  }
+  const sessionId = chatSessions.get(opts.chatId) || null;
   try {
     await runAcp({
       apiUrl: "",
@@ -40445,11 +40456,13 @@ ${opts.prompt}`;
     opts.onDone(`error: ${e.message}`);
   }
 }
-var chatSessions, chatPreambleSent;
+var ACPX_RUNTIMES, chatSessions, chatPreambleSent;
 var init_chat_turn = __esm(() => {
   init_acp_runner();
+  init_acpx_runner();
   init_run_task();
   init_detect();
+  ACPX_RUNTIMES = new Set(["pi", "codex", "openclaw"]);
   chatSessions = new Map;
   chatPreambleSent = new Set;
 });
@@ -40826,8 +40839,10 @@ class ChatSupervisor {
       return;
     }
   }
-  async resolveAgentRuntime(agentId) {
-    if (!agentId)
+  async resolveAgentRuntime(chat2, agentId) {
+    if (chat2.runtime)
+      return chat2.runtime;
+    if (!agentId || typeof agentId !== "string")
       return null;
     const headers = { authorization: `Bearer ${this.opts.authToken}` };
     try {
@@ -40866,7 +40881,7 @@ class ChatSupervisor {
     const mentionAgent = this.resolveAgentFromMention(allAgents, mentioned);
     const resolvedAgentId = mentionAgent?.id ?? chat2.primary_agent_id ?? null;
     const agentAuthorId = resolvedAgentId || mentioned || "agent";
-    const runtime4 = await this.resolveAgentRuntime(resolvedAgentId);
+    const runtime4 = await this.resolveAgentRuntime(chat2, resolvedAgentId);
     const cwd = await this.resolveCwd(chat2);
     if (cwd)
       this.opts.log(`[chat ${chat2.id}] cwd=${cwd}`);
@@ -40894,7 +40909,7 @@ class ChatSupervisor {
       peer.finalizePartialMessage(textContainerId);
       textContainerId = null;
     };
-    const agentDisplayName = mentionAgent?.name ?? allAgents.find((a) => a.id === resolvedAgentId)?.name ?? undefined;
+    const agentDisplayName = mentionAgent?.name ?? allAgents.find((a) => a.id === resolvedAgentId)?.name ?? runtime4 ?? undefined;
     const ensureTextOpen = () => {
       if (textContainerId == null) {
         textContainerId = peer.beginPartialAgentMessage(agentAuthorId, agentDisplayName).containerId;
@@ -41064,7 +41079,7 @@ class ChatSupervisor {
     }
   }
   async autoTitle(chat2, userMsg, agentReply) {
-    const runtime4 = await this.resolveAgentRuntime(chat2);
+    const runtime4 = await this.resolveAgentRuntime(chat2, chat2.primary_agent_id);
     const trimUser = userMsg.slice(0, 800);
     const trimAgent = agentReply.slice(0, 1200);
     const prompt = `Reply with ONLY a 3-6 word title for this conversation. No quotes, no punctuation, no explanation. Capitalize each word.
@@ -41730,7 +41745,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.38.0",
+  version: "0.38.5",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"

package/package.json

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