@shipers-dev/multi 0.5.0 → 0.5.1

package/dist/index.js

@@ -5198,6 +5198,7 @@ async function runAcp(opts) {
   const stream2 = ndJsonStream(output, input);
   let activeSessionId = opts.sessionId || null;
   let recording = false;
+  const alwaysAllow = new Set;
   const client = {
     async sessionUpdate(params) {
       if (!recording)
@@ -5205,7 +5206,7 @@ async function runAcp(opts) {
       await handleSessionUpdate(params, opts);
     },
     async requestPermission(params) {
-      return await handleRequestPermission(params, opts);
+      return await handleRequestPermission(params, opts, alwaysAllow);
     },
     async readTextFile(params) {
       try {
@@ -5325,8 +5326,14 @@ ${entries}` } });
         break;
     }
   }
-  async function handleRequestPermission(params, o) {
+  async function handleRequestPermission(params, o, allowCache) {
     const tc = params.toolCall || {};
+    const toolKey = `${tc.toolName || tc.title || ""}|${tc.kind || ""}`.toLowerCase();
+    if (toolKey && allowCache.has(toolKey)) {
+      const allowOpt = params.options.find((op) => /allow/i.test(op.kind || "") || /allow/i.test(op.name || ""));
+      if (allowOpt)
+        return { outcome: { outcome: "selected", optionId: allowOpt.optionId } };
+    }
     const created = await apiClient.post(`${o.apiUrl}/api/permissions`, {
       issue_id: o.issueId,
       device_id: o.deviceId,
@@ -5346,6 +5353,10 @@ ${entries}` } });
       if (!row)
         break;
       if (row.status === "resolved" && row.chosen) {
+        const chosenOpt = params.options.find((op) => op.optionId === row.chosen);
+        const isAlways = chosenOpt && (/always/i.test(chosenOpt.name || "") || /allow_always/i.test(chosenOpt.kind || ""));
+        if (isAlways && toolKey)
+          allowCache.add(toolKey);
         return { outcome: { outcome: "selected", optionId: row.chosen } };
       }
       if (row.status === "cancelled") {
@@ -5381,7 +5392,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.0";
+var VERSION = "0.5.1";
 var COMMANDS = {
   setup: "Register this device with a workspace",
   connect: "Connect device to realtime hub and execute assigned tasks",
@@ -5833,29 +5844,71 @@ async function handleRunTask(apiUrl, deviceId, task, detected) {
     } catch {}
   };
   const turn = {
-    text: "",
-    toolOrder: [],
+    blocks: [],
     tools: new Map,
     plans: [],
     progress: [],
     result: null,
     error: null
   };
+  const appendText = (text) => {
+    const last = turn.blocks[turn.blocks.length - 1];
+    if (last && last.kind === "text")
+      last.text += text;
+    else
+      turn.blocks.push({ kind: "text", text });
+  };
+  const upsertTool = (id, patch) => {
+    const existing = turn.tools.get(id);
+    if (existing) {
+      if (patch.tool && patch.tool !== "tool")
+        existing.tool = patch.tool;
+      if (patch.kind)
+        existing.kind = patch.kind;
+      if (patch.status)
+        existing.status = patch.status;
+      if (patch.input !== undefined)
+        existing.input = patch.input;
+    } else {
+      turn.tools.set(id, { id, tool: patch.tool || "tool", kind: patch.kind, status: patch.status, input: patch.input, results: [] });
+      turn.blocks.push({ kind: "tool", id });
+    }
+  };
+  const toolLabel = (t) => {
+    const clean = stripMd(t.tool);
+    if (clean && clean !== "tool")
+      return clean;
+    if (t.input && typeof t.input === "object") {
+      if (t.input.command)
+        return `Bash: ${String(t.input.command).split(`
+`)[0].slice(0, 60)}`;
+      if (t.input.file_path)
+        return `${t.kind === "edit" ? "Edit" : "Read"}: ${t.input.file_path}`;
+      if (t.input.pattern)
+        return `Grep: ${t.input.pattern}`;
+      if (t.input.url)
+        return `Fetch: ${t.input.url}`;
+    }
+    return t.kind ? `${t.kind}` : "tool";
+  };
   const render = () => {
     const parts = [];
-    if (turn.text)
-      parts.push(turn.text);
-    for (const id of turn.toolOrder) {
-      const t = turn.tools.get(id);
+    for (const b of turn.blocks) {
+      if (b.kind === "text") {
+        if (b.text)
+          parts.push(b.text);
+        continue;
+      }
+      const t = turn.tools.get(b.id);
       if (!t)
         continue;
       const icon = statusIcon(t.status);
-      const cleanTool = stripMd(t.tool);
-      const head = `${icon} ${cleanTool}${t.kind ? ` \xB7 ${t.kind}` : ""}${t.status && t.status !== "completed" ? ` \xB7 ${t.status}` : ""}`;
+      const label = toolLabel(t);
+      const head = `${icon} ${label}${t.status && t.status !== "completed" ? ` \xB7 ${t.status}` : ""}`;
       const body = [];
       if (t.input !== undefined && t.input !== null) {
         const inputStr = typeof t.input === "object" ? JSON.stringify(t.input, null, 2) : String(t.input);
-        body.push("```json\n" + inputStr + "\n```");
+        body.push("```json\n" + inputStr.slice(0, 2000) + "\n```");
       }
       if (t.results.length) {
         const joined = t.results.join(`
@@ -5917,7 +5970,7 @@ _${bits.join(" \xB7 ")}_`);
       }
       case "assistant_text": {
         await ensureLiveComment();
-        turn.text += p.text;
+        appendText(p.text);
         hasAssistantText = true;
         schedulePatch();
         break;
@@ -5925,8 +5978,8 @@ _${bits.join(" \xB7 ")}_`);
       case "stdout": {
         if (p.line) {
           await ensureLiveComment();
-          turn.text += (turn.text ? `
-` : "") + p.line;
+          appendText((turn.blocks.length ? `
+` : "") + p.line);
           hasAssistantText = true;
           schedulePatch();
         }
@@ -5934,36 +5987,24 @@ _${bits.join(" \xB7 ")}_`);
       }
       case "tool_call": {
         await ensureLiveComment();
-        const id = p.id || `anon-${turn.toolOrder.length}`;
-        const existing = turn.tools.get(id);
-        if (existing) {
-          if (p.tool)
-            existing.tool = p.tool;
-          if (p.kind)
-            existing.kind = p.kind;
-          if (p.status)
-            existing.status = p.status;
-          if (p.input !== undefined)
-            existing.input = p.input;
-        } else {
-          turn.toolOrder.push(id);
-          turn.tools.set(id, { id, tool: p.tool || "tool", kind: p.kind, status: p.status, input: p.input, results: [] });
-        }
+        const id = p.id || `anon-${turn.tools.size}`;
+        upsertTool(id, { tool: p.tool, kind: p.kind, status: p.status, input: p.input });
         schedulePatch();
         break;
       }
       case "tool_result": {
         await ensureLiveComment();
-        const id = p.tool_use_id || turn.toolOrder[turn.toolOrder.length - 1];
+        const lastToolId = [...turn.blocks].reverse().find((b) => b.kind === "tool")?.id;
+        const id = p.tool_use_id || lastToolId;
         const entry = id ? turn.tools.get(id) : undefined;
         const content = String(p.content ?? "").trim();
         if (entry && content) {
           entry.results.push(content);
           schedulePatch();
         } else if (content) {
-          const pid = `result-${turn.toolOrder.length}`;
-          turn.toolOrder.push(pid);
-          turn.tools.set(pid, { id: pid, tool: "tool result", results: [content] });
+          const pid = `result-${turn.tools.size}`;
+          upsertTool(pid, { tool: "tool result" });
+          turn.tools.get(pid).results.push(content);
           schedulePatch();
         }
         break;
@@ -5973,7 +6014,7 @@ _${bits.join(" \xB7 ")}_`);
         if (p.is_error)
           hadError = true;
         if (!hasAssistantText && p.result) {
-          turn.text = p.result;
+          appendText(p.result);
           hasAssistantText = true;
         }
         turn.result = { duration_ms: p.duration_ms, total_cost_usd: p.total_cost_usd, stopReason: p.stopReason, is_error: p.is_error };

package/package.json

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

package/src/acp-runner.ts

@@ -54,6 +54,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
 
   let activeSessionId: string | null = opts.sessionId || null;
   let recording = false; // only forward events after prompt() starts
+  const alwaysAllow = new Set<string>(); // keys: toolName|kind that user said "always allow"
 
   const client: Client = {
     async sessionUpdate(params: SessionNotification): Promise<void> {
@@ -61,7 +62,7 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
       await handleSessionUpdate(params, opts);
     },
     async requestPermission(params: RequestPermissionRequest): Promise<RequestPermissionResponse> {
-      return await handleRequestPermission(params, opts);
+      return await handleRequestPermission(params, opts, alwaysAllow);
     },
     async readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
       try {
@@ -170,8 +171,16 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
     }
   }
 
-  async function handleRequestPermission(params: RequestPermissionRequest, o: AcpRunOpts): Promise<RequestPermissionResponse> {
+  async function handleRequestPermission(params: RequestPermissionRequest, o: AcpRunOpts, allowCache: Set<string>): Promise<RequestPermissionResponse> {
     const tc: any = params.toolCall || {};
+    const toolKey = `${tc.toolName || tc.title || ''}|${tc.kind || ''}`.toLowerCase();
+
+    // Auto-approve if user previously chose "always allow" for same tool/kind
+    if (toolKey && allowCache.has(toolKey)) {
+      const allowOpt = (params.options as any[]).find(op => /allow/i.test(op.kind || '') || /allow/i.test(op.name || ''));
+      if (allowOpt) return { outcome: { outcome: 'selected', optionId: allowOpt.optionId } as any };
+    }
+
     const created = await apiClient.post<any>(`${o.apiUrl}/api/permissions`, {
       issue_id: o.issueId,
       device_id: o.deviceId,
@@ -183,7 +192,6 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
     const permId = created.data?.id;
     if (!permId) return { outcome: { outcome: 'cancelled' } as any };
 
-    // Poll every 500ms up to 5 min
     const deadline = Date.now() + 5 * 60 * 1000;
     while (Date.now() < deadline) {
       await new Promise(r => setTimeout(r, 500));
@@ -191,6 +199,10 @@ export async function runAcp(opts: AcpRunOpts): Promise<{ stopReason: string; se
       const row = got.data;
       if (!row) break;
       if (row.status === 'resolved' && row.chosen) {
+        // If the chosen option is an "always" variant, cache it
+        const chosenOpt = (params.options as any[]).find(op => op.optionId === row.chosen);
+        const isAlways = chosenOpt && (/always/i.test(chosenOpt.name || '') || /allow_always/i.test(chosenOpt.kind || ''));
+        if (isAlways && toolKey) allowCache.add(toolKey);
         return { outcome: { outcome: 'selected', optionId: row.chosen } as any };
       }
       if (row.status === 'cancelled') {

package/src/index.ts

@@ -16,7 +16,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.0';
+const VERSION = '0.5.1';
 
 const COMMANDS = {
   setup: 'Register this device with a workspace',
@@ -448,9 +448,9 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
   };
 
   type ToolEntry = { id: string; tool: string; kind?: string; status?: string; input?: any; results: string[] };
+  type Block = { kind: 'text'; text: string } | { kind: 'tool'; id: string };
   const turn = {
-    text: '' as string,
-    toolOrder: [] as string[],
+    blocks: [] as Block[],
     tools: new Map<string, ToolEntry>(),
     plans: [] as string[],
     progress: [] as string[],
@@ -458,20 +458,54 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
     error: null as null | string,
   };
 
+  const appendText = (text: string) => {
+    const last = turn.blocks[turn.blocks.length - 1];
+    if (last && last.kind === 'text') last.text += text;
+    else turn.blocks.push({ kind: 'text', text });
+  };
+
+  const upsertTool = (id: string, patch: Partial<ToolEntry>) => {
+    const existing = turn.tools.get(id);
+    if (existing) {
+      if (patch.tool && patch.tool !== 'tool') existing.tool = patch.tool;
+      if (patch.kind) existing.kind = patch.kind;
+      if (patch.status) existing.status = patch.status;
+      if (patch.input !== undefined) existing.input = patch.input;
+    } else {
+      turn.tools.set(id, { id, tool: patch.tool || 'tool', kind: patch.kind, status: patch.status, input: patch.input, results: [] });
+      turn.blocks.push({ kind: 'tool', id });
+    }
+  };
+
+  const toolLabel = (t: ToolEntry): string => {
+    const clean = stripMd(t.tool);
+    if (clean && clean !== 'tool') return clean;
+    // Fallback from input shape
+    if (t.input && typeof t.input === 'object') {
+      if (t.input.command) return `Bash: ${String(t.input.command).split('\n')[0].slice(0, 60)}`;
+      if (t.input.file_path) return `${t.kind === 'edit' ? 'Edit' : 'Read'}: ${t.input.file_path}`;
+      if (t.input.pattern) return `Grep: ${t.input.pattern}`;
+      if (t.input.url) return `Fetch: ${t.input.url}`;
+    }
+    return (t.kind ? `${t.kind}` : 'tool');
+  };
+
   const render = (): string => {
     const parts: string[] = [];
-    if (turn.text) parts.push(turn.text);
-
-    for (const id of turn.toolOrder) {
-      const t = turn.tools.get(id);
+    for (const b of turn.blocks) {
+      if (b.kind === 'text') {
+        if (b.text) parts.push(b.text);
+        continue;
+      }
+      const t = turn.tools.get(b.id);
       if (!t) continue;
       const icon = statusIcon(t.status);
-      const cleanTool = stripMd(t.tool);
-      const head = `${icon} ${cleanTool}${t.kind ? ` · ${t.kind}` : ''}${t.status && t.status !== 'completed' ? ` · ${t.status}` : ''}`;
+      const label = toolLabel(t);
+      const head = `${icon} ${label}${t.status && t.status !== 'completed' ? ` · ${t.status}` : ''}`;
       const body: string[] = [];
       if (t.input !== undefined && t.input !== null) {
         const inputStr = typeof t.input === 'object' ? JSON.stringify(t.input, null, 2) : String(t.input);
-        body.push('```json\n' + inputStr + '\n```');
+        body.push('```json\n' + inputStr.slice(0, 2000) + '\n```');
       }
       if (t.results.length) {
         const joined = t.results.join('\n').slice(-2000);
@@ -481,7 +515,6 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
     }
 
     if (turn.plans.length) parts.push('**Plan**\n\n' + turn.plans[turn.plans.length - 1]);
-
     if (turn.error) parts.push(`> ❌ ${turn.error}`);
 
     if (turn.result) {
@@ -517,16 +550,15 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       }
       case 'assistant_text': {
         await ensureLiveComment();
-        turn.text += p.text;
+        appendText(p.text);
         hasAssistantText = true;
         schedulePatch();
         break;
       }
       case 'stdout': {
-        // Legacy (non-ACP) runners emit stdout — route to live comment too.
         if (p.line) {
           await ensureLiveComment();
-          turn.text += (turn.text ? '\n' : '') + p.line;
+          appendText((turn.blocks.length ? '\n' : '') + p.line);
           hasAssistantText = true;
           schedulePatch();
         }
@@ -534,33 +566,24 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       }
       case 'tool_call': {
         await ensureLiveComment();
-        const id = p.id || `anon-${turn.toolOrder.length}`;
-        const existing = turn.tools.get(id);
-        if (existing) {
-          if (p.tool) existing.tool = p.tool;
-          if (p.kind) existing.kind = p.kind;
-          if (p.status) existing.status = p.status;
-          if (p.input !== undefined) existing.input = p.input;
-        } else {
-          turn.toolOrder.push(id);
-          turn.tools.set(id, { id, tool: p.tool || 'tool', kind: p.kind, status: p.status, input: p.input, results: [] });
-        }
+        const id = p.id || `anon-${turn.tools.size}`;
+        upsertTool(id, { tool: p.tool, kind: p.kind, status: p.status, input: p.input });
         schedulePatch();
         break;
       }
       case 'tool_result': {
         await ensureLiveComment();
-        const id = p.tool_use_id || turn.toolOrder[turn.toolOrder.length - 1];
+        const lastToolId = [...turn.blocks].reverse().find(b => b.kind === 'tool')?.id;
+        const id = p.tool_use_id || lastToolId;
         const entry = id ? turn.tools.get(id) : undefined;
         const content = String(p.content ?? '').trim();
         if (entry && content) {
           entry.results.push(content);
           schedulePatch();
         } else if (content) {
-          // orphan result — create a pseudo tool
-          const pid = `result-${turn.toolOrder.length}`;
-          turn.toolOrder.push(pid);
-          turn.tools.set(pid, { id: pid, tool: 'tool result', results: [content] });
+          const pid = `result-${turn.tools.size}`;
+          upsertTool(pid, { tool: 'tool result' });
+          turn.tools.get(pid)!.results.push(content);
           schedulePatch();
         }
         break;
@@ -569,7 +592,7 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
         await ensureLiveComment();
         if (p.is_error) hadError = true;
         if (!hasAssistantText && p.result) {
-          turn.text = p.result;
+          appendText(p.result);
           hasAssistantText = true;
         }
         turn.result = { duration_ms: p.duration_ms, total_cost_usd: p.total_cost_usd, stopReason: p.stopReason, is_error: p.is_error };