diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a4ba70f..c2dd8e6a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ Docs: https://docs.clawd.bot
 - Gateway: compare Linux process start time to avoid PID recycling lock loops; keep locks unless stale. (#1572) Thanks @steipete.
 - Skills: gate bird Homebrew install to macOS. (#1569) Thanks @bradleypriest.
 - Slack: honor open groupPolicy for unlisted channels in message + slash gating. (#1563) Thanks @itsjaydesu.
+- Agents: treat request-aborted AbortError timeouts as fallback triggers. (#1576) Thanks @lc0rp.
 - Agents: show tool error fallback when the last assistant turn only invoked tools (prevents silent stops).
 - Agents: ignore IDENTITY.md template placeholders when parsing identity to avoid placeholder replies. (#1556)
 - Agents: drop orphaned OpenAI Responses reasoning blocks on model switches. (#1562) Thanks @roshanasingh4.
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
index dec2d789a..227e6f17e 100644
--- a/src/auto-reply/reply/agent-runner.ts
+++ b/src/auto-reply/reply/agent-runner.ts
@@ -15,7 +15,6 @@ import {
   updateSessionStoreEntry,
 } from "../../config/sessions.js";
 import type { TypingMode } from "../../config/types.js";
-import { logVerbose } from "../../globals.js";
 import { defaultRuntime } from "../../runtime.js";
 import { estimateUsageCost, resolveModelCostConfig } from "../../utils/usage-format.js";
 import type { OriginatingChannelType, TemplateContext } from "../templating.js";
diff --git a/src/auto-reply/reply/session-usage.ts b/src/auto-reply/reply/session-usage.ts
index 1a048b55e..c1a761b04 100644
--- a/src/auto-reply/reply/session-usage.ts
+++ b/src/auto-reply/reply/session-usage.ts
@@ -44,7 +44,9 @@ export async function persistSessionUsageUpdate(params: {
           };
           if (params.cliSessionId) {
             const nextEntry = { ...entry, ...patch };
-            setCliSessionId(nextEntry, params.providerUsed, params.cliSessionId);
+            const provider = params.providerUsed ?? entry.modelProvider;
+            if (!provider) return patch;
+            setCliSessionId(nextEntry, provider, params.cliSessionId);
             return {
               ...patch,
               cliSessionIds: nextEntry.cliSessionIds,
@@ -75,7 +77,9 @@ export async function persistSessionUsageUpdate(params: {
           };
           if (params.cliSessionId) {
             const nextEntry = { ...entry, ...patch };
-            setCliSessionId(nextEntry, params.providerUsed, params.cliSessionId);
+            const provider = params.providerUsed ?? entry.modelProvider;
+            if (!provider) return patch;
+            setCliSessionId(nextEntry, provider, params.cliSessionId);
             return {
               ...patch,
               cliSessionIds: nextEntry.cliSessionIds,