brl-subagent 2.3.5 → 2.3.7

package/AGENT.md

@@ -1,7 +1,13 @@
-# AGENT.md — brl-subagent capability reference (v2.3.4+)
+# AGENT.md — brl-subagent capability reference
 
 > The `delegate_task` prompt guidelines are a derived summary of this file; if they disagree, this file wins.
 
+> **Naming:** deliberately `AGENT.md`, **not** `AGENTS.md`. This is *not* a pi
+> context file — it is read on demand via the extension's `delegate_task`
+> guidance, not auto-loaded into the system prompt. Renaming it would change
+> nothing for users (a package directory is not in pi's context-file lookup
+> chain) while adding its full contents to every session run inside this repo.
+
 This file is the authoritative reference for how the brl-subagent extension behaves
 and how you (the conductor) should judge a delegation. Read it when planning
 delegation-heavy work.
@@ -56,33 +62,3 @@ Presets and templates are documented in the schema, not here. Judgment only:
 - Recurring task shapes → a saved template.
 
 The schema's `delegate_task` parameters, the `templateSummary` and `presetRestrictionSummary` lines in the prompt guidelines, and `get_subagent_result`'s description are the mechanics reference.
-
-## Local development
-
-This repo is the package source. Daily use runs the **published npm package**;
-development runs the **local checkout**. Both are `pi install` entries and cannot
-coexist — two loaded copies register the same tools — so remove one first.
-
-```bash
-# Daily: the published artifact — the same thing users install
-pi remove <local-repo-path>
-pi install npm:brl-subagent
-
-# Develop: load the checkout in place — no copying, no syncing
-pi remove npm:brl-subagent
-pi install <local-repo-path>        # or a worktree: …/brl-subagent-wt-<n>
-# then /reload pi after edits
-
-# Back to the published artifact
-pi remove <local-repo-path>
-pi install npm:brl-subagent
-```
-
-A local-path install loads the directory in place and can point at an **unmerged
-worktree**, so it doubles as live verification for a PR. `pi update --extensions`
-advances the npm install and leaves a local-path install alone.
-
-(The former `sync-extension.sh` — rsync into `~/.pi/agent/extensions/brl-subagent`
-— was retired once the package was published: the local-path install supersedes it
-and does not fight `pi update --extensions` by mutating a package-manager-owned
-directory.)

package/README.md

@@ -2,7 +2,7 @@
 
 > Multi-agent orchestration for [pi](https://github.com/earendil-works/pi) — chain, parallel, and dependency-graph delegation to isolated subagents with per-step model routing, preset-driven tool scoping, thinking-level control, and background execution with live monitoring, real abort, and per-agent timeouts.
 
-**Version:** 2.3.4 · **Author:** Azmeen Afandi / [Beeroo Labs](https://beeroolabs.com) · **License:** MIT
+**Version:** 2.3.7 · **Author:** Azmeen Afandi / [Beeroo Labs](https://beeroolabs.com) · **License:** MIT
 
 ---
 
@@ -35,16 +35,6 @@ pi update --extensions        # update installed packages
 pi remove npm:brl-subagent    # uninstall
 ```
 
-<details>
-<summary>Alternative: install from git</summary>
-
-```bash
-pi install git:github.com/azmeenafandi/brl-subagent@v2.3.4
-```
-
-Git installs are **pinned** to the ref you specify. `pi update --extensions` reconciles to that ref but never advances it — upgrading means re-running `pi install` with a newer `@ref`.
-</details>
-
 ---
 
 ## Quick reference
@@ -70,7 +60,6 @@ Git installs are **pinned** to the ref you specify. `pi update --extensions` rec
 | `/brl-subagent monitor` | Live monitor running subagents |
 | `/brl-subagent dashboard` | Live observability dashboard |
 | `/brl-subagent retry` | Browse failed runs to retry |
-| `/brl-subagent update-check` | Toggle update check on startup |
 | `/brl-subagent reset` | Reset all configuration |
 
 All settings persist across sessions.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brl-subagent",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "Subagent extension for pi with configurable model and thinking mode via selection UI",
   "keywords": [
     "pi-package"
@@ -35,14 +35,14 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "^0.85.1",
-    "@earendil-works/pi-ai": "^0.85.1",
-    "@earendil-works/pi-coding-agent": "^0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1",
+    "@earendil-works/pi-agent-core": "^0.86.0",
+    "@earendil-works/pi-ai": "^0.86.0",
+    "@earendil-works/pi-coding-agent": "^0.86.0",
+    "@earendil-works/pi-tui": "^0.86.0",
     "jiti": "^2.7.0",
     "typebox": "^1.3.25",
     "typescript": "^5.9.3",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.0"
   },
   "overrides": {
     "nanoid": "^3.3.17"

package/src/index.ts

@@ -4,7 +4,6 @@
  * See AGENT.md for the conductor-facing capability reference.
  */
 
-import * as fs from "node:fs";
 import * as path from "node:path";
 import type {
 	AgentToolResult,
@@ -40,6 +39,7 @@ import {
 	EMPTY_USAGE,
 	getFinalOutput,
 	isSubagentError,
+	countSubagentOutcomes,
 	classifyError,
 	MAX_CHAIN_STEPS,
 	MAX_PARALLEL_TASKS,
@@ -93,7 +93,6 @@ import {
 	showCompletionNotifySelector,
 	showPresetManager,
 	showTemplateManager,
-	showUpdateCheckToggle,
 	showSLAConfig,
 	showSLAStats,
 	showConfigMenu,
@@ -104,17 +103,14 @@ import {
 	renderDelegateCall,
 	renderDelegateResult,
 } from "./tui";
-import { createLogger, type Logger } from "./logging";
+import { createLogger, setLogCwd, type Logger } from "./logging";
 import { Intercom } from "./messaging";
-import { checkForUpdates } from "./update";
-import { UPDATE_CHECK_INTERVAL_MS } from "./types";
 import * as eventBus from "./event-bus";
 import {
 	buildCompletionMessage,
 	resolveDelivery,
 	sendCompletionNotification,
 	markTerminalSeen,
-	normalizeCompletionStatus,
 	resolveRunEntry,
 } from "./notify-completion";
 
@@ -198,16 +194,6 @@ export function buildTemplateGuideline(templateSummary: string): string {
 export default function (pi: ExtensionAPI) {
 	const log = createLogger("brl-subagent");
 
-	// Read current version from package.json
-	const currentVersion = (() => {
-		try {
-			const pkg = JSON.parse(fs.readFileSync(pkgPath("package.json"), "utf-8"));
-			return pkg.version || "0.0.0";
-		} catch {
-			return "0.0.0";
-		}
-	})();
-
 	// F7: Session-bound state — initialized per session
 	let state = createSessionState(log);
 
@@ -810,7 +796,7 @@ export default function (pi: ExtensionAPI) {
 				previousOutput = getFinalOutput(result.messages);
 			}
 
-			chainSuccess = chainResults.every((r) => r.exitCode === 0);
+			chainSuccess = countSubagentOutcomes(chainResults).failed === 0;
 
 			// Compute aggregated totals
 			const totalInput = chainResults.reduce(
@@ -1217,11 +1203,8 @@ export default function (pi: ExtensionAPI) {
 			}
 
 			// Emit progress update
-			const completed = results.filter(Boolean).length;
-			const succeeded = results.filter(
-				(r) => r && r.exitCode === 0,
-			).length;
-			const failed = completed - succeeded;
+			const { succeeded, failed } = countSubagentOutcomes(results);
+			const completed = succeeded + failed;
 
 			const partialDetails: ParallelDetails = {
 				mode: "parallel",
@@ -1320,8 +1303,7 @@ export default function (pi: ExtensionAPI) {
 			(s, r) => s + r.usage.turns,
 			0,
 		);
-		const succeeded = finalResults.filter((r) => r.exitCode === 0).length;
-		const failed = finalResults.length - succeeded;
+		const { succeeded, failed } = countSubagentOutcomes(finalResults);
 
 		const parallelDetails: ParallelDetails = {
 			mode: "parallel",
@@ -1824,9 +1806,7 @@ export default function (pi: ExtensionAPI) {
 			const totalCost = allResults.reduce((s, r) => s + r.usage.cost, 0);
 			const totalTurns = allResults.reduce((s, r) => s + r.usage.turns, 0);
 
-			chainSuccess = allResults.every(
-				(r) => r.exitCode === 0 && r.stopReason !== "error" && r.stopReason !== "aborted",
-			);
+			chainSuccess = countSubagentOutcomes(allResults).failed === 0;
 
 			const graphDetails: GraphDetails = {
 				mode: "graph",
@@ -1932,7 +1912,6 @@ export default function (pi: ExtensionAPI) {
 				preset: () => showPresetManager(ctx, state),
 				templates: () => showTemplateManager(ctx, state),
 				retry: () => showRetryMenu(ctx, state),
-			"update-check": () => showUpdateCheckToggle(ctx, state, applyConfig),
 			sla: () => showSLAConfig(ctx, state, applyConfig),
 			"sla-stats": () => showSLAStats(ctx, state),
 			};
@@ -2335,48 +2314,10 @@ export default function (pi: ExtensionAPI) {
 				}, { deliverAs: "followUp" });
 			}
 
-			// F1: Sanitize task input — skip for chain/parallel modes
-			const hasChain = params.chain && params.chain.length > 0;
-			const hasParallel = params.tasks && params.tasks.length > 0;
-			const hasGraph = params.graph && params.graph.length > 0;
-			if (!hasChain && !hasParallel && !hasGraph) {
-				// task is optional per the schema; single mode requires it. When absent,
-				// feed "" to the sanitizer — same rejection path ("Task must not be
-				// empty.") as when task was a required field.
-				const taskResult = sanitizeTask(params.task ?? "");
-				if (!taskResult.ok) {
-					log.warn("Task rejected by sanitizer", { error: taskResult.error });
-					return {
-						content: [{ type: "text" as const, text: `Invalid task: ${taskResult.error}` }],
-						details: undefined,
-						isError: true,
-					};
-				}
-				params.task = taskResult.value;
-			}
-
-			// Handle retryRunId
-			if (params.retryRunId) {
-				const runEntry = state.findRunById(ctx, params.retryRunId);
-				if (runEntry) {
-					params = resolveRetryParams(params, runEntry);
-				} else {
-					// Issue #98: a silent no-op here made retries of background runs
-					// (which previously never wrote run entries) start as FRESH runs
-					// with no signal to the caller. Fail loudly instead.
-					log.warn("Retry run ID not found", { retryRunId: params.retryRunId });
-					return {
-						content: [{
-							type: "text" as const,
-							text: `Retry run ID not found: ${params.retryRunId}. The run may have been pruned, or it was a background run created before the run-entry fix (issue #98). Pass the run's agent ID — for background runs the agent ID and run ID are now the same.`,
-						}],
-						details: undefined,
-						isError: true,
-					};
-				}
-			}
-
-			// Handle template resolution
+			// Handle template resolution — MUST run before the single-mode sanitize
+			// block below: a template ASSIGNS params.task, so resolving first lets the
+			// sanitizer validate the real resolved body (a template-only call has no
+			// task yet) and lets mode detection see a non-empty task (issue #175).
 			if (params.template) {
 				const templateEntry = state.config.templates.find((t) => t.name === params.template);
 				if (!templateEntry) {
@@ -2408,7 +2349,34 @@ export default function (pi: ExtensionAPI) {
 				}
 
 				const tv = resolved.value;
-				// Use resolved template fields as defaults, explicitly provided params override
+				// Issue #175 review (fix 4): template-wins silently replaces a
+				// supplied `task`. If that task would itself have failed sanitization
+				// (e.g. over-length), the caller gets no signal — pre-#175 `dev`
+				// rejected it. Warn (never reject — #99/#110 precedent, same
+				// pi.sendMessage channel as the unknown-param warning) so both the LLM
+				// and the human see the ignored task. Emitted ONLY when the supplied
+				// task actually fails sanitization: a valid task alongside a template
+				// is the intended template-wins override (issue #57), not noise.
+				if (params.task !== undefined) {
+					const suppliedTask = sanitizeTask(params.task);
+					if (!suppliedTask.ok) {
+						log.warn("delegate_task: supplied task ignored because a template was given", {
+							template: params.template,
+							error: suppliedTask.error,
+						});
+						pi.sendMessage({
+							customType: "delegate-notification",
+							content: `delegate_task: the supplied 'task' was ignored because a template ('${params.template}') was given. The task would otherwise have been rejected: ${suppliedTask.error}`,
+							display: true,
+							details: { template: params.template, rejectedTask: suppliedTask.error },
+						}, { deliverAs: "followUp" });
+					}
+				}
+				// Issue #175 review (fix direction item 4): this assignment is
+				// UNCONDITIONAL — the resolved template task replaces any supplied
+				// `task` (template-wins, issue #57); it is NOT a default the caller can
+				// override. The fields below, by contrast, ARE defaults: an explicitly
+				// provided param wins over the template's value.
 				params.task = tv.task;
 				if (tv.preset && !params.preset) params.preset = tv.preset;
 				if (tv.thinkingLevel && !params.thinkingLevel) params.thinkingLevel = tv.thinkingLevel;
@@ -2420,6 +2388,53 @@ export default function (pi: ExtensionAPI) {
 				if (tv.inheritSystemPrompt !== undefined && params.inheritSystemPrompt === undefined) params.inheritSystemPrompt = tv.inheritSystemPrompt;
 			}
 
+			// Handle retryRunId — MUST run after template resolution and before the
+			// single-mode sanitize block. resolveRetryParams assigns params.task from
+			// the recorded run, so the sanitizer must see the retried body (a
+			// retry-only call has no task yet). It MUST run AFTER template resolution:
+			// resolveRetryParams returns a fresh object that DROPS `template`, so
+			// resolving templates first keeps a combined template + retryRunId call
+			// from silently disabling template resolution (issue #175 review).
+			if (params.retryRunId) {
+				const runEntry = state.findRunById(ctx, params.retryRunId);
+				if (runEntry) {
+					params = resolveRetryParams(params, runEntry);
+				} else {
+					// Issue #98: a silent no-op here made retries of background runs
+					// (which previously never wrote run entries) start as FRESH runs
+					// with no signal to the caller. Fail loudly instead.
+					log.warn("Retry run ID not found", { retryRunId: params.retryRunId });
+					return {
+						content: [{
+							type: "text" as const,
+							text: `Retry run ID not found: ${params.retryRunId}. The run may have been pruned, or it was a background run created before the run-entry fix. Pass the run's agent ID — for background runs the agent ID and run ID are now the same.`,
+						}],
+						details: undefined,
+						isError: true,
+					};
+				}
+			}
+
+			// F1: Sanitize task input — skip for chain/parallel/graph modes
+			const hasChain = params.chain && params.chain.length > 0;
+			const hasParallel = params.tasks && params.tasks.length > 0;
+			const hasGraph = params.graph && params.graph.length > 0;
+			if (!hasChain && !hasParallel && !hasGraph) {
+				// task is optional per the schema; single mode requires it. When absent,
+				// feed "" to the sanitizer — same rejection path ("Task must not be
+				// empty.") as when task was a required field.
+				const taskResult = sanitizeTask(params.task ?? "");
+				if (!taskResult.ok) {
+					log.warn("Task rejected by sanitizer", { error: taskResult.error });
+					return {
+						content: [{ type: "text" as const, text: `Invalid task: ${taskResult.error}` }],
+						details: undefined,
+						isError: true,
+					};
+				}
+				params.task = taskResult.value;
+			}
+
 			// P1+P2+P10: Mode detection — graph > chain > parallel > single
 			const isChain = hasChain;
 			const isParallel = hasParallel;
@@ -3696,6 +3711,9 @@ export default function (pi: ExtensionAPI) {
 	pi.on("session_start", async (_event, ctx) => {
 		// Issue #147: capture the session context for the completion-push subscriber.
 		sessionCtx = ctx;
+		// Issue #179 (D6): createLogger ran at module load with no cwd — point
+		// the shared file sink at this session's cwd now that it exists.
+		setLogCwd(ctx.cwd);
 		// Load built-in presets
 		const presetsDir = pkgPath("presets");
 		state.builtinPresets = loadBuiltinPresets(presetsDir, log);
@@ -3740,23 +3758,6 @@ export default function (pi: ExtensionAPI) {
 		// F5/F9: Safe state restoration with type guards
 		state.restoreFromSession(ctx);
 
-		// Check for updates (non-blocking, once per 24h)
-		if (state.config.updateCheckEnabled) {
-			const now = Date.now();
-			if (now - state.config.lastUpdateCheck > UPDATE_CHECK_INTERVAL_MS) {
-				state.config.lastUpdateCheck = now;
-				checkForUpdates(currentVersion, log).then((result) => {
-					if (result?.available) {
-						ctx.ui.notify(
-							"brl-subagent " + result.version + " available (current: " + currentVersion + "). Visit " + result.url + " to update. /brl-subagent update-check to disable.",
-							"info"
-						);
-						log.info("Update available", { current: currentVersion, latest: result.version });
-					}
-				}).catch(() => {}); // silently ignore errors
-			}
-		}
-
 		updateStatus(state, ctx);
 	});
 
@@ -3819,7 +3820,10 @@ export default function (pi: ExtensionAPI) {
 			const knob = state.config.completionNotify ?? "all";
 			const run = resolveRunEntry(state.getRunEntries(ctx), id);
 			const message = buildCompletionMessage(agent, run);
-			const delivery = resolveDelivery(normalizeCompletionStatus(agent.status), knob);
+			// Issue #179 (D2): resolve delivery from the CLASSIFIED notification
+			// status, not the raw agent status — otherwise a run whose completion
+			// the builder downgraded to failed would still be delivered as a success.
+			const delivery = resolveDelivery(message.details.status, knob);
 			sendCompletionNotification(pi, message, delivery);
 		} catch (err) {
 			log.warn(`completion-push handler failed for ${id}`, {

package/src/logging.ts

@@ -8,6 +8,9 @@
  *   const log = createLogger("runner", cwd);
  *   log.info("Subagent started", { model, thinkingLevel });
  *   log.error("Subagent failed", { error: err.message });
+ *
+ * Module-load callers pass no cwd; they call setLogCwd(ctx.cwd) once the
+ * session starts and all loggers share <cwd>/.pi/subagent-logs/brl-subagent.log.
  */
 
 import * as fs from "node:fs";
@@ -24,6 +27,12 @@ const MAX_LOG_SIZE = 5 * 1024 * 1024;
 /** Maximum number of rotated log files to keep */
 const MAX_LOG_FILES = 5;
 
+/**
+ * The single log file every logger writes to (issue #179). The JSON entry body
+ * already carries its `prefix`, so one shared file stays readable.
+ */
+const LOG_FILE_NAME = "brl-subagent.log";
+
 /** Log levels in order of verbosity */
 const LOG_LEVELS: Record<LogLevel, number> = {
 	debug: 0,
@@ -50,23 +59,33 @@ export function setLogLevel(level: LogLevel): void {
 	minLevel = level;
 }
 
+// Issue #179 (D6): createLogger() runs at MODULE LOAD (index.ts,
+// session-manager.ts) where the session cwd does not exist yet. The cwd is set
+// later from the session_start hook (ctx.cwd). All logger instances share this
+// module-level value so every entry lands in ONE
+// `<cwd>/.pi/subagent-logs/brl-subagent.log`.
+let logCwd: string | undefined;
+
+/**
+ * Point file logging at a session cwd (or clear it with undefined). Called from
+ * the session-start hook so module-load loggers can write once a cwd exists.
+ */
+export function setLogCwd(cwd: string | undefined): void {
+	logCwd = cwd;
+}
+
+function resolveLogDir(): string | undefined {
+	return logCwd ? path.join(logCwd, ".pi", "subagent-logs") : undefined;
+}
+
 /**
  * Create a logger for a specific module.
- * Logs are written to `.pi/subagent-logs/<prefix>.log` relative to `cwd`.
+ * Logs are written to `<cwd>/.pi/subagent-logs/brl-subagent.log` relative to the
+ * session cwd (set via setLogCwd or the optional `cwd` arg).
  */
 export function createLogger(prefix: string, cwd?: string): Logger {
-	const logDir = cwd ? path.join(cwd, ".pi", "subagent-logs") : undefined;
-
-	// Ensure log directory exists — owner-only (0o700) so other local users
-	// cannot list log files (F6 / issue #29). File writes below already use
-	// 0o600.
-	if (logDir) {
-		try {
-			fs.mkdirSync(logDir, { recursive: true, mode: 0o700 });
-		} catch {
-			// Can't create log dir — fall back to console-only logging
-		}
-	}
+	// Compat: an explicit cwd argument still sets the shared location eagerly.
+	if (cwd) logCwd = cwd;
 
 	function log(level: LogLevel, message: string, data?: Record<string, unknown>): void {
 		if (LOG_LEVELS[level] < LOG_LEVELS[minLevel]) return;
@@ -86,10 +105,15 @@ export function createLogger(prefix: string, cwd?: string): Logger {
 		const consoleMethod = level === "error" ? console.error : level === "warn" ? console.warn : console.log;
 		consoleMethod(`[${prefix}] ${level.toUpperCase()}: ${message}`);
 
-		// File output
+		// File output — resolved on each call because the cwd may be set after
+		// createLogger ran (module load) but before the first entry.
+		const logDir = resolveLogDir();
 		if (logDir) {
 			try {
-				const logFile = path.join(logDir, `${prefix}.log`);
+				// Owner-only (0o700) so other local users cannot list log files
+				// (F6 / issue #29); the file writes below already use 0o600.
+				fs.mkdirSync(logDir, { recursive: true, mode: 0o700 });
+				const logFile = path.join(logDir, LOG_FILE_NAME);
 				rotateIfNeeded(logFile);
 				fs.appendFileSync(logFile, line + "\n", { encoding: "utf-8", mode: 0o600 });
 			} catch {

package/src/notify-completion.ts

@@ -25,6 +25,7 @@ import type {
 } from "./types";
 import { truncateTail } from "./transcript-tail";
 import { formatRunDuration } from "./history";
+import { classifyTerminalOutcome } from "./types";
 
 /** Terminal statuses the completion message can carry. */
 export type CompletionStatus = "completed" | "failed" | "stopped";
@@ -35,6 +36,8 @@ export interface CompletionMessageDetails {
 	status: CompletionStatus;
 	errorCategory: string;
 	errorMessage?: string;
+	/** Issue #179 (D2): the terminal stopReason behind the classified status. */
+	stopReason?: string;
 	costUsd?: number;
 	tokensIn?: number;
 	tokensOut?: number;
@@ -59,12 +62,12 @@ const DEDUPE_CAP = 200;
 
 /**
  * Soft directive appended to the content (D3): the conductor should process
- * the completion silently unless action is needed; on failure apply the retry
- * taxonomy (re-dispatch ≠ retry; Rule 18 governs terminations — ask the user
- * before terminating anything).
+ * the completion silently unless action is needed. If the run failed, it
+ * should investigate the cause before re-dispatching rather than re-issuing an
+ * identical task — any re-issue is confirmed with the user first.
  */
 const COMPLETION_DIRECTIVE =
-	"Process this completion silently unless action is needed. If the run failed, apply the retry taxonomy: a re-dispatch is not a retry, and Rule 18 governs terminations — ask the user before terminating anything.";
+	"Process this completion silently unless action is needed. If the run failed, investigate before re-dispatching — do not re-issue an identical task without confirming the cause with the user.";
 
 /**
  * Normalize a BackgroundAgent status to a terminal status word. The subscriber
@@ -128,23 +131,50 @@ export function buildCompletionMessage(
 	agent: BackgroundAgent,
 	run: SubagentRun | undefined,
 ): CompletionMessagePayload {
-	const status = normalizeCompletionStatus(agent.status);
+	let status = normalizeCompletionStatus(agent.status);
+	// Issue #179 (D2): the notification category must NEVER default to success
+	// merely because `agent.status === "completed"`. The SDK resolves a mid-run
+	// provider death, so the run entry is the authoritative classified reason —
+	// downgrade a stale "completed" when the run says otherwise.
+	if (status === "completed" && run) {
+		const outcome = classifyTerminalOutcome(run.stopReason, run.errorMessage);
+		if (outcome.status !== "completed") {
+			status = outcome.status;
+		} else if (run.status === "failed") {
+			status = "failed";
+		}
+	}
 	// BackgroundAgent has no `label` field — the caller's label is `description`
 	// (set from params.description at spawn). Fall back to the id.
 	const label = agent.description || agent.id;
 	// completed → "success"; failed/stopped → classified category from the run
 	// record (finalizeRunEntry stamps it), falling back to "unknown".
 	const errorCategory =
-		status === "completed" ? "success" : (run?.originalParams?.errorCategory ?? "unknown");
+		status === "completed"
+			? "success"
+			: (run?.errorCategory ?? run?.originalParams?.errorCategory ?? "unknown");
 	const durationMs = run?.durationMs;
 	const costUsd = run?.cost;
 	const tokensIn = run?.tokensIn;
 	const tokensOut = run?.tokensOut;
+	const stopReason = run?.stopReason;
 	const errorMessage = status === "completed" ? undefined : agent.error ?? run?.errorMessage;
 
 	const summary = buildSummaryLine(label, agent.id, status, durationMs, costUsd, errorCategory);
-	const tail = truncateTail(agent.finalOutput ?? run?.fullOutput ?? "", 15);
+	// Issue #179 (C1 fix): truncateTail keeps the LAST 15 lines, but the failure
+	// headline is PREPENDED to the stored output — long earlier-turn prose would
+	// otherwise push the failure reason out of the notified body. Peel it off
+	// before tailing and re-add it as its own part so the reason is never
+	// truncated away.
+	const stored = agent.finalOutput ?? run?.fullOutput ?? "";
+	const headline = status === "completed" ? undefined : errorMessage;
+	const body =
+		headline && stored.startsWith(headline)
+			? stored.slice(headline.length).replace(/^\n+/, "")
+			: stored;
+	const tail = truncateTail(body, 15);
 	const parts = [summary];
+	if (headline) parts.push(headline);
 	if (tail) parts.push(tail);
 	parts.push(COMPLETION_DIRECTIVE);
 	const content = parts.join("\n\n");
@@ -154,6 +184,7 @@ export function buildCompletionMessage(
 		status,
 		errorCategory,
 		...(errorMessage ? { errorMessage } : {}),
+		...(stopReason ? { stopReason } : {}),
 		...(costUsd !== undefined ? { costUsd } : {}),
 		...(tokensIn !== undefined ? { tokensIn } : {}),
 		...(tokensOut !== undefined ? { tokensOut } : {}),

package/src/runner.ts

@@ -27,6 +27,7 @@ import {
 	SIGKILL_GRACE_MS,
 	TEMP_FILE_MODE,
 	MAX_TEMP_DIR_AGE_MS,
+	isProviderError,
 	classifyError,
 	SUBAGENT_ABORTED_MESSAGE,
 } from "./types";
@@ -666,7 +667,7 @@ export function parseSubagentLine(
 function countModelErrorTurns(messages: Array<Record<string, unknown>>): number {
 	let count = 0;
 	for (const msg of messages) {
-		if (msg.role === "assistant" && msg.stopReason === "error") count++;
+		if (msg.role === "assistant" && isProviderError(msg.stopReason as string | undefined)) count++;
 	}
 	return count;
 }