From 672728a692c98389e759d46086ce1c3d3cd89916 Mon Sep 17 00:00:00 2001
From: lubolin0925 <163701194+lubolin0925@users.noreply.github.com>
Date: Sat, 7 Mar 2026 11:24:40 +0800
Subject: [PATCH] fix: use previousSessionEntry for pre-reset learning and
 preserve session file path

---
 src/auto-reply/reply/commands-compact.ts |  9 +--------
 src/auto-reply/reply/commands-core.ts    | 21 ++++++++++-----------
 src/auto-reply/reply/commands-learn.ts   |  9 +--------
 3 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/auto-reply/reply/commands-compact.ts b/src/auto-reply/reply/commands-compact.ts
index 648e6b889e7..2ef77fb77e2 100644
--- a/src/auto-reply/reply/commands-compact.ts
+++ b/src/auto-reply/reply/commands-compact.ts
@@ -80,14 +80,7 @@ export const handleCompactCommand: CommandHandler = async (params) => {
     groupChannel: params.sessionEntry.groupChannel,
     groupSpace: params.sessionEntry.space,
     spawnedBy: params.sessionEntry.spawnedBy,
-    sessionFile: resolveSessionFilePath(
-      sessionId,
-      params.sessionEntry,
-      resolveSessionFilePathOptions({
-        agentId: params.agentId,
-        storePath: params.storePath,
-      }),
-    ),
+    sessionFile: params.sessionEntry.sessionFile,
     workspaceDir: params.workspaceDir,
     agentDir: params.agentDir,
     config: params.cfg,
diff --git a/src/auto-reply/reply/commands-core.ts b/src/auto-reply/reply/commands-core.ts
index fb2ea132e48..f76604ed5e4 100644
--- a/src/auto-reply/reply/commands-core.ts
+++ b/src/auto-reply/reply/commands-core.ts
@@ -223,10 +223,16 @@ export async function handleCommands(params: HandleCommandsParams): Promise<Comm
         : undefined;
 
     // Determine which session to learn from (after ACP resolution)
+    // For non-ACP resets, use previousSessionEntry because initSessionState already rotated to fresh session
     const targetSessionKey = boundAcpKey ?? params.sessionKey;
-    const targetSessionEntry = boundAcpKey
-      ? resolveSessionEntryForHookSessionKey(params.sessionStore, boundAcpKey)
-      : params.sessionEntry;
+    let targetSessionEntry: typeof params.sessionEntry;
+    if (boundAcpKey) {
+      targetSessionEntry = resolveSessionEntryForHookSessionKey(params.sessionStore, boundAcpKey);
+    } else if (params.previousSessionEntry?.sessionId) {
+      targetSessionEntry = params.previousSessionEntry;
+    } else {
+      targetSessionEntry = params.sessionEntry;
+    }
 
     // Trigger learning before reset/new commands (after ACP target resolution)
     if (targetSessionEntry?.sessionId) {
@@ -238,14 +244,7 @@ export async function handleCommands(params: HandleCommandsParams): Promise<Comm
         groupChannel: targetSessionEntry.groupChannel,
         groupSpace: targetSessionEntry.space,
         spawnedBy: targetSessionEntry.spawnedBy,
-        sessionFile: resolveSessionFilePath(
-          targetSessionEntry.sessionId,
-          targetSessionEntry,
-          resolveSessionFilePathOptions({
-            agentId: params.agentId,
-            storePath: params.storePath,
-          }),
-        ),
+        sessionFile: targetSessionEntry.sessionFile,
         workspaceDir: params.workspaceDir,
         agentDir: params.agentDir,
         config: params.cfg,
diff --git a/src/auto-reply/reply/commands-learn.ts b/src/auto-reply/reply/commands-learn.ts
index 3d87c333ff5..6279d959b83 100644
--- a/src/auto-reply/reply/commands-learn.ts
+++ b/src/auto-reply/reply/commands-learn.ts
@@ -1,6 +1,5 @@
 import { runEmbeddedPiAgent } from "../../agents/pi-embedded.js";
 import type { OpenClawConfig } from "../../config/config.js";
-import { resolveSessionFilePath, resolveSessionFilePathOptions } from "../../config/sessions.js";
 import { logVerbose } from "../../globals.js";
 
 const LEARN_SYSTEM_PROMPT = [
@@ -54,17 +53,11 @@ export async function runLearnForSession(params: {
     ? `Focus area: ${params.customFocus}. ${LEARN_DEFAULT_PROMPT}`
     : LEARN_DEFAULT_PROMPT;
 
-  const sessionFilePath = resolveSessionFilePath(
-    params.sessionId,
-    { sessionId: params.sessionId, sessionFile: params.sessionFile },
-    resolveSessionFilePathOptions({ agentId: undefined, storePath: undefined }),
-  );
-
   try {
     await runEmbeddedPiAgent({
       sessionId: params.sessionId,
       sessionKey: params.sessionKey,
-      sessionFile: sessionFilePath,
+      sessionFile: params.sessionFile,
       messageChannel: params.messageChannel,
       groupId: params.groupId,
       groupChannel: params.groupChannel,