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

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

@@ -14,26 +14,29 @@ import {
   scaffoldDialect,
   surveyRepos,
   testDialect
-} from "./chunk-P2VBXX7N.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.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-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
+} from "./chunk-G6EFXTUO.js";
+import "./chunk-PQQKZPBU.js";
+import "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
 import {
   RecordId,
-  orgPackDirOf,
+  orgPackDirOf
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import {
   require_dist
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

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

@@ -7,12 +7,12 @@ import {
   exportFrameworksKit,
   formatFrameworkSurvey,
   surveyFrameworks
-} from "./chunk-P2VBXX7N.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.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,23 +20,26 @@ import {
   learnJsFramework,
   learnJsFrameworkFromTarball,
   runFrameworkTests
-} from "./chunk-TWQRPM76.js";
-import {
-  baseClonePath
-} from "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
+} from "./chunk-G6EFXTUO.js";
 import {
   fsRepo
-} from "./chunk-7AB6OWTV.js";
+} from "./chunk-PQQKZPBU.js";
+import {
+  baseClonePath
+} from "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
 import {
   FrameworkModel,
   RecordId,
   loadOrgPack,
   orgPackDirOf,
-  require_dist,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

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

@@ -5,27 +5,28 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   initiativesDirOf
-} from "./chunk-2V2ZPQQU.js";
+} from "./chunk-2WUTCPPJ.js";
 import {
   gitHandoffPublisher,
   mergeChangeText
-} from "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
+} from "./chunk-WZYM5M4U.js";
+import "./chunk-NC755EKE.js";
 import {
   createAdapters,
   fileStepStore
-} from "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.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-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
+} from "./chunk-3EWKO457.js";
+import "./chunk-3424TLIJ.js";
+import "./chunk-QA4O2GGC.js";
 import {
   catalogDirOf,
   changesRelOf,
@@ -37,8 +38,9 @@ import {
   questionsDirOf,
   specsDirOf,
   stateDirOf
-} from "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/propose.js
@@ -116,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))];
@@ -148,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(".."));
@@ -170,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();
@@ -231,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 {
@@ -269,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 {
@@ -511,5 +567,6 @@ export {
   bringInMerged,
   proposeForReview,
   proposePlan,
-  scopeDirs
+  scopeDirs,
+  setUpstream
 };

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

@@ -11,23 +11,25 @@ import {
   findingAction,
   findings,
   statusLine
-} from "./chunk-PTQ3ZALZ.js";
+} from "./chunk-RPQITJNX.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-K332XW7K.js";
-import "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.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-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   completeCriticBatch,

package/dist/{chunk-WIWTJMMR.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-GNWAOVFQ.js";
+} from "./chunk-FMJYKLDY.js";
 import {
   withFileLock
-} from "./chunk-THN26IEF.js";
-import "./chunk-5QUOPNLN.js";
+} from "./chunk-PXW2RZGQ.js";
+import "./chunk-XGO74QWR.js";
 import {
   TARGET_DIR,
   applyStroke,
@@ -18,31 +18,33 @@ import {
   planSketchWrite,
   readDeltas,
   writeSketch
-} from "./chunk-BEPCKDCP.js";
-import "./chunk-HWD4JPU7.js";
-import "./chunk-5WERBKLE.js";
-import "./chunk-K332XW7K.js";
+} from "./chunk-MLGWSBF4.js";
+import "./chunk-CA3DKO4D.js";
+import "./chunk-D6BVLTDV.js";
+import "./chunk-RCG5IAAT.js";
 import {
   changeFolder
-} from "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.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-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.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-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-FPBUTZI5.js";
+import "./chunk-B4AEL3RF.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/change-sketch.js

package/dist/{chunk-JYTIHTIK.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-5WERBKLE.js";
 import {
   lensRunOf
-} from "./chunk-K332XW7K.js";
+} from "./chunk-D6BVLTDV.js";
+import {
+  CONTEXT_TOOLS
+} from "./chunk-RCG5IAAT.js";
 import {
   HandoffRuntime,
   TOOL_LIMITS,
   modelEnvOf,
   stepClassOf
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-3424TLIJ.js";
 import {
   changesRelOf,
   listQuestions,
@@ -26,7 +26,7 @@ import {
   runsDirOf,
   runsRelOf,
   stepModelsOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-FPBUTZI5.js";
 
 // packages/cli/dist/handoff-flag.js
 import { readdir, readFile } from "node:fs/promises";