From e89208f44b59525f607480077abdaae880040c80 Mon Sep 17 00:00:00 2001 From: Paul O'Reilly Date: Tue, 1 Sep 2026 02:11:20 +1200 Subject: [PATCH] fix(templates): per-item branches for concept-stage nodes (was shared spec/auto-draft) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All 6 concept/idea-stage templates hardcoded the literal shared branch spec/auto-draft instead of a per-item branch. Concurrent concept items (now routine via the M41 auto-advance sweep) all pushed to the same branch — a git collision risk. Switched to spec/${item.uuid}, matching the established task/${item.uuid} convention used by every task-stage template (merge@1, scaffold@1, etc — see spec/typed-workflows.md WF-COMP stable-per-item-branch rationale). spec-review-loop@1's 4 nodes keep the literal branch shared ACROSS the node set (now per-item, not global) so loop iterations still accumulate on one branch per item, per spec's cross-iteration-artifact caveat. Files: review-spec-arch-opus@1.yaml, spec-draft-opus@1.yaml, spec-review-loop@1.yaml, review-spec-arch-airouter@1.yaml, spec-draft-airouter@2.yaml, scope-decompose-sonnet@1.yaml --- task-templates/workflow/review-spec-arch-airouter@1.yaml | 2 +- task-templates/workflow/review-spec-arch-opus@1.yaml | 2 +- task-templates/workflow/scope-decompose-sonnet@1.yaml | 2 +- task-templates/workflow/spec-draft-airouter@2.yaml | 2 +- task-templates/workflow/spec-draft-opus@1.yaml | 2 +- task-templates/workflow/spec-review-loop@1.yaml | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/task-templates/workflow/review-spec-arch-airouter@1.yaml b/task-templates/workflow/review-spec-arch-airouter@1.yaml index 32044b5..5602133 100644 --- a/task-templates/workflow/review-spec-arch-airouter@1.yaml +++ b/task-templates/workflow/review-spec-arch-airouter@1.yaml @@ -21,7 +21,7 @@ nodes: labels: [airouter] runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. diff --git a/task-templates/workflow/review-spec-arch-opus@1.yaml b/task-templates/workflow/review-spec-arch-opus@1.yaml index 621345d..9838695 100644 --- a/task-templates/workflow/review-spec-arch-opus@1.yaml +++ b/task-templates/workflow/review-spec-arch-opus@1.yaml @@ -21,7 +21,7 @@ nodes: labels: [airouter] runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. diff --git a/task-templates/workflow/scope-decompose-sonnet@1.yaml b/task-templates/workflow/scope-decompose-sonnet@1.yaml index 4c54384..3c75fbd 100644 --- a/task-templates/workflow/scope-decompose-sonnet@1.yaml +++ b/task-templates/workflow/scope-decompose-sonnet@1.yaml @@ -26,7 +26,7 @@ nodes: model: sonnet runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" CP_URL: "http://controlplane.agent-runtimes.svc.cluster.local:8100" # AR-38: this stage's deliverable is work items POSTed to the CP, not a # repo diff — the empty-deliverable audit would fail every success. diff --git a/task-templates/workflow/spec-draft-airouter@2.yaml b/task-templates/workflow/spec-draft-airouter@2.yaml index 54902cd..3376c63 100644 --- a/task-templates/workflow/spec-draft-airouter@2.yaml +++ b/task-templates/workflow/spec-draft-airouter@2.yaml @@ -22,7 +22,7 @@ nodes: labels: [airouter] runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. diff --git a/task-templates/workflow/spec-draft-opus@1.yaml b/task-templates/workflow/spec-draft-opus@1.yaml index 3ace4b5..d925a94 100644 --- a/task-templates/workflow/spec-draft-opus@1.yaml +++ b/task-templates/workflow/spec-draft-opus@1.yaml @@ -20,7 +20,7 @@ nodes: model: opus runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. diff --git a/task-templates/workflow/spec-review-loop@1.yaml b/task-templates/workflow/spec-review-loop@1.yaml index f653d7c..7a4f64f 100644 --- a/task-templates/workflow/spec-review-loop@1.yaml +++ b/task-templates/workflow/spec-review-loop@1.yaml @@ -27,7 +27,7 @@ nodes: model: claude-opus-4 runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. @@ -55,7 +55,7 @@ nodes: model: minimax-m2 runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. @@ -84,7 +84,7 @@ nodes: depends_on: [review-opus, review-minimax] runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work. @@ -108,7 +108,7 @@ nodes: depends_on: [improve-sonnet] runtime_env: AGENT_REPO_URL: "git@gitea.oreillyit.nz-ai-enablement:skynet/agent-runtimes-agents.git" - AGENT_BRANCH: "spec/auto-draft" + AGENT_BRANCH: "spec/${item.uuid}" prompt: | The agent-runtimes project repo is cloned at /workspace/project. Change to that directory before doing any work.