Skip to content

Get up and running with Kimi, GLM, MiniMax, DeepSeek, gpt-oss, Qwen, Gemma and other models.

launch: suppress Claude Code connector warning for Ollama (#18878)

Eva H021cda52280d
diff --git a/cmd/launch/claude.go b/cmd/launch/claude.go
index ca96991b8..73aa1c749 100644
--- a/cmd/launch/claude.go
+++ b/cmd/launch/claude.go
@@ -69,6 +69,7 @@ func (c *Claude) envVars(model string) []string {
"ANTHROPIC_BASE_URL=" + envconfig.Host().String(),
"ANTHROPIC_API_KEY=",
"ANTHROPIC_AUTH_TOKEN=ollama",
+ "ENABLE_CLAUDEAI_MCP_SERVERS=false",
"CLAUDE_CODE_ATTRIBUTION_HEADER=0",
"CLAUDE_CODE_TOTAL_TOKENS_REMINDER=off",
"DISABLE_ERROR_REPORTING=1",
diff --git a/cmd/launch/claude_test.go b/cmd/launch/claude_test.go
index e89bc08ab..cc3ea7998 100644
--- a/cmd/launch/claude_test.go
+++ b/cmd/launch/claude_test.go
@@ -352,6 +352,7 @@ func TestClaudeEnvVars(t *testing.T) {
"ANTHROPIC_BASE_URL": envconfig.Host().String(),
"ANTHROPIC_API_KEY": "",
"ANTHROPIC_AUTH_TOKEN": "ollama",
+ "ENABLE_CLAUDEAI_MCP_SERVERS": "false",
"CLAUDE_CODE_ATTRIBUTION_HEADER": "0",
"CLAUDE_CODE_TOTAL_TOKENS_REMINDER": "off",
"DISABLE_ERROR_REPORTING": "1",
@@ -375,6 +376,48 @@ func TestClaudeEnvVars(t *testing.T) {
}
}
+func TestClaudeRunDisablesClaudeAiConnectors(t *testing.T) {
+ if runtime.GOOS == "windows" {
+ t.Skip("uses a POSIX shell fake binary")
+ }
+
+ for _, model := range []string{"llama3.2", "kimi-k3:cloud"} {
+ t.Run(model, func(t *testing.T) {
+ t.Setenv("ENABLE_CLAUDEAI_MCP_SERVERS", "true")
+ t.Setenv("OLLAMA_HOST", "http://127.0.0.1:12345")
+ t.Setenv("ANTHROPIC_API_KEY", "test-api-key")
+ t.Setenv("ANTHROPIC_AUTH_TOKEN", "test-auth-token")
+
+ dir := t.TempDir()
+ output := filepath.Join(dir, "env-and-args")
+ t.Setenv("PATH", dir)
+ t.Setenv("CLAUDE_LAUNCH_TEST_OUTPUT", output)
+ script := `#!/bin/sh
+printf '%s\n' "$ENABLE_CLAUDEAI_MCP_SERVERS" "$ANTHROPIC_BASE_URL" "${ANTHROPIC_API_KEY-unset}" "$ANTHROPIC_AUTH_TOKEN" "$@" > "$CLAUDE_LAUNCH_TEST_OUTPUT"
+`
+ if err := os.WriteFile(filepath.Join(dir, "claude"), []byte(script), 0o755); err != nil {
+ t.Fatal(err)
+ }
+
+ mcpConfig := filepath.Join(dir, "mcp.json")
+ if err := (&Claude{}).Run(model, nil, []string{"--mcp-config", mcpConfig}); err != nil {
+ t.Fatal(err)
+ }
+ got, err := os.ReadFile(output)
+ if err != nil {
+ t.Fatal(err)
+ }
+ want := strings.Join([]string{"false", "http://127.0.0.1:12345", "", "ollama", "--model", model, "--mcp-config", mcpConfig, ""}, "\n")
+ if string(got) != want {
+ t.Fatalf("child environment and arguments = %q, want %q", got, want)
+ }
+ if got := os.Getenv("ENABLE_CLAUDEAI_MCP_SERVERS"); got != "true" {
+ t.Fatalf("parent ENABLE_CLAUDEAI_MCP_SERVERS = %q, want true", got)
+ }
+ })
+ }
+}
+
func TestClaudeRunAutoModeServer(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("uses a POSIX shell fake binary")