From 21cbc15b7152192965fe70e535977c08e61f277f Mon Sep 17 00:00:00 2001
From: Tak Hoffman <781889+Takhoffman@users.noreply.github.com>
Date: Sat, 11 Apr 2026 20:20:37 -0500
Subject: [PATCH] fix(active-memory): stop caller timeouts from continuing
 failover (#65046)

* fix(active-memory): remove built-in fallback model

* fix(active-memory): wire external abort through failover
---
 extensions/codex/src/app-server/event-projector.ts               | 1 +
 src/agents/harness/selection.test.ts                             | 1 +
 ...unner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts | 1 +
 src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts | 1 +
 src/agents/pi-embedded-runner/usage-reporting.test.ts            | 1 +
 src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/extensions/codex/src/app-server/event-projector.ts b/extensions/codex/src/app-server/event-projector.ts
index 7f28f31b9fd..65fa2ccc6cc 100644
--- a/extensions/codex/src/app-server/event-projector.ts
+++ b/extensions/codex/src/app-server/event-projector.ts
@@ -153,6 +153,7 @@ export class CodexAppServerEventProjector {
       (turnFailed ? (this.completedTurn?.error?.message ?? "codex app-server turn failed") : null);
     return {
       aborted: this.aborted || turnInterrupted,
+      externalAbort: false,
       timedOut: false,
       idleTimedOut: false,
       timedOutDuringCompaction: false,
diff --git a/src/agents/harness/selection.test.ts b/src/agents/harness/selection.test.ts
index 92d8d4094d3..54572661bbf 100644
--- a/src/agents/harness/selection.test.ts
+++ b/src/agents/harness/selection.test.ts
@@ -59,6 +59,7 @@ function createAttemptParams(config?: OpenClawConfig): EmbeddedRunAttemptParams
 function createAttemptResult(sessionIdUsed: string): EmbeddedRunAttemptResult {
   return {
     aborted: false,
+    externalAbort: false,
     timedOut: false,
     idleTimedOut: false,
     timedOutDuringCompaction: false,
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 631ea392167..b04ff1e5509 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
@@ -185,6 +185,7 @@ const makeAttempt = (overrides: Partial<EmbeddedRunAttemptResult>): EmbeddedRunA
   const successfulCronAdds = overrides.successfulCronAdds;
   return {
     aborted: false,
+    externalAbort: false,
     timedOut: false,
     idleTimedOut: false,
     timedOutDuringCompaction: false,
diff --git a/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts b/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
index 8eabce1d1a0..79a6ca753d9 100644
--- a/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
+++ b/src/agents/pi-embedded-runner/run.overflow-compaction.fixture.ts
@@ -34,6 +34,7 @@ export function makeAttemptResult(
   const successfulCronAdds = overrides.successfulCronAdds;
   return {
     aborted: false,
+    externalAbort: false,
     timedOut: false,
     idleTimedOut: false,
     timedOutDuringCompaction: false,
diff --git a/src/agents/pi-embedded-runner/usage-reporting.test.ts b/src/agents/pi-embedded-runner/usage-reporting.test.ts
index e8914d0f34c..096a6111439 100644
--- a/src/agents/pi-embedded-runner/usage-reporting.test.ts
+++ b/src/agents/pi-embedded-runner/usage-reporting.test.ts
@@ -18,6 +18,7 @@ function makeAttemptResult(
   const successfulCronAdds = overrides.successfulCronAdds;
   return {
     aborted: false,
+    externalAbort: false,
     timedOut: false,
     idleTimedOut: false,
     timedOutDuringCompaction: false,
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 fedbbf459d1..53826239e11 100644
--- a/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts
+++ b/src/agents/test-helpers/pi-embedded-runner-e2e-fixtures.ts
@@ -102,6 +102,7 @@ export function makeEmbeddedRunnerAttempt(
   const successfulCronAdds = overrides.successfulCronAdds;
   return {
     aborted: false,
+    externalAbort: false,
     timedOut: false,
     idleTimedOut: false,
     timedOutDuringCompaction: false,