Refactor Aider module

Author: Harsh9485

registry/coder/modules/aider/README.md

@@ -48,10 +48,11 @@ module "aider" {
   agent_id         = coder_agent.example.id
   credentials      = var.gemini_api_key
   install_aider    = true
+  workdir          = "/home/coder"
   ai_provider      = "google"
   model            = "gemini"
   install_agentapi = true
-  task_prompt      = data.coder_parameter.ai_prompt.value
+  ai_prompt        = data.coder_parameter.ai_prompt.value
   system_prompt    = "..."
 }
 ```

registry/coder/modules/aider/main.test.ts

@@ -100,10 +100,10 @@ describe("Aider", async () => {
   });
 
   test("custom-folder", async () => {
-    const folder = "/tmp/aider-test";
+    const workdir = "/tmp/aider-test";
     const { id } = await setup({
       moduleVariables: {
-        folder,
+        workdir,
         model: "gemini",
       },
     });
@@ -112,15 +112,14 @@ describe("Aider", async () => {
       id,
       "/home/coder/.aider-module/install.log",
     );
-    expect(resp).toContain(folder);
+    expect(resp).toContain(workdir);
   });
 
   test("pre-post-install-scripts", async () => {
     const { id } = await setup({
       moduleVariables: {
-        experiment_pre_install_script: "#!/bin/bash\necho 'pre-install-script'",
-        experiment_post_install_script:
-          "#!/bin/bash\necho 'post-install-script'",
+        pre_install_script: "#!/bin/bash\necho 'pre-install-script'",
+        post_install_script: "#!/bin/bash\necho 'post-install-script'",
         model: "gemini",
       },
     });
@@ -163,7 +162,7 @@ describe("Aider", async () => {
       },
     });
     await execModuleScript(id, {
-      ARG_TASK_PROMPT: `${prompt}`,
+      ARG_AI_PROMPT: `${prompt}`,
     });
     const resp = await readFileContainer(
       id,

registry/coder/modules/aider/main.tf

@@ -36,21 +36,76 @@ variable "icon" {
   default     = "/icon/aider.svg"
 }
 
-variable "folder" {
+variable "workdir" {
   type        = string
   description = "The folder to run Aider in."
   default     = "/home/coder"
 }
 
-variable "install_aider" {
+variable "report_tasks" {
   type        = bool
-  description = "Whether to install Aider."
+  description = "Whether to enable task reporting to Coder UI via AgentAPI"
   default     = true
 }
 
-variable "experiment_report_tasks" {
+variable "cli_app" {
+  type        = bool
+  description = "Whether to create a CLI app for Aider"
+  default     = false
+}
+
+variable "web_app_display_name" {
+  type        = string
+  description = "Display name for the web app"
+  default     = "Aider"
+}
+
+variable "cli_app_display_name" {
+  type        = string
+  description = "Display name for the CLI app"
+  default     = "Aider CLI"
+}
+
+variable "pre_install_script" {
+  type        = string
+  description = "Custom script to run before installing Aider."
+  default     = null
+}
+
+variable "post_install_script" {
+  type        = string
+  description = "Custom script to run after installing Aider."
+  default     = null
+}
+
+variable "install_agentapi" {
+  type        = bool
+  description = "Whether to install AgentAPI."
+  default     = true
+}
+
+variable "agentapi_version" {
+  type        = string
+  description = "The version of AgentAPI to install."
+  default     = "v0.6.3"
+}
+
+variable "ai_prompt" {
+  type        = string
+  description = "Initial task prompt for Claude Code."
+  default     = ""
+}
+
+resource "coder_env" "ai_prompt" {
+  agent_id = var.agent_id
+  name     = "ARG_AI_PROMPT"
+  value    = var.ai_prompt
+}
+# ---------------------------------------------
+
+variable "install_aider" {
   type        = bool
-  description = "Whether to enable task reporting."
+  description = "Whether to install Aider."
   default     = true
 }
 
@@ -76,24 +131,6 @@ variable "system_prompt" {
   EOT
 }
 
-variable "aider_prompt" {
-  type        = bool
-  description = "This prompt will be sent to Aider and should run only once, and AgentAPI will be disabled."
-  default     = false
-}
-
-variable "experiment_pre_install_script" {
-  type        = string
-  description = "Custom script to run before installing Aider."
-  default     = null
-}
-
-variable "experiment_post_install_script" {
-  type        = string
-  description = "Custom script to run after installing Aider."
-  default     = null
-}
-
 variable "experiment_additional_extensions" {
   type        = string
   description = "Additional extensions configuration in YAML format to append to the config."
@@ -128,30 +165,6 @@ variable "custom_env_var_name" {
   default     = ""
 }
 
-variable "install_agentapi" {
-  type        = bool
-  description = "Whether to install AgentAPI."
-  default     = true
-}
-
-variable "agentapi_version" {
-  type        = string
-  description = "The version of AgentAPI to install."
-  default     = "v0.6.3"
-}
-
-variable "task_prompt" {
-  type        = string
-  description = "Task prompt to use with Aider"
-  default     = ""
-}
-
-resource "coder_env" "ai_prompt" {
-  agent_id = var.agent_id
-  name     = "ARG_TASK_PROMPT"
-  value    = var.task_prompt
-}
-
 variable "base_aider_config" {
   type        = string
   description = <<-EOT
@@ -243,34 +256,34 @@ locals {
 
 module "agentapi" {
   source  = "registry.coder.com/coder/agentapi/coder"
-  version = "1.0.1"
+  version = "1.1.1"
 
   agent_id             = var.agent_id
   web_app_slug         = local.app_slug
   web_app_order        = var.order
   web_app_group        = var.group
   web_app_icon         = var.icon
-  web_app_display_name = "Aider"
-  cli_app_slug         = "${local.app_slug}-cli"
-  cli_app_display_name = "Aider CLI"
+  web_app_display_name = var.web_app_display_name
+  cli_app              = var.cli_app
+  cli_app_slug         = var.cli_app ? "${local.app_slug}-cli" : null
+  cli_app_display_name = var.cli_app ? var.cli_app_display_name : null
   module_dir_name      = local.module_dir_name
   install_agentapi     = var.install_agentapi
   agentapi_version     = var.agentapi_version
-  pre_install_script   = var.experiment_pre_install_script
-  post_install_script  = var.experiment_post_install_script
+  pre_install_script   = var.pre_install_script
+  post_install_script  = var.post_install_script
   start_script         = <<-EOT
     #!/bin/bash
     set -o errexit
     set -o pipefail
 
     echo -n '${base64encode(local.start_script)}' | base64 -d > /tmp/start.sh
     chmod +x /tmp/start.sh   
-    AIDER_START_DIRECTORY='${var.folder}' \
-    ARG_API_KEY='${var.credentials}' \
+    AIDER_START_DIRECTORY='${var.workdir}' \
+    ARG_API_KEY='${base64encode(var.credentials)}' \
     ARG_MODEL='${var.model}' \
     ARG_PROVIDER='${var.ai_provider}' \
     ARG_ENV_API_NAME_HOLDER='${local.env_var_name}' \
-    AIDER_PROMPT='${var.aider_prompt}' \
     /tmp/start.sh
   EOT
 
@@ -281,10 +294,10 @@ module "agentapi" {
 
     echo -n '${base64encode(local.install_script)}' | base64 -d > /tmp/install.sh
     chmod +x /tmp/install.sh
-    AIDER_START_DIRECTORY='${var.folder}' \
+    AIDER_START_DIRECTORY='${var.workdir}' \
     ARG_INSTALL_AIDER='${var.install_aider}' \
     AIDER_SYSTEM_PROMPT='${var.system_prompt}' \
-    ARG_IMPLEMENT_MCP='${var.experiment_report_tasks}' \
+    ARG_REPORT_TASKS='${var.report_tasks}' \
     ARG_AIDER_CONFIG="$(echo -n '${base64encode(trimspace(local.combined_extensions))}' | base64 -d)" \
     /tmp/install.sh
   EOT

registry/coder/modules/aider/scripts/install.sh

@@ -6,6 +6,13 @@ command_exists() {
   command -v "$1" > /dev/null 2>&1
 }
 
+# Inputs
+AIDER_START_DIRECTORY=${AIDER_START_DIRECTORY:-/home/coder}
+ARG_INSTALL_AIDER=${ARG_INSTALL_AIDER:-true}
+AIDER_SYSTEM_PROMPT=${AIDER_SYSTEM_PROMPT:-}
+ARG_REPORT_TASKS=${ARG_REPORT_TASKS:-true}
+ARG_AIDER_CONFIG=${ARG_AIDER_CONFIG:-}
+
 echo "--------------------------------"
 echo "Install flag: $ARG_INSTALL_AIDER"
 echo "Workspace: $AIDER_START_DIRECTORY"
@@ -39,7 +46,7 @@ function setup_system_prompt() {
 }
 
 function configure_aider_settings() {
-  if [ "${ARG_IMPLEMENT_MCP}" = "true" ]; then
+  if [ "${ARG_REPORT_TASKS}" = "true" ]; then
     echo "Configuring Aider to report tasks via Coder MCP..."
 
     mkdir -p "$HOME/.config/aider"

registry/coder/modules/aider/scripts/start.sh

@@ -4,6 +4,12 @@ set -euo pipefail
 # Ensure pipx-installed apps are in PATH
 export PATH="$HOME/.local/bin:$PATH"
 
+AIDER_START_DIRECTORY=${AIDER_START_DIRECTORY:-/home/coder}
+ARG_API_KEY=$(echo -n "${ARG_API_KEY:-}" | base64 -d)
+ARG_MODEL=${ARG_MODEL:-}
+ARG_PROVIDER=${ARG_PROVIDER:-}
+ARG_ENV_API_NAME_HOLDER=${ARG_ENV_API_NAME_HOLDER:-}
+
 echo "--------------------------------"
 echo "Provider: $ARG_PROVIDER"
 echo "Module: $ARG_MODEL"
@@ -16,16 +22,16 @@ else
   printf "API key not provided\n"
 fi
 
-if [[ "${AIDER_PROMPT}" == "true" && -n "${ARG_TASK_PROMPT:-}" ]]; then
-  printf "Aider start only with this prompt : $ARG_TASK_PROMPT"
-  mkdir -p $HOME/.aider-module/
-  echo aider --model $ARG_MODEL --yes-always --message "$ARG_TASK_PROMPT" > $HOME/.aider-module/aider_output.txt
+# if [[ "${AIDER_PROMPT}" == "true" && -n "${ARG_AI_PROMPT:-}" ]]; then
+#   printf "Aider start only with this prompt : $ARG_AI_PROMPT"
+#   mkdir -p $HOME/.aider-module/
+#   echo aider --model $ARG_MODEL --yes-always --message "$ARG_AI_PROMPT" > $HOME/.aider-module/aider_output.txt
 
-elif [ -n "${ARG_TASK_PROMPT:-}" ]; then
-  printf "Aider task prompt provided : $ARG_TASK_PROMPT"
-  PROMPT="Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $ARG_TASK_PROMPT"
+if [ -n "${ARG_AI_PROMPT:-}" ]; then
+  printf "Aider task prompt provided : $ARG_AI_PROMPT"
+  PROMPT="Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $ARG_AI_PROMPT"
 
-  agentapi server --term-width=67 --term-height=1190 -- aider --model $ARG_MODEL --yes-always --message "$ARG_TASK_PROMPT"
+  agentapi server --term-width=67 --term-height=1190 -- aider --model $ARG_MODEL --yes-always --message "$ARG_AI_PROMPT"
 else
   printf "No task prompt given.\n"
   agentapi server --term-width=67 --term-height=1190 -- aider --model $ARG_MODEL --yes-always