gsd-pi 2.34.0-dev.7d38042 → 2.34.0-dev.e6d9bed

package/dist/resources/extensions/gsd/commands-prefs-wizard.js

@@ -624,10 +624,14 @@ export function serializePreferencesToFrontmatter(prefs) {
     const orderedKeys = [
         "version", "mode", "always_use_skills", "prefer_skills", "avoid_skills",
         "skill_rules", "custom_instructions", "models", "skill_discovery",
-        "auto_supervisor", "uat_dispatch", "unique_milestone_ids",
+        "skill_staleness_days", "auto_supervisor", "uat_dispatch", "unique_milestone_ids",
         "budget_ceiling", "budget_enforcement", "context_pause_threshold",
         "notifications", "remote_questions", "git",
         "post_unit_hooks", "pre_dispatch_hooks",
+        "dynamic_routing", "token_profile", "phases", "parallel",
+        "auto_visualize", "auto_report",
+        "verification_commands", "verification_auto_fix", "verification_max_retries",
+        "search_provider", "compression_strategy", "context_selection",
     ];
     const seen = new Set();
     for (const key of orderedKeys) {

package/dist/resources/extensions/gsd/docs/preferences-reference.md

@@ -134,6 +134,10 @@ Setting `prefer_skills: []` does **not** disable skill discovery — it just mea
   - `isolation`: `"worktree"`, `"branch"`, or `"none"` — controls auto-mode git isolation strategy. `"worktree"` creates a milestone worktree for isolated work; `"branch"` works directly in the project root but creates a milestone branch (useful for submodule-heavy repos); `"none"` works directly on the current branch with no worktree or milestone branch (ideal for step-mode with hot reloads). Default: `"worktree"`.
   - `manage_gitignore`: boolean — when `false`, GSD will not touch `.gitignore` at all. Useful when your project has a strictly managed `.gitignore` and you don't want GSD adding entries. Default: `true`.
   - `worktree_post_create`: string — script to run after a worktree is created (both auto-mode and manual `/worktree`). Receives `SOURCE_DIR` and `WORKTREE_DIR` as environment variables. Can be absolute or relative to project root. Runs with 30-second timeout. Failure is non-fatal (logged as warning). Default: none.
+  - `auto_pr`: boolean — automatically create a GitHub pull request after a milestone branch is merged. Requires `gh` CLI to be installed. Default: `false`.
+  - `pr_target_branch`: string — branch to target when `auto_pr` is enabled. Defaults to `main_branch` when omitted.
+  - **Deprecated:** `commit_docs` — no longer valid; `.gsd/` is always gitignored. Remove this setting.
+  - **Deprecated:** `merge_to_main` — no longer valid; milestone-level merge is always used. Remove this setting.
 
 - `unique_milestone_ids`: boolean — when `true`, generates milestone IDs in `M{seq}-{rand6}` format (e.g. `M001-eh88as`) instead of plain sequential `M001`. Prevents ID collisions in team workflows where multiple contributors create milestones concurrently. Both formats coexist — existing `M001`-style milestones remain valid. Default: `false`.
 
@@ -181,6 +185,12 @@ Setting `prefer_skills: []` does **not** disable skill discovery — it just mea
 
 - `auto_report`: boolean — generate an HTML report snapshot after each milestone completion. Default: `true`.
 
+- `search_provider`: `"brave"`, `"tavily"`, `"ollama"`, `"native"`, or `"auto"` — selects the search backend for research phases. `"native"` forces Anthropic's built-in web search only; provider values force that backend and disable native search; `"auto"` uses the default heuristic. Default: `"auto"`.
+
+- `compression_strategy`: `"truncate"` or `"compress"` — controls how context that exceeds the budget is reduced. `"truncate"` (default) drops sections from the end. `"compress"` applies heuristic compression before truncating, preserving more content at the cost of some fidelity. Default: `"truncate"`.
+
+- `context_selection`: `"full"` or `"smart"` — controls how files are inlined into context. `"full"` inlines entire files; `"smart"` uses semantic chunking to include only the most relevant sections. Default is derived from `token_profile`.
+
 - `parallel`: configures parallel orchestration for running multiple slices concurrently. Keys:
   - `enabled`: boolean — enable parallel execution. Default: `false`.
   - `max_workers`: number — maximum concurrent workers (1-4). Default: `2`.

package/dist/resources/extensions/gsd/doctor-checks.js

@@ -1,13 +1,13 @@
-import { existsSync, lstatSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
-import { join, sep } from "node:path";
+import { existsSync, lstatSync, readdirSync, readFileSync, realpathSync, rmSync, statSync } from "node:fs";
+import { basename, dirname, join, sep } from "node:path";
 import { loadFile, parseRoadmap } from "./files.js";
 import { resolveMilestoneFile, milestonesDir, gsdRoot, resolveGsdRootFile } from "./paths.js";
 import { deriveState, isMilestoneComplete } from "./state.js";
 import { saveFile } from "./files.js";
-import { listWorktrees, resolveGitDir } from "./worktree-manager.js";
+import { listWorktrees, resolveGitDir, worktreesDir } from "./worktree-manager.js";
 import { abortAndReset } from "./git-self-heal.js";
-import { RUNTIME_EXCLUSION_PATHS } from "./git-service.js";
-import { nativeIsRepo, nativeWorktreeRemove, nativeBranchList, nativeBranchDelete, nativeLsFiles, nativeRmCached } from "./native-git-bridge.js";
+import { RUNTIME_EXCLUSION_PATHS, readIntegrationBranch } from "./git-service.js";
+import { nativeIsRepo, nativeBranchExists, nativeWorktreeList, nativeWorktreeRemove, nativeBranchList, nativeBranchDelete, nativeLsFiles, nativeRmCached } from "./native-git-bridge.js";
 import { readCrashLock, isLockProcessAlive, clearLock } from "./crash-recovery.js";
 import { ensureGitignore } from "./gitignore.js";
 import { readAllSessionStatuses, isSessionStale, removeSessionStatus } from "./session-status-io.js";
@@ -200,6 +200,75 @@ export async function checkGitHealth(basePath, issues, fixesApplied, shouldFix,
     catch {
         // git branch list failed — skip
     }
+    // ── Integration branch existence ──────────────────────────────────────
+    // For each active (non-complete) milestone, verify the stored integration
+    // branch still exists in git. A missing integration branch blocks merge-back
+    // and causes the next merge operation to fail silently.
+    try {
+        const state = await deriveState(basePath);
+        for (const milestone of state.registry) {
+            if (milestone.status === "complete")
+                continue;
+            const integrationBranch = readIntegrationBranch(basePath, milestone.id);
+            if (!integrationBranch)
+                continue; // No stored branch — skip (not yet set)
+            if (!nativeBranchExists(basePath, integrationBranch)) {
+                issues.push({
+                    severity: "error",
+                    code: "integration_branch_missing",
+                    scope: "milestone",
+                    unitId: milestone.id,
+                    message: `Milestone ${milestone.id} recorded integration branch "${integrationBranch}" but that branch no longer exists in git. Merge-back will fail.`,
+                    fixable: false,
+                });
+            }
+        }
+    }
+    catch {
+        // Non-fatal — integration branch check failed
+    }
+    // ── Orphaned worktree directories ────────────────────────────────────
+    // Worktree removal can fail after a branch delete, leaving a directory
+    // that is no longer registered with git. These orphaned dirs cause
+    // "already exists" errors when re-creating the same worktree name.
+    try {
+        const wtDir = worktreesDir(basePath);
+        if (existsSync(wtDir)) {
+            const registeredPaths = new Set(nativeWorktreeList(basePath).map(entry => entry.path));
+            for (const entry of readdirSync(wtDir)) {
+                const fullPath = join(wtDir, entry);
+                try {
+                    if (!statSync(fullPath).isDirectory())
+                        continue;
+                }
+                catch {
+                    continue;
+                }
+                if (!registeredPaths.has(fullPath)) {
+                    issues.push({
+                        severity: "warning",
+                        code: "worktree_directory_orphaned",
+                        scope: "project",
+                        unitId: entry,
+                        message: `Worktree directory ${fullPath} exists on disk but is not registered with git. Run "git worktree prune" or doctor --fix to remove it.`,
+                        fixable: true,
+                    });
+                    if (shouldFix("worktree_directory_orphaned")) {
+                        try {
+                            rmSync(fullPath, { recursive: true, force: true });
+                            fixesApplied.push(`removed orphaned worktree directory ${fullPath}`);
+                        }
+                        catch {
+                            fixesApplied.push(`failed to remove orphaned worktree directory ${fullPath}`);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Non-fatal — orphaned worktree directory check failed
+    }
 }
 // ── Runtime Health Checks ──────────────────────────────────────────────────
 // Checks for stale crash locks, orphaned completed-units, stale hook state,
@@ -231,6 +300,45 @@ export async function checkRuntimeHealth(basePath, issues, fixesApplied, shouldF
     catch {
         // Non-fatal — crash lock check failed
     }
+    // ── Stranded lock directory ────────────────────────────────────────────
+    // proper-lockfile creates a `.gsd.lock/` directory as the OS-level lock
+    // mechanism. If the process was SIGKILLed or crashed hard, this directory
+    // can remain on disk without any live process holding it. The next session
+    // fails to acquire the lock until the directory is removed (#1245).
+    try {
+        const lockDir = join(dirname(root), `${basename(root)}.lock`);
+        if (existsSync(lockDir)) {
+            const statRes = statSync(lockDir);
+            if (statRes.isDirectory()) {
+                // Check if any live process actually holds this lock
+                const lock = readCrashLock(basePath);
+                const lockHolderAlive = lock ? isLockProcessAlive(lock) : false;
+                if (!lockHolderAlive) {
+                    issues.push({
+                        severity: "error",
+                        code: "stranded_lock_directory",
+                        scope: "project",
+                        unitId: "project",
+                        message: `Stranded lock directory "${lockDir}" exists but no live process holds the session lock. This blocks new auto-mode sessions from starting.`,
+                        file: lockDir,
+                        fixable: true,
+                    });
+                    if (shouldFix("stranded_lock_directory")) {
+                        try {
+                            rmSync(lockDir, { recursive: true, force: true });
+                            fixesApplied.push(`removed stranded lock directory ${lockDir}`);
+                        }
+                        catch {
+                            fixesApplied.push(`failed to remove stranded lock directory ${lockDir}`);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Non-fatal — stranded lock directory check failed
+    }
     // ── Stale parallel sessions ────────────────────────────────────────────
     try {
         const parallelStatuses = readAllSessionStatuses(basePath);

package/dist/resources/extensions/gsd/doctor-proactive.js

@@ -19,6 +19,9 @@ import { gsdRoot, resolveGsdRootFile } from "./paths.js";
 import { readCrashLock, isLockProcessAlive, clearLock } from "./crash-recovery.js";
 import { abortAndReset } from "./git-self-heal.js";
 import { rebuildState } from "./doctor.js";
+import { deriveState } from "./state.js";
+import { readIntegrationBranch } from "./git-service.js";
+import { nativeBranchExists, nativeIsRepo } from "./native-git-bridge.js";
 /** In-memory health history for the current auto-mode session. */
 let healthHistory = [];
 /** Count of consecutive units with unresolved errors. */
@@ -156,6 +159,25 @@ export async function preDispatchHealthGate(basePath) {
     catch {
         // Non-fatal — dispatch continues without STATE.md if rebuild fails
     }
+    // ── Integration branch existence check ──
+    // If the active milestone's recorded integration branch no longer exists in
+    // git, the merge-back at the end of the milestone will fail. Block dispatch
+    // now to surface this before work is lost.
+    try {
+        if (nativeIsRepo(basePath)) {
+            const state = await deriveState(basePath);
+            if (state.activeMilestone) {
+                const integrationBranch = readIntegrationBranch(basePath, state.activeMilestone.id);
+                if (integrationBranch && !nativeBranchExists(basePath, integrationBranch)) {
+                    issues.push(`Integration branch "${integrationBranch}" for milestone ${state.activeMilestone.id} no longer exists in git. ` +
+                        `Restore the branch or update the integration branch before dispatching. Run /gsd doctor for details.`);
+                }
+            }
+        }
+    }
+    catch {
+        // Non-fatal — dispatch continues if state/branch check fails
+    }
     // If we had critical issues that couldn't be auto-healed, block dispatch
     if (issues.length > 0) {
         return {

package/dist/resources/extensions/gsd/doctor.js

@@ -8,6 +8,7 @@ import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { COMPLETION_TRANSITION_CODES } from "./doctor-types.js";
 import { checkGitHealth, checkRuntimeHealth } from "./doctor-checks.js";
 import { checkEnvironmentHealth } from "./doctor-environment.js";
+import { runProviderChecks } from "./doctor-providers.js";
 export { summarizeDoctorIssues, filterDoctorIssues, formatDoctorReport, formatDoctorIssuesForPrompt } from "./doctor-format.js";
 export { runEnvironmentChecks, runFullEnvironmentChecks, formatEnvironmentReport } from "./doctor-environment.js";
 export { computeProgressScore, computeProgressScoreWithContext, formatProgressLine, formatProgressReport } from "./progress-score.js";
@@ -373,6 +374,41 @@ export async function runGSDDoctor(basePath, options) {
     const requirementsContent = await loadFile(requirementsPath);
     issues.push(...auditRequirements(requirementsContent));
     const state = await deriveState(basePath);
+    // Provider / auth health checks — only relevant when there is active work to dispatch.
+    // Skipped for idle projects (no active milestone) to avoid noise in environments
+    // where CI/test runners have no API key configured.
+    if (state.activeMilestone) {
+        try {
+            const providerResults = runProviderChecks();
+            for (const result of providerResults) {
+                if (!result.required)
+                    continue;
+                if (result.status === "error") {
+                    issues.push({
+                        severity: "warning",
+                        code: "provider_key_missing",
+                        scope: "project",
+                        unitId: "project",
+                        message: result.message + (result.detail ? ` — ${result.detail}` : ""),
+                        fixable: false,
+                    });
+                }
+                else if (result.status === "warning") {
+                    issues.push({
+                        severity: "warning",
+                        code: "provider_key_backedoff",
+                        scope: "project",
+                        unitId: "project",
+                        message: result.message + (result.detail ? ` — ${result.detail}` : ""),
+                        fixable: false,
+                    });
+                }
+            }
+        }
+        catch {
+            // Non-fatal — provider check failure should not block other checks
+        }
+    }
     for (const milestone of state.registry) {
         const milestoneId = milestone.id;
         const milestonePath = resolveMilestonePath(basePath, milestoneId);

package/dist/resources/extensions/gsd/guided-flow.js

@@ -661,9 +661,11 @@ export async function showSmartEntry(ctx, pi, basePath, options) {
     untrackRuntimeFiles(basePath);
     // ── Self-heal stale runtime records from crashed auto-mode sessions ──
     selfHealRuntimeRecords(basePath, ctx);
-    // Check for crash from previous auto-mode session
+    // Check for crash from previous auto-mode session.
+    // Skip if the lock was written by the current process — acquireSessionLock()
+    // writes to the same file, so we'd always false-positive (#1398).
     const crashLock = readCrashLock(basePath);
-    if (crashLock) {
+    if (crashLock && crashLock.pid !== process.pid) {
         clearLock(basePath);
         // Bootstrap crash with zero completed units = no work was lost.
         // Auto-discard instead of prompting the user — this commonly happens

package/dist/resources/extensions/gsd/preferences-validation.js

@@ -603,5 +603,43 @@ export function validatePreferences(preferences) {
             validated.git = git;
         }
     }
+    // ─── Auto Visualize ─────────────────────────────────────────────────
+    if (preferences.auto_visualize !== undefined) {
+        if (typeof preferences.auto_visualize === "boolean") {
+            validated.auto_visualize = preferences.auto_visualize;
+        }
+        else {
+            errors.push("auto_visualize must be a boolean");
+        }
+    }
+    // ─── Auto Report ────────────────────────────────────────────────────
+    if (preferences.auto_report !== undefined) {
+        if (typeof preferences.auto_report === "boolean") {
+            validated.auto_report = preferences.auto_report;
+        }
+        else {
+            errors.push("auto_report must be a boolean");
+        }
+    }
+    // ─── Compression Strategy ───────────────────────────────────────────
+    if (preferences.compression_strategy !== undefined) {
+        const validStrategies = new Set(["truncate", "compress"]);
+        if (typeof preferences.compression_strategy === "string" && validStrategies.has(preferences.compression_strategy)) {
+            validated.compression_strategy = preferences.compression_strategy;
+        }
+        else {
+            errors.push(`compression_strategy must be one of: truncate, compress`);
+        }
+    }
+    // ─── Context Selection ──────────────────────────────────────────────
+    if (preferences.context_selection !== undefined) {
+        const validModes = new Set(["full", "smart"]);
+        if (typeof preferences.context_selection === "string" && validModes.has(preferences.context_selection)) {
+            validated.context_selection = preferences.context_selection;
+        }
+        else {
+            errors.push(`context_selection must be one of: full, smart`);
+        }
+    }
     return { preferences: validated, errors, warnings };
 }

package/dist/resources/extensions/gsd/preferences.js

@@ -186,6 +186,8 @@ function mergePreferences(base, override) {
         search_provider: override.search_provider ?? base.search_provider,
         compression_strategy: override.compression_strategy ?? base.compression_strategy,
         context_selection: override.context_selection ?? base.context_selection,
+        auto_visualize: override.auto_visualize ?? base.auto_visualize,
+        auto_report: override.auto_report ?? base.auto_report,
     };
 }
 function mergeStringLists(base, override) {

package/dist/resources/skills/create-gsd-extension/references/events-reference.md

@@ -61,10 +61,10 @@ pi.on("tool_call", async (event, ctx) => {
 
 **tool_result** — Fired after tool executes. Can modify result. Handlers chain like middleware.
 ```typescript
-import { isBashToolResult } from "@mariozechner/pi-coding-agent";
+import { isToolResultEventType } from "@mariozechner/pi-coding-agent";
 
 pi.on("tool_result", async (event, ctx) => {
-  if (isBashToolResult(event)) {
+  if (isToolResultEventType("bash", event)) {
     // event.details is typed as BashToolDetails
   }
   // Return partial patch: { content, details, isError }
@@ -105,7 +105,7 @@ pi.on("model_select", async (event, ctx) => {
 Built-in type guards for tool events:
 
 ```typescript
-import { isToolCallEventType, isBashToolResult } from "@mariozechner/pi-coding-agent";
+import { isToolCallEventType, isToolResultEventType } from "@mariozechner/pi-coding-agent";
 
 // Tool calls — narrows event.input type
 if (isToolCallEventType("bash", event)) { /* event.input: { command, timeout? } */ }
@@ -114,7 +114,7 @@ if (isToolCallEventType("write", event)) { /* event.input: { path, content } */
 if (isToolCallEventType("edit", event)) { /* event.input: { path, oldText, newText } */ }
 
 // Tool results — narrows event.details type
-if (isBashToolResult(event)) { /* event.details: BashToolDetails */ }
+if (isToolResultEventType("bash", event)) { /* event.details: BashToolDetails */ }
 ```
 
 For custom tools, export your input type and use explicit type params:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gsd-pi",
-  "version": "2.34.0-dev.7d38042",
+  "version": "2.34.0-dev.e6d9bed",
   "description": "GSD — Get Shit Done coding agent",
   "license": "MIT",
   "repository": {

package/packages/pi-agent-core/dist/agent-loop.d.ts

@@ -4,6 +4,20 @@
  */
 import { EventStream } from "@gsd/pi-ai";
 import type { AgentContext, AgentEvent, AgentLoopConfig, AgentMessage, StreamFn } from "./types.js";
+export declare const ZERO_USAGE: {
+    readonly input: 0;
+    readonly output: 0;
+    readonly cacheRead: 0;
+    readonly cacheWrite: 0;
+    readonly totalTokens: 0;
+    readonly cost: {
+        readonly input: 0;
+        readonly output: 0;
+        readonly cacheRead: 0;
+        readonly cacheWrite: 0;
+        readonly total: 0;
+    };
+};
 /**
  * Start an agent loop with a new prompt message.
  * The prompt is added to the context and events are emitted for it.

package/packages/pi-agent-core/dist/agent-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGN,WAAW,EAIX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,YAAY,EAIZ,QAAQ,EACR,MAAM,YAAY,CAAC;AA8BpB;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CA8BzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CA+BzC"}
+{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAGN,WAAW,EAIX,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EACf,YAAY,EAIZ,QAAQ,EACR,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,UAAU;;;;;;;;;;;;;CAOb,CAAC;AA4CX;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAwBzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,QAAQ,GACjB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CA0BzC"}

package/packages/pi-agent-core/dist/agent-loop.js

@@ -3,7 +3,7 @@
  * Transforms to Message[] only at the LLM call boundary.
  */
 import { EventStream, streamSimple, validateToolArguments, } from "@gsd/pi-ai";
-const ZERO_USAGE = {
+export const ZERO_USAGE = {
     input: 0,
     output: 0,
     cacheRead: 0,
@@ -29,6 +29,23 @@ function createErrorMessage(error, config) {
         timestamp: Date.now(),
     };
 }
+/**
+ * Emit a message_start + message_end pair for a single message.
+ */
+function emitMessagePair(stream, message) {
+    stream.push({ type: "message_start", message });
+    stream.push({ type: "message_end", message });
+}
+/**
+ * Emit the standard error sequence when the outer agent loop catches an error.
+ * Pushes message_start/end, turn_end, agent_end, then closes the stream.
+ */
+function emitErrorSequence(stream, errMsg, newMessages) {
+    emitMessagePair(stream, errMsg);
+    stream.push({ type: "turn_end", message: errMsg, toolResults: [] });
+    stream.push({ type: "agent_end", messages: [...newMessages, errMsg] });
+    stream.end([...newMessages, errMsg]);
+}
 /**
  * Start an agent loop with a new prompt message.
  * The prompt is added to the context and events are emitted for it.
@@ -44,19 +61,13 @@ export function agentLoop(prompts, context, config, signal, streamFn) {
         stream.push({ type: "agent_start" });
         stream.push({ type: "turn_start" });
         for (const prompt of prompts) {
-            stream.push({ type: "message_start", message: prompt });
-            stream.push({ type: "message_end", message: prompt });
+            emitMessagePair(stream, prompt);
         }
         try {
             await runLoop(currentContext, newMessages, config, signal, stream, streamFn);
         }
         catch (error) {
-            const errMsg = createErrorMessage(error, config);
-            stream.push({ type: "message_start", message: errMsg });
-            stream.push({ type: "message_end", message: errMsg });
-            stream.push({ type: "turn_end", message: errMsg, toolResults: [] });
-            stream.push({ type: "agent_end", messages: [...newMessages, errMsg] });
-            stream.end([...newMessages, errMsg]);
+            emitErrorSequence(stream, createErrorMessage(error, config), newMessages);
         }
     })();
     return stream;
@@ -86,12 +97,7 @@ export function agentLoopContinue(context, config, signal, streamFn) {
             await runLoop(currentContext, newMessages, config, signal, stream, streamFn);
         }
         catch (error) {
-            const errMsg = createErrorMessage(error, config);
-            stream.push({ type: "message_start", message: errMsg });
-            stream.push({ type: "message_end", message: errMsg });
-            stream.push({ type: "turn_end", message: errMsg, toolResults: [] });
-            stream.push({ type: "agent_end", messages: [...newMessages, errMsg] });
-            stream.end([...newMessages, errMsg]);
+            emitErrorSequence(stream, createErrorMessage(error, config), newMessages);
         }
     })();
     return stream;
@@ -121,8 +127,7 @@ async function runLoop(currentContext, newMessages, config, signal, stream, stre
             // Process pending messages (inject before next assistant response)
             if (pendingMessages.length > 0) {
                 for (const message of pendingMessages) {
-                    stream.push({ type: "message_start", message });
-                    stream.push({ type: "message_end", message });
+                    emitMessagePair(stream, message);
                     currentContext.messages.push(message);
                     newMessages.push(message);
                 }
@@ -144,14 +149,7 @@ async function runLoop(currentContext, newMessages, config, signal, stream, stre
                     api: config.model.api,
                     provider: config.model.provider,
                     model: config.model.id,
-                    usage: {
-                        input: 0,
-                        output: 0,
-                        cacheRead: 0,
-                        cacheWrite: 0,
-                        totalTokens: 0,
-                        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
-                    },
+                    usage: ZERO_USAGE,
                     stopReason: signal?.aborted ? "aborted" : "error",
                     errorMessage: errorText,
                     timestamp: Date.now(),
@@ -478,8 +476,7 @@ function emitToolCallOutcome(toolCall, result, isError, stream) {
         isError,
         timestamp: Date.now(),
     };
-    stream.push({ type: "message_start", message: toolResultMessage });
-    stream.push({ type: "message_end", message: toolResultMessage });
+    emitMessagePair(stream, toolResultMessage);
     return toolResultMessage;
 }
 function skipToolCall(toolCall, stream, options) {