diff --git a/pkg/providers/claude_cli_provider.go b/pkg/providers/cli/claude_cli_provider.go
similarity index 99%
rename from pkg/providers/claude_cli_provider.go
rename to pkg/providers/cli/claude_cli_provider.go
index c3d98c555..62851ca3a 100644
--- a/pkg/providers/claude_cli_provider.go
+++ b/pkg/providers/cli/claude_cli_provider.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"bytes"
diff --git a/pkg/providers/claude_cli_provider_integration_test.go b/pkg/providers/cli/claude_cli_provider_integration_test.go
similarity index 99%
rename from pkg/providers/claude_cli_provider_integration_test.go
rename to pkg/providers/cli/claude_cli_provider_integration_test.go
index f6e0d787a..cdfe7060e 100644
--- a/pkg/providers/claude_cli_provider_integration_test.go
+++ b/pkg/providers/cli/claude_cli_provider_integration_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package providers
+package cliprovider
 
 import (
 	"context"
diff --git a/pkg/providers/claude_cli_provider_test.go b/pkg/providers/cli/claude_cli_provider_test.go
similarity index 92%
rename from pkg/providers/claude_cli_provider_test.go
rename to pkg/providers/cli/claude_cli_provider_test.go
index bc9960f0c..ddef84ffc 100644
--- a/pkg/providers/claude_cli_provider_test.go
+++ b/pkg/providers/cli/claude_cli_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"context"
@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/sipeed/picoclaw/pkg/config"
 )
 
 // --- Compile-time interface check ---
@@ -409,83 +407,6 @@ func TestChat_EmptyWorkspaceDoesNotSetDir(t *testing.T) {
 	}
 }
 
-// --- CreateProvider factory tests ---
-
-func TestCreateProvider_ClaudeCli(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.ModelList = []*config.ModelConfig{
-		{ModelName: "claude-sonnet-4.6", Model: "claude-cli/claude-sonnet-4.6", Workspace: "/test/ws"},
-	}
-	cfg.Agents.Defaults.ModelName = "claude-sonnet-4.6"
-
-	provider, _, err := CreateProvider(cfg)
-	if err != nil {
-		t.Fatalf("CreateProvider(claude-cli) error = %v", err)
-	}
-
-	cliProvider, ok := provider.(*ClaudeCliProvider)
-	if !ok {
-		t.Fatalf("CreateProvider(claude-cli) returned %T, want *ClaudeCliProvider", provider)
-	}
-	if cliProvider.workspace != "/test/ws" {
-		t.Errorf("workspace = %q, want %q", cliProvider.workspace, "/test/ws")
-	}
-}
-
-func TestCreateProvider_ClaudeCode(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.ModelList = []*config.ModelConfig{
-		{ModelName: "claude-code", Model: "claude-cli/claude-code"},
-	}
-	cfg.Agents.Defaults.ModelName = "claude-code"
-
-	provider, _, err := CreateProvider(cfg)
-	if err != nil {
-		t.Fatalf("CreateProvider(claude-code) error = %v", err)
-	}
-	if _, ok := provider.(*ClaudeCliProvider); !ok {
-		t.Fatalf("CreateProvider(claude-code) returned %T, want *ClaudeCliProvider", provider)
-	}
-}
-
-func TestCreateProvider_ClaudeCodec(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.ModelList = []*config.ModelConfig{
-		{ModelName: "claudecode", Model: "claude-cli/claudecode"},
-	}
-	cfg.Agents.Defaults.ModelName = "claudecode"
-
-	provider, _, err := CreateProvider(cfg)
-	if err != nil {
-		t.Fatalf("CreateProvider(claudecode) error = %v", err)
-	}
-	if _, ok := provider.(*ClaudeCliProvider); !ok {
-		t.Fatalf("CreateProvider(claudecode) returned %T, want *ClaudeCliProvider", provider)
-	}
-}
-
-func TestCreateProvider_ClaudeCliDefaultWorkspace(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.ModelList = []*config.ModelConfig{
-		{ModelName: "claude-cli", Model: "claude-cli/claude-sonnet"},
-	}
-	cfg.Agents.Defaults.ModelName = "claude-cli"
-	cfg.Agents.Defaults.Workspace = ""
-
-	provider, _, err := CreateProvider(cfg)
-	if err != nil {
-		t.Fatalf("CreateProvider error = %v", err)
-	}
-
-	cliProvider, ok := provider.(*ClaudeCliProvider)
-	if !ok {
-		t.Fatalf("returned %T, want *ClaudeCliProvider", provider)
-	}
-	if cliProvider.workspace != "." {
-		t.Errorf("workspace = %q, want %q (default)", cliProvider.workspace, ".")
-	}
-}
-
 // --- messagesToPrompt tests ---
 
 func TestMessagesToPrompt_SingleUser(t *testing.T) {
diff --git a/pkg/providers/codex_cli_credentials.go b/pkg/providers/cli/codex_cli_credentials.go
similarity index 99%
rename from pkg/providers/codex_cli_credentials.go
rename to pkg/providers/cli/codex_cli_credentials.go
index c5b25f040..95e289097 100644
--- a/pkg/providers/codex_cli_credentials.go
+++ b/pkg/providers/cli/codex_cli_credentials.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/codex_cli_credentials_test.go b/pkg/providers/cli/codex_cli_credentials_test.go
similarity index 99%
rename from pkg/providers/codex_cli_credentials_test.go
rename to pkg/providers/cli/codex_cli_credentials_test.go
index 1e88c1120..abad6e248 100644
--- a/pkg/providers/codex_cli_credentials_test.go
+++ b/pkg/providers/cli/codex_cli_credentials_test.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"os"
diff --git a/pkg/providers/codex_cli_provider.go b/pkg/providers/cli/codex_cli_provider.go
similarity index 99%
rename from pkg/providers/codex_cli_provider.go
rename to pkg/providers/cli/codex_cli_provider.go
index a9c8b692a..d1a23c329 100644
--- a/pkg/providers/codex_cli_provider.go
+++ b/pkg/providers/cli/codex_cli_provider.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"bufio"
diff --git a/pkg/providers/codex_cli_provider_integration_test.go b/pkg/providers/cli/codex_cli_provider_integration_test.go
similarity index 99%
rename from pkg/providers/codex_cli_provider_integration_test.go
rename to pkg/providers/cli/codex_cli_provider_integration_test.go
index 17a8305ad..af18b8c6d 100644
--- a/pkg/providers/codex_cli_provider_integration_test.go
+++ b/pkg/providers/cli/codex_cli_provider_integration_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package providers
+package cliprovider
 
 import (
 	"context"
diff --git a/pkg/providers/codex_cli_provider_test.go b/pkg/providers/cli/codex_cli_provider_test.go
similarity index 98%
rename from pkg/providers/codex_cli_provider_test.go
rename to pkg/providers/cli/codex_cli_provider_test.go
index 0f66e25f4..8338fbc91 100644
--- a/pkg/providers/codex_cli_provider_test.go
+++ b/pkg/providers/cli/codex_cli_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 )
@@ -400,6 +401,9 @@ func TestCodexCliProvider_GetDefaultModel(t *testing.T) {
 
 func createMockCodexCLI(t *testing.T, events []string) string {
 	t.Helper()
+	if runtime.GOOS == "windows" {
+		t.Skip("mock CLI scripts not supported on Windows")
+	}
 	tmpDir := t.TempDir()
 	scriptPath := filepath.Join(tmpDir, "codex")
 
@@ -471,6 +475,9 @@ func TestCodexCliProvider_MockCLI_Error(t *testing.T) {
 }
 
 func TestCodexCliProvider_MockCLI_WithModel(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("mock CLI scripts not supported on Windows")
+	}
 	// Mock script that captures args to verify model flag is passed
 	tmpDir := t.TempDir()
 	scriptPath := filepath.Join(tmpDir, "codex")
@@ -517,6 +524,9 @@ echo '{"type":"turn.completed"}'`
 }
 
 func TestCodexCliProvider_MockCLI_ContextCancel(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("mock CLI scripts not supported on Windows")
+	}
 	// Script that sleeps forever
 	tmpDir := t.TempDir()
 	scriptPath := filepath.Join(tmpDir, "codex")
diff --git a/pkg/providers/github_copilot_provider.go b/pkg/providers/cli/github_copilot_provider.go
similarity index 99%
rename from pkg/providers/github_copilot_provider.go
rename to pkg/providers/cli/github_copilot_provider.go
index 472c14257..d1d8a3e23 100644
--- a/pkg/providers/github_copilot_provider.go
+++ b/pkg/providers/cli/github_copilot_provider.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"context"
diff --git a/pkg/providers/tool_call_extract.go b/pkg/providers/cli/tool_call_extract.go
similarity index 98%
rename from pkg/providers/tool_call_extract.go
rename to pkg/providers/cli/tool_call_extract.go
index 7ddea0e99..f1d1886ea 100644
--- a/pkg/providers/tool_call_extract.go
+++ b/pkg/providers/cli/tool_call_extract.go
@@ -1,4 +1,4 @@
-package providers
+package cliprovider
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/toolcall_utils.go b/pkg/providers/cli/toolcall_utils.go
similarity index 99%
rename from pkg/providers/toolcall_utils.go
rename to pkg/providers/cli/toolcall_utils.go
index 7d0908158..b480082eb 100644
--- a/pkg/providers/toolcall_utils.go
+++ b/pkg/providers/cli/toolcall_utils.go
@@ -3,7 +3,7 @@
 //
 // Copyright (c) 2026 PicoClaw contributors
 
-package providers
+package cliprovider
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/cli/types.go b/pkg/providers/cli/types.go
new file mode 100644
index 000000000..f15897adf
--- /dev/null
+++ b/pkg/providers/cli/types.go
@@ -0,0 +1,28 @@
+package cliprovider
+
+import (
+	"context"
+
+	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
+)
+
+type (
+	ToolCall               = protocoltypes.ToolCall
+	FunctionCall           = protocoltypes.FunctionCall
+	LLMResponse            = protocoltypes.LLMResponse
+	UsageInfo              = protocoltypes.UsageInfo
+	Message                = protocoltypes.Message
+	ToolDefinition         = protocoltypes.ToolDefinition
+	ToolFunctionDefinition = protocoltypes.ToolFunctionDefinition
+)
+
+type LLMProvider interface {
+	Chat(
+		ctx context.Context,
+		messages []Message,
+		tools []ToolDefinition,
+		model string,
+		options map[string]any,
+	) (*LLMResponse, error)
+	GetDefaultModel() string
+}
diff --git a/pkg/providers/cli_facade.go b/pkg/providers/cli_facade.go
new file mode 100644
index 000000000..6580291bd
--- /dev/null
+++ b/pkg/providers/cli_facade.go
@@ -0,0 +1,40 @@
+package providers
+
+import (
+	"time"
+
+	cliprovider "github.com/sipeed/picoclaw/pkg/providers/cli"
+)
+
+type (
+	ClaudeCliProvider     = cliprovider.ClaudeCliProvider
+	CodexCliProvider      = cliprovider.CodexCliProvider
+	CodexCliAuth          = cliprovider.CodexCliAuth
+	GitHubCopilotProvider = cliprovider.GitHubCopilotProvider
+)
+
+const CodexHomeEnvVar = cliprovider.CodexHomeEnvVar
+
+func NewClaudeCliProvider(workspace string) *ClaudeCliProvider {
+	return cliprovider.NewClaudeCliProvider(workspace)
+}
+
+func NewCodexCliProvider(workspace string) *CodexCliProvider {
+	return cliprovider.NewCodexCliProvider(workspace)
+}
+
+func NewGitHubCopilotProvider(uri string, connectMode string, model string) (*GitHubCopilotProvider, error) {
+	return cliprovider.NewGitHubCopilotProvider(uri, connectMode, model)
+}
+
+func ReadCodexCliCredentials() (accessToken, accountID string, expiresAt time.Time, err error) {
+	return cliprovider.ReadCodexCliCredentials()
+}
+
+func CreateCodexCliTokenSource() func() (string, string, error) {
+	return cliprovider.CreateCodexCliTokenSource()
+}
+
+func NormalizeToolCall(tc ToolCall) ToolCall {
+	return cliprovider.NormalizeToolCall(tc)
+}
diff --git a/pkg/providers/cli_factory_test.go b/pkg/providers/cli_factory_test.go
new file mode 100644
index 000000000..b00eafb9f
--- /dev/null
+++ b/pkg/providers/cli_factory_test.go
@@ -0,0 +1,99 @@
+package providers
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/sipeed/picoclaw/pkg/config"
+)
+
+func testProviderWorkspace(t *testing.T, provider any) string {
+	t.Helper()
+
+	v := reflect.ValueOf(provider)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		t.Fatalf("provider = %T, want non-nil pointer", provider)
+	}
+
+	field := v.Elem().FieldByName("workspace")
+	if !field.IsValid() || field.Kind() != reflect.String {
+		t.Fatalf("provider %T does not expose workspace field", provider)
+	}
+
+	return field.String()
+}
+
+func TestCreateProvider_ClaudeCli(t *testing.T) {
+	cfg := config.DefaultConfig()
+	cfg.ModelList = []*config.ModelConfig{
+		{ModelName: "claude-sonnet-4.6", Model: "claude-cli/claude-sonnet-4.6", Workspace: "/test/ws"},
+	}
+	cfg.Agents.Defaults.ModelName = "claude-sonnet-4.6"
+
+	provider, _, err := CreateProvider(cfg)
+	if err != nil {
+		t.Fatalf("CreateProvider(claude-cli) error = %v", err)
+	}
+
+	cliProvider, ok := provider.(*ClaudeCliProvider)
+	if !ok {
+		t.Fatalf("CreateProvider(claude-cli) returned %T, want *ClaudeCliProvider", provider)
+	}
+	if got := testProviderWorkspace(t, cliProvider); got != "/test/ws" {
+		t.Errorf("workspace = %q, want %q", got, "/test/ws")
+	}
+}
+
+func TestCreateProvider_ClaudeCode(t *testing.T) {
+	cfg := config.DefaultConfig()
+	cfg.ModelList = []*config.ModelConfig{
+		{ModelName: "claude-code", Model: "claude-cli/claude-code"},
+	}
+	cfg.Agents.Defaults.ModelName = "claude-code"
+
+	provider, _, err := CreateProvider(cfg)
+	if err != nil {
+		t.Fatalf("CreateProvider(claude-code) error = %v", err)
+	}
+	if _, ok := provider.(*ClaudeCliProvider); !ok {
+		t.Fatalf("CreateProvider(claude-code) returned %T, want *ClaudeCliProvider", provider)
+	}
+}
+
+func TestCreateProvider_ClaudeCodec(t *testing.T) {
+	cfg := config.DefaultConfig()
+	cfg.ModelList = []*config.ModelConfig{
+		{ModelName: "claudecode", Model: "claude-cli/claudecode"},
+	}
+	cfg.Agents.Defaults.ModelName = "claudecode"
+
+	provider, _, err := CreateProvider(cfg)
+	if err != nil {
+		t.Fatalf("CreateProvider(claudecode) error = %v", err)
+	}
+	if _, ok := provider.(*ClaudeCliProvider); !ok {
+		t.Fatalf("CreateProvider(claudecode) returned %T, want *ClaudeCliProvider", provider)
+	}
+}
+
+func TestCreateProvider_ClaudeCliDefaultWorkspace(t *testing.T) {
+	cfg := config.DefaultConfig()
+	cfg.ModelList = []*config.ModelConfig{
+		{ModelName: "claude-cli", Model: "claude-cli/claude-sonnet"},
+	}
+	cfg.Agents.Defaults.ModelName = "claude-cli"
+	cfg.Agents.Defaults.Workspace = ""
+
+	provider, _, err := CreateProvider(cfg)
+	if err != nil {
+		t.Fatalf("CreateProvider error = %v", err)
+	}
+
+	cliProvider, ok := provider.(*ClaudeCliProvider)
+	if !ok {
+		t.Fatalf("returned %T, want *ClaudeCliProvider", provider)
+	}
+	if got := testProviderWorkspace(t, cliProvider); got != "." {
+		t.Errorf("workspace = %q, want %q (default)", got, ".")
+	}
+}
diff --git a/pkg/providers/facade_compat_test.go b/pkg/providers/facade_compat_test.go
new file mode 100644
index 000000000..b0aa48bf8
--- /dev/null
+++ b/pkg/providers/facade_compat_test.go
@@ -0,0 +1,52 @@
+package providers
+
+import (
+	"testing"
+
+	cliprovider "github.com/sipeed/picoclaw/pkg/providers/cli"
+	oauthprovider "github.com/sipeed/picoclaw/pkg/providers/oauth"
+)
+
+func TestNormalizeToolCallFacadeMatchesCLIProvider(t *testing.T) {
+	input := ToolCall{
+		ID:   "call_1",
+		Type: "function",
+		Function: &FunctionCall{
+			Name:      "read_file",
+			Arguments: `{"path":"README.md"}`,
+		},
+	}
+
+	got := NormalizeToolCall(input)
+	want := cliprovider.NormalizeToolCall(input)
+
+	if got.Name != want.Name {
+		t.Fatalf("Name = %q, want %q", got.Name, want.Name)
+	}
+	if got.Function == nil || want.Function == nil {
+		t.Fatalf("Function should not be nil: got=%v want=%v", got.Function, want.Function)
+	}
+	if got.Function.Name != want.Function.Name {
+		t.Fatalf("Function.Name = %q, want %q", got.Function.Name, want.Function.Name)
+	}
+	if got.Function.Arguments != want.Function.Arguments {
+		t.Fatalf("Function.Arguments = %q, want %q", got.Function.Arguments, want.Function.Arguments)
+	}
+	if got.Arguments["path"] != want.Arguments["path"] {
+		t.Fatalf("Arguments[path] = %v, want %v", got.Arguments["path"], want.Arguments["path"])
+	}
+}
+
+func TestAntigravityFacadeSignaturesRemainAvailable(t *testing.T) {
+	var projectFetcher func(string) (string, error) = FetchAntigravityProjectID
+	var modelsFetcher func(string, string) ([]AntigravityModelInfo, error) = FetchAntigravityModels
+
+	if projectFetcher == nil {
+		t.Fatal("FetchAntigravityProjectID facade should be available")
+	}
+	if modelsFetcher == nil {
+		t.Fatal("FetchAntigravityModels facade should be available")
+	}
+
+	var _ AntigravityModelInfo = oauthprovider.AntigravityModelInfo{}
+}
diff --git a/pkg/providers/httpapi/gemini_helpers.go b/pkg/providers/httpapi/gemini_helpers.go
new file mode 100644
index 000000000..36d95cf9e
--- /dev/null
+++ b/pkg/providers/httpapi/gemini_helpers.go
@@ -0,0 +1,139 @@
+package httpapi
+
+import (
+	"encoding/json"
+	"strings"
+)
+
+func normalizeStoredToolCall(tc ToolCall) (string, map[string]any, string) {
+	name := tc.Name
+	args := tc.Arguments
+	thoughtSignature := ""
+
+	if name == "" && tc.Function != nil {
+		name = tc.Function.Name
+		thoughtSignature = tc.Function.ThoughtSignature
+	} else if tc.Function != nil {
+		thoughtSignature = tc.Function.ThoughtSignature
+	}
+
+	if args == nil {
+		args = map[string]any{}
+	}
+
+	if len(args) == 0 && tc.Function != nil && tc.Function.Arguments != "" {
+		var parsed map[string]any
+		if err := json.Unmarshal([]byte(tc.Function.Arguments), &parsed); err == nil && parsed != nil {
+			args = parsed
+		}
+	}
+
+	return name, args, thoughtSignature
+}
+
+func resolveToolResponseName(toolCallID string, toolCallNames map[string]string) string {
+	if toolCallID == "" {
+		return ""
+	}
+
+	if name, ok := toolCallNames[toolCallID]; ok && name != "" {
+		return name
+	}
+
+	return inferToolNameFromCallID(toolCallID)
+}
+
+func inferToolNameFromCallID(toolCallID string) string {
+	if !strings.HasPrefix(toolCallID, "call_") {
+		return toolCallID
+	}
+
+	rest := strings.TrimPrefix(toolCallID, "call_")
+	if idx := strings.LastIndex(rest, "_"); idx > 0 {
+		candidate := rest[:idx]
+		if candidate != "" {
+			return candidate
+		}
+	}
+
+	return toolCallID
+}
+
+func extractPartThoughtSignature(thoughtSignature string, thoughtSignatureSnake string) string {
+	if thoughtSignature != "" {
+		return thoughtSignature
+	}
+	if thoughtSignatureSnake != "" {
+		return thoughtSignatureSnake
+	}
+	return ""
+}
+
+var geminiUnsupportedKeywords = map[string]bool{
+	"patternProperties":    true,
+	"additionalProperties": true,
+	"$schema":              true,
+	"$id":                  true,
+	"$ref":                 true,
+	"$defs":                true,
+	"definitions":          true,
+	"examples":             true,
+	"minLength":            true,
+	"maxLength":            true,
+	"minimum":              true,
+	"maximum":              true,
+	"multipleOf":           true,
+	"pattern":              true,
+	"format":               true,
+	"minItems":             true,
+	"maxItems":             true,
+	"uniqueItems":          true,
+	"minProperties":        true,
+	"maxProperties":        true,
+}
+
+func sanitizeSchemaForGemini(schema map[string]any) map[string]any {
+	if schema == nil {
+		return nil
+	}
+
+	result := make(map[string]any)
+	for k, v := range schema {
+		if geminiUnsupportedKeywords[k] {
+			continue
+		}
+		switch val := v.(type) {
+		case map[string]any:
+			result[k] = sanitizeSchemaForGemini(val)
+		case []any:
+			sanitized := make([]any, len(val))
+			for i, item := range val {
+				if m, ok := item.(map[string]any); ok {
+					sanitized[i] = sanitizeSchemaForGemini(m)
+				} else {
+					sanitized[i] = item
+				}
+			}
+			result[k] = sanitized
+		default:
+			result[k] = v
+		}
+	}
+
+	if _, hasProps := result["properties"]; hasProps {
+		if _, hasType := result["type"]; !hasType {
+			result["type"] = "object"
+		}
+	}
+
+	return result
+}
+
+func extractProtocol(model string) (protocol, modelID string) {
+	model = strings.TrimSpace(model)
+	protocol, modelID, found := strings.Cut(model, "/")
+	if !found {
+		return "openai", model
+	}
+	return protocol, modelID
+}
diff --git a/pkg/providers/gemini_provider.go b/pkg/providers/httpapi/gemini_provider.go
similarity index 99%
rename from pkg/providers/gemini_provider.go
rename to pkg/providers/httpapi/gemini_provider.go
index 561387534..d488d06f8 100644
--- a/pkg/providers/gemini_provider.go
+++ b/pkg/providers/httpapi/gemini_provider.go
@@ -1,4 +1,4 @@
-package providers
+package httpapi
 
 import (
 	"bufio"
@@ -303,7 +303,7 @@ func normalizeGeminiModel(model string) string {
 	model = strings.TrimSpace(model)
 	model = strings.TrimPrefix(model, "models/")
 	if strings.Contains(model, "/") {
-		_, modelID := ExtractProtocol(model)
+		_, modelID := extractProtocol(model)
 		if modelID != "" {
 			return modelID
 		}
diff --git a/pkg/providers/gemini_provider_test.go b/pkg/providers/httpapi/gemini_provider_test.go
similarity index 99%
rename from pkg/providers/gemini_provider_test.go
rename to pkg/providers/httpapi/gemini_provider_test.go
index a0ab748eb..aade90358 100644
--- a/pkg/providers/gemini_provider_test.go
+++ b/pkg/providers/httpapi/gemini_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package httpapi
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/http_provider.go b/pkg/providers/httpapi/http_provider.go
similarity index 99%
rename from pkg/providers/http_provider.go
rename to pkg/providers/httpapi/http_provider.go
index ac91f15f6..a84962622 100644
--- a/pkg/providers/http_provider.go
+++ b/pkg/providers/httpapi/http_provider.go
@@ -4,7 +4,7 @@
 //
 // Copyright (c) 2026 PicoClaw contributors
 
-package providers
+package httpapi
 
 import (
 	"context"
diff --git a/pkg/providers/httpapi/types.go b/pkg/providers/httpapi/types.go
new file mode 100644
index 000000000..c8bcdc0dc
--- /dev/null
+++ b/pkg/providers/httpapi/types.go
@@ -0,0 +1,43 @@
+package httpapi
+
+import (
+	"context"
+
+	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
+)
+
+type (
+	ToolCall               = protocoltypes.ToolCall
+	FunctionCall           = protocoltypes.FunctionCall
+	LLMResponse            = protocoltypes.LLMResponse
+	UsageInfo              = protocoltypes.UsageInfo
+	Message                = protocoltypes.Message
+	ToolDefinition         = protocoltypes.ToolDefinition
+	ToolFunctionDefinition = protocoltypes.ToolFunctionDefinition
+	ExtraContent           = protocoltypes.ExtraContent
+	GoogleExtra            = protocoltypes.GoogleExtra
+	ContentBlock           = protocoltypes.ContentBlock
+	CacheControl           = protocoltypes.CacheControl
+)
+
+type LLMProvider interface {
+	Chat(
+		ctx context.Context,
+		messages []Message,
+		tools []ToolDefinition,
+		model string,
+		options map[string]any,
+	) (*LLMResponse, error)
+	GetDefaultModel() string
+}
+
+type StreamingProvider interface {
+	ChatStream(
+		ctx context.Context,
+		messages []Message,
+		tools []ToolDefinition,
+		model string,
+		options map[string]any,
+		onChunk func(accumulated string),
+	) (*LLMResponse, error)
+}
diff --git a/pkg/providers/httpapi_facade.go b/pkg/providers/httpapi_facade.go
new file mode 100644
index 000000000..fea92dc43
--- /dev/null
+++ b/pkg/providers/httpapi_facade.go
@@ -0,0 +1,46 @@
+package providers
+
+import httpapi "github.com/sipeed/picoclaw/pkg/providers/httpapi"
+
+type (
+	GeminiProvider = httpapi.GeminiProvider
+	HTTPProvider   = httpapi.HTTPProvider
+)
+
+func NewGeminiProvider(
+	apiKey string,
+	apiBase string,
+	proxy string,
+	userAgent string,
+	requestTimeoutSeconds int,
+	extraBody map[string]any,
+	customHeaders map[string]string,
+) *GeminiProvider {
+	return httpapi.NewGeminiProvider(apiKey, apiBase, proxy, userAgent, requestTimeoutSeconds, extraBody, customHeaders)
+}
+
+func NewHTTPProvider(apiKey, apiBase, proxy string) *HTTPProvider {
+	return httpapi.NewHTTPProvider(apiKey, apiBase, proxy)
+}
+
+func NewHTTPProviderWithMaxTokensField(apiKey, apiBase, proxy, maxTokensField string) *HTTPProvider {
+	return httpapi.NewHTTPProviderWithMaxTokensField(apiKey, apiBase, proxy, maxTokensField)
+}
+
+func NewHTTPProviderWithMaxTokensFieldAndRequestTimeout(
+	apiKey, apiBase, proxy, maxTokensField, userAgent string,
+	requestTimeoutSeconds int,
+	extraBody map[string]any,
+	customHeaders map[string]string,
+) *HTTPProvider {
+	return httpapi.NewHTTPProviderWithMaxTokensFieldAndRequestTimeout(
+		apiKey,
+		apiBase,
+		proxy,
+		maxTokensField,
+		userAgent,
+		requestTimeoutSeconds,
+		extraBody,
+		customHeaders,
+	)
+}
diff --git a/pkg/providers/antigravity_provider.go b/pkg/providers/oauth/antigravity_provider.go
similarity index 99%
rename from pkg/providers/antigravity_provider.go
rename to pkg/providers/oauth/antigravity_provider.go
index b5ab847d5..38526dd7a 100644
--- a/pkg/providers/antigravity_provider.go
+++ b/pkg/providers/oauth/antigravity_provider.go
@@ -1,4 +1,4 @@
-package providers
+package oauthprovider
 
 import (
 	"bufio"
diff --git a/pkg/providers/antigravity_provider_test.go b/pkg/providers/oauth/antigravity_provider_test.go
similarity index 99%
rename from pkg/providers/antigravity_provider_test.go
rename to pkg/providers/oauth/antigravity_provider_test.go
index 9155e2d56..41cb5b0db 100644
--- a/pkg/providers/antigravity_provider_test.go
+++ b/pkg/providers/oauth/antigravity_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package oauthprovider
 
 import "testing"
 
diff --git a/pkg/providers/claude_provider.go b/pkg/providers/oauth/claude_provider.go
similarity index 91%
rename from pkg/providers/claude_provider.go
rename to pkg/providers/oauth/claude_provider.go
index 60639ca18..cf0052acd 100644
--- a/pkg/providers/claude_provider.go
+++ b/pkg/providers/oauth/claude_provider.go
@@ -1,9 +1,10 @@
-package providers
+package oauthprovider
 
 import (
 	"context"
 	"fmt"
 
+	"github.com/sipeed/picoclaw/pkg/auth"
 	anthropicprovider "github.com/sipeed/picoclaw/pkg/providers/anthropic"
 )
 
@@ -55,7 +56,7 @@ func (p *ClaudeProvider) GetDefaultModel() string {
 	return p.delegate.GetDefaultModel()
 }
 
-func createClaudeTokenSource() func() (string, error) {
+func CreateClaudeTokenSource(getCredential func(string) (*auth.AuthCredential, error)) func() (string, error) {
 	return func() (string, error) {
 		cred, err := getCredential("anthropic")
 		if err != nil {
diff --git a/pkg/providers/claude_provider_test.go b/pkg/providers/oauth/claude_provider_test.go
similarity index 99%
rename from pkg/providers/claude_provider_test.go
rename to pkg/providers/oauth/claude_provider_test.go
index 98e07bb80..eea5423c3 100644
--- a/pkg/providers/claude_provider_test.go
+++ b/pkg/providers/oauth/claude_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package oauthprovider
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/codex_provider.go b/pkg/providers/oauth/codex_provider.go
similarity index 98%
rename from pkg/providers/codex_provider.go
rename to pkg/providers/oauth/codex_provider.go
index d968215cc..0b125997b 100644
--- a/pkg/providers/codex_provider.go
+++ b/pkg/providers/oauth/codex_provider.go
@@ -1,4 +1,4 @@
-package providers
+package oauthprovider
 
 import (
 	"context"
@@ -240,7 +240,7 @@ func buildCodexParams(
 	return params
 }
 
-func createCodexTokenSource() func() (string, string, error) {
+func CreateCodexTokenSource() func() (string, string, error) {
 	return func() (string, string, error) {
 		cred, err := auth.GetCredential("openai")
 		if err != nil {
diff --git a/pkg/providers/codex_provider_test.go b/pkg/providers/oauth/codex_provider_test.go
similarity index 99%
rename from pkg/providers/codex_provider_test.go
rename to pkg/providers/oauth/codex_provider_test.go
index ad5748e0c..aeeb18360 100644
--- a/pkg/providers/codex_provider_test.go
+++ b/pkg/providers/oauth/codex_provider_test.go
@@ -1,4 +1,4 @@
-package providers
+package oauthprovider
 
 import (
 	"encoding/json"
diff --git a/pkg/providers/oauth/types.go b/pkg/providers/oauth/types.go
new file mode 100644
index 000000000..02ea4a21c
--- /dev/null
+++ b/pkg/providers/oauth/types.go
@@ -0,0 +1,32 @@
+package oauthprovider
+
+import (
+	"context"
+
+	"github.com/sipeed/picoclaw/pkg/providers/protocoltypes"
+)
+
+type (
+	ToolCall               = protocoltypes.ToolCall
+	FunctionCall           = protocoltypes.FunctionCall
+	LLMResponse            = protocoltypes.LLMResponse
+	UsageInfo              = protocoltypes.UsageInfo
+	Message                = protocoltypes.Message
+	ToolDefinition         = protocoltypes.ToolDefinition
+	ToolFunctionDefinition = protocoltypes.ToolFunctionDefinition
+	ExtraContent           = protocoltypes.ExtraContent
+	GoogleExtra            = protocoltypes.GoogleExtra
+	ContentBlock           = protocoltypes.ContentBlock
+	CacheControl           = protocoltypes.CacheControl
+)
+
+type LLMProvider interface {
+	Chat(
+		ctx context.Context,
+		messages []Message,
+		tools []ToolDefinition,
+		model string,
+		options map[string]any,
+	) (*LLMResponse, error)
+	GetDefaultModel() string
+}
diff --git a/pkg/providers/oauth_facade.go b/pkg/providers/oauth_facade.go
new file mode 100644
index 000000000..c14117773
--- /dev/null
+++ b/pkg/providers/oauth_facade.go
@@ -0,0 +1,60 @@
+package providers
+
+import (
+	oauthprovider "github.com/sipeed/picoclaw/pkg/providers/oauth"
+)
+
+type (
+	AntigravityProvider  = oauthprovider.AntigravityProvider
+	AntigravityModelInfo = oauthprovider.AntigravityModelInfo
+	ClaudeProvider       = oauthprovider.ClaudeProvider
+	CodexProvider        = oauthprovider.CodexProvider
+)
+
+func NewAntigravityProvider() *AntigravityProvider {
+	return oauthprovider.NewAntigravityProvider()
+}
+
+func NewClaudeProvider(token string) *ClaudeProvider {
+	return oauthprovider.NewClaudeProvider(token)
+}
+
+func NewClaudeProviderWithBaseURL(token, apiBase string) *ClaudeProvider {
+	return oauthprovider.NewClaudeProviderWithBaseURL(token, apiBase)
+}
+
+func NewClaudeProviderWithTokenSource(token string, tokenSource func() (string, error)) *ClaudeProvider {
+	return oauthprovider.NewClaudeProviderWithTokenSource(token, tokenSource)
+}
+
+func NewClaudeProviderWithTokenSourceAndBaseURL(
+	token string, tokenSource func() (string, error), apiBase string,
+) *ClaudeProvider {
+	return oauthprovider.NewClaudeProviderWithTokenSourceAndBaseURL(token, tokenSource, apiBase)
+}
+
+func NewCodexProvider(token, accountID string) *CodexProvider {
+	return oauthprovider.NewCodexProvider(token, accountID)
+}
+
+func NewCodexProviderWithTokenSource(
+	token, accountID string, tokenSource func() (string, string, error),
+) *CodexProvider {
+	return oauthprovider.NewCodexProviderWithTokenSource(token, accountID, tokenSource)
+}
+
+func FetchAntigravityProjectID(accessToken string) (string, error) {
+	return oauthprovider.FetchAntigravityProjectID(accessToken)
+}
+
+func FetchAntigravityModels(accessToken, projectID string) ([]AntigravityModelInfo, error) {
+	return oauthprovider.FetchAntigravityModels(accessToken, projectID)
+}
+
+func createClaudeTokenSource() func() (string, error) {
+	return oauthprovider.CreateClaudeTokenSource(getCredential)
+}
+
+func createCodexTokenSource() func() (string, string, error) {
+	return oauthprovider.CreateCodexTokenSource()
+}