Share one predicate between isSingleShellCommand and shellApprovalScopes - #403
Merged
TheGreatAxios merged 4 commits intoAug 8, 2026
Conversation
evaluateApprovals, isRequestCoveredByGrant, and hasExactFullCommandGrant each reimplemented the same tool/providerModel/cwd scoping condition independently (src/permission/authz-grants.ts, src/permission/gate.ts), so a scoping-dimension change required editing three sites in lockstep. A fourth copy, matcher.ts's isApproved, was dead in production and only exercised by its own test, and lacked the specificity-ranking behavior evaluateApprovals gets from @intx/authz's evaluateGrants. All three live call sites now delegate to a single exported grantScopeMatches predicate. The dead isApproved matcher and its tests are removed.
…ectly The other two live call sites (evaluateApprovals, isRequestCoveredByGrant) get a direct cross-check against grantScopeMatches; hasExactFullCommandGrant isn't exported, so it only had indirect coverage through evaluate()'s multi-segment replay path elsewhere in the suite. Drive that path directly with grants grantScopeMatches would refuse (wrong cwd, wrong providerModel) to confirm the replay never fires when the shared predicate says no.
Both answered "is this a single shell command, or a chain" by independently combining splitChainedCommand/tokenize, so a segmenting-rule change to one silently didn't reach the other. They disagreed on a comment-trailing command like "echo hi && # why": shellApprovalScopes filtered the comment-only segment before counting (treating it as one command), while gate.ts's isSingleShellCommand did not (treating it as a two-segment chain). isSingleShellCommand now lives in classify.ts, built on the same comment-filtered segment list shellApprovalScopes derives its ladder from, and gate.ts imports it instead of maintaining its own copy.
grantScopeMatches consolidation's sibling PR fixed a live disagreement on comment-trailing chains, but the shared realShellSegments predicate also silently narrows pure-comment input from single-command to not-a-command, and treats a leading-comment-then-chain by its trailing real segment only. Neither was covered by a test, so a future segmenting change could flip either back with nothing catching it.
TheGreatAxios
force-pushed
the
cl-5677-issingleshellcommand-and-shellapprovalscopes-redefine-is
branch
from
August 8, 2026 19:27
be7b1dc to
b7e7388
Compare
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
1 participant
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
isSingleShellCommand(src/permission/gate.ts:37-42, gatingpreApprove) andshellApprovalScopes(src/permission/classify.ts:391-401, gating the interactive approval scope ladder) each independently combinedsplitChainedCommand/tokenizeto answer "is this a single shell command, or a chain." They disagreed on a comment-trailing command likeecho hi && # why:shellApprovalScopesfilters comment-only segments before counting (treats it as one command), whileisSingleShellCommanddid not (treats it as a two-segment chain).isSingleShellCommandis now a single command, both offer the full per-command scope ladder consistently. Exported fromclassify.ts, built on the same comment-filtered segment listshellApprovalScopesderives its ladder from;gate.tsimports it instead of maintaining an independent copy.Test plan
src/permission/permission.test.ts("agrees with the interactive scope ladder on whether a comment-trailing command is single") that failed before the fix, proving the two predicates disagreed onecho hi && # why.bun run typecheckbun run buildbun run test— 4171 pass, 1 pre-existing unrelated failure (src/agent/lsp-availability.test.ts, an environment check fortypescript-language-serveravailability, untouched by this change)