@shipers-dev/multi 0.63.0 → 0.65.0

package/dist/index.js

@@ -17116,29 +17116,49 @@ async function ensureWorktree(workingDir, issueKey, issueId, opts) {
     return { path: workingDir, branch: "", created: false };
   }
   ensureGitignoreEntry(workingDir, ".multi/");
-  const key = normalizeKey(issueKey);
-  const branch = `multi/${key}`;
+  const slug = normalizeKey(opts?.worktreeName ?? issueKey);
+  const branch = `multi/${slug}`;
   const wtDir = join5(workingDir, ".multi", "worktrees");
-  const wtPath = join5(wtDir, key);
+  const wtPath = join5(wtDir, slug);
+  let baseRef = "HEAD";
+  const explicit = opts?.baseBranch || opts?.parentBranch || null;
+  if (explicit) {
+    const localOk = await branchExists(workingDir, explicit);
+    if (localOk) {
+      baseRef = explicit;
+    } else {
+      const fetched = await run3(workingDir, "git", ["fetch", "origin", `${explicit}:${explicit}`]);
+      if (fetched.code === 0)
+        baseRef = explicit;
+    }
+  }
   if (existsSync3(wtPath)) {
+    if (await isDirty(wtPath)) {
+      throw new WorktreeDirtyError({ path: wtPath, branch, reason: "dirty" });
+    }
+    if (opts?.baseBranch) {
+      const mergeBase = await run3(wtPath, "git", ["merge-base", branch, opts.baseBranch]);
+      if (mergeBase.code === 0 && mergeBase.stdout) {
+        const forkOnBase = await run3(workingDir, "git", ["merge-base", "--is-ancestor", mergeBase.stdout, opts.baseBranch]);
+        if (forkOnBase.code === 1) {
+          const baseHead = await run3(workingDir, "git", ["rev-parse", "--verify", `${opts.baseBranch}^{commit}`]);
+          throw new WorktreeDirtyError({
+            path: wtPath,
+            branch,
+            reason: "base_mismatch",
+            expectedBase: opts.baseBranch,
+            actualBase: baseHead.code === 0 ? baseHead.stdout : mergeBase.stdout
+          });
+        }
+      }
+    }
     if (issueId)
-      setWorktreeIndexEntry(workingDir, key, issueId);
+      setWorktreeIndexEntry(workingDir, slug, issueId);
     return { path: wtPath, branch, created: false };
   }
   try {
     mkdirSync3(wtDir, { recursive: true });
   } catch {}
-  let baseRef = "HEAD";
-  if (opts?.parentBranch) {
-    const localOk = await branchExists(workingDir, opts.parentBranch);
-    if (localOk) {
-      baseRef = opts.parentBranch;
-    } else {
-      const fetched = await run3(workingDir, "git", ["fetch", "origin", `${opts.parentBranch}:${opts.parentBranch}`]);
-      if (fetched.code === 0)
-        baseRef = opts.parentBranch;
-    }
-  }
   const exists4 = await branchExists(workingDir, branch);
   const args2 = exists4 ? ["worktree", "add", wtPath, branch] : ["worktree", "add", "-b", branch, wtPath, baseRef];
   const r = await run3(workingDir, "git", args2);
@@ -17147,7 +17167,7 @@ async function ensureWorktree(workingDir, issueKey, issueId, opts) {
   }
   await linkIgnoredFiles(workingDir, wtPath);
   if (issueId)
-    setWorktreeIndexEntry(workingDir, key, issueId);
+    setWorktreeIndexEntry(workingDir, slug, issueId);
   return { path: wtPath, branch, created: true };
 }
 async function linkIgnoredFiles(workingDir, wtPath) {
@@ -17274,7 +17294,17 @@ async function squashMergeChild(wtPath, childBranch, childKey) {
   result.message = `${childKey} squash-merged (${stagedFiles.length} file${stagedFiles.length === 1 ? "" : "s"})`;
   return result;
 }
-var init_worktree = () => {};
+var WorktreeDirtyError;
+var init_worktree = __esm(() => {
+  WorktreeDirtyError = class WorktreeDirtyError extends Error {
+    details;
+    code = "E_WORKTREE_DIRTY";
+    constructor(details) {
+      super(`worktree dirty or base-mismatched at ${details.path} (${details.reason})`);
+      this.details = details;
+    }
+  };
+});
 
 // ../../node_modules/zod/v4/core/core.js
 function $constructor(name, initializer, params) {
@@ -34022,7 +34052,8 @@ var init_streams = __esm(() => {
     "stopped",
     "queued",
     "worktree_created",
-    "worktree_error"
+    "worktree_error",
+    "worktree_dirty"
   ];
   StreamEventTypeSchema = exports_external.enum(STREAM_EVENT_TYPES);
   StreamEventInputSchema = exports_external.object({
@@ -34220,7 +34251,7 @@ function parsePlanBlocks(text) {
   }
   return { actions, errors: errors3 };
 }
-var PLAN_SCHEMA_VERSION = 10, Priority, AssigneeType, IssueStatus, SessionRole, SkillFile, EvalPolicy, PlanActionSchema, PlanEnvelopeSchema, UiBlockSchema, UI_FENCE_RE, FENCE_RE;
+var PLAN_SCHEMA_VERSION = 11, Priority, AssigneeType, IssueStatus, SessionRole, SkillFile, EvalPolicy, PlanActionSchema, PlanEnvelopeSchema, UiBlockSchema, UI_FENCE_RE, FENCE_RE;
 var init_plans = __esm(() => {
   init_zod();
   Priority = exports_external.enum(["low", "medium", "high"]);
@@ -34243,6 +34274,8 @@ var init_plans = __esm(() => {
       priority: Priority.optional(),
       assignee_type: AssigneeType.optional(),
       assignee_id: exports_external.string().optional(),
+      base_ref: exports_external.string().min(1).max(200).optional(),
+      worktree: exports_external.string().min(1).max(60).regex(/^[a-z0-9][a-z0-9_\-\/]*$/i).optional(),
       parent_id: exports_external.string().optional(),
       blocked_by: exports_external.array(exports_external.string().min(1)).optional(),
       await_children: exports_external.boolean().optional(),
@@ -34853,9 +34886,54 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
   const ISSUE_BASE = tenantWsId && projectId ? `${apiUrl}/api/workspaces/${tenantWsId}/projects/${projectId}/issues/${issueId}` : null;
   let workingDir = baseWorkingDir;
   let worktreeBranch = "";
-  if (baseWorkingDir) {
+  const inlineMode = task.inline_mode === true;
+  const baseBranch = task.base_branch ?? null;
+  const worktreeName = task.worktree_name ?? null;
+  let inlineRestoreHead = null;
+  const blockOnDirty = async (reason, extra = {}) => {
+    await postStream(apiUrl, issueId, "worktree_dirty", { reason, ...extra });
+    if (tenantWsId) {
+      try {
+        await patchIssueStatus(apiUrl, tenantWsId, issueId, "blocked");
+      } catch {}
+    }
+    await postStream(apiUrl, issueId, "run_finished", { stopReason: "blocked", duration_ms: 0 });
+  };
+  if (baseWorkingDir && inlineMode) {
+    try {
+      const status3 = Bun.spawnSync(["git", "status", "--porcelain"], { cwd: baseWorkingDir, stdout: "pipe" });
+      const dirty = (status3.stdout?.toString() || "").trim().length > 0;
+      if (dirty) {
+        await blockOnDirty("inline_dirty", { path: baseWorkingDir });
+        return;
+      }
+      if (baseBranch) {
+        const origSymRef = Bun.spawnSync(["git", "symbolic-ref", "--quiet", "HEAD"], { cwd: baseWorkingDir, stdout: "pipe" });
+        if (origSymRef.exitCode === 0) {
+          inlineRestoreHead = (origSymRef.stdout?.toString() || "").trim().replace(/^refs\/heads\//, "") || null;
+        } else {
+          const origSha = Bun.spawnSync(["git", "rev-parse", "HEAD"], { cwd: baseWorkingDir, stdout: "pipe" });
+          inlineRestoreHead = (origSha.stdout?.toString() || "").trim() || null;
+        }
+        const co = Bun.spawnSync(["git", "checkout", baseBranch], { cwd: baseWorkingDir, stdout: "pipe", stderr: "pipe" });
+        if (co.exitCode !== 0) {
+          await postStream(apiUrl, issueId, "worktree_error", { mode: "inline", message: co.stderr?.toString() || "checkout failed" });
+          await blockOnDirty("inline_checkout_failed", { baseBranch });
+          return;
+        }
+        worktreeBranch = baseBranch;
+      }
+      await postStream(apiUrl, issueId, "worktree_created", { path: baseWorkingDir, branch: worktreeBranch, reused: true, inline: true });
+    } catch (e) {
+      await postStream(apiUrl, issueId, "worktree_error", { mode: "inline", message: fmtError(e) });
+    }
+  } else if (baseWorkingDir) {
     try {
-      const wt = await ensureWorktree(baseWorkingDir, task.key || issueId, issueId, { parentBranch: task.parent_branch ?? undefined });
+      const wt = await ensureWorktree(baseWorkingDir, task.key || issueId, issueId, {
+        baseBranch: baseBranch ?? undefined,
+        parentBranch: task.parent_branch ?? undefined,
+        worktreeName: worktreeName ?? undefined
+      });
       workingDir = wt.path;
       worktreeBranch = wt.branch;
       await postStream(apiUrl, issueId, "worktree_created", { path: wt.path, branch: wt.branch, reused: !wt.created });
@@ -34867,6 +34945,10 @@ async function handleRunTask(apiUrl, deviceId, task, detected, ctx) {
         }
       }
     } catch (e) {
+      if (e?.code === "E_WORKTREE_DIRTY") {
+        await blockOnDirty("worktree_dirty", { details: e.details });
+        return;
+      }
       await postStream(apiUrl, issueId, "worktree_error", { message: fmtError(e) });
     }
   }
@@ -35110,6 +35192,10 @@ _${bits.join(" · ")}_`);
   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";
+  let issueHistoryBlock = "";
+  if (tenantWsId && ISSUE_BASE) {
+    issueHistoryBlock = await fetchIssueHistory(apiUrl, tenantWsId, projectId, issueId, log3);
+  }
   try {
     if (useAcp) {
       const issueContext = `## Issue ${task.key}: ${task.title}${task.description ? `
@@ -35127,6 +35213,20 @@ ${task.description}` : ""}`;
 ${cleanFollowup}`;
       } else {
         userPart = stripSelfMention(issueContext, preferType);
+        userPart += `
+
+---
+
+You have been assigned this issue. Investigate and resolve it. Read the codebase, understand the problem, implement a fix or complete the described work, and use your tools to make progress. When finished, emit a multi-plan action to mark the issue done (or blocked if you need human input).`;
+      }
+      if (issueHistoryBlock) {
+        userPart += `
+
+---
+
+## Issue history (prior activity)
+
+${issueHistoryBlock}`;
       }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map((a) => `- ${a.filename}: ${a.path}`).join(`
@@ -35145,6 +35245,7 @@ Note: if (and only if) you produce binary or large artifact outputs (screenshots
 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 = "";
+      let preambleFailed = false;
       try {
         if (tenantWsId) {
           const agentRes = await apiClient.get(`${apiUrl}/api/workspaces/${tenantWsId}/agents/${task.agent_id}`);
@@ -35174,7 +35275,9 @@ ${body}
           }
         }
       } catch (e) {
+        preambleFailed = true;
         log3(`preamble fetch failed: ${String(e)}`);
+        await postBoundChatMessage(apiUrl, task, `⚠️ System: agent preamble (prompt + skills) fetch failed — the agent is running without its role definition. Error: ${String(e).slice(0, 200)}`);
       }
       preamble += await buildPlanningPreamble(apiUrl, task);
       const prompt = preamble ? `${preamble}
@@ -35255,7 +35358,10 @@ ${body}
             }
           }
         }
-      } catch {}
+      } catch (e) {
+        log3(`preamble fetch failed (acpx): ${String(e)}`);
+        await postBoundChatMessage(apiUrl, task, `⚠️ System: agent preamble fetch failed — running without role definition. Error: ${String(e).slice(0, 200)}`);
+      }
       preamble += await buildPlanningPreamble(apiUrl, task);
       const issueContext = `## Issue ${task.key}: ${task.title}${task.description ? `
 
@@ -35272,6 +35378,20 @@ ${task.description}` : ""}`;
 ${cleanFollowup}`;
       } else {
         userPart = stripSelfMention(issueContext, preferType);
+        userPart += `
+
+---
+
+You have been assigned this issue. Investigate and resolve it. Read the codebase, understand the problem, implement a fix or complete the described work, and use your tools to make progress. When finished, emit a multi-plan action to mark the issue done (or blocked if you need human input).`;
+      }
+      if (issueHistoryBlock) {
+        userPart += `
+
+---
+
+## Issue history (prior activity)
+
+${issueHistoryBlock}`;
       }
       if (attachmentRefs.length) {
         const lines = attachmentRefs.map((a) => `- ${a.filename}: ${a.path}`).join(`
@@ -35398,6 +35518,58 @@ ${userPart}` : userPart;
         await apiClient.post(`${ISSUE_BASE}/fail`, {});
       log3(`  ✗ ${task.key} failed: ${msg}`);
     }
+  } finally {
+    if (inlineMode && inlineRestoreHead && baseWorkingDir) {
+      try {
+        Bun.spawnSync(["git", "checkout", inlineRestoreHead], { cwd: baseWorkingDir, stdout: "pipe", stderr: "pipe" });
+      } catch {}
+    }
+  }
+}
+async function fetchIssueHistory(apiUrl, tenantWsId, projectId, issueId, log4) {
+  const MAX_HISTORY_CHARS = 6000;
+  try {
+    const issueBase = `${apiUrl}/api/workspaces/${tenantWsId}/projects/${projectId}/issues/${issueId}`;
+    const res = await apiClient.get(`${issueBase}/activity`);
+    const activities = Array.isArray(res.data?.results) ? res.data.results : Array.isArray(res.data) ? res.data : [];
+    if (!activities.length)
+      return "";
+    const lines = [];
+    const recent = activities.slice(-20).reverse();
+    for (const act of recent) {
+      const action = act.action || "activity";
+      const actor = act.actor_name || act.actor_id || "system";
+      const ts = act.created_at ? new Date(act.created_at * 1000).toISOString().slice(0, 16) : "";
+      let line = `- **${actor}** ${action}`;
+      if (ts)
+        line += ` _${ts}_`;
+      if (act.details) {
+        try {
+          const d = typeof act.details === "string" ? JSON.parse(act.details) : act.details;
+          if (d.message)
+            line += `: ${String(d.message).slice(0, 200)}`;
+          else if (d.title)
+            line += `: ${String(d.title).slice(0, 200)}`;
+          else if (d.from && d.to)
+            line += `: ${d.from} → ${d.to}`;
+          else if (d.text)
+            line += `: ${String(d.text).slice(0, 200)}`;
+        } catch {}
+      }
+      lines.push(line);
+    }
+    const block = lines.join(`
+`);
+    if (block.length > MAX_HISTORY_CHARS) {
+      log4(`  issue history truncated: ${block.length} → ${MAX_HISTORY_CHARS} chars`);
+      return block.slice(0, MAX_HISTORY_CHARS) + `
+
+_… truncated_`;
+    }
+    return block;
+  } catch (e) {
+    log4(`  issue history fetch failed: ${String(e).slice(0, 200)}`);
+    return "";
   }
 }
 async function buildPlanningPreamble(apiUrl, task, _wsId) {
@@ -35598,7 +35770,7 @@ async function executePlanActions(apiUrl, parentTask, actions, ctx, parseErrors
           }
         }
       } else if (a.type === "delegate") {
-        const res = await apiClient.post(mutateUrl, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "todo" }, { headers });
+        const res = await apiClient.post(mutateUrl, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "in_progress" }, { headers });
         if (!res.success) {
           lines.push(`- [err] delegate ${a.id}: ${res.error || res.status}`);
           results.push({ type: "delegate", status: "error", error: String(res.error || res.status), label: a.id });
@@ -37035,7 +37207,7 @@ async function executeChatPlanActions(actionsIn, parseErrors, ctx) {
         results.push({ type: "update", status: "ok", issue_id: res.data.id, key: res.data.key, status_to: a.status ?? null, title_to: a.title ?? null });
         tally(true);
       } else if (a.type === "delegate") {
-        const res = await apiClient.post(mutateUrl, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "todo" }, { headers });
+        const res = await apiClient.post(mutateUrl, { action: "update", id: a.id, assignee_type: "agent", assignee_id: a.assignee_id, status: "in_progress" }, { headers });
         if (!res.success) {
           lines.push(`- [err] delegate ${a.id}: ${res.error || res.status}`);
           results.push({ type: "delegate", status: "error", error: String(res.error || res.status), label: a.id });
@@ -38681,7 +38853,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.63.0",
+  version: "0.65.0",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -39762,6 +39934,66 @@ import { homedir as homedir4 } from "os";
 import { join as join16 } from "path";
 init_adapter_pidfile();
 init_errors();
+// package.json
+var package_default2 = {
+  name: "@shipers-dev/multi",
+  version: "0.65.0",
+  type: "module",
+  bin: {
+    "multi-agent": "./dist/index.js"
+  },
+  files: [
+    "dist"
+  ],
+  scripts: {
+    dev: "MULTI_HOME=${MULTI_HOME:-$HOME/.multi-dev} MULTI_API=${MULTI_API:-http://127.0.0.1:8787} bun run src/index.ts connect",
+    build: "bun build src/index.ts --outdir=dist --target=node --sourcemap=none --external undici --external loro-crdt && node scripts/post-build.cjs",
+    prepublishOnly: "bun run build"
+  },
+  dependencies: {
+    "@agentclientprotocol/claude-agent-acp": "^0.31.0",
+    "@agentclientprotocol/sdk": "^0.20.0",
+    "@effect/platform-node": "^0.103.0",
+    effect: "^3.21.2",
+    "loro-crdt": "^1.12.1",
+    undici: "^7.0.0"
+  },
+  devDependencies: {
+    "@multi/lib": "workspace:*"
+  }
+};
+
+// src/_impl/daemon-main.ts
+var CLI_VERSION = package_default2.version;
+function findBunBinary() {
+  const tryPath = (p) => {
+    try {
+      return existsSync16(p) ? p : null;
+    } catch {
+      return null;
+    }
+  };
+  if (process.execPath && process.execPath.endsWith("/bun")) {
+    const hit = tryPath(process.execPath);
+    if (hit)
+      return hit;
+  }
+  const fromWhich = Bun.which?.("bun");
+  if (fromWhich)
+    return fromWhich;
+  const candidates = [
+    join16(homedir4(), ".bun", "bin", "bun"),
+    "/opt/homebrew/bin/bun",
+    "/usr/local/bin/bun",
+    "/home/linuxbrew/.linuxbrew/bin/bun"
+  ];
+  for (const c of candidates) {
+    const hit = tryPath(c);
+    if (hit)
+      return hit;
+  }
+  return null;
+}
 var MULTI_DIR5 = join16(homedir4(), ".multi");
 var PID_PATH2 = join16(MULTI_DIR5, "agent.pid");
 var PORT_PATH2 = join16(MULTI_DIR5, "agent.port");
@@ -40132,7 +40364,7 @@ var daemonProgram = ({ cfg, apiUrl }) => exports_Effect.gen(function* () {
       }
       const route = () => {
         if (url2.pathname === "/health")
-          return Response.json({ ok: true, device_id: cfg.deviceId });
+          return Response.json({ ok: true, device_id: cfg.deviceId, cli_version: CLI_VERSION });
         if (url2.pathname === "/files" && req.method === "GET") {
           if (req.headers.get("authorization") !== expectedAuth)
             return new Response("unauthorized", { status: 401 });
@@ -40539,6 +40771,47 @@ var daemonProgram = ({ cfg, apiUrl }) => exports_Effect.gen(function* () {
             }
           })();
         }
+        if (url2.pathname === "/upgrade" && req.method === "POST") {
+          if (req.headers.get("authorization") !== expectedAuth)
+            return new Response("unauthorized", { status: 401 });
+          return (async () => {
+            const bunBin = findBunBinary();
+            if (!bunBin) {
+              return Response.json({ error: "bun binary not found; run `bun add -g @shipers-dev/multi` manually" }, { status: 503 });
+            }
+            let body = {};
+            try {
+              body = await req.json();
+            } catch {}
+            const spec = body.target ? `@shipers-dev/multi@${body.target}` : "@shipers-dev/multi";
+            log3(`[upgrade] spawning ${bunBin} add -g ${spec}`);
+            const child = Bun.spawn([bunBin, "add", "-g", spec], {
+              stdout: "pipe",
+              stderr: "pipe",
+              stdin: "ignore"
+            });
+            (async () => {
+              try {
+                const stdoutTxt = await new Response(child.stdout).text();
+                const stderrTxt = await new Response(child.stderr).text();
+                const code = await child.exited;
+                if (stdoutTxt.trim())
+                  log3(`[upgrade] stdout: ${stdoutTxt.trim()}`);
+                if (stderrTxt.trim())
+                  log3(`[upgrade] stderr: ${stderrTxt.trim()}`);
+                if (code === 0) {
+                  log3("[upgrade] success; exiting so service manager respawns with new binary");
+                  setTimeout(() => process.exit(0), 500);
+                } else {
+                  log3(`[upgrade] failed with exit code ${code}`);
+                }
+              } catch (e) {
+                log3(`[upgrade] error: ${e.message}`);
+              }
+            })();
+            return Response.json({ accepted: true, current_version: CLI_VERSION, target: spec }, { status: 202 });
+          })();
+        }
         if (url2.pathname === "/stop" && req.method === "POST") {
           if (req.headers.get("authorization") !== expectedAuth)
             return new Response("unauthorized", { status: 401 });
@@ -40654,7 +40927,8 @@ var daemonProgram = ({ cfg, apiUrl }) => exports_Effect.gen(function* () {
       device_id: cfg.deviceId,
       workspace_id: cfg.workspaceId,
       api_url: apiUrl,
-      pid: process.pid
+      pid: process.pid,
+      cli_version: CLI_VERSION
     }, null, 2));
   } catch {}
   let tunnel;
@@ -41069,14 +41343,14 @@ var collectServiceEnv = () => {
     env.PATH = process.env.PATH;
   if (process.env.HOME)
     env.HOME = process.env.HOME;
-  if (process.env.MULTI_HOME)
-    env.MULTI_HOME = process.env.MULTI_HOME;
-  if (process.env.MULTI_API)
-    env.MULTI_API = process.env.MULTI_API;
   if (process.env.SHELL)
     env.SHELL = process.env.SHELL;
   if (process.env.LANG)
     env.LANG = process.env.LANG;
+  for (const [k, v] of Object.entries(process.env)) {
+    if (k.startsWith("MULTI_") && typeof v === "string" && v.length > 0)
+      env[k] = v;
+  }
   return env;
 };
 var ensureSupported = exports_Effect.fn("service.ensureSupported")(function* () {

package/package.json

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