mirror of
https://github.com/anthropics/claude-code-action.git
synced 2026-01-23 06:54:13 +08:00
fix: parse multiple --allowed-tools values correctly
The parseAllowedTools() function was using regex matching which only captured the first occurrence of --allowed-tools. This caused issues when users specified multiple space-separated quoted tools like: --allowed-tools "Bash(git log:*)" "Bash(git diff:*)" "Bash(gh pr:*)" The fix uses shell-quote library (same as parse-sdk-options.ts) to properly tokenize arguments. This handles: - Multiple space-separated quoted tools after a single --allowed-tools - Multiple --allowedTools flags in the same string - Mix of comma-separated and space-separated tools - Glob patterns (which shell-quote returns as objects) Fixes #746 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Ashwin Bhat <ashwin-ant@users.noreply.github.com>
This commit is contained in:
@@ -37,8 +37,9 @@ describe("parseAllowedTools", () => {
|
||||
|
||||
test("handles duplicate --allowedTools flags", () => {
|
||||
const args = "--allowedTools --allowedTools mcp__github__*";
|
||||
// Should not match the first one since the value is another flag
|
||||
expect(parseAllowedTools(args)).toEqual([]);
|
||||
// Should skip the first one since the value is another flag
|
||||
// and parse the second one correctly
|
||||
expect(parseAllowedTools(args)).toEqual(["mcp__github__*"]);
|
||||
});
|
||||
|
||||
test("handles typo --alloedTools", () => {
|
||||
@@ -84,4 +85,50 @@ describe("parseAllowedTools", () => {
|
||||
"mcp__github_comment__*",
|
||||
]);
|
||||
});
|
||||
|
||||
test("parses multiple space-separated quoted tools (issue #746)", () => {
|
||||
// This is the exact format from the bug report
|
||||
const args =
|
||||
'--allowed-tools "Bash(git log:*)" "Bash(git diff:*)" "Bash(git fetch:*)" "Bash(gh pr:*)"';
|
||||
expect(parseAllowedTools(args)).toEqual([
|
||||
"Bash(git log:*)",
|
||||
"Bash(git diff:*)",
|
||||
"Bash(git fetch:*)",
|
||||
"Bash(gh pr:*)",
|
||||
]);
|
||||
});
|
||||
|
||||
test("parses multiple --allowedTools flags with different tools", () => {
|
||||
const args =
|
||||
'--allowedTools "Edit,Read" --model "claude-3" --allowedTools "Bash(npm install)"';
|
||||
expect(parseAllowedTools(args)).toEqual([
|
||||
"Edit",
|
||||
"Read",
|
||||
"Bash(npm install)",
|
||||
]);
|
||||
});
|
||||
|
||||
test("parses mix of comma-separated and space-separated tools", () => {
|
||||
const args =
|
||||
'--allowed-tools "Bash(git log:*),Bash(git diff:*)" "Bash(git fetch:*)"';
|
||||
expect(parseAllowedTools(args)).toEqual([
|
||||
"Bash(git log:*)",
|
||||
"Bash(git diff:*)",
|
||||
"Bash(git fetch:*)",
|
||||
]);
|
||||
});
|
||||
|
||||
test("handles complex workflow example from issue #746", () => {
|
||||
const args =
|
||||
'--allowed-tools "Bash(git log:*)" "Bash(git diff:*)" "Bash(git fetch:*)" "Bash(git reflog:*)" "Bash(git merge-tree:*)" "Bash(gh pr:*)" "Bash(gh api:*)"';
|
||||
expect(parseAllowedTools(args)).toEqual([
|
||||
"Bash(git log:*)",
|
||||
"Bash(git diff:*)",
|
||||
"Bash(git fetch:*)",
|
||||
"Bash(git reflog:*)",
|
||||
"Bash(git merge-tree:*)",
|
||||
"Bash(gh pr:*)",
|
||||
"Bash(gh api:*)",
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user