Remove unsupported onboard key prompts

Author: Pyiner

garyx/src/cli.rs

@@ -77,9 +77,6 @@ pub(crate) enum Commands {
         /// API account id to create or enable for gateway/API usage
         #[arg(long, default_value = "main")]
         api_account: String,
-        /// Search API key to persist in gateway.search.api_key
-        #[arg(long)]
-        search_api_key: Option<String>,
         /// Start the gateway after onboarding completes
         #[arg(long)]
         run_gateway: bool,

garyx/src/commands.rs

@@ -78,7 +78,6 @@ pub(crate) struct OnboardCommandOptions {
     pub force: bool,
     pub json: bool,
     pub api_account: String,
-    pub search_api_key: Option<String>,
     pub run_gateway: bool,
     pub port_override: Option<u16>,
     pub host_override: Option<String>,
@@ -7395,21 +7394,13 @@ pub(crate) async fn cmd_doctor(
     Ok(())
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum SecretPromptUpdate {
-    Keep,
-    Clear,
-    Set,
-}
-
 #[derive(Debug, Serialize)]
 struct OnboardSummary {
     ok: bool,
     config_path: String,
     created_config: bool,
     api_account: String,
     api_account_created: bool,
-    search_api_key_configured: bool,
     gateway_run_requested: bool,
     /// `channel.account` identifiers bound during this onboarding session.
     channels_bound: Vec<String>,
@@ -7437,14 +7428,6 @@ fn prompt_line(prompt: &str) -> Result<String, Box<dyn std::error::Error>> {
     Ok(buf.trim().to_owned())
 }
 
-fn prompt_secret_line(prompt: &str) -> Result<String, Box<dyn std::error::Error>> {
-    if stdin_is_interactive() {
-        Ok(rpassword::prompt_password(prompt)?.trim().to_owned())
-    } else {
-        prompt_line(prompt)
-    }
-}
-
 fn prompt_yes_no(prompt: &str, default: bool) -> Result<bool, Box<dyn std::error::Error>> {
     let suffix = if default { "[Y/n]" } else { "[y/N]" };
     loop {
@@ -7463,25 +7446,6 @@ fn prompt_yes_no(prompt: &str, default: bool) -> Result<bool, Box<dyn std::error
     }
 }
 
-fn prompt_secret_update(
-    label: &str,
-    configured: bool,
-) -> Result<(SecretPromptUpdate, Option<String>), Box<dyn std::error::Error>> {
-    let prompt = if configured {
-        format!("{label} (Enter keeps current, '-' clears): ")
-    } else {
-        format!("{label} (optional, Enter skips): ")
-    };
-    let value = prompt_secret_line(&prompt)?;
-    if value.is_empty() {
-        return Ok((SecretPromptUpdate::Keep, None));
-    }
-    if value == "-" {
-        return Ok((SecretPromptUpdate::Clear, None));
-    }
-    Ok((SecretPromptUpdate::Set, Some(value)))
-}
-
 fn ensure_onboard_api_account(config: &mut GaryxConfig, account_id: &str) -> bool {
     let account_id = account_id.trim();
     if let Some(account) = config.channels.api.accounts.get_mut(account_id) {
@@ -7531,14 +7495,6 @@ fn print_onboard_summary(summary: &OnboardSummary) {
     } else {
         println!("API account: {} (enabled)", summary.api_account);
     }
-    println!(
-        "Search API key: {}",
-        if summary.search_api_key_configured {
-            "configured"
-        } else {
-            "missing"
-        }
-    );
     if summary.channels_bound.is_empty() {
         println!(
             "User-facing channels: {} configured (none bound this session)",
@@ -7578,10 +7534,6 @@ pub(crate) async fn cmd_onboard(
         trim_to_option(Some(options.api_account.as_str())).unwrap_or_else(|| "main".to_owned());
     let api_account_created = ensure_onboard_api_account(&mut cfg, &api_account);
 
-    if let Some(value) = trim_to_option(options.search_api_key.as_deref()) {
-        cfg.gateway.search.api_key = value;
-    }
-
     let interactive = !options.json && stdin_is_interactive();
     let mut channels_bound: Vec<String> = Vec::new();
     if interactive {
@@ -7593,22 +7545,6 @@ pub(crate) async fn cmd_onboard(
         }
         println!("Gateway/API account `{api_account}` will be available after setup.");
 
-        if options.search_api_key.is_none() {
-            let (action, value) = prompt_secret_update(
-                "Search API key",
-                !cfg.gateway.search.api_key.trim().is_empty(),
-            )?;
-            match action {
-                SecretPromptUpdate::Keep => {}
-                SecretPromptUpdate::Clear => cfg.gateway.search.api_key.clear(),
-                SecretPromptUpdate::Set => {
-                    if let Some(value) = value {
-                        cfg.gateway.search.api_key = value;
-                    }
-                }
-            }
-        }
-
         // ---- Channel binding ----
         // The api.* account auto-created above lets programs talk to gateway,
         // but a human needs at least one user-facing channel (telegram /
@@ -7659,7 +7595,6 @@ pub(crate) async fn cmd_onboard(
         created_config,
         api_account: api_account.clone(),
         api_account_created,
-        search_api_key_configured: !cfg.gateway.search.api_key.trim().is_empty(),
         gateway_run_requested: options.run_gateway,
         channels_bound,
         total_user_channel_accounts: user_channel_account_count(&cfg),

garyx/src/main.rs

@@ -421,7 +421,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Some(Commands::Onboard {
             force,
             api_account,
-            search_api_key,
             run_gateway: onboard_run_gateway,
             json,
         }) => {
@@ -431,7 +430,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     force,
                     json,
                     api_account,
-                    search_api_key,
                     run_gateway: onboard_run_gateway,
                     port_override: cli.port,
                     host_override: cli.host,

garyx/src/main_tests.rs

@@ -520,25 +520,30 @@ fn parse_onboard_flags() {
         "onboard",
         "--api-account",
         "gateway",
-        "--search-api-key",
-        "search-key",
         "--run-gateway",
     ]);
     match cli.command {
         Some(Commands::Onboard {
             api_account,
-            search_api_key,
             run_gateway,
             ..
         }) => {
             assert_eq!(api_account, "gateway");
-            assert_eq!(search_api_key.as_deref(), Some("search-key"));
             assert!(run_gateway);
         }
         _ => panic!("expected Onboard"),
     }
 }
 
+#[test]
+fn parse_onboard_rejects_search_api_key_flag() {
+    let result = Cli::try_parse_from(["garyx", "onboard", "--search-api-key", "search-key"]);
+    assert!(
+        result.is_err(),
+        "onboard should not accept unsupported search API key setup"
+    );
+}
+
 #[test]
 fn parse_config_set() {
     let cli = Cli::parse_from(["garyx", "config", "set", "gateway.port", "8080"]);
@@ -1867,7 +1872,7 @@ fn load_config_or_default_missing_file() {
 }
 
 #[tokio::test]
-async fn onboard_writes_gateway_keys_and_api_account() {
+async fn onboard_writes_api_account_without_search_key_setup() {
     let tmp = tempfile::TempDir::new().unwrap();
     let config_path = tmp.path().join("gary.json");
 
@@ -1877,7 +1882,6 @@ async fn onboard_writes_gateway_keys_and_api_account() {
             force: false,
             json: true,
             api_account: "main".to_owned(),
-            search_api_key: Some("search-key".to_owned()),
             run_gateway: false,
             port_override: None,
             host_override: None,
@@ -1895,7 +1899,7 @@ async fn onboard_writes_gateway_keys_and_api_account() {
     let config = loaded.config;
     let api_account = config.channels.api.accounts.get("main").unwrap();
     assert!(api_account.enabled);
-    assert_eq!(config.gateway.search.api_key, "search-key");
+    assert!(config.gateway.search.api_key.is_empty());
 }
 
 #[tokio::test]
@@ -1924,7 +1928,6 @@ async fn onboard_updates_existing_config_without_resetting_other_fields() {
             force: false,
             json: true,
             api_account: "custom".to_owned(),
-            search_api_key: None,
             run_gateway: false,
             port_override: None,
             host_override: None,