Consolidate grant tool/providerModel/cwd scoping into one predicate - #402
Merged
TheGreatAxios merged 2 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.
TheGreatAxios
force-pushed
the
cl-5676-grant-scoping-filter-is-duplicated-across-three-matchers-one
branch
from
August 8, 2026 19:27
0819b25 to
028c438
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
grantScopeMatchespredicate (src/permission/authz-grants.ts) covering tool/providerModel/cwd scoping, reusing the existingcwdMatchesGranthelper for the cwd dimensionevaluateApprovals,isRequestCoveredByGrant(src/permission/gate.ts), andhasExactFullCommandGrant(src/permission/gate.ts) now delegate to it instead of each reimplementing the conditionisApprovedmatcher (src/permission/matcher.ts) and its dedicated tests, which lacked the specificity-ranking behavior the live path hasTest plan
bun run typecheckbun run buildbun run test(4189 pass, 0 fail)