1 files changed, 18 insertions, 1 deletions
diff --git a/packages/cli/src/gemini.ts b/packages/cli/src/gemini.ts
index 420f3242..32e34c20 100644
--- a/packages/cli/src/gemini.ts
+++ b/packages/cli/src/gemini.ts
@@ -24,7 +24,24 @@ async function main() {
   const settings = loadSettings(process.cwd());
   const config = await loadCliConfig(settings.merged);
   if (settings.merged.theme) {
-    themeManager.setActiveTheme(settings.merged.theme);
+    try {
+      themeManager.setActiveTheme(settings.merged.theme);
+    } catch (error: unknown) {
+      // If the theme is not found during initial load, log a warning and continue.
+      // The useThemeCommand hook in App.tsx will handle opening the dialog.
+      if (
+        error instanceof Error &&
+        error.message.includes('Theme') &&
+        error.message.includes('not found')
+      ) {
+        console.warn(
+          `Warning: ${error instanceof Error ? error.message : String(error)}`,
+        );
+      } else {
+        // Re-throw other errors to be caught by the main catch block
+        throw error;
+      }
+    }
   }
 
   // hop into sandbox if we are outside and sandboxing is enabled