@shipers-dev/multi 0.2.0 → 0.3.1

package/dist/index.js

@@ -5368,7 +5368,7 @@ function extractText(content) {
 
 // src/index.ts
 import { parseArgs } from "util";
-import { mkdirSync as mkdirSync2, existsSync as existsSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync2, appendFileSync, unlinkSync } from "fs";
+import { mkdirSync as mkdirSync2, existsSync as existsSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync2, appendFileSync, unlinkSync, readdirSync, statSync } from "fs";
 import { join, dirname as dirname2 } from "path";
 var HOME = process.env.HOME || process.env.USERPROFILE || ".";
 var MULTI_DIR = join(HOME, ".multi");
@@ -5649,9 +5649,19 @@ async function cmdConnect(apiUrl, config) {
 async function handleRunTask(apiUrl, deviceId, task, detected) {
   const issueId = task.issue_id;
   const isFollowup = !!task.followup;
-  log(`\u25B6 run_task ${task.key}: ${isFollowup ? "(follow-up) " : ""}${task.title}`);
+  const workingDir = task.working_dir && existsSync2(task.working_dir) ? task.working_dir : undefined;
+  log(`\u25B6 run_task ${task.key}: ${isFollowup ? "(follow-up) " : ""}${task.title}${workingDir ? ` [cwd: ${workingDir}]` : ""}`);
   await apiClient.patch(`${apiUrl}/api/issues/${issueId}`, { status: "in_progress" });
   await postStream(apiUrl, issueId, "progress", { message: `Device ${deviceId} picked up ${isFollowup ? "follow-up" : "task"}` });
+  let attachmentRefs = [];
+  if (task.from_comment_id) {
+    const baseDir = workingDir || join(MULTI_DIR, "tmp", issueId);
+    const inDir = join(baseDir, ".multi-in", task.from_comment_id);
+    attachmentRefs = await downloadCommentAttachments(apiUrl, task.from_comment_id, inDir);
+    if (attachmentRefs.length)
+      log(`  fetched ${attachmentRefs.length} attachment(s) \u2192 ${inDir}`);
+  }
+  const outDir = join(workingDir || join(MULTI_DIR, "tmp", issueId), ".multi-out");
   let liveCommentId;
   let liveBody = "";
   let hadError = false;
@@ -5764,9 +5774,7 @@ _${bits.join(" \xB7 ")}_`);
       }
       case "assistant_text": {
         await ensureLiveComment();
-        turn.text += (turn.text ? `
-
-` : "") + p.text;
+        turn.text += p.text;
         hasAssistantText = true;
         schedulePatch();
         break;
@@ -5855,6 +5863,22 @@ ${task.description || ""}`.trim();
 ---
 Context (original task ${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 (on local disk, read them with your tools):
+${lines}
+
+To return generated files, write them to: ${outDir}`;
+      } else {
+        userPart += `
+
+---
+To return generated files, write them to: ${outDir}`;
+      }
       let preamble = "";
       try {
         const agentRes = await apiClient.get(`${apiUrl}/api/agents/${task.agent_id}`);
@@ -5907,6 +5931,7 @@ ${userPart}` : userPart;
         prompt,
         sessionId: task.session_id || null,
         adapterBin,
+        cwd: workingDir,
         onEvent: eventHandler,
         onSession: async (sid) => {
           try {
@@ -5926,6 +5951,11 @@ ${userPart}` : userPart;
       for await (const event of runner(task))
         await eventHandler(event);
     }
+    if (liveCommentId) {
+      const n = await uploadOutputDir(apiUrl, liveCommentId, outDir);
+      if (n > 0)
+        log(`  \uD83D\uDCCE uploaded ${n} output file(s)`);
+    }
     if (hadError) {
       await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {});
       log(`  \u2717 ${task.key} failed`);
@@ -5986,6 +6016,80 @@ async function resolveAcpAdapter(agentType, detectedPath) {
 async function postStream(apiUrl, issueId, event_type, payload) {
   await apiClient.post(`${apiUrl}/api/streams/${issueId}`, { event_type, payload });
 }
+async function downloadCommentAttachments(apiUrl, commentId, destDir) {
+  try {
+    const list = await apiClient.get(`${apiUrl}/api/attachments/comments/${commentId}`);
+    const items = list.data?.results || list.data || [];
+    if (!Array.isArray(items) || items.length === 0)
+      return [];
+    mkdirSync2(destDir, { recursive: true });
+    const token = authTokenHeader();
+    const out = [];
+    for (const it of items) {
+      const res = await fetch(`${apiUrl}/api/attachments/${it.id}`, { headers: token ? { Authorization: token } : {} });
+      if (!res.ok)
+        continue;
+      const buf = new Uint8Array(await res.arrayBuffer());
+      const safe = it.filename.replace(/[^A-Za-z0-9._-]/g, "_");
+      const p = join(destDir, safe);
+      writeFileSync2(p, buf);
+      out.push({ filename: it.filename, path: p });
+    }
+    return out;
+  } catch {
+    return [];
+  }
+}
+function authTokenHeader() {
+  const cfg = loadConfig();
+  return cfg.token ? `Bearer ${cfg.token}` : null;
+}
+async function uploadOutputDir(apiUrl, commentId, dir) {
+  if (!existsSync2(dir))
+    return 0;
+  const files = [];
+  const walk = (d, depth = 0) => {
+    if (depth > 3)
+      return;
+    for (const name of readdirSync(d)) {
+      const p = join(d, name);
+      try {
+        const st = statSync(p);
+        if (st.isDirectory())
+          walk(p, depth + 1);
+        else if (st.isFile())
+          files.push(p);
+      } catch {}
+    }
+  };
+  walk(dir);
+  if (!files.length)
+    return 0;
+  const token = authTokenHeader();
+  let uploaded = 0;
+  for (const f of files) {
+    try {
+      const data = readFileSync2(f);
+      const form = new FormData;
+      const blob = new Blob([data]);
+      form.append("file", blob, f.split("/").pop() || "file");
+      const res = await fetch(`${apiUrl}/api/attachments/comments/${commentId}`, {
+        method: "POST",
+        body: form,
+        headers: token ? { Authorization: token } : {}
+      });
+      if (res.ok) {
+        uploaded++;
+        try {
+          unlinkSync(f);
+        } catch {}
+      }
+    } catch (e) {
+      log(`upload failed for ${f}: ${String(e)}`);
+    }
+  }
+  return uploaded;
+}
 function pickRunner(detected, preferType) {
   const forceStub = process.env.MULTI_STUB === "1";
   if (forceStub || !detected.length)
@@ -6017,7 +6121,7 @@ Context (original task ${task.key}): ${task.title}` : base || task.title;
     yield { event_type: "progress", payload: { message: `spawning ${agent.type}`, cmd: `${agent.path} ${args.slice(0, 2).join(" ")} \u2026` } };
     let proc;
     try {
-      proc = Bun.spawn([agent.path, ...args], { stdout: "pipe", stderr: "pipe", stdin: "ignore" });
+      proc = Bun.spawn([agent.path, ...args], { stdout: "pipe", stderr: "pipe", stdin: "ignore", cwd: task?.working_dir || undefined });
     } catch (e) {
       yield { event_type: "error", payload: { message: `spawn failed: ${String(e)}` } };
       return;

package/package.json

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

package/src/index.ts

@@ -4,7 +4,7 @@ import { detectAgents } from './detect';
 import { apiClient, setAuthToken } from './client';
 import { runAcp } from './acp-runner';
 import { parseArgs } from 'util';
-import { mkdirSync, existsSync, writeFileSync, readFileSync, appendFileSync, unlinkSync } from 'fs';
+import { mkdirSync, existsSync, writeFileSync, readFileSync, appendFileSync, unlinkSync, readdirSync, statSync } from 'fs';
 import { join, dirname } from 'path';
 
 const HOME = process.env.HOME || process.env.USERPROFILE || '.';
@@ -284,11 +284,22 @@ async function cmdConnect(apiUrl: string, config: Config) {
 async function handleRunTask(apiUrl: string, deviceId: string, task: any, detected: { type: string; path: string }[]) {
   const issueId = task.issue_id;
   const isFollowup = !!task.followup;
-  log(`▶ run_task ${task.key}: ${isFollowup ? '(follow-up) ' : ''}${task.title}`);
+  const workingDir = task.working_dir && existsSync(task.working_dir) ? task.working_dir : undefined;
+  log(`▶ run_task ${task.key}: ${isFollowup ? '(follow-up) ' : ''}${task.title}${workingDir ? ` [cwd: ${workingDir}]` : ''}`);
 
   await apiClient.patch(`${apiUrl}/api/issues/${issueId}`, { status: 'in_progress' });
   await postStream(apiUrl, issueId, 'progress', { message: `Device ${deviceId} picked up ${isFollowup ? 'follow-up' : 'task'}` });
 
+  // Fetch attachments from originating comment into a scratch dir under working_dir (or tmp)
+  let attachmentRefs: { filename: string; path: string }[] = [];
+  if (task.from_comment_id) {
+    const baseDir = workingDir || join(MULTI_DIR, 'tmp', issueId);
+    const inDir = join(baseDir, '.multi-in', task.from_comment_id);
+    attachmentRefs = await downloadCommentAttachments(apiUrl, task.from_comment_id, inDir);
+    if (attachmentRefs.length) log(`  fetched ${attachmentRefs.length} attachment(s) → ${inDir}`);
+  }
+  const outDir = join(workingDir || join(MULTI_DIR, 'tmp', issueId), '.multi-out');
+
   let liveCommentId: string | undefined;
   let liveBody = '';
   let hadError = false;
@@ -379,7 +390,7 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       }
       case 'assistant_text': {
         await ensureLiveComment();
-        turn.text += (turn.text ? '\n\n' : '') + p.text;
+        turn.text += p.text;
         hasAssistantText = true;
         schedulePatch();
         break;
@@ -463,6 +474,12 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
         ? `${task.followup}\n\n---\nContext (original task ${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 (on local disk, read them with your tools):\n${lines}\n\nTo return generated files, write them to: ${outDir}`;
+      } else {
+        userPart += `\n\n---\nTo return generated files, write them to: ${outDir}`;
+      }
 
       // Pull agent + linked skills to construct system/context preamble
       let preamble = '';
@@ -502,6 +519,7 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
         apiUrl, issueId, deviceId, prompt,
         sessionId: task.session_id || null,
         adapterBin,
+        cwd: workingDir,
         onEvent: eventHandler,
         onSession: async (sid) => {
           try { await apiClient.patch(`${apiUrl}/api/issues/${issueId}`, { session_id: sid } as any); } catch {}
@@ -519,6 +537,12 @@ async function handleRunTask(apiUrl: string, deviceId: string, task: any, detect
       for await (const event of runner(task)) await eventHandler(event);
     }
 
+    // Upload any files the agent wrote to .multi-out as attachments on the live comment
+    if (liveCommentId) {
+      const n = await uploadOutputDir(apiUrl, liveCommentId, outDir);
+      if (n > 0) log(`  📎 uploaded ${n} output file(s)`);
+    }
+
     if (hadError) { await apiClient.post(`${apiUrl}/api/issues/${issueId}/fail`, {}); log(`  ✗ ${task.key} failed`); }
     else { await apiClient.post(`${apiUrl}/api/issues/${issueId}/complete`, {}); log(`  ✓ ${task.key} complete`); }
   } catch (e) {
@@ -577,6 +601,69 @@ async function postStream(apiUrl: string, issueId: string, event_type: string, p
   await apiClient.post(`${apiUrl}/api/streams/${issueId}`, { event_type, payload });
 }
 
+// Download attachments of a comment to a local dir. Returns list of absolute paths.
+async function downloadCommentAttachments(apiUrl: string, commentId: string, destDir: string): Promise<{ filename: string; path: string }[]> {
+  try {
+    const list = await apiClient.get<any>(`${apiUrl}/api/attachments/comments/${commentId}`);
+    const items = list.data?.results || list.data || [];
+    if (!Array.isArray(items) || items.length === 0) return [];
+    mkdirSync(destDir, { recursive: true });
+    const token = authTokenHeader();
+    const out: { filename: string; path: string }[] = [];
+    for (const it of items) {
+      const res = await fetch(`${apiUrl}/api/attachments/${it.id}`, { headers: token ? { Authorization: token } : {} });
+      if (!res.ok) continue;
+      const buf = new Uint8Array(await res.arrayBuffer());
+      const safe = it.filename.replace(/[^A-Za-z0-9._-]/g, '_');
+      const p = join(destDir, safe);
+      writeFileSync(p, buf);
+      out.push({ filename: it.filename, path: p });
+    }
+    return out;
+  } catch { return []; }
+}
+
+function authTokenHeader(): string | null {
+  const cfg = loadConfig();
+  return cfg.token ? `Bearer ${cfg.token}` : null;
+}
+
+// Scan a directory for files (recursive, shallow cap) and upload each as an attachment to a comment.
+async function uploadOutputDir(apiUrl: string, commentId: string, dir: string): Promise<number> {
+  if (!existsSync(dir)) return 0;
+  const files: string[] = [];
+  const walk = (d: string, depth = 0) => {
+    if (depth > 3) return;
+    for (const name of readdirSync(d)) {
+      const p = join(d, name);
+      try {
+        const st = statSync(p);
+        if (st.isDirectory()) walk(p, depth + 1);
+        else if (st.isFile()) files.push(p);
+      } catch {}
+    }
+  };
+  walk(dir);
+  if (!files.length) return 0;
+  const token = authTokenHeader();
+  let uploaded = 0;
+  for (const f of files) {
+    try {
+      const data = readFileSync(f);
+      const form = new FormData();
+      const blob = new Blob([data]);
+      form.append('file', blob, f.split('/').pop() || 'file');
+      const res = await fetch(`${apiUrl}/api/attachments/comments/${commentId}`, {
+        method: 'POST',
+        body: form,
+        headers: token ? { Authorization: token } : {},
+      });
+      if (res.ok) { uploaded++; try { unlinkSync(f); } catch {} }
+    } catch (e) { log(`upload failed for ${f}: ${String(e)}`); }
+  }
+  return uploaded;
+}
+
 type StreamEvent = { event_type: 'progress' | 'stdout' | 'stderr' | 'tool_call' | 'done' | 'error'; payload: any };
 type Runner = (task: any) => AsyncGenerator<StreamEvent>;
 
@@ -610,7 +697,7 @@ function makeCliRunner(agent: { type: string; path: string }): Runner {
 
     let proc: ReturnType<typeof Bun.spawn>;
     try {
-      proc = Bun.spawn([agent.path, ...args], { stdout: 'pipe', stderr: 'pipe', stdin: 'ignore' });
+      proc = Bun.spawn([agent.path, ...args], { stdout: 'pipe', stderr: 'pipe', stdin: 'ignore', cwd: (task as any)?.working_dir || undefined });
     } catch (e) {
       yield { event_type: 'error', payload: { message: `spawn failed: ${String(e)}` } };
       return;