Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions crates/goose/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,9 @@ base64 = "0.21"
url = "2.5"
axum = "0.8.1"
webbrowser = "0.8"
dotenv = "0.15"
lazy_static = "1.5"
tracing = "0.1"
tracing-subscriber = "0.3"
wiremock = "0.6.0"
keyring = { version = "3.6.1", features = ["apple-native", "windows-native", "sync-secret-service", "vendored"] }
ctor = "0.2.7"
paste = "1.0"
serde_yaml = "0.9.34"
once_cell = "1.20.2"
etcetera = "0.8.0"
Expand All @@ -76,7 +71,6 @@ jsonwebtoken = "9.3.1"

blake3 = "1.5"
fs2 = "0.4.3"
futures-util = "0.3.31"
tokio-stream = "0.1.17"

# Vector database for tool selection
Expand All @@ -94,6 +88,9 @@ mockall = "0.13.1"
wiremock = "0.6.0"
tokio = { version = "1.43", features = ["full"] }
temp-env = "0.3.6"
dotenv = "0.15.0"
lazy_static = "1.5.0"
ctor = "0.2.9"

[[example]]
name = "agent"
Expand Down
4 changes: 1 addition & 3 deletions crates/goose/src/agents/agent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ use std::sync::Arc;

use anyhow::{anyhow, Result};
use futures::stream::BoxStream;
use futures::{FutureExt, Stream, TryStreamExt};
use futures_util::stream;
use futures_util::stream::StreamExt;
use futures::{stream, FutureExt, Stream, StreamExt, TryStreamExt};
use mcp_core::protocol::JsonRpcMessage;

use crate::config::{Config, ExtensionConfigManager, PermissionManager};
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/providers/githubcopilot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl GithubCopilotProvider {

async fn post(&self, mut payload: Value) -> Result<Value, ProviderError> {
use crate::providers::utils_universal_openai_stream::{OAIStreamChunk, OAIStreamCollector};
use futures_util::StreamExt;
use futures::StreamExt;
// Detect gpt-4.1 and stream
let model_name = payload.get("model").and_then(|v| v.as_str()).unwrap_or("");
let stream_only_model = GITHUB_COPILOT_STREAM_MODELS
Expand Down
6 changes: 2 additions & 4 deletions crates/goose/src/providers/oauth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@ use axum::{extract::Query, response::Html, routing::get, Router};
use base64::Engine;
use chrono::{DateTime, Utc};
use etcetera::{choose_app_strategy, AppStrategy};
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use sha2::Digest;
use std::{collections::HashMap, fs, net::SocketAddr, path::PathBuf, sync::Arc};
use tokio::sync::{oneshot, Mutex as TokioMutex};
use url::Url;

lazy_static! {
static ref OAUTH_MUTEX: TokioMutex<()> = TokioMutex::new(());
}
static OAUTH_MUTEX: Lazy<TokioMutex<()>> = Lazy::new(|| TokioMutex::new(()));

#[derive(Debug, Clone)]
struct OidcEndpoints {
Expand Down
Loading