Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions internal/llmadapters/subprocess.go
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ func (a *SubprocessAdapter) buildArgsForSession(req Request, scratch string, res
args := []string{
"--bg",
"--tools", tools,
"--permission-mode", "acceptEdits",
"--permission-mode", "auto",
"--add-dir", scratch,
}
if workspace := req.ReviewerWorkspace; workspace != nil {
Expand Down Expand Up @@ -708,9 +708,13 @@ func (a *SubprocessAdapter) validateArgs(args []string, scratch string, req Requ
if req.ReviewerWorkspace != nil {
requiredTools = "Read,Write,Bash"
}
requiredPermissionMode := "acceptEdits"
if containsFlag(checkedArgs, "--bg") {
requiredPermissionMode = "auto"
}
required := map[string]string{
"--tools": requiredTools,
"--permission-mode": "acceptEdits",
"--permission-mode": requiredPermissionMode,
}
for flag, value := range required {
got, ok := flagValueOK(checkedArgs, flag)
Expand Down
24 changes: 14 additions & 10 deletions internal/llmadapters/subprocess_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestSubprocessClaudeBackgroundLaunchSafety(t *testing.T) {
t.Fatalf("args = %#v, want --bg", record.AdapterArgs)
}
assertFlagValue(t, record.AdapterArgs, "--tools", "Read,Write")
assertFlagValue(t, record.AdapterArgs, "--permission-mode", "acceptEdits")
assertFlagValue(t, record.AdapterArgs, "--permission-mode", "auto")
assertFlagValue(t, record.AdapterArgs, "--model", "claude-sonnet-4-6")
assertFlagValue(t, record.AdapterArgs, "--effort", "high")
if containsFlag(record.AdapterArgs, "--settings") {
Expand Down Expand Up @@ -191,6 +191,7 @@ func TestSubprocessClaudeBackgroundResume(t *testing.T) {
assertFlagValue(t, record.AdapterArgs, "--resume", "prior-session")
assertFlagValue(t, record.AdapterArgs, "--model", "claude-sonnet-4-6")
assertFlagValue(t, record.AdapterArgs, "--effort", "high")
assertFlagValue(t, record.AdapterArgs, "--permission-mode", "auto")
if record.StdinBytes != 0 {
t.Fatalf("stdin bytes = %d, want empty stdin for resumed Claude bg prompt", record.StdinBytes)
}
Expand Down Expand Up @@ -2003,22 +2004,25 @@ func TestClaudeTransportXORValidation(t *testing.T) {
adapter := NewClaudeCLIAdapter(SubprocessOptions{})
base := []string{
"--tools", "Read,Write",
"--permission-mode", "acceptEdits",
"--add-dir", scratch,
"--", "positional prompt",
}
cases := []struct {
name string
prefix []string
wantErr bool
name string
prefix []string
permissionMode string
wantErr bool
}{
{"bg only", []string{"--bg"}, false},
{"foreground only", []string{"-p", "--output-format", "json"}, false},
{"both transports", []string{"--bg", "-p", "--output-format", "json"}, true},
{"neither transport", nil, true},
{"bg only", []string{"--bg"}, "auto", false},
{"foreground only", []string{"-p", "--output-format", "json"}, "acceptEdits", false},
{"acceptEdits with bg", []string{"--bg"}, "acceptEdits", true},
{"auto with foreground", []string{"-p", "--output-format", "json"}, "auto", true},
{"both transports", []string{"--bg", "-p", "--output-format", "json"}, "auto", true},
{"neither transport", nil, "acceptEdits", true},
}
for _, tc := range cases {
args := append(append([]string(nil), tc.prefix...), base...)
args := append(append([]string(nil), tc.prefix...), "--permission-mode", tc.permissionMode)
args = append(args, base...)
err := adapter.validateArgs(args, scratch, Request{})
if tc.wantErr && !errors.Is(err, ErrUnsafeSubprocessConfig) {
t.Fatalf("%s: err = %v, want ErrUnsafeSubprocessConfig", tc.name, err)
Expand Down
Loading