From 1bae7bd22310e5cdda61d8849d0d227962b07571 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Wed, 18 Mar 2026 10:21:55 +0000
Subject: [PATCH] story-kit: create
 266_story_matrix_bot_structured_conversation_history

---
 ...tory_matrix_bot_structured_conversation_history.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md b/.story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md
index 8dd24d4..c3c96c7 100644
--- a/.story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md
+++ b/.story_kit/work/1_upcoming/266_story_matrix_bot_structured_conversation_history.md
@@ -44,6 +44,17 @@ The current implementation attempts session resumption via `--resume <session_id
 2. If `session_id` is present but nested differently (e.g. inside an `event` wrapper), fix the JSON path at `claude_code.rs:348`.
 3. If `-p` mode doesn't emit `session_id` at all, consider an alternative: pass conversation history as a structured prompt prefix, or switch to the Claude API directly.
 
+### Previous attempt failed (2026-03-18)
+
+A sonnet coder attempted this story but did NOT fix the root cause. It rewrote the `chat_stream()` call in `bot.rs` to look identical to what was already there — it never investigated why `session_id` isn't being captured. The merge auto-resolver then jammed the duplicate call inside the `tokio::select!` permission loop, producing mismatched braces. The broken merge was reverted.
+
+**What the coder must actually do:**
+
+1. **Do NOT rewrite the `chat_stream()` call or the `tokio::select!` loop in `bot.rs`.** That code is correct and handles permission forwarding (story 275). Do not touch it.
+2. **The bug is in `claude_code.rs`, not `bot.rs`.** The `process_json_event()` function at line ~348 looks for `json["session_id"]` but it's likely never finding it. Start by running step 1 above to see what the actual NDJSON output looks like.
+3. **If `claude -p` doesn't emit `session_id` at all**, the `--resume` approach won't work. In that case, the fix is to pass conversation history as a prompt prefix (prepend prior turns to the user message) or use `--continue` instead of `--resume`, or call the Claude API directly instead of shelling out to the CLI.
+4. **Rebase onto current master before starting.** Master has changed significantly (spike 92, story 275 permission handling, gitignore changes).
+
 ## Out of Scope
 
 - TBD