Compare commits

...
2 Commits
Author SHA1 Message Date
Daniel SamsonandClaude Opus 4.6 06cf4d1b9e Handle stale workspaces: 409 conflict auto-cleanup + verbose logging
Publish Image / publish (push) Successful in 20s
When the orchestrator restarts, it loses in-memory queue state. If a
stale workspace still exists, createWorkspace now auto-deletes it and
retries instead of failing with 409. Also adds --verbose to Claude Code
invocation for better task log debugging.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-12 13:58:08 +01:00
Daniel SamsonandClaude Opus 4.6 4f1d306fdf Fix ImagePullBackOff: use multi-arch base image tag
The tag `ubuntu-arm64` doesn't exist on Docker Hub. Switch to `latest`
which includes arm64 in its multi-arch manifest.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-12 13:44:44 +01:00
2 changed files with 86 additions and 3 deletions
+74 -3
View File
@@ -442,6 +442,25 @@ resource "coder_agent" "main" {
web_terminal = true web_terminal = true
} }
metadata {
display_name = "Task Status"
key = "task_status"
script = <<-EOS
if [ -f ~/task-output.log ]; then
if grep -q "Task completed" ~/task-output.log 2>/dev/null; then
echo "✅ Complete"
else
echo "⏳ Running ($(wc -l < ~/task-output.log) lines)"
fi
elif [ -n "$TASK_TYPE" ]; then
echo "⏳ Starting..."
else
echo "Interactive"
fi
EOS
interval = 10
}
env = { env = {
ANTHROPIC_API_KEY = data.coder_parameter.anthropic_api_key.value ANTHROPIC_API_KEY = data.coder_parameter.anthropic_api_key.value
GITHUB_TOKEN = data.coder_external_auth.github.access_token GITHUB_TOKEN = data.coder_external_auth.github.access_token
@@ -516,6 +535,41 @@ resource "coder_agent" "main" {
npm run db:migrate:local npm run db:migrate:local
fi fi
# --- Start log viewer on port 13338 ---
if [ -n "$TASK_TYPE" ]; then
touch ~/task-output.log
cat > ~/log-server.sh << 'LOGEOF'
#!/bin/bash
while true; do
{
echo "HTTP/1.1 200 OK"
echo "Content-Type: text/html; charset=utf-8"
echo "Connection: close"
echo ""
echo "<html><head><title>Task Log</title>"
echo "<meta http-equiv='refresh' content='5'>"
echo "<style>body{background:#1e1e1e;color:#d4d4d4;font-family:monospace;font-size:13px;padding:16px;white-space:pre-wrap;}"
echo "h2{color:#569cd6;margin:0 0 8px}.meta{color:#6a9955;margin-bottom:16px;display:block}</style></head><body>"
echo "<h2>$TASK_TYPE #$ISSUE_NUMBER — $(hostname)</h2>"
if [ -f ~/task-output.log ]; then
LINES=$(wc -l < ~/task-output.log)
if grep -q "Task completed" ~/task-output.log 2>/dev/null; then
echo "<span class='meta'>Status: ✅ Complete ($LINES lines)</span>"
else
echo "<span class='meta'>Status: ⏳ Running ($LINES lines) — auto-refreshing every 5s</span>"
fi
sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' ~/task-output.log
else
echo "Waiting for task to start..."
fi
echo "</body></html>"
} | nc -l -p 13338 -q 1 2>/dev/null || true
done
LOGEOF
chmod +x ~/log-server.sh
nohup bash ~/log-server.sh &>/dev/null &
fi
# --- Automated task execution --- # --- Automated task execution ---
if [ -n "$TASK_TYPE" ] && [ -d ~/project ]; then if [ -n "$TASK_TYPE" ] && [ -d ~/project ]; then
cd ~/project cd ~/project
@@ -525,8 +579,10 @@ resource "coder_agent" "main" {
ARGS="$DEPLOY_ENV" ARGS="$DEPLOY_ENV"
fi fi
# Run Claude Code in non-interactive mode # Run Claude Code in non-interactive mode with tool access
claude --print --dangerously-skip-permissions "/project:$TASK_TYPE $ARGS" 2>&1 | tee ~/task-output.log claude -p --dangerously-skip-permissions --verbose "/project:$TASK_TYPE $ARGS" 2>&1 | tee ~/task-output.log
EXIT_CODE=$?
echo "Claude exited with code: $EXIT_CODE" | tee -a ~/task-output.log
echo "Task completed. Output saved to ~/task-output.log" echo "Task completed. Output saved to ~/task-output.log"
@@ -540,6 +596,21 @@ resource "coder_agent" "main" {
EOT EOT
} }
resource "coder_app" "task_log" {
agent_id = coder_agent.main.id
slug = "task-log"
display_name = "Task Log"
icon = "/icon/document.svg"
url = "http://localhost:13338"
share = "owner"
healthcheck {
url = "http://localhost:13338"
interval = 10
threshold = 3
}
}
# ============================================================================= # =============================================================================
# Main Workspace Deployment # Main Workspace Deployment
# ============================================================================= # =============================================================================
@@ -620,7 +691,7 @@ resource "kubernetes_deployment_v1" "workspace" {
container { container {
name = "coder-agent" name = "coder-agent"
image = "codercom/enterprise-base:ubuntu-arm64" image = "codercom/enterprise-base:latest"
command = ["sh", "-c", coder_agent.main.init_script] command = ["sh", "-c", coder_agent.main.init_script]
+12
View File
@@ -50,6 +50,18 @@ export class CoderClient {
}, },
); );
// Handle 409 conflict — stale workspace from a previous orchestrator instance
if (res.status === 409) {
console.log(`[coder] workspace "${name}" already exists — deleting stale workspace and retrying`);
const existing = await this.findWorkspaceByName(name);
if (existing) {
await this.deleteWorkspace(existing.id);
// Wait for deletion to propagate
await new Promise((resolve) => setTimeout(resolve, 5000));
}
return this.createWorkspace(task);
}
if (!res.ok) { if (!res.ok) {
const text = await res.text(); const text = await res.text();
throw new Error(`Coder API error ${res.status}: ${text}`); throw new Error(`Coder API error ${res.status}: ${text}`);