Skip to content

cluster(night): dual-run shim thrash absorb (#3134 #3136 #3137) - #3140

Merged
natechadwick merged 7 commits into
mainfrom
cluster/night-issue-20260812-dual-run-shim
Aug 12, 2026
Merged

natechadwick merged 7 commits into
mainfrom
cluster/night-issue-20260812-dual-run-shim

Conversation

@natechadwick-intsof

Copy link
Copy Markdown
Collaborator

Summary

Overnight same-file thrash absorption for dual-run / definition-XML shim work. Three owned open PRs all edited the same criteria/operator docs and/or PSWidgetDao.java. This cluster unions their content against main so humans review one PR instead of thrashing merges.

Thrash files

Absorbed content (union)

  1. issue 2630 residual: default modernPackageRoots for product/H2 installs #3130 / feat(sitemanage): default modernPackageRoots for product/H2 installs (#3130) #3134 — product/H2 default modernPackageRoots (PSModernPackageRootDefaults, distribution staging, Zip Slip guards + diagnostic logs)
  2. issue 2630 residual: dual-run selection metrics evidence harness #3131 / fix(dual-run): selection metrics evidence harness for M2 (#3131) #3136 — dual-run selection metrics harness (cumulative counters + snapshot/summary on PSWidgetDao + GadgetRegistry, CI harness tests)
  3. issue 2630 residual: criteria M2 snapshot + operator dual-run checklist #3132 / docs(#3132): criteria M2 snapshot + operator dual-run checklist #3137 — criteria M2 Status snapshot (2026-08-12) + expanded operator dual-run checklist (updated to treat issue 2630 residual: default modernPackageRoots for product/H2 installs #3130/issue 2630 residual: dual-run selection metrics evidence harness #3131 as absorbed in this cluster)

Conflict resolution used union semantics (keep #3130 defaults + #3131 harness APIs + #3132 checklist/status; no unique adds dropped).

Supersedes

Supersedes Original PR Head Absorbed Notes
yes #3134 fix/issue-3130-default-modern-package-roots yes modernPackageRoots defaults + packaging + Zip Slip review fixes
yes #3136 fix/issue-3131-dual-run-selection-metrics-harness yes metrics harness + docs delta; conflict unioned on dual-run operator doc
yes #3137 fix/issue-3132-criteria-m2-snapshot-checklist yes docs-only snapshot/checklist; unioned onto code+docs from #3134/#3136

Do not merge #3134 / #3136 / #3137 — they are superseded by this cluster.

Test plan / gates evidence

Module Command Result
modules/perc-packages mvnw clean install after #3134 BUILD SUCCESS (exit 0)
projects/sitemanage mvnw clean install after #3134 BUILD SUCCESS
projects/sitemanage mvnw clean install after #3136 BUILD SUCCESS — Tests run: 1090, Failures: 0, Errors: 0, Skipped: 125
WebUI mvnw clean install after #3136 BUILD SUCCESS
docs (#3137) N/A (docs-only absorb) conflict union committed

Operator

Grok: night-issue-prs (model grok-4.5)

Closes nothing by itself; original issues #3130/#3131/#3132 already closed or tracked on parent #2630. Leaves #2852 blocked until M1–M3 + G1–G6.

…3130)

When widgetDao.modernPackageRoots is blank, discover package roots under
${rxdeploydir}/Packages/Modern (PSModernPackageRootDefaults), materializing
from the perc-packages classpath when the install tree is empty. Stage
Packages/Modern in the distribution and include it in upgrade overwrite.

Keeps PSLegacyDefinitionXmlShim dual-run fallback (#2852). Tests cover
modern-present and modern-absent selection. Criteria/dual-run docs updated.

Parent: #2630 · Fixes #3130

> Co-Authored by Grok Build using grok-4.5 with agent main.
Add cumulative modern/legacy (and gadget none) dual-run counters,
snapshot maps, and formatSelectionMetricsSummary() on PSWidgetDao and
GadgetRegistry. CI harness tests assert modern vs legacy selection
metrics; criteria doc documents how to measure M2. No shim deletion.

Parent: #2630

> Co-Authored by Grok Build using grok-4.5 with agent main.
Refresh definition-XML shim removal criteria Status snapshot (2026-08-12)
for M1/M2/M3/G1-G6 with merged PR links (#3024/#3025/#3026, cluster #2897)
and open evidence PRs (#3130/#3131). Expand dual-run operator checklist for
H2 qa-up and product install: how to read metrics, when shim must stay, and
what evidence closes M2. Explicitly keep #2852 blocked until M1-M3+G1-G6.
No code deletion.

Parent: #2630 · Fixes #3132

> Co-Authored by Grok Build using grok-4.5 with agent main.
…oots (#3130)

Address PR #3134 review threads: log resolved modern root paths and full
IOException stack; jar URI parse without URL round-trip; safeResolveUnder on
classpath materialize (CodeQL Zip Slip); unit coverage for path escape.

> Co-Authored by Grok CLI using agent overnight-pr-follow-up.
@natechadwick
natechadwick merged commit e91d953 into main Aug 12, 2026
4 checks passed
@natechadwick
natechadwick deleted the cluster/night-issue-20260812-dual-run-shim branch August 12, 2026 05:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

model:grok-4.5 Grok 4.5 model operator:grok Changes authored by Grok operator:night-issue-prs night-issue-prs workflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants