@orion-agents/orion-code 0.1.6 → 0.1.8

package/dist/services/session-storage.js

@@ -17,6 +17,8 @@ exports.loadSessionMeta = loadSessionMeta;
 exports.updateSessionStats = updateSessionStats;
 exports.resumeSession = resumeSession;
 exports.updateSessionGoalBinding = updateSessionGoalBinding;
+exports.clearSessionGoalBinding = clearSessionGoalBinding;
+exports.restoreSessionGoalBinding = restoreSessionGoalBinding;
 exports.updateSessionHarnessState = updateSessionHarnessState;
 exports.loadSessionHarnessState = loadSessionHarnessState;
 exports.updateSessionSkills = updateSessionSkills;
@@ -70,6 +72,8 @@ function sanitizeTraceEvent(event) {
         'permissionReason',
         'continuationHint',
         'goalStopReason',
+        'budgetExceededReason',
+        'lastToolSummary',
     ]) {
         if (typeof sanitized[key] === 'string') {
             sanitized[key] = (0, redaction_1.redactTraceText)(sanitized[key]);
@@ -143,6 +147,14 @@ function sanitizeTraceEvent(event) {
 // Project helpers
 // ============================================================================
 const MAX_CACHE_SIZE = 256;
+const SESSION_CATALOG_VERSION = 1;
+let sessionCatalogCache = null;
+function getSessionCatalogPath() {
+    return (0, path_1.join)((0, config_dir_1.getConfigDir)(), 'session-catalog.json');
+}
+function emptySessionCatalog() {
+    return { version: SESSION_CATALOG_VERSION, sessions: {} };
+}
 /**
  * Evict the oldest entries when a Map exceeds MAX_CACHE_SIZE.
  * Simple LRU approximation: delete the first (oldest) entries until
@@ -286,6 +298,114 @@ exports.SESSION_SIDECAR_SUFFIXES = [
     '.goal.json',
     '.index.json',
 ];
+function readSessionCatalogFile(path) {
+    try {
+        const parsed = JSON.parse((0, fs_1.readFileSync)(path, 'utf-8'));
+        if (parsed.version !== SESSION_CATALOG_VERSION ||
+            !parsed.sessions ||
+            typeof parsed.sessions !== 'object' ||
+            Array.isArray(parsed.sessions)) {
+            return null;
+        }
+        for (const [id, session] of Object.entries(parsed.sessions)) {
+            if (!session ||
+                session.id !== id ||
+                typeof session.projectPath !== 'string' ||
+                !session.projectPath) {
+                return null;
+            }
+        }
+        return parsed;
+    }
+    catch (error) {
+        (0, debug_log_1.debugError)('session-storage.readCatalog', error, path);
+        return null;
+    }
+}
+function cacheSessionCatalog(path, catalog) {
+    try {
+        const stat = (0, fs_1.statSync)(path);
+        sessionCatalogCache = { path, mtimeMs: stat.mtimeMs, size: stat.size, catalog };
+    }
+    catch (error) {
+        (0, debug_log_1.debugError)('session-storage.cacheCatalog', error, path);
+        sessionCatalogCache = null;
+    }
+    return catalog;
+}
+function readCachedSessionCatalog(path) {
+    if (!(0, fs_1.existsSync)(path))
+        return null;
+    try {
+        const stat = (0, fs_1.statSync)(path);
+        if (sessionCatalogCache?.path === path &&
+            sessionCatalogCache.mtimeMs === stat.mtimeMs &&
+            sessionCatalogCache.size === stat.size) {
+            return sessionCatalogCache.catalog;
+        }
+    }
+    catch (error) {
+        (0, debug_log_1.debugError)('session-storage.statCatalog', error, path);
+        return null;
+    }
+    const catalog = readSessionCatalogFile(path);
+    return catalog ? cacheSessionCatalog(path, catalog) : null;
+}
+function scanSessionCatalog() {
+    const catalog = emptySessionCatalog();
+    const projectsDir = (0, config_dir_1.getProjectsDir)();
+    if (!(0, fs_1.existsSync)(projectsDir))
+        return catalog;
+    for (const projectKey of (0, fs_1.readdirSync)(projectsDir)) {
+        const projectSessionsDir = (0, path_1.join)(projectsDir, projectKey, 'sessions');
+        if (!(0, fs_1.existsSync)(projectSessionsDir))
+            continue;
+        for (const file of (0, fs_1.readdirSync)(projectSessionsDir).filter(isSessionMetaFile)) {
+            const sourcePath = (0, path_1.join)(projectSessionsDir, file);
+            const rawSession = parseSessionMetaFile(sourcePath);
+            if (!rawSession)
+                continue;
+            const normalized = tryNormalizeSessionMeta(rawSession, sourcePath);
+            if (!normalized)
+                continue;
+            const previous = catalog.sessions[normalized.id];
+            if (!previous ||
+                (normalized.updatedAt ?? normalized.startTime) > (previous.updatedAt ?? previous.startTime)) {
+                catalog.sessions[normalized.id] = normalized;
+            }
+        }
+    }
+    return catalog;
+}
+function writeSessionCatalog(path, catalog) {
+    (0, atomic_write_1.atomicWriteFileSync)(path, JSON.stringify(catalog), { mode: 0o600 });
+    cacheSessionCatalog(path, catalog);
+}
+function loadOrRebuildSessionCatalog() {
+    (0, config_dir_1.ensureConfigDir)();
+    const path = getSessionCatalogPath();
+    const cached = readCachedSessionCatalog(path);
+    if (cached)
+        return cached;
+    return (0, file_lock_1.withFileLockSync)(path, () => {
+        const current = readCachedSessionCatalog(path);
+        if (current)
+            return current;
+        const rebuilt = scanSessionCatalog();
+        writeSessionCatalog(path, rebuilt);
+        return rebuilt;
+    }, { waitMs: 10000 });
+}
+function updateSessionCatalog(update) {
+    (0, config_dir_1.ensureConfigDir)();
+    const path = getSessionCatalogPath();
+    return (0, file_lock_1.withFileLockSync)(path, () => {
+        const catalog = readSessionCatalogFile(path) ?? scanSessionCatalog();
+        update(catalog);
+        writeSessionCatalog(path, catalog);
+        return catalog;
+    }, { waitMs: 10000 });
+}
 function parseHarnessSidecarFile(path) {
     try {
         const content = (0, fs_1.readFileSync)(path, 'utf-8');
@@ -321,14 +441,6 @@ function parseCompactCheckpointFile(path) {
         return null;
     }
 }
-function upsertNewestSession(sessionsById, session) {
-    const existing = sessionsById.get(session.id);
-    const existingTime = existing ? (existing.updatedAt ?? existing.startTime) : 0;
-    const nextTime = session.updatedAt ?? session.startTime;
-    if (!existing || nextTime >= existingTime) {
-        sessionsById.set(session.id, session);
-    }
-}
 function sortSessionsNewestFirst(sessions) {
     return sessions.sort((a, b) => (b.updatedAt ?? b.startTime) - (a.updatedAt ?? a.startTime));
 }
@@ -388,17 +500,42 @@ function saveSessionMeta(session) {
 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 });
+    const metaPath = (0, config_dir_1.getProjectSessionMetaPath)(normalized.projectPath, normalized.id);
+    (0, atomic_write_1.atomicWriteFileSync)(metaPath, JSON.stringify(normalized, null, 2), { mode: 0o600 });
+    updateSessionCatalog(catalog => {
+        catalog.sessions[normalized.id] = normalized;
+    });
 }
 function findSessionMetaPath(sessionId) {
-    const projectsDir = (0, config_dir_1.getProjectsDir)();
-    if (!(0, fs_1.existsSync)(projectsDir))
+    const catalog = loadOrRebuildSessionCatalog();
+    const indexed = catalog.sessions[sessionId];
+    const findUnindexedCandidate = () => {
+        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 candidate = (0, path_1.join)(projectsDir, projectKey, 'sessions', `${sessionId}.json`);
+            const session = (0, fs_1.existsSync)(candidate) ? readSessionMetaAtPath(candidate) : null;
+            if (!session)
+                continue;
+            updateSessionCatalog(current => {
+                current.sessions[session.id] = session;
+            });
+            return candidate;
+        }
         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;
-    }
+    };
+    if (!indexed)
+        return findUnindexedCandidate();
+    const path = (0, config_dir_1.getProjectSessionMetaPath)(indexed.projectPath, sessionId);
+    if ((0, fs_1.existsSync)(path))
+        return path;
+    const migratedPath = findUnindexedCandidate();
+    if (migratedPath)
+        return migratedPath;
+    updateSessionCatalog(current => {
+        delete current.sessions[sessionId];
+    });
     return null;
 }
 function readSessionMetaAtPath(path) {
@@ -477,6 +614,40 @@ function updateSessionGoalBinding(sessionId, goal) {
         session.updatedAtIso = new Date(session.updatedAt).toISOString();
     });
 }
+/**
+ * Clear a completed Goal binding without clobbering a newer Goal selected by
+ * another Orion process. A missing binding is already converged; a different
+ * binding is a lifecycle conflict and fails closed.
+ */
+function clearSessionGoalBinding(sessionId, expectedGoalId) {
+    return mutateSessionMeta(sessionId, session => {
+        if (session.activeGoalId && session.activeGoalId !== expectedGoalId) {
+            throw new Error(`Session Goal binding changed from ${expectedGoalId} to ${session.activeGoalId}; refusing to clear the newer Goal.`);
+        }
+        session.activeGoalId = undefined;
+        session.activeGoalObjective = undefined;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
+}
+/**
+ * Restore a Goal binding after a later sidecar mutation failed. A different
+ * active binding belongs to a newer lifecycle and must never be overwritten.
+ */
+function restoreSessionGoalBinding(sessionId, goal, expectedClearedAt) {
+    return mutateSessionMeta(sessionId, session => {
+        if (session.activeGoalId && session.activeGoalId !== goal.goalId) {
+            throw new Error(`Session Goal binding changed from ${goal.goalId} to ${session.activeGoalId}; refusing to overwrite the newer Goal during rollback.`);
+        }
+        if (!session.activeGoalId && session.updatedAt !== expectedClearedAt) {
+            throw new Error(`Session metadata changed after Goal ${goal.goalId} was cleared; refusing to overwrite newer session state during rollback.`);
+        }
+        session.activeGoalId = goal.goalId;
+        session.activeGoalObjective = goal.objective;
+        session.updatedAt = Date.now();
+        session.updatedAtIso = new Date(session.updatedAt).toISOString();
+    });
+}
 /**
  * 更新会话 Harness 状态。
  */
@@ -658,8 +829,7 @@ function endSession(sessionId) {
  * 更新会话任务摘要
  * 从会话消息中提取关键信息并更新元数据
  */
-function updateSessionSummary(sessionId, messages) {
-    // 提取工具使用列表
+function summarizeSessionMessages(messages) {
     const toolsUsed = [];
     const filesModified = [];
     for (const msg of messages) {
@@ -685,15 +855,52 @@ 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);
-    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;
+    const taskText = (0, redaction_1.redactTraceText)(firstUserMsg?.content ?? '');
+    const taskSummary = taskText.length > 100 ? `${taskText.slice(0, 100)}...` : taskText;
+    return {
+        toolsUsed: [...new Set(toolsUsed)],
+        filesModified: [...new Set(filesModified)],
+        taskSummary,
+        messageCount: messages.length,
+    };
+}
+function mergeMessageSummary(session, message) {
+    if (!session.taskSummary && message.role === 'user' && message.content) {
+        const taskText = (0, redaction_1.redactTraceText)(message.content);
+        session.taskSummary = taskText.length > 100 ? `${taskText.slice(0, 100)}...` : taskText;
+    }
+    if (message.role !== 'assistant' || !message.tool_calls)
+        return;
+    const tools = new Set(session.toolsUsed ?? []);
+    const files = new Set(session.filesModified ?? []);
+    for (const toolCall of message.tool_calls) {
+        tools.add(toolCall.function.name);
+        if (toolCall.function.name !== 'write_file' && toolCall.function.name !== 'edit_file')
+            continue;
+        try {
+            const args = JSON.parse(toolCall.function.arguments);
+            if (typeof args.path === 'string')
+                files.add(args.path);
+        }
+        catch (error) {
+            (0, debug_log_1.debugError)('session-storage.parseToolArgs', error, toolCall.function.name);
+        }
+    }
+    session.toolsUsed = [...tools];
+    session.filesModified = [...files];
+}
+function updateSessionSummary(sessionId, _messages) {
+    // Callers may hold a stale transcript snapshot. Re-read under the same lock
+    // used by append/delete so reconciliation can never roll metadata backwards.
+    withLockedSession(sessionId, session => {
+        const summary = summarizeSessionMessages(readSessionMessagesForSession(session));
+        session.toolsUsed = summary.toolsUsed;
+        session.filesModified = summary.filesModified;
+        session.taskSummary = summary.taskSummary;
+        session.messageCount = summary.messageCount;
         session.updatedAt = Date.now();
         session.updatedAtIso = new Date(session.updatedAt).toISOString();
+        writeSessionMetaUnlocked(session);
     });
 }
 /**
@@ -774,6 +981,7 @@ function appendSessionMessage(sessionId, message) {
         // 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);
+        mergeMessageSummary(session, message);
         session.updatedAt = Date.now();
         session.updatedAtIso = new Date(session.updatedAt).toISOString();
         session.messageCount = (session.messageCount ?? 0) + 1;
@@ -795,6 +1003,7 @@ function appendSessionMessages(sessionId, messages) {
         });
         for (const message of messages) {
             (0, session_index_1.updateSessionIndex)(sessionId, session.projectPath, message);
+            mergeMessageSummary(session, message);
         }
         session.updatedAt = Date.now();
         session.updatedAtIso = new Date(session.updatedAt).toISOString();
@@ -832,6 +1041,10 @@ function overwriteSessionMessagesUnlocked(session, messages) {
         (0, session_index_1.updateSessionIndex)(session.id, session.projectPath, message);
     }
     session.messageCount = messages.length;
+    const summary = summarizeSessionMessages(messages);
+    session.toolsUsed = summary.toolsUsed;
+    session.filesModified = summary.filesModified;
+    session.taskSummary = summary.taskSummary;
     session.updatedAt = Date.now();
     session.updatedAtIso = new Date(session.updatedAt).toISOString();
     writeSessionMetaUnlocked(session);
@@ -918,63 +1131,61 @@ function readSessionMessagesForSession(session) {
     }
 }
 function appendSessionTraceEvent(sessionId, event) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return null;
-    (0, config_dir_1.ensureConfigDir)();
-    const safeEvent = sanitizeTraceEvent(event);
-    const traceEvent = {
-        ...safeEvent,
-        sessionId,
-        turnId: String(safeEvent.turnId),
-        timestamp: safeEvent.timestamp ?? Date.now(),
-    };
-    (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId), `${JSON.stringify(traceEvent)}\n`, { mode: 0o600 });
-    return traceEvent;
+    return withLockedSession(sessionId, session => {
+        (0, config_dir_1.ensureConfigDir)();
+        const safeEvent = sanitizeTraceEvent(event);
+        const traceEvent = {
+            ...safeEvent,
+            sessionId,
+            turnId: String(safeEvent.turnId),
+            timestamp: safeEvent.timestamp ?? Date.now(),
+        };
+        (0, fs_1.appendFileSync)((0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId), `${JSON.stringify(traceEvent)}\n`, { mode: 0o600 });
+        return traceEvent;
+    });
 }
 function readSessionTraceEvents(sessionId) {
-    const session = loadSessionMeta(sessionId);
-    if (!session)
-        return [];
-    const path = (0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId);
-    if (!(0, fs_1.existsSync)(path))
-        return [];
-    try {
-        const content = (0, fs_1.readFileSync)(path, 'utf-8');
-        return content
-            .trim()
-            .split('\n')
-            .filter(Boolean)
-            .flatMap(line => {
-            try {
-                const parsed = JSON.parse(line);
-                if (!parsed.type || !parsed.turnId || !parsed.timestamp)
+    return (withLockedSession(sessionId, session => {
+        const path = (0, config_dir_1.getProjectSessionTracePath)(session.projectPath, sessionId);
+        if (!(0, fs_1.existsSync)(path))
+            return [];
+        try {
+            const content = (0, fs_1.readFileSync)(path, 'utf-8');
+            return content
+                .trim()
+                .split('\n')
+                .filter(Boolean)
+                .flatMap(line => {
+                try {
+                    const parsed = JSON.parse(line);
+                    if (!parsed.type || !parsed.turnId || !parsed.timestamp)
+                        return [];
+                    const sanitized = sanitizeTraceEvent({
+                        ...parsed,
+                        turnId: String(parsed.turnId),
+                    });
+                    return [
+                        {
+                            ...sanitized,
+                            sessionId,
+                            turnId: String(sanitized.turnId),
+                        },
+                    ];
+                }
+                catch (error) {
+                    // Drop only the malformed trace line, keep the rest of the trace.
+                    (0, debug_log_1.debugError)('session-storage.parseTraceLine', error);
                     return [];
-                const sanitized = sanitizeTraceEvent({
-                    ...parsed,
-                    turnId: String(parsed.turnId),
-                });
-                return [
-                    {
-                        ...sanitized,
-                        sessionId,
-                        turnId: String(sanitized.turnId),
-                    },
-                ];
-            }
-            catch (error) {
-                // Drop only the malformed trace line, keep the rest of the trace.
-                (0, debug_log_1.debugError)('session-storage.parseTraceLine', error);
-                return [];
-            }
-        });
-    }
-    catch (error) {
-        // An empty trace looks like "nothing happened" instead of "trace
-        // unreadable", which misleads anyone debugging a past run.
-        (0, debug_log_1.debugError)('session-storage.readTraceEvents', error, path);
-        return [];
-    }
+                }
+            });
+        }
+        catch (error) {
+            // An empty trace looks like "nothing happened" instead of "trace
+            // unreadable", which misleads anyone debugging a past run.
+            (0, debug_log_1.debugError)('session-storage.readTraceEvents', error, path);
+            return [];
+        }
+    }) ?? []);
 }
 /**
  * 读取会话消息并转换为 Message 格式（用于恢复对话历史）
@@ -1017,27 +1228,7 @@ function sessionMessageToModelMessage(message) {
  * 列出所有会话
  */
 function listSessions(limit) {
-    (0, config_dir_1.ensureConfigDir)();
-    const sessionsById = new Map();
-    const projectsDir = (0, config_dir_1.getProjectsDir)();
-    if ((0, fs_1.existsSync)(projectsDir)) {
-        for (const projectKey of (0, fs_1.readdirSync)(projectsDir)) {
-            const projectSessionsDir = (0, path_1.join)(projectsDir, projectKey, 'sessions');
-            if (!(0, fs_1.existsSync)(projectSessionsDir))
-                continue;
-            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)
-                    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()));
+    const sessions = sortSessionsNewestFirst(Object.values(loadOrRebuildSessionCatalog().sessions));
     return limit ? sessions.slice(0, limit) : sessions;
 }
 /**
@@ -1045,21 +1236,7 @@ function listSessions(limit) {
  */
 function listProjectSessions(projectPath, limit) {
     const canonicalProjectPath = resolveProjectPath(projectPath);
-    const sessionsById = new Map();
-    const projectSessionsDir = (0, config_dir_1.getProjectSessionsDir)(canonicalProjectPath);
-    if ((0, fs_1.existsSync)(projectSessionsDir)) {
-        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)
-                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()));
+    const sessions = sortSessionsNewestFirst(Object.values(loadOrRebuildSessionCatalog().sessions).filter(session => session.projectPath === canonicalProjectPath));
     return limit ? sessions.slice(0, limit) : sessions;
 }
 /**
@@ -1138,6 +1315,9 @@ function deleteSession(sessionId) {
                 deleted = true;
             }
         }
+        updateSessionCatalog(catalog => {
+            delete catalog.sessions[sessionId];
+        });
         return deleted;
     }) ?? false);
 }