@shipers-dev/multi 0.12.1 → 0.14.0

package/dist/index.js

@@ -15575,7 +15575,26 @@ class RequestError extends Error {
 
 // src/acp-runner.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
-import { dirname } from "path";
+import { dirname, join } from "path";
+function ensureBypassPermissions(cwd) {
+  try {
+    const dir = join(cwd, ".claude");
+    if (!existsSync(dir))
+      mkdirSync(dir, { recursive: true });
+    const path = join(dir, "settings.local.json");
+    let json2 = {};
+    if (existsSync(path)) {
+      try {
+        json2 = JSON.parse(readFileSync(path, "utf8"));
+      } catch {
+        json2 = {};
+      }
+    }
+    json2.permissions = { ...json2.permissions || {}, defaultMode: "bypassPermissions" };
+    writeFileSync(path, JSON.stringify(json2, null, 2) + `
+`, "utf8");
+  } catch {}
+}
 function fmtErr(e) {
   if (e == null)
     return "unknown error";
@@ -15605,11 +15624,13 @@ async function runAcp(opts) {
     cleanEnv[k] = v;
   }
   const argv = Array.isArray(opts.adapterBin) ? opts.adapterBin : [opts.adapterBin];
-  const permMode = process.env.MULTI_CLAUDE_SAFE === "1" ? "default" : "bypassPermissions";
+  const cwd = opts.cwd || process.cwd();
+  if (process.env.MULTI_CLAUDE_SAFE !== "1")
+    ensureBypassPermissions(cwd);
   const child = Bun.spawn(argv, {
     stdio: ["pipe", "pipe", "inherit"],
-    cwd: opts.cwd || process.cwd(),
-    env: { ...cleanEnv, ACP_PERMISSION_MODE: permMode }
+    cwd,
+    env: cleanEnv
   });
   try {
     opts.onSpawn?.(child);
@@ -15845,9 +15866,9 @@ function extractText(content) {
 
 // src/acpx-runner.ts
 import { appendFileSync } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 var HOME = process.env.HOME || process.env.USERPROFILE || ".";
-var LOG_PATH = join(HOME, ".multi", "logs", "agent.log");
+var LOG_PATH = join2(HOME, ".multi", "logs", "agent.log");
 function dlog(msg) {
   try {
     appendFileSync(LOG_PATH, `[${new Date().toISOString()}] ${msg}
@@ -16053,7 +16074,7 @@ var StreamEventInputSchema = exports_external.object({
 // src/worktree.ts
 import { spawn } from "child_process";
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 async function run(cwd, cmd, args) {
   return await new Promise((resolve) => {
     const p = spawn(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
@@ -16080,7 +16101,7 @@ async function branchExists(dir, branch) {
   return r.code === 0;
 }
 function ensureGitignoreEntry(workingDir, entry) {
-  const gip = join2(workingDir, ".gitignore");
+  const gip = join3(workingDir, ".gitignore");
   let body = "";
   try {
     body = existsSync2(gip) ? readFileSync2(gip, "utf8") : "";
@@ -16109,8 +16130,8 @@ async function ensureWorktree(workingDir, issueKey) {
   ensureGitignoreEntry(workingDir, ".multi/");
   const key = normalizeKey(issueKey);
   const branch = `multi/${key}`;
-  const wtDir = join2(workingDir, ".multi", "worktrees");
-  const wtPath = join2(wtDir, key);
+  const wtDir = join3(workingDir, ".multi", "worktrees");
+  const wtPath = join3(wtDir, key);
   if (existsSync2(wtPath)) {
     return { path: wtPath, branch, created: false };
   }
@@ -16128,15 +16149,15 @@ async function ensureWorktree(workingDir, issueKey) {
 
 // src/materializer.ts
 import { mkdirSync as mkdirSync3, existsSync as existsSync3, writeFileSync as writeFileSync3, readFileSync as readFileSync3, rmSync, symlinkSync, lstatSync } from "fs";
-import { join as join3, dirname as dirname2 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 var HOME2 = process.env.HOME || process.env.USERPROFILE || ".";
-var MULTI_DIR = join3(HOME2, ".multi");
-var MULTI_SKILLS = join3(MULTI_DIR, "skills");
-var MULTI_AGENTS = join3(MULTI_DIR, "agents");
-var STATE_PATH = join3(MULTI_DIR, "materialized.json");
-var CLAUDE_DIR = join3(HOME2, ".claude");
-var CLAUDE_SKILLS = join3(CLAUDE_DIR, "skills");
-var CLAUDE_AGENTS = join3(CLAUDE_DIR, "agents");
+var MULTI_DIR = join4(HOME2, ".multi");
+var MULTI_SKILLS = join4(MULTI_DIR, "skills");
+var MULTI_AGENTS = join4(MULTI_DIR, "agents");
+var STATE_PATH = join4(MULTI_DIR, "materialized.json");
+var CLAUDE_DIR = join4(HOME2, ".claude");
+var CLAUDE_SKILLS = join4(CLAUDE_DIR, "skills");
+var CLAUDE_AGENTS = join4(CLAUDE_DIR, "agents");
 var MARKER = ".multi-managed";
 function slugify2(s) {
   return s.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "unnamed";
@@ -16161,7 +16182,7 @@ function safeRmManaged(path) {
       rmSync(path);
       return;
     }
-    if (st.isDirectory() && existsSync3(join3(path, MARKER))) {
+    if (st.isDirectory() && existsSync3(join4(path, MARKER))) {
       rmSync(path, { recursive: true, force: true });
       return;
     }
@@ -16173,24 +16194,24 @@ function safeRmManaged(path) {
   } catch {}
 }
 function writeManagedSkill(slug, skill) {
-  const dir = join3(MULTI_SKILLS, slug);
+  const dir = join4(MULTI_SKILLS, slug);
   mkdirSync3(dir, { recursive: true });
-  writeFileSync3(join3(dir, MARKER), `skill_id=${skill.id}
+  writeFileSync3(join4(dir, MARKER), `skill_id=${skill.id}
 revision=${Date.now()}
 `);
   if (skill.body)
-    writeFileSync3(join3(dir, "SKILL.md"), skill.body);
+    writeFileSync3(join4(dir, "SKILL.md"), skill.body);
   for (const f of skill.files || []) {
     if (f.path.includes("..") || f.path.startsWith("/"))
       continue;
     if (f.path === MARKER)
       continue;
-    const out = join3(dir, f.path);
+    const out = join4(dir, f.path);
     mkdirSync3(dirname2(out), { recursive: true });
     writeFileSync3(out, f.content);
   }
   mkdirSync3(CLAUDE_SKILLS, { recursive: true });
-  const link = join3(CLAUDE_SKILLS, slug);
+  const link = join4(CLAUDE_SKILLS, slug);
   safeRmManaged(link);
   if (!existsSync3(link)) {
     try {
@@ -16202,7 +16223,7 @@ function writeManagedAgent(slug, agent, skillsForAgent) {
   if (agent.type !== "claude-code")
     return;
   mkdirSync3(CLAUDE_AGENTS, { recursive: true });
-  const out = join3(CLAUDE_AGENTS, `${slug}.md`);
+  const out = join4(CLAUDE_AGENTS, `${slug}.md`);
   safeRmManaged(out);
   const tools = agent.allowed_tools ? `
 tools: ${agent.allowed_tools}` : "";
@@ -16248,13 +16269,13 @@ async function materializeBundle(apiUrl, deviceId, log) {
   }
   for (const old of prev.skill_slugs) {
     if (!newSkillSlugs.includes(old)) {
-      safeRmManaged(join3(MULTI_SKILLS, old));
-      safeRmManaged(join3(CLAUDE_SKILLS, old));
+      safeRmManaged(join4(MULTI_SKILLS, old));
+      safeRmManaged(join4(CLAUDE_SKILLS, old));
     }
   }
   for (const old of prev.agent_slugs) {
     if (!newAgentSlugs.includes(old)) {
-      safeRmManaged(join3(CLAUDE_AGENTS, `${old}.md`));
+      safeRmManaged(join4(CLAUDE_AGENTS, `${old}.md`));
     }
   }
   saveState({ revision: bundle.revision, skill_slugs: newSkillSlugs, agent_slugs: newAgentSlugs });
@@ -16268,11 +16289,11 @@ function lastMaterializedRevision() {
 // src/index.ts
 import { parseArgs } from "util";
 import { mkdirSync as mkdirSync4, existsSync as existsSync4, writeFileSync as writeFileSync4, readFileSync as readFileSync4, appendFileSync as appendFileSync2, unlinkSync, readdirSync as readdirSync2, statSync as statSync2 } from "fs";
-import { join as join4, dirname as dirname3 } from "path";
+import { join as join5, dirname as dirname3 } from "path";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.12.1",
+  version: "0.14.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -16295,14 +16316,14 @@ var package_default = {
 
 // src/index.ts
 var HOME3 = process.env.HOME || process.env.USERPROFILE || ".";
-var MULTI_DIR2 = join4(HOME3, ".multi");
-var CONFIG_PATH = join4(MULTI_DIR2, "config.json");
-var PID_PATH = join4(MULTI_DIR2, "agent.pid");
-var PORT_PATH = join4(MULTI_DIR2, "agent.port");
-var LOG_PATH2 = join4(MULTI_DIR2, "logs", "agent.log");
-var SKILLS_DIR = join4(MULTI_DIR2, "skills");
-var STOP_PATH = join4(MULTI_DIR2, "stop.flag");
-var TASKS_DB_PATH = join4(MULTI_DIR2, "tasks.db");
+var MULTI_DIR2 = join5(HOME3, ".multi");
+var CONFIG_PATH = join5(MULTI_DIR2, "config.json");
+var PID_PATH = join5(MULTI_DIR2, "agent.pid");
+var PORT_PATH = join5(MULTI_DIR2, "agent.port");
+var LOG_PATH2 = join5(MULTI_DIR2, "logs", "agent.log");
+var SKILLS_DIR = join5(MULTI_DIR2, "skills");
+var STOP_PATH = join5(MULTI_DIR2, "stop.flag");
+var TASKS_DB_PATH = join5(MULTI_DIR2, "tasks.db");
 var VERSION = package_default.version;
 var COMMANDS = {
   setup: "Register this device with a workspace",
@@ -16315,7 +16336,7 @@ var COMMANDS = {
   reset: "Reset acpx session for an issue (--issue <id>)"
 };
 function ensureDirs() {
-  for (const d of [MULTI_DIR2, join4(MULTI_DIR2, "logs"), SKILLS_DIR]) {
+  for (const d of [MULTI_DIR2, join5(MULTI_DIR2, "logs"), SKILLS_DIR]) {
     if (!existsSync4(d))
       mkdirSync4(d, { recursive: true });
   }
@@ -16715,7 +16736,7 @@ async function cmdConnect(apiUrl, config2) {
   try {
     writeFileSync4(PORT_PATH, String(port));
   } catch {}
-  let tunnel = await startTunnel(port);
+  let tunnel = await startTunnel(port, log);
   if (!tunnel) {
     log("\u274C cloudflared did not emit a tunnel URL \u2014 is `cloudflared` installed? (`brew install cloudflared`)");
     try {
@@ -16785,7 +16806,7 @@ async function cmdConnect(apiUrl, config2) {
         old?.child.kill();
       } catch {}
       for (let attempt = 1;alive; attempt++) {
-        const next = await startTunnel(port);
+        const next = await startTunnel(port, log);
         if (next) {
           tunnel = next;
           log(`\u2601\uFE0F  Tunnel up: ${tunnel.url}`);
@@ -16854,21 +16875,77 @@ async function cmdConnect(apiUrl, config2) {
     }
   }
 }
-async function startTunnel(port) {
+async function startTunnel(port, log2 = () => {}) {
+  const named = process.env.MULTI_TUNNEL_NAME?.trim();
+  const hostname3 = process.env.MULTI_TUNNEL_HOSTNAME?.trim();
+  if (named) {
+    if (!hostname3) {
+      log2("\u274C MULTI_TUNNEL_NAME set but MULTI_TUNNEL_HOSTNAME missing \u2014 set the public hostname routed to this tunnel");
+      return null;
+    }
+    const args = ["tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${port}`, "run", named];
+    const child2 = Bun.spawn(["cloudflared", ...args], { stdout: "pipe", stderr: "pipe", stdin: "ignore" });
+    const ok = await waitNamedTunnelReady(child2.stderr);
+    if (!ok.ready) {
+      try {
+        child2.kill();
+      } catch {}
+      if (ok.tail) {
+        const lines = ok.tail.split(`
+`).filter(Boolean).slice(-6);
+        for (const l of lines)
+          log2(`   cloudflared: ${l}`);
+      }
+      return null;
+    }
+    const url3 = hostname3.startsWith("http") ? hostname3.replace(/\/+$/, "") : `https://${hostname3}`;
+    return { child: child2, url: url3 };
+  }
   const child = Bun.spawn(["cloudflared", "tunnel", "--no-autoupdate", "--url", `http://127.0.0.1:${port}`], {
     stdout: "pipe",
     stderr: "pipe",
     stdin: "ignore"
   });
-  const url2 = await parseTunnelUrl(child.stderr);
+  const { url: url2, tail } = await parseTunnelUrl(child.stderr);
   if (!url2) {
     try {
       child.kill();
     } catch {}
+    if (tail) {
+      const lines = tail.split(`
+`).filter(Boolean).slice(-6);
+      for (const l of lines)
+        log2(`   cloudflared: ${l}`);
+    }
     return null;
   }
   return { child, url: url2 };
 }
+async function waitNamedTunnelReady(stream2) {
+  const reader = stream2.getReader();
+  const dec = new TextDecoder;
+  const deadline = Date.now() + 30000;
+  let buf = "";
+  while (Date.now() < deadline) {
+    const { value, done } = await reader.read();
+    if (done)
+      break;
+    buf += dec.decode(value, { stream: true });
+    if (/Registered tunnel connection|Connection [a-z0-9-]+ registered/i.test(buf)) {
+      (async () => {
+        try {
+          while (true) {
+            const { done: done2 } = await reader.read();
+            if (done2)
+              break;
+          }
+        } catch {}
+      })();
+      return { ready: true, tail: buf };
+    }
+  }
+  return { ready: false, tail: buf };
+}
 async function probeTunnel(url2) {
   try {
     const ctrl = new AbortController;
@@ -16934,10 +17011,10 @@ async function parseTunnelUrl(stream2) {
           }
         } catch {}
       })();
-      return m[1];
+      return { url: m[1], tail: buf };
     }
   }
-  return null;
+  return { url: null, tail: buf };
 }
 async function markStopped(apiUrl, issueId, reason) {
   try {
@@ -16974,13 +17051,13 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
   await postStream(apiUrl, issueId, "progress", { message: `Device ${deviceId} picked up ${isFollowup ? "follow-up" : "task"}` });
   let attachmentRefs = [];
   if (task.from_comment_id) {
-    const baseDir = workingDir || join4(MULTI_DIR2, "tmp", issueId);
-    const inDir = join4(baseDir, ".multi-in", task.from_comment_id);
+    const baseDir = workingDir || join5(MULTI_DIR2, "tmp", issueId);
+    const inDir = join5(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 = join4(workingDir || join4(MULTI_DIR2, "tmp", issueId), ".multi-out");
+  const outDir = join5(workingDir || join5(MULTI_DIR2, "tmp", issueId), ".multi-out");
   let liveCommentId;
   let liveBody = "";
   let hadError = false;
@@ -17706,23 +17783,25 @@ async function resolveAcpAdapter(agentType, detectedPath) {
   if (agentType === "pi" && detectedPath && existsSync4(detectedPath)) {
     return [detectedPath, "--mode", "rpc"];
   }
-  const adapterName = "claude-agent-acp";
-  const candidates = [
-    join4(HOME3, ".bun", "install", "global", "node_modules", ".bin", adapterName)
-  ];
-  try {
-    const here = new URL(import.meta.url).pathname;
-    let dir = here;
-    for (let i = 0;i < 8; i++) {
-      dir = dirname3(dir);
-      const bin = join4(dir, "node_modules", ".bin", adapterName);
-      if (existsSync4(bin))
-        return [bin];
-    }
-  } catch {}
-  for (const c of candidates)
-    if (existsSync4(c))
-      return [c];
+  const override = process.env.MULTI_ACP_ADAPTER?.trim();
+  const adapterNames = override ? [override] : ["claude-code-acp", "claude-agent-acp"];
+  for (const name of adapterNames) {
+    if (name.startsWith("/") && existsSync4(name))
+      return [name];
+    try {
+      const here = new URL(import.meta.url).pathname;
+      let dir = here;
+      for (let i = 0;i < 8; i++) {
+        dir = dirname3(dir);
+        const bin = join5(dir, "node_modules", ".bin", name);
+        if (existsSync4(bin))
+          return [bin];
+      }
+    } catch {}
+    const global = join5(HOME3, ".bun", "install", "global", "node_modules", ".bin", name);
+    if (existsSync4(global))
+      return [global];
+  }
   return null;
 }
 async function ackDispatch(apiUrl, dispatchId, secret) {
@@ -17773,7 +17852,7 @@ async function postStream(apiUrl, issueId, event_type, payload) {
   try {
     ensureDirs();
     const date5 = new Date().toISOString().slice(0, 10);
-    const path = join4(MULTI_DIR2, "logs", `events-${date5}.ndjson`);
+    const path = join5(MULTI_DIR2, "logs", `events-${date5}.ndjson`);
     appendFileSync2(path, JSON.stringify({ ts: Date.now(), issue_id: issueId, event_type, payload }) + `
 `);
   } catch {}
@@ -17796,7 +17875,7 @@ async function downloadCommentAttachments(apiUrl, commentId, destDir) {
         continue;
       const buf = new Uint8Array(await res.arrayBuffer());
       const safe = it.filename.replace(/[^A-Za-z0-9._-]/g, "_");
-      const p = join4(destDir, safe);
+      const p = join5(destDir, safe);
       writeFileSync4(p, buf);
       out.push({ filename: it.filename, path: p });
     }
@@ -17817,7 +17896,7 @@ async function uploadOutputDir(apiUrl, commentId, dir) {
     if (depth > 3)
       return;
     for (const name of readdirSync2(d)) {
-      const p = join4(d, name);
+      const p = join5(d, name);
       try {
         const st = statSync2(p);
         if (st.isDirectory())

package/package.json

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