From b64b1e68794c984e8055fb7a75999275eff0a32a Mon Sep 17 00:00:00 2001
From: Jakob Michael Werner <jakemwernerz@gmail.com>
Date: Wed, 15 Apr 2026 03:33:51 -0500
Subject: [PATCH] fix: replace require() with static ESM import for Tauri event
 API

Vite bundles as ESM where require() is not defined, causing a silent
ReferenceError that falls back to DOM event listeners. The Rust
backend emits events through Tauri's IPC bridge, not the DOM, so
the frontend never receives any events.

Replace the require() + try/catch pattern with a static ESM import
in both ClaudeCodeSession.tsx and useClaudeMessages.ts.

Fixes #462
---
 src/components/ClaudeCodeSession.tsx          | 31 +------------------
 .../claude-code-session/useClaudeMessages.ts  | 10 +-----
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/src/components/ClaudeCodeSession.tsx b/src/components/ClaudeCodeSession.tsx
index f0f164f21..ebbec0476 100644
--- a/src/components/ClaudeCodeSession.tsx
+++ b/src/components/ClaudeCodeSession.tsx
@@ -16,37 +16,8 @@ import { Popover } from "@/components/ui/popover";
 import { api, type Session } from "@/lib/api";
 import { cn } from "@/lib/utils";
 
-// Conditional imports for Tauri APIs
-let tauriListen: any;
+import { listen } from "@tauri-apps/api/event";
 type UnlistenFn = () => void;
-
-try {
-  if (typeof window !== 'undefined' && window.__TAURI__) {
-    tauriListen = require("@tauri-apps/api/event").listen;
-  }
-} catch (e) {
-  console.log('[ClaudeCodeSession] Tauri APIs not available, using web mode');
-}
-
-// Web-compatible replacements
-const listen = tauriListen || ((eventName: string, callback: (event: any) => void) => {
-  console.log('[ClaudeCodeSession] Setting up DOM event listener for:', eventName);
-
-  // In web mode, listen for DOM events
-  const domEventHandler = (event: any) => {
-    console.log('[ClaudeCodeSession] DOM event received:', eventName, event.detail);
-    // Simulate Tauri event structure
-    callback({ payload: event.detail });
-  };
-
-  window.addEventListener(eventName, domEventHandler);
-
-  // Return unlisten function
-  return Promise.resolve(() => {
-    console.log('[ClaudeCodeSession] Removing DOM event listener for:', eventName);
-    window.removeEventListener(eventName, domEventHandler);
-  });
-});
 import { StreamMessage } from "./StreamMessage";
 import { FloatingPromptInput, type FloatingPromptInputRef } from "./FloatingPromptInput";
 import { ErrorBoundary } from "./ErrorBoundary";
diff --git a/src/components/claude-code-session/useClaudeMessages.ts b/src/components/claude-code-session/useClaudeMessages.ts
index 5a2e819e6..393580259 100644
--- a/src/components/claude-code-session/useClaudeMessages.ts
+++ b/src/components/claude-code-session/useClaudeMessages.ts
@@ -3,15 +3,7 @@ import { api } from '@/lib/api';
 import { getEnvironmentInfo } from '@/lib/apiAdapter';
 import type { ClaudeStreamMessage } from '../AgentExecution';
 
-// Conditional import for Tauri
-let tauriListen: any;
-try {
-  if (typeof window !== 'undefined' && window.__TAURI__) {
-    tauriListen = require('@tauri-apps/api/event').listen;
-  }
-} catch (e) {
-  console.log('[useClaudeMessages] Tauri event API not available, using web mode');
-}
+import { listen as tauriListen } from '@tauri-apps/api/event';
 
 interface UseClaudeMessagesOptions {
   onSessionInfo?: (info: { sessionId: string; projectId: string }) => void;