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

package/dist/{chunk-ZOSD4FXV.js → chunk-PJSJPMJI.js}

@@ -9,7 +9,7 @@ import {
   namesInCode,
   openIndex,
   workspaceRepos
-} from "./chunk-5WERBKLE.js";
+} from "./chunk-ISUAAMGS.js";
 
 // packages/cli/dist/code-tools.js
 var offered = /* @__PURE__ */ new Map();
@@ -21,7 +21,7 @@ function codeToolOptions(root) {
     codeDir: (r) => offered.get(r) ?? defaultCodeDir(root, r),
     repos: () => [.../* @__PURE__ */ new Set([...workspaceRepos(root), ...offered.keys()])].sort(),
     // Loaded on first use: the readers are large, and most commands never outline a file.
-    outline: async (path, text) => (await import("./chunk-UEVZZZU2.js")).declarationOutline(path, text)
+    outline: async (path, text) => (await import("./chunk-H5HBGNXU.js")).declarationOutline(path, text)
   };
 }
 function metarepoToolBox(root, calls) {
@@ -31,7 +31,7 @@ function metarepoToolBox(root, calls) {
   });
 }
 async function criticCodeSearch(root, names) {
-  const x = await import("./chunk-UEVZZZU2.js");
+  const x = await import("./chunk-H5HBGNXU.js");
   const r = await namesInCode(root, names, {
     ...codeToolOptions(root),
     outlines: (path) => x.syntaxLanguageOf(path) !== void 0

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

@@ -11,10 +11,15 @@ import {
   changeBranch,
   changesDirOf,
   orgPackDirOf,
-  require_dist,
   runsDirOf,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
+import {
+  withSharedFileLock
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -71,23 +76,26 @@ var STATUS = {
   T: "type-changed"
 };
 async function changedFiles(dir, from, to, git = createGit({ timeoutMs: 6e4 })) {
-  const r = await git(["diff", "--name-status", "-M", "-z", "--no-color", "--no-ext-diff", from, to, "--"], dir);
+  const r = await git(["diff", "--raw", "--no-abbrev", "-M", "-z", "--no-color", "--no-ext-diff", from, to, "--"], dir);
   const parts = r.stdout.split("\0");
   const out = [];
   for (let i = 0; i < parts.length; ) {
-    const code = parts[i++] ?? "";
-    if (!code)
+    const head = parts[i++] ?? "";
+    if (!head)
       continue;
-    const status = STATUS[code[0]];
+    const [oldMode, newMode, , , code = ""] = head.replace(/^:/, "").split(" ");
+    const gitlink = oldMode === "160000" || newMode === "160000";
+    const link = gitlink ? { gitlink: true } : {};
+    const status = STATUS[code[0] ?? ""];
     if (status === "renamed" || status === "copied") {
       const old = parts[i++] ?? "";
       const path = parts[i++] ?? "";
       if (old && path)
-        out.push({ status, path, from: old });
+        out.push({ status, path, from: old, ...link });
     } else {
       const path = parts[i++] ?? "";
       if (path)
-        out.push({ status: status ?? "modified", path });
+        out.push({ status: status ?? "modified", path, ...link });
     }
   }
   return out.sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
@@ -108,6 +116,7 @@ async function changesSince(dir, commits, to, git) {
 }
 
 // packages/workspace/dist/layout.js
+import { createHash } from "node:crypto";
 import { readFile, writeFile } from "node:fs/promises";
 import { join, relative, sep } from "node:path";
 var WORKSPACE_DIR = "workspace";
@@ -120,10 +129,20 @@ function id(what, value) {
 function baseClonePath(root, repo) {
   return join(root, WORKSPACE_DIR, id("repo id", repo));
 }
-var branchSlug = (branch) => branch.replace(/[^A-Za-z0-9.-]+/g, "-");
+var legacyBranchSlug = (branch) => branch.replace(/[^A-Za-z0-9.-]+/g, "-");
+var branchSlug = (branch) => {
+  const s = legacyBranchSlug(branch);
+  if (!/[A-Z]/.test(s))
+    return s;
+  const hash = createHash("sha256").update(branch, "utf8").digest("hex").slice(0, 8);
+  return `${s.toLowerCase()}-${hash}`;
+};
 function branchCheckoutPath(root, repo, branch) {
   return join(root, WORKSPACE_DIR, ".branches", id("repo id", repo), branchSlug(branch));
 }
+function legacyBranchCheckoutPath(root, repo, branch) {
+  return join(root, WORKSPACE_DIR, ".branches", id("repo id", repo), legacyBranchSlug(branch));
+}
 function changeWorktreesDir(root, change) {
   return join(root, WORKSPACE_DIR, ".worktrees", id("change id", change));
 }
@@ -357,6 +376,13 @@ async function checkoutState(dir, git = createGit()) {
 import { existsSync as existsSync2 } from "node:fs";
 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 withBaseClone(dest, id2, work) {
+  return withSharedFileLock(dest, work, {
+    staleMs: 30 * 6e4,
+    waitMs: 30 * 6e4,
+    what: `git work on the base clone of ${id2}`
+  });
+}
 function isInPlace(url) {
   const u = url.replace(/\\/g, "/");
   return u === "." || u.startsWith("./");
@@ -542,6 +568,30 @@ function createWorkspace(root, git = createGit()) {
       build: { status: "not-run" }
     };
   }
+  async function checkoutOne(repo, branch) {
+    const base = baseClonePath(root, repo.id);
+    if (!existsSync2(base))
+      throw new Error(`no base clone for ${repo.id}; run atticus workspace sync first`);
+    const ref = `refs/remotes/origin/${branch}`;
+    try {
+      await g(["fetch", "--no-tags", "origin", `+refs/heads/${branch}:${ref}`], base);
+    } catch {
+      throw new Error(`${repo.id} has no branch ${branch} on its remote`);
+    }
+    const dir = branchCheckoutPath(root, repo.id, branch);
+    const old = legacyBranchCheckoutPath(root, repo.id, branch);
+    if (old !== dir && !existsSync2(dir) && existsSync2(old))
+      await g(["worktree", "move", "--", old, dir], base).catch(() => void 0);
+    if (!existsSync2(dir)) {
+      await mkdir3(dirname2(dir), { recursive: true });
+      await g(["worktree", "add", "--detach", "--", dir, ref], base);
+    } 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) };
+  }
   return {
     root,
     async sync(repos, opts = {}) {
@@ -550,36 +600,21 @@ function createWorkspace(root, git = createGit()) {
       const out = [];
       const local = opts.from ? await localClones(opts.from, git) : void 0;
       for (const repo of repos)
-        out.push(await syncOne(repo, local));
+        out.push(
+          // Nothing to lock (nor a folder to make) for an archived or in-place repo.
+          repo.archived || isInPlace(repo.url) ? await syncOne(repo, local) : await withBaseClone(baseClonePath(root, repo.id), repo.id, () => syncOne(repo, local))
+        );
       return out;
     },
-    async checkoutBranch(repo, branch) {
-      const base = baseClonePath(root, repo.id);
-      if (!existsSync2(base))
-        throw new Error(`no base clone for ${repo.id}; run atticus workspace sync first`);
-      const ref = `refs/remotes/origin/${branch}`;
-      try {
-        await g(["fetch", "--no-tags", "origin", `+refs/heads/${branch}:${ref}`], base);
-      } catch {
-        throw new Error(`${repo.id} has no branch ${branch} on its remote`);
-      }
-      const dir = branchCheckoutPath(root, repo.id, branch);
-      if (!existsSync2(dir)) {
-        await mkdir3(dirname2(dir), { recursive: true });
-        await g(["worktree", "add", "--detach", "--", dir, ref], base);
-      } 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) };
+    checkoutBranch(repo, branch) {
+      return withBaseClone(baseClonePath(root, repo.id), repo.id, () => checkoutOne(repo, branch));
     },
     async openChange(change, repos) {
       await ensureGitignore(root);
       const existing = await readChangeRepos(root, change);
       const byId = new Map((existing?.repos ?? []).map((r) => [r.id, r]));
       for (const repo of repos) {
-        const fresh = await worktreeFor(change, repo);
+        const fresh = await withBaseClone(baseClonePath(root, repo.id), repo.id, () => worktreeFor(change, repo));
         const prior = byId.get(repo.id);
         byId.set(repo.id, prior ? { ...fresh, ...prior, worktree: fresh.worktree } : fresh);
       }
@@ -747,8 +782,10 @@ export {
   WORKSPACE_DIR,
   IGNORED,
   baseClonePath,
+  legacyBranchSlug,
   branchSlug,
   branchCheckoutPath,
+  legacyBranchCheckoutPath,
   changeWorktreesDir,
   worktreePath,
   changeDir,

package/dist/{chunk-ZZFHLRQW.js → chunk-PMUAJGLI.js}

@@ -11,23 +11,25 @@ import {
   findingAction,
   findings,
   statusLine
-} from "./chunk-PTQ3ZALZ.js";
+} from "./chunk-UF4AZOZB.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-K332XW7K.js";
-import "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   completeCriticBatch,

package/dist/{chunk-SH27FYPF.js → chunk-PPD7HTDP.js}

@@ -13,30 +13,32 @@ import {
   seedCollisions,
   seedSpec,
   writeSpecFiles
-} from "./chunk-BEPCKDCP.js";
-import "./chunk-HWD4JPU7.js";
-import "./chunk-5WERBKLE.js";
-import "./chunk-K332XW7K.js";
+} from "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.js";
+import "./chunk-S4PMJU6H.js";
 import {
   changeFolder
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   createOpenSpec
-} from "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
+} from "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
 import {
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/spec-seed-commands.js

package/dist/chunk-PSOFBQWB.js

@@ -0,0 +1,42 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  SHOWN,
+  factsRepos,
+  verifyAllCommand,
+  verifyCommand,
+  verifyInputsOf
+} from "./chunk-RGERPOIV.js";
+import "./chunk-OUBGGKDU.js";
+import "./chunk-XI2LCCYQ.js";
+import "./chunk-BPK5P77O.js";
+import "./chunk-WXFLMQSR.js";
+import "./chunk-TYQBFTBR.js";
+import "./chunk-2F4CYZKJ.js";
+import "./chunk-LO6P2VYG.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-UPS2DGFC.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  SHOWN,
+  factsRepos,
+  verifyAllCommand,
+  verifyCommand,
+  verifyInputsOf
+};