hammoc 1.1.6 → 1.2.1

package/packages/server/dist/services/sessionBufferManager.js

@@ -0,0 +1,113 @@
+/**
+ * SessionBufferManager — unified per-session message buffer
+ * Story 27.1: Holds history + streaming messages in memory,
+ * delivers all message data exclusively via WebSocket.
+ */
+import { ROOT_BRANCH_KEY } from '@hammoc/shared';
+import { parseJSONLFile, transformToHistoryMessages } from './historyParser.js';
+import { sessionService } from './sessionService.js';
+import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, } from '../utils/messageTree.js';
+import { createLogger } from '../utils/logger.js';
+const log = createLogger('sessionBufferManager');
+export class SessionBufferManager {
+    buffers = new Map();
+    create(sessionId, streaming = false) {
+        const existing = this.buffers.get(sessionId);
+        if (existing) {
+            existing.streaming = streaming;
+            return existing;
+        }
+        const buffer = { sessionId, messages: [], streaming };
+        this.buffers.set(sessionId, buffer);
+        log.debug(`Buffer created for session ${sessionId}`);
+        return buffer;
+    }
+    get(sessionId) {
+        return this.buffers.get(sessionId);
+    }
+    setMessages(sessionId, messages) {
+        const buffer = this.buffers.get(sessionId);
+        if (!buffer) {
+            log.warn(`setMessages: no buffer for session ${sessionId}`);
+            return;
+        }
+        buffer.messages = messages;
+    }
+    addMessage(sessionId, message) {
+        const buffer = this.buffers.get(sessionId);
+        if (!buffer) {
+            log.warn(`addMessage: no buffer for session ${sessionId}`);
+            return;
+        }
+        buffer.messages.push(message);
+    }
+    setStreaming(sessionId, streaming) {
+        const buffer = this.buffers.get(sessionId);
+        if (!buffer) {
+            log.warn(`setStreaming: no buffer for session ${sessionId}`);
+            return;
+        }
+        buffer.streaming = streaming;
+    }
+    async reloadFromJSONL(sessionId, projectSlug, branchSelections) {
+        const filePath = sessionService.getSessionFilePath(projectSlug, sessionId);
+        const rawMessages = await parseJSONLFile(filePath);
+        if (rawMessages.length === 0) {
+            if (!branchSelections) {
+                this.setMessages(sessionId, []);
+            }
+            return [];
+        }
+        const tree = buildRawMessageTree(rawMessages);
+        const defaults = getDefaultRawBranchSelections(tree.roots);
+        const selections = branchSelections
+            ? { ...defaults, ...branchSelections }
+            : defaults;
+        const { messages: branchMessages, branchPoints } = getActiveRawBranch(tree.roots, selections);
+        const historyMessages = transformToHistoryMessages(branchMessages, projectSlug, sessionId);
+        // Attach branchInfo to individual messages so the client can render branch navigation
+        if (Object.keys(branchPoints).length > 0) {
+            const idIndex = new Map();
+            for (const m of historyMessages) {
+                idIndex.set(m.id, m);
+            }
+            for (const [msgId, info] of Object.entries(branchPoints)) {
+                const msg = idIndex.get(msgId)
+                    // ROOT_BRANCH_KEY ('__root__') won't match any message ID —
+                    // attach to the first message so root-level branches are navigable.
+                    ?? (msgId === ROOT_BRANCH_KEY ? historyMessages[0] : undefined);
+                if (msg) {
+                    msg.branchInfo = info;
+                }
+            }
+        }
+        if (!branchSelections) {
+            this.setMessages(sessionId, historyMessages);
+        }
+        log.debug(`reloadFromJSONL: session=${sessionId}, ${historyMessages.length} messages`);
+        return historyMessages;
+    }
+    rekey(oldId, newId) {
+        const buffer = this.buffers.get(oldId);
+        if (!buffer) {
+            log.warn(`rekey: no buffer for session ${oldId}`);
+            return;
+        }
+        this.buffers.delete(oldId);
+        buffer.sessionId = newId;
+        this.buffers.set(newId, buffer);
+        log.debug(`Buffer re-keyed: ${oldId} → ${newId}`);
+    }
+    destroy(sessionId) {
+        const deleted = this.buffers.delete(sessionId);
+        if (deleted) {
+            log.debug(`Buffer destroyed for session ${sessionId}`);
+        }
+    }
+    /** Visible for testing */
+    get size() {
+        return this.buffers.size;
+    }
+}
+export const sessionBufferManager = new SessionBufferManager();
+//# sourceMappingURL=sessionBufferManager.js.map

package/packages/server/dist/services/sessionBufferManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionBufferManager.js","sourceRoot":"","sources":["../../src/services/sessionBufferManager.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/services/sessionService.d.ts

@@ -12,6 +12,7 @@ import type { SessionInfo, SessionListItem, SessionListParams, HistoryMessage, P
 export declare class SessionService {
     private readonly claudeProjectsDir;
     private static indexWriteLocks;
+    private static pendingBackfills;
     constructor();
     /**
      * Serialize async operations per project slug to prevent concurrent
@@ -134,6 +135,10 @@ export declare class SessionService {
      * @returns Full path to the JSONL session file
      */
     getSessionFilePath(projectSlug: string, sessionId: string): string;
+    /**
+     * Get the project directory path for a given project slug
+     */
+    getProjectDir(projectSlug: string): string;
     /**
      * Check if a session file exists
      * @param projectSlug The project slug
@@ -151,14 +156,34 @@ export declare class SessionService {
      * Get session messages with pagination
      * @param projectSlug The project slug
      * @param sessionId The session ID
-     * @param options Pagination options (limit, offset)
+     * @param options Pagination options (limit, offset, branchSelections)
      * @returns Messages with pagination info, or null if session not found
      */
     getSessionMessages(projectSlug: string, sessionId: string, options?: PaginationOptions): Promise<{
         messages: HistoryMessage[];
         pagination: PaginationInfo;
         lastAgentCommand: string | null;
+        branchPoints: Record<string, {
+            total: number;
+            current: number;
+        }>;
     } | null>;
+    /**
+     * Get the UUID of the first root message in a session JSONL.
+     * Currently unused — root-level edit branching is disabled because the SDK's
+     * resumeSessionAt only accepts assistant message UUIDs, and there is no
+     * assistant before the first user message.
+     */
+    getRootMessageUuid(projectSlug: string, sessionId: string): Promise<string | null>;
+    /**
+     * Delete phantom sessions — JSONL files that contain only metadata entries
+     * (e.g. file-history-snapshot) without any user/assistant conversation messages.
+     * These are created when SDK query() writes its initial checkpoint but fails
+     * before processing the user message (due to rate-limit, auth, abort, etc.).
+     *
+     * @returns Number of phantom sessions deleted
+     */
+    cleanupPhantomSessions(projectSlug: string): Promise<number>;
 }
 export declare const sessionService: SessionService;
 //# sourceMappingURL=sessionService.d.ts.map

package/packages/server/dist/services/sessionService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionService.d.ts","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionService.d.ts","sourceRoot":"","sources":["../../src/services/sessionService.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/services/sessionService.js

@@ -8,8 +8,12 @@
 import path from 'path';
 import os from 'os';
 import fs from 'fs/promises';
-import { existsSync } from 'fs';
-import { parseJSONLFile, parseJSONLSessionMeta, sortMessagesByParentUuid, transformToHistoryMessages, cleanCommandTags, } from './historyParser.js';
+import { existsSync, createReadStream } from 'fs';
+import readline from 'readline';
+import { createLogger } from '../utils/logger.js';
+import { parseJSONLFile, parseJSONLSessionMeta, transformToHistoryMessages, cleanCommandTags, } from './historyParser.js';
+import { buildRawMessageTree, getActiveRawBranch, getDefaultRawBranchSelections, } from '../utils/messageTree.js';
+const log = createLogger('sessionService');
 /**
  * SessionService - Manages Claude Code session data
  */
@@ -17,6 +21,8 @@ export class SessionService {
     claudeProjectsDir;
     // Per-project mutex for sessions-index.json writes to prevent concurrent read-modify-write races
     static indexWriteLocks = new Map();
+    // Track in-flight index backfill operations to prevent duplicate fire-and-forget calls
+    static pendingBackfills = new Set();
     constructor() {
         this.claudeProjectsDir = path.join(os.homedir(), '.claude', 'projects');
     }
@@ -273,17 +279,46 @@ export class SessionService {
                 }
                 const files = await fs.readdir(projectDir);
                 const jsonlFiles = files.filter(f => f.endsWith('.jsonl'));
-                // Stat all files (cheap) to get modified time
-                const fileStats = await Promise.all(jsonlFiles.map(async (file) => {
-                    const stat = await fs.stat(path.join(projectDir, file));
-                    return { file, sessionId: file.replace('.jsonl', ''), stat };
-                }));
-                // Sort by mtime descending
-                fileStats.sort((a, b) => b.stat.mtimeMs - a.stat.mtimeMs);
+                // Build sortable entries using index timestamps where available.
+                // Only stat files missing from the index to avoid O(N) stat calls.
+                const unindexedFiles = [];
+                const fileEntries = [];
+                for (const file of jsonlFiles) {
+                    const sessionId = file.replace('.jsonl', '');
+                    const cached = indexMap.get(sessionId);
+                    if (cached && cached.modified) {
+                        fileEntries.push({ file, sessionId, mtimeMs: new Date(cached.modified).getTime() || 0 });
+                    }
+                    else {
+                        unindexedFiles.push(file);
+                    }
+                }
+                // Stat only unindexed files
+                if (unindexedFiles.length > 0) {
+                    const stats = await Promise.all(unindexedFiles.map(async (file) => {
+                        const stat = await fs.stat(path.join(projectDir, file));
+                        return { file, sessionId: file.replace('.jsonl', ''), mtimeMs: stat.mtimeMs };
+                    }));
+                    fileEntries.push(...stats);
+                    // Backfill index in background so future requests skip stat for these files.
+                    // Deduplicate to prevent repeated fire-and-forget calls for the same session.
+                    for (const file of unindexedFiles) {
+                        const sid = file.replace('.jsonl', '');
+                        const key = `${projectSlug}:${sid}`;
+                        if (!SessionService.pendingBackfills.has(key)) {
+                            SessionService.pendingBackfills.add(key);
+                            this.updateSessionIndex(projectSlug, sid)
+                                .catch(() => { })
+                                .finally(() => SessionService.pendingBackfills.delete(key));
+                        }
+                    }
+                }
+                // Sort by modified time descending
+                fileEntries.sort((a, b) => b.mtimeMs - a.mtimeMs);
                 // When search is active, resolve cache misses for filtering
-                let candidates = fileStats;
+                let candidates = fileEntries;
                 if (queryLower) {
-                    const cacheMisses = fileStats.filter(({ sessionId }) => !indexMap.has(sessionId));
+                    const cacheMisses = fileEntries.filter(({ sessionId }) => !indexMap.has(sessionId));
                     if (cacheMisses.length > 0) {
                         await this.pMapWithLimit(cacheMisses, async ({ file, sessionId }) => {
                             const meta = await parseJSONLSessionMeta(path.join(projectDir, file));
@@ -300,7 +335,7 @@ export class SessionService {
                     }
                     // Pre-filter empty sessions
                     if (!includeEmpty) {
-                        candidates = fileStats.filter(({ sessionId }) => {
+                        candidates = fileEntries.filter(({ sessionId }) => {
                             const cached = indexMap.get(sessionId);
                             return cached ? !!cached.firstPrompt : false;
                         });
@@ -327,14 +362,16 @@ export class SessionService {
                         const contentHits = contentMatched.filter((e) => e !== null);
                         candidates = [...metadataFiltered, ...contentHits];
                         // Re-sort after merging
-                        candidates.sort((a, b) => b.stat.mtimeMs - a.stat.mtimeMs);
+                        candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
                     }
                     else {
                         candidates = metadataFiltered;
                     }
                     const topFiles = candidates.slice(offset, offset + limit);
-                    const sessions = topFiles.map(({ sessionId, stat }) => {
+                    // Stat only the page result files for accurate timestamps
+                    const sessions = await Promise.all(topFiles.map(async ({ file, sessionId }) => {
                         const cached = indexMap.get(sessionId);
+                        const stat = await fs.stat(path.join(projectDir, file));
                         return {
                             sessionId,
                             firstPrompt: this.truncateFirstPrompt(cached.firstPrompt),
@@ -342,13 +379,13 @@ export class SessionService {
                             created: stat.birthtime.toISOString(),
                             modified: stat.mtime.toISOString(),
                         };
-                    });
+                    }));
                     return { sessions, total: candidates.length };
                 }
                 // No search: use streaming pagination — resolve only until page is filled
                 // Pre-filter known-empty sessions from index cache
                 if (!includeEmpty) {
-                    candidates = fileStats.filter(({ sessionId }) => {
+                    candidates = fileEntries.filter(({ sessionId }) => {
                         const cached = indexMap.get(sessionId);
                         // Known empty from cache → exclude
                         if (cached && !cached.firstPrompt)
@@ -363,7 +400,7 @@ export class SessionService {
                 const sessions = [];
                 let skipped = 0;
                 let scannedCount = 0;
-                for (const { file, sessionId, stat } of candidates) {
+                for (const { file, sessionId } of candidates) {
                     scannedCount++;
                     const cached = indexMap.get(sessionId);
                     let firstPrompt;
@@ -389,6 +426,8 @@ export class SessionService {
                         continue;
                     }
                     if (sessions.length < limit) {
+                        // Stat only page result files for accurate timestamps
+                        const stat = await fs.stat(path.join(projectDir, file));
                         sessions.push({
                             sessionId,
                             firstPrompt: firstPrompt ? this.truncateFirstPrompt(firstPrompt) : '',
@@ -550,6 +589,9 @@ export class SessionService {
     async deleteSession(projectSlug, sessionId) {
         const filePath = this.getSessionFilePath(projectSlug, sessionId);
         await fs.unlink(filePath);
+        // Story 27.2: Clean up stored images for the deleted session
+        const { imageStorageService } = await import('./imageStorageService.js');
+        await imageStorageService.deleteSessionImages(projectSlug, sessionId);
         await this.removeFromSessionsIndex(projectSlug, sessionId);
     }
     /**
@@ -568,6 +610,9 @@ export class SessionService {
             try {
                 const filePath = this.getSessionFilePath(projectSlug, sessionId);
                 await fs.unlink(filePath);
+                // Story 27.2: Clean up stored images for the deleted session
+                const { imageStorageService } = await import('./imageStorageService.js');
+                await imageStorageService.deleteSessionImages(projectSlug, sessionId);
                 deleted++;
                 deletedIds.add(sessionId);
             }
@@ -647,6 +692,12 @@ export class SessionService {
     getSessionFilePath(projectSlug, sessionId) {
         return path.join(this.claudeProjectsDir, projectSlug, `${sessionId}.jsonl`);
     }
+    /**
+     * Get the project directory path for a given project slug
+     */
+    getProjectDir(projectSlug) {
+        return path.join(this.claudeProjectsDir, projectSlug);
+    }
     /**
      * Check if a session file exists
      * @param projectSlug The project slug
@@ -678,42 +729,37 @@ export class SessionService {
      * Get session messages with pagination
      * @param projectSlug The project slug
      * @param sessionId The session ID
-     * @param options Pagination options (limit, offset)
+     * @param options Pagination options (limit, offset, branchSelections)
      * @returns Messages with pagination info, or null if session not found
      */
     async getSessionMessages(projectSlug, sessionId, options = {}) {
-        const { limit = 50, offset = 0, streamStartedAt, runningStreamStartedAt } = options;
+        const { limit = 50, offset = 0, streamStartedAt, runningStreamStartedAt, branchSelections } = options;
         const filePath = this.getSessionFilePath(projectSlug, sessionId);
         if (!existsSync(filePath)) {
             return null;
         }
         const rawMessages = await parseJSONLFile(filePath);
-        const sorted = sortMessagesByParentUuid(rawMessages);
-        let transformed = transformToHistoryMessages(sorted);
+        // Build tree and extract active branch (Story 25.4)
+        const tree = buildRawMessageTree(rawMessages);
+        const effectiveSelections = branchSelections && Object.keys(branchSelections).length > 0
+            ? branchSelections
+            : getDefaultRawBranchSelections(tree.roots);
+        const { messages: activeBranchRaw, branchPoints } = getActiveRawBranch(tree.roots, effectiveSelections);
+        // Transform only active branch messages to HistoryMessages
+        let transformed = transformToHistoryMessages(activeBranchRaw, projectSlug, sessionId);
+        // branchInfo is attached by SessionBufferManager.reloadFromJSONL()
+        // after building the active branch, so all delivery paths get it.
         // If session has an active stream, exclude messages from the stream period.
-        // Those messages are covered by the active stream's buffer replay or by
-        // completedBuffer merge in the getMessages API (sessionController).
-        // This prevents duplicate tool/message cards when the client loads both
-        // JSONL history and buffer replay simultaneously.
+        // Those messages are delivered via SessionBufferManager (stream:history).
+        // This prevents duplicate tool/message cards.
         //
-        // IMPORTANT: User messages from the *running* stream's period are preserved
-        // so that trimMessagesAfterLastUser() on the client correctly identifies the
-        // triggering user message as the "last" user message. Without this, the client
-        // trims the previous assistant reply because the SDK writes the user message
-        // to JSONL after the stream starts (timestamp >= streamStartedAt).
-        //
-        // Only runningStreamStartedAt is used for user preservation (not the combined
-        // streamStartedAt which may include a completed buffer's earlier start time).
-        // Completed turn messages from the buffer period are provided via the API's
-        // completedBuffer merge, not via WebSocket buffer replay.
+        // If session has an active stream, exclude messages from the stream period
+        // to prevent duplicates with SessionBufferManager data.
         if (streamStartedAt) {
             transformed = transformed.filter((m) => {
                 const ts = new Date(m.timestamp).getTime();
                 if (ts < streamStartedAt)
                     return true;
-                // When a stream is actively running, preserve user messages from
-                // that stream's period so trimMessagesAfterLastUser() works correctly.
-                // Not needed for completed-buffer-only (no trimming runs on inactive streams).
                 if (runningStreamStartedAt && m.type === 'user' && ts >= runningStreamStartedAt)
                     return true;
                 return false;
@@ -726,7 +772,7 @@ export class SessionService {
         const startIndex = Math.max(0, total - offset - limit);
         const endIndex = Math.max(0, total - offset);
         const paginated = transformed.slice(startIndex, endIndex);
-        // Scan full message list (reverse) for last agent command in user messages.
+        // Scan active branch messages (reverse) for last agent command in user messages.
         // Must match agent command pattern (:agents:), not any slash command —
         // otherwise non-agent commands like /commit would shadow the real agent.
         let lastAgentCommand = null;
@@ -745,8 +791,91 @@ export class SessionService {
                 hasMore: startIndex > 0, // There are older messages to load
             },
             lastAgentCommand,
+            branchPoints,
         };
     }
+    /**
+     * Get the UUID of the first root message in a session JSONL.
+     * Currently unused — root-level edit branching is disabled because the SDK's
+     * resumeSessionAt only accepts assistant message UUIDs, and there is no
+     * assistant before the first user message.
+     */
+    async getRootMessageUuid(projectSlug, sessionId) {
+        const filePath = this.getSessionFilePath(projectSlug, sessionId);
+        if (!existsSync(filePath))
+            return null;
+        const stream = createReadStream(filePath, { encoding: 'utf-8' });
+        const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+        try {
+            for await (const line of rl) {
+                if (!line.trim())
+                    continue;
+                try {
+                    const obj = JSON.parse(line);
+                    if (!obj.parentUuid && obj.uuid) {
+                        return obj.uuid;
+                    }
+                }
+                catch {
+                    // Skip malformed lines
+                }
+            }
+        }
+        finally {
+            rl.close();
+            stream.destroy();
+        }
+        return null;
+    }
+    /**
+     * Delete phantom sessions — JSONL files that contain only metadata entries
+     * (e.g. file-history-snapshot) without any user/assistant conversation messages.
+     * These are created when SDK query() writes its initial checkpoint but fails
+     * before processing the user message (due to rate-limit, auth, abort, etc.).
+     *
+     * @returns Number of phantom sessions deleted
+     */
+    async cleanupPhantomSessions(projectSlug) {
+        const projectDir = path.join(this.claudeProjectsDir, projectSlug);
+        if (!existsSync(projectDir))
+            return 0;
+        const files = await fs.readdir(projectDir);
+        const jsonlFiles = files.filter(f => f.endsWith('.jsonl'));
+        let deleted = 0;
+        for (const file of jsonlFiles) {
+            const filePath = path.join(projectDir, file);
+            try {
+                const content = await fs.readFile(filePath, 'utf-8');
+                const hasConversation = content.includes('"type":"user"') || content.includes('"type":"assistant"');
+                if (!hasConversation) {
+                    await fs.unlink(filePath);
+                    deleted++;
+                }
+            }
+            catch {
+                // Skip files that can't be read or deleted
+            }
+        }
+        // Rebuild index to remove stale entries for deleted files
+        if (deleted > 0) {
+            const indexPath = path.join(projectDir, 'sessions-index.json');
+            try {
+                const indexContent = await fs.readFile(indexPath, 'utf-8');
+                const index = JSON.parse(indexContent);
+                if (index.entries && Array.isArray(index.entries)) {
+                    const before = index.entries.length;
+                    index.entries = index.entries.filter(e => existsSync(path.join(projectDir, `${e.sessionId}.jsonl`)));
+                    if (index.entries.length < before) {
+                        await fs.writeFile(indexPath, JSON.stringify(index, null, 2), 'utf-8');
+                    }
+                }
+            }
+            catch {
+                // Index may not exist or be corrupt — skip
+            }
+        }
+        return deleted;
+    }
 }
 // Singleton export for controllers (Story 3.3)
 export const sessionService = new SessionService();