diff --git a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
index 006a7fdcaeb..81f6272f885 100644
--- a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
+++ b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
@@ -204,6 +204,7 @@ const makeAttempt = (overrides: Partial<EmbeddedRunAttemptResult>): EmbeddedRunA
     messagingToolSentMediaUrls: [],
     messagingToolSentTargets: [],
     cloudCodeAssistFormatError: false,
+    itemLifecycle: { startedCount: 0, completedCount: 0, activeCount: 0 },
     ...overrides,
   };
 };
diff --git a/src/agents/pi-tool-definition-adapter.after-tool-call.fires-once.test.ts b/src/agents/pi-tool-definition-adapter.after-tool-call.fires-once.test.ts
index e69991e0ba4..a4f01fc79f1 100644
--- a/src/agents/pi-tool-definition-adapter.after-tool-call.fires-once.test.ts
+++ b/src/agents/pi-tool-definition-adapter.after-tool-call.fires-once.test.ts
@@ -61,7 +61,6 @@ function createToolHandlerCtx() {
     },
     hookRunner: hookMocks.runner,
     state: {
-      toolMetaById: new Map<string, unknown>(),
       ...createBaseToolHandlerState(),
       successfulCronAdds: 0,
     },
diff --git a/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts b/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts
index 843b0e75661..5c8a11799f0 100644
--- a/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts
+++ b/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts
@@ -123,6 +123,7 @@ export function makeEmbeddedRunnerAttempt(
     messagingToolSentMediaUrls: [],
     messagingToolSentTargets: [],
     cloudCodeAssistFormatError: false,
+    itemLifecycle: { startedCount: 0, completedCount: 0, activeCount: 0 },
     ...overrides,
   };
 }
diff --git a/src/auto-reply/reply/agent-runner-execution.test.ts b/src/auto-reply/reply/agent-runner-execution.test.ts
index 79f7b5a8eda..fe0bfba3c04 100644
--- a/src/auto-reply/reply/agent-runner-execution.test.ts
+++ b/src/auto-reply/reply/agent-runner-execution.test.ts
@@ -127,7 +127,15 @@ type EmbeddedAgentParams = {
   }) => Promise<void> | void;
   onAgentEvent?: (payload: {
     stream: string;
-    data: { phase?: string; completed?: boolean };
+    data: {
+      itemId?: string;
+      kind?: string;
+      title?: string;
+      name?: string;
+      phase?: string;
+      status?: string;
+      completed?: boolean;
+    };
   }) => Promise<void> | void;
 };
 
diff --git a/src/plugins/wired-hooks-after-tool-call.e2e.test.ts b/src/plugins/wired-hooks-after-tool-call.e2e.test.ts
index ff9f940b070..4f423eec1e4 100644
--- a/src/plugins/wired-hooks-after-tool-call.e2e.test.ts
+++ b/src/plugins/wired-hooks-after-tool-call.e2e.test.ts
@@ -39,7 +39,6 @@ function createToolHandlerCtx(params: {
     },
     hookRunner: hookMocks.runner,
     state: {
-      toolMetaById: new Map<string, string | undefined>(),
       ...createBaseToolHandlerState(),
     },
     log: { debug: vi.fn(), warn: vi.fn() },