chore: package the goose binary in the goose2 tauri app (#8615)

Co-authored-by: Lifei Zhou <lifei@squareup.com>

Author: jamadeo

.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.toml

@@ -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"

Justfile

@@ -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

ui/goose2/README.md

@@ -8,14 +8,12 @@ Goose2 is a Tauri 2 + React 19 desktop app.
    bash/zsh: `source ./bin/activate-hermit`
    fish: `source ./bin/activate-hermit.fish`
 2. Install git hooks: `lefthook install`
-3. Install dependencies: `just setup`
+3. Prepare workspace dependencies: `just setup`
 4. Start the app: `just dev`
 
 `just clean` removes Rust build artifacts, `dist`, and `node_modules`. Run `just setup` again before `just dev`.
 
-`just setup` bootstraps a shared managed goose checkout in a home-level cache directory when it does not exist, fast-forwards it, builds a local `goose` binary, and stamps the exact branch/commit it used. `just dev` only does a lightweight preflight against that shared stamp; if the managed checkout is missing, stale, or built from the wrong branch, it warns and tells you to rerun `just setup`. By default the helper uses `~/Library/Caches/goose2-dev` on macOS, or `$XDG_CACHE_HOME/goose2-dev` / `~/.cache/goose2-dev` elsewhere. It prefers `origin/baxen/goose2` and falls back to `origin/main` when that branch does not exist yet.
-
-Override the shared cache root or branch with `GOOSE_DEV_ROOT=/path/to/cache` and `GOOSE_DEV_BRANCH=my/integration-branch`. You can also override the checkout path directly with `GOOSE_DEV_REPO=/path/to/goose`, or the clone source with `GOOSE_DEV_CLONE_URL=...`.
+`just setup` installs UI workspace dependencies, builds the SDK package, and builds the local debug `goose` CLI binary. `just dev` exports `GOOSE_BIN` to that local binary and loads `src-tauri/tauri.dev.conf.json`, which clears the production `externalBin` requirement during development.
 
 Run `just` to list available commands, or see [justfile](./justfile) for the full recipe definitions.
 

ui/goose2/justfile

@@ -10,9 +10,9 @@ default:
 
 # Install dependencies and build workspace packages
 setup:
-    pnpm install
+    cd ../ && pnpm install
     cd ../sdk && pnpm build
-    cd src-tauri && cargo build
+    cargo build --manifest-path ../../Cargo.toml -p goose-cli --bin goose
 
 # ── Build & Check ────────────────────────────────────────────
 
@@ -50,6 +50,9 @@ tauri-check:
 # Full CI gate
 ci: check clippy test build tauri-check
 
+bundle:
+    pnpm tauri build
+
 # ── Test ─────────────────────────────────────────────────────
 
 # Run unit/component tests
@@ -82,7 +85,9 @@ dev:
     VITE_PORT={{ vite_port }}
     export VITE_PORT
     PROJECT_DIR=$(pwd)
-    TAURI_CONFIG="{\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"cd ${PROJECT_DIR} && exec pnpm exec vite --port ${VITE_PORT} --strictPort\",\"cwd\":\".\",\"wait\":false}}}"
+    GOOSE_BIN="${PROJECT_DIR}/../../target/debug/goose"
+    export GOOSE_BIN
+    EXTRA_CONFIG_ARGS=(--config "{\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"cd ${PROJECT_DIR} && exec pnpm exec vite --port ${VITE_PORT} --strictPort\",\"cwd\":\".\",\"wait\":false}}}")
 
     # In worktrees, generate a labeled icon so you can tell instances apart
     if git rev-parse --is-inside-work-tree &>/dev/null; then
@@ -97,12 +102,12 @@ dev:
 
             if swift scripts/generate-dev-icon.swift src-tauri/icons/icon.icns "$DEV_ICON" "$WORKTREE_LABEL"; then
                 echo "🌳 Worktree: ${WORKTREE_LABEL}"
-                TAURI_CONFIG=$(python3 -c "import json,sys; a=json.loads(sys.argv[1]); a['bundle']={'icon':['$DEV_ICON']}; print(json.dumps(a))" "$TAURI_CONFIG")
+                EXTRA_CONFIG_ARGS+=(--config "{\"bundle\":{\"icon\":[\"$DEV_ICON\"]}}")
             fi
         fi
     fi
 
-    pnpm tauri dev --features app-test-driver --config "$TAURI_CONFIG"
+    pnpm tauri dev --features app-test-driver --config src-tauri/tauri.dev.conf.json "${EXTRA_CONFIG_ARGS[@]}"
 
 # Start the desktop app with dev config
 dev-debug:
@@ -111,7 +116,10 @@ dev-debug:
 
     VITE_PORT={{ vite_port }}
     export VITE_PORT
-    EXTRA_CONFIG="--config {\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"exec ./node_modules/.bin/vite --port ${VITE_PORT} --strictPort\",\"cwd\":\"..\",\"wait\":false}}}"
+    PROJECT_DIR=$(pwd)
+    GOOSE_BIN="${PROJECT_DIR}/../../target/debug/goose"
+    export GOOSE_BIN
+    EXTRA_CONFIG_ARGS=(--config "{\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"exec ./node_modules/.bin/vite --port ${VITE_PORT} --strictPort\",\"cwd\":\"..\",\"wait\":false}}}")
 
     # In worktrees, generate a labeled icon so you can tell instances apart
     if git rev-parse --is-inside-work-tree &>/dev/null; then
@@ -126,12 +134,12 @@ dev-debug:
 
             if swift scripts/generate-dev-icon.swift src-tauri/icons/icon.icns "$DEV_ICON" "$WORKTREE_LABEL"; then
                 echo "🌳 Worktree: ${WORKTREE_LABEL}"
-                EXTRA_CONFIG="$EXTRA_CONFIG --config {\"bundle\":{\"icon\":[\"$DEV_ICON\"]}}"
+                EXTRA_CONFIG_ARGS+=(--config "{\"bundle\":{\"icon\":[\"$DEV_ICON\"]}}")
             fi
         fi
     fi
 
-    pnpm tauri dev --config src-tauri/tauri.dev.conf.json $EXTRA_CONFIG
+    pnpm tauri dev --config src-tauri/tauri.dev.conf.json "${EXTRA_CONFIG_ARGS[@]}"
 
 # Start only the frontend dev server
 dev-frontend:
@@ -166,8 +174,3 @@ clean:
     cd src-tauri && cargo clean
     rm -rf dist
     rm -rf node_modules
-
-# Cherry-pick commits from the goose2 repo into ui/goose2/
-cherry-pick-goose2 *ARGS:
-    git fetch goose2
-    git format-patch -1 {{ARGS}} --stdout | git am --directory=ui/goose2

ui/goose2/package.json

@@ -65,8 +65,9 @@
     "@tailwindcss/typography": "^0.5.19",
     "@tanstack/react-query": "^5.90.21",
     "@tauri-apps/api": "^2",
-    "@tauri-apps/plugin-dialog": "~2.6.0",
+    "@tauri-apps/plugin-dialog": "~2.7.0",
     "@tauri-apps/plugin-opener": "^2.5.3",
+    "@tauri-apps/plugin-shell": "~2.3.5",
     "@xyflow/react": "^12.10.2",
     "ai": "^6.0.142",
     "ansi-to-react": "^6.2.6",