Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4d6d9ac5a1e376ab851afe2f707cf256ac21f4a8 into 9fb78453e088cd7b553d7779faa0de5c83708e70

Browse Source
This commit is contained in:
DDD-HHY 2026-03-20 22:02:53 -07:00 committed by GitHub
commit 083b43f4a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/agents/pi-embedded-runner/session-manager-init.ts
View File

@ -12,6 +12,11 @@ type SessionMessageEntry = { type: "message"; message?: { role?: string } };
*
* This normalizes the file/session state so the first user prompt is persisted before the first
* assistant entry, even for pre-created session files.
*
* NOTE: We only reset when there are no user messages yet (truly empty pre-created session).
* If user messages already exist, the session has real conversation history — an API error
* (e.g. 400/503) may have left the transcript without an assistant reply, but we must NOT
* wipe the history. The orphaned-user-message repair in attempt.ts handles that case instead.
*/
export async function prepareSessionManagerForRun(params: {
sessionManager: unknown;
@ -33,6 +38,11 @@ export async function prepareSessionManagerForRun(params: {
const hasAssistant = sm.fileEntries.some(
(e) => e.type === "message" && (e as SessionMessageEntry).message?.role === "assistant",
);
// A session with existing user messages has real conversation history (e.g. a prior turn that
// hit an API error). Do not reset it — the orphaned-user-message repair handles recovery.
const hasUser = sm.fileEntries.some(
(e) => e.type === "message" && (e as SessionMessageEntry).message?.role === "user",
);
if (!params.hadSessionFile && header) {
header.id = params.sessionId;
@ -41,8 +51,9 @@ export async function prepareSessionManagerForRun(params: {
return;
}
if (params.hadSessionFile && header && !hasAssistant) {
if (params.hadSessionFile && header && !hasAssistant && !hasUser) {
// Reset file so the first assistant flush includes header+user+assistant in order.
// Only applies to truly empty pre-created session files (no messages at all).
await fs.writeFile(params.sessionFile, "", "utf-8");
sm.fileEntries = [header];
sm.byId?.clear?.();