Unify turns and events into ConversationView.items

Cargo.toml

@@ -24,20 +24,20 @@ edition = "2024"
 license = "Apache-2.0"
 
 [workspace.dependencies]
-toolpath = { version = "0.7.0", path = "crates/toolpath" }
-toolpath-convo = { version = "0.11.1", path = "crates/toolpath-convo" }
-toolpath-git = { version = "0.6.0", path = "crates/toolpath-git" }
-toolpath-claude = { version = "0.12.0", path = "crates/toolpath-claude", default-features = false }
-toolpath-gemini = { version = "0.6.0", path = "crates/toolpath-gemini", default-features = false }
-toolpath-codex = { version = "0.6.0", path = "crates/toolpath-codex" }
-toolpath-copilot = { version = "0.1.0", path = "crates/toolpath-copilot" }
-toolpath-opencode = { version = "0.5.0", path = "crates/toolpath-opencode" }
-toolpath-cursor = { version = "0.2.0", path = "crates/toolpath-cursor" }
-toolpath-github = { version = "0.6.0", path = "crates/toolpath-github" }
-toolpath-dot = { version = "0.5.0", path = "crates/toolpath-dot" }
-toolpath-md = { version = "0.7.0", path = "crates/toolpath-md" }
-toolpath-pi = { version = "0.6.1", path = "crates/toolpath-pi" }
-path-cli = { version = "0.15.0", path = "crates/path-cli" }
+toolpath = { version = "0.8.0", path = "crates/toolpath" }
+toolpath-convo = { version = "0.12.0", path = "crates/toolpath-convo" }
+toolpath-git = { version = "0.7.0", path = "crates/toolpath-git" }
+toolpath-claude = { version = "0.13.0", path = "crates/toolpath-claude", default-features = false }
+toolpath-gemini = { version = "0.7.0", path = "crates/toolpath-gemini", default-features = false }
+toolpath-codex = { version = "0.7.0", path = "crates/toolpath-codex" }
+toolpath-copilot = { version = "0.2.0", path = "crates/toolpath-copilot" }
+toolpath-opencode = { version = "0.6.0", path = "crates/toolpath-opencode" }
+toolpath-cursor = { version = "0.3.0", path = "crates/toolpath-cursor" }
+toolpath-github = { version = "0.7.0", path = "crates/toolpath-github" }
+toolpath-dot = { version = "0.6.0", path = "crates/toolpath-dot" }
+toolpath-md = { version = "0.8.0", path = "crates/toolpath-md" }
+toolpath-pi = { version = "0.7.0", path = "crates/toolpath-pi" }
+path-cli = { version = "0.16.0", path = "crates/path-cli" }
 pathbase-client = { version = "0.2.0", path = "crates/pathbase-client" }
 
 reqwest = { version = "0.13", default-features = false, features = ["blocking", "json", "rustls"] }

crates/path-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "path-cli"
-version = "0.15.0"
+version = "0.16.0"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/empathic/toolpath"

crates/path-cli/tests/cross_harness_matrix.rs

@@ -509,8 +509,7 @@ mod invariants {
     }
 
     fn meaningful_turns(view: &ConversationView) -> Vec<&Turn> {
-        view.turns
-            .iter()
+        view.turns()
             .filter(|t| !is_system_envelope(t))
             .collect()
     }
@@ -690,8 +689,7 @@ mod invariants {
         // on input/output — the fields every wire carries (codex has no
         // cache_write analog, cursor carries no cache counters at all).
         let usage_seq = |v: &ConversationView| -> Vec<(Option<u32>, Option<u32>)> {
-            v.turns
-                .iter()
+            v.turns()
                 .filter(|t| matches!(t.role, Role::Assistant))
                 .filter_map(|t| t.token_usage.as_ref())
                 .map(|u| (u.input_tokens, u.output_tokens))
@@ -745,13 +743,11 @@ mod invariants {
         failures: &mut Vec<String>,
     ) {
         let pre: Vec<&Turn> = before_target
-            .turns
-            .iter()
+            .turns()
             .filter(|t| matches!(t.role, Role::Assistant))
             .collect();
         let post: Vec<&Turn> = after_target
-            .turns
-            .iter()
+            .turns()
             .filter(|t| matches!(t.role, Role::Assistant))
             .collect();
         for (i, (a, b)) in pre.iter().zip(post.iter()).enumerate() {
@@ -813,8 +809,7 @@ mod invariants {
         failures: &mut Vec<String>,
     ) {
         let edges = |v: &ConversationView| -> BTreeSet<(String, Option<String>)> {
-            v.turns
-                .iter()
+            v.turns()
                 .map(|t| (t.id.clone(), t.parent_id.clone()))
                 .collect()
         };
@@ -864,7 +859,7 @@ mod invariants {
         failures: &mut Vec<String>,
     ) {
         let count =
-            |v: &ConversationView| -> usize { v.turns.iter().map(|t| t.delegations.len()).sum() };
+            |v: &ConversationView| -> usize { v.turns().map(|t| t.delegations.len()).sum() };
         let o = count(original);
         let f = count(final_);
         if o != f {
@@ -875,7 +870,7 @@ mod invariants {
             return;
         }
 
-        for (i, (a, b)) in original.turns.iter().zip(final_.turns.iter()).enumerate() {
+        for (i, (a, b)) in original.turns().zip(final_.turns()).enumerate() {
             if a.delegations.len() != b.delegations.len() {
                 failures.push(format!(
                     "turn {} delegation count diverged: first={} second={}",
@@ -938,14 +933,12 @@ mod invariants {
         failures: &mut Vec<String>,
     ) {
         let agent_ids = |v: &ConversationView| -> BTreeSet<String> {
-            v.turns
-                .iter()
+            v.turns()
                 .flat_map(|t| t.delegations.iter().map(|d| d.agent_id.clone()))
                 .collect()
         };
         let tool_use_ids = |v: &ConversationView| -> BTreeSet<String> {
-            v.turns
-                .iter()
+            v.turns()
                 .flat_map(|t| t.tool_uses.iter().map(|tu| tu.id.clone()))
                 .collect()
         };
@@ -1099,7 +1092,7 @@ fn matrix_translation() {
                 h.name()
             )
         });
-        eprintln!("loaded {} fixture: {} turns", h.name(), view.turns.len());
+        eprintln!("loaded {} fixture: {} turns", h.name(), view.turns().count());
         sources.push((h.name().to_string(), view));
     }
     run_matrix("matrix (real fixtures)", &sources);

crates/path-cli/tests/query.rs

@@ -471,6 +471,7 @@ fn kind_lists_bundled_kinds() {
         .assert()
         .success()
         .stdout(predicate::str::contains("agent-coding-session"))
+        .stdout(predicate::str::contains("v1.0.0"))
         .stdout(predicate::str::contains("v1.1.0"));
 }
 

crates/path-cli/tests/roundtrip.rs

@@ -65,19 +65,18 @@ fn roundtrip_claude_conversation() {
     // The extracted view comes from the toolpath Path which also emits
     // conversation.append steps only for real turns (not tool-result-only entries).
     assert_eq!(
-        extracted_view.turns.len(),
-        original_view.turns.len(),
+        extracted_view.turns().count(),
+        original_view.turns().count(),
         "turn count mismatch: extracted {} vs original {}",
-        extracted_view.turns.len(),
-        original_view.turns.len(),
+        extracted_view.turns().count(),
+        original_view.turns().count(),
     );
 
     // ── Assertions: turn content ────────────────────────────────────
 
     for (i, (ext, orig)) in extracted_view
-        .turns
-        .iter()
-        .zip(original_view.turns.iter())
+        .turns()
+        .zip(original_view.turns())
         .enumerate()
     {
         assert_eq!(

crates/toolpath-claude/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "toolpath-claude"
-version = "0.12.0"
+version = "0.13.0"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/empathic/toolpath"