Predeclare and stream consult session ids

1 files changed, 8 insertions, 3 deletions

diff --git a/crates/phone-opus/src/mcp/fault.rs b/crates/phone-opus/src/mcp/fault.rs
index 4d438e3..c2d4a6c 100644
--- a/crates/phone-opus/src/mcp/fault.rs
+++ b/crates/phone-opus/src/mcp/fault.rs
@@ -14,10 +14,11 @@ pub(crate) struct FaultContext {
 pub(crate) struct ConsultFaultContext {
     pub(crate) cwd: String,
     pub(crate) context_mode: String,
+    pub(crate) planned_session_id: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) reused_session_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) downstream_session_id: Option<String>,
+    pub(crate) observed_session_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) resume_session_id: Option<String>,
     #[serde(default, skip_serializing_if = "is_false")]
@@ -202,12 +203,16 @@ impl FaultRecord {
         let mut fields: BTreeMap<String, String> = BTreeMap::from([
             ("cwd".to_owned(), consult.cwd.clone()),
             ("context_mode".to_owned(), consult.context_mode.clone()),
+            (
+                "planned_session".to_owned(),
+                consult.planned_session_id.clone(),
+            ),
         ]);
         if let Some(session_id) = consult.reused_session_id.as_ref() {
             let _ = fields.insert("reused_session".to_owned(), session_id.clone());
         }
-        if let Some(session_id) = consult.downstream_session_id.as_ref() {
-            let _ = fields.insert("downstream_session".to_owned(), session_id.clone());
+        if let Some(session_id) = consult.observed_session_id.as_ref() {
+            let _ = fields.insert("observed_session".to_owned(), session_id.clone());
         }
         if let Some(session_id) = consult.resume_session_id.as_ref() {
             let _ = fields.insert("resume_session".to_owned(), session_id.clone());