Repository navigation
Back-merge hotfix #179 into staging - #193
Merged
Niels Laute (niels9001) merged 3 commits intoSep 25, 2026
Merged
Conversation
The Agent Plugins 1.0 package migration bumped plugins/winui/agent-plugin/plugin.json, .github/plugin/marketplace.json, and .claude-plugin/marketplace.json to 0.6.0, but left plugins/winui/.claude-plugin/plugin.json and plugins/winui/.codex-plugin/plugin.json at 0.3.0 -- neither the release helper nor CI tracked them. This blocks the Claude Code plugin submission in MARKETPLACE-DISTRIBUTION.md, which requires the Claude adapter manifest to carry the release version. - Bump all 7 version fields to 0.6.1 (patch, per the hotfix path in CONTRIBUTING.md -- no user-facing behavior changed). - Add the two adapter manifests to open-release-pr.ps1's Set-JsonField calls so future releases keep them in sync automatically. - Add the two adapter manifests to the version-sync and version-bump CI jobs in release-policy.yml (now checks 7 fields, not 5). - version-bump's main-side drift check stays advisory (::warning::, no exit) rather than hard-failing: Rule 1 already forces all 7 PR-head fields into sync, and a hard fail on main-side drift would deadlock this exact corrective PR against the inconsistency it's fixing. - Update RELEASING.md/CONTRIBUTING.md field counts and CHANGELOG.md. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Hotfix: sync Claude/Codex adapter manifest versions to 0.6.1
…-adapter-versions
Niels Laute (niels9001)
enabled auto-merge (squash)
September 25, 2026 13:31
Niels Laute (niels9001)
approved these changes
Sep 25, 2026
Niels Laute (niels9001)
deleted the
backmerge/hotfix-sync-adapter-versions
branch
September 25, 2026 13:33
1 task done
Jaylyn Barbee (Jaylyn-Barbee)
added a commit
that referenced
this pull request
Sep 25, 2026
Back-merge main into staging (merge commit, not squash) — replaces #193
Merged
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.
Description
Brings hotfix #179 (
Hotfix: sync Claude/Codex adapter manifest versions (0.6.1)) back intostaging, restoring the ancestry thestaging-up-to-date-with-maingate requires.mainwas 2 commits ahead ofstagingand had never been back-merged, so every feature PR targetingstagingcurrently fails that check — see #192, which is blocked on exactly this.This merge is content-neutral
git diff origin/staging HEADis empty. Staging already carried the equivalent change via #180, so this merge only repairs commit ancestry — it changes no files. All five version fields remain consistent at0.6.1:plugins/winui/agent-plugin/plugin.jsonplugins/winui/.claude-plugin/plugin.jsonplugins/winui/.codex-plugin/plugin.json.github/plugin/marketplace.json.claude-plugin/marketplace.jsonType of Change
Affected area
The
staging-up-to-date-with-maingate evaluatesgit rev-list --count origin/main ^HEAD. Squashing or rebasing flattens the two parents, drops the link tomain, and leaves the gate failing exactly as it does now — the back-merge would accomplish nothing.This branch uses the required
backmerge/prefix so theversion-synccheck skips it, perCONTRIBUTING.md§ Back-merge path.Additional Notes
Once this lands, #192 needs a rebase onto the updated
staging.