refactor(config): rename load_config for clarity

pRizz · cursoragent · pRizz · commit 05e6ba814dde · 2026-02-01T20:37:58.000-06:00
Rename load_config to load_config_or_default to better communicate that
missing configs are created with defaults, and update callers.

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/packages/cli-rust/src/commands/cockpit.rs b/packages/cli-rust/src/commands/cockpit.rs
@@ -5,7 +5,7 @@
 use anyhow::{Result, bail};
 use clap::Args;
 use console::style;
-use opencode_cloud_core::config::load_config;
+use opencode_cloud_core::config::load_config_or_default;
 use opencode_cloud_core::docker::{CONTAINER_NAME, container_is_running};
 
 /// Arguments for the cockpit command
@@ -20,7 +20,7 @@ pub struct CockpitArgs {}
 /// 3. Opens the Cockpit URL in the default browser
 pub async fn cmd_cockpit(_args: &CockpitArgs, maybe_host: Option<&str>, quiet: bool) -> Result<()> {
     // Load config
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     // Check if Cockpit is enabled
     if !config.cockpit_enabled {
diff --git a/packages/cli-rust/src/commands/config/env.rs b/packages/cli-rust/src/commands/config/env.rs
@@ -5,7 +5,7 @@
 use anyhow::{Result, bail};
 use clap::Subcommand;
 use console::style;
-use opencode_cloud_core::{load_config, save_config};
+use opencode_cloud_core::{load_config_or_default, save_config};
 
 /// Environment variable management subcommands
 #[derive(Subcommand)]
@@ -49,7 +49,7 @@ fn cmd_env_set(env_var: &str, quiet: bool) -> Result<()> {
     }
 
     // Load config
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
 
     // Remove any existing entry with the same key
     let key_prefix = format!("{key}=");
@@ -74,7 +74,7 @@ fn cmd_env_set(env_var: &str, quiet: bool) -> Result<()> {
 
 /// List all configured environment variables
 fn cmd_env_list(quiet: bool) -> Result<()> {
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     if config.container_env.is_empty() {
         if !quiet {
@@ -97,7 +97,7 @@ fn cmd_env_list(quiet: bool) -> Result<()> {
 
 /// Remove an environment variable
 fn cmd_env_remove(key: &str, quiet: bool) -> Result<()> {
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
 
     // Check if any entry matches
     let key_prefix = format!("{key}=");
diff --git a/packages/cli-rust/src/commands/config/set.rs b/packages/cli-rust/src/commands/config/set.rs
@@ -7,14 +7,14 @@ use console::style;
 use dialoguer::{Confirm, Password};
 use opencode_cloud_core::config::validate_bind_address;
 use opencode_cloud_core::docker::{CONTAINER_NAME, DockerClient, container_is_running};
-use opencode_cloud_core::{load_config, save_config};
+use opencode_cloud_core::{load_config_or_default, save_config};
 
 /// Set a configuration value
 ///
 /// Special handling for password: prompts interactively if value is None.
 /// Returns error if password value is provided on command line (security risk).
 pub fn cmd_config_set(key: &str, value: Option<&str>, quiet: bool, force: bool) -> Result<()> {
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
     let normalized_key = key.to_lowercase();
 
     // Display value for output (password is masked)
diff --git a/packages/cli-rust/src/commands/install.rs b/packages/cli-rust/src/commands/install.rs
@@ -8,7 +8,7 @@ use anyhow::{Result, anyhow};
 use clap::Args;
 use console::style;
 use dialoguer::Confirm;
-use opencode_cloud_core::config::load_config;
+use opencode_cloud_core::config::load_config_or_default;
 use opencode_cloud_core::platform::{
     ServiceConfig, get_service_manager, is_service_registration_supported,
 };
@@ -91,7 +91,7 @@ pub async fn cmd_install(args: &InstallArgs, quiet: bool, _verbose: u8) -> Resul
     let executable_path = std::env::current_exe()?;
 
     // 6. Load config for restart settings
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     // 7. Build ServiceConfig
     let service_config = ServiceConfig {
diff --git a/packages/cli-rust/src/commands/mount/add.rs b/packages/cli-rust/src/commands/mount/add.rs
@@ -3,7 +3,7 @@
 use anyhow::{Result, bail};
 use clap::Args;
 use console::style;
-use opencode_cloud_core::config::{load_config, save_config};
+use opencode_cloud_core::config::{load_config_or_default, save_config};
 use opencode_cloud_core::docker::{ParsedMount, check_container_path_warning, validate_mount_path};
 
 #[derive(Args)]
@@ -43,7 +43,7 @@ pub async fn cmd_mount_add(args: &MountAddArgs, quiet: bool, _verbose: u8) -> Re
     }
 
     // Load config and add mount
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
 
     // Check for duplicate (by host path)
     let host_str = parsed.host_path.to_string_lossy();
diff --git a/packages/cli-rust/src/commands/mount/list.rs b/packages/cli-rust/src/commands/mount/list.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use clap::Args;
 use comfy_table::{Cell, Table, presets::UTF8_FULL_CONDENSED};
 use console::style;
-use opencode_cloud_core::config::load_config;
+use opencode_cloud_core::config::load_config_or_default;
 use opencode_cloud_core::docker::ParsedMount;
 use std::path::Path;
 
@@ -40,7 +40,7 @@ fn resolve_docker_path(path: &Path) -> String {
 }
 
 pub async fn cmd_mount_list(args: &MountListArgs, quiet: bool, _verbose: u8) -> Result<()> {
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     if config.mounts.is_empty() {
         if !quiet && !args.names_only {
diff --git a/packages/cli-rust/src/commands/mount/remove.rs b/packages/cli-rust/src/commands/mount/remove.rs
@@ -3,7 +3,7 @@
 use anyhow::{Result, bail};
 use clap::Args;
 use console::style;
-use opencode_cloud_core::config::{load_config, save_config};
+use opencode_cloud_core::config::{load_config_or_default, save_config};
 use opencode_cloud_core::docker::ParsedMount;
 
 #[derive(Args)]
@@ -13,7 +13,7 @@ pub struct MountRemoveArgs {
 }
 
 pub async fn cmd_mount_remove(args: &MountRemoveArgs, quiet: bool, _verbose: u8) -> Result<()> {
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
 
     // Find and remove mount by host path
     let original_len = config.mounts.len();
diff --git a/packages/cli-rust/src/commands/restart.rs b/packages/cli-rust/src/commands/restart.rs
@@ -6,7 +6,7 @@ use crate::output::{CommandSpinner, format_docker_error, show_docker_error};
 use anyhow::{Result, anyhow};
 use clap::Args;
 use console::style;
-use opencode_cloud_core::config::load_config;
+use opencode_cloud_core::config::load_config_or_default;
 use opencode_cloud_core::docker::{
     CONTAINER_NAME, container_is_running, setup_and_start, stop_service,
 };
@@ -48,7 +48,7 @@ pub async fn cmd_restart(
     })?;
 
     // Load config for port and bind_address
-    let config = load_config()?;
+    let config = load_config_or_default()?;
     let port = config.opencode_web_port;
     let bind_addr = &config.bind_address;
 
diff --git a/packages/cli-rust/src/commands/setup.rs b/packages/cli-rust/src/commands/setup.rs
@@ -7,7 +7,7 @@ use clap::Args;
 use console::style;
 use dialoguer::Confirm;
 use opencode_cloud_core::docker::{CONTAINER_NAME, container_is_running};
-use opencode_cloud_core::{Config, load_config, save_config};
+use opencode_cloud_core::{Config, load_config_or_default, save_config};
 
 use crate::commands::{cmd_start, cmd_stop};
 use crate::wizard::run_wizard;
@@ -31,7 +31,7 @@ pub struct SetupArgs {
 /// Run the setup command
 pub async fn cmd_setup(args: &SetupArgs, quiet: bool) -> Result<()> {
     // Load existing config (or create default)
-    let existing_config = load_config().ok();
+    let existing_config = load_config_or_default().ok();
 
     if args.bootstrap {
         return run_bootstrap_setup(existing_config, args.host.as_deref(), quiet).await;
diff --git a/packages/cli-rust/src/commands/start.rs b/packages/cli-rust/src/commands/start.rs
@@ -600,7 +600,7 @@ pub async fn cmd_start(
     })?;
 
     // Load config for port and bind_address
-    let config = opencode_cloud_core::config::load_config()?;
+    let config = opencode_cloud_core::config::load_config_or_default()?;
     let port = args.port.unwrap_or(config.opencode_web_port);
     let bind_addr = &config.bind_address;
     // Validate config before starting
@@ -1112,7 +1112,7 @@ fn show_start_result(
     println!("Port:       {port} -> 3000");
 
     // Show Cockpit availability if enabled
-    if let Ok(config) = opencode_cloud_core::config::load_config() {
+    if let Ok(config) = opencode_cloud_core::config::load_config_or_default() {
         if config.cockpit_enabled {
             let cockpit_url =
                 format_cockpit_url(maybe_remote_addr.as_deref(), bind_addr, config.cockpit_port);
diff --git a/packages/cli-rust/src/commands/status.rs b/packages/cli-rust/src/commands/status.rs
@@ -146,7 +146,7 @@ pub async fn cmd_status(
         .unwrap_or_else(|| "unknown".to_string());
 
     // Load config early for reuse in multiple sections
-    let config = config::load_config().ok();
+    let config = config::load_config_or_default().ok();
     let bind_addr = config
         .as_ref()
         .map(|cfg| cfg.bind_address.as_str())
@@ -164,7 +164,7 @@ pub async fn cmd_status(
             let installed = manager.is_installed().unwrap_or(false);
             let install_status = if installed {
                 // Load config to determine boot mode
-                let boot_mode = config::load_config()
+                let boot_mode = config::load_config_or_default()
                     .map(|c| c.boot_mode)
                     .unwrap_or_else(|_| "user".to_string());
                 let boot_desc = if boot_mode == "system" {
diff --git a/packages/cli-rust/src/commands/update.rs b/packages/cli-rust/src/commands/update.rs
@@ -8,7 +8,7 @@ use anyhow::{Result, anyhow};
 use clap::{Args, Subcommand};
 use console::style;
 use dialoguer::Confirm;
-use opencode_cloud_core::config::load_config;
+use opencode_cloud_core::config::load_config_or_default;
 use opencode_cloud_core::docker::update::tag_current_as_previous;
 use opencode_cloud_core::docker::{
     CONTAINER_NAME, DockerClient, IMAGE_TAG_DEFAULT, ImageState, ProgressReporter, build_image,
@@ -126,7 +126,7 @@ pub async fn cmd_update(
         .map_err(|e| anyhow!("Docker connection error: {e}"))?;
 
     // Load config
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     if args.rollback {
         // Rollback flow
@@ -310,7 +310,7 @@ pub(crate) async fn cmd_update_opencode(
         .await
         .map_err(|e| anyhow!("Docker connection error: {e}"))?;
 
-    let config = load_config()?;
+    let config = load_config_or_default()?;
 
     if !container_exists(&client, CONTAINER_NAME).await? {
         return Err(anyhow!(
diff --git a/packages/cli-rust/src/commands/user/add.rs b/packages/cli-rust/src/commands/user/add.rs
@@ -10,7 +10,7 @@ use dialoguer::{Input, Password};
 use opencode_cloud_core::docker::{
     CONTAINER_NAME, DockerClient, create_user, persist_user, set_user_password, user_exists,
 };
-use opencode_cloud_core::{load_config, save_config};
+use opencode_cloud_core::{load_config_or_default, save_config};
 
 /// Arguments for the user add command
 #[derive(Args)]
@@ -119,7 +119,7 @@ pub async fn cmd_user_add(
     persist_user(client, CONTAINER_NAME, &username).await?;
 
     // Update config - add username to users array
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
     if !config.users.contains(&username) {
         config.users.push(username.clone());
         save_config(&config)?;
diff --git a/packages/cli-rust/src/commands/user/remove.rs b/packages/cli-rust/src/commands/user/remove.rs
@@ -9,7 +9,7 @@ use dialoguer::Confirm;
 use opencode_cloud_core::docker::{
     CONTAINER_NAME, DockerClient, delete_user, list_users, remove_persisted_user, user_exists,
 };
-use opencode_cloud_core::{load_config, save_config};
+use opencode_cloud_core::{load_config_or_default, save_config};
 
 /// Arguments for the user remove command
 #[derive(Args)]
@@ -50,7 +50,7 @@ pub async fn cmd_user_remove(
     }
 
     // Load config for later update
-    let mut config = load_config()?;
+    let mut config = load_config_or_default()?;
 
     // Check if this is the last user in the container (not just tracked users)
     let container_users = list_users(client, CONTAINER_NAME).await?;
diff --git a/packages/cli-rust/src/lib.rs b/packages/cli-rust/src/lib.rs
@@ -13,8 +13,8 @@ use clap::{Parser, Subcommand};
 use console::style;
 use dialoguer::Confirm;
 use opencode_cloud_core::{
-    DockerClient, InstanceLock, SingletonError, config, get_version, load_config, load_hosts,
-    save_config,
+    DockerClient, InstanceLock, SingletonError, config, get_version, load_config_or_default,
+    load_hosts, save_config,
 };
 
 /// Manage your opencode cloud service
@@ -157,7 +157,12 @@ pub fn run() -> Result<()> {
         .ok_or_else(|| anyhow!("Could not determine config path"))?;
     let config_exists = config_path.exists();
 
-    if !config_exists {
+    let skip_wizard = matches!(
+        cli.command,
+        Some(Commands::Setup(ref args)) if args.bootstrap || args.yes
+    );
+
+    if !config_exists && !skip_wizard {
         eprintln!(
             "{} First-time setup required. Running wizard...",
             style("Note:").cyan()
@@ -175,7 +180,7 @@ pub fn run() -> Result<()> {
     }
 
     // Load config
-    let config = match load_config() {
+    let config = match load_config_or_default() {
         Ok(config) => {
             // If config was just created, inform the user
             if cli.verbose > 0 {
diff --git a/packages/core/src/config/mod.rs b/packages/core/src/config/mod.rs
@@ -65,7 +65,7 @@ pub fn ensure_data_dir() -> Result<PathBuf> {
 /// If the config file doesn't exist, creates a new one with default values.
 /// Supports JSONC (JSON with comments).
 /// Rejects unknown fields for strict validation.
-pub fn load_config() -> Result<Config> {
+pub fn load_config_or_default() -> Result<Config> {
     let config_path =
         get_config_path().ok_or_else(|| anyhow::anyhow!("Could not determine config file path"))?;
 
diff --git a/packages/core/src/lib.rs b/packages/core/src/lib.rs
@@ -14,7 +14,7 @@ pub mod version;
 pub use version::{get_version, get_version_long};
 
 // Re-export config types and functions
-pub use config::{Config, get_hosts_path, load_config, save_config};
+pub use config::{Config, get_hosts_path, load_config_or_default, save_config};
 
 // Re-export singleton types
 pub use singleton::{InstanceLock, SingletonError};
