feat: simplify bot name handling and improve logging

- Added RUST_LOG=trace to VSCode debug configurations for better debugging
- Removed unused imports (uuid, Selectable, SelectableHelper) from bootstrap module
- Simplified bot name handling by removing name formatting logic, using raw bot folder names
- Renamed check_default_gbot to check_gbot for consistency
- Improved logging format in drive monitor initialization
- Fixed S3 bucket reference in bootstrap manager (removed 'templates/' prefix)

.vscode/launch.json

@@ -16,6 +16,9 @@
         }
       },
       "args": [],
+      "env": {
+        "RUST_LOG": "trace"
+      },
       "cwd": "${workspaceFolder}"
     },
     {
@@ -30,6 +33,9 @@
         }
       },
       "args": [],
+      "env": {
+        "RUST_LOG": "trace"
+      },
       "cwd": "${workspaceFolder}"
     }
   ]

src/bootstrap/mod.rs

@@ -1,7 +1,7 @@
 use crate::config::AppConfig;
 use crate::package_manager::{InstallMode, PackageManager};
 use anyhow::Result;
-use diesel::{connection::SimpleConnection, RunQueryDsl, Connection, QueryableByName, Selectable};
+use diesel::{connection::SimpleConnection, RunQueryDsl, Connection, QueryableByName};
 use dotenvy::dotenv;
 use log::{debug, error, info, trace};
 use aws_sdk_s3::Client;
@@ -13,8 +13,6 @@ use std::io::{self, Write};
 use std::path::Path;
 use std::process::Command;
 use std::sync::{Arc, Mutex};
-use uuid::Uuid;
-use diesel::SelectableHelper;
 
 use diesel::Queryable;
 
@@ -455,22 +453,9 @@ impl BootstrapManager {
             if path.is_dir() && path.extension().map(|e| e == "gbai").unwrap_or(false) {
                 let bot_folder = path.file_name().unwrap().to_string_lossy().to_string();
                 let bot_name = bot_folder.trim_end_matches(".gbai");
-                let formatted_name = bot_name
-                    .split('_')
-                    .map(|word| {
-                        let mut chars = word.chars();
-                        match chars.next() {
-                            None => String::new(),
-                            Some(first) => {
-                                first.to_uppercase().collect::<String>() + chars.as_str()
-                            }
-                        }
-                    })
-                    .collect::<Vec<_>>()
-                    .join(" ");
 
                 let existing: Option<String> = bots::table
-                    .filter(bots::name.eq(&formatted_name))
+                    .filter(bots::name.eq(&bot_name))
                     .select(bots::name)
                     .first(conn)
                     .optional()?;
@@ -480,11 +465,11 @@ impl BootstrapManager {
                         "INSERT INTO bots (id, name, description, llm_provider, llm_config, context_provider, context_config, is_active) \
                          VALUES (gen_random_uuid(), $1, $2, 'openai', '{\"model\": \"gpt-4\", \"temperature\": 0.7}', 'database', '{}', true)"
                     )
-                    .bind::<diesel::sql_types::Text, _>(&formatted_name)
+                    .bind::<diesel::sql_types::Text, _>(&bot_name)
                     .bind::<diesel::sql_types::Text, _>(format!("Bot for {} template", bot_name))
                     .execute(conn)?;
                 } else {
-                    log::trace!("Bot {} already exists", formatted_name);
+                    log::trace!("Bot {} already exists", bot_name);
                 }
             }
         }
@@ -541,7 +526,7 @@ impl BootstrapManager {
         use uuid::Uuid;
 
         let client = &self.s3_client;
-        let bucket = "templates/default.gbai";
+        let bucket = "default.gbai";
         let config_key = "default.gbot/config.csv";
         
         match client.get_object()

src/drive_monitor/mod.rs

@@ -2,8 +2,8 @@ use crate::basic::compiler::BasicCompiler;
 use crate::kb::embeddings;
 use crate::kb::qdrant_client;
 use crate::shared::state::AppState;
-use log::{debug, error, info, warn};
 use aws_sdk_s3::Client;
+use log::{debug, error, info, warn};
 use std::collections::HashMap;
 use std::error::Error;
 use std::sync::Arc;
@@ -34,7 +34,10 @@ impl DriveMonitor {
 
     pub fn spawn(self: Arc<Self>) -> tokio::task::JoinHandle<()> {
         tokio::spawn(async move {
-            info!("Drive Monitor service started for bucket: {}", self.bucket_name);
+            info!(
+                "Drive Monitor service started for bucket: {}",
+                self.bucket_name
+            );
             let mut tick = interval(Duration::from_secs(30));
             loop {
                 tick.tick().await;
@@ -56,7 +59,7 @@ impl DriveMonitor {
         self.check_gbdialog_changes(client).await?;
         self.check_gbkb_changes(client).await?;
 
-        if let Err(e) = self.check_default_gbot(client).await {
+        if let Err(e) = self.check_gbot(client).await {
             error!("Error checking default bot config: {}", e);
         }
 
@@ -73,16 +76,20 @@ impl DriveMonitor {
 
         let mut continuation_token = None;
         loop {
-            let list_objects = client.list_objects_v2()
-                .bucket(&self.bucket_name)
-                .prefix(prefix)
+            let list_objects = client
+                .list_objects_v2()
+                .bucket(&self.bucket_name.to_lowercase())
                 .set_continuation_token(continuation_token)
                 .send()
                 .await?;
+            debug!("List objects result: {:?}", list_objects);
 
             for obj in list_objects.contents.unwrap_or_default() {
                 let path = obj.key().unwrap_or_default().to_string();
-                
+                let path_parts: Vec<&str> = path.split('/').collect();
+                if path_parts.len() < 2 || !path_parts[0].ends_with(".gbdialog") {
+                    continue;
+                }
                 if path.ends_with('/') || !path.ends_with(".bas") {
                     continue;
                 }
@@ -146,16 +153,25 @@ impl DriveMonitor {
 
         let mut continuation_token = None;
         loop {
-            let list_objects = client.list_objects_v2()
-                .bucket(&self.bucket_name)
+            let list_objects = client
+                .list_objects_v2()
+                .bucket(&self.bucket_name.to_lowercase())
                 .prefix(prefix)
                 .set_continuation_token(continuation_token)
                 .send()
                 .await?;
+            debug!("List objects result: {:?}", list_objects);
 
             for obj in list_objects.contents.unwrap_or_default() {
                 let path = obj.key().unwrap_or_default().to_string();
 
+                let path_parts: Vec<&str> = path.split('/').collect();
+                if path_parts.len() < 2 || !path_parts[0].ends_with(".gbkb") {
+                    continue;
+                }
+
+
+
                 if path.ends_with('/') {
                     continue;
                 }
@@ -214,55 +230,103 @@ impl DriveMonitor {
         Ok(())
     }
 
-    async fn check_default_gbot(
+    async fn check_gbot(
         &self,
         client: &Client,
     ) -> Result<(), Box<dyn Error + Send + Sync>> {
-        let prefix = format!("{}default.gbot/", self.bucket_name);
-        let config_key = format!("{}config.csv", prefix);
+        let prefix = ".gbot/";
+        let mut continuation_token = None;
 
-        match client.head_object()
-            .bucket(&self.bucket_name)
-            .key(&config_key)
-            .send()
-            .await 
-        {
-            Ok(_) => {
-                let response = client.get_object()
-                    .bucket(&self.bucket_name)
-                    .key(&config_key)
+        loop {
+            let list_objects = client
+                .list_objects_v2()
+                .bucket(&self.bucket_name.to_lowercase())
+                .prefix(prefix)
+                .set_continuation_token(continuation_token)
                 .send()
                 .await?;
 
+            for obj in list_objects.contents.unwrap_or_default() {
+                let path = obj.key().unwrap_or_default().to_string();
+                let path_parts: Vec<&str> = path.split('/').collect();
+                
+                if path_parts.len() < 2 || !path_parts[0].ends_with(".gbot") {
+                    continue;
+                }
+                
+                if !path.ends_with("config.csv") {
+                    continue;
+                }
+
+                debug!("Checking config file at path: {}", path);
+                match client
+                    .head_object()
+                    .bucket(&self.bucket_name)
+                    .key(&path)
+                    .send()
+                    .await
+                {
+                    Ok(head_res) => {
+                        debug!("HeadObject successful for {}, metadata: {:?}", path, head_res);
+                        let response = client
+                            .get_object()
+                            .bucket(&self.bucket_name)
+                            .key(&path)
+                            .send()
+                            .await?;
+                        debug!("GetObject successful for {}, content length: {}", path, response.content_length().unwrap_or(0));
+
                         let bytes = response.body.collect().await?.into_bytes();
+                        debug!("Collected {} bytes for {}", bytes.len(), path);
                         let csv_content = String::from_utf8(bytes.to_vec())
-                    .map_err(|e| format!("UTF-8 error in config.csv: {}", e))?;
-                debug!("Found config.csv: {} bytes", csv_content.len());
-                Ok(())
+                            .map_err(|e| format!("UTF-8 error in {}: {}", path, e))?;
+                        debug!("Found {}: {} bytes", path, csv_content.len());
                     }
                     Err(e) => {
-                debug!("Config file not found or inaccessible: {}", e);
+                        debug!("Config file {} not found or inaccessible: {}", path, e);
+                    }
+                }
+            }
+
+            if !list_objects.is_truncated.unwrap_or(false) {
+                break;
+            }
+            continuation_token = list_objects.next_continuation_token;
+        }
+
         Ok(())
     }
-        }
-    }
 
     async fn compile_tool(
         &self,
         client: &Client,
         file_path: &str,
     ) -> Result<(), Box<dyn Error + Send + Sync>> {
-        let response = client.get_object()
+        debug!("Fetching object from S3: bucket={}, key={}", &self.bucket_name, file_path);
+        let response = match client
+            .get_object()
             .bucket(&self.bucket_name)
             .key(file_path)
             .send()
-            .await?;
+            .await {
+                Ok(res) => {
+                    debug!("Successfully fetched object from S3: bucket={}, key={}, size={}",
+                        &self.bucket_name, file_path, res.content_length().unwrap_or(0));
+                    res
+                }
+                Err(e) => {
+                    error!("Failed to fetch object from S3: bucket={}, key={}, error={:?}",
+                        &self.bucket_name, file_path, e);
+                    return Err(e.into());
+                }
+            };
 
         let bytes = response.body.collect().await?.into_bytes();
         let source_content = String::from_utf8(bytes.to_vec())?;
 
         let tool_name = file_path
-            .strip_prefix(".gbdialog/")
+            .split('/')
+            .last()
             .unwrap_or(file_path)
             .strip_suffix(".bas")
             .unwrap_or(file_path)
@@ -272,7 +336,7 @@ impl DriveMonitor {
             .bucket_name
             .strip_suffix(".gbai")
             .unwrap_or(&self.bucket_name);
-        let work_dir = format!("./work/{}.gbai/.gbdialog", bot_name);
+        let work_dir = format!("./work/{}.gbai/{}.gbdialog", bot_name, bot_name);
         std::fs::create_dir_all(&work_dir)?;
 
         let local_source_path = format!("{}/{}.bas", work_dir, tool_name);
@@ -307,7 +371,8 @@ impl DriveMonitor {
         }
 
         let collection_name = parts[1];
-        let response = client.get_object()
+        let response = client
+            .get_object()
             .bucket(&self.bucket_name)
             .key(file_path)
             .send()