Update configurations

Author: intitni

Config.debug.xcconfig

@@ -1,10 +1,13 @@
 #include "Version.xcconfig"
 SLASH = /
 
-PRODUCT_NAME = Copilot for Xcode Dev
 HOST_APP_NAME = Copilot for Xcode Dev
 BUNDLE_IDENTIFIER_BASE = dev.com.intii.CopilotForXcode
-EXTENSION_BUNDLE_NAME = Copilot Dev
 SPARKLE_FEED_URL = http:$(SLASH)$(SLASH)127.0.0.1:9433/appcast.xml
 SPARKLE_PUBLIC_KEY = WDzm5GHnc6c8kjeJEgX5GuGiPpW6Lc/ovGjLnrrZvPY=
 APPLICATION_SUPPORT_FOLDER = dev.com.intii.CopilotForXcode
+EXTENSION_BUNDLE_NAME = Copilot
+EXTENSION_BUNDLE_DISPLAY_NAME = Copilot Dev
+EXTENSION_SERVICE_NAME = CopilotForXcodeExtensionService
+
+// see also target Configs

Config.xcconfig

@@ -3,7 +3,11 @@ SLASH = /
 
 HOST_APP_NAME = Copilot for Xcode
 BUNDLE_IDENTIFIER_BASE = com.intii.CopilotForXcode
-EXTENSION_BUNDLE_NAME = Copilot
 SPARKLE_FEED_URL = https:$(SLASH)$(SLASH)raw.githubusercontent.com/intitni/CopilotForXcode/main/appcast.xml
 SPARKLE_PUBLIC_KEY = WDzm5GHnc6c8kjeJEgX5GuGiPpW6Lc/ovGjLnrrZvPY=
 APPLICATION_SUPPORT_FOLDER = com.intii.CopilotForXcode
+EXTENSION_BUNDLE_NAME = Copilot
+EXTENSION_BUNDLE_DISPLAY_NAME = Copilot
+EXTENSION_SERVICE_NAME = CopilotForXcodeExtensionService
+
+// see also target Configs

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -754,7 +754,7 @@
 				MARKETING_VERSION = "$(APP_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
 				PRODUCT_MODULE_NAME = Copilot_for_Xcode;
-				PRODUCT_NAME = "Copilot for Xcode Dev";
+				PRODUCT_NAME = "$(HOST_APP_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 			};
@@ -785,7 +785,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = "$(APP_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
-				PRODUCT_NAME = "Copilot for Xcode";
+				PRODUCT_NAME = "$(HOST_APP_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 			};
@@ -842,7 +842,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = "$(APP_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
-				PRODUCT_NAME = "CopilotForXcode$(TARGET_NAME)";
+				PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -874,7 +874,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = "$(APP_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
-				PRODUCT_NAME = "CopilotForXcode$(TARGET_NAME)";
+				PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

Core/Package.swift

@@ -115,7 +115,7 @@ let package = Package(
                 "SuggestionService",
             ]
         ),
-        .target(name: "Preferences"),
+        .target(name: "Preferences", dependencies: ["Configs"]),
 
         // MARK: - Host App
 
@@ -202,6 +202,7 @@ let package = Package(
 
         // MARK: - Helpers
 
+        .target(name: "Configs"),
         .target(name: "CGEventObserver"),
         .target(name: "Logger"),
         .target(name: "FileChangeChecker"),
@@ -261,7 +262,8 @@ let package = Package(
                 "SuggestionModel",
                 "Preferences",
                 "KeychainAccess",
-                "Terminal"
+                "Terminal",
+                "Configs",
             ]
         ),
     ]

Core/Sources/CodeiumService/CodeiumAuthService.swift

@@ -1,3 +1,4 @@
+import Configs
 import Foundation
 import KeychainAccess
 
@@ -6,10 +7,7 @@ public final class CodeiumAuthService {
     let codeiumKeyKey = "codeiumKey"
     let keychain: Keychain = {
         let info = Bundle.main.infoDictionary
-        return Keychain(
-            service: info?["BUNDLE_IDENTIFIER_BASE"] as? String ?? "",
-            accessGroup: "\(info?["APP_ID_PREFIX"] as? String ?? "")\(info?["BUNDLE_IDENTIFIER_BASE"] as? String ?? "").Shared"
-        )
+        return Keychain(service: keychainService, accessGroup: keychainAccessGroup)
     }()
 
     var key: String? { try? keychain.getString(codeiumKeyKey) }

Core/Sources/Configs/Configurations.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+public var userDefaultSuiteName: String {
+    "5YKZ4Y3DAW.group.com.intii.CopilotForXcode"
+}
+
+public var keychainAccessGroup: String {
+    #if DEBUG
+    return "5YKZ4Y3DAW.dev.com.intii.CopilotForXcode.Shared"
+    #else
+    return "5YKZ4Y3DAW.com.intii.CopilotForXcode.Shared"
+    #endif
+}
+
+public var keychainService: String {
+    #if DEBUG
+    return "dev.com.intii.CopilotForXcode"
+    #else
+    return "com.intii.CopilotForXcode"
+    #endif
+}
+

Core/Sources/GitHubCopilotService/GitHubCopilotService.swift

@@ -40,7 +40,7 @@ protocol GitHubCopilotLSP {
 
 enum GitHubCopilotError: Error, LocalizedError {
     case languageServerNotInstalled
-    
+
     var errorDescription: String? {
         switch self {
         case .languageServerNotInstalled:
@@ -68,7 +68,7 @@ public class GitHubCopilotBaseService {
             }
             let executionParams: Process.ExecutionParameters
             let runner = UserDefaults.shared.value(for: \.runNodeWith)
-            
+
             let agentJSURL = urls.executableURL.appendingPathComponent("copilot/dist/agent.js")
             guard FileManager.default.fileExists(atPath: agentJSURL.path) else {
                 throw GitHubCopilotError.languageServerNotInstalled
@@ -141,7 +141,11 @@ public class GitHubCopilotBaseService {
 
                 return InitializeParams(
                     processId: Int(ProcessInfo.processInfo.processIdentifier),
-                    clientInfo: .init(name: "Copilot for Xcode"),
+                    clientInfo: .init(
+                        name: Bundle.main
+                            .object(forInfoDictionaryKey: "HOST_APP_NAME") as? String
+                            ?? "Copilot for Xcode"
+                    ),
                     locale: nil,
                     rootPath: projectRootURL.path,
                     rootUri: projectRootURL.path,

Core/Sources/HostApp/GeneralView.swift

@@ -26,8 +26,12 @@ struct AppInfoView: View {
     var body: some View {
         VStack(alignment: .leading) {
             HStack(alignment: .top) {
-                Text("Copilot For Xcode")
-                    .font(.title)
+                Text(
+                    Bundle.main
+                        .object(forInfoDictionaryKey: "HOST_APP_NAME") as? String
+                        ?? "Copilot for Xcode"
+                )
+                .font(.title)
                 Text(appVersion ?? "")
                     .font(.footnote)
                     .foregroundColor(.secondary)
@@ -228,7 +232,7 @@ struct GeneralSettingsView: View {
             )) {
                 Text("Automatically Check for Update")
             }
-            
+
             Picker(selection: $settings.suggestionWidgetPositionMode) {
                 ForEach(SuggestionWidgetPositionMode.allCases, id: \.rawValue) {
                     switch $0 {

Core/Sources/Preferences/UserDefaults.swift

@@ -1,7 +1,8 @@
 import Foundation
+import Configs
 
 public extension UserDefaults {
-    static var shared = UserDefaults(suiteName: "5YKZ4Y3DAW.group.com.intii.CopilotForXcode")!
+    static var shared = UserDefaults(suiteName: userDefaultSuiteName)!
 
     static func setupDefaultSettings() {
         shared.setupDefaultValue(for: \.quitXPCServiceOnXcodeAndAppQuit)

EditorExtension/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>$(EXTENSION_BUNDLE_NAME)</string>
+	<string>$(EXTENSION_BUNDLE_DISPLAY_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>