[pull] main from intitni:main

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -958,6 +958,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Copilot-for-Xcode-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -991,6 +992,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Copilot-for-Xcode-Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				LD_RUNPATH_SEARCH_PATHS = (

Copilot-for-Xcode-Info.plist

@@ -12,6 +12,11 @@
 	<string>$(EXTENSION_BUNDLE_NAME)</string>
 	<key>HOST_APP_NAME</key>
 	<string>$(HOST_APP_NAME)</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>SUEnableJavaScript</key>
 	<string>YES</string>
 	<key>SUFeedURL</key>

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -72,7 +72,7 @@ struct ChatContextMenu: View {
     var chatModel: some View {
         let allModels = chatModels + [.init(
             id: "com.github.copilot",
-            name: "GitHub Copilot as chat model",
+            name: "GitHub Copilot Language Server",
             format: .openAI,
             info: .init()
         )]

Core/Sources/ChatService/AllPlugins.swift

@@ -94,6 +94,8 @@ final class LegacyChatPluginWrapper<Plugin: ChatPlugin>: LegacyChatPlugin {
                     break
                 case .startNewMessage:
                     break
+                case .reasoning:
+                    break
                 }
 
                 await chatGPTService.memory.mutateHistory { history in

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift

@@ -33,6 +33,7 @@ struct ChatModelEdit {
         var openAIProjectID: String = ""
         var customHeaders: [ChatModel.Info.CustomHeaderInfo.HeaderField] = []
         var openAICompatibleSupportsMultipartMessageContent = true
+        var requiresBeginWithUserMessage = false
     }
 
     enum Action: Equatable, BindableAction {
@@ -45,10 +46,44 @@ struct ChatModelEdit {
         case testSucceeded(String)
         case testFailed(String)
         case checkSuggestedMaxTokens
+        case selectModelFormat(ModelFormat)
         case apiKeySelection(APIKeySelection.Action)
         case baseURLSelection(BaseURLSelection.Action)
     }
 
+    enum ModelFormat: CaseIterable {
+        case openAI
+        case azureOpenAI
+        case googleAI
+        case ollama
+        case claude
+        case gitHubCopilot
+        case openAICompatible
+        case deepSeekOpenAICompatible
+        case openRouterOpenAICompatible
+        case grokOpenAICompatible
+        case mistralOpenAICompatible
+
+        init(_ format: ChatModel.Format) {
+            switch format {
+            case .openAI:
+                self = .openAI
+            case .azureOpenAI:
+                self = .azureOpenAI
+            case .googleAI:
+                self = .googleAI
+            case .ollama:
+                self = .ollama
+            case .claude:
+                self = .claude
+            case .openAICompatible:
+                self = .openAICompatible
+            case .gitHubCopilot:
+                self = .gitHubCopilot
+            }
+        }
+    }
+
     var toast: (String, ToastType) -> Void {
         @Dependency(\.namespacedToast) var toast
         return {
@@ -164,11 +199,53 @@ struct ChatModelEdit {
                         state.suggestedMaxTokens = nil
                     }
                     return .none
+                case .gitHubCopilot:
+                    if let knownModel = AvailableGitHubCopilotModel(rawValue: state.modelName) {
+                        state.suggestedMaxTokens = knownModel.contextWindow
+                    } else {
+                        state.suggestedMaxTokens = nil
+                    }
+                    return .none
                 default:
                     state.suggestedMaxTokens = nil
                     return .none
                 }
 
+            case let .selectModelFormat(format):
+                switch format {
+                case .openAI:
+                    state.format = .openAI
+                case .azureOpenAI:
+                    state.format = .azureOpenAI
+                case .googleAI:
+                    state.format = .googleAI
+                case .ollama:
+                    state.format = .ollama
+                case .claude:
+                    state.format = .claude
+                case .gitHubCopilot:
+                    state.format = .gitHubCopilot
+                case .openAICompatible:
+                    state.format = .openAICompatible
+                case .deepSeekOpenAICompatible:
+                    state.format = .openAICompatible
+                    state.baseURLSelection.baseURL = "https://api.deepseek.com"
+                    state.baseURLSelection.isFullURL = false
+                case .openRouterOpenAICompatible:
+                    state.format = .openAICompatible
+                    state.baseURLSelection.baseURL = "https://openrouter.ai"
+                    state.baseURLSelection.isFullURL = false
+                case .grokOpenAICompatible:
+                    state.format = .openAICompatible
+                    state.baseURLSelection.baseURL = "https://api.x.ai"
+                    state.baseURLSelection.isFullURL = false
+                case .mistralOpenAICompatible:
+                    state.format = .openAICompatible
+                    state.baseURLSelection.baseURL = "https://api.mistral.ai"
+                    state.baseURLSelection.isFullURL = false
+                }
+                return .none
+
             case .apiKeySelection:
                 return .none
 
@@ -208,7 +285,7 @@ extension ChatModel {
                     switch state.format {
                     case .googleAI, .ollama, .claude:
                         return false
-                    case .azureOpenAI, .openAI, .openAICompatible:
+                    case .azureOpenAI, .openAI, .openAICompatible, .gitHubCopilot:
                         return state.supportsFunctionCalling
                     }
                 }(),
@@ -222,7 +299,8 @@ extension ChatModel {
                 openAICompatibleInfo: .init(
                     enforceMessageOrder: state.enforceMessageOrder,
                     supportsMultipartMessageContent: state
-                        .openAICompatibleSupportsMultipartMessageContent
+                        .openAICompatibleSupportsMultipartMessageContent,
+                    requiresBeginWithUserMessage: state.requiresBeginWithUserMessage
                 ),
                 customHeaderInfo: .init(headers: state.customHeaders)
             )
@@ -249,7 +327,8 @@ extension ChatModel {
             openAIProjectID: info.openAIInfo.projectID,
             customHeaders: info.customHeaderInfo.headers,
             openAICompatibleSupportsMultipartMessageContent: info.openAICompatibleInfo
-                .supportsMultipartMessageContent
+                .supportsMultipartMessageContent,
+            requiresBeginWithUserMessage: info.openAICompatibleInfo.requiresBeginWithUserMessage
         )
     }
 }

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -29,6 +29,8 @@ struct ChatModelEditView: View {
                             OllamaForm(store: store)
                         case .claude:
                             ClaudeForm(store: store)
+                        case .gitHubCopilot:
+                            GitHubCopilotForm(store: store)
                         }
                     }
                     .padding()
@@ -86,31 +88,44 @@ struct ChatModelEditView: View {
         var body: some View {
             WithPerceptionTracking {
                 Picker(
-                    selection: $store.format,
+                    selection: Binding(
+                        get: { .init(store.format) },
+                        set: { store.send(.selectModelFormat($0)) }
+                    ),
                     content: {
                         ForEach(
-                            ChatModel.Format.allCases,
-                            id: \.rawValue
+                            ChatModelEdit.ModelFormat.allCases,
+                            id: \.self
                         ) { format in
                             switch format {
                             case .openAI:
-                                Text("OpenAI").tag(format)
+                                Text("OpenAI")
                             case .azureOpenAI:
-                                Text("Azure OpenAI").tag(format)
+                                Text("Azure OpenAI")
                             case .openAICompatible:
-                                Text("OpenAI Compatible").tag(format)
+                                Text("OpenAI Compatible")
                             case .googleAI:
-                                Text("Google Generative AI").tag(format)
+                                Text("Google AI")
                             case .ollama:
-                                Text("Ollama").tag(format)
+                                Text("Ollama")
                             case .claude:
-                                Text("Claude").tag(format)
+                                Text("Claude")
+                            case .gitHubCopilot:
+                                Text("GitHub Copilot")
+                            case .deepSeekOpenAICompatible:
+                                Text("DeepSeek (OpenAI Compatible)")
+                            case .openRouterOpenAICompatible:
+                                Text("OpenRouter (OpenAI Compatible)")
+                            case .grokOpenAICompatible:
+                                Text("Grok (OpenAI Compatible)")
+                            case .mistralOpenAICompatible:
+                                Text("Mistral (OpenAI Compatible)")
                             }
                         }
                     },
                     label: { Text("Format") }
                 )
-                .pickerStyle(.segmented)
+                .pickerStyle(.menu)
             }
         }
     }
@@ -243,7 +258,7 @@ struct ChatModelEditView: View {
 
                 MaxTokensTextField(store: store)
                 SupportsFunctionCallingToggle(store: store)
-                
+
                 TextField(text: $store.openAIOrganizationID, prompt: Text("Optional")) {
                     Text("Organization ID")
                 }
@@ -321,11 +336,15 @@ struct ChatModelEditView: View {
                 Toggle(isOn: $store.enforceMessageOrder) {
                     Text("Enforce message order to be user/assistant alternated")
                 }
-                
+
                 Toggle(isOn: $store.openAICompatibleSupportsMultipartMessageContent) {
                     Text("Support multi-part message content")
                 }
 
+                Toggle(isOn: $store.requiresBeginWithUserMessage) {
+                    Text("Requires the first message to be from the user")
+                }
+
                 Button("Custom Headers") {
                     isEditingCustomHeader.toggle()
                 }
@@ -375,12 +394,16 @@ struct ChatModelEditView: View {
 
     struct OllamaForm: View {
         @Perception.Bindable var store: StoreOf<ChatModelEdit>
+        @State var isEditingCustomHeader = false
+
         var body: some View {
             WithPerceptionTracking {
                 BaseURLTextField(store: store, prompt: Text("http://127.0.0.1:11434")) {
                     Text("/api/chat")
                 }
 
+                ApiKeyNamePicker(store: store)
+
                 TextField("Model Name", text: $store.modelName)
 
                 MaxTokensTextField(store: store)
@@ -389,12 +412,19 @@ struct ChatModelEditView: View {
                     Text("Keep Alive")
                 }
 
+                Button("Custom Headers") {
+                    isEditingCustomHeader.toggle()
+                }
+
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
                         " For more details, please visit [https://ollama.com](https://ollama.com)."
                     )
                 }
                 .padding(.vertical)
+
+            }.sheet(isPresented: $isEditingCustomHeader) {
+                CustomHeaderSettingsView(headers: $store.customHeaders)
             }
         }
     }
@@ -442,6 +472,61 @@ struct ChatModelEditView: View {
             }
         }
     }
+
+    struct GitHubCopilotForm: View {
+        @Perception.Bindable var store: StoreOf<ChatModelEdit>
+        @State var isEditingCustomHeader = false
+
+        var body: some View {
+            WithPerceptionTracking {
+                TextField("Model Name", text: $store.modelName)
+                    .overlay(alignment: .trailing) {
+                        Picker(
+                            "",
+                            selection: $store.modelName,
+                            content: {
+                                if AvailableGitHubCopilotModel(rawValue: store.modelName) == nil {
+                                    Text("Custom Model").tag(store.modelName)
+                                }
+                                ForEach(AvailableGitHubCopilotModel.allCases, id: \.self) { model in
+                                    Text(model.rawValue).tag(model.rawValue)
+                                }
+                            }
+                        )
+                        .frame(width: 20)
+                    }
+
+                MaxTokensTextField(store: store)
+                SupportsFunctionCallingToggle(store: store)
+
+                Toggle(isOn: $store.enforceMessageOrder) {
+                    Text("Enforce message order to be user/assistant alternated")
+                }
+
+                Toggle(isOn: $store.openAICompatibleSupportsMultipartMessageContent) {
+                    Text("Support multi-part message content")
+                }
+
+                Button("Custom Headers") {
+                    isEditingCustomHeader.toggle()
+                }
+
+                VStack(alignment: .leading, spacing: 8) {
+                    Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
+                        " Please login in the GitHub Copilot settings to use the model."
+                    )
+
+                    Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
+                        " This will call the APIs directly, which may not be allowed by GitHub. But it's used in other popular apps like Zed."
+                    )
+                }
+                .dynamicHeightTextInFormWorkaround()
+                .padding(.vertical)
+            }.sheet(isPresented: $isEditingCustomHeader) {
+                CustomHeaderSettingsView(headers: $store.customHeaders)
+            }
+        }
+    }
 }
 
 #Preview("OpenAI") {

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelManagement.swift

@@ -13,6 +13,7 @@ extension ChatModel: ManageableAIModel {
         case .googleAI: return "Google Generative AI"
         case .ollama: return "Ollama"
         case .claude: return "Claude"
+        case .gitHubCopilot: return "GitHub Copilot"
         }
     }