Repository navigation
feat(vetted-ops): draft the missing operator-git table, propose it in setup - #2230
Merged
Merged
Conversation
potiuk
enabled auto-merge (squash)
November 22, 2026 09:51
… setup A vetted-op-git refusal for missing [git] values or checkouts now carries a ready-to-append ["<upstream>"] table for operator-git.toml, derived from the current checkout. Setup config (Step 3a.3) and reconcile (3b) propose it when the isolated setup is in use, and never write it. The committed policy grants setup-upstream-fix the git-* operations. Generated-by: Claude Opus 5
potiuk
force-pushed
the
feat/vetted-git-personal-overlay
branch
from
November 22, 2026 10:03
170d811 to
c24ed57
Compare
3 tasks done
potiuk
added a commit
that referenced
this pull request
Nov 22, 2026
…e policy (#2231) #2230 and #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 #2228's entry, drop #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 #2227. That PR moved each operator's
[git]values into~/.config/apache-magpie/vetted-ops/operator-git.toml. This PR makes it easier for an operator who hasn't set that file up yet:vetted-op-gitfinds no[git]values for the upstream, or nocheckouts, the error now includes a ready-to-append["<upstream>"]table. The table is filled from the current checkout (checkouts,worktree_roots,upstream_remote), andforkis left as<your-github-login>/<name>. The refusal names the file and says only the operator can write it.setup configStep 3a.3 runs only when the isolated setup is in use and a publishing skill is installed. It shows the drafted table for the operator to append. Setup never writes the file.setup configStep 3a.3 also lists any shared-policygit-*grants that are missing, for the maintainers to add.setup reconcileitem 3b does the same check on later runs. It reports "unchecked" when the sandbox denies the read.setup-upstream-fixgets itsgit-*grants in this repository's committed policy: worktree add/sync/remove, fetch, stage, commit, push-branch and pr-create. Each operator's own values still come from their operator file.The earlier personal-overlay approach in this branch is dropped: #2227 covers it.
Test plan
uv run pytestintools/vetted-ops: 749 passed, 27 skipped. The skipped tests can't run in the sandbox; CI runs them.operator-git.tomlaccepts.ruff check,ruff format --checkcheck-family-plugins,skill-surface-hash,estimate-skill-tokens --check,check-doc-sync,check-shared-blocks,check-duplication🤖 Generated with Claude Code