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
@@ -140,6 +140,7 @@ impl BedrockClient {
|
||||
user_query: Option<String>,
|
||||
diagnostic_logger: Option<Arc<BedrockDiagnosticLogger>>,
|
||||
messages_sent: Arc<Mutex<Vec<ConversationMessage>>>,
|
||||
is_summarization: bool,
|
||||
) -> Result<ResponseStream, BedrockError> {
|
||||
let effective_model_id = if cross_region_inference {
|
||||
apply_cross_region_prefix(model_id, &self.region)
|
||||
@@ -228,6 +229,7 @@ impl BedrockClient {
|
||||
diagnostic_logger,
|
||||
messages_sent,
|
||||
effective_model_id,
|
||||
is_summarization,
|
||||
)))
|
||||
}
|
||||
|
||||
|
||||
@@ -175,6 +175,20 @@ pub fn extract_new_input_messages(request: &api::Request) -> Vec<ConversationMes
|
||||
),
|
||||
});
|
||||
}
|
||||
api::request::input::Type::SummarizeConversation(summarize) => {
|
||||
let prompt = if summarize.prompt.is_empty() {
|
||||
"Please summarize this conversation so far, preserving key decisions, \
|
||||
code changes, and important context. Be concise but retain all \
|
||||
information needed to continue the work."
|
||||
.to_string()
|
||||
} else {
|
||||
summarize.prompt.clone()
|
||||
};
|
||||
results.push(ConversationMessage {
|
||||
role: MessageRole::User,
|
||||
content: MessageContent::Text(prompt),
|
||||
});
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@@ -378,6 +392,30 @@ fn extract_input_messages(request: &api::Request) -> Vec<api::Message> {
|
||||
});
|
||||
}
|
||||
}
|
||||
api::request::input::Type::SummarizeConversation(summarize) => {
|
||||
let prompt = if summarize.prompt.is_empty() {
|
||||
"Please summarize this conversation so far, preserving key decisions, \
|
||||
code changes, and important context. Be concise but retain all \
|
||||
information needed to continue the work."
|
||||
.to_string()
|
||||
} else {
|
||||
summarize.prompt.clone()
|
||||
};
|
||||
results.push(api::Message {
|
||||
id: uuid::Uuid::new_v4().to_string(),
|
||||
task_id: task_id.clone(),
|
||||
request_id: String::new(),
|
||||
timestamp: None,
|
||||
server_message_data: String::new(),
|
||||
citations: vec![],
|
||||
message: Some(api::message::Message::UserQuery(
|
||||
api::message::UserQuery {
|
||||
query: prompt,
|
||||
..Default::default()
|
||||
},
|
||||
)),
|
||||
});
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@@ -1171,8 +1209,9 @@ pub fn extract_messages_from_request(request: &api::Request) -> Vec<Conversation
|
||||
messages
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
fn convert_proto_message_for_test(msg: &api::Message) -> Option<ConversationMessage> {
|
||||
/// Converts a proto `api::Message` into a `ConversationMessage` for the Bedrock message history.
|
||||
/// Used to rebuild the message history from persisted task messages on session restore.
|
||||
pub fn convert_proto_message(msg: &api::Message) -> Option<ConversationMessage> {
|
||||
let message_content = msg.message.as_ref()?;
|
||||
match message_content {
|
||||
api::message::Message::UserQuery(query) => Some(ConversationMessage {
|
||||
@@ -1184,7 +1223,7 @@ fn convert_proto_message_for_test(msg: &api::Message) -> Option<ConversationMess
|
||||
content: MessageContent::Text(output.text.clone()),
|
||||
}),
|
||||
api::message::Message::ToolCall(tool_call) => {
|
||||
let (name, input) = extract_tool_call_info_for_test(tool_call);
|
||||
let (name, input) = extract_tool_call_info(tool_call);
|
||||
Some(ConversationMessage {
|
||||
role: MessageRole::Assistant,
|
||||
content: MessageContent::ToolUse {
|
||||
@@ -1214,11 +1253,8 @@ fn convert_proto_message_for_test(msg: &api::Message) -> Option<ConversationMess
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[allow(deprecated)]
|
||||
fn extract_tool_call_info_for_test(
|
||||
tool_call: &api::message::ToolCall,
|
||||
) -> (String, serde_json::Value) {
|
||||
fn extract_tool_call_info(tool_call: &api::message::ToolCall) -> (String, serde_json::Value) {
|
||||
if let Some(tool) = &tool_call.tool {
|
||||
match tool {
|
||||
api::message::tool_call::Tool::RunShellCommand(cmd) => (
|
||||
@@ -1254,6 +1290,12 @@ fn extract_tool_call_info_for_test(
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
fn convert_proto_message_for_test(msg: &api::Message) -> Option<ConversationMessage> {
|
||||
convert_proto_message(msg)
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "request_translator_tests.rs"]
|
||||
mod tests;
|
||||
|
||||
@@ -65,6 +65,7 @@ pub fn bedrock_stream_to_response_events(
|
||||
diagnostic_logger: Option<Arc<BedrockDiagnosticLogger>>,
|
||||
messages_sent: Arc<Mutex<Vec<ConversationMessage>>>,
|
||||
model_id: String,
|
||||
is_summarization: bool,
|
||||
) -> BoxStream<'static, Event> {
|
||||
let request_id = Uuid::new_v4().to_string();
|
||||
let conversation_id = Uuid::new_v4().to_string();
|
||||
@@ -470,6 +471,7 @@ pub fn bedrock_stream_to_response_events(
|
||||
cache_read_input_tokens,
|
||||
cache_write_input_tokens,
|
||||
&model_id,
|
||||
is_summarization,
|
||||
);
|
||||
yield Ok(finished_event);
|
||||
};
|
||||
@@ -555,6 +557,7 @@ pub(super) fn build_stream_finished(
|
||||
cache_read_input_tokens: i32,
|
||||
cache_write_input_tokens: i32,
|
||||
model_id: &str,
|
||||
is_summarization: bool,
|
||||
) -> ResponseEvent {
|
||||
let total_tokens =
|
||||
(input_tokens + output_tokens + cache_read_input_tokens + cache_write_input_tokens) as u32;
|
||||
@@ -598,7 +601,7 @@ pub(super) fn build_stream_finished(
|
||||
#[allow(deprecated)]
|
||||
let conversation_usage_metadata = Some(stream_finished::ConversationUsageMetadata {
|
||||
context_window_usage: context_usage,
|
||||
summarized: false,
|
||||
summarized: is_summarization,
|
||||
credits_spent: 0.0,
|
||||
token_usage: vec![],
|
||||
tool_usage_metadata: None,
|
||||
|
||||
@@ -14,6 +14,7 @@ pub struct TranslatorRequest {
|
||||
pub root_task_id: Option<String>,
|
||||
pub bedrock_message_history: Vec<ConversationMessage>,
|
||||
pub bedrock_messages_sent: Arc<Mutex<Vec<ConversationMessage>>>,
|
||||
pub is_summarization: bool,
|
||||
}
|
||||
|
||||
pub async fn execute(
|
||||
@@ -100,6 +101,7 @@ pub async fn execute(
|
||||
user_query_text,
|
||||
diagnostic_logger,
|
||||
params.bedrock_messages_sent.clone(),
|
||||
params.is_summarization,
|
||||
)
|
||||
.await?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user