refactor: unify rendering pipeline and daemon protocol v2

RenderSession.emit() now returns void instead of TextRenderOp, removing
the dual text/event tracking pattern. CLI output modes (text, json) are
handled by dedicated render sessions (cli-text, cli-json) that write to
stdout directly, eliminating the printSessionOutput intermediary.

Daemon protocol bumped to v2 with DaemonToolResult replacing ToolResponse
on the wire. Added DaemonVersionMismatchError and auto-restart logic so
CLI transparently recovers when connecting to a stale daemon.

Removed postProcessToolResponse in favor of postProcessSession which
operates on sessions directly across MCP, daemon, and snapshot harness
boundaries.

Author: cameroncooke

src/cli/__tests__/output.test.ts

@@ -1,125 +1,15 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { printSessionOutput, type SessionOutputData } from '../output.ts';
-import type { PipelineEvent } from '../../types/pipeline-events.ts';
-
-function makeSessionData(opts: {
-  text: string;
-  events?: PipelineEvent[];
-  isError?: boolean;
-}): SessionOutputData {
-  return {
-    text: opts.text,
-    events: opts.events ?? [],
-    attachments: [],
-    isError: opts.isError ?? false,
-  };
-}
-
-describe('printSessionOutput', () => {
-  const originalNoColor = process.env.NO_COLOR;
-  const originalIsTTY = process.stdout.isTTY;
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-
-    if (originalNoColor === undefined) {
-      delete process.env.NO_COLOR;
-    } else {
-      process.env.NO_COLOR = originalNoColor;
-    }
-
-    Object.defineProperty(process.stdout, 'isTTY', {
-      configurable: true,
-      value: originalIsTTY,
-    });
-  });
-
-  it('colors inline errors red and summary failures with a red marker in text output when stdout is a TTY', () => {
-    const stdoutWrite = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
-    Object.defineProperty(process.stdout, 'isTTY', {
-      configurable: true,
-      value: true,
-    });
-    delete process.env.NO_COLOR;
-
-    const text = [
-      'Failed Tests',
-      'CalculatorAppTests',
-      ' \u2717 testCalculatorServiceFailure (0.009s)',
-      ' \u2514\u2500 XCTAssertEqual failed: ("0") is not equal to ("999")',
-      '  /tmp/CalculatorAppTests.swift:52: error: XCTAssertEqual failed: ("0") is not equal to ("999")',
-      'Test Summary',
-      'error: compiler command failed with exit code 1',
-      '\u274C Test Run test failed for scheme CalculatorApp.',
-    ].join('\n');
-
-    printSessionOutput(makeSessionData({ text, isError: true }));
-
-    const output = stdoutWrite.mock.calls.flat().join('');
-    expect(output).toContain('Failed Tests\n');
-    expect(output).toContain(' \u001B[31m\u2717 \u001B[0mtestCalculatorServiceFailure (0.009s)\n');
-    expect(output).toContain(
-      ' \u2514\u2500 XCTAssertEqual failed: ("0") is not equal to ("999")\n',
-    );
-    expect(output).toContain(
-      '\u001B[31m  /tmp/CalculatorAppTests.swift:52: error: XCTAssertEqual failed: ("0") is not equal to ("999")\u001B[0m',
-    );
-    expect(output).toContain(
-      '\u001B[31merror: compiler command failed with exit code 1\u001B[0m\n',
-    );
-    expect(output).toContain(
-      '\u001B[31m\u274C \u001B[0mTest Run test failed for scheme CalculatorApp.\n',
-    );
-    expect(output).toContain('CalculatorAppTests\n');
-    expect(output).toContain('Test Summary\n');
-    expect(process.exitCode).toBe(1);
-  });
-
-  it('prints session events via CLI renderer when all events are renderable', () => {
-    const stdoutWrite = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
-    Object.defineProperty(process.stdout, 'isTTY', {
-      configurable: true,
-      value: true,
-    });
-
-    const events: PipelineEvent[] = [
-      {
-        type: 'status-line',
-        timestamp: '2026-03-18T12:00:00.000Z',
-        level: 'success',
-        message: 'Build succeeded',
-      },
-    ];
-
-    printSessionOutput(makeSessionData({ text: 'Build succeeded', events }));
-
-    const output = stdoutWrite.mock.calls.flat().join('');
-    expect(output).toContain('Build succeeded');
-  });
-
-  it('prints events as JSONL in json format', () => {
-    const stdoutWrite = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
-
-    const events: PipelineEvent[] = [
-      {
-        type: 'status-line',
-        timestamp: '2026-03-18T12:00:00.000Z',
-        level: 'success',
-        message: 'Build succeeded',
-      },
-      {
-        type: 'next-steps',
-        timestamp: '2026-03-18T12:00:02.000Z',
-        steps: [{ tool: 'launch_app_sim' }],
-      },
+import { describe, expect, it } from 'vitest';
+import { formatToolList } from '../output.ts';
+
+describe('formatToolList', () => {
+  it('formats ungrouped tool list', () => {
+    const tools = [
+      { cliName: 'build', workflow: 'xcode', description: 'Build project', stateful: false },
+      { cliName: 'test', workflow: 'xcode', description: 'Run tests', stateful: true },
     ];
-
-    printSessionOutput(makeSessionData({ text: 'Build succeeded', events }), { format: 'json' });
-
-    const output = stdoutWrite.mock.calls.flat().join('');
-    const lines = output.trim().split('\n');
-    expect(lines).toHaveLength(2);
-    expect(JSON.parse(lines[0])).toEqual(events[0]);
-    expect(JSON.parse(lines[1])).toEqual(events[1]);
+    const output = formatToolList(tools);
+    expect(output).toContain('xcode build');
+    expect(output).toContain('xcode test');
+    expect(output).toContain('[stateful]');
   });
 });

src/cli/daemon-client.ts

@@ -6,6 +6,7 @@ import {
   type DaemonRequest,
   type DaemonResponse,
   type DaemonMethod,
+  type DaemonToolResult,
   type ToolInvokeParams,
   type ToolInvokeResult,
   type DaemonStatusResult,
@@ -16,9 +17,15 @@ import {
   type XcodeIdeInvokeParams,
   type XcodeIdeInvokeResult,
 } from '../daemon/protocol.ts';
-import type { ToolResponse } from '../types/common.ts';
 import { getSocketPath } from '../daemon/socket-path.ts';
 
+export class DaemonVersionMismatchError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'DaemonVersionMismatchError';
+  }
+}
+
 export interface DaemonClientOptions {
   socketPath?: string;
   timeout?: number;
@@ -81,7 +88,14 @@ export class DaemonClient {
           socket.end();
 
           if (res.error) {
-            reject(new Error(`${res.error.code}: ${res.error.message}`));
+            if (
+              res.error.code === 'BAD_REQUEST' &&
+              res.error.message.startsWith('Unsupported protocol version')
+            ) {
+              reject(new DaemonVersionMismatchError(res.error.message));
+            } else {
+              reject(new Error(`${res.error.code}: ${res.error.message}`));
+            }
           } else {
             resolve(res.result as TResult);
           }
@@ -124,12 +138,12 @@ export class DaemonClient {
   /**
    * Invoke a tool.
    */
-  async invokeTool(tool: string, args: Record<string, unknown>): Promise<ToolResponse> {
+  async invokeTool(tool: string, args: Record<string, unknown>): Promise<DaemonToolResult> {
     const result = await this.request<ToolInvokeResult>('tool.invoke', {
       tool,
       args,
     } satisfies ToolInvokeParams);
-    return result.response;
+    return result.result;
   }
 
   /**
@@ -146,12 +160,12 @@ export class DaemonClient {
   async invokeXcodeIdeTool(
     remoteTool: string,
     args: Record<string, unknown>,
-  ): Promise<ToolResponse> {
+  ): Promise<DaemonToolResult> {
     const result = await this.request<XcodeIdeInvokeResult>('xcode-ide.invoke', {
       remoteTool,
       args,
     } satisfies XcodeIdeInvokeParams);
-    return result.response as ToolResponse;
+    return result.result;
   }
 
   /**

src/cli/daemon-control.ts

@@ -1,8 +1,10 @@
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
+import { dirname, resolve, basename } from 'node:path';
 import { existsSync } from 'node:fs';
-import { DaemonClient } from './daemon-client.ts';
+import { DaemonClient, DaemonVersionMismatchError } from './daemon-client.ts';
+import { readDaemonRegistryEntry } from '../daemon/daemon-registry.ts';
+import { removeStaleSocket } from '../daemon/socket-path.ts';
 
 /**
  * Default timeout for daemon startup in milliseconds.
@@ -30,6 +32,26 @@ export function getDaemonExecutablePath(): string {
   return resolve(buildDir, '..', 'daemon.ts');
 }
 
+/**
+ * Force-stop a daemon that cannot be stopped gracefully (e.g. protocol version mismatch).
+ * Derives the workspace key from the socket path, reads the registry for the PID,
+ * sends SIGTERM, and removes the stale socket.
+ */
+export async function forceStopDaemon(socketPath: string): Promise<void> {
+  const workspaceKey = basename(dirname(socketPath));
+  const entry = readDaemonRegistryEntry(workspaceKey);
+  if (entry?.pid) {
+    try {
+      process.kill(entry.pid, 'SIGTERM');
+    } catch {
+      // Process may already be gone.
+    }
+    // Brief wait for the process to exit.
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+  removeStaleSocket(socketPath);
+}
+
 export interface StartDaemonBackgroundOptions {
   socketPath: string;
   workspaceRoot?: string;
@@ -113,7 +135,16 @@ export async function ensureDaemonRunning(opts: EnsureDaemonRunningOptions): Pro
 
   const isRunning = await client.isRunning();
   if (isRunning) {
-    return;
+    try {
+      await client.status();
+      return;
+    } catch (error) {
+      if (error instanceof DaemonVersionMismatchError) {
+        await forceStopDaemon(opts.socketPath);
+      } else {
+        return;
+      }
+    }
   }
 
   startDaemonBackground({