address reviewer feedback

Author: Eric Oliver

docs/product-stories/cli-utility/dev-prompt.md

@@ -1,4 +1,4 @@
-we are ready to work on issue #14 (docs/product-stories/cli-utility/story-14-non-interactive-mode.md) in repo https://github.com/sakamotopaya/code-agent.
+we are ready to work on issue #15 (docs/product-stories/cli-utility/story-15-mcp-server-support.md) in repo https://github.com/sakamotopaya/code-agent.
 follow the normal git flow. create a new local branch for the story.
 code the tasks and unit tests that prove the task are complete.
 if you need information about prior stories, you can find them locally here docs/product-stories/cli-utility

src/cli/config/CliConfigManager.ts

@@ -32,11 +32,11 @@ export const cliEnvironmentConfigSchema = z.object({
 		.optional(),
 	ROO_MAX_REQUESTS: z
 		.string()
-		.transform((val) => parseInt(val))
+		.transform((val) => parseInt(val, 10))
 		.optional(),
 	ROO_REQUEST_DELAY: z
 		.string()
-		.transform((val) => parseInt(val))
+		.transform((val) => parseInt(val, 10))
 		.optional(),
 
 	// File paths

src/cli/index.ts

@@ -50,6 +50,7 @@ interface CliOptions {
 	mcpTimeout?: number
 	mcpRetries?: number
 	mcpAutoConnect?: boolean
+	noMcpAutoConnect?: boolean
 	mcpLogLevel?: string
 }
 
@@ -154,10 +155,20 @@ program
 	.option("--mcp-config <path>", "Path to MCP configuration file", validatePath)
 	.option("--mcp-server <id>", "MCP server IDs to connect to (can be repeated)", collectArray, [])
 	.option("--mcp-timeout <ms>", "Timeout for MCP operations in milliseconds", validateTimeout)
-	.option("--mcp-retries <count>", "Number of retry attempts for MCP operations", parseInt)
-	.option("--mcp-auto-connect", "Automatically connect to enabled MCP servers", true)
+	.option("--mcp-retries <count>", "Number of retry attempts for MCP operations", (value) => parseInt(value, 10))
+	.option("--mcp-auto-connect", "Automatically connect to enabled MCP servers")
+	.option("--no-mcp-auto-connect", "Do not automatically connect to enabled MCP servers")
 	.option("--mcp-log-level <level>", "MCP logging level (error, warn, info, debug)", validateMcpLogLevel)
 	.action(async (options: CliOptions) => {
+		// Handle MCP auto-connect logic: default to true, but allow explicit override
+		if (options.mcpAutoConnect === undefined && options.noMcpAutoConnect === undefined) {
+			options.mcpAutoConnect = true // Default behavior
+		} else if (options.noMcpAutoConnect) {
+			options.mcpAutoConnect = false
+		} else if (options.mcpAutoConnect) {
+			options.mcpAutoConnect = true
+		}
+
 		try {
 			// Handle config generation
 			if (options.generateConfig) {