test(runtime): Align rebased tests with fragment contracts

Update the rebased test suite to match the current fragment and runtime-status APIs.

Replace stale progress-event expectations with fragment-based assertions, move infrastructure status helpers onto the runtime-only status type, and repair the small broken test helpers surfaced by typecheck after the rebase.

This keeps the branch working on top of main without reintroducing old ProgressEvent assumptions.

Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: cameroncooke

src/cli/__tests__/register-tool-commands.test.ts

@@ -89,22 +89,16 @@ function mockInvokeDirectThroughHandler() {
     .spyOn(DefaultToolInvoker.prototype, 'invokeDirect')
     .mockImplementation(async (tool, args, opts) => {
       const handlerContext: ToolHandlerContext = opts.handlerContext ?? {
-        emit: (event) => {
-          if (!('timestamp' in event)) {
-            opts.renderSession?.emit(event);
-          }
+        emit: (fragment) => {
+          opts.onProgress?.(fragment);
+          opts.renderSession?.emit(fragment);
         },
         attach: (image) => {
           opts.renderSession?.attach(image);
         },
-        liveProgressEnabled: false,
+        liveProgressEnabled: Boolean(opts.onProgress),
       };
 
-      if (opts.onProgress) {
-        handlerContext.liveProgressEnabled = true;
-        handlerContext.emitProgress = opts.onProgress;
-      }
-
       await tool.handler(args, handlerContext);
 
       if (handlerContext.structuredOutput && opts.onStructuredOutput) {

src/daemon/__tests__/tool-invoke-streaming.test.ts

@@ -57,7 +57,7 @@ describe('daemon tool.invoke streaming', () => {
     );
   });
 
-  it('does not stream progress events outside live CLI contexts and returns a terminal structured result', async () => {
+  it('streams fragments to the daemon client callback and still returns a terminal structured result', async () => {
     const tool: ToolDefinition = {
       cliName: 'stream-tool',
       mcpName: 'stream_tool',
@@ -67,8 +67,18 @@ describe('daemon tool.invoke streaming', () => {
       mcpSchema: {},
       stateful: true,
       handler: async (_params, ctx) => {
-        ctx.emitProgress?.({ type: 'status', level: 'info', message: 'Starting build' });
-        ctx.emitProgress?.({ type: 'artifact', name: 'Build Log', path: '/tmp/build.log' });
+        ctx.emit({
+          kind: 'infrastructure',
+          fragment: 'status',
+          level: 'info',
+          message: 'Starting build',
+        });
+        ctx.emit({
+          kind: 'transcript',
+          fragment: 'process-line',
+          stream: 'stderr',
+          line: 'Build Log: /tmp/build.log',
+        });
         ctx.nextSteps = [{ label: 'Open the build log' }];
         ctx.structuredOutput = {
           schema: 'xcodebuildmcp.output.simulator-list',
@@ -105,13 +115,13 @@ describe('daemon tool.invoke streaming', () => {
       'stream_tool',
       {},
       {
-        onProgress: (event) => {
-          progress.push(event.type);
+        onFragment: (fragment) => {
+          progress.push(fragment.fragment);
         },
       },
     );
 
-    expect(progress).toEqual([]);
+    expect(progress).toEqual(['status', 'process-line']);
     expect(result).toEqual({
       structuredOutput: {
         schema: 'xcodebuildmcp.output.simulator-list',

src/mcp/tools/doctor/__tests__/doctor.test.ts

@@ -134,17 +134,17 @@ describe('doctor tool', () => {
   describe('Handler Behavior (Complete Literal Returns)', () => {
     it('does not emit progress events from the executor', async () => {
       const executeDoctor = createDoctorExecutor(createDeps());
-      const emitProgress = vi.fn();
+      const emitFragment = vi.fn();
 
       const result = await executeDoctor(
         {},
         {
           liveProgressEnabled: false,
-          emitProgress,
+          emitFragment,
         },
       );
 
-      expect(emitProgress).not.toHaveBeenCalled();
+      expect(emitFragment).not.toHaveBeenCalled();
       expect(result.didError).toBe(false);
     });
 

src/runtime/__tests__/tool-invoker.test.ts

@@ -1,7 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { z } from 'zod';
 import type { ToolResponse } from '../../types/common.ts';
-import type { DomainFragment } from '../../types/domain-fragments.ts';
+import type { AnyFragment, DomainFragment } from '../../types/domain-fragments.ts';
+import type { RuntimeStatusFragment } from '../../types/runtime-status.ts';
 import type { DaemonToolResult, ToolInvokeResult } from '../../daemon/protocol.ts';
 import type { ToolDefinition } from '../types.ts';
 import { createToolCatalog } from '../tool-catalog.ts';
@@ -18,7 +19,7 @@ const daemonClientMock = {
       (
         name: string,
         args: Record<string, unknown>,
-        options?: { onFragment?: (fragment: DomainFragment) => void },
+        options?: { onFragment?: (fragment: AnyFragment) => void },
       ) => Promise<ToolInvokeResult>
     >(),
   listTools: vi.fn<() => Promise<Array<{ name: string }>>>(),
@@ -46,7 +47,7 @@ vi.mock('../../cli/daemon-control.ts', () => ({
 function statusFragment(
   level: 'info' | 'warning' | 'error' | 'success',
   message: string,
-): DomainFragment {
+): RuntimeStatusFragment {
   return { kind: 'infrastructure', fragment: 'status', level, message };
 }
 
@@ -153,7 +154,7 @@ function emitNextStepsHandler(
   });
 }
 
-function emitErrorEventsHandler(events: DomainFragment[]): ToolDefinition['handler'] {
+function emitErrorEventsHandler(events: AnyFragment[]): ToolDefinition['handler'] {
   return vi.fn(async (_params, ctx) => {
     for (const event of events) {
       ctx.emit(event);

src/utils/__tests__/session-aware-tool-factory.test.ts

@@ -17,7 +17,8 @@ import {
 } from '../config-store.ts';
 import { createRenderSession } from '../../rendering/render.ts';
 import type { ToolHandlerContext } from '../../rendering/types.ts';
-import type { DomainFragment } from '../../types/domain-fragments.ts';
+import type { AnyFragment } from '../../types/domain-fragments.ts';
+import type { RuntimeStatusFragment } from '../../types/runtime-status.ts';
 import { renderCliTextTranscript } from '../renderers/cli-text-renderer.ts';
 
 const cwd = '/repo';
@@ -30,7 +31,7 @@ async function initConfigStoreForTest(overrides?: RuntimeConfigOverrides): Promi
 function statusFragment(
   level: 'info' | 'warning' | 'error' | 'success',
   message: string,
-): DomainFragment {
+): RuntimeStatusFragment {
   return { kind: 'infrastructure', fragment: 'status', level, message };
 }
 
@@ -39,7 +40,7 @@ function invokeAndCollect(
   args: Record<string, unknown>,
 ): Promise<{ text: string; isError: boolean }> {
   const session = createRenderSession('text');
-  const items: DomainFragment[] = [];
+  const items: AnyFragment[] = [];
   const ctx: ToolHandlerContext = {
     liveProgressEnabled: false,
     emit: (event) => {
@@ -237,7 +238,7 @@ describe('createSessionAwareTool', () => {
     const handlerNoXor = createSessionAwareTool<z.infer<typeof internalSchemaNoXor>>({
       internalSchema: internalSchemaNoXor,
       logicFunction: (async () => {
-        ctx.emit(statusFragment('success', 'OK'));
+        const ctx = getHandlerContext();
         ctx.emit(statusFragment('success', 'OK'));
       }) as (params: z.infer<typeof internalSchemaNoXor>, executor: unknown) => Promise<void>,
       getExecutor: () => createMockExecutor({ success: true }),
@@ -340,7 +341,7 @@ describe('createSessionAwareTool', () => {
       internalSchema: envSchema,
       logicFunction: async (params) => {
         const ctx = getHandlerContext();
-        ctx.emit(statusLine('success', JSON.stringify(params.env)));
+        ctx.emit(statusFragment('success', JSON.stringify(params.env)));
       },
       getExecutor: () => createMockExecutor({ success: true }),
       requirements: [{ allOf: ['scheme'] }],

src/utils/__tests__/typed-tool-factory.test.ts

@@ -10,7 +10,8 @@ import { createMockExecutor } from '../../test-utils/mock-executors.ts';
 import { createRenderSession } from '../../rendering/render.ts';
 import type { ToolHandlerContext } from '../../rendering/types.ts';
 import { getHandlerContext } from '../typed-tool-factory.ts';
-import type { DomainFragment } from '../../types/domain-fragments.ts';
+import type { AnyFragment } from '../../types/domain-fragments.ts';
+import type { RuntimeStatusFragment } from '../../types/runtime-status.ts';
 import { renderCliTextTranscript } from '../renderers/cli-text-renderer.ts';
 
 const testSchema = z.object({
@@ -23,7 +24,7 @@ type TestParams = z.infer<typeof testSchema>;
 function statusFragment(
   level: 'info' | 'warning' | 'error' | 'success',
   message: string,
-): DomainFragment {
+): RuntimeStatusFragment {
   return { kind: 'infrastructure', fragment: 'status', level, message };
 }
 
@@ -37,7 +38,7 @@ function invokeAndCollect(
   args: Record<string, unknown>,
 ): Promise<{ text: string; isError: boolean }> {
   const session = createRenderSession('text');
-  const items: DomainFragment[] = [];
+  const items: AnyFragment[] = [];
   const ctx: ToolHandlerContext = {
     liveProgressEnabled: false,
     emit: (event) => {

src/utils/__tests__/xcodebuild-output.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
 import { createXcodebuildPipeline } from '../xcodebuild-pipeline.ts';
 import type { StartedPipeline } from '../xcodebuild-pipeline.ts';
 import { finalizeInlineXcodebuild } from '../xcodebuild-output.ts';
-import type { AnyFragment, DomainFragment } from '../../types/domain-fragments.ts';
+import type { AnyFragment } from '../../types/domain-fragments.ts';
 
 function startPipeline(emit: (fragment: AnyFragment) => void = () => {}): StartedPipeline {
   const pipeline = createXcodebuildPipeline({
@@ -16,7 +16,7 @@ function startPipeline(emit: (fragment: AnyFragment) => void = () => {}): Starte
 
 describe('xcodebuild-output', () => {
   it('does not emit fallback events (fallback is handled by domain result creators)', () => {
-    const emitted: DomainFragment[] = [];
+    const emitted: AnyFragment[] = [];
     const started = startPipeline((fragment) => emitted.push(fragment));
     emitted.length = 0;
 
@@ -38,7 +38,7 @@ describe('xcodebuild-output', () => {
   });
 
   it('logs parser debug info without emitting progress events during finalize', () => {
-    const emitted: DomainFragment[] = [];
+    const emitted: AnyFragment[] = [];
     const started = startPipeline((fragment) => emitted.push(fragment));
     emitted.length = 0;
 
@@ -62,7 +62,7 @@ describe('xcodebuild-output', () => {
   });
 
   it('returns finalized state without synthesizing footer events beyond the build summary', () => {
-    const emitted: DomainFragment[] = [];
+    const emitted: AnyFragment[] = [];
     const started = startPipeline((fragment) => emitted.push(fragment));
     emitted.length = 0;
 

src/utils/__tests__/xcodebuild-pipeline.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
 import { createXcodebuildPipeline } from '../xcodebuild-pipeline.ts';
 import { STAGE_RANK } from '../../types/domain-fragments.ts';
-import type { DomainFragment } from '../../types/domain-fragments.ts';
+import type { AnyFragment, DomainFragment } from '../../types/domain-fragments.ts';
 import { renderCliTextTranscript } from '../renderers/cli-text-renderer.ts';
 import type { StructuredToolOutput } from '../../rendering/types.ts';
 
@@ -18,7 +18,7 @@ describe('xcodebuild-pipeline', () => {
   });
 
   it('produces MCP content from xcodebuild test output', () => {
-    const emittedEvents: DomainFragment[] = [];
+    const emittedEvents: AnyFragment[] = [];
     const pipeline = createXcodebuildPipeline({
       operation: 'TEST',
       toolName: 'test_sim',
@@ -89,7 +89,7 @@ describe('xcodebuild-pipeline', () => {
   });
 
   it('handles build output with warnings and errors', () => {
-    const emittedEvents: DomainFragment[] = [];
+    const emittedEvents: AnyFragment[] = [];
     const pipeline = createXcodebuildPipeline({
       operation: 'BUILD',
       toolName: 'build_sim',
@@ -119,7 +119,7 @@ describe('xcodebuild-pipeline', () => {
 
   it('supports multi-phase with minimumStage', () => {
     // Phase 1: build-for-testing
-    const phase1Events: DomainFragment[] = [];
+    const phase1Events: AnyFragment[] = [];
     const phase1 = createXcodebuildPipeline({
       operation: 'TEST',
       toolName: 'test_sim',
@@ -141,7 +141,7 @@ describe('xcodebuild-pipeline', () => {
       | 'COMPILING'
       | undefined;
 
-    const phase2Events: DomainFragment[] = [];
+    const phase2Events: AnyFragment[] = [];
     const phase2 = createXcodebuildPipeline({
       operation: 'TEST',
       toolName: 'test_sim',
@@ -167,7 +167,7 @@ describe('xcodebuild-pipeline', () => {
   });
 
   it('emitFragment passes tool-originated events through the pipeline', () => {
-    const emittedEvents: DomainFragment[] = [];
+    const emittedEvents: AnyFragment[] = [];
     const pipeline = createXcodebuildPipeline({
       operation: 'TEST',
       toolName: 'test_sim',
@@ -218,7 +218,7 @@ describe('xcodebuild-pipeline', () => {
   });
 
   it('renders test discovery in cli-text mode', () => {
-    const emittedEvents: DomainFragment[] = [
+    const emittedEvents: AnyFragment[] = [
       {
         kind: 'test-result',
         fragment: 'test-discovery',
@@ -280,7 +280,7 @@ describe('xcodebuild-pipeline', () => {
     process.env.XCODEBUILDMCP_RUNTIME = 'cli';
     process.env.XCODEBUILDMCP_CLI_OUTPUT_FORMAT = 'json';
 
-    const emittedEvents: DomainFragment[] = [];
+    const emittedEvents: AnyFragment[] = [];
     const pipeline = createXcodebuildPipeline({
       operation: 'BUILD',
       toolName: 'build_sim',