@cordfuse/crosstalk 6.0.0-alpha.5 → 6.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cordfuse/crosstalk",
-  "version": "6.0.0-alpha.5",
+  "version": "6.0.0-alpha.6",
   "description": "Crosstalk runtime — async messaging between agents over git, across machines.",
   "type": "module",
   "license": "MIT",

package/src/dlq.ts

@@ -13,6 +13,7 @@ import {
 } from 'fs';
 import { resolve, join, dirname } from 'path';
 import { pathToFileURL } from 'url';
+import { spawnSync } from 'child_process';
 import { now } from './filenames.js';
 import { serializeFrontmatter, parseFrontmatter } from './frontmatter.js';
 import { stateDir, cursorPath } from './state.js';
@@ -162,16 +163,36 @@ if (isEntry) {
       process.exit(1);
     }
     const { data } = parseFrontmatter<DlqEntry>(readFileSync(path, 'utf-8'));
-    const cursor = cursorPath(transportRoot, data.actor, data.channel);
-    if (existsSync(cursor)) {
-      mkdirSync(dirname(cursor), { recursive: true });
-      writeFileSync(cursor, '');
+    const cursorFile = cursorPath(transportRoot, data.actor, data.channel);
+
+    // Find the commit that introduced the failed message and rewind to its
+    // parent. This ensures the next dispatch tick re-sees the message.
+    // Fallback: if git log fails, wipe the cursor so a full re-scan runs
+    // (less targeted but still recovers the message).
+    const relPath = `data/channels/${data.channel}/${data.messageRelPath}`;
+    const logResult = spawnSync('git', ['log', '--format=%H', '-1', '--', relPath], {
+      cwd: transportRoot,
+      encoding: 'utf-8',
+    });
+    const msgCommit = logResult.status === 0 ? logResult.stdout.trim() : '';
+    let rewindTo = '';
+    if (msgCommit) {
+      const parentResult = spawnSync('git', ['rev-parse', `${msgCommit}^`], {
+        cwd: transportRoot,
+        encoding: 'utf-8',
+      });
+      if (parentResult.status === 0) rewindTo = parentResult.stdout.trim();
     }
+
+    mkdirSync(dirname(cursorFile), { recursive: true });
+    writeFileSync(cursorFile, rewindTo ? rewindTo + '\n' : '');
+
     if (data.quarantined) {
       data.quarantined = false;
       writeFileSync(path, serializeFrontmatter(data as unknown as Record<string, unknown>, data.error));
     }
-    console.log(`Retried ${retryId}: cursor for ${data.actor}@${data.channel.slice(0, 8)} rewound; quarantine cleared.`);
+    const rewindDesc = rewindTo ? rewindTo.slice(0, 12) : 'start (full re-scan)';
+    console.log(`Retried ${retryId}: cursor for ${data.actor}@${data.channel.slice(0, 8)} rewound to ${rewindDesc}; quarantine cleared.`);
     console.log('  Entry kept — re-evaluated on next dispatch tick.');
   } else {
     const files = existsSync(dir) ? readdirSync(dir).filter((f) => f.endsWith('.md')).sort() : [];