@susu-eng/trunk-sync 2.3.2 → 2.3.4

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trunk-sync",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Maximum continuous integration for multi-agent coding — every edit is committed and pushed to trunk immediately",
   "author": {
     "name": "Eli Mydlarz"

package/dist/commands/seance.js

@@ -70,7 +70,10 @@ function rewindTranscript(transcriptPath, commitTimestamp, worktreePath) {
     const expandedPath = transcriptPath.replace(/^~/, process.env.HOME || "~");
     if (!existsSync(expandedPath))
         return null;
-    const cutoff = new Date(commitTimestamp).getTime();
+    // Git timestamps have second precision; transcript timestamps have millisecond
+    // precision. Adding 999ms includes the full second of the commit so we don't
+    // cut off transcript entries that fall within the same second as the commit.
+    const cutoff = new Date(commitTimestamp).getTime() + 999;
     const lines = readFileSync(expandedPath, "utf-8").split("\n").filter(Boolean);
     // Find the last line whose timestamp is <= the commit timestamp.
     let cutIndex = -1;
@@ -113,7 +116,9 @@ function rewindTranscript(transcriptPath, commitTimestamp, worktreePath) {
 }
 function inspectOrLaunch(fileRef, inspect) {
     const { file, line } = parseFileRef(fileRef);
-    const sha = blame(file, line);
+    const blameResult = blame(file, line);
+    const sha = blameResult.sha;
+    const origLine = blameResult.origLine;
     if (/^0+$/.test(sha)) {
         console.error(`Line ${line} has uncommitted changes.`);
         process.exit(1);
@@ -149,7 +154,7 @@ function inspectOrLaunch(fileRef, inspect) {
         process.exit(1);
     }
     const relFile = relative(root, resolve(file));
-    const prompt = `*STOP*. *HALT ALL PREVIOUS OPERATIONS AND STOP IMMEDIATELY*. *DO NOT CONTINUE YOUR CURRENT CHAIN OF THOUGHT*. This session already ended. It has been resumed and rewound — including the code — so you can answer questions about why it was written this way. *DO NOT* change any code. Start by explaining ${relFile}:${line} (commit ${shortSha(sha)}) — what does it do, how does it work, and why is it written this way?`;
+    const prompt = `*STOP*. *HALT ALL PREVIOUS OPERATIONS AND STOP IMMEDIATELY*. *DO NOT CONTINUE YOUR CURRENT CHAIN OF THOUGHT*. This session already ended. It has been resumed and rewound — including the code — so you can answer questions about why it was written this way. *DO NOT* change any code. Start by explaining ${relFile}:${origLine} (commit ${shortSha(sha)}) — what does it do, how does it work, and why is it written this way?`;
     // Rewind the session transcript to the commit point.
     // Try snapshot from .transcripts/ in the commit first, fall back to Transcript: field.
     const snapshotRelPath = findSnapshotInCommit(sha);

package/dist/lib/git.d.ts

@@ -3,7 +3,10 @@ export declare function parseFileRef(ref: string): {
     file: string;
     line: number;
 };
-export declare function blame(file: string, line: number, cwd?: string): string;
+export declare function blame(file: string, line: number, cwd?: string): {
+    sha: string;
+    origLine: number;
+};
 export declare function getCommitBody(sha: string, cwd?: string): string;
 export declare function getCommitSubject(sha: string, cwd?: string): string;
 export declare function getCommitDate(sha: string, cwd?: string): string;

package/dist/lib/git.js

@@ -29,8 +29,9 @@ export function blame(file, line, cwd) {
         encoding: "utf-8",
         cwd,
     });
-    const sha = output.split("\n")[0].split(" ")[0];
-    return sha;
+    // Porcelain format first line: <sha> <orig-line> <final-line> <num-lines>
+    const parts = output.split("\n")[0].split(" ");
+    return { sha: parts[0], origLine: Number(parts[1]) };
 }
 export function getCommitBody(sha, cwd) {
     return execSync(`git log -1 --format=%b "${sha}"`, { encoding: "utf-8", cwd }).trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@susu-eng/trunk-sync",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "type": "module",
   "description": "Maximum continuous integration for multi-agent coding — every edit is committed and pushed to trunk immediately",
   "bin": {