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

package/dist/{chunk-E6ZIEVOI.js → chunk-QBMLBCQH.js}

@@ -14,26 +14,26 @@ import {
   scaffoldDialect,
   surveyRepos,
   testDialect
-} from "./chunk-O7FDLW7L.js";
-import "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
-import "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
+} from "./chunk-4ETO2FXE.js";
+import "./chunk-IKAW2KJU.js";
+import "./chunk-CZ2ZS7AT.js";
+import "./chunk-4GAB5ZOZ.js";
+import "./chunk-A4JXVO5O.js";
+import "./chunk-TDSCKP3V.js";
 import {
   SYNTAX_LANGUAGES,
   syntaxLanguageOf,
   syntaxOutline
-} from "./chunk-CQDGOPGH.js";
-import "./chunk-3NFFJL5D.js";
-import "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-G6EFXTUO.js";
+import "./chunk-PQQKZPBU.js";
+import "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
 import "./chunk-QA4O2GGC.js";
 import {
   RecordId,
   orgPackDirOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-VZALIKIF.js → chunk-QLQIFJP3.js}

@@ -7,12 +7,12 @@ import {
   exportFrameworksKit,
   formatFrameworkSurvey,
   surveyFrameworks
-} from "./chunk-O7FDLW7L.js";
-import "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
-import "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
+} from "./chunk-4ETO2FXE.js";
+import "./chunk-IKAW2KJU.js";
+import "./chunk-CZ2ZS7AT.js";
+import "./chunk-4GAB5ZOZ.js";
+import "./chunk-A4JXVO5O.js";
+import "./chunk-TDSCKP3V.js";
 import {
   houseDependencies,
   learnFramework,
@@ -20,14 +20,14 @@ import {
   learnJsFramework,
   learnJsFrameworkFromTarball,
   runFrameworkTests
-} from "./chunk-CQDGOPGH.js";
+} from "./chunk-G6EFXTUO.js";
 import {
   fsRepo
-} from "./chunk-3NFFJL5D.js";
+} from "./chunk-PQQKZPBU.js";
 import {
   baseClonePath
-} from "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
 import "./chunk-QA4O2GGC.js";
 import {
   FrameworkModel,
@@ -35,8 +35,8 @@ import {
   loadOrgPack,
   orgPackDirOf,
   toCanonicalYaml
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-EMRIQUND.js → chunk-QLWDIKO4.js}

@@ -5,27 +5,27 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   initiativesDirOf
-} from "./chunk-6PPOWY5E.js";
+} from "./chunk-2WUTCPPJ.js";
 import {
   gitHandoffPublisher,
   mergeChangeText
-} from "./chunk-IDKCWSM5.js";
-import "./chunk-UUU4CLJG.js";
+} from "./chunk-WZYM5M4U.js";
+import "./chunk-NC755EKE.js";
 import {
   createAdapters,
   fileStepStore
-} from "./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";
+} from "./chunk-FL344WQD.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 {
   createGit
-} from "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
 import "./chunk-QA4O2GGC.js";
 import {
   catalogDirOf,
@@ -38,8 +38,8 @@ import {
   questionsDirOf,
   specsDirOf,
   stateDirOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
@@ -118,7 +118,12 @@ function scopeDirs(root, scope) {
         // Ninth UX walk: a person's corrections of a stage's drafts, and who drafted each file
         // (ADR 0181), saved in the app; they ride the stage's hand-off too.
         `${changesRelOf(root)}/*/stage/corrections.yaml`,
-        `${changesRelOf(root)}/*/stage/drafted.yaml`
+        `${changesRelOf(root)}/*/stage/drafted.yaml`,
+        // ADR 0188: what a person drew on a change's diagram (its target flows), proposed from
+        // the Change diagram; it rides the stage's hand-off too.
+        `${changesRelOf(root)}/*/target-flows`,
+        // ADR 0188: the knowledge a person confirmed or excluded on Change › Knowledge.
+        `${changesRelOf(root)}/*/knowledge.yaml`
       ];
     case "org-pack":
       return [rel(root, orgPackDirOf(root))];
@@ -150,6 +155,7 @@ async function readProposed(root) {
     return {};
   }
 }
+var LOCK_FILE = /\.lock(\.[^/]+\.stale)?$/;
 async function proposePlan(root, scope, o = {}) {
   const git = o.git ?? createGit();
   const dirs = scopeDirs(root, scope).filter((d) => d && !d.startsWith(".."));
@@ -172,18 +178,28 @@ async function proposePlan(root, scope, o = {}) {
     const status = e.slice(0, 2).trim() || "M";
     if (status.startsWith("R"))
       files.push({ path: e.slice(3), status, from: parts[++i] });
-    else
+    else if (!LOCK_FILE.test(e.slice(3)))
       files.push({ path: e.slice(3), status });
   }
   const was = await readProposed(root);
-  for (const f of files) {
+  const asked = files.filter((f) => was[f.path]);
+  const branches = [...new Set(asked.map((f) => was[f.path].branch).filter((b) => !!b))];
+  const live = /* @__PURE__ */ new Set();
+  await Promise.all(branches.map((b) => git(["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${b}`], root).then(() => live.add(b), () => void 0)));
+  const still = asked.filter((f) => {
+    const b = was[f.path].branch;
+    return !b || live.has(b);
+  });
+  const there = still.filter((f) => existsSync(join(root, f.path)));
+  const blobs = /* @__PURE__ */ new Map();
+  for (let i = 0; i < there.length; i += 200) {
+    const part = there.slice(i, i + 200);
+    const out2 = await git(["hash-object", "--", ...part.map((f) => f.path)], root).then((r) => r.stdout.split(/\r?\n/).map((l) => l.trim()), () => []);
+    part.forEach((f, j) => blobs.set(f.path, out2[j] ?? ""));
+  }
+  for (const f of still) {
     const p = was[f.path];
-    if (!p)
-      continue;
-    if (p.branch && !await git(["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${p.branch}`], root).then(() => true, () => false))
-      continue;
-    const blob = existsSync(join(root, f.path)) ? (await git(["hash-object", "--", f.path], root).catch(() => ({ stdout: "" }))).stdout.trim() : "";
-    if (blob === p.blob)
+    if ((blobs.get(f.path) ?? "") === p.blob)
       f.proposed = p.where;
   }
   const stamp = (o.now ?? /* @__PURE__ */ new Date()).toISOString();
@@ -233,7 +249,8 @@ async function proposeForReview(root, o, io) {
     await publisher.publish({ root, branch: plan.branch, base, files, message: title, approval });
     io.out(`Pushed ${files.length} file${files.length === 1 ? "" : "s"} to ${plan.branch}.`);
   } catch (e) {
-    io.out(`The branch ${plan.branch} wasn't pushed (${e.message.split("\n")[0]}): push it yourself before the PR is opened.`);
+    io.err(`The branch ${plan.branch} wasn't pushed (${e.message.split("\n")[0]}), so nothing was proposed: fix that (your access to the Git host, say), then propose for review again.`);
+    return 1;
   }
   let pr;
   try {
@@ -271,13 +288,50 @@ async function proposeForReview(root, o, io) {
   io.out("When it merges, Bring in what merged updates your copy of the metarepo.");
   return 0;
 }
+async function upstreamOffer(run) {
+  const branch = (await run(["rev-parse", "--abbrev-ref", "HEAD"]).catch(() => "")).trim();
+  if (!branch || branch === "HEAD")
+    return void 0;
+  const remotes = (await run(["remote"]).catch(() => "")).split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+  const remote = remotes.includes("origin") ? "origin" : remotes.length === 1 ? remotes[0] : void 0;
+  if (!remote)
+    return void 0;
+  const there = (await run(["ls-remote", "--heads", remote, `refs/heads/${branch}`]).catch(() => "")).trim();
+  return there ? { branch, upstream: `${remote}/${branch}` } : void 0;
+}
+async function setUpstream(root, upstream, io, o = {}) {
+  const git = o.git ?? createGit();
+  const run = async (args) => (await git(args, root)).stdout;
+  const offer = await upstreamOffer(run);
+  if (!offer || offer.upstream !== upstream) {
+    const branch = (await run(["rev-parse", "--abbrev-ref", "HEAD"]).catch(() => "")).trim();
+    io.err(offer ? `Only ${offer.upstream} can be ${offer.branch}'s upstream here (the same branch on the remote); ${upstream} isn't.` : `Only ${branch || "this branch"}'s own branch on a remote can be its upstream, and no remote here has it.`);
+    return 1;
+  }
+  const [remote] = upstream.split("/");
+  try {
+    await run([
+      "fetch",
+      "--quiet",
+      remote,
+      `+refs/heads/${offer.branch}:refs/remotes/${upstream}`
+    ]);
+    await run(["branch", "--quiet", `--set-upstream-to=${upstream}`, offer.branch]);
+  } catch (e) {
+    io.err(`The upstream wasn't set: ${e.message.split("\n")[0]}`);
+    return 1;
+  }
+  io.out(`${offer.branch} follows ${upstream} now. Bring in what merged brings in its changes.`);
+  return 0;
+}
 async function bringInMerged(root, io, o = {}) {
   const git = o.git ?? createGit();
   const run = async (args) => (await git(args, root)).stdout;
   const first = (e) => e.message.split("\n")[0];
   const up = (await run(["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]).catch(() => "")).trim();
   if (!up) {
-    io.err("This branch follows no remote branch, so there is nothing to bring in.");
+    const fix = await upstreamOffer(run);
+    io.err(fix ? `This branch ${fix.branch} follows no remote branch, and ${fix.upstream} is there: Set the upstream to ${fix.upstream}, then Bring in what merged again.` : "This branch follows no remote branch, so there is nothing to bring in.");
     return 2;
   }
   try {
@@ -513,5 +567,6 @@ export {
   bringInMerged,
   proposeForReview,
   proposePlan,
-  scopeDirs
+  scopeDirs,
+  setUpstream
 };

package/dist/{chunk-PMUAJGLI.js → chunk-QVVGJVVX.js}

@@ -11,24 +11,24 @@ import {
   findingAction,
   findings,
   statusLine
-} from "./chunk-UF4AZOZB.js";
+} from "./chunk-RPQITJNX.js";
 import "./chunk-VOGCSYOI.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-D6BVLTDV.js";
+import "./chunk-WZYM5M4U.js";
+import "./chunk-NC755EKE.js";
+import "./chunk-FL344WQD.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-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {

package/dist/{chunk-LNBQOP7D.js → chunk-QX4MAMUG.js}

@@ -5,11 +5,11 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   targetFlowsOf
-} from "./chunk-IH2XURVQ.js";
+} from "./chunk-FMJYKLDY.js";
 import {
   withFileLock
-} from "./chunk-S7FCV7S5.js";
-import "./chunk-OHNCWBKF.js";
+} from "./chunk-PXW2RZGQ.js";
+import "./chunk-XGO74QWR.js";
 import {
   TARGET_DIR,
   applyStroke,
@@ -18,32 +18,32 @@ import {
   planSketchWrite,
   readDeltas,
   writeSketch
-} from "./chunk-R7NYHMUU.js";
-import "./chunk-IVBOQAGB.js";
-import "./chunk-ISUAAMGS.js";
-import "./chunk-S4PMJU6H.js";
+} from "./chunk-MLGWSBF4.js";
+import "./chunk-CA3DKO4D.js";
+import "./chunk-D6BVLTDV.js";
+import "./chunk-RCG5IAAT.js";
 import {
   changeFolder
-} from "./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";
+} from "./chunk-WZYM5M4U.js";
+import "./chunk-NC755EKE.js";
+import "./chunk-FL344WQD.js";
+import "./chunk-IKAW2KJU.js";
+import "./chunk-CZ2ZS7AT.js";
+import "./chunk-4GAB5ZOZ.js";
+import "./chunk-A4JXVO5O.js";
 import {
   labelText,
   readDrawio
-} from "./chunk-6ZGLAACW.js";
-import "./chunk-CQDGOPGH.js";
-import "./chunk-3NFFJL5D.js";
-import "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-TDSCKP3V.js";
+import "./chunk-G6EFXTUO.js";
+import "./chunk-PQQKZPBU.js";
+import "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
 import "./chunk-QA4O2GGC.js";
 import {
   changesRelOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-X3WY6MN3.js → chunk-QZWRPQTI.js}

@@ -6,18 +6,18 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   isCritic
 } from "./chunk-4Q3NN7VF.js";
-import {
-  CONTEXT_TOOLS
-} from "./chunk-ISUAAMGS.js";
 import {
   lensRunOf
-} from "./chunk-S4PMJU6H.js";
+} from "./chunk-D6BVLTDV.js";
+import {
+  CONTEXT_TOOLS
+} from "./chunk-RCG5IAAT.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-3424TLIJ.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-FPBUTZI5.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";

package/dist/{chunk-ISUAAMGS.js → chunk-RCG5IAAT.js}

@@ -6,7 +6,7 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   dotInt8,
   textSha
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-3424TLIJ.js";
 import {
   JOINED_BY_PERSON,
   Question,
@@ -36,7 +36,7 @@ import {
   stateDirOf,
   toCanonicalYaml,
   walkRepo
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-FPBUTZI5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -1015,8 +1015,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-WJF2CS6M.js"),
-    import("./chunk-RLDGWLQ7.js")
+    import("./chunk-MNIPPBCT.js"),
+    import("./chunk-FRCOKUU4.js")
   ]);
   const screen = screenFile(path, bytes);
   if (screen.problem)
@@ -2269,7 +2269,7 @@ ${JSON.stringify(keyed)}`).digest("hex");
 
 // packages/index/dist/catalog-index.js
 import { mkdir } from "node:fs/promises";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { dirname as dirname2, join as join3, resolve } from "node:path";
 
 // packages/index/dist/db.js
 import { createRequire } from "node:module";
@@ -2295,7 +2295,8 @@ 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-WERM6KPJ.js")) {
+var embedders = /* @__PURE__ */ new Map();
+async function embedderOf(root, setting, load = () => import("./chunk-JSP73CDW.js")) {
   if (setting === "off")
     return { why: "turned off for this command" };
   if (setting && setting !== "auto")
@@ -2313,7 +2314,14 @@ async function embedderOf(root, setting, load = () => import("./chunk-WERM6KPJ.j
   try {
     const { embedderFor } = embed;
     const r = await embedderFor(root);
-    return r.embedder ? { embedder: r.embedder } : { why: r.state.problem ?? "no embedding model" };
+    if (!r.embedder)
+      return { why: r.state.problem ?? "no embedding model" };
+    const key = `${resolve(root)}\0${r.state.dir ?? ""}\0${r.state.id ?? r.embedder.id}`;
+    const had = embedders.get(key);
+    if (had)
+      return { embedder: had };
+    embedders.set(key, r.embedder);
+    return { embedder: r.embedder };
   } catch (e) {
     return { why: `the embedding model couldn't be read: ${e.message.split("\n")[0]}` };
   }
@@ -2321,11 +2329,10 @@ async function embedderOf(root, setting, load = () => import("./chunk-WERM6KPJ.j
 async function openIndex(root, o = {}) {
   const file = o.file ?? join3(stateDirOf(root), ".index", "catalog.sqlite");
   await mkdir(dirname2(file), { recursive: true });
-  const files = await listSources(root);
   const db = openDb(file);
   try {
     const fresh = ensureSchema(db, o.rebuild === true);
-    const u = await updateIndex(db, root, files, { force: fresh });
+    const u = o.trusted && !fresh ? { changed: [], removed: [], problems: [], rematched: false } : await updateIndex(db, root, await listSources(root), { force: fresh });
     const rebuilt = fresh || u.changed.length > 0 || u.removed.length > 0;
     attachVectors(db, vectorsFileOf(file));
     const e = await embedderOf(root, o.embeddings, o.loadEmbed);
@@ -2906,7 +2913,7 @@ function translate(question, lookup) {
 // packages/index/dist/tools.js
 import { existsSync, readdirSync } from "node:fs";
 import { 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 { isAbsolute, join as join4, relative as relative2, resolve as resolve2, sep as sep2 } from "node:path";
 import { createContext, runInContext, Script } from "node:vm";
 var ContextToolError = class extends Error {
   constructor(message) {
@@ -3283,7 +3290,7 @@ function isCited(ix, root, c) {
 async function insideClone(base, path) {
   if (!path || path.includes("\0") || isAbsolute(path) || /^[a-zA-Z]:/.test(path))
     throw new ContextToolError(`${path} isn't a path inside the repo.`);
-  const full = resolve(base, ...path.split(/[\\/]+/));
+  const full = resolve2(base, ...path.split(/[\\/]+/));
   const rel2 = relative2(base, full);
   if (!rel2 || rel2.startsWith("..") || isAbsolute(rel2))
     throw new ContextToolError(`${path} leaves the repo's checkout; Atticus reads nothing outside it.`);

package/dist/chunk-RGZFOKVO.js

@@ -0,0 +1,106 @@
+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 {
+  readUserState,
+  writeUserState
+} from "./chunk-KVVNAUIG.js";
+import {
+  loadOrgPack,
+  orgPackDirOf
+} from "./chunk-FPBUTZI5.js";
+
+// packages/cli/dist/model-address.js
+import { AsyncLocalStorage } from "node:async_hooks";
+var ADDRESS = /url|endpoint|host|address/i;
+function whereKeyGoes(m) {
+  const s = m?.settings ?? {};
+  const picked = Object.keys(s).filter((k) => k === "keyEnv" || k === "caFile" || ADDRESS.test(k)).sort().map((k) => [k, s[k]]);
+  return JSON.stringify([m?.type ?? null, picked]);
+}
+function addressWords(m) {
+  const s = m?.settings ?? {};
+  const at = Object.keys(s).filter((k) => k === "caFile" || ADDRESS.test(k)).map((k) => `${k} ${String(s[k])}`);
+  return `${String(m?.type ?? "no provider")}${at.length ? ` (${at.join(", ")})` : " at its own address"}`;
+}
+var OWN_ADDRESS = /* @__PURE__ */ new Set(["anthropic", "bedrock"]);
+function atProvidersOwnAddress(m) {
+  if (typeof m?.type !== "string" || !OWN_ADDRESS.has(m.type))
+    return false;
+  return !Object.keys(m.settings ?? {}).some((k) => k === "caFile" || ADDRESS.test(k));
+}
+var FILE = "model-address.json";
+async function confirmedAddress(root, env = process.env) {
+  const r = await readUserState(root, FILE, env);
+  return typeof r?.address === "string" ? r.address : void 0;
+}
+async function recordConfirmedAddress(root, m, env = process.env) {
+  await writeUserState(root, FILE, { address: whereKeyGoes(m), at: (/* @__PURE__ */ new Date()).toISOString() }, env);
+}
+async function addressRefusal(root, m, env = process.env) {
+  if (!m || m.type === void 0 || m.type === "mock")
+    return void 0;
+  const confirmed = await confirmedAddress(root, env);
+  const ok = confirmed !== void 0 ? confirmed === whereKeyGoes(m) : atProvidersOwnAddress(m);
+  if (ok)
+    return void 0;
+  return `runtime.yaml sends the model's key to ${addressWords(m)}, which you haven't confirmed${confirmed !== void 0 ? " (it changed since you last did)" : ""}, so nothing was sent. Open AI settings in the Atticus app and press Test: it asks you to confirm where the key goes. Or run the step yourself in a terminal (ADR 0186).`;
+}
+var fromApp = new AsyncLocalStorage();
+var serving = 0;
+var asTheApp = (f) => fromApp.run(true, f);
+function servingTheApp(on) {
+  serving = Math.max(0, serving + (on ? 1 : -1));
+}
+function whoStarts(env = process.env, tty = process.stdin.isTTY === true) {
+  if (fromApp.getStore() || serving > 0)
+    return "app";
+  if (env.ATTICUS_ACP_SESSION)
+    return "session";
+  return tty ? "person" : "unattended";
+}
+async function refusalError(message) {
+  const { RuntimeConfigError } = await import("./chunk-BFMTGNAQ.js");
+  const e = new RuntimeConfigError(message);
+  return Object.assign(e, { modelAddress: true });
+}
+async function guardModelAddress(o, env = process.env, tty = process.stdin.isTTY === true) {
+  const who = whoStarts(env, tty);
+  if (who === "unattended")
+    return;
+  const m = { type: o.type, settings: o.settings };
+  if (who === "person") {
+    if (await confirmedAddress(o.root) !== whereKeyGoes(m))
+      await recordConfirmedAddress(o.root, m).catch(() => void 0);
+    return;
+  }
+  const no = await addressRefusal(o.root, m);
+  if (no)
+    throw await refusalError(no);
+}
+async function requireConfirmedModel(root, mode, env = process.env) {
+  const op = await loadOrgPack(orgPackDirOf(root));
+  const effective = mode ?? env.ATTICUS_RUNTIME ?? op.runtime.modes.default;
+  if (effective !== "model")
+    return;
+  const no = await addressRefusal(root, op.runtime.adapters.model, env);
+  if (!no)
+    return;
+  const { HttpError } = await import("./chunk-4R3TO4VL.js");
+  throw new HttpError(403, "Confirm where the model's key goes", no, { confirm: "ai-test" });
+}
+
+export {
+  whereKeyGoes,
+  atProvidersOwnAddress,
+  confirmedAddress,
+  recordConfirmedAddress,
+  addressRefusal,
+  asTheApp,
+  servingTheApp,
+  whoStarts,
+  guardModelAddress,
+  requireConfirmedModel
+};

package/dist/{chunk-O5PXQR67.js → chunk-RLZFL76D.js}

@@ -5,14 +5,14 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   repoFor
-} from "./chunk-LO6P2VYG.js";
+} from "./chunk-XOMEQVLK.js";
 import {
   draftRepoType,
   matchRepoType
-} from "./chunk-J2JAKCIW.js";
+} from "./chunk-IKAW2KJU.js";
 import {
   fsRepo
-} from "./chunk-3NFFJL5D.js";
+} from "./chunk-PQQKZPBU.js";
 import {
   CONVENTIONS_SCHEMA_VERSION,
   ChecklistPack,
@@ -31,7 +31,7 @@ import {
   orgPackDirOf,
   termAnswerNote,
   termOfQuestion
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-FPBUTZI5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";