cc-transcript 14.7.0__tar.gz → 14.9.0__tar.gz

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/Cargo.lock

@@ -189,13 +189,12 @@ dependencies = [
  "criterion",
  "memchr",
  "once_cell",
+ "rable",
  "regex",
  "rusqlite",
  "ryu-js",
  "sha2",
  "sonic-rs",
- "tree-sitter",
- "tree-sitter-bash",
 ]
 
 [[package]]
@@ -490,7 +489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -731,7 +730,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1240,6 +1239,15 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "rable"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f601efcd059ce48cd6350771ca52e5a079274b88058a5fcec8c383bfaebe69c"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "rancor"
 version = "0.1.1"
@@ -1439,7 +1447,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1591,7 +1599,6 @@ version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
- "indexmap",
  "itoa",
  "memchr",
  "serde",
@@ -1700,12 +1707,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1801,7 +1802,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1916,36 +1917,6 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
 
-[[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 = "typenum"
 version = "1.20.1"
@@ -2202,7 +2173,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-transcript
-Version: 14.7.0
+Version: 14.9.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/cc_transcript/__init__.py

@@ -235,7 +235,15 @@ EXPORTS: dict[str, str] = {
         ),
         "cc_transcript.render": ("Budget", "render_session", "render_tool_call", "render_turn"),
         "cc_transcript.notifications": ("Notifications",),
-        "cc_transcript.query": ("FileRef", "Session", "SubagentIndex", "SubagentSession", "ToolCallQuery"),
+        "cc_transcript.query": (
+            "DeepSession",
+            "DeepView",
+            "FileRef",
+            "Session",
+            "SubagentIndex",
+            "SubagentSession",
+            "ToolCallQuery",
+        ),
         "cc_transcript.decisions": ("DECISIONS_DDL", "Action", "Decision", "DecisionLog"),
         "cc_transcript.disktruth": (
             "AttributionRange",

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/cc_transcript/__init__.pyi

@@ -203,6 +203,8 @@ from cc_transcript.parser import (
 )
 
 from cc_transcript.query import (
+    DeepSession as DeepSession,
+    DeepView as DeepView,
     FileRef as FileRef,
     Session as Session,
     SubagentIndex as SubagentIndex,
@@ -335,6 +337,8 @@ __all__ = [
     "DECISIONS_DDL",
     "Decision",
     "DecisionLog",
+    "DeepSession",
+    "DeepView",
     "DiskTruth",
     "Edit",
     "EditCall",

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/cc_transcript/query.py

@@ -14,13 +14,14 @@ import re
 from collections.abc import Mapping
 from dataclasses import dataclass
 from fnmatch import fnmatch
+from functools import cached_property
 from pathlib import PurePath
 from typing import TYPE_CHECKING, ClassVar
 
 from cc_transcript.activity import SessionActivity, Turn, event_stamps, native_user_classifier
 from cc_transcript.discovery import TranscriptExpiredError, resolve, subagent_paths, subagent_transcripts
 from cc_transcript.filterspec import event_meta, session_id_of
-from cc_transcript.ids import SessionId
+from cc_transcript.ids import SessionId, ToolUseId
 from cc_transcript.models import AssistantEvent, SystemEvent, ToolResultBlock, UserEvent
 from cc_transcript.notifications import Notifications
 from cc_transcript.parser import parse
@@ -41,7 +42,7 @@ if TYPE_CHECKING:
 
     from cc_transcript.activity import ToolUse, UserClassifier
     from cc_transcript.command import CommandLine
-    from cc_transcript.ids import EventUuid, ToolUseId
+    from cc_transcript.ids import EventUuid
     from cc_transcript.models import TranscriptEvent
 
 
@@ -246,6 +247,9 @@ class Session:
         turns: The turns in the window.
         path: The transcript file the session was loaded from, when known —
             required for sidechain (subagent) lookups.
+        attachments: External transcript files (e.g. codex rollouts) registered
+            with this session; :meth:`walk` and :attr:`deep` fold them in at
+            depth 1. Empty for a session loaded straight from disk.
 
     Example:
         >>> session.prior().after(tool="Write", file=str(fp)).has_tool("ExitPlanMode")
@@ -253,11 +257,14 @@ class Session:
 
     turns: tuple[Turn, ...]
     path: Path | None = None
+    attachments: tuple[Path, ...] = ()
 
     @classmethod
-    def from_activity(cls, activity: SessionActivity, *, path: Path | None = None) -> Session:
+    def from_activity(
+        cls, activity: SessionActivity, *, path: Path | None = None, attachments: tuple[Path, ...] = ()
+    ) -> Session:
         """Views ``activity``'s full turn range as a session."""
-        return cls(activity.turns, path)
+        return cls(activity.turns, path, attachments)
 
     @classmethod
     def from_path(cls, path: Path, *, user_classifier: UserClassifier = native_user_classifier) -> Session:
@@ -326,6 +333,25 @@ class Session:
             )
         )
 
+    def walk(self) -> Iterator[DeepSession]:
+        """Every transcript reachable from this session, lazily and depth-first.
+
+        Yields each descendant sidechain (subagent/teammate) transcript at every
+        depth in DFS path order, then each registered attachment at depth 1 —
+        never this session itself. A resolved-path seen-set (seeded with
+        :attr:`path`) dedupes: the first occurrence of a path wins, so a
+        tree-discovered sidechain outranks an equal attachment, and symlink
+        cycles terminate. An unreadable transcript is skipped but its children
+        are still walked; a structurally malformed line raises, as
+        :attr:`subagents` does.
+        """
+        return deep_sessions(self)
+
+    @property
+    def deep(self) -> DeepView:
+        """The recursive union view over this session and every transcript it reaches."""
+        return DeepView(self)
+
     def after(self, *, tool: str, file: str | None = None) -> Session:
         """The window strictly after the last call matching ``tool``.
 
@@ -369,7 +395,7 @@ class Session:
     @property
     def current_turn(self) -> Session:
         """The one-turn view of the window's last turn."""
-        return Session(self.turns[-1:], self.path)
+        return Session(self.turns[-1:], self.path, self.attachments)
 
     @property
     def user_text(self) -> str:
@@ -394,7 +420,7 @@ class Session:
     def has_tool(self, name: str, *, subagents: bool = True) -> bool:
         """Whether any call in the window matches the pipe spec ``name``."""
         return self.tool_calls.named(name).any() or (
-            subagents and any(sub.has_tool(name) for sub in sidechain_sessions(self.path))
+            subagents and any(deep.session.has_tool(name, subagents=False) for deep in self.walk())
         )
 
     def has_command(self, *argv: str, subagents: bool = True) -> bool:
@@ -405,19 +431,19 @@ class Session:
         ``sudo git push -f`` and ``cd x && git push`` but not ``echo "git push"``.
         """
         return any(cmd.runs(*argv) for line in self.command_lines() for cmd in line) or (
-            subagents and any(sub.has_command(*argv) for sub in sidechain_sessions(self.path))
+            subagents and any(deep.session.has_command(*argv, subagents=False) for deep in self.walk())
         )
 
     def has_edit_to(self, *globs: str, subagents: bool = True) -> bool:
         """Whether any edit-shaped call in the window targets a file matching any glob."""
         return any(file.matches(*globs) for file in self.edited_files) or (
-            subagents and any(sub.has_edit_to(*globs) for sub in sidechain_sessions(self.path))
+            subagents and any(deep.session.has_edit_to(*globs, subagents=False) for deep in self.walk())
         )
 
     def has_read(self, pattern: str, *, subagents: bool = True) -> bool:
         """Whether any Read in the window targets a path containing ``pattern``."""
         return any(pattern in str(file) for file in self.tool_calls.named("Read").files()) or (
-            subagents and any(sub.has_read(pattern) for sub in sidechain_sessions(self.path))
+            subagents and any(deep.session.has_read(pattern, subagents=False) for deep in self.walk())
         )
 
     def has_skill(self, *names: str, subagents: bool = True) -> bool:
@@ -425,7 +451,7 @@ class Session:
         return any(
             isinstance(call := use.call, SkillCall) and call.skill in names
             for use in self.tool_calls.named("Skill")
-        ) or (subagents and any(sub.has_skill(*names) for sub in sidechain_sessions(self.path)))
+        ) or (subagents and any(deep.session.has_skill(*names, subagents=False) for deep in self.walk()))
 
     def has_override(self, token: str, *, invalidated_by: Sequence[str] = ("Edit", "Write")) -> bool:
         """Whether ``token`` appears in the window without a later invalidating call.
@@ -530,6 +556,69 @@ class SubagentIndex:
         return bool(self.items)
 
 
+@dataclass(frozen=True, slots=True)
+class DeepSession:
+    """One transcript reached by :meth:`Session.walk`.
+
+    Attributes:
+        session: The whole-session view of the reached transcript.
+        path: The transcript file it was loaded from.
+        provider: Its source provider, ``"claude"`` or ``"codex"``.
+        depth: Distance from the root; ``1`` is a direct sidechain or attachment.
+        spawned_by: The dispatching tool-use id parsed from an ``agent-<id>``
+            sidechain stem, or None for an attachment.
+    """
+
+    session: Session
+    path: Path
+    provider: str
+    depth: int
+    spawned_by: ToolUseId | None
+
+
+@dataclass(frozen=True)  # non-slots: the cached_property below needs __dict__
+class DeepView:
+    """The recursive union of a session and every transcript reachable from it.
+
+    Sidechain (subagent/teammate) transcripts at every depth and registered
+    attachments contribute their tool calls and events to one window-spanning
+    view. The root axis respects the session's window; descendants and
+    attachments are window-invariant, mirroring how ``has_tool`` already scans
+    the whole sidechain tree.
+
+    Example:
+        >>> session.deep.tool_calls.named("Edit|Write").files()
+    """
+
+    root: Session
+
+    @cached_property
+    def sessions(self) -> tuple[DeepSession, ...]:
+        """Every reached :class:`DeepSession`, materialized once: DFS, then attachments."""
+        return tuple(self.root.walk())
+
+    @property
+    def tool_calls(self) -> ToolCallQuery:
+        """The root window's calls, then every descendant's and attachment's calls.
+
+        Positional, not chronological: root-window order, then DFS path order,
+        then attachment registration order — so :meth:`ToolCallQuery.first` and
+        :meth:`ToolCallQuery.last` read positionally.
+        """
+        return ToolCallQuery(
+            self.root.tool_calls.all_items
+            + tuple(use for deep in self.sessions for use in deep.session.tool_calls.all_items)
+        )
+
+    @property
+    def events(self) -> tuple[TranscriptEvent, ...]:
+        """Every event across the root window and every reached transcript, in walk order."""
+        return self.root.events + tuple(event for deep in self.sessions for event in deep.session.events)
+
+    def __iter__(self) -> Iterator[DeepSession]:
+        return iter(self.sessions)
+
+
 def windowed(session: Session, start: int, stop: int) -> Session:
     turns: list[Turn] = []
     base = 0
@@ -539,10 +628,47 @@ def windowed(session: Session, start: int, stop: int) -> Session:
         if lo < hi:
             turns.append(turn if (lo, hi) == (0, size) else trim_turn(turn, lo, hi))
         base += size
-    return Session(tuple(turns), session.path)
+    return Session(tuple(turns), session.path, session.attachments)
 
 
 def sidechain_sessions(path: Path | None) -> tuple[Session, ...]:
     if path is None:
         return ()
     return tuple(Session.from_path(entry) for entry in subagent_paths(path))
+
+
+def deep_sessions(root: Session) -> Iterator[DeepSession]:
+    seen: set[Path] = {root.path.resolve()} if root.path is not None else set()
+    if root.path is not None:
+        yield from descend_sidechains(root.path, 1, seen)
+    for attachment in root.attachments:
+        yield from visit_transcript(attachment, 1, None, seen)
+
+
+def descend_sidechains(parent: Path, depth: int, seen: set[Path]) -> Iterator[DeepSession]:
+    for child in subagent_paths(parent):
+        yield from visit_transcript(child, depth, ToolUseId(child.stem.removeprefix("agent-")), seen)
+
+
+def visit_transcript(path: Path, depth: int, spawned_by: ToolUseId | None, seen: set[Path]) -> Iterator[DeepSession]:
+    if (resolved := path.resolve()) in seen:
+        return
+    seen.add(resolved)
+    if (deep := load_deep_session(path, depth, spawned_by)) is not None:
+        yield deep
+    yield from descend_sidechains(path, depth + 1, seen)
+
+
+def load_deep_session(path: Path, depth: int, spawned_by: ToolUseId | None) -> DeepSession | None:
+    try:
+        transcript = parse(path)
+    except OSError:
+        return None
+    session_id = session_id_of(transcript.events) or SessionId(path.stem)
+    return DeepSession(
+        session=Session.from_activity(SessionActivity.from_events(session_id, transcript.events), path=path),
+        path=path,
+        provider=transcript.provider,
+        depth=depth,
+        spawned_by=spawned_by,
+    )

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/cc_transcript/tools.py

@@ -74,6 +74,7 @@ if TYPE_CHECKING:
 
 TOOL_ALIASES: dict[str, str] = {
     "Bash": "Execute",
+    "Edit": "apply_patch",
     "Write": "Create",
     "Agent": "Task",
     "WebFetch": "FetchUrl",

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cc-transcript"
-version = "14.7.0" # informational — releases stamp the version from the git tag
+version = "14.9.0" # informational — releases stamp the version from the git tag
 description = "Grep every Claude Code session you've ever run."
 readme = "README.md"
 license = "PolyForm-Noncommercial-1.0.0"

{cc_transcript-14.7.0 → cc_transcript-14.9.0}/rust/crates/core/Cargo.toml

@@ -13,11 +13,9 @@ chrono = { version = "0.4", default-features = false, features = ["std"] }
 memchr = "2.7"
 once_cell = "1"
 regex = "1"
-# Gated behind `command`; grammar-locked to the Python wheel (tree_sitter_bash 0.25.1
-# both sides, tree-sitter core 0.26 matching the wheel's 0.26.0). The Swift/CI build
+# Gated behind `command`: a real bash AST (rable) backs the command parser. The Swift/CI build
 # takes core with default-features off, so this stays out of the python-free path.
-tree-sitter = { version = "0.26", optional = true }
-tree-sitter-bash = { version = "0.25", optional = true }
+rable = { version = "0.2.1", optional = true }
 # ids.rs computes the cross-language tool-content digest; default features only
 # (no `asm`), so the python-free core stays pure-Rust for the Swift consumer.
 sha2 = "0.10"
@@ -32,7 +30,7 @@ rusqlite = { version = "0.32", features = ["bundled", "load_extension"], optiona
 
 [features]
 default = ["command", "sqlite"]
-command = ["dep:tree-sitter", "dep:tree-sitter-bash"]
+command = ["dep:rable"]
 sqlite = ["dep:rusqlite"]
 
 [dev-dependencies]