Emit idle state after stream turns

Author: lijiuyang.5137

src/runner.rs

@@ -1349,13 +1349,7 @@ fn emit_idle_session_state_if_requested(
     state: &mut TranscriptState,
     output_format: OutputFormat,
 ) -> Result<()> {
-    if output_format != OutputFormat::StreamJson
-        || state.saw_idle_session_state
-        || std::env::var("CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS")
-            .ok()
-            .as_deref()
-            != Some("1")
-    {
+    if output_format != OutputFormat::StreamJson || state.saw_idle_session_state {
         return Ok(());
     }
     let value = json!({

tests/cctty_cli.rs

@@ -80,7 +80,7 @@ fn stream_json_text_prompt_uses_tty_transcript() {
 
     assert_eq!(
         json_types(&lines),
-        ["system", "user", "assistant", "result"]
+        ["system", "user", "assistant", "result", "system"]
     );
     assert_eq!(lines[0]["session_id"], session_id);
     assert_eq!(lines[1]["message"]["content"], "Say OK");
@@ -655,8 +655,7 @@ fn stream_json_control_permission_mode_restart_recovers_from_stale_session_lock(
     )
     .unwrap();
     stdin.flush().unwrap();
-    let plan_response = read_json_line(&mut reader, &mut line);
-    assert_eq!(plan_response["type"], "control_response");
+    let plan_response = wait_for_control_response_line(&mut reader, &mut line);
     assert_eq!(plan_response["response"]["request_id"], "plan-after-prompt");
 
     writeln!(
@@ -973,8 +972,7 @@ fn stream_json_sdk_mcp_survives_control_restart_between_turns() {
     )
     .unwrap();
     stdin.flush().unwrap();
-    let model_response = read_json_line(&mut reader, &mut line);
-    assert_eq!(model_response["type"], "control_response");
+    let model_response = wait_for_control_response_line(&mut reader, &mut line);
     assert_eq!(
         model_response["response"]["request_id"],
         "set-model-after-mcp"
@@ -1033,6 +1031,27 @@ fn wait_for_result_line<R: BufRead>(reader: &mut R, line: &mut String) -> Value
     }
 }
 
+fn wait_for_control_response_line<R: BufRead>(reader: &mut R, line: &mut String) -> Value {
+    loop {
+        let value = read_json_line(reader, line);
+        if value.get("type").and_then(Value::as_str) == Some("control_response") {
+            return value;
+        }
+    }
+}
+
+fn wait_for_idle_session_state_line<R: BufRead>(reader: &mut R, line: &mut String) -> Value {
+    loop {
+        let value = read_json_line(reader, line);
+        if value.get("type").and_then(Value::as_str) == Some("system")
+            && value.get("subtype").and_then(Value::as_str) == Some("session_state_changed")
+            && value.get("state").and_then(Value::as_str) == Some("idle")
+        {
+            return value;
+        }
+    }
+}
+
 fn drive_fake_sdk_mcp_prompt<W: Write, R: BufRead>(
     stdin: &mut W,
     reader: &mut R,
@@ -1443,15 +1462,14 @@ fn assert_stream_json_recovers_from_bad_resume_startup(fake_failure: &str) {
 }
 
 #[test]
-fn stream_json_emits_idle_session_state_when_sdk_requests_it() {
+fn stream_json_emits_idle_session_state_after_each_turn() {
     let fixture = FakeClaude::new();
     let workspace = tempfile::tempdir().unwrap();
     let config_dir = tempfile::tempdir().unwrap();
     let session_id = "00000000-0000-0000-0000-000000000010";
     let mut child = std::process::Command::new(env!("CARGO_BIN_EXE_cctty"))
         .env("CCTTY_CLAUDE_PATH", fixture.path())
         .env("CLAUDE_CONFIG_DIR", config_dir.path())
-        .env("CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS", "1")
         .current_dir(workspace.path())
         .args([
             "--output-format",
@@ -1502,6 +1520,68 @@ fn stream_json_emits_idle_session_state_when_sdk_requests_it() {
     );
 }
 
+#[test]
+fn stream_json_synthetic_result_emits_idle_and_accepts_followup() {
+    let fixture = FakeClaude::new();
+    let workspace = tempfile::tempdir().unwrap();
+    let config_dir = tempfile::tempdir().unwrap();
+    let session_id = "00000000-0000-0000-0000-000000000023";
+    let mut child = std::process::Command::new(env!("CARGO_BIN_EXE_cctty"))
+        .env("CCTTY_CLAUDE_PATH", fixture.path())
+        .env("CLAUDE_CONFIG_DIR", config_dir.path())
+        .current_dir(workspace.path())
+        .args([
+            "--output-format",
+            "stream-json",
+            "--input-format",
+            "stream-json",
+            "--session-id",
+            session_id,
+        ])
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .unwrap();
+    let mut stdin = child.stdin.take().unwrap();
+    let stdout = child.stdout.take().unwrap();
+    let mut reader = BufReader::new(stdout);
+    let mut line = String::new();
+
+    writeln!(
+        stdin,
+        r#"{{"type":"user","message":{{"role":"user","content":"OMIT_FAKE_RESULT first"}}}}"#
+    )
+    .unwrap();
+    stdin.flush().unwrap();
+    let first_result = wait_for_result_line(&mut reader, &mut line);
+    assert_eq!(
+        first_result["result"],
+        "FAKE_RESPONSE: OMIT_FAKE_RESULT first"
+    );
+    let idle = wait_for_idle_session_state_line(&mut reader, &mut line);
+    assert_eq!(idle["session_id"], session_id);
+
+    writeln!(
+        stdin,
+        r#"{{"type":"user","message":{{"role":"user","content":"Second prompt"}}}}"#
+    )
+    .unwrap();
+    stdin.flush().unwrap();
+    let second_result = wait_for_result_line(&mut reader, &mut line);
+    assert_eq!(second_result["result"], "FAKE_RESPONSE: Second prompt");
+    drop(stdin);
+
+    let status = child
+        .wait_timeout(Duration::from_secs(10))
+        .unwrap()
+        .unwrap_or_else(|| {
+            let _ = child.kill();
+            panic!("cctty did not exit after stdin closed");
+        });
+    assert!(status.success());
+}
+
 #[test]
 fn stream_json_permission_prompt_stdio_bridges_can_use_tool_request() {
     let fixture = FakeClaude::new();

tests/support/mod.rs

@@ -612,6 +612,18 @@ while True:
             after += 1
         buf = buf[after:]
         continue
+    if "OMIT_FAKE_RESULT" in prompt:
+        with transcript.open("a", encoding="utf-8") as f:
+            f.write(json.dumps({"type":"system","subtype":"init","session_id":session_id}) + "\n")
+            f.write(json.dumps({"type":"user","message":{"role":"user","content":prompt}}) + "\n")
+            f.write(json.dumps({"type":"assistant","message":{"model":"fake-model","content":[{"type":"text","text":response}]}}) + "\n")
+        sys.stdout.write("Context permissions /mcp\n")
+        sys.stdout.flush()
+        after = end + len(b"\x1b[201~")
+        while after < len(buf) and buf[after:after + 1] in (b"\r", b"\n"):
+            after += 1
+        buf = buf[after:]
+        continue
     with transcript.open("a", encoding="utf-8") as f:
         f.write(json.dumps({"type":"system","subtype":"init","session_id":session_id}) + "\n")
         f.write(json.dumps({"type":"user","message":{"role":"user","content":prompt}}) + "\n")