@orion-agents/orion-code 0.1.4 → 0.1.6

package/dist/services/session-storage.js

@@ -12,6 +12,7 @@ exports.getProjectKey = getProjectKey;
 exports.isSessionMetaFile = isSessionMetaFile;
 exports.createSession = createSession;
 exports.saveSessionMeta = saveSessionMeta;
+exports.updateSessionEffort = updateSessionEffort;
 exports.loadSessionMeta = loadSessionMeta;
 exports.updateSessionStats = updateSessionStats;
 exports.resumeSession = resumeSession;
@@ -34,6 +35,7 @@ exports.appendSessionMessage = appendSessionMessage;
 exports.appendSessionMessages = appendSessionMessages;
 exports.truncateSessionToLastComplete = truncateSessionToLastComplete;
 exports.removeLastIncompleteAssistantMessage = removeLastIncompleteAssistantMessage;
+exports.removeTrailingSessionUserMessage = removeTrailingSessionUserMessage;
 exports.readSessionMessages = readSessionMessages;
 exports.appendSessionTraceEvent = appendSessionTraceEvent;
 exports.readSessionTraceEvents = readSessionTraceEvents;
@@ -50,7 +52,9 @@ const child_process_1 = require("child_process");
 const path_1 = require("path");
 const config_dir_1 = require("./config-dir");
 const atomic_write_1 = require("./atomic-write");
+const file_lock_1 = require("./file-lock");
 const session_index_1 = require("./session-index");
+const tool_call_groups_1 = require("./compact/tool-call-groups");
 const redaction_1 = require("./redaction");
 const debug_log_1 = require("../utils/debug-log");
 const goal_storage_1 = require("./goal-storage");
@@ -238,6 +242,15 @@ function normalizeSessionMeta(session) {
         gitBranch: session.gitBranch ?? getGitBranch(projectPath),
     };
 }
+function tryNormalizeSessionMeta(session, sourcePath) {
+    try {
+        return normalizeSessionMeta(session);
+    }
+    catch (error) {
+        (0, debug_log_1.debugError)('session-storage.normalizeSessionMeta', error, sourcePath);
+        return null;
+    }
+}
 function uniquePaths(paths) {
     return [...new Set(paths)];
 }
@@ -366,103 +379,129 @@ function createSession(projectPath, model) {
 function saveSessionMeta(session) {
     (0, config_dir_1.ensureConfigDir)();
     const normalized = normalizeSessionMeta(session);
-    const payload = JSON.stringify(normalized, null, 2);
     (0, config_dir_1.ensureProjectDir)(normalized.projectPath);
-    (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionMetaPath)(normalized.projectPath, normalized.id), payload, {
-        mode: 0o600,
+    const metaPath = (0, config_dir_1.getProjectSessionMetaPath)(normalized.projectPath, normalized.id);
+    (0, file_lock_1.withFileLockSync)(metaPath, () => {
+        writeSessionMetaUnlocked(normalized);
+    });
+}
+function writeSessionMetaUnlocked(session) {
+    const normalized = normalizeSessionMeta(session);
+    (0, config_dir_1.ensureProjectDir)(normalized.projectPath);
+    (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionMetaPath)(normalized.projectPath, normalized.id), JSON.stringify(normalized, null, 2), { mode: 0o600 });
+}
+function findSessionMetaPath(sessionId) {
+    const projectsDir = (0, config_dir_1.getProjectsDir)();
+    if (!(0, fs_1.existsSync)(projectsDir))
+        return null;
+    for (const projectKey of (0, fs_1.readdirSync)(projectsDir)) {
+        const path = (0, path_1.join)(projectsDir, projectKey, 'sessions', `${sessionId}.json`);
+        if ((0, fs_1.existsSync)(path) && readSessionMetaAtPath(path))
+            return path;
+    }
+    return null;
+}
+function readSessionMetaAtPath(path) {
+    const session = parseSessionMetaFile(path);
+    return session ? tryNormalizeSessionMeta(session, path) : null;
+}
+/**
+ * Serialize a session read-modify-write transaction across Orion processes.
+ * The metadata path is rediscovered before each transaction and re-read only
+ * after the lock is held, so a stale snapshot can never overwrite a concurrent
+ * message/stat update.
+ */
+function withLockedSession(sessionId, operation) {
+    const metaPath = findSessionMetaPath(sessionId);
+    if (!metaPath)
+        return null;
+    return (0, file_lock_1.withFileLockSync)(metaPath, () => {
+        const session = readSessionMetaAtPath(metaPath);
+        if (!session)
+            return null;
+        return operation(session);
+    }, { waitMs: 10000 });
+}
+function mutateSessionMeta(sessionId, mutation) {
+    return withLockedSession(sessionId, session => {
+        mutation(session);
+        writeSessionMetaUnlocked(session);
+        return session;
+    });
+}
+function updateSessionEffort(sessionId, effortPreference) {
+    return mutateSessionMeta(sessionId, session => {
+        if (effortPreference === undefined || effortPreference === 'auto') {
+            delete session.effortPreference;
+        }
+        else {
+            session.effortPreference = effortPreference;
+        }
     });
 }
 /**
  * 加载会话元数据
  */
 function loadSessionMeta(sessionId) {
-    const projectsDir = (0, config_dir_1.getProjectsDir)();
-    if ((0, fs_1.existsSync)(projectsDir)) {
-        for (const projectKey of (0, fs_1.readdirSync)(projectsDir)) {
-            const path = (0, path_1.join)(projectsDir, projectKey, 'sessions', `${sessionId}.json`);
-            if (!(0, fs_1.existsSync)(path))
-                continue;
-            const session = parseSessionMetaFile(path);
-            if (session) {
-                return normalizeSessionMeta(session);
-            }
-        }
-    }
-    return null;
+    const path = findSessionMetaPath(sessionId);
+    return path ? readSessionMetaAtPath(path) : null;
 }
 /**
  * 更新会话统计
  */
 function updateSessionStats(sessionId, tokens, cost) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
-    session.tokenCount += tokens;
-    session.cost += cost;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
-}
-function touchSession(sessionId, messageDelta = 0) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    session.messageCount = (session.messageCount ?? 0) + messageDelta;
-    saveSessionMeta(session);
-    return session;
+    mutateSessionMeta(sessionId, session => {
+        session.tokenCount += tokens;
+        session.cost += cost;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /**
  * Mark a saved session as active again and refresh project metadata.
  */
 function resumeSession(sessionId) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
-    session.endTime = undefined;
-    session.gitBranch = getGitBranch(session.projectPath);
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
-    return session;
+    return mutateSessionMeta(sessionId, session => {
+        session.endTime = undefined;
+        session.gitBranch = getGitBranch(session.projectPath);
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /** Keep the session metadata's additive Goal binding in sync with its sidecar. */
 function updateSessionGoalBinding(sessionId, goal) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
-    session.activeGoalId = goal?.goalId;
-    session.activeGoalObjective = goal?.objective;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
-    return session;
+    return mutateSessionMeta(sessionId, session => {
+        session.activeGoalId = goal?.goalId;
+        session.activeGoalObjective = goal?.objective;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /**
  * 更新会话 Harness 状态。
  */
 function updateSessionHarnessState(sessionId, harnessState) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
-    const fullState = (0, harness_1.upgradeHarnessState)(harnessState, { cwd: session.cwd ?? session.projectPath });
-    const sidecar = {
-        version: 2,
-        sessionId,
-        projectPath: session.projectPath,
-        state: fullState,
-        contextCapsule: fullState.capsule,
-        updatedAt: Date.now(),
-        diagnostics: fullState.diagnostics,
-    };
-    (0, config_dir_1.ensureProjectDir)(session.projectPath);
-    (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionHarnessPath)(session.projectPath, sessionId), JSON.stringify(sidecar, null, 2), { mode: 0o600 });
-    session.harnessState = (0, harness_1.summarizeHarnessStateForMeta)(fullState);
-    session.contextCapsule = fullState.capsule;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
+    withLockedSession(sessionId, session => {
+        const fullState = (0, harness_1.upgradeHarnessState)(harnessState, {
+            cwd: session.cwd ?? session.projectPath,
+        });
+        const sidecar = {
+            version: 2,
+            sessionId,
+            projectPath: session.projectPath,
+            state: fullState,
+            contextCapsule: fullState.capsule,
+            updatedAt: Date.now(),
+            diagnostics: fullState.diagnostics,
+        };
+        (0, config_dir_1.ensureProjectDir)(session.projectPath);
+        (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionHarnessPath)(session.projectPath, sessionId), JSON.stringify(sidecar, null, 2), { mode: 0o600 });
+        session.harnessState = (0, harness_1.summarizeHarnessStateForMeta)(fullState);
+        session.contextCapsule = fullState.capsule;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+        writeSessionMetaUnlocked(session);
+    });
 }
 function loadSessionHarnessState(sessionId) {
     const session = loadSessionMeta(sessionId);
@@ -496,23 +535,18 @@ function loadSessionHarnessState(sessionId) {
 function updateSessionSkills(sessionId, skills) {
     if (skills.length === 0)
         return;
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
-    session.skillsUsed = [...new Set([...(session.skillsUsed || []), ...skills])];
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
+    mutateSessionMeta(sessionId, session => {
+        session.skillsUsed = [...new Set([...(session.skillsUsed || []), ...skills])];
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 function markSessionTranscriptDisplayStart(sessionId, timestamp = Date.now()) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
-    session.transcriptDisplayStartTime = timestamp;
-    session.updatedAt = timestamp;
-    session.updatedAtIso = new Date(timestamp).toISOString();
-    saveSessionMeta(session);
-    return session;
+    return mutateSessionMeta(sessionId, session => {
+        session.transcriptDisplayStartTime = timestamp;
+        session.updatedAt = timestamp;
+        session.updatedAtIso = new Date(timestamp).toISOString();
+    });
 }
 function persistSessionCompactHistory(sessionId, messages, timestamp = Date.now()) {
     const session = loadSessionMeta(sessionId);
@@ -544,51 +578,53 @@ function loadSessionCompactCheckpoint(sessionId) {
     return checkpoint;
 }
 function commitSessionCompactCheckpoint(input) {
-    const session = loadSessionMeta(input.sessionId);
-    if (!session)
-        throw new Error(`Session not found: ${input.sessionId}`);
-    const rawCount = readSessionMessages(input.sessionId).length;
-    if (input.sourceMessageCount < 0 || input.sourceMessageCount > rawCount) {
-        throw new Error(`Invalid compact source boundary ${input.sourceMessageCount}; transcript has ${rawCount} messages`);
-    }
-    const createdAt = input.createdAt ?? Date.now();
-    const checkpoint = {
-        version: 1,
-        checkpointId: (0, crypto_1.randomUUID)(),
-        sessionId: input.sessionId,
-        createdAt,
-        mode: input.mode,
-        modelId: input.modelId,
-        sourceMessageCount: input.sourceMessageCount,
-        transcriptStartMessageIndex: Math.max(0, Math.min(input.sourceMessageCount, input.transcriptStartMessageIndex)),
-        modelHistory: input.modelHistory
-            .filter(message => message.role !== 'system')
-            .map(message => ({ ...message })),
-        summary: {
-            ...input.summary,
+    const checkpoint = withLockedSession(input.sessionId, session => {
+        const rawCount = readSessionMessagesForSession(session).length;
+        if (input.sourceMessageCount < 0 || input.sourceMessageCount > rawCount) {
+            throw new Error(`Invalid compact source boundary ${input.sourceMessageCount}; transcript has ${rawCount} messages`);
+        }
+        const createdAt = input.createdAt ?? Date.now();
+        const nextCheckpoint = {
+            version: 1,
+            checkpointId: (0, crypto_1.randomUUID)(),
+            sessionId: input.sessionId,
+            createdAt,
+            mode: input.mode,
+            modelId: input.modelId,
             sourceMessageCount: input.sourceMessageCount,
-        },
-        beforeUsage: { ...input.beforeUsage },
-        afterUsage: { ...input.afterUsage },
-    };
-    const previousId = session.activeCompactCheckpointId;
-    const previousTime = session.lastCompactAt;
-    session.activeCompactCheckpointId = checkpoint.checkpointId;
-    session.lastCompactAt = createdAt;
-    session.updatedAt = createdAt;
-    session.updatedAtIso = new Date(createdAt).toISOString();
-    // Commit the pointer before replacing the atomic sidecar. If the process
-    // crashes between writes, the loader safely uses the last valid sidecar.
-    saveSessionMeta(session);
-    try {
-        (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionCompactPath)(session.projectPath, input.sessionId), JSON.stringify(checkpoint, null, 2), { mode: 0o600 });
-    }
-    catch (error) {
-        session.activeCompactCheckpointId = previousId;
-        session.lastCompactAt = previousTime;
-        saveSessionMeta(session);
-        throw error;
-    }
+            transcriptStartMessageIndex: Math.max(0, Math.min(input.sourceMessageCount, input.transcriptStartMessageIndex)),
+            modelHistory: input.modelHistory
+                .filter(message => message.role !== 'system')
+                .map(message => ({ ...message })),
+            summary: {
+                ...input.summary,
+                sourceMessageCount: input.sourceMessageCount,
+            },
+            beforeUsage: { ...input.beforeUsage },
+            afterUsage: { ...input.afterUsage },
+        };
+        const previousId = session.activeCompactCheckpointId;
+        const previousTime = session.lastCompactAt;
+        session.activeCompactCheckpointId = nextCheckpoint.checkpointId;
+        session.lastCompactAt = createdAt;
+        session.updatedAt = createdAt;
+        session.updatedAtIso = new Date(createdAt).toISOString();
+        // Commit the pointer before replacing the atomic sidecar. If the process
+        // crashes between writes, the loader safely uses the last valid sidecar.
+        writeSessionMetaUnlocked(session);
+        try {
+            (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionCompactPath)(session.projectPath, input.sessionId), JSON.stringify(nextCheckpoint, null, 2), { mode: 0o600 });
+        }
+        catch (error) {
+            session.activeCompactCheckpointId = previousId;
+            session.lastCompactAt = previousTime;
+            writeSessionMetaUnlocked(session);
+            throw error;
+        }
+        return nextCheckpoint;
+    });
+    if (!checkpoint)
+        throw new Error(`Session not found: ${input.sessionId}`);
     return checkpoint;
 }
 function loadSessionTranscriptMessages(sessionId) {
@@ -612,22 +648,17 @@ function hasPersistedCompactContext(messages) {
  * 结束会话
  */
 function endSession(sessionId) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
-    session.endTime = Date.now();
-    session.updatedAt = session.endTime;
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
+    mutateSessionMeta(sessionId, session => {
+        session.endTime = Date.now();
+        session.updatedAt = session.endTime;
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /**
  * 更新会话任务摘要
  * 从会话消息中提取关键信息并更新元数据
  */
 function updateSessionSummary(sessionId, messages) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
     // 提取工具使用列表
     const toolsUsed = [];
     const filesModified = [];
@@ -655,14 +686,15 @@ function updateSessionSummary(sessionId, messages) {
     // 提取任务摘要（从第一个用户消息）
     const firstUserMsg = messages.find(m => m.role === 'user' && m.content);
     const taskSummary = (0, redaction_1.redactTraceText)(firstUserMsg?.content ?? '').slice(0, 100);
-    // 更新 session
-    session.toolsUsed = [...new Set(toolsUsed)]; // unique
-    session.filesModified = [...new Set(filesModified)]; // unique
-    session.taskSummary = taskSummary.length > 100 ? taskSummary.slice(0, 100) + '...' : taskSummary;
-    session.messageCount = messages.length;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
+    mutateSessionMeta(sessionId, session => {
+        session.toolsUsed = [...new Set(toolsUsed)]; // unique
+        session.filesModified = [...new Set(filesModified)]; // unique
+        session.taskSummary =
+            taskSummary.length > 100 ? taskSummary.slice(0, 100) + '...' : taskSummary;
+        session.messageCount = messages.length;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /**
  * 获取项目最近的会话
@@ -734,15 +766,19 @@ function readProjectHistory(projectPath, limit) {
 function appendSessionMessage(sessionId, message) {
     (0, config_dir_1.ensureConfigDir)();
     const line = JSON.stringify(message) + '\n';
-    const session = touchSession(sessionId, 1);
-    if (!session)
-        return;
-    (0, config_dir_1.ensureProjectDir)(session.projectPath);
-    (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId), line, {
-        mode: 0o600,
+    withLockedSession(sessionId, session => {
+        (0, config_dir_1.ensureProjectDir)(session.projectPath);
+        (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId), line, {
+            mode: 0o600,
+        });
+        // Keep transcript, metadata, and search index inside the same session
+        // critical section so concurrent processes cannot lose counters.
+        (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+        session.messageCount = (session.messageCount ?? 0) + 1;
+        writeSessionMetaUnlocked(session);
     });
-    // Update session index for fast search
-    (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
 }
 /**
  * 追加多条会话消息
@@ -752,16 +788,19 @@ function appendSessionMessages(sessionId, messages) {
         return;
     (0, config_dir_1.ensureConfigDir)();
     const lines = messages.map(m => JSON.stringify(m)).join('\n') + '\n';
-    const session = touchSession(sessionId, messages.length);
-    if (!session)
-        return;
-    (0, config_dir_1.ensureProjectDir)(session.projectPath);
-    (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId), lines, {
-        mode: 0o600,
+    withLockedSession(sessionId, session => {
+        (0, config_dir_1.ensureProjectDir)(session.projectPath);
+        (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId), lines, {
+            mode: 0o600,
+        });
+        for (const message of messages) {
+            (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
+        }
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+        session.messageCount = (session.messageCount ?? 0) + messages.length;
+        writeSessionMetaUnlocked(session);
     });
-    for (const message of messages) {
-        (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
-    }
 }
 function isFinalAssistantMessage(message) {
     return message.role === 'assistant' && (!message.tool_calls || message.tool_calls.length === 0);
@@ -772,26 +811,30 @@ function findLastCompleteBoundary(messages) {
         return messages.length;
     }
     const tail = messages.slice(lastUserIndex + 1);
-    return tail.some(isFinalAssistantMessage) ? messages.length : lastUserIndex;
+    if (tail.some(isFinalAssistantMessage)) {
+        return messages.length;
+    }
+    // No final assistant answer follows the last user prompt: the turn is
+    // incomplete. Keep the user prompt itself (lastUserIndex + 1) and only drop
+    // the partial assistant/tool tail — an abort must not delete what the user
+    // actually typed (Issue #49: off-by-one previously returned lastUserIndex and
+    // sliced the prompt away).
+    return lastUserIndex + 1;
 }
-function overwriteSessionMessages(sessionId, messages) {
-    (0, config_dir_1.ensureConfigDir)();
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return;
+function overwriteSessionMessagesUnlocked(session, messages) {
     const content = messages.length > 0 ? messages.map(message => JSON.stringify(message)).join('\n') + '\n' : '';
     (0, config_dir_1.ensureProjectDir)(session.projectPath);
-    (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId), content, {
+    (0, atomic_write_1.atomicWriteFileSync)((0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, session.id), content, {
         mode: 0o600,
     });
-    (0, session_index_1.deleteSessionIndex)(sessionId, session.projectPath);
+    (0, session_index_1.deleteSessionIndex)(session.id, session.projectPath);
     for (const message of messages) {
-        (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
+        (0, session_index_1.updateSessionIndex)(session.id, session.projectPath, message);
     }
     session.messageCount = messages.length;
     session.updatedAt = Date.now();
     session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
+    writeSessionMetaUnlocked(session);
 }
 /**
  * Remove a trailing incomplete turn from the persisted session transcript.
@@ -802,18 +845,38 @@ function overwriteSessionMessages(sessionId, messages) {
  * resurrect partial state.
  */
 function truncateSessionToLastComplete(sessionId) {
-    const messages = readSessionMessages(sessionId);
-    const boundary = findLastCompleteBoundary(messages);
-    if (boundary === messages.length) {
-        return messages;
-    }
-    const truncated = messages.slice(0, boundary);
-    overwriteSessionMessages(sessionId, truncated);
-    return truncated;
+    return (withLockedSession(sessionId, session => {
+        const messages = readSessionMessagesForSession(session);
+        const boundary = findLastCompleteBoundary(messages);
+        if (boundary === messages.length)
+            return messages;
+        const truncated = messages.slice(0, boundary);
+        overwriteSessionMessagesUnlocked(session, truncated);
+        return truncated;
+    }) ?? []);
 }
 function removeLastIncompleteAssistantMessage(sessionId) {
     return truncateSessionToLastComplete(sessionId);
 }
+/**
+ * Remove the trailing user message from a failed turn so a provider/tool
+ * failure does not leave a dangling prompt in the persisted session that would
+ * be replayed on resume. The caller must guarantee the trailing message was
+ * appended by the turn that just failed (i.e. `persistAsUserMessage !== false`);
+ * this is a no-op when the last message is not a user message.
+ */
+function removeTrailingSessionUserMessage(sessionId) {
+    return (withLockedSession(sessionId, session => {
+        const messages = readSessionMessagesForSession(session);
+        if (messages.length === 0)
+            return messages;
+        if (messages[messages.length - 1].role !== 'user')
+            return messages;
+        const truncated = messages.slice(0, -1);
+        overwriteSessionMessagesUnlocked(session, truncated);
+        return truncated;
+    }) ?? []);
+}
 /**
  * 读取会话消息
  */
@@ -821,6 +884,10 @@ function readSessionMessages(sessionId) {
     const session = loadSessionMeta(sessionId);
     if (!session)
         return [];
+    return readSessionMessagesForSession(session);
+}
+function readSessionMessagesForSession(session) {
+    const sessionId = session.id;
     const path = (0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId);
     if (!(0, fs_1.existsSync)(path))
         return [];
@@ -833,9 +900,12 @@ function readSessionMessages(sessionId) {
                 messages.push(JSON.parse(lines[i]));
             }
             catch (error) {
-                // A missing turn can orphan later tool results, so only restore the valid prefix.
+                // A single corrupted line must not silently truncate the whole session
+                // (which would drop every later turn on resume). Skip only the bad line
+                // and keep the rest, mirroring readHistory's behaviour. The corruption
+                // is still recorded for observability (#68).
                 (0, debug_log_1.debugError)('session-storage.parseMessageLine', error, `${path}:${i + 1}`);
-                break;
+                continue;
             }
         }
         return messages;
@@ -914,10 +984,10 @@ function loadSessionHistory(sessionId) {
     const messages = readSessionMessages(sessionId);
     const checkpoint = loadSessionCompactCheckpoint(sessionId);
     if (checkpoint) {
-        return [
+        return (0, tool_call_groups_1.sealToolCallGroups)([
             ...checkpoint.modelHistory.map(message => ({ ...message })),
             ...messages.slice(checkpoint.sourceMessageCount).map(sessionMessageToModelMessage),
-        ];
+        ]);
     }
     const session = loadSessionMeta(sessionId);
     const displayStartTime = session?.transcriptDisplayStartTime;
@@ -928,7 +998,7 @@ function loadSessionHistory(sessionId) {
             ? afterDisplayStart
             : messages;
     }
-    return modelVisibleMessages.map(sessionMessageToModelMessage);
+    return (0, tool_call_groups_1.sealToolCallGroups)(modelVisibleMessages.map(sessionMessageToModelMessage));
 }
 function sessionMessageToModelMessage(message) {
     const result = {
@@ -958,9 +1028,12 @@ function listSessions(limit) {
             const files = (0, fs_1.readdirSync)(projectSessionsDir).filter(isSessionMetaFile);
             for (const file of files) {
                 const rawSession = parseSessionMetaFile((0, path_1.join)(projectSessionsDir, file));
-                if (rawSession) {
-                    upsertNewestSession(sessionsById, normalizeSessionMeta(rawSession));
-                }
+                if (!rawSession)
+                    continue;
+                const sourcePath = (0, path_1.join)(projectSessionsDir, file);
+                const normalized = tryNormalizeSessionMeta(rawSession, sourcePath);
+                if (normalized)
+                    upsertNewestSession(sessionsById, normalized);
             }
         }
     }
@@ -978,9 +1051,12 @@ function listProjectSessions(projectPath, limit) {
         const files = (0, fs_1.readdirSync)(projectSessionsDir).filter(isSessionMetaFile);
         for (const file of files) {
             const rawSession = parseSessionMetaFile((0, path_1.join)(projectSessionsDir, file));
-            if (rawSession) {
-                upsertNewestSession(sessionsById, normalizeSessionMeta(rawSession));
-            }
+            if (!rawSession)
+                continue;
+            const sourcePath = (0, path_1.join)(projectSessionsDir, file);
+            const normalized = tryNormalizeSessionMeta(rawSession, sourcePath);
+            if (normalized)
+                upsertNewestSession(sessionsById, normalized);
         }
     }
     const sessions = sortSessionsNewestFirst(Array.from(sessionsById.values()));
@@ -1026,48 +1102,43 @@ function lookupSessionRef(ref, projectPath, options = {}) {
  * Rename a session for easier picker/resume targeting.
  */
 function renameSession(sessionId, name) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
     const trimmed = name.trim();
-    session.name = trimmed || undefined;
-    session.updatedAt = Date.now();
-    session.updatedAtIso = new Date(session.updatedAt).toISOString();
-    saveSessionMeta(session);
-    return session;
+    return mutateSessionMeta(sessionId, session => {
+        session.name = trimmed || undefined;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
 }
 /**
  * 删除会话
  */
 function deleteSession(sessionId) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return false;
-    let deleted = false;
-    const paths = [
-        (0, config_dir_1.getProjectSessionMetaPath)(session.projectPath, sessionId),
-        (0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId),
-        (0, config_dir_1.getProjectSessionHarnessPath)(session.projectPath, sessionId),
-        (0, config_dir_1.getProjectSessionCompactPath)(session.projectPath, sessionId),
-        (0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId),
-    ];
-    // Preserve a durable deletion fence so a stale writer in another process
-    // cannot recreate the Goal after the rest of the session is removed.
-    const goalPath = (0, path_1.join)((0, config_dir_1.getProjectSessionsDir)(session.projectPath), `${sessionId}.goal.json`);
-    const hadGoal = (0, fs_1.existsSync)(goalPath);
-    const goalDeletion = (0, goal_storage_1.deleteGoal)(session.projectPath, sessionId);
-    if (!goalDeletion.ok) {
-        return false;
-    }
-    if (hadGoal)
-        deleted = true;
-    (0, session_index_1.deleteSessionIndex)(sessionId, session.projectPath);
-    for (const path of uniquePaths(paths)) {
-        if ((0, fs_1.existsSync)(path)) {
-            (0, fs_1.unlinkSync)(path);
+    return (withLockedSession(sessionId, session => {
+        let deleted = false;
+        const paths = [
+            (0, config_dir_1.getProjectSessionMetaPath)(session.projectPath, sessionId),
+            (0, config_dir_1.getProjectSessionMessagesPath)(session.projectPath, sessionId),
+            (0, config_dir_1.getProjectSessionHarnessPath)(session.projectPath, sessionId),
+            (0, config_dir_1.getProjectSessionCompactPath)(session.projectPath, sessionId),
+            (0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId),
+        ];
+        // Preserve a durable deletion fence so a stale writer in another process
+        // cannot recreate the Goal after the rest of the session is removed.
+        const goalPath = (0, path_1.join)((0, config_dir_1.getProjectSessionsDir)(session.projectPath), `${sessionId}.goal.json`);
+        const hadGoal = (0, fs_1.existsSync)(goalPath);
+        const goalDeletion = (0, goal_storage_1.deleteGoal)(session.projectPath, sessionId);
+        if (!goalDeletion.ok)
+            return false;
+        if (hadGoal)
             deleted = true;
+        (0, session_index_1.deleteSessionIndex)(sessionId, session.projectPath);
+        for (const path of uniquePaths(paths)) {
+            if ((0, fs_1.existsSync)(path)) {
+                (0, fs_1.unlinkSync)(path);
+                deleted = true;
+            }
         }
-    }
-    return deleted;
+        return deleted;
+    }) ?? false);
 }
 //# sourceMappingURL=session-storage.js.map