Skip to content

docs: sync upstream baseline to e9c88458#70

Merged
Jamkris merged 1 commit into
mainfrom
docs/advance-upstream-baseline
May 13, 2026
Merged

docs: sync upstream baseline to e9c88458#70
Jamkris merged 1 commit into
mainfrom
docs/advance-upstream-baseline

Conversation

@Jamkris
Copy link
Copy Markdown
Owner

@Jamkris Jamkris commented May 13, 2026

Summary

Final PR of the 2026-05-12 upstream sync round. Advances the recorded baseline from 9db98673 (2026-02-09) to e9c88458 (2026-05-11) — the upstream HEAD at triage time and the last commit evaluated in this round.

What landed in this round

  • #66 — triage / audit log (upstream/sync-rounds/2026-05-12.md)
  • #67 — port: skill curation updates from ECC
  • #68 — port: hook + validator fixes from ECC (closed two real bypass holes; 3 rounds of bot review)
  • #69 — port: plan command graceful degradation

Of the 159 commits in the focused range (4e66b288..e9c88458):

Disposition Count
Ported 9
Evaluated inline + skipped 5
Deferred (eligible net-new skills) 3
Skipped with rationale 142

The 142 skips are dominated by ECC-runtime-only surfaces (loop-status, gateguard, insaits-security-*, ECC's cursor/codex/opencode install targets, ecc2 RC1 work) and Claude-Code-specific session-start / observe-runner / MCP-disable changes.

Files updated (4)

  • upstream/.upstream-sync.jsonlastSyncedSha + lastSyncedAt + round notes pointing at the audit log.
  • upstream/README.md — baseline badge, Last-synced commit, date, and a round-notes pointer.
  • upstream/ko-KR/README.md + upstream/zh-CN/README.md — same three updates mirrored.

Why the baseline is the evaluated SHA, not ECC HEAD

ECC has continued to merge commits since triage (~820e07f at the time of this PR). The sync policy explicitly chooses to advance the baseline to the last commit actually evaluated rather than the current upstream HEAD — see upstream/README.md → Recording a sync. Lying about the SHA would close issue #60 prematurely and hide unevaluated drift.

Expected post-merge behaviour

  • The CI validator (validate-upstream-sync.js) passes — the prose SHA and JSON SHA agree on e9c8845.
  • The next scheduled or manually-dispatched upstream-drift workflow run will compute the delta against ECC's current HEAD, find a small drift (only the ~1–2 days of new ECC commits since e9c88458), and update issue Upstream sync: 1526 new commits in ECC since 9db9867 #60 with the new (much smaller) count.
  • Issue Upstream sync: 1526 new commits in ECC since 9db9867 #60 will not auto-close because ECC continues to merge faster than EGC catches up. That is exactly the "best-effort, surface drift" policy at work — the tracker now shows progress instead of an inflated 1500+ figure.

Test plan

  • node scripts/ci/validate-upstream-sync.js — "OK — both files reference e9c8845"
  • npm run lint — clean
  • npm test — 279/279
  • Manual link check — README baseline → ECC commit, audit log link → sync-rounds/2026-05-12.md
  • Post-merge: manually dispatch the upstream-drift workflow and verify issue Upstream sync: 1526 new commits in ECC since 9db9867 #60 updates with the new count instead of duplicating to a new issue

Round end

This PR closes the round. Future rounds will start fresh with a new triage file under upstream/sync-rounds/.

Related to / will eventually close #60 once ECC's commit cadence catches down (or, more realistically, the next round).


Summary by cubic

Advances the recorded upstream baseline to e9c88458 (2026-05-11), the last commit evaluated in the 2026-05-12 sync round, and points docs to that round’s audit log. Updates upstream/.upstream-sync.json, upstream/README.md, upstream/ko-KR/README.md, and upstream/zh-CN/README.md with the new SHA, date, and notes; the next drift run will recalc against ECC’s current HEAD and shrink the count in issue #60.

Written for commit b18af8f. Summary will update on new commits.

Summary by CodeRabbit

Chores

  • Updated upstream synchronization baseline and configuration metadata to reflect the latest evaluated commit.
  • Refreshed README documentation in English, Korean, and Chinese languages with current upstream synchronization details and sync date of May 13, 2026.
  • Updated internal synchronization tracking notes and references to correspond with the latest round of upstream evaluation.

Review Change Stack

Final PR of the 2026-05-12 upstream sync round. Advances the
recorded baseline from 9db98673 (2026-02-09) to e9c88458
(2026-05-11) — the upstream HEAD at triage time and the last
commit *evaluated* in this round.

The round shipped three port PRs and a per-commit audit log:
- #67 port: skill curation updates from ECC
- #68 port: hook + validator fixes from ECC
- #69 port: plan command graceful degradation
- audit log: upstream/sync-rounds/2026-05-12.md

The baseline reflects what was evaluated, not what was ported.
Of the 159 commits in the focused range, 9 ported, 5 evaluated
inline, 3 deferred as net-new skills, 142 skipped with rationale.
Architectural-mismatch skips (session-start additional_context,
observe-runner relocation, MCP-disable Claude-only guidance) are
documented in the audit log and the relevant PR descriptions so
the precedent is auditable.

Files updated:
- upstream/.upstream-sync.json — lastSyncedSha + lastSyncedAt +
  round notes pointing at the audit log.
- upstream/README.md — baseline badge, Last-synced commit, date,
  and a round-notes pointer.
- upstream/ko-KR/README.md and upstream/zh-CN/README.md — same
  three updates mirrored.

Expected post-merge behaviour: the next scheduled run of the
upstream-drift workflow (or a manual dispatch) will compute the
delta against ECC's current HEAD (~820e07f at the time of this
PR), find a small drift covering only the new commits ECC merged
in the last ~36 hours, and update issue #60 with the new (much
smaller) count. Issue #60 will not auto-close because ECC
continues to merge upstream commits faster than EGC catches up;
that is exactly the "best-effort, surface drift" policy at work.

validate-upstream-sync passes locally: "OK — both files reference
e9c8845". Lint clean. 279/279 tests pass. Doc-only.
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 13, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 9b20471d-c2b1-43b9-9e38-76346e1330ef

📥 Commits

Reviewing files that changed from the base of the PR and between 63c67ea and b18af8f.

📒 Files selected for processing (4)
  • upstream/.upstream-sync.json
  • upstream/README.md
  • upstream/ko-KR/README.md
  • upstream/zh-CN/README.md

Walkthrough

Updates the upstream synchronization baseline commit from 9db9867 to e9c88458 (dated 2026-05-13) across the configuration file and localized README documentation, advancing the recorded baseline to reflect Round 2 sync audit completion.

Changes

Upstream Sync Baseline Advance to Round 2

Layer / File(s) Summary
Sync configuration metadata update
upstream/.upstream-sync.json
Updates lastSyncedSha, lastSyncedAt, and notes fields to record the new baseline commit (e9c88458), sync date (2026-05-13), and Round 2 sync audit metadata.
README baseline updates across locales
upstream/README.md, upstream/ko-KR/README.md, upstream/zh-CN/README.md
Updates the baseline badge hash and Upstream baseline section metadata in English, Korean, and Chinese documentation to reflect the new commit e9c88458 and sync date 2026-05-13.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes


Possibly related PRs

  • Jamkris/everything-gemini-code#66: Adds the Round 2 sync audit triage log (upstream/sync-rounds/2026-05-12.md) that documents the evaluation supporting this baseline advance.
  • Jamkris/everything-gemini-code#58: Updates upstream drift validation logic in scripts/lib/upstream-drift.js that strictly validates the .upstream-sync.json metadata being updated here.

Suggested labels

docs

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: updating the upstream baseline reference from 9db98673 to e9c88458.
Linked Issues check ✅ Passed The PR fulfills issue #60's objective by advancing the recorded baseline to an evaluated upstream commit (e9c88458) following the documented sync procedure.
Out of Scope Changes check ✅ Passed All changes scope to baseline synchronization: sync metadata, badge updates, and last-synced timestamps across four files with no unrelated modifications.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch docs/advance-upstream-baseline

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 4 files

@Jamkris Jamkris merged commit 17ae76b into main May 13, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upstream sync: 1526 new commits in ECC since 9db9867

1 participant