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

package/dist/{chunk-AIOQPLA5.js → chunk-EGQRREQH.js}

@@ -8,15 +8,16 @@ import {
   notMetarepo
 } from "./chunk-3G4YI4ZU.js";
 import {
+  newerAtticusOf,
   upgradeCheck
-} from "./chunk-YISXLPHN.js";
+} from "./chunk-P2V7QW4D.js";
 import {
   ASSISTANT_FORMATS,
   assistantTier,
   generateAssistantFiles,
   readProbes,
   tierLine
-} from "./chunk-IPKHE5D6.js";
+} from "./chunk-BEVTIBRH.js";
 import {
   BETA_FEATURES,
   OPENSPEC_PINNED,
@@ -26,36 +27,42 @@ import {
   openspecFeatures,
   openspecHasStores,
   readStoreMarker
-} from "./chunk-4AK7IBVP.js";
+} from "./chunk-UUU4CLJG.js";
 import {
   versionAtLeast
-} from "./chunk-RZPYKDWS.js";
+} from "./chunk-F3P7N7SF.js";
 import {
   baseClonePath,
   createGit,
   isInPlace,
   loadRepos,
   remoteDefaultBranch
-} from "./chunk-EFHQ3TWP.js";
+} from "./chunk-PKBHS4AA.js";
+import {
+  keyEnvFromEnvironment
+} from "./chunk-LYBNHMVZ.js";
 import {
   modelEnvOf,
   modelSourceWords,
   modelsByClass
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-P32RUW3B.js";
 import {
   DEFAULT_PORT,
   STEP_CLASSES,
+  copilotAcpOf,
   factsDirOf,
   loadOpenSpecSettings,
   loadOrgPack,
   orgPackDirOf,
-  require_dist,
   retrievalOf,
   stepModelsOf
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-Q2TECDIT.js";
 import {
   readLock
-} from "./chunk-D3PO4DOZ.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -126,7 +133,7 @@ async function defaultFreeBytes(dir) {
 }
 function defaultOnPath(env, platform) {
   const exts = platform === "win32" ? (env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";") : [""];
-  const dirs = (env.PATH ?? env.Path ?? "").split(platform === "win32" ? ";" : delimiter);
+  const dirs = (env.PATH ?? env.Path ?? "").split(platform === "win32" ? ";" : delimiter).map((d) => d.trim().replace(/^"(.*)"$/, "$1"));
   return (program) => dirs.some((d) => d && exts.some((e) => existsSync(join(d, program + e.toLowerCase())) || existsSync(join(d, program + e))));
 }
 var envName = (env, ...names) => names.find((n) => env[n] !== void 0 && env[n] !== "");
@@ -375,8 +382,9 @@ async function doctorChecks(root, deps = {}) {
     id: "upgrade",
     label: "Metarepo version",
     status: up.newer ? "fail" : up.pending.length ? "warn" : "ok",
-    detail: up.newer ? `upgraded by Atticus ${up.stamp.atticus}; this is ${up.atticus}` : up.pending.length ? `${up.pending.length} upgrade step${up.pending.length === 1 ? "" : "s"} to run` : up.stamp ? `up to date (last upgraded by Atticus ${up.stamp.atticus})` : "up to date",
-    fix: up.newer ? `Install Atticus ${up.stamp.atticus} or later before working in this metarepo (npm install -g @maycombhq/atticus@${up.stamp.atticus} from your npm mirror, or that version's offline bundle).` : "Run atticus upgrade, then commit what it changed in a pull request."
+    // Round 49: a stamp this Atticus can't read is a newer or unknown one's, and fails too.
+    detail: up.newer ? newerAtticusOf(up) ? `upgraded by Atticus ${newerAtticusOf(up)}; this is ${up.atticus}` : `upgraded by a newer or unknown Atticus: .atticus/metarepo.yaml isn't a stamp ${up.atticus} reads (${up.unreadStamp?.why ?? "unreadable"})` : up.pending.length ? `${up.pending.length} upgrade step${up.pending.length === 1 ? "" : "s"} to run` : up.stamp ? `up to date (last upgraded by Atticus ${up.stamp.atticus})` : "up to date",
+    fix: up.newer ? newerAtticusOf(up) ? `Install Atticus ${newerAtticusOf(up)} or later before working in this metarepo (npm install -g @maycombhq/atticus@${newerAtticusOf(up)} from your npm mirror, or that version's offline bundle).` : "Install the Atticus that upgraded this metarepo before working in it; or, if .atticus/metarepo.yaml was edited by hand, put it back as it was in Git. Don't run atticus upgrade until then." : "Run atticus upgrade, then commit what it changed in a pull request."
   });
   const op = await loadOrgPack(orgPackDirOf(root));
   out.push({
@@ -419,13 +427,30 @@ async function doctorChecks(root, deps = {}) {
   const keyEnv = model && typeof model.settings.keyEnv === "string" ? model.settings.keyEnv : void 0;
   const modelMode = rt.modes.allowed.includes("model");
   const named = !!model && model.type !== "mock";
+  const keyHere = (name) => keyEnvFromEnvironment(name) && !!envName(env, name);
   out.push({
     id: "model",
     label: "How AI steps run",
-    status: rt.ai === "off" || !modelMode || named && (!keyEnv || envName(env, keyEnv)) ? "ok" : "warn",
-    detail: rt.ai === "off" ? "AI is off here (runtime.yaml)" : !modelMode ? rt.modes.allowed.includes("headless-claude-code") ? "AI steps hand off to your assistant, or run in headless Claude Code (--mode headless-claude-code); runtime.yaml doesn't allow Atticus to call a model's API itself" : "AI steps hand off to your assistant; runtime.yaml doesn't allow Atticus to call a model itself" : !named ? "model mode is allowed, but runtime.yaml names no model provider" : keyEnv && !envName(env, keyEnv) ? `model mode with ${model.type}, but ${keyEnv} isn't set on this machine` : `model mode with ${model.type}${typeof model.settings.model === "string" ? ` (${model.settings.model})` : ""}${keyEnv ? `; ${keyEnv} is set` : ""}. Not called here: doctor makes no network call`,
+    status: rt.ai === "off" || !modelMode || named && (!keyEnv || keyHere(keyEnv)) ? "ok" : "warn",
+    detail: rt.ai === "off" ? "AI is off here (runtime.yaml)" : !modelMode ? rt.modes.allowed.includes("headless-claude-code") ? "AI steps hand off to your assistant, or run in headless Claude Code (--mode headless-claude-code); runtime.yaml doesn't allow Atticus to call a model's API itself" : "AI steps hand off to your assistant; runtime.yaml doesn't allow Atticus to call a model itself" : !named ? "model mode is allowed, but runtime.yaml names no model provider" : keyEnv && !keyEnvFromEnvironment(keyEnv) ? `model mode with ${model.type}, but keyEnv ${keyEnv} isn't read from the environment (review round 48): name a variable starting ATTICUS_ or the provider's own, or keep the key with atticus secret set ${keyEnv}` : keyEnv && !keyHere(keyEnv) ? `model mode with ${model.type}, but ${keyEnv} isn't set on this machine` : `model mode with ${model.type}${typeof model.settings.model === "string" ? ` (${model.settings.model})` : ""}${keyEnv ? `; ${keyEnv} is set` : ""}. Not called here: doctor makes no network call`,
     fix: !named ? "Name the provider under adapters.model in runtime.yaml (docs/guide/admin.md, Calling a model directly), or leave model mode out of modes.allowed." : `Set the environment variable ${keyEnv ?? "the provider's key variable"} to the key on this machine (never in runtime.yaml), then open a new terminal.`
   });
+  if (rt.ai !== "off" && rt.modes.allowed.includes("copilot-acp")) {
+    const command = copilotAcpOf(rt).command;
+    const probe = deps.copilotAcp ?? (async (o) => (await import("./chunk-34S2WGOB.js")).copilotAcpProbe(o));
+    const p = await probe({ command, cwd: root }).catch((e) => ({
+      found: false,
+      said: e.message
+    }));
+    const name = p.version ? `${command.split(/\s+/).at(-1)} ${p.version.replace(/^\S*copilot\S*\s+/i, "")}` : command;
+    out.push({
+      id: "copilot-acp",
+      label: "Copilot ACP (copilot-acp)",
+      status: p.found && p.signedIn === true ? "ok" : "warn",
+      detail: !p.found ? `${command} can't be run here${p.said ? ` (${p.said})` : ""}` : p.signedIn === false ? `${name} answers in Agent Client Protocol mode but isn't signed in; it said: ${p.said ?? "nothing"}` : p.signedIn === true ? `${name} answers in Agent Client Protocol mode and is signed in. No session was run.` : `${name} was found, but its Agent Client Protocol handshake didn't say whether it is signed in${p.said ? `: ${p.said}` : ""}`,
+      fix: !p.found ? "Set copilotAcp.command in runtime.yaml to the Copilot language server (npx --yes @github/copilot-language-server, or its full path), check that it lists --acp in its --help, or leave copilot-acp out of modes.allowed. docs/guide/copilot-unattended.md says how." : "Sign in to GitHub Copilot yourself (your editor's Copilot sign-in, or the link and code the server printed); Atticus never handles your sign-in. Then run atticus doctor again."
+    });
+  }
   if (rt.ai !== "off") {
     const choices = stepModelChoices(rt, env);
     const notes = STEP_CLASSES.flatMap((c) => choices[c].notes);
@@ -459,7 +484,7 @@ async function doctorChecks(root, deps = {}) {
     });
   }
   const lexical = "the context engine searches by words and names only";
-  const embed = await (deps.embed ?? (() => import("./chunk-TANFV3MZ.js")))().catch((e) => e);
+  const embed = await (deps.embed ?? (() => import("./chunk-WERM6KPJ.js")))().catch((e) => e);
   if (embed instanceof Error) {
     const model2 = retrievalOf(rt).embeddings.model;
     const off = process.env.ATTICUS_EMBEDDINGS === "off" || model2 === "off";
@@ -535,6 +560,7 @@ export {
   stepModelLine,
   MIN_NODE,
   MIN_GIT,
+  defaultOnPath,
   doctorChecks,
   doctorCommand
 };

package/dist/chunk-EHA7RMZ3.js

@@ -0,0 +1,58 @@
+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 {
+  excludesOf
+} from "./chunk-2F4CYZKJ.js";
+import {
+  dirSource,
+  houseImportsUntaught,
+  readRulesOf
+} from "./chunk-CXJ6FUKN.js";
+import {
+  globToRegExp
+} from "./chunk-3NFFJL5D.js";
+import {
+  conventionsOf,
+  loadOrgPack,
+  orgPackDirOf
+} from "./chunk-Q2TECDIT.js";
+
+// packages/cli/dist/house-imports.js
+async function houseUntaughtOf(root, repo, o) {
+  const op = o.op ?? await loadOrgPack(orgPackDirOf(root)).catch(() => void 0);
+  const conventions = conventionsOf(op);
+  if (!conventions.housePrefixes.length)
+    return [];
+  const exclude = o.exclude ?? await excludesOf(root, repo);
+  return houseImportsUntaught(o.source ?? dirSource(o.dir), {
+    prefixes: conventions.housePrefixes,
+    taught: (op?.frameworks ?? []).flatMap((m) => m.packages),
+    rules: readRulesOf(conventions),
+    exclude: exclude.map(globToRegExp)
+  });
+}
+function houseUntaughtLines(repo, found) {
+  if (!found.length)
+    return [];
+  const one = found.length === 1;
+  return [
+    `Teach first: ${repo} imports ${one ? "a house package" : `${found.length} house packages`} no framework taught to Atticus covers (the org pack's housePrefixes). Read without ${one ? "it" : "them"}, ${one ? "its" : "their"} annotations and wrapper calls are ordinary code to the reader; teach ${one ? "it" : "each"} before the first read, then run this again:`,
+    ...found.map((h) => `  - ${h.package} (${h.files} ${h.files === 1 ? "file" : "files"}, first at ${h.first}): ${h.command}`)
+  ];
+}
+function houseUntaughtWords(repo, found) {
+  if (!found.length)
+    return "";
+  const shown = found.slice(0, 3).map((h) => h.package);
+  const more = found.length > shown.length ? ` and ${found.length - shown.length} more` : "";
+  return ` Teach first: ${repo} imports ${shown.join(", ")}${more}, ${found.length === 1 ? "a house package" : "house packages"} no taught framework covers; run ${found[0].command}${found.length > 1 ? " (one per package; atticus map " + repo + " --estimate lists them)" : ""} before reading it.`;
+}
+
+export {
+  houseUntaughtOf,
+  houseUntaughtLines,
+  houseUntaughtWords
+};

package/dist/{chunk-M766ZJ6W.js → chunk-EIPTLPFC.js}

@@ -5,44 +5,55 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   estimateOf
-} from "./chunk-FHH4I4ZV.js";
+} from "./chunk-BDKC6H5P.js";
 import {
   changeMapBody,
   changeMapOf
-} from "./chunk-TDD55CJH.js";
-import "./chunk-BOHJZTEQ.js";
-import "./chunk-MVZVGYXH.js";
-import "./chunk-FITWGOJ2.js";
-import "./chunk-2ANOROX3.js";
-import "./chunk-65NYPGRC.js";
+} from "./chunk-IH2XURVQ.js";
+import "./chunk-WF7B67YE.js";
+import "./chunk-6PPOWY5E.js";
+import "./chunk-OHNCWBKF.js";
+import "./chunk-BTGPE6CR.js";
+import "./chunk-MUWDB4R4.js";
 import {
   knowledgeAppliesMarkdown,
   readKnowledgeApplies
-} from "./chunk-CKSITVS4.js";
-import "./chunk-L6SGQIR3.js";
+} from "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.js";
 import {
   readRound,
   reviewedGates,
   roundsOf
-} from "./chunk-3HI6Z55Y.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
-import "./chunk-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-T6AIP7H5.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
-import "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./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 {
+  redactSecrets
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/handoff-review.js
+function inlineCode(text) {
+  const s = redactSecrets(text.replace(/\s+/g, " ").trim());
+  const longest = Math.max(0, ...[...s.matchAll(/`+/g)].map((m) => m[0].length));
+  const tick = "`".repeat(longest + 1);
+  const pad = s.startsWith("`") || s.endsWith("`") ? " " : "";
+  return `${tick}${pad}${s}${pad}${tick}`;
+}
 var days = (d) => `${d.p20}\u2013${d.p80} days (most likely ${d.p50})`;
 async function handoffReview(root, change) {
   const lines = [];
@@ -55,7 +66,7 @@ async function handoffReview(root, change) {
     lines.push("No target flows yet: the architecture stage writes them.", "");
   const applies = await readKnowledgeApplies(root, change).catch(() => void 0);
   if (applies)
-    lines.push(knowledgeAppliesMarkdown(applies).trimEnd(), "");
+    lines.push(knowledgeAppliesMarkdown(applies, { text: inlineCode }).trimEnd(), "");
   lines.push("### Estimate", "");
   const est = await estimateOf(root, change).catch(() => void 0);
   if (est?.effort) {
@@ -109,7 +120,7 @@ async function handoffReview(root, change) {
   else {
     const order = ["blocking", "gap", "risk", "idea"];
     for (const f of open.sort((a, b) => order.indexOf(a.severity) - order.indexOf(b.severity)))
-      lines.push(`- **${f.severity}** (${f.gate}): ${f.summary} \`${f.id}\``);
+      lines.push(`- **${f.severity}** (${f.gate}): ${inlineCode(f.summary)} ${inlineCode(f.id)}`);
     lines.push("");
   }
   return lines.join("\n");