Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/apps/cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,7 @@ async fn run_interactive(

// ======================== Main ========================

#[tokio::main]
async fn main() -> Result<()> {
async fn run_cli() -> Result<()> {
let cli = Cli::parse();

let is_tui_mode = matches!(cli.command, None | Some(Commands::Chat { .. }));
Expand Down Expand Up @@ -766,3 +765,28 @@ async fn run_interactive_with_session(config: CliConfig, session_id: String) ->
Ok(())
}

fn main() {
let worker = std::thread::Builder::new()
.stack_size(16 * 1024 * 1024)
.spawn(|| {
let runtime = tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
.expect("failed to build tokio runtime");
runtime.block_on(run_cli())
})
.expect("failed to spawn bitfun-cli worker thread");

match worker.join() {
Ok(Ok(())) => {}
Ok(Err(err)) => {
eprintln!("Error: {err}");
std::process::exit(1);
}
Err(_) => {
eprintln!("Error: bitfun-cli worker thread panicked");
std::process::exit(1);
}
}
}

23 changes: 14 additions & 9 deletions src/crates/core/src/service/config/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,26 @@ impl ConfigManager {
/// Loads or creates the configuration file.
async fn load_or_create_config(&mut self) -> BitFunResult<()> {
if self.config_file.exists() {
self.load_and_migrate_config().await?;
self.load_existing_config().await?;
} else {
self.config = self.providers.get_default_config();
Self::add_default_agent_models_config(&mut self.config.ai.agent_models);
Self::add_default_func_agent_models_config(&mut self.config.ai.func_agent_models);
self.config.version = env!("CARGO_PKG_VERSION").to_string();
self.save_config().await?;
debug!("Created default config file");
self.create_default_config().await?;
}

Ok(())
}

/// Loads and migrates configuration.
async fn load_and_migrate_config(&mut self) -> BitFunResult<()> {
/// Creates the first config file using the already initialized defaults.
async fn create_default_config(&mut self) -> BitFunResult<()> {
Self::add_default_agent_models_config(&mut self.config.ai.agent_models);
Self::add_default_func_agent_models_config(&mut self.config.ai.func_agent_models);
self.config.version = env!("CARGO_PKG_VERSION").to_string();
self.save_config().await?;
debug!("Created default config file");
Ok(())
}

/// Loads an existing config file and migrates it if needed.
async fn load_existing_config(&mut self) -> BitFunResult<()> {
let content = fs::read_to_string(&self.config_file)
.await
.map_err(|e| BitFunError::config(format!("Failed to read config file: {}", e)))?;
Expand Down
46 changes: 1 addition & 45 deletions src/crates/core/src/service/config/providers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,51 +570,7 @@ impl ConfigProviderRegistry {

/// Builds the default configuration.
pub fn get_default_config(&self) -> GlobalConfig {
let mut config = GlobalConfig::default();

if let Some(provider) = self.get_provider("app") {
if let Ok(app_config) = serde_json::from_value(provider.get_default_config()) {
config.app = app_config;
}
}

if let Some(provider) = self.get_provider("theme") {
if let Ok(theme_config) = serde_json::from_value(provider.get_default_config()) {
config.theme = theme_config;
}
}

if let Some(provider) = self.get_provider("themes") {
if let Ok(themes_config) = serde_json::from_value(provider.get_default_config()) {
config.themes = Some(themes_config);
}
}

if let Some(provider) = self.get_provider("editor") {
if let Ok(editor_config) = serde_json::from_value(provider.get_default_config()) {
config.editor = editor_config;
}
}

if let Some(provider) = self.get_provider("terminal") {
if let Ok(terminal_config) = serde_json::from_value(provider.get_default_config()) {
config.terminal = terminal_config;
}
}

if let Some(provider) = self.get_provider("workspace") {
if let Ok(workspace_config) = serde_json::from_value(provider.get_default_config()) {
config.workspace = workspace_config;
}
}

if let Some(provider) = self.get_provider("ai") {
if let Ok(ai_config) = serde_json::from_value(provider.get_default_config()) {
config.ai = ai_config;
}
}

config
GlobalConfig::default()
}

/// Validates the full configuration.
Expand Down
Loading