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..3d5226258 100644
--- a/src/auto-reply/reply/session-usage.ts
+++ b/src/auto-reply/reply/session-usage.ts
@@ -42,9 +42,10 @@ export async function persistSessionUsageUpdate(params: {
             systemPromptReport: params.systemPromptReport ?? entry.systemPromptReport,
             updatedAt: Date.now(),
           };
-          if (params.cliSessionId) {
+          const cliProvider = params.providerUsed ?? entry.modelProvider;
+          if (params.cliSessionId && cliProvider) {
             const nextEntry = { ...entry, ...patch };
-            setCliSessionId(nextEntry, params.providerUsed, params.cliSessionId);
+            setCliSessionId(nextEntry, cliProvider, params.cliSessionId);
             return {
               ...patch,
               cliSessionIds: nextEntry.cliSessionIds,
@@ -73,9 +74,10 @@ export async function persistSessionUsageUpdate(params: {
             systemPromptReport: params.systemPromptReport ?? entry.systemPromptReport,
             updatedAt: Date.now(),
           };
-          if (params.cliSessionId) {
+          const cliProvider = params.providerUsed ?? entry.modelProvider;
+          if (params.cliSessionId && cliProvider) {
             const nextEntry = { ...entry, ...patch };
-            setCliSessionId(nextEntry, params.providerUsed, params.cliSessionId);
+            setCliSessionId(nextEntry, cliProvider, params.cliSessionId);
             return {
               ...patch,
               cliSessionIds: nextEntry.cliSessionIds,