Skip to content

Commit ff7b8b2

Browse files
committed
Merge remote-tracking branch 'origin/main' into jhugo/bump-workspace-deps
* origin/main: (34 commits) fix: reduce server log verbosity — skip session in instrument, defaul… (#7729) fix: provider test infrastructure (#7738) fix: sanitize streamable HTTP extension names derived from URLs (#7740) refactor: derive GooseMode string conversions with strum (#7706) docs: Add Spraay Batch Payments MCP Extension Tutorial (#7525) fix: flake.nix (#7224) delete goose web (#7696) Add @angiejones as CODEOWNER for documentation (#7711) Add MLflow integration guide (#7563) docs: LM Studio availability (#7698) feat: add Avian as an LLM provider (#7561) Adds `linux-mcp-server` to the goose registry (#6979) fix: add #[serde(default)] to description field on 4 ExtensionConfig variants (#7708) feat: combine TUI UX from alexhancock/tui-goodness with publishing config from jackamadeo/package-tui (#7683) chore: cleanup old sandbox (#7700) Correct windows artifact (#7699) gh fall back (#7695) fix: restore smart-approve mode (#7690) fix: make TLS configurable in goosed agent via GOOSE_TLS env var (#7686) Update to rmcp 1.1.0 (#7619) ... # Conflicts: # Cargo.lock
2 parents d456c23 + 9ab5c45 commit ff7b8b2

File tree

168 files changed

+8898
-7054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+8898
-7054
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
33

44
# Documentation owned by DevRel
5-
/documentation/ @blackgirlbytes
5+
/documentation/ @blackgirlbytes @angiejones
66

.github/workflows/bundle-desktop-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
run: |
135135
source ./bin/activate-hermit
136136
cd ui/desktop
137-
npm install
137+
npm ci
138138
# Verify installation
139139
ls -la node_modules/.bin/ | head -5
140140

.github/workflows/bundle-desktop-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
run: |
138138
cd ui/desktop
139139
140-
npm install
140+
npm ci
141141
node scripts/build-main.js
142142
node scripts/prepare-platform-binaries.js
143143
npm run make -- --platform=win32 --arch=x64

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ jobs:
151151
# restore-keys: |
152152
# ci-npm-cache-v1-${{ runner.os }}-
153153

154+
- name: Check lockfile has cross-platform entries
155+
run: ./scripts/check-lockfile-platforms.sh
156+
working-directory: ui/desktop
157+
154158
- name: Install Dependencies
155159
run: source ../../bin/activate-hermit && npm ci
156160
working-directory: ui/desktop

Cargo.lock

Lines changed: 21 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resolver = "2"
44

55
[workspace.package]
66
edition = "2021"
7-
version = "1.26.0"
7+
version = "1.27.0"
88
authors = ["Block <ai-oss-tools@block.xyz>"]
99
license = "Apache-2.0"
1010
repository = "https://github.com/block/goose"
@@ -15,7 +15,7 @@ uninlined_format_args = "allow"
1515
string_slice = "warn"
1616

1717
[workspace.dependencies]
18-
rmcp = { version = "0.16", features = ["schemars", "auth"] }
18+
rmcp = { version = "1.1.0", features = ["schemars", "auth"] }
1919
anyhow = "1.0"
2020
async-stream = "0.3"
2121
async-trait = "0.1"
@@ -44,6 +44,7 @@ serde = { version = "1.0", features = ["derive"] }
4444
serde_json = "1.0"
4545
serde_yaml = "0.9"
4646
shellexpand = "3.1"
47+
strum = { version = "0.27", features = ["derive"] }
4748
tempfile = "3"
4849
thiserror = "2.0"
4950
tokio = { version = "1.49", features = ["full"] }

Justfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ copy-binary-windows:
125125
run-ui:
126126
@just release-binary
127127
@echo "Running UI..."
128-
cd ui/desktop && npm install && npm run start-gui
128+
cd ui/desktop && npm ci && npm run start-gui
129129

130130
run-ui-playwright:
131131
#!/usr/bin/env sh
@@ -138,14 +138,14 @@ run-ui-playwright:
138138

139139
run-ui-only:
140140
@echo "Running UI..."
141-
cd ui/desktop && npm install && npm run start-gui
141+
cd ui/desktop && npm ci && npm run start-gui
142142

143143
debug-ui *alpha:
144144
@echo "🚀 Starting goose frontend in external backend mode{{ if alpha == "alpha" { " with alpha features enabled" } else { "" } }}"
145145
cd ui/desktop && \
146146
export GOOSE_EXTERNAL_BACKEND=true && \
147147
{{ if alpha == "alpha" { "export ALPHA=true &&" } else { "" } }} \
148-
npm install && \
148+
npm ci && \
149149
npm run {{ if alpha == "alpha" { "start-alpha-gui" } else { "start-gui" } }}
150150

151151
# Run UI with main process debugging enabled
@@ -159,15 +159,15 @@ debug-ui-main-process:
159159
@echo "🔍 Starting goose UI with main process debugging enabled"
160160
@just release-binary
161161
cd ui/desktop && \
162-
npm install && \
162+
npm ci && \
163163
npm run start-gui-debug
164164

165165
# Package the desktop app locally for testing (macOS)
166166
# Applies ad-hoc code signing with entitlements (needed for mic access, etc.)
167167
package-ui:
168168
@just release-binary
169169
@echo "Packaging desktop app..."
170-
cd ui/desktop && npm install && npm run package
170+
cd ui/desktop && npm ci && npm run package
171171
@echo "Signing with entitlements..."
172172
codesign --force --deep --sign - --entitlements ui/desktop/entitlements.plist ui/desktop/out/Goose-darwin-arm64/Goose.app
173173
@echo "Done! Launch with: open ui/desktop/out/Goose-darwin-arm64/Goose.app"
@@ -176,14 +176,14 @@ package-ui:
176176
run-ui-alpha:
177177
@just release-binary
178178
@echo "Running UI with alpha features..."
179-
cd ui/desktop && npm install && ALPHA=true npm run start-alpha-gui
179+
cd ui/desktop && npm ci && ALPHA=true npm run start-alpha-gui
180180

181181
# Run UI with latest (Windows version)
182182
run-ui-windows:
183183
@just release-windows
184184
@powershell.exe -Command "Write-Host 'Copying Windows binary...'"
185185
@just copy-binary-windows
186-
@powershell.exe -Command "Write-Host 'Running UI...'; Set-Location ui/desktop; npm install; npm run start-gui"
186+
@powershell.exe -Command "Write-Host 'Running UI...'; Set-Location ui/desktop; npm ci; npm run start-gui"
187187

188188
# Run Docusaurus server for documentation
189189
run-docs:
@@ -386,7 +386,7 @@ win-bld-rls-all:
386386

387387
### Install npm stuff
388388
win-app-deps:
389-
cd ui{{s}}desktop ; npm install
389+
cd ui{{s}}desktop ; npm ci
390390

391391
### Windows copy {release|debug} files to ui\desktop\src\bin
392392
### s = os dependent file separator

0 commit comments

Comments
 (0)