refactor(cli): dedupe MCP config sanitization

Author: rexleimo

crates/loopforge-cli/src/dispatch.rs

@@ -8,6 +8,7 @@ mod doctor;
 mod harness;
 mod init;
 mod mcp;
+mod mcp_sanitize;
 mod release;
 mod session;
 mod skills;

crates/loopforge-cli/src/dispatch/mcp.rs

@@ -4,6 +4,7 @@ use std::path::PathBuf;
 use anyhow::{anyhow, Context};
 use serde_json::Value;
 
+use super::mcp_sanitize::sanitize_mcp_config;
 use crate::{cli::McpCommand, runtime_env};
 
 pub(super) async fn run(command: McpCommand) -> anyhow::Result<()> {
@@ -185,36 +186,6 @@ fn list_remote_tool_names(tools: &rexos::tools::Toolset) -> Vec<String> {
     names
 }
 
-fn sanitize_mcp_config(value: &Value) -> Value {
-    match value {
-        Value::Object(map) => {
-            let mut out = serde_json::Map::new();
-            for (k, v) in map {
-                if k == "env" {
-                    match v.as_object() {
-                        Some(env) => {
-                            let mut redacted = serde_json::Map::new();
-                            for (ek, _ev) in env {
-                                redacted
-                                    .insert(ek.clone(), Value::String("[redacted]".to_string()));
-                            }
-                            out.insert(k.clone(), Value::Object(redacted));
-                        }
-                        None => {
-                            out.insert(k.clone(), Value::String("[redacted]".to_string()));
-                        }
-                    }
-                    continue;
-                }
-                out.insert(k.clone(), sanitize_mcp_config(v));
-            }
-            Value::Object(out)
-        }
-        Value::Array(values) => Value::Array(values.iter().map(sanitize_mcp_config).collect()),
-        other => other.clone(),
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

crates/loopforge-cli/src/dispatch/mcp_sanitize.rs

@@ -0,0 +1,31 @@
+use serde_json::Value;
+
+pub(crate) fn sanitize_mcp_config(value: &Value) -> Value {
+    match value {
+        Value::Object(map) => {
+            let mut out = serde_json::Map::new();
+            for (k, v) in map {
+                if k == "env" {
+                    match v.as_object() {
+                        Some(env) => {
+                            let mut redacted = serde_json::Map::new();
+                            for (ek, _ev) in env {
+                                redacted
+                                    .insert(ek.clone(), Value::String("[redacted]".to_string()));
+                            }
+                            out.insert(k.clone(), Value::Object(redacted));
+                        }
+                        None => {
+                            out.insert(k.clone(), Value::String("[redacted]".to_string()));
+                        }
+                    }
+                    continue;
+                }
+                out.insert(k.clone(), sanitize_mcp_config(v));
+            }
+            Value::Object(out)
+        }
+        Value::Array(values) => Value::Array(values.iter().map(sanitize_mcp_config).collect()),
+        other => other.clone(),
+    }
+}

crates/loopforge-cli/src/dispatch/session.rs

@@ -3,6 +3,7 @@ use std::collections::BTreeMap;
 use anyhow::Context;
 use serde_json::Value;
 
+use super::mcp_sanitize::sanitize_mcp_config;
 use crate::{cli::SessionCommand, runtime_env};
 
 pub(super) async fn run(command: SessionCommand) -> anyhow::Result<()> {
@@ -167,36 +168,6 @@ fn summarize_mcp_config(
     (servers, sanitized, None)
 }
 
-fn sanitize_mcp_config(value: &Value) -> Value {
-    match value {
-        Value::Object(map) => {
-            let mut out = serde_json::Map::new();
-            for (k, v) in map {
-                if k == "env" {
-                    match v.as_object() {
-                        Some(env) => {
-                            let mut redacted = serde_json::Map::new();
-                            for (ek, _ev) in env {
-                                redacted
-                                    .insert(ek.clone(), Value::String("[redacted]".to_string()));
-                            }
-                            out.insert(k.clone(), Value::Object(redacted));
-                        }
-                        None => {
-                            out.insert(k.clone(), Value::String("[redacted]".to_string()));
-                        }
-                    }
-                    continue;
-                }
-                out.insert(k.clone(), sanitize_mcp_config(v));
-            }
-            Value::Object(out)
-        }
-        Value::Array(values) => Value::Array(values.iter().map(sanitize_mcp_config).collect()),
-        other => other.clone(),
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;