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

package/dist/chunk-C4R4JLHE.js

@@ -0,0 +1,40 @@
+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 {
+  changeEstimateCommand,
+  estimateOf
+} from "./chunk-BDKC6H5P.js";
+import "./chunk-IH2XURVQ.js";
+import "./chunk-WF7B67YE.js";
+import "./chunk-6PPOWY5E.js";
+import "./chunk-OHNCWBKF.js";
+import "./chunk-BTGPE6CR.js";
+import "./chunk-MUWDB4R4.js";
+import "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.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 {
+  changeEstimateCommand,
+  estimateOf
+};

package/dist/chunk-CADWLE2T.js

@@ -0,0 +1,18 @@
+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 {
+  routeQuestions,
+  ruleOffers
+} from "./chunk-JA5FI3QV.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  routeQuestions,
+  ruleOffers
+};

package/dist/chunk-CBGGOQWU.js

@@ -0,0 +1,82 @@
+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 {
+  listRuns
+} from "./chunk-GZY6RUZ6.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import {
+  runsDirOf
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+
+// packages/cli/dist/handoff-resume.js
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+var STAGE_PAGES = [
+  [
+    /^atticus change feature \S+(?: --\S+(?: \S+)?)*$/,
+    "prepare the feature stage again on Feature design"
+  ],
+  [
+    /^atticus change architecture \S+(?: --\S+(?: \S+)?)*$/,
+    "prepare the architecture stage again on Architecture"
+  ],
+  [/^atticus plan stories \S+(?: --\S+(?: \S+)?)*$/, "prepare the stories stage again on Stories"],
+  [/^atticus change small \S+(?: --\S+(?: \S+)?)*$/, "prepare its one step again on At a glance"]
+];
+var againWords = (command) => STAGE_PAGES.find(([re]) => re.test(command))?.[1] ?? "prepare it again on the page you prepared it from";
+function appLines(lines, o = {}) {
+  const ready = o.next ? "The next prompt is ready: open it on Runs." : "The prompt is ready: open it on Runs, then press Done once your assistant has written the answer.";
+  return lines.map((l) => l.replace(/\s*When it is done(?:, run)?: atticus handoff done \S+.*$/, ` ${ready}`).replace(/,? (?:and|then) run atticus handoff done \S+ again/g, ", then press Done again").replace(/\b([Rr])un atticus handoff done \S+ again/g, (_m, r) => r === "R" ? "Press Done again" : "press Done again").replace(/: pull \S+, then run atticus change learn\.$/, ": Bring in what merged on Home; the comparison with what Atticus drafted is kept the next time the drafts are measured.").replace(/^Answer each with atticus questions answer <id> .*, or with \/atticus-answer\.$/, "Answer each on Questions.").replace(/\b([Tt])hen run (atticus [^:]+?) again\b/, (_m, t, cmd) => `${t}hen ${againWords(cmd)}`).replace(/^Open the stage's pull request for a person to approve: .*$/, "Raise the stage's hand-off on the change page for a person to approve.").trimStart());
+}
+async function prepareStep(root, runStep, args, o = {}) {
+  const res = await runStep([...args, "--handoff", "--json"]);
+  const lines = [...res.out, ...res.err];
+  const json = [...res.out].reverse().find((l) => l.trim().startsWith("{"));
+  let h = {};
+  try {
+    h = json ? JSON.parse(json) : {};
+  } catch {
+    h = {};
+  }
+  const said = appLines([
+    ...lines.filter((l) => !l.trim().startsWith("{")),
+    ...h.messages ?? [],
+    ...h.errors ?? [],
+    ...(h.questions ?? []).map((q) => `Question ${q.id}: ${q.question} (answer it on Questions)`),
+    ...h.pagesLeft ? [`${h.pagesLeft} pages are left for the next part: Prepare it again.`] : []
+  ], o);
+  if (h.state !== "handoff" || !h.runId)
+    return { code: res.code, prepared: { lines: said } };
+  const run = (await listRuns(root, { limit: 1e5 })).find((x) => x.runId === h.runId);
+  if (run && h.resumeArgs)
+    await writeFile(join(runsDirOf(root), run.change, run.runId, "resume.json"), JSON.stringify({ args: h.resumeArgs.filter((a) => a !== "--json") }) + "\n", "utf8").catch(() => void 0);
+  return {
+    code: res.code,
+    prepared: {
+      runId: h.runId,
+      lines: said,
+      ...h.stillWaiting ? { stillWaiting: true } : {}
+    }
+  };
+}
+async function resumeAfterDone(root, runStep, change, runId) {
+  const t = await readFile(join(runsDirOf(root), change, runId, "resume.json"), "utf8").catch(() => void 0);
+  if (!t)
+    return void 0;
+  const { args } = JSON.parse(t);
+  const words = args.filter((a) => a !== "--handoff");
+  const r = await prepareStep(root, runStep, words, { next: true });
+  return r.prepared.runId && r.prepared.runId !== runId ? { next: r.prepared.runId, lines: r.prepared.lines } : { lines: r.prepared.lines };
+}
+export {
+  appLines,
+  prepareStep,
+  resumeAfterDone
+};

package/dist/chunk-CMDXGQTS.js

@@ -0,0 +1,47 @@
+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 {
+  REPO_READER,
+  mapCommand,
+  mapStateOf,
+  readAnswer,
+  repoReaderAgent,
+  ruleLineOf,
+  rulesCovering,
+  taughtIn
+} from "./chunk-X5F3Q5LV.js";
+import "./chunk-OUBGGKDU.js";
+import "./chunk-BPK5P77O.js";
+import "./chunk-EHA7RMZ3.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-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 {
+  REPO_READER,
+  mapCommand,
+  mapStateOf,
+  readAnswer,
+  repoReaderAgent,
+  ruleLineOf,
+  rulesCovering,
+  taughtIn
+};

package/dist/{chunk-MC3H7736.js → chunk-CQDGOPGH.js}

@@ -10,13 +10,14 @@ import {
   globToRegExp,
   memoryRepo,
   scanRepo
-} from "./chunk-GQ4N4WKF.js";
+} from "./chunk-3NFFJL5D.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-Q2TECDIT.js";
+import {
   require_dist
-} from "./chunk-S2A7YC3Q.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))
@@ -18702,6 +18709,8 @@ function clientOf(type, method, names, source) {
   };
 }
 function addConstant(c, owner, name2, value2, source) {
+  if (name2 === "serialVersionUID")
+    return;
   c.constants[`${owner}.${name2}`] = { value: value2, source };
   if (/service/i.test(owner))
     c.serviceIds.push(`${owner}.${name2}`);
@@ -18752,7 +18761,7 @@ function assemble(c, o) {
   const model = FrameworkModel.parse({
     schemaVersion: 1,
     name: o.name,
-    packages: o.packages ?? [commonPrefix([...c.packages])].filter(Boolean),
+    packages: o.packages ?? packagesOf(c),
     artifacts: [...new Set(c.artifacts)],
     annotations,
     clients: c.clients,
@@ -18765,7 +18774,7 @@ async function learnFramework(repo, o) {
   const src = (path) => ({ kind: "code", ref: `${repo.name}:${path}` });
   const c = collected();
   for await (const path of repo.listFiles(["**/*.java", "**/pom.xml"])) {
-    if (/(^|\/)src\/test\//.test(path))
+    if (/(^|\/)src\/test\//.test(path) || isBuildOutput(path))
       continue;
     const text2 = await repo.readText(path);
     if (path.endsWith("pom.xml")) {
@@ -18878,6 +18887,25 @@ function learnFrameworkFromJar(jar, o) {
   }
   return assemble(c, o);
 }
+function isBuildOutput(path) {
+  const m = /(^|\/)(target|build)\//.exec(path);
+  return !!m && !path.slice(0, m.index).split("/").includes("src");
+}
+function packagesOf(c) {
+  const names = [...c.packages].sort();
+  if (names.length === 0)
+    throw new Error("no Java source with a package declaration was found (tests, target/ and build/ are left out). Point --from at the framework's own source, its JAR or its .tgz, or name its package with --package <base package>.");
+  const p = commonPrefix(names);
+  if (p)
+    return [p];
+  const count = /* @__PURE__ */ new Map();
+  for (const n of names) {
+    const r = n.split(".").slice(0, 2).join(".");
+    count.set(r, (count.get(r) ?? 0) + 1);
+  }
+  const roots = [...count.keys()].sort((a, b) => count.get(b) - count.get(a) || (a < b ? -1 : 1));
+  throw new Error(`its Java packages share no common package (${roots.slice(0, 6).join(", ")}${roots.length > 6 ? ", ..." : ""}), so the framework's can't be told. Name it with --package <base package>, e.g. --package ${roots[0]}.`);
+}
 function commonPrefix(names) {
   if (names.length === 0)
     return "";
@@ -19364,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
@@ -19410,6 +19438,18 @@ async function houseDependencies(repo, groups) {
       for (const block of select(pom, "project/properties"))
         for (const p of block.children)
           props.set(p.name, p.text.trim());
+      const parentVersion = selectText(pom, "project/parent/version")?.text.trim();
+      const ownVersion = selectText(pom, "project/version")?.text.trim() || parentVersion;
+      const builtIn = {
+        "project.parent.version": parentVersion,
+        "parent.version": parentVersion,
+        "project.version": ownVersion,
+        version: ownVersion,
+        "pom.version": ownVersion
+      };
+      for (const [k, v] of Object.entries(builtIn))
+        if (v && !props.has(k))
+          props.set(k, v);
       const fill = (v) => v.replace(/\$\{([\w.-]+)\}/g, (s, k) => props.get(k) ?? s);
       for (const d of select(pom, "//dependency")) {
         const group = selectText(d, "groupId")?.text;

package/dist/{chunk-HFQCFSJR.js → chunk-CX4RZ2KS.js}

@@ -28,9 +28,10 @@ import {
   stampEvidence,
   tooLargeMessage,
   withParseCache
-} from "./chunk-GQ4N4WKF.js";
-import "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-3NFFJL5D.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   DEFAULT_IGNORES,