Keep long-running monitors polling after prose turns

app/src/ai/runtime/rig_request.rs

@@ -737,7 +737,7 @@ fn build_system_prompt(
             "## Orchestration Mode\nDelegate only independent, bounded work where parallelism materially helps, then synthesize the results.\n\n",
         ),
         RigRequestMode::Cli => prompt.push_str(
-            "## Running Command Monitor\nThis turn concerns a running or just-finished shell command. Act as its dedicated monitor while still following the user's steering messages. Use the command ID from the tool result for every read/write operation. If the result says the command finished, report its outcome and stop polling. Otherwise, poll with `read_shell_command_output` and use short delays. Never choose a poll interval that crosses a user-specified deadline or stop condition. When an explicit stop condition is met, call `interrupt_shell_command` immediately, then poll briefly to verify the outcome. Never start a duplicate command merely to check its state, and never report completion while a result says it is still running.\n\n",
+            "## Running Command Monitor\nThis turn concerns a running or just-finished shell command. Act as its dedicated monitor while still following the user's steering messages. Use the command ID from the tool result for every read/write operation. If the result says the command finished, report its outcome and stop polling. If it says the command is still running, the next assistant output MUST be a tool call: use `read_shell_command_output` with a short delay, or use `interrupt_shell_command` immediately when the user's explicit stop condition is met. Do not end a still-running monitor turn with prose, a status message, or a request for the user to say continue. Never choose a poll interval that crosses a user-specified deadline or stop condition. After an interrupt, poll briefly to verify the outcome. Never start a duplicate command merely to check its state, and never report completion while a result says it is still running.\n\n",
         ),
     }
     prompt.push_str("## Available Tools\n");

app/src/ai/runtime/rig_request_tests.rs

@@ -185,7 +185,9 @@ fn lrc_snapshot_follow_up_uses_the_cli_monitor_prompt_and_tools() {
     let prompt = prepared.request.system_prompt.expect("system prompt");
 
     assert!(prompt.contains("## Running Command Monitor"));
-    assert!(prompt.contains("poll with `read_shell_command_output`"));
+    assert!(prompt.contains("`read_shell_command_output` with a short delay"));
+    assert!(prompt.contains("next assistant output MUST be a tool call"));
+    assert!(prompt.contains("Do not end a still-running monitor turn with prose"));
     assert!(prepared
         .request
         .tools
@@ -203,13 +205,14 @@ fn lrc_snapshot_follow_up_uses_the_cli_monitor_prompt_and_tools() {
         .any(|message| match &message.content {
             MessageContent::ToolResult { content, .. } => {
                 content.contains("Command ID: precmd-lrc-test")
-                    && content.contains("Continue monitoring with `read_shell_command_output`")
+                    && content.contains("The next assistant output MUST be a tool call")
             }
             MessageContent::MultiPart(parts) => parts.iter().any(|part| {
                 matches!(
                     part,
                     ContentPart::ToolResult { content, .. }
                         if content.contains("Command ID: precmd-lrc-test")
+                            && content.contains("The next assistant output MUST be a tool call")
                 )
             }),
             _ => false,