v0.2.6-pre.003

crates/ksp-app-wallet-desk/src/app_state.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-app-wallet-desk/src/app_state.rs
-// version: 2
+// version: 3
 
 //! Shared backend state owned by the Wallet Desk Tauri application.
 
@@ -9,10 +9,11 @@ pub(crate) struct AppState {
     logging_runtime: std::sync::Mutex<LoggingRuntimeState>,
     splash_settings: crate::SplashSettings,
     splash_sequence_started: std::sync::atomic::AtomicBool,
+    wallet_config_startup: crate::WalletConfigStartup,
 }
 
 impl AppState {
-    /// Initializes Config ownership, Logging and the common desktop splash state.
+    /// Initializes Config composition, Logging, Wallet directory preparation and the common desktop splash state.
     pub(crate) fn initialize(arguments: &[std::ffi::OsString]) -> ksp_core_lib::Result<Self> {
         let config_management = crate::config_management(arguments);
         let config_management = match config_management {
@@ -29,6 +30,14 @@ impl AppState {
             std::result::Result::Ok(value) => value,
             std::result::Result::Err(error) => return std::result::Result::Err(error),
         };
+        let wallet_config_startup = crate::initialize_wallet_config(&config_management);
+        let wallet_config_startup = match wallet_config_startup {
+            std::result::Result::Ok(value) => value,
+            std::result::Result::Err(error) => {
+                ksp_logging_lib::error!(target: crate::TRACING_TARGET, domain = crate::TRACING_DOMAIN_BOOTSTRAP, error_domain = error.code().domain(), error_code = error.code().code(), "Wallet Desk Config/Wallet directory bootstrap failed");
+                return std::result::Result::Err(error);
+            },
+        };
         let splash_settings = crate::SplashSettings::load();
         let splash_settings = match splash_settings {
             std::result::Result::Ok(value) => value,
@@ -48,10 +57,11 @@ impl AppState {
             }),
             splash_settings,
             splash_sequence_started: std::sync::atomic::AtomicBool::new(false),
+            wallet_config_startup,
         });
     }
 
-    /// Builds the safe shell status DTO exposed during pre.002.
+    /// Builds the safe Config-composition status DTO exposed during pre.003.
     pub(crate) fn runtime_status(&self) -> ksp_core_lib::Result<crate::RuntimeStatusDto> {
         let document_count = self.config_management.engine().registry().descriptors().count();
         let document_count = u32::try_from(document_count);
@@ -61,7 +71,7 @@ impl AppState {
                 return std::result::Result::Err(
                     ksp_core_lib::Error::new(
                         crate::ERROR_CODE_APP_STATE_INVALID,
-                        "Config registry contains too many descriptors for the Wallet Desk shell DTO",
+                        "Config registry contains too many descriptors for the Wallet Desk runtime DTO",
                     )
                     .with_source(error),
                 );
@@ -78,13 +88,22 @@ impl AppState {
             },
         };
         let _keep_guard_alive = &runtime.guard;
+        let resolved = self.wallet_config_startup.resolved();
+        let wallets_subdirectory = resolved.wallets_subdirectory().map(|value| return value.to_string_lossy().into_owned());
         return std::result::Result::Ok(crate::RuntimeStatusDto {
             application_version: env!("CARGO_PKG_VERSION").to_owned(),
-            config_document_count: document_count,
+            active_composite_profile: self.wallet_config_startup.composite_profile_id().to_owned(),
             active_logging_profile: runtime.active_profile_id.clone(),
+            active_wallet_profile: resolved.profile_id().to_owned(),
+            config_document_count: document_count,
+            effective_wallets_directory: resolved.effective_wallets_directory().to_string_lossy().into_owned(),
+            effective_wallets_directory_created_on_startup: self.wallet_config_startup.effective_directory_created_on_startup(),
             fallback_logging_active: runtime.fallback_active,
+            root_wallets_directory_created_on_startup: self.wallet_config_startup.root_directory_created_on_startup(),
+            shell_phase: "pre.003-config-wallet".to_owned(),
             startup_diagnostic: runtime.startup_diagnostic.clone(),
-            shell_phase: "pre.002-shell".to_owned(),
+            wallets_directory: resolved.wallets_directory().to_string_lossy().into_owned(),
+            wallets_subdirectory,
         });
     }