bosun 0.41.8 → 0.41.10

package/ui/demo-defaults.js

@@ -970,7 +970,7 @@
           "type": "action.run_command",
           "label": "Fetch Bosun PR State",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const hours=Number('{{lookbackHours}}')||24; const repoScope=String('{{repoScope}}'||'auto').trim(); const since=new Date(Date.now()-hours*3600000).toISOString(); function ghJson(args){   try{const o=execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();return o?JSON.parse(o):[];}   catch{return [];} } const merged=ghJson(['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt','--limit','50']); const open=ghJson(['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft','--limit','50']); function extractTaskId(pr){   const src=String((pr.body||'')+'\\n'+(pr.title||''));   const m=src.match(/(?:Bosun-Task|VE-Task|Task-ID|task[_-]?id)[:\\s]+([a-zA-Z0-9_-]{4,64})/i);   return m?m[1].trim():null; } const recentMerged=merged.filter(p=>!p.mergedAt||new Date(p.mergedAt)>=new Date(since)); console.log(JSON.stringify({   repoScope,   merged:recentMerged.map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),   open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})), })); \"",
+            "command": "node -e \" const fs=require('fs'); const path=require('path'); const {execFileSync}=require('child_process'); const hours=Number('{{lookbackHours}}')||24; const repoScope=String('{{repoScope}}'||'auto').trim(); const since=new Date(Date.now()-hours*3600000).toISOString(); function ghJson(args){   try{const o=execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();return o?JSON.parse(o):[];}   catch{return [];} } function configPath(){   const home=String(process.env.BOSUN_HOME||process.env.VK_PROJECT_DIR||'').trim();   return home?path.join(home,'bosun.config.json'):path.join(process.cwd(),'bosun.config.json'); } function collectReposFromConfig(){   const repos=[];   try{     const cfg=JSON.parse(fs.readFileSync(configPath(),'utf8'));     const workspaces=Array.isArray(cfg?.workspaces)?cfg.workspaces:[];     if(workspaces.length>0){       const active=String(cfg?.activeWorkspace||'').trim().toLowerCase();       const activeWs=active?workspaces.find(w=>String(w?.id||'').trim().toLowerCase()===active):null;       const wsList=activeWs?[activeWs]:workspaces;       for(const ws of wsList){         for(const repo of (Array.isArray(ws?.repos)?ws.repos:[])){           const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();           if(slug) repos.push(slug);         }       }     }     if(repos.length===0){       for(const repo of (Array.isArray(cfg?.repos)?cfg.repos:[])){         const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();         if(slug) repos.push(slug);       }     }   }catch{}   return repos; } function resolveRepoTargets(){   if(repoScope&&repoScope!=='auto'&&repoScope!=='all'&&repoScope!=='current'){     return [...new Set(repoScope.split(',').map(v=>v.trim()).filter(Boolean))];   }   if(repoScope==='current') return [''];   const fromConfig=collectReposFromConfig();   if(fromConfig.length>0) return [...new Set(fromConfig)];   const envRepo=String(process.env.GITHUB_REPOSITORY||'').trim();   if(envRepo) return [envRepo];   return ['']; } function parseRepoFromUrl(url){   const raw=String(url||'');   const marker='github.com/';   const idx=raw.toLowerCase().indexOf(marker);   if(idx<0) return '';   const tail=raw.slice(idx+marker.length).split('/');   if(tail.length<2) return '';   const owner=String(tail[0]||'').trim();   const repo=String(tail[1]||'').trim();   return owner&&repo?(owner+'/'+repo):''; } function extractTaskId(pr){   const src=String((pr.body||'')+'\\n'+(pr.title||''));   const m=src.match(/(?:Bosun-Task|VE-Task|Task-ID|task[_-]?id)[:\\s]+([a-zA-Z0-9_-]{4,64})/i);   return m?m[1].trim():null; } const repoTargets=resolveRepoTargets(); const merged=[]; const open=[]; for(const target of repoTargets){   const repo=String(target||'').trim();   const mergedArgs=['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt,url','--limit','50'];   const openArgs=['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft,url','--limit','50'];   if(repo){ mergedArgs.push('--repo',repo); openArgs.push('--repo',repo); }   for(const pr of ghJson(mergedArgs)){ merged.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); }   for(const pr of ghJson(openArgs)){ open.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); } } const recentMerged=merged.filter(p=>!p.mergedAt||new Date(p.mergedAt)>=new Date(since)); console.log(JSON.stringify({   repoScope,   reposScanned: repoTargets.length,   merged:recentMerged.map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),   open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})), })); \"",
             "continueOnError": true
           },
           "position": {
@@ -1001,7 +1001,7 @@
           "type": "action.run_command",
           "label": "Sync PR State → Kanban (Programmatic)",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const fs=require('fs'); const raw=String(process.env.BOSUN_FETCH_PR_STATE||''); const data=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const merged=Array.isArray(data.merged)?data.merged:[]; const open=Array.isArray(data.open)?data.open:[]; const updates=[]; const unresolved=[]; const taskCli=['task-cli.mjs','task/task-cli.mjs'].find(p=>fs.existsSync(p))||''; if(!taskCli){   console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_cli_missing'}],needsAgent:true}));   process.exit(0); } function runTask(args){return execFileSync('node',[taskCli,...args],{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/).map(s=>s.trim()).filter(Boolean);for(let i=lines.length-1;i>=0;i--){const line=lines[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;} function getTaskSnapshot(id){   try{const raw=runTask(['get',id,'--json']);const task=parseJsonObject(raw);return {status:task?.status||null,reviewStatus:task?.reviewStatus||null};}catch{return {status:null,reviewStatus:null};} } for(const item of merged){   const id=String(item?.taskId||'').trim();   if(!id) continue;   try{runTask(['update',id,'--status','done']);updates.push({taskId:id,status:'done'});}catch(e){unresolved.push({taskId:id,status:'done',error:String(e?.message||e)});} } for(const item of open){   const id=String(item?.taskId||'').trim();   if(!id) continue;   try{const snap=getTaskSnapshot(id);const current=snap?.status;const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}if(current==='todo'||current==='inprogress'){const reason=(review==='changes_requested'||review==='change_requested'||review==='requested_changes')?'changes_requested_pending_fix':'local_progress_state';updates.push({taskId:id,status:current,skipped:true,reason});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview'});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});} } console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:unresolved.length>0})); \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const fs=require('fs'); const raw=String(process.env.BOSUN_FETCH_PR_STATE||''); const data=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const merged=Array.isArray(data.merged)?data.merged:[]; const open=Array.isArray(data.open)?data.open:[]; const updates=[]; const unresolved=[]; const maxBuffer=25*1024*1024; const cliPath=fs.existsSync('cli.mjs')?'cli.mjs':''; const taskCli=['task-cli.mjs','task/task-cli.mjs'].find(p=>fs.existsSync(p))||''; const taskRunner=cliPath?'cli':(taskCli?'task-cli':''); if(!taskRunner){   console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_command_missing'}],needsAgent:true}));   process.exit(0); } function runTask(args){const cmdArgs=taskRunner==='cli'?['cli.mjs','task',...args,'--config-dir','.bosun','--repo-root','.']:[taskCli,...args];return execFileSync('node',cmdArgs,{encoding:'utf8',stdio:['pipe','pipe','pipe'],maxBuffer}).trim();} function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/);for(let start=0;start<lines.length;start++){const token=lines[start].trim();if(!(token==='['||token==='{'||token.startsWith('[{')||token.startsWith('{\"')||token.startsWith('[\"')))continue;const candidate=lines.slice(start).join('\\n').trim();try{return JSON.parse(candidate);}catch{}}const compact=lines.map(s=>s.trim()).filter(Boolean);for(let i=compact.length-1;i>=0;i--){const line=compact[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;} let taskListCache=null; function normalizeRepo(value){return String(value||'').trim().toLowerCase();} function listTasks(){   if(Array.isArray(taskListCache)) return taskListCache;   try{const raw=runTask(['list','--json']);const tasks=parseJsonObject(raw);taskListCache=Array.isArray(tasks)?tasks:[];return taskListCache;}catch{taskListCache=[];return taskListCache;} } function resolveTaskId(item){   const explicit=String(item?.taskId||'').trim();   if(explicit) return explicit;   const branch=String(item?.branch||'').trim();   if(!branch) return '';   const repo=normalizeRepo(item?.repo);   const matches=listTasks().filter((task)=>{     const taskBranch=String(task?.branchName||'').trim();     if(taskBranch!==branch) return false;     const taskRepo=normalizeRepo(task?.repository||'');     if(!repo || !taskRepo) return true;     return taskRepo===repo;   });   if(matches.length===1) return String(matches[0]?.id||'').trim();   const exactRepo=matches.find((task)=>normalizeRepo(task?.repository||'')===repo);   return exactRepo?String(exactRepo?.id||'').trim():''; } function getTaskSnapshot(id){   try{const raw=runTask(['get',id,'--json']);const task=parseJsonObject(raw);return {status:task?.status||null,reviewStatus:task?.reviewStatus||null};}catch{return {status:null,reviewStatus:null};} } for(const item of merged){   const id=resolveTaskId(item);   if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'done',reason:'task_lookup_failed'});continue;}   try{runTask(['update',id,'--status','done']);updates.push({taskId:id,status:'done'});}catch(e){unresolved.push({taskId:id,status:'done',error:String(e?.message||e)});} } for(const item of open){   const id=resolveTaskId(item);   if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'inreview',reason:'task_lookup_failed'});continue;}   try{const snap=getTaskSnapshot(id);const current=String(snap?.status||'').trim().toLowerCase();const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview',fromStatus:current||null,reviewStatus:review||null});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});} } const actionableUnresolved=unresolved.filter((item)=>String(item?.taskId||'').trim()); console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:actionableUnresolved.length>0})); \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -1021,7 +1021,7 @@
           "type": "condition.expression",
           "label": "Needs Agent Sync?",
           "config": {
-            "expression": "(()=>{try{const raw=$ctx.getNodeOutput('sync-programmatic')?.output||'{}';const d=JSON.parse(raw);return d?.needsAgent===true || (Array.isArray(d?.unresolved)&&d.unresolved.length>0);}catch{return true;}})()"
+            "expression": "(()=>{try{const raw=$ctx.getNodeOutput('sync-programmatic')?.output||'{}';const d=JSON.parse(raw);const actionable=Array.isArray(d?.unresolved)?d.unresolved.some((item)=>String(item?.taskId||'').trim()):false;return d?.needsAgent===true || actionable;}catch{return true;}})()"
           },
           "position": {
             "x": 400,
@@ -4607,7 +4607,7 @@
         "multi-language"
       ],
       "nodeCount": 29,
-      "edgeCount": 30,
+      "edgeCount": 28,
       "recommended": true,
       "enabled": true,
       "trigger": "trigger.task_assigned",
@@ -4714,7 +4714,7 @@
           ]
         },
         {
-          "id": "build",
+          "id": "main-build",
           "type": "validation.build",
           "label": "Build Check",
           "config": {
@@ -4723,29 +4723,29 @@
           },
           "position": {
             "x": 400,
-            "y": 650
+            "y": 0
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "test-final",
+          "id": "main-test",
           "type": "validation.tests",
-          "label": "Final Test Run",
+          "label": "Test Run",
           "config": {
             "command": "{{testCommand}}"
           },
           "position": {
             "x": 400,
-            "y": 780
+            "y": 130
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "lint",
+          "id": "main-lint",
           "type": "validation.lint",
           "label": "Lint Check",
           "config": {
@@ -4753,7 +4753,7 @@
           },
           "position": {
             "x": 400,
-            "y": 910
+            "y": 260
           },
           "outputs": [
             "default"
@@ -4764,7 +4764,7 @@
           "type": "condition.expression",
           "label": "All Checks Passed?",
           "config": {
-            "expression": "$ctx.getNodeOutput('build')?.passed === true && $ctx.getNodeOutput('test-final')?.passed === true && $ctx.getNodeOutput('lint')?.passed === true"
+            "expression": "$ctx.getNodeOutput('main-build')?.passed === true && $ctx.getNodeOutput('main-test')?.passed === true && $ctx.getNodeOutput('main-lint')?.passed === true"
           },
           "position": {
             "x": 400,
@@ -4795,22 +4795,6 @@
             "default"
           ]
         },
-        {
-          "id": "push-ok",
-          "type": "condition.expression",
-          "label": "Push OK?",
-          "config": {
-            "expression": "$ctx.getNodeOutput('push-branch')?.pushed === true"
-          },
-          "position": {
-            "x": 250,
-            "y": 1175
-          },
-          "outputs": [
-            "yes",
-            "no"
-          ]
-        },
         {
           "id": "create-pr",
           "type": "action.create_pr",
@@ -4834,15 +4818,15 @@
           ]
         },
         {
-          "id": "pr-created",
+          "id": "main-pr-ok",
           "type": "condition.expression",
-          "label": "Handoff Recorded?",
+          "label": "PR Created?",
           "config": {
-            "expression": "Boolean($ctx.getNodeOutput('create-pr')?.prNumber || $ctx.getNodeOutput('create-pr')?.prUrl)"
+            "expression": "Boolean($ctx.getNodeOutput($edge.source)?.prNumber || $ctx.getNodeOutput($edge.source)?.prUrl)"
           },
           "position": {
-            "x": 250,
-            "y": 1240
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "yes",
@@ -4850,7 +4834,7 @@
           ]
         },
         {
-          "id": "set-inreview",
+          "id": "main-set-inreview",
           "type": "action.update_task_status",
           "label": "Set In-Review",
           "config": {
@@ -4859,8 +4843,30 @@
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 180,
-            "y": 1320
+            "x": 300,
+            "y": 130
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "main-handoff-progressor",
+          "type": "action.execute_workflow",
+          "label": "Handoff PR Progressor",
+          "config": {
+            "workflowId": "template-bosun-pr-progressor",
+            "mode": "dispatch",
+            "input": {
+              "taskId": "{{taskId}}",
+              "taskTitle": "{{taskTitle}}",
+              "branch": "{{branch}}",
+              "baseBranch": "{{baseBranch}}"
+            }
+          },
+          "position": {
+            "x": 300,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -4903,7 +4909,7 @@
           "label": "Summarize Validation Output",
           "config": {
             "key": "validationSummary",
-            "value": "(() => { const implement = $ctx.getNodeOutput('implement') || {}; const build = $ctx.getNodeOutput('build') || {}; const test = $ctx.getNodeOutput('test-final') || {}; const lint = $ctx.getNodeOutput('lint') || {}; return ['- implement.success: ' + (implement.success === true), '- build.passed: ' + (build.passed === true), '- test-final.passed: ' + (test.passed === true), '- lint.passed: ' + (lint.passed === true), '', 'Build output:', String(build.output || '').slice(0, 6000), '', 'Test output:', String(test.output || '').slice(0, 6000), '', 'Lint output:', String(lint.output || '').slice(0, 6000)].join('\\n'); })()",
+            "value": "(() => { const implement = $ctx.getNodeOutput('implement') || {}; const build = $ctx.getNodeOutput('main-build') || {}; const test = $ctx.getNodeOutput('main-test') || {}; const lint = $ctx.getNodeOutput('main-lint') || {}; return ['- implement.success: ' + (implement.success === true), '- build.passed: ' + (build.passed === true), '- test-final.passed: ' + (test.passed === true), '- lint.passed: ' + (lint.passed === true), '', 'Build output:', String(build.output || '').slice(0, 6000), '', 'Test output:', String(test.output || '').slice(0, 6000), '', 'Lint output:', String(lint.output || '').slice(0, 6000)].join('\\n'); })()",
             "isExpression": true
           },
           "position": {
@@ -4932,46 +4938,46 @@
           ]
         },
         {
-          "id": "build-retry",
+          "id": "retry-build",
           "type": "validation.build",
-          "label": "Build Check (Retry)",
+          "label": "Build Check",
           "config": {
             "command": "{{buildCommand}}",
             "zeroWarnings": true
           },
           "position": {
-            "x": 620,
-            "y": 1300
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "test-retry",
+          "id": "retry-test",
           "type": "validation.tests",
-          "label": "Final Test Run (Retry)",
+          "label": "Test Run",
           "config": {
             "command": "{{testCommand}}"
           },
           "position": {
-            "x": 620,
-            "y": 1430
+            "x": 400,
+            "y": 130
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "lint-retry",
+          "id": "retry-lint",
           "type": "validation.lint",
-          "label": "Lint Check (Retry)",
+          "label": "Lint Check",
           "config": {
             "command": "{{lintCommand}}"
           },
           "position": {
-            "x": 620,
-            "y": 1560
+            "x": 400,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -4982,7 +4988,7 @@
           "type": "condition.expression",
           "label": "Retry Checks Passed?",
           "config": {
-            "expression": "$ctx.getNodeOutput('build-retry')?.passed === true && $ctx.getNodeOutput('test-retry')?.passed === true && $ctx.getNodeOutput('lint-retry')?.passed === true"
+            "expression": "$ctx.getNodeOutput('retry-build')?.passed === true && $ctx.getNodeOutput('retry-test')?.passed === true && $ctx.getNodeOutput('retry-lint')?.passed === true"
           },
           "position": {
             "x": 620,
@@ -5013,22 +5019,6 @@
             "default"
           ]
         },
-        {
-          "id": "push-ok-retry",
-          "type": "condition.expression",
-          "label": "Push OK? (Retry)",
-          "config": {
-            "expression": "$ctx.getNodeOutput('push-branch-retry')?.pushed === true"
-          },
-          "position": {
-            "x": 450,
-            "y": 1825
-          },
-          "outputs": [
-            "yes",
-            "no"
-          ]
-        },
         {
           "id": "create-pr-retry",
           "type": "action.create_pr",
@@ -5052,15 +5042,15 @@
           ]
         },
         {
-          "id": "pr-created-retry",
+          "id": "retry-pr-ok",
           "type": "condition.expression",
-          "label": "Handoff Recorded (Retry Path)?",
+          "label": "PR Created?",
           "config": {
-            "expression": "Boolean($ctx.getNodeOutput('create-pr-retry')?.prNumber || $ctx.getNodeOutput('create-pr-retry')?.prUrl)"
+            "expression": "Boolean($ctx.getNodeOutput($edge.source)?.prNumber || $ctx.getNodeOutput($edge.source)?.prUrl)"
           },
           "position": {
-            "x": 450,
-            "y": 1890
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "yes",
@@ -5068,17 +5058,39 @@
           ]
         },
         {
-          "id": "set-inreview-retry",
+          "id": "retry-set-inreview",
           "type": "action.update_task_status",
-          "label": "Set In-Review (Retry)",
+          "label": "Set In-Review",
           "config": {
             "taskId": "{{taskId}}",
             "status": "inreview",
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 360,
-            "y": 1980
+            "x": 300,
+            "y": 130
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "retry-handoff-progressor",
+          "type": "action.execute_workflow",
+          "label": "Handoff PR Progressor",
+          "config": {
+            "workflowId": "template-bosun-pr-progressor",
+            "mode": "dispatch",
+            "input": {
+              "taskId": "{{taskId}}",
+              "taskTitle": "{{taskTitle}}",
+              "branch": "{{branch}}",
+              "baseBranch": "{{baseBranch}}"
+            }
+          },
+          "position": {
+            "x": 300,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -5151,26 +5163,26 @@
           "sourcePort": "default"
         },
         {
-          "id": "implement->build",
+          "id": "implement->main-build",
           "source": "implement",
-          "target": "build",
+          "target": "main-build",
           "sourcePort": "default"
         },
         {
-          "id": "build->test-final",
-          "source": "build",
-          "target": "test-final",
+          "id": "main-build->main-test",
+          "source": "main-build",
+          "target": "main-test",
           "sourcePort": "default"
         },
         {
-          "id": "test-final->lint",
-          "source": "test-final",
-          "target": "lint",
+          "id": "main-test->main-lint",
+          "source": "main-test",
+          "target": "main-lint",
           "sourcePort": "default"
         },
         {
-          "id": "lint->all-passed",
-          "source": "lint",
+          "id": "main-lint->all-passed",
+          "source": "main-lint",
           "target": "all-passed",
           "sourcePort": "default"
         },
@@ -5189,78 +5201,69 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "set-validation-summary->auto-fix",
-          "source": "set-validation-summary",
-          "target": "auto-fix",
-          "sourcePort": "default"
-        },
-        {
-          "id": "push-branch->push-ok",
+          "id": "push-branch->create-pr",
           "source": "push-branch",
-          "target": "push-ok",
+          "target": "create-pr",
           "sourcePort": "default"
         },
         {
-          "id": "push-ok->create-pr",
-          "source": "push-ok",
-          "target": "create-pr",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
+          "id": "create-pr->main-pr-ok",
+          "source": "create-pr",
+          "target": "main-pr-ok",
+          "sourcePort": "default"
         },
         {
-          "id": "push-ok->notify-pr-failed",
-          "source": "push-ok",
-          "target": "notify-pr-failed",
-          "sourcePort": "no",
-          "condition": "$output?.result !== true"
+          "id": "main-pr-ok->main-set-inreview",
+          "source": "main-pr-ok",
+          "target": "main-set-inreview",
+          "sourcePort": "yes"
         },
         {
-          "id": "create-pr->pr-created",
-          "source": "create-pr",
-          "target": "pr-created",
+          "id": "main-set-inreview->main-handoff-progressor",
+          "source": "main-set-inreview",
+          "target": "main-handoff-progressor",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created->set-inreview",
-          "source": "pr-created",
-          "target": "set-inreview",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
-        },
-        {
-          "id": "set-inreview->notify-done",
-          "source": "set-inreview",
+          "id": "main-handoff-progressor->notify-done",
+          "source": "main-handoff-progressor",
           "target": "notify-done",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created->notify-pr-failed",
-          "source": "pr-created",
+          "id": "main-pr-ok->notify-pr-failed",
+          "source": "main-pr-ok",
           "target": "notify-pr-failed",
           "sourcePort": "no",
           "condition": "$output?.result !== true"
         },
         {
-          "id": "auto-fix->build-retry",
+          "id": "set-validation-summary->auto-fix",
+          "source": "set-validation-summary",
+          "target": "auto-fix",
+          "sourcePort": "default"
+        },
+        {
+          "id": "auto-fix->retry-build",
           "source": "auto-fix",
-          "target": "build-retry",
+          "target": "retry-build",
           "sourcePort": "default"
         },
         {
-          "id": "build-retry->test-retry",
-          "source": "build-retry",
-          "target": "test-retry",
+          "id": "retry-build->retry-test",
+          "source": "retry-build",
+          "target": "retry-test",
           "sourcePort": "default"
         },
         {
-          "id": "test-retry->lint-retry",
-          "source": "test-retry",
-          "target": "lint-retry",
+          "id": "retry-test->retry-lint",
+          "source": "retry-test",
+          "target": "retry-lint",
           "sourcePort": "default"
         },
         {
-          "id": "lint-retry->retry-passed",
-          "source": "lint-retry",
+          "id": "retry-lint->retry-passed",
+          "source": "retry-lint",
           "target": "retry-passed",
           "sourcePort": "default"
         },
@@ -5279,47 +5282,38 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "push-branch-retry->push-ok-retry",
+          "id": "push-branch-retry->create-pr-retry",
           "source": "push-branch-retry",
-          "target": "push-ok-retry",
+          "target": "create-pr-retry",
           "sourcePort": "default"
         },
         {
-          "id": "push-ok-retry->create-pr-retry",
-          "source": "push-ok-retry",
-          "target": "create-pr-retry",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
+          "id": "create-pr-retry->retry-pr-ok",
+          "source": "create-pr-retry",
+          "target": "retry-pr-ok",
+          "sourcePort": "default"
         },
         {
-          "id": "push-ok-retry->notify-pr-failed-retry",
-          "source": "push-ok-retry",
-          "target": "notify-pr-failed-retry",
-          "sourcePort": "no",
-          "condition": "$output?.result !== true"
+          "id": "retry-pr-ok->retry-set-inreview",
+          "source": "retry-pr-ok",
+          "target": "retry-set-inreview",
+          "sourcePort": "yes"
         },
         {
-          "id": "create-pr-retry->pr-created-retry",
-          "source": "create-pr-retry",
-          "target": "pr-created-retry",
+          "id": "retry-set-inreview->retry-handoff-progressor",
+          "source": "retry-set-inreview",
+          "target": "retry-handoff-progressor",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created-retry->set-inreview-retry",
-          "source": "pr-created-retry",
-          "target": "set-inreview-retry",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
-        },
-        {
-          "id": "set-inreview-retry->notify-done-retry",
-          "source": "set-inreview-retry",
+          "id": "retry-handoff-progressor->notify-done-retry",
+          "source": "retry-handoff-progressor",
           "target": "notify-done-retry",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created-retry->notify-pr-failed-retry",
-          "source": "pr-created-retry",
+          "id": "retry-pr-ok->notify-pr-failed-retry",
+          "source": "retry-pr-ok",
           "target": "notify-pr-failed-retry",
           "sourcePort": "no",
           "condition": "$output?.result !== true"
@@ -14372,7 +14366,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -14397,7 +14391,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -14412,7 +14406,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -14753,7 +14747,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -14778,7 +14772,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -14793,7 +14787,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -15255,7 +15249,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -15280,7 +15274,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -15295,7 +15289,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -15346,7 +15340,7 @@
       ],
       "nodeCount": 5,
       "edgeCount": 4,
-      "recommended": false,
+      "recommended": true,
       "enabled": true,
       "trigger": "trigger.task_assigned",
       "variables": {
@@ -15431,7 +15425,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -15456,7 +15450,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -15471,7 +15465,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -15791,7 +15785,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -15816,7 +15810,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -15831,7 +15825,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -18724,6 +18718,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -18748,6 +18743,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -18772,6 +18768,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -20080,6 +20077,8 @@
             "cwd": "{{worktreePath}}",
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
+            "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -21732,7 +21731,7 @@
           "type": "action.run_command",
           "label": "Fetch Bosun PR State",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const hours=Number('{{lookbackHours}}')||24; const repoScope=String('{{repoScope}}'||'auto').trim(); const since=new Date(Date.now()-hours*3600000).toISOString(); function ghJson(args){   try{const o=execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();return o?JSON.parse(o):[];}   catch{return [];} } const merged=ghJson(['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt','--limit','50']); const open=ghJson(['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft','--limit','50']); function extractTaskId(pr){   const src=String((pr.body||'')+'\\n'+(pr.title||''));   const m=src.match(/(?:Bosun-Task|VE-Task|Task-ID|task[_-]?id)[:\\s]+([a-zA-Z0-9_-]{4,64})/i);   return m?m[1].trim():null; } const recentMerged=merged.filter(p=>!p.mergedAt||new Date(p.mergedAt)>=new Date(since)); console.log(JSON.stringify({   repoScope,   merged:recentMerged.map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),   open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})), })); \"",
+            "command": "node -e \" const fs=require('fs'); const path=require('path'); const {execFileSync}=require('child_process'); const hours=Number('{{lookbackHours}}')||24; const repoScope=String('{{repoScope}}'||'auto').trim(); const since=new Date(Date.now()-hours*3600000).toISOString(); function ghJson(args){   try{const o=execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();return o?JSON.parse(o):[];}   catch{return [];} } function configPath(){   const home=String(process.env.BOSUN_HOME||process.env.VK_PROJECT_DIR||'').trim();   return home?path.join(home,'bosun.config.json'):path.join(process.cwd(),'bosun.config.json'); } function collectReposFromConfig(){   const repos=[];   try{     const cfg=JSON.parse(fs.readFileSync(configPath(),'utf8'));     const workspaces=Array.isArray(cfg?.workspaces)?cfg.workspaces:[];     if(workspaces.length>0){       const active=String(cfg?.activeWorkspace||'').trim().toLowerCase();       const activeWs=active?workspaces.find(w=>String(w?.id||'').trim().toLowerCase()===active):null;       const wsList=activeWs?[activeWs]:workspaces;       for(const ws of wsList){         for(const repo of (Array.isArray(ws?.repos)?ws.repos:[])){           const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();           if(slug) repos.push(slug);         }       }     }     if(repos.length===0){       for(const repo of (Array.isArray(cfg?.repos)?cfg.repos:[])){         const slug=typeof repo==='string'?String(repo).trim():String(repo?.slug||'').trim();         if(slug) repos.push(slug);       }     }   }catch{}   return repos; } function resolveRepoTargets(){   if(repoScope&&repoScope!=='auto'&&repoScope!=='all'&&repoScope!=='current'){     return [...new Set(repoScope.split(',').map(v=>v.trim()).filter(Boolean))];   }   if(repoScope==='current') return [''];   const fromConfig=collectReposFromConfig();   if(fromConfig.length>0) return [...new Set(fromConfig)];   const envRepo=String(process.env.GITHUB_REPOSITORY||'').trim();   if(envRepo) return [envRepo];   return ['']; } function parseRepoFromUrl(url){   const raw=String(url||'');   const marker='github.com/';   const idx=raw.toLowerCase().indexOf(marker);   if(idx<0) return '';   const tail=raw.slice(idx+marker.length).split('/');   if(tail.length<2) return '';   const owner=String(tail[0]||'').trim();   const repo=String(tail[1]||'').trim();   return owner&&repo?(owner+'/'+repo):''; } function extractTaskId(pr){   const src=String((pr.body||'')+'\\n'+(pr.title||''));   const m=src.match(/(?:Bosun-Task|VE-Task|Task-ID|task[_-]?id)[:\\s]+([a-zA-Z0-9_-]{4,64})/i);   return m?m[1].trim():null; } const repoTargets=resolveRepoTargets(); const merged=[]; const open=[]; for(const target of repoTargets){   const repo=String(target||'').trim();   const mergedArgs=['pr','list','--state','merged','--label','bosun-attached','--json','number,title,body,headRefName,mergedAt,url','--limit','50'];   const openArgs=['pr','list','--state','open','--label','bosun-attached','--json','number,title,body,headRefName,isDraft,url','--limit','50'];   if(repo){ mergedArgs.push('--repo',repo); openArgs.push('--repo',repo); }   for(const pr of ghJson(mergedArgs)){ merged.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); }   for(const pr of ghJson(openArgs)){ open.push({...pr,__repo:repo||parseRepoFromUrl(pr?.url)||String(process.env.GITHUB_REPOSITORY||'').trim()}); } } const recentMerged=merged.filter(p=>!p.mergedAt||new Date(p.mergedAt)>=new Date(since)); console.log(JSON.stringify({   repoScope,   reposScanned: repoTargets.length,   merged:recentMerged.map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})),   open:open.filter(p=>!p.isDraft).map(p=>({n:p.number,repo:p.__repo||'',title:p.title,branch:p.headRefName,taskId:extractTaskId(p)})), })); \"",
             "continueOnError": true
           },
           "position": {
@@ -21763,7 +21762,7 @@
           "type": "action.run_command",
           "label": "Sync PR State → Kanban (Programmatic)",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const fs=require('fs'); const raw=String(process.env.BOSUN_FETCH_PR_STATE||''); const data=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const merged=Array.isArray(data.merged)?data.merged:[]; const open=Array.isArray(data.open)?data.open:[]; const updates=[]; const unresolved=[]; const taskCli=['task-cli.mjs','task/task-cli.mjs'].find(p=>fs.existsSync(p))||''; if(!taskCli){   console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_cli_missing'}],needsAgent:true}));   process.exit(0); } function runTask(args){return execFileSync('node',[taskCli,...args],{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/).map(s=>s.trim()).filter(Boolean);for(let i=lines.length-1;i>=0;i--){const line=lines[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;} function getTaskSnapshot(id){   try{const raw=runTask(['get',id,'--json']);const task=parseJsonObject(raw);return {status:task?.status||null,reviewStatus:task?.reviewStatus||null};}catch{return {status:null,reviewStatus:null};} } for(const item of merged){   const id=String(item?.taskId||'').trim();   if(!id) continue;   try{runTask(['update',id,'--status','done']);updates.push({taskId:id,status:'done'});}catch(e){unresolved.push({taskId:id,status:'done',error:String(e?.message||e)});} } for(const item of open){   const id=String(item?.taskId||'').trim();   if(!id) continue;   try{const snap=getTaskSnapshot(id);const current=snap?.status;const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}if(current==='todo'||current==='inprogress'){const reason=(review==='changes_requested'||review==='change_requested'||review==='requested_changes')?'changes_requested_pending_fix':'local_progress_state';updates.push({taskId:id,status:current,skipped:true,reason});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview'});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});} } console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:unresolved.length>0})); \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const fs=require('fs'); const raw=String(process.env.BOSUN_FETCH_PR_STATE||''); const data=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const merged=Array.isArray(data.merged)?data.merged:[]; const open=Array.isArray(data.open)?data.open:[]; const updates=[]; const unresolved=[]; const maxBuffer=25*1024*1024; const cliPath=fs.existsSync('cli.mjs')?'cli.mjs':''; const taskCli=['task-cli.mjs','task/task-cli.mjs'].find(p=>fs.existsSync(p))||''; const taskRunner=cliPath?'cli':(taskCli?'task-cli':''); if(!taskRunner){   console.log(JSON.stringify({updated:0,unresolved:[{reason:'task_command_missing'}],needsAgent:true}));   process.exit(0); } function runTask(args){const cmdArgs=taskRunner==='cli'?['cli.mjs','task',...args,'--config-dir','.bosun','--repo-root','.']:[taskCli,...args];return execFileSync('node',cmdArgs,{encoding:'utf8',stdio:['pipe','pipe','pipe'],maxBuffer}).trim();} function parseJsonObject(raw){const txt=String(raw||'').trim();if(!txt)return null;try{return JSON.parse(txt);}catch{}const lines=txt.split(/\\r?\\n/);for(let start=0;start<lines.length;start++){const token=lines[start].trim();if(!(token==='['||token==='{'||token.startsWith('[{')||token.startsWith('{\"')||token.startsWith('[\"')))continue;const candidate=lines.slice(start).join('\\n').trim();try{return JSON.parse(candidate);}catch{}}const compact=lines.map(s=>s.trim()).filter(Boolean);for(let i=compact.length-1;i>=0;i--){const line=compact[i];if(!(line.startsWith('{')||line.startsWith('[')))continue;try{return JSON.parse(line);}catch{}}const start=txt.indexOf('{');const end=txt.lastIndexOf('}');if(start>=0&&end>start){try{return JSON.parse(txt.slice(start,end+1));}catch{}}return null;} let taskListCache=null; function normalizeRepo(value){return String(value||'').trim().toLowerCase();} function listTasks(){   if(Array.isArray(taskListCache)) return taskListCache;   try{const raw=runTask(['list','--json']);const tasks=parseJsonObject(raw);taskListCache=Array.isArray(tasks)?tasks:[];return taskListCache;}catch{taskListCache=[];return taskListCache;} } function resolveTaskId(item){   const explicit=String(item?.taskId||'').trim();   if(explicit) return explicit;   const branch=String(item?.branch||'').trim();   if(!branch) return '';   const repo=normalizeRepo(item?.repo);   const matches=listTasks().filter((task)=>{     const taskBranch=String(task?.branchName||'').trim();     if(taskBranch!==branch) return false;     const taskRepo=normalizeRepo(task?.repository||'');     if(!repo || !taskRepo) return true;     return taskRepo===repo;   });   if(matches.length===1) return String(matches[0]?.id||'').trim();   const exactRepo=matches.find((task)=>normalizeRepo(task?.repository||'')===repo);   return exactRepo?String(exactRepo?.id||'').trim():''; } function getTaskSnapshot(id){   try{const raw=runTask(['get',id,'--json']);const task=parseJsonObject(raw);return {status:task?.status||null,reviewStatus:task?.reviewStatus||null};}catch{return {status:null,reviewStatus:null};} } for(const item of merged){   const id=resolveTaskId(item);   if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'done',reason:'task_lookup_failed'});continue;}   try{runTask(['update',id,'--status','done']);updates.push({taskId:id,status:'done'});}catch(e){unresolved.push({taskId:id,status:'done',error:String(e?.message||e)});} } for(const item of open){   const id=resolveTaskId(item);   if(!id){unresolved.push({taskId:null,repo:String(item?.repo||''),branch:String(item?.branch||''),status:'inreview',reason:'task_lookup_failed'});continue;}   try{const snap=getTaskSnapshot(id);const current=String(snap?.status||'').trim().toLowerCase();const review=String(snap?.reviewStatus||'').toLowerCase();if(current==='inreview'||current==='done'){updates.push({taskId:id,status:current,skipped:true});continue;}runTask(['update',id,'--status','inreview']);updates.push({taskId:id,status:'inreview',fromStatus:current||null,reviewStatus:review||null});}catch(e){unresolved.push({taskId:id,status:'inreview',error:String(e?.message||e)});} } const actionableUnresolved=unresolved.filter((item)=>String(item?.taskId||'').trim()); console.log(JSON.stringify({updated:updates.length,updates,unresolved,needsAgent:actionableUnresolved.length>0})); \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -21783,7 +21782,7 @@
           "type": "condition.expression",
           "label": "Needs Agent Sync?",
           "config": {
-            "expression": "(()=>{try{const raw=$ctx.getNodeOutput('sync-programmatic')?.output||'{}';const d=JSON.parse(raw);return d?.needsAgent===true || (Array.isArray(d?.unresolved)&&d.unresolved.length>0);}catch{return true;}})()"
+            "expression": "(()=>{try{const raw=$ctx.getNodeOutput('sync-programmatic')?.output||'{}';const d=JSON.parse(raw);const actionable=Array.isArray(d?.unresolved)?d.unresolved.some((item)=>String(item?.taskId||'').trim()):false;return d?.needsAgent===true || actionable;}catch{return true;}})()"
           },
           "position": {
             "x": 400,
@@ -25233,7 +25232,7 @@
           ]
         },
         {
-          "id": "build",
+          "id": "main-build",
           "type": "validation.build",
           "label": "Build Check",
           "config": {
@@ -25242,29 +25241,29 @@
           },
           "position": {
             "x": 400,
-            "y": 650
+            "y": 0
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "test-final",
+          "id": "main-test",
           "type": "validation.tests",
-          "label": "Final Test Run",
+          "label": "Test Run",
           "config": {
             "command": "{{testCommand}}"
           },
           "position": {
             "x": 400,
-            "y": 780
+            "y": 130
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "lint",
+          "id": "main-lint",
           "type": "validation.lint",
           "label": "Lint Check",
           "config": {
@@ -25272,7 +25271,7 @@
           },
           "position": {
             "x": 400,
-            "y": 910
+            "y": 260
           },
           "outputs": [
             "default"
@@ -25283,7 +25282,7 @@
           "type": "condition.expression",
           "label": "All Checks Passed?",
           "config": {
-            "expression": "$ctx.getNodeOutput('build')?.passed === true && $ctx.getNodeOutput('test-final')?.passed === true && $ctx.getNodeOutput('lint')?.passed === true"
+            "expression": "$ctx.getNodeOutput('main-build')?.passed === true && $ctx.getNodeOutput('main-test')?.passed === true && $ctx.getNodeOutput('main-lint')?.passed === true"
           },
           "position": {
             "x": 400,
@@ -25314,22 +25313,6 @@
             "default"
           ]
         },
-        {
-          "id": "push-ok",
-          "type": "condition.expression",
-          "label": "Push OK?",
-          "config": {
-            "expression": "$ctx.getNodeOutput('push-branch')?.pushed === true"
-          },
-          "position": {
-            "x": 250,
-            "y": 1175
-          },
-          "outputs": [
-            "yes",
-            "no"
-          ]
-        },
         {
           "id": "create-pr",
           "type": "action.create_pr",
@@ -25353,15 +25336,15 @@
           ]
         },
         {
-          "id": "pr-created",
+          "id": "main-pr-ok",
           "type": "condition.expression",
-          "label": "Handoff Recorded?",
+          "label": "PR Created?",
           "config": {
-            "expression": "Boolean($ctx.getNodeOutput('create-pr')?.prNumber || $ctx.getNodeOutput('create-pr')?.prUrl)"
+            "expression": "Boolean($ctx.getNodeOutput($edge.source)?.prNumber || $ctx.getNodeOutput($edge.source)?.prUrl)"
           },
           "position": {
-            "x": 250,
-            "y": 1240
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "yes",
@@ -25369,7 +25352,7 @@
           ]
         },
         {
-          "id": "set-inreview",
+          "id": "main-set-inreview",
           "type": "action.update_task_status",
           "label": "Set In-Review",
           "config": {
@@ -25378,8 +25361,30 @@
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 180,
-            "y": 1320
+            "x": 300,
+            "y": 130
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "main-handoff-progressor",
+          "type": "action.execute_workflow",
+          "label": "Handoff PR Progressor",
+          "config": {
+            "workflowId": "template-bosun-pr-progressor",
+            "mode": "dispatch",
+            "input": {
+              "taskId": "{{taskId}}",
+              "taskTitle": "{{taskTitle}}",
+              "branch": "{{branch}}",
+              "baseBranch": "{{baseBranch}}"
+            }
+          },
+          "position": {
+            "x": 300,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -25422,7 +25427,7 @@
           "label": "Summarize Validation Output",
           "config": {
             "key": "validationSummary",
-            "value": "(() => { const implement = $ctx.getNodeOutput('implement') || {}; const build = $ctx.getNodeOutput('build') || {}; const test = $ctx.getNodeOutput('test-final') || {}; const lint = $ctx.getNodeOutput('lint') || {}; return ['- implement.success: ' + (implement.success === true), '- build.passed: ' + (build.passed === true), '- test-final.passed: ' + (test.passed === true), '- lint.passed: ' + (lint.passed === true), '', 'Build output:', String(build.output || '').slice(0, 6000), '', 'Test output:', String(test.output || '').slice(0, 6000), '', 'Lint output:', String(lint.output || '').slice(0, 6000)].join('\\n'); })()",
+            "value": "(() => { const implement = $ctx.getNodeOutput('implement') || {}; const build = $ctx.getNodeOutput('main-build') || {}; const test = $ctx.getNodeOutput('main-test') || {}; const lint = $ctx.getNodeOutput('main-lint') || {}; return ['- implement.success: ' + (implement.success === true), '- build.passed: ' + (build.passed === true), '- test-final.passed: ' + (test.passed === true), '- lint.passed: ' + (lint.passed === true), '', 'Build output:', String(build.output || '').slice(0, 6000), '', 'Test output:', String(test.output || '').slice(0, 6000), '', 'Lint output:', String(lint.output || '').slice(0, 6000)].join('\\n'); })()",
             "isExpression": true
           },
           "position": {
@@ -25451,46 +25456,46 @@
           ]
         },
         {
-          "id": "build-retry",
+          "id": "retry-build",
           "type": "validation.build",
-          "label": "Build Check (Retry)",
+          "label": "Build Check",
           "config": {
             "command": "{{buildCommand}}",
             "zeroWarnings": true
           },
           "position": {
-            "x": 620,
-            "y": 1300
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "test-retry",
+          "id": "retry-test",
           "type": "validation.tests",
-          "label": "Final Test Run (Retry)",
+          "label": "Test Run",
           "config": {
             "command": "{{testCommand}}"
           },
           "position": {
-            "x": 620,
-            "y": 1430
+            "x": 400,
+            "y": 130
           },
           "outputs": [
             "default"
           ]
         },
         {
-          "id": "lint-retry",
+          "id": "retry-lint",
           "type": "validation.lint",
-          "label": "Lint Check (Retry)",
+          "label": "Lint Check",
           "config": {
             "command": "{{lintCommand}}"
           },
           "position": {
-            "x": 620,
-            "y": 1560
+            "x": 400,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -25501,7 +25506,7 @@
           "type": "condition.expression",
           "label": "Retry Checks Passed?",
           "config": {
-            "expression": "$ctx.getNodeOutput('build-retry')?.passed === true && $ctx.getNodeOutput('test-retry')?.passed === true && $ctx.getNodeOutput('lint-retry')?.passed === true"
+            "expression": "$ctx.getNodeOutput('retry-build')?.passed === true && $ctx.getNodeOutput('retry-test')?.passed === true && $ctx.getNodeOutput('retry-lint')?.passed === true"
           },
           "position": {
             "x": 620,
@@ -25532,22 +25537,6 @@
             "default"
           ]
         },
-        {
-          "id": "push-ok-retry",
-          "type": "condition.expression",
-          "label": "Push OK? (Retry)",
-          "config": {
-            "expression": "$ctx.getNodeOutput('push-branch-retry')?.pushed === true"
-          },
-          "position": {
-            "x": 450,
-            "y": 1825
-          },
-          "outputs": [
-            "yes",
-            "no"
-          ]
-        },
         {
           "id": "create-pr-retry",
           "type": "action.create_pr",
@@ -25571,15 +25560,15 @@
           ]
         },
         {
-          "id": "pr-created-retry",
+          "id": "retry-pr-ok",
           "type": "condition.expression",
-          "label": "Handoff Recorded (Retry Path)?",
+          "label": "PR Created?",
           "config": {
-            "expression": "Boolean($ctx.getNodeOutput('create-pr-retry')?.prNumber || $ctx.getNodeOutput('create-pr-retry')?.prUrl)"
+            "expression": "Boolean($ctx.getNodeOutput($edge.source)?.prNumber || $ctx.getNodeOutput($edge.source)?.prUrl)"
           },
           "position": {
-            "x": 450,
-            "y": 1890
+            "x": 400,
+            "y": 0
           },
           "outputs": [
             "yes",
@@ -25587,17 +25576,39 @@
           ]
         },
         {
-          "id": "set-inreview-retry",
+          "id": "retry-set-inreview",
           "type": "action.update_task_status",
-          "label": "Set In-Review (Retry)",
+          "label": "Set In-Review",
           "config": {
             "taskId": "{{taskId}}",
             "status": "inreview",
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 360,
-            "y": 1980
+            "x": 300,
+            "y": 130
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "retry-handoff-progressor",
+          "type": "action.execute_workflow",
+          "label": "Handoff PR Progressor",
+          "config": {
+            "workflowId": "template-bosun-pr-progressor",
+            "mode": "dispatch",
+            "input": {
+              "taskId": "{{taskId}}",
+              "taskTitle": "{{taskTitle}}",
+              "branch": "{{branch}}",
+              "baseBranch": "{{baseBranch}}"
+            }
+          },
+          "position": {
+            "x": 300,
+            "y": 260
           },
           "outputs": [
             "default"
@@ -25670,26 +25681,26 @@
           "sourcePort": "default"
         },
         {
-          "id": "implement->build",
+          "id": "implement->main-build",
           "source": "implement",
-          "target": "build",
+          "target": "main-build",
           "sourcePort": "default"
         },
         {
-          "id": "build->test-final",
-          "source": "build",
-          "target": "test-final",
+          "id": "main-build->main-test",
+          "source": "main-build",
+          "target": "main-test",
           "sourcePort": "default"
         },
         {
-          "id": "test-final->lint",
-          "source": "test-final",
-          "target": "lint",
+          "id": "main-test->main-lint",
+          "source": "main-test",
+          "target": "main-lint",
           "sourcePort": "default"
         },
         {
-          "id": "lint->all-passed",
-          "source": "lint",
+          "id": "main-lint->all-passed",
+          "source": "main-lint",
           "target": "all-passed",
           "sourcePort": "default"
         },
@@ -25708,78 +25719,69 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "set-validation-summary->auto-fix",
-          "source": "set-validation-summary",
-          "target": "auto-fix",
-          "sourcePort": "default"
-        },
-        {
-          "id": "push-branch->push-ok",
+          "id": "push-branch->create-pr",
           "source": "push-branch",
-          "target": "push-ok",
+          "target": "create-pr",
           "sourcePort": "default"
         },
         {
-          "id": "push-ok->create-pr",
-          "source": "push-ok",
-          "target": "create-pr",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
+          "id": "create-pr->main-pr-ok",
+          "source": "create-pr",
+          "target": "main-pr-ok",
+          "sourcePort": "default"
         },
         {
-          "id": "push-ok->notify-pr-failed",
-          "source": "push-ok",
-          "target": "notify-pr-failed",
-          "sourcePort": "no",
-          "condition": "$output?.result !== true"
+          "id": "main-pr-ok->main-set-inreview",
+          "source": "main-pr-ok",
+          "target": "main-set-inreview",
+          "sourcePort": "yes"
         },
         {
-          "id": "create-pr->pr-created",
-          "source": "create-pr",
-          "target": "pr-created",
+          "id": "main-set-inreview->main-handoff-progressor",
+          "source": "main-set-inreview",
+          "target": "main-handoff-progressor",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created->set-inreview",
-          "source": "pr-created",
-          "target": "set-inreview",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
-        },
-        {
-          "id": "set-inreview->notify-done",
-          "source": "set-inreview",
+          "id": "main-handoff-progressor->notify-done",
+          "source": "main-handoff-progressor",
           "target": "notify-done",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created->notify-pr-failed",
-          "source": "pr-created",
+          "id": "main-pr-ok->notify-pr-failed",
+          "source": "main-pr-ok",
           "target": "notify-pr-failed",
           "sourcePort": "no",
           "condition": "$output?.result !== true"
         },
         {
-          "id": "auto-fix->build-retry",
+          "id": "set-validation-summary->auto-fix",
+          "source": "set-validation-summary",
+          "target": "auto-fix",
+          "sourcePort": "default"
+        },
+        {
+          "id": "auto-fix->retry-build",
           "source": "auto-fix",
-          "target": "build-retry",
+          "target": "retry-build",
           "sourcePort": "default"
         },
         {
-          "id": "build-retry->test-retry",
-          "source": "build-retry",
-          "target": "test-retry",
+          "id": "retry-build->retry-test",
+          "source": "retry-build",
+          "target": "retry-test",
           "sourcePort": "default"
         },
         {
-          "id": "test-retry->lint-retry",
-          "source": "test-retry",
-          "target": "lint-retry",
+          "id": "retry-test->retry-lint",
+          "source": "retry-test",
+          "target": "retry-lint",
           "sourcePort": "default"
         },
         {
-          "id": "lint-retry->retry-passed",
-          "source": "lint-retry",
+          "id": "retry-lint->retry-passed",
+          "source": "retry-lint",
           "target": "retry-passed",
           "sourcePort": "default"
         },
@@ -25798,47 +25800,38 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "push-branch-retry->push-ok-retry",
+          "id": "push-branch-retry->create-pr-retry",
           "source": "push-branch-retry",
-          "target": "push-ok-retry",
+          "target": "create-pr-retry",
           "sourcePort": "default"
         },
         {
-          "id": "push-ok-retry->create-pr-retry",
-          "source": "push-ok-retry",
-          "target": "create-pr-retry",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
+          "id": "create-pr-retry->retry-pr-ok",
+          "source": "create-pr-retry",
+          "target": "retry-pr-ok",
+          "sourcePort": "default"
         },
         {
-          "id": "push-ok-retry->notify-pr-failed-retry",
-          "source": "push-ok-retry",
-          "target": "notify-pr-failed-retry",
-          "sourcePort": "no",
-          "condition": "$output?.result !== true"
+          "id": "retry-pr-ok->retry-set-inreview",
+          "source": "retry-pr-ok",
+          "target": "retry-set-inreview",
+          "sourcePort": "yes"
         },
         {
-          "id": "create-pr-retry->pr-created-retry",
-          "source": "create-pr-retry",
-          "target": "pr-created-retry",
+          "id": "retry-set-inreview->retry-handoff-progressor",
+          "source": "retry-set-inreview",
+          "target": "retry-handoff-progressor",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created-retry->set-inreview-retry",
-          "source": "pr-created-retry",
-          "target": "set-inreview-retry",
-          "sourcePort": "yes",
-          "condition": "$output?.result === true"
-        },
-        {
-          "id": "set-inreview-retry->notify-done-retry",
-          "source": "set-inreview-retry",
+          "id": "retry-handoff-progressor->notify-done-retry",
+          "source": "retry-handoff-progressor",
           "target": "notify-done-retry",
           "sourcePort": "default"
         },
         {
-          "id": "pr-created-retry->notify-pr-failed-retry",
-          "source": "pr-created-retry",
+          "id": "retry-pr-ok->notify-pr-failed-retry",
+          "source": "retry-pr-ok",
           "target": "notify-pr-failed-retry",
           "sourcePort": "no",
           "condition": "$output?.result !== true"
@@ -34356,7 +34349,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -34381,7 +34374,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -34396,7 +34389,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -34715,7 +34708,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -34740,7 +34733,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -34755,7 +34748,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -35191,7 +35184,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -35216,7 +35209,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -35231,7 +35224,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -35354,7 +35347,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -35379,7 +35372,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -35394,7 +35387,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -35693,7 +35686,7 @@
           },
           "position": {
             "x": 400,
-            "y": 380
+            "y": 340
           },
           "outputs": [
             "default"
@@ -35718,7 +35711,7 @@
           },
           "position": {
             "x": 400,
-            "y": 560
+            "y": 500
           },
           "outputs": [
             "default"
@@ -35733,7 +35726,7 @@
           },
           "position": {
             "x": 400,
-            "y": 720
+            "y": 660
           },
           "outputs": [
             "default"
@@ -38493,6 +38486,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -38517,6 +38511,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -38541,6 +38536,7 @@
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
             "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {
@@ -39828,6 +39824,8 @@
             "cwd": "{{worktreePath}}",
             "timeoutMs": "{{taskTimeoutMs}}",
             "maxRetries": "{{maxRetries}}",
+            "maxContinues": "{{maxContinues}}",
+            "resolveMode": "library",
             "failOnError": false
           },
           "position": {