feat(ai-providers): add OpenCode Zen provider (#1400) (#1417)

datlechin · web-flow · commit 39c8c9e7b20b · 2026-05-26T12:48:00.000+07:00
* feat(ai-providers): add OpenCode Zen provider (#1400) * fix(ai-providers): make OpenCode Zen API key optional so free models work (#1400)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- OpenCode Zen as an AI provider. Add it from the provider list and paste an OpenCode key, or leave the key blank to use the free models; the model list loads automatically, covering the Claude, GPT, Gemini, and open models Zen serves. (#1400)
+
+### Fixed
+
+- Custom and OpenAI-compatible AI providers now work when the base URL already ends in `/v1`, instead of building a doubled `/v1/v1/` path that failed. (#1400)
+
 ## [0.45.0] - 2026-05-26
 
 ### Added
diff --git a/TablePro/Core/AI/AIProviderFactory.swift b/TablePro/Core/AI/AIProviderFactory.swift
@@ -83,7 +83,7 @@ enum AIProviderFactory {
         guard let config else { return nil }
         let apiKey: String?
         switch config.type.authStyle {
-        case .apiKey:
+        case .apiKey, .optionalApiKey:
             apiKey = AIKeyStorage.shared.loadAPIKey(for: config.id)
         case .oauth, .none:
             apiKey = nil
diff --git a/TablePro/Core/AI/OpenAICompatibleProvider.swift b/TablePro/Core/AI/OpenAICompatibleProvider.swift
@@ -262,8 +262,7 @@ final class OpenAICompatibleProvider: ChatTransport {
                 )
             }
         default:
-            let chatPath = "/v1/chat/completions"
-            guard let url = URL(string: "\(endpoint)\(chatPath)") else {
+            guard let url = URL(string: endpoint.openAIPath("chat/completions")) else {
                 throw AIProviderError.invalidEndpoint(endpoint)
             }
 
@@ -312,10 +311,10 @@ final class OpenAICompatibleProvider: ChatTransport {
         turns: [ChatTurnWire],
         options: ChatTransportOptions
     ) throws -> URLRequest {
-        let chatPath = providerType == .ollama
-            ? "/api/chat"
-            : "/v1/chat/completions"
-        guard let url = URL(string: "\(endpoint)\(chatPath)") else {
+        let urlString = providerType == .ollama
+            ? "\(endpoint)/api/chat"
+            : endpoint.openAIPath("chat/completions")
+        guard let url = URL(string: urlString) else {
             throw AIProviderError.invalidEndpoint(endpoint)
         }
 
@@ -481,7 +480,7 @@ final class OpenAICompatibleProvider: ChatTransport {
     }
 
     private func fetchOpenAIModels() async throws -> [String] {
-        guard let url = URL(string: "\(endpoint)/v1/models") else {
+        guard let url = URL(string: endpoint.openAIPath("models")) else {
             throw AIProviderError.invalidEndpoint(endpoint)
         }
 
diff --git a/TablePro/Core/AI/Registry/AIProviderRegistration.swift b/TablePro/Core/AI/Registry/AIProviderRegistration.swift
@@ -64,7 +64,7 @@ enum AIProviderRegistration {
             }
         ))
 
-        for type in [AIProviderType.openRouter, .ollama, .custom] {
+        for type in [AIProviderType.openRouter, .openCode, .ollama, .custom] {
             registry.register(AIProviderDescriptor(
                 typeID: type.rawValue,
                 displayName: type.displayName,
diff --git a/TablePro/Core/AI/String+AIEndpoint.swift b/TablePro/Core/AI/String+AIEndpoint.swift
@@ -9,4 +9,9 @@ extension String {
     func normalizedEndpoint() -> String {
         hasSuffix("/") ? String(dropLast()) : self
     }
+
+    func openAIPath(_ resource: String) -> String {
+        let base = normalizedEndpoint()
+        return base.hasSuffix("/v1") ? "\(base)/\(resource)" : "\(base)/v1/\(resource)"
+    }
 }
diff --git a/TablePro/Models/AI/AIModels.swift b/TablePro/Models/AI/AIModels.swift
@@ -14,6 +14,7 @@ enum AIProviderType: String, Codable, CaseIterable, Identifiable, Sendable {
     case openRouter
     case gemini
     case ollama
+    case openCode
     case custom
 
     var id: String { rawValue }
@@ -26,6 +27,7 @@ enum AIProviderType: String, Codable, CaseIterable, Identifiable, Sendable {
         case .openRouter: return "OpenRouter"
         case .gemini:     return "Gemini"
         case .ollama:     return "Ollama"
+        case .openCode:   return "OpenCode Zen"
         case .custom:     return String(localized: "Custom")
         }
     }
@@ -38,17 +40,23 @@ enum AIProviderType: String, Codable, CaseIterable, Identifiable, Sendable {
         case .openRouter: return "https://openrouter.ai/api"
         case .gemini:     return "https://generativelanguage.googleapis.com"
         case .ollama:     return "http://localhost:11434"
+        case .openCode:   return "https://opencode.ai/zen"
         case .custom:     return ""
         }
     }
 
-    enum AuthStyle: Sendable { case apiKey, oauth, none }
+    enum AuthStyle: Sendable {
+        case apiKey, optionalApiKey, oauth, none
+
+        var usesAPIKey: Bool { self == .apiKey || self == .optionalApiKey }
+    }
 
     var authStyle: AuthStyle {
         switch self {
-        case .copilot: return .oauth
-        case .ollama:  return .none
-        default:       return .apiKey
+        case .copilot:  return .oauth
+        case .ollama:   return .none
+        case .openCode: return .optionalApiKey
+        default:        return .apiKey
         }
     }
 
@@ -60,6 +68,7 @@ enum AIProviderType: String, Codable, CaseIterable, Identifiable, Sendable {
         case .openRouter: return "globe"
         case .gemini:     return "wand.and.stars"
         case .ollama:     return "desktopcomputer"
+        case .openCode:   return "sparkles"
         case .custom:     return "server.rack"
         }
     }
diff --git a/TablePro/ViewModels/AIChatViewModel.swift b/TablePro/ViewModels/AIChatViewModel.swift
@@ -275,7 +275,7 @@ final class AIChatViewModel {
             for config in pending {
                 let apiKey: String?
                 switch config.type.authStyle {
-                case .apiKey:
+                case .apiKey, .optionalApiKey:
                     apiKey = services.aiKeyStorage.loadAPIKey(for: config.id)
                 case .oauth, .none:
                     apiKey = nil
diff --git a/TablePro/Views/Settings/AIProviderDetailSheet.swift b/TablePro/Views/Settings/AIProviderDetailSheet.swift
@@ -116,7 +116,7 @@ struct AIProviderDetailSheet: View {
         switch draft.type.authStyle {
         case .apiKey:
             return !apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-        case .oauth, .none:
+        case .optionalApiKey, .oauth, .none:
             return true
         }
     }
@@ -132,7 +132,7 @@ struct AIProviderDetailSheet: View {
     @ViewBuilder
     private var authSection: some View {
         switch draft.type.authStyle {
-        case .apiKey:
+        case .apiKey, .optionalApiKey:
             apiKeyAuthSection
         case .oauth:
             copilotAuthSection
@@ -159,7 +159,7 @@ struct AIProviderDetailSheet: View {
                         Text("Test Connection")
                     }
                 }
-                .disabled(isTesting || apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+                .disabled(isTesting || (draft.type.authStyle == .apiKey && apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty))
             }
             if case .success = testResult {
                 Label(String(localized: "Connection successful"), systemImage: "checkmark.circle.fill")
diff --git a/TablePro/Views/Settings/AISettingsView.swift b/TablePro/Views/Settings/AISettingsView.swift
@@ -213,7 +213,7 @@ struct AISettingsView: View {
     }
 
     private var orderedAddableTypes: [AIProviderType] {
-        [.copilot, .claude, .openAI, .openRouter, .gemini, .ollama]
+        [.copilot, .claude, .openAI, .openRouter, .openCode, .gemini, .ollama]
     }
 
     // MARK: - Inline Suggestions
@@ -312,7 +312,7 @@ struct AISettingsView: View {
         switch provider.type.authStyle {
         case .oauth:
             return copilotStatusText()
-        case .apiKey:
+        case .apiKey, .optionalApiKey:
             if provider.type == .custom {
                 return customStatusText(for: provider)
             }
@@ -356,7 +356,7 @@ struct AISettingsView: View {
 
     private func refreshKeyAvailability() {
         var ids: Set<UUID> = []
-        for provider in settings.providers where provider.type.authStyle == .apiKey {
+        for provider in settings.providers where provider.type.authStyle.usesAPIKey {
             if let key = AIKeyStorage.shared.loadAPIKey(for: provider.id), !key.isEmpty {
                 ids.insert(provider.id)
             }
@@ -379,7 +379,7 @@ struct AISettingsView: View {
     }
 
     private func saveProvider(_ provider: AIProviderConfig, apiKey: String, isNew: Bool) {
-        if provider.type.authStyle == .apiKey {
+        if provider.type.authStyle.usesAPIKey {
             AIKeyStorage.shared.saveAPIKey(apiKey, for: provider.id)
         }
 
diff --git a/TableProTests/Core/AI/StringAIEndpointTests.swift b/TableProTests/Core/AI/StringAIEndpointTests.swift
@@ -0,0 +1,39 @@
+//
+//  StringAIEndpointTests.swift
+//  TableProTests
+//
+//  Tests for AI endpoint path construction, including tolerance for base URLs
+//  that already include the /v1 version segment.
+//
+
+import Foundation
+import Testing
+
+@testable import TablePro
+
+@Suite("AI Endpoint Path")
+struct StringAIEndpointTests {
+    @Test("base without version gets /v1 appended")
+    func appendsVersionWhenMissing() {
+        #expect("https://api.openai.com".openAIPath("chat/completions") == "https://api.openai.com/v1/chat/completions")
+        #expect("https://openrouter.ai/api".openAIPath("chat/completions") == "https://openrouter.ai/api/v1/chat/completions")
+    }
+
+    @Test("base ending in /v1 is not doubled")
+    func doesNotDoubleVersion() {
+        #expect("https://opencode.ai/zen/v1".openAIPath("chat/completions") == "https://opencode.ai/zen/v1/chat/completions")
+        #expect("https://opencode.ai/zen/v1".openAIPath("models") == "https://opencode.ai/zen/v1/models")
+    }
+
+    @Test("base without /v1 resolves the OpenCode Zen path")
+    func openCodeZenWithoutVersion() {
+        #expect("https://opencode.ai/zen".openAIPath("chat/completions") == "https://opencode.ai/zen/v1/chat/completions")
+        #expect("https://opencode.ai/zen".openAIPath("models") == "https://opencode.ai/zen/v1/models")
+    }
+
+    @Test("trailing slash is normalized before building the path")
+    func normalizesTrailingSlash() {
+        #expect("https://opencode.ai/zen/v1/".openAIPath("models") == "https://opencode.ai/zen/v1/models")
+        #expect("https://api.openai.com/".openAIPath("models") == "https://api.openai.com/v1/models")
+    }
+}
diff --git a/docs/features/ai-assistant.mdx b/docs/features/ai-assistant.mdx
@@ -1,6 +1,6 @@
 ---
 title: AI Assistant
-description: "Built-in AI for SQL: chat with tool calling, inline suggestions, explain, optimize, fix-error. 7 providers."
+description: "Built-in AI for SQL: chat with tool calling, inline suggestions, explain, optimize, fix-error. 8 providers."
 ---
 
 # AI Assistant
@@ -28,7 +28,7 @@ Open **Settings** (`Cmd+,`) > **AI**. The tab is modeled on Xcode's Intelligence
 
 ### Add a Provider
 
-1. Click **Add Provider...** and pick a type: GitHub Copilot, Claude, OpenAI, OpenRouter, Gemini, Ollama, or a custom OpenAI-compatible endpoint.
+1. Click **Add Provider...** and pick a type: GitHub Copilot, Claude, OpenAI, OpenRouter, OpenCode Zen, Gemini, Ollama, or a custom OpenAI-compatible endpoint.
 2. Enter the API key, or run device-flow sign-in for Copilot.
 3. Enter a model name, or pick one from the fetched list. Click **Reload** if needed.
 4. Click **Test Connection**.
@@ -177,7 +177,7 @@ The cap is 10 tool round trips per turn. If you hit it, send a follow-up to cont
 | `execute_query` | Run `SELECT` / `INSERT` / `UPDATE` / `DELETE`. Multi-statement input rejected. Destructive DDL blocked. | Edit, Agent |
 | `confirm_destructive_operation` | Run destructive DDL after the model passes the verbatim phrase `I understand this is irreversible` | Agent |
 
-Provider support: Claude, OpenAI, OpenRouter, Gemini, Ollama (model-dependent), GitHub Copilot, and custom OpenAI-compatible endpoints.
+Provider support: Claude, OpenAI, OpenRouter, OpenCode Zen, Gemini, Ollama (model-dependent), GitHub Copilot, and custom OpenAI-compatible endpoints.
 
 ### Attach Context with `@`
 

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ final class OpenAICompatibleProvider: ChatTransport {`
`262`	`262`	`)`
`263`	`263`	`}`
`264`	`264`	`default:`
`265`		`- let chatPath = "/v1/chat/completions"`
`266`		`- guard let url = URL(string: "\(endpoint)\(chatPath)") else {`
	`265`	`+ guard let url = URL(string: endpoint.openAIPath("chat/completions")) else {`
`267`	`266`	`throw AIProviderError.invalidEndpoint(endpoint)`
`268`	`267`	`}`
`269`	`268`
`@@ -312,10 +311,10 @@ final class OpenAICompatibleProvider: ChatTransport {`
`312`	`311`	`turns: [ChatTurnWire],`
`313`	`312`	`options: ChatTransportOptions`
`314`	`313`	`) throws -> URLRequest {`
`315`		`- let chatPath = providerType == .ollama`
`316`		`- ? "/api/chat"`
`317`		`- : "/v1/chat/completions"`
`318`		`- guard let url = URL(string: "\(endpoint)\(chatPath)") else {`
	`314`	`+ let urlString = providerType == .ollama`
	`315`	`+ ? "\(endpoint)/api/chat"`
	`316`	`+ : endpoint.openAIPath("chat/completions")`
	`317`	`+ guard let url = URL(string: urlString) else {`
`319`	`318`	`throw AIProviderError.invalidEndpoint(endpoint)`
`320`	`319`	`}`
`321`	`320`
`@@ -481,7 +480,7 @@ final class OpenAICompatibleProvider: ChatTransport {`
`481`	`480`	`}`
`482`	`481`
`483`	`482`	`private func fetchOpenAIModels() async throws -> [String] {`
`484`		`- guard let url = URL(string: "\(endpoint)/v1/models") else {`
	`483`	`+ guard let url = URL(string: endpoint.openAIPath("models")) else {`
`485`	`484`	`throw AIProviderError.invalidEndpoint(endpoint)`
`486`	`485`	`}`
`487`	`486`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ enum AIProviderRegistration {`
`64`	`64`	`}`
`65`	`65`	`))`
`66`	`66`
`67`		`- for type in [AIProviderType.openRouter, .ollama, .custom] {`
	`67`	`+ for type in [AIProviderType.openRouter, .openCode, .ollama, .custom] {`
`68`	`68`	`registry.register(AIProviderDescriptor(`
`69`	`69`	`typeID: type.rawValue,`
`70`	`70`	`displayName: type.displayName,`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,9 @@ extension String {`
`9`	`9`	`func normalizedEndpoint() -> String {`
`10`	`10`	`hasSuffix("/") ? String(dropLast()) : self`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+ func openAIPath(_ resource: String) -> String {`
	`14`	`+ let base = normalizedEndpoint()`
	`15`	`+ return base.hasSuffix("/v1") ? "\(base)/\(resource)" : "\(base)/v1/\(resource)"`
	`16`	`+ }`
`12`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ struct AIProviderDetailSheet: View {`
`116`	`116`	`switch draft.type.authStyle {`
`117`	`117`	`case .apiKey:`
`118`	`118`	`return !apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty`
`119`		`- case .oauth, .none:`
	`119`	`+ case .optionalApiKey, .oauth, .none:`
`120`	`120`	`return true`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -132,7 +132,7 @@ struct AIProviderDetailSheet: View {`
`132`	`132`	`@ViewBuilder`
`133`	`133`	`private var authSection: some View {`
`134`	`134`	`switch draft.type.authStyle {`
`135`		`- case .apiKey:`
	`135`	`+ case .apiKey, .optionalApiKey:`
`136`	`136`	`apiKeyAuthSection`
`137`	`137`	`case .oauth:`
`138`	`138`	`copilotAuthSection`
`@@ -159,7 +159,7 @@ struct AIProviderDetailSheet: View {`
`159`	`159`	`Text("Test Connection")`
`160`	`160`	`}`
`161`	`161`	`}`
`162`		`- .disabled(isTesting \|\| apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)`
	`162`	`+ .disabled(isTesting \|\| (draft.type.authStyle == .apiKey && apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty))`
`163`	`163`	`}`
`164`	`164`	`if case .success = testResult {`
`165`	`165`	`Label(String(localized: "Connection successful"), systemImage: "checkmark.circle.fill")`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ struct AISettingsView: View {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`private var orderedAddableTypes: [AIProviderType] {`
`216`		`- [.copilot, .claude, .openAI, .openRouter, .gemini, .ollama]`
	`216`	`+ [.copilot, .claude, .openAI, .openRouter, .openCode, .gemini, .ollama]`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`// MARK: - Inline Suggestions`
`@@ -312,7 +312,7 @@ struct AISettingsView: View {`
`312`	`312`	`switch provider.type.authStyle {`
`313`	`313`	`case .oauth:`
`314`	`314`	`return copilotStatusText()`
`315`		`- case .apiKey:`
	`315`	`+ case .apiKey, .optionalApiKey:`
`316`	`316`	`if provider.type == .custom {`
`317`	`317`	`return customStatusText(for: provider)`
`318`	`318`	`}`
`@@ -356,7 +356,7 @@ struct AISettingsView: View {`
`356`	`356`
`357`	`357`	`private func refreshKeyAvailability() {`
`358`	`358`	`var ids: Set<UUID> = []`
`359`		`- for provider in settings.providers where provider.type.authStyle == .apiKey {`
	`359`	`+ for provider in settings.providers where provider.type.authStyle.usesAPIKey {`
`360`	`360`	`if let key = AIKeyStorage.shared.loadAPIKey(for: provider.id), !key.isEmpty {`
`361`	`361`	`ids.insert(provider.id)`
`362`	`362`	`}`
`@@ -379,7 +379,7 @@ struct AISettingsView: View {`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`private func saveProvider(_ provider: AIProviderConfig, apiKey: String, isNew: Bool) {`
`382`		`- if provider.type.authStyle == .apiKey {`
	`382`	`+ if provider.type.authStyle.usesAPIKey {`
`383`	`383`	`AIKeyStorage.shared.saveAPIKey(apiKey, for: provider.id)`
`384`	`384`	`}`
`385`	`385`