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

Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

Browse Source
This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/ai/agent_sdk/admin.rs
+3 -3
View File
@@ -2,8 +2,8 @@
use anyhow::{Context, Result};
use serde::Serialize;
use warp_cli::agent::OutputFormat;
use warpui::{platform::TerminationMode, AppContext, SingletonEntity};
use galaxy_cli::agent::OutputFormat;
use galaxyui::{platform::TerminationMode, AppContext, SingletonEntity};
use crate::auth::auth_manager::{AuthManager, AuthManagerEvent};
use crate::auth::user::PrincipalType;
@@ -116,7 +116,7 @@ struct WhoamiOutput {
/// Singleton model that provides a `ModelContext` for the `whoami` command's async work.
struct WhoamiRunner;
impl warpui::Entity for WhoamiRunner {
impl galaxyui::Entity for WhoamiRunner {
type Event = ();
}
app/src/ai/agent_sdk/agent_config.rs
+5 -5
View File
@@ -4,10 +4,10 @@ use crate::ai::agent_sdk::oauth_flow::poll_oauth_until_terminal;
use crate::ai::cloud_environments::GithubRepo;
use crate::server::server_api::ai::AgentListItem;
use crate::server::server_api::ServerApiProvider;
use warp_cli::agent::ListAgentConfigsArgs;
use warp_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use warp_graphql::queries::user_repo_auth_status::UserRepoAuthStatusEnum;
use warpui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use galaxy_cli::agent::ListAgentConfigsArgs;
use galaxy_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use galaxy_graphql::queries::user_repo_auth_status::UserRepoAuthStatusEnum;
use galaxyui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
const MAX_LINE_WIDTH: usize = 90;
const MAX_AUTH_ATTEMPTS: u32 = 8;
@@ -304,7 +304,7 @@ impl AgentConfigRunner {
}
}
impl warpui::Entity for AgentConfigRunner {
impl galaxyui::Entity for AgentConfigRunner {
type Event = ();
}
app/src/ai/agent_sdk/ambient.rs
+6 -6
View File
@@ -27,7 +27,7 @@ use comfy_table::Cell;
use futures::{future, StreamExt};
use serde::Serialize;
use warp_cli::{
use galaxy_cli::{
agent::{Harness, OutputFormat, Prompt, RunCloudArgs},
json_filter::JsonOutput,
task::{
@@ -37,10 +37,10 @@ use warp_cli::{
},
GlobalOptions,
};
use warp_core::channel::ChannelState;
use warp_core::features::FeatureFlag;
use warpui::r#async::Timer;
use warpui::{
use galaxy_core::channel::ChannelState;
use galaxy_core::features::FeatureFlag;
use galaxyui::r#async::Timer;
use galaxyui::{
platform::TerminationMode, r#async::Spawnable, AppContext, ModelContext, SingletonEntity,
};
@@ -1240,7 +1240,7 @@ impl AmbientAgentRunner {
}
}
impl warpui::Entity for AmbientAgentRunner {
impl galaxyui::Entity for AmbientAgentRunner {
type Event = ();
}
app/src/ai/agent_sdk/ambient_tests.rs
+2 -2
View File
@@ -3,8 +3,8 @@
use chrono::{TimeZone, Utc};
use warp_cli::json_filter::JsonOutput;
use warp_cli::task::{
use galaxy_cli::json_filter::JsonOutput;
use galaxy_cli::task::{
ArtifactTypeArg, ExecutionLocationArg, ListTasksArgs, RunSortByArg, RunSortOrderArg,
RunSourceArg, RunStateArg,
};
app/src/ai/agent_sdk/artifact.rs
+5 -5
View File
@@ -2,12 +2,12 @@ use std::{path::PathBuf, sync::Arc};
use anyhow::{Context, Result};
use serde::Serialize;
use warp_cli::agent::OutputFormat;
use warp_cli::artifact::{
use galaxy_cli::agent::OutputFormat;
use galaxy_cli::artifact::{
ArtifactCommand, DownloadArtifactArgs, GetArtifactArgs, UploadArtifactArgs,
};
use warp_cli::GlobalOptions;
use warpui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use galaxy_cli::GlobalOptions;
use galaxyui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use crate::ai::artifact_download::{download_artifact_bytes, download_destination};
#[cfg(test)]
@@ -129,7 +129,7 @@ impl ArtifactCommandRunner {
}
}
impl warpui::Entity for ArtifactCommandRunner {
impl galaxyui::Entity for ArtifactCommandRunner {
type Event = ();
}
app/src/ai/agent_sdk/artifact_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use std::path::PathBuf;
use warp_cli::agent::OutputFormat;
use galaxy_cli::agent::OutputFormat;
use super::*;
app/src/ai/agent_sdk/artifact_upload.rs
+1 -1
View File
@@ -7,7 +7,7 @@ use std::sync::Arc;
use anyhow::{anyhow, bail, Context, Result};
use blocking::unblock;
use mime_guess::from_path;
use warp_cli::artifact::UploadArtifactArgs;
use galaxy_cli::artifact::UploadArtifactArgs;
use super::common::parse_ambient_task_id;
use crate::ai::agent::api::ServerConversationToken;
app/src/ai/agent_sdk/artifact_upload_tests.rs
+1 -1
View File
@@ -4,7 +4,7 @@ use std::path::PathBuf;
use chrono::Utc;
use tempfile::tempdir;
use warp_cli::artifact::UploadArtifactArgs;
use galaxy_cli::artifact::UploadArtifactArgs;
use super::*;
use crate::ai::agent::api::ServerConversationToken;
app/src/ai/agent_sdk/common.rs
+5 -5
View File
@@ -7,10 +7,10 @@ use std::time::Duration;
use futures::TryFutureExt;
use inquire::{InquireError, Select};
use warp_cli::agent::Harness;
use warp_cli::environment::{EnvironmentCreateArgs, EnvironmentUpdateArgs};
use warpui::r#async::FutureExt;
use warpui::{AppContext, GetSingletonModelHandle, SingletonEntity as _, UpdateModel};
use galaxy_cli::agent::Harness;
use galaxy_cli::environment::{EnvironmentCreateArgs, EnvironmentUpdateArgs};
use galaxyui::r#async::FutureExt;
use galaxyui::{AppContext, GetSingletonModelHandle, SingletonEntity as _, UpdateModel};
use crate::ai::agent::conversation::ServerAIConversationMetadata;
use crate::ai::agent_sdk::driver::{AgentDriverError, WARP_DRIVE_SYNC_TIMEOUT};
@@ -252,7 +252,7 @@ impl EnvironmentChoice {
// If there are no synced environments, require the user to create one or use --no-environment.
if options.len() == 1 {
let cli_name = warp_cli::binary_name().unwrap_or_else(|| "warp".to_string());
let cli_name = galaxy_cli::binary_name().unwrap_or_else(|| "warp".to_string());
return Err(ResolveConfigurationError::Other(anyhow::anyhow!(
"No environments are configured for this account.\n\
You can create an environment with `{cli_name} environment create`.\n\
app/src/ai/agent_sdk/config_file.rs
+1 -1
View File
@@ -2,7 +2,7 @@ use std::path::Path;
use anyhow::Context as _;
use serde_json::{Map, Value};
use warp_cli::mcp::MCPSpec;
use galaxy_cli::mcp::MCPSpec;
use crate::ai::ambient_agents::AgentConfigSnapshot;
app/src/ai/agent_sdk/config_file_tests.rs
+1 -1
View File
@@ -5,7 +5,7 @@ use std::io::Write as _;
use serde_json::json;
use crate::ai::ambient_agents::AgentConfigSnapshot;
use warp_cli::mcp::MCPSpec;
use galaxy_cli::mcp::MCPSpec;
fn write_temp(suffix: &str, contents: &str) -> tempfile::NamedTempFile {
let mut file = tempfile::Builder::new().suffix(suffix).tempfile().unwrap();
app/src/ai/agent_sdk/driver.rs
+13 -13
View File
@@ -76,13 +76,13 @@ use futures::{
};
use oneshot::{Canceled, Receiver, Sender};
use uuid::Uuid;
use warp_cli::agent::{Harness, OutputFormat};
use warp_cli::mcp::MCPSpec;
use warp_cli::share::ShareRequest;
use warp_core::{features::FeatureFlag, report_error, report_if_error, safe_debug, safe_info};
use warp_graphql::ai::AgentTaskState;
use warp_managed_secrets::ManagedSecretValue;
use warpui::{
use galaxy_cli::agent::{Harness, OutputFormat};
use galaxy_cli::mcp::MCPSpec;
use galaxy_cli::share::ShareRequest;
use galaxy_core::{features::FeatureFlag, report_error, report_if_error, safe_debug, safe_info};
use galaxy_graphql::ai::AgentTaskState;
use galaxy_managed_secrets::ManagedSecretValue;
use galaxyui::{
r#async::{FutureExt, TimeoutError},
AppContext, Entity, ModelContext, ModelHandle, ModelSpawner, SingletonEntity,
};
@@ -441,8 +441,8 @@ pub enum AgentDriverError {
},
}
impl From<warpui::ModelDropped> for AgentDriverError {
fn from(_: warpui::ModelDropped) -> Self {
impl From<galaxyui::ModelDropped> for AgentDriverError {
fn from(_: galaxyui::ModelDropped) -> Self {
AgentDriverError::InvalidRuntimeState
}
}
@@ -596,7 +596,7 @@ impl AgentDriver {
// Signal to third-party harnesses (e.g. Claude Code) that we're in a sandbox
// so they allow root execution with permissive flags.
if warp_isolation_platform::detect().is_some() {
if galaxy_isolation_platform::detect().is_some() {
env_vars.insert(OsString::from("IS_SANDBOX"), OsString::from("1"));
}
@@ -729,7 +729,7 @@ impl AgentDriver {
) {
let timeout = idle_timeout.min(SETUP_FAILED_IDLE_TIMEOUT);
log::info!("Environment setup failed; keeping session alive for {timeout:?}");
warpui::r#async::Timer::after(timeout).await;
galaxyui::r#async::Timer::after(timeout).await;
}
}
@@ -1402,7 +1402,7 @@ impl AgentDriver {
// and then call stop_sharing_session when they're done. To know when streams are finished, we would need to modify start_ordered_terminal_events_listener
// to send a message when the streams are finished, flushed, and the websocket is disconnected. For now, we'll just sleep for a second, as this seems
// to be enough time for the streams to be finished and the events to be flushed.
warpui::r#async::Timer::after(Duration::from_secs(1)).await;
galaxyui::r#async::Timer::after(Duration::from_secs(1)).await;
conversation_status.into_result()
}
@@ -1569,7 +1569,7 @@ impl AgentDriver {
let command_result = loop {
futures::select! {
exit_code = command_handle => break exit_code,
_ = warpui::r#async::Timer::after(HARNESS_SAVE_INTERVAL).fuse() => {
_ = galaxyui::r#async::Timer::after(HARNESS_SAVE_INTERVAL).fuse() => {
log::debug!("Triggering periodic save of harness conversation data");
report_if_error!(runner
.save_conversation(SavePoint::Periodic, foreground)
app/src/ai/agent_sdk/driver/attachments.rs
+1 -1
View File
@@ -8,7 +8,7 @@ use futures::TryStreamExt as _;
use mime_guess::from_path;
use tokio::fs;
use tokio_util::io::StreamReader;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
use crate::ai::agent_sdk::retry::with_bounded_retry;
use crate::ai::ambient_agents::task::{AttachmentInput, TaskAttachment};
app/src/ai/agent_sdk/driver/cloud_provider.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ffi::OsString, future::Future, pin::Pin};
use anyhow::Error;
use warpui::ModelSpawner;
use galaxyui::ModelSpawner;
use super::terminal::TerminalDriver;
use crate::ai::cloud_environments::ProvidersConfig;
app/src/ai/agent_sdk/driver/cloud_provider/aws.rs
+4 -4
View File
@@ -3,9 +3,9 @@ use std::{collections::HashMap, ffi::OsString, future::Future, pin::Pin, time::D
use anyhow::Context;
use tempfile::{Builder, NamedTempFile};
use vec1::Vec1;
use warp_core::safe_info;
use warp_managed_secrets::ManagedSecretManager;
use warpui::{ModelSpawner, SingletonEntity};
use galaxy_core::safe_info;
use galaxy_managed_secrets::ManagedSecretManager;
use galaxyui::{ModelSpawner, SingletonEntity};
use crate::ai::aws_credentials::aws_role_session_name;
use crate::ai::cloud_environments::AwsProviderConfig;
@@ -93,7 +93,7 @@ impl CloudProvider for AwsCloudProvider {
ManagedSecretManager::handle(ctx)
.as_ref(ctx)
.issue_task_identity_token(
warp_managed_secrets::client::IdentityTokenOptions {
galaxy_managed_secrets::client::IdentityTokenOptions {
audience,
requested_duration: duration,
subject_template,
app/src/ai/agent_sdk/driver/cloud_provider/gcp.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ffi::OsString, future::Future, pin::Pin, time::Duration};
use anyhow::Context as _;
use warp_managed_secrets::{GcpCredentials, GcpFederationConfig};
use galaxy_managed_secrets::{GcpCredentials, GcpFederationConfig};
use crate::ai::cloud_environments::GcpProviderConfig;
app/src/ai/agent_sdk/driver/environment.rs
+7 -7
View File
@@ -14,12 +14,12 @@ use ai::index::full_source_code_embedding::manager::{
};
use futures::{channel::oneshot, future::join_all};
use repo_metadata::repositories::{DetectedRepositories, RepoDetectionSource};
use warp_completer::completer::CommandExitStatus;
use warp_core::{command::ExitCode, safe_info, safe_warn};
use warpui::{r#async::FutureExt, ModelContext, ModelSpawner, SingletonEntity};
use galaxy_completer::completer::CommandExitStatus;
use galaxy_core::{command::ExitCode, safe_info, safe_warn};
use galaxyui::{r#async::FutureExt, ModelContext, ModelSpawner, SingletonEntity};
use super::{terminal::TerminalDriver, AgentDriverError};
use warp_cli::agent::Harness;
use galaxy_cli::agent::Harness;
const CODEBASE_INDEX_SYNC_TIMEOUT: Duration = Duration::from_secs(60);
@@ -260,10 +260,10 @@ async fn prepare_environment_impl(
// We also skip this in Namespace to reduce startup time.
#[cfg(not(target_family = "wasm"))]
let should_wait_for_indexing = !matches!(
warp_isolation_platform::detect(),
galaxy_isolation_platform::detect(),
Some(
warp_isolation_platform::IsolationPlatformType::DockerSandbox
| warp_isolation_platform::IsolationPlatformType::Namespace
galaxy_isolation_platform::IsolationPlatformType::DockerSandbox
| galaxy_isolation_platform::IsolationPlatformType::Namespace
)
);
#[cfg(target_family = "wasm")]
app/src/ai/agent_sdk/driver/error_classification.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use crate::ai::blocklist::task_status_sync_model::classify_renderable_error;
use crate::server::server_api::ai::TaskStatusUpdate;
use warp_graphql::ai::{AgentTaskState, PlatformErrorCode};
use galaxy_graphql::ai::{AgentTaskState, PlatformErrorCode};
use super::terminal::ShareSessionError;
use super::AgentDriverError;
@@ -71,7 +71,7 @@ pub fn classify_driver_error(error: &AgentDriverError) -> (AgentTaskState, TaskS
),
),
AgentDriverError::NotLoggedIn => {
let bin = warp_cli::binary_name().unwrap_or_else(|| "warp".to_string());
let bin = galaxy_cli::binary_name().unwrap_or_else(|| "warp".to_string());
(
AgentTaskState::Error,
TaskStatusUpdate::with_error_code(
app/src/ai/agent_sdk/driver/error_classification_tests.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp_graphql::ai::{AgentTaskState, PlatformErrorCode};
use galaxy_graphql::ai::{AgentTaskState, PlatformErrorCode};
use super::classify_driver_error;
use crate::ai::agent_sdk::driver::terminal::ShareSessionError;
app/src/ai/agent_sdk/driver/harness/claude_code.rs
+2 -2
View File
@@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize};
use serde_json::{Map, Value};
use tempfile::NamedTempFile;
use uuid::Uuid;
use warp_cli::agent::Harness;
use warpui::{ModelHandle, ModelSpawner};
use galaxy_cli::agent::Harness;
use galaxyui::{ModelHandle, ModelSpawner};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::ambient_agents::AmbientAgentTaskId;
app/src/ai/agent_sdk/driver/harness/claude_code/parent_bridge.rs
+2 -2
View File
@@ -20,8 +20,8 @@ use serde::{Deserialize, Serialize};
use tempfile::NamedTempFile;
use tokio::sync::Mutex as AsyncMutex;
use uuid::Uuid;
use warpui::r#async::SpawnedFutureHandle;
use warpui::ModelSpawner;
use galaxyui::r#async::SpawnedFutureHandle;
use galaxyui::ModelSpawner;
use crate::ai::agent_events::{
run_agent_event_driver, AgentEventConsumer, AgentEventConsumerControlFlow,
app/src/ai/agent_sdk/driver/harness/claude_transcript.rs
+1 -1
View File
@@ -22,7 +22,7 @@ use anyhow::{Context, Result};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use uuid::Uuid;
use warp_core::safe_warn;
use galaxy_core::safe_warn;
use crate::ai::agent::conversation::AIConversationId;
app/src/ai/agent_sdk/driver/harness/gemini.rs
+3 -3
View File
@@ -8,9 +8,9 @@ use parking_lot::Mutex;
use serde::{Deserialize, Serialize};
use serde_json::{Map, Value};
use tempfile::NamedTempFile;
use warp_cli::agent::Harness;
use warp_managed_secrets::ManagedSecretValue;
use warpui::{ModelHandle, ModelSpawner};
use galaxy_cli::agent::Harness;
use galaxy_managed_secrets::ManagedSecretValue;
use galaxyui::{ModelHandle, ModelSpawner};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::ambient_agents::AmbientAgentTaskId;
app/src/ai/agent_sdk/driver/harness/mod.rs
+5 -5
View File
@@ -9,9 +9,9 @@ use std::sync::Arc;
use anyhow::{Context, Result};
use async_trait::async_trait;
use tempfile::NamedTempFile;
use warp_cli::agent::Harness;
use warp_managed_secrets::ManagedSecretValue;
use warpui::{ModelHandle, ModelSpawner, SingletonEntity};
use galaxy_cli::agent::Harness;
use galaxy_managed_secrets::ManagedSecretValue;
use galaxyui::{ModelHandle, ModelSpawner, SingletonEntity};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::ambient_agents::AmbientAgentTaskId;
@@ -21,11 +21,11 @@ use crate::terminal::cli_agent_sessions::{CLIAgentSessionStatus, CLIAgentSession
use crate::terminal::model::block::{BlockId, SerializedBlock};
use crate::terminal::CLIAgent;
use crate::util::path::resolve_executable;
use warp_cli::{
use galaxy_cli::{
OZ_CLI_ENV, OZ_HARNESS_ENV, OZ_PARENT_RUN_ID_ENV, OZ_RUN_ID_ENV, SERVER_ROOT_URL_OVERRIDE_ENV,
SESSION_SHARING_SERVER_URL_OVERRIDE_ENV, WS_SERVER_URL_OVERRIDE_ENV,
};
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
use super::terminal::{CommandHandle, TerminalDriver};
use super::{
app/src/ai/agent_sdk/driver/output.rs
+1 -1
View File
@@ -1289,7 +1289,7 @@ pub mod json {
use crate::ai::agent::{AIAgentText, AIAgentTextSection};
use crate::code::editor_management::CodeSource;
use std::io::{self, BufWriter, Write};
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
/// Constructs the Oz dashboard URL for a given run ID.
fn run_url(run_id: &str) -> String {
app/src/ai/agent_sdk/driver/snapshot.rs
+2 -2
View File
@@ -34,8 +34,8 @@ use anyhow::Result;
use command::r#async::Command;
use command::Stdio;
use futures::future::join_all;
use warp_core::report_error;
use warpui::r#async::FutureExt as _;
use galaxy_core::report_error;
use galaxyui::r#async::FutureExt as _;
use crate::ai::agent_sdk::retry::with_bounded_retry;
use crate::ai::ambient_agents::AmbientAgentTaskId;
app/src/ai/agent_sdk/driver/terminal.rs
+8 -8
View File
@@ -12,12 +12,12 @@ use std::{
use futures::channel::oneshot;
use session_sharing_protocol::common::{Role, SessionId};
use session_sharing_protocol::sharer::SessionSourceType;
use warp_cli::share::{ShareAccessLevel, ShareRequest, ShareSubject};
use warp_completer::completer::CommandOutput;
use warp_core::command::ExitCode;
use warp_core::features::FeatureFlag;
use warp_util::path::ShellFamily;
use warpui::{
use galaxy_cli::share::{ShareAccessLevel, ShareRequest, ShareSubject};
use galaxy_completer::completer::CommandOutput;
use galaxy_core::command::ExitCode;
use galaxy_core::features::FeatureFlag;
use galaxy_util::path::ShellFamily;
use galaxyui::{
r#async::FutureExt, AppContext, Entity, ModelContext, ModelHandle, SingletonEntity as _,
ViewHandle,
};
@@ -198,7 +198,7 @@ impl TerminalDriver {
// When sharing is disabled (or running against ngrok), leave both halves
// as None so that `wait_for_session_shared` returns immediately.
let sharing_expected =
should_share && !warp_core::channel::ChannelState::server_root_url().contains("ngrok");
should_share && !galaxy_core::channel::ChannelState::server_root_url().contains("ngrok");
let (mut session_share_tx, session_share_rx) = if sharing_expected {
if !FeatureFlag::CreatingSharedSessions.is_enabled() {
// Session sharing was requested but the feature is not enabled for this
@@ -272,7 +272,7 @@ impl TerminalDriver {
pub fn with_terminal_view(
&self,
ctx: &mut ModelContext<Self>,
f: impl FnOnce(&mut TerminalView, &mut warpui::ViewContext<TerminalView>),
f: impl FnOnce(&mut TerminalView, &mut galaxyui::ViewContext<TerminalView>),
) {
self.terminal_view.update(ctx, f);
}
app/src/ai/agent_sdk/driver_tests.rs
+3 -3
View File
@@ -1,12 +1,12 @@
use std::{ffi::OsString, sync::Arc, time::Duration};
use futures::channel::oneshot;
use warp_cli::agent::Harness;
use warp_cli::{
use galaxy_cli::agent::Harness;
use galaxy_cli::{
OZ_CLI_ENV, OZ_HARNESS_ENV, OZ_PARENT_RUN_ID_ENV, OZ_RUN_ID_ENV, SERVER_ROOT_URL_OVERRIDE_ENV,
SESSION_SHARING_SERVER_URL_OVERRIDE_ENV, WS_SERVER_URL_OVERRIDE_ENV,
};
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
use super::{
IdleTimeoutSender, LEGACY_OZ_PARENT_LISTENER_MANAGED_EXTERNALLY_ENV,
app/src/ai/agent_sdk/environment.rs
+35 -35
View File
@@ -3,14 +3,14 @@ use std::collections::HashSet;
use comfy_table::Cell;
use inquire::{error::InquireError, Confirm, Select};
use serde::Serialize;
use warp_cli::{
use galaxy_cli::{
agent::OutputFormat,
environment::{EnvironmentCommand, ImageCommand},
scope::ObjectScope,
GlobalOptions,
};
use warpui::r#async::FutureExt;
use warpui::{AppContext, ModelContext, SingletonEntity};
use galaxyui::r#async::FutureExt;
use galaxyui::{AppContext, ModelContext, SingletonEntity};
use crate::ai::agent_sdk::output::{self, TableFormat};
@@ -32,11 +32,11 @@ use crate::util::time_format::format_approx_duration_from_now_utc;
use crate::workspaces::user_profiles::UserProfiles;
use crate::CloudObjectTypeAndId;
use cynic::QueryBuilder;
use warp_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use warp_graphql::queries::list_warp_dev_images::{
use galaxy_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use galaxy_graphql::queries::list_warp_dev_images::{
ListWarpDevImages, ListWarpDevImagesResult, ListWarpDevImagesVariables,
};
use warp_graphql::queries::user_repo_auth_status::UserRepoAuthStatusEnum;
use galaxy_graphql::queries::user_repo_auth_status::UserRepoAuthStatusEnum;
const WARP_DEV_ENVIRONMENTS_REPO: &str = "https://github.com/warpdotdev/warp-dev-environments";
@@ -174,7 +174,7 @@ impl EnvironmentCommandRunner {
);
}
output::print_list(image_infos, global_options.output_format);
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
}
ListWarpDevImagesResult::UserFacingError(_) | ListWarpDevImagesResult::Unknown => {
super::report_fatal_error(anyhow::anyhow!("Failed to fetch images"), ctx);
@@ -253,7 +253,7 @@ impl EnvironmentCommandRunner {
output::print_list(environment_infos, global_options.output_format);
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
});
}
@@ -276,7 +276,7 @@ impl EnvironmentCommandRunner {
Ok(sid) => sid,
Err(_) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!("Environment {} not found", id))),
);
return;
@@ -287,10 +287,10 @@ impl EnvironmentCommandRunner {
if let Some(environment) = environment {
Self::print_environment_details(&environment.model().string_model);
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
} else {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!("Environment {} not found", id))),
);
}
@@ -330,7 +330,7 @@ impl EnvironmentCommandRunner {
match err {
InquireError::OperationCanceled | InquireError::OperationInterrupted => {
eprintln!("Environment creation canceled.");
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
true
}
_ => false,
@@ -426,7 +426,7 @@ impl EnvironmentCommandRunner {
docker_image: Option<String>,
github_repos: Vec<GithubRepo>,
setup_commands: Vec<String>,
scope: warp_cli::scope::ObjectScope,
scope: galaxy_cli::scope::ObjectScope,
ctx: &mut ModelContext<Self>,
) {
if let Some(image) = docker_image {
@@ -464,7 +464,7 @@ impl EnvironmentCommandRunner {
docker_image: String,
github_repos: Vec<GithubRepo>,
setup_commands: Vec<String>,
scope: warp_cli::scope::ObjectScope,
scope: galaxy_cli::scope::ObjectScope,
ctx: &mut ModelContext<Self>,
) {
let initial_sync = UpdateManager::as_ref(ctx)
@@ -521,7 +521,7 @@ impl EnvironmentCommandRunner {
if attempt > MAX_AUTH_ATTEMPTS {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Exceeded maximum number of authorization attempts ({}). Please try again later.",
MAX_AUTH_ATTEMPTS
@@ -582,7 +582,7 @@ impl EnvironmentCommandRunner {
if private_repo_owners.len() > 1 {
let owners_str = private_repo_owners.into_iter().collect::<Vec<_>>().join(", ");
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"All private repositories in an environment must belong to the same owner. Found multiple owners: {}.\nIf you need support for private repos from multiple owners, please submit a GitHub issue.",
owners_str
@@ -644,7 +644,7 @@ impl EnvironmentCommandRunner {
}
Ok(OauthConnectTxStatus::Failed) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"GitHub authorization failed. Please try again."
))),
@@ -652,7 +652,7 @@ impl EnvironmentCommandRunner {
}
Ok(OauthConnectTxStatus::Expired) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"GitHub authorization expired. Please try again."
))),
@@ -662,7 +662,7 @@ impl EnvironmentCommandRunner {
| Ok(OauthConnectTxStatus::InProgress) => {
// Should not be returned by poll_oauth_until_terminal.
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Unexpected non-terminal OAuth status returned"
))),
@@ -670,7 +670,7 @@ impl EnvironmentCommandRunner {
}
Err(err) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Error polling OAuth status: {err}"
))),
@@ -685,14 +685,14 @@ impl EnvironmentCommandRunner {
println!("\nAuthorize access here: {auth_url}\n");
println!("After authorizing, please re-run this command.");
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
None,
);
}
(None, Some(_)) => {
// Server returned txId without authUrl - unexpected.
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Server error: did not receive auth URL for OAuth flow"
))),
@@ -701,7 +701,7 @@ impl EnvironmentCommandRunner {
(None, None) => {
// No auth URL or txId provided, but we have auth issues.
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Cannot {} environment: authorization required but no auth flow provided by server",
operation_name
@@ -712,7 +712,7 @@ impl EnvironmentCommandRunner {
}
Err(e) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(e.context("Failed to check GitHub auth status"))),
);
}
@@ -764,7 +764,7 @@ impl EnvironmentCommandRunner {
{
let server_id = result.server_id.unwrap();
println!("Environment created successfully with ID: {server_id}");
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
}
}
});
@@ -807,13 +807,13 @@ impl EnvironmentCommandRunner {
Ok(false) | Err(InquireError::OperationCanceled | InquireError::OperationInterrupted) => {
println!("Environment {action} canceled.");
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
None,
);
}
Err(err) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!("Error prompting for confirmation: {err}"))),
);
}
@@ -824,7 +824,7 @@ impl EnvironmentCommandRunner {
}
Err(_) => {
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(anyhow::anyhow!(
"Aborting environment {action} because integration usage could not be determined. Re-run with --force to override."
))),
@@ -868,7 +868,7 @@ impl EnvironmentCommandRunner {
Err(_) => {
let error = anyhow::anyhow!("Environment {} not found", id);
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(error)),
);
return;
@@ -879,7 +879,7 @@ impl EnvironmentCommandRunner {
let Some(environment) = environment else {
let error = anyhow::anyhow!("Environment {} not found", id);
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(error)),
);
return;
@@ -1011,7 +1011,7 @@ impl EnvironmentCommandRunner {
println!("Environment updated successfully!\n");
Self::print_environment_details(&updated_env);
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
None,
);
}
@@ -1047,7 +1047,7 @@ impl EnvironmentCommandRunner {
Err(_) => {
let error = anyhow::anyhow!("Environment {} not found", id);
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(error)),
);
return;
@@ -1058,7 +1058,7 @@ impl EnvironmentCommandRunner {
let Some(environment) = environment else {
let error = anyhow::anyhow!("Environment {} not found", id);
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
Some(Err(error)),
);
return;
@@ -1094,7 +1094,7 @@ impl EnvironmentCommandRunner {
OperationSuccessType::Success => {
println!("Environment deleted successfully");
ctx.terminate_app(
warpui::platform::TerminationMode::ForceTerminate,
galaxyui::platform::TerminationMode::ForceTerminate,
None,
);
}
@@ -1111,7 +1111,7 @@ impl EnvironmentCommandRunner {
}
}
impl warpui::Entity for EnvironmentCommandRunner {
impl galaxyui::Entity for EnvironmentCommandRunner {
type Event = ();
}
impl SingletonEntity for EnvironmentCommandRunner {}
app/src/ai/agent_sdk/federate.rs
+6 -6
View File
@@ -2,11 +2,11 @@ use std::process;
use anyhow::{anyhow, Result};
use serde_json::json;
use warp_cli::federate::{FederateCommand, IssueGcpTokenArgs, IssueTokenArgs};
use warp_cli::{agent::OutputFormat, GlobalOptions};
use warp_core::{features::FeatureFlag, report_error};
use warp_managed_secrets::ManagedSecretManager;
use warpui::{platform::TerminationMode, AppContext, SingletonEntity as _};
use galaxy_cli::federate::{FederateCommand, IssueGcpTokenArgs, IssueTokenArgs};
use galaxy_cli::{agent::OutputFormat, GlobalOptions};
use galaxy_core::{features::FeatureFlag, report_error};
use galaxy_managed_secrets::ManagedSecretManager;
use galaxyui::{platform::TerminationMode, AppContext, SingletonEntity as _};
use super::common::set_ambient_task_context_from_run_id;
@@ -43,7 +43,7 @@ fn issue_token(
ManagedSecretManager::handle(ctx).update(ctx, move |manager, ctx| {
let future =
manager.issue_task_identity_token(warp_managed_secrets::client::IdentityTokenOptions {
manager.issue_task_identity_token(galaxy_managed_secrets::client::IdentityTokenOptions {
audience,
requested_duration: duration,
subject_template,
app/src/ai/agent_sdk/harness_support.rs
+6 -6
View File
@@ -4,14 +4,14 @@
//! - [`ping`] — fetches the current run by task ID and prints its info.
//! - [`report_artifact`] — reports an artifact (e.g. a PR) back to the Oz platform.
use anyhow::Result;
use warp_cli::agent::OutputFormat;
use warp_cli::harness_support::{
use galaxy_cli::agent::OutputFormat;
use galaxy_cli::harness_support::{
FinishTaskArgs, HarnessSupportArgs, HarnessSupportCommand, NotifyUserArgs, ReportArtifactArgs,
ReportArtifactCommand, TaskStatus,
};
use warp_cli::GlobalOptions;
use warp_core::features::FeatureFlag;
use warpui::{platform::TerminationMode, AppContext, ModelHandle, SingletonEntity};
use galaxy_cli::GlobalOptions;
use galaxy_core::features::FeatureFlag;
use galaxyui::{platform::TerminationMode, AppContext, ModelHandle, SingletonEntity};
use super::common::set_ambient_task_context_from_run_id;
use crate::ai::ambient_agents::AmbientAgentTaskId;
@@ -206,7 +206,7 @@ fn finish_task(
/// Singleton model for running async harness-support operations.
struct HarnessSupportRunner;
impl warpui::Entity for HarnessSupportRunner {
impl galaxyui::Entity for HarnessSupportRunner {
type Event = ();
}
app/src/ai/agent_sdk/integration.rs
+6 -6
View File
@@ -1,14 +1,14 @@
use crate::server::server_api::ServerApiProvider;
use futures::future;
use warp_cli::{
use galaxy_cli::{
integration::{CreateIntegrationArgs, IntegrationCommand, UpdateIntegrationArgs},
provider::ProviderType,
GlobalOptions,
};
use warp_graphql::mutations::create_simple_integration::CreateSimpleIntegrationOutput;
use warp_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use warp_graphql::queries::get_simple_integrations::SimpleIntegrationsOutput;
use warpui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use galaxy_graphql::mutations::create_simple_integration::CreateSimpleIntegrationOutput;
use galaxy_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use galaxy_graphql::queries::get_simple_integrations::SimpleIntegrationsOutput;
use galaxyui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use super::common::{EnvironmentChoice, ResolveConfigurationError};
use super::integration_output;
@@ -518,7 +518,7 @@ impl IntegrationCommandRunner {
}
}
impl warpui::Entity for IntegrationCommandRunner {
impl galaxyui::Entity for IntegrationCommandRunner {
type Event = ();
}
impl SingletonEntity for IntegrationCommandRunner {}
app/src/ai/agent_sdk/integration_output.rs
+2 -2
View File
@@ -2,11 +2,11 @@ use chrono::{DateTime, Utc};
use comfy_table::{presets::UTF8_FULL, Cell, Table};
use serde::Serialize;
use serde_json::{Map, Value};
use warp_cli::agent::OutputFormat;
use galaxy_cli::agent::OutputFormat;
use crate::ai::agent_sdk::output::{self, TableFormat};
use crate::util::time_format::format_approx_duration_from_now_utc;
use warp_graphql::queries::get_simple_integrations::{
use galaxy_graphql::queries::get_simple_integrations::{
ListedSimpleIntegrationConfig, SimpleIntegration, SimpleIntegrationConnectionStatus,
SimpleIntegrationsOutput,
};
app/src/ai/agent_sdk/mcp.rs
+4 -4
View File
@@ -1,7 +1,7 @@
use comfy_table::Cell;
use serde::Serialize;
use warp_cli::{mcp::MCPCommand, GlobalOptions};
use warpui::{AppContext, ModelContext, SingletonEntity};
use galaxy_cli::{mcp::MCPCommand, GlobalOptions};
use galaxyui::{AppContext, ModelContext, SingletonEntity};
use crate::ai::agent_sdk::output::{self, TableFormat};
use crate::ai::mcp::TemplatableMCPServerManager;
@@ -40,12 +40,12 @@ impl MCPCommandRunner {
global_options.output_format,
);
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
});
}
}
impl warpui::Entity for MCPCommandRunner {
impl galaxyui::Entity for MCPCommandRunner {
type Event = ();
}
impl SingletonEntity for MCPCommandRunner {}
app/src/ai/agent_sdk/mcp_config.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use anyhow::Context as _;
use serde_json::{Map, Value};
use warp_cli::mcp::MCPSpec;
use galaxy_cli::mcp::MCPSpec;
use crate::ai::mcp::TemplatableMCPServer;
app/src/ai/agent_sdk/mcp_config_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use serde_json::{json, Map, Value};
use warp_cli::mcp::MCPSpec;
use galaxy_cli::mcp::MCPSpec;
use super::build_mcp_servers_from_specs;
app/src/ai/agent_sdk/mod.rs
+14 -14
View File
@@ -24,7 +24,7 @@ use crate::server::server_api::ai::AIClient;
use crate::workflows::workflow::Workflow;
use ai::api_keys::{ApiKeyManager, AwsCredentialsRefreshStrategy};
use anyhow::Context;
use warp_cli::{
use galaxy_cli::{
agent::{AgentCommand, AgentProfileCommand, OutputFormat},
artifact::ArtifactCommand,
environment::{EnvironmentCommand, ImageCommand},
@@ -40,13 +40,13 @@ use warp_cli::{
task::{MessageCommand, TaskCommand},
CliCommand, GlobalOptions,
};
use warp_core::features::FeatureFlag;
use warp_isolation_platform::IsolationPlatformError;
use galaxy_core::features::FeatureFlag;
use galaxy_isolation_platform::IsolationPlatformError;
#[cfg(not(target_family = "wasm"))]
use warp_logging::log_file_path;
use warp_managed_secrets::ManagedSecretManager;
use warpui::ModelSpawner;
use warpui::{platform::TerminationMode, AppContext, SingletonEntity};
use galaxy_logging::log_file_path;
use galaxy_managed_secrets::ManagedSecretManager;
use galaxyui::ModelSpawner;
use galaxyui::{platform::TerminationMode, AppContext, SingletonEntity};
use crate::{
ai::ambient_agents::{task::HarnessConfig, AmbientAgentTaskId},
@@ -60,7 +60,7 @@ use crate::{
terminal::view::ConversationRestorationInNewPaneType,
};
use driver::AgentDriverError;
use warp_graphql::object_permissions::OwnerType;
use galaxy_graphql::object_permissions::OwnerType;
use crate::ai::attachment_utils::attachments_download_dir;
use crate::ai::skills::{
@@ -72,8 +72,8 @@ pub(crate) use driver::harness::{
};
pub use driver::AgentDriver;
use telemetry::CliTelemetryEvent;
use warp_cli::agent::{Harness, Prompt, RunAgentArgs};
use warp_cli::OZ_HARNESS_ENV;
use galaxy_cli::agent::{Harness, Prompt, RunAgentArgs};
use galaxy_cli::OZ_HARNESS_ENV;
mod admin;
mod agent_config;
@@ -510,7 +510,7 @@ fn run_task(
));
}
match conv_cmd {
warp_cli::task::ConversationCommand::Get(args) => {
galaxy_cli::task::ConversationCommand::Get(args) => {
ambient::get_conversation(ctx, args.conversation_id)
}
}
@@ -531,11 +531,11 @@ fn run_task(
/// requires spawning an async task, which requires a ModelContext.
struct AgentDriverRunner;
impl warpui::Entity for AgentDriverRunner {
impl galaxyui::Entity for AgentDriverRunner {
type Event = ();
}
impl warpui::SingletonEntity for AgentDriverRunner {}
impl galaxyui::SingletonEntity for AgentDriverRunner {}
impl AgentDriverRunner {
async fn setup_and_run_driver(
@@ -1301,7 +1301,7 @@ fn launch_command(
return dispatch_command(ctx, command, global_options);
}
let cli_name = warp_cli::binary_name().unwrap_or_else(|| "warp".to_string());
let cli_name = galaxy_cli::binary_name().unwrap_or_else(|| "warp".to_string());
let auth_state = AuthStateProvider::handle(ctx).as_ref(ctx).get();
if !auth_state.is_logged_in() {
app/src/ai/agent_sdk/mod_tests.rs
+2 -2
View File
@@ -1,10 +1,10 @@
use serde_json::json;
use warp_cli::{
use galaxy_cli::{
artifact::{ArtifactCommand, DownloadArtifactArgs, GetArtifactArgs, UploadArtifactArgs},
task::{MessageCommand, MessageSendArgs, MessageWatchArgs, TaskCommand},
CliCommand,
};
use warp_core::telemetry::TelemetryEvent;
use galaxy_core::telemetry::TelemetryEvent;
use super::{command_requires_auth, command_to_telemetry_event};
app/src/ai/agent_sdk/model.rs
+3 -3
View File
@@ -4,8 +4,8 @@ use crate::ai::agent_sdk::output::{self, TableFormat};
use crate::ai::llms::LLMPreferences;
use comfy_table::Cell;
use serde::Serialize;
use warp_cli::{model::ModelCommand, GlobalOptions};
use warpui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use galaxy_cli::{model::ModelCommand, GlobalOptions};
use galaxyui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
/// Handle model-related CLI commands.
pub fn run(
@@ -59,7 +59,7 @@ impl ModelCommandRunner {
}
}
impl warpui::Entity for ModelCommandRunner {
impl galaxyui::Entity for ModelCommandRunner {
type Event = ();
}
app/src/ai/agent_sdk/oauth_flow.rs
+2 -2
View File
@@ -2,10 +2,10 @@ use std::sync::Arc;
use std::time::Duration;
use anyhow::{anyhow, Result};
use warpui::r#async::Timer;
use galaxyui::r#async::Timer;
use crate::server::server_api::integrations::IntegrationsClient;
use warp_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
use galaxy_graphql::queries::get_oauth_connect_tx_status::OauthConnectTxStatus;
/// Shared helpers for OAuth-based connect flows (txId + polling).
///
app/src/ai/agent_sdk/output.rs
+2 -2
View File
@@ -11,8 +11,8 @@ use jaq_all::fmts::Format;
use jaq_json::{write as jaq_write, Val};
use serde::Serialize;
use tabwriter::TabWriter;
use warp_cli::agent::OutputFormat;
use warp_cli::json_filter::{JqFilter, JsonOutput};
use galaxy_cli::agent::OutputFormat;
use galaxy_cli::json_filter::{JqFilter, JsonOutput};
pub fn standard_table() -> Table {
let mut table = Table::new();
app/src/ai/agent_sdk/output_tests.rs
+2 -2
View File
@@ -4,8 +4,8 @@ use super::{
use comfy_table::Cell;
use serde::Serialize;
use serde_json::json;
use warp_cli::agent::OutputFormat;
use warp_cli::json_filter::parse_jq_filter;
use galaxy_cli::agent::OutputFormat;
use galaxy_cli::json_filter::parse_jq_filter;
#[derive(Serialize)]
struct TestItem {
app/src/ai/agent_sdk/profiles.rs
+4 -4
View File
@@ -1,7 +1,7 @@
use comfy_table::Cell;
use serde::Serialize;
use warp_cli::{agent::AgentProfileCommand, GlobalOptions};
use warpui::{AppContext, ModelContext, SingletonEntity};
use galaxy_cli::{agent::AgentProfileCommand, GlobalOptions};
use galaxyui::{AppContext, ModelContext, SingletonEntity};
use crate::ai::agent_sdk::output::{self, TableFormat};
use crate::ai::execution_profiles::profiles::AIExecutionProfilesModel;
@@ -52,12 +52,12 @@ impl ProfilesCommandRunner {
output::print_list(profiles, global_options.output_format);
ctx.terminate_app(warpui::platform::TerminationMode::ForceTerminate, None);
ctx.terminate_app(galaxyui::platform::TerminationMode::ForceTerminate, None);
});
}
}
impl warpui::Entity for ProfilesCommandRunner {
impl galaxyui::Entity for ProfilesCommandRunner {
type Event = ();
}
impl SingletonEntity for ProfilesCommandRunner {}
app/src/ai/agent_sdk/provider.rs
+4 -4
View File
@@ -2,12 +2,12 @@
use crate::workspaces::user_workspaces::UserWorkspaces;
use comfy_table::Cell;
use serde::Serialize;
use warp_cli::{
use galaxy_cli::{
provider::{ProviderCommand, ProviderType},
GlobalOptions,
};
use warp_core::channel::ChannelState;
use warpui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use galaxy_core::channel::ChannelState;
use galaxyui::{platform::TerminationMode, AppContext, ModelContext, SingletonEntity};
use crate::ai::agent_sdk::output::{self, TableFormat};
@@ -123,7 +123,7 @@ impl ProviderCommandRunner {
}
}
impl warpui::Entity for ProviderCommandRunner {
impl galaxyui::Entity for ProviderCommandRunner {
type Event = ();
}
impl SingletonEntity for ProviderCommandRunner {}
app/src/ai/agent_sdk/retry.rs
+2 -2
View File
@@ -9,8 +9,8 @@ use std::future::Future;
use std::time::Duration;
use anyhow::{anyhow, Result};
use warpui::duration_with_jitter;
use warpui::r#async::Timer;
use galaxyui::duration_with_jitter;
use galaxyui::r#async::Timer;
pub(crate) use crate::server::retry_strategies::is_transient_http_error;
app/src/ai/agent_sdk/schedule.rs
+5 -5
View File
@@ -2,14 +2,14 @@ use chrono::{DateTime, Utc};
use comfy_table::Cell;
use futures::future;
use serde::Serialize;
use warp_cli::schedule::{
use galaxy_cli::schedule::{
CreateScheduleArgs, DeleteScheduleArgs, GetScheduleArgs, PauseScheduleArgs, ScheduleCommand,
ScheduleSubcommand, UnpauseScheduleArgs, UpdateScheduleArgs,
};
use warp_cli::{agent::OutputFormat, GlobalOptions};
use warp_graphql::queries::get_scheduled_agent_history::ScheduledAgentHistory;
use warpui::platform::TerminationMode;
use warpui::{AppContext, SingletonEntity};
use galaxy_cli::{agent::OutputFormat, GlobalOptions};
use galaxy_graphql::queries::get_scheduled_agent_history::ScheduledAgentHistory;
use galaxyui::platform::TerminationMode;
use galaxyui::{AppContext, SingletonEntity};
use crate::ai::ambient_agents::scheduled::{
CloudScheduledAmbientAgent, ScheduledAgentManager, ScheduledAmbientAgent, UpdateScheduleParams,
app/src/ai/agent_sdk/secret.rs
+5 -5
View File
@@ -8,7 +8,7 @@ use chrono::{DateTime, Utc};
use comfy_table::Cell;
use inquire::{Confirm, InquireError, Password};
use serde::Serialize;
use warp_cli::{
use galaxy_cli::{
agent::OutputFormat,
scope::ObjectScope,
secret::{
@@ -17,13 +17,13 @@ use warp_cli::{
},
GlobalOptions,
};
use warp_core::features::FeatureFlag;
use warp_graphql::{
use galaxy_core::features::FeatureFlag;
use galaxy_graphql::{
managed_secrets::{ManagedSecret, ManagedSecretType},
object::SpaceType,
};
use warp_managed_secrets::{client::SecretOwner, ManagedSecretManager, ManagedSecretValue};
use warpui::{platform::TerminationMode, AppContext, SingletonEntity as _};
use galaxy_managed_secrets::{client::SecretOwner, ManagedSecretManager, ManagedSecretValue};
use galaxyui::{platform::TerminationMode, AppContext, SingletonEntity as _};
use crate::{
auth::UserUid, cloud_object::Owner, server::ids::ServerId,
app/src/ai/agent_sdk/telemetry.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use crate::features::FeatureFlag;
use serde_json::{json, Value};
use strum_macros::{EnumDiscriminants, EnumIter};
use warp_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
#[derive(Debug, EnumDiscriminants)]
#[strum_discriminants(derive(EnumIter))]
@@ -204,7 +204,7 @@ impl TelemetryEvent for CliTelemetryEvent {
}
fn event_descs() -> impl Iterator<Item = Box<dyn TelemetryEventDesc>> {
warp_core::telemetry::enum_events::<Self>()
galaxy_core::telemetry::enum_events::<Self>()
}
}
@@ -421,4 +421,4 @@ impl TelemetryEventDesc for CliTelemetryEventDiscriminants {
}
}
warp_core::register_telemetry_event!(CliTelemetryEvent);
galaxy_core::register_telemetry_event!(CliTelemetryEvent);