fix(ci): converge golden-main pilot governance path#22241
Closed
BrianCLong wants to merge 19 commits intomainfrom
Closed
fix(ci): converge golden-main pilot governance path#22241BrianCLong wants to merge 19 commits intomainfrom
BrianCLong wants to merge 19 commits intomainfrom
Conversation
Adds the requested Tri-Graph Model UI components to `packages/summit-ui/src/components/cogbattlespace/` including `LayerToggle`, `ExplainDrawer`, `MetricsPanel`, and `RejectionReportPanel`. Also adds the main Cognitive Battlespace page stub to `packages/summit-ui/src/pages/cogbattlespace/index.tsx`. Updates `packages/summit-cogbattlespace/src/storage.ts` to include required methods `getCurrentEntity` and `putLaneSnapshot`. Updates `packages/summit-cogbattlespace/tsconfig.json` to exclude test files from compilation. Co-authored-by: BrianCLong <6404035+BrianCLong@users.noreply.github.com>
Contributor
|
Warning You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again! |
This was referenced Mar 29, 2026
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughConsolidates CI governance into a single Changes
Sequence Diagram(s)sequenceDiagram
participant Runner as Pipeline<br/>(run_pipeline.js)
participant Verify as Verify<br/>(cli/verify.mjs)
participant Replay as Replay<br/>(cli/replay.mjs)
participant Export as ExportProof<br/>(cli/exportProof.mjs)
participant Artifacts as Artifacts<br/>Dir
Runner->>Artifacts: write report.json, metrics.json, evidence.json, stamp.json
Verify->>Artifacts: read files
Verify->>Verify: validate schemas (report/metrics/evidence)
Verify->>Verify: verifyEvidenceBindings()
Verify->>Verify: hash report → write hash.txt and verify.log
Replay->>Artifacts: ensure baseline report exists
alt baseline missing
Replay->>Runner: run pipeline to create artifacts
end
Replay->>Verify: run verification
Replay->>Replay: baseline report hash
Replay->>Runner: re-run pipeline
Replay->>Verify: run verification again
Replay->>Replay: compare baseline vs replay hashes (compareFiles)
Export->>Artifacts: check for verify/replay logs
alt logs missing
Export->>Verify: run verify
Export->>Replay: run replay
end
Export->>Export: copy proof files → compute file hashes
Export->>Artifacts: write proof-manifest.json into proof dir
Estimated code review effort🎯 5 (Critical) | ⏱️ ~120 minutes
✨ Finishing Touches🧪 Generate unit tests (beta)
|
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: e8a7b8a51b
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| # We exclude node_modules and .git to avoid false positives | ||
| if grep -R --include="*.js" --include="*.ts" --exclude-dir="node_modules" --exclude-dir=".git" "Date\.now()" .; then | ||
| echo "❌ Non-deterministic timestamp usage detected (Date.now())" | ||
| if grep -R --include="*.js" --include="*.jsx" --include="*.ts" --include="*.tsx" --exclude-dir="node_modules" --exclude-dir=".git" "Date\.now()" .; then |
There was a problem hiding this comment.
This grep runs from the repository root and fails on any Date.now() usage in source/test files, but pr-gate now executes this script as a required check. Because the repo already contains many legitimate Date.now/new Date/Math.random uses, the gate can fail even when a PR does not introduce nondeterministic artifacts, effectively turning the required check into a permanent merge blocker. Scope the scan to generated evidence/artifact paths (or an explicit allowlist) instead of all JS/TS files.
Useful? React with 👍 / 👎.
added 7 commits
March 29, 2026 17:05
This was referenced Mar 30, 2026
This was referenced Mar 30, 2026
Closed
BrianCLong
added a commit
that referenced
this pull request
Mar 30, 2026
Co-authored-by: BrianCLong <6404035+BrianCLong@users.noreply.github.com>
Owner
Author
|
@BrianAtTopicality repo is now reduced to a single open PR. summit-verify is green, auto-merge is enabled, and this PR is the only remaining merge lane. Remaining blocker is your approval. |
Owner
Author
BrianCLong
added a commit
that referenced
this pull request
Mar 31, 2026
## Summary Rebuilds the golden-main merge train from a clean `main` base and converges the currently mergeable PR set into one replacement branch. This branch absorbs: - #22296 - #22279 - #22281 - #22282 - #22283 - #22284 - #22285 - #22295 - #22297 - #22286 - #22291 - #22280 - #22277 - unique non-conflicting surfaces from #22241 - the admissibility/CACert/failure-demo runtime lane from #22314 This branch supersedes: - #22298 as the contaminated/conflicting convergence branch - #22277 as a standalone merge vehicle - #22241 as the broad mixed-purpose convergence vehicle once remaining review is complete - #22314 as the standalone admissibility lane now folded into the golden path This branch intentionally excludes: - #22292 because it targets `merge-surge/staging`, not `main` ## Conflict policy used while absorbing #22241 When merging `#22241` on top of the cleaned train, the following files conflicted and were resolved in favor of the current train versions so the newer focused CI/governance repairs remain authoritative: - `.github/ci/required-checks.json` - `.github/workflows/drift-sentinel.yml` - `.github/workflows/pr-gate.yml` - `docs/ci/REQUIRED_CHECKS_POLICY.yml` - `pnpm-lock.yaml` - `scripts/ci/check_branch_protection_drift.mjs` - `scripts/ci/validate_workflows.mjs` All other `#22241` changes merged on top of the train. ## Mapping Change Summary This convergence branch updates workflow, schema, and governance contracts that control merge eligibility, admissibility evidence, and deterministic trust artifacts. ## Diff - Added admissibility/evidence/CACert surfaces including `packages/evidence/schemas/decision_trace.schema.json` - Tightened golden-lane workflow policy and drift handling in `.github/workflows/_policy-enforcer.yml`, `.github/workflows/execution-graph-reconciliation.yml`, `.github/workflows/post-ga-hardening-enforcement.yml`, `.github/workflows/merge-surge.yml`, `.github/workflows/control-plane-drift.yml` - Realigned governance state in `governance/pilot-ci-policy.json` and `governance/branch-protection.json` - Repaired deterministic reconciliation verification in `scripts/ci/verify_execution_graph_reconciliation.mjs` and `scripts/ci/drift-sentinel.mjs` ## Justification The repo needed one mergeable replacement lane that restores deterministic governance checks, folds the admissibility implementation into the golden path, and suppresses broken optional PR workflows that were blocking convergence without being canonical required checks. ## Impact - Canonical pilot checks remain `pr-gate / gate` and `drift-sentinel / enforce` - Merge-train branches no longer fail ordinary small-PR enforcement gates by construction - Optional broken workflows are narrowed to their owned surfaces so they stop contaminating this convergence lane and the immediate post-merge main push - Execution-graph reconciliation now accepts the repo’s canonical snake_case trust bundle fields ## Rollback Plan Revert commit `ce32b96c0f` from `merge-train/golden-main-20260331-final`, then rerun the prior golden-lane checks and restore the previous PR body. ## Backfill Plan After the lane is green, backfill the same workflow scoping and governance-contract repairs into any surviving PRs that still touch `.github/workflows/**` or governance surfaces, then close superseded PRs against `#22309`. ## Validation Evidence Local validation completed: - `node scripts/ci/drift-sentinel.mjs` - `ruby -e 'require "yaml"; ... YAML.load_file(...)'` over all edited workflow files - `jq . governance/pilot-ci-policy.json` - `jq . governance/branch-protection.json` - merge-marker scan over all edited files returned clean ## Notes - Live GitHub PR checks on the open PR set are being converged through this single branch instead of salvaging each broken lane independently. - I did not run the full local verification matrix in this session; this PR is intended to give the repo one clean convergence lane for CI and human review. - After this PR lands, the absorbed PRs should be closed as superseded. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Bot <bot@summit.ai> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gemini CLI <gemini-cli@google.com>
Owner
Author
|
Superseded by #22309, which is now merged into main. |
auto-merge was automatically disabled
March 31, 2026 20:10
Pull request was closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Converges the current open repair slices onto one clean branch from
main.This PR:
#22202Cognitive Battlespace UI slice on top of a compile-clean baselineSupersedes or absorbs work from:
Excluded from this train:
.github/workflows/archive/deploy-aws.ymlRisk & Surface (Required)
Risk Level (Select one):
risk:low(Docs, comments, safe refactors)risk:medium(Feature flags, backward-compatible changes)risk:high(Database migrations, auth changes, critical path)risk:release-blocking(Critical fixes only)Surface Area (Select all that apply):
area:clientarea:serverarea:docsarea:infraarea:ciarea:policyAssumption Ledger
mainat12cad4ac74is the correct golden base for this train; the repo's protected-branch surface is intentionally narrowed to the pilot governance path.Execution Governor & Customer Impact
.exec-override.Evidence Bundle
prompts/registry.yamlupdated (if prompts changed).Investigation Trust Doctrine Checklist
Security Impact
Green CI Contract Checklist
pnpm lintlocally.CI & Merge Train Rules
If CI is Blocked:
Verification
Local verification run on
/tmp/summit-pr22202:node scripts/ci/governance_mutation_guard.mjspnpm exec tsc -p packages/summit-ui/tsconfig.json --noEmitnode --test tests/integration/ci-gate.test.mjsnode --import tsx --test packages/summit-cogbattlespace/src/__tests__/*.test.tsnode scripts/pilot/verify-buyable-demo.mjs{
"promptId": "manual-convergence-2026-03-29",
"taskId": "golden-main-convergence-20260329",
"tags": ["merge-train", "ci", "governance", "pilot", "cogbattlespace"]
}
Summary by CodeRabbit
New Features
Bug Fixes & Improvements
Documentation
Tests