Skip to content

feat(vetted-ops): draft the missing operator-git table, propose it in setup - #2230

Merged
potiuk merged 1 commit into
apache:mainfrom
potiuk:feat/vetted-git-personal-overlay
Nov 22, 2026
Merged

potiuk merged 1 commit into
apache:mainfrom
potiuk:feat/vetted-git-personal-overlay

Conversation

@potiuk

@potiuk potiuk commented Nov 22, 2026 •

Copy link
Copy Markdown
Member

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:

  • The refusal drafts the missing table. When vetted-op-git finds no [git] values for the upstream, or no checkouts, the error now includes a ready-to-append ["<upstream>"] table. The table is filled from the current checkout (checkouts, worktree_roots, upstream_remote), and fork is left as <your-github-login>/<name>. The refusal names the file and says only the operator can write it.
  • Setup proposes it, for the secure setup only.
    • setup config Step 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 config Step 3a.3 also lists any shared-policy git-* grants that are missing, for the maintainers to add.
    • setup reconcile item 3b does the same check on later runs. It reports "unchecked" when the sandbox denies the read.
  • setup-upstream-fix gets its git-* 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 pytest in tools/vetted-ops: 749 passed, 27 skipped. The skipped tests can't run in the sandbox; CI runs them.
  • Two new tests check that each refusal includes a table that operator-git.toml accepts.
  • ruff check, ruff format --check
  • check-family-plugins, skill-surface-hash, estimate-skill-tokens --check, check-doc-sync, check-shared-blocks, check-duplication

🤖 Generated with Claude Code

@potiuk
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
potiuk force-pushed the feat/vetted-git-personal-overlay branch from 170d811 to c24ed57 Compare November 22, 2026 10:03
@potiuk potiuk changed the title feat(vetted-ops): a personal git overlay for vetted-op-git, proposed to sandboxed users when missing feat(vetted-ops): draft the missing operator-git table, propose it in setup Nov 22, 2026
@github-actions github-actions Bot added family:setup setup-* skills family:tools tools/* capability:platform Framework / agent substrate skills (install, verify, doctor, override, status, setup bootstrap) substrate:sandbox Tool substrate: agent isolation, egress control, settings audit labels Nov 22, 2026
@potiuk
potiuk merged commit d8d48f1 into apache:main Nov 22, 2026
12 of 13 checks passed
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

capability:platform Framework / agent substrate skills (install, verify, doctor, override, status, setup bootstrap) family:setup setup-* skills family:tools tools/* substrate:sandbox Tool substrate: agent isolation, egress control, settings audit

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant