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

package/dist/chunk-SH27FYPF.js

@@ -0,0 +1,150 @@
+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 {
+  SEED_MARK,
+  loadEstate,
+  openspecRootOf,
+  readExistingSpecs,
+  seedChangeId,
+  seedCollisionWords,
+  seedCollisions,
+  seedSpec,
+  writeSpecFiles
+} from "./chunk-BEPCKDCP.js";
+import "./chunk-HWD4JPU7.js";
+import "./chunk-5WERBKLE.js";
+import "./chunk-K332XW7K.js";
+import {
+  changeFolder
+} from "./chunk-HSZMPH5T.js";
+import {
+  createOpenSpec
+} from "./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 {
+  writeFileAtomic
+} from "./chunk-ODMBPDDV.js";
+import "./chunk-TV45EUGM.js";
+
+// packages/cli/dist/spec-seed-commands.js
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+var NO_OPENSPEC = "This metarepo isn't set up with OpenSpec (no openspec/config.yaml). Set it up first: atticus openspec setup";
+async function specSeed(root, repo, o, io) {
+  const osRoot = openspecRootOf(root);
+  if (!osRoot) {
+    io.err(NO_OPENSPEC);
+    return 2;
+  }
+  const estate = await loadEstate(root, []);
+  const flows = estate.flows.filter((f) => f.repo === repo).map((f) => f.flow);
+  if (!flows.length) {
+    io.err(`${repo} has no verified flows in specs/${repo}/. Read it first: atticus map ${repo}, then atticus verify ${repo} --write`);
+    return 2;
+  }
+  const os = createOpenSpec({ root: osRoot });
+  const existing = await readExistingSpecs(os);
+  const multiRepo = new Set(estate.flows.map((f) => f.repo)).size > 1;
+  const seed = seedSpec(repo, flows, { existing, multiRepo });
+  if (!seed.deltas.length) {
+    if (o.json)
+      io.out(JSON.stringify({ change: null, repo, skipped: seed.skipped }, null, 2));
+    else
+      io.out(`Nothing to seed: openspec/specs already has every flow of ${repo} that the code runs today. Each change keeps it current when it is archived.`);
+    return 0;
+  }
+  const dir = changeFolder(root, seed.change);
+  if (!existsSync(join(dir, ".openspec.yaml")))
+    await os.newChange(seed.change, { description: `Starting spec for ${repo}` });
+  const written = await writeSpecFiles(dir, seed.files, SEED_MARK);
+  const had = await readFile(join(dir, "proposal.md"), "utf8").catch(() => void 0);
+  const proposal = had === void 0 || had.startsWith(SEED_MARK);
+  if (proposal)
+    await writeFileAtomic(join(dir, "proposal.md"), seed.proposal);
+  const kept = Object.keys(seed.files).filter((f) => !written.includes(f));
+  const collisions = (await seedCollisions(root)).filter((c) => c.seed === seed.change);
+  if (o.json) {
+    io.out(JSON.stringify({
+      change: seed.change,
+      repo,
+      capabilities: seed.deltas.map((d) => ({ capability: d.capability, flow: d.flow })),
+      written,
+      kept,
+      skipped: seed.skipped,
+      collisions
+    }, null, 2));
+    return 0;
+  }
+  for (const c of collisions)
+    io.err(`Warning: ${seedCollisionWords(c)}`);
+  const rel = `openspec/changes/${seed.change}`;
+  io.out(`Wrote ${rel}/: a starting spec for ${repo}, ${seed.deltas.length} ${seed.deltas.length === 1 ? "capability" : "capabilities"}, one per verified flow, each scenario citing its lines.`);
+  for (const f of kept)
+    io.out(`Kept ${rel}/${f} as a person left it (no mark on its first line).`);
+  if (!proposal)
+    io.out(`Kept ${rel}/proposal.md as a person left it.`);
+  for (const s of seed.skipped)
+    io.out(`Not seeded: ${s.flow} (${s.why}).`);
+  io.out(`Read each spec under ${rel}/specs/ against the code it cites, then accept it: atticus spec accept ${repo}`);
+  return 0;
+}
+async function specAccept(root, repo, o, io) {
+  if (!o.by) {
+    io.err("Say who is accepting: set your Git user (git config user.name), or pass --by <you>.");
+    return 2;
+  }
+  const osRoot = openspecRootOf(root);
+  if (!osRoot) {
+    io.err(NO_OPENSPEC);
+    return 2;
+  }
+  const change = seedChangeId(repo);
+  const dir = changeFolder(root, change);
+  if (!existsSync(join(dir, ".openspec.yaml"))) {
+    io.err(`${repo} has no starting spec waiting. Write one first: atticus spec seed ${repo}`);
+    return 2;
+  }
+  const os = createOpenSpec({ root: osRoot });
+  const v = await os.validate({ item: change, type: "change", strict: true });
+  const issues = (v.items[0]?.issues ?? []).filter((i) => i.level !== "INFO");
+  if (issues.length || v.items[0]?.valid === false) {
+    io.err(`${change} doesn't pass openspec validate --strict; fix its specs and accept again:`);
+    for (const i of issues)
+      io.err(`  ${i.path}: ${i.message}`);
+    return 1;
+  }
+  const date = (o.now ?? /* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+  const p = join(dir, "proposal.md");
+  const text = await readFile(p, "utf8").catch(() => void 0);
+  if (text !== void 0 && !/\nAccepted by .+ on \d{4}-\d{2}-\d{2}\.\n?$/.test(text))
+    await writeFileAtomic(p, `${text.trimEnd()}
+
+Accepted by ${o.by} on ${date}.
+`);
+  try {
+    await os.archive(change);
+  } catch (e) {
+    io.err(`openspec archive ${change} failed: ${e.message}`);
+    return 1;
+  }
+  io.out(`Accepted ${repo}'s starting spec: openspec/specs/ has its capabilities, and ${change} is archived. Commit the metarepo and open its pull request; the next change to ${repo} modifies these requirements.`);
+  return 0;
+}
+export {
+  specAccept,
+  specSeed
+};

package/dist/chunk-T74WQQGS.js

@@ -0,0 +1,40 @@
+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 {
+  SHOWN,
+  factsRepos,
+  verifyAllCommand,
+  verifyCommand,
+  verifyInputsOf
+} from "./chunk-LN77DXBM.js";
+import "./chunk-L4CESDPB.js";
+import "./chunk-U3NBK4EU.js";
+import "./chunk-455SYIIE.js";
+import "./chunk-GIFMBCTW.js";
+import "./chunk-MD7KUEJ3.js";
+import "./chunk-Q46QDDMF.js";
+import "./chunk-TGVVUKTG.js";
+import "./chunk-3AQ2R5NL.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-API5TOUB.js";
+import "./chunk-XOL3GFW2.js";
+import "./chunk-QHJJMZLX.js";
+import "./chunk-7AB6OWTV.js";
+import "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
+import "./chunk-TV45EUGM.js";
+export {
+  SHOWN,
+  factsRepos,
+  verifyAllCommand,
+  verifyCommand,
+  verifyInputsOf
+};

package/dist/{chunk-O3WI5KWW.js → chunk-TGVVUKTG.js}

@@ -5,11 +5,11 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   baseClonePath
-} from "./chunk-EFHQ3TWP.js";
+} from "./chunk-XOL3GFW2.js";
 import {
   loadOrgPack,
   orgPackDirOf
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/repo-for.js
 import { stat } from "node:fs/promises";

package/dist/chunk-THN26IEF.js

@@ -0,0 +1,48 @@
+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));
+
+// packages/cli/dist/file-lock.js
+import { appendFile, readFile } from "node:fs/promises";
+import { resolve } from "node:path";
+var chains = /* @__PURE__ */ new Map();
+function withFileLock(path, work) {
+  const key = resolve(path);
+  const before = chains.get(key) ?? Promise.resolve();
+  const next = before.then(work, work);
+  const tail = next.catch(() => void 0);
+  chains.set(key, tail);
+  void tail.then(() => {
+    if (chains.get(key) === tail)
+      chains.delete(key);
+  });
+  return next;
+}
+function appendLines(file, lines) {
+  return withFileLock(file, async () => {
+    const now = await readFile(file, "utf8").catch(() => "");
+    const eol = /\r\n/.test(now) ? "\r\n" : "\n";
+    const lead = now && !now.endsWith("\n") ? eol : "";
+    await appendFile(file, lead + lines.map((l) => `${l}${eol}`).join(""), "utf8");
+  });
+}
+var safeMessage = (m) => m.replace(/[^A-Za-z0-9 _.,:/@{}()#+-]/g, "").replace(/\s+/g, " ").trim().slice(0, 200);
+async function originOf(dir, git) {
+  const url = await git(["-C", dir, "remote", "get-url", "origin"]).then((r) => r.stdout.trim()).catch(() => "");
+  const clean = url.replace(/^([a-z][a-z0-9+.-]*:\/\/)[^/]*@/i, "$1").replace(/[?#].*$/, "");
+  if (/^(https?|ssh|git):\/\/[^/]/i.test(clean))
+    return clean;
+  if (/^[\w.-]+@[\w.-]+:[^\\]/.test(clean) && !/^[a-z]:[\\/]/i.test(clean))
+    return clean;
+  return nameOf(url ? url.replace(/^file:\/*/i, "/").replace(/[?#].*$/, "") : dir);
+}
+var nameOf = (p) => p.replace(/[\\/]+$/, "").split(/[\\/]/).pop() || p;
+
+export {
+  withFileLock,
+  appendLines,
+  safeMessage,
+  originOf
+};

package/dist/chunk-TJH2EUAZ.js

@@ -0,0 +1,47 @@
+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 {
+  mapRules,
+  plannedTopUp,
+  recordRulesNow,
+  recordTopUpVerified,
+  ruleSetsOfFiles,
+  rulesPrompt,
+  rulesRelOf,
+  topUpFiles,
+  topUpOf,
+  topUpSessions
+} from "./chunk-U3NBK4EU.js";
+import "./chunk-455SYIIE.js";
+import "./chunk-GIFMBCTW.js";
+import "./chunk-MD7KUEJ3.js";
+import "./chunk-Q46QDDMF.js";
+import "./chunk-TGVVUKTG.js";
+import "./chunk-3AQ2R5NL.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-TV45EUGM.js";
+export {
+  mapRules,
+  plannedTopUp,
+  recordRulesNow,
+  recordTopUpVerified,
+  ruleSetsOfFiles,
+  rulesPrompt,
+  rulesRelOf,
+  topUpFiles,
+  topUpOf,
+  topUpSessions
+};

package/dist/{chunk-ZNCEKR4J.js → chunk-TQ4TG57V.js}

@@ -8,24 +8,24 @@ import {
 } from "./chunk-VOGCSYOI.js";
 import {
   readCatalog
-} from "./chunk-27NKUS3X.js";
+} from "./chunk-4SLBCEPD.js";
 import {
   TriageError,
   buildTriage,
   classify,
   scanInputs
-} from "./chunk-23W7VWKR.js";
+} from "./chunk-CPK7QSBG.js";
 import {
   readDrawio,
   reconcile
-} from "./chunk-7EKXJZ2Y.js";
+} from "./chunk-YO2PKTXT.js";
 import {
   inputsDirOf,
   loadOrgPack,
   orgPackDirOf,
   recordPath,
   serializeRecord
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-PAINMSID.js";
 
 // packages/cli/dist/intake-commands.js
 import { createHash } from "node:crypto";
@@ -81,9 +81,9 @@ async function addToInbox(root, files) {
     const dot = name.lastIndexOf(".");
     const [stem, ext] = dot > 0 ? [name.slice(0, dot), name.slice(dot)] : [name, ""];
     await mkdir(inbox, { recursive: true });
-    const taken = new Set(await readdir(inbox));
+    const taken = new Set((await readdir(inbox)).map((n) => n.toLowerCase()));
     let target = name;
-    for (let n = 2; taken.has(target); n++)
+    for (let n = 2; taken.has(target.toLowerCase()); n++)
       target = `${stem}-${n}${ext}`;
     await writeFile(join(inbox, target), bytes);
     const path = `${INBOX}/${target}`;
@@ -152,7 +152,8 @@ var STATUS_WORDS = [
   ["unresolved", (n) => `${n} waiting for a system name`],
   ["duplicate", (n) => `${n} duplicate${n === 1 ? "" : "s"}`],
   ["superseded", (n) => `${n} older version${n === 1 ? "" : "s"}`],
-  ["failed", (n) => `${n} failed`]
+  ["failed", (n) => `${n} failed`],
+  ["unreadable", (n) => `${n} unreadable`]
 ];
 function chains(docs) {
   const byId = new Map(docs.filter((d) => d.id).map((d) => [d.id, d]));
@@ -186,7 +187,7 @@ async function intakeList(root, io, o) {
   for (const l of table(["PATH", "TYPE", "STATUS", "SYSTEMS"], documents.map((d) => [
     d.path,
     d.classification,
-    d.duplicateOf ? `duplicate of ${d.duplicateOf}` : d.status,
+    d.duplicateOf ? `duplicate of ${d.duplicateOf}` : d.status === "unreadable" && d.reason ? `unreadable: ${d.reason}` : d.status,
     d.systems.join(", ")
   ])))
     io.out(l);
@@ -201,6 +202,9 @@ async function intakeList(root, io, o) {
     return n > 0 ? words(n) : "";
   }).filter(Boolean);
   io.out(`${documents.length} file${documents.length === 1 ? "" : "s"}: ${counts.join(", ")}.`);
+  for (const d of documents)
+    for (const n of d.notes ?? [])
+      io.out(`  ~ ${d.path}: ${n}`);
   for (const p of problems)
     io.out(`  ! ${p.path}: ${p.message}`);
   return problems.length > 0 ? 1 : 0;

package/dist/{chunk-7FBGJFEE.js → chunk-TQTRWENN.js}

@@ -5,22 +5,22 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   loadCatalog
-} from "./chunk-FITWGOJ2.js";
-import "./chunk-27NKUS3X.js";
+} from "./chunk-5QUOPNLN.js";
+import "./chunk-4SLBCEPD.js";
 import {
   domainProfile
-} from "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
+} from "./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 {
   orgPackDirOf
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/domain-commands.js

package/dist/{chunk-TYAID7B7.js → chunk-TSM6T6GQ.js}

@@ -5,41 +5,41 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   matchedRepoType
-} from "./chunk-GLUX4EEP.js";
+} from "./chunk-K6JB6XTX.js";
 import {
   loadCatalog
-} from "./chunk-FITWGOJ2.js";
+} from "./chunk-5QUOPNLN.js";
 import {
   repoFor
-} from "./chunk-O3WI5KWW.js";
+} from "./chunk-TGVVUKTG.js";
 import {
   draftSpec
-} from "./chunk-KEM4SDDP.js";
-import "./chunk-ZVM6AKKM.js";
+} from "./chunk-P2VBXX7N.js";
+import "./chunk-ZOSD4FXV.js";
 import {
   stepJudges
-} from "./chunk-CKSITVS4.js";
-import "./chunk-L6SGQIR3.js";
-import "./chunk-3HI6Z55Y.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
+} from "./chunk-BEPCKDCP.js";
+import "./chunk-HWD4JPU7.js";
+import "./chunk-5WERBKLE.js";
+import "./chunk-K332XW7K.js";
+import "./chunk-HSZMPH5T.js";
+import "./chunk-D2WSW4GU.js";
+import "./chunk-4KNOJC6J.js";
 import {
   checkSpec,
   citedFileHashes,
   staleFlows
-} from "./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";
+} from "./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 {
   fsRepo
-} from "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
+} from "./chunk-7AB6OWTV.js";
 import {
   askedByStep,
   listQuestions,
@@ -58,8 +58,8 @@ import {
   writeFlow,
   writeSpecFindings,
   writeSpecHeader
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-PAINMSID.js";
+import "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/spec-commands.js

package/dist/{chunk-DPZHZQKE.js → chunk-TW3KOSQK.js}

@@ -3,10 +3,13 @@ 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 {
+  nearRepos
+} from "./chunk-OMPENNWY.js";
 import {
   gitUser,
   loadRepos
-} from "./chunk-EFHQ3TWP.js";
+} from "./chunk-XOL3GFW2.js";
 import {
   ManifestEditError,
   REPO_DESCRIPTION_MAX,
@@ -18,13 +21,15 @@ import {
   manifestFiles,
   parseFacts,
   setManifestDescription
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-PAINMSID.js";
+import {
+  FileChangedError
+} from "./chunk-ODMBPDDV.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/repo-commands.js
 import { readFile, stat } from "node:fs/promises";
-import { basename, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
 var askOnTerminal = async (prompt) => {
@@ -70,8 +75,8 @@ async function typeOf(url, description, frameworks = []) {
   if (!await stat(dir).then((s) => s.isDirectory(), () => false))
     return void 0;
   const [{ detectRepoType }, { fsRepo }] = await Promise.all([
-    import("./chunk-R77KLRB3.js"),
-    import("./chunk-HFQCFSJR.js")
+    import("./chunk-RA33EYS4.js"),
+    import("./chunk-5PV7S2ZP.js")
   ]);
   const d = await detectRepoType(fsRepo(basename(dir), dir, "0".repeat(40)), {
     ...description ? { description } : {},
@@ -79,6 +84,22 @@ async function typeOf(url, description, frameworks = []) {
   });
   return d.type === "unknown" ? void 0 : { type: d.type, signals: d.signals, confidence: d.confidence };
 }
+async function cloneAt(url) {
+  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(url) || /^[^/\\]+@/.test(url))
+    return void 0;
+  const dir = resolve(url);
+  if (!await stat(join(dir, ".git")).catch(() => void 0))
+    return void 0;
+  const { execFile } = await import("node:child_process");
+  const git = (...args) => new Promise((done) => execFile("git", args, { cwd: dir }, (e, out) => done(e ? "" : String(out).trim())));
+  const origin = await git("config", "--get", "remote.origin.url");
+  const branch = await git("rev-parse", "--abbrev-ref", "HEAD");
+  return {
+    dir,
+    ...origin ? { origin } : {},
+    ...branch && branch !== "HEAD" ? { branch } : {}
+  };
+}
 async function whoFor(root, d) {
   if (d.by)
     return d.by;
@@ -93,6 +114,7 @@ async function repoAdd(root, url, o, io, deps = {}) {
     io.err('Usage: atticus repo add <clone URL or path> [--id id] [--type repo type] [--owner team] [--description "what it is"].');
     return 2;
   }
+  const clone = await cloneAt(url.trim());
   const id = o.id?.trim() || idFromUrl(url.trim());
   if (!RecordId.safeParse(id).success) {
     io.err(`${id} isn't a repo id: ids are lowercase slugs (a-z, 0-9, '.', '_' and '-'). Give one with --id.`);
@@ -113,18 +135,23 @@ async function repoAdd(root, url, o, io, deps = {}) {
   const by = await whoFor(root, deps);
   const description = text ? written(text, by, deps.now ?? /* @__PURE__ */ new Date()) : void 0;
   const detected = o.type?.trim() ? void 0 : await typeOf(url.trim(), text, await declaredFrameworks(root, id));
+  const listed = await loadRepos(root).catch(() => []);
+  const near = nearRepos({ id, url: clone?.origin ?? url.trim() }, listed);
   try {
     const file = await addManifestRepo(root, platform, {
       id,
-      url: url.trim(),
+      url: clone?.origin ?? url.trim(),
+      ...clone?.branch ? { defaultBranch: clone.branch } : {},
       type: o.type?.trim() || detected?.type || "unknown",
       owner: o.owner?.trim() || "unassigned",
       ...o.system?.trim() ? { system: o.system.trim() } : {},
       ...o.component?.trim() ? { component: o.component.trim() } : {},
       ...description ? { description } : {}
     });
+    for (const n of near)
+      io.err(`Warning: ${id} looks like ${n.id}, already listed (${n.why}). If they are one repo, remove this entry from ${file.rel}, or keep one id: atticus repo rename <old> <new>.`);
     if (o.json) {
-      io.out(JSON.stringify({ repo: id, platform, file: file.rel, description }, null, 2));
+      io.out(JSON.stringify({ repo: id, platform, file: file.rel, description, ...near.length ? { near } : {} }, null, 2));
       return 0;
     }
     io.out(`Added ${id} to ${file.rel}: commit it in a pull request.`);
@@ -134,7 +161,7 @@ async function repoAdd(root, url, o, io, deps = {}) {
       io.out(`What it is: ${description.text}`);
     else
       io.out(`${id} has no description yet${asked ? "" : " (--description, or atticus repo describe)"}: atticus repo describe ${id} --description "what it is". Until then its reading prompts, the join's questions and the views have only its id to go on.`);
-    io.out(`Next: atticus workspace sync, then read it: /atticus-map ${id}.`);
+    io.out(clone?.origin ? `From your clone: ${clone.origin}, branch ${clone.branch ?? "main"}. Next: atticus workspace sync --from "${dirname(clone.dir)}" --repos ${id} (copied from it, no network), then read it: /atticus-map ${id}.` : `Next: atticus workspace sync, then read it: /atticus-map ${id}.`);
     return 0;
   } catch (e) {
     if (e instanceof ManifestEditError) {
@@ -272,7 +299,13 @@ async function keepDraftedDescription(root, repo, draft, now) {
   });
   if (!d.success)
     return { kept: false, why: d.error.issues[0]?.message ?? "the draft wasn't one line" };
-  await setManifestDescription(root, repo, d.data);
+  try {
+    await setManifestDescription(root, repo, d.data);
+  } catch (e) {
+    if (e instanceof FileChangedError)
+      return { kept: false, why: e.message };
+    throw e;
+  }
   return { kept: true };
 }
 export {