fix: update user mcp creation to follow coder_mcp method since mcp flag can be passed multiple times to auggie

Author: DevelopmentCats

registry/coder-labs/modules/auggie/main.tf

@@ -170,7 +170,6 @@ module "agentapi" {
      chmod +x /tmp/start.sh
      ARG_AUGGIE_START_DIRECTORY='${var.folder}' \
      ARG_TASK_PROMPT='${base64encode(var.ai_prompt)}' \
-     ARG_MCP_CONFIG='${var.mcp != null ? base64encode(replace(var.mcp, "'", "'\\''")) : ""}' \
      ARG_MCP_FILES='${jsonencode(var.mcp_files)}' \
      ARG_AUGGIE_RULES='${base64encode(var.rules)}' \
      ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION='${var.continue_previous_conversation}' \
@@ -191,6 +190,7 @@ module "agentapi" {
     ARG_AUGGIE_VERSION='${var.auggie_version}' \
     ARG_MCP_APP_STATUS_SLUG='${local.app_slug}' \
     ARG_AUGGIE_RULES='${base64encode(var.rules)}' \
+    ARG_MCP_CONFIG='${var.mcp != null ? base64encode(replace(var.mcp, "'", "'\\''")) : ""}' \
     /tmp/install.sh
   EOT
 }

registry/coder-labs/modules/auggie/scripts/install.sh

@@ -15,6 +15,7 @@ ARG_AUGGIE_INSTALL=${ARG_AUGGIE_INSTALL:-true}
 ARG_AUGGIE_VERSION=${ARG_AUGGIE_VERSION:-}
 ARG_MCP_APP_STATUS_SLUG=${ARG_MCP_APP_STATUS_SLUG:-}
 ARG_AUGGIE_RULES=$(echo -n "${ARG_AUGGIE_RULES:-}" | base64 -d)
+ARG_MCP_CONFIG=${ARG_MCP_CONFIG:-}
 
 echo "--------------------------------"
 
@@ -114,6 +115,18 @@ EOF
   printf "Coder MCP config created at: %s\n" "$AUGGIE_CODER_MCP_FILE"
 }
 
+function create_user_mcp() {
+  if [ -n "$ARG_MCP_CONFIG" ]; then
+    USER_MCP_CONFIG_FILE="$HOME/.augment/user_mcp.json"
+    USER_MCP_CONTENT=$(echo -n "$ARG_MCP_CONFIG" | base64 -d)
+    mkdir -p "$(dirname "$USER_MCP_CONFIG_FILE")"
+    echo "$USER_MCP_CONTENT" > "$USER_MCP_CONFIG_FILE"
+    printf "User MCP config created at: %s\n" "$USER_MCP_CONFIG_FILE"
+  else
+    printf "No user MCP config provided, skipping user MCP config creation.\n"
+  fi
+}
+
 function create_rules_file() {
   AUGGIE_RULES_FILE="$HOME/.augment/rules.md"
   if [ -n "$ARG_AUGGIE_RULES" ]; then
@@ -127,4 +140,5 @@ function create_rules_file() {
 
 install_auggie
 create_coder_mcp
+create_user_mcp
 create_rules_file

registry/coder-labs/modules/auggie/scripts/start.sh

@@ -20,7 +20,6 @@ set -o nounset
 
 ARG_AUGGIE_START_DIRECTORY=${ARG_AUGGIE_START_DIRECTORY:-"$HOME"}
 ARG_TASK_PROMPT=$(echo -n "${ARG_TASK_PROMPT:-}" | base64 -d)
-ARG_MCP_CONFIG=${ARG_MCP_CONFIG:-}
 ARG_MCP_FILES=${ARG_MCP_FILES:-[]}
 ARG_AUGGIE_RULES=${ARG_AUGGIE_RULES:-}
 ARG_AUGMENT_SESSION_AUTH=${ARG_AUGMENT_SESSION_AUTH:-}
@@ -34,7 +33,6 @@ echo "--------------------------------"
 
 printf "auggie_start_directory: %s\n" "$ARG_AUGGIE_START_DIRECTORY"
 printf "task_prompt: %s\n" "$ARG_TASK_PROMPT"
-printf "mcp_config: %s\n" "$ARG_MCP_CONFIG"
 printf "mcp_files: %s\n" "$ARG_MCP_FILES"
 printf "auggie_rules: %s\n" "$ARG_AUGGIE_RULES"
 printf "continue_previous_conversation: %s\n" "$ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION"
@@ -66,8 +64,9 @@ function build_auggie_args() {
     ARGS+=(--model "$ARG_AUGGIE_MODEL")
   fi
 
-  if [ -n "$ARG_MCP_CONFIG" ]; then
-    ARGS+=(--mcp-config "$ARG_MCP_CONFIG")
+  # add user mcp file if it exists
+  if [ -f "$HOME/.augment/user_mcp.json" ]; then
+    ARGS+=(--mcp-config "$HOME/.augment/user_mcp.json")
   fi
 
   if [ -n "$ARG_MCP_FILES" ]; then