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
@@ -15,9 +15,9 @@ use super::{
|
||||
use watcher::{BulkFilesystemWatcherEvent, HomeDirectoryWatcher, HomeDirectoryWatcherEvent};
|
||||
|
||||
use crate::server::datetime_ext::DateTimeExt;
|
||||
use crate::warp_managed_paths_watcher::{
|
||||
filter_repository_update_by_prefix, warp_managed_skill_dirs, WarpManagedPathsWatcher,
|
||||
WarpManagedPathsWatcherEvent,
|
||||
use crate::galaxy_managed_paths_watcher::{
|
||||
filter_repository_update_by_prefix, galaxy_managed_skill_dirs, GalaxyManagedPathsWatcher,
|
||||
GalaxyManagedPathsWatcherEvent,
|
||||
};
|
||||
use ai::skills::{
|
||||
home_skills_path, parse_skill, ParsedSkill, SkillProvider, SKILL_PROVIDER_DEFINITIONS,
|
||||
@@ -124,7 +124,7 @@ impl SkillWatcher {
|
||||
}
|
||||
},
|
||||
);
|
||||
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);
|
||||
});
|
||||
}
|
||||
@@ -138,7 +138,7 @@ impl SkillWatcher {
|
||||
// We use a separate HomeDirectoryWatcher to detect when those are created and start watching them after they are created.
|
||||
let mut home_provider_watchers = HashMap::new();
|
||||
if let Some(home_path) = home_dir {
|
||||
Self::spawn_read_skills_from_directories(warp_managed_skill_dirs(), ctx);
|
||||
Self::spawn_read_skills_from_directories(galaxy_managed_skill_dirs(), ctx);
|
||||
let skills_parent_paths: HashSet<PathBuf> = SKILL_PROVIDER_DEFINITIONS
|
||||
.iter()
|
||||
.filter(|provider| provider.provider != SkillProvider::Warp)
|
||||
@@ -806,11 +806,11 @@ impl SkillWatcher {
|
||||
|
||||
fn handle_warp_managed_paths_event(
|
||||
&mut self,
|
||||
event: &WarpManagedPathsWatcherEvent,
|
||||
event: &GalaxyManagedPathsWatcherEvent,
|
||||
ctx: &mut ModelContext<Self>,
|
||||
) {
|
||||
let WarpManagedPathsWatcherEvent::FilesChanged(update) = event;
|
||||
for skill_dir in warp_managed_skill_dirs() {
|
||||
let GalaxyManagedPathsWatcherEvent::FilesChanged(update) = event;
|
||||
for skill_dir in galaxy_managed_skill_dirs() {
|
||||
if let Some(filtered_update) = filter_repository_update_by_prefix(update, &skill_dir) {
|
||||
self.handle_repository_update(&filtered_update, ctx);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ use galaxyui::AppContext;
|
||||
use regex::Regex;
|
||||
use repo_metadata::{local_model::GetContentsArgs, RepoContent, RepoMetadataModel};
|
||||
|
||||
use crate::warp_managed_paths_watcher::warp_managed_skill_dirs;
|
||||
use crate::galaxy_managed_paths_watcher::galaxy_managed_skill_dirs;
|
||||
|
||||
/// Finds all skill directories in a repository by querying the RepoMetadataModel tree.
|
||||
///
|
||||
@@ -100,7 +100,7 @@ pub fn extract_skill_parent_directory(path: &Path) -> Result<PathBuf, Error> {
|
||||
&& path
|
||||
.parent()
|
||||
.and_then(Path::parent)
|
||||
.is_some_and(|parent| warp_managed_skill_dirs().iter().any(|dir| parent == dir));
|
||||
.is_some_and(|parent| galaxy_managed_skill_dirs().iter().any(|dir| parent == dir));
|
||||
if is_warp_home_skill {
|
||||
return dirs::home_dir()
|
||||
.ok_or_else(|| anyhow::anyhow!("Home directory not available for {}", path.display()));
|
||||
@@ -136,7 +136,7 @@ pub fn is_home_skill_directory(path: &Path) -> bool {
|
||||
pub fn is_home_provider_path(path: &Path) -> bool {
|
||||
SKILL_PROVIDER_DEFINITIONS.iter().any(|provider| {
|
||||
if provider.provider == SkillProvider::Warp {
|
||||
return warp_managed_skill_dirs().iter().any(|dir| path == dir);
|
||||
return galaxy_managed_skill_dirs().iter().any(|dir| path == dir);
|
||||
}
|
||||
home_skills_path(provider.provider)
|
||||
.as_ref()
|
||||
|
||||
@@ -327,7 +327,7 @@ fn is_home_provider_path_true_for_known_providers() {
|
||||
let path = home_dir.join(".agents").join("skills");
|
||||
assert!(is_home_provider_path(&path));
|
||||
|
||||
if let Some(path) = galaxy_core::paths::warp_home_skills_dir() {
|
||||
if let Some(path) = galaxy_core::paths::galaxy_home_skills_dir() {
|
||||
assert!(is_home_provider_path(&path));
|
||||
}
|
||||
|
||||
@@ -350,12 +350,12 @@ fn extract_skill_parent_directory_returns_home_dir_for_warp_home_skill() {
|
||||
eprintln!("Skipping test: home directory not available");
|
||||
return;
|
||||
};
|
||||
let Some(warp_home_skills_dir) = galaxy_core::paths::warp_home_skills_dir() else {
|
||||
let Some(galaxy_home_skills_dir) = galaxy_core::paths::galaxy_home_skills_dir() else {
|
||||
eprintln!("Skipping test: Warp home skills directory not available");
|
||||
return;
|
||||
};
|
||||
|
||||
let skill_path = warp_home_skills_dir.join("test-skill").join("SKILL.md");
|
||||
let skill_path = galaxy_home_skills_dir.join("test-skill").join("SKILL.md");
|
||||
let result = extract_skill_parent_directory(&skill_path);
|
||||
assert_eq!(result.ok(), Some(home_dir));
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ use galaxyui::AppContext;
|
||||
use galaxyui::SingletonEntity as _;
|
||||
|
||||
use super::SkillManager;
|
||||
use crate::warp_managed_paths_watcher::warp_managed_skill_dirs;
|
||||
use crate::galaxy_managed_paths_watcher::galaxy_managed_skill_dirs;
|
||||
|
||||
const SKILL_FILE_NAME: &str = "SKILL.md";
|
||||
|
||||
@@ -64,7 +64,7 @@ fn home_skill_dirs_for_resolution() -> Vec<PathBuf> {
|
||||
let mut skill_dirs = Vec::new();
|
||||
for provider in SKILL_PROVIDER_DEFINITIONS.iter() {
|
||||
if provider.provider == SkillProvider::Warp {
|
||||
for dir in warp_managed_skill_dirs() {
|
||||
for dir in galaxy_managed_skill_dirs() {
|
||||
push_unique_path(&mut skill_dirs, dir);
|
||||
}
|
||||
} else if let Some(dir) = home_skills_path(provider.provider) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use super::*;
|
||||
use crate::warp_managed_paths_watcher::WarpManagedPathsWatcher;
|
||||
use crate::galaxy_managed_paths_watcher::GalaxyManagedPathsWatcher;
|
||||
use ai::skills::{ParsedSkill, SkillProvider, SkillScope};
|
||||
use galaxy_core::channel::ChannelState;
|
||||
use galaxyui::App;
|
||||
@@ -74,7 +74,7 @@ fn get_skills_for_working_directory_scopes_subdirectory_skills() {
|
||||
let repo_handle = 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);
|
||||
let skill_manager_handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
// Register the repo root so get_root_for_path returns Some.
|
||||
@@ -196,7 +196,7 @@ fn get_skills_for_working_directory_name_collision_returns_both() {
|
||||
let repo_handle = 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);
|
||||
let skill_manager_handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
// Register the repo root so get_root_for_path returns Some.
|
||||
@@ -292,7 +292,7 @@ fn cloud_environment_skills_always_included() {
|
||||
let repo_handle = 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);
|
||||
let skill_manager_handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
let canonical_repo_a =
|
||||
@@ -493,7 +493,7 @@ fn best_supported_provider_fast_path_returns_deduped_provider() {
|
||||
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);
|
||||
let handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
let claude_skill = make_skill("deploy", ".claude");
|
||||
@@ -518,7 +518,7 @@ fn best_supported_provider_remaps_to_supported_provider() {
|
||||
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);
|
||||
let handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
let agents_skill = make_skill("deploy", ".agents");
|
||||
@@ -548,7 +548,7 @@ fn best_supported_provider_falls_back_when_no_match() {
|
||||
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);
|
||||
let handle = app.add_singleton_model(SkillManager::new);
|
||||
|
||||
let agents_skill = make_skill("deploy", ".agents");
|
||||
|
||||
@@ -21,7 +21,7 @@ use std::hash::{Hash, Hasher};
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use crate::warp_managed_paths_watcher::warp_managed_skill_dirs;
|
||||
use crate::galaxy_managed_paths_watcher::galaxy_managed_skill_dirs;
|
||||
|
||||
lazy_static! {
|
||||
static ref CONTENT_HASHER: SipHasher = SipHasher::new_with_keys(0, 0);
|
||||
@@ -167,7 +167,7 @@ pub fn icon_override_for_skill_name(name: &str) -> Option<Icon> {
|
||||
pub fn skill_path_from_file_path(file_path: &Path) -> Option<PathBuf> {
|
||||
for definition in SKILL_PROVIDER_DEFINITIONS.iter() {
|
||||
let home_skill_dirs = if definition.provider == SkillProvider::Warp {
|
||||
warp_managed_skill_dirs()
|
||||
galaxy_managed_skill_dirs()
|
||||
} else {
|
||||
home_skills_path(definition.provider).into_iter().collect()
|
||||
};
|
||||
|
||||
@@ -14,18 +14,18 @@ fn test_skill_path_from_file_path_skill_md() {
|
||||
|
||||
#[test]
|
||||
fn test_skill_path_from_file_path_warp_home_skill() {
|
||||
let Some(warp_home_skills_dir) = galaxy_core::paths::warp_home_skills_dir() else {
|
||||
let Some(galaxy_home_skills_dir) = galaxy_core::paths::galaxy_home_skills_dir() else {
|
||||
eprintln!("Skipping test: Warp home skills directory not available");
|
||||
return;
|
||||
};
|
||||
let warp_home_skill = warp_home_skills_dir
|
||||
let warp_home_skill = galaxy_home_skills_dir
|
||||
.join("my-skill")
|
||||
.join("assets")
|
||||
.join("image.png");
|
||||
let result = skill_path_from_file_path(&warp_home_skill);
|
||||
assert_eq!(
|
||||
result,
|
||||
Some(warp_home_skills_dir.join("my-skill").join("SKILL.md"))
|
||||
Some(galaxy_home_skills_dir.join("my-skill").join("SKILL.md"))
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user