Sync upstream changes for 2026-06-11

.github/workflows/pr-website-preview.yml

@@ -17,6 +17,10 @@ jobs:
   build:
     if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
+    env:
+      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.PAGES_PR_PREVIEW_CF_ACCOUNT_ID }}
+      CLOUDFLARE_API_TOKEN: ${{ secrets.PAGES_PR_PREVIEW_CF_API_TOKEN }}
+      CLOUDFLARE_PAGES_PROJECT_NAME: ${{ secrets.PAGES_PR_PREVIEW_CF_PAGES_PROJECT_NAME }}
     permissions:
       contents: read
       pull-requests: write
@@ -52,12 +56,10 @@ jobs:
           node-version: 22
 
       - name: Deploy preview to Cloudflare Pages
+        if: env.CLOUDFLARE_ACCOUNT_ID != '' && env.CLOUDFLARE_API_TOKEN != '' && env.CLOUDFLARE_PAGES_PROJECT_NAME != ''
         id: cloudflare-pages
         working-directory: ./documentation
         env:
-          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.PAGES_PR_PREVIEW_CF_ACCOUNT_ID }}
-          CLOUDFLARE_API_TOKEN: ${{ secrets.PAGES_PR_PREVIEW_CF_API_TOKEN }}
-          CLOUDFLARE_PAGES_PROJECT_NAME: ${{ secrets.PAGES_PR_PREVIEW_CF_PAGES_PROJECT_NAME }}
           PR_NUMBER: ${{ github.event.number }}
         run: |
           set -euo pipefail
@@ -76,6 +78,7 @@ jobs:
           echo "preview-url=$preview_url" >> "$GITHUB_OUTPUT"
 
       - name: Comment preview URL
+        if: steps.cloudflare-pages.outputs.preview-url != ''
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3  # v9.0.0
         env:
           PREVIEW_URL: ${{ steps.cloudflare-pages.outputs.preview-url }}

crates/goose-cli/src/cli.rs

@@ -1326,7 +1326,7 @@ async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) ->
     use goose::config::paths::Paths;
     use std::net::SocketAddr;
     use std::sync::Arc;
-    use tracing::info;
+    use tracing::{info, warn};
 
     let builtins = if builtins.is_empty() {
         vec!["developer".to_string()]
@@ -1353,12 +1353,18 @@ async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) ->
         goose_platform: GoosePlatform::GooseCli,
         additional_source_roots,
     }));
-    let secret_key = std::env::var(GOOSE_SERVER_SECRET_KEY_ENV)
+    let env_secret = std::env::var(GOOSE_SERVER_SECRET_KEY_ENV)
         .ok()
         .map(|secret| secret.trim().to_string())
-        .filter(|secret| !secret.is_empty())
-        .unwrap_or_else(generate_serve_secret_key);
-    let router = create_router(server, secret_key);
+        .filter(|secret| !secret.is_empty());
+    let require_token = env_secret.is_some();
+    if !require_token {
+        warn!(
+            "{GOOSE_SERVER_SECRET_KEY_ENV} is not set; the ACP endpoint will accept unauthenticated connections"
+        );
+    }
+    let secret_key = env_secret.unwrap_or_else(generate_serve_secret_key);
+    let router = create_router(server, secret_key, require_token);
 
     let addr: SocketAddr = format!("{}:{}", host, port).parse()?;
     info!("Starting ACP server on {}", addr);

crates/goose-providers/src/conversation/message.rs

@@ -667,6 +667,11 @@ pub struct MessageMetadata {
     pub agent_visible: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub inference: Option<InferenceMetadata>,
+    /// Whether this message is a steer injected into an active run. UI-only:
+    /// surfaced as `_meta.goose.steer` so clients can mark the steer boundary
+    /// without matching user-visible text. Never sent to providers.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub steer: bool,
 }
 
 impl Default for MessageMetadata {
@@ -675,6 +680,7 @@ impl Default for MessageMetadata {
             user_visible: true,
             agent_visible: true,
             inference: None,
+            steer: false,
         }
     }
 }
@@ -743,6 +749,11 @@ impl MessageMetadata {
         self.inference = Some(inference);
         self
     }
+
+    pub fn with_steer(mut self) -> Self {
+        self.steer = true;
+        self
+    }
 }
 
 #[derive(ToSchema, Clone, PartialEq, Serialize, Deserialize, Debug)]
@@ -1028,6 +1039,11 @@ impl Message {
         self
     }
 
+    pub fn with_steer(mut self) -> Self {
+        self.metadata.steer = true;
+        self
+    }
+
     pub fn with_inference_if_assistant(self, inference: InferenceMetadata) -> Self {
         if self.role == Role::Assistant && self.metadata.inference.is_none() {
             self.with_inference(inference)

crates/goose-providers/src/errors.rs

@@ -42,6 +42,12 @@ pub enum ProviderError {
         details: String,
         top_up_url: Option<String>,
     },
+
+    #[error("Provider refused request: {details}")]
+    Refusal {
+        details: String,
+        category: Option<String>,
+    },
 }
 
 impl ProviderError {
@@ -58,12 +64,21 @@ impl ProviderError {
             ProviderError::NotImplemented(_) => "not_implemented",
             ProviderError::EndpointNotFound(_) => "endpoint_not_found",
             ProviderError::CreditsExhausted { .. } => "credits_exhausted",
+            ProviderError::Refusal { .. } => "refusal",
         }
     }
 
     pub fn is_endpoint_not_found(&self) -> bool {
         matches!(self, ProviderError::EndpointNotFound(_))
     }
+
+    /// Recover a typed `ProviderError` from a streaming decode error, falling
+    /// back to `RequestFailed` for errors that did not originate as one.
+    pub fn from_stream_error(error: anyhow::Error) -> Self {
+        error
+            .downcast()
+            .unwrap_or_else(|e| ProviderError::RequestFailed(format!("Stream decode error: {e}")))
+    }
 }
 
 fn is_network_error(err: &reqwest::Error) -> bool {

crates/goose-sdk-types/src/custom_requests.rs

@@ -1,4 +1,4 @@
-use agent_client_protocol::schema::McpServer;
+use agent_client_protocol::schema::{ContentBlock, McpServer, SessionInfo};
 use agent_client_protocol::{JsonRpcRequest, JsonRpcResponse};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -140,6 +140,30 @@ pub struct SetSessionSystemPromptRequest {
     pub text: String,
 }
 
+/// Add user input to the currently active prompt without starting a new prompt.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
+#[request(
+    method = "_goose/unstable/session/steer",
+    response = SteerSessionResponse
+)]
+#[serde(rename_all = "camelCase")]
+pub struct SteerSessionRequest {
+    pub session_id: String,
+    #[serde(default)]
+    pub prompt: Vec<ContentBlock>,
+    pub expected_run_id: String,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcResponse)]
+#[serde(rename_all = "camelCase")]
+pub struct SteerSessionResponse {
+    pub run_id: String,
+    /// Stable id of the queued steer message. The same id later appears as
+    /// `messageId` on the streamed `UserMessageChunk` (with `_meta.goose.steer`),
+    /// letting clients correlate a queued steer with its pickup.
+    pub message_id: String,
+}
+
 /// Delete a session.
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
 #[request(method = "session/delete", response = EmptyResponse)]
@@ -314,6 +338,7 @@ pub struct PreferencesRemoveRequest {
 pub enum PreferenceKey {
     #[default]
     AutoCompactThreshold,
+    GooseThinkingEffort,
     VoiceAutoSubmitPhrases,
     VoiceDictationProvider,
     VoiceDictationPreferredMic,
@@ -449,6 +474,23 @@ pub struct DictationSecretDeleteRequest {
     pub provider: String,
 }
 
+/// Return list-style metadata for a single session without loading the conversation.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
+#[request(
+    method = "_goose/unstable/session/info",
+    response = GetSessionInfoResponse
+)]
+#[serde(rename_all = "camelCase")]
+pub struct GetSessionInfoRequest {
+    pub session_id: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, JsonRpcResponse)]
+#[serde(rename_all = "camelCase")]
+pub struct GetSessionInfoResponse {
+    pub session: SessionInfo,
+}
+
 /// Update the project association for a session.
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
 #[request(method = "_goose/unstable/session/project/update", response = EmptyResponse)]

crates/goose-server/Cargo.toml

@@ -81,7 +81,6 @@ tokio-tungstenite = { version = "0.29", default-features = false, features = ["c
 url = { workspace = true }
 rand = { workspace = true }
 hex = { version = "0.4.3", default-features = false, features = ["std"] }
-subtle = { version = "2.5", default-features = false, features = ["std"] }
 socket2 = { version = "0.6", default-features = false }
 fs2 = { workspace = true }
 rustls = { workspace = true, optional = true }

crates/goose-server/src/auth.rs

@@ -4,13 +4,8 @@ use axum::{
     middleware::Next,
     response::Response,
 };
-use subtle::ConstantTimeEq;
-
-fn token_matches(candidate: Option<&str>, expected: &str) -> bool {
-    candidate
-        .map(|key| bool::from(key.as_bytes().ct_eq(expected.as_bytes())))
-        .unwrap_or(false)
-}
+pub use goose::acp::transport::auth::check_acp_token;
+use goose::acp::transport::auth::token_matches;
 
 pub async fn check_token(
     State(state): State<String>,
@@ -36,26 +31,3 @@ pub async fn check_token(
         Err(StatusCode::UNAUTHORIZED)
     }
 }
-
-pub async fn check_acp_token(
-    State(state): State<String>,
-    request: Request,
-    next: Next,
-) -> Result<Response, StatusCode> {
-    let header_token = request
-        .headers()
-        .get("X-Secret-Key")
-        .and_then(|value| value.to_str().ok());
-
-    let query_token = request.uri().query().and_then(|query| {
-        url::form_urlencoded::parse(query.as_bytes())
-            .find(|(key, _)| key == "token")
-            .map(|(_, value)| value.into_owned())
-    });
-
-    if token_matches(header_token, &state) || token_matches(query_token.as_deref(), &state) {
-        Ok(next.run(request).await)
-    } else {
-        Err(StatusCode::UNAUTHORIZED)
-    }
-}

crates/goose-server/src/openapi.rs

@@ -8,7 +8,7 @@ use goose::download_manager::{DownloadProgress, DownloadStatus};
 use goose::model::ModelConfig;
 use goose::permission::permission_confirmation::{Permission, PrincipalType};
 use goose::providers::base::{ConfigKey, ModelInfo, ProviderMetadata, ProviderType};
-use goose::session::{Session, SessionInsights, SessionType, SystemInfo};
+use goose::session::{Session, SessionType, SystemInfo};
 use goose_providers::thinking::ThinkingEffort;
 use rmcp::model::{
     Annotations, Content, EmbeddedResource, Icon, IconTheme, ImageContent, JsonObject,
@@ -440,14 +440,8 @@ derive_utoipa!(IconTheme as IconThemeSchema);
         super::routes::session_events::session_events,
         super::routes::session_events::session_reply,
         super::routes::session_events::session_cancel,
-        super::routes::session::list_sessions,
-        super::routes::session::search_sessions,
         super::routes::session::get_session,
-        super::routes::session::get_session_insights,
         super::routes::session::update_session_name,
-        super::routes::session::delete_session,
-        super::routes::session::export_session,
-        super::routes::session::import_session,
         super::routes::session::share_session_nostr,
         super::routes::session::import_session_nostr,
         super::routes::session::update_session_user_recipe_values,
@@ -522,11 +516,9 @@ derive_utoipa!(IconTheme as IconThemeSchema);
         super::routes::session_events::SessionReplyRequest,
         super::routes::session_events::SessionReplyResponse,
         super::routes::session_events::CancelRequest,
-        super::routes::session::ImportSessionRequest,
         super::routes::session::ShareSessionNostrRequest,
         super::routes::session::ShareSessionNostrResponse,
         super::routes::session::ImportSessionNostrRequest,
-        super::routes::session::SessionListResponse,
         super::routes::session::UpdateSessionNameRequest,
         super::routes::session::UpdateSessionUserRecipeValuesRequest,
         super::routes::session::UpdateSessionUserRecipeValuesResponse,
@@ -587,7 +579,6 @@ derive_utoipa!(IconTheme as IconThemeSchema);
         super::routes::config_management::ProviderModelInfoQuery,
         Session,
         goose::config::goose_mode::GooseMode,
-        SessionInsights,
         SessionType,
         SystemInfo,
         Conversation,