Skip to content

Revert "fix(acp): reject unattended permission requests" - #5323

Merged
wesbillman merged 1 commit into
mainfrom
revert-4609-codex/security-acp-shell-auto-approval
Aug 8, 2026
Merged

Revert "fix(acp): reject unattended permission requests"#5323
wesbillman merged 1 commit into
mainfrom
revert-4609-codex/security-acp-shell-auto-approval

Conversation

@wesbillman

Copy link
Copy Markdown
Collaborator

Reverts #4609

@wesbillman
wesbillman requested a review from a team as a code owner August 8, 2026 15:13
@wolfyy970

Copy link
Copy Markdown

@wesbillman The revert restores agent function, but it also makes bypassPermissions the hidden default again. I put a small signed patch directly on top at bbc6f7572.

It keeps bypassPermissions available as an explicit legacy choice while defaulting to the adapter's per-request path. Buzz still selects allow_once unattended for this emergency, but each grant remains visible to the harness and #5106 can replace that behavior cleanly. Goose receives no unsupported mode override.

The regression drives a real fake adapter through the prompt wire, captures the exact permission response, and proves the turn completes. All 688 ACP tests, strict Clippy, formatting, and the adversarial pass are clean. You can cherry-pick this before merge.

@wesbillman
wesbillman merged commit 6a17d03 into main Aug 8, 2026
33 checks passed
@wesbillman
wesbillman deleted the revert-4609-codex/security-acp-shell-auto-approval branch August 8, 2026 15:43
@wolfyy970

Copy link
Copy Markdown

@wesbillman @wpfleger96 The revert merged before the cherry-pick. I restacked the exact reviewed commit onto the new main as #5325. It is one signed commit, passes the full ACP gate locally, and keeps #5106's policy path open without delaying the recovery.

tlongwell-block pushed a commit that referenced this pull request Aug 8, 2026
…ounting-and-solo

* origin/main:
  chore(release): release Buzz Desktop version 0.5.8 (#5326)
  fix(buzz-agent): recover from 400-shaped image rejections; unbound benchmark agent rounds (#5318)
  Revert "fix(acp): reject unattended permission requests" (#5323)
  feat(desktop): unify add agent flows (#5015)

Co-authored-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
wpfleger96 pushed a commit that referenced this pull request Aug 8, 2026
* origin/main:
  chore(release): release Buzz Desktop version 0.5.8 (#5326)
  fix(buzz-agent): recover from 400-shaped image rejections; unbound benchmark agent rounds (#5318)
  Revert "fix(acp): reject unattended permission requests" (#5323)
  feat(desktop): unify add agent flows (#5015)
  fix(buzz-agent): budget summarizer reasoning separately so it cannot starve the handoff summary (#5248)
  infra: bind development services to loopback (#4871)

Signed-off-by: Duncan <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@buzz.block.builderlab.xyz>

# Conflicts:
#	CHANGELOG.md
wpfleger96 added a commit that referenced this pull request Aug 8, 2026
* origin/main:
  fix(desktop): welcome banner overlap and missing dismiss control (#5330)
  fix(desktop): prevent horizontal clipping in Prompt Context modal (#5324)
  chore(release): release Buzz Relay version 0.2.1 (#2856)
  chore(release): release Buzz Desktop version 0.5.8 (#5326)
  fix(buzz-agent): recover from 400-shaped image rejections; unbound benchmark agent rounds (#5318)
  Revert "fix(acp): reject unattended permission requests" (#5323)
  feat(desktop): unify add agent flows (#5015)
  fix(buzz-agent): budget summarizer reasoning separately so it cannot starve the handoff summary (#5248)
  infra: bind development services to loopback (#4871)
  chore(release): release Buzz Desktop version 0.5.7 (#5252)
  fix(desktop): isolate relay admission tests (#5221)
  fix(desktop): externalize boot <style> to prevent Tauri CSP nonce override (#5242)
  fix(desktop): let imported and recovered identities finish onboarding (#5228)

Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
wpfleger96 added a commit that referenced this pull request Aug 8, 2026
The 74c9200 merge let main's revert-of-#4609 semantics leak into
branch-owned buzz-acp code. Specifically:

- config.rs: BypassPermissions variant reintroduced with no guard in
  PermissionConfig::resolve; test_default_config_uses_bypass_permissions
  asserted effective_mode == DontAsk
- pool.rs: ResolvedPermissionConfig replaced with bare PermissionMode,
  relay_event_publisher/permission_decision_tx stripped, sentinel wiring
  removed from run_prompt_task, doc comments spliced mid-sentence
- acp.rs: test helpers options()/outcome() deleted while call sites
  remained (5 E0425 compile errors); find_allow_once_returns_none_when_absent
  body corrupted with undefined `response` variable
- lib.rs: import regression

Fix: restore all four crates/buzz-acp files to the branch tip (d808c4b)
which correctly supersedes both #4609 and its revert #5323. No semantics
from the revert survive on this branch.

Co-authored-by: Will Pfleger <pfleger.will@gmail.com>
Signed-off-by: Will Pfleger <pfleger.will@gmail.com>
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.

3 participants