test: harden MessageDict mypy fixtures and restore search parity

Author: clean6378-max-it

tests/mypy_types/message_dict_invalid.py

@@ -3,7 +3,7 @@
 from models.session import MessageDict, UserMessageDict
 
 user_msg: UserMessageDict = {"role": "user", "text": "hello"}
-_ = user_msg["thinking"]
+_ = user_msg["thinking"]  # expect: typeddict-item thinking
 
 union_msg: MessageDict = {"role": "user", "text": "hello"}
-_ = union_msg["thinking"]
+_ = union_msg["thinking"]  # expect: typeddict-item thinking

tests/mypy_types/message_dict_valid.py

@@ -1,9 +1,15 @@
 """Positive fixture: discriminant narrowing allows role-specific fields."""
 
-from models.session import MessageDict, UserMessageDict
+from models.session import AssistantMessageDict, MessageDict, UserMessageDict
 
-messages: list[MessageDict] = [{"role": "user", "text": "hello"}]
+messages: list[MessageDict] = [
+    {"role": "user", "text": "hello"},
+    {"role": "assistant", "text": "hi", "thinking": "hmm"},
+]
 for msg in messages:
     if msg["role"] == "user":
         narrowed: UserMessageDict = msg
-        _ = narrowed.get("slug")
+        _ = narrowed["slug"]
+    elif msg["role"] == "assistant":
+        narrowed_asst: AssistantMessageDict = msg
+        _ = narrowed_asst["thinking"]

tests/test_message_dict_mypy.py

@@ -13,7 +13,7 @@
 MYPY_TYPES_DIR = REPO_ROOT / "tests" / "mypy_types"
 
 _INVALID_FIXTURE = "message_dict_invalid.py"
-_INVALID_ERROR_LINES = (6, 9)
+_EXPECT_MARKER = "expect: typeddict-item"
 
 
 def _run_mypy_on(path: Path) -> subprocess.CompletedProcess[str]:
@@ -31,6 +31,7 @@ def _run_mypy_on(path: Path) -> subprocess.CompletedProcess[str]:
         capture_output=True,
         text=True,
         check=False,
+        timeout=60.0,
     )
 
 
@@ -39,6 +40,19 @@ def _typeddict_item_error_lines(output: str, fixture_name: str) -> set[int]:
     return {int(match.group(1)) for match in re.finditer(pattern, output)}
 
 
+def _invalid_fixture_expectations(fixture_path: Path) -> tuple[set[int], list[str]]:
+    expected_lines: set[int] = set()
+    expected_tokens: list[str] = []
+    for lineno, line in enumerate(fixture_path.read_text(encoding="utf-8").splitlines(), start=1):
+        if _EXPECT_MARKER not in line:
+            continue
+        expected_lines.add(lineno)
+        suffix = line.split(_EXPECT_MARKER, 1)[1].strip()
+        if suffix:
+            expected_tokens.append(suffix)
+    return expected_lines, expected_tokens
+
+
 @pytest.mark.parametrize(
     ("fixture_name", "should_pass"),
     [
@@ -47,14 +61,18 @@ def _typeddict_item_error_lines(output: str, fixture_name: str) -> set[int]:
     ],
 )
 def test_message_dict_mypy_fixtures(fixture_name: str, should_pass: bool) -> None:
-    result = _run_mypy_on(MYPY_TYPES_DIR / fixture_name)
+    fixture_path = MYPY_TYPES_DIR / fixture_name
+    result = _run_mypy_on(fixture_path)
     output = result.stdout + result.stderr
     if should_pass:
         assert result.returncode == 0, output
     else:
         assert result.returncode != 0
         error_lines = _typeddict_item_error_lines(output, fixture_name)
-        assert error_lines >= set(_INVALID_ERROR_LINES), (
-            f"expected typeddict-item on lines {_INVALID_ERROR_LINES}, "
+        expected_lines, expected_tokens = _invalid_fixture_expectations(fixture_path)
+        assert error_lines >= expected_lines, (
+            f"expected typeddict-item on lines {sorted(expected_lines)}, "
             f"got {sorted(error_lines)}: {output}"
         )
+        for token in expected_tokens:
+            assert token in output, f"expected mypy output to mention {token!r}: {output}"

utils/jsonl_parser.py

@@ -114,8 +114,6 @@ def _fallback_message(entry: dict[str, Any], role: RoleLiteral) -> MessageDict:
             "parent_uuid": base["parent_uuid"],
             "timestamp": base["timestamp"],
             "is_sidechain": base["is_sidechain"],
-            "progress_type": "",
-            "data": {},
         }
         return progress_msg
     result_msg: ResultMessageDict = {

utils/search_index.py

@@ -385,8 +385,8 @@ def message_searchable_text(msg: MessageDict) -> str:
         raw_text = msg.get("text", "")
         text = raw_text if isinstance(raw_text, str) else ""
     elif role == "system":
-        raw_content = msg.get("content", "")
-        content = raw_content if isinstance(raw_content, str) else ""
+        raw_text = msg.get("text", "") or msg.get("content", "") or ""
+        text = raw_text if isinstance(raw_text, str) else ""
     elif role == "result":
         raw_text = msg.get("text", "") or msg.get("content", "") or ""
         text = raw_text if isinstance(raw_text, str) else ""