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

package/dist/{chunk-7UOMVMFG.js → chunk-NN6AXKFX.js}

@@ -11,25 +11,27 @@ import {
   planJourney,
   recordCommitment,
   requestFromTeam
-} from "./chunk-6PPOWY5E.js";
+} from "./chunk-JUHZBZPZ.js";
 import {
   table
 } from "./chunk-VOGCSYOI.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-U2JTTRKS.js";
+import "./chunk-5MKV4TV6.js";
+import "./chunk-ESJALLOK.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-OSZTENIA.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-BIGDQDHD.js → chunk-NOU5IBLM.js}

@@ -5,11 +5,13 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   defaultCodeDir
-} from "./chunk-ISUAAMGS.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-MCE74XMF.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-LFGTYX5U.js → chunk-NQDHRT2H.js}

@@ -3,31 +3,31 @@ 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 {
-  HttpError,
-  badRequest,
-  conflict,
-  notFound
-} from "./chunk-C3RY6KU6.js";
 import {
   appendLines,
   safeMessage
-} from "./chunk-S7FCV7S5.js";
+} from "./chunk-QOC3Q4UU.js";
 import {
   estateJoinOnFile,
   stampOf
-} from "./chunk-T6DQR5TV.js";
+} from "./chunk-AM7PYKVP.js";
 import {
   intakeContext
-} from "./chunk-SFUP7TTO.js";
+} from "./chunk-44QUCNPH.js";
+import {
+  HttpError,
+  badRequest,
+  conflict,
+  notFound
+} from "./chunk-W4EG25TI.js";
 import {
   estateFacts,
   estateRepos,
   outsideProfileSystems
-} from "./chunk-J2JAKCIW.js";
+} from "./chunk-25CUJJTP.js";
 import {
   readVendorSpec
-} from "./chunk-QKUJMING.js";
+} from "./chunk-GFYVVTKH.js";
 import {
   FactCorrection,
   QuestionError,
@@ -41,15 +41,17 @@ import {
   isAdopted,
   linkCandidates,
   listQuestions,
-  loadOrgPack,
   orgPackDirOf,
   parseCorrections,
   questionsRelOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
 import {
   withSharedFileLock,
   writeFileAtomic
-} from "./chunk-TUULXQRW.js";
+} from "./chunk-G3ZFEHCX.js";
+import {
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 
 // packages/cli/dist/ui-api-links.js
 import { mkdir, readFile } from "node:fs/promises";
@@ -230,14 +232,14 @@ function uiLinkRoutes(r, ctx, deps = {}) {
 git commit -m "${safeMessage(`${from}: calls paired with ${target} on the canvas`)}"`;
     let answer;
     if (q) {
-      const { targetAnswerOf } = await import("./chunk-KFAVQZSX.js");
+      const { targetAnswerOf } = await import("./chunk-B63NWU3P.js");
       const t = await targetAnswerOf(ctx.root, q, target);
       if ("problem" in t)
         throw new HttpError(422, "Atticus can't do that yet", t.problem);
       answer = t;
     }
     if (preview) {
-      const { verifyWritePreview } = await import("./chunk-XERYFDB5.js");
+      const { verifyWritePreview } = await import("./chunk-3XZRYQWU.js");
       const v = await verifyWritePreview(ctx.root, from, { extra: corrections });
       return {
         status: 200,
@@ -300,8 +302,8 @@ git commit -m "${safeMessage(`${from}: calls paired with ${target} on the canvas
     const type = estateRepos(op).find((x) => x.id === b.data.repo)?.type;
     if (!type)
       throw notFound(`No repo of the manifest is ${b.data.repo}.`);
-    const { ruleFromPairing } = await import("./chunk-UNAGJYET.js");
-    const { rulesAddCommand } = await import("./chunk-66PPNOON.js");
+    const { ruleFromPairing } = await import("./chunk-JFBVIMGY.js");
+    const { rulesAddCommand } = await import("./chunk-CKRPMRFQ.js");
     const rule = ruleFromPairing({
       type,
       to: c.link.repo ?? c.link.system ?? "it",

package/dist/{chunk-KDNTAPLX.js → chunk-NTEPBOAF.js}

@@ -5,18 +5,20 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readCatalog
-} from "./chunk-J2JAKCIW.js";
+} from "./chunk-25CUJJTP.js";
 import {
   readDiagram,
   reconcile
-} from "./chunk-6ZGLAACW.js";
+} from "./chunk-DIYNRYXW.js";
 import {
-  loadOrgPack,
   orgPackDirOf,
   parseRecord,
   recordPath,
   serializeRecord
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
+import {
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 
 // packages/cli/dist/reconcile-commands.js
 import { mkdir, readdir, readFile, writeFile } from "node:fs/promises";

package/dist/{chunk-LYBNHMVZ.js → chunk-NTOPAOBY.js}

@@ -7,13 +7,13 @@ import {
   RuntimeConfigError,
   RuntimeError,
   registerModelProvider
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-MOWUP33K.js";
 import {
   estimateTokens
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
 import {
   redactText
-} from "./chunk-TUULXQRW.js";
+} from "./chunk-G3ZFEHCX.js";
 import {
   __commonJS,
   __require,

package/dist/{chunk-R44CYFPV.js → chunk-NX5IPHI3.js}

@@ -3,30 +3,33 @@ 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 {
+  SHIPPED_MODEL_PROVIDER_PLUGINS
+} from "./chunk-NTOPAOBY.js";
 import {
   runPluginTests
-} from "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
-import "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
-import "./chunk-CQDGOPGH.js";
+} from "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
 import {
   pluginEntryHash,
   runTranslator
-} from "./chunk-3NFFJL5D.js";
-import "./chunk-PKBHS4AA.js";
-import {
-  SHIPPED_MODEL_PROVIDER_PLUGINS
-} from "./chunk-LYBNHMVZ.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
+import "./chunk-OSZTENIA.js";
 import {
-  ModelProviderPlugin,
-  ScannerPlugin,
   orgPackDirOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import {
+  ModelProviderPlugin,
+  ScannerPlugin
+} from "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-GCWRWSU7.js → chunk-O4ZWZZZT.js}

@@ -47,11 +47,13 @@ import {
   systemKeyStore,
   undiciTransport,
   uriEncode
-} from "./chunk-LYBNHMVZ.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-NTOPAOBY.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {

package/dist/chunk-OCU5S2XG.js

@@ -0,0 +1,36 @@
+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 {
+  addressRefusal,
+  asTheApp,
+  atProvidersOwnAddress,
+  confirmedAddress,
+  guardModelAddress,
+  recordConfirmedAddress,
+  requireConfirmedModel,
+  servingTheApp,
+  whereKeyGoes,
+  whoStarts
+} from "./chunk-4MNMOUU7.js";
+import "./chunk-KVVNAUIG.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  addressRefusal,
+  asTheApp,
+  atProvidersOwnAddress,
+  confirmedAddress,
+  guardModelAddress,
+  recordConfirmedAddress,
+  requireConfirmedModel,
+  servingTheApp,
+  whereKeyGoes,
+  whoStarts
+};

package/dist/{chunk-SU74NDMQ.js → chunk-OKSRK2LJ.js}

@@ -14,26 +14,28 @@ import {
   onboardFrameworkCheck,
   scanReview,
   scanSurvey
-} from "./chunk-4EURQWQD.js";
-import "./chunk-OHNCWBKF.js";
+} from "./chunk-DF6DPCW2.js";
+import "./chunk-RSHVSXPJ.js";
 import {
   repoFor
-} from "./chunk-LO6P2VYG.js";
-import "./chunk-O7FDLW7L.js";
-import "./chunk-PJSJPMJI.js";
-import "./chunk-ISUAAMGS.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";
+} from "./chunk-HWNFFCGB.js";
+import "./chunk-BYKWWSXL.js";
+import "./chunk-ENZ3PI7L.js";
+import "./chunk-MCE74XMF.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-OSZTENIA.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {

package/dist/{chunk-XD75VZIH.js → chunk-OSWOIFRQ.js}

@@ -3,6 +3,9 @@ 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 {
+  table
+} from "./chunk-VOGCSYOI.js";
 import {
   QueryError,
   askLookup,
@@ -10,14 +13,13 @@ import {
   openIndex,
   runContextTool,
   translate
-} from "./chunk-ISUAAMGS.js";
-import {
-  table
-} from "./chunk-VOGCSYOI.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-MCE74XMF.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

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

@@ -4,19 +4,21 @@ var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
-  ChangeRepos,
-  RecordId,
-  RepoManifest,
-  WORKSPACE_SCHEMA_VERSION,
   changeBranch,
   changesDirOf,
   orgPackDirOf,
   runsDirOf,
   toCanonicalYaml
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
 import {
   withSharedFileLock
-} from "./chunk-TUULXQRW.js";
+} from "./chunk-G3ZFEHCX.js";
+import {
+  ChangeRepos,
+  RecordId,
+  RepoManifest,
+  WORKSPACE_SCHEMA_VERSION
+} from "./chunk-QFDPX6C4.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -175,10 +177,9 @@ async function ensureGitignore(root) {
   const have = new Set(text.split(/\r?\n/).map(norm));
   const missing = IGNORED.filter((p) => !have.has(norm(p)));
   if (missing.length > 0) {
-    const prefix = text === "" || text.endsWith("\n") ? text : text + "\n";
-    await writeFile(path, `${prefix}${prefix ? "\n" : ""}# Atticus local state
-${missing.join("\n")}
-`, "utf8");
+    const eol = text.includes("\r\n") ? "\r\n" : "\n";
+    const prefix = text === "" || text.endsWith("\n") ? text : text + eol;
+    await writeFile(path, `${prefix}${prefix ? eol : ""}# Atticus local state${eol}${missing.join(eol)}${eol}`, "utf8");
   }
   return missing;
 }
@@ -376,10 +377,11 @@ 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) {
+var BASE_CLONE_WAIT_MS = 30 * 6e4;
+function withBaseCloneLock(dest, id2, work, waitMs = BASE_CLONE_WAIT_MS) {
   return withSharedFileLock(dest, work, {
-    staleMs: 30 * 6e4,
-    waitMs: 30 * 6e4,
+    staleMs: BASE_CLONE_WAIT_MS,
+    waitMs,
     what: `git work on the base clone of ${id2}`
   });
 }
@@ -411,8 +413,9 @@ async function remoteDefaultBranch(dir, git = createGit()) {
     return void 0;
   }
 }
-function createWorkspace(root, git = createGit()) {
+function createWorkspace(root, git = createGit(), opts = {}) {
   const g = (args, cwd = root) => git(args, cwd);
+  const withBaseClone = (dest, id2, work) => withBaseCloneLock(dest, id2, work, opts.lockWaitMs);
   const head = async (cwd) => (await g(["rev-parse", "HEAD"], cwd)).stdout.trim();
   const dirty = async (cwd) => (await g(["status", "--porcelain", "--untracked-files=normal"], cwd)).stdout.trim() !== "";
   const refExists = async (cwd, ref) => {
@@ -594,11 +597,11 @@ function createWorkspace(root, git = createGit()) {
   }
   return {
     root,
-    async sync(repos, opts = {}) {
+    async sync(repos, opts2 = {}) {
       if (repos.some((r) => !r.archived && !isInPlace(r.url)))
         await ensureGitignore(root);
       const out = [];
-      const local = opts.from ? await localClones(opts.from, git) : void 0;
+      const local = opts2.from ? await localClones(opts2.from, git) : void 0;
       for (const repo of repos)
         out.push(
           // Nothing to lock (nor a folder to make) for an archived or in-place repo.
@@ -627,7 +630,7 @@ function createWorkspace(root, git = createGit()) {
       await writeEditorWorkspaces(root, value);
       return value;
     },
-    async prune(change, opts = {}) {
+    async prune(change, opts2 = {}) {
       const repos = await readChangeRepos(root, change);
       const removed = [];
       const kept = [];
@@ -635,12 +638,12 @@ function createWorkspace(root, git = createGit()) {
         return { removed, kept };
       const removeOne = async (id2, path, repo) => {
         try {
-          if (!opts.force && await dirty(path)) {
+          if (!opts2.force && await dirty(path)) {
             kept.push({ id: id2, reason: "uncommitted changes in the worktree" });
             return;
           }
           const args = ["worktree", "remove"];
-          if (opts.force)
+          if (opts2.force)
             args.push("--force");
           await g([...args, "--", path], baseClonePath(root, repo));
           removed.push(id2);
@@ -651,7 +654,7 @@ function createWorkspace(root, git = createGit()) {
       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) {
+        if (!done && !opts2.all) {
           kept.push({ id: r.id, reason: r.pr ? `PR is ${r.pr.state}` : "no PR yet" });
           waiting.add(r.id);
           continue;
@@ -774,6 +777,32 @@ async function gitUser(root, o = {}) {
   };
 }
 
+// packages/workspace/dist/repo-ids.js
+function repoIdKey(id2) {
+  return id2.toLowerCase().replace(/_/g, "-").replace(/(?:[-.]v?\d+)+$/, "").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
+}
+function cloneUrlKey(url) {
+  const u = url.trim();
+  if (!u || isInPlace(u) || /^\.\.[\\/]/.test(u))
+    return void 0;
+  return u.replace(/[/\\]+$/, "").replace(/\.git$/i, "").replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/^[^@/]+@/, "").replace(/^([^/:]+):(?!\d+\/)/, "$1/").toLowerCase();
+}
+var SAME_ID_WHY = "its id is the same once case, '_' and '-', and a version suffix are set aside";
+function nearRepos(entry, listed) {
+  const key = repoIdKey(entry.id);
+  const url = entry.url ? cloneUrlKey(entry.url) : void 0;
+  const out = [];
+  for (const r of listed) {
+    if (r.id === entry.id)
+      continue;
+    if (url && r.url && cloneUrlKey(r.url) === url)
+      out.push({ id: r.id, why: "it has the same clone URL" });
+    else if (key && repoIdKey(r.id) === key)
+      out.push({ id: r.id, why: SAME_ID_WHY });
+  }
+  return out;
+}
+
 export {
   GitError,
   createGit,
@@ -810,5 +839,9 @@ export {
   remoteDefaultBranch,
   createWorkspace,
   toHandle,
-  gitUser
+  gitUser,
+  repoIdKey,
+  cloneUrlKey,
+  SAME_ID_WHY,
+  nearRepos
 };

package/dist/{chunk-NDCF4R6S.js → chunk-OTUBMKSG.js}

@@ -5,19 +5,21 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   componentTypesAt
-} from "./chunk-OUBGGKDU.js";
+} from "./chunk-HGDBM3A5.js";
 import {
-  COMPONENT_TYPE_SCHEMA_VERSION,
-  ComponentType,
-  RecordId,
-  TYPE_SHAPES,
-  loadOrgPack,
   orgPackDirOf,
   orgPackRelOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
 import {
   writeFileAtomic
-} from "./chunk-TUULXQRW.js";
+} from "./chunk-G3ZFEHCX.js";
+import {
+  COMPONENT_TYPE_SCHEMA_VERSION,
+  ComponentType,
+  RecordId,
+  TYPE_SHAPES,
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";