@machina.ai/cell-cli-core 1.38.1-rc2 → 1.40.1-rc2

package/dist/src/services/sandboxedFileSystemService.js

@@ -48,40 +48,45 @@ export class SandboxedFileSystemService {
                 allowedPaths: [safePath],
             },
         });
-        return new Promise((resolve, reject) => {
-            // Direct spawn is necessary here for streaming large file contents.
-            const child = spawn(prepared.program, prepared.args, {
-                cwd: this.cwd,
-                env: prepared.env,
-            });
-            let output = '';
-            let error = '';
-            child.stdout?.on('data', (data) => {
-                output += data.toString();
-            });
-            child.stderr?.on('data', (data) => {
-                error += data.toString();
-            });
-            child.on('close', (code) => {
-                if (code === 0) {
-                    resolve(output);
-                }
-                else {
-                    const isEnoent = error.toLowerCase().includes('no such file or directory') ||
-                        error.toLowerCase().includes('enoent') ||
-                        error.toLowerCase().includes('could not find file') ||
-                        error.toLowerCase().includes('could not find a part of the path');
-                    const err = new Error(`Sandbox Error: read_file failed for '${filePath}'. Exit code ${code}. ${error ? 'Details: ' + error : ''}`);
-                    if (isEnoent) {
-                        Object.assign(err, { code: 'ENOENT' });
+        try {
+            return await new Promise((resolve, reject) => {
+                // Direct spawn is necessary here for streaming large file contents.
+                const child = spawn(prepared.program, prepared.args, {
+                    cwd: this.cwd,
+                    env: prepared.env,
+                });
+                let output = '';
+                let error = '';
+                child.stdout?.on('data', (data) => {
+                    output += data.toString();
+                });
+                child.stderr?.on('data', (data) => {
+                    error += data.toString();
+                });
+                child.on('close', (code) => {
+                    if (code === 0) {
+                        resolve(output);
                     }
-                    reject(err);
-                }
-            });
-            child.on('error', (err) => {
-                reject(new Error(`Sandbox Error: Failed to spawn read_file for '${filePath}': ${err.message}`));
+                    else {
+                        const isEnoent = error.toLowerCase().includes('no such file or directory') ||
+                            error.toLowerCase().includes('enoent') ||
+                            error.toLowerCase().includes('could not find file') ||
+                            error.toLowerCase().includes('could not find a part of the path');
+                        const err = new Error(`Sandbox Error: read_file failed for '${filePath}'. Exit code ${code}. ${error ? 'Details: ' + error : ''}`);
+                        if (isEnoent) {
+                            Object.assign(err, { code: 'ENOENT' });
+                        }
+                        reject(err);
+                    }
+                });
+                child.on('error', (err) => {
+                    reject(new Error(`Sandbox Error: Failed to spawn read_file for '${filePath}': ${err.message}`));
+                });
             });
-        });
+        }
+        finally {
+            prepared.cleanup?.();
+        }
     }
     async writeTextFile(filePath, content) {
         const safePath = this.sanitizeAndValidatePath(filePath);
@@ -99,37 +104,42 @@ export class SandboxedFileSystemService {
                 },
             },
         });
-        return new Promise((resolve, reject) => {
-            // Direct spawn is necessary here for streaming large file contents.
-            const child = spawn(prepared.program, prepared.args, {
-                cwd: this.cwd,
-                env: prepared.env,
-            });
-            child.stdin?.on('error', (err) => {
-                // Silently ignore EPIPE errors on stdin, they will be caught by the process error/close listeners
-                if (isNodeError(err) && err.code === 'EPIPE') {
-                    return;
-                }
-                debugLogger.error(`Sandbox Error: stdin error for '${filePath}': ${err instanceof Error ? err.message : String(err)}`);
-            });
-            child.stdin?.write(content);
-            child.stdin?.end();
-            let error = '';
-            child.stderr?.on('data', (data) => {
-                error += data.toString();
-            });
-            child.on('close', (code) => {
-                if (code === 0) {
-                    resolve();
-                }
-                else {
-                    reject(new Error(`Sandbox Error: write_file failed for '${filePath}'. Exit code ${code}. ${error ? 'Details: ' + error : ''}`));
-                }
-            });
-            child.on('error', (err) => {
-                reject(new Error(`Sandbox Error: Failed to spawn write_file for '${filePath}': ${err.message}`));
+        try {
+            return await new Promise((resolve, reject) => {
+                // Direct spawn is necessary here for streaming large file contents.
+                const child = spawn(prepared.program, prepared.args, {
+                    cwd: this.cwd,
+                    env: prepared.env,
+                });
+                child.stdin?.on('error', (err) => {
+                    // Silently ignore EPIPE errors on stdin, they will be caught by the process error/close listeners
+                    if (isNodeError(err) && err.code === 'EPIPE') {
+                        return;
+                    }
+                    debugLogger.error(`Sandbox Error: stdin error for '${filePath}': ${err instanceof Error ? err.message : String(err)}`);
+                });
+                child.stdin?.write(content);
+                child.stdin?.end();
+                let error = '';
+                child.stderr?.on('data', (data) => {
+                    error += data.toString();
+                });
+                child.on('close', (code) => {
+                    if (code === 0) {
+                        resolve();
+                    }
+                    else {
+                        reject(new Error(`Sandbox Error: write_file failed for '${filePath}'. Exit code ${code}. ${error ? 'Details: ' + error : ''}`));
+                    }
+                });
+                child.on('error', (err) => {
+                    reject(new Error(`Sandbox Error: Failed to spawn write_file for '${filePath}': ${err.message}`));
+                });
             });
-        });
+        }
+        finally {
+            prepared.cleanup?.();
+        }
     }
 }
 //# sourceMappingURL=sandboxedFileSystemService.js.map

package/dist/src/services/sandboxedFileSystemService.js.map

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

package/dist/src/services/sessionSummaryUtils.d.ts

@@ -5,7 +5,7 @@
  */
 import type { Config } from '../config/config.js';
 /**
- * Finds the most recently created session that needs a summary.
+ * Finds the most recently updated previous session that still needs a summary.
  * Returns the path if it needs a summary, null otherwise.
  */
 export declare function getPreviousSession(config: Config): Promise<string | null>;

package/dist/src/services/sessionSummaryUtils.js

@@ -6,18 +6,55 @@
 import { SessionSummaryService } from './sessionSummaryService.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { debugLogger } from '../utils/debugLogger.js';
-import { SESSION_FILE_PREFIX, } from './chatRecordingService.js';
+import { SESSION_FILE_PREFIX, loadConversationRecord, } from './chatRecordingService.js';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 const MIN_MESSAGES_FOR_SUMMARY = 1;
+function isSupportedSessionFile(fileName) {
+    return (fileName.startsWith(SESSION_FILE_PREFIX) &&
+        (fileName.endsWith('.json') || fileName.endsWith('.jsonl')));
+}
+async function listSessionFileCandidates(chatsDir) {
+    const allFiles = await fs.readdir(chatsDir);
+    const candidates = [];
+    for (const fileName of allFiles) {
+        if (!isSupportedSessionFile(fileName))
+            continue;
+        const filePath = path.join(chatsDir, fileName);
+        try {
+            const stat = await fs.stat(filePath);
+            if (!stat.isFile())
+                continue;
+            candidates.push({ filePath, mtimeMs: stat.mtimeMs });
+        }
+        catch {
+            // Skip files that disappeared between readdir and stat.
+        }
+    }
+    candidates.sort((a, b) => {
+        const mtimeDelta = b.mtimeMs - a.mtimeMs;
+        if (mtimeDelta !== 0) {
+            return mtimeDelta;
+        }
+        return path.basename(b.filePath).localeCompare(path.basename(a.filePath));
+    });
+    return candidates;
+}
+function getSessionTimestampMs(session) {
+    if (!session.lastUpdated)
+        return 0;
+    const parsed = Date.parse(session.lastUpdated);
+    return Number.isNaN(parsed) ? 0 : parsed;
+}
 /**
  * Generates and saves a summary for a session file.
  */
 async function generateAndSaveSummary(config, sessionPath) {
-    // Read session file
-    const content = await fs.readFile(sessionPath, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const conversation = JSON.parse(content);
+    const conversation = await loadConversationRecord(sessionPath);
+    if (!conversation) {
+        debugLogger.debug(`[SessionSummary] Could not read session ${sessionPath}`);
+        return;
+    }
     // Skip if summary already exists
     if (conversation.summary) {
         debugLogger.debug(`[SessionSummary] Summary already exists for ${sessionPath}, skipping`);
@@ -44,23 +81,37 @@ async function generateAndSaveSummary(config, sessionPath) {
         debugLogger.warn(`[SessionSummary] Failed to generate summary for ${sessionPath}`);
         return;
     }
-    // Re-read the file before writing to handle race conditions
-    const freshContent = await fs.readFile(sessionPath, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const freshConversation = JSON.parse(freshContent);
+    // Re-read the file before writing to handle race conditions. For JSONL we
+    // only need the metadata; for legacy JSON we need the full record so we can
+    // round-trip the messages back to disk.
+    const isJsonl = sessionPath.endsWith('.jsonl');
+    const freshConversation = await loadConversationRecord(sessionPath, {
+        metadataOnly: isJsonl,
+    });
+    if (!freshConversation) {
+        debugLogger.debug(`[SessionSummary] Could not re-read ${sessionPath}`);
+        return;
+    }
     // Check if summary was added by another process
     if (freshConversation.summary) {
         debugLogger.debug(`[SessionSummary] Summary was added by another process for ${sessionPath}`);
         return;
     }
-    // Add summary and write back
-    freshConversation.summary = summary;
-    freshConversation.lastUpdated = new Date().toISOString();
-    await fs.writeFile(sessionPath, JSON.stringify(freshConversation, null, 2));
+    if (isJsonl) {
+        await fs.appendFile(sessionPath, `${JSON.stringify({ $set: { summary } })}\n`);
+    }
+    else {
+        const lastUpdated = freshConversation.lastUpdated;
+        await fs.writeFile(sessionPath, JSON.stringify({
+            ...freshConversation,
+            summary,
+            lastUpdated,
+        }, null, 2));
+    }
     debugLogger.debug(`[SessionSummary] Saved summary for ${sessionPath}: "${summary}"`);
 }
 /**
- * Finds the most recently created session that needs a summary.
+ * Finds the most recently updated previous session that still needs a summary.
  * Returns the path if it needs a summary, null otherwise.
  */
 export async function getPreviousSession(config) {
@@ -74,39 +125,61 @@ export async function getPreviousSession(config) {
             debugLogger.debug('[SessionSummary] No chats directory found');
             return null;
         }
-        // List session files
-        const allFiles = await fs.readdir(chatsDir);
-        const sessionFiles = allFiles.filter((f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'));
+        const sessionFiles = await listSessionFileCandidates(chatsDir);
         if (sessionFiles.length === 0) {
             debugLogger.debug('[SessionSummary] No session files found');
             return null;
         }
-        // Sort by filename descending (most recently created first)
-        // Filename format: session-YYYY-MM-DDTHH-MM-XXXXXXXX.json
-        sessionFiles.sort((a, b) => b.localeCompare(a));
-        // Check the most recently created session
-        const mostRecentFile = sessionFiles[0];
-        const filePath = path.join(chatsDir, mostRecentFile);
-        try {
-            const content = await fs.readFile(filePath, 'utf-8');
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            const conversation = JSON.parse(content);
-            if (conversation.summary) {
-                debugLogger.debug('[SessionSummary] Most recent session already has summary');
-                return null;
+        let bestPreviousSession = null;
+        for (const { filePath, mtimeMs } of sessionFiles) {
+            const bestTimestamp = bestPreviousSession
+                ? getSessionTimestampMs(bestPreviousSession.conversation)
+                : null;
+            if (bestPreviousSession &&
+                bestTimestamp !== null &&
+                bestTimestamp > 0 &&
+                mtimeMs < bestTimestamp) {
+                break;
             }
-            // Only generate summaries for sessions with more than 1 user message
-            const userMessageCount = conversation.messages.filter((m) => m.type === 'user').length;
-            if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
-                debugLogger.debug(`[SessionSummary] Most recent session has ${userMessageCount} user message(s), skipping (need more than ${MIN_MESSAGES_FOR_SUMMARY})`);
-                return null;
+            try {
+                const conversation = await loadConversationRecord(filePath, {
+                    metadataOnly: true,
+                });
+                if (!conversation)
+                    continue;
+                if (conversation.sessionId === config.getSessionId())
+                    continue;
+                if (conversation.summary)
+                    continue;
+                // Only generate summaries for sessions with more than 1 user message.
+                // `loadConversationRecord` populates `userMessageCount` in metadataOnly
+                // mode; fall back to scanning messages for the legacy fallback path.
+                const userMessageCount = conversation.userMessageCount ??
+                    conversation.messages.filter((message) => message.type === 'user')
+                        .length;
+                if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
+                    continue;
+                }
+                if (!bestPreviousSession ||
+                    getSessionTimestampMs(conversation) >
+                        getSessionTimestampMs(bestPreviousSession.conversation) ||
+                    (getSessionTimestampMs(conversation) ===
+                        getSessionTimestampMs(bestPreviousSession.conversation) &&
+                        path
+                            .basename(filePath)
+                            .localeCompare(path.basename(bestPreviousSession.filePath)) > 0)) {
+                    bestPreviousSession = { filePath, conversation };
+                }
+            }
+            catch {
+                // Ignore unreadable session files
             }
-            return filePath;
         }
-        catch {
-            debugLogger.debug('[SessionSummary] Could not read most recent session');
+        if (!bestPreviousSession) {
+            debugLogger.debug('[SessionSummary] No previous session needs summary generation');
             return null;
         }
+        return bestPreviousSession.filePath;
     }
     catch (error) {
         debugLogger.debug(`[SessionSummary] Error finding previous session: ${error instanceof Error ? error.message : String(error)}`);

package/dist/src/services/sessionSummaryUtils.js.map

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