diff --git a/src/agents/cache-trace.ts b/src/agents/cache-trace.ts
index 006d0d52eed..e0ea2f2233c 100644
--- a/src/agents/cache-trace.ts
+++ b/src/agents/cache-trace.ts
@@ -14,6 +14,7 @@ export type CacheTraceStage =
   | "cache:result"
   | "cache:state"
   | "session:loaded"
+  | "session:raw-model-run"
   | "session:sanitized"
   | "session:limited"
   | "prompt:before"
diff --git a/src/agents/command/attempt-execution.cli.test.ts b/src/agents/command/attempt-execution.cli.test.ts
index 6f0a292ee6a..638fb0a8608 100644
--- a/src/agents/command/attempt-execution.cli.test.ts
+++ b/src/agents/command/attempt-execution.cli.test.ts
@@ -544,6 +544,7 @@ describe("CLI attempt execution", () => {
     await runAgentAttempt({
       providerOverride: "anthropic",
       modelOverride: "claude-opus-4-7",
+      originalProvider: "anthropic",
       cfg: {
         agents: {
           defaults: {
diff --git a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
index 57b63274515..ba1b96ec33c 100644
--- a/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
+++ b/src/agents/pi-embedded-runner/run/attempt.spawn-workspace.context-engine.test.ts
@@ -261,7 +261,7 @@ describe("runEmbeddedAttempt context engine sessionKey forwarding", () => {
       runBeforeAgentStart: vi.fn(async () => ({ prependContext: "legacy hook context" })),
       runLlmInput,
     });
-    const seen: { prompt?: string; messages?: unknown[] } = {};
+    const seen: { prompt?: string; messages?: unknown[]; systemPrompt?: string } = {};
 
     const result = await createContextEngineAttemptRunner({
       contextEngine: createTestContextEngine({