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

package/dist/{chunk-WWPC2AZ2.js → chunk-5QUOPNLN.js}

@@ -5,7 +5,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readCatalog
-} from "./chunk-EZBAS5BL.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   VIEW_NAMES,
   ViewError,
@@ -14,14 +14,14 @@ import {
   toDrawio,
   toMermaid,
   viewFromDiagram
-} from "./chunk-IPSFMTK2.js";
+} from "./chunk-JYMIB5XY.js";
 import {
   readDrawio
-} from "./chunk-7IM4BVVH.js";
+} from "./chunk-YO2PKTXT.js";
 import {
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/diagram-commands.js
 import { mkdir, readFile, writeFile } from "node:fs/promises";

package/dist/{chunk-7OVH2L7L.js → chunk-5TDRBOAV.js}

@@ -8,11 +8,11 @@ import {
   criticCodeSearch,
   metarepoToolBox,
   offerCodeDir
-} from "./chunk-JZOOX3PQ.js";
-import "./chunk-YXUIUOQZ.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-ZOSD4FXV.js";
+import "./chunk-5WERBKLE.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 export {
   codeToolOptions,

package/dist/{chunk-YXUIUOQZ.js → chunk-5WERBKLE.js}

@@ -6,11 +6,13 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   dotInt8,
   textSha
-} from "./chunk-QNMLLYTN.js";
+} from "./chunk-QHJJMZLX.js";
 import {
+  JOINED_BY_PERSON,
   Question,
   RECORD_KINDS,
   RecordId,
+  answerByWords,
   changesDirOf,
   deserializeRecord,
   identifierWords,
@@ -28,7 +30,7 @@ import {
   splitForms,
   stateDirOf,
   toCanonicalYaml
-} from "./chunk-YK6CSODO.js";
+} from "./chunk-PAINMSID.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -870,9 +872,9 @@ function questionNodes(path, text) {
         name: q.question,
         file: path,
         verified: false,
-        line: `answered question ${q.id}: ${q.question} Answer: ${answer} (${a.by}, ${a.at}) [${path}]`,
+        line: `answered question ${q.id}: ${q.question} Answer: ${answer} (${answerByWords(a.by)}, ${a.at}) [${path}]`,
         detail: `Question ${q.id} (${path}), asked by ${q.askedBy.step} about repo ${q.repo}: ${q.question}
-Answer, by ${a.by} at ${a.at}: ${answer}
+Answer, by ${answerByWords(a.by)} at ${a.at}: ${answer}
 Evidence: ${q.evidence.join(", ")}`,
         names: "",
         ids: q.id,
@@ -1004,8 +1006,8 @@ var DOCUMENT_EXTENSIONS = /\.(docx|pptx|xlsx|pdf|md|markdown|html?|txt)$/i;
 async function documentNodes(path, bytes) {
   const out = { nodes: [], names: [], links: [] };
   const [{ readDocument }, { screenFile }] = await Promise.all([
-    import("./chunk-SBE773JU.js"),
-    import("./chunk-U542BJME.js")
+    import("./chunk-NRQ65LTQ.js"),
+    import("./chunk-UDXWIPCB.js")
   ]);
   const screen = screenFile(path, bytes);
   if (screen.problem)
@@ -2284,7 +2286,7 @@ function openDb(file) {
 // packages/index/dist/catalog-index.js
 var vectorsFileOf = (file) => join3(dirname2(file), "vectors.sqlite");
 var notInstalled = (e, pkg) => e.code === "ERR_MODULE_NOT_FOUND" && String(e.message).includes(pkg);
-async function embedderOf(root, setting, load = () => import("./chunk-TX4OGZKU.js")) {
+async function embedderOf(root, setting, load = () => import("./chunk-LO3BLMVG.js")) {
   if (setting === "off")
     return { why: "turned off for this command" };
   if (setting && setting !== "auto")
@@ -2525,6 +2527,10 @@ var CatalogIndex = class {
   list(kind, o = {}) {
     const where = ["kind = ?"];
     const params = [kind];
+    if (o.confidence) {
+      where.push("confidence = ?");
+      params.push(o.confidence);
+    }
     if (o.status) {
       where.push("status = ?");
       params.push(o.status);
@@ -2713,7 +2719,8 @@ function impact(ix, rootId, depth = 4) {
   };
   for (const a of affected) {
     const rec = recordOf(a.kind, a.id);
-    if (a.kind === "Interface" && rec.confidence === "inferred")
+    const paired = Array.isArray(rec.flags) && rec.flags.includes(JOINED_BY_PERSON);
+    if (a.kind === "Interface" && rec.confidence === "inferred" && !paired)
       addGap({
         record: a.id,
         field: "confidence",
@@ -2867,8 +2874,11 @@ function translate(question, lookup) {
       terms.push(`refs:${rec.id}`);
     if (has(/\b(without|no|missing) (a |an )?pattern\b/))
       terms.push("missing:pattern");
-    if (has(/\b(inferred|unconfirmed|one end)\b/))
+    if (has(/\b(inferred|unconfirmed|one end)\b/)) {
       terms.push("confidence:inferred");
+      if (has(/\bone end\b/))
+        terms.push("-flags:joined-by-person");
+    }
     return {
       action: "query",
       query: terms.join(" "),
@@ -2888,6 +2898,131 @@ function translate(question, lookup) {
 import { existsSync, readdirSync } from "node:fs";
 import { readdir as readdir2, readFile as readFile3, realpath, stat as stat2 } from "node:fs/promises";
 import { isAbsolute, join as join4, relative as relative2, resolve, sep as sep2 } from "node:path";
+import { createContext, runInContext, Script } from "node:vm";
+
+// packages/index/dist/glob.js
+var notSlash = (c) => c !== "/";
+var anyChar = (c) => !/[\n\r\u2028\u2029]/.test(c);
+var Builder = class {
+  states = [];
+  add(s) {
+    this.states.push(s);
+    return this.states.length - 1;
+  }
+  /** `c*` looping on a test, then on to next. */
+  loop(test, next) {
+    const split = this.add({ kind: "split", outs: [] });
+    const ch = this.add({ kind: "char", test, out: split });
+    this.states[split].outs.push(ch, next);
+    return split;
+  }
+  /** `(?:.*\/)?` then next: any folders, or none. */
+  folders(next) {
+    const slash = this.add({ kind: "char", test: (c) => c === "/", out: next });
+    return this.add({ kind: "split", outs: [this.loop(anyChar, slash), next] });
+  }
+};
+function tidy(glob2) {
+  return glob2.trim().replace(/\\/g, "/").replace(/^\.\//, "");
+}
+function compile(b, g, next) {
+  const pieces = [];
+  for (let i = 0; i < g.length; i++) {
+    const ch = g[i];
+    if (ch === "*") {
+      if (g[i + 1] === "*") {
+        const slash = g[i + 2] === "/";
+        pieces.push(slash ? (n) => b.folders(n) : (n) => b.loop(anyChar, n));
+        i += slash ? 2 : 1;
+      } else
+        pieces.push((n) => b.loop(notSlash, n));
+    } else if (ch === "?")
+      pieces.push((n) => b.add({ kind: "char", test: notSlash, out: n }));
+    else if (ch === "[") {
+      const end = g.indexOf("]", i + 2);
+      if (end < 0)
+        pieces.push(lit("["));
+      else {
+        const body = g.slice(i + 1, end).replace(/^!/, "^").replace(/\\/g, "\\\\");
+        const re = new RegExp(`^[${body}]$`);
+        pieces.push((n) => b.add({ kind: "char", test: (c) => re.test(c), out: n }));
+        i = end;
+      }
+    } else if (ch === "{") {
+      const end = g.indexOf("}", i);
+      if (end < 0)
+        pieces.push(lit("{"));
+      else {
+        const parts = g.slice(i + 1, end).split(",").map((p) => {
+          let t = tidy(p);
+          if (t.startsWith("/"))
+            t = t.slice(1);
+          return t;
+        });
+        const probe = new Builder();
+        for (const p of parts)
+          compile(probe, p, probe.add({ kind: "match" }));
+        pieces.push((n) => b.add({ kind: "split", outs: parts.map((p) => compile(b, p, n)) }));
+        i = end;
+      }
+    } else
+      pieces.push(lit(ch));
+  }
+  let at = next;
+  for (let k = pieces.length - 1; k >= 0; k--)
+    at = pieces[k](at);
+  return at;
+  function lit(c) {
+    return (n) => b.add({ kind: "char", test: (x) => x === c, out: n });
+  }
+}
+function globMatcher(glob2, anyDepth = !glob2.replace(/\/$/, "").includes("/")) {
+  let g = tidy(glob2);
+  if (g.startsWith("/")) {
+    g = g.slice(1);
+    anyDepth = false;
+  }
+  const b = new Builder();
+  const end = b.add({ kind: "match" });
+  let start = compile(b, g, end);
+  if (anyDepth)
+    start = b.folders(start);
+  const states = b.states;
+  const close = (set, s) => {
+    const stack = [s];
+    while (stack.length) {
+      const at = stack.pop();
+      if (set.has(at))
+        continue;
+      set.add(at);
+      const st = states[at];
+      if (st.kind === "split")
+        for (const o of st.outs)
+          stack.push(o);
+    }
+  };
+  return {
+    test(path) {
+      let live = /* @__PURE__ */ new Set();
+      close(live, start);
+      for (let i = 0; i < path.length; i++) {
+        const c = path[i];
+        const next = /* @__PURE__ */ new Set();
+        for (const s of live) {
+          const st = states[s];
+          if (st.kind === "char" && st.test(c))
+            close(next, st.out);
+        }
+        if (!next.size)
+          return false;
+        live = next;
+      }
+      return live.has(end);
+    }
+  };
+}
+
+// packages/index/dist/tools.js
 var ContextToolError = class extends Error {
   constructor(message) {
     super(message);
@@ -2918,6 +3053,12 @@ var CONTEXT_TOOL_BOUNDS = {
   /** The longest pattern grep takes, and the most of a hit's line it shows. */
   grepPattern: 200,
   grepLineChars: 200,
+  /**
+   * The most time a regular expression may spend on one file, and on one grep call in all,
+   * so a pattern that backtracks without end (`(a+)+$`) can't hang the MCP server or a scan.
+   */
+  grepRegexMs: 1e3,
+  grepRegexTotalMs: 5e3,
   /** Files one grep or files call walks at most, and bytes grep reads at most. */
   walkFiles: 2e4,
   grepBytes: 64e6,
@@ -3488,46 +3629,6 @@ function reposOf(root, input, o) {
     throw new ContextToolError("No repo is cloned in the workspace.");
   return out;
 }
-function globRe(glob2, anyDepth = !glob2.replace(/\/$/, "").includes("/")) {
-  let g = glob2.trim().replace(/\\/g, "/").replace(/^\.\//, "");
-  if (g.startsWith("/")) {
-    g = g.slice(1);
-    anyDepth = false;
-  }
-  let re = "";
-  for (let i = 0; i < g.length; i++) {
-    const ch = g[i];
-    if (ch === "*") {
-      if (g[i + 1] === "*") {
-        const slash = g[i + 2] === "/";
-        re += slash ? "(?:.*/)?" : ".*";
-        i += slash ? 2 : 1;
-      } else
-        re += "[^/]*";
-    } else if (ch === "?")
-      re += "[^/]";
-    else if (ch === "[") {
-      const end = g.indexOf("]", i + 2);
-      if (end < 0)
-        re += "\\[";
-      else {
-        const body = g.slice(i + 1, end).replace(/^!/, "^").replace(/\\/g, "\\\\");
-        re += `[${body}]`;
-        i = end;
-      }
-    } else if (ch === "{") {
-      const end = g.indexOf("}", i);
-      if (end < 0)
-        re += "\\{";
-      else {
-        re += `(?:${g.slice(i + 1, end).split(",").map((p) => globRe(p, false).source.slice(1, -1)).join("|")})`;
-        i = end;
-      }
-    } else
-      re += ch.replace(/[.+^$()|\\]/g, "\\$&");
-  }
-  return new RegExp(`^${anyDepth ? "(?:.*/)?" : ""}${re}$`);
-}
 function ignoreRules(text, base) {
   const out = [];
   for (let line of text.split(/\r?\n/)) {
@@ -3547,7 +3648,7 @@ function ignoreRules(text, base) {
       continue;
     const anchored = line.includes("/");
     try {
-      out.push({ base, re: globRe(line.replace(/^\//, ""), !anchored), negate, dirOnly });
+      out.push({ base, re: globMatcher(line.replace(/^\//, ""), !anchored), negate, dirOnly });
     } catch {
     }
   }
@@ -3634,6 +3735,34 @@ async function runCodeTool(root, name, input, o) {
     return filesTool(root, input, o);
   return outlineTool(root, input, o);
 }
+var REGEX_LINES = new Script("(() => { const out = []; for (let i = 0; i < lines.length; i++) if (re.test(lines[i])) out.push(i); return out; })()");
+function regexMatcher(pattern, flags) {
+  const B = CONTEXT_TOOL_BOUNDS;
+  const context = createContext({ pattern, flags, lines: [] });
+  runInContext("globalThis.re = new RegExp(pattern, flags);", context);
+  let spent = 0;
+  return (lines) => {
+    const left = B.grepRegexTotalMs - spent;
+    if (left < 1)
+      return void 0;
+    const timeout = Math.min(B.grepRegexMs, left);
+    context.lines = lines;
+    const started = performance.now();
+    try {
+      return Array.from(REGEX_LINES.runInContext(context, { timeout }));
+    } catch (e) {
+      if (e.code === "ERR_SCRIPT_EXECUTION_TIMEOUT") {
+        if (timeout < B.grepRegexMs)
+          return void 0;
+        throw new ContextToolError(`The pattern ${pattern} took too long; make it simpler (no quantifier inside a repeated group, such as (a+)+).`);
+      }
+      throw e;
+    } finally {
+      context.lines = [];
+      spent += performance.now() - started;
+    }
+  };
+}
 async function grepTool(root, input, o) {
   const B = CONTEXT_TOOL_BOUNDS;
   const pattern = typeof input.pattern === "string" && input.pattern ? input.pattern : void 0;
@@ -3642,22 +3771,26 @@ async function grepTool(root, input, o) {
   if (pattern.length > B.grepPattern)
     throw new ContextToolError(`A grep pattern is at most ${B.grepPattern} characters.`);
   const ignoreCase = input.ignoreCase === true;
-  let test;
+  let matching;
   if (input.regex === true) {
-    let re;
     try {
-      re = new RegExp(pattern, ignoreCase ? "i" : "");
+      new RegExp(pattern, ignoreCase ? "i" : "");
     } catch (e) {
       throw new ContextToolError(`${pattern} isn't a regular expression: ${e.message}.`);
     }
-    test = (l) => re.test(l);
+    matching = regexMatcher(pattern, ignoreCase ? "i" : "");
   } else {
     const p = ignoreCase ? pattern.toLowerCase() : pattern;
-    test = ignoreCase ? (l) => l.toLowerCase().includes(p) : (l) => l.includes(p);
+    const test = ignoreCase ? (l) => l.toLowerCase().includes(p) : (l) => l.includes(p);
+    matching = function* (lines) {
+      for (let i = 0; i < lines.length; i++)
+        if (test(lines[i]))
+          yield i;
+    };
   }
   const limit = int(input.limit, 1, B.grepLimit, B.grepDefault);
   const paths = str2(input.paths);
-  const only = paths ? globRe(paths) : void 0;
+  const only = paths ? globMatcher(paths) : void 0;
   const repos = reposOf(root, input, o);
   const hits = [];
   let more = false;
@@ -3679,11 +3812,14 @@ async function grepTool(root, input, o) {
         return false;
       }
       read++;
-      const lines = buf.toString("utf8").split(/\r?\n/);
-      for (let i = 0; i < lines.length; i++) {
-        const line = lines[i].slice(0, 2e3);
-        if (!test(line))
-          continue;
+      const lines = buf.toString("utf8").split(/\r?\n/).map((l) => l.slice(0, 2e3));
+      const found = matching(lines);
+      if (!found) {
+        cut = true;
+        return false;
+      }
+      for (const i of found) {
+        const line = lines[i];
         if (hits.length >= limit) {
           more = true;
           return false;
@@ -3707,7 +3843,7 @@ async function grepTool(root, input, o) {
     `${plural(hits.length, "hit")} for "${pattern}"${where}${scope} (${plural(read, "file")} read):`,
     ...hits,
     ...more ? [`\u2026 more hits past the ${limit} shown; narrow the pattern or the paths.`] : [],
-    ...cut ? [`\u2026 the search stopped at its cap of files or bytes; name a repo or narrower paths.`] : [],
+    ...cut ? [`\u2026 the search stopped at its cap of files, bytes or time; name a repo or narrower paths.`] : [],
     "Show the lines around a hit with show_code (repo, path, line). A hit is a pointer, not a fact: a fact cites its file and line, and Atticus checks the value there."
   ].join("\n");
 }
@@ -3717,7 +3853,7 @@ async function filesTool(root, input, o) {
   if (!glob2)
     throw new ContextToolError("files needs a glob, for example src/**/*.java.");
   const limit = int(input.limit, 1, B.filesLimit, B.filesDefault);
-  const re = globRe(glob2);
+  const re = globMatcher(glob2);
   const repos = reposOf(root, input, o);
   const out = [];
   let more = false;

package/dist/{chunk-6WNNXEG6.js → chunk-62DLJSLV.js}

@@ -6,14 +6,14 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   acceptOrgPackDraft,
   draftOrgPack
-} from "./chunk-KCQS52TH.js";
-import "./chunk-TNCROWPQ.js";
-import "./chunk-7IM4BVVH.js";
-import "./chunk-RBXDHCN7.js";
-import "./chunk-TLDL2ZZI.js";
-import "./chunk-QNMLLYTN.js";
-import "./chunk-YK6CSODO.js";
-import "./chunk-MMB2OHUY.js";
+} from "./chunk-64AADMTW.js";
+import "./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";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/orgpack-draft-commands.js