gogcli-mcp 2.7.1 → 2.18.0

package/tests/tools/contacts.test.ts

@@ -1,26 +1,26 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerContactsTools } from '../../src/tools/contacts.js';
 import * as runner from '../../src/runner.js';
-import { setupHandlers as setupHandlersBase, type ToolHandler } from '../helpers/test-harness.js';
+import { createTestHarness } from '@chrischall/mcp-utils/test';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => setupHandlersBase(registerContactsTools);
+const setupHandlers = () => createTestHarness(registerContactsTools);
 
 beforeEach(() => vi.clearAllMocks());
 
 describe('gog_contacts_search', () => {
   it('calls run with query', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"connections":[]}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_search')!({ query: 'alice' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_search', { query: 'alice' });
     expect(runner.run).toHaveBeenCalledWith(['contacts', 'search', 'alice'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Search failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_contacts_search')!({ query: 'x' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_contacts_search', { query: 'x' });
     expect(result.content[0].text).toBe('Error: Search failed');
   });
 });
@@ -28,15 +28,15 @@ describe('gog_contacts_search', () => {
 describe('gog_contacts_list', () => {
   it('calls run with contacts list', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"connections":[]}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_list')!({});
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_list', {});
     expect(runner.run).toHaveBeenCalledWith(['contacts', 'list'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('List failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_contacts_list')!({});
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_contacts_list', {});
     expect(result.content[0].text).toBe('Error: List failed');
   });
 });
@@ -44,15 +44,15 @@ describe('gog_contacts_list', () => {
 describe('gog_contacts_get', () => {
   it('calls run with resourceName', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"resourceName":"people/c123"}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_get')!({ resourceName: 'people/c123' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_get', { resourceName: 'people/c123' });
     expect(runner.run).toHaveBeenCalledWith(['contacts', 'get', 'people/c123'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_contacts_get')!({ resourceName: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_contacts_get', { resourceName: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
@@ -60,15 +60,15 @@ describe('gog_contacts_get', () => {
 describe('gog_contacts_create', () => {
   it('calls run with required givenName', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"resourceName":"people/c456"}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_create')!({ givenName: 'Alice' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_create', { givenName: 'Alice' });
     expect(runner.run).toHaveBeenCalledWith(['contacts', 'create', '--given=Alice'], { account: undefined });
   });
 
   it('appends optional fields when provided', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_create')!({
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_create', {
       givenName: 'Alice',
       familyName: 'Smith',
       email: 'alice@example.com',
@@ -88,8 +88,8 @@ describe('gog_contacts_create', () => {
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Create failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_contacts_create')!({ givenName: 'Bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_contacts_create', { givenName: 'Bad' });
     expect(result.content[0].text).toBe('Error: Create failed');
   });
 });
@@ -97,15 +97,15 @@ describe('gog_contacts_create', () => {
 describe('gog_contacts_run', () => {
   it('passes subcommand and args to runner', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_contacts_run')!({ subcommand: 'delete', args: ['people/c123'] });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_contacts_run', { subcommand: 'delete', args: ['people/c123'] });
     expect(runner.run).toHaveBeenCalledWith(['contacts', 'delete', 'people/c123'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Run failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_contacts_run')!({ subcommand: 'update', args: [] });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_contacts_run', { subcommand: 'update', args: [] });
     expect(result.content[0].text).toBe('Error: Run failed');
   });
 });

package/tests/tools/docs.test.ts

@@ -1,19 +1,19 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerDocsTools } from '../../src/tools/docs.js';
 import * as runner from '../../src/runner.js';
-import { setupHandlers as setupHandlersBase, type ToolHandler } from '../helpers/test-harness.js';
+import { createTestHarness } from '@chrischall/mcp-utils/test';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => setupHandlersBase(registerDocsTools);
+const setupHandlers = () => createTestHarness(registerDocsTools);
 
 beforeEach(() => vi.clearAllMocks());
 
 describe('gog_docs_info', () => {
   it('calls run with correct args', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"title":"My Doc","docId":"abc"}');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_info')!({ docId: 'abc' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_info', { docId: 'abc' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'info', 'abc'], { account: undefined });
     expect(result.content[0].text).toContain('My Doc');
   });
@@ -22,15 +22,15 @@ describe('gog_docs_info', () => {
     vi.mocked(runner.run)
       .mockRejectedValueOnce(new Error('Doc not found'))
       .mockResolvedValueOnce('user@gmail.com');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_info')!({ docId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_info', { docId: 'bad' });
     expect(result.content[0].text).toBe('Error: Doc not found\n\nConfigured accounts:\nuser@gmail.com');
   });
 
   it('returns plain error text when auth list also fails', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Doc not found'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_info')!({ docId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_info', { docId: 'bad' });
     expect(result.content[0].text).toBe('Error: Doc not found');
   });
 
@@ -38,8 +38,8 @@ describe('gog_docs_info', () => {
     vi.mocked(runner.run)
       .mockRejectedValueOnce('raw error string')
       .mockRejectedValueOnce(new Error('auth list failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_info')!({ docId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_info', { docId: 'bad' });
     expect(result.content[0].text).toBe('raw error string');
   });
 });
@@ -47,23 +47,30 @@ describe('gog_docs_info', () => {
 describe('gog_docs_cat', () => {
   it('calls run with correct args', async () => {
     vi.mocked(runner.run).mockResolvedValue('Hello world');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_cat')!({ docId: 'abc' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_cat', { docId: 'abc' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'cat', 'abc'], { account: undefined });
     expect(result.content[0].text).toBe('Hello world');
   });
 
   it('forwards account override', async () => {
     vi.mocked(runner.run).mockResolvedValue('text');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_cat')!({ docId: 'abc', account: 'other@gmail.com' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_cat', { docId: 'abc', account: 'other@gmail.com' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'cat', 'abc'], { account: 'other@gmail.com' });
   });
 
+  it('appends --chips when requested', async () => {
+    vi.mocked(runner.run).mockResolvedValue('Hello @person');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_cat', { docId: 'abc', chips: true });
+    expect(runner.run).toHaveBeenCalledWith(['docs', 'cat', 'abc', '--chips'], { account: undefined });
+  });
+
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Not found'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_cat')!({ docId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_cat', { docId: 'bad' });
     expect(result.content[0].text).toBe('Error: Not found');
   });
 });
@@ -71,15 +78,15 @@ describe('gog_docs_cat', () => {
 describe('gog_docs_create', () => {
   it('calls run with title', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"docId":"newid","title":"Meeting Notes"}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_create')!({ title: 'Meeting Notes' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_create', { title: 'Meeting Notes' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'create', 'Meeting Notes'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Create failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_create')!({ title: 'Bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_create', { title: 'Bad' });
     expect(result.content[0].text).toBe('Error: Create failed');
   });
 });
@@ -87,26 +94,37 @@ describe('gog_docs_create', () => {
 describe('gog_docs_write', () => {
   it('calls run with text flag', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_write')!({ docId: 'abc', text: 'Hello world' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', { docId: 'abc', text: 'Hello world' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'write', 'abc', '--text=Hello world'], { account: undefined });
   });
 
   it('adds --append flag when append is true', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_write')!({ docId: 'abc', text: 'More text', append: true });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', { docId: 'abc', text: 'More text', append: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['docs', 'write', 'abc', '--text=More text', '--append'],
       { account: undefined },
     );
   });
 
+  // gog 0.25.0
+  it('appends to a persisted batch via --batch', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', { docId: 'abc', text: 'T', batch: 'b1' });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['docs', 'write', 'abc', '--text=T', '--batch=b1'],
+      { account: undefined },
+    );
+  });
+
   // gog 0.24.0
   it('adds --check-orphans when checkOrphans is true', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_write')!({ docId: 'abc', text: 'Rewrite', checkOrphans: true });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', { docId: 'abc', text: 'Rewrite', checkOrphans: true });
     expect(runner.run).toHaveBeenCalledWith(
       ['docs', 'write', 'abc', '--text=Rewrite', '--check-orphans'],
       { account: undefined },
@@ -115,15 +133,46 @@ describe('gog_docs_write', () => {
 
   it('omits --append flag when append is false', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_write')!({ docId: 'abc', text: 'text', append: false });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', { docId: 'abc', text: 'text', append: false });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'write', 'abc', '--text=text'], { account: undefined });
   });
 
+  // gog 0.30.0 paragraph list / indentation / spacing / keep controls
+  it('adds bullets, numbering, indentation, spacing and keep flags (keep=true)', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', {
+      docId: 'abc', text: 'List', bullets: true, bulletPreset: 'BULLET_DISC_CIRCLE_SQUARE',
+      indentStart: 18, indentEnd: 6, indentFirstLine: 36, spaceAbove: 4, spaceBelow: 8,
+      keepLinesTogether: true, keepWithNext: true,
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['docs', 'write', 'abc', '--text=List', '--bullets', '--bullet-preset=BULLET_DISC_CIRCLE_SQUARE',
+        '--indent-start=18', '--indent-end=6', '--indent-first-line=36', '--space-above=4', '--space-below=8',
+        '--keep-lines-together', '--keep-with-next'],
+      { account: undefined },
+    );
+  });
+
+  it('uses numbered list and negated keep flags (keep=false)', async () => {
+    vi.mocked(runner.run).mockResolvedValue('{}');
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_write', {
+      docId: 'abc', text: 'Steps', ordered: true, noBullets: true,
+      keepLinesTogether: false, keepWithNext: false,
+    });
+    expect(runner.run).toHaveBeenCalledWith(
+      ['docs', 'write', 'abc', '--text=Steps', '--ordered', '--no-bullets',
+        '--no-keep-lines-together', '--no-keep-with-next'],
+      { account: undefined },
+    );
+  });
+
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Write failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_write')!({ docId: 'bad', text: 'x' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_write', { docId: 'bad', text: 'x' });
     expect(result.content[0].text).toBe('Error: Write failed');
   });
 });
@@ -131,15 +180,15 @@ describe('gog_docs_write', () => {
 describe('gog_docs_find_replace', () => {
   it('calls run with find and replace args', async () => {
     vi.mocked(runner.run).mockResolvedValue('{"occurrencesChanged":2}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_find_replace')!({ docId: 'abc', find: 'foo', replace: 'bar' });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_find_replace', { docId: 'abc', find: 'foo', replace: 'bar' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'find-replace', 'abc', 'foo', 'bar'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Replace failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_find_replace')!({ docId: 'bad', find: 'x', replace: 'y' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_find_replace', { docId: 'bad', find: 'x', replace: 'y' });
     expect(result.content[0].text).toBe('Error: Replace failed');
   });
 });
@@ -147,16 +196,16 @@ describe('gog_docs_find_replace', () => {
 describe('gog_docs_structure', () => {
   it('calls run with correct args', async () => {
     vi.mocked(runner.run).mockResolvedValue('[1] Heading\n[2] Paragraph');
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_structure')!({ docId: 'abc' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_structure', { docId: 'abc' });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'structure', 'abc'], { account: undefined });
     expect(result.content[0].text).toContain('Heading');
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Structure failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_structure')!({ docId: 'bad' });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_structure', { docId: 'bad' });
     expect(result.content[0].text).toBe('Error: Structure failed');
   });
 });
@@ -164,22 +213,22 @@ describe('gog_docs_structure', () => {
 describe('gog_docs_run', () => {
   it('passes raw subcommand and args to runner', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_run')!({ subcommand: 'copy', args: ['abc', 'My Copy'] });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_run', { subcommand: 'copy', args: ['abc', 'My Copy'] });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'copy', 'abc', 'My Copy'], { account: undefined });
   });
 
   it('works with empty args array', async () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
-    const handlers = setupHandlers();
-    await handlers.get('gog_docs_run')!({ subcommand: 'clear', args: [] });
+    const harness = await setupHandlers();
+    await harness.callTool('gog_docs_run', { subcommand: 'clear', args: [] });
     expect(runner.run).toHaveBeenCalledWith(['docs', 'clear'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
     vi.mocked(runner.run).mockRejectedValue(new Error('Run failed'));
-    const handlers = setupHandlers();
-    const result = await handlers.get('gog_docs_run')!({ subcommand: 'clear', args: [] });
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_docs_run', { subcommand: 'clear', args: [] });
     expect(result.content[0].text).toBe('Error: Run failed');
   });
 });