diff --git a/ui/desktop/src/components/settings_v2/providers/subcomponents/CardBody.tsx b/ui/desktop/src/components/settings_v2/providers/subcomponents/CardBody.tsx
index b5f2c1ed..30f881ae 100644
--- a/ui/desktop/src/components/settings_v2/providers/subcomponents/CardBody.tsx
+++ b/ui/desktop/src/components/settings_v2/providers/subcomponents/CardBody.tsx
@@ -1,6 +1,4 @@
import React from 'react';
-import CardActions from './CardActions';
-import ConfigurationAction from '../interfaces/ConfigurationAction';
interface CardBodyProps {
children: React.ReactNode;
diff --git a/ui/desktop/src/components/settings_v2/providers/subcomponents/ProviderCard.tsx b/ui/desktop/src/components/settings_v2/providers/subcomponents/ProviderCard.tsx
index 017b6a04..a3b0d0ca 100644
--- a/ui/desktop/src/components/settings_v2/providers/subcomponents/ProviderCard.tsx
+++ b/ui/desktop/src/components/settings_v2/providers/subcomponents/ProviderCard.tsx
@@ -23,7 +23,7 @@ export const ProviderCard = memo(function ProviderCard({
const providerMetadata: ProviderMetadata | null = provider?.metadata || null;
// Instead of useEffect for logging, use useMemo to memoize the metadata
- const metadata = useMemo(() => providerMetadata, [provider]);
+ const metadata = useMemo(() => providerMetadata, [providerMetadata]);
if (!metadata) {
return
ProviderCard error: No metadata provided
;
diff --git a/ui/desktop/src/components/settings_v2/providers/subcomponents/buttons/CardButtons.tsx b/ui/desktop/src/components/settings_v2/providers/subcomponents/buttons/CardButtons.tsx
index a6476edb..8d8b2397 100644
--- a/ui/desktop/src/components/settings_v2/providers/subcomponents/buttons/CardButtons.tsx
+++ b/ui/desktop/src/components/settings_v2/providers/subcomponents/buttons/CardButtons.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Button } from '../../../../ui/button';
import clsx from 'clsx';
import { TooltipWrapper } from './TooltipWrapper';
-import { Check, CircleHelp, Plus, RefreshCw, Rocket, Sliders, X } from 'lucide-react';
+import { Check, Rocket, Sliders } from 'lucide-react';
interface ActionButtonProps extends React.ComponentProps
{
/** Icon component to render, e.g. `RefreshCw` from lucide-react */
diff --git a/ui/desktop/src/components/ui/BaseModal.tsx b/ui/desktop/src/components/ui/BaseModal.tsx
index 93ab8873..1550c822 100644
--- a/ui/desktop/src/components/ui/BaseModal.tsx
+++ b/ui/desktop/src/components/ui/BaseModal.tsx
@@ -6,13 +6,11 @@ export function BaseModal({
title,
children,
actions,
- onClose,
}: {
isOpen: boolean;
title: string;
children: React.ReactNode;
actions: React.ReactNode; // Buttons for actions
- onClose: () => void;
}) {
if (!isOpen) return null;
diff --git a/ui/desktop/src/components/ui/DeepLinkModal.tsx b/ui/desktop/src/components/ui/DeepLinkModal.tsx
index 3d18b5f7..db7beca5 100644
--- a/ui/desktop/src/components/ui/DeepLinkModal.tsx
+++ b/ui/desktop/src/components/ui/DeepLinkModal.tsx
@@ -1,26 +1,26 @@
import React, { useMemo, useState, useEffect, useRef } from 'react';
import { Buffer } from 'buffer';
import Copy from '../icons/Copy';
-import Modal from '../Modal';
-import { Card } from '../ui/card';
+import { Card } from './card';
+
+interface BotConfig {
+ instructions?: string;
+ activities?: string[];
+ [key: string]: unknown;
+}
interface DeepLinkModalProps {
- botConfig: any;
+ botConfig: BotConfig;
onClose: () => void;
- onOpen: () => void;
}
// Function to generate a deep link from a bot config
-export function generateDeepLink(botConfig: any): string {
+export function generateDeepLink(botConfig: BotConfig): string {
const configBase64 = Buffer.from(JSON.stringify(botConfig)).toString('base64');
return `goose://bot?config=${configBase64}`;
}
-export function DeepLinkModal({
- botConfig: initialBotConfig,
- onClose,
- onOpen,
-}: DeepLinkModalProps) {
+export function DeepLinkModal({ botConfig: initialBotConfig, onClose }: DeepLinkModalProps) {
// Create editable state for the bot config
const [botConfig, setBotConfig] = useState(initialBotConfig);
const [instructions, setInstructions] = useState(initialBotConfig.instructions || '');
@@ -61,7 +61,7 @@ export function DeepLinkModal({
instructions,
activities,
});
- }, [instructions, activities]);
+ }, [instructions, activities, botConfig]);
// Handle adding a new activity
const handleAddActivity = () => {
diff --git a/ui/desktop/src/extensions.tsx b/ui/desktop/src/extensions.tsx
index b9ebc871..67cdeb40 100644
--- a/ui/desktop/src/extensions.tsx
+++ b/ui/desktop/src/extensions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { getApiUrl, getSecretKey } from './config';
import { type View } from './App';
import { type SettingsViewOptions } from './components/settings/SettingsView';
@@ -6,7 +5,6 @@ import { toast } from 'react-toastify';
import builtInExtensionsData from './built-in-extensions.json';
import { toastError, toastLoading, toastSuccess } from './toasts';
-import { Toast } from 'react-toastify/dist/components';
// Hardcoded default extension timeout in seconds
export const DEFAULT_EXTENSION_TIMEOUT = 300;
@@ -214,7 +212,9 @@ export async function loadAndAddStoredExtensions() {
if (userSettingsStr) {
const userSettings = JSON.parse(userSettingsStr);
- const enabledExtensions = userSettings.extensions.filter((ext: any) => ext.enabled);
+ const enabledExtensions = userSettings.extensions.filter(
+ (ext: FullExtensionConfig) => ext.enabled
+ );
console.log('Adding extensions from localStorage: ', enabledExtensions);
for (const ext of enabledExtensions) {
await addExtension(ext, true);
diff --git a/ui/desktop/src/goosed.ts b/ui/desktop/src/goosed.ts
index e857c55a..1424e0d6 100644
--- a/ui/desktop/src/goosed.ts
+++ b/ui/desktop/src/goosed.ts
@@ -5,7 +5,9 @@ import path from 'node:path';
import { getBinaryPath } from './utils/binaryPath';
import log from './utils/logger';
import { ChildProcessByStdio } from 'node:child_process';
-import { Readable } from 'node:stream';
+import { Readable, Buffer } from 'node:stream';
+import { App } from 'electron';
+import type { ProcessEnv } from 'node:process';
// Find an available port to start goosed on
export const findAvailablePort = (): Promise => {
@@ -50,10 +52,20 @@ const checkServerStatus = async (
return false;
};
+interface GooseProcessEnv extends ProcessEnv {
+ HOME: string;
+ USERPROFILE: string;
+ APPDATA: string;
+ LOCALAPPDATA: string;
+ PATH: string;
+ GOOSE_PORT: string;
+ GOOSE_SERVER__SECRET_KEY?: string;
+}
+
export const startGoosed = async (
- app,
- dir = null,
- env = {}
+ app: App,
+ dir: string | null = null,
+ env: Partial = {}
): Promise<[number, string, ChildProcessByStdio]> => {
// we default to running goosed in home dir - if not specified
const homeDir = os.homedir();
@@ -72,7 +84,7 @@ export const startGoosed = async (
log.info(`Starting goosed from: ${goosedPath} on port ${port} in dir ${dir}`);
// Define additional environment variables
- const additionalEnv = {
+ const additionalEnv: GooseProcessEnv = {
// Set HOME for UNIX-like systems
HOME: homeDir,
// Set USERPROFILE for Windows
@@ -82,16 +94,16 @@ export const startGoosed = async (
// Set LOCAL_APPDATA for Windows
LOCALAPPDATA: process.env.LOCALAPPDATA || path.join(homeDir, 'AppData', 'Local'),
// Set PATH to include the binary directory
- PATH: `${path.dirname(goosedPath)}${path.delimiter}${process.env.PATH}`,
+ PATH: `${path.dirname(goosedPath)}${path.delimiter}${process.env.PATH || ''}`,
// start with the port specified
GOOSE_PORT: String(port),
GOOSE_SERVER__SECRET_KEY: process.env.GOOSE_SERVER__SECRET_KEY,
// Add any additional environment variables passed in
...env,
- };
+ } as GooseProcessEnv;
// Merge parent environment with additional environment variables
- const processEnv = { ...process.env, ...additionalEnv };
+ const processEnv: GooseProcessEnv = { ...process.env, ...additionalEnv } as GooseProcessEnv;
// Add detailed logging for troubleshooting
log.info(`Process platform: ${process.platform}`);
@@ -111,6 +123,7 @@ export const startGoosed = async (
// Verify binary exists
try {
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
const fs = require('fs');
const stats = fs.statSync(goosedPath);
log.info(`Binary exists: ${stats.isFile()}`);
@@ -122,7 +135,7 @@ export const startGoosed = async (
const spawnOptions = {
cwd: dir,
env: processEnv,
- stdio: ['ignore', 'pipe', 'pipe'],
+ stdio: ['ignore', 'pipe', 'pipe'] as ['ignore', 'pipe', 'pipe'],
// Hide terminal window on Windows
windowsHide: true,
// Run detached on Windows only to avoid terminal windows
@@ -142,19 +155,19 @@ export const startGoosed = async (
goosedProcess.unref();
}
- goosedProcess.stdout.on('data', (data) => {
+ goosedProcess.stdout.on('data', (data: Buffer) => {
log.info(`goosed stdout for port ${port} and dir ${dir}: ${data.toString()}`);
});
- goosedProcess.stderr.on('data', (data) => {
+ goosedProcess.stderr.on('data', (data: Buffer) => {
log.error(`goosed stderr for port ${port} and dir ${dir}: ${data.toString()}`);
});
- goosedProcess.on('close', (code) => {
+ goosedProcess.on('close', (code: number | null) => {
log.info(`goosed process exited with code ${code} for port ${port} and dir ${dir}`);
});
- goosedProcess.on('error', (err) => {
+ goosedProcess.on('error', (err: Error) => {
log.error(`Failed to start goosed on port ${port} and dir ${dir}`, err);
throw err; // Propagate the error
});
diff --git a/ui/desktop/src/hooks/useChat.ts b/ui/desktop/src/hooks/useChat.ts
index 44cf4f9e..35027b8a 100644
--- a/ui/desktop/src/hooks/useChat.ts
+++ b/ui/desktop/src/hooks/useChat.ts
@@ -1,10 +1,11 @@
import { useEffect, useState } from 'react';
import { ChatType } from '../components/ChatView';
import { fetchSessionDetails, generateSessionId } from '../sessions';
+import { View, ViewOptions } from '../App';
type UseChatArgs = {
setIsLoadingSession: (isLoading: boolean) => void;
- setView: (view: string) => void;
+ setView: (view: View, viewOptions?: ViewOptions) => void;
};
export const useChat = ({ setIsLoadingSession, setView }: UseChatArgs) => {
const [chat, setChat] = useState({
@@ -49,6 +50,8 @@ export const useChat = ({ setIsLoadingSession, setView }: UseChatArgs) => {
};
checkForResumeSession();
+ // todo: rework this to allow for exhaustive deps currently throws app in error loop
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
return { chat, setChat };
diff --git a/ui/desktop/src/json.d.ts b/ui/desktop/src/json.d.ts
index bbab69d2..d60d46d6 100644
--- a/ui/desktop/src/json.d.ts
+++ b/ui/desktop/src/json.d.ts
@@ -1,4 +1,4 @@
declare module '*.json' {
- const value: any;
+ const value: Record;
export default value;
}
diff --git a/ui/desktop/src/main.ts b/ui/desktop/src/main.ts
index 2384f258..02e9c5b3 100644
--- a/ui/desktop/src/main.ts
+++ b/ui/desktop/src/main.ts
@@ -3,13 +3,13 @@ import {
session,
BrowserWindow,
dialog,
- globalShortcut,
ipcMain,
Menu,
MenuItem,
Notification,
powerSaveBlocker,
Tray,
+ App,
} from 'electron';
import { Buffer } from 'node:buffer';
import started from 'electron-squirrel-startup';
@@ -41,8 +41,8 @@ app.setAsDefaultProtocolClient('goose');
// Triggered when the user opens "goose://..." links
let firstOpenWindow: BrowserWindow;
-let pendingDeepLink = null; // Store deep link if sent before React is ready
-app.on('open-url', async (event, url) => {
+let pendingDeepLink: string | null = null; // Store deep link if sent before React is ready
+app.on('open-url', async (_event, url) => {
pendingDeepLink = url;
// Parse the URL to determine the type
@@ -156,13 +156,21 @@ let appConfig = {
let windowCounter = 0;
const windowMap = new Map();
+interface BotConfig {
+ id: string;
+ name: string;
+ description: string;
+ instructions: string;
+ activities: string[];
+}
+
const createChat = async (
- app,
+ app: App,
query?: string,
dir?: string,
version?: string,
resumeSessionId?: string,
- botConfig?: any // Bot configuration
+ botConfig?: BotConfig
) => {
// Apply current environment settings before creating chat
updateEnvironmentVariables(envToggles);
@@ -202,7 +210,7 @@ const createChat = async (
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
// Open all links in external browser
if (url.startsWith('http:') || url.startsWith('https:')) {
- require('electron').shell.openExternal(url);
+ electron.shell.openExternal(url);
return { action: 'deny' };
}
return { action: 'allow' };
@@ -350,7 +358,7 @@ const openDirectoryDialog = async (replaceWindow: boolean = false) => {
if (!result.canceled && result.filePaths.length > 0) {
addRecentDir(result.filePaths[0]);
const currentWindow = BrowserWindow.getFocusedWindow();
- const newWindow = await createChat(app, undefined, result.filePaths[0]);
+ await createChat(app, undefined, result.filePaths[0]);
if (replaceWindow) {
currentWindow.close();
}
@@ -376,7 +384,7 @@ process.on('unhandledRejection', (error) => {
handleFatalError(error instanceof Error ? error : new Error(String(error)));
});
-ipcMain.on('react-ready', (event) => {
+ipcMain.on('react-ready', () => {
console.log('React ready event received');
if (pendingDeepLink) {
@@ -399,7 +407,7 @@ ipcMain.on('react-ready', (event) => {
});
// Handle directory chooser
-ipcMain.handle('directory-chooser', (_, replace: boolean = false) => {
+ipcMain.handle('directory-chooser', (_event, replace: boolean = false) => {
return openDirectoryDialog(replace);
});
@@ -447,11 +455,11 @@ ipcMain.handle('check-ollama', async () => {
});
// Handle binary path requests
-ipcMain.handle('get-binary-path', (event, binaryName) => {
+ipcMain.handle('get-binary-path', (_event, binaryName) => {
return getBinaryPath(app, binaryName);
});
-ipcMain.handle('read-file', (event, filePath) => {
+ipcMain.handle('read-file', (_event, filePath) => {
return new Promise((resolve) => {
exec(`cat ${filePath}`, (error, stdout, stderr) => {
if (error) {
@@ -467,7 +475,7 @@ ipcMain.handle('read-file', (event, filePath) => {
});
});
-ipcMain.handle('write-file', (event, filePath, content) => {
+ipcMain.handle('write-file', (_event, filePath, content) => {
return new Promise((resolve) => {
const command = `cat << 'EOT' > ${filePath}
${content}
@@ -513,25 +521,27 @@ app.whenReady().then(async () => {
const menu = Menu.getApplicationMenu();
// App menu
- const appMenu = menu.items.find((item) => item.label === 'Goose');
- // add Settings to app menu after About
- appMenu.submenu.insert(1, new MenuItem({ type: 'separator' }));
- appMenu.submenu.insert(
- 1,
- new MenuItem({
- label: 'Settings',
- accelerator: 'CmdOrCtrl+,',
- click() {
- const focusedWindow = BrowserWindow.getFocusedWindow();
- if (focusedWindow) focusedWindow.webContents.send('set-view', 'settings');
- },
- })
- );
- appMenu.submenu.insert(1, new MenuItem({ type: 'separator' }));
+ const appMenu = menu?.items.find((item) => item.label === 'Goose');
+ if (appMenu?.submenu) {
+ // add Settings to app menu after About
+ appMenu.submenu.insert(1, new MenuItem({ type: 'separator' }));
+ appMenu.submenu.insert(
+ 1,
+ new MenuItem({
+ label: 'Settings',
+ accelerator: 'CmdOrCtrl+,',
+ click() {
+ const focusedWindow = BrowserWindow.getFocusedWindow();
+ if (focusedWindow) focusedWindow.webContents.send('set-view', 'settings');
+ },
+ })
+ );
+ appMenu.submenu.insert(1, new MenuItem({ type: 'separator' }));
+ }
// Add Environment menu items to View menu
- const viewMenu = menu.items.find((item) => item.label === 'View');
- if (viewMenu) {
+ const viewMenu = menu?.items.find((item) => item.label === 'View');
+ if (viewMenu?.submenu) {
viewMenu.submenu.append(new MenuItem({ type: 'separator' }));
viewMenu.submenu.append(
new MenuItem({
@@ -549,29 +559,29 @@ app.whenReady().then(async () => {
const fileMenu = menu?.items.find((item) => item.label === 'File');
- // open goose to specific dir and set that as its working space
- fileMenu.submenu.append(
- new MenuItem({
- label: 'Open Directory...',
- accelerator: 'CmdOrCtrl+O',
- click: () => openDirectoryDialog(),
- })
- );
-
- // Add Recent Files submenu
- const recentFilesSubmenu = buildRecentFilesMenu();
- if (recentFilesSubmenu.length > 0) {
- fileMenu.submenu.append(new MenuItem({ type: 'separator' }));
+ if (fileMenu?.submenu) {
+ // open goose to specific dir and set that as its working space
fileMenu.submenu.append(
new MenuItem({
- label: 'Recent Directories',
- submenu: recentFilesSubmenu,
+ label: 'Open Directory...',
+ accelerator: 'CmdOrCtrl+O',
+ click: () => openDirectoryDialog(),
})
);
- }
- // Add menu items to File menu
- if (fileMenu && fileMenu.submenu) {
+ // Add Recent Files submenu
+ const recentFilesSubmenu = buildRecentFilesMenu();
+ if (recentFilesSubmenu.length > 0) {
+ fileMenu.submenu.append(new MenuItem({ type: 'separator' }));
+ fileMenu.submenu.append(
+ new MenuItem({
+ label: 'Recent Directories',
+ submenu: recentFilesSubmenu,
+ })
+ );
+ }
+
+ // Add menu items to File menu
fileMenu.submenu.append(
new MenuItem({
label: 'New Chat Window',
@@ -611,7 +621,9 @@ app.whenReady().then(async () => {
);
}
- Menu.setApplicationMenu(menu);
+ if (menu) {
+ Menu.setApplicationMenu(menu);
+ }
app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) {
@@ -619,7 +631,7 @@ app.whenReady().then(async () => {
}
});
- ipcMain.on('create-chat-window', (_, query, dir, version, resumeSessionId, botConfig) => {
+ ipcMain.on('create-chat-window', (_event, query, dir, version, resumeSessionId, botConfig) => {
if (!dir?.trim()) {
const recentDirs = loadRecentDirs();
dir = recentDirs.length > 0 ? recentDirs[0] : null;
@@ -627,12 +639,12 @@ app.whenReady().then(async () => {
createChat(app, query, dir, version, resumeSessionId, botConfig);
});
- ipcMain.on('notify', (event, data) => {
+ ipcMain.on('notify', (_event, data) => {
console.log('NOTIFY', data);
new Notification({ title: data.title, body: data.body }).show();
});
- ipcMain.on('logInfo', (_, info) => {
+ ipcMain.on('logInfo', (_event, info) => {
log.info('from renderer:', info);
});
@@ -668,12 +680,12 @@ app.whenReady().then(async () => {
});
// Handle binary path requests
- ipcMain.handle('get-binary-path', (event, binaryName) => {
+ ipcMain.handle('get-binary-path', (_event, binaryName) => {
return getBinaryPath(app, binaryName);
});
// Handle metadata fetching from main process
- ipcMain.handle('fetch-metadata', async (_, url) => {
+ ipcMain.handle('fetch-metadata', async (_event, url) => {
try {
const response = await fetch(url, {
headers: {
@@ -692,7 +704,7 @@ app.whenReady().then(async () => {
}
});
- ipcMain.on('open-in-chrome', (_, url) => {
+ ipcMain.on('open-in-chrome', (_event, url) => {
// On macOS, use the 'open' command with Chrome
if (process.platform === 'darwin') {
spawn('open', ['-a', 'Google Chrome', url]);
diff --git a/ui/desktop/src/preload.ts b/ui/desktop/src/preload.ts
index 4809cb78..7980a8a2 100644
--- a/ui/desktop/src/preload.ts
+++ b/ui/desktop/src/preload.ts
@@ -1,11 +1,32 @@
import Electron, { contextBridge, ipcRenderer } from 'electron';
+interface BotConfig {
+ id: string;
+ name: string;
+ description: string;
+ instructions?: string;
+ activities?: string[];
+ [key: string]: unknown;
+}
+
+interface NotificationData {
+ title: string;
+ body: string;
+}
+
+interface FileResponse {
+ file: string;
+ filePath: string;
+ error: string | null;
+ found: boolean;
+}
+
const config = JSON.parse(process.argv.find((arg) => arg.startsWith('{')) || '{}');
// Define the API types in a single place
type ElectronAPI = {
reactReady: () => void;
- getConfig: () => Record;
+ getConfig: () => Record;
hideWindow: () => void;
directoryChooser: (replace?: boolean) => Promise;
createChatWindow: (
@@ -13,36 +34,34 @@ type ElectronAPI = {
dir?: string,
version?: string,
resumeSessionId?: string,
- botConfig?: any
+ botConfig?: BotConfig
) => void;
logInfo: (txt: string) => void;
- showNotification: (data: any) => void;
+ showNotification: (data: NotificationData) => void;
openInChrome: (url: string) => void;
- fetchMetadata: (url: string) => Promise;
+ fetchMetadata: (url: string) => Promise;
reloadApp: () => void;
checkForOllama: () => Promise;
selectFileOrDirectory: () => Promise;
startPowerSaveBlocker: () => Promise;
stopPowerSaveBlocker: () => Promise;
getBinaryPath: (binaryName: string) => Promise;
- readFile: (
- directory: string
- ) => Promise<{ file: string; filePath: string; error: string; found: boolean }>;
+ readFile: (directory: string) => Promise;
writeFile: (directory: string, content: string) => Promise;
on: (
channel: string,
- callback: (event: Electron.IpcRendererEvent, ...args: any[]) => void
+ callback: (event: Electron.IpcRendererEvent, ...args: unknown[]) => void
) => void;
off: (
channel: string,
- callback: (event: Electron.IpcRendererEvent, ...args: any[]) => void
+ callback: (event: Electron.IpcRendererEvent, ...args: unknown[]) => void
) => void;
- emit: (channel: string, ...args: any[]) => void;
+ emit: (channel: string, ...args: unknown[]) => void;
};
type AppConfigAPI = {
- get: (key: string) => any;
- getAll: () => Record;
+ get: (key: string) => unknown;
+ getAll: () => Record;
};
const electronAPI: ElectronAPI = {
@@ -55,10 +74,10 @@ const electronAPI: ElectronAPI = {
dir?: string,
version?: string,
resumeSessionId?: string,
- botConfig?: any
+ botConfig?: BotConfig
) => ipcRenderer.send('create-chat-window', query, dir, version, resumeSessionId, botConfig),
logInfo: (txt: string) => ipcRenderer.send('logInfo', txt),
- showNotification: (data: any) => ipcRenderer.send('notify', data),
+ showNotification: (data: NotificationData) => ipcRenderer.send('notify', data),
openInChrome: (url: string) => ipcRenderer.send('open-in-chrome', url),
fetchMetadata: (url: string) => ipcRenderer.invoke('fetch-metadata', url),
reloadApp: () => ipcRenderer.send('reload-app'),
@@ -70,13 +89,19 @@ const electronAPI: ElectronAPI = {
readFile: (filePath: string) => ipcRenderer.invoke('read-file', filePath),
writeFile: (filePath: string, content: string) =>
ipcRenderer.invoke('write-file', filePath, content),
- on: (channel: string, callback: (event: Electron.IpcRendererEvent, ...args: any[]) => void) => {
+ on: (
+ channel: string,
+ callback: (event: Electron.IpcRendererEvent, ...args: unknown[]) => void
+ ) => {
ipcRenderer.on(channel, callback);
},
- off: (channel: string, callback: (event: Electron.IpcRendererEvent, ...args: any[]) => void) => {
+ off: (
+ channel: string,
+ callback: (event: Electron.IpcRendererEvent, ...args: unknown[]) => void
+ ) => {
ipcRenderer.off(channel, callback);
},
- emit: (channel: string, ...args: any[]) => {
+ emit: (channel: string, ...args: unknown[]) => {
ipcRenderer.emit(channel, ...args);
},
};
diff --git a/ui/desktop/src/sessionLinks.ts b/ui/desktop/src/sessionLinks.ts
index 9ed3a760..43d72bd9 100644
--- a/ui/desktop/src/sessionLinks.ts
+++ b/ui/desktop/src/sessionLinks.ts
@@ -1,7 +1,14 @@
-import { toast } from 'react-toastify';
import { fetchSharedSessionDetails, SharedSessionDetails } from './sharedSessions';
import { type View } from './App';
+interface SessionLinksViewOptions {
+ sessionDetails?: SharedSessionDetails | null;
+ error?: string;
+ shareToken?: string;
+ baseUrl?: string;
+ [key: string]: unknown;
+}
+
/**
* Handles opening a shared session from a deep link
* @param url The deep link URL (goose://sessions/:shareToken)
@@ -11,7 +18,7 @@ import { type View } from './App';
*/
export async function openSharedSessionFromDeepLink(
url: string,
- setView: (view: View, options?: Record) => void,
+ setView: (view: View, options?: SessionLinksViewOptions) => void,
baseUrl?: string
): Promise {
try {
diff --git a/ui/desktop/src/utils/binaryPath.ts b/ui/desktop/src/utils/binaryPath.ts
index 049e6550..9704a677 100644
--- a/ui/desktop/src/utils/binaryPath.ts
+++ b/ui/desktop/src/utils/binaryPath.ts
@@ -6,7 +6,7 @@ import log from './logger';
export const getBinaryPath = (app: Electron.App, binaryName: string): string => {
const isWindows = process.platform === 'win32';
- const possiblePaths = [];
+ const possiblePaths: string[] = [];
if (isWindows) {
addPaths(isWindows, possiblePaths, `${binaryName}.exe`, app);
addPaths(isWindows, possiblePaths, `${binaryName}.cmd`, app);
@@ -33,7 +33,7 @@ export const getBinaryPath = (app: Electron.App, binaryName: string): string =>
const addPaths = (
isWindows: boolean,
- possiblePaths: any[],
+ possiblePaths: string[],
executableName: string,
app: Electron.App
): void => {
diff --git a/ui/desktop/src/utils/deleteAllKeys.tsx b/ui/desktop/src/utils/deleteAllKeys.tsx
index c95aacb3..3972e9cc 100644
--- a/ui/desktop/src/utils/deleteAllKeys.tsx
+++ b/ui/desktop/src/utils/deleteAllKeys.tsx
@@ -2,7 +2,7 @@ import { getApiUrl, getSecretKey } from '../config';
import { required_keys } from '../components/settings/models/hardcoded_stuff';
export async function DeleteProviderKeysFromKeychain() {
- for (const [provider, keys] of Object.entries(required_keys)) {
+ for (const [_provider, keys] of Object.entries(required_keys)) {
for (const keyName of keys) {
try {
const deleteResponse = await fetch(getApiUrl('/configs/delete'), {
diff --git a/ui/desktop/src/utils/providerUtils.ts b/ui/desktop/src/utils/providerUtils.ts
index aa78c17b..43205864 100644
--- a/ui/desktop/src/utils/providerUtils.ts
+++ b/ui/desktop/src/utils/providerUtils.ts
@@ -16,7 +16,12 @@ import type { ExtensionConfig, FixedExtensionEntry } from '../components/ConfigC
import { toastService } from '../toasts';
import { ExtensionQuery, addExtension as apiAddExtension } from '../api';
-export function getStoredProvider(config: any): string | null {
+interface AppConfig {
+ GOOSE_PROVIDER?: string;
+ [key: string]: unknown;
+}
+
+export function getStoredProvider(config: AppConfig): string | null {
return config.GOOSE_PROVIDER || localStorage.getItem(GOOSE_PROVIDER);
}
diff --git a/ui/desktop/tests/e2e/app.spec.ts b/ui/desktop/tests/e2e/app.spec.ts
index 3463aacf..a7d96684 100644
--- a/ui/desktop/tests/e2e/app.spec.ts
+++ b/ui/desktop/tests/e2e/app.spec.ts
@@ -65,8 +65,8 @@ async function selectProvider(mainWindow: any, provider: Provider) {
await mainWindow.waitForSelector('div[class*="bg-bgSubtle border-b border-borderSubtle"]', { timeout: 5000 });
await mainWindow.waitForTimeout(1000); // Give UI time to stabilize
- const menuButton = await mainWindow.waitForSelector('button:has(svg)', {
- timeout: 5000,
+ const menuButton = await mainWindow.waitForSelector('button[aria-label="More options"]', {
+ timeout: 2000,
state: 'visible'
});
await menuButton.click();
@@ -75,7 +75,7 @@ async function selectProvider(mainWindow: any, provider: Provider) {
await mainWindow.waitForTimeout(1000);
// Click "Reset provider and model"
- const resetProviderButton = await mainWindow.waitForSelector('button:has-text("Reset provider and model")', { timeout: 5000 });
+ const resetProviderButton = await mainWindow.waitForSelector('button:has-text("Reset provider and model")', { timeout: 2000 });
await resetProviderButton.click();
// Wait for page to start refreshing
@@ -90,7 +90,7 @@ async function selectProvider(mainWindow: any, provider: Provider) {
}
// Wait for provider selection screen
- const heading = await mainWindow.waitForSelector('h2:has-text("Choose a Provider")', { timeout: 10000 });
+ const heading = await mainWindow.waitForSelector('h2:has-text("Choose a Provider")', { timeout: 2000 });
const headingText = await heading.textContent();
expect(headingText).toBe('Choose a Provider');
@@ -112,7 +112,7 @@ async function selectProvider(mainWindow: any, provider: Provider) {
// Wait for chat interface to appear
const chatTextarea = await mainWindow.waitForSelector('textarea[placeholder*="What can goose help with?"]',
- { timeout: 15000 });
+ { timeout: 5000 });
expect(await chatTextarea.isVisible()).toBe(true);
// Take screenshot of chat interface
@@ -220,32 +220,47 @@ test.describe('Goose App', () => {
test.describe('General UI', () => {
test('dark mode toggle', async () => {
console.log('Testing dark mode toggle...');
+
+ await selectProvider(mainWindow, providers[0]);
// Click the three dots menu button in the top right
await mainWindow.waitForSelector('div[class*="bg-bgSubtle border-b border-borderSubtle"]');
- const menuButton = await mainWindow.waitForSelector('button:has(svg)', { timeout: 10000 });
+ const menuButton = await mainWindow.waitForSelector('button[aria-label="More options"]', {
+ timeout: 5000,
+ state: 'visible'
+ });
await menuButton.click();
// Find and click the dark mode toggle button
- const darkModeButton = await mainWindow.waitForSelector('button:has-text("Dark Mode"), button:has-text("Light Mode")');
-
+ const darkModeButton = await mainWindow.waitForSelector('button:has-text("Dark")');
+ const lightModeButton = await mainWindow.waitForSelector('button:has-text("Light")');
+ const systemModeButton = await mainWindow.waitForSelector('button:has-text("System")');
+
// Get initial state
const isDarkMode = await mainWindow.evaluate(() => document.documentElement.classList.contains('dark'));
console.log('Initial dark mode state:', isDarkMode);
+
+ if (isDarkMode) {
+ // Click to toggle to light mode
+ await lightModeButton.click();
+ await mainWindow.waitForTimeout(1000);
+ const newDarkMode = await mainWindow.evaluate(() => document.documentElement.classList.contains('dark'));
+ expect(newDarkMode).toBe(!isDarkMode);
+ // Take screenshot to verify and pause to show the change
+ await mainWindow.screenshot({ path: 'test-results/dark-mode-toggle.png' });
+ } else {
+ // Click to toggle to dark mode
+ await darkModeButton.click();
+ await mainWindow.waitForTimeout(1000);
+ const newDarkMode = await mainWindow.evaluate(() => document.documentElement.classList.contains('dark'));
+ expect(newDarkMode).toBe(!isDarkMode);
+ }
+
+ // check that system mode is clickable
+ await systemModeButton.click();
- // Click to toggle
- await darkModeButton.click();
-
- // Verify the change
- const newDarkMode = await mainWindow.evaluate(() => document.documentElement.classList.contains('dark'));
- expect(newDarkMode).toBe(!isDarkMode);
-
- // Take screenshot to verify and pause to show the change
- await mainWindow.screenshot({ path: 'test-results/dark-mode-toggle.png' });
- await mainWindow.waitForTimeout(2000); // Pause in dark/light mode
-
- // Toggle back to original state
- await darkModeButton.click();
+ // Toggle back to light mode
+ await lightModeButton.click();
// Pause to show return to original state
await mainWindow.waitForTimeout(2000);
@@ -331,7 +346,6 @@ test.describe('Goose App', () => {
await chatInput.press('Enter');
// Wait for loading indicator and response
- await mainWindow.waitForSelector('.text-textStandard >> text="goose is working on it…"', { timeout: 10000 });
await mainWindow.waitForSelector('.text-textStandard >> text="goose is working on it…"',
{ state: 'hidden', timeout: 30000 });
@@ -383,12 +397,25 @@ test.describe('Goose App', () => {
await mainWindow.reload();
await mainWindow.waitForLoadState('networkidle');
+ // Debug: Print HTML structure before trying to find menu button
+ // console.log('Debug: Current HTML structure before menu button selection:');
+ // const htmlStructure = await mainWindow.evaluate(() => document.documentElement.outerHTML);
+ // console.log(htmlStructure);
+
+ // Take screenshot before attempting to find menu button
+ await mainWindow.screenshot({ path: `test-results/${provider.name.toLowerCase()}-before-menu-button.png` });
+
// Click the menu button (3 dots)
- const menuButton = await mainWindow.waitForSelector('button:has(svg)', { timeout: 10000 });
+ console.log('Attempting to find menu button...');
+ const menuButton = await mainWindow.waitForSelector('button[aria-label="More options"]', {
+ timeout: 5000,
+ state: 'visible'
+ });
+ console.log('Menu button found, clicking...');
await menuButton.click();
- // Click Advanced Settings
- const advancedSettingsButton = await mainWindow.waitForSelector('button:has-text("Advanced Settings")');
+ // Click Advanced settings
+ const advancedSettingsButton = await mainWindow.waitForSelector('button:has-text("Advanced settings")');
await advancedSettingsButton.click();
// Wait for settings page and take screenshot
@@ -440,7 +467,7 @@ test.describe('Goose App', () => {
console.log('Extension added successfully');
// Click Exit button to return to chat
- const exitButton = await mainWindow.waitForSelector('button:has-text("Exit")', { timeout: 5000 });
+ const exitButton = await mainWindow.waitForSelector('button:has-text("Back")', { timeout: 5000 });
await exitButton.click();
} catch (error) {
@@ -472,7 +499,7 @@ test.describe('Goose App', () => {
// Wait for loading indicator
const loadingIndicator = await mainWindow.waitForSelector('.text-textStandard >> text="goose is working on it…"',
- { timeout: 10000 });
+ { timeout: 30000 });
expect(await loadingIndicator.isVisible()).toBe(true);
// Take screenshot of loading state
diff --git a/ui/desktop/tsconfig.json b/ui/desktop/tsconfig.json
index 0a9f5aa2..b298d27c 100644
--- a/ui/desktop/tsconfig.json
+++ b/ui/desktop/tsconfig.json
@@ -1,11 +1,45 @@
{
"compilerOptions": {
- "esModuleInterop": true,
+ "target": "ES2020",
+ "useDefineForClassFields": true,
+ "lib": ["ES2020", "DOM", "DOM.Iterable"],
+ "module": "ESNext",
+ "skipLibCheck": true,
+
+ /* Bundler mode */
+ "moduleResolution": "bundler",
"resolveJsonModule": true,
- "jsx": "react",
- "lib": ["dom", "esnext"],
- "paths": {
- "@/*": ["./*"]
- }
- }
+ "isolatedModules": true,
+ "noEmit": true,
+ "jsx": "react-jsx",
+
+ /* Linting */
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noFallthroughCasesInSwitch": true,
+
+ /* Electron/Node.js specific */
+ "types": ["node", "electron", "vite/client"],
+ "typeRoots": ["./node_modules/@types", "./src/types"],
+ "esModuleInterop": true,
+ "allowSyntheticDefaultImports": true,
+ "forceConsistentCasingInFileNames": true,
+
+ /* Source Maps */
+ "sourceMap": true,
+ "inlineSources": true,
+
+ /* Additional Safety */
+ "noImplicitAny": true,
+ "strictNullChecks": true,
+ "strictFunctionTypes": true,
+ "strictBindCallApply": true,
+ "strictPropertyInitialization": true,
+ "noImplicitThis": true,
+ "alwaysStrict": true,
+ "noImplicitReturns": true
+ },
+ "include": ["src"],
+ "references": [{ "path": "./tsconfig.node.json" }]
}
diff --git a/ui/desktop/tsconfig.node.json b/ui/desktop/tsconfig.node.json
new file mode 100644
index 00000000..6503cf99
--- /dev/null
+++ b/ui/desktop/tsconfig.node.json
@@ -0,0 +1,24 @@
+{
+ "compilerOptions": {
+ "composite": true,
+ "skipLibCheck": true,
+ "module": "ESNext",
+ "moduleResolution": "bundler",
+ "allowSyntheticDefaultImports": true,
+ "strict": true,
+ "types": ["node", "electron"],
+ "target": "ES2020",
+ "esModuleInterop": true,
+ "resolveJsonModule": true,
+ "sourceMap": true
+ },
+ "include": [
+ "vite.config.ts",
+ "vite.main.config.ts",
+ "vite.preload.config.ts",
+ "vite.renderer.config.ts",
+ "forge.config.ts",
+ "src/main.ts",
+ "src/preload.ts"
+ ]
+}