From c70d1984bef9ade6fcd281a2032708d68fec57df Mon Sep 17 00:00:00 2001
From: Alejandro Borbolla <alejandro.borbolla@datadoghq.com>
Date: Sun, 27 Jul 2025 19:13:05 +0200
Subject: [PATCH] fix: Pass args as string from client to server

---
 client/bin/start.js | 2 +-
 server/src/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/bin/start.js b/client/bin/start.js
index ae6e9259c..f6594015e 100755
--- a/client/bin/start.js
+++ b/client/bin/start.js
@@ -93,7 +93,7 @@ async function startProdServer(serverOptions) {
       inspectorServerPath,
       ...(command ? [`--command`, command] : []),
       ...(mcpServerArgs && mcpServerArgs.length > 0
-        ? [`--args`, mcpServerArgs.join(" ")]
+        ? [`--args`, `"${mcpServerArgs.join(" ")}"`]
         : []),
     ],
     {
diff --git a/server/src/index.ts b/server/src/index.ts
index 92badc2c3..42fb28f22 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -522,7 +522,7 @@ app.get("/config", originValidationMiddleware, authMiddleware, (req, res) => {
     res.json({
       defaultEnvironment,
       defaultCommand: values.command,
-      defaultArgs: values.args,
+      defaultArgs: values.args.substring(1, values.args.length - 1), // Remove quotes from args
     });
   } catch (error) {
     console.error("Error in /config route:", error);