gogcli-mcp-drive 2.7.1 → 2.18.0

package/tests/tools/drive-extra.test.ts

@@ -1,7 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerExtraDriveTools } from '../../src/tools/drive-extra.js';
 import * as lib from '../../../gogcli-mcp/src/lib.js';
-import { setupHandlers, toText, type ToolHandler } from '../../../gogcli-mcp/tests/helpers/test-harness.js';
+import { createTestHarness, type TestHarness } from '@chrischall/mcp-utils/test';
+import { rawTextResult } from '@chrischall/mcp-utils';
 
 vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
   const actual = await importOriginal<typeof lib>();
@@ -11,37 +12,45 @@ vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
   };
 });
 
-let handlers: Map<string, ToolHandler>;
+let harness: TestHarness;
 
-beforeEach(() => {
+beforeEach(async () => {
   vi.clearAllMocks();
-  vi.mocked(lib.runOrDiagnose).mockResolvedValue(toText('{}'));
-  handlers = setupHandlers(registerExtraDriveTools);
+  vi.mocked(lib.runOrDiagnose).mockResolvedValue(rawTextResult('{}'));
+  harness = await createTestHarness(registerExtraDriveTools);
 });
 
 describe('gog_drive_download', () => {
   it('calls runOrDiagnose with fileId only', async () => {
-    await handlers.get('gog_drive_download')!({ fileId: 'f1' });
+    await harness.callTool('gog_drive_download', { fileId: 'f1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'download', 'f1'], { account: undefined });
   });
 
   it('passes --out and --format when provided', async () => {
-    await handlers.get('gog_drive_download')!({ fileId: 'f1', out: '/tmp/file.pdf', format: 'pdf', account: 'a@b.com' });
+    await harness.callTool('gog_drive_download', { fileId: 'f1', out: '/tmp/file.pdf', format: 'pdf', account: 'a@b.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'download', 'f1', '--out=/tmp/file.pdf', '--format=pdf'],
       { account: 'a@b.com' },
     );
   });
+
+  it('passes --overwrite when requested', async () => {
+    await harness.callTool('gog_drive_download', { fileId: 'f1', out: '/tmp/file.pdf', overwrite: true });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'download', 'f1', '--out=/tmp/file.pdf', '--overwrite'],
+      { account: undefined },
+    );
+  });
 });
 
 describe('gog_drive_upload', () => {
   it('calls runOrDiagnose with localPath only', async () => {
-    await handlers.get('gog_drive_upload')!({ localPath: '/tmp/x.txt' });
+    await harness.callTool('gog_drive_upload', { localPath: '/tmp/x.txt' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'upload', '/tmp/x.txt'], { account: undefined });
   });
 
   it('passes all upload flags', async () => {
-    await handlers.get('gog_drive_upload')!({
+    await harness.callTool('gog_drive_upload', {
       localPath: '/tmp/x.txt',
       name: 'renamed.txt',
       parent: 'folder1',
@@ -67,19 +76,49 @@ describe('gog_drive_upload', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('gog_drive_upload')!({ localPath: '/tmp/x.txt', keepRevisionForever: false, convert: false });
+    await harness.callTool('gog_drive_upload', { localPath: '/tmp/x.txt', keepRevisionForever: false, convert: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'upload', '/tmp/x.txt'], { account: undefined });
   });
 });
 
+describe('gog_drive_sync_push', () => {
+  it('calls runOrDiagnose with localPath and required parent', async () => {
+    await harness.callTool('gog_drive_sync_push', { localPath: '/tmp/dir', parent: 'folder1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'sync', 'push', '/tmp/dir', '--parent=folder1'],
+      { account: undefined },
+    );
+  });
+
+  it('passes --dry-run and --no-all-drives', async () => {
+    await harness.callTool('gog_drive_sync_push', {
+      localPath: '/tmp/dir', parent: 'folder1', dryRun: true, allDrives: false,
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'sync', 'push', '/tmp/dir', '--parent=folder1', '--dry-run', '--no-all-drives'],
+      { account: undefined },
+    );
+  });
+
+  it('omits --no-all-drives when allDrives is true and dryRun false', async () => {
+    await harness.callTool('gog_drive_sync_push', {
+      localPath: '/tmp/dir', parent: 'folder1', dryRun: false, allDrives: true,
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'sync', 'push', '/tmp/dir', '--parent=folder1'],
+      { account: undefined },
+    );
+  });
+});
+
 describe('gog_drive_copy', () => {
   it('calls runOrDiagnose with fileId and name', async () => {
-    await handlers.get('gog_drive_copy')!({ fileId: 'f1', name: 'Copy' });
+    await harness.callTool('gog_drive_copy', { fileId: 'f1', name: 'Copy' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'copy', 'f1', 'Copy'], { account: undefined });
   });
 
   it('passes --parent when provided', async () => {
-    await handlers.get('gog_drive_copy')!({ fileId: 'f1', name: 'Copy', parent: 'folder1' });
+    await harness.callTool('gog_drive_copy', { fileId: 'f1', name: 'Copy', parent: 'folder1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'copy', 'f1', 'Copy', '--parent=folder1'],
       { account: undefined },
@@ -89,24 +128,24 @@ describe('gog_drive_copy', () => {
 
 describe('gog_drive_url', () => {
   it('calls runOrDiagnose with single fileId', async () => {
-    await handlers.get('gog_drive_url')!({ fileIds: ['f1'] });
+    await harness.callTool('gog_drive_url', { fileIds: ['f1'] });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'url', 'f1'], { account: undefined });
   });
 
   it('calls runOrDiagnose with multiple fileIds', async () => {
-    await handlers.get('gog_drive_url')!({ fileIds: ['f1', 'f2', 'f3'] });
+    await harness.callTool('gog_drive_url', { fileIds: ['f1', 'f2', 'f3'] });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'url', 'f1', 'f2', 'f3'], { account: undefined });
   });
 });
 
 describe('gog_drive_permissions', () => {
   it('calls runOrDiagnose with fileId', async () => {
-    await handlers.get('gog_drive_permissions')!({ fileId: 'f1' });
+    await harness.callTool('gog_drive_permissions', { fileId: 'f1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'permissions', 'f1'], { account: undefined });
   });
 
   it('passes --max and --page when provided', async () => {
-    await handlers.get('gog_drive_permissions')!({ fileId: 'f1', max: 50, page: 'tok' });
+    await harness.callTool('gog_drive_permissions', { fileId: 'f1', max: 50, page: 'tok' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'permissions', 'f1', '--max=50', '--page=tok'],
       { account: undefined },
@@ -116,9 +155,9 @@ describe('gog_drive_permissions', () => {
 
 describe('gog_drive_unshare', () => {
   it('calls runOrDiagnose with fileId and permissionId', async () => {
-    await handlers.get('gog_drive_unshare')!({ fileId: 'f1', permissionId: 'p1' });
+    await harness.callTool('gog_drive_unshare', { fileId: 'f1', permissionId: 'p1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['drive', 'unshare', 'f1', 'p1'],
+      ['drive', 'unshare', 'f1', 'p1', '--force'],
       { account: undefined },
     );
   });
@@ -126,12 +165,12 @@ describe('gog_drive_unshare', () => {
 
 describe('gog_drive_drives_list', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_drives_list')!({});
+    await harness.callTool('gog_drive_drives_list', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'drives'], { account: undefined });
   });
 
   it('passes all listing flags', async () => {
-    await handlers.get('gog_drive_drives_list')!({ max: 50, page: 'tok', all: true, query: 'engineering' });
+    await harness.callTool('gog_drive_drives_list', { max: 50, page: 'tok', all: true, query: 'engineering' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'drives', '--max=50', '--page=tok', '--all', '--query=engineering'],
       { account: undefined },
@@ -139,14 +178,14 @@ describe('gog_drive_drives_list', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_drive_drives_list')!({ all: false });
+    await harness.callTool('gog_drive_drives_list', { all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'drives'], { account: undefined });
   });
 });
 
 describe('gog_drive_comments_list', () => {
   it('calls runOrDiagnose with fileId', async () => {
-    await handlers.get('gog_drive_comments_list')!({ fileId: 'f1' });
+    await harness.callTool('gog_drive_comments_list', { fileId: 'f1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'list', 'f1'],
       { account: undefined },
@@ -155,7 +194,7 @@ describe('gog_drive_comments_list', () => {
 
   // gog 0.22.0 adds --since; --include-quoted and pagination were already supported by gog.
   it('includes --since, --include-quoted and pagination flags when set', async () => {
-    await handlers.get('gog_drive_comments_list')!({
+    await harness.callTool('gog_drive_comments_list', {
       fileId: 'f1', since: '2026-06-01T00:00:00Z', includeQuoted: true, max: 5, page: 'tok', all: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -167,7 +206,7 @@ describe('gog_drive_comments_list', () => {
 
 describe('gog_drive_comments_get', () => {
   it('calls runOrDiagnose with fileId and commentId', async () => {
-    await handlers.get('gog_drive_comments_get')!({ fileId: 'f1', commentId: 'c1' });
+    await harness.callTool('gog_drive_comments_get', { fileId: 'f1', commentId: 'c1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'get', 'f1', 'c1'],
       { account: undefined },
@@ -177,7 +216,7 @@ describe('gog_drive_comments_get', () => {
 
 describe('gog_drive_comments_add', () => {
   it('calls runOrDiagnose with fileId and content', async () => {
-    await handlers.get('gog_drive_comments_add')!({ fileId: 'f1', content: 'LGTM' });
+    await harness.callTool('gog_drive_comments_add', { fileId: 'f1', content: 'LGTM' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'create', 'f1', 'LGTM'],
       { account: undefined },
@@ -187,7 +226,7 @@ describe('gog_drive_comments_add', () => {
 
 describe('gog_drive_comments_update', () => {
   it('calls runOrDiagnose with fileId, commentId, and content', async () => {
-    await handlers.get('gog_drive_comments_update')!({ fileId: 'f1', commentId: 'c1', content: 'edited' });
+    await harness.callTool('gog_drive_comments_update', { fileId: 'f1', commentId: 'c1', content: 'edited' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'update', 'f1', 'c1', 'edited'],
       { account: undefined },
@@ -197,9 +236,9 @@ describe('gog_drive_comments_update', () => {
 
 describe('gog_drive_comments_delete', () => {
   it('calls runOrDiagnose with fileId and commentId', async () => {
-    await handlers.get('gog_drive_comments_delete')!({ fileId: 'f1', commentId: 'c1' });
+    await harness.callTool('gog_drive_comments_delete', { fileId: 'f1', commentId: 'c1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['drive', 'comments', 'delete', 'f1', 'c1'],
+      ['drive', 'comments', 'delete', 'f1', 'c1', '--force'],
       { account: undefined },
     );
   });
@@ -207,7 +246,7 @@ describe('gog_drive_comments_delete', () => {
 
 describe('gog_drive_comments_reply', () => {
   it('calls runOrDiagnose with fileId, commentId, and content', async () => {
-    await handlers.get('gog_drive_comments_reply')!({ fileId: 'f1', commentId: 'c1', content: 'thanks' });
+    await harness.callTool('gog_drive_comments_reply', { fileId: 'f1', commentId: 'c1', content: 'thanks' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'reply', 'f1', 'c1', 'thanks'],
       { account: undefined },
@@ -216,7 +255,7 @@ describe('gog_drive_comments_reply', () => {
 
   // gog 0.18.0: --action atomically flips resolved state on the parent comment.
   it('passes --action=resolve when action provided', async () => {
-    await handlers.get('gog_drive_comments_reply')!({
+    await harness.callTool('gog_drive_comments_reply', {
       fileId: 'f1', commentId: 'c1', content: 'lgtm, resolving', action: 'resolve',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -226,7 +265,7 @@ describe('gog_drive_comments_reply', () => {
   });
 
   it('passes --action=reopen when action provided', async () => {
-    await handlers.get('gog_drive_comments_reply')!({
+    await harness.callTool('gog_drive_comments_reply', {
       fileId: 'f1', commentId: 'c1', content: 'actually wait', action: 'reopen',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -240,7 +279,7 @@ describe('gog_drive_comments_reply', () => {
 
 describe('gog_drive_comments_resolve', () => {
   it('calls runOrDiagnose with fileId and commentId', async () => {
-    await handlers.get('gog_drive_comments_resolve')!({ fileId: 'f1', commentId: 'c1' });
+    await harness.callTool('gog_drive_comments_resolve', { fileId: 'f1', commentId: 'c1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'resolve', 'f1', 'c1'],
       { account: undefined },
@@ -248,7 +287,7 @@ describe('gog_drive_comments_resolve', () => {
   });
 
   it('forwards account', async () => {
-    await handlers.get('gog_drive_comments_resolve')!({ fileId: 'f1', commentId: 'c1', account: 'a@b.com' });
+    await harness.callTool('gog_drive_comments_resolve', { fileId: 'f1', commentId: 'c1', account: 'a@b.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'resolve', 'f1', 'c1'],
       { account: 'a@b.com' },
@@ -258,7 +297,7 @@ describe('gog_drive_comments_resolve', () => {
 
 describe('gog_drive_comments_reopen', () => {
   it('calls runOrDiagnose with fileId and commentId', async () => {
-    await handlers.get('gog_drive_comments_reopen')!({ fileId: 'f1', commentId: 'c1' });
+    await harness.callTool('gog_drive_comments_reopen', { fileId: 'f1', commentId: 'c1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'comments', 'reopen', 'f1', 'c1'],
       { account: undefined },
@@ -270,12 +309,12 @@ describe('gog_drive_comments_reopen', () => {
 
 describe('gog_drive_du', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_du')!({});
+    await harness.callTool('gog_drive_du', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'du'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_du')!({
+    await harness.callTool('gog_drive_du', {
       parent: 'folder1', depth: 3, max: 20, sort: 'files', order: 'asc', noAllDrives: true, account: 'a@b.com',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -285,7 +324,7 @@ describe('gog_drive_du', () => {
   });
 
   it('handles depth/max=0 and omits noAllDrives when false', async () => {
-    await handlers.get('gog_drive_du')!({ depth: 0, max: 0, noAllDrives: false });
+    await harness.callTool('gog_drive_du', { depth: 0, max: 0, noAllDrives: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'du', '--depth=0', '--max=0'],
       { account: undefined },
@@ -295,12 +334,12 @@ describe('gog_drive_du', () => {
 
 describe('gog_drive_tree', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_tree')!({});
+    await harness.callTool('gog_drive_tree', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'tree'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_tree')!({ parent: 'folder1', depth: 4, max: 100, noAllDrives: true });
+    await harness.callTool('gog_drive_tree', { parent: 'folder1', depth: 4, max: 100, noAllDrives: true });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'tree', '--parent=folder1', '--depth=4', '--max=100', '--no-all-drives'],
       { account: undefined },
@@ -308,19 +347,19 @@ describe('gog_drive_tree', () => {
   });
 
   it('handles depth=0 and omits noAllDrives when false', async () => {
-    await handlers.get('gog_drive_tree')!({ depth: 0, noAllDrives: false });
+    await harness.callTool('gog_drive_tree', { depth: 0, noAllDrives: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'tree', '--depth=0'], { account: undefined });
   });
 });
 
 describe('gog_drive_changes_start_token', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_changes_start_token')!({});
+    await harness.callTool('gog_drive_changes_start_token', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'changes', 'start-token'], { account: undefined });
   });
 
   it('passes --drive when provided', async () => {
-    await handlers.get('gog_drive_changes_start_token')!({ drive: 'd1', account: 'a@b.com' });
+    await harness.callTool('gog_drive_changes_start_token', { drive: 'd1', account: 'a@b.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'changes', 'start-token', '--drive=d1'],
       { account: 'a@b.com' },
@@ -330,7 +369,7 @@ describe('gog_drive_changes_start_token', () => {
 
 describe('gog_drive_changes_list', () => {
   it('calls runOrDiagnose with token only', async () => {
-    await handlers.get('gog_drive_changes_list')!({ token: 'tok1' });
+    await harness.callTool('gog_drive_changes_list', { token: 'tok1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'changes', 'list', '--token=tok1'],
       { account: undefined },
@@ -338,7 +377,7 @@ describe('gog_drive_changes_list', () => {
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_changes_list')!({
+    await harness.callTool('gog_drive_changes_list', {
       token: 'tok1', max: 50, page: 'p2', all: true, includeRemoved: true, drive: 'd1',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -348,7 +387,7 @@ describe('gog_drive_changes_list', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('gog_drive_changes_list')!({ token: 'tok1', all: false, includeRemoved: false });
+    await harness.callTool('gog_drive_changes_list', { token: 'tok1', all: false, includeRemoved: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'changes', 'list', '--token=tok1'],
       { account: undefined },
@@ -358,12 +397,12 @@ describe('gog_drive_changes_list', () => {
 
 describe('gog_drive_labels_list', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_labels_list')!({});
+    await harness.callTool('gog_drive_labels_list', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'labels', 'list'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_labels_list')!({
+    await harness.callTool('gog_drive_labels_list', {
       language: 'en', view: 'LABEL_VIEW_FULL', minimumRole: 'APPLIER', publishedOnly: true, adminAccess: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -373,19 +412,19 @@ describe('gog_drive_labels_list', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('gog_drive_labels_list')!({ publishedOnly: false, adminAccess: false });
+    await harness.callTool('gog_drive_labels_list', { publishedOnly: false, adminAccess: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'labels', 'list'], { account: undefined });
   });
 });
 
 describe('gog_drive_labels_get', () => {
   it('calls runOrDiagnose with name only', async () => {
-    await handlers.get('gog_drive_labels_get')!({ name: 'labels/abc' });
+    await harness.callTool('gog_drive_labels_get', { name: 'labels/abc' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'labels', 'get', 'labels/abc'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_labels_get')!({
+    await harness.callTool('gog_drive_labels_get', {
       name: 'labels/abc', language: 'en', view: 'LABEL_VIEW_BASIC', adminAccess: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -395,14 +434,14 @@ describe('gog_drive_labels_get', () => {
   });
 
   it('omits --admin-access when false', async () => {
-    await handlers.get('gog_drive_labels_get')!({ name: 'labels/abc', adminAccess: false });
+    await harness.callTool('gog_drive_labels_get', { name: 'labels/abc', adminAccess: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'labels', 'get', 'labels/abc'], { account: undefined });
   });
 });
 
 describe('gog_drive_labels_file_list', () => {
   it('calls runOrDiagnose with fileId only', async () => {
-    await handlers.get('gog_drive_labels_file_list')!({ fileId: 'f1' });
+    await harness.callTool('gog_drive_labels_file_list', { fileId: 'f1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'labels', 'file', 'list', 'f1'],
       { account: undefined },
@@ -410,7 +449,7 @@ describe('gog_drive_labels_file_list', () => {
   });
 
   it('passes --max and --page when provided', async () => {
-    await handlers.get('gog_drive_labels_file_list')!({ fileId: 'f1', max: 25, page: 'tok' });
+    await harness.callTool('gog_drive_labels_file_list', { fileId: 'f1', max: 25, page: 'tok' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'labels', 'file', 'list', 'f1', '--max=25', '--page=tok'],
       { account: undefined },
@@ -420,7 +459,7 @@ describe('gog_drive_labels_file_list', () => {
 
 describe('gog_drive_labels_file_apply', () => {
   it('calls runOrDiagnose with fileId and labelId only', async () => {
-    await handlers.get('gog_drive_labels_file_apply')!({ fileId: 'f1', labelId: 'l1' });
+    await harness.callTool('gog_drive_labels_file_apply', { fileId: 'f1', labelId: 'l1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'labels', 'file', 'apply', 'f1', 'l1'],
       { account: undefined },
@@ -428,7 +467,7 @@ describe('gog_drive_labels_file_apply', () => {
   });
 
   it('passes all repeatable field flags and fields-json', async () => {
-    await handlers.get('gog_drive_labels_file_apply')!({
+    await harness.callTool('gog_drive_labels_file_apply', {
       fileId: 'f1',
       labelId: 'l1',
       text: ['t1=hello', 't2=world'],
@@ -455,7 +494,7 @@ describe('gog_drive_labels_file_apply', () => {
   });
 
   it('omits empty arrays', async () => {
-    await handlers.get('gog_drive_labels_file_apply')!({
+    await harness.callTool('gog_drive_labels_file_apply', {
       fileId: 'f1', labelId: 'l1', text: [], selection: [], integer: [], date: [], user: [], unset: [],
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -467,9 +506,9 @@ describe('gog_drive_labels_file_apply', () => {
 
 describe('gog_drive_labels_file_remove', () => {
   it('calls runOrDiagnose with fileId and labelId', async () => {
-    await handlers.get('gog_drive_labels_file_remove')!({ fileId: 'f1', labelId: 'l1' });
+    await harness.callTool('gog_drive_labels_file_remove', { fileId: 'f1', labelId: 'l1' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['drive', 'labels', 'file', 'remove', 'f1', 'l1'],
+      ['drive', 'labels', 'file', 'remove', 'f1', 'l1', '--force'],
       { account: undefined },
     );
   });
@@ -477,12 +516,12 @@ describe('gog_drive_labels_file_remove', () => {
 
 describe('gog_drive_activity', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_activity')!({});
+    await harness.callTool('gog_drive_activity', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'activity', 'query'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_activity')!({
+    await harness.callTool('gog_drive_activity', {
       file: 'f1',
       folder: 'fo1',
       actions: 'edit,share',
@@ -506,19 +545,19 @@ describe('gog_drive_activity', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('gog_drive_activity')!({ all: false, consolidate: false });
+    await harness.callTool('gog_drive_activity', { all: false, consolidate: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'activity', 'query'], { account: undefined });
   });
 });
 
 describe('gog_drive_audit_sharing', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_drive_audit_sharing')!({});
+    await harness.callTool('gog_drive_audit_sharing', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['drive', 'audit', 'sharing'], { account: undefined });
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_audit_sharing')!({
+    await harness.callTool('gog_drive_audit_sharing', {
       file: 'f1',
       parent: 'fo1',
       depth: 3,
@@ -540,7 +579,7 @@ describe('gog_drive_audit_sharing', () => {
   });
 
   it('handles depth/max=0, empty domains, and omits booleans when false', async () => {
-    await handlers.get('gog_drive_audit_sharing')!({
+    await harness.callTool('gog_drive_audit_sharing', {
       depth: 0, max: 0, internalDomain: [], publicOnly: false, externalOnly: false, noAllDrives: false,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -552,7 +591,7 @@ describe('gog_drive_audit_sharing', () => {
 
 describe('gog_drive_audit_user', () => {
   it('calls runOrDiagnose with user only', async () => {
-    await handlers.get('gog_drive_audit_user')!({ user: 'a@b.com' });
+    await harness.callTool('gog_drive_audit_user', { user: 'a@b.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'audit', 'user', 'a@b.com'],
       { account: undefined },
@@ -560,7 +599,7 @@ describe('gog_drive_audit_user', () => {
   });
 
   it('passes all flags', async () => {
-    await handlers.get('gog_drive_audit_user')!({
+    await harness.callTool('gog_drive_audit_user', {
       user: 'a@b.com', file: 'f1', parent: 'fo1', depth: 3, max: 100, noAllDrives: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -570,7 +609,7 @@ describe('gog_drive_audit_user', () => {
   });
 
   it('handles depth/max=0 and omits noAllDrives when false', async () => {
-    await handlers.get('gog_drive_audit_user')!({ user: 'a@b.com', depth: 0, max: 0, noAllDrives: false });
+    await harness.callTool('gog_drive_audit_user', { user: 'a@b.com', depth: 0, max: 0, noAllDrives: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'audit', 'user', 'a@b.com', '--depth=0', '--max=0'],
       { account: undefined },
@@ -581,7 +620,7 @@ describe('gog_drive_audit_user', () => {
 // gog 0.24.0
 describe('gog_drive_revisions_list', () => {
   it('lists revisions with pagination', async () => {
-    await handlers.get('gog_drive_revisions_list')!({ fileId: 'f1', max: 10, page: 'tok', all: true });
+    await harness.callTool('gog_drive_revisions_list', { fileId: 'f1', max: 10, page: 'tok', all: true });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'revisions', 'list', 'f1', '--max=10', '--page=tok', '--all'],
       { account: undefined },
@@ -591,10 +630,29 @@ describe('gog_drive_revisions_list', () => {
 
 describe('gog_drive_revisions_get', () => {
   it('gets one revision', async () => {
-    await handlers.get('gog_drive_revisions_get')!({ fileId: 'f1', revisionId: 'r3', account: 'a@b.com' });
+    await harness.callTool('gog_drive_revisions_get', { fileId: 'f1', revisionId: 'r3', account: 'a@b.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['drive', 'revisions', 'get', 'f1', 'r3'],
       { account: 'a@b.com' },
     );
   });
 });
+
+// gog 0.25.0
+describe('gog_drive_shortcut_create', () => {
+  it('creates a shortcut to a target in a folder', async () => {
+    await harness.callTool('gog_drive_shortcut_create', { targetId: 'f1', parent: 'folder9' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'shortcut', 'create', 'f1', '--parent=folder9'],
+      { account: undefined },
+    );
+  });
+
+  it('passes an explicit shortcut name', async () => {
+    await harness.callTool('gog_drive_shortcut_create', { targetId: 'f1', parent: 'folder9', name: 'My Link', account: 'a@b.com' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['drive', 'shortcut', 'create', 'f1', '--parent=folder9', '--name=My Link'],
+      { account: 'a@b.com' },
+    );
+  });
+});

package/tsconfig.json

@@ -5,5 +5,5 @@
     "rootDir": "../"
   },
   "include": ["src/**/*", "../gogcli-mcp/src/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist", "../gogcli-mcp/src/worker.ts"]
 }