@xelth/eck-snapshot 5.9.0 → 6.6.0

package/src/cli/commands/updateSnapshot.js

@@ -5,11 +5,12 @@ import chalk from 'chalk';
 import isBinaryPath from 'is-binary-path';
 import { getGitAnchor, getChangedFiles } from '../../utils/gitUtils.js';
 import { loadSetupConfig } from '../../config.js';
-import { readFileWithSizeCheck, parseSize, formatSize, matchesPattern, loadGitignore, generateTimestamp, getShortRepoName } from '../../utils/fileUtils.js';
+import { readFileWithSizeCheck, parseSize, formatSize, matchesPattern, loadGitignore, generateTimestamp, getShortRepoName, ensureSnapshotsInGitignore, readMlModelMetadata } from '../../utils/fileUtils.js';
 import { detectProjectType, getProjectSpecificFiltering } from '../../utils/projectDetector.js';
 import { execa } from 'execa';
 import { fileURLToPath } from 'url';
 import { pushTelemetry } from '../../utils/telemetry.js';
+import { syncTokenWeights } from '../../utils/tokenEstimator.js';
 
 // Mirror the same hidden-path guard used in createSnapshot.js
 function isHiddenPath(filePath) {
@@ -36,6 +37,15 @@ async function autoCommit(repoPath) {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+function resolveBaseHash(base) {
+  if (!base) return null;
+  const basename = path.basename(base, '.md');
+  const match = basename.match(/_([0-9a-f]{7,40})_/);
+  if (match) return match[1];
+  if (/^[0-9a-f]{7,40}$/i.test(base)) return base;
+  throw new Error(`Invalid --base value: "${base}". Expected a snapshot filename or a git commit hash.`);
+}
+
 // Shared logic to generate the snapshot content string
 async function generateSnapshotContent(repoPath, changedFiles, anchor, config, gitignore) {
   let contentOutput = '';
@@ -45,13 +55,45 @@ async function generateSnapshotContent(repoPath, changedFiles, anchor, config, g
   // Include Agent Report if it exists and hasn't been embedded yet
   let agentReport = null;
   const reportPath = path.join(repoPath, '.eck', 'lastsnapshot', 'AnswerToSA.md');
+  const lockPath = path.join(repoPath, '.eck', 'lastsnapshot', 'AnswerToSA.lock');
   try {
+    // Use atomic directory creation as a lock to prevent race conditions
+    await fs.mkdir(lockPath);
     const reportContent = await fs.readFile(reportPath, 'utf-8');
+    
     if (!reportContent.includes('[SYSTEM: EMBEDDED]')) {
       agentReport = reportContent;
+
+      // Immediately mark as embedded to release the race window
       await fs.appendFile(reportPath, '\n\n[SYSTEM: EMBEDDED]\n', 'utf-8');
+
+      // Auto-Journaling: prepend agent report to JOURNAL.md
+      const journalPath = path.join(repoPath, '.eck', 'JOURNAL.md');
+      try {
+        const dateStr = new Date().toISOString().split('T')[0];
+        const journalEntry = `## ${dateStr} — Agent Report\n\n${reportContent.trim()}\n`;
+
+        let existingJournal = '';
+        try {
+          existingJournal = await fs.readFile(journalPath, 'utf-8');
+        } catch (e) { /* might not exist */ }
+
+        const insertPos = existingJournal.indexOf('\n## ');
+        if (insertPos !== -1) {
+          const newJournal = existingJournal.slice(0, insertPos) + '\n\n' + journalEntry + existingJournal.slice(insertPos);
+          await fs.writeFile(journalPath, newJournal, 'utf-8');
+        } else {
+          await fs.writeFile(journalPath, (existingJournal ? existingJournal + '\n\n' : '') + journalEntry + '\n', 'utf-8');
+        }
+      } catch (je) {
+        console.warn('Could not auto-update JOURNAL.md', je.message);
+      }
     }
-  } catch (e) { /* File not found or unreadable */ }
+    await fs.rmdir(lockPath);
+  } catch (e) { 
+    // File not found or locked by another process
+    try { await fs.rmdir(lockPath); } catch (_) {} 
+  }
 
   const cleanDirsToIgnore = (config.dirsToIgnore || []).map(d => d.replace(/\/$/, ''));
 
@@ -61,8 +103,12 @@ async function generateSnapshotContent(repoPath, changedFiles, anchor, config, g
     // Skip hidden paths (.idea/, .vscode/, etc.) — mirrors createSnapshot.js
     if (isHiddenPath(normalizedPath)) continue;
 
+    const mlExt = path.extname(filePath).toLowerCase();
+    const ML_EXTENSIONS = ['.safetensors', '.onnx', '.pt', '.pth', '.h5', '.pb', '.bin', '.ckpt', '.gguf'];
+    const isMlModel = ML_EXTENSIONS.includes(mlExt);
+
     // Skip binary files — mirrors createSnapshot.js
-    if (isBinaryPath(filePath)) continue;
+    if (isBinaryPath(filePath) && !isMlModel) continue;
 
     const pathParts = normalizedPath.split('/');
     let isIgnoredDir = false;
@@ -82,9 +128,26 @@ async function generateSnapshotContent(repoPath, changedFiles, anchor, config, g
 
     try {
       const fullPath = path.join(repoPath, filePath);
-      const content = await readFileWithSizeCheck(fullPath, parseSize(config.maxFileSize));
+
+      // Explicitly check if file was deleted
+      try {
+        await fs.access(fullPath);
+      } catch (accessErr) {
+        contentOutput += `--- File: /${normalizedPath} ---\n\n[FILE DELETED]\n\n`;
+        fileList.push(`- ${normalizedPath} (Deleted)`);
+        includedCount++;
+        continue;
+      }
+
+      let content;
+      if (isMlModel) {
+          content = await readMlModelMetadata(fullPath);
+      } else {
+          content = await readFileWithSizeCheck(fullPath, parseSize(config.maxFileSize));
+      }
+
       contentOutput += `--- File: /${normalizedPath} ---\n\n${content}\n\n`;
-      fileList.push(`- ${normalizedPath}`);
+      fileList.push(`- ${normalizedPath} (Modified/Added)`);
       includedCount++;
     } catch (e) { /* Skip */ }
   }
@@ -99,7 +162,10 @@ async function generateSnapshotContent(repoPath, changedFiles, anchor, config, g
     reportSection = `\n---\n### 📨 MESSAGE FROM EXECUTION AGENT\n\n${agentReport}\n---\n\n`;
   }
 
-  header = header.replace('{{anchor}}', anchor.substring(0, 7))
+  const repoName = path.basename(repoPath);
+
+  header = header.replace('{{repoName}}', repoName)
+    .replace('{{anchor}}', anchor.substring(0, 7))
     .replace('{{timestamp}}', new Date().toLocaleString())
     .replace('{{fileList}}', fileList.join('\n'));
 
@@ -116,19 +182,31 @@ async function generateSnapshotContent(repoPath, changedFiles, anchor, config, g
 export async function updateSnapshot(repoPath, options) {
   const spinner = ora('Generating update snapshot...').start();
   try {
-    const anchor = await getGitAnchor(repoPath);
+    const isCustomBase = !!options.base;
+    const anchor = resolveBaseHash(options.base) || await getGitAnchor(repoPath);
+
     if (!anchor) {
       throw new Error('No snapshot anchor found. Run a full snapshot first: eck-snapshot snapshot');
     }
 
     // Auto-commit any uncommitted changes so they appear in the diff
-    const didCommit = await autoCommit(repoPath);
-    if (didCommit) {
-      spinner.info('Auto-committed uncommitted changes.');
-      spinner.start('Generating update snapshot...');
+    let didCommit = false;
+    if (!options.fail) {
+      didCommit = await autoCommit(repoPath);
+      if (didCommit) {
+        spinner.info('Auto-committed uncommitted changes.');
+      }
+    } else {
+      spinner.info('Fail flag passed: skipping auto-commit.');
+    }
+
+    if (isCustomBase) {
+      spinner.info(`Using custom base: ${anchor.substring(0, 7)} (from ${path.basename(options.base)})`);
     }
 
-    const changedFiles = await getChangedFiles(repoPath, anchor);
+    spinner.start('Generating update snapshot...');
+
+    const changedFiles = await getChangedFiles(repoPath, anchor, options.fail);
     if (changedFiles.length === 0) {
       spinner.succeed('No changes detected since last full snapshot.');
       return;
@@ -154,27 +232,32 @@ export async function updateSnapshot(repoPath, options) {
     const { fullContent, includedCount, agentReport } = await generateSnapshotContent(repoPath, changedFiles, anchor, config, gitignore);
 
     // Determine sequence number
-    let seqNum = 1;
-    const counterPath = path.join(repoPath, '.eck', 'update_seq');
-    try {
-      const seqData = await fs.readFile(counterPath, 'utf-8');
-      const [savedHash, savedCount] = seqData.split(':');
-      if (savedHash && savedHash.trim() === anchor.substring(0, 7).trim()) {
-        seqNum = parseInt(savedCount || '0') + 1;
-      }
-    } catch (e) {}
+    let seqStr = 'custom';
+    if (!isCustomBase) {
+      let seqNum = 1;
+      const counterPath = path.join(repoPath, '.eck', 'update_seq');
+      try {
+        const seqData = await fs.readFile(counterPath, 'utf-8');
+        const [savedHash, savedCount] = seqData.split(':');
+        if (savedHash && savedHash.trim() === anchor.substring(0, 7).trim()) {
+          seqNum = parseInt(savedCount || '0') + 1;
+        }
+      } catch (e) {}
 
-    try {
-      await fs.writeFile(counterPath, `${anchor.substring(0, 7)}:${seqNum}`);
-    } catch (e) {}
+      try {
+        await fs.writeFile(counterPath, `${anchor.substring(0, 7)}:${seqNum}`);
+      } catch (e) {}
+      seqStr = seqNum.toString();
+    }
 
     const timestamp = generateTimestamp();
     const shortRepoName = getShortRepoName(path.basename(repoPath));
     const sizeKB = Math.max(1, Math.round(Buffer.byteLength(fullContent, 'utf-8') / 1024));
-    const outputFilename = `eck${shortRepoName}${timestamp}_${anchor.substring(0, 7)}_up${seqNum}_${sizeKB}kb.md`;
+    const outputFilename = `eck${shortRepoName}${timestamp}_${anchor.substring(0, 7)}_up${seqStr}_${sizeKB}kb.md`;
     const outputPath = path.join(repoPath, '.eck', 'snapshots', outputFilename);
 
     await fs.mkdir(path.dirname(outputPath), { recursive: true });
+    await ensureSnapshotsInGitignore(repoPath);
     await fs.writeFile(outputPath, fullContent);
 
     spinner.succeed(`Update snapshot created: .eck/snapshots/${outputFilename}`);
@@ -216,18 +299,22 @@ export async function updateSnapshot(repoPath, options) {
 }
 
 // New Silent/JSON command for Agents
-export async function updateSnapshotJson(repoPath) {
+export async function updateSnapshotJson(repoPath, options = {}) {
   try {
-    const anchor = await getGitAnchor(repoPath);
+    const isCustomBase = !!options.base;
+    const anchor = resolveBaseHash(options.base) || await getGitAnchor(repoPath);
+    
     if (!anchor) {
       console.log(JSON.stringify({ status: "error", message: "No snapshot anchor found" }));
       return;
     }
 
     // Auto-commit any uncommitted changes
-    await autoCommit(repoPath);
+    if (!options.fail) {
+      await autoCommit(repoPath);
+    }
 
-    const changedFiles = await getChangedFiles(repoPath, anchor);
+    const changedFiles = await getChangedFiles(repoPath, anchor, !!options.fail);
     if (changedFiles.length === 0) {
       console.log(JSON.stringify({ status: "no_changes", message: "No changes detected" }));
       return;
@@ -252,26 +339,31 @@ export async function updateSnapshotJson(repoPath) {
 
     const { fullContent, includedCount, agentReport } = await generateSnapshotContent(repoPath, changedFiles, anchor, config, gitignore);
 
-    let seqNum = 1;
-    const counterPath = path.join(repoPath, '.eck', 'update_seq');
-    try {
-      const seqData = await fs.readFile(counterPath, 'utf-8');
-      const [savedHash, savedCount] = seqData.split(':');
-      if (savedHash && savedHash.trim() === anchor.substring(0, 7).trim()) {
-        seqNum = parseInt(savedCount || '0') + 1;
-      }
-    } catch (e) {}
+    let seqStr = 'custom';
+    if (!isCustomBase) {
+      let seqNum = 1;
+      const counterPath = path.join(repoPath, '.eck', 'update_seq');
+      try {
+        const seqData = await fs.readFile(counterPath, 'utf-8');
+        const [savedHash, savedCount] = seqData.split(':');
+        if (savedHash && savedHash.trim() === anchor.substring(0, 7).trim()) {
+          seqNum = parseInt(savedCount || '0') + 1;
+        }
+      } catch (e) {}
 
-    try {
-      await fs.writeFile(counterPath, `${anchor.substring(0, 7)}:${seqNum}`);
-    } catch (e) {}
+      try {
+        await fs.writeFile(counterPath, `${anchor.substring(0, 7)}:${seqNum}`);
+      } catch (e) {}
+      seqStr = seqNum.toString();
+    }
 
     const timestamp = generateTimestamp();
     const shortRepoName = getShortRepoName(path.basename(repoPath));
     const sizeKB = Math.max(1, Math.round(Buffer.byteLength(fullContent, 'utf-8') / 1024));
-    const outputFilename = `eck${shortRepoName}${timestamp}_${anchor.substring(0, 7)}_up${seqNum}_${sizeKB}kb.md`;
+    const outputFilename = `eck${shortRepoName}${timestamp}_${anchor.substring(0, 7)}_up${seqStr}_${sizeKB}kb.md`;
     const outputPath = path.join(repoPath, '.eck', 'snapshots', outputFilename);
     await fs.mkdir(path.dirname(outputPath), { recursive: true });
+    await ensureSnapshotsInGitignore(repoPath);
     await fs.writeFile(outputPath, fullContent);
 
     // --- FEATURE: Active Snapshot (.eck/lastsnapshot/) ---
@@ -301,8 +393,9 @@ export async function updateSnapshotJson(repoPath) {
       timestamp: timestamp
     }));
 
-    // Auto-push telemetry (fire and forget so it doesn't break JSON output)
+    // Auto-push telemetry and sync weights (fire and forget so it doesn't break JSON output)
     pushTelemetry(repoPath, true).catch(() => {});
+    syncTokenWeights(true).catch(() => {});
 
   } catch (error) {
     console.log(JSON.stringify({ status: "error", message: error.message }));

package/src/core/depthConfig.js

@@ -0,0 +1,54 @@
+/**
+ * Shared depth configuration for link and scout commands.
+ * Scale: 0-9
+ *
+ * @param {number} depth - Depth level (0-9)
+ * @returns {object} Configuration object with mode settings
+ */
+export function getDepthConfig(depth) {
+  const d = Math.max(0, Math.min(9, parseInt(depth, 10) || 0));
+
+  if (d === 0) {
+    return { mode: 'tree', skipContent: true };
+  }
+
+  if (d >= 1 && d <= 4) {
+    const linesMap = { 1: 10, 2: 30, 3: 60, 4: 100 };
+    return { mode: 'truncated', maxLinesPerFile: linesMap[d], skeleton: false };
+  }
+
+  if (d === 5) {
+    return { mode: 'skeleton', skeleton: true, preserveDocs: false, maxLinesPerFile: 0 };
+  }
+
+  if (d === 6) {
+    return { mode: 'skeleton+docs', skeleton: true, preserveDocs: true, maxLinesPerFile: 0 };
+  }
+
+  if (d === 7) {
+    return { mode: 'full', skeleton: false, maxLinesPerFile: 500 };
+  }
+
+  if (d === 8) {
+    return { mode: 'full', skeleton: false, maxLinesPerFile: 1000 };
+  }
+
+  // d === 9
+  return { mode: 'full', skeleton: false, maxLinesPerFile: 0 };
+}
+
+/**
+ * Human-readable depth scale table for documentation/headers.
+ */
+export const DEPTH_SCALE = [
+  { depth: 0, mode: 'Tree only',        description: 'Directory structure, no file contents' },
+  { depth: 1, mode: 'Truncated 10',     description: '10 lines per file (imports/header)' },
+  { depth: 2, mode: 'Truncated 30',     description: '30 lines per file' },
+  { depth: 3, mode: 'Truncated 60',     description: '60 lines per file' },
+  { depth: 4, mode: 'Truncated 100',    description: '100 lines per file' },
+  { depth: 5, mode: 'Skeleton',         description: 'Function/class signatures only' },
+  { depth: 6, mode: 'Skeleton + docs',  description: 'Signatures + docstrings/comments' },
+  { depth: 7, mode: 'Full (compact)',   description: 'Full content, truncated at 500 lines' },
+  { depth: 8, mode: 'Full (standard)',  description: 'Full content, truncated at 1000 lines' },
+  { depth: 9, mode: 'Full (unlimited)', description: 'Everything, no limits' },
+];