Skip to content

Cool updates #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anasx07 merged 3 commits into from
Jun 7, 2026
Merged

Cool updates #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e1add
fix: resolve Windows file-locking deadlock during update process
anasx07 Jun 7, 2026
d79ab26
fix: implement Google Cloud Project ID prompt step in Vertex AI crede…
anasx07 Jun 7, 2026
0ea1d72
feat: add support for loading Vertex AI and Google credentials from e…
anasx07 Jun 7, 2026
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 15 additions & 6 deletions apps/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,13 @@ async fn main() -> anyhow::Result<()> {
let provider_name = config.provider.clone();
let api_key = std::env::var(format!("{}_API_KEY", provider_name.to_uppercase()))
.ok()
.or_else(|| {
if provider_name == "vertex" {
std::env::var("GOOGLE_API_KEY").ok()
} else {
None
}
})
.or_else(|| config.api_keys.get(&provider_name).cloned());

let api_key = match api_key {
Expand Down Expand Up @@ -447,13 +454,15 @@ async fn main() -> anyhow::Result<()> {
#[cfg(target_os = "windows")]
{
match std::process::Command::new("powershell")
.args(["-NoProfile", "-Command", "irm https://raw.githubusercontent.com/anasx07/routecode/main/install.ps1 | iex"])
.status()
.args([
"-NoProfile",
"-Command",
"Start-Sleep -m 500; irm https://raw.githubusercontent.com/anasx07/routecode/main/install.ps1 | iex",
])
.spawn()
{
Ok(status) => {
if !status.success() {
eprintln!("Update command failed with exit code: {:?}", status.code());
}
Ok(_) => {
std::process::exit(0);
}
Err(e) => eprintln!("Failed to run update command: {}", e),
}
Expand Down
28 changes: 23 additions & 5 deletions apps/cli/src/ui/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ pub(crate) async fn handle_key_event(
format!("{}_API_KEY", provider_id.to_uppercase().replace("-", "_"));
let api_key = std::env::var(env_key)
.ok()
.or_else(|| {
if provider_id == "vertex" {
std::env::var("GOOGLE_API_KEY").ok()
} else {
None
}
})
.or_else(|| config.api_keys.get(provider_id).cloned());
if let Some(key) = api_key {
config.model = model_name.clone();
Expand Down Expand Up @@ -375,10 +382,11 @@ pub(crate) async fn handle_key_event(
ApiKeyInputStage::ApiKey => {
if let Some(provider_id) = app.pending_provider_id.clone() {
if provider_id == "vertex" {
app.api_key_input_stage = ApiKeyInputStage::VertexLocation;
app.pending_account_id = Some(input_value);
app.api_key_input_stage = ApiKeyInputStage::VertexProject;
app.api_key_input = TextArea::default();
app.api_key_input
.set_placeholder_text(" Location (e.g. us-central1)...");
.set_placeholder_text(" Google Cloud Project ID...");
} else {
app.pending_provider_id.take();
let mut config = app.orchestrator.config.lock().await;
Expand All @@ -397,13 +405,20 @@ pub(crate) async fn handle_key_event(
app.api_key_input_stage = ApiKeyInputStage::None;
}
}
ApiKeyInputStage::VertexProject => {
app.pending_gateway_id = Some(input_value);
app.api_key_input_stage = ApiKeyInputStage::VertexLocation;
app.api_key_input = TextArea::default();
app.api_key_input
.set_placeholder_text(" Location (e.g. us-central1)...");
}
ApiKeyInputStage::VertexLocation => {
if let Some(provider_id) = app.pending_provider_id.take() {
let location = input_value;
let api_key =
app.api_key_input.lines().join("\n").trim().to_string();
let api_key = app.pending_account_id.take().unwrap_or_default();
let project = app.pending_gateway_id.take().unwrap_or_default();
let mut config = app.orchestrator.config.lock().await;
config.vertex_project = "".to_string();
config.vertex_project = project;
config.vertex_location = location;
config.api_keys.insert(provider_id, api_key);
if let Err(e) = routecode_sdk::utils::storage::save_config(&config)
Expand Down Expand Up @@ -480,6 +495,9 @@ pub(crate) async fn handle_key_event(
if api_key.is_none() && provider_id.starts_with("cloudflare") {
api_key = std::env::var("CLOUDFLARE_API_KEY").ok();
}
if api_key.is_none() && provider_id == "vertex" {
api_key = std::env::var("GOOGLE_API_KEY").ok();
}
if api_key.is_none() {
let config = app.orchestrator.config.lock().await;
api_key = config.api_keys.get(provider_id).cloned();
Expand Down
4 changes: 4 additions & 0 deletions apps/cli/src/ui/menus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ pub fn render_api_key_dialog(f: &mut Frame, app: &mut App) {
ApiKeyInputStage::CloudflareApiKey => {
("Enter Cloudflare API Token:".to_string(), " API Token...")
}
ApiKeyInputStage::VertexProject => (
"Enter GCP Project ID (e.g. my-gcp-project):".to_string(),
" Project ID...",
),
ApiKeyInputStage::VertexLocation => (
"Enter GCP location (us-central1, europe-west4, us):".to_string(),
" us-central1...",
Expand Down
1 change: 1 addition & 0 deletions apps/cli/src/ui/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ pub enum Screen {
pub enum ApiKeyInputStage {
None,
ApiKey,
VertexProject,
VertexLocation,
CloudflareAccountId,
CloudflareGatewayId,
Expand Down
24 changes: 14 additions & 10 deletions libs/sdk/src/agents/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,25 @@ pub fn resolve_provider_with_config(
.or_else(|_| std::env::var("GCLOUD_PROJECT"))
.unwrap_or_default();

let final_project = if vertex_project.is_empty() {
&env_project
let final_project = if !env_project.is_empty() {
env_project
} else if !vertex_project.is_empty() {
vertex_project.to_string()
} else {
vertex_project
"".to_string()
};

let env_location = std::env::var("GOOGLE_VERTEX_LOCATION")
.or_else(|_| std::env::var("GOOGLE_CLOUD_LOCATION"))
let env_location = std::env::var("GOOGLE_CLOUD_LOCATION")
.or_else(|_| std::env::var("GOOGLE_VERTEX_LOCATION"))
.or_else(|_| std::env::var("VERTEX_LOCATION"))
.unwrap_or_else(|_| "us-central1".to_string());

let final_location = if vertex_location.is_empty() {
&env_location
let final_location = if !env_location.is_empty() {
env_location
} else if !vertex_location.is_empty() {
vertex_location.to_string()
} else {
vertex_location
"us-central1".to_string()
};

if final_project.is_empty() {
Expand All @@ -122,8 +126,8 @@ pub fn resolve_provider_with_config(
} else {
std::sync::Arc::new(VertexAIProvider::new(
api_key,
final_project.to_string(),
final_location.to_string(),
final_project,
final_location,
))
}
}
Expand Down
Loading