BasedHardware · karthikyeluripati · Jun 18, 2026 · Jun 18, 2026 · Jun 19, 2026 · Jun 19, 2026
diff --git a/backend/routers/chat.py b/backend/routers/chat.py
@@ -274,9 +274,14 @@ def process_message(response: str, callback_data: dict):
 
         # cited extraction
         cited_conversation_idxs = {int(i) for i in re.findall(r'\[(\d+)\]', response)}
+        logger.info(
+            f"[chat] citation extraction: {len(memories)} memories_found, "
+            f"cited_idxs={sorted(cited_conversation_idxs)}"
+        )
         if len(cited_conversation_idxs) > 0:
             response = re.sub(r'\[\d+\]', '', response)
         memories = [memories[i - 1] for i in cited_conversation_idxs if 0 < i and i <= len(memories)]
+        logger.info(f"[chat] resolved {len(memories)} citation(s) for done: payload")
 
         memories_id = extract_memory_ids(memories) if memories else []
 
@@ -324,7 +329,25 @@ async def generate_stream():
                 else:
                     response = callback_data.get('answer')
                     if response:
-                        ai_message, ask_for_nps = process_message(response, callback_data)
+                        try:
+                            ai_message, ask_for_nps = process_message(response, callback_data)
+                        except Exception as pm_err:
+                            logger.error(
+                                f"[chat] process_message failed; emitting done: without citations. Error: {pm_err}"
+                            )
+                            # Build a minimal message so the done: line is always emitted.
+                            # Strip [N] markers best-effort so the frontend shows clean text.
+                            ai_message = Message(
+                                id=str(uuid.uuid4()),
+                                text=re.sub(r'\[\d+\]', '', response),
+                                created_at=datetime.now(timezone.utc),
+                                sender='ai',
+                                app_id=app_id_from_app,
+                                type='text',
+                            )
+                            if chat_session:
+                                ai_message.chat_session_id = chat_session.id
+                            ask_for_nps = False
-                            if chat_session:
-                                ai_message.chat_session_id = chat_session.id
-                            ask_for_nps = False
+                            if chat_session:
+                                ai_message.chat_session_id = chat_session.id
+                                chat_db.add_message_to_chat_session(uid, chat_session.id, ai_message.id)
+                            chat_db.add_message(uid, ai_message.dict())
+                            ask_for_nps = False
-                            if chat_session:
-                                ai_message.chat_session_id = chat_session.id
-                            ask_for_nps = False
+                            if chat_session:
+                                ai_message.chat_session_id = chat_session.id
+                                chat_db.add_message_to_chat_session(uid, chat_session.id, ai_message.id)
+                            chat_db.add_message(uid, ai_message.dict())
+                            ask_for_nps = False
                         ai_message_dict = ai_message.dict()
                         response_message = ResponseMessage(**ai_message_dict)
                         response_message.ask_for_nps = ask_for_nps

diff --git a/backend/utils/retrieval/agentic.py b/backend/utils/retrieval/agentic.py
@@ -657,5 +657,11 @@ async def execute_agentic_chat_stream(
         traceback.print_exc()
         if callback_data is not None:
             callback_data['error'] = str(e)
+            # Ensure answer is always set so generate_stream can emit the done: line
+            # and the frontend receives clean text even when an exception cut the
+            # normal success path before line 644.
+            if 'answer' not in callback_data:
+                callback_data['answer'] = ''.join(full_response)
+                callback_data['memories_found'] = conversations_collected if conversations_collected else []
 
     yield None  # Signal completion
diff --git a/backend/utils/retrieval/tools/conversation_tools.py b/backend/utils/retrieval/tools/conversation_tools.py
@@ -242,8 +242,15 @@ def get_conversations_tool(
 
         logger.info(f"🔍 get_conversations_tool - Converted {len(conversations)} conversation objects")
 
-        # Store conversations in config for citation tracking (as lightweight dicts)
-        conversations_collected = config['configurable'].get('conversations_collected', [])
+        # Store conversations in config for citation tracking (as lightweight dicts).
+        # Prefer agent_config_context (guaranteed to be the original shared list from
+        # execute_agentic_chat_stream) over config['configurable'] (LangChain may pass
+        # a copy of the configurable dict, silently breaking the shared-list reference).
+        ctx = agent_config_context.get(None)
+        if ctx:
+            conversations_collected = ctx['configurable'].get('conversations_collected', [])
+        else:
+            conversations_collected = config['configurable'].get('conversations_collected', [])
         for conv in conversations:
             conv_dict = conv.dict()
             # Remove heavy fields to reduce memory usage
@@ -477,8 +484,15 @@ def search_conversations_tool(
 
         logger.info(f"🔍 search_conversations_tool - Converted {len(conversations)} conversation objects")
 
-        # Store conversations in config for citation tracking (as lightweight dicts)
-        conversations_collected = config['configurable'].get('conversations_collected', [])
+        # Store conversations in config for citation tracking (as lightweight dicts).
+        # Prefer agent_config_context (guaranteed to be the original shared list from
+        # execute_agentic_chat_stream) over config['configurable'] (LangChain may pass
+        # a copy of the configurable dict, silently breaking the shared-list reference).
+        ctx = agent_config_context.get(None)
+        if ctx:
+            conversations_collected = ctx['configurable'].get('conversations_collected', [])
+        else:
+            conversations_collected = config['configurable'].get('conversations_collected', [])
         for conv in conversations:
             conv_dict = conv.dict()
             # Remove heavy fields to reduce memory usage

diff --git a/desktop/windows/.gitignore b/desktop/windows/.gitignore
@@ -50,3 +50,5 @@ resources/win-ocr-helper/*.pdb
 src/main/automation/helper/bin/
 src/main/automation/helper/obj/
 resources/win-automation-helper/*.pdb
+*.tsbuildinfo
+electron.vite.config.*.mjs
diff --git a/desktop/windows/electron-builder.yml b/desktop/windows/electron-builder.yml
@@ -19,6 +19,9 @@ asarUnpack:
   # koffi loads its native .node at runtime, resolved relative to its own package
   # dir — it must live outside the asar archive or the foreground monitor fails.
   - node_modules/koffi/**
+  # kgWorker.js is loaded via new Worker(path) which bypasses Electron's asar
+  # virtual-fs patch — it must be a real file on disk.
+  - out/main/kgWorker.js
 win:
   executableName: omi-windows
   target:

diff --git a/desktop/windows/electron.vite.config.ts b/desktop/windows/electron.vite.config.ts
@@ -1,9 +1,24 @@
+import { readFileSync } from 'node:fs'
 import { resolve } from 'path'
 import { defineConfig } from 'electron-vite'
 import react from '@vitejs/plugin-react'
 
+const appVersion = (JSON.parse(readFileSync('./package.json', 'utf-8')) as { version: string }).version
+
 export default defineConfig({
-  main: {},
+  main: {
+    build: {
+      rollupOptions: {
+        input: {
+          index: resolve('src/main/index.ts'),
+          // Second entry so vite emits out/main/kgWorker.js alongside index.js.
+          // The worker file must be a separate bundle (not inlined) because
+          // new Worker(path) needs a real file — it can't load from the main bundle.
+          kgWorker: resolve('src/main/ipc/kgWorker.ts')
+        }
+      }
+    }
+  },
   preload: {},
   renderer: {
     // Pin the dev server to a fixed port so the renderer's origin
@@ -21,6 +36,9 @@ export default defineConfig({
         '@renderer': resolve('src/renderer/src')
       }
     },
-    plugins: [react()]
+    plugins: [react()],
+    define: {
+      __APP_VERSION__: JSON.stringify(appVersion)
+    }
   }
 })
diff --git a/desktop/windows/package.json b/desktop/windows/package.json
@@ -18,7 +18,7 @@
     "build:ocr-helper": "powershell -ExecutionPolicy Bypass -File scripts/build-ocr-helper.ps1",
     "postinstall": "electron-builder install-app-deps && electron-rebuild -f -w better-sqlite3 && node scripts/ensure-ocr-helper.mjs",
     "build:unpack": "npm run build && electron-builder --dir",
-    "build:win": "npm run build && electron-builder --win --x64",
+    "build:win": "node scripts/copy-koffi-native.mjs && npm run build && electron-builder --win --x64",
     "build:mac": "electron-vite build && electron-builder --mac",
     "build:linux": "electron-vite build && electron-builder --linux",
     "test": "vitest run",
@@ -34,8 +34,6 @@
     "@radix-ui/react-scroll-area": "^1.2.10",
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-tooltip": "^1.2.8",
-    "@react-three/drei": "^10.7.7",
-    "@react-three/fiber": "^9.6.1",
     "axios": "^1.16.1",
     "better-sqlite3": "^12.10.0",
     "class-variance-authority": "^0.7.1",
@@ -47,20 +45,22 @@
     "lucide-react": "^1.16.0",
     "react-router-dom": "^7.15.1",
     "tailwind-merge": "^3.6.0",
-    "three": "^0.184.0",
     "ws": "^8.21.0"
   },
   "devDependencies": {
     "@electron-toolkit/eslint-config-prettier": "^3.0.0",
     "@electron-toolkit/eslint-config-ts": "^3.1.0",
     "@electron-toolkit/tsconfig": "^2.0.0",
+    "@react-three/drei": "^10.7.7",
+    "@react-three/fiber": "^9.6.1",
     "@electron/rebuild": "^4.0.4",
     "@types/better-sqlite3": "^7.6.13",
     "@types/d3-force": "^3.0.10",
     "@types/node": "^22.19.1",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@types/three": "^0.184.1",
+    "three": "^0.184.0",
     "@types/ws": "^8.18.1",
     "@vitejs/plugin-react": "^5.1.1",
     "autoprefixer": "^10.5.0",