Feat: prefix trace session ids (oc / cc)

cli/src/services/agent_trace_db/mod.rs

@@ -691,18 +691,18 @@ mod tests {
         let end_patch = valid_patch("notes/end.md", "at end");
         let after_end_patch = valid_patch("notes/after.md", "after end");
 
-        insert_test_diff_trace(&db, 999, "before-cutoff", &before_cutoff_patch);
-        insert_test_diff_trace(&db, 1000, "at-cutoff", &cutoff_patch);
+        insert_test_diff_trace(&db, 999, "oc_before-cutoff", &before_cutoff_patch);
+        insert_test_diff_trace(&db, 1000, "oc_at-cutoff", &cutoff_patch);
         insert_test_diff_trace(
             &db,
             1500,
-            "malformed",
+            "oc_malformed",
             "Index: notes/malformed.md\n===================================================================\n--- notes/malformed.md\n+++ notes/malformed.md\n@@ malformed @@\n+bad\n",
         );
-        insert_test_diff_trace(&db, 1500, "same-time-a", &first_same_time_patch);
-        insert_test_diff_trace(&db, 1500, "same-time-b", &second_same_time_patch);
-        insert_test_diff_trace(&db, 2000, "at-end", &end_patch);
-        insert_test_diff_trace(&db, 2001, "after-end", &after_end_patch);
+        insert_test_diff_trace(&db, 1500, "oc_same-time-a", &first_same_time_patch);
+        insert_test_diff_trace(&db, 1500, "oc_same-time-b", &second_same_time_patch);
+        insert_test_diff_trace(&db, 2000, "oc_at-end", &end_patch);
+        insert_test_diff_trace(&db, 2001, "oc_after-end", &after_end_patch);
 
         let result = recent_diff_trace_patches_with(&db, 1000, 2000)
             .expect("recent diff trace patches should load");
@@ -716,10 +716,10 @@ mod tests {
                 .map(|patch| (patch.id, patch.time_ms, patch.session_id.as_str()))
                 .collect::<Vec<_>>(),
             vec![
-                (2, 1000, "at-cutoff"),
-                (4, 1500, "same-time-a"),
-                (5, 1500, "same-time-b"),
-                (6, 2000, "at-end"),
+                (2, 1000, "oc_at-cutoff"),
+                (4, 1500, "oc_same-time-a"),
+                (5, 1500, "oc_same-time-b"),
+                (6, 2000, "oc_at-end"),
             ]
         );
         assert_eq!(
@@ -763,7 +763,7 @@ mod tests {
         );
         assert_eq!(result.skipped[0].id, 3);
         assert_eq!(result.skipped[0].time_ms, 1500);
-        assert_eq!(result.skipped[0].session_id, "malformed");
+        assert_eq!(result.skipped[0].session_id, "oc_malformed");
         assert!(
             result.skipped[0].reason.contains("invalid hunk header"),
             "unexpected skipped reason: {}",

cli/src/services/hooks/mod.rs

@@ -35,8 +35,26 @@ pub mod lifecycle;
 pub const NAME: &str = "hooks";
 pub const CANONICAL_SCE_COAUTHOR_TRAILER: &str = "Co-authored-by: SCE <sce@crocoder.dev>";
 const CLAUDE_MODEL_ID_PREFIX: &str = "claude/";
+pub(crate) const DIFF_TRACE_OPENCODE_SESSION_ID_PREFIX: &str = "oc_";
+pub(crate) const DIFF_TRACE_CLAUDE_SESSION_ID_PREFIX: &str = "cc_";
+const OPENCODE_TOOL_NAME: &str = "opencode";
+const CLAUDE_TOOL_NAME: &str = "claude";
 type PayloadValidationError = fn(&str) -> String;
 
+pub(crate) fn prefixed_diff_trace_session_id(tool_name: &str, raw_session_id: &str) -> String {
+    let prefix = match tool_name {
+        OPENCODE_TOOL_NAME => DIFF_TRACE_OPENCODE_SESSION_ID_PREFIX,
+        CLAUDE_TOOL_NAME => DIFF_TRACE_CLAUDE_SESSION_ID_PREFIX,
+        _ => return raw_session_id.to_string(),
+    };
+
+    if raw_session_id.starts_with(prefix) {
+        raw_session_id.to_string()
+    } else {
+        format!("{prefix}{raw_session_id}")
+    }
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum HookSubcommand {
     PreCommit,
@@ -1094,10 +1112,11 @@ where
     F: FnOnce(DiffTraceInsert<'_>) -> Result<()>,
 {
     let time_ms = diff_trace_db_time_ms(payload.time)?;
+    let session_id = prefixed_diff_trace_session_id(&payload.tool_name, &payload.session_id);
 
     insert_fn(DiffTraceInsert {
         time_ms,
-        session_id: &payload.session_id,
+        session_id: &session_id,
         patch: &payload.diff,
         model_id,
         tool_name: &payload.tool_name,
@@ -2238,14 +2257,30 @@ mod tests {
     }
 
     fn diff_trace_payload(model_id: Option<&str>, tool_version: Option<&str>) -> DiffTracePayload {
+        diff_trace_payload_with(
+            "claude",
+            "session-123",
+            PAYLOAD_TYPE_STRUCTURED,
+            model_id,
+            tool_version,
+        )
+    }
+
+    fn diff_trace_payload_with(
+        tool_name: &str,
+        session_id: &str,
+        payload_type: &str,
+        model_id: Option<&str>,
+        tool_version: Option<&str>,
+    ) -> DiffTracePayload {
         DiffTracePayload {
-            session_id: String::from("session-123"),
+            session_id: String::from(session_id),
             diff: String::from("diff text"),
             time: 1_800_000_000_000_u64,
             model_id: model_id.map(String::from),
-            tool_name: String::from("claude"),
+            tool_name: String::from(tool_name),
             tool_version: tool_version.map(String::from),
-            payload_type: String::from(PAYLOAD_TYPE_STRUCTURED),
+            payload_type: String::from(payload_type),
         }
     }
 
@@ -2259,7 +2294,7 @@ mod tests {
             Some("Claude Code 1.2.3"),
             |input| {
                 assert_eq!(input.time_ms, 1_800_000_000_000_i64);
-                assert_eq!(input.session_id, "session-123");
+                assert_eq!(input.session_id, "cc_session-123");
                 assert_eq!(input.model_id, Some("direct-model"));
                 assert_eq!(input.tool_name, "claude");
                 assert_eq!(input.tool_version, Some("Claude Code 1.2.3"));
@@ -2296,7 +2331,7 @@ mod tests {
                     patches: vec![ParsedDiffTracePatch {
                         id: 7,
                         time_ms: now_ms - 500,
-                        session_id: String::from("valid-session"),
+                        session_id: String::from("oc_valid-session"),
                         patch: valid_patch("src/lib.rs", "shared line"),
                         tool_name: Some(String::from("opencode")),
                         tool_version: Some(String::from("1.2.3")),
@@ -2305,7 +2340,7 @@ mod tests {
                     skipped: vec![SkippedDiffTracePatch {
                         id: 8,
                         time_ms: now_ms - 250,
-                        session_id: String::from("malformed-session"),
+                        session_id: String::from("oc_malformed-session"),
                         reason: String::from("invalid hunk header"),
                     }],
                 })