Pre-release 0.43.143

Author: actions-user

Core/Sources/ChatService/ChatService.swift

@@ -229,15 +229,12 @@ public final class ChatService: ChatServiceType, ObservableObject {
     }
 
     public func updateToolCallStatus(toolCallId: String, status: AgentToolCall.ToolCallStatus, payload: Any? = nil) {
-        if status == .cancelled {
-            resetOngoingRequest(with: .cancelled)
-            return
-        }
-
         // Send the tool call result back to the server
-        if let toolCallRequest = self.pendingToolCallRequests[toolCallId], status == .accepted {
+        if let toolCallRequest = self.pendingToolCallRequests[toolCallId], status == .accepted || status == .cancelled {
             self.pendingToolCallRequests.removeValue(forKey: toolCallId)
-            let toolResult = LanguageModelToolConfirmationResult(result: .Accept)
+            let toolResult = LanguageModelToolConfirmationResult(
+                result: status == .accepted ? .Accept : .Dismiss
+            )
             let jsonResult = try? JSONEncoder().encode(toolResult)
             let jsonValue = (try? JSONDecoder().decode(JSONValue.self, from: jsonResult ?? Data())) ?? JSONValue.null
             toolCallRequest.completion(

Core/Sources/ConversationTab/Chat.swift

@@ -784,9 +784,12 @@ struct Chat {
                     let chatContext: ChatContext = .from(message, projectURL: projectURL)
                     state.editor.setContext(chatContext, for: mode)
                     state.editorMode = mode
+                    let isReceivingMessage = service.isReceivingMessage
 
                     return .run { send in
-                        await send(.stopRespondingButtonTapped)
+                        if isReceivingMessage {
+                            await send(.stopRespondingButtonTapped)
+                        }
                     }
                 }
 

Core/Sources/ConversationTab/ChatPanel.swift

@@ -43,18 +43,20 @@ public struct ChatPanel: View {
                     if let _ = chat.history.last?.followUp {
                         ChatFollowUp(chat: chat)
                             .scaledPadding(.vertical, 8)
+                            .scaledPadding(.horizontal, 16)
                             .dimWithExitEditMode(chat)
                     }
                 }
 
                 if chat.fileEditMap.count > 0 {
                     WorkingSetView(chat: chat)
                         .dimWithExitEditMode(chat)
+                        .scaledPadding(.horizontal, 16)
                 }
 
                 ChatPanelInputArea(chat: chat, r: r, editorMode: .input)
-                    .chatPanelInputAreaPadding(.input)
                     .dimWithExitEditMode(chat)
+                    .scaledPadding(.horizontal, 16)
             }
             .scaledPadding(.vertical, 12)
             .background(Color.chatWindowBackgroundColor)
@@ -183,7 +185,7 @@ struct ChatPanelMessages: View {
                         }
                     }
                     .listStyle(.plain)
-                    .padding(.horizontal, -8)
+                    .scaledPadding(.leading, 8)
                     .listRowBackground(EmptyView())
                     .modify { view in
                         if #available(macOS 13.0, *) {
@@ -406,13 +408,15 @@ struct ChatHistory: View {
                                 // check point
                                 CheckPoint(chat: chat, messageId: message.id)
                                     .padding(.vertical, 8)
+                                    .padding(.trailing, 8)
                             }
                         }
 
                         // Show up check point for redo
                         if message.id == pendingCheckpointMessageId {
                             CheckPoint(chat: chat, messageId: message.id)
                                 .padding(.vertical, 8)
+                                .padding(.trailing, 8)
                         }
                     }
                     .dimWithExitEditMode(
@@ -445,6 +449,7 @@ struct ChatHistoryItem: View {
                     requestType: message.requestType
                 )
                 .scaledPadding(.leading, chat.editorMode.isEditingUserMessage && chat.editorMode.editingUserMessageId == message.id ? 0 : 20)
+                .scaledPadding(.trailing, 8)
             case .assistant:
                 BotMessage(
                     message: message,

Core/Sources/ConversationTab/ModelPicker/ModelPicker.swift

@@ -302,9 +302,13 @@ struct ModelPicker: View {
             HStack(spacing: 0) {
                 // Custom segmented control with color change
                 ChatModePicker(chatMode: $chatMode, onScopeChange: switchModelsForScope)
-                    .onAppear() {
+                    .onAppear {
                         updateAgentPicker()
                     }
+                    .onReceive(
+                        NotificationCenter.default.publisher(for: .gitHubCopilotChatModeDidChange)) { _ in
+                            updateAgentPicker()
+                    }
 
                 if chatMode == "Agent" {
                     mcpButton

Core/Sources/ConversationTab/TerminalViews/RunInTerminalToolView.swift

@@ -82,7 +82,7 @@ struct RunInTerminalToolView: View {
 
                     toolView
                 }
-                .padding(8)
+                .scaledPadding(8)
                 .cornerRadius(8)
                 .overlay(
                     RoundedRectangle(cornerRadius: 8)
@@ -123,7 +123,7 @@ struct RunInTerminalToolView: View {
                         Text(command!)
                             .textSelection(.enabled)
                             .scaledFont(size: chatFontSize, design: .monospaced)
-                            .padding(8)
+                            .scaledPadding(8)
                             .frame(maxWidth: .infinity, alignment: .leading)
                             .foregroundStyle(codeForegroundColor)
                             .background(codeBackgroundColor)
@@ -147,19 +147,23 @@ struct RunInTerminalToolView: View {
                         .frame(maxWidth: .infinity, alignment: .leading)
 
                     HStack {
-                        Button("Cancel") {
+                        Button(action: {
                             chat.send(.toolCallCancelled(tool.id))
+                        }) {
+                            Text("Skip")
+                                .scaledFont(.body)
                         }
-                        .scaledFont(.body)
-
-                        Button("Continue") {
+                        
+                        Button(action: {
                             chat.send(.toolCallAccepted(tool.id))
+                        }) {
+                            Text("Allow")
+                                .scaledFont(.body)
                         }
-                        .scaledFont(.body)
                         .buttonStyle(BorderedProminentButtonStyle())
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
-                    .padding(.top, 4)
+                    .scaledPadding(.top, 4)
                 }
             }
         }

Core/Sources/ConversationTab/ViewExtension.swift

@@ -84,18 +84,6 @@ extension View {
         self.hoverForeground(isHovered: isHovered, defaultColor: .secondary)
     }
 
-    // MARK: - Chat Panel Input Area
-    func chatPanelInputAreaPadding(_ mode: Chat.EditorMode) -> some View {
-        var trailingPadding: CGFloat
-        switch mode {
-        case .input:
-            trailingPadding = 16
-        case .editUserMessage:
-            trailingPadding = 8
-        }
-        return self.padding(.trailing, trailingPadding)
-    }
-    
     // MARK: - Editor Mode
 
     /// Dims the view when in edit mode and provides tap/keyboard exit functionality

Core/Sources/ConversationTab/Views/BotMessage.swift

@@ -387,7 +387,7 @@ private struct TurnStatusView: View {
     }
 
     private var cancelStatus: some View {
-        statusView(icon: "slash.circle", iconColor: .secondary, text: "Cancelled")
+        statusView(icon: "slash.circle", iconColor: .secondary, text: "Stopped")
     }
 
     private var errorStatus: some View {

Core/Sources/ConversationTab/Views/ChatPanelInputArea/InputAreaTextEditor.swift

@@ -211,7 +211,7 @@ struct InputAreaTextEditor: View {
             }
             .overlay {
                 RoundedRectangle(cornerRadius: 6)
-                    .stroke(Color(nsColor: .controlColor), lineWidth: 1)
+                    .stroke(.quaternary, lineWidth: 1)
             }
             .background {
                 if isEditorActive {
@@ -452,14 +452,22 @@ struct InputAreaTextEditor: View {
 
     @ViewBuilder
     func makeCurrentEditorView(_ ref: ConversationFileReference) -> some View {
+        let toggleTrailingPadding: CGFloat = {
+            if #available(macOS 26.0, *) {
+                return 8
+            } else {
+                return 4
+            }
+        }()
+        
         HStack(spacing: 0) {
             makeContextFileNameView(url: ref.url, isCurrentEditor: true, selection: ref.selection)
 
             Toggle("", isOn: $isCurrentEditorContextEnabled)
                 .toggleStyle(SwitchToggleStyle(tint: .blue))
                 .controlSize(.mini)
                 .frame(width: 34)
-                .padding(.trailing, 4)
+                .padding(.trailing, toggleTrailingPadding)
                 .onChange(of: isCurrentEditorContextEnabled) { newValue in
                     enableCurrentEditorContext = newValue
                 }

Core/Sources/ConversationTab/Views/ConversationAgentProgressView.swift

@@ -39,7 +39,6 @@ struct ProgressToolCalls: View {
                         RunInTerminalToolView(tool: tool, chat: chat)
                     } else if tool.invokeParams != nil && tool.status == .waitForConfirmation {
                         ToolConfirmationView(tool: tool, chat: chat)
-                            .scaledPadding(8)
                     } else {
                         ToolStatusItemView(tool: tool)
                     }
@@ -64,20 +63,26 @@ struct ToolConfirmationView: View {
                     .frame(maxWidth: .infinity, alignment: .leading)
 
                 HStack {
-                    Button("Cancel") {
+                    Button(action: {
                         chat.send(.toolCallCancelled(tool.id))
+                    }) {
+                        Text("Skip")
+                            .scaledFont(.body)
                     }
-                    .scaledFont(.body)
-
-                    Button("Continue") {
+                    
+                    Button(action: {
                         chat.send(.toolCallAccepted(tool.id))
+                    }) {
+                        Text("Allow")
+                            .scaledFont(.body)
                     }
                     .buttonStyle(BorderedProminentButtonStyle())
-                    .scaledFont(.body)
+                    
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .scaledPadding(.top, 4)
             }
+            .scaledPadding(8)
             .cornerRadius(8)
             .overlay(
                 RoundedRectangle(cornerRadius: 8)

Core/Sources/ConversationTab/Views/UserMessage.swift

@@ -112,7 +112,6 @@ private struct MessageInputArea: View {
             editorMode: editorMode
         )
         .frame(maxWidth: .infinity)
-        .chatPanelInputAreaPadding(editorMode)
     }
 }