diff --git a/apps/ui/src/components/ui/git-diff-panel.tsx b/apps/ui/src/components/ui/git-diff-panel.tsx
index cce517b7..39e7a61f 100644
--- a/apps/ui/src/components/ui/git-diff-panel.tsx
+++ b/apps/ui/src/components/ui/git-diff-panel.tsx
@@ -479,12 +479,7 @@ export function GitDiffPanel({
             <div className="flex flex-col items-center justify-center gap-2 py-8 text-muted-foreground">
               <AlertCircle className="w-5 h-5 text-amber-500" />
               <span className="text-sm">{error}</span>
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={async () => await loadDiffs()}
-                className="mt-2"
-              >
+              <Button variant="ghost" size="sm" onClick={() => void loadDiffs()} className="mt-2">
                 <RefreshCw className="w-4 h-4 mr-2" />
                 Retry
               </Button>
@@ -558,7 +553,7 @@ export function GitDiffPanel({
                     <Button
                       variant="ghost"
                       size="sm"
-                      onClick={async () => await loadDiffs()}
+                      onClick={() => void loadDiffs()}
                       className="text-xs h-7"
                     >
                       <RefreshCw className="w-3 h-3 mr-1" />
diff --git a/apps/ui/src/components/views/settings-view/cli-status/claude-cli-status.tsx b/apps/ui/src/components/views/settings-view/cli-status/claude-cli-status.tsx
index 9ce54acf..89678ccb 100644
--- a/apps/ui/src/components/views/settings-view/cli-status/claude-cli-status.tsx
+++ b/apps/ui/src/components/views/settings-view/cli-status/claude-cli-status.tsx
@@ -89,13 +89,17 @@ export function ClaudeCliStatus({ status, authStatus, isChecking, onRefresh }: C
     setIsAuthenticating(true);
     try {
       const api = getElectronAPI();
-      if (!api.setup) {
+      // Check if authClaude method exists on the API
+      const authClaude = (api.setup as Record<string, unknown> | undefined)?.authClaude as
+        | (() => Promise<{ success: boolean; error?: string }>)
+        | undefined;
+      if (!authClaude) {
         toast.error('Authentication Failed', {
-          description: 'Setup API is not available',
+          description: 'Claude authentication is not available',
         });
         return;
       }
-      const result = await api.setup.authClaude();
+      const result = await authClaude();
 
       if (result.success) {
         toast.success('Signed In', {
diff --git a/apps/ui/src/components/views/settings-view/cli-status/cursor-cli-status.tsx b/apps/ui/src/components/views/settings-view/cli-status/cursor-cli-status.tsx
index 6e942327..77a0707b 100644
--- a/apps/ui/src/components/views/settings-view/cli-status/cursor-cli-status.tsx
+++ b/apps/ui/src/components/views/settings-view/cli-status/cursor-cli-status.tsx
@@ -210,7 +210,7 @@ export function CursorCliStatus({ status, isChecking, onRefresh }: CursorCliStat
     try {
       const api = getElectronAPI();
       // Check if authCursor method exists on the API
-      const authCursor = (api.setup as Record<string, unknown> | undefined)?.authCursor as
+      const authCursor = (api?.setup as Record<string, unknown> | undefined)?.authCursor as
         | (() => Promise<{ success: boolean; error?: string }>)
         | undefined;
       if (!authCursor) {
@@ -245,7 +245,7 @@ export function CursorCliStatus({ status, isChecking, onRefresh }: CursorCliStat
     try {
       const api = getElectronAPI();
       // Check if deauthCursor method exists on the API
-      const deauthCursor = (api.setup as Record<string, unknown> | undefined)?.deauthCursor as
+      const deauthCursor = (api?.setup as Record<string, unknown> | undefined)?.deauthCursor as
         | (() => Promise<{ success: boolean; error?: string }>)
         | undefined;
       if (!deauthCursor) {
diff --git a/apps/ui/src/hooks/mutations/use-auto-mode-mutations.ts b/apps/ui/src/hooks/mutations/use-auto-mode-mutations.ts
index 94e0c3aa..1151de4b 100644
--- a/apps/ui/src/hooks/mutations/use-auto-mode-mutations.ts
+++ b/apps/ui/src/hooks/mutations/use-auto-mode-mutations.ts
@@ -348,7 +348,7 @@ export function useStartAutoMode(projectPath: string) {
     mutationFn: async (maxConcurrency?: number) => {
       const api = getElectronAPI();
       if (!api.autoMode) throw new Error('AutoMode API not available');
-      const result = await api.autoMode.start(projectPath, String(maxConcurrency ?? ''));
+      const result = await api.autoMode.start(projectPath, undefined, maxConcurrency);
       if (!result.success) {
         throw new Error(result.error || 'Failed to start auto mode');
       }
diff --git a/apps/ui/src/hooks/queries/use-cli-status.ts b/apps/ui/src/hooks/queries/use-cli-status.ts
index 6ce77c0f..3f7215b5 100644
--- a/apps/ui/src/hooks/queries/use-cli-status.ts
+++ b/apps/ui/src/hooks/queries/use-cli-status.ts
@@ -69,6 +69,9 @@ export function useApiKeysStatus() {
         throw new Error('Setup API not available');
       }
       const result = await api.setup.getApiKeys();
+      if (!result.success) {
+        throw new Error('Failed to fetch API keys');
+      }
       return result;
     },
     staleTime: STALE_TIMES.CLI_STATUS,
diff --git a/apps/ui/src/lib/http-api-client.ts b/apps/ui/src/lib/http-api-client.ts
index 3b7a9b6c..f468f07c 100644
--- a/apps/ui/src/lib/http-api-client.ts
+++ b/apps/ui/src/lib/http-api-client.ts
@@ -161,7 +161,7 @@ const getServerUrl = (): string => {
 
     // In web mode (not Electron), use relative URL to leverage Vite proxy
     // This avoids CORS issues since requests appear same-origin
-    if (!window.Electron) {
+    if (!window.isElectron) {
       return '';
     }
   }