karajan-code 1.36.1 → 1.37.0

package/src/orchestrator/post-loop-stages.js

@@ -98,7 +98,8 @@ export async function runTesterStage({ config, logger, emitter, eventBase, sessi
   emitProgress(
     emitter,
     makeEvent("tester:start", { ...eventBase, stage: "tester" }, {
-      message: "Tester evaluating test quality"
+      message: "Tester evaluating test quality",
+      detail: { provider: config?.roles?.tester?.provider || config?.roles?.coder?.provider || config?.coder || "claude", executorType: "agent" }
     })
   );
 
@@ -126,11 +127,13 @@ export async function runTesterStage({ config, logger, emitter, eventBase, sessi
     attempts: attempts.length > 1 ? attempts : undefined
   });
 
+  const testerProvider = provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("tester:end", { ...eventBase, stage: "tester" }, {
       status: testerOutput.ok ? "ok" : "fail",
-      message: testerOutput.ok ? "Tester passed" : `Tester: ${testerOutput.summary}`
+      message: testerOutput.ok ? "Tester passed" : `Tester: ${testerOutput.summary}`,
+      detail: { ok: testerOutput.ok, summary: testerOutput.summary, provider: testerProvider, executorType: "agent" }
     })
   );
 
@@ -143,7 +146,7 @@ export async function runTesterStage({ config, logger, emitter, eventBase, sessi
       makeEvent("tester:auto-continue", { ...eventBase, stage: "tester" }, {
         status: "warn",
         message: `Tester issues are advisory (reviewer approved), continuing: ${testerOutput.summary}`,
-        detail: { summary: testerOutput.summary, auto_continued: true }
+        detail: { summary: testerOutput.summary, auto_continued: true, provider: testerProvider, executorType: "agent" }
       })
     );
     return { action: "ok", stageResult: { ok: false, summary: testerOutput.summary || "Tester issues (advisory)", auto_continued: true } };
@@ -158,7 +161,8 @@ export async function runSecurityStage({ config, logger, emitter, eventBase, ses
   emitProgress(
     emitter,
     makeEvent("security:start", { ...eventBase, stage: "security" }, {
-      message: "Security auditing code"
+      message: "Security auditing code",
+      detail: { provider: config?.roles?.security?.provider || config?.roles?.coder?.provider || config?.coder || "claude", executorType: "agent" }
     })
   );
 
@@ -186,11 +190,13 @@ export async function runSecurityStage({ config, logger, emitter, eventBase, ses
     attempts: attempts.length > 1 ? attempts : undefined
   });
 
+  const securityProvider = provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("security:end", { ...eventBase, stage: "security" }, {
       status: securityOutput.ok ? "ok" : "fail",
-      message: securityOutput.ok ? "Security audit passed" : `Security: ${securityOutput.summary}`
+      message: securityOutput.ok ? "Security audit passed" : `Security: ${securityOutput.summary}`,
+      detail: { ok: securityOutput.ok, summary: securityOutput.summary, provider: securityProvider, executorType: "agent" }
     })
   );
 
@@ -246,7 +252,8 @@ export async function runImpeccableStage({ config, logger, emitter, eventBase, s
   emitProgress(
     emitter,
     makeEvent("impeccable:start", { ...eventBase, stage: "impeccable" }, {
-      message: "Impeccable auditing frontend design quality"
+      message: "Impeccable auditing frontend design quality",
+      detail: { provider: config?.roles?.impeccable?.provider || coderRole.provider, executorType: "agent" }
     })
   );
 
@@ -277,13 +284,15 @@ export async function runImpeccableStage({ config, logger, emitter, eventBase, s
   });
 
   const verdict = impeccableOutput.result?.verdict || "APPROVED";
+  const impeccableProvider = config?.roles?.impeccable?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("impeccable:end", { ...eventBase, stage: "impeccable" }, {
       status: impeccableOutput.ok ? "ok" : "fail",
       message: impeccableOutput.ok
         ? (verdict === "IMPROVED" ? "Impeccable applied design fixes" : "Impeccable audit passed")
-        : `Impeccable: ${impeccableOutput.summary}`
+        : `Impeccable: ${impeccableOutput.summary}`,
+      detail: { provider: impeccableProvider, executorType: "agent" }
     })
   );
 
@@ -296,7 +305,8 @@ export async function runFinalAuditStage({ config, logger, emitter, eventBase, s
   emitProgress(
     emitter,
     makeEvent("audit:start", { ...eventBase, stage: "audit" }, {
-      message: "Final audit — verifying code quality"
+      message: "Final audit — verifying code quality",
+      detail: { provider: config?.roles?.audit?.provider || config?.roles?.coder?.provider || config?.coder || "claude", executorType: "agent" }
     })
   );
 
@@ -324,6 +334,7 @@ export async function runFinalAuditStage({ config, logger, emitter, eventBase, s
     attempts: attempts.length > 1 ? attempts : undefined
   });
 
+  const auditProvider = provider || coderRole.provider;
   if (!auditOutput.ok) {
     // Audit agent failed to run — treat as advisory, don't block pipeline
     logger.warn(`Audit agent error (advisory): ${auditOutput.summary}`);
@@ -331,7 +342,8 @@ export async function runFinalAuditStage({ config, logger, emitter, eventBase, s
       emitter,
       makeEvent("audit:end", { ...eventBase, stage: "audit" }, {
         status: "warn",
-        message: `Audit: agent error (advisory), continuing — ${auditOutput.summary}`
+        message: `Audit: agent error (advisory), continuing — ${auditOutput.summary}`,
+        detail: { provider: auditProvider, executorType: "agent" }
       })
     );
     return { action: "ok", stageResult: { ok: false, summary: auditOutput.summary || "Audit agent error (advisory)", auto_continued: true } };
@@ -374,7 +386,8 @@ export async function runFinalAuditStage({ config, logger, emitter, eventBase, s
       emitter,
       makeEvent("audit:end", { ...eventBase, stage: "audit" }, {
         status: "fail",
-        message: `Audit: ${criticalCount + highCount} issue(s) found, sending back to coder`
+        message: `Audit: ${criticalCount + highCount} issue(s) found, sending back to coder`,
+        detail: { provider: auditProvider, executorType: "agent" }
       })
     );
 
@@ -392,7 +405,8 @@ export async function runFinalAuditStage({ config, logger, emitter, eventBase, s
     emitter,
     makeEvent("audit:end", { ...eventBase, stage: "audit" }, {
       status: "ok",
-      message: certifiedMsg
+      message: certifiedMsg,
+      detail: { provider: auditProvider, executorType: "agent" }
     })
   );
 

package/src/orchestrator/pre-loop-stages.js

@@ -48,14 +48,16 @@ function applyModelSelection(triageOutput, config, emitter, eventBase) {
 
 export async function runTriageStage({ config, logger, emitter, eventBase, session, coderRole, trackBudget }) {
   logger.setContext({ iteration: 0, stage: "triage" });
+
+  const triageProvider = config?.roles?.triage?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("triage:start", { ...eventBase, stage: "triage" }, {
-      message: "Triage classifying task complexity"
+      message: "Triage classifying task complexity",
+      detail: { provider: triageProvider, executorType: "agent" }
     })
   );
 
-  const triageProvider = config?.roles?.triage?.provider || coderRole.provider;
   const triageOnOutput = ({ stream, line }) => {
     emitProgress(emitter, makeEvent("agent:output", { ...eventBase, stage: "triage" }, {
       message: line,
@@ -132,7 +134,7 @@ export async function runTriageStage({ config, logger, emitter, eventBase, sessi
     makeEvent("triage:end", { ...eventBase, stage: "triage" }, {
       status: triageOutput.ok ? "ok" : "fail",
       message: triageOutput.ok ? "Triage completed" : `Triage failed: ${triageOutput.summary}`,
-      detail: stageResult
+      detail: { ...stageResult, provider: triageProvider, executorType: "agent" }
     })
   );
 
@@ -141,14 +143,16 @@ export async function runTriageStage({ config, logger, emitter, eventBase, sessi
 
 export async function runResearcherStage({ config, logger, emitter, eventBase, session, coderRole, trackBudget }) {
   logger.setContext({ iteration: 0, stage: "researcher" });
+
+  const researcherProvider = config?.roles?.researcher?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("researcher:start", { ...eventBase, stage: "researcher" }, {
-      message: "Researcher investigating codebase"
+      message: "Researcher investigating codebase",
+      detail: { researcher: researcherProvider, provider: researcherProvider, executorType: "agent" }
     })
   );
 
-  const researcherProvider = config?.roles?.researcher?.provider || coderRole.provider;
   const researcherOnOutput = ({ stream, line }) => {
     emitProgress(emitter, makeEvent("agent:output", { ...eventBase, stage: "researcher" }, {
       message: line,
@@ -191,7 +195,8 @@ export async function runResearcherStage({ config, logger, emitter, eventBase, s
     emitter,
     makeEvent("researcher:end", { ...eventBase, stage: "researcher" }, {
       status: researchOutput.ok ? "ok" : "fail",
-      message: researchOutput.ok ? "Research completed" : `Research failed: ${researchOutput.summary}`
+      message: researchOutput.ok ? "Research completed" : `Research failed: ${researchOutput.summary}`,
+      detail: { provider: researcherProvider, executorType: "agent" }
     })
   );
 
@@ -260,14 +265,14 @@ async function handleArchitectClarification({ architectOutput, askQuestion, conf
 
 export async function runArchitectStage({ config, logger, emitter, eventBase, session, coderRole, trackBudget, researchContext = null, discoverResult = null, triageLevel = null, askQuestion = null }) {
   logger.setContext({ iteration: 0, stage: "architect" });
+  const architectProvider = config?.roles?.architect?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("architect:start", { ...eventBase, stage: "architect" }, {
-      message: "Architect designing solution architecture"
+      message: "Architect designing solution architecture",
+      detail: { architect: architectProvider, provider: architectProvider, executorType: "agent" }
     })
   );
-
-  const architectProvider = config?.roles?.architect?.provider || coderRole.provider;
   const architectOnOutput = ({ stream, line }) => {
     emitProgress(emitter, makeEvent("agent:output", { ...eventBase, stage: "architect" }, {
       message: line,
@@ -330,7 +335,7 @@ export async function runArchitectStage({ config, logger, emitter, eventBase, se
     makeEvent("architect:end", { ...eventBase, stage: "architect" }, {
       status: architectOutput.ok ? "ok" : "fail",
       message: architectOutput.ok ? "Architecture completed" : `Architecture failed: ${architectOutput.summary}`,
-      detail: stageResult
+      detail: { ...stageResult, provider: architectProvider, executorType: "agent" }
     })
   );
 
@@ -373,7 +378,7 @@ export async function runPlannerStage({ config, logger, emitter, eventBase, sess
     emitter,
     makeEvent("planner:start", { ...eventBase, stage: "planner" }, {
       message: `Planner (${plannerRole.provider}) running`,
-      detail: { planner: plannerRole.provider }
+      detail: { planner: plannerRole.provider, provider: plannerRole.provider, executorType: "agent" }
     })
   );
 
@@ -416,7 +421,8 @@ export async function runPlannerStage({ config, logger, emitter, eventBase, sess
       emitter,
       makeEvent("planner:end", { ...eventBase, stage: "planner" }, {
         status: "fail",
-        message: `Planner failed: ${details}`
+        message: `Planner failed: ${details}`,
+        detail: { provider: plannerRole.provider, executorType: "agent" }
       })
     );
     throw new Error(`Planner failed: ${details}`);
@@ -436,7 +442,8 @@ export async function runPlannerStage({ config, logger, emitter, eventBase, sess
   emitProgress(
     emitter,
     makeEvent("planner:end", { ...eventBase, stage: "planner" }, {
-      message: "Planner completed"
+      message: "Planner completed",
+      detail: { provider: plannerRole.provider, executorType: "agent" }
     })
   );
 
@@ -445,14 +452,14 @@ export async function runPlannerStage({ config, logger, emitter, eventBase, sess
 
 export async function runDiscoverStage({ config, logger, emitter, eventBase, session, coderRole, trackBudget }) {
   logger.setContext({ iteration: 0, stage: "discover" });
+  const discoverProvider = config?.roles?.discover?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("discover:start", { ...eventBase, stage: "discover" }, {
-      message: "Discover analyzing task for gaps"
+      message: "Discover analyzing task for gaps",
+      detail: { discover: discoverProvider, provider: discoverProvider, executorType: "agent" }
     })
   );
-
-  const discoverProvider = config?.roles?.discover?.provider || coderRole.provider;
   const discoverOnOutput = ({ stream, line }) => {
     emitProgress(emitter, makeEvent("agent:output", { ...eventBase, stage: "discover" }, {
       message: line,
@@ -504,7 +511,7 @@ export async function runDiscoverStage({ config, logger, emitter, eventBase, ses
     makeEvent("discover:end", { ...eventBase, stage: "discover" }, {
       status: discoverOutput.ok ? "ok" : "fail",
       message: discoverOutput.ok ? "Discovery completed" : `Discovery failed: ${discoverOutput.summary}`,
-      detail: stageResult
+      detail: { ...stageResult, provider: discoverProvider, executorType: "agent" }
     })
   );
 
@@ -518,10 +525,12 @@ export async function runDiscoverStage({ config, logger, emitter, eventBase, ses
  */
 export async function runHuReviewerStage({ config, logger, emitter, eventBase, session, coderRole, trackBudget, huFile, askQuestion }) {
   logger.setContext({ iteration: 0, stage: "hu-reviewer" });
+  const huReviewerProvider = config?.roles?.hu_reviewer?.provider || coderRole.provider;
   emitProgress(
     emitter,
     makeEvent("hu-reviewer:start", { ...eventBase, stage: "hu-reviewer" }, {
-      message: "HU Reviewer certifying user stories"
+      message: "HU Reviewer certifying user stories",
+      detail: { provider: huReviewerProvider, executorType: "agent" }
     })
   );
 
@@ -569,7 +578,6 @@ export async function runHuReviewerStage({ config, logger, emitter, eventBase, s
   }
 
   // --- Evaluate loop (re-evaluate entire batch until all certified or needs_context with no askQuestion) ---
-  const huReviewerProvider = config?.roles?.hu_reviewer?.provider || coderRole.provider;
   const huReviewerOnOutput = ({ stream, line }) => {
     emitProgress(emitter, makeEvent("agent:output", { ...eventBase, stage: "hu-reviewer" }, {
       message: line,
@@ -711,7 +719,7 @@ export async function runHuReviewerStage({ config, logger, emitter, eventBase, s
     makeEvent("hu-reviewer:end", { ...eventBase, stage: "hu-reviewer" }, {
       status: "ok",
       message: `HU Review complete: ${certifiedStories.length}/${batch.stories.length} certified`,
-      detail: stageResult
+      detail: { ...stageResult, provider: huReviewerProvider, executorType: "agent" }
     })
   );
 

package/src/orchestrator/preflight-checks.js

@@ -167,14 +167,14 @@ export async function runPreflightChecks({ config, logger, emitter, eventBase, r
     logger.info("Preflight: skipped (no sonar, no security)");
     emitProgress(emitter, makeEvent("preflight:end", { ...eventBase, stage: "preflight" }, {
       message: "Preflight skipped (no checks needed)",
-      detail: result
+      detail: { ...result, executorType: "local" }
     }));
     return result;
   }
 
   emitProgress(emitter, makeEvent("preflight:start", { ...eventBase, stage: "preflight" }, {
     message: "Running preflight environment checks",
-    detail: { sonarEnabled, securityEnabled }
+    detail: { sonarEnabled, securityEnabled, executorType: "local" }
   }));
 
   // --- 1. Docker (only if sonar enabled and not external) ---
@@ -286,7 +286,7 @@ export async function runPreflightChecks({ config, logger, emitter, eventBase, r
       : hasWarnings
         ? `Preflight completed with ${result.warnings.length} warning(s)`
         : "Preflight passed — all checks OK",
-    detail: result
+    detail: { ...result, executorType: "local" }
   }));
 
   return result;

package/src/orchestrator/solomon-escalation.js

@@ -9,11 +9,12 @@ export async function invokeSolomon({ config, logger, emitter, eventBase, stage,
     return escalateToHuman({ askQuestion, session, emitter, eventBase, stage, conflict, iteration });
   }
 
+  const solomonProvider = config?.roles?.solomon?.provider || "gemini";
   emitProgress(
     emitter,
     makeEvent("solomon:start", { ...eventBase, stage: "solomon" }, {
       message: `Solomon arbitrating ${stage} conflict`,
-      detail: { conflictStage: stage }
+      detail: { conflictStage: stage, provider: solomonProvider, executorType: "agent" }
     })
   );
 
@@ -41,7 +42,7 @@ export async function invokeSolomon({ config, logger, emitter, eventBase, stage,
       message: ruling.ok
         ? `Solomon ruling: ${ruling.result?.ruling || "unknown"}`
         : `Solomon failed: ${(solomonError || ruling.summary || "unknown error").slice(0, 200)}`,
-      detail: ruling.result
+      detail: { ...ruling.result, provider: solomonProvider, executorType: "agent" }
     })
   );
 

package/src/orchestrator.js

@@ -177,7 +177,8 @@ function createBudgetManager({ config, emitter, eventBase }) {
           max_budget_usd: budgetLimit,
           warn_threshold_pct: warnThresholdPct,
           pct_used: Number(pctUsed.toFixed(2)),
-          remaining_usd: budgetTracker.remaining(budgetLimit)
+          remaining_usd: budgetTracker.remaining(budgetLimit),
+          executorType: "system"
         }
       })
     );
@@ -379,7 +380,7 @@ async function handleCheckpoint({ checkpointDisabled, askQuestion, lastCheckpoin
       emitter,
       makeEvent("session:checkpoint", { ...eventBase, iteration: i, stage: "checkpoint" }, {
         message: `Checkpoint: progress detected, continuing (${elapsedStr} min elapsed)`,
-        detail: { elapsed_minutes: Number(elapsedStr), iterations_done: i - 1, stages: stagesCompleted, auto_continued: true }
+        detail: { elapsed_minutes: Number(elapsedStr), iterations_done: i - 1, stages: stagesCompleted, auto_continued: true, executorType: "system" }
       })
     );
     return { action: "continue_loop", checkpointDisabled, lastCheckpointAt: Date.now(), lastCheckpointSnapshot: newSnapshot };
@@ -956,7 +957,7 @@ async function runGuardStages({ config, logger, emitter, eventBase, session, ite
       const warnings = outputResult.violations.filter(v => v.severity === "warning");
       emitProgress(emitter, makeEvent("guard:output", { ...eventBase, stage: "guard" }, {
         message: `Output guard: ${critical.length} critical, ${warnings.length} warnings`,
-        detail: { violations: outputResult.violations }
+        detail: { violations: outputResult.violations, executorType: "local" }
       }));
       logger.info(`Output guard: ${outputResult.violations.length} violation(s) found`);
       for (const v of outputResult.violations) {
@@ -983,7 +984,7 @@ async function runGuardStages({ config, logger, emitter, eventBase, session, ite
     if (!perfResult.skipped && perfResult.violations.length > 0) {
       emitProgress(emitter, makeEvent("guard:perf", { ...eventBase, stage: "guard" }, {
         message: `Perf guard: ${perfResult.violations.length} issue(s)`,
-        detail: { violations: perfResult.violations }
+        detail: { violations: perfResult.violations, executorType: "local" }
       }));
       logger.info(`Perf guard: ${perfResult.violations.length} issue(s) found`);
       for (const v of perfResult.violations) {
@@ -1165,7 +1166,7 @@ async function initFlowContext({ task, config, logger, emitter, askQuestion, pgT
     logger.info(`RTK detected (${rtkResult.version}) — instructing agents to prefix Bash commands with rtk`);
     emitProgress(emitter, makeEvent("rtk:detected", ctx.eventBase, {
       message: "RTK detected — agent commands will use token optimization",
-      detail: { version: rtkResult.version }
+      detail: { version: rtkResult.version, executorType: "local" }
     }));
   }
 

package/src/utils/display.js

@@ -47,6 +47,20 @@ const ICONS = {
   "budget:update": "\ud83d\udcb8",
   "iteration:end": "\u23f1\ufe0f",
   "session:end": "\ud83c\udfc1",
+  "discover:start": "\ud83d\udd0e",
+  "discover:end": "\ud83d\udd0e",
+  "architect:start": "\ud83c\udfdb\ufe0f",
+  "architect:end": "\ud83c\udfdb\ufe0f",
+  "hu-reviewer:start": "\ud83d\udcdd",
+  "hu-reviewer:end": "\ud83d\udcdd",
+  "impeccable:start": "\ud83c\udfa8",
+  "impeccable:end": "\ud83c\udfa8",
+  "audit:start": "\ud83d\udccb",
+  "audit:end": "\ud83d\udccb",
+  "sonarcloud:start": "\u2601\ufe0f",
+  "sonarcloud:end": "\u2601\ufe0f",
+  "preflight:start": "\ud83d\udee1\ufe0f",
+  "preflight:end": "\ud83d\udee1\ufe0f",
   question: "\u2753"
 };
 
@@ -95,24 +109,37 @@ export function printHeader({ task, config }) {
   console.log();
 }
 
+/* ── Helper: executor/provider tag ───────────────────────────── */
+
+function formatExecutor(detail) {
+  if (!detail) return '';
+  const provider = detail.provider || '';
+  const type = detail.executorType || '';
+  if (provider) return `  ${ANSI.dim}${provider}${ANSI.reset}`;
+  if (type === 'local') return `  ${ANSI.dim}local${ANSI.reset}`;
+  if (type === 'system') return `  ${ANSI.dim}system${ANSI.reset}`;
+  return '';
+}
+
 /* ── Helper: role start/end one-liners ───────────────────────── */
 
 function roleStart(icon, label, provider) {
   console.log(`  \u251c\u2500 ${icon} ${label} (${provider || "?"}) running...`);
 }
 
-function roleEnd(status, label, elapsed) {
-  console.log(`  \u251c\u2500 ${status} ${label} completed  ${elapsed}`);
+function roleEnd(status, label, elapsed, executor) {
+  console.log(`  \u251c\u2500 ${status} ${label} completed${executor || ''}  ${elapsed}`);
 }
 
 /* ── Helper: pass/fail stage result ─────────────────────────── */
 
 function passFailStage(detail, label, failDefault, elapsed) {
+  const executor = formatExecutor(detail);
   if (detail?.ok === false) {
     const summary = detail?.summary || failDefault;
-    console.log(`  \u251c\u2500 ${ANSI.red}\u274c ${label}: ${summary}${ANSI.reset}  ${elapsed}`);
+    console.log(`  \u251c\u2500 ${ANSI.red}\u274c ${label}: ${summary}${ANSI.reset}${executor}  ${elapsed}`);
   } else {
-    console.log(`  \u251c\u2500 ${ANSI.green}\u2705 ${label}: passed${ANSI.reset}  ${elapsed}`);
+    console.log(`  \u251c\u2500 ${ANSI.green}\u2705 ${label}: passed${ANSI.reset}${executor}  ${elapsed}`);
   }
 }
 
@@ -270,49 +297,52 @@ const EVENT_HANDLERS = {
     roleStart(icon, "Planner", event.detail?.planner);
   },
 
-  "planner:end": (_event, _icon, elapsed, status) => {
-    roleEnd(status, "Planner", elapsed);
+  "planner:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Planner", elapsed, formatExecutor(event.detail));
   },
 
   "coder:start": (event, icon) => {
     roleStart(icon, "Coder", event.detail?.coder);
   },
 
-  "coder:end": (_event, _icon, elapsed, status) => {
-    roleEnd(status, "Coder", elapsed);
+  "coder:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Coder", elapsed, formatExecutor(event.detail));
   },
 
   "refactorer:start": (event, icon) => {
     roleStart(icon, "Refactorer", event.detail?.refactorer);
   },
 
-  "refactorer:end": (_event, _icon, elapsed, status) => {
-    roleEnd(status, "Refactorer", elapsed);
+  "refactorer:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Refactorer", elapsed, formatExecutor(event.detail));
   },
 
   "tdd:result": (event, icon) => {
     const tdd = event.detail || {};
     const label = tdd.ok ? `${ANSI.green}PASS${ANSI.reset}` : `${ANSI.red}FAIL${ANSI.reset}`;
     const files = tdd.sourceFiles === undefined ? "" : ` (${tdd.sourceFiles} src, ${tdd.testFiles} test)`;
-    console.log(`  \u251c\u2500 ${icon} TDD policy: ${label}${files}`);
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${icon} TDD policy: ${label}${files}${executor}`);
   },
 
   "researcher:start": (event, icon) => {
     console.log(`  \u251c\u2500 ${icon} Researcher (${event.detail?.researcher || "?"}) investigating...`);
   },
 
-  "researcher:end": (_event, _icon, elapsed, status) => {
-    roleEnd(status, "Researcher", elapsed);
+  "researcher:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Researcher", elapsed, formatExecutor(event.detail));
   },
 
-  "sonar:start": (_event, icon) => {
-    console.log(`  \u251c\u2500 ${icon} SonarQube scanning...`);
+  "sonar:start": (event, icon) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${icon} SonarQube scanning...${executor}`);
   },
 
   "sonar:end": (event, _icon, elapsed, status) => {
     const gate = event.detail?.gateStatus || "?";
     const gateColor = gate === "OK" ? ANSI.green : ANSI.red;
-    console.log(`  \u251c\u2500 ${status} Quality gate: ${gateColor}${gate}${ANSI.reset}  ${elapsed}`);
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${status} Quality gate: ${gateColor}${gate}${ANSI.reset}${executor}  ${elapsed}`);
   },
 
   "reviewer:start": (event, icon) => {
@@ -321,11 +351,12 @@ const EVENT_HANDLERS = {
 
   "reviewer:end": (event, _icon, elapsed) => {
     const review = event.detail || {};
+    const executor = formatExecutor(event.detail);
     if (review.approved) {
-      console.log(`  \u251c\u2500 ${ANSI.green}\u2705 Review: APPROVED${ANSI.reset}  ${elapsed}`);
+      console.log(`  \u251c\u2500 ${ANSI.green}\u2705 Review: APPROVED${ANSI.reset}${executor}  ${elapsed}`);
     } else {
       const count = review.blockingCount || 0;
-      console.log(`  \u251c\u2500 ${ANSI.red}\u274c Review: REJECTED (${count} blocking)${ANSI.reset}`);
+      console.log(`  \u251c\u2500 ${ANSI.red}\u274c Review: REJECTED (${count} blocking)${ANSI.reset}${executor}`);
       if (review.issues) {
         for (const issue of review.issues) {
           console.log(`  \u2502   ${ANSI.dim}${issue}${ANSI.reset}`);
@@ -334,16 +365,18 @@ const EVENT_HANDLERS = {
     }
   },
 
-  "tester:start": (_event, icon) => {
-    console.log(`  \u251c\u2500 ${icon} Tester evaluating...`);
+  "tester:start": (event, icon) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${icon} Tester evaluating...${executor}`);
   },
 
   "tester:end": (event, _icon, elapsed) => {
     passFailStage(event.detail, "Tester", "issues found", elapsed);
   },
 
-  "security:start": (_event, icon) => {
-    console.log(`  \u251c\u2500 ${icon} Security auditing...`);
+  "security:start": (event, icon) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${icon} Security auditing...${executor}`);
   },
 
   "security:end": (event, _icon, elapsed) => {
@@ -351,7 +384,8 @@ const EVENT_HANDLERS = {
   },
 
   "solomon:start": (event, icon) => {
-    console.log(`  \u251c\u2500 ${icon} Solomon arbitrating ${event.detail?.conflictStage || "?"} conflict...`);
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 ${icon} Solomon arbitrating ${event.detail?.conflictStage || "?"} conflict...${executor}`);
   },
 
   "solomon:end": (event, _icon, elapsed) => {
@@ -422,6 +456,82 @@ const EVENT_HANDLERS = {
     console.log(`${ANSI.dim}Resume with: kj resume ${event.sessionId} --answer "<response>"${ANSI.reset}`);
   },
 
+  "preflight:start": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \ud83d\udee1\ufe0f Preflight checks running...${executor}`);
+  },
+
+  "preflight:end": (event, _icon, elapsed) => {
+    const executor = formatExecutor(event.detail);
+    const ok = event.status === "ok";
+    const statusIcon = ok ? `${ANSI.green}\u2705` : `${ANSI.red}\u274c`;
+    console.log(`  \u251c\u2500 ${statusIcon} Preflight: ${event.message}${ANSI.reset}${executor}  ${elapsed}`);
+  },
+
+  "discover:start": (event, icon) => {
+    const provider = event.detail?.provider || event.detail?.discover || "?";
+    console.log(`  \u251c\u2500 ${icon || "\ud83d\udd0e"} Discover (${provider}) analyzing...`);
+  },
+
+  "discover:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Discover", elapsed, formatExecutor(event.detail));
+  },
+
+  "architect:start": (event) => {
+    const provider = event.detail?.provider || event.detail?.architect || "?";
+    console.log(`  \u251c\u2500 \ud83c\udfdb\ufe0f Architect (${provider}) designing...`);
+  },
+
+  "architect:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Architect", elapsed, formatExecutor(event.detail));
+  },
+
+  "hu-reviewer:start": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \ud83d\udcdd HU Reviewer certifying...${executor}`);
+  },
+
+  "hu-reviewer:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "HU Reviewer", elapsed, formatExecutor(event.detail));
+  },
+
+  "impeccable:start": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \ud83c\udfa8 Impeccable auditing design...${executor}`);
+  },
+
+  "impeccable:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Impeccable", elapsed, formatExecutor(event.detail));
+  },
+
+  "audit:start": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \ud83d\udccb Final audit running...${executor}`);
+  },
+
+  "audit:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "Audit", elapsed, formatExecutor(event.detail));
+  },
+
+  "sonarcloud:start": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \u2601\ufe0f SonarCloud scanning...${executor}`);
+  },
+
+  "sonarcloud:end": (event, _icon, elapsed, status) => {
+    roleEnd(status, "SonarCloud", elapsed, formatExecutor(event.detail));
+  },
+
+  "guard:output": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \ud83d\udee1\ufe0f ${event.message}${executor}`);
+  },
+
+  "guard:perf": (event) => {
+    const executor = formatExecutor(event.detail);
+    console.log(`  \u251c\u2500 \u26a1 ${event.message}${executor}`);
+  },
+
   "pipeline:tracker": (event) => {
     const trackerStages = event.detail?.stages || [];
     console.log(`  ${ANSI.dim}\u250c Pipeline${ANSI.reset}`);