Repository navigation
User trustedTools wins over trusted project list; revert #79 union (O55) - #75
Merged
Merged
Conversation
Reverts the trustedTools union from #79. When the user sets trustedTools, that list is used exactly; a trusted project's list applies only when the user left it unset. Untrusted projects' trustedTools stay dropped.
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
QiaolongLi1201
changed the base branch from
fix/o56-untrusted-permissions-v2
to
main
October 11, 2026 07:18
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.
Implements backlog O55. Reverts the union from #79; stacked on O56 PR #70; depends on #69. (Base branch is main, so until #69 and #70 merge the diff also shows their commits; the O55 change is the top commit only.)
Why
#79 changed
trustedToolsfrom user-wins to user ∪ project, so a trusted project could add tools to a narrower list the user set. That conflicts with principle 6 (project files must not loosen approvals).Change
mergeConfigFiles:trustedTools: userConfig.trustedTools ?? projectConfig.trustedTools.trustedToolsdropped (unchanged from fix(o79): harden mutating git against repo filters and merge drivers #79).No changes under
src/safety.Tests
test/o55-user-trustedtools.spec.mjs(adapted from QA reproqa-repro-o55.spec.mjs): 3 cases.8ad654ea, i.e. union):user [read_file] wins over trusted project [read_file, exec]FAIL; other two PASS.test/cli-config-merge.spec.mjs,test/cli-config-untrusted-permissions.spec.mjs(projectpermissions.allowstill unions).npm run verifyon macOS, Node 25.9, allMOSS_*/*_API_KEYunset, pyte layout ran ([tui-layout] 74/74 passed): exit 0. (One earlier run hit a flakytest/git-spawn.spec.mjsfixture assertion; it passed 3/3 in isolation and the rerun was green.)Supersedes #72 (rebased onto b8a4e4b).