@@ -5,6 +5,22 @@ 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.42.0 - September 3, 2025
+### Added
+- Support for Bring Your Own Keys (BYOK) with model providers including Azure, OpenAI, Anthropic, Gemini, Groq, and OpenRouter. See [BYOK.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/BYOK.md).
+- Use the current selection as chat context.
+- Add folders as chat context.
+- Shortcut to quickly fix errors in Xcode.
+- Support for custom instruction files at `.github/instructions/*.instructions.md`. See [CustomInstructions.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/CustomInstructions.md).
+- Support for prompt files at `.github/prompts/*.prompt.md`. See [PromptFiles.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/PromptFiles.md).
+- Use ↑/↓ keys to reuse previous chat context in the chat view.
+
+### Changed
+- Default chat mode is now set to “Agent”.
+
+### Fixed
+- Cannot copy url from Safari browser to chat view.
+
 ## 0.41.0 - August 14, 2025
 ### Added
 - Code review feature.
 
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "ai-model-16.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}
@@ -561,7 +561,7 @@ public final class ChatService: ChatServiceType, ObservableObject {
                 skillSet: skillSet,
                 references: lastUserRequest.references ?? [],
                 model: model != nil ? model : lastUserRequest.model,
-                modelProviderName: modelProviderName != nil ? modelProviderName : lastUserRequest.modelProviderName,
+                modelProviderName: modelProviderName,
                 agentMode: lastUserRequest.agentMode,
                 userLanguage: lastUserRequest.userLanguage,
                 turnId: id
@@ -793,7 +793,11 @@ public final class ChatService: ChatServiceType, ObservableObject {
                         }
                         do {
                             CopilotModelManager.switchToFallbackModel()
-                            try await resendMessage(id: progress.turnId, model: fallbackModel.id)
+                            try await resendMessage(
+                                id: progress.turnId,
+                                model: fallbackModel.id,
+                                modelProviderName: nil
+                            )
                         } catch {
                             Logger.gitHubCopilot.error(error)
                             resetOngoingRequest()
 
@@ -96,7 +96,7 @@ struct CreateCustomCopilotFileView: View {
             if fileAlreadyExists && !trimmedFileName.isEmpty {
                 Image(systemName: "xmark.circle.fill")
                     .foregroundColor(.red)
-                Text("'.github/\(promptType.directoryName)/\(trimmedFileName).\(promptType.fileExtension)' already exists")
+                Text("'.github/\(promptType.directoryName)/\(trimmedFileName)\(promptType.fileExtension)' already exists")
                     .font(.caption)
                     .foregroundColor(.red)
                     .lineLimit(2)
@@ -110,7 +110,7 @@ struct CreateCustomCopilotFileView: View {
                     .font(.caption)
                     .foregroundColor(.secondary)
             } else {
-                Text(".github/\(promptType.directoryName)/\(trimmedFileName).\(promptType.fileExtension)")
+                Text(".github/\(promptType.directoryName)/\(trimmedFileName)\(promptType.fileExtension)")
                     .font(.caption)
                     .foregroundColor(.secondary)
                     .lineLimit(2)
@@ -165,7 +165,7 @@ struct CreateCustomCopilotFileView: View {
         if FileManager.default.fileExists(atPath: filePath.path) {
             await MainActor.run {
                 self.fileAlreadyExists = true
-                toast("\(promptType.displayName) '\(trimmedFileName).\(promptType.fileExtension)' already exists", .warning)
+                toast("\(promptType.displayName) '\(trimmedFileName)\(promptType.fileExtension)' already exists", .warning)
             }
             return
         }
@@ -179,7 +179,7 @@ struct CreateCustomCopilotFileView: View {
             try promptType.defaultTemplate.write(to: filePath, atomically: true, encoding: .utf8)
 
             await MainActor.run {
-                toast("Created \(promptType.rawValue) file '\(trimmedFileName).\(promptType.fileExtension)'", .info)
+                toast("Created \(promptType.rawValue) file '\(trimmedFileName)\(promptType.fileExtension)'", .info)
                 NSWorkspace.shared.open(filePath)
                 self.isOpen.wrappedValue = false
             }
 
@@ -56,7 +56,7 @@ public enum PromptType: String, CaseIterable, Equatable {
         case .instructions:
             return "Configure `.github/instructions/*.instructions.md` files scoped to specific file patterns or tasks."
         case .prompt:
-            return "Configure `.github/prompts/*.prompt.md` files for reusable prompt templates."
+            return "Configure `.github/prompts/*.prompt.md` files for reusable prompts. Trigger with '/' commands in the Chat view."
         }
     }
 
@@ -74,7 +74,7 @@ public enum PromptType: String, CaseIterable, Equatable {
         case .prompt:
             return """
             ---
-            description: Tool Description
+            description: Prompt Description
             ---
             Define the task to achieve, including specific requirements, constraints, and success criteria.
 
 
@@ -150,6 +150,11 @@ struct ModelSheet: View {
                         vision: supportVision
                     )
                 )
+                
+                if let originalModel = existingModel, trimmedModelId != originalModel.modelId {
+                    // Delete existing model if the model ID has changed
+                    try await dataManager.deleteModel(originalModel)
+                }
 
                 try await dataManager.saveModel(modelParams)
                 dismiss()
 
@@ -27,13 +27,13 @@ public enum TabIndex: Int, CaseIterable {
         case .general: return "CopilotLogo"
         case .advanced: return "gearshape.2.fill"
         case .mcp: return "wrench.and.screwdriver.fill"
-        case .byok: return "cube"
+        case .byok: return "Model"
         }
     }
 
     var isSystemImage: Bool {
         switch self {
-        case .general: return false
+        case .general, .byok: return false
         default: return true
         }
     }
 
@@ -38,7 +38,7 @@ extension WidgetWindowsController {
     @MainActor
     func updateFixErrorPanelWindowLocation() async {
         guard let activeApp = await XcodeInspector.shared.safe.activeApplication,
-              activeApp.isXcode
+              (activeApp.isXcode || activeApp.isCopilotForXcodeExtensionService)
         else {
             hideFixErrorWindow()
             return
 
@@ -1,19 +1,20 @@
-### GitHub Copilot for Xcode 0.41.0
+### GitHub Copilot for Xcode 0.42.0
 
 **🚀 Highlights**
 
-* Code review feature.
-* Chat: Support for new model `GPT-5`.
-* Agent mode: Added support for new tool to read web URL contents.
-* Support disabling MCP when it's disabled by policy.
-* Support for opening MCP logs directly from the MCP settings page.
-* OAuth support for remote GitHub MCP server.
+* Support for Bring Your Own Keys (BYOK) with model providers including Azure, OpenAI, Anthropic, Gemini, Groq, and OpenRouter. See [BYOK.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/BYOK.md).
+* Support for custom instruction files at `.github/instructions/*.instructions.md`. See [CustomInstructions.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/CustomInstructions.md).
+* Support for prompt files at `.github/prompts/*.prompt.md`. See [PromptFiles.md](https://github.com/github/CopilotForXcode/blob/0.42.0/Docs/PromptFiles.md).
+* Default chat mode is now set to “Agent”.
+
 
 **💪 Improvements**
 
-* Performance: Improved instant-apply speed for edit_file tool.
+* Use the current selection as chat context.
+* Add folders as chat context.
+* Shortcut to quickly fix errors in Xcode.
+* Use ↑/↓ keys to reuse previous chat context in the chat view.
 
 **🛠️ Bug Fixes**
 
-* Chat Agent repeatedly reverts its own changes when editing the same file.
-* Performance: Avoid chat panel being stuck when sending a large text for chat.
+* Cannot copy url from Safari browser to chat view.
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,11 @@ struct ModelSheet: View {`
`150`	`150`	`vision: supportVision`
`151`	`151`	`)`
`152`	`152`	`)`
	`153`	`+`
	`154`	`+ if let originalModel = existingModel, trimmedModelId != originalModel.modelId {`
	`155`	`+ // Delete existing model if the model ID has changed`
	`156`	`+ try await dataManager.deleteModel(originalModel)`
	`157`	`+ }`
`153`	`158`
`154`	`159`	`try await dataManager.saveModel(modelParams)`
`155`	`160`	`dismiss()`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ public enum TabIndex: Int, CaseIterable {`
`27`	`27`	`case .general: return "CopilotLogo"`
`28`	`28`	`case .advanced: return "gearshape.2.fill"`
`29`	`29`	`case .mcp: return "wrench.and.screwdriver.fill"`
`30`		`- case .byok: return "cube"`
	`30`	`+ case .byok: return "Model"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`var isSystemImage: Bool {`
`35`	`35`	`switch self {`
`36`		`- case .general: return false`
	`36`	`+ case .general, .byok: return false`
`37`	`37`	`default: return true`
`38`	`38`	`}`
`39`	`39`	`}`