Merge remote-tracking branch 'origin/main' into goose-dev-just-target

Author: jamadeo

.github/workflows/goose2-ci.yml

@@ -5,10 +5,12 @@ on:
     branches: [main]
     paths:
       - "ui/goose2/**"
+      - "ui/sdk/**"
   pull_request:
     branches: [main]
     paths:
       - "ui/goose2/**"
+      - "ui/sdk/**"
   merge_group:
     branches: [main]
   workflow_dispatch:
@@ -35,8 +37,11 @@ jobs:
         with:
           node-version: 24
           cache: pnpm
-          cache-dependency-path: ui/goose2/pnpm-lock.yaml
+          cache-dependency-path: ui/pnpm-lock.yaml
       - run: pnpm install --frozen-lockfile
+      - name: Build SDK
+        run: pnpm build
+        working-directory: ui/sdk
       - run: pnpm check
       - run: pnpm typecheck
 
@@ -53,8 +58,11 @@ jobs:
         with:
           node-version: 24
           cache: pnpm
-          cache-dependency-path: ui/goose2/pnpm-lock.yaml
+          cache-dependency-path: ui/pnpm-lock.yaml
       - run: pnpm install --frozen-lockfile
+      - name: Build SDK
+        run: pnpm build
+        working-directory: ui/sdk
       - run: pnpm test
 
   desktop:
@@ -70,7 +78,7 @@ jobs:
         with:
           node-version: 24
           cache: pnpm
-          cache-dependency-path: ui/goose2/pnpm-lock.yaml
+          cache-dependency-path: ui/pnpm-lock.yaml
 
       - name: Install system dependencies
         run: |
@@ -96,9 +104,17 @@ jobs:
 
       - run: pnpm install --frozen-lockfile
 
+      - name: Build SDK
+        run: pnpm build
+        working-directory: ui/sdk
+
       - name: Build frontend
         run: pnpm build
 
+      - name: Mock goose binary
+        working-directory: .
+        run: mkdir -p target/release && touch target/release/goose-$(rustc --print host-tuple)
+
       - name: Check Tauri
         run: cd src-tauri && cargo check
 
@@ -155,6 +171,10 @@ jobs:
             ui/goose2/src-tauri/target
           key: ${{ runner.os }}-goose2-cargo-${{ hashFiles('ui/goose2/src-tauri/Cargo.lock') }}
 
+      - name: Mock goose binary
+        working-directory: .
+        run: mkdir -p target/release && touch target/release/goose-$(rustc --print host-tuple)
+
       - name: Format check
         run: cd src-tauri && cargo fmt --check
 

Cargo.lock

@@ -2,7 +2,7 @@
 members = [
     "crates/*",
     # Mainly for cargo-machete to not error out during inspection.
-    "vendor/v8"
+    "vendor/v8",
 ]
 exclude = ["ui/goose2/src-tauri"]
 resolver = "2"
@@ -20,7 +20,7 @@ uninlined_format_args = "allow"
 string_slice = "warn"
 
 [workspace.dependencies]
-rmcp = { version = "1.2.0", features = ["schemars", "auth"] }
+rmcp = { version = "1.5.0", features = ["schemars", "auth"] }
 agent-client-protocol-schema = { version = "0.11", features = ["unstable"] }
 sacp = "11.0.0"
 arboard = "3"

Cargo.toml

@@ -487,3 +487,8 @@ build-test-tools:
 record-mcp-tests: build-test-tools
   GOOSE_RECORD_MCP=1 cargo test --package goose --test mcp_integration_test
   git add crates/goose/tests/mcp_replays/
+
+bundle-goose2:
+  cargo build --release --package goose-cli --bin goose
+  cp target/release/goose target/release/goose-$(rustc --print host-tuple)
+  @just goose2::bundle

Justfile

@@ -164,6 +164,7 @@ fn mcp_server_to_extension_config(mcp_server: McpServer) -> Result<ExtensionConf
                     .map(|h| (h.name, h.value))
                     .collect(),
                 timeout,
+                socket: None,
                 bundled: Some(false),
                 available_tools: vec![],
             })
@@ -2962,6 +2963,7 @@ mod tests {
                 "Bearer ghp_xxxxxxxxxxxx".into()
             )]),
             timeout: None,
+            socket: None,
             bundled: Some(false),
             available_tools: vec![],
         })

crates/goose-acp/src/server.rs

@@ -1174,6 +1174,7 @@ fn configure_streamable_http_extension() -> anyhow::Result<()> {
             headers,
             description,
             timeout: Some(timeout),
+            socket: None,
             bundled: None,
             available_tools: Vec::new(),
         },

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

@@ -166,6 +166,7 @@ mod tests {
                     env_keys: vec!["GITHUB_TOKEN".to_string(), "GITHUB_API_URL".to_string()],
                     description: "github-mcp".to_string(),
                     timeout: None,
+                    socket: None,
                     bundled: None,
                     available_tools: Vec::new(),
                     headers: HashMap::new(),
@@ -262,6 +263,7 @@ mod tests {
                     env_keys: vec!["API_KEY".to_string()],
                     description: "service-a".to_string(),
                     timeout: None,
+                    socket: None,
                     bundled: None,
                     available_tools: Vec::new(),
                     headers: HashMap::new(),
@@ -321,6 +323,7 @@ mod tests {
                 env_keys: vec!["PARENT_TOKEN".to_string()],
                 description: "parent-ext".to_string(),
                 timeout: None,
+                socket: None,
                 bundled: None,
                 available_tools: Vec::new(),
                 headers: HashMap::new(),