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

package/dist/{chunk-AFWUDXEM.js → chunk-6TNQO76I.js}

@@ -3,31 +3,33 @@ 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 {
+  doctorChecks
+} from "./chunk-MDTAZ6NE.js";
 import {
   buildSite,
   catalogRecords,
   openChanges
-} from "./chunk-GUX3PTYM.js";
-import {
-  doctorChecks
-} from "./chunk-EGQRREQH.js";
+} from "./chunk-JVMNEI7B.js";
 import {
   readProbes,
   whatRunsWhere
-} from "./chunk-BEVTIBRH.js";
+} from "./chunk-J4K4C4T5.js";
 import {
   baseClonePath,
   loadRepos
-} from "./chunk-PKBHS4AA.js";
+} from "./chunk-OSZTENIA.js";
 import {
-  CatalogBaseline,
-  DEFAULT_RUNTIME,
-  WORKSPACE_SCHEMA_VERSION,
   catalogDirOf,
   inputsDirOf,
-  loadOrgPack,
   orgPackDirOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
+import {
+  CatalogBaseline,
+  DEFAULT_RUNTIME,
+  WORKSPACE_SCHEMA_VERSION,
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -39,6 +41,7 @@ import {
 var import_yaml = __toESM(require_dist(), 1);
 import { readdir, readFile, stat, writeFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
+var MACHINE_CHECKING = "checking";
 var BASELINE_FILE = "baseline.yaml";
 async function readBaseline(root) {
   try {
@@ -57,9 +60,10 @@ async function countFiles(dir) {
   }
 }
 async function setupSteps(root, o = {}) {
+  const checking = o.doctor === MACHINE_CHECKING;
   const clonedOf = async (repos2) => (await Promise.all(repos2.map((r) => stat(join(baseClonePath(root, r.id), ".git")).then(() => true, () => false)))).filter(Boolean).length;
   const [doctor, op, repos, records, inputs, baseline, probes] = await Promise.all([
-    o.doctor ?? doctorChecks(root),
+    o.doctor === MACHINE_CHECKING ? [] : o.doctor ?? doctorChecks(root),
     loadOrgPack(orgPackDirOf(root)),
     loadRepos(root).catch(() => []),
     catalogRecords(root),
@@ -72,12 +76,19 @@ async function setupSteps(root, o = {}) {
   const generated = records.filter((r) => r.evidence.some((e) => e.source !== "manual")).length;
   const wikis = op.sources.wikis.length;
   const steps = [
-    {
+    checking ? {
+      id: "machine",
+      label: "This machine has what Atticus needs",
+      done: false,
+      checking: true,
+      detail: "checking this machine (Git, OpenSpec, your assistant)",
+      fix: "Wait a moment: the checks finish on their own. Settings \u203A This machine shows each one (in a terminal, atticus doctor)."
+    } : {
       id: "machine",
       label: "This machine has what Atticus needs",
       done: failing.length === 0,
       detail: failing.length ? `to fix: ${failing.map((c) => c.label).join(", ")}` : `${doctor.filter((c) => c.status === "warn").length} to look at`,
-      fix: failing.length ? `Run atticus doctor: ${failing.map((c) => c.fix ?? c.label).join(" ")}` : "Run atticus doctor for the details."
+      fix: failing.length ? `Open Settings \u203A This machine, fix what it names, then press Check again: ${failing.map((c) => c.fix ?? c.label).join(" ")} (In a terminal, atticus doctor shows the same checks.)` : "Settings \u203A This machine shows the details (in a terminal, atticus doctor)."
     },
     {
       id: "org-pack",
@@ -101,15 +112,20 @@ async function setupSteps(root, o = {}) {
       label: "The integration pattern registry has patterns",
       done: op.patterns.length > 0,
       detail: op.patterns.length ? `${op.patterns.length} pattern${op.patterns.length === 1 ? "" : "s"}: ${op.patterns.map((p) => p.code).sort().join(", ")}` : "empty: the critic can't check a hop's pattern until it has some",
-      fix: "Add one YAML file per integration pattern your organisation approves under org-pack/patterns/ (its code, status confirmed, its route and controls; the starter pack's patterns show the shape), run atticus orgpack validate, and propose it for review. The app has no editor for patterns yet.",
+      fix: "Add one YAML file per integration pattern your organisation approves under org-pack/patterns/ (its code, status confirmed, its route and controls; the starter pack's patterns show the shape), run atticus orgpack validate, and propose it for review; or add one on Set up \u203A Org pack in the app (Add an integration pattern).",
       optional: true
     },
     {
       // ADR 0121 item 6: how AI runs here is a choice, not the default left by accident.
       id: "ai",
       label: "Choose how AI runs here",
-      // runtime.yaml's version alone (1 from an older init, ADR 0121 addendum) isn't a choice.
-      done: JSON.stringify({ ...op.runtime, schemaVersion: DEFAULT_RUNTIME.schemaVersion }) !== JSON.stringify(DEFAULT_RUNTIME),
+      // runtime.yaml's version alone (1 from an older init, ADR 0121 addendum) isn't a choice, nor
+      // are its adapters (init writes the manual git host, ADR 0190): they aren't how AI runs.
+      done: JSON.stringify({
+        ...op.runtime,
+        schemaVersion: DEFAULT_RUNTIME.schemaVersion,
+        adapters: DEFAULT_RUNTIME.adapters
+      }) !== JSON.stringify(DEFAULT_RUNTIME),
       detail: whatRunsWhere(op.runtime, { probes }),
       fix: "Choose the assistants, the modes and the model provider on Set up \u203A AI in the app (or in org-pack/runtime.yaml), and commit it through a pull request. As atticus init wrote it, steps are handed to Copilot, which needs nothing more.",
       optional: true
@@ -207,6 +223,7 @@ async function baselineCommand(root, o, io) {
 }
 
 export {
+  MACHINE_CHECKING,
   BASELINE_FILE,
   readBaseline,
   setupSteps,

package/dist/{chunk-WF7B67YE.js → chunk-6UTD5RQH.js}

@@ -12,13 +12,13 @@ import {
   readPlan,
   readView,
   workingDays
-} from "./chunk-6PPOWY5E.js";
+} from "./chunk-JUHZBZPZ.js";
 import {
   traceMatrix
-} from "./chunk-BTGPE6CR.js";
+} from "./chunk-QIDSEHJA.js";
 import {
   SYNC_FILE
-} from "./chunk-R7NYHMUU.js";
+} from "./chunk-WECCLSYY.js";
 import {
   contentLines,
   docOf,
@@ -38,7 +38,7 @@ import {
   sectionLines,
   sectionMatching,
   tableWith
-} from "./chunk-S4PMJU6H.js";
+} from "./chunk-A6ZG3UOS.js";
 import {
   changeFolder,
   changeReport,
@@ -47,17 +47,14 @@ import {
   outsideKindOf,
   outsideSystemsOf,
   outsideWords
-} from "./chunk-IDKCWSM5.js";
+} from "./chunk-U2JTTRKS.js";
 import {
   fileStepStore,
   stepOfProvisional
-} from "./chunk-7IGKHZ4Z.js";
+} from "./chunk-ESJALLOK.js";
 import {
   readServiceRequestExports
-} from "./chunk-QKUJMING.js";
-import {
-  readChangeRepos
-} from "./chunk-PKBHS4AA.js";
+} from "./chunk-GFYVVTKH.js";
 import {
   BREAKING_SPEC,
   NAMES_SECRET_SPEC,
@@ -67,16 +64,21 @@ import {
   settle,
   tokenFormatIn,
   verdictOf
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-MOWUP33K.js";
+import {
+  readChangeRepos
+} from "./chunk-OSZTENIA.js";
 import {
-  ChangeOutcomes,
-  WORKSPACE_SCHEMA_VERSION,
-  external_exports,
   fileJudgments,
   inputsDirOf,
-  readRunSummary,
   toCanonicalYaml
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
+import {
+  ChangeOutcomes,
+  WORKSPACE_SCHEMA_VERSION,
+  external_exports,
+  readRunSummary
+} from "./chunk-QFDPX6C4.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-HNM2YQT2.js → chunk-775FMPUB.js}

@@ -5,7 +5,10 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   judgingRuntime
-} from "./chunk-PAQ2AS5E.js";
+} from "./chunk-YF6N45QN.js";
+import {
+  table
+} from "./chunk-VOGCSYOI.js";
 import {
   draftChange,
   draftTemplates,
@@ -16,17 +19,14 @@ import {
   storyBar,
   submitRequests,
   syncWorkItems
-} from "./chunk-R7NYHMUU.js";
-import {
-  table
-} from "./chunk-VOGCSYOI.js";
+} from "./chunk-WECCLSYY.js";
 import {
   runtimeForCli
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-MOWUP33K.js";
 import {
   changesRelOf,
   proposalsRelOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
 
 // packages/cli/dist/plan-commands.js
 import { resolve } from "node:path";

package/dist/{chunk-7ASNL4Q4.js → chunk-77AZRGWE.js}

@@ -5,14 +5,14 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   intakeContext
-} from "./chunk-SFUP7TTO.js";
+} from "./chunk-44QUCNPH.js";
 import "./chunk-VOGCSYOI.js";
 import {
   changeFolder,
   changeStore
-} from "./chunk-IDKCWSM5.js";
-import "./chunk-UUU4CLJG.js";
-import "./chunk-7IGKHZ4Z.js";
+} from "./chunk-U2JTTRKS.js";
+import "./chunk-5MKV4TV6.js";
+import "./chunk-ESJALLOK.js";
 import {
   estateFacts,
   estateRepos,
@@ -20,31 +20,34 @@ import {
   joinReposOf,
   outsideProfileSystems,
   outsideSystems
-} from "./chunk-J2JAKCIW.js";
-import "./chunk-745DAZ4L.js";
-import "./chunk-CXJ6FUKN.js";
+} from "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
 import {
   attachToChange,
   readChangeInputs,
   readVendorSpec
-} from "./chunk-QKUJMING.js";
-import "./chunk-6ZGLAACW.js";
-import "./chunk-CQDGOPGH.js";
-import "./chunk-3NFFJL5D.js";
-import "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
+} from "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
+import "./chunk-OSZTENIA.js";
 import {
   PROTOTYPE_GROUPS,
   comparePrototype,
   factsDirOf,
   inputsDirOf,
   isPrototypeType,
-  joinConventions,
   parseFacts,
   prototypeArchitectureSection
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import {
+  joinConventions
+} from "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-WKUJ3KPV.js → chunk-7HWCEDPX.js}

@@ -12,13 +12,13 @@ import {
   runEvals,
   saveReport,
   writeQuality
-} from "./chunk-RXPJMEOW.js";
+} from "./chunk-FGW5TLGM.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
 import {
   readDocument
-} from "./chunk-6ZGLAACW.js";
+} from "./chunk-DIYNRYXW.js";
 import {
   combine,
   createRuntime,
@@ -27,13 +27,15 @@ import {
   screenDiagramXml,
   screenOfficeXml,
   screenText
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-MOWUP33K.js";
 import {
-  loadOrgPack,
   orgPackDirOf,
   readZip,
   stateDirOf
-} from "./chunk-Q2TECDIT.js";
+} from "./chunk-GJVCBTSO.js";
+import {
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
 
 // packages/cli/dist/eval-commands.js
 import { readdir, readFile, stat } from "node:fs/promises";

package/dist/{chunk-G6X77UJZ.js → chunk-7U46TCRZ.js}

@@ -7,42 +7,45 @@ import {
   contextFlags,
   contextLines
 } from "./chunk-R6RY4Q5T.js";
+import {
+  table
+} from "./chunk-VOGCSYOI.js";
 import {
   findNeeds,
   markNeed,
   readNeeds
-} from "./chunk-R7NYHMUU.js";
-import "./chunk-IVBOQAGB.js";
-import "./chunk-ISUAAMGS.js";
-import {
-  table
-} from "./chunk-VOGCSYOI.js";
-import "./chunk-S4PMJU6H.js";
-import "./chunk-IDKCWSM5.js";
-import "./chunk-UUU4CLJG.js";
-import "./chunk-7IGKHZ4Z.js";
-import "./chunk-J2JAKCIW.js";
+} from "./chunk-WECCLSYY.js";
+import "./chunk-5FUFVNXB.js";
+import "./chunk-A6ZG3UOS.js";
+import "./chunk-U2JTTRKS.js";
+import "./chunk-5MKV4TV6.js";
+import "./chunk-ESJALLOK.js";
+import "./chunk-MCE74XMF.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
 import {
   readKnowledge
-} from "./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";
+} from "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
 import {
   RuntimeConfigError,
   runtimeForCli
-} from "./chunk-P32RUW3B.js";
+} from "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
+import "./chunk-OSZTENIA.js";
 import {
   changesDirOf,
   changesRelOf,
-  loadOrgPack,
   orgPackDirOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import {
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-O45HFTFS.js → chunk-A3NUZJFI.js}

@@ -5,8 +5,10 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   assistantActor
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 

package/dist/{chunk-UPOY4YSQ.js → chunk-A4VDFIMR.js}

@@ -6,19 +6,21 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   aliasCommand,
   reconcileCommand
-} from "./chunk-KDNTAPLX.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";
+} from "./chunk-NTEPBOAF.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
 import "./chunk-QA4O2GGC.js";
-import "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+import "./chunk-OSZTENIA.js";
+import "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {

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

@@ -5,41 +5,44 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   initiativesDirOf
-} from "./chunk-6PPOWY5E.js";
+} from "./chunk-JUHZBZPZ.js";
 import {
   gitHandoffPublisher,
   mergeChangeText
-} from "./chunk-IDKCWSM5.js";
-import "./chunk-UUU4CLJG.js";
+} from "./chunk-U2JTTRKS.js";
+import "./chunk-5MKV4TV6.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-ESJALLOK.js";
+import "./chunk-25CUJJTP.js";
+import "./chunk-HNPKCRCE.js";
+import "./chunk-CZ75S2EZ.js";
+import "./chunk-GFYVVTKH.js";
+import "./chunk-DIYNRYXW.js";
+import "./chunk-5FPAKAGE.js";
+import "./chunk-IJQHBK76.js";
+import "./chunk-MOWUP33K.js";
+import "./chunk-QA4O2GGC.js";
 import {
   createGit
-} from "./chunk-PKBHS4AA.js";
-import "./chunk-P32RUW3B.js";
-import "./chunk-QA4O2GGC.js";
+} from "./chunk-OSZTENIA.js";
 import {
   catalogDirOf,
   changesRelOf,
   decisionsRelOf,
   factsDirOf,
-  loadOrgPack,
   mapDirOf,
   orgPackDirOf,
   questionsDirOf,
   specsDirOf,
   stateDirOf
-} from "./chunk-Q2TECDIT.js";
-import "./chunk-TUULXQRW.js";
+} from "./chunk-GJVCBTSO.js";
+import "./chunk-G3ZFEHCX.js";
+import {
+  loadOrgPack
+} from "./chunk-QFDPX6C4.js";
+import "./chunk-CTJHEG6A.js";
 import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
@@ -118,7 +121,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 +158,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 +181,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 +252,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 +291,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 +570,6 @@ export {
   bringInMerged,
   proposeForReview,
   proposePlan,
-  scopeDirs
+  scopeDirs,
+  setUpstream
 };