@bongos/core 1.19.501 → 1.19.502

package/.bongos-core.json

@@ -2,11 +2,11 @@
   "artifact": "bongos-core",
   "manifest_schema": 1,
   "generator": "scripts/gds/package-core.js",
-  "core_version": "1.19.501",
-  "core_contract": "1.19.501",
-  "source_commit": "d6bac950eb66f758928e815cf88f2d6ddacaf30a",
+  "core_version": "1.19.502",
+  "core_contract": "1.19.502",
+  "source_commit": "0028d2b0b8159fb3da54835fd45eeb3ae98f7916",
   "source_ref": "HEAD",
-  "built_at": "2026-09-03T15:41:46.721Z",
+  "built_at": "2026-09-03T16:16:35.542Z",
   "redaction": {
     "model": "docs-redacted+functional-verbatim",
     "docs_redacted": 426,
@@ -17,7 +17,7 @@
     "gate": "passed"
   },
   "file_count": 2392,
-  "tree_sha256": "d4ef43893ca56f9d2d4e0df1823f7fdb2692bb3f3a18d8bb2fece9221dc83925",
+  "tree_sha256": "ad1558679b2605e11cf647772ee24f67c5bd59c0e1d98bcdf81d7a795c456654",
   "files": [
     {
       "path": ".claude/skills/blocker-review/SKILL.md",
@@ -317,7 +317,7 @@
     {
       "path": ".gitattributes",
       "mode": "0000644",
-      "sha256": "106e3a8a087cf1a9dd932513115d16c387cfeebea0e22ed269a672f95efdac1e"
+      "sha256": "3848ed851a03fd11f8dae94c1e94b802c4aa625efaa7f4aff27438a1fdfb67ac"
     },
     {
       "path": "CLAUDE.md",
@@ -877,7 +877,7 @@
     {
       "path": "docs/adr/0082-server-side-merge-conflict-auto-resolution.md",
       "mode": "0000644",
-      "sha256": "ce00626058783ba42629d88da8d03ef868d4743d4b01ed87b6348d20fcbca395"
+      "sha256": "7da7140202139c123e832f527167c96de18eb498ae21243cd30cea6b133c8f90"
     },
     {
       "path": "docs/adr/0083-modular-architecture-strangler-build-plan.md",
@@ -2572,7 +2572,7 @@
     {
       "path": "docs/module-api-changelog.md",
       "mode": "0000644",
-      "sha256": "49c673ec2ee31c6174bdc48d1b124905bd1f47a51db4e0a3a75e4d937a25ba0a"
+      "sha256": "bccd3e96df6a344e806052af69493507b4ccab78ab3149aa10f7373d8546fb97"
     },
     {
       "path": "docs/modules-contract.md",
@@ -7217,12 +7217,12 @@
     {
       "path": "package-lock.json",
       "mode": "0000644",
-      "sha256": "79dfc35495b354b8e53ac84d6210c5c84e8d1bd6a97fc08c84dcbcfd7cc7379d"
+      "sha256": "5911d20e472c017d950ca2154d1c0e86e7479e07c9efb4a02eecea0534aae58c"
     },
     {
       "path": "package.json",
       "mode": "0000644",
-      "sha256": "5c08ffd017c27b4ac3a97a55988bbd1fd9958a1ac15ab9e4a689af04531889b6"
+      "sha256": "2220826fc5bb64636838a79c72229e973109a28639174748ca7e2fb505192f97"
     },
     {
       "path": "public-docs/index.html",
@@ -7737,7 +7737,7 @@
     {
       "path": "scripts/gds/git-merge-regen.js",
       "mode": "0000644",
-      "sha256": "75130de4a880fc7d76f5a8d79ed65750238df94847c1ccfdc974188f9300a1e6"
+      "sha256": "f9a391ac6f32b2d5ca939b48186b6d9cb7aa171554652a5b5afbc4a408aae203"
     },
     {
       "path": "scripts/gds/go-live.js",
@@ -8892,7 +8892,7 @@
     {
       "path": "src/module-api.js",
       "mode": "0000644",
-      "sha256": "980689b2fd9c8e0db4213b6ef449b68cef246f40ff3752925562f0f7ed818a16"
+      "sha256": "636b358e8be667bd38743b42009ee1101b0c330584fc647f71424c03fe166c71"
     },
     {
       "path": "src/module-loader/catalog.js",
@@ -9882,7 +9882,7 @@
     {
       "path": "tests/git_merge_regen.mjs",
       "mode": "0000644",
-      "sha256": "3c718cdd83f7c997a89bcf55120ad641a2c8ed4bea7cbbf5aa253792f867a467"
+      "sha256": "2d3574914c1f9c843396f498a8e68c2fd8ec2a5bc574c98f64dc2505aa1ccba8"
     },
     {
       "path": "tests/github_push_ancestry.mjs",

package/.gitattributes

@@ -74,6 +74,16 @@ src/bongos/CLAUDE.md          merge=otb-regen
 src/bongos/routes/CLAUDE.md   merge=otb-regen
 scripts/gds/CLAUDE.md      merge=otb-regen
 
+# docs/copy-registry.json + docs/copy-inventory.md (task 1003543): the copy
+# registry's committed pair (scripts/gds/copy-inventory.js) — fully generated from
+# a tree scan, nothing hand-authored in either, so two branches that each touch
+# hall/status/landing copy regenerate them differently and conflict like ordinary
+# files. Same otb-regen shape as docs/session-log-index.md above (whole-file
+# rebuild, all three merge sides ignored); REGENERABLE in git-merge-regen.js
+# carries the matching rule.
+docs/copy-registry.json    merge=otb-regen
+docs/copy-inventory.md     merge=otb-regen
+
 # Append-only index tables (task 1385 / ADR 0082). docs/adr/README.md is a
 # hand-maintained ADR index whose ONLY recurring conflict is two branches each
 # appending a new row — there is no generator to regen it from, so `otb-regen`

package/docs/adr/0082-server-side-merge-conflict-auto-resolution.md

@@ -48,6 +48,10 @@ The PR's required checks (unit / trufflehog / audit / gate-review) re-run on the
 - `docs/adr/README.md` itself now carries `merge=union`, so this ADR's own index row — and every future one — stops conflicting.
 - The generated-artifact set is defined once (`REGENERABLE` in `git-merge-regen.js`, mirrored by `.gitattributes` and the `fitness.js` freshness gate); adding a future generated file means adding it in those places together.
 
+## Addendum (task 1003543, 2026-09-03) — the copy registry joined the whole-file set
+
+Two hall PRs in one session (526 for task 1003069, 531 for task 1003157) both ran `scripts/gds/copy-inventory.js` and sat `confirmed` with GitHub `mergeable=CONFLICTING` for 20+ minutes: `docs/copy-inventory.md` + `docs/copy-registry.json` carried no `.gitattributes` entry and no `REGENERABLE` rule, so they conflicted as ordinary text/JSON and the server resolver could not heal them (`resolveBranchConflicts` *did* run — its log line fired for both PRs — but the `otb-regen` driver refused the unregistered paths and the merge came back non-zero, which the resolver correctly reported as `unresolvable_conflict`; the reconciler dispatch was never the gap). Both files are, like `docs/repo-map.md` and `docs/session-log-index.md`, 100% generated from a tree scan with nothing hand-authored in either — `copy-inventory.js`'s own header says so ("Deterministic on a given tree — regenerate and commit rather than hand-editing"), so they needed the whole-file `otb-regen` shape, not `union`. The fix: `docs/copy-registry.json merge=otb-regen` + `docs/copy-inventory.md merge=otb-regen` in `.gitattributes`, both added to `REGENERABLE` in `git-merge-regen.js` with a regeneration rule that calls `copy-inventory.js`'s `buildRegistry()`/`renderReport()` directly (ignoring all three merge sides, same as the repo-map heal). No change was needed to `conflict-resolve.js`, `publish-reconciler.js`, or `ship-preflight-steps.js` — none of the three keeps its own copy of the generated-file list; all three read `REGENERABLE` (or, for the resolver, register the driver that reads it), so the new pair is covered everywhere the existing four already were.
+
 ## Alternatives considered
 
 - **Lower deploy/merge access to `thetes`** (the owner's first instinct) — rejected: reopens the Builder 25 hole for zero benefit here (the stranded session was already Archon; rank was never the blocker).

package/docs/module-api-changelog.md

@@ -1439,5 +1439,7 @@ is load-bearing: the script throws rather than guess if it is missing, and
         landed since 1.19.499 with no explicit bump. run 33772499045. (task 1002620)
   1.19.501 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
         landed since 1.19.500 with no explicit bump. run 33774087943. (task 1002620)
+  1.19.502 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
+        landed since 1.19.501 with no explicit bump. run 33777587058. (task 1002620)
 ---------------------------------------------------------------------------
 ```

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.501",
+  "version": "1.19.502",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bongos/core",
-      "version": "1.19.501",
+      "version": "1.19.502",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "express": "^4.21.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bongos/core",
-  "version": "1.19.501",
+  "version": "1.19.502",
   "description": "Cloud Bongos — the AI-first build platform core (GDS + platform surfaces + module system), installed as a versioned dependency (ADR 0108).",
   "license": "AGPL-3.0-or-later",
   "main": "src/platform-server.js",

package/scripts/gds/git-merge-regen.js

@@ -28,6 +28,7 @@ const { spawnSync } = require('node:child_process');
 const G = require('./gen-repo-map');
 const FM = require('./gen-file-map');
 const SI = require('./gen-session-index');
+const CI = require('./copy-inventory');
 
 const REPO_ROOT = path.resolve(__dirname, '..', '..');
 
@@ -36,10 +37,18 @@ const REPO_ROOT = path.resolve(__dirname, '..', '..');
 // hand-written prose with one generated block; docs/file-map.md is hand-written
 // prose with TWO generated section blocks (ADR 0066). (task 1385: session-log-index
 // joined so a confirmed PR that only conflicts on it self-heals like the rest.)
+// docs/copy-inventory.md + docs/copy-registry.json (task 1003543) are the copy
+// registry's own pair — like repo-map.md, `copy-inventory.js` writes them
+// wholesale from a tree scan with nothing hand-authored in either, so any two
+// branches that both touch hall/status/landing copy regenerate them differently
+// and conflict on ordinary text; they join the whole-file group for the same
+// reason session-log-index.md did.
 const REGENERABLE = new Set([
   'docs/repo-map.md',
   'docs/file-map.md',
   'docs/session-log-index.md',
+  'docs/copy-inventory.md',
+  'docs/copy-registry.json',
   ...G.NESTED_DIRS.map((d) => `${d}/CLAUDE.md`),
 ]);
 
@@ -86,6 +95,17 @@ function regenerateResolved(relpath, { base = '', ours = '', theirs = '' } = {})
     return { content: SI.renderIndex(SI.collectEntries()), ok: true };
   }
 
+  // docs/copy-registry.json / docs/copy-inventory.md: both artifacts of one scan
+  // (copy-inventory.js), fully generated — ignore all three sides, rebuild from
+  // the merged tree. Reuse buildRegistry() rather than shelling out to write() so
+  // this stays in-process like the repo-map/session-index heals above.
+  if (relpath === 'docs/copy-registry.json') {
+    return { content: `${JSON.stringify(CI.buildRegistry(), null, 2)}\n`, ok: true };
+  }
+  if (relpath === 'docs/copy-inventory.md') {
+    return { content: CI.renderReport(CI.buildRegistry()), ok: true };
+  }
+
   const model = G.buildModel();
 
   // docs/repo-map.md is fully generated — ignore all three sides, rebuild it.

package/src/module-api.js

@@ -45,7 +45,7 @@ const { validateOrRespond, LIMITS, parseId, asyncHandler, corsPublicGet, parsePa
 // there. scripts/gds/bump-version.js still rewrites the literal below; it appends
 // the entry to that file. Look for a version's history there, not here.
 // ---------------------------------------------------------------------------
-const CORE_VERSION = '1.19.501'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
+const CORE_VERSION = '1.19.502'; // CI auto-patch carrier (ADR 0161); changelog: docs/module-api-changelog.md
 
 // A namespaced logger so a module's log lines are attributable + consistent.
 // Usage: const log = api.logger('dev-box'); log.info('mounted');

package/tests/git_merge_regen.mjs

@@ -14,6 +14,14 @@
 //      markers remain) so a human resolves it — the heal never clobbers real edits.
 //   4. The merge-driver entrypoint writes %A + exits 0 (heal) / 1 (real conflict).
 //   5. A non-generated path is never touched (not in REGENERABLE).
+//   6. END-TO-END: a real `git merge` invokes the driver via .gitattributes.
+//   7. .gitattributes' merge=otb-regen lines and REGENERABLE agree (task 1003543).
+//   8. docs/copy-registry.json + docs/copy-inventory.md (task 1003543) — the copy
+//      registry's own pair — regenerate clean from the merged tree, same as
+//      repo-map.md, ignoring the conflicted sides.
+//   9. END-TO-END for docs/copy-registry.json: two branches that each regenerate
+//      it differently merge without conflict markers via the real .gitattributes +
+//      git-config wiring, and the result equals a fresh regeneration.
 //
 // Run:  node tests/git_merge_regen.mjs
 
@@ -30,6 +38,7 @@ const here = path.dirname(fileURLToPath(import.meta.url));
 const repo = path.resolve(here, '..');
 const regen = require('../scripts/gds/git-merge-regen.js');
 const G = require('../scripts/gds/gen-repo-map.js');
+const CI = require('../scripts/gds/copy-inventory.js');
 
 const MARKERS = /^(<{7}|={7}|>{7})/m;
 
@@ -148,4 +157,82 @@ function withBlockBody(src, body) {
   }
 }
 
+// ── 7) .gitattributes' merge=otb-regen lines and REGENERABLE agree (task 1003543) ─
+// The whole scheme is two hand-maintained lists naming the same files (one in
+// .gitattributes, one in REGENERABLE) — nothing checked that they still matched, so
+// docs/copy-inventory.md + docs/copy-registry.json could be (and were) added to
+// neither and merge like ordinary text. This pins the two lists as one set.
+{
+  const attrsText = fs.readFileSync(path.join(repo, '.gitattributes'), 'utf8');
+  const otbRegenPaths = [...attrsText.matchAll(/^(\S+)\s+merge=otb-regen\s*$/gm)].map((m) => m[1]);
+  assert.ok(otbRegenPaths.length > 0, 'expected at least one merge=otb-regen line in .gitattributes');
+  for (const p of otbRegenPaths) {
+    assert.ok(regen.REGENERABLE.has(p), `.gitattributes declares merge=otb-regen for ${p} but REGENERABLE (git-merge-regen.js) does not know it`);
+  }
+  for (const p of regen.REGENERABLE) {
+    assert.ok(otbRegenPaths.includes(p), `REGENERABLE (git-merge-regen.js) knows ${p} but .gitattributes has no merge=otb-regen line for it`);
+  }
+}
+
+// ── 8) docs/copy-registry.json + docs/copy-inventory.md regenerate clean ────────
+// (task 1003543 — the copy registry's own pair, from copy-inventory.js. Both
+// artifacts of one scan, fully generated — like docs/repo-map.md, all three
+// conflicted sides are ignored and the merged tree is rebuilt from scratch.)
+{
+  const freshReg = CI.buildRegistry();
+  const freshJson = `${JSON.stringify(freshReg, null, 2)}\n`;
+  const freshMd = CI.renderReport(freshReg);
+
+  const rJson = regen.regenerateResolved('docs/copy-registry.json', {
+    base: '{}\n', ours: '<<<<<<< ours\n{"a":1}\n=======\n{"b":2}\n>>>>>>> theirs\n', theirs: 'nonsense\n',
+  });
+  assert.equal(rJson.ok, true, 'copy-registry.json heal must succeed');
+  assert.ok(!MARKERS.test(rJson.content), 'copy-registry.json heal must leave no conflict markers');
+  assert.equal(rJson.content, freshJson, 'copy-registry.json heal must equal a fresh regeneration');
+
+  const rMd = regen.regenerateResolved('docs/copy-inventory.md', {
+    base: '# base\n', ours: '<<<<<<< ours\n# a\n=======\n# b\n>>>>>>> theirs\n', theirs: 'nonsense\n',
+  });
+  assert.equal(rMd.ok, true, 'copy-inventory.md heal must succeed');
+  assert.ok(!MARKERS.test(rMd.content), 'copy-inventory.md heal must leave no conflict markers');
+  assert.equal(rMd.content, freshMd, 'copy-inventory.md heal must equal a fresh regeneration');
+}
+
+// ── 9) END-TO-END: two branches that both regenerate docs/copy-registry.json ────
+// differently merge clean via the real .gitattributes + git-config wiring — the
+// exact PR 526/531 shape from task 1003543 (two hall PRs both ran copy-inventory.js
+// concurrently and conflicted as ordinary JSON/markdown). Mirrors test 6 above.
+{
+  const driver = path.join(repo, 'scripts/gds/git-merge-regen.js');
+  const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'otb-gitmerge-copyreg-'));
+  const g = (...a) => {
+    const r = spawnSync('git', a, { cwd: tmp, encoding: 'utf8' });
+    return { status: r.status, out: `${r.stdout || ''}${r.stderr || ''}` };
+  };
+  const writeReg = (s) => fs.writeFileSync(path.join(tmp, 'docs', 'copy-registry.json'), s);
+  try {
+    g('init', '-q');
+    g('config', 'user.email', 't@t'); g('config', 'user.name', 't');
+    g('config', 'merge.otb-regen.driver', `node ${driver} %O %A %B %P`);
+    fs.writeFileSync(path.join(tmp, '.gitattributes'), 'docs/copy-registry.json merge=otb-regen\n');
+    fs.mkdirSync(path.join(tmp, 'docs'));
+    writeReg('{"schema":0}\n'); g('add', '-A'); g('commit', '-qm', 'base');
+    g('checkout', '-qb', 'feature');
+    writeReg('{"schema":0,"feature":true}\n'); g('add', '-A'); g('commit', '-qm', 'feat');
+    g('checkout', '-q', 'master');
+    if (g('rev-parse', '--verify', 'master').status !== 0) g('checkout', '-q', 'main');
+    writeReg('{"schema":0,"master":true}\n'); g('add', '-A'); g('commit', '-qm', 'mast');
+    const merge = g('merge', '--no-edit', 'feature');
+    assert.equal(merge.status, 0, `real git merge must auto-resolve via the driver; got ${merge.status} :: ${merge.out}`);
+    const unmerged = g('diff', '--name-only', '--diff-filter=U').out.trim();
+    assert.equal(unmerged, '', `no file may be left unmerged; got: ${unmerged}`);
+    const healed = fs.readFileSync(path.join(tmp, 'docs', 'copy-registry.json'), 'utf8');
+    assert.ok(!MARKERS.test(healed), 'merged copy-registry.json must have no conflict markers');
+    assert.equal(healed, `${JSON.stringify(CI.buildRegistry(), null, 2)}\n`,
+      'merged copy-registry.json must equal a fresh regeneration from the (real) merged tree');
+  } finally {
+    fs.rmSync(tmp, { recursive: true, force: true });
+  }
+}
+
 console.log('git_merge_regen: all assertions passed');