refactor(cursor-cli): drop extra_args, binary_name, base_command, additional_settings; simplify non-interactive run

Author: matifali

registry/coder-labs/modules/cursor-cli/cursor-cli.tftest.hcl

@@ -9,8 +9,8 @@ run "defaults_noninteractive" {
   }
 
   assert {
-    condition     = can(regex("BINARY_NAME='cursor-agent'", resource.coder_script.cursor_cli.script))
-    error_message = "Expected default binary_name to be cursor-agent"
+    condition     = can(regex("Cursor CLI", resource.coder_script.cursor_cli.display_name))
+    error_message = "Expected coder_script to be created"
   }
 }
 
@@ -19,15 +19,13 @@ run "non_interactive_mode" {
 
   variables {
     agent_id         = "test-agent"
-    base_command     = "status"
-    extra_args       = ["--dry-run"]
     output_format    = "json"
   }
 
   assert {
-    // base command and -p --output-format json are included in env
-    condition     = can(regex("BASE_COMMAND='status'", resource.coder_script.cursor_cli.script))
-    error_message = "Expected BASE_COMMAND to be propagated"
+    // non-interactive always prints; output format propagates
+    condition     = can(regex("OUTPUT_FORMAT='json'", resource.coder_script.cursor_cli.script))
+    error_message = "Expected OUTPUT_FORMAT to be propagated"
   }
 }
 
@@ -55,36 +53,13 @@ run "additional_settings_propagated" {
   command = plan
 
   variables {
-    agent_id            = "test-agent"
-    additional_settings = jsonencode({
-      mcpServers = {
-        coder = {
-          command = "coder"
-          args    = ["exp", "mcp", "server"]
-          type    = "stdio"
-        }
-      }
-    })
+    agent_id   = "test-agent"
     mcp_json   = jsonencode({ mcpServers = { foo = { command = "foo", type = "stdio" } } })
     rules_files = {
       "global.yml" = "version: 1\nrules:\n  - name: global\n    include: ['**/*']\n    description: global rule"
     }
   }
 
-  // Ensure the encoded settings are passed into the install invocation
-  assert {
-    condition     = can(regex(base64encode(jsonencode({
-      mcpServers = {
-        coder = {
-          command = "coder"
-          args    = ["exp", "mcp", "server"]
-          type    = "stdio"
-        }
-      }
-    })), resource.coder_script.cursor_cli.script))
-    error_message = "Expected ADDITIONAL_SETTINGS (base64) to be in the install step"
-  }
-
   // Ensure project mcp_json is passed
   assert {
     condition     = can(regex(base64encode(jsonencode({ mcpServers = { foo = { command = "foo", type = "stdio" } } })), resource.coder_script.cursor_cli.script))
@@ -98,16 +73,13 @@ run "additional_settings_propagated" {
   }
 }
 
-run "output_api_key_binary_basecmd_extra" {
+run "output_api_key" {
   command = plan
 
   variables {
     agent_id        = "test-agent"
     output_format   = "json"
     api_key         = "sk-test-123"
-    binary_name     = "cursor-agent"
-    base_command    = "status"
-    extra_args      = ["--foo", "bar"]
   }
 
   assert {
@@ -119,19 +91,4 @@ run "output_api_key_binary_basecmd_extra" {
     condition     = can(regex("API_KEY_SECRET='sk-test-123'", resource.coder_script.cursor_cli.script))
     error_message = "Expected API key to be plumbed (to CURSOR_API_KEY at runtime)"
   }
-
-  assert {
-    condition     = can(regex("BINARY_NAME='cursor-agent'", resource.coder_script.cursor_cli.script))
-    error_message = "Expected binary name to be forwarded"
-  }
-
-  assert {
-    condition     = can(regex("BASE_COMMAND='status'", resource.coder_script.cursor_cli.script))
-    error_message = "Expected base command to be forwarded"
-  }
-
-  assert {
-    condition     = can(regex(base64encode("--foo\nbar"), resource.coder_script.cursor_cli.script))
-    error_message = "Expected extra args to be base64 encoded and passed"
-  }
 }

registry/coder-labs/modules/cursor-cli/main.tf

@@ -82,29 +82,6 @@ variable "api_key" {
   sensitive   = true
 }
 
-variable "extra_args" {
-  type        = list(string)
-  description = "Additional args to pass to the Cursor CLI."
-  default     = []
-}
-
-variable "binary_name" {
-  type        = string
-  description = "Cursor Agent binary name (default: cursor-agent)."
-  default     = "cursor-agent"
-}
-
-variable "base_command" {
-  type        = string
-  description = "Base Cursor CLI command to run (default: none for chat)."
-  default     = ""
-}
-
-variable "additional_settings" {
-  type        = string
-  description = "JSON to merge into ~/.cursor/settings.json (e.g., mcpServers)."
-  default     = ""
-}
 
 variable "mcp_json" {
   type        = string
@@ -138,7 +115,6 @@ resource "coder_script" "cursor_cli" {
     chmod +x /tmp/install.sh
     ARG_INSTALL='${var.install_cursor_cli}' \
     ARG_VERSION='${var.cursor_cli_version}' \
-    ADDITIONAL_SETTINGS='${base64encode(replace(var.additional_settings, "'", "'\\''"))}' \
     PROJECT_MCP_JSON='${var.mcp_json != null ? base64encode(replace(var.mcp_json, "'", "'\\''")) : ""}' \
     PROJECT_RULES_JSON='${var.rules_files != null ? base64encode(jsonencode(var.rules_files)) : ""}' \
     MODULE_DIR_NAME='${local.module_dir_name}' \
@@ -148,15 +124,12 @@ resource "coder_script" "cursor_cli" {
     echo -n '${base64encode(local.start_script)}' | base64 -d > /tmp/start.sh
     chmod +x /tmp/start.sh
     # Non-interactive mode by design
-    BASE_COMMAND='${var.base_command}' \
     FORCE='${var.force}' \
     MODEL='${var.model}' \
     OUTPUT_FORMAT='${var.output_format}' \
     API_KEY_SECRET='${var.api_key}' \
-    EXTRA_ARGS='${base64encode(join("\n", var.extra_args))}' \
     MODULE_DIR_NAME='${local.module_dir_name}' \
     FOLDER='${var.folder}' \
-    BINARY_NAME='${var.binary_name}' \
     /tmp/start.sh | tee "$HOME/${local.module_dir_name}/start.log"
   EOT
   run_on_start = true

registry/coder-labs/modules/cursor-cli/scripts/start.sh

@@ -13,15 +13,12 @@ FORCE=${FORCE:-false}
 MODEL=${MODEL:-}
 OUTPUT_FORMAT=${OUTPUT_FORMAT:-json}
 API_KEY_SECRET=${API_KEY_SECRET:-}
-EXTRA_ARGS_BASE64=${EXTRA_ARGS:-}
 MODULE_DIR_NAME=${MODULE_DIR_NAME:-.cursor-cli-module}
 FOLDER=${FOLDER:-$HOME}
 BINARY_NAME=${BINARY_NAME:-cursor-agent}
 
 mkdir -p "$HOME/$MODULE_DIR_NAME"
 
-# Decode EXTRA_ARGS lines into an array
-IFS=$'\n' read -r -d '' -a EXTRA_ARR < <(echo -n "$EXTRA_ARGS_BASE64" | base64 -d; printf '\0') || true
 
 # Find cursor agent cli
 if command_exists "$BINARY_NAME"; then
@@ -67,10 +64,6 @@ if [ -n "$NON_INTERACTIVE_CMD" ]; then
   ARGS+=("${CMD_PARTS[@]}")
 fi
 
-# Extra args, if any
-if [ ${#EXTRA_ARR[@]} -gt 0 ]; then
-  ARGS+=("${EXTRA_ARR[@]}")
-fi
 
 # Set API key env if provided
 if [ -n "$API_KEY_SECRET" ]; then