fix merge conflicts

Author: CREDO23

…17_add_vision_llm_id_to_search_spaces.py …19_add_vision_llm_id_to_search_spaces.pysurfsense_backend/alembic/versions/117_add_vision_llm_id_to_search_spaces.py renamed to surfsense_backend/alembic/versions/119_add_vision_llm_id_to_search_spaces.py surfsense_backend/alembic/versions/117_add_vision_llm_id_to_search_spaces.py renamed to surfsense_backend/alembic/versions/119_add_vision_llm_id_to_search_spaces.py

@@ -1,7 +1,7 @@
-"""117_add_vision_llm_id_to_search_spaces
+"""119_add_vision_llm_id_to_search_spaces
 
-Revision ID: 117
-Revises: 116
+Revision ID: 119
+Revises: 118
 
 Adds vision_llm_id column to search_spaces for vision/screenshot analysis
 LLM role assignment. Defaults to 0 (Auto mode), same convention as
@@ -16,8 +16,8 @@
 
 from alembic import op
 
-revision: str = "117"
-down_revision: str | None = "116"
+revision: str = "119"
+down_revision: str | None = "118"
 branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 

surfsense_backend/app/services/vision_autocomplete_service.py

@@ -220,6 +220,6 @@ async def stream_vision_autocomplete(
             logger.warning(f"Vision autocomplete: selected model does not support vision: {e}")
             yield streaming.format_error(vision_error_msg)
         else:
-            logger.error(f"Vision autocomplete streaming error: {e}")
-            yield streaming.format_error(str(e))
+            logger.error(f"Vision autocomplete streaming error: {e}", exc_info=True)
+            yield streaming.format_error("Autocomplete failed. Please try again.")
         yield streaming.format_done()

surfsense_desktop/src/modules/autocomplete/index.ts

@@ -11,6 +11,7 @@ const SHORTCUT = 'CommandOrControl+Shift+Space';
 let autocompleteEnabled = true;
 let savedClipboard = '';
 let sourceApp = '';
+let lastSearchSpaceId: string | null = null;
 
 function isSurfSenseWindow(): boolean {
   const app = getFrontmostApp();
@@ -36,19 +37,24 @@ async function triggerAutocomplete(): Promise<void> {
     return;
   }
 
-  const cursor = screen.getCursorScreenPoint();
-  const win = createSuggestionWindow(cursor.x, cursor.y);
-
-  let searchSpaceId = '1';
   const mainWin = getMainWindow();
   if (mainWin && !mainWin.isDestroyed()) {
     const mainUrl = mainWin.webContents.getURL();
     const match = mainUrl.match(/\/dashboard\/(\d+)/);
     if (match) {
-      searchSpaceId = match[1];
+      lastSearchSpaceId = match[1];
     }
   }
 
+  if (!lastSearchSpaceId) {
+    console.warn('[autocomplete] No active search space. Open a search space first.');
+    return;
+  }
+
+  const searchSpaceId = lastSearchSpaceId;
+  const cursor = screen.getCursorScreenPoint();
+  const win = createSuggestionWindow(cursor.x, cursor.y);
+
   win.webContents.once('did-finish-load', () => {
     const sw = getSuggestionWindow();
     setTimeout(() => {

surfsense_web/components/editor-panel/editor-panel.tsx

@@ -96,9 +96,6 @@ export function EditorPanelContent({
 			}
 
 			try {
-				const response = await authenticatedFetch(
-					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/editor-content`,
-					{ method: "GET", signal: controller.signal }
 				const url = new URL(
 					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/editor-content`
 				);

surfsense_web/components/layout/ui/tabs/DocumentTabContent.tsx

@@ -81,9 +81,6 @@ export function DocumentTabContent({ documentId, searchSpaceId, title }: Documen
 			}
 
 			try {
-				const response = await authenticatedFetch(
-					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/editor-content`,
-					{ method: "GET", signal: controller.signal }
 				const url = new URL(
 					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/editor-content`
 				);