difit 5.0.6 → 5.0.8

package/dist/server/git-diff.d.ts

@@ -11,6 +11,7 @@ export declare class GitDiffParser {
     private resolveBaseCommitish;
     parseDiff(selection: DiffSelection, ignoreWhitespace?: boolean, contextLines?: number): Promise<DiffResponse>;
     private parseUnifiedDiff;
+    private splitPlainUnifiedDiff;
     private getGitattributesSourceArgs;
     private parseGitattributesGeneratedOutput;
     private getGitattributesGeneratedPaths;

package/dist/server/git-diff.js

@@ -113,15 +113,68 @@ export class GitDiffParser {
     parseUnifiedDiff(diffText) {
         const files = [];
         const fileBlocks = diffText.split(/^diff --git /m).slice(1);
-        for (const fileBlock of fileBlocks) {
-            const block = `diff --git ${fileBlock}`;
-            const file = this.parseFileBlock(block);
+        if (fileBlocks.length > 0) {
+            for (const fileBlock of fileBlocks) {
+                const block = `diff --git ${fileBlock}`;
+                const file = this.parseFileBlock(block);
+                if (file) {
+                    files.push(file);
+                }
+            }
+            return files;
+        }
+        for (const fileBlock of this.splitPlainUnifiedDiff(diffText)) {
+            const file = this.parseFileBlock(fileBlock, 'plain');
             if (file) {
                 files.push(file);
             }
         }
         return files;
     }
+    splitPlainUnifiedDiff(diffText) {
+        const lines = diffText.split(/\r?\n/);
+        const blocks = [];
+        let blockStart = null;
+        let remainingOldLines = 0;
+        let remainingNewLines = 0;
+        for (let index = 0; index < lines.length; index++) {
+            const line = lines[index];
+            if (blockStart !== null && line.startsWith('@@')) {
+                const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+                if (match) {
+                    remainingOldLines = parseInt(match[2] ?? '1');
+                    remainingNewLines = parseInt(match[4] ?? '1');
+                }
+                continue;
+            }
+            if (blockStart !== null && (remainingOldLines > 0 || remainingNewLines > 0)) {
+                if (line.startsWith('\\')) {
+                    continue;
+                }
+                if (line.startsWith('+')) {
+                    remainingNewLines--;
+                }
+                else if (line.startsWith('-')) {
+                    remainingOldLines--;
+                }
+                else if (line.startsWith(' ')) {
+                    remainingOldLines--;
+                    remainingNewLines--;
+                }
+                continue;
+            }
+            if (line.startsWith('--- ') && lines[index + 1]?.startsWith('+++ ')) {
+                if (blockStart !== null) {
+                    blocks.push(lines.slice(blockStart, index).join('\n'));
+                }
+                blockStart = index;
+            }
+        }
+        if (blockStart !== null) {
+            blocks.push(lines.slice(blockStart).join('\n'));
+        }
+        return blocks;
+    }
     getGitattributesSourceArgs(ref) {
         if (ref === 'working' || ref === '.') {
             return [];
@@ -179,23 +232,25 @@ export class GitDiffParser {
         }
         return files.map((file) => generatedPaths.has(file.path) ? { ...file, isGenerated: true } : file);
     }
-    decodeGitPath(rawPath) {
+    decodeGitPath(rawPath, stripGitPrefix = true) {
         if (typeof rawPath !== 'string') {
             return undefined;
         }
-        const trimmed = rawPath.startsWith('"') && rawPath.endsWith('"') ? rawPath.slice(1, -1) : rawPath;
+        const tabIndex = rawPath.indexOf('\t');
+        const pathWithoutTimestamp = tabIndex === -1 ? rawPath : rawPath.slice(0, tabIndex);
+        const trimmed = pathWithoutTimestamp.startsWith('"') && pathWithoutTimestamp.endsWith('"')
+            ? pathWithoutTimestamp.slice(1, -1)
+            : pathWithoutTimestamp;
         const gitPrefixes = ['a/', 'b/', 'c/', 'i/', 'w/'];
         let withoutPrefix = trimmed;
-        for (const prefix of gitPrefixes) {
-            if (withoutPrefix.startsWith(prefix)) {
-                withoutPrefix = withoutPrefix.slice(prefix.length);
-                break;
+        if (stripGitPrefix) {
+            for (const prefix of gitPrefixes) {
+                if (withoutPrefix.startsWith(prefix)) {
+                    withoutPrefix = withoutPrefix.slice(prefix.length);
+                    break;
+                }
             }
         }
-        const tabIndex = withoutPrefix.indexOf('\t');
-        if (tabIndex !== -1) {
-            withoutPrefix = withoutPrefix.slice(0, tabIndex);
-        }
         if (withoutPrefix === '/dev/null') {
             return undefined;
         }
@@ -261,11 +316,11 @@ export class GitDiffParser {
         }
         return Buffer.from(bytes).toString('utf8');
     }
-    extractPathFromLine(line, prefix) {
+    extractPathFromLine(line, prefix, stripGitPrefix = true) {
         if (!line?.startsWith(prefix)) {
             return undefined;
         }
-        return this.decodeGitPath(line.slice(prefix.length));
+        return this.decodeGitPath(line.slice(prefix.length), stripGitPrefix);
     }
     parseDiffHeaderPaths(headerLine) {
         if (!headerLine.startsWith('diff --git ')) {
@@ -304,7 +359,7 @@ export class GitDiffParser {
             newPath: this.decodeGitPath(rawNewPath),
         };
     }
-    parseFileBlock(block) {
+    parseFileBlock(block, format = 'git') {
         const lines = block.split('\n');
         const headerLine = lines[0];
         const headerPaths = this.parseDiffHeaderPaths(headerLine);
@@ -312,12 +367,15 @@ export class GitDiffParser {
         const plusLine = lines.find((line) => line.startsWith('+++ '));
         const renameFromLine = lines.find((line) => line.startsWith('rename from '));
         const renameToLine = lines.find((line) => line.startsWith('rename to '));
-        const plusPath = this.extractPathFromLine(plusLine, '+++ ');
-        const minusPath = this.extractPathFromLine(minusLine, '--- ');
+        const stripGitPrefix = format !== 'plain';
+        const plusPath = this.extractPathFromLine(plusLine, '+++ ', stripGitPrefix);
+        const minusPath = this.extractPathFromLine(minusLine, '--- ', stripGitPrefix);
         const renameFromPath = this.extractPathFromLine(renameFromLine, 'rename from ');
         const renameToPath = this.extractPathFromLine(renameToLine, 'rename to ');
-        const newPath = renameToPath ?? plusPath ?? headerPaths?.newPath;
-        const oldPath = renameFromPath ?? minusPath ?? headerPaths?.oldPath ?? newPath;
+        const parsedNewPath = renameToPath ?? plusPath ?? headerPaths?.newPath;
+        const parsedOldPath = renameFromPath ?? minusPath ?? headerPaths?.oldPath;
+        const newPath = parsedNewPath ?? parsedOldPath;
+        const oldPath = parsedOldPath ?? newPath;
         if (!newPath) {
             return null;
         }
@@ -333,7 +391,7 @@ export class GitDiffParser {
         else if (deletedFileMode || plusLine?.includes('/dev/null')) {
             status = 'deleted';
         }
-        else if (oldPath !== newPath) {
+        else if (format !== 'plain' && oldPath !== newPath) {
             status = 'renamed';
         }
         // Common properties for all files

package/dist/server/git-diff.test.js

@@ -765,6 +765,116 @@ index 0000000..1234567
                 isGenerated: false,
             });
         });
+        it('parses plain unified diff output without git headers', () => {
+            const diffContent = `--- file1.txt\t2026-07-11 12:00:00
++++ file2.txt\t2026-07-11 12:00:01
+@@ -1,2 +1,2 @@
+ unchanged
+-old content
++new content`;
+            const result = parser.parseStdinDiff(diffContent);
+            expect(result).toMatchObject({
+                commit: 'stdin diff',
+                isEmpty: false,
+                files: [
+                    {
+                        path: 'file2.txt',
+                        status: 'modified',
+                        additions: 1,
+                        deletions: 1,
+                        isGenerated: false,
+                    },
+                ],
+            });
+        });
+        it('normalizes CRLF in plain unified diff output', () => {
+            const diffContent = [
+                '--- old.txt',
+                '+++ new.txt',
+                '@@ -1 +1 @@',
+                '-old content',
+                '+new content',
+            ].join('\r\n');
+            const result = parser.parseStdinDiff(diffContent);
+            expect(result.files).toHaveLength(1);
+            expect(result.files[0]).toMatchObject({
+                path: 'new.txt',
+                chunks: [
+                    {
+                        lines: [
+                            { type: 'delete', content: 'old content' },
+                            { type: 'add', content: 'new content' },
+                        ],
+                    },
+                ],
+            });
+        });
+        it('parses multiple concatenated plain unified diffs', () => {
+            const diffContent = `--- first-old.txt
++++ first-new.txt
+@@ -1 +1 @@
+-before
++after
+--- second-old.txt
++++ second-new.txt
+@@ -1 +1,2 @@
+ existing
++added`;
+            const result = parser.parseStdinDiff(diffContent);
+            expect(result.files).toMatchObject([
+                {
+                    path: 'first-new.txt',
+                    status: 'modified',
+                    additions: 1,
+                    deletions: 1,
+                },
+                {
+                    path: 'second-new.txt',
+                    status: 'modified',
+                    additions: 1,
+                    deletions: 0,
+                },
+            ]);
+        });
+        it('does not treat header-like hunk content as another plain diff', () => {
+            const diffContent = `--- old.txt
++++ new.txt
+@@ -1,2 +1,2 @@
+--- deleted content
++++ added content`;
+            const result = parser.parseStdinDiff(diffContent);
+            expect(result.files).toHaveLength(1);
+            expect(result.files[0]).toMatchObject({
+                path: 'new.txt',
+                additions: 1,
+                deletions: 1,
+            });
+        });
+        it('detects added and deleted files in plain unified diffs', () => {
+            const diffContent = `--- /dev/null
++++ added.txt
+@@ -0,0 +1 @@
++added
+--- deleted.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-deleted`;
+            const result = parser.parseStdinDiff(diffContent);
+            expect(result.files).toMatchObject([
+                {
+                    path: 'added.txt',
+                    status: 'added',
+                    additions: 1,
+                    deletions: 0,
+                },
+                {
+                    path: 'deleted.txt',
+                    status: 'deleted',
+                    additions: 0,
+                    deletions: 1,
+                },
+            ]);
+        });
         it('should handle deleted files', async () => {
             const diffContent = `diff --git a/deleted.txt b/deleted.txt
 deleted file mode 100644

package/dist/server/server.js

@@ -567,6 +567,22 @@ export async function startServer(options) {
             res.status(400).json({ error: 'Invalid comment import data' });
         }
     });
+    app.delete('/api/comments/:threadId', (req, res) => {
+        const selection = getCommentSelectionFromQuery(req.query);
+        const session = getOrCreateCommentSession(selection);
+        const threadId = req.params.threadId;
+        const nextThreads = session.threads.filter((thread) => thread.id !== threadId);
+        if (nextThreads.length === session.threads.length) {
+            res.status(404).json({ error: `Thread not found: ${threadId}` });
+            return;
+        }
+        updateCommentSession(selection, nextThreads);
+        res.json({
+            success: true,
+            threadId,
+            version: session.version,
+        });
+    });
     app.get('/api/comments-json', (req, res) => {
         const selection = getCommentSelectionFromQuery(req.query);
         const session = getOrCreateCommentSession(selection);

package/dist/server/server.test.js

@@ -191,7 +191,10 @@ describe('Server Integration Tests', () => {
         };
         it('merges concurrent agent additions instead of clobbering on a stale push', async () => {
             const port = await getAvailablePort(4966);
-            const result = await startServer({ preferredPort: port, openBrowser: false });
+            const result = await startServer({
+                preferredPort: port,
+                openBrowser: false,
+            });
             try {
                 // Browser establishes a thread; it now knows version 1.
                 await postThreads(result.port, [makeThread('t1', 'src/a.ts', 10, 'human thread')]);
@@ -234,7 +237,10 @@ describe('Server Integration Tests', () => {
         });
         it('replaces (honoring deletions) when the push version matches', async () => {
             const port = await getAvailablePort(4966);
-            const result = await startServer({ preferredPort: port, openBrowser: false });
+            const result = await startServer({
+                preferredPort: port,
+                openBrowser: false,
+            });
             try {
                 await postThreads(result.port, [makeThread('t1', 'src/a.ts', 10, 'human thread')]);
                 const afterFirst = await getSession(result.port);
@@ -258,7 +264,10 @@ describe('Server Integration Tests', () => {
         });
         it('bumps the version when a reply is imported (so the change is broadcast)', async () => {
             const port = await getAvailablePort(4966);
-            const result = await startServer({ preferredPort: port, openBrowser: false });
+            const result = await startServer({
+                preferredPort: port,
+                openBrowser: false,
+            });
             try {
                 await postThreads(result.port, [makeThread('t1', 'src/a.ts', 10, 'human thread')]);
                 const before = await getSession(result.port);
@@ -792,6 +801,46 @@ describe('Server Integration Tests', () => {
             const threads = data.threads.filter((t) => t.filePath === 'src/dedup.ts');
             expect(threads).toHaveLength(1);
         });
+        it('DELETE /api/comments/:threadId removes the thread and bumps the version', async () => {
+            await fetch(`http://localhost:${port}/api/comment-imports`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify([
+                    {
+                        type: 'thread',
+                        id: 'delete-me',
+                        filePath: 'src/delete-test.ts',
+                        position: { side: 'new', line: 3 },
+                        body: 'Thread to delete',
+                    },
+                ]),
+            });
+            const beforeResponse = await fetch(`http://localhost:${port}/api/comments-json`);
+            const before = (await beforeResponse.json());
+            expect(before.threads.some((t) => t.id === 'delete-me')).toBe(true);
+            const deleteResponse = await fetch(`http://localhost:${port}/api/comments/delete-me`, {
+                method: 'DELETE',
+            });
+            const deleteData = (await deleteResponse.json());
+            expect(deleteResponse.ok).toBe(true);
+            expect(deleteData).toMatchObject({
+                success: true,
+                threadId: 'delete-me',
+            });
+            expect(deleteData.version).toBe(before.version + 1);
+            const afterResponse = await fetch(`http://localhost:${port}/api/comments-json`);
+            const after = (await afterResponse.json());
+            expect(after.threads.some((t) => t.id === 'delete-me')).toBe(false);
+        });
+        it('DELETE /api/comments/:threadId returns 404 for unknown thread', async () => {
+            const response = await fetch(`http://localhost:${port}/api/comments/does-not-exist`, {
+                method: 'DELETE',
+            });
+            expect(response.status).toBe(404);
+            const data = (await response.json());
+            expect(data).toHaveProperty('error');
+            expect(data.error).toContain('does-not-exist');
+        });
         it('isolates comment sessions between different diff selections', async () => {
             const importServer = await startServer({
                 selection: { targetCommitish: 'HEAD', baseCommitish: 'HEAD^' },
@@ -961,7 +1010,10 @@ describe('Server Integration Tests', () => {
             const data = (await response.json());
             expect(response.ok).toBe(true);
             expect(data.specialOptions).toHaveLength(3);
-            expect(data.specialOptions).not.toContainEqual({ value: 'merge-base', label: 'Merge Base' });
+            expect(data.specialOptions).not.toContainEqual({
+                value: 'merge-base',
+                label: 'Merge Base',
+            });
             expect(data.branches).toEqual([{ name: 'main', current: true }]);
             expect(data.commits).toEqual([
                 { hash: 'abc1234', shortHash: 'abc1234', message: 'Test commit' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "difit",
-  "version": "5.0.6",
+  "version": "5.0.8",
   "description": "A lightweight command-line tool that spins up a local web server to display Git commit diffs in a GitHub-like Files changed view",
   "keywords": [
     "cli",
@@ -79,6 +79,7 @@
     "react-dom": "^19.1.0",
     "react-hotkeys-hook": "^5.2.4",
     "react-markdown": "^10.1.0",
+    "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "simple-git": "^3.28.0"
   },

package/dist/client/assets/architecture-7EHR7CIX-CGrQkVgf.js

@@ -1 +0,0 @@
-import"./chunk-NNHCCRGN-DlpIbxXb.js";import{x as e}from"./mermaid-parser.core-oUly7wXy.js";export{e as createArchitectureServices};

package/dist/client/assets/channel-DG8kr4eK.js

@@ -1 +0,0 @@
-import{at as e,ot as t}from"./chunk-CSCIHK7Q-CaTF_T3W.js";var n=(n,r)=>t.lang.round(e.parse(n)[r]);export{n as t};

package/dist/client/assets/chunk-QZHKN3VN-M1-XSu5b.js

@@ -1 +0,0 @@
-import{h as e}from"./src-BWoEPgyG.js";var t=class{constructor(e){this.init=e,this.records=this.init()}static{e(this,`ImperativeState`)}reset(){this.records=this.init()}};export{t};

package/dist/client/assets/chunk-WU5MYG2G-BvFjxMiG.js

@@ -1 +0,0 @@
-import{h as e,p as t}from"./src-BWoEPgyG.js";import{x as n}from"./chunk-CSCIHK7Q-CaTF_T3W.js";var r=e(e=>{let{securityLevel:r}=n(),i=t(`body`);return r===`sandbox`&&(i=t((t(`#i${e}`).node()?.contentDocument??document).body)),i.select(`#${e}`)},`selectSvgElement`);export{r as t};

package/dist/client/assets/classDiagram-4FO5ZUOK-BtF02SOc.js

@@ -1 +0,0 @@
-import{h as e}from"./src-BWoEPgyG.js";import"./chunk-CSCIHK7Q-CaTF_T3W.js";import"./chunk-5ZQYHXKU-uSJ_ZgCu.js";import"./chunk-O5CBEL6O-BAuwNGEL.js";import"./chunk-FMBD7UC4-D1irlAGU.js";import"./chunk-BSJP7CBP-C15Vti01.js";import"./chunk-L5ZTLDWV-F5Tij0A9.js";import"./chunk-ND2GUHAM-C0rukZcz.js";import"./chunk-55IACEB6-DtWki8a-.js";import"./chunk-2J33WTMH-1DQ-4Bz3.js";import"./chunk-NZK2D7GU-DRm_z6tq.js";import"./chunk-3OPIFGDE-BQmtgKnq.js";import"./chunk-KSCS5N6A-DGAjxObb.js";import"./chunk-LZXEDZCA-BkUKm4Z2.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-BB6xZgSD.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/client/assets/classDiagram-v2-Q7XG4LA2-BtF02SOc.js

@@ -1 +0,0 @@
-import{h as e}from"./src-BWoEPgyG.js";import"./chunk-CSCIHK7Q-CaTF_T3W.js";import"./chunk-5ZQYHXKU-uSJ_ZgCu.js";import"./chunk-O5CBEL6O-BAuwNGEL.js";import"./chunk-FMBD7UC4-D1irlAGU.js";import"./chunk-BSJP7CBP-C15Vti01.js";import"./chunk-L5ZTLDWV-F5Tij0A9.js";import"./chunk-ND2GUHAM-C0rukZcz.js";import"./chunk-55IACEB6-DtWki8a-.js";import"./chunk-2J33WTMH-1DQ-4Bz3.js";import"./chunk-NZK2D7GU-DRm_z6tq.js";import"./chunk-3OPIFGDE-BQmtgKnq.js";import"./chunk-KSCS5N6A-DGAjxObb.js";import"./chunk-LZXEDZCA-BkUKm4Z2.js";import{i as t,n,r,t as i}from"./chunk-727SXJPM-BB6xZgSD.js";var a={parser:n,get db(){return new i},renderer:r,styles:t,init:e(e=>{e.class||={},e.class.arrowMarkerAbsolute=e.arrowMarkerAbsolute},`init`)};export{a as diagram};

package/dist/client/assets/eventmodeling-FCH6USID-D2pfiIpz.js

@@ -1 +0,0 @@
-import"./chunk-NNHCCRGN-DlpIbxXb.js";import{y as e}from"./mermaid-parser.core-oUly7wXy.js";export{e as createEventModelingServices};