From 2ec8f63cacd20b4295c1b6fdc9dc8a7021facb47 Mon Sep 17 00:00:00 2001
From: Zaki Ali <zaki@squareup.com>
Date: Wed, 8 Jan 2025 21:29:51 -0800
Subject: [PATCH] Fixes after rebase

---
 ui/desktop/src/LauncherWindow.tsx      |   2 +-
 ui/desktop/src/components/MoreMenu.tsx | 162 ++++++++++++++-----------
 ui/desktop/src/goosed.ts               |   5 +-
 3 files changed, 92 insertions(+), 77 deletions(-)

diff --git a/ui/desktop/src/LauncherWindow.tsx b/ui/desktop/src/LauncherWindow.tsx
index c18916430..0d5b0589b 100644
--- a/ui/desktop/src/LauncherWindow.tsx
+++ b/ui/desktop/src/LauncherWindow.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useRef, useState } from 'react';
 
 declare global {
   interface Window {
diff --git a/ui/desktop/src/components/MoreMenu.tsx b/ui/desktop/src/components/MoreMenu.tsx
index f5094dc98..e0a69ab35 100644
--- a/ui/desktop/src/components/MoreMenu.tsx
+++ b/ui/desktop/src/components/MoreMenu.tsx
@@ -1,4 +1,12 @@
-import { useEffect, useState } from 'react';
+import {
+    Popover,
+    PopoverContent,
+    PopoverTrigger,
+    PopoverPortal,
+} from "@radix-ui/react-popover";
+import React, { useEffect, useState } from 'react';
+import { FaMoon, FaSun } from 'react-icons/fa';
+import VertDots from './ui/VertDots';
 
 interface VersionInfo {
     current_version: string;
@@ -115,81 +123,87 @@ export default function MoreMenu() {
                     <VertDots size={18}/>
                 </button>
             </PopoverTrigger>
-            <PopoverContent className="w-48 rounded-md" align="end">
-                <div className="flex flex-col bg-black text-white dark:bg-gray-800 rounded-md">
-                    <div className="flex items-center justify-between p-2">
-                        <span className="text-sm">Use System Theme</span>
-                        <input
-                            type="checkbox"
-                            checked={useSystemTheme}
-                            onChange={toggleUseSystemTheme}
-                        />
-                    </div>
-                    {!useSystemTheme && (<div className="flex items-center justify-between p-2">
-                        <span className="text-sm">{isDarkMode ? 'Dark Mode' : 'Light Mode'}</span>
-                        <button
-                            className={`relative inline-flex items-center h-6 rounded-full w-11 focus:outline-none border-2 ${isDarkMode
-                                ? 'bg-gray-600 border-gray-600'
-                                : 'bg-yellow-300 border-yellow-300'}`}
-                            onClick={() => toggleTheme()}>
-                            <span
-                                className={`inline-block w-4 h-4 transform bg-white rounded-full transition-transform ${isDarkMode
-                                    ? 'translate-x-6' : 'translate-x-1'}`}
-                            >
-                                {isDarkMode ? <FaMoon className="text-gray-200"/> : <FaSun
-                                    className="text-yellow-500"/>}
-                            </span>
-                        </button>
-                    </div>)}
-                    
-                    {/* Versions Menu */}
-                    {versions && versions.available_versions.length > 0 && (
-                        <>
+            <PopoverPortal>
+                <PopoverContent 
+                    className="z-[200] w-48 rounded-md bg-black text-white dark:bg-gray-800 shadow-lg" 
+                    align="end"
+                    sideOffset={5}
+                >
+                    <div className="flex flex-col rounded-md">
+                        <div className="flex items-center justify-between p-2">
+                            <span className="text-sm">Use System Theme</span>
+                            <input
+                                type="checkbox"
+                                checked={useSystemTheme}
+                                onChange={toggleUseSystemTheme}
+                            />
+                        </div>
+                        {!useSystemTheme && (<div className="flex items-center justify-between p-2">
+                            <span className="text-sm">{isDarkMode ? 'Dark Mode' : 'Light Mode'}</span>
                             <button
-                                onClick={() => setShowVersions(!showVersions)}
-                                className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700 flex justify-between items-center"
-                            >
-                                <span>Versions</span>
-                                <span className="text-xs">{showVersions ? '▼' : '▶'}</span>
+                                className={`relative inline-flex items-center h-6 rounded-full w-11 focus:outline-none border-2 ${isDarkMode
+                                    ? 'bg-gray-600 border-gray-600'
+                                    : 'bg-yellow-300 border-yellow-300'}`}
+                                onClick={() => toggleTheme()}>
+                                <span
+                                    className={`inline-block w-4 h-4 transform bg-white rounded-full transition-transform ${isDarkMode
+                                        ? 'translate-x-6' : 'translate-x-1'}`}
+                                >
+                                    {isDarkMode ? <FaMoon className="text-gray-200"/> : <FaSun
+                                        className="text-yellow-500"/>}
+                                </span>
                             </button>
-                            {showVersions && (
-                                <div className="pl-2 bg-gray-900">
-                                    {versions.available_versions.map((version) => (
-                                        <button
-                                            key={version}
-                                            onClick={() => handleVersionSelect(version)}
-                                            className={`w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700 ${
-                                                version === versions.current_version ? 'text-green-400' : ''
-                                            }`}
-                                        >
-                                            {version} {version === versions.current_version && '(current)'}
-                                        </button>
-                                    ))}
-                                </div>
-                            )}
-                        </>
-                    )}
-                    
-                    <button
-                        onClick={() => {
-                            setOpen(false);
-                            window.electron.directoryChooser();
-                        }}
-                        className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700"
-                    >
-                        Open Directory (cmd+O)
-                    </button>
-                    <button
-                        onClick={() => {
-                            setOpen(false);
-                            window.electron.createChatWindow();
-                        }}
-                        className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700"
-                    >
-                        New Session (cmd+N)
-                    </button>
-                </div>
-            </PopoverContent>
+                        </div>)}
+                        
+                        {/* Versions Menu */}
+                        {versions && versions.available_versions.length > 0 && (
+                            <>
+                                <button
+                                    onClick={() => setShowVersions(!showVersions)}
+                                    className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700 flex justify-between items-center"
+                                >
+                                    <span>Versions</span>
+                                    <span className="text-xs">{showVersions ? '▼' : '▶'}</span>
+                                </button>
+                                {showVersions && (
+                                    <div className="pl-2 bg-gray-900">
+                                        {versions.available_versions.map((version) => (
+                                            <button
+                                                key={version}
+                                                onClick={() => handleVersionSelect(version)}
+                                                className={`w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700 ${
+                                                    version === versions.current_version ? 'text-green-400' : ''
+                                                }`}
+                                            >
+                                                {version} {version === versions.current_version && '(current)'}
+                                            </button>
+                                        ))}
+                                    </div>
+                                )}
+                            </>
+                        )}
+                        
+                        <button
+                            onClick={() => {
+                                setOpen(false);
+                                window.electron.directoryChooser();
+                            }}
+                            className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700"
+                        >
+                            Open Directory (cmd+O)
+                        </button>
+                        <button
+                            onClick={() => {
+                                setOpen(false);
+                                window.electron.createChatWindow();
+                            }}
+                            className="w-full text-left px-2 py-1.5 text-sm hover:bg-gray-700"
+                        >
+                            New Session (cmd+N)
+                        </button>
+                    </div>
+                </PopoverContent>
+            </PopoverPortal>
         </Popover>
     );
 }
\ No newline at end of file
diff --git a/ui/desktop/src/goosed.ts b/ui/desktop/src/goosed.ts
index 64e98bb6d..041c8b1be 100644
--- a/ui/desktop/src/goosed.ts
+++ b/ui/desktop/src/goosed.ts
@@ -36,7 +36,7 @@ const fetchAgentVersion = async (port: number): Promise<string> => {
 
 // Goose process manager. Take in the app, port, and directory to start goosed in.
 // Check if goosed server is ready by polling the status endpoint
-const checkServerStatus = async (port: number, maxAttempts: number = 30, interval: number = 100): Promise<boolean> => {
+const checkServerStatus = async (port: number, maxAttempts: number = 60, interval: number = 100): Promise<boolean> => {
   const statusUrl = `http://127.0.0.1:${port}/status`;
   log.info(`Checking server status at ${statusUrl}`);
 
@@ -102,7 +102,7 @@ export const startGoosed = async (app, dir=null, env={}): Promise<[number, strin
   const processEnv = { ...process.env, ...additionalEnv };
 
   // Spawn the goosed process with the user's home directory as cwd
-  const goosedProcess = spawn(goosedPath, [], { cwd: dir, env: processEnv, stdio: ["ignore", "pipe", "pipe"] });
+  const goosedProcess = spawn(goosedPath, ["agent"], { cwd: dir, env: processEnv, stdio: ["ignore", "pipe", "pipe"] });
 
   goosedProcess.stdout.on('data', (data) => {
     log.info(`goosed stdout for port ${port} and dir ${dir}: ${data.toString()}`);
@@ -123,6 +123,7 @@ export const startGoosed = async (app, dir=null, env={}): Promise<[number, strin
 
   // Wait for the server to be ready
   const isReady = await checkServerStatus(port);
+  log.info(`Goosed isReady ${isReady}`);
   if (!isReady) {
     log.error(`Goosed server failed to start on port ${port}`);
     goosedProcess.kill();