Skip to content

Commit 59d4485

Browse files
committed
Merge remote-tracking branch 'origin/main' into wpfleger/tool-response-issue
* origin/main: fix(ui-desktop): unify path resolution around GOOSE_PATH_ROOT (#7335) fix: pass OAuth scopes to DCR and extract granted_scopes from token response (#7571) fix: write to real file if config.yaml is symlink (#7669) fix: preserve pairings when stopping gateway (#7733) 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)
2 parents 698d417 + 12eac72 commit 59d4485

File tree

46 files changed

+1147
-2595
lines changed

Some content is hidden

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

46 files changed

+1147
-2595
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

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = "1.0"
4950
tokio = { version = "1.49", features = ["full"] }

crates/goose-cli/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ tokio = { workspace = true }
3636
futures = { workspace = true }
3737
serde = { workspace = true }
3838
serde_yaml = { workspace = true }
39+
strum = { workspace = true }
3940
tempfile = { workspace = true }
4041
etcetera = { workspace = true }
4142
rand = { workspace = true }
@@ -52,10 +53,6 @@ tar = "0.4"
5253
reqwest = { workspace = true, features = ["blocking", "rustls"], default-features = false }
5354
zip = { version = "^8.0", default-features = false, features = ["deflate"] }
5455
bzip2 = "0.5"
55-
# Web server dependencies
56-
axum = { workspace = true, features = ["ws", "macros"] }
57-
tower-http = { workspace = true, features = ["cors", "fs", "auth"] }
58-
http = { workspace = true }
5956
webbrowser = { workspace = true }
6057
indicatif = "0.18.1"
6158
tokio-util = { workspace = true, features = ["compat", "rt"] }

crates/goose-cli/WEB_INTERFACE.md

Lines changed: 0 additions & 78 deletions
This file was deleted.

crates/goose-cli/src/cli.rs

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -841,42 +841,6 @@ enum Command {
841841
reconfigure: bool,
842842
},
843843

844-
/// Start a web server with a chat interface
845-
#[command(about = "Experimental: Start a web server with a chat interface")]
846-
Web {
847-
/// Port to run the web server on
848-
#[arg(
849-
short,
850-
long,
851-
default_value = "3000",
852-
help = "Port to run the web server on"
853-
)]
854-
port: u16,
855-
856-
/// Host to bind the web server to
857-
#[arg(
858-
long,
859-
default_value = "127.0.0.1",
860-
help = "Host to bind the web server to"
861-
)]
862-
host: String,
863-
864-
/// Open browser automatically
865-
#[arg(long, help = "Open browser automatically when server starts")]
866-
open: bool,
867-
868-
/// Authentication token for both Basic Auth (password) and Bearer token
869-
#[arg(long, help = "Authentication token to secure the web interface")]
870-
auth_token: Option<String>,
871-
872-
/// Allow running without authentication when exposed on the network (unsafe)
873-
#[arg(
874-
long,
875-
help = "Skip auth requirement when exposed on the network (unsafe)"
876-
)]
877-
no_auth: bool,
878-
},
879-
880844
/// Terminal-integrated session (one session per terminal)
881845
#[command(
882846
about = "Terminal-integrated goose session",
@@ -1041,7 +1005,6 @@ fn get_command_name(command: &Option<Command>) -> &'static str {
10411005
Some(Command::Schedule { .. }) => "schedule",
10421006
Some(Command::Update { .. }) => "update",
10431007
Some(Command::Recipe { .. }) => "recipe",
1044-
Some(Command::Web { .. }) => "web",
10451008
Some(Command::Term { .. }) => "term",
10461009
Some(Command::LocalModels { .. }) => "local-models",
10471010
Some(Command::Completion { .. }) => "completion",
@@ -1780,13 +1743,6 @@ pub async fn cli() -> anyhow::Result<()> {
17801743
Ok(())
17811744
}
17821745
Some(Command::Recipe { command }) => handle_recipe_subcommand(command),
1783-
Some(Command::Web {
1784-
port,
1785-
host,
1786-
open,
1787-
auth_token,
1788-
no_auth,
1789-
}) => crate::commands::web::handle_web(port, host, open, auth_token, no_auth).await,
17901746
Some(Command::Term { command }) => handle_term_subcommand(command).await,
17911747
Some(Command::LocalModels { command }) => handle_local_models_command(command).await,
17921748
Some(Command::ValidateExtensions { file }) => {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ pub mod schedule;
77
pub mod session;
88
pub mod term;
99
pub mod update;
10-
pub mod web;

0 commit comments

Comments
 (0)