Merge remote-tracking branch 'upstream/main'

Author: hashim2266

.github/actions/set-xcode-version/action.yml

@@ -6,7 +6,7 @@ inputs:
       Xcode version to use, in semver(ish)-style matching the format on the Actions runner image.
       See available versions at https://github.com/actions/runner-images/blame/main/images/macos/macos-14-Readme.md#xcode
     required: false
-    default: '15.3'
+    default: '16.2'
 outputs:
   xcode-path:
     description: "Path to current Xcode version"

.gitignore

@@ -117,6 +117,7 @@ Core/Package.resolved
 
 # Copilot language server
 Server/node_modules/
+Server/dist
 
 # Releases
 /releases/

CHANGELOG.md

@@ -0,0 +1,75 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 0.35.0 - May 19, 2025
+### Added
+- Launched Agent Mode. Copilot will automatically use multiple requests to edit files, run terminal commands, and fix errors.
+- Introduced Model Context Protocol (MCP) support in Agent Mode, allowing you to configure MCP tools to extend capabilities.
+
+### Changed
+- Added a button to enable/disable referencing current file in conversations
+- Added an animated progress icon in the response section
+- Refined onboarding experience with updated instruction screens and welcome views
+- Improved conversation reliability with extended timeout limits for agent requests
+
+### Fixed
+- Addressed critical error handling issues in core functionality
+- Resolved UI inconsistencies with chat interface padding adjustments
+- Implemented custom certificate handling using system environment variables `NODE_EXTRA_CA_CERTS` and `NODE_TLS_REJECT_UNAUTHORIZED`, fixing network access issues
+
+## 0.34.0 - April 29, 2025
+### Added
+- Added support for new models in Chat: OpenAI GPT-4.1, o3 and o4-mini, Gemini 2.5 Pro
+
+### Changed
+- Switched default model to GPT-4.1 for new installations
+- Enhanced model selection interface
+
+### Fixed
+- Resolved critical error handling issues
+
+## 0.33.0 - April 17, 2025
+### Added
+- Added support for new models in Chat: Claude 3.7 Sonnet and GPT 4.5
+- Implemented @workspace context feature allowing questions about the entire codebase in Copilot Chat
+
+### Changed
+- Simplified access to Copilot Chat from the Copilot for Xcode app with a single click
+- Enhanced instructions for granting background permissions
+
+### Fixed
+- Resolved false alarms for sign-in and free plan limit notifications
+- Improved app launch performance
+- Fixed workspace and context update issues
+
+## 0.32.0 - March 11, 2025 (General Availability)
+### Added
+- Implemented model picker for selecting LLM model in chat
+- Introduced new `/releaseNotes` slash command for accessing release information
+
+### Changed
+- Improved focus handling with automatic switching between chat text field and file search bar
+- Enhanced keyboard navigation support for file picker in chat context
+- Refined instructions for granting accessibility and extension permissions
+- Enhanced accessibility compliance for the chat window
+- Redesigned notification and status bar menu styles for better usability
+
+### Fixed
+- Resolved compatibility issues with macOS 12/13/14
+- Fixed handling of invalid workspace switch event '/'
+- Corrected chat attachment file picker to respect workspace scope
+- Improved icon display consistency across different themes
+- Added support for previously unsupported file types (.md, .txt) in attachments
+- Adjusted incorrect margins in chat window UI
+
+## 0.31.0 - February 11, 2025 (Public Preview)
+### Added
+- Added Copilot Chat support
+- Added GitHub Freeplan support
+- Implemented conversation and chat history management across multiple Xcode instances
+- Introduced multi-file context support for comprehensive code understanding
+- Added slash commands for specialized operations

CommunicationBridge/ServiceDelegate.swift

@@ -136,28 +136,100 @@ actor ExtensionServiceLauncher {
         isLaunching = true
 
         Logger.communicationBridge.info("Launching extension service app.")
-
-        NSWorkspace.shared.openApplication(
-            at: appURL,
-            configuration: {
-                let configuration = NSWorkspace.OpenConfiguration()
-                configuration.createsNewApplicationInstance = false
-                configuration.addsToRecentItems = false
-                configuration.activates = false
-                return configuration
-            }()
-        ) { app, error in
-            if let error = error {
-                Logger.communicationBridge.error(
-                    "Failed to launch extension service app: \(error)"
-                )
-            } else {
-                Logger.communicationBridge.info(
-                    "Finished launching extension service app."
-                )
+        
+        // First check if the app is already running
+        if let runningApp = NSWorkspace.shared.runningApplications.first(where: { 
+            $0.bundleIdentifier == appIdentifier 
+        }) {
+            Logger.communicationBridge.info("Extension service app already running with PID: \(runningApp.processIdentifier)")
+            self.application = runningApp
+            self.isLaunching = false
+            return
+        }
+        
+        // Implement a retry mechanism with exponential backoff
+        Task {
+            var retryCount = 0
+            let maxRetries = 3
+            var success = false
+            
+            while !success && retryCount < maxRetries {
+                do {
+                    // Add a delay between retries with exponential backoff
+                    if retryCount > 0 {
+                        let delaySeconds = pow(2.0, Double(retryCount - 1)) 
+                        Logger.communicationBridge.info("Retrying launch after \(delaySeconds) seconds (attempt \(retryCount + 1) of \(maxRetries))")
+                        try await Task.sleep(nanoseconds: UInt64(delaySeconds * 1_000_000_000))
+                    }
+                    
+                    // Use a task-based approach for launching with timeout
+                    let launchTask = Task<NSRunningApplication?, Error> { () -> NSRunningApplication? in
+                        return await withCheckedContinuation { continuation in
+                            NSWorkspace.shared.openApplication(
+                                at: appURL,
+                                configuration: {
+                                    let configuration = NSWorkspace.OpenConfiguration()
+                                    configuration.createsNewApplicationInstance = false
+                                    configuration.addsToRecentItems = false
+                                    configuration.activates = false
+                                    return configuration
+                                }()
+                            ) { app, error in
+                                if let error = error {
+                                    continuation.resume(returning: nil)
+                                } else {
+                                    continuation.resume(returning: app)
+                                }
+                            }
+                        }
+                    }
+                    
+                    // Set a timeout for the launch operation
+                    let timeoutTask = Task {
+                        try await Task.sleep(nanoseconds: 10_000_000_000) // 10 seconds
+                        return
+                    }
+                    
+                    // Wait for either the launch or the timeout
+                    let app = try await withTaskCancellationHandler {
+                        try await launchTask.value ?? nil
+                    } onCancel: {
+                        launchTask.cancel()
+                    }
+                    
+                    // Cancel the timeout task
+                    timeoutTask.cancel()
+                    
+                    if let app = app {
+                        // Success!
+                        self.application = app
+                        success = true
+                        break
+                    } else {
+                        // App is nil, retry
+                        retryCount += 1
+                        Logger.communicationBridge.info("Launch attempt \(retryCount) failed, app is nil")
+                    }
+                } catch {
+                    retryCount += 1
+                    Logger.communicationBridge.error("Error during launch attempt \(retryCount): \(error.localizedDescription)")
+                }
             }
-
-            self.application = app
+            
+            // Double-check we have a valid application
+            if !success && self.application == nil {
+                // After all retries, check once more if the app is running (it might have launched but we missed the callback)
+                if let runningApp = NSWorkspace.shared.runningApplications.first(where: { 
+                    $0.bundleIdentifier == appIdentifier 
+                }) {
+                    Logger.communicationBridge.info("Found running extension service after retries: \(runningApp.processIdentifier)")
+                    self.application = runningApp
+                    success = true
+                } else {
+                    Logger.communicationBridge.info("Failed to launch extension service after \(maxRetries) attempts")
+                }
+            }
+            
             self.isLaunching = false
         }
     }

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 70;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -255,6 +255,10 @@
 		C8F103292A7A365000D28F4F /* launchAgent.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = launchAgent.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFileSystemSynchronizedRootGroup section */
+		9E6A029A2DBDF64200AB6BD5 /* Server */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Server; sourceTree = SOURCE_ROOT; };
+/* End PBXFileSystemSynchronizedRootGroup section */
+
 /* Begin PBXFrameworksBuildPhase section */
 		C81458892939EFDC00135263 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
@@ -357,6 +361,7 @@
 				C81458AE293A009800135263 /* Config.debug.xcconfig */,
 				C8CD828229B88006008D044D /* TestPlan.xctestplan */,
 				C828B27D2B1F241500E7612A /* ExtensionPoint.appextensionpoint */,
+				9E6A029A2DBDF64200AB6BD5 /* Server */,
 				C81D181E2A1B509B006C1B70 /* Tool */,
 				C8189B282938979000C9DCDA /* Core */,
 				C8189B182938972F00C9DCDA /* Copilot for Xcode */,
@@ -700,24 +705,21 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3A60421A2C8955710006B34C /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/Server/package.json",
-				"$(SRCROOT)/Server/package-lock.json",
 			);
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(SRCROOT)/Server/node_modules/@github/copilot-language-server/native/darwin-x64/copilot-language-server",
-				"$(SRCROOT)/Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server-arm64",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "npm -C Server install\ncp Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server-arm64\n";
+			shellScript = "export PATH=/usr/local/bin:/opt/homebrew/bin:$PATH\n\nnpm -C Server install\ncp Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server Server/node_modules/@github/copilot-language-server/native/darwin-arm64/copilot-language-server-arm64\n\necho \"Build and copy webview js/html files as the bundle resources\"\nnpm -C Server run build\nmkdir -p \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources/webViewDist\"\ncp -R Server/dist/* \"${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources/webViewDist/\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */