@maycombhq/atticus 2.0.0-beta.18 → 2.0.0-beta.21

package/dist/{chunk-ZQC7MNQB.js → chunk-XOL3GFW2.js}

@@ -14,7 +14,7 @@ import {
   require_dist,
   runsDirOf,
   toCanonicalYaml
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -40,8 +40,9 @@ function createGit(opts = {}) {
     GIT_PAGER: "cat",
     LC_ALL: "C"
   };
+  const pre = process.platform === "win32" ? ["-c", "core.longpaths=true"] : [];
   return (args, cwd) => new Promise((resolve, reject) => {
-    execFile("git", args, {
+    execFile("git", [...pre, ...args], {
       cwd,
       env,
       timeout: opts.timeoutMs ?? 10 * 6e4,
@@ -97,6 +98,7 @@ async function changesSince(dir, commits, to, git) {
   const missing = [];
   for (const c of [...new Set(commits)].filter((x) => !sameCommit(x, to)).sort()) {
     try {
+      await (git ?? createGit({ timeoutMs: 6e4 }))(["merge-base", "--is-ancestor", c, to], dir);
       changes[c] = await changedFiles(dir, c, to, git);
     } catch {
       missing.push(c);
@@ -244,7 +246,7 @@ async function writeChangeRepos(root, value) {
 
 // packages/workspace/dist/editors.js
 import { existsSync } from "node:fs";
-import { mkdir as mkdir2, rm, writeFile as writeFile3 } from "node:fs/promises";
+import { mkdir as mkdir2, readdir as readdir2, rm, writeFile as writeFile3 } from "node:fs/promises";
 import { join as join3, relative as relative2, sep as sep2 } from "node:path";
 var posix = (p) => p.split(sep2).join("/");
 function xmlEscape(s) {
@@ -329,9 +331,12 @@ async function writeEditorWorkspaces(root, repos) {
   await writeFile3(vscode, JSON.stringify(vscodeWorkspace(root, repos), null, 2) + "\n", "utf8");
   const intellij = intellijProjectPath(root, repos.change);
   const ideaDir = join3(intellij, ".idea");
-  await rm(ideaDir, { recursive: true, force: true });
   await mkdir2(ideaDir, { recursive: true });
-  for (const [name, text] of Object.entries(intellijProject(root, repos))) {
+  const files = intellijProject(root, repos);
+  for (const name of await readdir2(ideaDir).catch(() => []))
+    if (name.endsWith(".iml") && !(name in files))
+      await rm(join3(ideaDir, name), { force: true });
+  for (const [name, text] of Object.entries(files)) {
     await writeFile3(join3(ideaDir, name), text, "utf8");
   }
   return { vscode, intellij };
@@ -350,10 +355,25 @@ async function checkoutState(dir, git = createGit()) {
 
 // packages/workspace/dist/manager.js
 import { existsSync as existsSync2 } from "node:fs";
-import { mkdir as mkdir3, readdir as readdir2, rm as rm2 } from "node:fs/promises";
+import { mkdir as mkdir3, readdir as readdir3, rm as rm2 } from "node:fs/promises";
 import { basename, dirname as dirname2, join as join4 } from "node:path";
 function isInPlace(url) {
-  return url === "." || url.startsWith("./");
+  const u = url.replace(/\\/g, "/");
+  return u === "." || u.startsWith("./");
+}
+function inPlacePath(url) {
+  if (!isInPlace(url))
+    return void 0;
+  const segs = url.split(/[\\/]+/).filter((s) => s !== "" && s !== ".");
+  if (segs.includes(".."))
+    return void 0;
+  return segs.length ? segs.join("/") : ".";
+}
+function inPlaceDir(root, url) {
+  const p = inPlacePath(url);
+  if (p === void 0)
+    return void 0;
+  return p === "." ? root : join4(root, ...p.split("/"));
 }
 async function remoteDefaultBranch(dir, git = createGit()) {
   if (!existsSync2(dir))
@@ -401,8 +421,18 @@ function createWorkspace(root, git = createGit()) {
         action: "failed",
         reason: `your clone at ${from} has no ${branch} branch; fetch it there, or sync without --from`
       };
-    await g(["clone", "--quiet", "--no-tags", "--no-checkout", "--", from, dest]);
-    await g(["remote", "set-url", "origin", repo.url], dest);
+    await g([
+      "clone",
+      "-c",
+      "core.longpaths=true",
+      "--quiet",
+      "--no-tags",
+      "--no-checkout",
+      "--",
+      from,
+      dest
+    ]);
+    await g(["remote", "set-url", "origin", "--", repo.url], dest);
     const refs = (await g(["for-each-ref", "--format=%(refname)", "refs/remotes/origin"], dest)).stdout.split("\n").filter(Boolean);
     for (const r of refs)
       await g(["update-ref", "-d", r], dest);
@@ -423,13 +453,22 @@ function createWorkspace(root, git = createGit()) {
       };
     const dest = baseClonePath(root, repo.id);
     const branch = repo.defaultBranch;
+    const made = !existsSync2(dest);
     try {
-      if (!existsSync2(dest)) {
+      if (made) {
         await mkdir3(dirname2(dest), { recursive: true });
         const from = local && yourClone(local, repo);
         if (from)
           return await copyFrom(repo, from, dest);
-        const args = ["clone", "--no-tags", "--branch", branch, "--filter=blob:none"];
+        const args = [
+          "clone",
+          "-c",
+          "core.longpaths=true",
+          "--no-tags",
+          "--branch",
+          branch,
+          "--filter=blob:none"
+        ];
         if (repo.sparse.length > 0)
           args.push("--sparse");
         args.push("--", repo.url, dest);
@@ -462,7 +501,14 @@ function createWorkspace(root, git = createGit()) {
         ...await remoteDefault(dest)
       };
     } catch (err) {
-      return { id: repo.id, action: "failed", reason: err.message };
+      if (made)
+        await rm2(dest, { recursive: true, force: true }).catch(() => void 0);
+      const msg = err.message;
+      return {
+        id: repo.id,
+        action: "failed",
+        reason: /Filename too long/i.test(msg) ? `${msg.trim()} \u2014 a path in the repo is longer than Windows allows: run git config --global core.longpaths true, then sync again` : msg
+      };
     }
   }
   async function worktreeFor(change, repo) {
@@ -521,8 +567,11 @@ function createWorkspace(root, git = createGit()) {
       if (!existsSync2(dir)) {
         await mkdir3(dirname2(dir), { recursive: true });
         await g(["worktree", "add", "--detach", "--", dir, ref], base);
-      } else
+      } else {
+        if (await dirty(dir))
+          throw new Error(`${repo.id}'s checkout of ${branch} has local changes: commit or stash them in ${dir}, then try again`);
         await g(["checkout", "--quiet", "--force", "--detach", ref], dir);
+      }
       return { dir, commit: await head(dir) };
     },
     async openChange(change, repos) {
@@ -549,10 +598,27 @@ function createWorkspace(root, git = createGit()) {
       const kept = [];
       if (!repos)
         return { removed, kept };
+      const removeOne = async (id2, path, repo) => {
+        try {
+          if (!opts.force && await dirty(path)) {
+            kept.push({ id: id2, reason: "uncommitted changes in the worktree" });
+            return;
+          }
+          const args = ["worktree", "remove"];
+          if (opts.force)
+            args.push("--force");
+          await g([...args, "--", path], baseClonePath(root, repo));
+          removed.push(id2);
+        } catch (err) {
+          kept.push({ id: id2, reason: err instanceof GitError ? err.message : String(err) });
+        }
+      };
+      const waiting = /* @__PURE__ */ new Set();
       for (const r of repos.repos) {
         const done = r.pr?.state === "merged" || r.pr?.state === "closed";
         if (!done && !opts.all) {
           kept.push({ id: r.id, reason: r.pr ? `PR is ${r.pr.state}` : "no PR yet" });
+          waiting.add(r.id);
           continue;
         }
         const path = worktreePath(root, change, r.id);
@@ -560,24 +626,27 @@ function createWorkspace(root, git = createGit()) {
           removed.push(r.id);
           continue;
         }
-        const base = baseClonePath(root, r.id);
-        try {
-          if (!opts.force && await dirty(path)) {
-            kept.push({ id: r.id, reason: "uncommitted changes in the worktree" });
+        await removeOne(r.id, path, r.id);
+      }
+      const tasksDir = join4(changeWorktreesDir(root, change), ".tasks");
+      const subdirs = async (dir) => (await readdir3(dir, { withFileTypes: true }).catch(() => [])).filter((d) => d.isDirectory()).map((d) => d.name).sort();
+      const taskRepos = /* @__PURE__ */ new Set();
+      for (const task of await subdirs(tasksDir))
+        for (const repo of await subdirs(join4(tasksDir, task))) {
+          taskRepos.add(repo);
+          if (waiting.has(repo))
             continue;
-          }
-          const args = ["worktree", "remove"];
-          if (opts.force)
-            args.push("--force");
-          await g([...args, "--", path], base);
-          removed.push(r.id);
-        } catch (err) {
-          kept.push({ id: r.id, reason: err instanceof GitError ? err.message : String(err) });
+          await removeOne(`${repo} task ${task}`, join4(tasksDir, task, repo), repo);
         }
-      }
-      for (const r of repos.repos) {
-        if (existsSync2(baseClonePath(root, r.id)))
-          await g(["worktree", "prune"], baseClonePath(root, r.id)).catch(() => void 0);
+      for (const id2 of /* @__PURE__ */ new Set([...repos.repos.map((r) => r.id), ...taskRepos])) {
+        let base;
+        try {
+          base = baseClonePath(root, id2);
+        } catch {
+          continue;
+        }
+        if (existsSync2(base))
+          await g(["worktree", "prune"], base).catch(() => void 0);
       }
       if (kept.length === 0) {
         await removeEditorWorkspaces(root, change);
@@ -602,7 +671,7 @@ async function localClones(dir, g) {
   const visit = async (d, depth) => {
     let names;
     try {
-      names = await readdir2(d);
+      names = await readdir3(d);
     } catch {
       return;
     }
@@ -699,6 +768,8 @@ export {
   removeEditorWorkspaces,
   checkoutState,
   isInPlace,
+  inPlacePath,
+  inPlaceDir,
   remoteDefaultBranch,
   createWorkspace,
   toHandle,

package/dist/{chunk-GXDATVSY.js → chunk-XQ3YZ4QW.js}

@@ -6,32 +6,32 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   renderTaskContext,
   taskContext
-} from "./chunk-XO5RQKNM.js";
-import "./chunk-L3T33FA7.js";
-import "./chunk-VEJYZEPC.js";
+} from "./chunk-BEPCKDCP.js";
+import "./chunk-HWD4JPU7.js";
+import "./chunk-5WERBKLE.js";
+import "./chunk-K332XW7K.js";
 import {
   changeFolder,
   changeStore
-} from "./chunk-IOW6BF3U.js";
-import "./chunk-43E6XX67.js";
-import "./chunk-V3UEPUHT.js";
-import "./chunk-EZBAS5BL.js";
-import "./chunk-KCQS52TH.js";
-import "./chunk-IPSFMTK2.js";
+} from "./chunk-HSZMPH5T.js";
+import "./chunk-D2WSW4GU.js";
+import "./chunk-4KNOJC6J.js";
+import "./chunk-4SLBCEPD.js";
+import "./chunk-64AADMTW.js";
+import "./chunk-JYMIB5XY.js";
 import {
   attachToChange
-} from "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-YXUIUOQZ.js";
-import "./chunk-ZQC7MNQB.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
+} from "./chunk-CPK7QSBG.js";
+import "./chunk-YO2PKTXT.js";
+import "./chunk-TWQRPM76.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
 import {
   changesRelOf,
   inputsDirOf
-} from "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/attach-commands.js
@@ -90,7 +90,7 @@ async function promoteChangeInput(root, change, file) {
   } catch {
     throw new AttachError("not-found", `inputs/${name} isn't attached to ${c.id}: atticus change attach ${c.id} adds it.`);
   }
-  const { addToInbox } = await import("./chunk-3GLDB4IT.js");
+  const { addToInbox } = await import("./chunk-ZKYRDV7A.js");
   const r = await addToInbox(root, [{ name, bytes }]);
   const added = r.added[0];
   if (!added)
@@ -107,11 +107,11 @@ function attachedLine(rel, a) {
 async function changeAttachCli(root, change, paths, o, io) {
   if (change && o.prototype) {
     if (paths.length) {
-      const { PROTOTYPE_CLI_WORDS } = await import("./chunk-2TG2QGKW.js");
+      const { PROTOTYPE_CLI_WORDS } = await import("./chunk-VYOCPTUB.js");
       io.err(PROTOTYPE_CLI_WORDS.usage(change, o.prototype));
       return 2;
     }
-    const { attachPrototype } = await import("./chunk-2TG2QGKW.js");
+    const { attachPrototype } = await import("./chunk-VYOCPTUB.js");
     return attachPrototype(root, change, o.prototype, { by: o.by, ...o.json ? { json: true } : {}, ...o.now ? { now: o.now } : {} }, io);
   }
   if (change && o.like) {
@@ -119,7 +119,7 @@ async function changeAttachCli(root, change, paths, o, io) {
       io.err("--like names an archived change, attached on its own: atticus change attach add-refund-window --like raise-transfer-limit");
       return 2;
     }
-    const { attachPastChange, findPastChange } = await import("./chunk-63565QTF.js");
+    const { attachPastChange, findPastChange } = await import("./chunk-BC6KKZ67.js");
     const folder = await findPastChange(root, o.like);
     if (!folder) {
       io.err(`There is no archived change ${o.like}: atticus change similar "<what it is about>" lists them.`);