refactor: share suggested-next-steps sanitizers between store and runner

The sanitize/legacy-fallback/non-empty-prompt helpers were duplicated
between store/models.rs and session_runner.rs, so the 4-item cap and
trim rules had to be kept in sync by hand. Make the models.rs versions
pub and use them from session_runner.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Matt Toohey <contact@matttoohey.com>

Author: matt2e

apps/staged/src-tauri/src/session_runner.rs

@@ -52,9 +52,10 @@ use crate::agent::{AcpDriver, AgentDriver, MessageWriter};
 use crate::git::Span;
 use crate::shell_env::ShellEnvCache;
 use crate::store::{
-    AcpConfigSelection, Comment, CommentAuthor, CommentType, CompletionReason, FailureStrategy,
-    MessageRole, PipelineExecution, PipelineKind, PipelineStep, SessionMessage, SessionStatus,
-    StepStatus, StepType, Store, SuggestedNextStep,
+    legacy_suggested_next_steps, sanitize_suggested_next_steps, AcpConfigSelection, Comment,
+    CommentAuthor, CommentType, CompletionReason, FailureStrategy, MessageRole, PipelineExecution,
+    PipelineKind, PipelineStep, SessionMessage, SessionStatus, StepStatus, StepType, Store,
+    SuggestedNextStep,
 };
 
 const PIPELINE_STEP_PROMPT_OUTPUT_MAX_CHARS: usize = 30_000;
@@ -3053,53 +3054,6 @@ impl SuggestedNextStepsPayload {
     }
 }
 
-fn legacy_suggested_next_steps(
-    suggested_next_commit_step: Option<String>,
-    suggested_next_note_step: Option<String>,
-) -> Vec<SuggestedNextStep> {
-    let mut steps = Vec::new();
-    if let Some(prompt) = non_empty_suggested_step_prompt(suggested_next_commit_step) {
-        steps.push(SuggestedNextStep::Implementation {
-            prompt,
-            expected_multiple_commits: false,
-        });
-    }
-    if let Some(prompt) = non_empty_suggested_step_prompt(suggested_next_note_step) {
-        steps.push(SuggestedNextStep::Note { prompt });
-    }
-    steps
-}
-
-fn sanitize_suggested_next_steps(steps: Vec<SuggestedNextStep>) -> Vec<SuggestedNextStep> {
-    steps
-        .into_iter()
-        .filter_map(|step| match step {
-            SuggestedNextStep::Implementation {
-                prompt,
-                expected_multiple_commits,
-            } => non_empty_suggested_step_prompt(Some(prompt)).map(|prompt| {
-                SuggestedNextStep::Implementation {
-                    prompt,
-                    expected_multiple_commits,
-                }
-            }),
-            SuggestedNextStep::Note { prompt } => non_empty_suggested_step_prompt(Some(prompt))
-                .map(|prompt| SuggestedNextStep::Note { prompt }),
-        })
-        .take(4)
-        .collect()
-}
-
-fn non_empty_suggested_step_prompt(prompt: Option<String>) -> Option<String> {
-    let prompt = prompt?;
-    let trimmed = prompt.trim();
-    if trimmed.is_empty() {
-        None
-    } else {
-        Some(trimmed.to_string())
-    }
-}
-
 /// Extract suggested next steps from assistant output.
 ///
 /// Prefer the terminal ```suggested-next-steps fenced block used by the current

apps/staged/src-tauri/src/store/models.rs

@@ -909,7 +909,7 @@ pub fn suggested_next_steps_legacy_note_step(steps: &[SuggestedNextStep]) -> Opt
     })
 }
 
-fn legacy_suggested_next_steps(
+pub fn legacy_suggested_next_steps(
     legacy_commit_step: Option<String>,
     legacy_note_step: Option<String>,
 ) -> Vec<SuggestedNextStep> {
@@ -926,7 +926,7 @@ fn legacy_suggested_next_steps(
     steps
 }
 
-fn sanitize_suggested_next_steps(steps: Vec<SuggestedNextStep>) -> Vec<SuggestedNextStep> {
+pub fn sanitize_suggested_next_steps(steps: Vec<SuggestedNextStep>) -> Vec<SuggestedNextStep> {
     steps
         .into_iter()
         .filter_map(|step| match step {