wind-agent-cli 1.37.2 → 1.37.3

package/server/modules/git/index.ts

@@ -1,2 +1,2 @@
-// createGitModule: used by the server entrypoint to assemble Git routes with provider runtimes.
-export { createGitModule } from './git.module.js';
+// createGitModule: used by the server entrypoint to assemble Git routes with provider runtimes.
+export { createGitModule } from './git.module.js';

package/server/modules/git/tests/git-branch.service.test.ts

@@ -1,60 +1,60 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import { deleteLocalBranch } from '../git-branch.service.js';
-
-test('deleteLocalBranch uses safe deletion by default', async () => {
-  const commands: string[][] = [];
-  const output = await deleteLocalBranch({
-    projectPath: '/workspace/repo',
-    branch: 'feature/safe-delete',
-    force: false,
-    runCommand: async (_command, args) => {
-      commands.push(args);
-      return {
-        stdout: args.includes('--show-current') ? 'main\n' : 'Deleted branch feature/safe-delete.\n',
-        stderr: '',
-      };
-    },
-  });
-
-  assert.equal(output, 'Deleted branch feature/safe-delete.\n');
-  assert.deepEqual(commands, [
-    ['branch', '--show-current'],
-    ['branch', '-d', '--', 'feature/safe-delete'],
-  ]);
-});
-
-test('deleteLocalBranch uses force deletion only when requested', async () => {
-  const commands: string[][] = [];
-  await deleteLocalBranch({
-    projectPath: '/workspace/repo',
-    branch: 'feature/unmerged',
-    force: true,
-    runCommand: async (_command, args) => {
-      commands.push(args);
-      return { stdout: args.includes('--show-current') ? 'main\n' : '', stderr: '' };
-    },
-  });
-
-  assert.deepEqual(commands, [
-    ['branch', '--show-current'],
-    ['branch', '-D', '--', 'feature/unmerged'],
-  ]);
-});
-
-test('deleteLocalBranch refuses to delete the current branch even when forced', async () => {
-  await assert.rejects(
-    deleteLocalBranch({
-      projectPath: '/workspace/repo',
-      branch: 'feature/current',
-      force: true,
-      runCommand: async () => ({ stdout: 'feature/current\n', stderr: '' }),
-    }),
-    (error: unknown) => {
-      assert.equal((error as { code?: string }).code, 'GIT_CURRENT_BRANCH_DELETE');
-      assert.equal((error as { statusCode?: number }).statusCode, 400);
-      return true;
-    },
-  );
-});
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { deleteLocalBranch } from '../git-branch.service.js';
+
+test('deleteLocalBranch uses safe deletion by default', async () => {
+  const commands: string[][] = [];
+  const output = await deleteLocalBranch({
+    projectPath: '/workspace/repo',
+    branch: 'feature/safe-delete',
+    force: false,
+    runCommand: async (_command, args) => {
+      commands.push(args);
+      return {
+        stdout: args.includes('--show-current') ? 'main\n' : 'Deleted branch feature/safe-delete.\n',
+        stderr: '',
+      };
+    },
+  });
+
+  assert.equal(output, 'Deleted branch feature/safe-delete.\n');
+  assert.deepEqual(commands, [
+    ['branch', '--show-current'],
+    ['branch', '-d', '--', 'feature/safe-delete'],
+  ]);
+});
+
+test('deleteLocalBranch uses force deletion only when requested', async () => {
+  const commands: string[][] = [];
+  await deleteLocalBranch({
+    projectPath: '/workspace/repo',
+    branch: 'feature/unmerged',
+    force: true,
+    runCommand: async (_command, args) => {
+      commands.push(args);
+      return { stdout: args.includes('--show-current') ? 'main\n' : '', stderr: '' };
+    },
+  });
+
+  assert.deepEqual(commands, [
+    ['branch', '--show-current'],
+    ['branch', '-D', '--', 'feature/unmerged'],
+  ]);
+});
+
+test('deleteLocalBranch refuses to delete the current branch even when forced', async () => {
+  await assert.rejects(
+    deleteLocalBranch({
+      projectPath: '/workspace/repo',
+      branch: 'feature/current',
+      force: true,
+      runCommand: async () => ({ stdout: 'feature/current\n', stderr: '' }),
+    }),
+    (error: unknown) => {
+      assert.equal((error as { code?: string }).code, 'GIT_CURRENT_BRANCH_DELETE');
+      assert.equal((error as { statusCode?: number }).statusCode, 400);
+      return true;
+    },
+  );
+});

package/server/modules/git/tests/git-init.routes.test.ts

@@ -1,11 +1,11 @@
-import assert from 'node:assert/strict';
-import { EventEmitter, once } from 'node:events';
-import type { AddressInfo } from 'node:net';
-import { PassThrough } from 'node:stream';
-import test from 'node:test';
-
-import express from 'express';
-
+import assert from 'node:assert/strict';
+import { EventEmitter, once } from 'node:events';
+import type { AddressInfo } from 'node:net';
+import { PassThrough } from 'node:stream';
+import test from 'node:test';
+
+import express from 'express';
+
 import { createGitRouter } from '@/modules/git/git.routes.js';
 
 test('git status hides every spawned Git console window', async () => {
@@ -53,127 +53,127 @@ test('git status hides every spawned Git console window', async () => {
 });
 
 test('git init does not run when repository validation fails for an execution error', async () => {
-  const commands: string[][] = [];
-  const spawnProcess = ((_command: string, args: string[]) => {
-    commands.push(args);
-    const child = new EventEmitter() as EventEmitter & { stdout: PassThrough; stderr: PassThrough };
-    child.stdout = new PassThrough();
-    child.stderr = new PassThrough();
-    process.nextTick(() => child.emit('error', Object.assign(new Error('permission denied'), {
-      code: 'EACCES',
-    })));
-    return child;
-  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
-  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
-  const router = createGitRouter({
-    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
-    spawnProcess,
-    resolveProjectPathById: () => '/workspace/repo',
-    queryClaude: unexpectedProvider,
-    queryCursor: unexpectedProvider,
-  });
-  const app = express();
-  app.use(express.json());
-  app.use('/api/git', router);
-  const server = app.listen(0, '127.0.0.1');
-  await once(server, 'listening');
-
-  try {
-    const address = server.address() as AddressInfo;
-    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/init`, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ project: 'project-1' }),
-    });
-    const body = await response.json() as { success: boolean; error: string };
-    assert.equal(body.success, false);
-    assert.match(body.error, /permission denied/);
-  } finally {
-    await new Promise<void>((resolve) => server.close(() => resolve()));
-  }
-
-  assert.deepEqual(commands, [['rev-parse', '--is-inside-work-tree']]);
-});
-
-test('delete branch parses force and uses Git force deletion', async () => {
-  const commands: string[][] = [];
-  const spawnProcess = ((_command: string, args: string[]) => {
-    commands.push(args);
-    const child = new EventEmitter() as EventEmitter & { stdout: PassThrough; stderr: PassThrough };
-    child.stdout = new PassThrough();
-    child.stderr = new PassThrough();
-    process.nextTick(() => {
-      if (args.includes('--is-inside-work-tree')) child.stdout.write('true\n');
-      if (args.includes('--show-toplevel')) child.stdout.write('/workspace/repo\n');
-      if (args.includes('--show-current')) child.stdout.write('main\n');
-      if (args.includes('-D')) child.stdout.write('Deleted branch feature/unmerged.\n');
-      child.stdout.end();
-      child.stderr.end();
-      child.emit('close', 0);
-    });
-    return child;
-  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
-  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
-  const router = createGitRouter({
-    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
-    spawnProcess,
-    resolveProjectPathById: () => '/workspace/repo',
-    queryClaude: unexpectedProvider,
-    queryCursor: unexpectedProvider,
-  });
-  const app = express();
-  app.use(express.json());
-  app.use('/api/git', router);
-  const server = app.listen(0, '127.0.0.1');
-  await once(server, 'listening');
-
-  try {
-    const address = server.address() as AddressInfo;
-    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/delete-branch`, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ project: 'project-1', branch: 'feature/unmerged', force: true }),
-    });
-    const body = await response.json() as { success: boolean; output: string };
-    assert.equal(response.status, 200);
-    assert.equal(body.success, true);
-    assert.match(body.output, /Deleted branch/);
-  } finally {
-    await new Promise<void>((resolve) => server.close(() => resolve()));
-  }
-
-  assert.deepEqual(commands.at(-1), ['branch', '-D', '--', 'feature/unmerged']);
-});
-
-test('delete branch rejects a non-boolean force value before running Git', async () => {
-  const spawnProcess = (() => {
-    throw new Error('Git must not run for invalid input');
-  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
-  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
-  const router = createGitRouter({
-    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
-    spawnProcess,
-    resolveProjectPathById: () => '/workspace/repo',
-    queryClaude: unexpectedProvider,
-    queryCursor: unexpectedProvider,
-  });
-  const app = express();
-  app.use(express.json());
-  app.use('/api/git', router);
-  const server = app.listen(0, '127.0.0.1');
-  await once(server, 'listening');
-
-  try {
-    const address = server.address() as AddressInfo;
-    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/delete-branch`, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ project: 'project-1', branch: 'feature/unmerged', force: 'yes' }),
-    });
-    const body = await response.json() as { error: string };
-    assert.equal(response.status, 400);
-    assert.equal(body.error, 'force must be a boolean');
-  } finally {
-    await new Promise<void>((resolve) => server.close(() => resolve()));
-  }
-});
+  const commands: string[][] = [];
+  const spawnProcess = ((_command: string, args: string[]) => {
+    commands.push(args);
+    const child = new EventEmitter() as EventEmitter & { stdout: PassThrough; stderr: PassThrough };
+    child.stdout = new PassThrough();
+    child.stderr = new PassThrough();
+    process.nextTick(() => child.emit('error', Object.assign(new Error('permission denied'), {
+      code: 'EACCES',
+    })));
+    return child;
+  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
+  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
+  const router = createGitRouter({
+    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
+    spawnProcess,
+    resolveProjectPathById: () => '/workspace/repo',
+    queryClaude: unexpectedProvider,
+    queryCursor: unexpectedProvider,
+  });
+  const app = express();
+  app.use(express.json());
+  app.use('/api/git', router);
+  const server = app.listen(0, '127.0.0.1');
+  await once(server, 'listening');
+
+  try {
+    const address = server.address() as AddressInfo;
+    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/init`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ project: 'project-1' }),
+    });
+    const body = await response.json() as { success: boolean; error: string };
+    assert.equal(body.success, false);
+    assert.match(body.error, /permission denied/);
+  } finally {
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+
+  assert.deepEqual(commands, [['rev-parse', '--is-inside-work-tree']]);
+});
+
+test('delete branch parses force and uses Git force deletion', async () => {
+  const commands: string[][] = [];
+  const spawnProcess = ((_command: string, args: string[]) => {
+    commands.push(args);
+    const child = new EventEmitter() as EventEmitter & { stdout: PassThrough; stderr: PassThrough };
+    child.stdout = new PassThrough();
+    child.stderr = new PassThrough();
+    process.nextTick(() => {
+      if (args.includes('--is-inside-work-tree')) child.stdout.write('true\n');
+      if (args.includes('--show-toplevel')) child.stdout.write('/workspace/repo\n');
+      if (args.includes('--show-current')) child.stdout.write('main\n');
+      if (args.includes('-D')) child.stdout.write('Deleted branch feature/unmerged.\n');
+      child.stdout.end();
+      child.stderr.end();
+      child.emit('close', 0);
+    });
+    return child;
+  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
+  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
+  const router = createGitRouter({
+    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
+    spawnProcess,
+    resolveProjectPathById: () => '/workspace/repo',
+    queryClaude: unexpectedProvider,
+    queryCursor: unexpectedProvider,
+  });
+  const app = express();
+  app.use(express.json());
+  app.use('/api/git', router);
+  const server = app.listen(0, '127.0.0.1');
+  await once(server, 'listening');
+
+  try {
+    const address = server.address() as AddressInfo;
+    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/delete-branch`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ project: 'project-1', branch: 'feature/unmerged', force: true }),
+    });
+    const body = await response.json() as { success: boolean; output: string };
+    assert.equal(response.status, 200);
+    assert.equal(body.success, true);
+    assert.match(body.output, /Deleted branch/);
+  } finally {
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+
+  assert.deepEqual(commands.at(-1), ['branch', '-D', '--', 'feature/unmerged']);
+});
+
+test('delete branch rejects a non-boolean force value before running Git', async () => {
+  const spawnProcess = (() => {
+    throw new Error('Git must not run for invalid input');
+  }) as Parameters<typeof createGitRouter>[0]['spawnProcess'];
+  const unexpectedProvider = async (): Promise<never> => { throw new Error('unexpected provider call'); };
+  const router = createGitRouter({
+    fileSystem: { access: async () => undefined } as unknown as Parameters<typeof createGitRouter>[0]['fileSystem'],
+    spawnProcess,
+    resolveProjectPathById: () => '/workspace/repo',
+    queryClaude: unexpectedProvider,
+    queryCursor: unexpectedProvider,
+  });
+  const app = express();
+  app.use(express.json());
+  app.use('/api/git', router);
+  const server = app.listen(0, '127.0.0.1');
+  await once(server, 'listening');
+
+  try {
+    const address = server.address() as AddressInfo;
+    const response = await fetch(`http://127.0.0.1:${address.port}/api/git/delete-branch`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ project: 'project-1', branch: 'feature/unmerged', force: 'yes' }),
+    });
+    const body = await response.json() as { error: string };
+    assert.equal(response.status, 400);
+    assert.equal(body.error, 'force must be a boolean');
+  } finally {
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+});

package/server/modules/git/tests/git.test.ts

@@ -1,106 +1,106 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import { parseGitLogWithStats, parseGitStatusOutput } from '../git-parsing.service.js';
-
-// Builds `git status --porcelain=v1 -z` output: NUL-separated entries with a
-// trailing NUL, exactly as git emits it.
-const porcelain = (...entries: string[]) => entries.join('\0') + '\0';
-
-test('parseGitStatusOutput buckets files and reports index-side staging', () => {
-  const output = porcelain(
-    'M  staged-modified.ts',
-    ' M unstaged-modified.ts',
-    'MM staged-and-unstaged.ts',
-    'A  staged-new.ts',
-    'D  staged-deleted.ts',
-    ' D unstaged-deleted.ts',
-    '?? untracked.ts',
-  );
-
-  const result = parseGitStatusOutput(output);
-
-  assert.deepEqual(result.modified, ['staged-modified.ts', 'unstaged-modified.ts', 'staged-and-unstaged.ts']);
-  assert.deepEqual(result.added, ['staged-new.ts']);
-  assert.deepEqual(result.deleted, ['staged-deleted.ts', 'unstaged-deleted.ts']);
-  assert.deepEqual(result.untracked, ['untracked.ts']);
-  // Only index-side (X) changes count as staged.
-  assert.deepEqual(result.staged, [
-    'staged-modified.ts',
-    'staged-and-unstaged.ts',
-    'staged-new.ts',
-    'staged-deleted.ts',
-  ]);
-});
-
-test('parseGitStatusOutput keeps paths with spaces intact (-z output has no quoting)', () => {
-  const result = parseGitStatusOutput(porcelain('M  src/my folder/some file.ts'));
-  assert.deepEqual(result.modified, ['src/my folder/some file.ts']);
-  assert.deepEqual(result.staged, ['src/my folder/some file.ts']);
-});
-
-test('parseGitStatusOutput tracks the post-rename path and skips the original', () => {
-  const output = porcelain('R  renamed-to.ts', 'renamed-from.ts', ' M other.ts');
-  const result = parseGitStatusOutput(output);
-
-  assert.deepEqual(result.modified, ['renamed-to.ts', 'other.ts']);
-  assert.deepEqual(result.staged, ['renamed-to.ts']);
-  // The pre-rename path is metadata, not a change entry.
-  assert.equal(JSON.stringify(result).includes('renamed-from.ts'), false);
-});
-
-test('parseGitStatusOutput never reports merge conflicts as staged', () => {
-  const output = porcelain('UU conflicted.ts', 'AA both-added.ts', 'DD both-deleted.ts');
-  const result = parseGitStatusOutput(output);
-
-  assert.deepEqual(result.modified, ['conflicted.ts', 'both-added.ts', 'both-deleted.ts']);
-  assert.deepEqual(result.staged, []);
-});
-
-test('parseGitStatusOutput handles empty output', () => {
-  assert.deepEqual(parseGitStatusOutput(''), {
-    modified: [],
-    added: [],
-    deleted: [],
-    untracked: [],
-    staged: [],
-  });
-});
-
-// Builds one `git log --pretty=format:%H%x1f%P%x1f%D%x1f%an%x1f%ae%x1f%ad%x1f%s` line.
-const US = '';
-const logLine = (hash: string, parents: string, refs: string, subject: string) =>
-  [hash, parents, refs, 'Alice', 'a@x.com', '2026-07-06T10:00:00+03:00', subject].join(US);
-
-test('parseGitLogWithStats parses commits with parents, refs, and shortstat lines', () => {
-  const output = [
-    logLine('c3', 'c2', 'HEAD -> main, origin/main, tag: v1.0', 'feat: add | pipes | to subject'),
-    ' 3 files changed, 10 insertions(+), 2 deletions(-)',
-    '',
-    logLine('c2', 'c1 c0', '', 'Merge branch feature'),
-    '',
-    logLine('c0', '', '', 'initial commit'),
-    ' 1 file changed, 1 insertion(+)',
-  ].join('\n');
-
-  const commits = parseGitLogWithStats(output);
-
-  assert.equal(commits.length, 3);
-  assert.deepEqual(commits[0].parents, ['c2']);
-  assert.deepEqual(commits[0].refs, ['HEAD -> main', 'origin/main', 'tag: v1.0']);
-  // Pipes in the subject survive because fields are joined with .
-  assert.equal(commits[0].message, 'feat: add | pipes | to subject');
-  assert.equal(commits[0].stats, '3 files changed, 10 insertions(+), 2 deletions(-)');
-
-  // Merge commit: two parents, no shortstat line.
-  assert.deepEqual(commits[1].parents, ['c1', 'c0']);
-  assert.equal(commits[1].stats, '');
-
-  // Root commit: no parents.
-  assert.deepEqual(commits[2].parents, []);
-  assert.equal(commits[2].stats, '1 file changed, 1 insertion(+)');
-});
-
-test('parseGitLogWithStats handles empty output', () => {
-  assert.deepEqual(parseGitLogWithStats(''), []);
-});
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { parseGitLogWithStats, parseGitStatusOutput } from '../git-parsing.service.js';
+
+// Builds `git status --porcelain=v1 -z` output: NUL-separated entries with a
+// trailing NUL, exactly as git emits it.
+const porcelain = (...entries: string[]) => entries.join('\0') + '\0';
+
+test('parseGitStatusOutput buckets files and reports index-side staging', () => {
+  const output = porcelain(
+    'M  staged-modified.ts',
+    ' M unstaged-modified.ts',
+    'MM staged-and-unstaged.ts',
+    'A  staged-new.ts',
+    'D  staged-deleted.ts',
+    ' D unstaged-deleted.ts',
+    '?? untracked.ts',
+  );
+
+  const result = parseGitStatusOutput(output);
+
+  assert.deepEqual(result.modified, ['staged-modified.ts', 'unstaged-modified.ts', 'staged-and-unstaged.ts']);
+  assert.deepEqual(result.added, ['staged-new.ts']);
+  assert.deepEqual(result.deleted, ['staged-deleted.ts', 'unstaged-deleted.ts']);
+  assert.deepEqual(result.untracked, ['untracked.ts']);
+  // Only index-side (X) changes count as staged.
+  assert.deepEqual(result.staged, [
+    'staged-modified.ts',
+    'staged-and-unstaged.ts',
+    'staged-new.ts',
+    'staged-deleted.ts',
+  ]);
+});
+
+test('parseGitStatusOutput keeps paths with spaces intact (-z output has no quoting)', () => {
+  const result = parseGitStatusOutput(porcelain('M  src/my folder/some file.ts'));
+  assert.deepEqual(result.modified, ['src/my folder/some file.ts']);
+  assert.deepEqual(result.staged, ['src/my folder/some file.ts']);
+});
+
+test('parseGitStatusOutput tracks the post-rename path and skips the original', () => {
+  const output = porcelain('R  renamed-to.ts', 'renamed-from.ts', ' M other.ts');
+  const result = parseGitStatusOutput(output);
+
+  assert.deepEqual(result.modified, ['renamed-to.ts', 'other.ts']);
+  assert.deepEqual(result.staged, ['renamed-to.ts']);
+  // The pre-rename path is metadata, not a change entry.
+  assert.equal(JSON.stringify(result).includes('renamed-from.ts'), false);
+});
+
+test('parseGitStatusOutput never reports merge conflicts as staged', () => {
+  const output = porcelain('UU conflicted.ts', 'AA both-added.ts', 'DD both-deleted.ts');
+  const result = parseGitStatusOutput(output);
+
+  assert.deepEqual(result.modified, ['conflicted.ts', 'both-added.ts', 'both-deleted.ts']);
+  assert.deepEqual(result.staged, []);
+});
+
+test('parseGitStatusOutput handles empty output', () => {
+  assert.deepEqual(parseGitStatusOutput(''), {
+    modified: [],
+    added: [],
+    deleted: [],
+    untracked: [],
+    staged: [],
+  });
+});
+
+// Builds one `git log --pretty=format:%H%x1f%P%x1f%D%x1f%an%x1f%ae%x1f%ad%x1f%s` line.
+const US = '';
+const logLine = (hash: string, parents: string, refs: string, subject: string) =>
+  [hash, parents, refs, 'Alice', 'a@x.com', '2026-07-06T10:00:00+03:00', subject].join(US);
+
+test('parseGitLogWithStats parses commits with parents, refs, and shortstat lines', () => {
+  const output = [
+    logLine('c3', 'c2', 'HEAD -> main, origin/main, tag: v1.0', 'feat: add | pipes | to subject'),
+    ' 3 files changed, 10 insertions(+), 2 deletions(-)',
+    '',
+    logLine('c2', 'c1 c0', '', 'Merge branch feature'),
+    '',
+    logLine('c0', '', '', 'initial commit'),
+    ' 1 file changed, 1 insertion(+)',
+  ].join('\n');
+
+  const commits = parseGitLogWithStats(output);
+
+  assert.equal(commits.length, 3);
+  assert.deepEqual(commits[0].parents, ['c2']);
+  assert.deepEqual(commits[0].refs, ['HEAD -> main', 'origin/main', 'tag: v1.0']);
+  // Pipes in the subject survive because fields are joined with .
+  assert.equal(commits[0].message, 'feat: add | pipes | to subject');
+  assert.equal(commits[0].stats, '3 files changed, 10 insertions(+), 2 deletions(-)');
+
+  // Merge commit: two parents, no shortstat line.
+  assert.deepEqual(commits[1].parents, ['c1', 'c0']);
+  assert.equal(commits[1].stats, '');
+
+  // Root commit: no parents.
+  assert.deepEqual(commits[2].parents, []);
+  assert.equal(commits[2].stats, '1 file changed, 1 insertion(+)');
+});
+
+test('parseGitLogWithStats handles empty output', () => {
+  assert.deepEqual(parseGitLogWithStats(''), []);
+});