bosun 0.41.0 → 0.41.2

package/workflow-templates/reliability.mjs

@@ -46,12 +46,30 @@ export const ERROR_RECOVERY_TEMPLATE = {
     }, { x: 400, y: 180 }),
 
     node("analyze-error", "action.run_agent", "Analyze Failure", {
-      prompt: "Analyze the following error and suggest a fix:\n\n{{lastError}}\n\nTask: {{taskTitle}}",
+      prompt:
+        "Analyze the following task failure and suggest the most likely minimal fix.\n\n" +
+        "Task: {{taskTitle}} ({{taskId}})\n" +
+        "Retry attempt: {{$data?.retryCount || 0}}/{{$data?.maxRetries || 3}}\n" +
+        "Branch: {{branch}}\n" +
+        "Base branch: {{baseBranch}}\n" +
+        "Worktree: {{worktreePath}}\n\n" +
+        "Last error:\n{{lastError}}",
       timeoutMs: 300000,
     }, { x: 200, y: 330 }),
 
     node("retry-task", "action.run_agent", "Retry Task", {
-      prompt: "{{taskExecutorRetryPrompt}}",
+      prompt:
+        "{{taskExecutorRetryPrompt}}\n\n" +
+        "Failure context:\n" +
+        "- taskId: {{taskId}}\n" +
+        "- taskTitle: {{taskTitle}}\n" +
+        "- branch: {{branch}}\n" +
+        "- baseBranch: {{baseBranch}}\n" +
+        "- worktreePath: {{worktreePath}}\n" +
+        "- retryCount: {{$data?.retryCount || 0}}/{{$data?.maxRetries || 3}}\n" +
+        "- lastError: {{lastError}}\n" +
+        "- recoveryAnalysis: {{$ctx.getNodeOutput('analyze-error')?.output || ''}}\n\n" +
+        "Use the analysis to choose a different approach if the previous attempt failed.",
       timeoutMs: 3600000,
       failOnError: true,
       maxRetries: "{{maxRetries}}",
@@ -69,13 +87,17 @@ export const ERROR_RECOVERY_TEMPLATE = {
     }, { x: 90, y: 760 }),
 
     node("escalate", "notify.telegram", "Escalate to Human", {
-      message: ":alert: Task **{{taskTitle}}** failed after {{maxRetries}} attempts. Manual intervention needed.\n\nLast error: {{lastError}}",
+      message:
+        ":alert: Task **{{taskTitle}}** failed after {{maxRetries}} attempts. Manual intervention needed.\n\n" +
+        "Last error: {{lastError}}\n\n" +
+        "Recovery analysis: {{$ctx.getNodeOutput('analyze-error')?.output || ''}}",
     }, { x: 600, y: 620 }),
 
     node("chain-repair", "action.execute_workflow", "Trigger Repair Workflow", {
       workflowId: "template-task-repair-worktree",
       mode: "dispatch",
-      input: "({taskId: $data?.taskId, taskTitle: $data?.taskTitle, worktreePath: $data?.worktreePath, branch: $data?.branch, baseBranch: $data?.baseBranch, error: $data?.lastError})",
+      input:
+        "(() => { const analysisRaw = String($ctx.getNodeOutput('analyze-error')?.output || '').trim(); const retryOutputRaw = String($ctx.getNodeOutput('retry-task')?.output || '').trim(); const retryErrorRaw = String($ctx.getNodeOutput('retry-task')?.error || '').trim(); const truncate = (value, limit = 2000) => value.length > limit ? `${value.slice(0, limit)}...` : value; const diagnostics = [String($data?.lastError || '').trim(), analysisRaw ? `Recovery analysis:\n${truncate(analysisRaw)}` : '', retryOutputRaw ? `Retry output:\n${truncate(retryOutputRaw)}` : '', retryErrorRaw ? `Retry error:\n${truncate(retryErrorRaw)}` : ''].filter(Boolean).join('\n\n'); return { taskId: $data?.taskId, taskTitle: $data?.taskTitle, worktreePath: $data?.worktreePath, branch: $data?.branch, baseBranch: $data?.baseBranch, error: diagnostics || String($data?.lastError || ''), recoveryAnalysis: truncate(analysisRaw), retryResult: { success: $ctx.getNodeOutput('retry-task')?.success === true, output: truncate(retryOutputRaw), error: truncate(retryErrorRaw) } }; })()",
     }, { x: 400, y: 760 }),
   ],
   edges: [
@@ -92,7 +114,7 @@ export const ERROR_RECOVERY_TEMPLATE = {
     author: "bosun",
     version: 1,
     createdAt: "2025-02-24T00:00:00Z",
-    templateVersion: "1.0.1",
+    templateVersion: "1.1.0",
     tags: ["error", "recovery", "autofix"],
     requiredTemplates: ["template-task-repair-worktree"],
     replaces: {
@@ -458,6 +480,20 @@ export const TASK_FINALIZATION_GUARD_TEMPLATE = {
       },
     }, { x: 240, y: 900 }),
 
+    node("handoff-pr-progressor", "action.execute_workflow", "Dispatch PR Progressor", {
+      workflowId: "template-bosun-pr-progressor",
+      mode: "dispatch",
+      input: {
+        taskId: "{{taskId}}",
+        taskTitle: "{{taskTitle}}",
+        branch: "{{branch}}",
+        baseBranch: "{{baseBranch}}",
+        prNumber: "{{$data?.prNumber ?? $ctx.getNodeOutput('create-pr')?.prNumber ?? null}}",
+        prUrl: "{{$data?.prUrl || $ctx.getNodeOutput('create-pr')?.prUrl || ''}}",
+        repo: "{{$data?.repo || $data?.repoSlug || $data?.repository || $ctx.getNodeOutput('create-pr')?.repoSlug || ''}}",
+      },
+    }, { x: 240, y: 1040 }),
+
     node("mark-todo-failed", "action.update_task_status", "Mark Todo (Checks Failed)", {
       taskId: "{{taskId}}",
       status: "todo",
@@ -497,13 +533,13 @@ export const TASK_FINALIZATION_GUARD_TEMPLATE = {
     node("notify-pass", "notify.log", "Log Finalization Success", {
       message: "Task {{taskId}} finalization passed — moved to inreview",
       level: "info",
-    }, { x: 240, y: 1040 }),
+    }, { x: 240, y: 1180 }),
 
     node("chain-archiver", "flow.universal", "Queue Archival", {
       workflowId: "template-task-archiver",
       mode: "dispatch",
       input: "({taskId: $data?.taskId, taskTitle: $data?.taskTitle, completedAt: new Date().toISOString(), taskJson: JSON.stringify($data?.task || {id: $data?.taskId, title: $data?.taskTitle})})",
-    }, { x: 240, y: 1180 }),
+    }, { x: 240, y: 1320 }),
 
     node("end-success", "flow.end", "End Success", {
       status: "completed",
@@ -513,7 +549,7 @@ export const TASK_FINALIZATION_GUARD_TEMPLATE = {
         taskId: "{{taskId}}",
         taskTitle: "{{taskTitle}}",
       },
-    }, { x: 240, y: 1310 }),
+    }, { x: 240, y: 1450 }),
 
     node("notify-fail", "notify.telegram", "Notify Finalization Failure", {
       message: ":alert: Task finalization failed for **{{taskTitle}}** ({{taskId}}). Repair workflow handoff triggered.",
@@ -543,7 +579,8 @@ export const TASK_FINALIZATION_GUARD_TEMPLATE = {
     edge("create-pr", "create-pr-success"),
     edge("create-pr-success", "mark-inreview", { condition: "$output?.result === true", port: "yes" }),
     edge("create-pr-success", "mark-todo-failed", { condition: "$output?.result !== true", port: "no" }),
-    edge("mark-inreview", "notify-pass"),
+    edge("mark-inreview", "handoff-pr-progressor"),
+    edge("handoff-pr-progressor", "notify-pass"),
     edge("notify-skip-missing-context", "end-success"),
     edge("notify-pass", "chain-archiver"),
     edge("chain-archiver", "end-success"),
@@ -557,7 +594,7 @@ export const TASK_FINALIZATION_GUARD_TEMPLATE = {
     createdAt: "2026-02-26T00:00:00Z",
     templateVersion: "1.0.1",
     tags: ["finalization", "quality-gate", "prepush", "handoff", "reliability"],
-    requiredTemplates: ["template-task-archiver"],
+    requiredTemplates: ["template-task-archiver", "template-bosun-pr-progressor"],
     replaces: {
       module: "task-executor.mjs",
       functions: ["_handleTaskResult finalization gate"],
@@ -659,6 +696,20 @@ export const TASK_REPAIR_WORKTREE_TEMPLATE = {
       },
     }, { x: 250, y: 1020 }),
 
+    node("handoff-pr-progressor", "action.execute_workflow", "Dispatch PR Progressor", {
+      workflowId: "template-bosun-pr-progressor",
+      mode: "dispatch",
+      input: {
+        taskId: "{{taskId}}",
+        taskTitle: "{{taskTitle}}",
+        branch: "{{branch}}",
+        baseBranch: "{{baseBranch}}",
+        prNumber: "{{$data?.prNumber ?? $ctx.getNodeOutput('create-pr')?.prNumber ?? null}}",
+        prUrl: "{{$data?.prUrl || $ctx.getNodeOutput('create-pr')?.prUrl || ''}}",
+        repo: "{{$data?.repo || $data?.repoSlug || $data?.repository || $ctx.getNodeOutput('create-pr')?.repoSlug || ''}}",
+      },
+    }, { x: 250, y: 1160 }),
+
     node("mark-todo", "action.update_task_status", "Mark Todo (Repair Failed)", {
       taskId: "{{taskId}}",
       status: "todo",
@@ -676,7 +727,7 @@ export const TASK_REPAIR_WORKTREE_TEMPLATE = {
     node("notify-success", "notify.telegram", "Notify Repair Success", {
       message: ":check: Repair workflow recovered **{{taskTitle}}** ({{taskId}}) and moved it to inreview.",
       silent: true,
-    }, { x: 250, y: 1160 }),
+    }, { x: 250, y: 1300 }),
 
     node("notify-escalate", "notify.telegram", "Escalate Repair Failure", {
       message: ":alert: Repair workflow could not recover **{{taskTitle}}** ({{taskId}}). Manual intervention required.",
@@ -700,7 +751,8 @@ export const TASK_REPAIR_WORKTREE_TEMPLATE = {
     edge("create-pr", "create-pr-success"),
     edge("create-pr-success", "mark-inreview", { condition: "$output?.result === true", port: "yes" }),
     edge("create-pr-success", "mark-todo", { condition: "$output?.result !== true", port: "no" }),
-    edge("mark-inreview", "notify-success"),
+    edge("mark-inreview", "handoff-pr-progressor"),
+    edge("handoff-pr-progressor", "notify-success"),
     edge("mark-todo", "notify-escalate"),
     edge("no-worktree", "notify-escalate"),
   ],
@@ -710,6 +762,7 @@ export const TASK_REPAIR_WORKTREE_TEMPLATE = {
     createdAt: "2026-02-26T00:00:00Z",
     templateVersion: "1.0.1",
     tags: ["repair", "recovery", "worktree", "resilience", "automation"],
+    requiredTemplates: ["template-bosun-pr-progressor"],
     replaces: {
       module: "task-executor.mjs",
       functions: ["retry/escalation recovery path"],

package/workflow-templates/task-batch.mjs

@@ -51,7 +51,7 @@ export const TASK_BATCH_PROCESSOR_TEMPLATE = {
     // ── Trigger: Tasks available for processing ──────────────────────────
     node("trigger", "trigger.task_available", "Tasks Available?", {
       maxParallel: "{{maxConcurrent}}",
-      pollIntervalMs: 60000,
+      pollIntervalMs: 15000,
       status: "{{pollStatus}}",
     }, { x: 400, y: 50 }),
 
@@ -91,7 +91,7 @@ export const TASK_BATCH_PROCESSOR_TEMPLATE = {
 
     // ── Fan-out: dispatch each task to the lifecycle workflow ─────────────
     node("dispatch-tasks", "loop.for_each", "Dispatch Tasks", {
-      items: "{{queryResult}}",
+      items: "{{query-tasks.output}}",
       itemVariable: "currentTask",
       indexVariable: "taskIndex",
       maxConcurrent: "{{maxConcurrent}}",
@@ -113,7 +113,7 @@ export const TASK_BATCH_PROCESSOR_TEMPLATE = {
     // ── Notify on completion ─────────────────────────────────────────────
     node("notify-complete", "notify.telegram", "Batch Summary", {
       channel: "{{notifyChannel}}",
-      message: "Task batch completed: {{batchResult.successCount}}/{{batchResult.totalItems}} succeeded",
+      message: "Task batch completed: {{dispatch-tasks.successCount}}/{{dispatch-tasks.totalItems}} succeeded ({{dispatch-tasks.failCount}} failed)",
     }, { x: 400, y: 700 }),
   ],
   edges: [
@@ -162,7 +162,7 @@ export const TASK_BATCH_PR_TEMPLATE = {
     // ── Trigger ──────────────────────────────────────────────────────────
     node("trigger", "trigger.task_available", "Tasks Available?", {
       maxParallel: "{{maxConcurrent}}",
-      pollIntervalMs: 60000,
+      pollIntervalMs: 15000,
       status: "{{pollStatus}}",
     }, { x: 400, y: 50 }),
 
@@ -195,7 +195,7 @@ export const TASK_BATCH_PR_TEMPLATE = {
 
     // ── Fan-out: per-task agent + PR ─────────────────────────────────────
     node("for-each-task", "loop.for_each", "Process Each Task", {
-      items: "{{queryResult}}",
+      items: "{{query-tasks.output}}",
       itemVariable: "task",
       indexVariable: "idx",
       maxConcurrent: "{{maxConcurrent}}",
@@ -241,11 +241,25 @@ export const TASK_BATCH_PR_TEMPLATE = {
       status: "inreview",
     }, { x: 400, y: 1090 }),
 
+    node("handoff-pr-progressor", "action.execute_workflow", "Dispatch PR Progressor", {
+      workflowId: "template-bosun-pr-progressor",
+      mode: "dispatch",
+      input: {
+        taskId: "{{task.taskId}}",
+        taskTitle: "{{task.taskTitle}}",
+        branch: "{{task.branch}}",
+        baseBranch: "{{defaultBaseBranch}}",
+        prNumber: "{{$ctx.getNodeOutput('create-pr')?.prNumber ?? null}}",
+        prUrl: "{{$ctx.getNodeOutput('create-pr')?.prUrl || ''}}",
+        repo: "{{$ctx.getNodeOutput('create-pr')?.repoSlug || $data?.repo || $data?.repoSlug || $data?.repository || ''}}",
+      },
+    }, { x: 400, y: 1160 }),
+
     node("join-batch-outcomes", "flow.join", "Join Batch Outcomes", {
       mode: "all",
-      sourceNodeIds: ["detect-commits", "set-inreview"],
+      sourceNodeIds: ["detect-commits", "handoff-pr-progressor"],
       includeSkipped: true,
-    }, { x: 400, y: 1160 }),
+    }, { x: 400, y: 1230 }),
 
     // ── Batch complete notification ──────────────────────────────────────
     node("notify", "notify.telegram", "Batch Complete", {
@@ -263,7 +277,8 @@ export const TASK_BATCH_PR_TEMPLATE = {
     edge("push-branch", "create-pr"),
     edge("create-pr", "set-inreview"),
     edge("detect-commits", "join-batch-outcomes", { condition: "result.hasNewCommits !== true" }),
-    edge("set-inreview", "join-batch-outcomes"),
+    edge("set-inreview", "handoff-pr-progressor"),
+    edge("handoff-pr-progressor", "join-batch-outcomes"),
     edge("join-batch-outcomes", "notify"),
   ],
   metadata: {
@@ -272,5 +287,6 @@ export const TASK_BATCH_PR_TEMPLATE = {
     createdAt: "2026-03-15T00:00:00Z",
     templateVersion: "1.0.0",
     tags: ["task", "batch", "pr", "agent", "autonomous"],
+    requiredTemplates: ["template-bosun-pr-progressor"],
   },
 };

package/workflow-templates/task-lifecycle.mjs

@@ -65,6 +65,10 @@ export const TASK_LIFECYCLE_TEMPLATE = {
     defaultSdk: "auto",
     defaultTargetBranch: "origin/main",
     taskTimeoutMs: 21600000, // 6 hours
+    prePrValidationEnabled: true,
+    prePrValidationCommand: "npm run prepush:check",
+    autoMergeOnCreate: false,
+    autoMergeMethod: "squash",
     maxRetries: 2,
     maxContinues: 3,
     protectedBranches: ["main", "master", "develop", "production"],
@@ -228,12 +232,43 @@ export const TASK_LIFECYCLE_TEMPLATE = {
       expression: "$ctx.getNodeOutput('detect-commits')?.hasCommits === true",
     }, { x: 120, y: 1870, outputs: ["yes", "no"] }),
 
+    // ── SUCCESS PATH: Local quality gate before push/PR ──────────────────
+    node("pre-pr-validation", "action.run_command", "Pre-PR Validation", {
+      command: "{{prePrValidationCommand}}",
+      cwd: "{{worktreePath}}",
+      failOnError: false,
+    }, { x: -120, y: 1940 }),
+
+    node("pre-pr-validation-ok", "condition.expression", "Validation Passed?", {
+      expression:
+        "(() => {" +
+        "const enabled = $data?.prePrValidationEnabled !== false;" +
+        "if (!enabled) return true;" +
+        "const out = $ctx.getNodeOutput('pre-pr-validation');" +
+        "if (!out) return false;" +
+        "if (out.success === true) return true;" +
+        "const code = Number(out.exitCode);" +
+        "return Number.isFinite(code) && code === 0;" +
+        "})()",
+    }, { x: -120, y: 2060, outputs: ["yes", "no"] }),
+
+    node("log-validation-failed", "notify.log", "Log Validation Failed", {
+      message: "Task \"{{taskTitle}}\" ({{taskId}}) — pre-PR validation failed, returning to todo",
+      level: "warn",
+    }, { x: 300, y: 2000 }),
+
+    node("set-todo-validation-failed", "action.update_task_status", "Set Todo (Validation Fail)", {
+      taskId: "{{taskId}}",
+      status: "todo",
+      taskTitle: "{{taskTitle}}",
+    }, { x: 300, y: 2130 }),
     // ── SUCCESS PATH: Push branch (with rebase + empty-diff guard) ───────
     node("push-branch", "action.push_branch", "Push Branch", {
       worktreePath: "{{worktreePath}}",
       branch: "{{branch}}",
       baseBranch: "{{baseBranch}}",
       rebaseBeforePush: true,
+      skipHooks: true,
       emptyDiffGuard: true,
       protectedBranches: "{{protectedBranches}}",
     }, { x: 0, y: 2000 }),
@@ -250,6 +285,8 @@ export const TASK_LIFECYCLE_TEMPLATE = {
       base: "{{baseBranch}}",
       branch: "{{branch}}",
       cwd: "{{worktreePath}}",
+      enableAutoMerge: "{{autoMergeOnCreate}}",
+      autoMergeMethod: "{{autoMergeMethod}}",
     }, { x: 0, y: 2260 }),
 
     node("pr-created", "condition.expression", "PR Linked?", {
@@ -263,11 +300,25 @@ export const TASK_LIFECYCLE_TEMPLATE = {
       taskTitle: "{{taskTitle}}",
     }, { x: 0, y: 2390 }),
 
+    node("handoff-pr-progressor", "action.execute_workflow", "Handoff PR Progressor", {
+      workflowId: "template-bosun-pr-progressor",
+      mode: "dispatch",
+      input: {
+        taskId: "{{taskId}}",
+        taskTitle: "{{taskTitle}}",
+        branch: "{{branch}}",
+        baseBranch: "{{baseBranch}}",
+        prNumber: "{{$ctx.getNodeOutput('create-pr')?.prNumber ?? $data?.prNumber ?? null}}",
+        prUrl: "{{$ctx.getNodeOutput('create-pr')?.prUrl || $data?.prUrl || ''}}",
+        repo: "{{$ctx.getNodeOutput('create-pr')?.repoSlug || $data?.repo || $data?.repoSlug || $data?.repository || ''}}",
+      },
+    }, { x: -120, y: 2520 }),
+
     // ── SUCCESS PATH: Log success ────────────────────────────────────────
     node("log-success", "notify.log", "Log Success", {
       message: "Task \"{{taskTitle}}\" ({{taskId}}) completed — PR created",
       level: "info",
-    }, { x: 0, y: 2520 }),
+    }, { x: -120, y: 2650 }),
 
     // ── NO COMMITS PATH: Log no-commit ───────────────────────────────────
     node("log-no-commits", "notify.log", "Log No Commits", {
@@ -297,6 +348,8 @@ export const TASK_LIFECYCLE_TEMPLATE = {
       branch: "{{branch}}",
       cwd: "{{worktreePath}}",
       failOnError: false,
+      enableAutoMerge: "{{autoMergeOnCreate}}",
+      autoMergeMethod: "{{autoMergeMethod}}",
     }, { x: 400, y: 1740 }),
 
     node("pr-created-stolen", "condition.expression", "PR Linked After Claim Loss?", {
@@ -309,10 +362,24 @@ export const TASK_LIFECYCLE_TEMPLATE = {
       taskTitle: "{{taskTitle}}",
     }, { x: 250, y: 2000 }),
 
+    node("handoff-pr-progressor-stolen", "action.execute_workflow", "Handoff PR Progressor (Recovered)", {
+      workflowId: "template-bosun-pr-progressor",
+      mode: "dispatch",
+      input: {
+        taskId: "{{taskId}}",
+        taskTitle: "{{taskTitle}}",
+        branch: "{{branch}}",
+        baseBranch: "{{baseBranch}}",
+        prNumber: "{{$ctx.getNodeOutput('create-pr-retry')?.prNumber ?? $data?.prNumber ?? null}}",
+        prUrl: "{{$ctx.getNodeOutput('create-pr-retry')?.prUrl || $data?.prUrl || ''}}",
+        repo: "{{$ctx.getNodeOutput('create-pr-retry')?.repoSlug || $data?.repo || $data?.repoSlug || $data?.repository || ''}}",
+      },
+    }, { x: 120, y: 2130 }),
+
     node("log-claim-stolen-recovered", "notify.log", "Log Claim Loss Recovery", {
       message: "Task \"{{taskTitle}}\" ({{taskId}}) — claim lost after PR link recovery, keeping inreview",
       level: "warn",
-    }, { x: 250, y: 2130 }),
+    }, { x: 120, y: 2260 }),
 
     node("log-claim-stolen", "notify.log", "Log Claim Stolen", {
       message: "Task \"{{taskTitle}}\" ({{taskId}}) — claim was stolen, aborting",
@@ -328,7 +395,7 @@ export const TASK_LIFECYCLE_TEMPLATE = {
 
     node("join-outcomes", "flow.join", "Join Outcome Paths", {
       mode: "all",
-      sourceNodeIds: ["log-success", "set-todo-push-failed", "set-todo-cooldown", "set-todo-stolen", "log-claim-stolen-recovered"],
+      sourceNodeIds: ["log-success", "set-todo-push-failed", "set-todo-cooldown", "set-todo-validation-failed", "set-todo-stolen", "log-claim-stolen-recovered"],
       includeSkipped: true,
     }, { x: 200, y: 2560 }),
 
@@ -402,13 +469,19 @@ export const TASK_LIFECYCLE_TEMPLATE = {
     edge("detect-commits", "has-commits"),
 
     // Success path (has commits)
-    edge("has-commits", "push-branch", { condition: "$output?.result === true", port: "yes" }),
+    edge("has-commits", "pre-pr-validation", { condition: "$output?.result === true", port: "yes" }),
+    edge("pre-pr-validation", "pre-pr-validation-ok"),
+    edge("pre-pr-validation-ok", "push-branch", { condition: "$output?.result === true", port: "yes" }),
+    edge("pre-pr-validation-ok", "log-validation-failed", { condition: "$output?.result !== true", port: "no" }),
+    edge("log-validation-failed", "set-todo-validation-failed"),
+    edge("set-todo-validation-failed", "join-outcomes"),
     edge("push-branch", "push-ok"),
     edge("push-ok", "create-pr", { condition: "$output?.result === true", port: "yes" }),
     edge("create-pr", "pr-created"),
     edge("pr-created", "set-inreview", { condition: "$output?.result === true", port: "yes" }),
     edge("pr-created", "set-todo-push-failed", { condition: "$output?.result !== true", port: "no" }),
-    edge("set-inreview", "log-success"),
+    edge("set-inreview", "handoff-pr-progressor"),
+    edge("handoff-pr-progressor", "log-success"),
     edge("log-success", "join-outcomes"),
 
     // Push failed path
@@ -424,7 +497,8 @@ export const TASK_LIFECYCLE_TEMPLATE = {
     edge("claim-stolen", "create-pr-retry", { condition: "$output?.result === true", port: "yes" }),
     edge("create-pr-retry", "pr-created-stolen"),
     edge("pr-created-stolen", "set-inreview-stolen", { condition: "$output?.result === true", port: "yes" }),
-    edge("set-inreview-stolen", "log-claim-stolen-recovered"),
+    edge("set-inreview-stolen", "handoff-pr-progressor-stolen"),
+    edge("handoff-pr-progressor-stolen", "log-claim-stolen-recovered"),
     edge("log-claim-stolen-recovered", "join-outcomes"),
     edge("pr-created-stolen", "log-claim-stolen", { condition: "$output?.result !== true", port: "no" }),
     edge("log-claim-stolen", "set-todo-stolen"),
@@ -451,6 +525,7 @@ export const TASK_LIFECYCLE_TEMPLATE = {
     createdAt: "2026-03-01T00:00:00Z",
     templateVersion: "2.0.0",
     tags: ["task", "lifecycle", "executor", "workflow-first", "core"],
+    requiredTemplates: ["template-bosun-pr-progressor"],
     replaces: {
       module: "task-executor.mjs",
       functions: [
@@ -725,3 +800,5 @@ export const VE_ORCHESTRATOR_LITE_TEMPLATE = {
     },
   },
 };
+
+

package/workspace/context-cache.mjs

@@ -856,16 +856,57 @@ function extractCommandText(item) {
   return "";
 }
 
-function normalizeGitDescriptor(item) {
-  const toolName = extractToolName(item);
-  const commandText = extractCommandText(item);
-  return `${toolName} ${commandText}`
+function normalizeGitTokenSource(value) {
+  return String(value || "")
     .toLowerCase()
-    .replaceAll(/_+/g, " ")
+    .replaceAll(/[^a-z0-9]+/g, " ")
     .replaceAll(/\s+/g, " ")
     .trim();
 }
 
+function inferGitCommandSignals(toolName, commandText) {
+  const normalizedToolName = normalizeGitTokenSource(toolName);
+  const normalizedCommand = normalizeGitTokenSource(commandText);
+  const merged = `${normalizedCommand} ${normalizedToolName}`.trim();
+
+  const commandLooksGit = /\bgit\b/.test(normalizedCommand);
+  const toolLooksGit = normalizedToolName.includes("git");
+  if (!toolLooksGit && !commandLooksGit) {
+    return {
+      eligible: false,
+      boundedDiff: false,
+      hasLog: false,
+      hasShortlog: false,
+      hasReflog: false,
+      hasDiff: false,
+      hasShow: false,
+      hasStatus: false,
+    };
+  }
+
+  let commandBody = normalizedCommand.startsWith("git ")
+    ? normalizedCommand.slice(4).trim()
+    : normalizedCommand;
+
+  if (!commandBody && toolLooksGit) {
+    commandBody = normalizedToolName
+      .replaceAll(/\bgit\b/g, " ")
+      .replaceAll(/\s+/g, " ")
+      .trim();
+  }
+
+  const source = `${commandBody} ${normalizedToolName}`.trim();
+  const hasShortlog = /\bshortlog\b/.test(source);
+  const hasReflog = /\breflog\b/.test(source);
+  const hasLog = !hasShortlog && !hasReflog && /\blog\b/.test(source);
+  const hasDiff = /\bdiff\b/.test(source);
+  const hasShow = /\bshow\b/.test(source);
+  const hasStatus = /\bstatus\b/.test(source);
+  const boundedDiff = /(?:^|\s)--(?:stat|shortstat|numstat|name-only|name-status|summary)\b/.test(commandBody)
+    || /\bdiff(?:\s|-)*(?:stat|shortstat|numstat|name only|name status|summary)\b/.test(merged);
+  return { eligible: true, boundedDiff, hasLog, hasShortlog, hasReflog, hasDiff, hasShow, hasStatus };
+}
+
 function classifyImmediateGitOutput(item, opts) {
   const maxChars = opts?.gitOutputMaxChars ?? DEFAULT_GIT_OUTPUT_MAX_CHARS;
   if (!Number.isFinite(maxChars) || maxChars <= 0) return null;
@@ -873,17 +914,25 @@ function classifyImmediateGitOutput(item, opts) {
   const text = getItemText(item);
   if (typeof text !== "string" || text.length <= maxChars) return null;
 
-  const descriptor = normalizeGitDescriptor(item);
-  if (!descriptor.includes("git")) return null;
-
-  if (/\bgit\s+log\b/.test(descriptor)) return { kind: "log", text };
-  if (/\bgit\s+shortlog\b/.test(descriptor)) return { kind: "shortlog", text };
-  if (/\bgit\s+reflog\b/.test(descriptor)) return { kind: "reflog", text };
-
-  if (/\bgit\s+diff\b/.test(descriptor)) {
-    const boundedDiff = /(?:^|\s)--(?:stat|shortstat|numstat|name-only|name-status|summary)\b/.test(descriptor);
-    if (!boundedDiff) return { kind: "diff", text };
-  }
+  const toolName = extractToolName(item);
+  const commandText = extractCommandText(item);
+  const {
+    eligible,
+    boundedDiff,
+    hasLog,
+    hasShortlog,
+    hasReflog,
+    hasDiff,
+    hasShow,
+    hasStatus,
+  } = inferGitCommandSignals(toolName, commandText);
+  if (!eligible) return null;
+
+  if (hasStatus || hasShow) return null;
+  if (hasShortlog) return { kind: "shortlog", text };
+  if (hasReflog) return { kind: "reflog", text };
+  if (hasLog) return { kind: "log", text };
+  if (hasDiff && !boundedDiff) return { kind: "diff", text };
 
   return null;
 }
@@ -899,7 +948,7 @@ function compressImmediateGitText(text, logId, opts) {
   const tail = tailChars > 0 ? text.slice(-tailChars) : "";
   const omitted = text.length - headChars - (tailChars > 0 ? tailChars : 0);
   const lineCount = text.length === 0 ? 0 : (text.match(/\n/g) || []).length + 1;
-  const note = `\n\n[…git capped: ${lineCount} lines, ${omitted} chars hidden. Full: bosun --tool-log ${logId}]\n\n`;
+  const note = `\n\n[…git capped: ${lineCount} lines, ${omitted} chars suppressed. Full: bosun --tool-log ${logId}]\n\n`;
   return head + note + tail;
 }
 
@@ -2413,4 +2462,3 @@ export async function maybeCompressSessionItems(
   return compressedItems;
 }
 
-

package/workspace/workspace-manager.mjs

@@ -357,12 +357,13 @@ function buildGitPullFailureDetails(err, repoPath, childProcess) {
   const stderr = normalizeSingleLine(err?.stderr || "");
   const stdout = normalizeSingleLine(err?.stdout || "");
   const message = normalizeSingleLine(err?.message || err || "");
+  const preferred = normalizeSingleLine(err?.stderr || err?.stdout || err?.message || "");
   const parts = [];
   if (Number.isFinite(err?.status)) parts.push(`status=${err.status}`);
   if (err?.signal) parts.push(`signal=${err.signal}`);
   if (err?.code) parts.push(`code=${err.code}`);
 
-  let details = stderr || stdout || message || "git pull --rebase failed";
+  let details = preferred || stderr || stdout || message || "git pull --rebase failed";
   if (!details || isGenericGitPullFailure(details)) {
     const fallback = message && !isGenericGitPullFailure(message)
       ? message