feat: Add Qwen CLI provider support and merge upstream by dome · Pull Request #1750 · sipeed/picoclaw

dome · 2026-03-18T14:43:57Z

📝 Description

🗣️ Type of Change

🐞 Bug fix (non-breaking change which fixes an issue)
✨ New feature (non-breaking change which adds functionality)
📖 Documentation update
⚡ Code refactoring (no functional changes, no api changes)

🤖 AI Code Generation

🤖 Fully AI-generated (100% AI, 0% Human)
🛠️ Mostly AI-generated (AI draft, Human verified/modified)
👨‍💻 Mostly Human-written (Human lead, AI assisted or none)

🔗 Related Issue

📚 Technical Context (Skip for Docs)

Reference URL:
Reasoning:

🧪 Test Environment

Hardware:
OS:
Model/Provider:
Channels:

📸 Evidence (Optional)

Click to view Logs/Screenshots

☑️ Checklist

My code/docs follow the style of this project.
I have performed a self-review of my own changes.
I have updated the documentation accordingly.

Add support for Qwen Code CLI (qwen) as a new LLM provider. This enables users to use the qwen CLI tool as a provider, similar to the existing claude-cli and codex-cli providers. Changes: - Add QwenCliProvider implementation with JSON event parsing - Add comprehensive unit tests (32 test cases) - Register qwen-cli protocol in factory_provider.go - Add providerTypeQwenCLI in factory.go - Add qwen-code to default model list in defaults.go

CLAassistant · 2026-03-18T14:44:05Z

All committers have signed the CLA.

Copilot

Pull request overview

Adds a new local qwen CLI–backed provider to the PicoClaw providers layer, enabling qwen-cli/... models to be selected via config and used like other CLI providers.

Changes:

Introduces QwenCliProvider that runs the qwen CLI as a subprocess and parses JSON event output into LLMResponse.
Extends provider factories to recognize qwen-cli protocol / qwen-code provider selection.
Adds a default qwen-code model entry and comprehensive unit tests for the new provider.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
pkg/providers/qwen_cli_provider.go	Implements the Qwen CLI provider, prompt building, and JSON event parsing.
pkg/providers/qwen_cli_provider_test.go	Adds unit tests for CLI execution behavior, prompt building, JSON parsing, and config factory integration.
pkg/providers/factory.go	Allows selecting Qwen CLI via `agents.defaults.provider` values.
pkg/providers/factory_provider.go	Adds `qwen-cli` protocol handling in `CreateProviderFromConfig`.
pkg/config/defaults.go	Adds a default `qwen-code` model entry using `qwen-cli/qwen-code`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

pkg/providers/qwen_cli_provider.go

+				}
+			}
+		case "error":
+			lastError = event.Error.Message


pkg/providers/qwen_cli_provider.go

+		if ctx.Err() == context.Canceled {
+			return nil, ctx.Err()


pkg/providers/qwen_cli_provider_test.go

+	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	defer cancel()
+
+	start := time.Now()
+	_, err := p.Chat(ctx, []Message{
+		{Role: "user", Content: "Hello"},
+	}, nil, "", nil)
+	elapsed := time.Since(start)
+
+	if err == nil {
+		t.Fatal("Chat() expected error on context cancellation")
+	}
+	// Should fail well before the full 2s sleep completes
+	if elapsed > 3*time.Second {
+		t.Errorf("Chat() took %v, expected to fail faster via context cancellation", elapsed)
+	}


pkg/providers/factory.go

+		case "qwen-cli", "qwen-code", "qwencode":
+			workspace := cfg.WorkspacePath()
+			if workspace == "" {
+				workspace = "."
+			}
+			sel.providerType = providerTypeQwenCLI
+			sel.workspace = workspace
+			return sel, nil


Copilot

Pull request overview

Adds a new local Qwen CLI-backed LLM provider to PicoClaw, integrates it into provider factories, and ships a default model_list entry so it can be selected via config.

Changes:

Introduce QwenCliProvider that shells out to qwen and parses its JSON event output.
Extend provider factory logic to recognize qwen-cli protocol / provider selection paths.
Add qwen-code default model entry (qwen-cli/qwen-code) in config defaults, plus comprehensive unit tests for the new provider.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
pkg/providers/qwen_cli_provider.go	New CLI-based provider implementation and JSON event parsing.
pkg/providers/qwen_cli_provider_test.go	Unit/integration-style tests for prompt building, JSON parsing, and factory integration.
pkg/providers/factory.go	Adds provider selection routing for `qwen-cli` / aliases in legacy selection logic.
pkg/providers/factory_provider.go	Adds `qwen-cli` protocol support to `CreateProviderFromConfig`.
pkg/config/defaults.go	Adds a default `qwen-code` model entry using the new `qwen-cli` provider.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-21T17:47:08Z

pkg/providers/qwen_cli_provider.go

+				usage = &UsageInfo{
+					PromptTokens:     event.Usage.InputTokens,
+					CompletionTokens: event.Usage.OutputTokens,
+					TotalTokens:      event.Usage.TotalTokens,


In usage parsing, TotalTokens is set directly from event.Usage.TotalTokens, but qwenUsage marks total_tokens as optional (omitempty). If total_tokens is omitted (or zero), this reports TotalTokens as 0 even when input/output tokens are present. Consider computing TotalTokens as InputTokens+OutputTokens when TotalTokens is 0 (and optionally only populating UsageInfo when tokens are non-zero) to match how other providers report usage.

Suggested change

usage = &UsageInfo{

PromptTokens: event.Usage.InputTokens,

CompletionTokens: event.Usage.OutputTokens,

TotalTokens: event.Usage.TotalTokens,

promptTokens := event.Usage.InputTokens

completionTokens := event.Usage.OutputTokens

totalTokens := event.Usage.TotalTokens

if totalTokens == 0 && (promptTokens > 0 || completionTokens > 0) {

totalTokens = promptTokens + completionTokens

}

usage = &UsageInfo{

PromptTokens: promptTokens,

CompletionTokens: completionTokens,

TotalTokens: totalTokens,

Copilot · 2026-03-21T17:47:08Z

pkg/providers/qwen_cli_provider.go

+				}
+			}
+		case "error":
+			lastError = event.Error.Message


case "error": lastError = event.Error.Message can panic when the CLI emits an "error" event without an error object (i.e., event.Error is nil). Add a nil check (and optionally fall back to event.Result/Type) before dereferencing event.Error.

Suggested change

lastError = event.Error.Message

if event.Error != nil && event.Error.Message != "" {

lastError = event.Error.Message

} else if event.Result != "" {

lastError = event.Result

} else {

lastError = "error event with no message"

}

Copilot · 2026-03-21T17:47:09Z

pkg/providers/factory.go

+		case "qwen-cli", "qwen-code", "qwencode":
+			workspace := cfg.WorkspacePath()
+			if workspace == "" {
+				workspace = "."
+			}
+			sel.providerType = providerTypeQwenCLI
+			sel.workspace = workspace
+			return sel, nil


A new explicit provider branch was added for qwen-cli/qwen-code, but resolveProviderSelection has table-driven tests for other providers and currently has no coverage for this new branch. Add a test case asserting providerTypeQwenCLI is selected and that the workspace defaulting behavior is correct.

Copilot · 2026-03-21T17:47:09Z

pkg/providers/qwen_cli_provider_test.go

+	}
+	// Should fail well before the full 2s sleep completes
+	if elapsed > 3*time.Second {
+		t.Errorf("Chat() took %v, expected to fail faster via context cancellation", elapsed)
+	}


The context-cancellation test checks elapsed > 3*time.Second, but the mock sleeps for 2s. This assertion will still pass even if cancellation is broken (the command could run the full 2s and still be <=3s). Tighten the bound (e.g., assert elapsed is well below the sleep duration) and/or assert the error is context.DeadlineExceeded.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-23T09:46:45Z

pkg/providers/factory.go

 import (
 	"github.com/sipeed/picoclaw/pkg/auth"
 )


This file references fmt/strings/config and other identifiers (e.g., fmt.Errorf, strings.ToLower, config.Config) but the import block only imports pkg/auth. As-is, pkg/providers won’t compile; add the required imports (and remove unused ones) or split logic into separate files with the correct imports.

Copilot · 2026-03-23T09:46:45Z

pkg/providers/factory.go

+					sel.apiBase = cfg.Providers.Anthropic.APIBase
+					if sel.apiBase == "" {
+						sel.apiBase = defaultAnthropicAPIBase
+					}
+					sel.providerType = providerTypeClaudeAuth


defaultAnthropicAPIBase is referenced here but isn’t defined anywhere in pkg/providers (search only finds these call sites). This causes a compile error; either define the constant (likely the default Anthropic base URL) or inline the value / reuse an existing helper.

Copilot · 2026-03-23T09:46:46Z

pkg/providers/qwen_cli_provider.go

+	if err != nil {
+		if ctx.Err() == context.Canceled {
+			return nil, ctx.Err()
+		}
+		if stderrStr := stderr.String(); stderrStr != "" {
+			return nil, fmt.Errorf("qwen cli error: %s", stderrStr)
+		}
+		return nil, fmt.Errorf("qwen cli error: %w", err)


When exec.CommandContext exits due to a context deadline, ctx.Err() will be context.DeadlineExceeded, but this code only returns ctx.Err() for context.Canceled. Consider returning ctx.Err() whenever it’s non-nil so callers can reliably detect timeouts vs. CLI failures.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-25T14:16:44Z

pkg/providers/factory.go

+func resolveProviderSelection(cfg *config.Config) (providerSelection, error) {
+	model := cfg.Agents.Defaults.GetModelName()
+	providerName := strings.ToLower(cfg.Agents.Defaults.Provider)
+	lowerModel := strings.ToLower(model)
+
+	if providerName == "" && model == "" {
+		return providerSelection{}, fmt.Errorf("no model configured: agents.defaults.model is empty")
+	}


resolveProviderSelection uses config.Config, fmt, and strings, but factory.go only imports pkg/auth. As-is, this file won’t compile due to missing imports. Add the required imports (and remove any unused ones) so the new provider selection logic builds.

Copilot · 2026-03-25T14:16:44Z

pkg/providers/factory_provider.go

+// Supported protocols: openai, litellm, novita, anthropic, anthropic-messages,
+// antigravity, claude-cli, codex-cli, qwen-cli, github-copilot


The updated comment listing “Supported protocols” is now misleading: CreateProviderFromConfig supports many more protocols (e.g. azure/azure-openai, bedrock, openrouter, groq, etc.) than the short list shown here. Please either expand the comment to match the switch cases, or revert to wording that points readers to the switch as the authoritative list.

Suggested change

// Supported protocols: openai, litellm, novita, anthropic, anthropic-messages,

// antigravity, claude-cli, codex-cli, qwen-cli, github-copilot

// Supported protocols are determined by the switch on `protocol` below;

// see that switch for the authoritative list.

Copilot · 2026-03-25T14:16:45Z

pkg/providers/factory.go

+		case "anthropic", "claude":
+			if cfg.Providers.Anthropic.APIKey != "" || cfg.Providers.Anthropic.AuthMethod != "" {
+				if cfg.Providers.Anthropic.AuthMethod == "oauth" || cfg.Providers.Anthropic.AuthMethod == "token" {
+					sel.apiBase = cfg.Providers.Anthropic.APIBase
+					if sel.apiBase == "" {
+						sel.apiBase = defaultAnthropicAPIBase
+					}
+					sel.providerType = providerTypeClaudeAuth
+					return sel, nil
+				}
+				sel.apiKey = cfg.Providers.Anthropic.APIKey
+				sel.apiBase = cfg.Providers.Anthropic.APIBase
+				sel.proxy = cfg.Providers.Anthropic.Proxy
+				if sel.apiBase == "" {
+					sel.apiBase = defaultAnthropicAPIBase
+				}


defaultAnthropicAPIBase is referenced here but does not appear to be defined anywhere else in the repo (search shows only these references). This will fail to compile. Either define the constant in providers (consistent with other defaults), or inline the default URL string as done in CreateProviderFromConfig ("https://api.anthropic.com/v1").

dome added 2 commits March 18, 2026 16:48

feat: Add Qwen CLI provider support and merge upstream

9dd2d9f

Copilot AI review requested due to automatic review settings March 18, 2026 14:43

Copilot started reviewing on behalf of dome March 18, 2026 14:44 View session

Copilot AI reviewed Mar 18, 2026

View reviewed changes

Merge branch 'sipeed:main' into main

a54635e

sipeed-bot bot added type: enhancement New feature or request domain: provider domain: config labels Mar 19, 2026

github-actions bot mentioned this pull request Mar 20, 2026

🦞 Bản tin hàng ngày hệ sinh thái OpenClaw 2026-03-20 compasify/agents-radar#61

Open

Merge branch 'sipeed:main' into main

2e43c02

Copilot AI review requested due to automatic review settings March 21, 2026 17:41

Copilot started reviewing on behalf of dome March 21, 2026 17:42 View session

Copilot AI reviewed Mar 21, 2026

View reviewed changes

dome added 2 commits March 22, 2026 11:29

Merge branch 'sipeed:main' into main

538d05b

Merge branch 'main' into main

9126118

Copilot AI review requested due to automatic review settings March 23, 2026 09:43

Copilot started reviewing on behalf of dome March 23, 2026 09:44 View session

Copilot AI reviewed Mar 23, 2026

View reviewed changes

dome added 2 commits March 24, 2026 16:35

Merge branch 'main' into main

053ff64

Merge branch 'sipeed:main' into main

1dd9123

Copilot AI review requested due to automatic review settings March 25, 2026 14:12

Copilot started reviewing on behalf of dome March 25, 2026 14:12 View session

Copilot AI reviewed Mar 25, 2026

View reviewed changes

-				usage = &UsageInfo{
-					PromptTokens:     event.Usage.InputTokens,
-					CompletionTokens: event.Usage.OutputTokens,
-					TotalTokens:      event.Usage.TotalTokens,
+				promptTokens := event.Usage.InputTokens
+				completionTokens := event.Usage.OutputTokens
+				totalTokens := event.Usage.TotalTokens
+				if totalTokens == 0 && (promptTokens > 0 || completionTokens > 0) {
+					totalTokens = promptTokens + completionTokens
+				}
+				usage = &UsageInfo{
+					PromptTokens:     promptTokens,
+					CompletionTokens: completionTokens,
+					TotalTokens:      totalTokens,

-			lastError = event.Error.Message
+			if event.Error != nil && event.Error.Message != "" {
+				lastError = event.Error.Message
+			} else if event.Result != "" {
+				lastError = event.Result
+			} else {
+				lastError = "error event with no message"
+			}

		// Supported protocols: openai, litellm, novita, anthropic, anthropic-messages,
		// antigravity, claude-cli, codex-cli, qwen-cli, github-copilot

Conversation

dome commented Mar 18, 2026

📝 Description

🗣️ Type of Change

🤖 AI Code Generation

🔗 Related Issue

📚 Technical Context (Skip for Docs)

🧪 Test Environment

📸 Evidence (Optional)

☑️ Checklist

Uh oh!

CLAassistant commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

CLAassistant commented Mar 18, 2026 •

edited

Loading