Remove session_id from provider streaming trait methods (#9984)

crates/goose-cli/src/commands/configure.rs

@@ -1813,7 +1813,6 @@ pub async fn handle_openrouter_auth() -> anyhow::Result<()> {
             let test_result = provider
                 .complete(
                     &model_config,
-                    "",
                     "You are goose, an AI assistant.",
                     &[Message::user().with_text("Say 'Configuration test successful!'")],
                     &[],

crates/goose-cli/src/commands/info.rs

@@ -88,10 +88,12 @@ async fn check_provider(
 
     let test_msg = Message::user().with_text("Say 'ok'");
     let start = std::time::Instant::now();
-    provider_client
-        .complete(&model_config, "check", "", &[test_msg], &[])
-        .await
-        .map_err(ProviderCheckError::ProviderRequest)?;
+    goose::session_context::with_session_id(
+        Some("check".to_string()),
+        provider_client.complete(&model_config, "", &[test_msg], &[]),
+    )
+    .await
+    .map_err(ProviderCheckError::ProviderRequest)?;
 
     Ok(ProviderCheckSuccess {
         provider,

crates/goose-cli/src/session/mod.rs

@@ -226,15 +226,16 @@ pub async fn classify_planner_response(
     );
 
     let message = Message::user().with_text(&prompt);
-    let (result, _usage) = provider
-        .complete(
+    let (result, _usage) = goose::session_context::with_session_id(
+        Some(session_id.to_string()),
+        provider.complete(
             &model_config,
-            session_id,
             "Reply only with the classification label: \"plan\" or \"clarifying questions\"",
             &[message],
             &[],
-        )
-        .await?;
+        ),
+    )
+    .await?;
 
     let predicted = result.as_concat_text();
     if predicted.to_lowercase().contains("plan") {
@@ -1060,15 +1061,11 @@ impl CliSession {
     ) -> Result<(), anyhow::Error> {
         let plan_prompt = self.agent.get_plan_prompt(&self.session_id).await?;
         output::show_thinking();
-        let (plan_response, _usage) = reasoner
-            .complete(
-                &model_config,
-                &self.session_id,
-                &plan_prompt,
-                plan_messages.messages(),
-                &[],
-            )
-            .await?;
+        let (plan_response, _usage) = goose::session_context::with_session_id(
+            Some(self.session_id.clone()),
+            reasoner.complete(&model_config, &plan_prompt, plan_messages.messages(), &[]),
+        )
+        .await?;
         output::render_message(&plan_response, self.debug);
         output::hide_thinking();
         let planner_response_type = classify_planner_response(