From d2bf0d127318c3cc0b1071bda4c8dd8b149f06b9 Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Thu, 10 Sep 2026 18:48:49 +0000 Subject: [PATCH] fix context management dependency (#11768) --- Cargo.lock | 2 +- crates/goose-context-management/Cargo.toml | 2 +- crates/goose-context-management/src/format.rs | 2 +- crates/goose-context-management/src/lib.rs | 4 ++-- crates/goose-context-management/src/model.rs | 10 +++++----- crates/goose-context-management/src/provider.rs | 10 +++++----- crates/goose-context-management/src/structured.rs | 2 +- crates/goose-context-management/src/summarize.rs | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74d721871..14b7c4e15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5385,7 +5385,7 @@ version = "0.1.0-alpha.9" dependencies = [ "anyhow", "async-trait", - "goose-providers", + "goose-provider-types", "include_dir", "minijinja", "rmcp 3.2.0", diff --git a/crates/goose-context-management/Cargo.toml b/crates/goose-context-management/Cargo.toml index f31e601be..c07a3cb67 100644 --- a/crates/goose-context-management/Cargo.toml +++ b/crates/goose-context-management/Cargo.toml @@ -12,7 +12,7 @@ description = "Conversation compaction for Goose" workspace = true [dependencies] -goose-providers = { version = "0.1.0-alpha.9", path = "../goose-providers", features = ["rustls-tls"] } +goose-provider-types = { version = "0.1.0-alpha.9", path = "../goose-provider-types" } anyhow = { workspace = true } async-trait = { workspace = true } include_dir = { workspace = true } diff --git a/crates/goose-context-management/src/format.rs b/crates/goose-context-management/src/format.rs index c7358b2bf..0dbe8818f 100644 --- a/crates/goose-context-management/src/format.rs +++ b/crates/goose-context-management/src/format.rs @@ -1,4 +1,4 @@ -use goose_providers::conversation::message::{ActionRequiredData, Message, MessageContent}; +use goose_provider_types::conversation::message::{ActionRequiredData, Message, MessageContent}; use rmcp::model::Role; pub fn format_message_for_compacting(msg: &Message) -> String { diff --git a/crates/goose-context-management/src/lib.rs b/crates/goose-context-management/src/lib.rs index 85fd951e6..3dc36018b 100644 --- a/crates/goose-context-management/src/lib.rs +++ b/crates/goose-context-management/src/lib.rs @@ -19,8 +19,8 @@ pub mod summarize; pub mod templates; use anyhow::Result; -use goose_providers::conversation::message::Message; -use goose_providers::conversation::token_usage::ProviderUsage; +use goose_provider_types::conversation::message::Message; +use goose_provider_types::conversation::token_usage::ProviderUsage; pub use format::format_message_for_compacting; pub use model::{CompactionModel, ProviderModel, TokenEstimator}; diff --git a/crates/goose-context-management/src/model.rs b/crates/goose-context-management/src/model.rs index 81ffdd324..5d339256a 100644 --- a/crates/goose-context-management/src/model.rs +++ b/crates/goose-context-management/src/model.rs @@ -1,11 +1,11 @@ use std::sync::Arc; use async_trait::async_trait; -use goose_providers::base::Provider; -use goose_providers::conversation::message::Message; -use goose_providers::conversation::token_usage::ProviderUsage; -use goose_providers::errors::ProviderError; -use goose_providers::model::ModelConfig; +use goose_provider_types::base::Provider; +use goose_provider_types::conversation::message::Message; +use goose_provider_types::conversation::token_usage::ProviderUsage; +use goose_provider_types::errors::ProviderError; +use goose_provider_types::model::ModelConfig; /// The single completion call compaction needs. Implementations decide model /// selection, fallbacks and session plumbing. diff --git a/crates/goose-context-management/src/provider.rs b/crates/goose-context-management/src/provider.rs index 78335d96d..90cd7d51c 100644 --- a/crates/goose-context-management/src/provider.rs +++ b/crates/goose-context-management/src/provider.rs @@ -4,11 +4,11 @@ use std::sync::Arc; use async_trait::async_trait; -use goose_providers::base::{MessageStream, Provider}; -use goose_providers::conversation::message::Message; -use goose_providers::conversation::token_usage::ProviderUsage; -use goose_providers::errors::ProviderError; -use goose_providers::model::ModelConfig; +use goose_provider_types::base::{MessageStream, Provider}; +use goose_provider_types::conversation::message::Message; +use goose_provider_types::conversation::token_usage::ProviderUsage; +use goose_provider_types::errors::ProviderError; +use goose_provider_types::model::ModelConfig; use crate::model::ProviderModel; use crate::templates::Templates; diff --git a/crates/goose-context-management/src/structured.rs b/crates/goose-context-management/src/structured.rs index 8507defc6..593d68c5c 100644 --- a/crates/goose-context-management/src/structured.rs +++ b/crates/goose-context-management/src/structured.rs @@ -1,5 +1,5 @@ use crate::templates::{self, COMPACTION_SUMMARY_TEMPLATE}; -use goose_providers::json::safely_parse_json; +use goose_provider_types::json::safely_parse_json; use serde::{Deserialize, Serialize}; /// Structured output of the compaction LLM call. diff --git a/crates/goose-context-management/src/summarize.rs b/crates/goose-context-management/src/summarize.rs index 9c7913687..a73d3aa55 100644 --- a/crates/goose-context-management/src/summarize.rs +++ b/crates/goose-context-management/src/summarize.rs @@ -1,7 +1,7 @@ use anyhow::Result; -use goose_providers::conversation::message::{Message, MessageContent}; -use goose_providers::conversation::token_usage::ProviderUsage; -use goose_providers::errors::ProviderError; +use goose_provider_types::conversation::message::{Message, MessageContent}; +use goose_provider_types::conversation::token_usage::ProviderUsage; +use goose_provider_types::errors::ProviderError; use rmcp::model::Role; use serde::Serialize; use tracing::warn;