Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Record a merge disposition for every generator, and gate the ones nobody judged by claude[bot] · Pull Request #13876 · objectstack-ai/objectstack · GitHub
Skip to content

Record a merge disposition for every generator, and gate the ones nobody judged - #13876

Merged
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions
Aug 31, 2026
Merged

Record a merge disposition for every generator, and gate the ones nobody judged#13876
os-project-manager merged 1 commit into
mainfrom
claude/issue-13731-generator-artifact-routing-dispositions

Conversation

@claude

@claudeclaudeBot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Fixes#13731
Fixes#13335

Every generator-owned artifact now has a recorded disposition — routed to merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and check:merge-driver gained a third reconciliation so that generator number 12 is met by a red gate instead of by a merge conflict.

Re-derived census (⛔ not the card's figures — measured on this tree)

Command, and the numbers it produced at merge base 8c6a7fc0b:

node scripts/git-merge-regen.mjs --self-test
-> all 21 generator(s) across 79 manifest(s) have a recorded disposition
card (d32b0f501)this tree
workspace manifests + root79 + root78 + root = 79
generator-ish scripts (gen:* key, or a --fix/--update mode)2121
named as a driver-managed row's gen1010
in NEITHER ledger1111

The split reproduces exactly; only the manifest count differs (the card's "79 workspace manifests plus the root" reads as 80 against this tree's 79).

One correction that changed the shape of the work: the census is by SCRIPT, but a disposition is per PATH. Resolving each of the 11 to what it actually writes collapses them to 9 artifact groups, and two of those turn out not to be in git at all.

The dispositions — one per path, each with its recorded reason

Routed (merge=os-regen) — 3 paths

pathgeneratorwhy routing is right
skills/*/references/_index.mdgen:skill-refs#13335. Generated whole, one row per spec module, no hand-written region. Two branches' correct-for-themselves projections merge to a file describing neither. 9 tracked files today; a SEGMENT glob so a tenth skill arrives routed.
skills/objectstack-ui/contracts/react-blocks.contract.jsongen:react-blocksGenerated whole from the REACT_BLOCKS definition. Two PRs adding different blocks are a set union git reports as a conflict.
skills/objectstack-ui/references/react-blocks.mdgen:react-blocksSame, and generated whole including its frontmatter and its "do not edit by hand" banner — verified in the generator, so there is no hand-written region a deferral could launder.

⚠️Routing is the CHEAP half and is never the protection — the driver is a LOCAL facility, so it does nothing for a merge-queue rebuild. What protects these paths is server-side, and it is already wired: check:skill-refs and check:react-blocks run in lint.yml on pull_requestandmerge_group with no paths: filter, and both RE-DERIVE the artifact from source rather than reading it back — so they also catch the silent case. This follows #13646's ruling (the CI regeneration check is load-bearing, the driver incidental) rather than re-litigating it.

NOT_DRIVER_MANAGED — 7 paths, each with its own reason

pathgeneratorrecorded reason (abridged)
skills/README.mdgen:skill-docsMIXED — the generator rewrites only the BEGIN/END GENERATED: skills region: 17 of 114 lines. The other 97 are hand-written prose, and the driver defers the WHOLE file. Routing would launder a sibling's prose edit — the exact trade migrations/registry.ts is kept out for.
content/docs/ai/skills-reference.mdxgen:skill-docsMIXED, same shape — one spliced block inside 267 lines of guide prose.
packages/client/test-typecheck-debt.jsongen:test-typecheck-debtShrink-only ratchet. Recomputing mid-merge records whatever the half-merged tree compiles to, and a file that GAINED errors enters the ledger as merge noise instead of as red.
packages/rest/test-typecheck-debt.jsongen:test-typecheck-debtSame. Listed separately on purpose — see the keying note below.
packages/sdui-parser/objectui-lockstep.jsongen:sdui-lockstepA vendored record of ANOTHER repository.--update needs an objectui checkout; a merge driver has no network, no build and no sibling checkout, so "recompute from the merged sources" names sources not in this tree. And the pinned .objectui-sha records which revision a human ported to — an act, not a projection.
packages/spec/json-schema/**gen:openapiGitignored (.gitignore:61) — git never merges it, so it has no merge semantics to decide. Recorded because it looks like the routed json-schema.manifest/** beside it and invites the symmetry.
sbom.jsongen:sbomGitignored (.gitignore:73) — release-time output; nothing merges it and no check: proves it current.

Already accounted for — no change beyond making it visible

gen:migration-registry and the packages/spec copy of gen:test-typecheck-debt were already NOT_DRIVER_MANAGEDby path; they gain a gen field so the new accounting can see them. gen:authorable-surface-base is deliberately not any row's gen (the reasoning already sits beside the authorable-surface.base.json row); it gains an alsoWrittenBy entry so it reads as judged rather than as unaccounted.

What the instrument fails on

reconcileGenerators() in scripts/git-merge-regen.mjs. Population is enumerated from the manifests themselves — never a hand-kept list — so generator 12 enters it by existing. It fails, in both directions, when:

  • a generator-ish script is in neither ledger; and
  • a recorded disposition names a generator no manifest defines (a rename leaves a reason covering nothing).

Accounting is keyed by (owner, script), never by bare name: gen:test-typecheck-debt exists in three manifests writing three different ledgers, and a name-keyed check would have let the packages/spec entry account for the client and rest copies — which were 2 of the 11 gaps, so it would have been born unable to see its own motivating case.

Two more reconciliations came with it:

  • reconcileAttributeSemantics()entryForPath and git must read a declared path the same way, measured against git check-attr itself over all 7614 tracked files. This closes a latent bug the segment glob would otherwise have walked into: reconcileAttributes compares bytes, so a pattern git matches but entryForPath does not reconciles green and is then REFUSED by the driver mid-merge, blaming a table row that is present. A row matching nothing is a failure too.
  • reconcileUntrackedDispositions() — the two "git never merges it" reasons are expiring claims, so they are asserted rather than asserted once. The day sbom.json is committed, a gate reddens instead of a merge conflict surfacing later.

The false-positive bound (⚠️ stated, because a bound nobody writes down is a bound nobody checks)

  • The --fix/--update limb currently adds zero members beyond the gen:* keys — measured: all 21 members carry a gen: key. It is kept because it fails closed; its false-positive class is a transform like eslint --fix, whose remedy is one ledger line. A gate asking for one line is not a noisy gate.
  • What it cannot see: a generator that no manifest script names. scripts/*.mjs invoked directly by a workflow is that shape, and that population belongs to check:ratchet-remedy-authority, which builds its own from readdirSync.

#13335's reproduced conflict, and what this PR does to it

The card's exact rows, replayed in a temp repo — control (unrouted, today's main) against this PR:

===== CONTROL (unrouted — today's main)
git merge exit=1
RESULT: CONFLICT MARKERS in skills/objectstack-ui/references/_index.md
conflicted-in-index: UU skills/objectstack-ui/references/_index.md
pending marker: (none)
| CONFLICT (content): Merge conflict in skills/objectstack-ui/references/_index.md
===== THIS PR (skills/*/references/_index.md merge=os-regen)
git merge exit=0
RESULT: no conflict markers
conflicted-in-index: none
pending marker: skills/objectstack-ui/references/_index.md
| ⟳ skills/objectstack-ui/references/_index.md
| not text-merged — it is generated. Regenerate from the merged tree:
| pnpm --filter @objectstack/spec gen:skill-refs

The resolution #13335 records by hand — take either side, commit the merge, regenerate, let check:skill-refs prove it — is what this row plus os-regen-merge.sh step 4 now do mechanically. os-regen-merge.sh also stops reporting the file as a conflict in a NON-generated file, which is what it did on that card.

Reverse verification — 4 ablations, all RED in the predicted direction

Each mutation was proven on disk before the run (occurrence counts, not a bare git diff --stat), and each restore proven by git diff HEAD empty and a blob-hash match against the HEAD blob. No build step: these are plain .mjs run directly by node, with no dist/ resolution between the edit and the run.

ablationexpectedobserved
A. delete the sdui-lockstep dispositionredexit=1 · ✗ generator(s) with NO recorded merge disposition
B. add a 12th generator nobody has judgedredexit=1 · same refusal, naming it
C. revert the glob matcher onlyredexit=1 · ✗ git routes these to merge=os-regen but entryForPath does not resolve themand✗ declared path(s) matching no tracked file
D. point a disposition at a generator no manifest definesredexit=1 · ✗ disposition(s) naming a generator that no manifest defines

C is the one worth reading: it confirms the latent bug is real. Without the segment-glob support, routing skills/*/references/_index.md would have reconciled green and then failed at merge time.

Gates

Derived with node scripts/pm/dispatch-gates.mjs --repo objectstack-ai/objectstack (13 families + 2 convention-triggered for editing a gate script), all run on final commit dc492c701:

PASS pnpm check:merge-driver PASS pnpm check:ratchet-remedy-authority
PASS pnpm check:agent-test-spelling PASS pnpm check:bash32-floor
PASS pnpm check:cli-command-ids PASS pnpm check:cross-package-test-inputs
PASS pnpm check:entry-guard PASS pnpm check:parse-guard
PASS pnpm check:pnpm-filter-targets PASS pnpm check:watch-hint-literal
PASS node scripts/check-ci-filter-parity.mjs
PASS node scripts/check-cross-package-test-inputs.mjs
PASS node scripts/check-shard-attestation.mjs
PASS node scripts/pm/bare-root-worklist.mjs --self-test
PASS pnpm check:pm-dispatch-gates (1048 cases)
PASS pnpm check:nul-bytes (7607 files, 0 raw control bytes)
PASS pnpm --filter @objectstack/spec check:generated --reconcile-only
PASS check:skill-refs · check:react-blocks · check:skill-docs · check:sdui-lockstep

node scripts/check-test-completeness.mjs exits 3 when run bare — it requires a test-run log CI tees in, so it is NOT MEASURED locally rather than failed.

ESLint — narrowed, with the evidence the narrowing needs: the changed files lint clean (--format json: 2 files, 0 errors, 0 warnings). Population read from eslint's own --print-config, which reports parserOptions.project = null and projectService = nulltype-aware linting is not enabled, so no untouched file's verdict can depend on this diff, and the diff changes no eslint config. The repo-wide sweep remains CI's run.

Changeset

None, and skip-changeset applied. Measured, not assumed: all three touched paths live at the repo root, owned by the private@objectstack/spec-monorepo; of 69 publishable workspace packages, zero are rooted at the repo root and zero have a files[] entry reaching scripts/ or .gitattributes. Nothing publishes.

Governed surface

No skills/** file is edited.GOVERNED_SURFACES is docs/adr/, .claude/, skills/, AGENTS.md, CLAUDE.md; this diff is .gitattributes + two root scripts/*.mjs. The fence stays intact and this is not a governed PR — confirming the devx seat's 03:29Z measurement on #13335.


Generated by Claude Code


Generated by Claude Code

Every generator-owned artifact now has a recorded disposition — routed to
merge=os-regen, or NOT_DRIVER_MANAGED with a per-path reason — and
check:merge-driver reconciles the generators themselves, so the next one is
met by a red gate instead of by a merge conflict.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pk26oZ12t5N1hwGW1m1MgC
@claudeclaudeBot added the skip-changeset PR has no user-facing published change; bypasses the changeset gate label Aug 31, 2026
@os-project-manager
os-project-manager marked this pull request as ready for review August 31, 2026 16:39
@os-project-manager
os-project-manager added this pull request to the merge queueAug 31, 2026
Merged via the queue into main with commit 4902a25Aug 31, 2026
37 checks passed
@os-project-manager
os-project-manager deleted the claude/issue-13731-generator-artifact-routing-dispositions branch August 31, 2026 17:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/mskip-changesetPR has no user-facing published change; bypasses the changeset gate

Projects

None yet

2 participants

@os-project-manager@claude