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

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

@@ -9,7 +9,7 @@ import {
   namesInCode,
   openIndex,
   workspaceRepos
-} from "./chunk-5WERBKLE.js";
+} from "./chunk-RCG5IAAT.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-J25YOUIZ.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-J25YOUIZ.js");
   const r = await namesInCode(root, names, {
     ...codeToolOptions(root),
     outlines: (path) => x.syntaxLanguageOf(path) !== void 0

package/dist/chunk-FRAEQVYN.js

@@ -0,0 +1,52 @@
+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 {
+  AUDIT_WORDS,
+  answerAudit,
+  auditCommand,
+  auditLines,
+  defaultAuditSeed,
+  precisionOf,
+  prepareAudit,
+  tallyWords,
+  writeAudit
+} from "./chunk-HUGQZQ2K.js";
+import "./chunk-T6MX7WXM.js";
+import "./chunk-EHXDB3SA.js";
+import "./chunk-IMZFOMVX.js";
+import "./chunk-VJFXQISZ.js";
+import "./chunk-CT6NINGR.js";
+import "./chunk-ZLQEQR3D.js";
+import "./chunk-OPWGPQ2N.js";
+import "./chunk-73GFVW2L.js";
+import "./chunk-XOMEQVLK.js";
+import "./chunk-J4CPHJUL.js";
+import "./chunk-IKAW2KJU.js";
+import "./chunk-CZ2ZS7AT.js";
+import "./chunk-4GAB5ZOZ.js";
+import "./chunk-A4JXVO5O.js";
+import "./chunk-TDSCKP3V.js";
+import "./chunk-G6EFXTUO.js";
+import "./chunk-PQQKZPBU.js";
+import "./chunk-RRQUQAXP.js";
+import "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  AUDIT_WORDS,
+  answerAudit,
+  auditCommand,
+  auditLines,
+  defaultAuditSeed,
+  precisionOf,
+  prepareAudit,
+  tallyWords,
+  writeAudit
+};

package/dist/{chunk-UDXWIPCB.js → chunk-FRCOKUU4.js}

@@ -62,13 +62,15 @@ import {
   specEndpointIds,
   specFormatOf,
   vendorImpact
-} from "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-A4JXVO5O.js";
+import "./chunk-TDSCKP3V.js";
+import "./chunk-G6EFXTUO.js";
+import "./chunk-PQQKZPBU.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   CHANGE_INPUTS_SCHEMA_VERSION,

package/dist/{chunk-UYLBRRFK.js → chunk-FSN6JFXB.js}

@@ -4,12 +4,11 @@ var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
-  safeMessage,
-  withFileLock
-} from "./chunk-THN26IEF.js";
+  safeMessage
+} from "./chunk-PXW2RZGQ.js";
 import {
   checkoutOf
-} from "./chunk-Q46QDDMF.js";
+} from "./chunk-73GFVW2L.js";
 import {
   AI_LINE_BY,
   AnswerMatch,
@@ -48,6 +47,7 @@ import {
   parseAuditFile,
   parseCorrections,
   parseFacts,
+  personEditOfTo,
   proposalRelOf,
   questionAiProblem,
   questionBar,
@@ -57,14 +57,16 @@ import {
   ruleKindOf,
   writeBatch,
   writeQuestion
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
 import {
+  FileChangedError,
+  withSharedFileLock,
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-B4AEL3RF.js";
 
 // packages/cli/dist/ai-decide.js
-import { readdir, readFile, rm, stat } from "node:fs/promises";
-import { isAbsolute, join, relative, resolve } from "node:path";
+import { mkdir, readdir, readFile, rm, stat } from "node:fs/promises";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 var DecideError = class extends Error {
   code;
   constructor(code, message) {
@@ -92,7 +94,7 @@ async function correctedRepos(root) {
 }
 async function rewriteCorrections(root, repo, o) {
   const file = correctionsFile(root, repo);
-  return withFileLock(file, async () => {
+  return withSharedFileLock(file, async () => {
     const text = await readFile(file, "utf8").catch(() => "");
     const eol = /\r\n/.test(text) ? "\r\n" : "\n";
     const lines = text.split(/\r?\n/).filter((l, i, all) => l !== "" || i < all.length - 1);
@@ -107,7 +109,7 @@ async function rewriteCorrections(root, repo, o) {
       return true;
     });
     const have = new Set(kept.map((l) => l.trim()));
-    const wanted = o.pick ? o.pick(parseCorrections(text).corrections) : o.add ?? [];
+    const wanted = o.pick ? await o.pick(parseCorrections(text).corrections) : o.add ?? [];
     const add = wanted.filter((l) => !have.has(l.trim()));
     const out = [...kept.filter((l) => l.trim() !== ""), ...add];
     if (!removed && !add.length)
@@ -135,8 +137,28 @@ async function coversCall(match, f, facts) {
   const s = subjectOfCall(f);
   if (s?.topic)
     return matchCovers(match, s);
-  const { ruleCoversCall } = await import("./chunk-BXZ4PKIT.js");
-  return ruleCoversCall(match, f, facts);
+  const { ruleCoversCall } = await import("./chunk-BUUJ7N4O.js");
+  return ruleCoversCall(match, f, facts, { strict: true });
+}
+async function answeredByPerson(root, repo, facts) {
+  const questions = (await listQuestions(root, { step: TARGETS_STEP_ID })).questions;
+  const people = questions.filter((q) => q.state === "answered" && !!q.answer && !isAiBy(q.answer.by));
+  if (!people.length)
+    return /* @__PURE__ */ new Set();
+  const { estateRepos, targetsFromAnswers, TARGETS_SPLIT } = await import("./chunk-BUUJ7N4O.js");
+  const byRepo = /* @__PURE__ */ new Map([[repo, facts]]);
+  const out = new Set(people.filter((q) => q.repo === repo && q.options[(q.answer.option ?? 0) - 1]?.label !== TARGETS_SPLIT).flatMap((q) => callsOfQuestion(q, byRepo).map((c) => c.id)));
+  const op = await loadOrgPack(orgPackDirOf(root));
+  const repoType = estateRepos(op).find((r) => r.id === repo)?.type;
+  const ai = {};
+  const named = targetsFromAnswers(repo, facts, questions, {
+    ...repoType ? { repoType } : {},
+    ai
+  });
+  for (const id of Object.keys(named))
+    if (!ai[id])
+      out.add(id);
+  return out;
 }
 async function aiAuditItems(root) {
   const out = [];
@@ -310,11 +332,21 @@ async function decideLinks(root, o) {
   }
   if (!lines.length)
     return { mode: "auto", applied, kept };
+  const answered = /* @__PURE__ */ new Set();
   const r = await rewriteCorrections(root, o.view.from, {
-    pick: (now) => lines.filter((l) => {
-      const f = calls.get(l);
-      return !linksFor(f, now).some((c) => !c.ai);
-    })
+    pick: async (now) => {
+      const byPerson = await answeredByPerson(root, o.view.from, o.facts);
+      return lines.filter((l) => {
+        const f = calls.get(l);
+        if (linksFor(f, now).some((c) => !c.ai) || personEditOfTo(f, now))
+          return false;
+        if (byPerson.has(f.id)) {
+          answered.add(l);
+          return false;
+        }
+        return true;
+      });
+    }
   });
   const written = new Set(r.picked ?? []);
   for (let i = applied.length - 1; i >= 0; i--) {
@@ -323,7 +355,7 @@ async function decideLinks(root, o) {
     kept.push({
       call: applied[i].call,
       api: applied[i].api,
-      why: "a person has said where this call goes: their word stands"
+      why: answered.has(lines[i]) ? "a person answered where this call goes (its targets question): their word stands" : "a person has said where this call goes: their word stands"
     });
     applied.splice(i, 1);
     items.splice(i, 1);
@@ -356,14 +388,35 @@ async function targetRuleVerdict(root, q, label, questions) {
   if (!calls.length)
     return void 0;
   const op = await loadOrgPack(orgPackDirOf(root));
-  const { estateRepos, ruledTargets } = await import("./chunk-BXZ4PKIT.js");
+  const { estateRepos, ruledTargets } = await import("./chunk-BUUJ7N4O.js");
   const repoType = estateRepos(op).find((r) => r.id === q.repo)?.type;
-  const ruled = ruledTargets(q.repo, facts, questions, repoType ? { repoType } : {});
+  const ruled = ruledTargets(q.repo, facts, questions, {
+    ...repoType ? { repoType } : {},
+    strict: true
+  });
   const labels = calls.map((c) => ruled.get(c.id)?.label);
   if (labels.some((l) => l !== void 0 && l !== label))
     return "against";
   return labels.every((l) => l === label) ? "agrees" : void 0;
 }
+async function personLinkVerdict(root, q, label) {
+  const facts = await factsOf(root, q.repo);
+  const calls = callsOfQuestion(q, /* @__PURE__ */ new Map([[q.repo, facts]]));
+  if (!calls.length)
+    return void 0;
+  const corrections = await correctionsOf(root, q.repo);
+  if (calls.some((c) => linksFor(c, corrections).some((l) => !l.ai) || personEditOfTo(c, corrections)))
+    return "a person said where its call goes on the canvas (a pairing or none): their word stands";
+  const rules = await linkRulesOf(root, q.repo);
+  for (const c of calls)
+    for (const r of rules)
+      if (await coversCall(r.match, c, facts)) {
+        if (r.answer !== label)
+          return `a person's rule (${r.match}) says these calls go to ${r.answer}`;
+        break;
+      }
+  return void 0;
+}
 async function decideAnswers(root, o) {
   if (inAcpSession(o.env))
     return void 0;
@@ -405,13 +458,18 @@ async function decideAnswers(root, o) {
       continue;
     }
     const label = q.options[option - 1].label;
-    const { TARGETS_NO_EVIDENCE } = await import("./chunk-BXZ4PKIT.js");
+    const { TARGETS_NO_EVIDENCE } = await import("./chunk-BUUJ7N4O.js");
     const shapesFirst = option === 1 && !q.options[0].means.includes(TARGETS_NO_EVIDENCE);
     const rule = await targetRuleVerdict(root, q, label, everyTarget);
     if (rule === "against") {
       kept.push({ id: p.id, why: "a person's rule covers its calls and says otherwise" });
       continue;
     }
+    const declined = await personLinkVerdict(root, q, label);
+    if (declined) {
+      kept.push({ id: p.id, why: declined });
+      continue;
+    }
     const bar = questionBar(q, option, { shapesFirst, ruleAgrees: rule === "agrees" });
     if (!bar) {
       kept.push({
@@ -421,6 +479,8 @@ async function decideAnswers(root, o) {
       continue;
     }
     const by = { kind: "ai", runtime, run: o.run, bar };
+    const proposalFile = join(root, ...proposalRelOf(root, q.id).split("/"));
+    const proposalText = await readFile(proposalFile, "utf8").catch(() => void 0);
     try {
       await answerQuestion(root, q.id, {
         option,
@@ -434,10 +494,18 @@ async function decideAnswers(root, o) {
         kept.push({ id: p.id, why: e.message });
         continue;
       }
+      if (e instanceof FileChangedError) {
+        kept.push({ id: p.id, why: "a person changed it meanwhile: theirs stands" });
+        continue;
+      }
       throw e;
     }
-    await rm(join(root, ...proposalRelOf(root, q.id).split("/")), { force: true });
-    items.push({ kind: "question", id: q.id });
+    await rm(proposalFile, { force: true });
+    items.push({
+      kind: "question",
+      id: q.id,
+      ...proposalText?.trim() && proposalText.length <= 65536 ? { proposal: proposalText } : {}
+    });
     applied.push({ id: q.id, option, bar });
   }
   if (items.length)
@@ -517,8 +585,8 @@ async function decisionsView(root) {
       qCounts.byPerson++;
   }
   const linkCounts = { fromCode: 0, byPerson: 0, byAi: 0 };
-  const { readCatalog } = await import("./chunk-BXZ4PKIT.js");
-  const cat = await readCatalog(join(catalogDirOf(root), "generated")).catch(() => void 0);
+  const { readCatalog } = await import("./chunk-BUUJ7N4O.js");
+  const cat = await readCatalog(join(catalogDirOf(root), "generated"), { cacheRoot: root }).catch(() => void 0);
   for (const r of cat?.records ?? []) {
     if (r.kind !== "Interface")
       continue;
@@ -682,7 +750,7 @@ async function correctQuestion(root, req, o) {
   }
   const spread = plans.map((p) => p.view);
   const op = await loadOrgPack(orgPackDirOf(root));
-  const { estateRepos } = await import("./chunk-BXZ4PKIT.js");
+  const { estateRepos } = await import("./chunk-BUUJ7N4O.js");
   const repoType = estateRepos(op).find((r) => r.id === q.repo)?.type;
   const shape = `question:${repoType ?? q.repo}:${rule?.match ?? calls[0]?.path ?? q.id}`;
   const n = await shapeCount(root, shape);
@@ -825,7 +893,7 @@ async function correctLink(root, req, o) {
   const appliedItems = [{ kind: "link", repo, fact: f.id, line: ownLine }];
   const revertedItems = [];
   if (rule) {
-    const { candidatesOf, settingsOf } = await import("./chunk-PRZ7KMWL.js");
+    const { candidatesOf, settingsOf } = await import("./chunk-W4TNCEI4.js");
     const box = { repo: target ?? aiRepo };
     const cands = box.repo !== repo ? await candidatesOf(root, repo, box).catch(() => void 0) : void 0;
     const loose = new Set((cands?.view.calls ?? []).filter((c) => c.status !== "paired").map((c) => c.fact));
@@ -846,6 +914,7 @@ async function correctLink(root, req, o) {
       return s ? apis.find((a) => a.id === s) : void 0;
     };
     const words = (c) => `${repo}'s call ${[c.method?.toUpperCase(), c.path].filter(Boolean).join(" ")} (${c.cite.file}:${c.cite.line})`;
+    const byPerson = await answeredByPerson(root, repo, facts);
     for (const c of facts) {
       if (c.kind !== "call" || c.id === f.id)
         continue;
@@ -854,6 +923,10 @@ async function correctLink(root, req, o) {
       const st = linksFor(c, corrections)[0];
       if (st && !st.ai)
         continue;
+      if (personEditOfTo(c, corrections))
+        continue;
+      if (byPerson.has(c.id))
+        continue;
       const item = `link:${repo}:${c.id}`;
       const was = st?.ai ? `${st.link.repo} ${[st.link.method, st.link.path].filter(Boolean).join(" ")}` : void 0;
       if (!st && !loose.has(c.id))
@@ -899,7 +972,7 @@ async function correctLink(root, req, o) {
     }
   }
   const op = await loadOrgPack(orgPackDirOf(root));
-  const { estateRepos } = await import("./chunk-BXZ4PKIT.js");
+  const { estateRepos } = await import("./chunk-BUUJ7N4O.js");
   const repoType = estateRepos(op).find((r) => r.id === repo)?.type;
   const shape = `link:${repoType ?? repo}:${rule?.match ?? f.path}`;
   const n = await shapeCount(root, shape);
@@ -954,6 +1027,30 @@ async function batchStands(root, b) {
   }
   return false;
 }
+async function restoreProposal(root, q, text) {
+  const rel = proposalRelOf(root, q.id);
+  const file = join(root, ...rel.split("/"));
+  if (await stat(file).then(() => true, () => false))
+    return void 0;
+  let out = text;
+  const p = q.answer?.proposal;
+  if (!out && p && q.answer?.option && p.cites.length) {
+    const { stringify } = await import("./chunk-H4VO6WG3.js");
+    out = stringify({
+      schemaVersion: 1,
+      answer: { option: q.answer.option },
+      why: `Put back on Undo of the AI's answer: ${p.by} proposed it, citing the lines below.`,
+      cites: p.cites,
+      by: p.by,
+      at: p.at
+    });
+  }
+  if (!out)
+    return void 0;
+  await mkdir(dirname(file), { recursive: true });
+  await writeFileAtomic(file, out);
+  return rel.replace(/[^/]+$/, "");
+}
 async function undoBatch(root, id, o) {
   if (inAcpSession(o.env))
     throw new DecideError("refused", "Undo is a person's: a Copilot session acts as no one.");
@@ -1019,6 +1116,11 @@ async function undoBatch(root, id, o) {
       skipped.push(`${i.id} was answered again since: left as it is`);
       continue;
     }
+    if (b.kind === "ai" && isAiBy(q.answer.by)) {
+      const restoredProposal = await restoreProposal(root, q, i.proposal);
+      if (restoredProposal)
+        files.add(restoredProposal);
+    }
     const { answer: _a, ...rest } = q;
     const before = i.before && !await isUndone(i.before.batch) ? i.before : void 0;
     if (i.before && !before)

package/dist/{chunk-BC6KKZ67.js → chunk-FTLYXMHA.js}

@@ -6,13 +6,16 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   openIndex,
   searchIndex
-} from "./chunk-5WERBKLE.js";
-import "./chunk-QHJJMZLX.js";
+} from "./chunk-RCG5IAAT.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
+import {
+  changesDirOf
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import {
-  changesDirOf,
   require_dist
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -118,7 +121,7 @@ async function pastChangeMarkdown(root, folder) {
 `;
 }
 async function attachPastChange(root, change, folder, by, now = /* @__PURE__ */ new Date()) {
-  const { attachFiles } = await import("./chunk-XQ3YZ4QW.js");
+  const { attachFiles } = await import("./chunk-ISG547IS.js");
   const name = `like-${folder.replace(DATED, "$2")}.md`;
   await attachFiles(root, change, [{ name, bytes: new TextEncoder().encode(await pastChangeMarkdown(root, folder)) }], by, now);
   return name;

package/dist/{chunk-FAJDKNSD.js → chunk-FVYZ4Y52.js}

@@ -6,6 +6,7 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   GitError,
   IGNORED,
+  SAME_ID_WHY,
   WORKSPACE_DIR,
   WorkspaceFileError,
   baseClonePath,
@@ -17,6 +18,7 @@ import {
   changedFiles,
   changesSince,
   checkoutState,
+  cloneUrlKey,
   createGit,
   createWorkspace,
   ensureGitignore,
@@ -26,11 +28,15 @@ import {
   intellijProject,
   intellijProjectPath,
   isInPlace,
+  legacyBranchCheckoutPath,
+  legacyBranchSlug,
   loadManifest,
   loadRepos,
+  nearRepos,
   readChangeRepos,
   remoteDefaultBranch,
   removeEditorWorkspaces,
+  repoIdKey,
   toHandle,
   toRepoRelative,
   vscodeWorkspace,
@@ -38,13 +44,15 @@ import {
   worktreePath,
   writeChangeRepos,
   writeEditorWorkspaces
-} from "./chunk-XOL3GFW2.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-3EWKO457.js";
+import "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   GitError,
   IGNORED,
+  SAME_ID_WHY,
   WORKSPACE_DIR,
   WorkspaceFileError,
   baseClonePath,
@@ -56,6 +64,7 @@ export {
   changedFiles,
   changesSince,
   checkoutState,
+  cloneUrlKey,
   createGit,
   createWorkspace,
   ensureGitignore,
@@ -65,11 +74,15 @@ export {
   intellijProject,
   intellijProjectPath,
   isInPlace,
+  legacyBranchCheckoutPath,
+  legacyBranchSlug,
   loadManifest,
   loadRepos,
+  nearRepos,
   readChangeRepos,
   remoteDefaultBranch,
   removeEditorWorkspaces,
+  repoIdKey,
   toHandle,
   toRepoRelative,
   vscodeWorkspace,

package/dist/{chunk-TWQRPM76.js → chunk-G6EFXTUO.js}

@@ -10,13 +10,14 @@ import {
   globToRegExp,
   memoryRepo,
   scanRepo
-} from "./chunk-7AB6OWTV.js";
+} from "./chunk-PQQKZPBU.js";
 import {
   Dialect,
   FrameworkModel,
   MESH_KEY,
   RECORD_SCHEMAS,
   RecordId,
+  cmpText,
   fieldTemplates,
   interfaceId,
   matchType,
@@ -24,9 +25,11 @@ import {
   readTarGz,
   readZip,
   renderExpr,
-  renderTemplate,
+  renderTemplate
+} from "./chunk-FPBUTZI5.js";
+import {
   require_dist
-} from "./chunk-PAINMSID.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __commonJS,
   __require,
@@ -1677,7 +1680,7 @@ async function configSources(repo, globs = [
 }
 function layer(sources2, keep) {
   const rank = (s) => !s.profile ? 0 : PROD.test(s.profile) ? 1 : 2;
-  const ordered = sources2.filter(keep).sort((a, b) => rank(a) - rank(b) || (a.profile ?? "").localeCompare(b.profile ?? "") || a.file.split("/").pop().length - b.file.split("/").pop().length || a.file.localeCompare(b.file));
+  const ordered = sources2.filter(keep).sort((a, b) => rank(a) - rank(b) || cmpText(a.profile ?? "", b.profile ?? "") || a.file.split("/").pop().length - b.file.split("/").pop().length || cmpText(a.file, b.file));
   const out2 = /* @__PURE__ */ new Map();
   for (const s of ordered)
     for (const [k, v] of s.values)
@@ -2670,7 +2673,7 @@ async function dotenv(repo) {
   for await (const p of repo.listFiles([".env", "**/.env", ".env.example", "**/.env.example"]))
     if (!skipPath(p))
       files.push(p);
-  files.sort((a, b) => Number(a.endsWith(".example")) - Number(b.endsWith(".example")) || a.split("/").length - b.split("/").length || a.localeCompare(b));
+  files.sort((a, b) => Number(a.endsWith(".example")) - Number(b.endsWith(".example")) || a.split("/").length - b.split("/").length || cmpText(a, b));
   for (const f of files) {
     (await repo.readText(f)).split(/\r?\n/).forEach((raw, i2) => {
       const m = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_.]*)\s*=\s*(.*?)\s*$/.exec(raw);
@@ -4087,7 +4090,7 @@ async function wrapperRequests(repo, paths, scriptOf = (_p, t) => t) {
     if (url)
       out2.push({ method: w.method.v, url, path: w.at.path, line: w.at.line });
   }
-  return out2.sort((x, y) => x.path.localeCompare(y.path) || x.line - y.line);
+  return out2.sort((x, y) => cmpText(x.path, y.path) || x.line - y.line);
 }
 
 // packages/extractors/dist/lang/sql.js
@@ -4709,7 +4712,7 @@ var migrationsExtractor = defineExtractor({
       for (let i2 = 0; i2 < Math.max(x.length, y.length); i2++)
         if ((x[i2] ?? 0) !== (y[i2] ?? 0))
           return (x[i2] ?? 0) - (y[i2] ?? 0);
-      return a.path.localeCompare(b.path);
+      return cmpText(a.path, b.path);
     });
     let first2 = true;
     const state = new DesignState();
@@ -6293,7 +6296,7 @@ var springExtractor = defineExtractor({
   }
 });
 function* settings(repoName, component2, config) {
-  for (const [key, v] of [...config.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+  for (const [key, v] of [...config.entries()].sort(([a], [b]) => cmpText(a, b))) {
     const kind = SETTING_KIND.find(([re2]) => re2.test(key.split(".").pop() ?? ""))?.[1];
     if (!kind || v.value === "")
       continue;
@@ -6922,7 +6925,7 @@ var int = (v) => {
   return Number.isInteger(n) && n >= 0 ? n : void 0;
 };
 function deployment(f) {
-  const ingress = [...f.ingress ?? []].sort((a, b) => `${a.host}|${a.path ?? ""}`.localeCompare(`${b.host}|${b.path ?? ""}`));
+  const ingress = [...f.ingress ?? []].sort((a, b) => cmpText(`${a.host}|${a.path ?? ""}`, `${b.host}|${b.path ?? ""}`));
   return {
     schemaVersion: 1,
     kind: "Deployment",
@@ -7003,7 +7006,7 @@ async function loadTerraform(repo, ctx, relevant) {
     byDir.set(dirOf2(path), [...byDir.get(dirOf2(path)) ?? [], { path, text: text2 }]);
   }
   const folders = /* @__PURE__ */ new Map();
-  for (const [dir, list2] of [...byDir.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+  for (const [dir, list2] of [...byDir.entries()].sort(([a], [b]) => cmpText(a, b))) {
     const f = {
       dir,
       relevant: list2.some((x) => x.path.endsWith(".tf") && relevant.test(x.text)),
@@ -7608,6 +7611,7 @@ async function repoConfigFiles(repo, globs) {
 }
 function dialectExtractor(dialect, parents = /* @__PURE__ */ new Map(), o = {}) {
   const rules = /* @__PURE__ */ new Map();
+  const applied = /* @__PURE__ */ new Set();
   const visit = (d, seen) => {
     for (const p of d.extends) {
       if (seen.has(p))
@@ -7615,8 +7619,11 @@ function dialectExtractor(dialect, parents = /* @__PURE__ */ new Map(), o = {})
       const parent = parents.get(p);
       if (!parent)
         throw new Error(`dialect ${d.name} extends ${p}, which isn't loaded`);
+      if (applied.has(p))
+        continue;
       visit(parent, /* @__PURE__ */ new Set([...seen, p]));
     }
+    applied.add(d.name);
     for (const r of d.rules)
       rules.set(r.id, r);
   };
@@ -7738,7 +7745,7 @@ function dialectExtractor(dialect, parents = /* @__PURE__ */ new Map(), o = {})
         }
         tables.set(name2, table);
       }
-      for (const rule of [...rules.values()].sort((a, b) => a.id.localeCompare(b.id))) {
+      for (const rule of [...rules.values()].sort((a, b) => cmpText(a.id, b.id))) {
         const emits = Array.isArray(rule.emit) ? rule.emit : [rule.emit];
         const yamlValues = await yamlFor([
           ...emits.flatMap(templatesOf),
@@ -8218,7 +8225,7 @@ function attrGroup(src, open, close) {
 }
 async function appsettings(repo) {
   const files = await listSources(repo, ["**/appsettings.json", "**/appsettings.*.json"]);
-  files.sort((a, b) => a.split("/").pop().length - b.split("/").pop().length || a.localeCompare(b));
+  files.sort((a, b) => a.split("/").pop().length - b.split("/").pop().length || cmpText(a, b));
   const out2 = /* @__PURE__ */ new Map();
   for (const f of files) {
     const flat2 = flattenYaml(stripJsonComments(await repo.readText(f)), f, repo.parseCache);
@@ -8487,7 +8494,7 @@ var dotnetExtractor = defineExtractor({
     }
     const csproj = (await listSources(repo, ["**/*.csproj"])).map((p) => repo.readText(p));
     const packages = (await Promise.all(csproj)).join("\n");
-    for (const [key, v] of [...config.entries()].sort(([a], [b]) => a.localeCompare(b))) {
+    for (const [key, v] of [...config.entries()].sort(([a], [b]) => cmpText(a, b))) {
       if (!key.startsWith("connectionstrings."))
         continue;
       const scheme = /Npgsql/i.test(packages) ? "postgresql" : /MySql|Pomelo/i.test(packages) ? "mysql" : /SqlClient|SqlServer/i.test(packages) ? "sqlserver" : /Oracle/i.test(packages) ? "oracle" : /(^|;)\s*Host\s*=/i.test(v.value) ? "postgresql" : "sqlserver";
@@ -14737,7 +14744,7 @@ async function readEfCore(repo) {
   const has = (p, name2) => p.attrs.find((a) => a.name === name2);
   const scalar2 = (p) => SCALARS.has(p.type.replace(/^System\./, "")) || enums.has(p.type);
   const info2 = /* @__PURE__ */ new Map();
-  const sorted = entities.map((n) => classes.get(n)).sort((a, b) => a.path.localeCompare(b.path) || a.line - b.line);
+  const sorted = entities.map((n) => classes.get(n)).sort((a, b) => cmpText(a.path, b.path) || a.line - b.line);
   for (const c of sorted) {
     const tableAttr = has(c, "Table");
     const name2 = fluent.get(c.name) ?? (tableAttr && firstString(tableAttr)) ?? sets.get(c.name) ?? c.name;
@@ -16005,7 +16012,7 @@ async function markers(repo, ctx) {
         line: firstLine2(text2, /<Use(WPF|WindowsForms)>/i)
       });
   }
-  return found.sort((a, b) => order.indexOf(a.runtime) - order.indexOf(b.runtime) || a.path.localeCompare(b.path));
+  return found.sort((a, b) => order.indexOf(a.runtime) - order.indexOf(b.runtime) || cmpText(a.path, b.path));
 }
 function joinBase(base, path) {
   if (!base || /^https?:\/\//.test(path))
@@ -19385,7 +19392,7 @@ async function detectModules(repo) {
   }
   if (parts2.size + (rootPart ? 1 : 0) < 2)
     return [];
-  return [...parts2].sort(([a], [b]) => a.localeCompare(b)).map(([path, component2]) => ({ path, component: component2 }));
+  return [...parts2].sort(([a], [b]) => cmpText(a, b)).map(([path, component2]) => ({ path, component: component2 }));
 }
 
 // packages/extractors/dist/dependencies.js