v1.4.0: Auto-compact streaming, Bedrock summarization support, subagent orchestration, and Galaxy rebrand continuation
Major features: - Auto-compact: triggers conversation summarization when context window >= 85%, compacts Bedrock message history to a summary pair, and tracks live context tokens - Bedrock summarization: plumbs `is_summarization` flag through translator/client/response pipeline, handles SummarizeConversation input type, and marks `summarized` in metadata - Session restore: rebuilds bedrock_message_history from persisted task messages via newly-public `convert_proto_message`, preventing empty history on reconnect - Subagent orchestration: adds SubagentQuestion/Answer/CompletionSummary event types, parent-child question routing with depth limits, retry counting, and drain methods - Summarization UI: inline SummarizationView in AI blocks with progress/finished states Refactors: - Rename WarpTheme → GalaxyTheme across ~100 files (rebrand continuation) - Rename warp_home_config_dir → galaxy_home_config_dir and related path functions - Predefined rules: replace "System Defined Rule #N" with descriptive names (e.g. "Correctness Over Speed", "Never Guess") and add lookup helpers - Usage view: replace cumulative input/output token display with live context tokens, cache hit rate calculation, and separate cache read/write stats - Telemetry: remove verbose doc comments, simplify trait definitions - Facts view: simplify delete permission check (always allow local deletion) - Remove warp_managed_paths_watcher.rs (dead code) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
eaa2ddc75e
commit
6f54e2cb30
@@ -14,7 +14,7 @@ use crate::{
|
||||
ParsedTemplatableMCPServerResult,
|
||||
},
|
||||
settings::{ai::AISettings, AISettingsChangedEvent},
|
||||
warp_managed_paths_watcher::warp_data_dir,
|
||||
galaxy_managed_paths_watcher::galaxy_data_dir,
|
||||
};
|
||||
|
||||
/// Singleton model to manage file-based MCP servers.
|
||||
@@ -235,7 +235,7 @@ impl FileBasedMCPManager {
|
||||
/// config location.
|
||||
///
|
||||
/// "Global" means the installation was detected outside of a user repository:
|
||||
/// - For `MCPProvider::Warp`: `warp_data_dir()` (i.e. `~/.warp-core/.mcp.json`).
|
||||
/// - For `MCPProvider::Warp`: `galaxy_data_dir()` (i.e. `~/.warp-core/.mcp.json`).
|
||||
/// - For any other provider: the user's home directory (e.g. `~/.claude.json`).
|
||||
///
|
||||
/// Project-scoped installations (those detected inside a repo) are not considered
|
||||
@@ -243,7 +243,7 @@ impl FileBasedMCPManager {
|
||||
/// case this returns `true` due to the global reference).
|
||||
fn is_global_server(&self, hash: u64) -> bool {
|
||||
let home_dir = dirs::home_dir();
|
||||
let warp_root = warp_data_dir();
|
||||
let warp_root = galaxy_data_dir();
|
||||
self.file_based_servers_by_root
|
||||
.iter()
|
||||
.any(|(root_path, provider_map)| {
|
||||
@@ -264,7 +264,7 @@ impl FileBasedMCPManager {
|
||||
/// Returns `true` if the server identified by `hash` is referenced from the global
|
||||
/// Warp config (`~/.warp/.mcp.json`). Global Warp servers always auto-spawn.
|
||||
fn is_global_warp_server(&self, hash: u64) -> bool {
|
||||
let warp_root = warp_data_dir();
|
||||
let warp_root = galaxy_data_dir();
|
||||
self.file_based_servers_by_root
|
||||
.get(&warp_root)
|
||||
.and_then(|provider_map| provider_map.get(&MCPProvider::Warp))
|
||||
@@ -432,7 +432,7 @@ impl FileBasedMCPManager {
|
||||
// Global Warp installs live under `~/.warp-core/`, which is internal Warp state
|
||||
// rather than a meaningful working directory. Map them to the home dir so
|
||||
// all global installs (Warp and third-party) share a consistent cwd.
|
||||
if discovery_root == warp_data_dir() {
|
||||
if discovery_root == galaxy_data_dir() {
|
||||
return dirs::home_dir().or(Some(discovery_root));
|
||||
}
|
||||
Some(discovery_root)
|
||||
|
||||
@@ -3,7 +3,7 @@ use crate::ai::mcp::FileMCPWatcher;
|
||||
use crate::ai::mcp::ParsedTemplatableMCPServerResult;
|
||||
use crate::auth::AuthStateProvider;
|
||||
use crate::settings::{AISettings, FocusedTerminalInfo};
|
||||
use crate::warp_managed_paths_watcher::{warp_data_dir, WarpManagedPathsWatcher};
|
||||
use crate::galaxy_managed_paths_watcher::{galaxy_data_dir, GalaxyManagedPathsWatcher};
|
||||
use crate::workspaces::user_workspaces::UserWorkspaces;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxyui::{App, Entity, ModelHandle, SingletonEntity as _};
|
||||
@@ -22,7 +22,7 @@ fn setup_app(app: &mut App) -> galaxyui::ModelHandle<FileBasedMCPManager> {
|
||||
app.add_singleton_model(|_| DetectedRepositories::default());
|
||||
app.add_singleton_model(RepoMetadataModel::new);
|
||||
app.add_singleton_model(HomeDirectoryWatcher::new_for_test);
|
||||
app.add_singleton_model(WarpManagedPathsWatcher::new_for_testing);
|
||||
app.add_singleton_model(GalaxyManagedPathsWatcher::new_for_testing);
|
||||
app.add_singleton_model(FileMCPWatcher::new);
|
||||
app.add_singleton_model(AISettings::new_with_defaults);
|
||||
app.add_singleton_model(|_| AuthStateProvider::new_for_test());
|
||||
@@ -260,7 +260,7 @@ fn test_update_file_based_servers_removes_unreferenced_servers() {
|
||||
#[test]
|
||||
fn test_global_warp_server_always_spawns() {
|
||||
let _flag_guard = FeatureFlag::FileBasedMcp.override_enabled(true);
|
||||
let warp_root = warp_data_dir();
|
||||
let warp_root = galaxy_data_dir();
|
||||
let parsed = parse_mcp_json(r#"{"global-warp": {"command": "npx", "args": ["warp"]}}"#);
|
||||
|
||||
App::test((), |mut app| async move {
|
||||
|
||||
@@ -19,8 +19,8 @@ use crate::ai::mcp::{
|
||||
home_config_file_path, parsing::normalize_codex_toml_to_json, MCPProvider,
|
||||
ParsedTemplatableMCPServerResult,
|
||||
};
|
||||
use crate::warp_managed_paths_watcher::{
|
||||
warp_managed_mcp_config_path, WarpManagedPathsWatcher, WarpManagedPathsWatcherEvent,
|
||||
use crate::galaxy_managed_paths_watcher::{
|
||||
galaxy_managed_mcp_config_path, GalaxyManagedPathsWatcher, GalaxyManagedPathsWatcherEvent,
|
||||
};
|
||||
use crate::HomeDirectoryWatcher;
|
||||
use strum::IntoEnumIterator;
|
||||
@@ -173,12 +173,12 @@ impl FileMCPWatcher {
|
||||
ctx.subscribe_to_model(&HomeDirectoryWatcher::handle(ctx), |me, event, ctx| {
|
||||
me.handle_home_directory_watcher_event(event, ctx);
|
||||
});
|
||||
ctx.subscribe_to_model(&WarpManagedPathsWatcher::handle(ctx), |me, event, ctx| {
|
||||
ctx.subscribe_to_model(&GalaxyManagedPathsWatcher::handle(ctx), |me, event, ctx| {
|
||||
me.handle_warp_managed_paths_event(event, ctx);
|
||||
});
|
||||
|
||||
let mut home_provider_watchers = HashMap::new();
|
||||
if let Some(mcp_config_path) = warp_managed_mcp_config_path() {
|
||||
if let Some(mcp_config_path) = galaxy_managed_mcp_config_path() {
|
||||
Self::spawn_config_parse(
|
||||
mcp_config_path.config_path,
|
||||
mcp_config_path.root_path,
|
||||
@@ -418,11 +418,11 @@ impl FileMCPWatcher {
|
||||
|
||||
fn handle_warp_managed_paths_event(
|
||||
&mut self,
|
||||
event: &WarpManagedPathsWatcherEvent,
|
||||
event: &GalaxyManagedPathsWatcherEvent,
|
||||
ctx: &mut ModelContext<Self>,
|
||||
) {
|
||||
let WarpManagedPathsWatcherEvent::FilesChanged(update) = event;
|
||||
let Some(mcp_config_path) = warp_managed_mcp_config_path() else {
|
||||
let GalaxyManagedPathsWatcherEvent::FilesChanged(update) = event;
|
||||
let Some(mcp_config_path) = galaxy_managed_mcp_config_path() else {
|
||||
return;
|
||||
};
|
||||
let config_path = mcp_config_path.config_path;
|
||||
|
||||
@@ -48,7 +48,7 @@ cfg_if::cfg_if! {
|
||||
|
||||
pub(crate) fn home_config_file_path(provider: MCPProvider) -> Option<PathBuf> {
|
||||
match provider {
|
||||
MCPProvider::Warp => galaxy_core::paths::warp_home_mcp_config_file_path(),
|
||||
MCPProvider::Warp => galaxy_core::paths::galaxy_home_mcp_config_file_path(),
|
||||
_ => dirs::home_dir().map(|home_dir| home_dir.join(provider.home_config_path())),
|
||||
}
|
||||
}
|
||||
@@ -146,11 +146,11 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn mcp_provider_from_file_path_recognizes_warp_home_path() {
|
||||
if let Some(warp_home_mcp_config_file_path) =
|
||||
galaxy_core::paths::warp_home_mcp_config_file_path()
|
||||
if let Some(galaxy_home_mcp_config_file_path) =
|
||||
galaxy_core::paths::galaxy_home_mcp_config_file_path()
|
||||
{
|
||||
assert_eq!(
|
||||
mcp_provider_from_file_path(&warp_home_mcp_config_file_path),
|
||||
mcp_provider_from_file_path(&galaxy_home_mcp_config_file_path),
|
||||
Some(MCPProvider::Warp)
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user