chore: add ARG_REPORT_TASKS to start.sh and update initial prompt logic
This commit is contained in:
parent
d6b490ecb2
commit
496c29dda7
@ -285,18 +285,18 @@ module "agentapi" {
|
|||||||
source = "registry.coder.com/coder/agentapi/coder"
|
source = "registry.coder.com/coder/agentapi/coder"
|
||||||
version = "2.2.0"
|
version = "2.2.0"
|
||||||
|
|
||||||
agent_id = var.agent_id
|
agent_id = var.agent_id
|
||||||
folder = local.workdir
|
folder = local.workdir
|
||||||
web_app_slug = local.app_slug
|
web_app_slug = local.app_slug
|
||||||
web_app_order = var.order
|
web_app_order = var.order
|
||||||
web_app_group = var.group
|
web_app_group = var.group
|
||||||
web_app_icon = var.icon
|
web_app_icon = var.icon
|
||||||
web_app_display_name = var.web_app_display_name
|
web_app_display_name = var.web_app_display_name
|
||||||
cli_app = var.cli_app
|
cli_app = var.cli_app
|
||||||
cli_app_slug = var.cli_app ? "${local.app_slug}-cli" : null
|
cli_app_slug = var.cli_app ? "${local.app_slug}-cli" : null
|
||||||
cli_app_icon = var.cli_app ? var.icon : null
|
cli_app_icon = var.cli_app ? var.icon : null
|
||||||
cli_app_display_name = var.cli_app ? var.cli_app_display_name : null
|
cli_app_display_name = var.cli_app ? var.cli_app_display_name : null
|
||||||
agentapi_subdomain = var.subdomain
|
agentapi_subdomain = var.subdomain
|
||||||
module_dir_name = local.module_dir_name
|
module_dir_name = local.module_dir_name
|
||||||
install_agentapi = var.install_agentapi
|
install_agentapi = var.install_agentapi
|
||||||
agentapi_version = var.agentapi_version
|
agentapi_version = var.agentapi_version
|
||||||
@ -322,6 +322,7 @@ module "agentapi" {
|
|||||||
ARG_TRUSTED_DIRECTORIES='${join(",", var.trusted_directories)}' \
|
ARG_TRUSTED_DIRECTORIES='${join(",", var.trusted_directories)}' \
|
||||||
ARG_EXTERNAL_AUTH_ID='${var.external_auth_id}' \
|
ARG_EXTERNAL_AUTH_ID='${var.external_auth_id}' \
|
||||||
ARG_RESUME_SESSION='${var.resume_session}' \
|
ARG_RESUME_SESSION='${var.resume_session}' \
|
||||||
|
ARG_REPORT_TASKS='${var.report_tasks}' \
|
||||||
ARG_ENABLE_AIBRIDGE_PROXY='${var.enable_aibridge_proxy}' \
|
ARG_ENABLE_AIBRIDGE_PROXY='${var.enable_aibridge_proxy}' \
|
||||||
ARG_AIBRIDGE_PROXY_AUTH_URL='${var.aibridge_proxy_auth_url != null ? var.aibridge_proxy_auth_url : ""}' \
|
ARG_AIBRIDGE_PROXY_AUTH_URL='${var.aibridge_proxy_auth_url != null ? var.aibridge_proxy_auth_url : ""}' \
|
||||||
ARG_AIBRIDGE_PROXY_CERT_PATH='${var.aibridge_proxy_cert_path != null ? var.aibridge_proxy_cert_path : ""}' \
|
ARG_AIBRIDGE_PROXY_CERT_PATH='${var.aibridge_proxy_cert_path != null ? var.aibridge_proxy_cert_path : ""}' \
|
||||||
|
|||||||
@ -23,27 +23,34 @@ ARG_DENY_TOOLS=${ARG_DENY_TOOLS:-}
|
|||||||
ARG_TRUSTED_DIRECTORIES=${ARG_TRUSTED_DIRECTORIES:-}
|
ARG_TRUSTED_DIRECTORIES=${ARG_TRUSTED_DIRECTORIES:-}
|
||||||
ARG_EXTERNAL_AUTH_ID=${ARG_EXTERNAL_AUTH_ID:-github}
|
ARG_EXTERNAL_AUTH_ID=${ARG_EXTERNAL_AUTH_ID:-github}
|
||||||
ARG_RESUME_SESSION=${ARG_RESUME_SESSION:-true}
|
ARG_RESUME_SESSION=${ARG_RESUME_SESSION:-true}
|
||||||
|
ARG_REPORT_TASKS=${ARG_REPORT_TASKS:-true}
|
||||||
ARG_ENABLE_AIBRIDGE_PROXY=${ARG_ENABLE_AIBRIDGE_PROXY:-false}
|
ARG_ENABLE_AIBRIDGE_PROXY=${ARG_ENABLE_AIBRIDGE_PROXY:-false}
|
||||||
ARG_AIBRIDGE_PROXY_AUTH_URL=${ARG_AIBRIDGE_PROXY_AUTH_URL:-}
|
ARG_AIBRIDGE_PROXY_AUTH_URL=${ARG_AIBRIDGE_PROXY_AUTH_URL:-}
|
||||||
ARG_AIBRIDGE_PROXY_CERT_PATH=${ARG_AIBRIDGE_PROXY_CERT_PATH:-}
|
ARG_AIBRIDGE_PROXY_CERT_PATH=${ARG_AIBRIDGE_PROXY_CERT_PATH:-}
|
||||||
|
|
||||||
validate_copilot_installation() {
|
validate_copilot_installation() {
|
||||||
if ! command_exists copilot; then
|
if ! command_exists copilot; then
|
||||||
echo "ERROR: Copilot not installed. Run: npm install -g @github/copilot"
|
echo "ERROR: Copilot not installed or not in PATH. Please ensure Copilot CLI is installed and accessible."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
build_initial_prompt() {
|
build_initial_prompt() {
|
||||||
local initial_prompt=""
|
local initial_prompt=""
|
||||||
|
local task_prompt="$ARG_AI_PROMPT"
|
||||||
|
|
||||||
if [ -n "$ARG_AI_PROMPT" ]; then
|
# Add task reporting instruction when report_tasks is enabled
|
||||||
|
if [ -n "$ARG_AI_PROMPT" ] && [ "$ARG_REPORT_TASKS" = "true" ]; then
|
||||||
|
task_prompt="Every step of the way, report your progress using Coder.coder_report_task tool with proper summary and statuses. Your task at hand: $ARG_AI_PROMPT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$task_prompt" ]; then
|
||||||
if [ -n "$ARG_SYSTEM_PROMPT" ]; then
|
if [ -n "$ARG_SYSTEM_PROMPT" ]; then
|
||||||
initial_prompt="$ARG_SYSTEM_PROMPT
|
initial_prompt="$ARG_SYSTEM_PROMPT
|
||||||
|
|
||||||
$ARG_AI_PROMPT"
|
$task_prompt"
|
||||||
else
|
else
|
||||||
initial_prompt="$ARG_AI_PROMPT"
|
initial_prompt="$task_prompt"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user