Skip to content

fix: mark packaged backend as desktop-managed #146

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
zouyonghe merged 2 commits into from
Jul 2, 2026
+31 −6
Merged

fix: mark packaged backend as desktop-managed #146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e378e52
fix: mark packaged backend as desktop-managed
zouyonghe Jul 1, 2026
e56a692
fix: centralize desktop backend env keys
zouyonghe Jul 1, 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
37 changes: 31 additions & 6 deletions src-tauri/src/backend/launch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const ASTRBOT_DASHBOARD_PORT_ENV: &str = "ASTRBOT_DASHBOARD_PORT";
const ASTRBOT_DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV: &str =
"ASTRBOT_DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH";
const DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV: &str = "DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH";
const ASTRBOT_DESKTOP_CLIENT_ENV: &str = "ASTRBOT_DESKTOP_CLIENT";
const ASTRBOT_DESKTOP_MANAGED_ENV: &str = "ASTRBOT_DESKTOP_MANAGED";
const DEFAULT_DASHBOARD_HOST: &str = "127.0.0.1";
const DEFAULT_DASHBOARD_PORT: &str = "6185";
const CMD_CONFIG_RELATIVE_PATH: &str = "data/cmd_config.json";
Expand Down Expand Up @@ -132,6 +134,11 @@ where
command.env("PYTHONNOUSERSITE", "1");
}

fn configure_desktop_managed_environment(command: &mut Command) {
command.env(ASTRBOT_DESKTOP_CLIENT_ENV, "1");
command.env(ASTRBOT_DESKTOP_MANAGED_ENV, "1");
}

fn configure_desktop_dashboard_environment(
command: &mut Command,
root_dir: Option<&Path>,
Expand Down Expand Up @@ -434,7 +441,7 @@ impl BackendState {

if plan.packaged_mode {
sanitize_packaged_python_environment(&mut command, append_desktop_log);
command.env("ASTRBOT_DESKTOP_CLIENT", "1");
configure_desktop_managed_environment(&mut command);
}

if let Some(root_dir) = &plan.root_dir {
Expand Down Expand Up @@ -531,11 +538,13 @@ mod tests {
use std::os::unix::ffi::OsStringExt;

use super::{
configure_desktop_dashboard_environment, read_cmd_config_file_with_retry_and_hook,
sanitize_packaged_python_environment, ASTRBOT_DASHBOARD_HOST_ENV,
ASTRBOT_DASHBOARD_PORT_ENV, ASTRBOT_DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV,
CMD_CONFIG_RELATIVE_PATH, DASHBOARD_HOST_ENV, DASHBOARD_PORT_ENV,
DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV, DEFAULT_DASHBOARD_HOST, DEFAULT_DASHBOARD_PORT,
configure_desktop_dashboard_environment, configure_desktop_managed_environment,
read_cmd_config_file_with_retry_and_hook, sanitize_packaged_python_environment,
ASTRBOT_DASHBOARD_HOST_ENV, ASTRBOT_DASHBOARD_PORT_ENV,
ASTRBOT_DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV, ASTRBOT_DESKTOP_CLIENT_ENV,
ASTRBOT_DESKTOP_MANAGED_ENV, CMD_CONFIG_RELATIVE_PATH, DASHBOARD_HOST_ENV,
DASHBOARD_PORT_ENV, DASHBOARD_SKIP_DEFAULT_PASSWORD_AUTH_ENV, DEFAULT_DASHBOARD_HOST,
DEFAULT_DASHBOARD_PORT,
};

static ENV_TEST_LOCK: Mutex<()> = Mutex::new(());
Expand Down Expand Up @@ -622,6 +631,22 @@ mod tests {
);
}

#[test]
fn configure_desktop_managed_environment_marks_backend_as_desktop_managed() {
let mut command = Command::new("sh");

configure_desktop_managed_environment(&mut command);

assert_eq!(
get_command_env_value(&command, ASTRBOT_DESKTOP_CLIENT_ENV),
Some(Some("1".to_string()))
);
assert_eq!(
get_command_env_value(&command, ASTRBOT_DESKTOP_MANAGED_ENV),
Some(Some("1".to_string()))
);
}

#[test]
fn configure_desktop_dashboard_environment_enables_local_setup_without_default_password() {
with_clean_dashboard_env(|| {
Expand Down