Add Qwen Code support

Author: akcorca

AGENTS.md

@@ -9,7 +9,7 @@ Read these first:
 Current architecture:
 
 - `sah` is a Go CLI that authenticates against `https://sah.borca.ai`, stores the contributor API key locally, and polls `/s@h/*` endpoints.
-- The CLI never hands the contributor API key to Codex CLI, Gemini CLI, or Claude Code. It fetches assignments itself, runs the local agent CLI in an empty working directory, captures stdout, and submits the parsed JSON payload itself.
+- The CLI never hands the contributor API key to Codex CLI, Gemini CLI, Claude Code, or Qwen Code. It fetches assignments itself, runs the local agent CLI in an empty working directory, captures stdout, and submits the parsed JSON payload itself.
 - Foreground mode uses `sah run`. Daemon mode uses a per-user macOS `launchd` agent installed by `sah daemon install`.
 
 Note: `CLAUDE.md` is a symlink to `AGENTS.md`.

README.md

@@ -29,7 +29,7 @@ For always-on background work:
 sah daemon install
 ```
 
-`sah daemon install` installs and starts the per-user `launchd` agent immediately. It captures the current shell `PATH`, `HOME`, and the absolute paths of installed agent binaries, then runs from `~/Library/Application Support/sah` instead of your home directory. Re-run it after moving `codex`, `gemini`, or `claude`.
+`sah daemon install` installs and starts the per-user `launchd` agent immediately. It captures the current shell `PATH`, `HOME`, and the absolute paths of installed agent binaries, then runs from `~/Library/Application Support/sah` instead of your home directory. Re-run it after moving `codex`, `gemini`, `claude`, or `qwen`.
 
 ## Documentation
 

cmd/sah/main.go

@@ -72,8 +72,8 @@ Commands:
 Examples:
   sah auth login
   sah run --rotate-installed
-  sah run --agents codex,gemini,claude --models codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet
-  sah daemon install --agents codex,claude --interval 30m
+  sah run --agents codex,gemini,claude,qwen --models codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet
+  sah daemon install --agents codex,claude,qwen --interval 30m
   sah me
 `)
 }
@@ -169,11 +169,11 @@ func authCmd(args []string) error {
 func runCmd(args []string) error {
 	fs := flag.NewFlagSet("run", flag.ContinueOnError)
 	fs.SetOutput(os.Stderr)
-	agent := fs.String("agent", "", "Agent CLI to use: codex, gemini, claude")
-	agents := fs.String("agents", "", "Comma-separated round-robin agent order, e.g. codex,gemini,claude")
+	agent := fs.String("agent", "", "Agent CLI to use: codex, gemini, claude, qwen")
+	agents := fs.String("agents", "", "Comma-separated round-robin agent order, e.g. codex,gemini,claude,qwen")
 	rotateInstalled := fs.Bool("rotate-installed", false, "Rotate through every supported agent CLI installed on this Mac")
 	model := fs.String("model", "", "Optional model override passed to the agent CLI")
-	models := fs.String("models", "", "Per-agent model overrides, e.g. codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet")
+	models := fs.String("models", "", "Per-agent model overrides, e.g. codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet,qwen=<name>")
 	interval := fs.String("interval", "", "Polling interval")
 	timeout := fs.String("timeout", "", "Per-assignment agent timeout")
 	taskType := fs.String("task-type", "", "Optional task type filter")
@@ -351,7 +351,7 @@ func parseDaemonInstallOptions(args []string) (daemonInstallOptions, error) {
 	fs.StringVar(&options.agents, "agents", "", "Comma-separated round-robin agent order for the daemon")
 	fs.BoolVar(&options.rotateInstalled, "rotate-installed", false, "Rotate through every installed supported agent CLI")
 	fs.StringVar(&options.model, "model", "", "Default model override")
-	fs.StringVar(&options.models, "models", "", "Per-agent model overrides, e.g. codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet")
+	fs.StringVar(&options.models, "models", "", "Per-agent model overrides, e.g. codex=gpt-5.4-mini,gemini=gemini-3-flash-base,claude=sonnet,qwen=<name>")
 	fs.StringVar(&options.interval, "interval", "", "Default polling interval")
 	fs.StringVar(&options.timeout, "timeout", "", "Default per-assignment timeout")
 	fs.StringVar(&options.baseURL, "base-url", "", "SCIENCE@home base URL")

docs/architecture.md

@@ -19,7 +19,7 @@ The browser never receives the raw contributor API key. The local CLI proves pos
 - `sah` calls `GET /s@h/tasks` with `X-API-Key`.
 - The assignment response can include a protocol version plus `_links.submit` and `_links.release`, and the same submit/release relations can also be exposed through the HTTP `Link` header.
 - It builds a task-only prompt from the returned assignment payload and instructions.
-- It runs one of the supported local agent CLIs: `codex`, `gemini`, or `claude`.
+- It runs one of the supported local agent CLIs: `codex`, `gemini`, `claude`, or `qwen`.
 - The agent receives no API key and runs in an empty temporary working directory.
 - The CLI parses the agent stdout as JSON and follows the assignment-scoped submit link when present, falling back to the legacy contribution endpoint when it is not.
 - If the local agent aborts or fails before submission, `sah` releases the assignment immediately so the API key does not stay pinned at the open-assignment limit until expiry.

docs/build.md

@@ -23,7 +23,7 @@ go build -o bin/sah ./cmd/sah
 For release builds, inject the version via `ldflags`.
 
 ```sh
-go build -trimpath -ldflags="-s -w -X main.version=v0.3.0" -o bin/sah ./cmd/sah
+go build -trimpath -ldflags="-s -w -X main.version=v0.4.0" -o bin/sah ./cmd/sah
 ```
 
 ## Run
@@ -39,7 +39,7 @@ sah daemon install
 
 `sah daemon install` both installs and starts the `launchd` agent. Use `sah daemon start` only after a manual `stop` or after logging back into macOS.
 
-If the daemon cannot find `codex`, `gemini`, or `claude`, re-run `sah daemon install` from a shell where that agent is already on `PATH`. The install command captures the current shell environment for `launchd`, stores absolute agent binary paths, and runs the daemon from `~/Library/Application Support/sah` instead of `HOME`.
+If the daemon cannot find `codex`, `gemini`, `claude`, or `qwen`, re-run `sah daemon install` from a shell where that agent is already on `PATH`. The install command captures the current shell environment for `launchd`, stores absolute agent binary paths, and runs the daemon from `~/Library/Application Support/sah` instead of `HOME`.
 
 ## Test
 
@@ -75,8 +75,8 @@ The hook runs:
 Pushing a `v*` tag triggers GitHub Actions (`.github/workflows/release.yml`), which runs GoReleaser. It builds macOS binaries, creates archives with checksums, publishes a GitHub Release, and updates the Homebrew tap.
 
 ```sh
-git tag v0.3.0
-git push origin v0.3.0
+git tag v0.4.0
+git push origin v0.4.0
 ```
 
 Required repository secrets:

internal/sah/agent_selection.go

@@ -144,7 +144,8 @@ func MergeAgentModels(base map[string]string, overrides map[string]string) map[s
 // --model is supplied. Keep these in sync with what each upstream CLI actually
 // accepts today: Gemini CLI 0.37.x only exposes `gemini-3-flash-base` (and
 // friends) -- `gemini3-flash` / `gemini-3-flash` are NOT valid ids and cause
-// ModelNotFoundError.
+// ModelNotFoundError. Qwen is intentionally omitted so Qwen Code can use the
+// current default model resolved by the user's local auth/provider config.
 var DefaultAgentModels = map[string]string{
 	"codex":  "gpt-5.4-mini",
 	"gemini": "gemini-3-flash-base",

internal/sah/agent_selection_test.go

@@ -3,18 +3,18 @@ package sah
 import "testing"
 
 func TestParseAgentList(t *testing.T) {
-	list := ParseAgentList("codex, gemini ,claude,codex")
-	if len(list) != 3 || list[0] != "codex" || list[1] != "gemini" || list[2] != "claude" {
+	list := ParseAgentList("codex, gemini ,claude,qwen,codex")
+	if len(list) != 4 || list[0] != "codex" || list[1] != "gemini" || list[2] != "claude" || list[3] != "qwen" {
 		t.Fatalf("unexpected list: %#v", list)
 	}
 }
 
 func TestParseAgentModels(t *testing.T) {
-	models, err := ParseAgentModels("codex=gpt-5.4-mini, gemini=gemini-3-flash-base, claude=sonnet")
+	models, err := ParseAgentModels("codex=gpt-5.4-mini, gemini=gemini-3-flash-base, claude=sonnet, qwen=coder-model")
 	if err != nil {
 		t.Fatalf("ParseAgentModels returned error: %v", err)
 	}
-	if models["codex"] != "gpt-5.4-mini" || models["gemini"] != "gemini-3-flash-base" || models["claude"] != "sonnet" {
+	if models["codex"] != "gpt-5.4-mini" || models["gemini"] != "gemini-3-flash-base" || models["claude"] != "sonnet" || models["qwen"] != "coder-model" {
 		t.Fatalf("unexpected models: %#v", models)
 	}
 }
@@ -45,3 +45,10 @@ func TestModelForAgentUsesBuiltinDefaults(t *testing.T) {
 		}
 	}
 }
+
+func TestModelForAgentLeavesQwenUnsetWithoutOverrides(t *testing.T) {
+	model := ModelForAgent("qwen", "", nil)
+	if model != "" {
+		t.Fatalf("expected qwen to use upstream default model, got %q", model)
+	}
+}

internal/sah/runner.go

@@ -51,6 +51,7 @@ var SupportedAgents = []AgentSpec{
 	{Name: "codex", Binary: "codex", Description: "OpenAI Codex CLI"},
 	{Name: "gemini", Binary: "gemini", Description: "Google Gemini CLI"},
 	{Name: "claude", Binary: "claude", Description: "Anthropic Claude Code"},
+	{Name: "qwen", Binary: "qwen", Description: "Qwen Code CLI"},
 }
 
 func InstalledAgents() []AgentStatus {
@@ -253,6 +254,13 @@ func buildAgentCommand(
 			"--no-session-persistence",
 			prompt,
 		}
+	case "qwen":
+		args = []string{
+			"--prompt", prompt,
+			"--sandbox",
+			"--approval-mode", "plan",
+			"--output-format", "stream-json",
+		}
 	default:
 		return nil, false, fmt.Errorf("unsupported agent %q", agent.Name)
 	}
@@ -307,6 +315,8 @@ func parseStructuredOutput(agentName string, raw string) (*structuredAgentOutput
 		return parseGeminiStructuredOutput(raw)
 	case "claude":
 		return parseClaudeStructuredOutput(raw)
+	case "qwen":
+		return parseQwenStructuredOutput(raw)
 	default:
 		return nil, fmt.Errorf("unsupported agent %q", agentName)
 	}
@@ -369,29 +379,52 @@ func parseGeminiStructuredOutput(raw string) (*structuredAgentOutput, error) {
 }
 
 func parseClaudeStructuredOutput(raw string) (*structuredAgentOutput, error) {
+	return parseAssistantResultStructuredOutput(raw, parseClaudeUsage)
+}
+
+func parseQwenStructuredOutput(raw string) (*structuredAgentOutput, error) {
+	return parseAssistantResultStructuredOutput(raw, parseQwenUsage)
+}
+
+func parseAssistantResultStructuredOutput(
+	raw string,
+	parseUsage func(map[string]any) TokenUsage,
+) (*structuredAgentOutput, error) {
 	output := &structuredAgentOutput{}
+	var assistantText strings.Builder
 
 	if err := parseJSONLines(raw, func(event map[string]any) {
 		switch stringValue(event["type"]) {
 		case "assistant":
 			message := mapValue(event["message"])
 			content := arrayValue(message["content"])
 			for _, item := range content {
-				text := strings.TrimSpace(stringValue(mapValue(item)["text"]))
+				block := mapValue(item)
+				if stringValue(block["type"]) != "text" {
+					continue
+				}
+				text := strings.TrimSpace(stringValue(block["text"]))
 				if text != "" {
-					output.Text = text
+					if assistantText.Len() > 0 {
+						assistantText.WriteString("\n")
+					}
+					assistantText.WriteString(text)
 				}
 			}
 		case "result":
-			output.Usage = parseClaudeUsage(mapValue(event["usage"]))
+			output.Usage = parseUsage(mapValue(event["usage"]))
 			if boolValue(event["is_error"]) && output.AgentError == "" {
 				output.AgentError = strings.TrimSpace(stringValue(event["result"]))
+				if output.AgentError == "" {
+					output.AgentError = strings.TrimSpace(stringValue(event["subtype"]))
+				}
 			}
 		}
 	}); err != nil {
 		return nil, err
 	}
 
+	output.Text = strings.TrimSpace(assistantText.String())
 	return output, nil
 }
 
@@ -446,6 +479,20 @@ func parseClaudeUsage(usage map[string]any) TokenUsage {
 	}
 }
 
+func parseQwenUsage(usage map[string]any) TokenUsage {
+	total := int64Value(usage["total_tokens"])
+	if total == 0 {
+		total = int64Value(usage["input_tokens"]) + int64Value(usage["output_tokens"])
+	}
+	return TokenUsage{
+		Available:    len(usage) > 0,
+		InputTokens:  int64Value(usage["input_tokens"]),
+		OutputTokens: int64Value(usage["output_tokens"]),
+		CachedTokens: int64Value(usage["cache_read_input_tokens"]),
+		TotalTokens:  total,
+	}
+}
+
 func mapValue(value any) map[string]any {
 	if mapped, ok := value.(map[string]any); ok {
 		return mapped

internal/sah/runner_test.go

@@ -57,6 +57,22 @@ func TestParseClaudeStructuredOutput(t *testing.T) {
 	}
 }
 
+func TestParseQwenStructuredOutput(t *testing.T) {
+	raw := `{"type":"assistant","message":{"content":[{"type":"thinking","thinking":"internal"},{"type":"text","text":"{\"ok\":true}"}]}}
+{"type":"result","subtype":"success","is_error":false,"usage":{"input_tokens":21,"cache_read_input_tokens":4,"output_tokens":6,"total_tokens":27}}`
+
+	output, err := parseQwenStructuredOutput(raw)
+	if err != nil {
+		t.Fatalf("parseQwenStructuredOutput returned error: %v", err)
+	}
+	if output.Text != `{"ok":true}` {
+		t.Fatalf("unexpected text: %q", output.Text)
+	}
+	if output.Usage.InputTokens != 21 || output.Usage.OutputTokens != 6 || output.Usage.CachedTokens != 4 || output.Usage.TotalTokens != 27 {
+		t.Fatalf("unexpected usage: %#v", output.Usage)
+	}
+}
+
 func TestResolveAgentBinaryPathUsesConfiguredPath(t *testing.T) {
 	t.Setenv("PATH", "")
 
@@ -122,3 +138,36 @@ func TestBuildAgentCommandForClaudeAvoidsBareAuthMode(t *testing.T) {
 		t.Fatalf("expected claude args to include --disable-slash-commands, got %q", args)
 	}
 }
+
+func TestBuildAgentCommandForQwenUsesHeadlessPlanMode(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "qwen")
+	if err := os.WriteFile(path, []byte("#!/bin/sh\nexit 0\n"), 0o755); err != nil {
+		t.Fatalf("write executable: %v", err)
+	}
+
+	command, useStdin, err := buildAgentCommand(
+		context.Background(),
+		AgentSpec{Name: "qwen", Binary: "qwen"},
+		"",
+		t.TempDir(),
+		`{"ok":true}`,
+		map[string]string{"qwen": path},
+	)
+	if err != nil {
+		t.Fatalf("buildAgentCommand returned error: %v", err)
+	}
+	if useStdin {
+		t.Fatal("expected qwen prompt to be passed as an argument")
+	}
+
+	args := strings.Join(command.Args[1:], " ")
+	if !strings.Contains(args, "--output-format stream-json") {
+		t.Fatalf("expected qwen args to include stream-json output, got %q", args)
+	}
+	if !strings.Contains(args, "--approval-mode plan") {
+		t.Fatalf("expected qwen args to include plan mode, got %q", args)
+	}
+	if !strings.Contains(args, "--sandbox") {
+		t.Fatalf("expected qwen args to enable sandboxing, got %q", args)
+	}
+}