merge main

Author: evanliu048

Cargo.lock

@@ -54,7 +54,7 @@ clap = { version = "4.5.32", features = [
 ] }
 clap_complete = "4.5.46"
 clap_complete_fig = "4.4.0"
-color-eyre = "0.6.2"
+color-eyre = "0.6.5"
 color-print = "0.3.5"
 convert_case = "0.8.0"
 cookie = "0.18.1"
@@ -149,6 +149,7 @@ tracing-subscriber = { version = "0.3.19", features = [
     "parking_lot",
     "time",
 ] }
+typed-path = "0.11.0"
 unicode-width = "0.2.0"
 url = "2.5.4"
 uuid = { version = "1.15.1", features = ["v4", "serde"] }

crates/chat-cli/Cargo.toml

@@ -536,6 +536,16 @@ pub async fn logout(database: &mut Database) -> Result<(), AuthError> {
     Ok(())
 }
 
+pub async fn get_start_url_and_region(database: &Database) -> (Option<String>, Option<String>) {
+    // NOTE: Database provides direct methods to access the start_url and region, but they are not
+    // guaranteed to be up to date in the chat session. Example: login is changed mid-chat session.
+    let token = BuilderIdToken::load(database).await;
+    match token {
+        Ok(Some(t)) => (t.start_url, t.region),
+        _ => (None, None),
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct BearerResolver;
 

crates/chat-cli/src/auth/builder_id.rs

@@ -256,7 +256,7 @@ fn resolve_scope_profile(ctx: &Context, scope: Option<Scope>) -> Result<PathBuf>
 
 fn expand_path(ctx: &Context, p: &str) -> Result<PathBuf> {
     let p = shellexpand::tilde(p);
-    let mut path = PathBuf::from(p.as_ref());
+    let mut path = PathBuf::from(p.as_ref() as &str);
     if path.is_relative() {
         path = ctx.env().current_dir()?.join(path);
     }