merge origin/main into codex/translate-acp-host-capabilities

Signed-off-by: Andrew Harvard <aharvard@squareup.com>

Author: aharvard

.github/workflows/goose2-ci.yml

@@ -111,6 +111,10 @@ jobs:
       - 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
 
@@ -167,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

@@ -484,3 +484,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

@@ -40,11 +40,6 @@
       "requestType": "GetSessionExtensionsRequest",
       "responseType": "GetSessionExtensionsResponse"
     },
-    {
-      "method": "_goose/session/provider/update",
-      "requestType": "UpdateProviderRequest",
-      "responseType": "UpdateProviderResponse"
-    },
     {
       "method": "_goose/providers/list",
       "requestType": "ListProvidersRequest",

crates/goose-acp/acp-meta.json

@@ -195,61 +195,6 @@
       "x-side": "agent",
       "x-method": "_goose/session/extensions"
     },
-    "UpdateProviderRequest": {
-      "type": "object",
-      "properties": {
-        "sessionId": {
-          "type": "string"
-        },
-        "provider": {
-          "type": "string"
-        },
-        "model": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "contextLimit": {
-          "type": [
-            "integer",
-            "null"
-          ],
-          "format": "uint",
-          "minimum": 0
-        },
-        "requestParams": {
-          "type": [
-            "object",
-            "null"
-          ],
-          "additionalProperties": {}
-        }
-      },
-      "required": [
-        "sessionId",
-        "provider"
-      ],
-      "description": "Atomically update the provider for a live session.",
-      "x-side": "agent",
-      "x-method": "_goose/session/provider/update"
-    },
-    "UpdateProviderResponse": {
-      "type": "object",
-      "properties": {
-        "configOptions": {
-          "type": "array",
-          "items": {},
-          "description": "Refreshed session config options after the provider/model change."
-        }
-      },
-      "required": [
-        "configOptions"
-      ],
-      "description": "Provider update response.",
-      "x-side": "agent",
-      "x-method": "_goose/session/provider/update"
-    },
     "ListProvidersRequest": {
       "type": "object",
       "description": "List providers available through goose, including the config-default sentinel.",
@@ -746,15 +691,6 @@
                   "description": "Params for _goose/session/extensions",
                   "title": "GetSessionExtensionsRequest"
                 },
-                {
-                  "allOf": [
-                    {
-                      "$ref": "#/$defs/UpdateProviderRequest"
-                    }
-                  ],
-                  "description": "Params for _goose/session/provider/update",
-                  "title": "UpdateProviderRequest"
-                },
                 {
                   "allOf": [
                     {
@@ -942,14 +878,6 @@
                       ],
                       "title": "GetSessionExtensionsResponse"
                     },
-                    {
-                      "allOf": [
-                        {
-                          "$ref": "#/$defs/UpdateProviderResponse"
-                        }
-                      ],
-                      "title": "UpdateProviderResponse"
-                    },
                     {
                       "allOf": [
                         {