@hubspot/cli 8.0.7-experimental.0 → 8.0.8-experimental.0

package/lib/mcp/__tests__/setup.test.js

@@ -145,8 +145,7 @@ describe('lib/mcp/setup', () => {
             mockedExecAsync.mockResolvedValueOnce({ stdout: '', stderr: '' });
             const result = await setupCodex(mockMcpCommandWithEnv);
             expect(result).toBe(true);
-            // The HUBSPOT_MCP_STANDALONE env var is now passed in the command string using 'env'
-            expect(mockedExecAsync).toHaveBeenCalledWith('codex mcp add "HubSpotDev" -- env HUBSPOT_MCP_STANDALONE=true test-command --arg1 --ai-agent codex');
+            expect(mockedExecAsync).toHaveBeenCalledWith('codex mcp add "HubSpotDev" -- test-command --arg1 --ai-agent codex --env HUBSPOT_MCP_STANDALONE=true');
         });
     });
     describe('setupGemini', () => {

package/lib/mcp/setup.js

@@ -306,8 +306,7 @@ export async function setupCodex(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, codex);
-        const commandString = buildCommandStringWithEnv(mcpCommandWithAgent);
-        await execAsync(`codex mcp add "${mcpServerName}" -- ${commandString}`);
+        await execAsync(`codex mcp add "${mcpServerName}" -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}${buildEnvFlagString(mcpCommand)}`);
         SpinniesManager.succeed('codexSpinner', {
             text: commands.mcp.setup.spinners.configuredCodex,
         });
@@ -336,8 +335,7 @@ export async function setupGemini(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, gemini);
-        const commandString = buildCommandStringWithEnv(mcpCommandWithAgent);
-        await execAsync(`gemini mcp add -s user "${mcpServerName}" ${commandString}`);
+        await execAsync(`gemini mcp add -s user "${mcpServerName}" ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}${buildEnvFlagString(mcpCommand)}`);
         SpinniesManager.succeed('geminiSpinner', {
             text: commands.mcp.setup.spinners.configuredGemini,
         });
@@ -356,18 +354,16 @@ function buildCommandWithAgentString(mcpCommand, agent) {
     mcpCommandCopy.args.push('--ai-agent', agent);
     return mcpCommandCopy;
 }
-function buildCommandStringWithEnv(mcpCommand) {
-    const parts = [];
-    // Only pass HUBSPOT_MCP_STANDALONE environment variable if it exists
-    if (mcpCommand.env?.HUBSPOT_MCP_STANDALONE) {
-        parts.push(`HUBSPOT_MCP_STANDALONE=${mcpCommand.env.HUBSPOT_MCP_STANDALONE};`);
+function buildEnvFlagString(mcpCommand) {
+    const envFlags = [];
+    if (mcpCommand.env) {
+        const env = Object.entries(mcpCommand.env);
+        env.forEach(([key, value]) => {
+            envFlags.push(`--env ${key}=${value}`);
+        });
     }
-    // Only pass HUBSPOT_MCP_STANDALONE environment variable if it exists
-    if (mcpCommand.env?.HUBSPOT_CLI_VERSION) {
-        parts.push(`HUBSPOT_CLI_VERSION=${mcpCommand.env.HUBSPOT_CLI_VERSION};`);
+    if (envFlags.length === 0) {
+        return '';
     }
-    // Add the command and args
-    parts.push(mcpCommand.command);
-    parts.push(...mcpCommand.args);
-    return parts.join(' ');
+    return ` ${envFlags.join(' ')}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.0.7-experimental.0",
+    "version": "8.0.8-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",