Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

Rename the core event schema module.

debajyoti-truefoundryb80fc44d6c24
diff --git a/packages/harness/src/agentSession/TurnHandle.ts b/packages/harness/src/agentSession/TurnHandle.ts
index 9f5184ee4..7c7290522 100644
--- a/packages/harness/src/agentSession/TurnHandle.ts
+++ b/packages/harness/src/agentSession/TurnHandle.ts
@@ -1,8 +1,8 @@
/**
* Durable turn handle. {@link TurnHandle.stream} is execute-once (persist-before-yield).
*/
-import type { MCPAuthRequiredEvent, ModelMessageDeltaEvent, ThreadDoneEvent } from '../core/events/eventSchemas';
-import { EventType as HarnessEventType, newEventId } from '../core/events/eventSchemas';
+import type { MCPAuthRequiredEvent, ModelMessageDeltaEvent, ThreadDoneEvent } from '../core/events/schema';
+import { EventType as HarnessEventType, newEventId } from '../core/events/schema';
import { getEmptyUsage } from '../core/llm/LLMTypes';
import { getEmptyMetric } from '../core/llm/metrics';
import {
diff --git a/packages/harness/src/agentSession/models/TurnRecord.ts b/packages/harness/src/agentSession/models/TurnRecord.ts
index 5d445076e..fe5703768 100644
--- a/packages/harness/src/agentSession/models/TurnRecord.ts
+++ b/packages/harness/src/agentSession/models/TurnRecord.ts
@@ -1,4 +1,4 @@
-import type { MCPServerInitInfo } from '../../core/events/eventSchemas';
+import type { MCPServerInitInfo } from '../../core/events/schema';
import type { AgentThreadSnapshot } from '../../core/runtime/AgentThread.types';
import type { SandboxInfo } from '../../core/sandbox/Sandbox';
import type { TurnInputItem, TurnState } from '../schemas/turn';
diff --git a/packages/harness/src/agentSession/schemas/events.ts b/packages/harness/src/agentSession/schemas/events.ts
index 3e12f36a0..208367554 100644
--- a/packages/harness/src/agentSession/schemas/events.ts
+++ b/packages/harness/src/agentSession/schemas/events.ts
@@ -4,6 +4,7 @@
* event unions the store writes. SSE streaming envelopes stay in server/schemas.
*/
import { z } from '@hono/zod-openapi';
+import type { WithRegisteredPassthrough } from '../../core/events/PassthroughEvents';
import {
EventIdSchema,
EventType as HarnessEventType,
@@ -16,8 +17,7 @@ import {
ToolApprovalRequiredEventSchema,
ToolResponseEventSchema,
ToolResponseRequiredEventSchema,
-} from '../../core/events/eventSchemas';
-import type { WithRegisteredPassthrough } from '../../core/events/PassthroughEvents';
+} from '../../core/events/schema';
import {
TurnInputItemSchema,
TurnStateCancelledSchema,
@@ -89,7 +89,7 @@ export type SessionEvent = z.infer<typeof SessionEventSchema>;
* passthrough events. Shared by append and list operations.
*/
export type PersistedTurnEvent = WithRegisteredPassthrough<SessionEvent>;
-export type SessionEventItem = {
+export interface SessionEventItem {
turn_id: string;
event: PersistedTurnEvent;
-};
+}
diff --git a/packages/harness/src/agentSession/schemas/turn.ts b/packages/harness/src/agentSession/schemas/turn.ts
index ab7869d90..0dc71a95c 100644
--- a/packages/harness/src/agentSession/schemas/turn.ts
+++ b/packages/harness/src/agentSession/schemas/turn.ts
@@ -6,7 +6,7 @@ import {
ModelMessageEventSchema,
UserToolApprovalMessageSchema,
UserToolResponseMessageSchema,
-} from '../../core/events/eventSchemas';
+} from '../../core/events/schema';
export enum CancellationReason {
// AbortController.abort() reason for the max-execution timer.
diff --git a/packages/harness/src/agentSession/store/ISessionStore.ts b/packages/harness/src/agentSession/store/ISessionStore.ts
index e7a97cac8..b6cefd98f 100644
--- a/packages/harness/src/agentSession/store/ISessionStore.ts
+++ b/packages/harness/src/agentSession/store/ISessionStore.ts
@@ -1,4 +1,4 @@
-import type { MCPServerInitInfo, ThreadOverwriteContextEvent } from '../../core/events/eventSchemas';
+import type { MCPServerInitInfo, ThreadOverwriteContextEvent } from '../../core/events/schema';
import type { CompletionUsage } from '../../core/llm/LLMTypes';
import type {
AgentThreadSnapshot,
@@ -25,68 +25,68 @@ export type UpdateSessionInput<TSessionCustom extends object = Record<string, ne
> &
Partial<Pick<SessionRecord<TSessionCustom>, 'agent_spec' | 'title'>>;
-export type GetSessionInput = {
+export interface GetSessionInput {
tenant_name: string;
session_id: string;
-};
+}
-export type ListSessionsInput = {
+export interface ListSessionsInput {
tenant_name: string;
limit: number;
page_token?: string | undefined;
order?: 'asc' | 'desc' | undefined;
start_timestamp?: string | undefined;
end_timestamp?: string | undefined;
-};
+}
-export type CreateTurnInput<TTurnCustom extends object = Record<string, never>> = {
+export interface CreateTurnInput<TTurnCustom extends object = Record<string, never>> {
tenant_name: string;
turn: TurnRecord<TTurnCustom>;
update_session_title_if_not_exist?: string | undefined;
-};
+}
-export type GetTurnInput = {
+export interface GetTurnInput {
tenant_name: string;
session_id: string;
turn_id: string;
-};
+}
-export type ListTurnsInput = {
+export interface ListTurnsInput {
tenant_name: string;
session_id: string;
limit: number;
page_token?: string | undefined;
-};
+}
-export type UpdateTurnStateInput = {
+export interface UpdateTurnStateInput {
tenant_name: string;
session_id: string;
turn_id: string;
state: TerminalTurnState;
-};
+}
-export type AppendToEventsInput = {
+export interface AppendToEventsInput {
tenant_name: string;
session_id: string;
turn_id: string;
events: PersistedTurnEvent[];
-};
+}
-export type AddThreadsInput = {
+export interface AddThreadsInput {
tenant_name: string;
session_id: string;
turn_id: string;
threads: AgentThreadSnapshot[];
-};
+}
-export type RemoveThreadsInput = {
+export interface RemoveThreadsInput {
tenant_name: string;
session_id: string;
turn_id: string;
thread_ids: string[];
-};
+}
-export type AppendToThreadContextInput = {
+export interface AppendToThreadContextInput {
tenant_name: string;
session_id: string;
turn_id: string;
@@ -94,54 +94,54 @@ export type AppendToThreadContextInput = {
context: ContextMessage[];
current_context_usage?: CompletionUsage | undefined;
completion?: SubAgentCompletionMarker | undefined;
-};
+}
-export type OverwriteThreadContextInput = {
+export interface OverwriteThreadContextInput {
tenant_name: string;
session_id: string;
turn_id: string;
event: ThreadOverwriteContextEvent;
-};
+}
-export type PatchMCPServersInput = {
+export interface PatchMCPServersInput {
tenant_name: string;
session_id: string;
turn_id: string;
mcp_servers: MCPServerInitInfo[];
-};
+}
-export type PatchSandboxInfoInput = {
+export interface PatchSandboxInfoInput {
tenant_name: string;
session_id: string;
turn_id: string;
sandbox_info: SandboxInfo;
-};
+}
-export type PatchThreadCapabilityStateInput = {
+export interface PatchThreadCapabilityStateInput {
tenant_name: string;
session_id: string;
turn_id: string;
thread_id: string;
key: string;
state: unknown;
-};
+}
-export type ListTurnEventsInput = {
+export interface ListTurnEventsInput {
tenant_name: string;
session_id: string;
turn_id: string;
limit: number;
page_token?: string | undefined;
order?: 'asc' | 'desc' | undefined;
-};
+}
-export type ListSessionEventsInput = {
+export interface ListSessionEventsInput {
tenant_name: string;
session_id: string;
limit: number;
page_token?: string | undefined;
last_turn_id?: string | undefined;
-};
+}
/**
* Session/turn persistence contract. Pure durability: no streaming, SSE, or
diff --git a/packages/harness/src/core/capabilities/AgentContextProcessor.ts b/packages/harness/src/core/capabilities/AgentContextProcessor.ts
index de56d3163..bef387230 100644
--- a/packages/harness/src/core/capabilities/AgentContextProcessor.ts
+++ b/packages/harness/src/core/capabilities/AgentContextProcessor.ts
@@ -1,5 +1,5 @@
import type { ChatCompletionMessageParam } from 'openai/resources/chat';
-import type { ThreadOverwriteContextEvent } from '../events/eventSchemas';
+import type { ThreadOverwriteContextEvent } from '../events/schema';
import type { CompletionUsage } from '../llm/LLMTypes';
import type {
AgentThreadAppendContext,
diff --git a/packages/harness/src/core/capabilities/builtins/ContextCompaction.ts b/packages/harness/src/core/capabilities/builtins/ContextCompaction.ts
index 2a992289a..c69f08829 100644
--- a/packages/harness/src/core/capabilities/builtins/ContextCompaction.ts
+++ b/packages/harness/src/core/capabilities/builtins/ContextCompaction.ts
@@ -1,5 +1,5 @@
import type { ChatCompletionCreateParams } from 'openai/resources/chat';
-import { EventType, newEventId } from '../../events/eventSchemas';
+import { EventType, newEventId } from '../../events/schema';
import type { ILLM } from '../../llm/ILLM';
import type { AgentDefinition } from '../../runtime/AgentDefinition';
import type { ContextMessage } from '../../runtime/AgentThread.types';
diff --git a/packages/harness/src/core/events/eventSchemas.ts b/packages/harness/src/core/events/schema.ts
similarity index 100%
rename from packages/harness/src/core/events/eventSchemas.ts
rename to packages/harness/src/core/events/schema.ts
diff --git a/packages/harness/src/core/index.ts b/packages/harness/src/core/index.ts
index d17c3042d..13e377779 100644
--- a/packages/harness/src/core/index.ts
+++ b/packages/harness/src/core/index.ts
@@ -30,7 +30,7 @@ export { largeToolResponse } from './capabilities/builtins/LargeToolResponse';
export { openUI } from './capabilities/builtins/OpenUI';
// MCP contracts
-export type { ApprovalDecision } from './events/eventSchemas';
+export type { ApprovalDecision } from './events/schema';
export { ClientSideTool } from './mcp/ClientSideTool';
export { isAuthRequired, toolResultResponse } from './mcp/IMCPServer';
export type {
@@ -75,7 +75,7 @@ export {
ToolResponseEventSchema,
ToolResponseRequiredEventSchema,
newEventId,
-} from './events/eventSchemas';
+} from './events/schema';
export type { AgentThreadMetric } from './llm/metrics';
export { InternalEventType } from './runtime/AgentThread.types';
export type { AgentThreadSendBatch, ContextMessage } from './runtime/AgentThread.types';
diff --git a/packages/harness/src/core/mcp/IMCPServer.ts b/packages/harness/src/core/mcp/IMCPServer.ts
index 46c37c3d6..07defaec9 100644
--- a/packages/harness/src/core/mcp/IMCPServer.ts
+++ b/packages/harness/src/core/mcp/IMCPServer.ts
@@ -1,6 +1,6 @@
import type { CallToolRequest, CallToolResult, ListToolsResult } from '@modelcontextprotocol/sdk/types.js';
import type { RegisteredPassthroughEvent } from '../events/PassthroughEvents';
-import type { AgentInfo, ApprovalDecision, MCPServerAuthInfo, MCPServerInitInfo } from '../events/eventSchemas';
+import type { AgentInfo, ApprovalDecision, MCPServerAuthInfo, MCPServerInitInfo } from '../events/schema';
import type { InternalToolCallInfo } from '../llm/LLMTypes';
import type { SandboxInfo } from '../sandbox/Sandbox';
diff --git a/packages/harness/src/core/mcp/LocalToolMCP.ts b/packages/harness/src/core/mcp/LocalToolMCP.ts
index c95049298..cb7afe5fd 100644
--- a/packages/harness/src/core/mcp/LocalToolMCP.ts
+++ b/packages/harness/src/core/mcp/LocalToolMCP.ts
@@ -1,7 +1,7 @@
import type { CallToolRequest, ListToolsResult } from '@modelcontextprotocol/sdk/types.js';
import { type AnyZodObject, z } from 'zod';
import zodToJsonSchema from 'zod-to-json-schema';
-import type { ApprovalDecision } from '../events/eventSchemas';
+import type { ApprovalDecision } from '../events/schema';
import type { InternalToolCallInfo } from '../llm/LLMTypes';
import type { AgentTracing } from '../tracing/AgentTracing';
import {
diff --git a/packages/harness/src/core/mcp/RemoteMCP.ts b/packages/harness/src/core/mcp/RemoteMCP.ts
index ea2427773..e8555eaa0 100644
--- a/packages/harness/src/core/mcp/RemoteMCP.ts
+++ b/packages/harness/src/core/mcp/RemoteMCP.ts
@@ -1,7 +1,7 @@
import type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
import type { Logger } from 'winston';
import { McpConnectionError } from '../errors';
-import type { MCPServerInitInfo } from '../events/eventSchemas';
+import type { MCPServerInitInfo } from '../events/schema';
import type { InternalToolCallInfo } from '../llm/LLMTypes';
import type { AgentTracing } from '../tracing/AgentTracing';
import { NOOP_AGENT_TRACING } from '../tracing/NoopAgentTracing';
diff --git a/packages/harness/src/core/mcp/ToolSet.ts b/packages/harness/src/core/mcp/ToolSet.ts
index b9eef2c21..d75244400 100644
--- a/packages/harness/src/core/mcp/ToolSet.ts
+++ b/packages/harness/src/core/mcp/ToolSet.ts
@@ -1,6 +1,6 @@
import type { CallToolRequest, ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
import { McpConnectionError } from '../errors';
-import type { ApprovalDecision } from '../events/eventSchemas';
+import type { ApprovalDecision } from '../events/schema';
import type { InternalToolCallInfo } from '../llm/LLMTypes';
import {
isAuthRequired,
diff --git a/packages/harness/src/core/mcp/convertMCPServers.ts b/packages/harness/src/core/mcp/convertMCPServers.ts
index 69c1b4bf4..44af84130 100644
--- a/packages/harness/src/core/mcp/convertMCPServers.ts
+++ b/packages/harness/src/core/mcp/convertMCPServers.ts
@@ -1,5 +1,5 @@
import type { ChatCompletionTool } from 'openai/resources/chat';
-import type { MCPServerInitInfo } from '../events/eventSchemas';
+import type { MCPServerInitInfo } from '../events/schema';
import type { MCPAuthRequired } from '../mcp/IMCPServer';
import { type IToolSet, isAuthRequired } from './IMCPServer';
import { getUniqueSanitizedToolName } from './toolNames';
diff --git a/packages/harness/src/core/mcp/executeToolCalls.ts b/packages/harness/src/core/mcp/executeToolCalls.ts
index 97340bf1b..f8a8e77ab 100644
--- a/packages/harness/src/core/mcp/executeToolCalls.ts
+++ b/packages/harness/src/core/mcp/executeToolCalls.ts
@@ -1,5 +1,5 @@
-import type { ApprovalDecision, MCPServerInitInfo } from '../events/eventSchemas';
import type { RegisteredPassthroughEvent } from '../events/PassthroughEvents';
+import type { ApprovalDecision, MCPServerInitInfo } from '../events/schema';
import type { InternalEnrichedAssistantMessage, InternalEnrichedToolCall, LLMToolMessage } from '../llm/LLMTypes';
import type { MCPAuthRequired } from '../mcp/IMCPServer';
import type { AgentThreadCreateSubAgent } from '../runtime/AgentThread.types';
diff --git a/packages/harness/src/core/runtime/AgentThread.ts b/packages/harness/src/core/runtime/AgentThread.ts
index a259acda2..0e17cd585 100644
--- a/packages/harness/src/core/runtime/AgentThread.ts
+++ b/packages/harness/src/core/runtime/AgentThread.ts
@@ -17,6 +17,7 @@ import type {
import { SUB_AGENT_IDENTITY } from '../capabilities/builtins/DynamicSubAgents';
import type { ToolResponseProcessor } from '../capabilities/ToolResponseProcessor';
import { AgentHarnessError, InvalidAgentSendInputError } from '../errors';
+import type { RegisteredPassthroughEvent } from '../events/PassthroughEvents';
import {
EventType,
newEventId,
@@ -36,8 +37,7 @@ import {
type ToolResponseRequiredEvent,
type UserToolApprovalMessage,
type UserToolResponseMessage,
-} from '../events/eventSchemas';
-import type { RegisteredPassthroughEvent } from '../events/PassthroughEvents';
+} from '../events/schema';
import { InstructionBuilder, ROOT_AGENT_IDENTITY } from '../InstructionBuilder';
import {
getEmptyUsage,
diff --git a/packages/harness/src/core/runtime/AgentThread.types.ts b/packages/harness/src/core/runtime/AgentThread.types.ts
index baaba1250..39a42071a 100644
--- a/packages/harness/src/core/runtime/AgentThread.types.ts
+++ b/packages/harness/src/core/runtime/AgentThread.types.ts
@@ -24,7 +24,7 @@ import type {
ToolResponseRequiredEvent,
UserToolApprovalMessage,
UserToolResponseMessage,
-} from '../events/eventSchemas';
+} from '../events/schema';
import type {
CompletionUsage,
InternalEnrichedAssistantMessage,
diff --git a/packages/harness/src/core/runtime/AgentThreadOrchestrator.ts b/packages/harness/src/core/runtime/AgentThreadOrchestrator.ts
index 65a988a5f..6ecd84230 100644
--- a/packages/harness/src/core/runtime/AgentThreadOrchestrator.ts
+++ b/packages/harness/src/core/runtime/AgentThreadOrchestrator.ts
@@ -8,7 +8,7 @@ import {
type ToolResponseEvent,
type UserToolApprovalMessage,
type UserToolResponseMessage,
-} from '../events/eventSchemas';
+} from '../events/schema';
import { addMetrics, getEmptyMetric } from '../llm/metrics';
import type { AgentExecutionTrace, AgentTracing } from '../tracing/AgentTracing';
import { onSignalAbort } from '../util/abort';
diff --git a/packages/harness/src/core/runtime/CreateDynamicSubAgentThread.ts b/packages/harness/src/core/runtime/CreateDynamicSubAgentThread.ts
index 3914be8f2..e2db99aeb 100644
--- a/packages/harness/src/core/runtime/CreateDynamicSubAgentThread.ts
+++ b/packages/harness/src/core/runtime/CreateDynamicSubAgentThread.ts
@@ -1,4 +1,4 @@
-import type { AgentInfo, AgentParent } from '../events/eventSchemas';
+import type { AgentInfo, AgentParent } from '../events/schema';
import type { AgentDefinition } from './AgentDefinition';
import type { AgentThread } from './AgentThread';
diff --git a/packages/harness/src/core/runtime/DeferredTool.ts b/packages/harness/src/core/runtime/DeferredTool.ts
index 0cdaced48..4eb8973c4 100644
--- a/packages/harness/src/core/runtime/DeferredTool.ts
+++ b/packages/harness/src/core/runtime/DeferredTool.ts
@@ -2,7 +2,7 @@ import type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
import dedent from 'dedent';
import type { Logger } from 'winston';
import { z } from 'zod';
-import type { ApprovalDecision } from '../events/eventSchemas';
+import type { ApprovalDecision } from '../events/schema';
import { InstructionBuilder } from '../InstructionBuilder';
import type { InternalToolCallInfo } from '../llm/LLMTypes';
import {
diff --git a/packages/harness/src/core/runtime/UserInputMessage.ts b/packages/harness/src/core/runtime/UserInputMessage.ts
index 460105757..f72e61810 100644
--- a/packages/harness/src/core/runtime/UserInputMessage.ts
+++ b/packages/harness/src/core/runtime/UserInputMessage.ts
@@ -6,7 +6,7 @@ import {
type FileContentPart,
type TextContentPart,
type UserContentPart,
-} from '../events/eventSchemas';
+} from '../events/schema';
import type { LLMUserMessage } from '../llm/LLMTypes';
import type { Sandbox, SandboxInfo } from '../sandbox/Sandbox';
import type { AgentSendInput } from './AgentThread.types';
diff --git a/packages/harness/src/core/runtime/contextUtils.ts b/packages/harness/src/core/runtime/contextUtils.ts
index 0bbf0d12f..26167f2ad 100644
--- a/packages/harness/src/core/runtime/contextUtils.ts
+++ b/packages/harness/src/core/runtime/contextUtils.ts
@@ -1,11 +1,11 @@
import dedent from 'dedent';
-import type { ApprovalDecision } from '../events/eventSchemas';
+import type { ApprovalDecision } from '../events/schema';
import {
EventType,
type AgentApprovalDecisionMessage,
type UserToolApprovalMessage,
type UserToolResponseMessage,
-} from '../events/eventSchemas';
+} from '../events/schema';
import type {
CompletionUsage,
EnrichedToolCall,
diff --git a/packages/harness/tests/agentSession/inMemorySessionStore.test.ts b/packages/harness/tests/agentSession/inMemorySessionStore.test.ts
index 7408bbd97..a7b0da112 100644
--- a/packages/harness/tests/agentSession/inMemorySessionStore.test.ts
+++ b/packages/harness/tests/agentSession/inMemorySessionStore.test.ts
@@ -4,7 +4,7 @@ import { CancellationReason } from '../../src/agentSession/schemas/turn';
import type { ISessionStore } from '../../src/agentSession/store/ISessionStore';
import { InMemorySessionStore } from '../../src/agentSession/store/InMemorySessionStore';
import { SessionStoreConflictError, SessionStoreNotFoundError } from '../../src/agentSession/store/SessionStoreErrors';
-import { EventType, newEventId } from '../../src/core/events/eventSchemas';
+import { EventType, newEventId } from '../../src/core/events/schema';
import { getEmptyUsage } from '../../src/core/llm/LLMTypes';
import { makeAgentSpec, makeModelMessageEvent, makeRunningTurnRecord, makeTurnCreatedEvent } from './testHelpers';
@@ -634,14 +634,20 @@ function runStoreContractSuite(createStore: () => ISessionStore) {
const chainLength = ancestorWindow + 5;
const ids = Array.from({ length: chainLength }, (_, i) => `t${String(i + 1)}`);
for (let i = 0; i < ids.length; i++) {
+ const turnId = mustGet(ids[i], `ids[${String(i)}]`);
const window = ids.slice(Math.max(0, i - ancestorWindow), i);
await store.createTurn({
tenant_name: tenant,
turn: {
...makeRunningTurnRecord({
sessionId,
- turnId: ids[i]!,
- ...(i > 0 ? { previousTurnId: ids[i - 1], firstTurnId: ids[0] } : {}),
+ turnId,
+ ...(i > 0
+ ? {
+ previousTurnId: mustGet(ids[i - 1], `ids[${String(i - 1)}]`),
+ firstTurnId: mustGet(ids[0], 'ids[0]'),
+ }
+ : {}),
}),
ancestor_ids: window,
},
@@ -649,11 +655,11 @@ function runStoreContractSuite(createStore: () => ISessionStore) {
await store.appendToEvents({
tenant_name: tenant,
session_id: sessionId,
- turn_id: ids[i]!,
- events: [makeTurnCreatedEvent(ids[i]!)],
+ turn_id: turnId,
+ events: [makeTurnCreatedEvent(turnId)],
});
}
- const tip = ids.at(-1)!;
+ const tip = mustGet(ids.at(-1), 'chain tip');
const { data } = await store.listSessionEvents({
tenant_name: tenant,
session_id: sessionId,
diff --git a/packages/harness/tests/agentSession/testHelpers.ts b/packages/harness/tests/agentSession/testHelpers.ts
index 2bcc17a18..9ef153db5 100644
--- a/packages/harness/tests/agentSession/testHelpers.ts
+++ b/packages/harness/tests/agentSession/testHelpers.ts
@@ -3,7 +3,7 @@ import { MAIN_THREAD_ID, type TurnRecord } from '../../src/agentSession/models/T
import { AgentSpecSchema, type AgentSpec } from '../../src/agentSession/schemas/agentSpec';
import { TurnResourceResolver } from '../../src/agentSession/TurnResourceResolver';
import type { AgentCapability } from '../../src/core/capabilities/AgentCapability';
-import { EventType, newEventId } from '../../src/core/events/eventSchemas';
+import { EventType, newEventId } from '../../src/core/events/schema';
import type { ExtendedChatCompletionChunk, RawAssistantMessageWithUsage } from '../../src/core/llm/LLMTypes';
import { getEmptyUsage } from '../../src/core/llm/LLMTypes';
import type { Sandbox } from '../../src/core/sandbox/Sandbox';
diff --git a/packages/harness/tests/core/fixtures/boundary-valid.ts b/packages/harness/tests/core/fixtures/boundary-valid.ts
index 545575e74..b37a89812 100644
--- a/packages/harness/tests/core/fixtures/boundary-valid.ts
+++ b/packages/harness/tests/core/fixtures/boundary-valid.ts
@@ -3,7 +3,7 @@
* Lint with the harness fixtures eslint override; expect zero diagnostics.
*/
import { z } from 'zod';
-import { EventType } from '../../../src/core/events/eventSchemas';
+import { EventType } from '../../../src/core/events/schema';
import { NOOP_AGENT_TRACING } from '../../../src/core/tracing/NoopAgentTracing';
export const BoundaryValidSchema = z.object({
diff --git a/packages/harness/tests/core/mcpInitializeAggregation.test.ts b/packages/harness/tests/core/mcpInitializeAggregation.test.ts
index 51103b3d8..9164bbb02 100644
--- a/packages/harness/tests/core/mcpInitializeAggregation.test.ts
+++ b/packages/harness/tests/core/mcpInitializeAggregation.test.ts
@@ -1,5 +1,5 @@
-import type { MCPServerInitInfo } from '../../src/core/events/eventSchemas';
-import { EventType } from '../../src/core/events/eventSchemas';
+import type { MCPServerInitInfo } from '../../src/core/events/schema';
+import { EventType } from '../../src/core/events/schema';
import type { AgentToolSchema, IToolSet, ListToolsResponse } from '../../src/core/mcp/IMCPServer';
import { convertMCPServersToTools } from '../../src/core/mcp/convertMCPServers';
import './harnessMocks';
diff --git a/packages/harness/tests/core/sendBatchTypes.compile.test.ts b/packages/harness/tests/core/sendBatchTypes.compile.test.ts
index 515262328..9455c8374 100644
--- a/packages/harness/tests/core/sendBatchTypes.compile.test.ts
+++ b/packages/harness/tests/core/sendBatchTypes.compile.test.ts
@@ -2,7 +2,7 @@
* Compile-time ownership of public vs runtime send batches.
* Accepts the three homogeneous modes; rejects mixed pairs via @ts-expect-error.
*/
-import type { UserToolApprovalMessage, UserToolResponseMessage } from '../../src/core/events/eventSchemas';
+import type { UserToolApprovalMessage, UserToolResponseMessage } from '../../src/core/events/schema';
import type { LLMToolMessage } from '../../src/core/llm/LLMTypes';
import type { AgentThreadRuntimeSendBatch, AgentThreadSendBatch } from '../../src/core/runtime/AgentThread.types';
import type { AgentInputUserMessage } from '../../src/core/runtime/UserInputMessage';
diff --git a/packages/harness/tests/core/userInputMessage.test.ts b/packages/harness/tests/core/userInputMessage.test.ts
index 5aa53a372..23e75fe4a 100644
--- a/packages/harness/tests/core/userInputMessage.test.ts
+++ b/packages/harness/tests/core/userInputMessage.test.ts
@@ -1,5 +1,5 @@
import { AgentSandboxRequiredError, InvalidAgentInputError } from '../../src/core/errors';
-import { EventType } from '../../src/core/events/eventSchemas';
+import { EventType } from '../../src/core/events/schema';
import {
isEmptyMessageContent,
processAgentUserInput,