bosun 0.41.2 → 0.41.4

package/ui/demo-defaults.js

@@ -23,7 +23,7 @@
       "enabled": true,
       "trigger": "trigger.workflow_call",
       "variables": {
-        "mergeMethod": "squash",
+        "mergeMethod": "merge",
         "labelNeedsFix": "bosun-needs-fix",
         "labelNeedsReview": "bosun-needs-human-review",
         "suspiciousDeletionRatio": 3,
@@ -230,7 +230,7 @@
           "type": "action.run_command",
           "label": "Review Gate: Merge Single PR",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const pr=(()=>{try{return JSON.parse(String(process.env.BOSUN_PR_INSPECT||'{}'))}catch{return {}}})(); const repo=String(pr.repo||'').trim(); const n=String(pr.prNumber||'').trim(); const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'squash').toLowerCase(); function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} if(!repo||!n){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'missing_repo_or_pr'}]}));process.exit(0);} try{   const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);   const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();   if(view?.isDraft===true){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'draft'}]}));process.exit(0);}   const add=Number(view?.additions||0);   const del=Number(view?.deletions||0);   const changed=Number(view?.changedFiles||0);   const destructive=(del>(add*ratio))&&(del>minDel);   const tooWide=changed>250;   if(destructive||tooWide){     gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);     gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);     console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed}]}));     process.exit(0);   }   const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);   const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();   const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{const s=String(x?.state||'').toUpperCase();const b=String(x?.bucket||'').toUpperCase();return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s)||b==='FAIL';});   const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(String(x?.state||'').toUpperCase()));   if(hasFailure){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_failed'}]}));process.exit(0);}   if(hasPending){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_pending'}]}));process.exit(0);}   const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];   if(method==='rebase') mergeArgs.push('--rebase');   else if(method==='merge') mergeArgs.push('--merge');   else mergeArgs.push('--squash');   try{gh(mergeArgs);}catch(directErr){mergeArgs.push('--auto');gh(mergeArgs);}   console.log(JSON.stringify({mergedCount:1,heldCount:0,skippedCount:0,merged:[{repo,number:n,title:String(view?.title||'')}] })); }catch(e){   console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)}]})); } \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const pr=(()=>{try{return JSON.parse(String(process.env.BOSUN_PR_INSPECT||'{}'))}catch{return {}}})(); const repo=String(pr.repo||'').trim(); const n=String(pr.prNumber||'').trim(); const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'merge').toLowerCase(); function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} if(!repo||!n){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'missing_repo_or_pr'}]}));process.exit(0);} try{   const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);   const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();   if(view?.isDraft===true){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'draft'}]}));process.exit(0);}   const add=Number(view?.additions||0);   const del=Number(view?.deletions||0);   const changed=Number(view?.changedFiles||0);   const destructive=(del>(add*ratio))&&(del>minDel);   const tooWide=changed>250;   if(destructive||tooWide){     gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);     gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);     console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed}]}));     process.exit(0);   }   const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);   const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();   const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{const s=String(x?.state||'').toUpperCase();const b=String(x?.bucket||'').toUpperCase();return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s)||b==='FAIL';});   const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(String(x?.state||'').toUpperCase()));   if(hasFailure){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_failed'}]}));process.exit(0);}   if(hasPending){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_pending'}]}));process.exit(0);}   const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];   if(method==='rebase') mergeArgs.push('--rebase');   else if(method==='merge') mergeArgs.push('--merge');   else mergeArgs.push('--squash');   try{gh(mergeArgs);}catch(directErr){mergeArgs.push('--auto');gh(mergeArgs);}   console.log(JSON.stringify({mergedCount:1,heldCount:0,skippedCount:0,merged:[{repo,number:n,title:String(view?.title||'')}] })); }catch(e){   console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)}]})); } \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -424,14 +424,15 @@
       "enabled": true,
       "trigger": "trigger.schedule",
       "variables": {
-        "mergeMethod": "squash",
+        "mergeMethod": "merge",
         "labelNeedsFix": "bosun-needs-fix",
         "labelNeedsReview": "bosun-needs-human-review",
         "repoScope": "auto",
         "maxPrs": 25,
         "intervalMs": 90000,
         "suspiciousDeletionRatio": 3,
-        "minDestructiveDeletions": 500
+        "minDestructiveDeletions": 500,
+        "autoApplySuggestions": true
       },
       "metadata": {
         "author": "bosun",
@@ -679,7 +680,7 @@
           "type": "action.run_command",
           "label": "Review Gate: Programmatic Merge",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const raw=String(process.env.BOSUN_FETCH_AND_CLASSIFY||''); const payload=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const candidates=Array.isArray(payload.readyCandidates)?payload.readyCandidates:[]; const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'squash').toLowerCase(); const merged=[]; const held=[]; const skipped=[]; function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} for(const c of candidates){   const repo=String(c?.repo||'').trim();   const n=String(c?.n||'').trim();   if(!repo||!n){skipped.push({repo,number:n,reason:'missing_repo_or_pr'});continue;}   try{     const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);     const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();     if(view?.isDraft===true){skipped.push({repo,number:n,reason:'draft'});continue;}     const add=Number(view?.additions||0);     const del=Number(view?.deletions||0);     const changed=Number(view?.changedFiles||0);     const destructive=(del>(add*ratio))&&(del>minDel);     const tooWide=changed>250;     if(destructive||tooWide){       gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);       gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);       held.push({repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed});       continue;     }     const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);     const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();     const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       const b=String(x?.bucket||'').toUpperCase();       return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s) || b==='FAIL';     });     const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       return ['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(s);     });     if(hasFailure){skipped.push({repo,number:n,reason:'ci_failed'});continue;}     if(hasPending){skipped.push({repo,number:n,reason:'ci_pending'});continue;}     const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];     if(method==='rebase') mergeArgs.push('--rebase');     else if(method==='merge') mergeArgs.push('--merge');     else mergeArgs.push('--squash');     try{gh(mergeArgs);}catch(directErr){       mergeArgs.push('--auto');       gh(mergeArgs);     }     merged.push({repo,number:n,title:String(view?.title||'')});   }catch(e){     held.push({repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)});   } } console.log(JSON.stringify({mergedCount:merged.length,heldCount:held.length,skippedCount:skipped.length,merged,held,skipped})); \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const raw=String(process.env.BOSUN_FETCH_AND_CLASSIFY||''); const payload=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const candidates=Array.isArray(payload.readyCandidates)?payload.readyCandidates:[]; const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'merge').toLowerCase(); const merged=[]; const held=[]; const skipped=[]; function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} for(const c of candidates){   const repo=String(c?.repo||'').trim();   const n=String(c?.n||'').trim();   if(!repo||!n){skipped.push({repo,number:n,reason:'missing_repo_or_pr'});continue;}   try{     const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);     const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();     if(view?.isDraft===true){skipped.push({repo,number:n,reason:'draft'});continue;}     const add=Number(view?.additions||0);     const del=Number(view?.deletions||0);     const changed=Number(view?.changedFiles||0);     const destructive=(del>(add*ratio))&&(del>minDel);     const tooWide=changed>250;     if(destructive||tooWide){       gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);       gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);       held.push({repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed});       continue;     }     const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);     const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();     const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       const b=String(x?.bucket||'').toUpperCase();       return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s) || b==='FAIL';     });     const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       return ['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(s);     });     if(hasFailure){skipped.push({repo,number:n,reason:'ci_failed'});continue;}     if(hasPending){skipped.push({repo,number:n,reason:'ci_pending'});continue;}     const doApplySuggestions=String('{{autoApplySuggestions}}'||'true')==='true'&&process.env.BOSUN_AUTO_APPLY_SUGGESTIONS!=='false';     if(doApplySuggestions){       try{         const toolPath=require('path').resolve(process.cwd(),'tools','apply-pr-suggestions.mjs');         if(require('fs').existsSync(toolPath)){           const sugOut=execFileSync('node',[toolPath,'--owner',repo.split('/')[0],'--repo',repo.split('/')[1],n,'--json'],{encoding:'utf8',timeout:60000,stdio:['pipe','pipe','pipe']});           const sugRes=(()=>{try{return JSON.parse(sugOut)}catch{return null}})();           if(sugRes?.commitSha) console.error('[watchdog] auto-applied '+sugRes.applied+' suggestion(s) on PR #'+n+' → '+sugRes.commitSha.slice(0,8));         }       }catch(sugErr){console.error('[watchdog] suggestion auto-apply skipped for PR #'+n+': '+String(sugErr?.message||sugErr).slice(0,120));}     }     const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];     if(method==='rebase') mergeArgs.push('--rebase');     else if(method==='merge') mergeArgs.push('--merge');     else mergeArgs.push('--squash');     try{gh(mergeArgs);}catch(directErr){       mergeArgs.push('--auto');       gh(mergeArgs);     }     merged.push({repo,number:n,title:String(view?.title||'')});   }catch(e){     held.push({repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)});   } } console.log(JSON.stringify({mergedCount:merged.length,heldCount:held.length,skippedCount:skipped.length,merged,held,skipped})); \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -696,11 +697,11 @@
         },
         {
           "id": "notify",
-          "type": "notify.telegram",
+          "type": "notify.log",
           "label": "Watchdog Report",
           "config": {
-            "message": ":bug: Bosun PR Watchdog cycle complete — fix-dispatched: {{fixNeeded}} | candidates-reviewed: {{readyCandidates}}",
-            "silent": true
+            "message": "Bosun PR Watchdog cycle complete — see live digest/status board for streaming updates",
+            "level": "info"
           },
           "position": {
             "x": 400,
@@ -1642,7 +1643,7 @@
           "type": "action.run_command",
           "label": "Auto-Merge PR",
           "config": {
-            "command": "gh pr merge {{prNumber}} --auto --squash",
+            "command": "gh pr merge {{prNumber}} --auto --merge",
             "failOnError": true,
             "maxRetries": "{{maxRetries}}",
             "retryDelayMs": 30000,
@@ -3401,7 +3402,7 @@
           "type": "action.run_command",
           "label": "List Active Sessions",
           "config": {
-            "command": "bosun agent list --json --active",
+            "command": "node -e \"const fs = require('node:fs');const path = require('node:path');const { pathToFileURL } = require('node:url');const cwd = process.cwd();const mirrorMarker = `${path.sep}.bosun${path.sep}workspaces${path.sep}`.toLowerCase();let repoRoot = cwd;if (cwd.toLowerCase().includes(mirrorMarker)) {const sourceRepoRoot = path.resolve(cwd, '..', '..', '..', '..');if (fs.existsSync(path.join(sourceRepoRoot, 'infra', 'session-tracker.mjs'))) repoRoot = sourceRepoRoot;}const trackerModuleUrl = pathToFileURL(path.join(repoRoot, 'infra', 'session-tracker.mjs')).href;import(trackerModuleUrl).then(({ getSessionTracker }) => {const tracker = getSessionTracker();const sessions = tracker.getActiveSessions().map((session) => {const progress = tracker.getProgressStatus(session.taskId);return {id: session.taskId,taskId: session.taskId,taskTitle: session.taskTitle || null,status: progress.status,idleMs: progress.idleMs,totalEvents: progress.totalEvents,elapsedMs: progress.elapsedMs,lastEventType: progress.lastEventType,recommendation: progress.recommendation,tokenPercent: null};});console.log(JSON.stringify(sessions));}).catch((err) => { console.error(err?.stack || String(err)); process.exit(1); });\"",
             "continueOnError": true
           },
           "position": {
@@ -3417,7 +3418,7 @@
           "type": "condition.expression",
           "label": "Any Active?",
           "config": {
-            "expression": "($ctx.getNodeOutput('list-sessions')?.output || '[]') !== '[]' && ($ctx.getNodeOutput('list-sessions')?.output || '').length > 5"
+            "expression": "(() => {const raw = String($ctx.getNodeOutput('list-sessions')?.output || '[]');const lines = raw.split(/\\r?\\n/).map((line) => line.trim()).filter(Boolean);const candidate = lines.length ? lines[lines.length - 1] : '[]';try {const parsed = JSON.parse(candidate);return Array.isArray(parsed) ? parsed : [];} catch {return [];}})().length > 0"
           },
           "position": {
             "x": 400,
@@ -3432,7 +3433,7 @@
           "type": "action.run_command",
           "label": "Check Session Health",
           "config": {
-            "command": "bosun agent health --json",
+            "command": "node -e \"const fs = require('node:fs');const path = require('node:path');const { pathToFileURL } = require('node:url');const cwd = process.cwd();const mirrorMarker = `${path.sep}.bosun${path.sep}workspaces${path.sep}`.toLowerCase();let repoRoot = cwd;if (cwd.toLowerCase().includes(mirrorMarker)) {const sourceRepoRoot = path.resolve(cwd, '..', '..', '..', '..');if (fs.existsSync(path.join(sourceRepoRoot, 'infra', 'session-tracker.mjs'))) repoRoot = sourceRepoRoot;}const trackerModuleUrl = pathToFileURL(path.join(repoRoot, 'infra', 'session-tracker.mjs')).href;import(trackerModuleUrl).then(({ getSessionTracker }) => {const tracker = getSessionTracker();const sessions = tracker.getActiveSessions().map((session) => {const progress = tracker.getProgressStatus(session.taskId);return {id: session.taskId,taskId: session.taskId,taskTitle: session.taskTitle || null,status: progress.status,idleMs: progress.idleMs,totalEvents: progress.totalEvents,elapsedMs: progress.elapsedMs,lastEventType: progress.lastEventType,recommendation: progress.recommendation,tokenPercent: null};});console.log(JSON.stringify(sessions));}).catch((err) => { console.error(err?.stack || String(err)); process.exit(1); });\"",
             "continueOnError": true
           },
           "position": {
@@ -3448,7 +3449,7 @@
           "type": "condition.expression",
           "label": "Any Unhealthy?",
           "config": {
-            "expression": "(() => { const out = String($ctx.getNodeOutput('check-health')?.output || ''); const maxIdleMs = Number($data?.maxIdleMs || 600000); const maxTokenPercent = Number($data?.maxTokenPercent || 85); const idleMatch = out.match(/idle(?:_ms)?\\s*[:=]\\s*(\\d+)/i); const tokenMatch = out.match(/token(?:_usage|_percent)?\\s*[:=]\\s*(\\d+(?:\\.\\d+)?)/i); const idleExceeded = idleMatch ? Number(idleMatch[1]) > maxIdleMs : false; const tokenExceeded = tokenMatch ? Number(tokenMatch[1]) >= maxTokenPercent : false; return out.includes('stalled') || out.includes('timeout') || idleExceeded || tokenExceeded; })()"
+            "expression": "(() => { const sessions = (() => {const raw = String($ctx.getNodeOutput('check-health')?.output || '[]');const lines = raw.split(/\\r?\\n/).map((line) => line.trim()).filter(Boolean);const candidate = lines.length ? lines[lines.length - 1] : '[]';try {const parsed = JSON.parse(candidate);return Array.isArray(parsed) ? parsed : [];} catch {return [];}})(); const maxIdleMs = Number($data?.maxIdleMs || 600000); const maxTokenPercent = Number($data?.maxTokenPercent || 85); return sessions.some((item) => { const status = String(item?.status || '').toLowerCase(); const idleMs = Number(item?.idleMs || 0); const tokenPercent = Number(item?.tokenPercent); return status === 'idle' || status === 'stalled' || status === 'timeout' || idleMs > maxIdleMs || (Number.isFinite(tokenPercent) && tokenPercent >= maxTokenPercent); }); })()"
           },
           "position": {
             "x": 200,
@@ -14848,7 +14849,7 @@
       "trigger": "trigger.schedule",
       "variables": {
         "sessionTimeoutMs": 5400000,
-        "branch": "chore/code-quality-striker-{{_runId}}",
+        "branch": "chore/code-quality-striker",
         "baseBranch": "main",
         "sessionLogPath": ".bosun-monitor/code-quality-striker.md",
         "maxFilesPerSession": 6,
@@ -14945,7 +14946,7 @@
           "config": {
             "timeoutMs": "{{sessionTimeoutMs}}",
             "sdk": "auto",
-            "prompt": "# Code Quality Striker\n\nYou are a **structural quality agent**. Your sole mandate is to improve the\ninternal structure of the codebase so that future agentic models can work on\nit more efficiently — smaller files, clearer module boundaries, zero\nduplication, and self-contained functions.\n\n## Session Constraints\n\n- **Hard session cap**: you have at most 90 minutes total. Budget your time.\n- **You MUST open a PR before ending** — a session with no PR is a failed\n  session. If you run out of time mid-refactor, commit what you have, push,\n  and open the PR immediately even if the work is partial, AS LONG AS all\n  tests pass.\n- **Maximum {{maxFilesPerSession}} source files changed** in a single PR.\n  Keep diffs small and reviewable. Better to do one clean split per session\n  than attempt a mega-refactor.\n- You may run multiple sessions and PRs over time. Prefer incremental progress.\n\n## ✅ Allowed Changes (ONLY these)\n\n1. **Module decomposition** — extract a large file into smaller, focused\n   modules. The extracted module must be imported back so the public surface\n   is identical.\n2. **Function splitting** — break functions > ~80 lines into smaller,\n   well-named helpers within the same file or a co-located util module.\n3. **Deduplication** — extract identical or near-identical logic blocks into\n   a shared helper. Must not change call-site behaviour.\n4. **Dead code removal** — remove functions, variables, or imports that are\n   verifiably unreferenced (no callers anywhere in the repo).\n5. **Import cleanup** — remove unused imports, deduplicate import statements,\n   consolidate barrel imports.\n\n## ❌ Forbidden Changes (HARD STOPS — never do these)\n\n- Adding, removing, or changing any exported function signature or return value\n- Changing any HTTP route path, method, or response shape\n- Changing any config key names or default values\n- Adding new features, flags, or options of any kind\n- Changing test assertions or test logic\n- Renaming exported symbols (only rename internal/private symbols)\n- Adding comments, JSDoc, or inline documentation (unless minimal and necessary)\n- Changing error messages visible to users or logs (string literals)\n- Any change to .json, .sh, .md, .yaml, .html, .css, or non-.mjs/.js files\n  (unless you are only touching an import path string that is broken by a move)\n\n## Workflow\n\n### Step 1 — Identify your target\n\nUse the candidate file list provided (sorted by size, largest first):\n\n```\n{{scan-candidates.output}}\n```\n\nPick **1–3 files** for this session. Prioritise:\n- Files > 500 lines used by multiple modules (high parallel-conflict risk)\n- Files with clearly repeated logic blocks\n- Files with functions > 100 lines that have distinct sub-responsibilities\n\nRead each target file in full before making any decision. Do NOT edit\nanything you have not fully read.\n\n### Step 2 — Plan your split in writing\n\nBefore touching the file, write a short plan (to yourself, as a comment in\nyour reasoning — DO NOT add it to the code):\n- What gets extracted and where\n- New file names (follow existing naming conventions in that directory)\n- Which exports stay vs. move\n- Any callers that will need their import paths updated\n\n### Step 3 — Extract and wire up\n\n- Create the new module file(s) under the same directory as the source file.\n- Update the source file to re-export or directly import the extracted piece\n  so every existing call-site continues to work without modification.\n- Update any OTHER files that directly imported from the source file, if and\n  only if you moved an export that those files reference. Use\n  `grep -r 'importedName' --include='*.mjs' --include='*.js'` to find callers.\n- **Do not touch callers unless strictly required by the move.**\n\n### Step 4 — Validate before committing\n\nRun ALL of the following in order. Do not commit if any fail:\n\n```bash\n# 1. Syntax check every file you touched\n{{syntaxCheckCommand}} <file1> <file2> ...\n\n# 2. Lint check (if configured)\n{{lintCommand}}\n\n# 3. Full test suite — must be 0 failures, 0 unexpected skips\n{{testCommand}}\n\n# 4. Build — must pass clean\n{{buildCommand}}\n```\n\nIf tests fail, **revert your change** (`git checkout -- <file>`) and either:\n- Attempt a smaller, safer split of the same file, OR\n- Move to a different target file\n\n**Never push a failing test suite.**\n\n### Step 5 — Commit, push, and open the PR\n\nBranch name: `chore/code-quality-striker-{{_runId}}`\nBase branch: `{{baseBranch}}`\n\nCommit message format:\n```\nrefactor(<module>): split <description>\n\n- extracted <what> into <new-file>\n- <any other bullet points>\n\nNo functional changes. All tests pass.\n```\n\nPR title: `refactor: code quality pass — <one-line summary>`\n\nPR body template:\n```markdown\n## Code Quality Pass\n\n**Session**: code-quality-striker {{_runId}}\n**Scope**: structural refactor only — zero functional changes\n\n### Changes\n- <bullet per extracted module or dedup>\n\n### Validation\n- `{{syntaxCheckCommand}}` passed on all touched files\n- `{{testCommand}}` passed (N tests)\n- `{{buildCommand}}` passed\n\n### Why\n<one sentence: \"X was Y lines with Z responsibilities; split to improve\nparallel edit safety for future agent sessions.\">\n```\n\n### Step 6 — Write session log\n\nAppend a new entry to `{{sessionLogPath}}` using this\nexact format (create the file if it does not exist):\n\n```markdown\n## <ISO timestamp with timezone>\n\n- Scope: <one sentence describing what was refactored>\n- Files changed: <comma-separated list>\n- Strategy: <what split/dedup/cleanup was performed and why>\n- Validation evidence:\n  - `{{syntaxCheckCommand}}` passed on all touched files\n  - `{{testCommand}}` passed (N tests)\n  - `{{buildCommand}}` passed\n- PR: #<number> — `<branch name>`\n```\n\n## Time Budget Warning\n\nIf you have fewer than 15 minutes remaining:\n- Stop new analysis immediately\n- Commit and push whatever passing changes you have\n- Open the PR even if the scope is smaller than planned\n- Write the session log\n- Stop\n\nA small, clean, tested PR is always better than nothing."
+            "prompt": "# Code Quality Striker\n\nYou are a **structural quality agent**. Your sole mandate is to improve the\ninternal structure of the codebase so that future agentic models can work on\nit more efficiently — smaller files, clearer module boundaries, zero\nduplication, and self-contained functions.\n\n## Session Constraints\n\n- **Hard session cap**: you have at most 90 minutes total. Budget your time.\n- **You MUST open a PR before ending** — a session with no PR is a failed\n  session. If you run out of time mid-refactor, commit what you have, push,\n  and open the PR immediately even if the work is partial, AS LONG AS all\n  tests pass.\n- **Maximum {{maxFilesPerSession}} source files changed** in a single PR.\n  Keep diffs small and reviewable. Better to do one clean split per session\n  than attempt a mega-refactor.\n- You may run multiple sessions and PRs over time. Prefer incremental progress.\n\n## ✅ Allowed Changes (ONLY these)\n\n1. **Module decomposition** — extract a large file into smaller, focused\n   modules. The extracted module must be imported back so the public surface\n   is identical.\n2. **Function splitting** — break functions > ~80 lines into smaller,\n   well-named helpers within the same file or a co-located util module.\n3. **Deduplication** — extract identical or near-identical logic blocks into\n   a shared helper. Must not change call-site behaviour.\n4. **Dead code removal** — remove functions, variables, or imports that are\n   verifiably unreferenced (no callers anywhere in the repo).\n5. **Import cleanup** — remove unused imports, deduplicate import statements,\n   consolidate barrel imports.\n\n## ❌ Forbidden Changes (HARD STOPS — never do these)\n\n- Adding, removing, or changing any exported function signature or return value\n- Changing any HTTP route path, method, or response shape\n- Changing any config key names or default values\n- Adding new features, flags, or options of any kind\n- Changing test assertions or test logic\n- Renaming exported symbols (only rename internal/private symbols)\n- Adding comments, JSDoc, or inline documentation (unless minimal and necessary)\n- Changing error messages visible to users or logs (string literals)\n- Any change to .json, .sh, .md, .yaml, .html, .css, or non-.mjs/.js files\n  (unless you are only touching an import path string that is broken by a move)\n\n## Workflow\n\n### Step 1 — Identify your target\n\nUse the candidate file list provided (sorted by size, largest first):\n\n```\n{{scan-candidates.output}}\n```\n\nPick **1–3 files** for this session. Prioritise:\n- Files > 500 lines used by multiple modules (high parallel-conflict risk)\n- Files with clearly repeated logic blocks\n- Files with functions > 100 lines that have distinct sub-responsibilities\n\nRead each target file in full before making any decision. Do NOT edit\nanything you have not fully read.\n\n### Step 2 — Plan your split in writing\n\nBefore touching the file, write a short plan (to yourself, as a comment in\nyour reasoning — DO NOT add it to the code):\n- What gets extracted and where\n- New file names (follow existing naming conventions in that directory)\n- Which exports stay vs. move\n- Any callers that will need their import paths updated\n\n### Step 3 — Extract and wire up\n\n- Create the new module file(s) under the same directory as the source file.\n- Update the source file to re-export or directly import the extracted piece\n  so every existing call-site continues to work without modification.\n- Update any OTHER files that directly imported from the source file, if and\n  only if you moved an export that those files reference. Use\n  `grep -r 'importedName' --include='*.mjs' --include='*.js'` to find callers.\n- **Do not touch callers unless strictly required by the move.**\n\n### Step 4 — Validate before committing\n\nRun ALL of the following in order. Do not commit if any fail:\n\n```bash\n# 1. Syntax check every file you touched\n{{syntaxCheckCommand}} <file1> <file2> ...\n\n# 2. Lint check (if configured)\n{{lintCommand}}\n\n# 3. Full test suite — must be 0 failures, 0 unexpected skips\n{{testCommand}}\n\n# 4. Build — must pass clean\n{{buildCommand}}\n```\n\nIf tests fail, **revert your change** (`git checkout -- <file>`) and either:\n- Attempt a smaller, safer split of the same file, OR\n- Move to a different target file\n\n**Never push a failing test suite.**\n\n### Step 5 — Commit, push, and open the PR\n\nBranch name: `{{branch}}`\nBase branch: `{{baseBranch}}`\n\nCommit message format:\n```\nrefactor(<module>): split <description>\n\n- extracted <what> into <new-file>\n- <any other bullet points>\n\nNo functional changes. All tests pass.\n```\n\nPR title: `refactor: code quality pass — <one-line summary>`\n\nPR body template:\n```markdown\n## Code Quality Pass\n\n**Session**: {{branch}}\n**Scope**: structural refactor only — zero functional changes\n\n### Changes\n- <bullet per extracted module or dedup>\n\n### Validation\n- `{{syntaxCheckCommand}}` passed on all touched files\n- `{{testCommand}}` passed (N tests)\n- `{{buildCommand}}` passed\n\n### Why\n<one sentence: \"X was Y lines with Z responsibilities; split to improve\nparallel edit safety for future agent sessions.\">\n```\n\n### Step 6 — Write session log\n\nAppend a new entry to `{{sessionLogPath}}` using this\nexact format (create the file if it does not exist):\n\n```markdown\n## <ISO timestamp with timezone>\n\n- Scope: <one sentence describing what was refactored>\n- Files changed: <comma-separated list>\n- Strategy: <what split/dedup/cleanup was performed and why>\n- Validation evidence:\n  - `{{syntaxCheckCommand}}` passed on all touched files\n  - `{{testCommand}}` passed (N tests)\n  - `{{buildCommand}}` passed\n- PR: #<number> — `<branch name>`\n```\n\n## Time Budget Warning\n\nIf you have fewer than 15 minutes remaining:\n- Stop new analysis immediately\n- Commit and push whatever passing changes you have\n- Open the PR even if the scope is smaller than planned\n- Write the session log\n- Stop\n\nA small, clean, tested PR is always better than nothing."
           },
           "position": {
             "x": 400,
@@ -15007,7 +15008,7 @@
           "type": "action.create_pr",
           "label": "Open Quality PR",
           "config": {
-            "title": "refactor: code quality pass {{_runId}}",
+            "title": "refactor: code quality pass",
             "body": "Automated code-quality session. Structural refactor only — zero functional changes. See `.bosun-monitor/code-quality-striker.md` for session details.",
             "branch": "{{branch}}",
             "baseBranch": "{{baseBranch}}",
@@ -15030,7 +15031,7 @@
           "type": "notify.telegram",
           "label": "Notify PR Opened",
           "config": {
-            "message": ":check: Code quality striker session complete.\nPR opened: **{{branch}}**\nRun ID: `{{_runId}}`",
+            "message": ":check: Code quality striker session complete.\nPR opened: **{{branch}}**",
             "silent": true
           },
           "position": {
@@ -15046,7 +15047,7 @@
           "type": "notify.telegram",
           "label": "Notify — Validation Failed",
           "config": {
-            "message": ":alert: Code quality striker **validation failed** for run `{{_runId}}`.\n\nThe agent produced changes that broke tests or build. No PR was created.\nCheck `.bosun-monitor/code-quality-striker.md` for details."
+            "message": ":alert: Code quality striker **validation failed**.\n\nThe agent produced changes that broke tests or build. No PR was created.\nCheck `.bosun-monitor/code-quality-striker.md` for details."
           },
           "position": {
             "x": 600,
@@ -15061,7 +15062,7 @@
           "type": "notify.log",
           "label": "Log Failure",
           "config": {
-            "message": "Code quality striker run {{_runId}} failed validation — no PR created.",
+            "message": "Code quality striker validation failed — no PR created.",
             "level": "warn"
           },
           "position": {
@@ -17832,8 +17833,7 @@
         "pollStatus": "todo",
         "maxBatchSize": 5,
         "defaultBaseBranch": "main",
-        "draftPR": true,
-        "notifyChannel": "telegram"
+        "draftPR": true
       },
       "metadata": {
         "author": "bosun",
@@ -17877,7 +17877,7 @@
             "command": "node",
             "args": [
               "-e",
-              "\n        import(\"./kanban-adapter.mjs\")\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"5\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              branch: t.branch || t.metadata?.branch || null,\n              repository: t.repository || null,\n              workspace: t.workspace || null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
+              "\n        const fs = require(\"node:fs\");\n        const path = require(\"node:path\");\n        const { pathToFileURL } = require(\"node:url\");\n        const cwd = process.cwd();\n        const mirrorMarker = (path.sep + \".bosun\" + path.sep + \"workspaces\" + path.sep).toLowerCase();\n        let repoRoot = cwd;\n        if (cwd.toLowerCase().includes(mirrorMarker)) {\n          const sourceRepoRoot = path.resolve(cwd, \"..\", \"..\", \"..\", \"..\");\n          if (fs.existsSync(path.join(sourceRepoRoot, \"kanban\", \"kanban-adapter.mjs\"))) repoRoot = sourceRepoRoot;\n        }\n        const kanbanModuleUrl = pathToFileURL(path.join(repoRoot, \"kanban\", \"kanban-adapter.mjs\")).href;\n        import(kanbanModuleUrl)\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"5\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              branch: t.branch || t.metadata?.branch || null,\n              repository: t.repository || null,\n              workspace: t.workspace || null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
             ],
             "env": {
               "MAX_BATCH": "{{maxBatchSize}}"
@@ -18058,11 +18058,11 @@
         },
         {
           "id": "notify",
-          "type": "notify.telegram",
+          "type": "notify.log",
           "label": "Batch Complete",
           "config": {
-            "channel": "{{notifyChannel}}",
-            "message": "Task batch PR pipeline complete"
+            "message": "Task batch PR pipeline complete",
+            "level": "info"
           },
           "position": {
             "x": 400,
@@ -18165,8 +18165,8 @@
         "dispatch",
         "lifecycle"
       ],
-      "nodeCount": 7,
-      "edgeCount": 6,
+      "nodeCount": 9,
+      "edgeCount": 8,
       "recommended": true,
       "enabled": true,
       "trigger": "trigger.task_available",
@@ -18231,7 +18231,7 @@
             "command": "node",
             "args": [
               "-e",
-              "\n        import(\"./kanban-adapter.mjs\")\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"10\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              status: t.status,\n              branch: t.branch || t.metadata?.branch || null,\n              scope: t.scope || t.metadata?.scope || null,\n              repository: typeof t?.repository === \"string\" ? t.repository.trim() : null,\n              workspace: typeof t?.workspace === \"string\" ? t.workspace.trim() : null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
+              "\n        const fs = require(\"node:fs\");\n        const path = require(\"node:path\");\n        const { pathToFileURL } = require(\"node:url\");\n        const cwd = process.cwd();\n        const mirrorMarker = (path.sep + \".bosun\" + path.sep + \"workspaces\" + path.sep).toLowerCase();\n        let repoRoot = cwd;\n        if (cwd.toLowerCase().includes(mirrorMarker)) {\n          const sourceRepoRoot = path.resolve(cwd, \"..\", \"..\", \"..\", \"..\");\n          if (fs.existsSync(path.join(sourceRepoRoot, \"kanban\", \"kanban-adapter.mjs\"))) repoRoot = sourceRepoRoot;\n        }\n        const kanbanModuleUrl = pathToFileURL(path.join(repoRoot, \"kanban\", \"kanban-adapter.mjs\")).href;\n        import(kanbanModuleUrl)\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"10\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              status: t.status,\n              branch: t.branch || t.metadata?.branch || null,\n              scope: t.scope || t.metadata?.scope || null,\n              repository: typeof t?.repository === \"string\" ? t.repository.trim() : null,\n              workspace: typeof t?.workspace === \"string\" ? t.workspace.trim() : null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
             ],
             "env": {
               "MAX_BATCH": "{{maxBatchSize}}"
@@ -18301,12 +18301,11 @@
           ]
         },
         {
-          "id": "notify-complete",
-          "type": "notify.telegram",
-          "label": "Batch Summary",
+          "id": "has-batch-failures",
+          "type": "condition.expression",
+          "label": "Any Batch Failures?",
           "config": {
-            "channel": "{{notifyChannel}}",
-            "message": "Task batch completed: {{dispatch-tasks.successCount}}/{{dispatch-tasks.totalItems}} succeeded ({{dispatch-tasks.failCount}} failed)"
+            "expression": "Number($data?.batchResult?.failCount || 0) > 0"
           },
           "position": {
             "x": 400,
@@ -18315,6 +18314,38 @@
           "outputs": [
             "default"
           ]
+        },
+        {
+          "id": "notify-failures",
+          "type": "notify.telegram",
+          "label": "Batch Failure Alert",
+          "config": {
+            "channel": "{{notifyChannel}}",
+            "message": "Task batch needs attention: {{batchResult.failCount}} failed out of {{batchResult.totalItems}} ({{batchResult.successCount}} succeeded)"
+          },
+          "position": {
+            "x": 220,
+            "y": 830
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "log-summary",
+          "type": "notify.log",
+          "label": "Batch Summary",
+          "config": {
+            "message": "Task batch completed: {{batchResult.successCount}}/{{batchResult.totalItems}} succeeded ({{batchResult.failCount}} failed)",
+            "level": "info"
+          },
+          "position": {
+            "x": 580,
+            "y": 830
+          },
+          "outputs": [
+            "default"
+          ]
         }
       ],
       "edges": [
@@ -18350,10 +18381,24 @@
           "sourcePort": "default"
         },
         {
-          "id": "record-results->notify-complete",
+          "id": "record-results->has-batch-failures",
           "source": "record-results",
-          "target": "notify-complete",
+          "target": "has-batch-failures",
           "sourcePort": "default"
+        },
+        {
+          "id": "has-batch-failures->notify-failures",
+          "source": "has-batch-failures",
+          "target": "notify-failures",
+          "sourcePort": "default",
+          "condition": "$output?.result === true"
+        },
+        {
+          "id": "has-batch-failures->log-summary",
+          "source": "has-batch-failures",
+          "target": "log-summary",
+          "sourcePort": "default",
+          "condition": "$output?.result !== true"
         }
       ]
     },
@@ -18372,8 +18417,8 @@
         "workflow-first",
         "core"
       ],
-      "nodeCount": 50,
-      "edgeCount": 55,
+      "nodeCount": 53,
+      "edgeCount": 59,
       "recommended": true,
       "enabled": true,
       "trigger": "trigger.task_available",
@@ -19279,6 +19324,62 @@
             "default"
           ]
         },
+        {
+          "id": "wt-failure-blocking",
+          "type": "condition.expression",
+          "label": "Non-Retryable WT Failure?",
+          "config": {
+            "expression": "$ctx.getNodeOutput('acquire-worktree')?.retryable === false"
+          },
+          "position": {
+            "x": 600,
+            "y": 1220
+          },
+          "outputs": [
+            "yes",
+            "no"
+          ]
+        },
+        {
+          "id": "set-blocked-wt-failed",
+          "type": "action.update_task_status",
+          "label": "Set Blocked (WT Fail)",
+          "config": {
+            "taskId": "{{taskId}}",
+            "status": "blocked",
+            "taskTitle": "{{taskTitle}}"
+          },
+          "position": {
+            "x": 470,
+            "y": 1350
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "annotate-blocked-wt-failed",
+          "type": "action.bosun_function",
+          "label": "Annotate Blocked (WT Fail)",
+          "config": {
+            "function": "tasks.update",
+            "args": {
+              "taskId": "{{taskId}}",
+              "fields": {
+                "cooldownUntil": "{{acquire-worktree.retryAt}}",
+                "blockedReason": "{{acquire-worktree.blockedReason}}",
+                "meta": "{{(() => { const current = ($data.taskMeta && typeof $data.taskMeta === 'object') ? $data.taskMeta : {}; const output = $ctx.getNodeOutput('acquire-worktree') || {}; return { ...current, autoRecovery: { active: true, reason: 'worktree_failure', failureKind: output.failureKind || 'branch_refresh_conflict', retryAt: output.retryAt || null, recoveryDelayMs: output.autoRecoverDelayMs || null, error: output.error || '', recordedAt: output.recordedAt || null }, worktreeFailure: { failureKind: output.failureKind || 'branch_refresh_conflict', retryable: output.retryable !== false, retryAt: output.retryAt || null, blockedReason: output.blockedReason || '', error: output.error || '', recordedAt: output.recordedAt || null } }; })()}}"
+              }
+            }
+          },
+          "position": {
+            "x": 470,
+            "y": 1480
+          },
+          "outputs": [
+            "default"
+          ]
+        },
         {
           "id": "set-todo-wt-failed",
           "type": "action.update_task_status",
@@ -19289,8 +19390,8 @@
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 600,
-            "y": 1220
+            "x": 730,
+            "y": 1350
           },
           "outputs": [
             "default"
@@ -19305,7 +19406,7 @@
           },
           "position": {
             "x": 600,
-            "y": 1350
+            "y": 1480
           },
           "outputs": [
             "default"
@@ -19316,11 +19417,11 @@
           "type": "notify.telegram",
           "label": "Notify WT Failed",
           "config": {
-            "message": "⚠️ Worktree failed for \"{{taskTitle}}\" ({{taskId}})"
+            "message": "⚠️ Worktree failed for \"{{taskTitle}}\" ({{taskId}}){{acquire-worktree.recoveryNote}}"
           },
           "position": {
             "x": 600,
-            "y": 1480
+            "y": 1740
           },
           "outputs": [
             "default"
@@ -19658,9 +19759,35 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "release-claim-wt-failed->set-todo-wt-failed",
+          "id": "release-claim-wt-failed->wt-failure-blocking",
           "source": "release-claim-wt-failed",
+          "target": "wt-failure-blocking",
+          "sourcePort": "default"
+        },
+        {
+          "id": "wt-failure-blocking->set-blocked-wt-failed",
+          "source": "wt-failure-blocking",
+          "target": "set-blocked-wt-failed",
+          "sourcePort": "yes",
+          "condition": "$output?.result === true"
+        },
+        {
+          "id": "wt-failure-blocking->set-todo-wt-failed",
+          "source": "wt-failure-blocking",
           "target": "set-todo-wt-failed",
+          "sourcePort": "no",
+          "condition": "$output?.result !== true"
+        },
+        {
+          "id": "set-blocked-wt-failed->annotate-blocked-wt-failed",
+          "source": "set-blocked-wt-failed",
+          "target": "annotate-blocked-wt-failed",
+          "sourcePort": "default"
+        },
+        {
+          "id": "annotate-blocked-wt-failed->release-slot-wt-failed",
+          "source": "annotate-blocked-wt-failed",
+          "target": "release-slot-wt-failed",
           "sourcePort": "default"
         },
         {
@@ -20720,7 +20847,7 @@
       "nodeCount": 13,
       "trigger": "trigger.workflow_call",
       "variables": {
-        "mergeMethod": "squash",
+        "mergeMethod": "merge",
         "labelNeedsFix": "bosun-needs-fix",
         "labelNeedsReview": "bosun-needs-human-review",
         "suspiciousDeletionRatio": 3,
@@ -20914,7 +21041,7 @@
           "type": "action.run_command",
           "label": "Review Gate: Merge Single PR",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const pr=(()=>{try{return JSON.parse(String(process.env.BOSUN_PR_INSPECT||'{}'))}catch{return {}}})(); const repo=String(pr.repo||'').trim(); const n=String(pr.prNumber||'').trim(); const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'squash').toLowerCase(); function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} if(!repo||!n){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'missing_repo_or_pr'}]}));process.exit(0);} try{   const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);   const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();   if(view?.isDraft===true){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'draft'}]}));process.exit(0);}   const add=Number(view?.additions||0);   const del=Number(view?.deletions||0);   const changed=Number(view?.changedFiles||0);   const destructive=(del>(add*ratio))&&(del>minDel);   const tooWide=changed>250;   if(destructive||tooWide){     gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);     gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);     console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed}]}));     process.exit(0);   }   const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);   const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();   const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{const s=String(x?.state||'').toUpperCase();const b=String(x?.bucket||'').toUpperCase();return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s)||b==='FAIL';});   const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(String(x?.state||'').toUpperCase()));   if(hasFailure){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_failed'}]}));process.exit(0);}   if(hasPending){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_pending'}]}));process.exit(0);}   const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];   if(method==='rebase') mergeArgs.push('--rebase');   else if(method==='merge') mergeArgs.push('--merge');   else mergeArgs.push('--squash');   try{gh(mergeArgs);}catch(directErr){mergeArgs.push('--auto');gh(mergeArgs);}   console.log(JSON.stringify({mergedCount:1,heldCount:0,skippedCount:0,merged:[{repo,number:n,title:String(view?.title||'')}] })); }catch(e){   console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)}]})); } \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const pr=(()=>{try{return JSON.parse(String(process.env.BOSUN_PR_INSPECT||'{}'))}catch{return {}}})(); const repo=String(pr.repo||'').trim(); const n=String(pr.prNumber||'').trim(); const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'merge').toLowerCase(); function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} if(!repo||!n){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'missing_repo_or_pr'}]}));process.exit(0);} try{   const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);   const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();   if(view?.isDraft===true){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'draft'}]}));process.exit(0);}   const add=Number(view?.additions||0);   const del=Number(view?.deletions||0);   const changed=Number(view?.changedFiles||0);   const destructive=(del>(add*ratio))&&(del>minDel);   const tooWide=changed>250;   if(destructive||tooWide){     gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);     gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);     console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed}]}));     process.exit(0);   }   const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);   const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();   const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{const s=String(x?.state||'').toUpperCase();const b=String(x?.bucket||'').toUpperCase();return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s)||b==='FAIL';});   const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(String(x?.state||'').toUpperCase()));   if(hasFailure){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_failed'}]}));process.exit(0);}   if(hasPending){console.log(JSON.stringify({mergedCount:0,heldCount:0,skippedCount:1,skipped:[{repo,number:n,reason:'ci_pending'}]}));process.exit(0);}   const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];   if(method==='rebase') mergeArgs.push('--rebase');   else if(method==='merge') mergeArgs.push('--merge');   else mergeArgs.push('--squash');   try{gh(mergeArgs);}catch(directErr){mergeArgs.push('--auto');gh(mergeArgs);}   console.log(JSON.stringify({mergedCount:1,heldCount:0,skippedCount:0,merged:[{repo,number:n,title:String(view?.title||'')}] })); }catch(e){   console.log(JSON.stringify({mergedCount:0,heldCount:1,skippedCount:0,held:[{repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)}]})); } \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -21107,14 +21234,15 @@
       "nodeCount": 17,
       "trigger": "trigger.schedule",
       "variables": {
-        "mergeMethod": "squash",
+        "mergeMethod": "merge",
         "labelNeedsFix": "bosun-needs-fix",
         "labelNeedsReview": "bosun-needs-human-review",
         "repoScope": "auto",
         "maxPrs": 25,
         "intervalMs": 90000,
         "suspiciousDeletionRatio": 3,
-        "minDestructiveDeletions": 500
+        "minDestructiveDeletions": 500,
+        "autoApplySuggestions": true
       },
       "nodes": [
         {
@@ -21339,7 +21467,7 @@
           "type": "action.run_command",
           "label": "Review Gate: Programmatic Merge",
           "config": {
-            "command": "node -e \" const {execFileSync}=require('child_process'); const raw=String(process.env.BOSUN_FETCH_AND_CLASSIFY||''); const payload=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const candidates=Array.isArray(payload.readyCandidates)?payload.readyCandidates:[]; const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'squash').toLowerCase(); const merged=[]; const held=[]; const skipped=[]; function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} for(const c of candidates){   const repo=String(c?.repo||'').trim();   const n=String(c?.n||'').trim();   if(!repo||!n){skipped.push({repo,number:n,reason:'missing_repo_or_pr'});continue;}   try{     const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);     const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();     if(view?.isDraft===true){skipped.push({repo,number:n,reason:'draft'});continue;}     const add=Number(view?.additions||0);     const del=Number(view?.deletions||0);     const changed=Number(view?.changedFiles||0);     const destructive=(del>(add*ratio))&&(del>minDel);     const tooWide=changed>250;     if(destructive||tooWide){       gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);       gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);       held.push({repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed});       continue;     }     const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);     const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();     const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       const b=String(x?.bucket||'').toUpperCase();       return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s) || b==='FAIL';     });     const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       return ['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(s);     });     if(hasFailure){skipped.push({repo,number:n,reason:'ci_failed'});continue;}     if(hasPending){skipped.push({repo,number:n,reason:'ci_pending'});continue;}     const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];     if(method==='rebase') mergeArgs.push('--rebase');     else if(method==='merge') mergeArgs.push('--merge');     else mergeArgs.push('--squash');     try{gh(mergeArgs);}catch(directErr){       mergeArgs.push('--auto');       gh(mergeArgs);     }     merged.push({repo,number:n,title:String(view?.title||'')});   }catch(e){     held.push({repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)});   } } console.log(JSON.stringify({mergedCount:merged.length,heldCount:held.length,skippedCount:skipped.length,merged,held,skipped})); \"",
+            "command": "node -e \" const {execFileSync}=require('child_process'); const raw=String(process.env.BOSUN_FETCH_AND_CLASSIFY||''); const payload=(()=>{try{return JSON.parse(raw||'{}')}catch{return {}}})(); const candidates=Array.isArray(payload.readyCandidates)?payload.readyCandidates:[]; const ratio=Number('{{suspiciousDeletionRatio}}')||3; const minDel=Number('{{minDestructiveDeletions}}')||500; const labelReview=String('{{labelNeedsReview}}'||'bosun-needs-human-review'); const method=String('{{mergeMethod}}'||'merge').toLowerCase(); const merged=[]; const held=[]; const skipped=[]; function gh(args){return execFileSync('gh',args,{encoding:'utf8',stdio:['pipe','pipe','pipe']}).trim();} for(const c of candidates){   const repo=String(c?.repo||'').trim();   const n=String(c?.n||'').trim();   if(!repo||!n){skipped.push({repo,number:n,reason:'missing_repo_or_pr'});continue;}   try{     const viewRaw=gh(['pr','view',n,'--repo',repo,'--json','number,title,additions,deletions,changedFiles,isDraft']);     const view=(()=>{try{return JSON.parse(viewRaw||'{}')}catch{return {}}})();     if(view?.isDraft===true){skipped.push({repo,number:n,reason:'draft'});continue;}     const add=Number(view?.additions||0);     const del=Number(view?.deletions||0);     const changed=Number(view?.changedFiles||0);     const destructive=(del>(add*ratio))&&(del>minDel);     const tooWide=changed>250;     if(destructive||tooWide){       gh(['pr','edit',n,'--repo',repo,'--add-label',labelReview]);       gh(['pr','comment',n,'--repo',repo,'--body',':warning: Bosun held this PR for human review due to suspicious diff footprint.']);       held.push({repo,number:n,reason:destructive?'destructive_diff':'changed_files_too_large',additions:add,deletions:del,changedFiles:changed});       continue;     }     const checksRaw=gh(['pr','checks',n,'--repo',repo,'--json','name,state,bucket']);     const checks=(()=>{try{return JSON.parse(checksRaw||'[]')}catch{return []}})();     const hasFailure=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       const b=String(x?.bucket||'').toUpperCase();       return ['FAILURE','ERROR','TIMED_OUT','CANCELLED','STARTUP_FAILURE'].includes(s) || b==='FAIL';     });     const hasPending=(Array.isArray(checks)?checks:[]).some((x)=>{       const s=String(x?.state||'').toUpperCase();       return ['QUEUED','IN_PROGRESS','PENDING','WAITING','REQUESTED'].includes(s);     });     if(hasFailure){skipped.push({repo,number:n,reason:'ci_failed'});continue;}     if(hasPending){skipped.push({repo,number:n,reason:'ci_pending'});continue;}     const doApplySuggestions=String('{{autoApplySuggestions}}'||'true')==='true'&&process.env.BOSUN_AUTO_APPLY_SUGGESTIONS!=='false';     if(doApplySuggestions){       try{         const toolPath=require('path').resolve(process.cwd(),'tools','apply-pr-suggestions.mjs');         if(require('fs').existsSync(toolPath)){           const sugOut=execFileSync('node',[toolPath,'--owner',repo.split('/')[0],'--repo',repo.split('/')[1],n,'--json'],{encoding:'utf8',timeout:60000,stdio:['pipe','pipe','pipe']});           const sugRes=(()=>{try{return JSON.parse(sugOut)}catch{return null}})();           if(sugRes?.commitSha) console.error('[watchdog] auto-applied '+sugRes.applied+' suggestion(s) on PR #'+n+' → '+sugRes.commitSha.slice(0,8));         }       }catch(sugErr){console.error('[watchdog] suggestion auto-apply skipped for PR #'+n+': '+String(sugErr?.message||sugErr).slice(0,120));}     }     const mergeArgs=['pr','merge',n,'--repo',repo,'--delete-branch'];     if(method==='rebase') mergeArgs.push('--rebase');     else if(method==='merge') mergeArgs.push('--merge');     else mergeArgs.push('--squash');     try{gh(mergeArgs);}catch(directErr){       mergeArgs.push('--auto');       gh(mergeArgs);     }     merged.push({repo,number:n,title:String(view?.title||'')});   }catch(e){     held.push({repo,number:n,reason:'merge_attempt_failed',error:String(e?.message||e)});   } } console.log(JSON.stringify({mergedCount:merged.length,heldCount:held.length,skippedCount:skipped.length,merged,held,skipped})); \"",
             "continueOnError": true,
             "failOnError": false,
             "env": {
@@ -21356,11 +21484,11 @@
         },
         {
           "id": "notify",
-          "type": "notify.telegram",
+          "type": "notify.log",
           "label": "Watchdog Report",
           "config": {
-            "message": ":bug: Bosun PR Watchdog cycle complete — fix-dispatched: {{fixNeeded}} | candidates-reviewed: {{readyCandidates}}",
-            "silent": true
+            "message": "Bosun PR Watchdog cycle complete — see live digest/status board for streaming updates",
+            "level": "info"
           },
           "position": {
             "x": 400,
@@ -22226,7 +22354,7 @@
           "type": "action.run_command",
           "label": "Auto-Merge PR",
           "config": {
-            "command": "gh pr merge {{prNumber}} --auto --squash",
+            "command": "gh pr merge {{prNumber}} --auto --merge",
             "failOnError": true,
             "maxRetries": "{{maxRetries}}",
             "retryDelayMs": 30000,
@@ -23856,7 +23984,7 @@
           "type": "action.run_command",
           "label": "List Active Sessions",
           "config": {
-            "command": "bosun agent list --json --active",
+            "command": "node -e \"const fs = require('node:fs');const path = require('node:path');const { pathToFileURL } = require('node:url');const cwd = process.cwd();const mirrorMarker = `${path.sep}.bosun${path.sep}workspaces${path.sep}`.toLowerCase();let repoRoot = cwd;if (cwd.toLowerCase().includes(mirrorMarker)) {const sourceRepoRoot = path.resolve(cwd, '..', '..', '..', '..');if (fs.existsSync(path.join(sourceRepoRoot, 'infra', 'session-tracker.mjs'))) repoRoot = sourceRepoRoot;}const trackerModuleUrl = pathToFileURL(path.join(repoRoot, 'infra', 'session-tracker.mjs')).href;import(trackerModuleUrl).then(({ getSessionTracker }) => {const tracker = getSessionTracker();const sessions = tracker.getActiveSessions().map((session) => {const progress = tracker.getProgressStatus(session.taskId);return {id: session.taskId,taskId: session.taskId,taskTitle: session.taskTitle || null,status: progress.status,idleMs: progress.idleMs,totalEvents: progress.totalEvents,elapsedMs: progress.elapsedMs,lastEventType: progress.lastEventType,recommendation: progress.recommendation,tokenPercent: null};});console.log(JSON.stringify(sessions));}).catch((err) => { console.error(err?.stack || String(err)); process.exit(1); });\"",
             "continueOnError": true
           },
           "position": {
@@ -23872,7 +24000,7 @@
           "type": "condition.expression",
           "label": "Any Active?",
           "config": {
-            "expression": "($ctx.getNodeOutput('list-sessions')?.output || '[]') !== '[]' && ($ctx.getNodeOutput('list-sessions')?.output || '').length > 5"
+            "expression": "(() => {const raw = String($ctx.getNodeOutput('list-sessions')?.output || '[]');const lines = raw.split(/\\r?\\n/).map((line) => line.trim()).filter(Boolean);const candidate = lines.length ? lines[lines.length - 1] : '[]';try {const parsed = JSON.parse(candidate);return Array.isArray(parsed) ? parsed : [];} catch {return [];}})().length > 0"
           },
           "position": {
             "x": 400,
@@ -23887,7 +24015,7 @@
           "type": "action.run_command",
           "label": "Check Session Health",
           "config": {
-            "command": "bosun agent health --json",
+            "command": "node -e \"const fs = require('node:fs');const path = require('node:path');const { pathToFileURL } = require('node:url');const cwd = process.cwd();const mirrorMarker = `${path.sep}.bosun${path.sep}workspaces${path.sep}`.toLowerCase();let repoRoot = cwd;if (cwd.toLowerCase().includes(mirrorMarker)) {const sourceRepoRoot = path.resolve(cwd, '..', '..', '..', '..');if (fs.existsSync(path.join(sourceRepoRoot, 'infra', 'session-tracker.mjs'))) repoRoot = sourceRepoRoot;}const trackerModuleUrl = pathToFileURL(path.join(repoRoot, 'infra', 'session-tracker.mjs')).href;import(trackerModuleUrl).then(({ getSessionTracker }) => {const tracker = getSessionTracker();const sessions = tracker.getActiveSessions().map((session) => {const progress = tracker.getProgressStatus(session.taskId);return {id: session.taskId,taskId: session.taskId,taskTitle: session.taskTitle || null,status: progress.status,idleMs: progress.idleMs,totalEvents: progress.totalEvents,elapsedMs: progress.elapsedMs,lastEventType: progress.lastEventType,recommendation: progress.recommendation,tokenPercent: null};});console.log(JSON.stringify(sessions));}).catch((err) => { console.error(err?.stack || String(err)); process.exit(1); });\"",
             "continueOnError": true
           },
           "position": {
@@ -23903,7 +24031,7 @@
           "type": "condition.expression",
           "label": "Any Unhealthy?",
           "config": {
-            "expression": "(() => { const out = String($ctx.getNodeOutput('check-health')?.output || ''); const maxIdleMs = Number($data?.maxIdleMs || 600000); const maxTokenPercent = Number($data?.maxTokenPercent || 85); const idleMatch = out.match(/idle(?:_ms)?\\s*[:=]\\s*(\\d+)/i); const tokenMatch = out.match(/token(?:_usage|_percent)?\\s*[:=]\\s*(\\d+(?:\\.\\d+)?)/i); const idleExceeded = idleMatch ? Number(idleMatch[1]) > maxIdleMs : false; const tokenExceeded = tokenMatch ? Number(tokenMatch[1]) >= maxTokenPercent : false; return out.includes('stalled') || out.includes('timeout') || idleExceeded || tokenExceeded; })()"
+            "expression": "(() => { const sessions = (() => {const raw = String($ctx.getNodeOutput('check-health')?.output || '[]');const lines = raw.split(/\\r?\\n/).map((line) => line.trim()).filter(Boolean);const candidate = lines.length ? lines[lines.length - 1] : '[]';try {const parsed = JSON.parse(candidate);return Array.isArray(parsed) ? parsed : [];} catch {return [];}})(); const maxIdleMs = Number($data?.maxIdleMs || 600000); const maxTokenPercent = Number($data?.maxTokenPercent || 85); return sessions.some((item) => { const status = String(item?.status || '').toLowerCase(); const idleMs = Number(item?.idleMs || 0); const tokenPercent = Number(item?.tokenPercent); return status === 'idle' || status === 'stalled' || status === 'timeout' || idleMs > maxIdleMs || (Number.isFinite(tokenPercent) && tokenPercent >= maxTokenPercent); }); })()"
           },
           "position": {
             "x": 200,
@@ -34683,7 +34811,7 @@
       "trigger": "trigger.schedule",
       "variables": {
         "sessionTimeoutMs": 5400000,
-        "branch": "chore/code-quality-striker-{{_runId}}",
+        "branch": "chore/code-quality-striker",
         "baseBranch": "main",
         "sessionLogPath": ".bosun-monitor/code-quality-striker.md",
         "maxFilesPerSession": 6,
@@ -34766,7 +34894,7 @@
           "config": {
             "timeoutMs": "{{sessionTimeoutMs}}",
             "sdk": "auto",
-            "prompt": "# Code Quality Striker\n\nYou are a **structural quality agent**. Your sole mandate is to improve the\ninternal structure of the codebase so that future agentic models can work on\nit more efficiently — smaller files, clearer module boundaries, zero\nduplication, and self-contained functions.\n\n## Session Constraints\n\n- **Hard session cap**: you have at most 90 minutes total. Budget your time.\n- **You MUST open a PR before ending** — a session with no PR is a failed\n  session. If you run out of time mid-refactor, commit what you have, push,\n  and open the PR immediately even if the work is partial, AS LONG AS all\n  tests pass.\n- **Maximum {{maxFilesPerSession}} source files changed** in a single PR.\n  Keep diffs small and reviewable. Better to do one clean split per session\n  than attempt a mega-refactor.\n- You may run multiple sessions and PRs over time. Prefer incremental progress.\n\n## ✅ Allowed Changes (ONLY these)\n\n1. **Module decomposition** — extract a large file into smaller, focused\n   modules. The extracted module must be imported back so the public surface\n   is identical.\n2. **Function splitting** — break functions > ~80 lines into smaller,\n   well-named helpers within the same file or a co-located util module.\n3. **Deduplication** — extract identical or near-identical logic blocks into\n   a shared helper. Must not change call-site behaviour.\n4. **Dead code removal** — remove functions, variables, or imports that are\n   verifiably unreferenced (no callers anywhere in the repo).\n5. **Import cleanup** — remove unused imports, deduplicate import statements,\n   consolidate barrel imports.\n\n## ❌ Forbidden Changes (HARD STOPS — never do these)\n\n- Adding, removing, or changing any exported function signature or return value\n- Changing any HTTP route path, method, or response shape\n- Changing any config key names or default values\n- Adding new features, flags, or options of any kind\n- Changing test assertions or test logic\n- Renaming exported symbols (only rename internal/private symbols)\n- Adding comments, JSDoc, or inline documentation (unless minimal and necessary)\n- Changing error messages visible to users or logs (string literals)\n- Any change to .json, .sh, .md, .yaml, .html, .css, or non-.mjs/.js files\n  (unless you are only touching an import path string that is broken by a move)\n\n## Workflow\n\n### Step 1 — Identify your target\n\nUse the candidate file list provided (sorted by size, largest first):\n\n```\n{{scan-candidates.output}}\n```\n\nPick **1–3 files** for this session. Prioritise:\n- Files > 500 lines used by multiple modules (high parallel-conflict risk)\n- Files with clearly repeated logic blocks\n- Files with functions > 100 lines that have distinct sub-responsibilities\n\nRead each target file in full before making any decision. Do NOT edit\nanything you have not fully read.\n\n### Step 2 — Plan your split in writing\n\nBefore touching the file, write a short plan (to yourself, as a comment in\nyour reasoning — DO NOT add it to the code):\n- What gets extracted and where\n- New file names (follow existing naming conventions in that directory)\n- Which exports stay vs. move\n- Any callers that will need their import paths updated\n\n### Step 3 — Extract and wire up\n\n- Create the new module file(s) under the same directory as the source file.\n- Update the source file to re-export or directly import the extracted piece\n  so every existing call-site continues to work without modification.\n- Update any OTHER files that directly imported from the source file, if and\n  only if you moved an export that those files reference. Use\n  `grep -r 'importedName' --include='*.mjs' --include='*.js'` to find callers.\n- **Do not touch callers unless strictly required by the move.**\n\n### Step 4 — Validate before committing\n\nRun ALL of the following in order. Do not commit if any fail:\n\n```bash\n# 1. Syntax check every file you touched\n{{syntaxCheckCommand}} <file1> <file2> ...\n\n# 2. Lint check (if configured)\n{{lintCommand}}\n\n# 3. Full test suite — must be 0 failures, 0 unexpected skips\n{{testCommand}}\n\n# 4. Build — must pass clean\n{{buildCommand}}\n```\n\nIf tests fail, **revert your change** (`git checkout -- <file>`) and either:\n- Attempt a smaller, safer split of the same file, OR\n- Move to a different target file\n\n**Never push a failing test suite.**\n\n### Step 5 — Commit, push, and open the PR\n\nBranch name: `chore/code-quality-striker-{{_runId}}`\nBase branch: `{{baseBranch}}`\n\nCommit message format:\n```\nrefactor(<module>): split <description>\n\n- extracted <what> into <new-file>\n- <any other bullet points>\n\nNo functional changes. All tests pass.\n```\n\nPR title: `refactor: code quality pass — <one-line summary>`\n\nPR body template:\n```markdown\n## Code Quality Pass\n\n**Session**: code-quality-striker {{_runId}}\n**Scope**: structural refactor only — zero functional changes\n\n### Changes\n- <bullet per extracted module or dedup>\n\n### Validation\n- `{{syntaxCheckCommand}}` passed on all touched files\n- `{{testCommand}}` passed (N tests)\n- `{{buildCommand}}` passed\n\n### Why\n<one sentence: \"X was Y lines with Z responsibilities; split to improve\nparallel edit safety for future agent sessions.\">\n```\n\n### Step 6 — Write session log\n\nAppend a new entry to `{{sessionLogPath}}` using this\nexact format (create the file if it does not exist):\n\n```markdown\n## <ISO timestamp with timezone>\n\n- Scope: <one sentence describing what was refactored>\n- Files changed: <comma-separated list>\n- Strategy: <what split/dedup/cleanup was performed and why>\n- Validation evidence:\n  - `{{syntaxCheckCommand}}` passed on all touched files\n  - `{{testCommand}}` passed (N tests)\n  - `{{buildCommand}}` passed\n- PR: #<number> — `<branch name>`\n```\n\n## Time Budget Warning\n\nIf you have fewer than 15 minutes remaining:\n- Stop new analysis immediately\n- Commit and push whatever passing changes you have\n- Open the PR even if the scope is smaller than planned\n- Write the session log\n- Stop\n\nA small, clean, tested PR is always better than nothing."
+            "prompt": "# Code Quality Striker\n\nYou are a **structural quality agent**. Your sole mandate is to improve the\ninternal structure of the codebase so that future agentic models can work on\nit more efficiently — smaller files, clearer module boundaries, zero\nduplication, and self-contained functions.\n\n## Session Constraints\n\n- **Hard session cap**: you have at most 90 minutes total. Budget your time.\n- **You MUST open a PR before ending** — a session with no PR is a failed\n  session. If you run out of time mid-refactor, commit what you have, push,\n  and open the PR immediately even if the work is partial, AS LONG AS all\n  tests pass.\n- **Maximum {{maxFilesPerSession}} source files changed** in a single PR.\n  Keep diffs small and reviewable. Better to do one clean split per session\n  than attempt a mega-refactor.\n- You may run multiple sessions and PRs over time. Prefer incremental progress.\n\n## ✅ Allowed Changes (ONLY these)\n\n1. **Module decomposition** — extract a large file into smaller, focused\n   modules. The extracted module must be imported back so the public surface\n   is identical.\n2. **Function splitting** — break functions > ~80 lines into smaller,\n   well-named helpers within the same file or a co-located util module.\n3. **Deduplication** — extract identical or near-identical logic blocks into\n   a shared helper. Must not change call-site behaviour.\n4. **Dead code removal** — remove functions, variables, or imports that are\n   verifiably unreferenced (no callers anywhere in the repo).\n5. **Import cleanup** — remove unused imports, deduplicate import statements,\n   consolidate barrel imports.\n\n## ❌ Forbidden Changes (HARD STOPS — never do these)\n\n- Adding, removing, or changing any exported function signature or return value\n- Changing any HTTP route path, method, or response shape\n- Changing any config key names or default values\n- Adding new features, flags, or options of any kind\n- Changing test assertions or test logic\n- Renaming exported symbols (only rename internal/private symbols)\n- Adding comments, JSDoc, or inline documentation (unless minimal and necessary)\n- Changing error messages visible to users or logs (string literals)\n- Any change to .json, .sh, .md, .yaml, .html, .css, or non-.mjs/.js files\n  (unless you are only touching an import path string that is broken by a move)\n\n## Workflow\n\n### Step 1 — Identify your target\n\nUse the candidate file list provided (sorted by size, largest first):\n\n```\n{{scan-candidates.output}}\n```\n\nPick **1–3 files** for this session. Prioritise:\n- Files > 500 lines used by multiple modules (high parallel-conflict risk)\n- Files with clearly repeated logic blocks\n- Files with functions > 100 lines that have distinct sub-responsibilities\n\nRead each target file in full before making any decision. Do NOT edit\nanything you have not fully read.\n\n### Step 2 — Plan your split in writing\n\nBefore touching the file, write a short plan (to yourself, as a comment in\nyour reasoning — DO NOT add it to the code):\n- What gets extracted and where\n- New file names (follow existing naming conventions in that directory)\n- Which exports stay vs. move\n- Any callers that will need their import paths updated\n\n### Step 3 — Extract and wire up\n\n- Create the new module file(s) under the same directory as the source file.\n- Update the source file to re-export or directly import the extracted piece\n  so every existing call-site continues to work without modification.\n- Update any OTHER files that directly imported from the source file, if and\n  only if you moved an export that those files reference. Use\n  `grep -r 'importedName' --include='*.mjs' --include='*.js'` to find callers.\n- **Do not touch callers unless strictly required by the move.**\n\n### Step 4 — Validate before committing\n\nRun ALL of the following in order. Do not commit if any fail:\n\n```bash\n# 1. Syntax check every file you touched\n{{syntaxCheckCommand}} <file1> <file2> ...\n\n# 2. Lint check (if configured)\n{{lintCommand}}\n\n# 3. Full test suite — must be 0 failures, 0 unexpected skips\n{{testCommand}}\n\n# 4. Build — must pass clean\n{{buildCommand}}\n```\n\nIf tests fail, **revert your change** (`git checkout -- <file>`) and either:\n- Attempt a smaller, safer split of the same file, OR\n- Move to a different target file\n\n**Never push a failing test suite.**\n\n### Step 5 — Commit, push, and open the PR\n\nBranch name: `{{branch}}`\nBase branch: `{{baseBranch}}`\n\nCommit message format:\n```\nrefactor(<module>): split <description>\n\n- extracted <what> into <new-file>\n- <any other bullet points>\n\nNo functional changes. All tests pass.\n```\n\nPR title: `refactor: code quality pass — <one-line summary>`\n\nPR body template:\n```markdown\n## Code Quality Pass\n\n**Session**: {{branch}}\n**Scope**: structural refactor only — zero functional changes\n\n### Changes\n- <bullet per extracted module or dedup>\n\n### Validation\n- `{{syntaxCheckCommand}}` passed on all touched files\n- `{{testCommand}}` passed (N tests)\n- `{{buildCommand}}` passed\n\n### Why\n<one sentence: \"X was Y lines with Z responsibilities; split to improve\nparallel edit safety for future agent sessions.\">\n```\n\n### Step 6 — Write session log\n\nAppend a new entry to `{{sessionLogPath}}` using this\nexact format (create the file if it does not exist):\n\n```markdown\n## <ISO timestamp with timezone>\n\n- Scope: <one sentence describing what was refactored>\n- Files changed: <comma-separated list>\n- Strategy: <what split/dedup/cleanup was performed and why>\n- Validation evidence:\n  - `{{syntaxCheckCommand}}` passed on all touched files\n  - `{{testCommand}}` passed (N tests)\n  - `{{buildCommand}}` passed\n- PR: #<number> — `<branch name>`\n```\n\n## Time Budget Warning\n\nIf you have fewer than 15 minutes remaining:\n- Stop new analysis immediately\n- Commit and push whatever passing changes you have\n- Open the PR even if the scope is smaller than planned\n- Write the session log\n- Stop\n\nA small, clean, tested PR is always better than nothing."
           },
           "position": {
             "x": 400,
@@ -34828,7 +34956,7 @@
           "type": "action.create_pr",
           "label": "Open Quality PR",
           "config": {
-            "title": "refactor: code quality pass {{_runId}}",
+            "title": "refactor: code quality pass",
             "body": "Automated code-quality session. Structural refactor only — zero functional changes. See `.bosun-monitor/code-quality-striker.md` for session details.",
             "branch": "{{branch}}",
             "baseBranch": "{{baseBranch}}",
@@ -34851,7 +34979,7 @@
           "type": "notify.telegram",
           "label": "Notify PR Opened",
           "config": {
-            "message": ":check: Code quality striker session complete.\nPR opened: **{{branch}}**\nRun ID: `{{_runId}}`",
+            "message": ":check: Code quality striker session complete.\nPR opened: **{{branch}}**",
             "silent": true
           },
           "position": {
@@ -34867,7 +34995,7 @@
           "type": "notify.telegram",
           "label": "Notify — Validation Failed",
           "config": {
-            "message": ":alert: Code quality striker **validation failed** for run `{{_runId}}`.\n\nThe agent produced changes that broke tests or build. No PR was created.\nCheck `.bosun-monitor/code-quality-striker.md` for details."
+            "message": ":alert: Code quality striker **validation failed**.\n\nThe agent produced changes that broke tests or build. No PR was created.\nCheck `.bosun-monitor/code-quality-striker.md` for details."
           },
           "position": {
             "x": 600,
@@ -34882,7 +35010,7 @@
           "type": "notify.log",
           "label": "Log Failure",
           "config": {
-            "message": "Code quality striker run {{_runId}} failed validation — no PR created.",
+            "message": "Code quality striker validation failed — no PR created.",
             "level": "warn"
           },
           "position": {
@@ -37531,8 +37659,7 @@
         "pollStatus": "todo",
         "maxBatchSize": 5,
         "defaultBaseBranch": "main",
-        "draftPR": true,
-        "notifyChannel": "telegram"
+        "draftPR": true
       },
       "nodes": [
         {
@@ -37560,7 +37687,7 @@
             "command": "node",
             "args": [
               "-e",
-              "\n        import(\"./kanban-adapter.mjs\")\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"5\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              branch: t.branch || t.metadata?.branch || null,\n              repository: t.repository || null,\n              workspace: t.workspace || null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
+              "\n        const fs = require(\"node:fs\");\n        const path = require(\"node:path\");\n        const { pathToFileURL } = require(\"node:url\");\n        const cwd = process.cwd();\n        const mirrorMarker = (path.sep + \".bosun\" + path.sep + \"workspaces\" + path.sep).toLowerCase();\n        let repoRoot = cwd;\n        if (cwd.toLowerCase().includes(mirrorMarker)) {\n          const sourceRepoRoot = path.resolve(cwd, \"..\", \"..\", \"..\", \"..\");\n          if (fs.existsSync(path.join(sourceRepoRoot, \"kanban\", \"kanban-adapter.mjs\"))) repoRoot = sourceRepoRoot;\n        }\n        const kanbanModuleUrl = pathToFileURL(path.join(repoRoot, \"kanban\", \"kanban-adapter.mjs\")).href;\n        import(kanbanModuleUrl)\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"5\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              branch: t.branch || t.metadata?.branch || null,\n              repository: t.repository || null,\n              workspace: t.workspace || null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
             ],
             "env": {
               "MAX_BATCH": "{{maxBatchSize}}"
@@ -37741,11 +37868,11 @@
         },
         {
           "id": "notify",
-          "type": "notify.telegram",
+          "type": "notify.log",
           "label": "Batch Complete",
           "config": {
-            "channel": "{{notifyChannel}}",
-            "message": "Task batch PR pipeline complete"
+            "message": "Task batch PR pipeline complete",
+            "level": "info"
           },
           "position": {
             "x": 400,
@@ -37852,7 +37979,7 @@
       "description": "Monitors the task backlog and dispatches multiple tasks in parallel using the Task Lifecycle sub-workflow. Automatically picks up tasks when backlog drops below threshold, fans out execution across available slots, and reports batch results.",
       "category": "task-execution",
       "enabled": true,
-      "nodeCount": 7,
+      "nodeCount": 9,
       "trigger": "trigger.task_available",
       "variables": {
         "maxConcurrent": 3,
@@ -37902,7 +38029,7 @@
             "command": "node",
             "args": [
               "-e",
-              "\n        import(\"./kanban-adapter.mjs\")\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"10\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              status: t.status,\n              branch: t.branch || t.metadata?.branch || null,\n              scope: t.scope || t.metadata?.scope || null,\n              repository: typeof t?.repository === \"string\" ? t.repository.trim() : null,\n              workspace: typeof t?.workspace === \"string\" ? t.workspace.trim() : null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
+              "\n        const fs = require(\"node:fs\");\n        const path = require(\"node:path\");\n        const { pathToFileURL } = require(\"node:url\");\n        const cwd = process.cwd();\n        const mirrorMarker = (path.sep + \".bosun\" + path.sep + \"workspaces\" + path.sep).toLowerCase();\n        let repoRoot = cwd;\n        if (cwd.toLowerCase().includes(mirrorMarker)) {\n          const sourceRepoRoot = path.resolve(cwd, \"..\", \"..\", \"..\", \"..\");\n          if (fs.existsSync(path.join(sourceRepoRoot, \"kanban\", \"kanban-adapter.mjs\"))) repoRoot = sourceRepoRoot;\n        }\n        const kanbanModuleUrl = pathToFileURL(path.join(repoRoot, \"kanban\", \"kanban-adapter.mjs\")).href;\n        import(kanbanModuleUrl)\n          .then(k => k.listTasks(undefined, { status: \"todo\" }))\n          .then(tasks => {\n            const filtered = (tasks || []).filter((task) => {\n              const repository = typeof task?.repository === \"string\" ? task.repository.trim() : \"\";\n              const workspace = typeof task?.workspace === \"string\" ? task.workspace.trim() : \"\";\n              return task && task.status === \"todo\" && !task.draft && repository.length > 0 && workspace.length > 0;\n            });\n            const batch = filtered.slice(0, parseInt(process.env.MAX_BATCH || \"10\"));\n            console.log(JSON.stringify(batch.map(t => ({\n              taskId: t.id,\n              taskTitle: t.title || t.id,\n              status: t.status,\n              branch: t.branch || t.metadata?.branch || null,\n              scope: t.scope || t.metadata?.scope || null,\n              repository: typeof t?.repository === \"string\" ? t.repository.trim() : null,\n              workspace: typeof t?.workspace === \"string\" ? t.workspace.trim() : null,\n            }))));\n          })\n          .catch(e => { console.error(e.message); process.exit(1); });\n      "
             ],
             "env": {
               "MAX_BATCH": "{{maxBatchSize}}"
@@ -37972,12 +38099,11 @@
           ]
         },
         {
-          "id": "notify-complete",
-          "type": "notify.telegram",
-          "label": "Batch Summary",
+          "id": "has-batch-failures",
+          "type": "condition.expression",
+          "label": "Any Batch Failures?",
           "config": {
-            "channel": "{{notifyChannel}}",
-            "message": "Task batch completed: {{dispatch-tasks.successCount}}/{{dispatch-tasks.totalItems}} succeeded ({{dispatch-tasks.failCount}} failed)"
+            "expression": "Number($data?.batchResult?.failCount || 0) > 0"
           },
           "position": {
             "x": 400,
@@ -37986,6 +38112,38 @@
           "outputs": [
             "default"
           ]
+        },
+        {
+          "id": "notify-failures",
+          "type": "notify.telegram",
+          "label": "Batch Failure Alert",
+          "config": {
+            "channel": "{{notifyChannel}}",
+            "message": "Task batch needs attention: {{batchResult.failCount}} failed out of {{batchResult.totalItems}} ({{batchResult.successCount}} succeeded)"
+          },
+          "position": {
+            "x": 220,
+            "y": 830
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "log-summary",
+          "type": "notify.log",
+          "label": "Batch Summary",
+          "config": {
+            "message": "Task batch completed: {{batchResult.successCount}}/{{batchResult.totalItems}} succeeded ({{batchResult.failCount}} failed)",
+            "level": "info"
+          },
+          "position": {
+            "x": 580,
+            "y": 830
+          },
+          "outputs": [
+            "default"
+          ]
         }
       ],
       "edges": [
@@ -38021,10 +38179,24 @@
           "sourcePort": "default"
         },
         {
-          "id": "record-results->notify-complete",
+          "id": "record-results->has-batch-failures",
           "source": "record-results",
-          "target": "notify-complete",
+          "target": "has-batch-failures",
           "sourcePort": "default"
+        },
+        {
+          "id": "has-batch-failures->notify-failures",
+          "source": "has-batch-failures",
+          "target": "notify-failures",
+          "sourcePort": "default",
+          "condition": "$output?.result === true"
+        },
+        {
+          "id": "has-batch-failures->log-summary",
+          "source": "has-batch-failures",
+          "target": "log-summary",
+          "sourcePort": "default",
+          "condition": "$output?.result !== true"
         }
       ],
       "metadata": {
@@ -38047,7 +38219,7 @@
       "description": "Complete task execution pipeline: poll for tasks → claim → worktree → agent dispatch → commit detection → PR creation → status transition. Replaces the monolithic TaskExecutor.executeTask() method with a composable workflow DAG.",
       "category": "task-execution",
       "enabled": true,
-      "nodeCount": 50,
+      "nodeCount": 53,
       "trigger": "trigger.task_available",
       "variables": {
         "maxParallel": 3,
@@ -38920,6 +39092,62 @@
             "default"
           ]
         },
+        {
+          "id": "wt-failure-blocking",
+          "type": "condition.expression",
+          "label": "Non-Retryable WT Failure?",
+          "config": {
+            "expression": "$ctx.getNodeOutput('acquire-worktree')?.retryable === false"
+          },
+          "position": {
+            "x": 600,
+            "y": 1220
+          },
+          "outputs": [
+            "yes",
+            "no"
+          ]
+        },
+        {
+          "id": "set-blocked-wt-failed",
+          "type": "action.update_task_status",
+          "label": "Set Blocked (WT Fail)",
+          "config": {
+            "taskId": "{{taskId}}",
+            "status": "blocked",
+            "taskTitle": "{{taskTitle}}"
+          },
+          "position": {
+            "x": 470,
+            "y": 1350
+          },
+          "outputs": [
+            "default"
+          ]
+        },
+        {
+          "id": "annotate-blocked-wt-failed",
+          "type": "action.bosun_function",
+          "label": "Annotate Blocked (WT Fail)",
+          "config": {
+            "function": "tasks.update",
+            "args": {
+              "taskId": "{{taskId}}",
+              "fields": {
+                "cooldownUntil": "{{acquire-worktree.retryAt}}",
+                "blockedReason": "{{acquire-worktree.blockedReason}}",
+                "meta": "{{(() => { const current = ($data.taskMeta && typeof $data.taskMeta === 'object') ? $data.taskMeta : {}; const output = $ctx.getNodeOutput('acquire-worktree') || {}; return { ...current, autoRecovery: { active: true, reason: 'worktree_failure', failureKind: output.failureKind || 'branch_refresh_conflict', retryAt: output.retryAt || null, recoveryDelayMs: output.autoRecoverDelayMs || null, error: output.error || '', recordedAt: output.recordedAt || null }, worktreeFailure: { failureKind: output.failureKind || 'branch_refresh_conflict', retryable: output.retryable !== false, retryAt: output.retryAt || null, blockedReason: output.blockedReason || '', error: output.error || '', recordedAt: output.recordedAt || null } }; })()}}"
+              }
+            }
+          },
+          "position": {
+            "x": 470,
+            "y": 1480
+          },
+          "outputs": [
+            "default"
+          ]
+        },
         {
           "id": "set-todo-wt-failed",
           "type": "action.update_task_status",
@@ -38930,8 +39158,8 @@
             "taskTitle": "{{taskTitle}}"
           },
           "position": {
-            "x": 600,
-            "y": 1220
+            "x": 730,
+            "y": 1350
           },
           "outputs": [
             "default"
@@ -38946,7 +39174,7 @@
           },
           "position": {
             "x": 600,
-            "y": 1350
+            "y": 1480
           },
           "outputs": [
             "default"
@@ -38957,11 +39185,11 @@
           "type": "notify.telegram",
           "label": "Notify WT Failed",
           "config": {
-            "message": "⚠️ Worktree failed for \"{{taskTitle}}\" ({{taskId}})"
+            "message": "⚠️ Worktree failed for \"{{taskTitle}}\" ({{taskId}}){{acquire-worktree.recoveryNote}}"
           },
           "position": {
             "x": 600,
-            "y": 1480
+            "y": 1740
           },
           "outputs": [
             "default"
@@ -39299,9 +39527,35 @@
           "condition": "$output?.result !== true"
         },
         {
-          "id": "release-claim-wt-failed->set-todo-wt-failed",
+          "id": "release-claim-wt-failed->wt-failure-blocking",
           "source": "release-claim-wt-failed",
+          "target": "wt-failure-blocking",
+          "sourcePort": "default"
+        },
+        {
+          "id": "wt-failure-blocking->set-blocked-wt-failed",
+          "source": "wt-failure-blocking",
+          "target": "set-blocked-wt-failed",
+          "sourcePort": "yes",
+          "condition": "$output?.result === true"
+        },
+        {
+          "id": "wt-failure-blocking->set-todo-wt-failed",
+          "source": "wt-failure-blocking",
           "target": "set-todo-wt-failed",
+          "sourcePort": "no",
+          "condition": "$output?.result !== true"
+        },
+        {
+          "id": "set-blocked-wt-failed->annotate-blocked-wt-failed",
+          "source": "set-blocked-wt-failed",
+          "target": "annotate-blocked-wt-failed",
+          "sourcePort": "default"
+        },
+        {
+          "id": "annotate-blocked-wt-failed->release-slot-wt-failed",
+          "source": "annotate-blocked-wt-failed",
+          "target": "release-slot-wt-failed",
           "sourcePort": "default"
         },
         {