fix: resolve merge conflicts; apply review feedback on logging

Author: bradjin8

api/logs.py

@@ -14,7 +14,7 @@
 from flask import Blueprint, jsonify
 
 from utils.workspace_path import resolve_workspace_path
-from utils.path_helpers import to_epoch_ms
+from utils.path_helpers import to_epoch_ms, warn_workspace_json_read
 
 bp = Blueprint("logs", __name__)
 _logger = logging.getLogger(__name__)
@@ -95,11 +95,7 @@ def get_logs():
                         wd = json.load(f)
                     workspace_folder = wd.get("folder")
                 except Exception as e:
-                    _logger.warning(
-                        "Failed to read workspace.json for %s: %s",
-                        name,
-                        e,
-                    )
+                    warn_workspace_json_read(_logger, name, e)
 
                 try:
                     # closing() guarantees .close() on scope exit (issue #17).

api/search.py

@@ -16,7 +16,7 @@
 
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
 from utils.workspace_path import resolve_workspace_path, get_cli_chats_path
-from utils.path_helpers import to_epoch_ms
+from utils.path_helpers import to_epoch_ms, warn_workspace_json_read
 from utils.text_extract import extract_text_from_bubble
 from utils.cli_chat_reader import list_cli_projects, traverse_blobs, messages_to_bubbles
 from models import Bubble, Composer, SchemaError
@@ -115,11 +115,7 @@ def search():
                                     if fn:
                                         ws_id_to_name[name] = _url_unquote(fn)
                             except Exception as e:
-                                _logger.warning(
-                                    "Failed to read workspace.json for %s: %s",
-                                    name,
-                                    e,
-                                )
+                                warn_workspace_json_read(_logger, name, e)
                 except Exception as e:
                     _logger.warning(
                         "Failed to list workspace entries under %s: %s",
@@ -305,11 +301,7 @@ def search():
                         wd = json.load(f)
                     workspace_folder = wd.get("folder")
                 except Exception as e:
-                    _logger.warning(
-                        "Failed to read workspace.json for %s: %s",
-                        name,
-                        e,
-                    )
+                    warn_workspace_json_read(_logger, name, e)
                 workspace_name = _workspace_display_name_from_folder(workspace_folder, fallback=name)
 
                 # try/finally guarantees .close() on every exit path (issue #17).

api/workspaces.py

@@ -15,7 +15,11 @@
 
 from utils.workspace_path import resolve_workspace_path, get_cli_chats_path
 from utils.cli_chat_reader import list_cli_projects
-from utils.path_helpers import get_workspace_folder_paths, get_workspace_display_name
+from utils.path_helpers import (
+    get_workspace_folder_paths,
+    get_workspace_display_name,
+    warn_workspace_json_read,
+)
 from utils.workspace_descriptor import read_json_file
 from services.workspace_resolver import (
     _infer_workspace_name_from_context,
@@ -118,11 +122,7 @@ def get_workspace(workspace_id):
                 if inferred:
                     workspace_name = inferred
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                workspace_id,
-                e,
-            )
+            warn_workspace_json_read(_logger, workspace_id, e)
             inferred = _infer_workspace_name_from_context(workspace_path, workspace_id)
             if inferred:
                 workspace_name = inferred

services/workspace_listing.py

@@ -14,6 +14,7 @@
     get_workspace_folder_paths,
     normalize_file_path,
     to_epoch_ms,
+    warn_workspace_json_read,
 )
 from utils.workspace_descriptor import read_json_file
 from utils.workspace_path import get_cli_chats_path
@@ -133,8 +134,8 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
                             cid,
                             e,
                         )
-            except Exception as e:
-                _logger.error("Failed to load composer rows from global storage: %s", e)
+            except Exception:
+                _logger.exception("Failed to load composer rows from global storage")
 
     # Group workspace entries by normalized folder path
     folder_to_entries: dict[str, list] = {}
@@ -148,11 +149,7 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
             if first_folder:
                 norm_folder = normalize_file_path(first_folder)
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                entry["name"],
-                e,
-            )
+            warn_workspace_json_read(_logger, entry["name"], e)
         if not norm_folder:
             norm_folder = entry["name"]  # fallback to workspace ID
         entry_folder_map[entry["name"]] = norm_folder

services/workspace_resolver.py

@@ -15,6 +15,7 @@
     get_workspace_display_name,
     get_workspace_folder_paths,
     normalize_file_path,
+    warn_workspace_json_read,
 )
 from utils.workspace_descriptor import basename_from_pathish, read_json_file
 from services.workspace_db import _open_global_db
@@ -139,11 +140,7 @@ def _get_project_from_file_path(
                     best_len = len(wp)
                     best_match = entry["name"]
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                entry["name"],
-                e,
-            )
+            warn_workspace_json_read(_logger, entry["name"], e)
     return best_match
 
 
@@ -159,11 +156,7 @@ def _create_project_name_to_workspace_id_map(workspace_entries):
                 if folder_name:
                     mapping[folder_name] = entry["name"]
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                entry["name"],
-                e,
-            )
+            warn_workspace_json_read(_logger, entry["name"], e)
     return mapping
 
 
@@ -176,11 +169,7 @@ def _create_workspace_path_to_id_map(workspace_entries):
                 normalized = normalize_file_path(folder)
                 out[normalized] = entry["name"]
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                entry["name"],
-                e,
-            )
+            warn_workspace_json_read(_logger, entry["name"], e)
     return out
 
 
@@ -294,11 +283,7 @@ def _determine_project_for_conversation(
                 if name:
                     folder_name_to_ws.append({"name": name, "id": entry["name"]})
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                entry["name"],
-                e,
-            )
+            warn_workspace_json_read(_logger, entry["name"], e)
 
     best_id = None
     best_len = 0

services/workspace_tabs.py

@@ -13,6 +13,7 @@
     get_workspace_folder_paths,
     normalize_file_path,
     to_epoch_ms,
+    warn_workspace_json_read,
 )
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
 from utils.text_extract import extract_text_from_bubble
@@ -46,6 +47,19 @@ def _try_loads_kv_value(raw: str | None) -> Any | None:
         return None
 
 
+_KV_VALUE_LOG_LIMIT = 200
+
+
+def _kv_value_log_preview(value: object | None, limit: int = _KV_VALUE_LOG_LIMIT) -> str:
+    """Truncated KV payload for warning logs (avoids multi-MB log lines on bad rows)."""
+    if value is None:
+        return "None"
+    text = value if isinstance(value, str) else str(value)
+    if len(text) > limit:
+        return text[:limit] + "..."
+    return text
+
+
 def assemble_workspace_tabs(
     workspace_id: str,
     workspace_path: str,
@@ -73,11 +87,7 @@ def assemble_workspace_tabs(
             if first_folder:
                 target_folder = normalize_file_path(first_folder)
         except Exception as e:
-            _logger.warning(
-                "Failed to read workspace.json for %s: %s",
-                workspace_id,
-                e,
-            )
+            warn_workspace_json_read(_logger, workspace_id, e)
         if target_folder:
             for entry in workspace_entries:
                 try:
@@ -87,11 +97,7 @@ def assemble_workspace_tabs(
                     if f2 and normalize_file_path(f2) == target_folder:
                         matching_ws_ids.add(entry["name"])
                 except Exception as e:
-                    _logger.warning(
-                        "Failed to read workspace.json for %s: %s",
-                        entry["name"],
-                        e,
-                    )
+                    warn_workspace_json_read(_logger, entry["name"], e)
 
     bubble_map: dict[str, dict] = {}
     code_block_diff_map: dict[str, list] = {}
@@ -122,12 +128,12 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
                     continue
                 try:
                     parsed = json.loads(row["value"])
-                except json.JSONDecodeError as e:
+                except (json.JSONDecodeError, TypeError, ValueError) as e:
                     _logger.warning(
-                        "Failed to decode Bubble from %s: %s (value: %r)",
+                        "Failed to decode Bubble from %s: %s (value_preview=%r)",
                         row["key"],
                         e,
-                        row["value"],
+                        _kv_value_log_preview(row["value"]),
                     )
                     continue
                 try:
@@ -206,12 +212,13 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
                 continue
             try:
                 parsed = json.loads(row["value"])
-            except json.JSONDecodeError as e:
+            except (json.JSONDecodeError, TypeError, ValueError) as e:
                 _logger.warning(
-                    "Failed to decode Composer from composerData:%s: %s (value: %r)",
+                    "Failed to decode Composer from composerData:%s: %s (key=%s, value_preview=%r)",
                     composer_id,
                     e,
-                    row["value"],
+                    row["key"],
+                    _kv_value_log_preview(row["value"]),
                 )
                 continue
             try:

utils/path_helpers.py

@@ -1,5 +1,6 @@
 """Path utility functions mirroring src/utils/path.ts"""
 
+import logging
 import os
 import sys
 from datetime import datetime
@@ -142,3 +143,16 @@ def get_workspace_display_name(workspace_data: dict, fallback: str | None = None
             if decoded:
                 return decoded
     return fallback or ""
+
+
+def warn_workspace_json_read(
+    logger: logging.Logger,
+    workspace_id: str,
+    err: BaseException,
+) -> None:
+    """Log a standard warning when workspace.json cannot be read (shared across services/api)."""
+    logger.warning(
+        "Failed to read workspace.json for %s: %s",
+        workspace_id,
+        err,
+    )