Wrapping up bedrock implementation
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use settings::Setting;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::color::blend::Blend;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
@@ -12,6 +9,9 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
ViewHandle,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use settings::Setting;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
|
||||
@@ -54,8 +54,8 @@ use crate::{
|
||||
workspace::{view::TOGGLE_PROJECT_EXPLORER_BINDING_NAME, ToastStack},
|
||||
workspaces::user_workspaces::UserWorkspaces,
|
||||
};
|
||||
use toolbar_item::AgentToolbarItemKind;
|
||||
use galaxy_cli::agent::Harness;
|
||||
use toolbar_item::AgentToolbarItemKind;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -1309,10 +1309,12 @@ impl AgentInputFooter {
|
||||
.unwrap_or_else(|| appearance.theme().foreground().into_solid());
|
||||
left_buttons.add_child(
|
||||
Container::new(
|
||||
ConstrainedBox::new(icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
|
||||
.with_width(cli_icon_size)
|
||||
.with_height(cli_icon_size)
|
||||
.finish(),
|
||||
ConstrainedBox::new(
|
||||
icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish(),
|
||||
)
|
||||
.with_width(cli_icon_size)
|
||||
.with_height(cli_icon_size)
|
||||
.finish(),
|
||||
)
|
||||
.with_padding_right(8.)
|
||||
.finish(),
|
||||
|
||||
@@ -72,9 +72,7 @@ pub enum AgentToolbarItemKind {
|
||||
impl AgentToolbarItemKind {
|
||||
pub fn available_in(&self) -> ToolbarAvailability {
|
||||
match self {
|
||||
Self::ContextChip(_) | Self::VoiceInput | Self::FileAttach => {
|
||||
ToolbarAvailability::Both
|
||||
}
|
||||
Self::ContextChip(_) | Self::VoiceInput | Self::FileAttach => ToolbarAvailability::Both,
|
||||
Self::ModelSelector
|
||||
| Self::NLDToggle
|
||||
| Self::ContextWindowUsage
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use parking_lot::FairMutex;
|
||||
use galaxy_core::features::FeatureFlag;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
@@ -9,6 +8,7 @@ use galaxyui::elements::{Container, Element, Empty, MouseStateHandle};
|
||||
use galaxyui::keymap::Keystroke;
|
||||
use galaxyui::platform::OperatingSystem;
|
||||
use galaxyui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
|
||||
use parking_lot::FairMutex;
|
||||
|
||||
use super::{AgentViewState, EphemeralMessageModel, EphemeralMessageModelEvent};
|
||||
use crate::ai::agent::conversation::AIConversation;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use settings::Setting;
|
||||
use galaxy_core::ui::{appearance::Appearance, Icon};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
@@ -12,6 +10,8 @@ use galaxyui::{
|
||||
text_layout::ClipConfig,
|
||||
Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use settings::Setting;
|
||||
|
||||
use crate::{
|
||||
ai::{
|
||||
|
||||
@@ -2,13 +2,13 @@ use std::{sync::Arc, time::Duration};
|
||||
|
||||
use instant::Instant;
|
||||
|
||||
use parking_lot::FairMutex;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::keymap::Keystroke;
|
||||
use galaxyui::AppContext;
|
||||
use galaxyui::{
|
||||
r#async::SpawnedFutureHandle, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity,
|
||||
};
|
||||
use parking_lot::FairMutex;
|
||||
|
||||
use crate::terminal::input::message_bar::{Message, MessageItem};
|
||||
use crate::terminal::input::slash_commands::SlashCommandTrigger;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use ai::agent::action::{AIAgentActionType, ShellCommandDelay};
|
||||
use parking_lot::FairMutex;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{
|
||||
elements::{CornerRadius, Radius},
|
||||
AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, View, ViewContext,
|
||||
};
|
||||
use parking_lot::FairMutex;
|
||||
|
||||
use crate::{
|
||||
ai::{
|
||||
|
||||
@@ -15,17 +15,17 @@ pub use agent_message_bar::*;
|
||||
pub use agent_view_block::*;
|
||||
pub use controller::*;
|
||||
pub use ephemeral_message_model::*;
|
||||
pub use inline_agent_view_header::*;
|
||||
use galaxyui::fonts::Properties;
|
||||
pub use inline_agent_view_header::*;
|
||||
pub use zero_state_block::*;
|
||||
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxy_core::ui::{appearance::Appearance, color::blend::Blend};
|
||||
use galaxyui::keymap::Keystroke;
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::view_components::action_button::ActionButtonTheme;
|
||||
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxyui::{
|
||||
@@ -12,6 +10,8 @@ use galaxyui::{
|
||||
text_layout::ClipConfig,
|
||||
AppContext, Element, EventContext, SingletonEntity,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
|
||||
use crate::{
|
||||
ai::{
|
||||
@@ -199,7 +199,9 @@ pub(crate) fn conversation_navigation_card_with_icon(
|
||||
Container::new(
|
||||
ConstrainedBox::new(
|
||||
Icon::ChevronRight
|
||||
.to_galaxyui_icon(blended_colors::text_sub(theme, theme.background()).into())
|
||||
.to_galaxyui_icon(
|
||||
blended_colors::text_sub(theme, theme.background()).into(),
|
||||
)
|
||||
.finish(),
|
||||
)
|
||||
.with_height(20.)
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
#![allow(dead_code, unused_imports, unused_variables)]
|
||||
use itertools::Itertools as _;
|
||||
use markdown_parser::{parse_markdown, FormattedText, FormattedTextFragment, FormattedTextLine};
|
||||
use parking_lot::FairMutex;
|
||||
use settings::Setting;
|
||||
use std::{borrow::Cow, cmp::Reverse, path::Path, sync::Arc};
|
||||
use galaxy_core::{features::FeatureFlag, report_if_error, ui::Icon};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
@@ -17,6 +12,11 @@ use galaxyui::{
|
||||
scene::Border,
|
||||
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
};
|
||||
use itertools::Itertools as _;
|
||||
use markdown_parser::{parse_markdown, FormattedText, FormattedTextFragment, FormattedTextLine};
|
||||
use parking_lot::FairMutex;
|
||||
use settings::Setting;
|
||||
use std::{borrow::Cow, cmp::Reverse, path::Path, sync::Arc};
|
||||
|
||||
use crate::{
|
||||
ai::{
|
||||
@@ -209,8 +209,7 @@ impl AgentViewZeroStateBlock {
|
||||
}
|
||||
}
|
||||
});
|
||||
ctx.subscribe_to_model(&AISettings::handle(ctx), |_me, _, _event, _ctx| {
|
||||
});
|
||||
ctx.subscribe_to_model(&AISettings::handle(ctx), |_me, _, _event, _ctx| {});
|
||||
|
||||
let mut state_handles = StateHandles::default();
|
||||
state_handles.update_hyperlinks.resize(
|
||||
|
||||
@@ -7,8 +7,8 @@ use crate::terminal::{
|
||||
color::{self, Colors},
|
||||
event_listener::ChannelEventListener,
|
||||
};
|
||||
use std::{path::PathBuf, sync::Arc};
|
||||
use galaxyui::r#async::executor::Background;
|
||||
use std::{path::PathBuf, sync::Arc};
|
||||
|
||||
fn terminal_with_startup_path(startup_path: Option<&str>) -> TerminalModel {
|
||||
TerminalModel::new_for_test(
|
||||
|
||||
Reference in New Issue
Block a user