Repository navigation
fix(vetted-ops): drop the duplicate setup-upstream-fix caller from the policy - #2231
Merged
Merged
Conversation
…e policy apache#2230 and apache#2228 each added a "setup-upstream-fix" entry to [callers]. Git merged the two cleanly, but the key is declared twice, so the committed policy is no longer valid TOML and every vetted op in this repository fails on its config. Keep apache#2228's entry, drop apache#2230's. Add a test that loads the committed policy and checks every granted operation exists, so a merge like this fails CI. Setup config Step 3a.3 no longer lists missing shared-policy grants (a separate check covers it), and the setup skill's measured_tokens is refreshed. Generated-by: Claude Opus 5
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
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
Follow-up to #2230, which broke main's vetted-ops policy.
"setup-upstream-fix"entry to[callers]in.apache-magpie-overrides/tools/vetted-ops/config.toml. Git merged them cleanly, but the key ends up declared twice. The file then fails to parse withCannot overwrite a value (at line 215), so every vetted op run in this repository fails on its config. This keeps feat(skills): publish changes through vetted-op-git instead of raw git recipes #2228's entry and drops feat(vetted-ops): draft the missing operator-git table, propose it in setup #2230's.tests/test_committed_policy.pyloads the committed policy and checks that every granted operation exists in the op catalogue. It fails on current main and passes with this change.git-*grants. That check belongs to the broader caller-grant check being added separately tosetup reconcile. The step now only proposes the operator's ownoperator-git.tomltable.measured_tokensfor the setup skill is refreshed (themeasurecheck).Test plan
uv run pytestintools/vetted-ops. The new test fails before the policy change and passes after it.ruff check,ruff format --checkskill-token-count --write,skill-surface-hash,check-family-plugins🤖 Generated with Claude Code