Revert "Pre-release 0.34.116"

This reverts commit 677f73f.

Author: hoangtu1sos1hot

.gitignore

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

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -255,10 +255,6 @@
 		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;
@@ -361,7 +357,6 @@
 				C81458AE293A009800135263 /* Config.debug.xcconfig */,
 				C8CD828229B88006008D044D /* TestPlan.xctestplan */,
 				C828B27D2B1F241500E7612A /* ExtensionPoint.appextensionpoint */,
-				9E6A029A2DBDF64200AB6BD5 /* Server */,
 				C81D181E2A1B509B006C1B70 /* Tool */,
 				C8189B282938979000C9DCDA /* Core */,
 				C8189B182938972F00C9DCDA /* Copilot for Xcode */,
@@ -705,21 +700,24 @@
 /* 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 = "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";
+			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";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Copilot for Xcode/App.swift

@@ -19,7 +19,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     enum LaunchMode {
         case chat
         case settings
-        case mcp
     }
 
     func applicationDidFinishLaunching(_ notification: Notification) {
@@ -47,8 +46,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         let launchArgs = CommandLine.arguments
         if launchArgs.contains("--settings") {
             return .settings
-        } else if launchArgs.contains("--mcp") {
-            return .mcp
         } else {
             return .chat
         }
@@ -58,16 +55,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         switch mode {
         case .settings:
             openSettings()
-        case .mcp:
-            openMCPSettings()
         case .chat:
             openChat()
         }
     }
 
     private func openSettings() {
         DispatchQueue.main.async {
-            activateAndOpenSettings()
+            NSApp.activate(ignoringOtherApps: true)
+            if #available(macOS 14.0, *) {
+                let environment = SettingsEnvironment()
+                environment.open()
+            } else if #available(macOS 13.0, *) {
+                NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
+            } else {
+                NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
+            }
         }
     }
 
@@ -80,13 +83,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    private func openMCPSettings() {
-        DispatchQueue.main.async {
-            activateAndOpenSettings()
-            hostAppStore.send(.setActiveTab(2))
-        }
-    }
-    
     @available(macOS 13.0, *)
     private func checkBackgroundPermissions() {
         Task {
@@ -175,18 +171,15 @@ struct CopilotForXcodeApp: App {
             queue: .main
         ) { _ in
             DispatchQueue.main.async {
-                activateAndOpenSettings()
-            }
-        }
-        
-        DistributedNotificationCenter.default().addObserver(
-            forName: .openMCPSettingsWindowRequest,
-            object: nil,
-            queue: .main
-        ) { _ in
-            DispatchQueue.main.async {
-                activateAndOpenSettings()
-                hostAppStore.send(.setActiveTab(2))
+                NSApp.activate(ignoringOtherApps: true)
+                if #available(macOS 14.0, *) {
+                    let environment = SettingsEnvironment()
+                    environment.open()
+                } else if #available(macOS 13.0, *) {
+                    NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
+                } else {
+                    NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
+                }
             }
         }
     }
@@ -204,17 +197,4 @@ struct CopilotForXcodeApp: App {
     }
 }
 
-@MainActor 
-func activateAndOpenSettings() {
-    NSApp.activate(ignoringOtherApps: true)
-    if #available(macOS 14.0, *) {
-        let environment = SettingsEnvironment()
-        environment.open()
-    } else if #available(macOS 13.0, *) {
-        NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
-    } else {
-        NSApp.sendAction(Selector(("showPreferencesWindow:")), to: nil, from: nil)
-    }
-}
-
 var isPreview: Bool { ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" }

Copilot for Xcode/Assets.xcassets/Color.colorset/Contents.json

@@ -3268,58 +3268,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\
 SOFTWARE.\
 \
 \
-Dependency: https://github.com/microsoft/monaco-editor\
-Version: 0.52.2\
-License Content:\
-The MIT License (MIT)\
-\
-Copyright (c) 2016 - present Microsoft Corporation\
-\
-Permission is hereby granted, free of charge, to any person obtaining a copy\
-of this software and associated documentation files (the "Software"), to deal\
-in the Software without restriction, including without limitation the rights\
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\
-copies of the Software, and to permit persons to whom the Software is\
-furnished to do so, subject to the following conditions:\
-\
-The above copyright notice and this permission notice shall be included in all\
-copies or substantial portions of the Software.\
-\
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\
-SOFTWARE.\
-\
-\
-Dependency: https://github.com/xtermjs/xterm.js\
-Version: @xterm/addon-fit@0.10.0, @xterm/xterm@5.5.0\
-License Content:\
-The MIT License (MIT)\
-\
-Copyright (c) 2017-2019, The xterm.js authors (https://github.com/xtermjs/xterm.js)\
-Copyright (c) 2014-2016, SourceLair Private Company (https://www.sourcelair.com)\
-Copyright (c) 2012-2013, Christopher Jeffrey (https://github.com/chjj/)\
-\
-Permission is hereby granted, free of charge, to any person obtaining a copy\
-of this software and associated documentation files (the "Software"), to deal\
-in the Software without restriction, including without limitation the rights\
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\
-copies of the Software, and to permit persons to whom the Software is\
-furnished to do so, subject to the following conditions:\
-\
-The above copyright notice and this permission notice shall be included in\
-all copies or substantial portions of the Software.\
-\
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\
-THE SOFTWARE.\
-\
-\
 }

Copilot for Xcode/Assets.xcassets/GroupBoxBackgroundColor.colorset/Contents.json

@@ -178,8 +178,7 @@ let package = Package(
                     .product(name: "AXHelper", package: "Tool"),
                     .product(name: "ConversationServiceProvider", package: "Tool"),
                     .product(name: "GitHubCopilotService", package: "Tool"),
-                    .product(name: "Workspace", package: "Tool"),
-                    .product(name: "Terminal", package: "Tool")
+                    .product(name: "Workspace", package: "Tool")
                 ]),
             .testTarget(
                 name: "ChatServiceTests",
@@ -199,8 +198,7 @@ let package = Package(
                     .product(name: "MarkdownUI", package: "swift-markdown-ui"),
                     .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
                     .product(name: "SwiftUIFlowLayout", package: "swiftui-flow-layout"),
-                    .product(name: "Persist", package: "Tool"),
-                    .product(name: "Terminal", package: "Tool")
+                    .product(name: "Persist", package: "Tool")
                 ]
             ),