Merge branch 'main' into 35C4n0r/feat-migrate-claude-code-agentapiv3

registry/coder/modules/claude-code/main.tf

@@ -43,7 +43,7 @@ variable "workdir" {
 
 variable "report_tasks" {
   type        = bool
-  description = "Whether to enable task reporting to Coder UI via AgentAPI"
+  description = "Whether to enable AgentAPI and task reporting to Coder"
   default     = true
 }
 
@@ -352,13 +352,15 @@ locals {
     var.report_tasks ? format("\n%s\n", local.report_tasks_system_prompt) : "",
     local.custom_system_prompt != "" ? format("\n%s\n", local.custom_system_prompt) : ""
   )
+  agent_name = "claude"
 }
 
 module "agentapi" {
-  source  = "registry.coder.com/coder/agentapi/coder"
-  version = "2.0.0"
+  source = "git::https://github.com/coder/registry.git//registry/coder/modules/agentapi?ref=35C4n0r/feat-agentapi-architecture-improv"
+  # version = "2.0.0"
 
   agent_id             = var.agent_id
+  enable_agentapi      = var.report_tasks
   web_app_slug         = local.app_slug
   web_app_order        = var.order
   web_app_group        = var.group
@@ -370,54 +372,55 @@ module "agentapi" {
   cli_app_display_name = var.cli_app ? var.cli_app_display_name : null
   agentapi_subdomain   = var.subdomain
   module_dir_name      = local.module_dir_name
+  agent_name           = local.agent_name
   install_agentapi     = var.install_agentapi
   agentapi_version     = var.agentapi_version
   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
+      #!/bin/bash
+      set -o errexit
+      set -o pipefail
+      echo -n '${base64encode(local.start_script)}' | base64 -d > /tmp/start.sh
+      chmod +x /tmp/start.sh
 
-    ARG_RESUME_SESSION_ID='${var.resume_session_id}' \
-    ARG_CONTINUE='${var.continue}' \
-    ARG_DANGEROUSLY_SKIP_PERMISSIONS='${var.dangerously_skip_permissions}' \
-    ARG_PERMISSION_MODE='${var.permission_mode}' \
-    ARG_WORKDIR='${local.workdir}' \
-    ARG_AI_PROMPT='${base64encode(var.ai_prompt)}' \
-    ARG_REPORT_TASKS='${var.report_tasks}' \
-    ARG_ENABLE_BOUNDARY='${var.enable_boundary}' \
-    ARG_BOUNDARY_VERSION='${var.boundary_version}' \
-    ARG_COMPILE_FROM_SOURCE='${var.compile_boundary_from_source}' \
-    ARG_USE_BOUNDARY_DIRECTLY='${var.use_boundary_directly}' \
-    ARG_CODER_HOST='${local.coder_host}' \
-    ARG_CLAUDE_BINARY_PATH='${var.claude_binary_path}' \
-    /tmp/start.sh
-  EOT
+      ARG_RESUME_SESSION_ID='${var.resume_session_id}' \
+      ARG_CONTINUE='${var.continue}' \
+      ARG_DANGEROUSLY_SKIP_PERMISSIONS='${var.dangerously_skip_permissions}' \
+      ARG_PERMISSION_MODE='${var.permission_mode}' \
+      ARG_WORKDIR='${local.workdir}' \
+      ARG_AI_PROMPT='${base64encode(var.ai_prompt)}' \
+      ARG_REPORT_TASKS='${var.report_tasks}' \
+      ARG_ENABLE_BOUNDARY='${var.enable_boundary}' \
+      ARG_BOUNDARY_VERSION='${var.boundary_version}' \
+      ARG_COMPILE_FROM_SOURCE='${var.compile_boundary_from_source}' \
+      ARG_USE_BOUNDARY_DIRECTLY='${var.use_boundary_directly}' \
+      ARG_CODER_HOST='${local.coder_host}' \
+      ARG_CLAUDE_BINARY_PATH='${var.claude_binary_path}' \
+      /tmp/start.sh
+    EOT
 
   install_script = <<-EOT
-    #!/bin/bash
-    set -o errexit
-    set -o pipefail
+      #!/bin/bash
+      set -o errexit
+      set -o pipefail
 
-    echo -n '${base64encode(local.install_script)}' | base64 -d > /tmp/install.sh
-    chmod +x /tmp/install.sh
-    ARG_CLAUDE_CODE_VERSION='${var.claude_code_version}' \
-    ARG_MCP_APP_STATUS_SLUG='${local.app_slug}' \
-    ARG_INSTALL_CLAUDE_CODE='${var.install_claude_code}' \
-    ARG_CLAUDE_BINARY_PATH='${var.claude_binary_path}' \
-    ARG_INSTALL_VIA_NPM='${var.install_via_npm}' \
-    ARG_REPORT_TASKS='${var.report_tasks}' \
-    ARG_WORKDIR='${local.workdir}' \
-    ARG_ALLOWED_TOOLS='${var.allowed_tools}' \
-    ARG_DISALLOWED_TOOLS='${var.disallowed_tools}' \
-    ARG_MCP='${var.mcp != null ? base64encode(replace(var.mcp, "'", "'\\''")) : ""}' \
-    ARG_MCP_CONFIG_REMOTE_PATH='${base64encode(jsonencode(var.mcp_config_remote_path))}' \
-    ARG_ENABLE_AIBRIDGE='${var.enable_aibridge}' \
-    /tmp/install.sh
-  EOT
+      echo -n '${base64encode(local.install_script)}' | base64 -d > /tmp/install.sh
+      chmod +x /tmp/install.sh
+      ARG_CLAUDE_CODE_VERSION='${var.claude_code_version}' \
+      ARG_MCP_APP_STATUS_SLUG='${local.app_slug}' \
+      ARG_INSTALL_CLAUDE_CODE='${var.install_claude_code}' \
+      ARG_CLAUDE_BINARY_PATH='${var.claude_binary_path}' \
+      ARG_INSTALL_VIA_NPM='${var.install_via_npm}' \
+      ARG_REPORT_TASKS='${var.report_tasks}' \
+      ARG_WORKDIR='${local.workdir}' \
+      ARG_ALLOWED_TOOLS='${var.allowed_tools}' \
+      ARG_DISALLOWED_TOOLS='${var.disallowed_tools}' \
+      ARG_MCP='${var.mcp != null ? base64encode(replace(var.mcp, "'", "'\\''")) : ""}' \
+      ARG_MCP_CONFIG_REMOTE_PATH='${base64encode(jsonencode(var.mcp_config_remote_path))}' \
+      ARG_ENABLE_AIBRIDGE='${var.enable_aibridge}' \
+      /tmp/install.sh
+    EOT
 }
 
 output "task_app_id" {

registry/coder/modules/claude-code/scripts/start.sh

@@ -12,6 +12,7 @@ command_exists() {
   command -v "$1" > /dev/null 2>&1
 }
 
+MODULE_PATH="$HOME/.claude-module"
 ARG_RESUME_SESSION_ID=${ARG_RESUME_SESSION_ID:-}
 ARG_CONTINUE=${ARG_CONTINUE:-false}
 ARG_DANGEROUSLY_SKIP_PERMISSIONS=${ARG_DANGEROUSLY_SKIP_PERMISSIONS:-}
@@ -244,12 +245,28 @@ function start_agentapi() {
       BOUNDARY_CMD=("$CODER_NO_CAPS" "boundary")
     fi
 
-    agentapi server --type claude --term-width 67 --term-height 1190 -- \
-      "${BOUNDARY_CMD[@]}" "${BOUNDARY_ARGS[@]}" -- \
-      claude "${ARGS[@]}"
+    # Build properly quoted command arguments
+    boundary_cmd=$(printf '%q ' "${BOUNDARY_CMD[@]}" "${BOUNDARY_ARGS[@]}")
+    claude_args=$(printf '%q ' "${ARGS[@]}")
+
+    # Write command to agent-command.sh with boundary
+    cat > "$MODULE_PATH/agent-command.sh" << EOF
+#!/bin/bash
+${BOUNDARY_CMD[@]} -- claude ${ARGS[@]}
+EOF
   else
-    agentapi server --type claude --term-width 67 --term-height 1190 -- claude "${ARGS[@]}"
+    # Build properly quoted command arguments
+    claude_args=$(printf '%q ' "${ARGS[@]}")
+
+    # Write command to agent-command.sh without boundary
+    cat > "$MODULE_PATH/agent-command.sh" << EOF
+#!/bin/bash
+claude ${ARGS[@]}
+EOF
   fi
+
+  chmod +x "$MODULE_PATH/agent-command.sh"
+  printf "Agent command written to %s\n" "$MODULE_PATH/agent-command.sh"
 }
 
 validate_claude_installation