Use errorMessage (#6749)

Co-authored-by: Douwe Osinga <douwe@squareup.com>

ui/desktop/src/utils/autoUpdater.ts

@@ -16,6 +16,7 @@ import * as fs from 'fs/promises';
 import log from './logger';
 import { githubUpdater } from './githubUpdater';
 import { loadRecentDirs } from './recentDirs';
+import { errorMessage } from './conversionUtils';
 import {
   trackUpdateCheckStarted,
   trackUpdateCheckCompleted,
@@ -99,7 +100,7 @@ export function registerUpdateIpcHandlers() {
       log.error(`=== MANUAL UPDATE CHECK FAILED after ${duration}ms ===`);
       log.error('Error checking for updates:', error);
       log.error('Manual check error details:', {
-        message: error instanceof Error ? error.message : 'Unknown error',
+        message: errorMessage(error, 'Unknown error'),
         stack: error instanceof Error ? error.stack : 'No stack',
         name: error instanceof Error ? error.name : 'Unknown',
         code:
@@ -189,12 +190,12 @@ export function registerUpdateIpcHandlers() {
 
       trackUpdateCheckCompleted('error', currentVersion, {
         usingFallback: false,
-        errorType: error instanceof Error ? error.message : 'unknown',
+        errorType: errorMessage(error, 'unknown'),
       });
 
       return {
         updateInfo: null,
-        error: error instanceof Error ? error.message : 'Unknown error',
+        error: errorMessage(error, 'Unknown error'),
       };
     }
   });
@@ -250,11 +251,11 @@ export function registerUpdateIpcHandlers() {
         false,
         version,
         method,
-        error instanceof Error ? error.message : 'unknown'
+        errorMessage(error, 'unknown')
       );
       return {
         success: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
+        error: errorMessage(error, 'Unknown error'),
       };
     }
   });
@@ -708,7 +709,7 @@ async function githubAutoDownload(
       false,
       latestVersion,
       'github-fallback',
-      downloadError instanceof Error ? downloadError.message : 'unknown'
+      errorMessage(downloadError, 'unknown')
     );
     log.error(
       `Error during GitHub auto-download${contextLabel ? ` (${contextLabel})` : ''}:`,

ui/desktop/src/utils/githubUpdater.ts

@@ -4,7 +4,7 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
 import log from './logger';
-import { safeJsonParse } from './conversionUtils';
+import { safeJsonParse, errorMessage } from './conversionUtils';
 
 interface GitHubRelease {
   tag_name: string;
@@ -142,7 +142,7 @@ export class GitHubUpdater {
     } catch (error) {
       log.error('GitHubUpdater: Error checking for updates:', error);
       log.error('GitHubUpdater: Error details:', {
-        message: error instanceof Error ? error.message : 'Unknown error',
+        message: errorMessage(error, 'Unknown error'),
         stack: error instanceof Error ? error.stack : 'No stack',
         name: error instanceof Error ? error.name : 'Unknown',
         code:
@@ -152,7 +152,7 @@ export class GitHubUpdater {
       });
       return {
         updateAvailable: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
+        error: errorMessage(error, 'Unknown error'),
       };
     }
   }
@@ -271,13 +271,13 @@ export class GitHubUpdater {
       log.error(`=== GitHubUpdater: DOWNLOAD FAILED after ${duration}ms ===`);
       log.error('GitHubUpdater: Error downloading update:', error);
       log.error('GitHubUpdater: Download error details:', {
-        message: error instanceof Error ? error.message : 'Unknown error',
+        message: errorMessage(error, 'Unknown error'),
         stack: error instanceof Error ? error.stack : 'No stack',
         name: error instanceof Error ? error.name : 'Unknown',
       });
       return {
         success: false,
-        error: error instanceof Error ? error.message : 'Unknown error',
+        error: errorMessage(error, 'Unknown error'),
       };
     }
   }

ui/desktop/src/utils/ollamaDetection.ts

@@ -1,3 +1,5 @@
+import { errorMessage } from './conversionUtils';
+
 const DEFAULT_OLLAMA_HOST = 'http://127.0.0.1:11434';
 const OLLAMA_DOWNLOAD_URL = 'https://ollama.com/download';
 const PREFERRED_MODEL = 'gpt-oss:20b';
@@ -52,7 +54,7 @@ export async function checkOllamaStatus(): Promise<OllamaStatus> {
     return {
       isRunning: false,
       host: DEFAULT_OLLAMA_HOST,
-      error: error instanceof Error ? error.message : 'Unknown error',
+      error: errorMessage(error, 'Unknown error'),
     };
   }
 }

ui/desktop/src/utils/sessionCache.ts

@@ -1,5 +1,6 @@
 import { Session } from '../api';
 import { getApiUrl } from '../config';
+import { errorMessage } from './conversionUtils';
 
 /**
  * In-memory cache for session data
@@ -57,10 +58,7 @@ export async function loadSession(sessionId: string, forceRefresh = false): Prom
 
       return session;
     } catch (error) {
-      if (error instanceof Error) {
-        throw new Error(`Error loading session ${sessionId}: ${error.message}`);
-      }
-      throw new Error(`Error loading session ${sessionId}: Unknown error`);
+      throw new Error(`Error loading session ${sessionId}: ${errorMessage(error, 'Unknown error')}`);
     } finally {
       inFlightRequests.delete(sessionId);
     }