Pre-release 0.45.155

Author: actions-user

Core/Sources/ChatService/ChatService.swift

@@ -162,7 +162,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
                 AgentRound(roundId: params.roundId,
                            reply: "",
                            toolCalls: [
-                            AgentToolCall(id: params.toolCallId, name: params.name, status: .waitForConfirmation, invokeParams: params)
+                            AgentToolCall(id: params.toolCallId, name: params.name, status: .waitForConfirmation, invokeParams: params, title: params.title)
                            ]
                           )
             ]

Core/Sources/ChatService/ToolCalls/InsertEditIntoFileTool.swift

@@ -8,6 +8,26 @@ import Logger
 import XcodeInspector
 import ChatAPIService
 
+public enum InsertEditError: LocalizedError {
+    case missingEditorElement(file: URL)
+    case openingApplicationUnavailable
+    case fileNotOpenedInXcode
+    case fileURLMismatch(expected: URL, actual: URL?)
+    
+    public var errorDescription: String? {
+        switch self {
+        case .missingEditorElement(let file):
+            return "Could not find source editor element for file \(file.lastPathComponent)."
+        case .openingApplicationUnavailable:
+            return "Failed to get the application that opened the file."
+        case .fileNotOpenedInXcode:
+            return "The file is not currently opened in Xcode."
+        case .fileURLMismatch(let expected, let actual):
+            return "The currently focused file URL \(actual?.lastPathComponent ?? "unknown") does not match the expected file URL \(expected.lastPathComponent)."
+        }
+    }
+}
+
 public class InsertEditIntoFileTool: ICopilotTool {
     public static let name = ToolName.insertEditIntoFile
 
@@ -89,16 +109,9 @@ public class InsertEditIntoFileTool: ICopilotTool {
         contextProvider: any ToolContextProvider,
         xcodeInstance: AppInstanceInspector
     ) throws -> String {
-        Thread.sleep(forTimeInterval: 0.5)
-        // Get the focused element directly from the app (like XcodeInspector does)
-        guard let focusedElement: AXUIElement = xcodeInstance.appElement.focusedElement
+        guard let editorElement = Self.getEditorElement(by: xcodeInstance, for: fileURL)
         else {
-            throw NSError(domain: "Failed to access xcode element", code: 0)
-        }
-        
-        // Find the source editor element using XcodeInspector's logic
-        guard let editorElement = focusedElement.findSourceEditorElement() else {
-            throw NSError(domain: "Could not find source editor element", code: 0)
+            throw InsertEditError.missingEditorElement(file: fileURL)
         }
 
         // Check if element supports kAXValueAttribute before reading
@@ -115,6 +128,8 @@ public class InsertEditIntoFileTool: ICopilotTool {
         let lines = value.components(separatedBy: .newlines)
 
         do {
+            try Self.checkOpenedFileURL(for: fileURL, xcodeInstance: xcodeInstance)
+                    
             try AXHelper().injectUpdatedCodeWithAccessibilityAPI(
                 .init(
                     content: content,
@@ -133,25 +148,8 @@ public class InsertEditIntoFileTool: ICopilotTool {
             throw error
         }
 
-        guard let refreshedFocusedElement: AXUIElement = xcodeInstance.appElement.focusedElement,
-              let refreshedEditorElement = refreshedFocusedElement.findSourceEditorElement()
-        else {
-            throw NSError(domain: "Failed to access xcode element", code: 0)
-        }
-        
         // Verify the content was applied by reading it back
-        do {
-            let newContent: String = try refreshedEditorElement.copyValue(key: kAXValueAttribute)
-            Logger.client.info("Successfully read back new content, length: \(newContent.count)")
-            
-            return newContent
-        } catch {
-            Logger.client.error("Failed to read back new content: \(error)")
-            if let axError = error as? AXError {
-                Logger.client.error("AX Error code when reading back: \(axError.rawValue)")
-            }
-            throw error
-        }
+        return try Self.getCurrentEditorContent(for: fileURL, by: xcodeInstance)
     }
 
     public static func applyEdit(
@@ -166,15 +164,15 @@ public class InsertEditIntoFileTool: ICopilotTool {
 
                 guard let app = app
                 else {
-                    throw NSError(domain: "Failed to get the app that opens file.", code: 0)
+                    throw InsertEditError.openingApplicationUnavailable
                 }
 
                 let appInstanceInspector = AppInstanceInspector(runningApplication: app)
                 guard appInstanceInspector.isXcode
                 else {
-                    throw NSError(domain: "The file is not opened in Xcode.", code: 0)
+                    throw InsertEditError.fileNotOpenedInXcode
                 }
-                
+                                
                 let newContent = try applyEdit(
                     for: fileURL,
                     content: content,
@@ -192,4 +190,61 @@ public class InsertEditIntoFileTool: ICopilotTool {
             }
         }
     }
+    
+    /// Get the source editor element with retries for specific file URL
+    private static func getEditorElement(
+        by xcodeInstance: AppInstanceInspector,
+        for fileURL: URL,
+        retryTimes: Int = 6,
+        delay: TimeInterval = 0.5
+    ) -> AXUIElement? {
+        var remainingAttempts = max(1, retryTimes)
+        
+        while remainingAttempts > 0 {
+            guard let realtimeURL = xcodeInstance.appElement.realtimeDocumentURL,
+                  realtimeURL == fileURL,
+                  let focusedElement = xcodeInstance.appElement.focusedElement,
+                  let editorElement = focusedElement.findSourceEditorElement()
+            else {
+                if remainingAttempts > 1 {
+                    Thread.sleep(forTimeInterval: delay)
+                }
+                
+                remainingAttempts -= 1
+                continue
+            }
+            
+            return editorElement
+        }
+        
+        Logger.client.error("Editor element not found for \(fileURL.lastPathComponent) after \(retryTimes) attempts.")
+        return nil
+    }
+
+    // Check if current opened file is the target URL
+    private static func checkOpenedFileURL(
+        for fileURL: URL,
+        xcodeInstance: AppInstanceInspector
+    ) throws {
+        let realtimeDocumentURL = xcodeInstance.realtimeDocumentURL
+        
+        if realtimeDocumentURL != fileURL {
+            throw InsertEditError.fileURLMismatch(expected: fileURL, actual: realtimeDocumentURL)
+        }
+    }
+    
+    private static func getCurrentEditorContent(for fileURL: URL, by xcodeInstance: AppInstanceInspector) throws -> String {
+        guard let editorElement = getEditorElement(by: xcodeInstance, for: fileURL, retryTimes: 1)
+        else {
+            throw InsertEditError.missingEditorElement(file: fileURL)
+        }
+        
+        return try editorElement.copyValue(key: kAXValueAttribute)
+    }
+}
+
+private extension AppInstanceInspector {
+    var realtimeDocumentURL: URL? {
+        appElement.realtimeDocumentURL
+    }
 }

Core/Sources/ConversationTab/FilePicker.swift

@@ -203,9 +203,8 @@ struct FileRowView: View {
 
     var body: some View {
         WithPerceptionTracking {
-            HStack {
+            HStack(alignment: .center) {
                 drawFileIcon(ref.url, isDirectory: ref.isDirectory)
-                    .resizable()
                     .scaledToFit()
                     .scaledFrame(width: 16, height: 16)
                     .hoverSecondaryForeground(isHovered: selectedId == id)

Core/Sources/ConversationTab/ModeAndModelPicker/ModeAndModelPickerPicker.swift

@@ -116,8 +116,8 @@ struct ModeAndModelPicker: View {
 
         for model in models {
             let multiplierText = ModelMenuItemFormatter.getMultiplierText(for: model)
-            newCache[model.modelName.appending(model.providerName ?? "")] = multiplierText
-            
+            newCache[model.id.appending(model.providerName ?? "")] = multiplierText
+
             let displayName = "✓ \(model.displayName ?? model.modelName)"
             let displayNameWidth = displayName.size(withAttributes: attributes).width
             let multiplierWidth = multiplierText.isEmpty ? 0 : multiplierText.size(withAttributes: attributes).width
@@ -328,7 +328,7 @@ struct ModeAndModelPicker: View {
             Text(createModelMenuItemAttributedString(
                 modelName: model.displayName ?? model.modelName,
                 isSelected: selectedModel == model,
-                cachedMultiplierText: currentCache.modelMultiplierCache[model.modelName.appending(model.providerName ?? "")] ?? ""
+                cachedMultiplierText: currentCache.modelMultiplierCache[model.id.appending(model.providerName ?? "")] ?? ""
             ))
         }
         .help(

Core/Sources/ConversationTab/ModeAndModelPicker/ModelManagerUtils.swift

@@ -26,7 +26,8 @@ public extension AppState {
         }
 
         guard let modelName = savedModel["modelName"]?.stringValue,
-              let modelFamily = savedModel["modelFamily"]?.stringValue else {
+              let modelFamily = savedModel["modelFamily"]?.stringValue,
+              let id = savedModel["id"]?.stringValue else {
             return nil
         }
 
@@ -48,6 +49,7 @@ public extension AppState {
             displayName: displayName,
             modelName: modelName,
             modelFamily: modelFamily,
+            id: id,
             billing: billing,
             providerName: providerName,
             supportVision: supportVision
@@ -149,7 +151,8 @@ public class CopilotModelManagerObservable: ObservableObject {
                     AppState.shared.setSelectedModel(
                         .init(
                             modelName: fallbackModel.modelName,
-                            modelFamily: fallbackModel.id,
+                            modelFamily: fallbackModel.modelFamily,
+                            id: fallbackModel.id,
                             billing: fallbackModel.billing,
                             supportVision: fallbackModel.capabilities.supports.vision
                         )
@@ -170,6 +173,7 @@ public extension CopilotModelManager {
             return LLMModel(
                 modelName: $0.modelName,
                 modelFamily: $0.isChatFallback ? $0.id : $0.modelFamily,
+                id: $0.id,
                 billing: $0.billing,
                 supportVision: $0.capabilities.supports.vision
             )
@@ -185,6 +189,7 @@ public extension CopilotModelManager {
             return LLMModel(
                 modelName: defaultModel.modelName,
                 modelFamily: defaultModel.modelFamily,
+                id: defaultModel.id,
                 billing: defaultModel.billing,
                 supportVision: defaultModel.capabilities.supports.vision
             )
@@ -196,6 +201,7 @@ public extension CopilotModelManager {
             return LLMModel(
                 modelName: gpt4_1.modelName,
                 modelFamily: gpt4_1.modelFamily,
+                id: gpt4_1.id,
                 billing: gpt4_1.billing,
                 supportVision: gpt4_1.capabilities.supports.vision
             )
@@ -206,6 +212,7 @@ public extension CopilotModelManager {
             return LLMModel(
                 modelName: firstModel.modelName,
                 modelFamily: firstModel.modelFamily,
+                id: firstModel.id,
                 billing: firstModel.billing,
                 supportVision: firstModel.capabilities.supports.vision
             )
@@ -229,6 +236,7 @@ public extension BYOKModelManager {
                 displayName: $0.modelCapabilities?.name,
                 modelName: $0.modelId,
                 modelFamily: $0.modelId,
+                id: $0.modelId,
                 billing: nil,
                 providerName: $0.providerName.rawValue,
                 supportVision: $0.modelCapabilities?.vision ?? false
@@ -241,6 +249,7 @@ public struct LLMModel: Codable, Hashable, Equatable {
     public let displayName: String?
     public let modelName: String
     public let modelFamily: String
+    public let id: String
     public let billing: CopilotModelBilling?
     public let providerName: String?
     public let supportVision: Bool
@@ -249,13 +258,15 @@ public struct LLMModel: Codable, Hashable, Equatable {
         displayName: String? = nil,
         modelName: String,
         modelFamily: String,
+        id: String,
         billing: CopilotModelBilling?,
         providerName: String? = nil,
         supportVision: Bool
     ) {
         self.displayName = displayName
         self.modelName = modelName
         self.modelFamily = modelFamily
+        self.id = id
         self.billing = billing
         self.providerName = providerName
         self.supportVision = supportVision