Merge branch 'hotfix/0.33.7'

Author: intitni

Core/Package.swift

@@ -83,6 +83,7 @@ let package = Package(
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "Workspace", package: "Tool"),
+                .product(name: "WorkspaceSuggestionService", package: "Tool"),
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
@@ -388,6 +389,7 @@ var isProIncluded: Bool {
         let rootURL = fileURL
             .deletingLastPathComponent()
             .deletingLastPathComponent()
+            .deletingLastPathComponent()
         let confURL = rootURL.appendingPathComponent("PLUS")
         return FileManager.default.fileExists(atPath: confURL.path)
     }

Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift

@@ -67,7 +67,7 @@ struct ChatSettingsGeneralSectionView: View {
                     case .browser:
                         Text("Open web page in browser").tag(mode)
                     case .codeiumChat:
-                        Text("Open Codeium chat tab (beta)").tag(mode)
+                        Text("Open Codeium chat tab").tag(mode)
                     }
                 }
             }

Core/Sources/SuggestionWidget/ChatPanelWindow.swift

@@ -47,7 +47,7 @@ final class ChatPanelWindow: WidgetWindow {
     ) {
         self.minimizeWindow = minimizeWindow
         super.init(
-            contentRect: .zero,
+            contentRect: .init(x: 0, y: 0, width: 300, height: 400),
             styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView],
             backing: .buffered,
             defer: false
@@ -82,9 +82,12 @@ final class ChatPanelWindow: WidgetWindow {
         setIsVisible(true)
         isPanelDisplayed = false
 
+        var wasDetached = false
         storeObserver.observe { [weak self] in
             guard let self else { return }
             let isDetached = store.isDetached
+            guard isDetached != wasDetached else { return }
+            wasDetached = isDetached
             Task { @MainActor in
                 if UserDefaults.shared.value(for: \.disableFloatOnTopWhenTheChatPanelIsDetached) {
                     self.setFloatOnTop(!isDetached)

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -418,7 +418,12 @@ extension WidgetWindowsController {
                     windows.widgetWindow.alphaValue = if noFocus {
                         0
                     } else if previousAppIsXcode {
-                        1
+                        if windows.chatPanelWindow.isFullscreen,
+                           windows.chatPanelWindow.isOnActiveSpace {
+                            0
+                        } else {
+                            1
+                        }
                     } else {
                         0
                     }
@@ -573,11 +578,11 @@ extension WidgetWindowsController {
 
     @MainActor
     func handleXcodeFullscreenChange() async {
-        guard let activeXcode = await XcodeInspector.shared.safe.activeXcode
-        else { return }
+        let activeXcode = await XcodeInspector.shared.safe.activeXcode
 
-        let xcode = activeXcode.appElement
-        let isFullscreen = if let xcodeWindow = xcode.focusedWindow {
+        let isFullscreen = if let xcode = activeXcode?.appElement,
+                              let xcodeWindow = xcode.focusedWindow
+        {
             xcodeWindow.isFullScreen && xcode.isFrontmost
         } else {
             false
@@ -593,10 +598,8 @@ extension WidgetWindowsController {
             $0.send(.didChangeActiveSpace(fullscreen: isFullscreen))
         }
 
-        if windows.fullscreenDetector.isOnActiveSpace {
-            if xcode.focusedWindow != nil {
-                windows.orderFront()
-            }
+        if windows.fullscreenDetector.isOnActiveSpace, isFullscreen {
+            windows.orderFront()
         }
     }
 }
@@ -856,6 +859,10 @@ class WidgetWindow: CanBecomeKeyWindow {
         [.fullScreenAuxiliary, .transient]
     }
 
+    var isFullscreen: Bool {
+        styleMask.contains(.fullScreen)
+    }
+
     private var state: State? {
         didSet {
             guard state != oldValue else { return }
@@ -885,3 +892,4 @@ func widgetLevel(_ addition: Int) -> NSWindow.Level {
     minimumWidgetLevel = NSWindow.Level.floating.rawValue
     return .init(minimumWidgetLevel + addition)
 }
+

Tool/Package.swift

@@ -27,7 +27,8 @@ let package = Package(
         .library(name: "Keychain", targets: ["Keychain"]),
         .library(name: "SharedUIComponents", targets: ["SharedUIComponents"]),
         .library(name: "UserDefaultsObserver", targets: ["UserDefaultsObserver"]),
-        .library(name: "Workspace", targets: ["Workspace", "WorkspaceSuggestionService"]),
+        .library(name: "Workspace", targets: ["Workspace"]),
+        .library(name: "WorkspaceSuggestionService", targets: ["WorkspaceSuggestionService"]),
         .library(
             name: "SuggestionProvider",
             targets: ["SuggestionProvider", "GitHubCopilotService", "CodeiumService"]

Tool/Sources/CodeiumService/ChatTab/CodeiumChatTab.swift

@@ -140,11 +140,11 @@ public class CodeiumChatTab: ChatTab {
     }
 
     public static func chatBuilders() -> [ChatTabBuilder] {
-        [Builder(title: "Codeium Chat (Beta)")]
+        [Builder(title: "Codeium Chat")]
     }
 
 	public static func defaultChatBuilder() -> ChatTabBuilder {
-        Builder(title: "Codeium Chat (Beta)")
+        Builder(title: "Codeium Chat")
     }
 }
 

Tool/Sources/CodeiumService/Services/CodeiumService.swift

@@ -351,6 +351,8 @@ extension CodeiumService: CodeiumSuggestionServiceType {
             URLQueryItem(name: "ide_version", value: metadata.ide_version),
             URLQueryItem(name: "web_server_url", value: webServerUrl),
             URLQueryItem(name: "ide_telemetry_enabled", value: "true"),
+            URLQueryItem(name: "has_enterprise_extension", value: String(UserDefaults.shared.value(for: \.codeiumEnterpriseMode))),
+            URLQueryItem(name: "has_index_service", value: String(UserDefaults.shared.value(for: \.codeiumIndexEnabled)))
         ]
 
         if let url = components.url {