[pull] main from intitni:main

Core/Package.swift

@@ -366,7 +366,6 @@ let package = Package(
 extension [Target.Dependency] {
     func pro(_ targetNames: [String]) -> [Target.Dependency] {
         if isProIncluded {
-            // include the pro package
             return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
         }
         return self
@@ -376,27 +375,22 @@ extension [Target.Dependency] {
 extension [Package.Dependency] {
     var pro: [Package.Dependency] {
         if isProIncluded {
-            // include the pro package
-            return self + [.package(path: "../../CopilotForXcodePro/Pro")]
+            return self + [.package(path: "../../Pro")]
         }
         return self
     }
 }
 
-let isProIncluded: Bool = {
+var isProIncluded: Bool {
     func isProIncluded(file: StaticString = #file) -> Bool {
         let filePath = "\(file)"
         let fileURL = URL(fileURLWithPath: filePath)
         let rootURL = fileURL
             .deletingLastPathComponent()
             .deletingLastPathComponent()
-            .deletingLastPathComponent()
         let confURL = rootURL.appendingPathComponent("PLUS")
-        if !FileManager.default.fileExists(atPath: confURL.path) {
-            return false
-        }
-        return true
+        return FileManager.default.fileExists(atPath: confURL.path)
     }
 
     return isProIncluded()
-}()
+}

Tool/Sources/CodeiumService/CodeiumExtension.swift

@@ -16,7 +16,7 @@ public final class CodeiumExtension: BuiltinExtension {
 
     public var suggestionServiceId: Preferences.BuiltInSuggestionFeatureProvider { .codeium }
 
-    public let suggestionService: CodeiumSuggestionService?
+    public let suggestionService: CodeiumSuggestionService
 
     public var chatTabTypes: [any ChatTab.Type] {
         [CodeiumChatTab.self]

Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift

@@ -8,12 +8,14 @@ import Preferences
 /// https://docs.anthropic.com/claude/reference/messages_post
 public actor ClaudeChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI {
     public enum KnownModel: String, CaseIterable {
+        case claude35Sonnet = "claude-3-5-sonnet-20240620"
         case claude3Opus = "claude-3-opus-20240229"
         case claude3Sonnet = "claude-3-sonnet-20240229"
         case claude3Haiku = "claude-3-haiku-20240307"
 
         public var contextWindow: Int {
             switch self {
+            case .claude35Sonnet: return 200_000
             case .claude3Opus: return 200_000
             case .claude3Sonnet: return 200_000
             case .claude3Haiku: return 200_000

Tool/Sources/Preferences/Types/GoogleGenerativeChatModel.swift

@@ -1,6 +1,8 @@
 import Foundation
 
 public enum GoogleGenerativeAIModel: String {
+    case gemini15Pro = "gemini-1.5-pro"
+    case gemini15Flash = "gemini-1.5-flash"
     case geminiPro = "gemini-pro"
 }
 
@@ -9,6 +11,10 @@ public extension GoogleGenerativeAIModel {
         switch self {
         case .geminiPro:
             return 32768
+        case .gemini15Flash:
+            return 1_048_576
+        case .gemini15Pro:
+            return 2_097_152
         }
     }
 }

Version.xcconfig

@@ -1,3 +1,3 @@
 APP_VERSION = 0.33.5
-APP_BUILD = 393
+APP_BUILD = 394