refactor(mcp-server): migrate worker-URL env to AGENTKEYS_WORKER_{MEMORY,AUDIT}_URL

crates/agentkeys-daemon/src/main.rs

@@ -220,7 +220,10 @@ struct Args {
 
     /// W3 real-memory: the memory worker base URL (e.g. https://memory.litentry.org).
     /// Unset ⇒ master-memory plant/list use the in-memory fallback (dev/no-infra).
-    #[arg(long, env = "AGENTKEYS_MEMORY_URL")]
+    /// Canonical env is `AGENTKEYS_WORKER_MEMORY_URL` (the AGENTKEYS_WORKER_<svc>_URL
+    /// family in operator-workstation.env, matching --config-url below); the legacy
+    /// bare `AGENTKEYS_MEMORY_URL` is still accepted as a fallback at consumption.
+    #[arg(long, env = "AGENTKEYS_WORKER_MEMORY_URL")]
     memory_url: Option<String>,
 
     /// W3 real-memory: per-actor memory IAM role ARN for the STS relay (sourced from
@@ -1146,7 +1149,10 @@ async fn run_ui_bridge_mode(args: Args) -> anyhow::Result<()> {
         args.broker_url.clone(),
         args.signer_url.clone(),
         args.init_chain_id,
-        args.memory_url.clone(),
+        args
+            .memory_url
+            .clone()
+            .or_else(|| std::env::var("AGENTKEYS_MEMORY_URL").ok().filter(|v| !v.is_empty())),
         args.memory_role_arn.clone(),
         args.config_url.clone(),
         args.config_role_arn.clone(),

crates/agentkeys-mcp-server/README.md

@@ -70,8 +70,8 @@ cargo run -p agentkeys-mcp-server -- \
 docker build -t agentkeys-mcp-server -f crates/agentkeys-mcp-server/Dockerfile .
 docker run --rm -p 8088:8088 \
   -e AGENTKEYS_BROKER_URL=https://broker.litentry.org \
-  -e AGENTKEYS_MEMORY_URL=https://memory.litentry.org \
-  -e AGENTKEYS_AUDIT_URL=https://audit.litentry.org \
+  -e AGENTKEYS_WORKER_MEMORY_URL=https://memory.litentry.org \
+  -e AGENTKEYS_WORKER_AUDIT_URL=https://audit.litentry.org \
   -e MCP_VENDOR_TOKENS="magiclick:demo-tok" \
   agentkeys-mcp-server
 ```

crates/agentkeys-mcp-server/src/config.rs

@@ -45,12 +45,16 @@ pub struct Cli {
     #[arg(long, env = "AGENTKEYS_BROKER_URL")]
     pub broker_url: Option<String>,
 
-    /// Memory worker base URL.
-    #[arg(long, env = "AGENTKEYS_MEMORY_URL")]
+    /// Memory worker base URL. Canonical env is `AGENTKEYS_WORKER_MEMORY_URL`
+    /// (the `AGENTKEYS_WORKER_<svc>_URL` family in operator-workstation.env);
+    /// the legacy bare `AGENTKEYS_MEMORY_URL` is still accepted as a fallback in
+    /// `Config::from_cli` for un-redeployed `/etc/agentkeys/mcp.env` hosts.
+    #[arg(long, env = "AGENTKEYS_WORKER_MEMORY_URL")]
     pub memory_url: Option<String>,
 
-    /// Audit worker base URL.
-    #[arg(long, env = "AGENTKEYS_AUDIT_URL")]
+    /// Audit worker base URL. Canonical env is `AGENTKEYS_WORKER_AUDIT_URL`;
+    /// legacy bare `AGENTKEYS_AUDIT_URL` accepted as a fallback (see above).
+    #[arg(long, env = "AGENTKEYS_WORKER_AUDIT_URL")]
     pub audit_url: Option<String>,
 
     /// Comma-separated `<vendor_id>:<bearer_token>` pairs that the HTTP
@@ -224,14 +228,26 @@ impl Config {
             },
         };
 
+        // Zero-downtime env-name migration (terminology-drift follow-up): the
+        // clap `env` above reads the canonical AGENTKEYS_WORKER_{MEMORY,AUDIT}_URL
+        // (the AGENTKEYS_WORKER_<svc>_URL family in operator-workstation.env). A
+        // deployed MCP host still has the LEGACY bare names in
+        // /etc/agentkeys/mcp.env (written by an older setup-mcp-host.sh) until its
+        // next redeploy, so accept both: fall back to the legacy
+        // AGENTKEYS_{MEMORY,AUDIT}_URL only when the canonical var (and the
+        // --memory-url/--audit-url flag) is unset.
+        let legacy_env = |key: &str| std::env::var(key).ok().filter(|v| !v.is_empty());
+        let memory_url = cli.memory_url.or_else(|| legacy_env("AGENTKEYS_MEMORY_URL"));
+        let audit_url = cli.audit_url.or_else(|| legacy_env("AGENTKEYS_AUDIT_URL"));
+
         Ok(Self {
             transport,
             backend,
             listen: cli.listen,
             mcp_endpoint: cli.mcp_endpoint,
             broker_url: cli.broker_url,
-            memory_url: cli.memory_url,
-            audit_url: cli.audit_url,
+            memory_url,
+            audit_url,
             vendor_tokens,
             default_daily_spend_cap_rmb: cli.default_daily_spend_cap_rmb,
             default_actor,