Fix review follow-ups for search window order and shared tab parsing

Author: clean6378-max-it

services/search.py

@@ -502,6 +502,8 @@ def _search_global_storage_via_index(
         if since_ms is not None and not composers_in_window:
             return results
 
+        search_pool = composers_in_window
+
         window_ids = set(composers_in_window.keys()) if since_ms is not None else None
         bubble_texts_by_composer = query_composer_bubble_hits(
             query_lower,
@@ -513,19 +515,13 @@ def _search_global_storage_via_index(
         for row in query_composer_title_hits(query_lower, since_ms=since_ms):
             candidate_ids.add(row["composer_id"])
 
-        search_pool = composers_in_window if since_ms is not None else query_composer_rows_in_window(None)
         for composer_id, row in search_pool.items():
             raw_lower = (row["raw_json"] or "").lower()
             if query_lower in raw_lower:
                 candidate_ids.add(composer_id)
 
         for composer_id in candidate_ids:
-            composer_row: sqlite3.Row | None = (
-                composers_in_window.get(composer_id) if since_ms is not None
-                else search_pool.get(composer_id)
-            )
-            if composer_row is None:
-                composer_row = query_composer_rows_in_window(None).get(composer_id)
+            composer_row = search_pool.get(composer_id)
             if composer_row is None:
                 continue
 
@@ -888,6 +884,10 @@ def search_legacy_workspaces(
                     ct = tab.get("chatTitle") or ""
                     tab_id = str(tab.get("tabId") or "")
 
+                    tab_ts = to_epoch_ms(tab.get("lastSendTime")) or _UNKNOWN_SEARCH_TIMESTAMP
+                    if not _timestamp_in_search_window(tab_ts, since_ms):
+                        continue
+
                     tab_model_names: list[str] | None = None
                     tab_meta = tab.get("metadata")
                     if isinstance(tab_meta, dict):
@@ -921,10 +921,6 @@ def search_legacy_workspaces(
                     if not has_match:
                         continue
 
-                    tab_ts = to_epoch_ms(tab.get("lastSendTime")) or _UNKNOWN_SEARCH_TIMESTAMP
-                    if not _timestamp_in_search_window(tab_ts, since_ms):
-                        continue
-
                     results.append({
                         "workspaceId": name,
                         "workspaceFolder": workspace_name,

services/search_index.py

@@ -43,6 +43,7 @@
 
 __all__ = [
     "SEARCH_INDEX_FILE",
+    "SEARCH_INDEX_POINTER_FILE",
     "ensure_search_index",
     "index_is_usable",
     "index_search_enabled",

services/workspace_composer_scan.py

@@ -29,13 +29,13 @@ def parse_composer_data_row(
     Returns ``None`` for null/placeholder payloads (e.g. ``empty-state-draft``)
     without emitting decode warnings. Logs and records skips for malformed JSON.
     """
+    if not row_key.startswith("composerData:"):
+        return None
     if raw_value is None:
         return None
     if not isinstance(raw_value, (str, bytes, bytearray)):
         parse_warnings.record_composer_skipped()
         return None
-    if not row_key.startswith("composerData:"):
-        return None
     composer_id = row_key.split(":", 1)[1]
     if not composer_id:
         parse_warnings.record_composer_skipped()

services/workspace_tabs.py

@@ -741,13 +741,7 @@ def assemble_workspace_tabs(
                         project_layouts_map[chat_id].append(layout["rootPath"])
 
         # Get composer data entries with conversations
-        composer_rows = safe_fetchall(
-            global_db,
-            "SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'"
-            " AND value IS NOT NULL"
-            " AND value LIKE '%fullConversationHeadersOnly%'"
-            " AND value NOT LIKE '%fullConversationHeadersOnly\":[]%'",
-        )
+        composer_rows = safe_fetchall(global_db, COMPOSER_ROWS_WITH_HEADERS_SQL)
 
         invalid_workspace_aliases = infer_invalid_workspace_aliases(
             composer_rows=composer_rows,
@@ -761,34 +755,12 @@ def assemble_workspace_tabs(
         )
 
         for row in composer_rows:
-            composer_id = row["key"].split(":")[1]
-            try:
-                parsed = json.loads(row["value"])
-            except (json.JSONDecodeError, TypeError, ValueError) as e:
-                payload_len, payload_fp = _kv_payload_log_meta(row["value"])
-                _logger.warning(
-                    "Failed to decode Composer from composerData:%s: %s (key=%s, payload_len=%d, payload_sha256=%s)",
-                    composer_id,
-                    e,
-                    row["key"],
-                    payload_len,
-                    payload_fp,
-                )
-                parse_warnings.record_composer_skipped()
-                continue
-            try:
-                composer = Composer.from_dict(parsed, composer_id=composer_id)
-            except SchemaError as e:
-                # Drift skipped + logged so the two primary conversation
-                # paths (list_workspaces + get_workspace_tabs) agree on what
-                # counts as a valid composer.
-                _logger.warning(
-                    "Failed to parse Composer from composerData:%s: %s",
-                    composer_id,
-                    e,
-                )
-                parse_warnings.record_composer_skipped()
+            composer = parse_composer_data_row(
+                row["key"], row["value"], parse_warnings=parse_warnings,
+            )
+            if composer is None:
                 continue
+            composer_id = composer.composer_id
             try:
                 # Determine project
                 pid = determine_project_for_conversation(

tests/test_parse_failure_logging.py

@@ -156,7 +156,7 @@ def test_workspace_tabs_logs_composer_json_decode_failure(self) -> None:
                     ("composerData:cmp-json", bad_composer_value),
                 )
                 conn.commit()
-            with self.assertLogs("services.workspace_tabs", level="WARNING") as cm:
+            with self.assertLogs("services.workspace_composer_scan", level="WARNING") as cm:
                 with app.test_request_context("/api/workspaces/global/tabs"):
                     _payload, _status = assemble_workspace_tabs("global", ws_root, rules=[])