cc-transcript 7.1.0__tar.gz → 8.0.0__tar.gz

{cc_transcript-7.1.0 → cc_transcript-8.0.0}/Cargo.lock

@@ -66,7 +66,7 @@ dependencies = [
 
 [[package]]
 name = "cc_transcript_parser"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "chrono",
  "crossbeam-channel",
@@ -79,6 +79,8 @@ dependencies = [
  "regex",
  "serde",
  "sonic-rs",
+ "tree-sitter",
+ "tree-sitter-bash",
  "udpipe-rs",
 ]
 
@@ -728,6 +730,20 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.150"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
 [[package]]
 name = "shlex"
 version = "2.0.1"
@@ -791,6 +807,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -869,6 +891,36 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tree-sitter"
+version = "0.26.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c343ed63e3f5c64d1acdecb5d2c13d4e169cb5fde0052106ebaa6c6f27f9e55"
+dependencies = [
+ "cc",
+ "regex",
+ "regex-syntax",
+ "serde_json",
+ "streaming-iterator",
+ "tree-sitter-language",
+]
+
+[[package]]
+name = "tree-sitter-bash"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5ec769279cc91b561d3df0d8a5deb26b0ad40d183127f409494d6d8fc53062"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
+[[package]]
+name = "tree-sitter-language"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
+
 [[package]]
 name = "udpipe-rs"
 version = "0.2.0"

cc_transcript-8.0.0/PKG-INFO

@@ -0,0 +1,123 @@
+Metadata-Version: 2.4
+Name: cc-transcript
+Version: 8.0.0
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Rust
+Classifier: Typing :: Typed
+Requires-Dist: aiosqlite>=0.20
+Requires-Dist: anyio>=4.4
+Requires-Dist: click>=8.1
+Requires-Dist: orjson>=3.10
+Requires-Dist: tree-sitter>=0.26
+Requires-Dist: tree-sitter-bash>=0.25
+Requires-Dist: pytest>=8.0 ; extra == 'dev'
+Requires-Dist: ty>=0.0.44 ; extra == 'dev'
+Requires-Dist: ruff>=0.8 ; extra == 'dev'
+Requires-Dist: spawnllm>=0.5.1,<0.6 ; extra == 'llm'
+Requires-Dist: spacy>=3.8 ; extra == 'sentiment'
+Requires-Dist: afinn>=0.1 ; extra == 'sentiment'
+Provides-Extra: dev
+Provides-Extra: llm
+Provides-Extra: sentiment
+License-File: LICENSE
+Summary: Grep every Claude Code session you've ever run.
+Keywords: claude-code,claude,anthropic,transcripts,jsonl,parser,cli,agents,sentiment,feedback-mining
+Author-email: Yasyf Mohamedali <yasyfm@gmail.com>
+License-Expression: PolyForm-Noncommercial-1.0.0
+Requires-Python: >=3.13
+Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
+Project-URL: Changelog, https://github.com/yasyf/cc-transcript/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://yasyf.github.io/cc-transcript/
+Project-URL: Homepage, https://github.com/yasyf/cc-transcript
+Project-URL: Issues, https://github.com/yasyf/cc-transcript/issues
+Project-URL: Repository, https://github.com/yasyf/cc-transcript
+
+# ![cc-transcript](https://github.com/yasyf/cc-transcript/raw/main/docs/assets/readme-banner.webp)
+
+**Grep every Claude Code session you've ever run.** cc-transcript's lossless parser reads Claude Code's on-disk JSONL; the CLI lists transcripts, greps their content, and renders one compact line per event.
+
+[![CI](https://github.com/yasyf/cc-transcript/actions/workflows/ci.yml/badge.svg)](https://github.com/yasyf/cc-transcript/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/cc-transcript.svg)](https://pypi.org/project/cc-transcript/)
+[![License: PolyForm Noncommercial](https://img.shields.io/badge/license-PolyForm--Noncommercial--1.0.0-blue)](https://github.com/yasyf/cc-transcript/blob/main/LICENSE)
+
+## Get started
+
+```bash
+uvx cc-transcript list
+```
+
+Every session is already on disk under `~/.claude/projects` — `list` finds them newest first, and `stats` collapses one into a screenful:
+
+<img src="https://github.com/yasyf/cc-transcript/raw/main/docs/assets/demo.png" alt="Terminal running 'uvx cc-transcript stats' — a 1,023-event session summarized as counts, kinds, models, and tool names" width="700">
+
+Driving with an agent? Paste this:
+
+```text
+/plugin marketplace add yasyf/cc-transcript
+/plugin install cc-transcript@cc-transcript
+```
+
+The plugin's skill teaches Claude to answer "what did I ask you yesterday?" from its own history, funneling through the CLI instead of reading raw JSONL.
+
+<details>
+<summary>No Claude Code? Point any agent at the CLI</summary>
+
+```text
+Use `uvx cc-transcript` to investigate my Claude Code sessions: `list` finds
+transcripts on disk, `stats` summarizes one, `grep` searches content, and `show`
+renders one compact line per event. Start by listing my newest sessions and
+summarizing the most recent one. Docs: https://yasyf.github.io/cc-transcript/
+```
+
+</details>
+
+---
+
+## Use cases
+
+### Ask Claude what you asked Claude yesterday
+
+Yesterday's session is a megabyte of JSONL, and pasting it into a chat blows the context window. Render the spine instead:
+
+```bash
+uvx cc-transcript show --signal --tail 20 ~/.claude/projects/<project>/<session>.jsonl
+```
+
+`--signal` keeps only the substantive user and assistant turns — one line per event, a few hundred tokens for the whole exchange. With the plugin installed, skip the command: ask Claude directly and its skill runs this funnel for you.
+
+### Find the session where you fixed that bug
+
+The fix happened weeks ago, in one of a few hundred transcripts. Search them all:
+
+```bash
+uvx cc-transcript grep "TranscriptExpiredError" --project cc-transcript
+```
+
+Hits print under their transcript's path, each line carrying its raw event index — feed an index back into `show --range` to re-read the conversation around the fix. `grep` searches your newest 50 transcripts by default; `--all` takes it to every session on disk, and a no-match run exits 1 so it scripts cleanly.
+
+### Debug a token blowup from transcript evidence
+
+A session burned through the context window and you want the culprit, not a guess. Rank the evidence:
+
+```bash
+uvx cc-transcript stats --per-file --project myapp
+```
+
+Each block reports text, thinking, and tool-io bytes plus per-tool call counts — the blowup stands out as an outsized `tool io` line. Then `grep --tool <name> --with-result` pins it to the exact calls.
+
+## More in the docs
+
+- **The Python library** — raw JSONL bytes to typed events, a composed filter, and a score in a dozen lines — [getting started](https://yasyf.github.io/cc-transcript/docs/getting-started/index.html)
+- **Filtering events** — composable clauses, specs, and the ready-made `NOISE_SPEC` — [builder catalog](https://yasyf.github.io/cc-transcript/docs/guide/filtering-events.html)
+- **Sentiment scoring** — bucket conversations and score them around any inference engine — [score specs](https://yasyf.github.io/cc-transcript/docs/guide/scoring-sentiment.html)
+- **Feedback mining** — detectors, confidence calibration, and LLM verdict passes over your corpus — [mine your sessions](https://yasyf.github.io/cc-transcript/docs/guide/mining-feedback.html)
+- **Two backends, one protocol** — a Rust fast path and a Python reference, parity-asserted against each other — [how parity works](https://yasyf.github.io/cc-transcript/docs/guide/backends-and-parity.html)
+- **API reference** — the complete typed surface, from `TranscriptEvent` to `SessionActivity` — [reference](https://yasyf.github.io/cc-transcript/reference/index.html)
+
+Read the [docs](https://yasyf.github.io/cc-transcript/) for the full guide. Licensed under [PolyForm Noncommercial 1.0.0](https://github.com/yasyf/cc-transcript/blob/main/LICENSE).
+

cc_transcript-8.0.0/README.md

@@ -0,0 +1,83 @@
+# ![cc-transcript](https://github.com/yasyf/cc-transcript/raw/main/docs/assets/readme-banner.webp)
+
+**Grep every Claude Code session you've ever run.** cc-transcript's lossless parser reads Claude Code's on-disk JSONL; the CLI lists transcripts, greps their content, and renders one compact line per event.
+
+[![CI](https://github.com/yasyf/cc-transcript/actions/workflows/ci.yml/badge.svg)](https://github.com/yasyf/cc-transcript/actions/workflows/ci.yml)
+[![PyPI](https://img.shields.io/pypi/v/cc-transcript.svg)](https://pypi.org/project/cc-transcript/)
+[![License: PolyForm Noncommercial](https://img.shields.io/badge/license-PolyForm--Noncommercial--1.0.0-blue)](https://github.com/yasyf/cc-transcript/blob/main/LICENSE)
+
+## Get started
+
+```bash
+uvx cc-transcript list
+```
+
+Every session is already on disk under `~/.claude/projects` — `list` finds them newest first, and `stats` collapses one into a screenful:
+
+<img src="https://github.com/yasyf/cc-transcript/raw/main/docs/assets/demo.png" alt="Terminal running 'uvx cc-transcript stats' — a 1,023-event session summarized as counts, kinds, models, and tool names" width="700">
+
+Driving with an agent? Paste this:
+
+```text
+/plugin marketplace add yasyf/cc-transcript
+/plugin install cc-transcript@cc-transcript
+```
+
+The plugin's skill teaches Claude to answer "what did I ask you yesterday?" from its own history, funneling through the CLI instead of reading raw JSONL.
+
+<details>
+<summary>No Claude Code? Point any agent at the CLI</summary>
+
+```text
+Use `uvx cc-transcript` to investigate my Claude Code sessions: `list` finds
+transcripts on disk, `stats` summarizes one, `grep` searches content, and `show`
+renders one compact line per event. Start by listing my newest sessions and
+summarizing the most recent one. Docs: https://yasyf.github.io/cc-transcript/
+```
+
+</details>
+
+---
+
+## Use cases
+
+### Ask Claude what you asked Claude yesterday
+
+Yesterday's session is a megabyte of JSONL, and pasting it into a chat blows the context window. Render the spine instead:
+
+```bash
+uvx cc-transcript show --signal --tail 20 ~/.claude/projects/<project>/<session>.jsonl
+```
+
+`--signal` keeps only the substantive user and assistant turns — one line per event, a few hundred tokens for the whole exchange. With the plugin installed, skip the command: ask Claude directly and its skill runs this funnel for you.
+
+### Find the session where you fixed that bug
+
+The fix happened weeks ago, in one of a few hundred transcripts. Search them all:
+
+```bash
+uvx cc-transcript grep "TranscriptExpiredError" --project cc-transcript
+```
+
+Hits print under their transcript's path, each line carrying its raw event index — feed an index back into `show --range` to re-read the conversation around the fix. `grep` searches your newest 50 transcripts by default; `--all` takes it to every session on disk, and a no-match run exits 1 so it scripts cleanly.
+
+### Debug a token blowup from transcript evidence
+
+A session burned through the context window and you want the culprit, not a guess. Rank the evidence:
+
+```bash
+uvx cc-transcript stats --per-file --project myapp
+```
+
+Each block reports text, thinking, and tool-io bytes plus per-tool call counts — the blowup stands out as an outsized `tool io` line. Then `grep --tool <name> --with-result` pins it to the exact calls.
+
+## More in the docs
+
+- **The Python library** — raw JSONL bytes to typed events, a composed filter, and a score in a dozen lines — [getting started](https://yasyf.github.io/cc-transcript/docs/getting-started/index.html)
+- **Filtering events** — composable clauses, specs, and the ready-made `NOISE_SPEC` — [builder catalog](https://yasyf.github.io/cc-transcript/docs/guide/filtering-events.html)
+- **Sentiment scoring** — bucket conversations and score them around any inference engine — [score specs](https://yasyf.github.io/cc-transcript/docs/guide/scoring-sentiment.html)
+- **Feedback mining** — detectors, confidence calibration, and LLM verdict passes over your corpus — [mine your sessions](https://yasyf.github.io/cc-transcript/docs/guide/mining-feedback.html)
+- **Two backends, one protocol** — a Rust fast path and a Python reference, parity-asserted against each other — [how parity works](https://yasyf.github.io/cc-transcript/docs/guide/backends-and-parity.html)
+- **API reference** — the complete typed surface, from `TranscriptEvent` to `SessionActivity` — [reference](https://yasyf.github.io/cc-transcript/reference/index.html)
+
+Read the [docs](https://yasyf.github.io/cc-transcript/) for the full guide. Licensed under [PolyForm Noncommercial 1.0.0](https://github.com/yasyf/cc-transcript/blob/main/LICENSE).

{cc_transcript-7.1.0 → cc_transcript-8.0.0}/cc_transcript/__init__.py

@@ -53,9 +53,20 @@ EXPORTS: dict[str, str] = {
             "expand_tool_names",
             "file_path_of",
             "hunks_of",
+            "matches_names",
+            "mcp_access",
+            "mcp_parts",
             "parse_tool_call",
             "tool_name_matches",
         ),
+        "cc_transcript.command": (
+            "Command",
+            "CommandLine",
+            "CommandLineQuery",
+            "Redirect",
+            "command_prefixes",
+            "parse_command_line",
+        ),
         "cc_transcript.models": (
             "AssistantEvent",
             "CacheCreation",
@@ -81,6 +92,8 @@ EXPORTS: dict[str, str] = {
             "TranscriptEvent",
             "Usage",
             "UserEvent",
+            "thinking_chars",
+            "tool_uses",
         ),
         "cc_transcript.parser": (
             "TranscriptParser",
@@ -114,6 +127,13 @@ EXPORTS: dict[str, str] = {
             "UserClassifier",
             "hunk_overlap",
             "native_user_classifier",
+            "result_index",
+        ),
+        "cc_transcript.facts": (
+            "ToolFact",
+            "command_prefix_counts",
+            "mcp_summary",
+            "tool_facts",
         ),
         "cc_transcript.evidence": (
             "CandidatePair",
@@ -153,7 +173,6 @@ EXPORTS: dict[str, str] = {
             "INTERRUPT_MARKER_RE",
             "JUNK_USER_MESSAGE_RE",
             "RESUME_PHRASE_SET",
-            "STOP_HOOK_RE",
             "STRUCTURAL_NOISE_RE",
             "TRIVIAL_ACK_SET",
             "USERS",
@@ -177,13 +196,6 @@ EXPORTS: dict[str, str] = {
             "drop_synthetic",
             "keep_only",
         ),
-        "cc_transcript.messages": (
-            "AssistantMessage",
-            "BaseMessage",
-            "MessageToolCall",
-            "TranscriptMessage",
-            "UserMessage",
-        ),
         "cc_transcript.store": ("FileStateStore",),
     }.items()
     for name in names
@@ -222,6 +234,9 @@ if TYPE_CHECKING:
     from cc_transcript.activity import (
         native_user_classifier as native_user_classifier,
     )
+    from cc_transcript.activity import (
+        result_index as result_index,
+    )
     from cc_transcript.backend import Backend as Backend
     from cc_transcript.backend import ParsedTranscript as ParsedTranscript
     from cc_transcript.builders import (
@@ -260,6 +275,24 @@ if TYPE_CHECKING:
     from cc_transcript.builders import (
         keep_only as keep_only,
     )
+    from cc_transcript.command import (
+        Command as Command,
+    )
+    from cc_transcript.command import (
+        CommandLine as CommandLine,
+    )
+    from cc_transcript.command import (
+        CommandLineQuery as CommandLineQuery,
+    )
+    from cc_transcript.command import (
+        Redirect as Redirect,
+    )
+    from cc_transcript.command import (
+        command_prefixes as command_prefixes,
+    )
+    from cc_transcript.command import (
+        parse_command_line as parse_command_line,
+    )
     from cc_transcript.context import (
         ContextWindow as ContextWindow,
     )
@@ -374,6 +407,18 @@ if TYPE_CHECKING:
     from cc_transcript.evidence import (
         record_harvest as record_harvest,
     )
+    from cc_transcript.facts import (
+        ToolFact as ToolFact,
+    )
+    from cc_transcript.facts import (
+        command_prefix_counts as command_prefix_counts,
+    )
+    from cc_transcript.facts import (
+        mcp_summary as mcp_summary,
+    )
+    from cc_transcript.facts import (
+        tool_facts as tool_facts,
+    )
     from cc_transcript.filterspec import (
         ASSISTANTS as ASSISTANTS,
     )
@@ -386,9 +431,6 @@ if TYPE_CHECKING:
     from cc_transcript.filterspec import (
         RESUME_PHRASE_SET as RESUME_PHRASE_SET,
     )
-    from cc_transcript.filterspec import (
-        STOP_HOOK_RE as STOP_HOOK_RE,
-    )
     from cc_transcript.filterspec import (
         STRUCTURAL_NOISE_RE as STRUCTURAL_NOISE_RE,
     )
@@ -434,21 +476,6 @@ if TYPE_CHECKING:
     from cc_transcript.ids import (
         tool_digest as tool_digest,
     )
-    from cc_transcript.messages import (
-        AssistantMessage as AssistantMessage,
-    )
-    from cc_transcript.messages import (
-        BaseMessage as BaseMessage,
-    )
-    from cc_transcript.messages import (
-        MessageToolCall as MessageToolCall,
-    )
-    from cc_transcript.messages import (
-        TranscriptMessage as TranscriptMessage,
-    )
-    from cc_transcript.messages import (
-        UserMessage as UserMessage,
-    )
     from cc_transcript.models import (
         AssistantEvent as AssistantEvent,
     )
@@ -521,6 +548,12 @@ if TYPE_CHECKING:
     from cc_transcript.models import (
         UserEvent as UserEvent,
     )
+    from cc_transcript.models import (
+        thinking_chars as thinking_chars,
+    )
+    from cc_transcript.models import (
+        tool_uses as tool_uses,
+    )
     from cc_transcript.parser import (
         TranscriptParser as TranscriptParser,
     )
@@ -636,6 +669,15 @@ if TYPE_CHECKING:
     from cc_transcript.tools import (
         hunks_of as hunks_of,
     )
+    from cc_transcript.tools import (
+        matches_names as matches_names,
+    )
+    from cc_transcript.tools import (
+        mcp_access as mcp_access,
+    )
+    from cc_transcript.tools import (
+        mcp_parts as mcp_parts,
+    )
     from cc_transcript.tools import (
         parse_tool_call as parse_tool_call,
     )

{cc_transcript-7.1.0 → cc_transcript-8.0.0}/cc_transcript/_parser_rs.pyi

@@ -38,3 +38,6 @@ def score_short_circuit(spec_json: str, buckets: list[list[str]], /) -> list[int
 
 def score_post_process(spec_json: str, buckets: list[list[str]], raw: list[int], /) -> list[int]:
     """Folds each bucket's raw score through the post-process stages in order."""
+
+def command_prefixes(commands: list[str], /) -> list[list[str]]:
+    """Permission-style prefixes per command line, parsed in parallel off the GIL."""

{cc_transcript-7.1.0 → cc_transcript-8.0.0}/cc_transcript/activity.py

@@ -17,8 +17,9 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from cc_transcript.discovery import TranscriptDiscovery, TranscriptExpiredError, find_transcript
+from cc_transcript.filterspec import event_meta
 from cc_transcript.ids import EventRef
-from cc_transcript.models import AssistantEvent, SystemEvent, ToolResultBlock, ToolUseBlock, UserEvent
+from cc_transcript.models import AssistantEvent, ToolResultBlock, ToolUseBlock, UserEvent
 from cc_transcript.parser import TranscriptParser
 from cc_transcript.tools import file_path_of, hunks_of, parse_tool_call
 
@@ -28,7 +29,7 @@ if TYPE_CHECKING:
     from pathlib import Path
 
     from cc_transcript.ids import SessionId, ToolUseId
-    from cc_transcript.models import EntryMeta, TranscriptEvent
+    from cc_transcript.models import TranscriptEvent
     from cc_transcript.tools import Hunk, ToolCall
 
 UserClassifier = Callable[["UserEvent"], bool]
@@ -52,6 +53,8 @@ class ToolUse:
         ref: The resolvable reference to the tool-use block.
         call: The typed tool call, constructed once at lift time.
         result: The matching result block, or None when none ever arrived.
+        result_ts: The timestamp of the user entry carrying the result, or
+            None when no result ever arrived.
         turn_index: The index of the turn the call fired in.
         ts: The timestamp of the assistant entry carrying the call.
     """
@@ -59,9 +62,15 @@ class ToolUse:
     ref: EventRef
     call: ToolCall
     result: ToolResultBlock | None
+    result_ts: datetime | None
     turn_index: int
     ts: datetime
 
+    @property
+    def duration_ms(self) -> int | None:
+        """Milliseconds from the call to its result, or None without a result."""
+        return None if self.result_ts is None else round((self.result_ts - self.ts).total_seconds() * 1000)
+
 
 @dataclass(frozen=True, slots=True)
 class Edit:
@@ -157,13 +166,7 @@ class SessionActivity:
                     segments[-1][1].append(event)
                 case _:
                     segments.append(("", [event]))
-        results = {
-            block.tool_use_id: block
-            for event in events
-            if isinstance(event, UserEvent)
-            for block in event.blocks
-            if isinstance(block, ToolResultBlock)
-        }
+        results = result_index(events)
         return cls(
             session_id=session_id,
             turns=tuple(
@@ -218,7 +221,7 @@ class SessionActivity:
                 turn
                 for turn in self.turns
                 for event in turn.events
-                if (meta := meta_of(event)) is not None and meta.uuid == ref.event_uuid
+                if (meta := event_meta(event)) is not None and meta.uuid == ref.event_uuid
             ),
             None,
         )
@@ -274,12 +277,30 @@ def hunk_overlap(a: Hunk, b: Hunk) -> float:
     return sum(line in olds for line in lines) / len(lines)
 
 
-def meta_of(event: TranscriptEvent) -> EntryMeta | None:
-    match event:
-        case UserEvent() | AssistantEvent() | SystemEvent():
-            return event.meta
-        case _:
-            return None
+def result_index(events: Sequence[TranscriptEvent]) -> dict[ToolUseId, tuple[ToolResultBlock, datetime | None]]:
+    """Indexes tool results by the id of the tool use they answer.
+
+    Pairs each :class:`~cc_transcript.models.ToolResultBlock` with the
+    timestamp of the ``UserEvent`` carrying it, keyed by the block's
+    ``tool_use_id`` — the single source for joining a call to its result and
+    deriving the call's duration.
+
+    Returns:
+        A mapping from tool-use id to a ``(result block, result timestamp)``
+        pair.
+    """
+    return {
+        block.tool_use_id: (block, event.meta.timestamp)
+        for event in events
+        if isinstance(event, UserEvent)
+        for block in event.blocks
+        if isinstance(block, ToolResultBlock)
+    }
+
+
+def event_stamps(events: Sequence[TranscriptEvent]) -> tuple[datetime | None, datetime | None]:
+    stamps = [meta.timestamp for event in events if (meta := event_meta(event)) is not None]
+    return (stamps[0], stamps[-1]) if stamps else (None, None)
 
 
 def lift_turn(
@@ -287,20 +308,21 @@ def lift_turn(
     index: int,
     prompt: str,
     events: tuple[TranscriptEvent, ...],
-    results: Mapping[ToolUseId, ToolResultBlock],
+    results: Mapping[ToolUseId, tuple[ToolResultBlock, datetime | None]],
 ) -> Turn:
-    stamps = [meta.timestamp for event in events if (meta := meta_of(event)) is not None]
+    started_at, ended_at = event_stamps(events)
     return Turn(
         index=index,
         prompt=prompt,
-        started_at=stamps[0] if stamps else None,
-        ended_at=stamps[-1] if stamps else None,
+        started_at=started_at,
+        ended_at=ended_at,
         events=events,
         tool_uses=tuple(
             ToolUse(
                 ref=EventRef(session_id, event.meta.uuid, block.id),
                 call=parse_tool_call(block.name, block.input, on_error="other"),
-                result=results.get(block.id),
+                result=pair[0] if (pair := results.get(block.id)) is not None else None,
+                result_ts=pair[1] if pair is not None else None,
                 turn_index=index,
                 ts=event.meta.timestamp,
             )
@@ -316,7 +338,7 @@ def position_in(turn: Turn, ref: EventRef) -> tuple[int, int]:
     event_pos, event = next(
         (i, event)
         for i, event in enumerate(turn.events)
-        if (meta := meta_of(event)) is not None and meta.uuid == ref.event_uuid
+        if (meta := event_meta(event)) is not None and meta.uuid == ref.event_uuid
     )
     match ref.tool_use_id, event:
         case None, _: