Merge remote-tracking branch 'origin/main' into tyler/analyze-platform-extension-pr

* origin/main:
  Update CODEOWNERS for team restructuring (#7574)
  Add snapshot test with platform extensions (#7573)
  Handle Bedrock 'prompt is too long' error (#7550)
  feat: make pctx/Code Mode an optional dependency via 'code-mode' feature (#7567)
  chore(release): release version 1.26.0 (minor) (#7512)
  feat: allow goose askai bot to search goose codebase (#7508)
  Revert "Reapply "fix: prevent crashes in long-running Electron sessions""
  Reapply "fix: prevent crashes in long-running Electron sessions"
  Revert "fix: prevent crashes in long-running Electron sessions"
  fix: replace unwrap() with graceful error in scheduler execute_job (#7436)
  fix: Dictation API error message shows incorrect limit (#7423)
  fix(acp): Use ACP schema types for session/list (#7409)
  fix(desktop): make bundle and updater asset naming configurable (#7337)
  fix(openai): preserve order in Responses API history (#7500)
  Use the correct Goose emoji 🪿 instead of Swan in README.md (#7485)
  fix: prevent crashes in long-running Electron sessions

Author: tlongwell-block

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 # CODEOWNERS file for block/goose repository
 # See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-# Documentation owned by DevRel team
-/documentation/ @block/goose-devrel
+# Documentation owned by DevRel
+/documentation/ @blackgirlbytes
 

CUSTOM_DISTROS.md

@@ -46,7 +46,7 @@ goose's architecture is designed for extensibility. Organizations can create "re
 |---------------|---------------|------------|
 | Preconfigure a model/provider | `config.yaml`, `init-config.yaml`, environment variables | Low |
 | Add custom AI providers | `crates/goose/src/providers/declarative/` | Low |
-| Bundle custom MCP extensions | `config.yaml` extensions section, `ui/desktop/src/built-in-extensions.json` | Medium |
+| Bundle custom MCP extensions | `config.yaml` extensions section, `ui/desktop/src/built-in-extensions.json`, `ui/desktop/src/components/settings/extensions/bundled-extensions.json` | Medium |
 | Modify system prompts | `crates/goose/src/prompts/` | Low |
 | Customize desktop branding | `ui/desktop/` (icons, names, colors) | Medium |
 | Build a new UI (web, mobile) | Integrate with `goose-server` REST API | High |
@@ -191,7 +191,11 @@ async def query_data_lake(query: str) -> str:
     return results
 ```
 
-2. **Bundle as a built-in extension** by adding to `ui/desktop/src/built-in-extensions.json`:
+2. **Bundle as a built-in extension** by adding to either:
+   - `ui/desktop/src/built-in-extensions.json` (core built-ins surfaced in extension UI)
+   - `ui/desktop/src/components/settings/extensions/bundled-extensions.json` (bundled extension catalog in Settings)
+
+Example:
 
 ```json
 {
@@ -268,6 +272,26 @@ You are an AI assistant called [YourName], created by [YourCompany].
    - Component text and labels
    - Feature visibility
 
+5. **Align packaging and updater names** when rebranding:
+   - Update static branding metadata in `ui/desktop/package.json` (`productName`, description) and Linux desktop templates (`ui/desktop/forge.deb.desktop`, `ui/desktop/forge.rpm.desktop`)
+
+   - Set build/release environment variables consistently:
+     - `GITHUB_OWNER` and `GITHUB_REPO` for publisher + updater repository lookup
+     - `GOOSE_BUNDLE_NAME` for bundle/debug scripts and updater asset naming (defaults to `Goose`)
+
+Example:
+
+```bash
+export GITHUB_OWNER="your-org"
+export GITHUB_REPO="your-goose-fork"
+export GOOSE_BUNDLE_NAME="InsightStream-goose"
+```
+
+6. **Use this branding consistency checklist** before release:
+   - Application metadata (`forge.config.ts`, `package.json`, `index.html`) uses your distro name
+   - Release artifact names and updater lookup names are consistent
+   - Desktop launchers (Linux `.desktop` templates) point to the same executable name produced by packaging
+
 ### Technical Details
 
 - Electron config: `ui/desktop/forge.config.ts`

Cargo.lock

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "1.25.0"
+version = "1.26.0"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "Apache-2.0"
 repository = "https://github.com/block/goose"

Cargo.toml

@@ -35,7 +35,7 @@ Designed for maximum flexibility, goose works with any LLM and supports multi-mo
 - [Diagnostics & Reporting](https://block.github.io/goose/docs/troubleshooting/diagnostics-and-reporting)
 - [Known Issues](https://block.github.io/goose/docs/troubleshooting/known-issues)
 
-# a little goose humor 🦢
+# a little goose humor 🪿
 
 > Why did the developer choose goose as their AI agent?
 > 

README.md

@@ -15,15 +15,19 @@ path = "src/bin/server.rs"
 name = "generate-acp-schema"
 path = "src/bin/generate_acp_schema.rs"
 
+[features]
+default = ["code-mode"]
+code-mode = ["goose/code-mode"]
+
 [lints]
 workspace = true
 
 [dependencies]
-goose = { path = "../goose" }
+goose = { path = "../goose", default-features = false }
 goose-mcp = { path = "../goose-mcp" }
 rmcp = { workspace = true }
 sacp = "10.1.0"
-agent-client-protocol-schema = { version = "0.10", features = ["unstable_session_model"] }
+agent-client-protocol-schema = { version = "0.10", features = ["unstable_session_model", "unstable_session_list"] }
 anyhow = { workspace = true }
 tokio = { workspace = true }
 tokio-util = { workspace = true, features = ["compat", "rt"] }

crates/goose-acp/Cargo.toml

@@ -82,12 +82,6 @@ pub struct GetSessionResponse {
     pub session: serde_json::Value,
 }
 
-/// List all sessions.
-#[derive(Debug, Serialize, JsonSchema)]
-pub struct ListSessionsResponse {
-    pub sessions: Vec<serde_json::Value>,
-}
-
 /// Delete a session.
 #[derive(Debug, Deserialize, JsonSchema)]
 pub struct DeleteSessionRequest {

crates/goose-acp/src/custom_requests.rs

@@ -24,10 +24,11 @@ use sacp::schema::{
     AgentCapabilities, AuthMethod, AuthenticateRequest, AuthenticateResponse, BlobResourceContents,
     CancelNotification, Content, ContentBlock, ContentChunk, EmbeddedResource,
     EmbeddedResourceResource, ImageContent, InitializeRequest, InitializeResponse,
-    LoadSessionRequest, LoadSessionResponse, McpCapabilities, McpServer, ModelId, ModelInfo,
-    NewSessionRequest, NewSessionResponse, PermissionOption, PermissionOptionKind,
-    PromptCapabilities, PromptRequest, PromptResponse, RequestPermissionOutcome,
-    RequestPermissionRequest, ResourceLink, SessionId, SessionModelState, SessionNotification,
+    ListSessionsResponse, LoadSessionRequest, LoadSessionResponse, McpCapabilities, McpServer,
+    ModelId, ModelInfo, NewSessionRequest, NewSessionResponse, PermissionOption,
+    PermissionOptionKind, PromptCapabilities, PromptRequest, PromptResponse,
+    RequestPermissionOutcome, RequestPermissionRequest, ResourceLink, SessionCapabilities,
+    SessionId, SessionInfo, SessionListCapabilities, SessionModelState, SessionNotification,
     SessionUpdate, SetSessionModelRequest, SetSessionModelResponse, StopReason, TextContent,
     TextResourceContents, ToolCall, ToolCallContent, ToolCallId, ToolCallLocation, ToolCallStatus,
     ToolCallUpdate, ToolCallUpdateFields, ToolKind,
@@ -664,6 +665,7 @@ impl GooseAcpAgent {
 
         let capabilities = AgentCapabilities::new()
             .load_session(true)
+            .session_capabilities(SessionCapabilities::new().list(SessionListCapabilities::new()))
             .prompt_capabilities(
                 PromptCapabilities::new()
                     .image(true)
@@ -1097,14 +1099,15 @@ impl GooseAcpAgent {
             .list_sessions()
             .await
             .map_err(|e| sacp::Error::internal_error().data(e.to_string()))?;
-        let sessions_json = sessions
+        let session_infos: Vec<SessionInfo> = sessions
             .into_iter()
-            .map(|s| serde_json::to_value(&s))
-            .collect::<Result<Vec<_>, _>>()
-            .map_err(|e| sacp::Error::internal_error().data(e.to_string()))?;
-        Ok(ListSessionsResponse {
-            sessions: sessions_json,
-        })
+            .map(|s| {
+                SessionInfo::new(SessionId::new(s.id), s.working_dir)
+                    .title(s.name)
+                    .updated_at(s.updated_at.to_rfc3339())
+            })
+            .collect();
+        Ok(ListSessionsResponse::new(session_infos))
     }
 
     #[custom_method("session/get")]
@@ -1286,6 +1289,14 @@ impl JrMessageHandler for GooseAcpHandler {
                                 request_cx.respond(json)?;
                                 Ok(())
                             }
+                            MessageCx::Request(req, request_cx) if req.method == "session/list" => {
+                                let resp = agent.on_list_sessions().await?;
+                                let json = serde_json::to_value(resp).map_err(|e| {
+                                    sacp::Error::internal_error().data(e.to_string())
+                                })?;
+                                request_cx.respond(json)?;
+                                Ok(())
+                            }
                             MessageCx::Request(req, request_cx) if req.method.starts_with('_') => {
                                 match agent.handle_custom_request(&req.method, req.params).await {
                                     Ok(json) => request_cx.respond(json)?,

crates/goose-acp/src/server.rs

@@ -20,8 +20,8 @@ path = "src/bin/generate_manpages.rs"
 
 [dependencies]
 clap_mangen = "0.2.31"
-goose = { path = "../goose" }
-goose-acp = { path = "../goose-acp" }
+goose = { path = "../goose", default-features = false }
+goose-acp = { path = "../goose-acp", default-features = false }
 goose-mcp = { path = "../goose-mcp" }
 rmcp = { workspace = true }
 clap = { workspace = true }
@@ -70,6 +70,8 @@ comfy-table = "7.2.2"
 winapi = { version = "0.3", features = ["wincred"] }
 
 [features]
+default = ["code-mode"]
+code-mode = ["goose/code-mode", "goose-acp/code-mode"]
 # disables the update command
 disable-update = []
 

crates/goose-cli/Cargo.toml

@@ -11,11 +11,12 @@ description.workspace = true
 workspace = true
 
 [features]
-default = []
+default = ["code-mode"]
+code-mode = ["goose/code-mode"]
 cuda = ["goose/cuda"]
 
 [dependencies]
-goose = { path = "../goose" }
+goose = { path = "../goose", default-features = false }
 goose-mcp = { path = "../goose-mcp" }
 rmcp = { workspace = true }
 axum = { workspace = true, features = ["ws", "macros"] }