Skip to content

Commit 7ba9ffd

Browse files
committed
tooling(cutover): the merge driver records shadcn:update as not driver-managed (objectstack#25803)
Bill item 21(a): reconcileGenerators finds one generator in the ui/ manifests with no merge disposition, object-ui-monorepo's shadcn:update. Its output is vendored components carrying hand-kept local patches, fetched from the network registry, so it gets a NOT_DRIVER_MANAGED entry with its reason, never a REGEN_ARTIFACTS row. Co-Authored-By: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CUXv64KLMfYv3ia2sWi6te
1 parent 059c98f commit 7ba9ffd

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

‎scripts/regen-artifacts.mjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,19 @@ export const NOT_DRIVER_MANAGED = Object.freeze([
873873
+ 'stopped (they merged clean and WRONG). Regenerating a ledger would discard evidence, which is '
874874
+ 'the opposite trade — so this exclusion covers the prose and must stay.',
875875
},
876+
// ── the objectui tree under ui/ (objectstack#25677) ──────────────────────────
877+
{
878+
path: 'ui/packages/components/src/ui/*.tsx',
879+
gen: 'shadcn:update',
880+
owner: 'object-ui-monorepo',
881+
why:
882+
'VENDORED components with hand-kept local patches. `shadcn:update` (`ui/scripts/shadcn-sync.js '
883+
+ '--update`) fetches a component from the network Shadcn registry, re-applies the patch list in '
884+
+ '`ui/scripts/shadcn-local-patches.mjs` and refuses to overwrite local edits without `--force`. '
885+
+ '"Discard both sides and re-run" would swap a reviewed vendored copy for whatever the registry '
886+
+ 'serves that day and drop every edit the patch list does not carry, and it needs the network, '
887+
+ 'which a merge must not. A conflict in a vendored component stays a human\'s; never routed.',
888+
},
876889
]);
877890

878891
/** Marker file (inside the git dir, never the worktree) listing paths the driver deferred. */

0 commit comments

Comments
 (0)