Merge pull request #11 from sky-xo/fix/sandbox-flag-parsing

fix(spawn): correct --sandbox flag parsing for Gemini

Author: sky-xo

README.md

@@ -54,9 +54,9 @@ Names always include a unique 4-character suffix. The `--name` flag sets a prefi
 | Flag | Description |
 |------|-------------|
 | `--name` | Custom prefix for agent name |
-| `--sandbox` | Sandbox mode: `full` (default), `permissive`, or `none`/`read-only` |
+| `--sandbox` | Enable sandbox. Codex: `--sandbox` (defaults to `workspace-write`) or `--sandbox=VALUE` where VALUE is `read-only`, `workspace-write`, or `danger-full-access`. Gemini: `--sandbox` only (no value accepted) |
 | `--model` | Model to use (Codex: `o3`, `o4-mini`; Gemini: `gemini-2.5-pro`, etc.) |
-| `--yolo` | Auto-approve all tool calls (use with caution) |
+| `--yolo` | Auto-approve all tool calls (Gemini only) |
 
 Agent state is stored in `~/.june/june.db`.
 

TODO.md

@@ -7,3 +7,7 @@
 - [ ] Create a consistent color palette for the UI (centralize colors used for borders, indicators, etc.)
 - [ ] Character-level diff highlighting within changed lines (show specific changes, not just whole line)
 - [ ] Full-width background - extend red/green background to right edge of panel
+
+# Bugs
+
+- [ ] Diffs don't currently show the entire diff

internal/cli/spawn.go

@@ -50,12 +50,15 @@ Examples:
 			case "codex":
 				// For Codex, if --sandbox was passed without value, default to workspace-write
 				codexSandbox := sandbox
-				if cmd.Flags().Changed("sandbox") && sandbox == "" {
+				if sandbox == "true" {
 					codexSandbox = "workspace-write"
 				}
 				return runSpawnCodex(name, task, model, reasoningEffort, codexSandbox, maxTokens)
 			case "gemini":
-				// For Gemini, sandbox is boolean - true if flag was passed at all
+				// Gemini sandbox is boolean-only, reject explicit values
+				if sandbox != "" && sandbox != "true" {
+					return fmt.Errorf("Gemini --sandbox does not accept values, use --sandbox without a value")
+				}
 				geminiSandbox := cmd.Flags().Changed("sandbox")
 				return runSpawnGemini(name, task, model, yolo, geminiSandbox)
 			default:
@@ -68,7 +71,7 @@ Examples:
 	cmd.Flags().StringVar(&name, "name", "", "Name prefix for the agent (auto-generated if omitted)")
 	cmd.Flags().StringVar(&model, "model", "", "Model to use")
 	cmd.Flags().StringVar(&sandbox, "sandbox", "", "Enable sandbox (Codex: optional value read-only|workspace-write|danger-full-access, defaults to workspace-write; Gemini: boolean)")
-	cmd.Flags().Lookup("sandbox").NoOptDefVal = "" // Allow --sandbox without value
+	cmd.Flags().Lookup("sandbox").NoOptDefVal = "true" // Allow --sandbox without value
 
 	// Codex-specific flags
 	cmd.Flags().StringVar(&reasoningEffort, "reasoning-effort", "", "Reasoning effort (codex only)")

internal/cli/spawn_test.go

@@ -183,13 +183,14 @@ func TestSpawnCmdFlagDefaults(t *testing.T) {
 
 func TestSpawnCmdFlagParsing(t *testing.T) {
 	tests := []struct {
-		name    string
-		args    []string
-		wantErr bool
+		name          string
+		args          []string
+		wantErr       bool
+		runValidation bool // if true, let RunE execute to test validation logic
 	}{
 		{
 			name:    "valid args with all flags",
-			args:    []string{"codex", "task", "--name", "test", "--model", "o3", "--reasoning-effort", "high", "--max-tokens", "4096", "--sandbox", "read-only"},
+			args:    []string{"codex", "task", "--name", "test", "--model", "o3", "--reasoning-effort", "high", "--max-tokens", "4096", "--sandbox=read-only"},
 			wantErr: false,
 		},
 		{
@@ -212,14 +213,34 @@ func TestSpawnCmdFlagParsing(t *testing.T) {
 			args:    []string{"--name", "test"},
 			wantErr: true,
 		},
+		{
+			name:    "sandbox without value followed by name flag",
+			args:    []string{"codex", "task", "--sandbox", "--name", "test"},
+			wantErr: false,
+		},
+		{
+			name:    "gemini sandbox with name flag",
+			args:    []string{"gemini", "task", "--sandbox", "--name", "test"},
+			wantErr: false,
+		},
+		{
+			name:          "gemini sandbox with explicit value errors",
+			args:          []string{"gemini", "task", "--sandbox=read-only"},
+			wantErr:       true,
+			runValidation: true,
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			cmd := newSpawnCmd()
 			cmd.SetArgs(tt.args)
-			// Disable RunE to avoid actual execution
-			cmd.RunE = func(c *cobra.Command, args []string) error { return nil }
+
+			// For tests that check validation errors, let RunE execute.
+			// For others, disable to avoid actually spawning agents.
+			if !tt.runValidation {
+				cmd.RunE = func(c *cobra.Command, args []string) error { return nil }
+			}
 
 			err := cmd.Execute()
 			if (err != nil) != tt.wantErr {