@shipers-dev/multi 0.5.1 → 0.6.1

package/dist/index.js

@@ -5380,6 +5380,145 @@ function extractText(content) {
   return "";
 }
 
+// src/acpx-runner.ts
+async function runAcpx(opts) {
+  const args = ["acpx", "--format", "json", "--json-strict", "--approve-all"];
+  if (opts.cwd)
+    args.push("--cwd", opts.cwd);
+  args.push(opts.agentType);
+  if (opts.sessionName) {
+    const ensureArgs = ["acpx", ...opts.cwd ? ["--cwd", opts.cwd] : [], opts.agentType, "sessions", "ensure", "--name", opts.sessionName];
+    try {
+      const ensure = Bun.spawn(ensureArgs, { stdout: "pipe", stderr: "pipe", stdin: "ignore" });
+      await ensure.exited;
+    } catch {}
+    args.push("prompt", "-s", opts.sessionName);
+  } else {
+    args.push("prompt");
+  }
+  args.push(opts.prompt);
+  const proc = Bun.spawn(args, { stdout: "pipe", stderr: "pipe", stdin: "ignore" });
+  let stopReason = "end_turn";
+  const reader = proc.stdout.getReader();
+  const dec = new TextDecoder;
+  let buf = "";
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done)
+      break;
+    buf += dec.decode(value, { stream: true });
+    let nl;
+    while ((nl = buf.indexOf(`
+`)) !== -1) {
+      const line = buf.slice(0, nl).trim();
+      buf = buf.slice(nl + 1);
+      if (!line)
+        continue;
+      const events = parseAcpLine(line, (r) => {
+        stopReason = r;
+      });
+      for (const ev of events)
+        await opts.onEvent(ev);
+    }
+  }
+  if (buf.trim()) {
+    const events = parseAcpLine(buf.trim(), (r) => {
+      stopReason = r;
+    });
+    for (const ev of events)
+      await opts.onEvent(ev);
+  }
+  const code = await proc.exited;
+  if (code !== 0 && code !== 130) {
+    await opts.onEvent({ event_type: "error", payload: { message: `acpx exited with code ${code}` } });
+  }
+  return { stopReason };
+}
+function parseAcpLine(line, setStop) {
+  let msg;
+  try {
+    msg = JSON.parse(line);
+  } catch {
+    return [];
+  }
+  const out = [];
+  if (msg.method === "session/update" && msg.params?.sessionUpdate) {
+    return handleSessionUpdate(msg.params);
+  }
+  if (msg.id && msg.result && typeof msg.result === "object" && "stopReason" in msg.result) {
+    setStop(msg.result.stopReason);
+    out.push({ event_type: "result", payload: { stopReason: msg.result.stopReason } });
+    return out;
+  }
+  if (msg.error) {
+    out.push({ event_type: "error", payload: { message: msg.error.message || JSON.stringify(msg.error) } });
+    return out;
+  }
+  return out;
+}
+function handleSessionUpdate(params) {
+  const u = params.update || {};
+  const kind = u.sessionUpdate;
+  const out = [];
+  switch (kind) {
+    case "agent_message_chunk":
+    case "agent_thought_chunk": {
+      const text = extractText2(u.content);
+      if (text)
+        out.push({ event_type: "assistant_text", payload: { text } });
+      break;
+    }
+    case "tool_call":
+    case "tool_call_update": {
+      out.push({ event_type: "tool_call", payload: {
+        id: u.toolCallId || u.id,
+        tool: u.title || u.toolName || "tool",
+        kind: u.kind,
+        status: u.status,
+        input: u.rawInput,
+        locations: u.locations
+      } });
+      if (Array.isArray(u.content)) {
+        for (const c of u.content) {
+          if (c.type === "content" && c.content?.type === "text") {
+            out.push({ event_type: "tool_result", payload: { tool_use_id: u.toolCallId || u.id, content: String(c.content.text).slice(0, 4000) } });
+          } else if (c.type === "diff") {
+            const diff = `--- ${c.path}
+${c.oldText || ""}
++++ ${c.path}
+${c.newText || ""}`.slice(0, 4000);
+            out.push({ event_type: "tool_result", payload: { tool_use_id: u.toolCallId || u.id, content: diff } });
+          }
+        }
+      }
+      break;
+    }
+    case "plan": {
+      const entries = (u.entries || []).map((e, i) => `${i + 1}. [${e.status || "pending"}] ${e.content}`).join(`
+`);
+      if (entries)
+        out.push({ event_type: "assistant_text", payload: { text: `**Plan**
+
+${entries}` } });
+      break;
+    }
+  }
+  return out;
+}
+function extractText2(content) {
+  if (!content)
+    return "";
+  if (typeof content === "string")
+    return content;
+  if (Array.isArray(content))
+    return content.map(extractText2).join("");
+  if (content.type === "text" && typeof content.text === "string")
+    return content.text;
+  if (content.text)
+    return content.text;
+  return "";
+}
+
 // src/index.ts
 import { parseArgs } from "util";
 import { mkdirSync as mkdirSync2, existsSync as existsSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync2, appendFileSync, unlinkSync, readdirSync, statSync } from "fs";
@@ -5392,7 +5531,7 @@ var LOG_PATH = join(MULTI_DIR, "logs", "agent.log");
 var SKILLS_DIR = join(MULTI_DIR, "skills");
 var STOP_PATH = join(MULTI_DIR, "stop.flag");
 var TASKS_DB_PATH = join(MULTI_DIR, "tasks.db");
-var VERSION = "0.5.1";
+var VERSION = "0.6.1";
 var COMMANDS = {
   setup: "Register this device with a workspace",
   connect: "Connect device to realtime hub and execute assigned tasks",
@@ -6037,6 +6176,7 @@ _${bits.join(" \xB7 ")}_`);
   } catch {}
   const acpCapable = detected.filter((d) => d.type === "claude-code");
   const useAcp = preferType !== "pi" && acpCapable.length > 0 && process.env.MULTI_LEGACY !== "1";
+  const useAcpx = !useAcp && preferType && ["pi", "codex", "openclaw"].includes(preferType) && process.env.MULTI_LEGACY !== "1";
   try {
     if (useAcp) {
       const base = `${task.title}
@@ -6053,15 +6193,15 @@ Context (original task ${task.key}): ${task.title}` : base || task.title;
         userPart += `
 
 ---
-Attached files (on local disk, read them with your tools):
+Attached input files (read them with your tools if useful):
 ${lines}
 
-To return generated files, write them to: ${outDir}`;
+Note: if (and only if) you produce binary or large artifact outputs (screenshots, data exports, generated source files), write them under ${outDir}. Always put your human-facing reply in the chat response itself \u2014 do NOT write your answer as a file.`;
       } else {
         userPart += `
 
 ---
-To return generated files, write them to: ${outDir}`;
+Respond in the chat. Only if you produce large artifact files (screenshots, data exports, generated source code), write them under ${outDir}. Do not put your answer in a file.`;
       }
       let preamble = "";
       try {
@@ -6124,14 +6264,72 @@ ${userPart}` : userPart;
         }
       });
       log(`  acp session ${sessionId.slice(0, 8)}`);
-    } else {
-      let preferType2;
+    } else if (useAcpx) {
+      let preamble = "";
       try {
-        const a = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
-        if (a.data?.type)
-          preferType2 = a.data.type;
+        const agentRes = await apiClient.get(`${apiUrl}/api/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})
+
+`;
+          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 {}
-      const runner = pickRunner(detected, preferType2);
+      const base = `${task.title}
+
+${task.description || ""}`.trim();
+      let userPart = task.followup ? `${task.followup}
+
+---
+Context (${task.key}): ${task.title}` : base || task.title;
+      userPart = stripSelfMention(userPart, preferType);
+      if (attachmentRefs.length) {
+        const lines = attachmentRefs.map((a) => `- ${a.filename}: ${a.path}`).join(`
+`);
+        userPart += `
+
+---
+Attached files:
+${lines}
+
+Write generated files to: ${outDir}`;
+      } else {
+        userPart += `
+
+---
+Write generated files to: ${outDir}`;
+      }
+      const full = preamble ? `${preamble}
+---
+
+${userPart}` : userPart;
+      log(`  acpx runner: ${preferType}`);
+      await runAcpx({
+        agentType: preferType,
+        prompt: full,
+        cwd: workingDir,
+        sessionName: `issue-${issueId}`,
+        onEvent: eventHandler
+      });
+    } else {
+      const runner = pickRunner(detected, preferType);
       for await (const event of runner(task))
         await eventHandler(event);
     }

package/package.json

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

package/src/acpx-runner.ts

@@ -0,0 +1,136 @@
+// acpx-runner — delegate to `acpx` CLI for pi/codex/openclaw agents.
+// acpx emits raw ACP JSON-RPC NDJSON on stdout with --format json; we reuse the
+// same parse semantics as our direct ACP runner to produce AcpEvent stream.
+//
+// Requires: `npm install -g acpx` on device host (or npx acpx@latest).
+// Runs with --approve-all for now (no permission UI forwarding).
+
+import type { AcpEvent } from './acp-runner';
+
+export interface AcpxRunOpts {
+  agentType: 'pi' | 'codex' | 'openclaw' | 'claude' | string;
+  prompt: string;
+  cwd?: string;
+  sessionName?: string; // reuse same session across follow-ups (e.g. "issue-<id>")
+  onEvent: (ev: AcpEvent) => void | Promise<void>;
+}
+
+export async function runAcpx(opts: AcpxRunOpts): Promise<{ stopReason: string }> {
+  const args = ['acpx', '--format', 'json', '--json-strict', '--approve-all'];
+  if (opts.cwd) args.push('--cwd', opts.cwd);
+  args.push(opts.agentType);
+  // Ensure a session exists for this name (idempotent). ensure = get-or-create.
+  // We run it as a separate invocation, then prompt.
+  if (opts.sessionName) {
+    const ensureArgs = ['acpx', ...(opts.cwd ? ['--cwd', opts.cwd] : []), opts.agentType, 'sessions', 'ensure', '--name', opts.sessionName];
+    try {
+      const ensure = Bun.spawn(ensureArgs, { stdout: 'pipe', stderr: 'pipe', stdin: 'ignore' });
+      await ensure.exited;
+    } catch {}
+    args.push('prompt', '-s', opts.sessionName);
+  } else {
+    args.push('prompt');
+  }
+  args.push(opts.prompt);
+
+  const proc = Bun.spawn(args, { stdout: 'pipe', stderr: 'pipe', stdin: 'ignore' });
+  let stopReason = 'end_turn';
+
+  const reader = (proc.stdout as ReadableStream<Uint8Array>).getReader();
+  const dec = new TextDecoder();
+  let buf = '';
+
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) break;
+    buf += dec.decode(value, { stream: true });
+    let nl: number;
+    while ((nl = buf.indexOf('\n')) !== -1) {
+      const line = buf.slice(0, nl).trim();
+      buf = buf.slice(nl + 1);
+      if (!line) continue;
+      const events = parseAcpLine(line, (r) => { stopReason = r; });
+      for (const ev of events) await opts.onEvent(ev);
+    }
+  }
+  if (buf.trim()) {
+    const events = parseAcpLine(buf.trim(), (r) => { stopReason = r; });
+    for (const ev of events) await opts.onEvent(ev);
+  }
+
+  const code = await proc.exited;
+  if (code !== 0 && code !== 130) {
+    await opts.onEvent({ event_type: 'error', payload: { message: `acpx exited with code ${code}` } });
+  }
+  return { stopReason };
+}
+
+function parseAcpLine(line: string, setStop: (r: string) => void): AcpEvent[] {
+  let msg: any;
+  try { msg = JSON.parse(line); } catch { return []; }
+  const out: AcpEvent[] = [];
+
+  // session/update notification
+  if (msg.method === 'session/update' && msg.params?.sessionUpdate) {
+    return handleSessionUpdate(msg.params);
+  }
+  // prompt result
+  if (msg.id && msg.result && typeof msg.result === 'object' && 'stopReason' in msg.result) {
+    setStop(msg.result.stopReason);
+    out.push({ event_type: 'result', payload: { stopReason: msg.result.stopReason } });
+    return out;
+  }
+  // errors
+  if (msg.error) {
+    out.push({ event_type: 'error', payload: { message: msg.error.message || JSON.stringify(msg.error) } });
+    return out;
+  }
+  return out;
+}
+
+function handleSessionUpdate(params: any): AcpEvent[] {
+  const u = params.update || {};
+  const kind = u.sessionUpdate;
+  const out: AcpEvent[] = [];
+  switch (kind) {
+    case 'agent_message_chunk':
+    case 'agent_thought_chunk': {
+      const text = extractText(u.content);
+      if (text) out.push({ event_type: 'assistant_text', payload: { text } });
+      break;
+    }
+    case 'tool_call':
+    case 'tool_call_update': {
+      out.push({ event_type: 'tool_call', payload: {
+        id: u.toolCallId || u.id, tool: u.title || u.toolName || 'tool',
+        kind: u.kind, status: u.status, input: u.rawInput, locations: u.locations,
+      }});
+      if (Array.isArray(u.content)) {
+        for (const c of u.content) {
+          if (c.type === 'content' && c.content?.type === 'text') {
+            out.push({ event_type: 'tool_result', payload: { tool_use_id: u.toolCallId || u.id, content: String(c.content.text).slice(0, 4000) } });
+          } else if (c.type === 'diff') {
+            const diff = `--- ${c.path}\n${c.oldText || ''}\n+++ ${c.path}\n${c.newText || ''}`.slice(0, 4000);
+            out.push({ event_type: 'tool_result', payload: { tool_use_id: u.toolCallId || u.id, content: diff } });
+          }
+        }
+      }
+      break;
+    }
+    case 'plan': {
+      const entries = (u.entries || []).map((e: any, i: number) => `${i + 1}. [${e.status || 'pending'}] ${e.content}`).join('\n');
+      if (entries) out.push({ event_type: 'assistant_text', payload: { text: `**Plan**\n\n${entries}` } });
+      break;
+    }
+  }
+  return out;
+}
+
+function extractText(content: any): string {
+  if (!content) return '';
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) return content.map(extractText).join('');
+  if (content.type === 'text' && typeof content.text === 'string') return content.text;
+  if (content.text) return content.text;
+  return '';
+}

package/src/index.ts

@@ -4,6 +4,7 @@ import { detectAgents } from './detect';
 import { apiClient, setAuthToken } from './client';
 import { Database } from 'bun:sqlite';
 import { runAcp } from './acp-runner';
+import { runAcpx } from './acpx-runner';
 import { parseArgs } from 'util';
 import { mkdirSync, existsSync, writeFileSync, readFileSync, appendFileSync, unlinkSync, readdirSync, statSync } from 'fs';
 import { join, dirname } from 'path';
@@ -16,7 +17,7 @@ const LOG_PATH = join(MULTI_DIR, 'logs', 'agent.log');
 const SKILLS_DIR = join(MULTI_DIR, 'skills');
 const STOP_PATH = join(MULTI_DIR, 'stop.flag');
 const TASKS_DB_PATH = join(MULTI_DIR, 'tasks.db');
-const VERSION = '0.5.1';
+const VERSION = '0.6.1';
 
 const COMMANDS = {
   setup: 'Register this device with a workspace',
@@ -616,6 +617,8 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
   } catch {}
   const acpCapable = detected.filter(d => d.type === 'claude-code');
   const useAcp = preferType !== 'pi' && acpCapable.length > 0 && process.env.MULTI_LEGACY !== '1';
+  // Route pi/codex/openclaw through acpx (handles these agent types natively)
+  const useAcpx = !useAcp && preferType && ['pi', 'codex', 'openclaw'].includes(preferType) && process.env.MULTI_LEGACY !== '1';
 
   try {
     if (useAcp) {
@@ -626,9 +629,9 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       userPart = stripSelfMention(userPart, preferType);
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map(a => `- ${a.filename}: ${a.path}`).join('\n');
-        userPart += `\n\n---\nAttached files (on local disk, read them with your tools):\n${lines}\n\nTo return generated files, write them to: ${outDir}`;
+        userPart += `\n\n---\nAttached input files (read them with your tools if useful):\n${lines}\n\nNote: if (and only if) you produce binary or large artifact outputs (screenshots, data exports, generated source files), write them under ${outDir}. Always put your human-facing reply in the chat response itself — do NOT write your answer as a file.`;
       } else {
-        userPart += `\n\n---\nTo return generated files, write them to: ${outDir}`;
+        userPart += `\n\n---\nRespond in the chat. Only if you produce large artifact files (screenshots, data exports, generated source code), write them under ${outDir}. Do not put your answer in a file.`;
       }
 
       // Pull agent + linked skills to construct system/context preamble
@@ -676,13 +679,42 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
         },
       });
       log(`  acp session ${sessionId.slice(0, 8)}`);
-    } else {
-      // Determine preferred type from agent (e.g. pi)
-      let preferType: string | undefined;
+    } else if (useAcpx) {
+      // Build prompt with preamble (same logic as ACP path, but as one string)
+      let preamble = '';
       try {
-        const a = await apiClient.get<any>(`${apiUrl}/api/agents/${task.agent_id}`);
-        if (a.data?.type) preferType = a.data.type;
+        const agentRes = await apiClient.get<any>(`${apiUrl}/api/agents/${task.agent_id}`);
+        const agent = agentRes.data;
+        if (agent?.prompt) preamble += `# Agent instructions\n\n${agent.prompt}\n\n`;
+        const skillsRes = await apiClient.get<any[]>(`${apiUrl}/api/agents/${task.agent_id}/skills`);
+        const skillList = Array.isArray(skillsRes.data) ? skillsRes.data : [];
+        if (skillList.length) {
+          preamble += `# Attached skills (${skillList.length})\n\n`;
+          for (const s of skillList) {
+            const body = String(s.body || s.description || '').trim();
+            if (body) preamble += `## ${s.name}${s.version ? ` v${s.version}` : ''}\n\n${body}\n\n`;
+          }
+        }
       } catch {}
+      const base = `${task.title}\n\n${task.description || ''}`.trim();
+      let userPart = task.followup ? `${task.followup}\n\n---\nContext (${task.key}): ${task.title}` : (base || task.title);
+      userPart = stripSelfMention(userPart, preferType);
+      if (attachmentRefs.length) {
+        const lines = attachmentRefs.map(a => `- ${a.filename}: ${a.path}`).join('\n');
+        userPart += `\n\n---\nAttached files:\n${lines}\n\nWrite generated files to: ${outDir}`;
+      } else {
+        userPart += `\n\n---\nWrite generated files to: ${outDir}`;
+      }
+      const full = preamble ? `${preamble}\n---\n\n${userPart}` : userPart;
+      log(`  acpx runner: ${preferType}`);
+      await runAcpx({
+        agentType: preferType!,
+        prompt: full,
+        cwd: workingDir,
+        sessionName: `issue-${issueId}`,
+        onEvent: eventHandler,
+      });
+    } else {
       const runner = pickRunner(detected, preferType);
       for await (const event of runner(task)) await eventHandler(event);
     }