public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/ai/conversation_navigation/mod.rs
+16 -15
View File
@@ -1,17 +1,16 @@
use crate::ai::agent::api::ServerConversationToken;
use crate::ai::agent::conversation::AIConversation;
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::blocklist::history_model::AIConversationMetadata;
use crate::ai::blocklist::history_model::BlocklistAIHistoryModel;
use crate::terminal::view::blocklist_filter;
use crate::undo_close::UndoCloseStack;
use crate::workspace::PaneViewLocator;
use crate::workspace::WorkspaceRegistry;
use chrono::TimeZone;
use galaxyui::{AppContext, EntityId, SingletonEntity, WindowId};
use std::cmp::Ordering;
use std::collections::HashSet;
use chrono::TimeZone;
use galaxyui::{AppContext, EntityId, SingletonEntity, WindowId};
use crate::ai::agent::api::ServerConversationToken;
use crate::ai::agent::conversation::{AIConversation, AIConversationId};
use crate::ai::blocklist::history_model::{AIConversationMetadata, BlocklistAIHistoryModel};
use crate::terminal::view::blocklist_filter;
use crate::undo_close::UndoCloseStack;
use crate::workspace::{PaneViewLocator, WorkspaceRegistry};
/// Result from matching a conversation.
/// terminal_view_id and window_id are optional because, when we add restored conversations,
/// these conversations will not have associated windows or terminal views.
@@ -187,7 +186,7 @@ impl ConversationNavigationData {
// Skip conversation transcript viewers, as they are stored elsewhere
// and should not be presented as regular user conversations.
if history_model
.is_terminal_view_conversation_transcript_viewer(terminal_view_id)
.is_terminal_surface_conversation_transcript_viewer(terminal_view_id)
{
continue;
}
@@ -200,7 +199,7 @@ impl ConversationNavigationData {
// Get all continuable conversations for this terminal view
for conversation in
history_model.all_live_conversations_for_terminal_view(terminal_view_id)
history_model.all_live_conversations_for_terminal_surface(terminal_view_id)
{
if !all_conversation_ids.contains(&conversation.id()) {
if conversation.should_exclude_from_navigation() {
@@ -257,7 +256,8 @@ impl ConversationNavigationData {
.iter()
.for_each(|(terminal_id, conversation)| {
if conversation.should_exclude_from_navigation()
|| history_model.is_terminal_view_conversation_transcript_viewer(*terminal_id)
|| history_model
.is_terminal_surface_conversation_transcript_viewer(*terminal_id)
|| !blocklist_filter::conversation_would_render_in_blocklist(conversation)
{
// Track the ID so the historical loop below doesn't re-add it.
@@ -288,7 +288,8 @@ impl ConversationNavigationData {
.iter()
.for_each(|(terminal_id, conversation)| {
if conversation.should_exclude_from_navigation()
|| history_model.is_terminal_view_conversation_transcript_viewer(*terminal_id)
|| history_model
.is_terminal_surface_conversation_transcript_viewer(*terminal_id)
|| !blocklist_filter::conversation_would_render_in_blocklist(conversation)
{
// Track the ID so the historical loop below doesn't re-add it.