Compare commits
7
Commits
7145fb536a
..
v1.0.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa986a470e | ||
|
|
520fc8f81e | ||
|
|
d46e3ca247 | ||
|
|
ec0b012586 | ||
|
|
36c80458e0 | ||
|
|
06cf4d1b9e | ||
|
|
4f1d306fdf |
@@ -0,0 +1,27 @@
|
|||||||
|
name: Publish Workspace Image
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- 'coder/workspace.Dockerfile'
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: publish-workspace
|
||||||
|
cancel-in-progress: false
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
publish:
|
||||||
|
runs-on: self-hosted
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Log in to registry
|
||||||
|
run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login registry.samson.media -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
run: |
|
||||||
|
IMAGE=registry.samson.media/coder-workspace
|
||||||
|
docker build -f coder/workspace.Dockerfile -t "$IMAGE:latest" .
|
||||||
|
docker push "$IMAGE:latest"
|
||||||
@@ -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
|
||||||
@@ -459,28 +478,6 @@ resource "coder_agent" "main" {
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# --- Install Node.js 22 ---
|
|
||||||
if ! command -v node &> /dev/null; then
|
|
||||||
curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
|
|
||||||
sudo apt-get install -y nodejs
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Install global tools ---
|
|
||||||
if ! command -v wrangler &> /dev/null; then
|
|
||||||
sudo npm install -g wrangler @anthropic-ai/claude-code
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Install Playwright system dependencies ---
|
|
||||||
if ! dpkg -s libgbm1 &> /dev/null; then
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 \
|
|
||||||
libcups2t64 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 \
|
|
||||||
libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2t64 libatspi2.0-0 \
|
|
||||||
|| sudo apt-get install -y libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 \
|
|
||||||
libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 \
|
|
||||||
libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libatspi2.0-0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Configure git ---
|
# --- Configure git ---
|
||||||
git config --global user.name "${data.coder_workspace_owner.me.full_name}"
|
git config --global user.name "${data.coder_workspace_owner.me.full_name}"
|
||||||
git config --global user.email "${data.coder_workspace_owner.me.email}"
|
git config --global user.email "${data.coder_workspace_owner.me.email}"
|
||||||
@@ -525,8 +522,18 @@ resource "coder_agent" "main" {
|
|||||||
ARGS="$DEPLOY_ENV"
|
ARGS="$DEPLOY_ENV"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run Claude Code in non-interactive mode
|
# Read the slash command .md file, strip YAML frontmatter, substitute $ARGUMENTS
|
||||||
claude --print --dangerously-skip-permissions "/project:$TASK_TYPE $ARGS" 2>&1 | tee ~/task-output.log
|
CMD_FILE=".claude/commands/$TASK_TYPE.md"
|
||||||
|
if [ ! -f "$CMD_FILE" ]; then
|
||||||
|
echo "ERROR: Command file not found: $CMD_FILE" | tee ~/task-output.log
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
PROMPT=$(sed '1{/^---$/!q}; 1,/^---$/d' "$CMD_FILE" | sed "s/\\\$ARGUMENTS/$ARGS/g")
|
||||||
|
|
||||||
|
# Run Claude Code in non-interactive mode with tool access
|
||||||
|
claude -p --dangerously-skip-permissions --verbose "$PROMPT" 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"
|
||||||
|
|
||||||
@@ -620,7 +627,7 @@ resource "kubernetes_deployment_v1" "workspace" {
|
|||||||
|
|
||||||
container {
|
container {
|
||||||
name = "coder-agent"
|
name = "coder-agent"
|
||||||
image = "codercom/enterprise-base:ubuntu-arm64"
|
image = "registry.samson.media/coder-workspace:latest"
|
||||||
|
|
||||||
command = ["sh", "-c", coder_agent.main.init_script]
|
command = ["sh", "-c", coder_agent.main.init_script]
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
FROM codercom/enterprise-base:latest
|
||||||
|
|
||||||
|
USER root
|
||||||
|
|
||||||
|
# Node.js 22
|
||||||
|
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
|
||||||
|
&& apt-get install -y nodejs \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Global npm tools
|
||||||
|
RUN npm install -g wrangler @anthropic-ai/claude-code
|
||||||
|
|
||||||
|
# Playwright system dependencies (both Ubuntu 24.04 and 22.04 package names)
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 \
|
||||||
|
libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxfixes3 \
|
||||||
|
libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libatspi2.0-0 \
|
||||||
|
jq netcat-openbsd \
|
||||||
|
&& (apt-get install -y libcups2t64 libasound2t64 2>/dev/null \
|
||||||
|
|| apt-get install -y libcups2 libasound2 2>/dev/null) \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
USER coder
|
||||||
@@ -84,6 +84,11 @@ if (maintenanceRepos.length > 0) {
|
|||||||
// Start
|
// Start
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Reconcile queue state with Coder before accepting traffic
|
||||||
|
queue.reconcile().catch((err) =>
|
||||||
|
console.error("[startup] reconcile failed:", err),
|
||||||
|
);
|
||||||
|
|
||||||
serve({ fetch: app.fetch, port: config.port }, (info) => {
|
serve({ fetch: app.fetch, port: config.port }, (info) => {
|
||||||
console.log(`SDLC Orchestrator listening on :${info.port} (concurrency: ${concurrency})`);
|
console.log(`SDLC Orchestrator listening on :${info.port} (concurrency: ${concurrency})`);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -35,6 +35,34 @@ export class TaskQueue {
|
|||||||
this.concurrency = concurrency;
|
this.concurrency = concurrency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconcile in-memory state with Coder on startup.
|
||||||
|
* Re-adopts any running workspaces so callbacks and dedup work correctly.
|
||||||
|
*/
|
||||||
|
async reconcile(): Promise<void> {
|
||||||
|
const workspaces = await this.coder.listWorkspaces();
|
||||||
|
const runningStatuses = ["starting", "running", "started"];
|
||||||
|
|
||||||
|
for (const ws of workspaces) {
|
||||||
|
if (!runningStatuses.includes(ws.latestBuildStatus)) continue;
|
||||||
|
|
||||||
|
// Only adopt workspaces that match our naming pattern: {taskType}-{repo}-{issue}
|
||||||
|
const parts = ws.name.match(/^(.+?)-(.+?)-(\d+)$/);
|
||||||
|
if (!parts) continue;
|
||||||
|
|
||||||
|
this.active.set(ws.name, {
|
||||||
|
workspaceId: ws.id,
|
||||||
|
workspaceName: ws.name,
|
||||||
|
startedAt: new Date(), // approximate — we don't know the real start time
|
||||||
|
});
|
||||||
|
console.log(`[queue] reconciled: adopted workspace "${ws.name}" (status: ${ws.latestBuildStatus})`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.active.size > 0) {
|
||||||
|
console.log(`[queue] reconcile complete: ${this.active.size} active workspace(s) adopted`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Build a dedup key for a task. */
|
/** Build a dedup key for a task. */
|
||||||
static key(task: TaskRequest): string {
|
static key(task: TaskRequest): string {
|
||||||
return `${task.taskType}-${task.giteaRepo}-${task.issueNumber}`;
|
return `${task.taskType}-${task.giteaRepo}-${task.issueNumber}`;
|
||||||
|
|||||||
+77
-3
@@ -50,6 +50,32 @@ export class CoderClient {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Handle 409 conflict — workspace with this name already exists.
|
||||||
|
// This can happen if the orchestrator restarted and lost in-memory state.
|
||||||
|
if (res.status === 409) {
|
||||||
|
const existing = await this.findWorkspaceByName(name);
|
||||||
|
if (!existing) {
|
||||||
|
throw new Error(`Coder 409 but workspace "${name}" not found — possible race condition`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const stoppedStatuses = ["stopped", "failed", "canceled", "deleted"];
|
||||||
|
if (stoppedStatuses.includes(existing.latestBuildStatus)) {
|
||||||
|
// Workspace is done — safe to replace
|
||||||
|
console.log(
|
||||||
|
`[coder] workspace "${name}" exists but ${existing.latestBuildStatus} — deleting and retrying`,
|
||||||
|
);
|
||||||
|
await this.deleteWorkspace(existing.id);
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 5000));
|
||||||
|
return this.createWorkspace(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Workspace is still running — adopt it, don't kill it
|
||||||
|
console.log(
|
||||||
|
`[coder] workspace "${name}" is still ${existing.latestBuildStatus} — adopting existing workspace`,
|
||||||
|
);
|
||||||
|
return { id: existing.id, name: existing.name };
|
||||||
|
}
|
||||||
|
|
||||||
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}`);
|
||||||
@@ -95,7 +121,42 @@ export class CoderClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async findWorkspaceByName(name: string): Promise<{ id: string } | null> {
|
/**
|
||||||
|
* List all workspaces owned by the authenticated user.
|
||||||
|
* Used at startup to reconcile in-memory state with Coder.
|
||||||
|
*/
|
||||||
|
async listWorkspaces(): Promise<
|
||||||
|
Array<{ id: string; name: string; latestBuildStatus: string }>
|
||||||
|
> {
|
||||||
|
const res = await fetch(
|
||||||
|
`${this.baseUrl}/api/v2/workspaces?q=owner:me`,
|
||||||
|
{
|
||||||
|
headers: { "Coder-Session-Token": this.token },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!res.ok) return [];
|
||||||
|
|
||||||
|
const data = (await res.json()) as {
|
||||||
|
workspaces: Array<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
latest_build: { status: string };
|
||||||
|
}>;
|
||||||
|
};
|
||||||
|
return (data.workspaces ?? []).map((w) => ({
|
||||||
|
id: w.id,
|
||||||
|
name: w.name,
|
||||||
|
latestBuildStatus: w.latest_build?.status ?? "unknown",
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
async findWorkspaceByName(name: string): Promise<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
createdAt: string;
|
||||||
|
latestBuildStatus: string;
|
||||||
|
} | null> {
|
||||||
const res = await fetch(
|
const res = await fetch(
|
||||||
`${this.baseUrl}/api/v2/workspaces?q=name:${encodeURIComponent(name)}`,
|
`${this.baseUrl}/api/v2/workspaces?q=name:${encodeURIComponent(name)}`,
|
||||||
{
|
{
|
||||||
@@ -107,8 +168,21 @@ export class CoderClient {
|
|||||||
|
|
||||||
if (!res.ok) return null;
|
if (!res.ok) return null;
|
||||||
|
|
||||||
const data = (await res.json()) as { workspaces: Array<{ id: string; name: string }> };
|
const data = (await res.json()) as {
|
||||||
|
workspaces: Array<{
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
created_at: string;
|
||||||
|
latest_build: { status: string };
|
||||||
|
}>;
|
||||||
|
};
|
||||||
const match = data.workspaces?.find((w) => w.name === name);
|
const match = data.workspaces?.find((w) => w.name === name);
|
||||||
return match ? { id: match.id } : null;
|
if (!match) return null;
|
||||||
|
return {
|
||||||
|
id: match.id,
|
||||||
|
name: match.name,
|
||||||
|
createdAt: match.created_at,
|
||||||
|
latestBuildStatus: match.latest_build?.status ?? "unknown",
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user