gogcli-mcp-calendar 4.2.4 → 4.3.0

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-calendar",
   "display_name": "gogcli (Calendar)",
-  "version": "4.2.4",
+  "version": "4.3.0",
   "description": "Extended Google Calendar for Claude via gogcli — auth + Calendar events + Meet space management",
   "author": {
     "name": "Chris Hall",
@@ -35,7 +35,8 @@
       ],
       "env": {
         "GOG_ACCOUNT": "${user_config.gog_account}",
-        "GOG_PATH": "${user_config.gog_path}"
+        "GOG_PATH": "${user_config.gog_path}",
+        "GOG_FILE_ROOTS": "${user_config.gog_file_roots}"
       }
     }
   },
@@ -51,6 +52,12 @@
       "title": "gog Executable Path",
       "description": "Path to the gog executable (optional — defaults to 'gog' on your PATH)",
       "required": false
+    },
+    "gog_file_roots": {
+      "type": "string",
+      "title": "Allowed file directories",
+      "description": "Directories tools may read files from (attachments, uploads) or write files to (exports, downloads), separated by ':' (';' on Windows). Optional — defaults to ~/gogcli-mcp-files",
+      "required": false
     }
   },
   "tools": [

package/mint.yaml

@@ -92,7 +92,7 @@ dependencies:
   # bumping these nine pins, and the pin stored on each mcp-host registration.
   - kind: github-release
     repo: openclaw/gogcli
-    tag: v0.40.0
+    tag: v0.41.0
     asset: "gogcli_*_linux_amd64.tar.gz"
     bin: [gog]
 state:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-calendar",
-  "version": "4.2.4",
+  "version": "4.3.0",
   "mcpName": "io.github.chrischall/gogcli-mcp-calendar",
   "description": "Extended Google Calendar + Meet MCP server via gogcli — auth + Calendar events + Meet space management",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -24,7 +24,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^2.1.0",
+    "@chrischall/mcp-utils": "^2.4.0",
     "@modelcontextprotocol/server": "^2.0.0",
     "zod": "^4.6.1"
   },

package/src/tools/calendar-extra.ts

@@ -1,6 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/server';
 import { z } from 'zod';
-import { accountParam, runOrDiagnose, pageTokenParam, pageAliasParam, resolvePageToken} from '../../../gogcli-mcp/src/lib.js';
+import { accountParam, runOrDiagnose, pageTokenParam, pageAliasParam, resolvePageToken, pos} from '../../../gogcli-mcp/src/lib.js';
+import type { GogArg } from '../../../gogcli-mcp/src/lib.js';
 
 const meetAccess = z.enum(['open', 'trusted', 'restricted']);
 
@@ -16,7 +17,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ access, open, account }) => {
-    const args = ['meet', 'create'];
+    const args: GogArg[] = ['meet', 'create'];
     if (access) args.push(`--access=${access}`);
     if (open) args.push('--open');
     return runOrDiagnose(args, { account });
@@ -30,7 +31,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ meetingCode, account }) => {
-    return runOrDiagnose(['meet', 'get', meetingCode], { account });
+    return runOrDiagnose(['meet', 'get', pos(meetingCode)], { account });
   });
 
   server.registerTool('gog_meet_update', {
@@ -42,7 +43,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ meetingCode, access, account }) => {
-    const args = ['meet', 'update', meetingCode];
+    const args: GogArg[] = ['meet', 'update', pos(meetingCode)];
     if (access) args.push(`--access=${access}`);
     return runOrDiagnose(args, { account });
   });
@@ -55,7 +56,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ meetingCode, account }) => {
-    return runOrDiagnose(['meet', 'end', meetingCode, '--force'], { account }); // gog gates this op; without --force the runner's --no-input makes it refuse
+    return runOrDiagnose(['meet', 'end', pos(meetingCode), '--force'], { account }); // gog gates this op; without --force the runner's --no-input makes it refuse
   });
 
   server.registerTool('gog_meet_history', {
@@ -70,7 +71,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ meetingCode, max, pageToken, page, all, account }) => {
-    const args = ['meet', 'history', meetingCode];
+    const args: GogArg[] = ['meet', 'history', pos(meetingCode)];
     if (max !== undefined) args.push(`--max=${max}`);
     const token = resolvePageToken({ pageToken, page });
     if (token) args.push(`--page=${token}`);
@@ -92,7 +93,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       skipValidate: z.boolean().optional().describe('Store credentials without calling Zoom /users/me to validate'),
     }),
   }, async ({ accountId, clientId, clientSecret, alias, skipValidate }) => {
-    const args = ['zoom', 'auth', 'setup'];
+    const args: GogArg[] = ['zoom', 'auth', 'setup'];
     if (alias) args.push(`--alias=${alias}`);
     args.push(`--account-id=${accountId}`);
     args.push(`--client-id=${clientId}`);
@@ -108,7 +109,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       alias: z.string().optional().describe('Zoom credential alias to check (default: "default")'),
     }),
   }, async ({ alias }) => {
-    const args = ['zoom', 'auth', 'doctor'];
+    const args: GogArg[] = ['zoom', 'auth', 'doctor'];
     if (alias) args.push(`--alias=${alias}`);
     return runOrDiagnose(args, {});
   });
@@ -126,7 +127,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ max, pageToken, page, all, account }) => {
-    const args = ['calendar', 'calendars'];
+    const args: GogArg[] = ['calendar', 'calendars'];
     if (max !== undefined) args.push(`--max=${max}`);
     const token = resolvePageToken({ pageToken, page });
     if (token) args.push(`--page=${token}`);
@@ -156,7 +157,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ query, from, to, today, tomorrow, week, days, weekStart, calendar, max, account }) => {
-    const args = ['calendar', 'search', query];
+    const args: GogArg[] = ['calendar', 'search', pos(query)];
     if (from) args.push(`--from=${from}`);
     if (to) args.push(`--to=${to}`);
     if (today) args.push('--today');
@@ -181,8 +182,8 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ calendarId, calendarIds, since, max, all, account }) => {
-    const args = ['calendar', 'changed'];
-    if (calendarId) args.push(calendarId);
+    const args: GogArg[] = ['calendar', 'changed'];
+    if (calendarId) args.push(pos(calendarId));
     if (calendarIds) args.push(`--calendars=${calendarIds}`);
     if (since) args.push(`--since=${since}`);
     if (max !== undefined) args.push(`--max=${max}`);
@@ -201,8 +202,8 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ from, to, calendarIds, all, account }) => {
-    const args = ['calendar', 'freebusy'];
-    if (calendarIds) args.push(calendarIds);
+    const args: GogArg[] = ['calendar', 'freebusy'];
+    if (calendarIds) args.push(pos(calendarIds));
     args.push(`--from=${from}`);
     args.push(`--to=${to}`);
     if (all) args.push('--all');
@@ -231,7 +232,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ calendarId, max, pageToken, page, all, account }) => {
-    const args = ['calendar', 'acl', calendarId];
+    const args: GogArg[] = ['calendar', 'acl', pos(calendarId)];
     if (max !== undefined) args.push(`--max=${max}`);
     const token = resolvePageToken({ pageToken, page });
     if (token) args.push(`--page=${token}`);
@@ -250,7 +251,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ calendarId, eventId, destinationCalendarId, sendUpdates, account }) => {
-    const args = ['calendar', 'move', calendarId, eventId, destinationCalendarId];
+    const args: GogArg[] = ['calendar', 'move', pos(calendarId), pos(eventId), pos(destinationCalendarId)];
     if (sendUpdates) args.push(`--send-updates=${sendUpdates}`);
     return runOrDiagnose(args, { account });
   });
@@ -269,8 +270,8 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ from, to, calendarId, summary, autoDecline, declineMessage, allDay, account }) => {
-    const args = ['calendar', 'out-of-office'];
-    if (calendarId) args.push(calendarId);
+    const args: GogArg[] = ['calendar', 'out-of-office'];
+    if (calendarId) args.push(pos(calendarId));
     args.push(`--from=${from}`);
     args.push(`--to=${to}`);
     if (summary) args.push(`--summary=${summary}`);
@@ -288,7 +289,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ calendarId, account }) => {
-    return runOrDiagnose(['calendar', 'unsubscribe', calendarId], { account });
+    return runOrDiagnose(['calendar', 'unsubscribe', pos(calendarId)], { account });
   });
 
   server.registerTool('gog_calendar_delete_calendar', {
@@ -299,7 +300,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ calendarId, account }) => {
-    return runOrDiagnose(['calendar', 'delete-calendar', calendarId, '--force'], { account }); // gog gates this op; without --force the runner's --no-input makes it refuse
+    return runOrDiagnose(['calendar', 'delete-calendar', pos(calendarId), '--force'], { account }); // gog gates this op; without --force the runner's --no-input makes it refuse
   });
 
   server.registerTool('gog_meet_participants', {
@@ -315,7 +316,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     }),
   }, async ({ meetingCode, conference, max, pageToken, page, all, account }) => {
-    const args = ['meet', 'participants', meetingCode];
+    const args: GogArg[] = ['meet', 'participants', pos(meetingCode)];
     if (conference) args.push(`--conference=${conference}`);
     if (max !== undefined) args.push(`--max=${max}`);
     const token = resolvePageToken({ pageToken, page });

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

@@ -3,6 +3,7 @@ import { registerExtraCalendarTools } from '../../src/tools/calendar-extra.js';
 import * as lib from '../../../gogcli-mcp/src/lib.js';
 import { createTestHarness, type TestHarness } from '@chrischall/mcp-utils/test';
 import { rawTextResult } from '@chrischall/mcp-utils';
+import { pos } from '../../../gogcli-mcp/src/argv.js';
 
 vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
   const actual = await importOriginal<typeof lib>();
@@ -43,7 +44,7 @@ describe('gog_meet_create', () => {
 describe('gog_meet_get', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
     await harness.callTool('gog_meet_get', { meetingCode: 'abc-defg-hij' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'get', 'abc-defg-hij'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'get', pos('abc-defg-hij')], { account: undefined });
   });
 });
 
@@ -51,28 +52,28 @@ describe('gog_meet_update', () => {
   it('calls runOrDiagnose with meetingCode and --access', async () => {
     await harness.callTool('gog_meet_update', { meetingCode: 'abc-defg-hij', access: 'restricted' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['meet', 'update', 'abc-defg-hij', '--access=restricted'],
+      ['meet', 'update', pos('abc-defg-hij'), '--access=restricted'],
       { account: undefined },
     );
   });
 
   it('omits --access when not provided', async () => {
     await harness.callTool('gog_meet_update', { meetingCode: 'abc-defg-hij' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'update', 'abc-defg-hij'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'update', pos('abc-defg-hij')], { account: undefined });
   });
 });
 
 describe('gog_meet_end', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
     await harness.callTool('gog_meet_end', { meetingCode: 'abc-defg-hij' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'end', 'abc-defg-hij', '--force'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'end', pos('abc-defg-hij'), '--force'], { account: undefined });
   });
 });
 
 describe('gog_meet_history', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
     await harness.callTool('gog_meet_history', { meetingCode: 'abc-defg-hij' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', 'abc-defg-hij'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', pos('abc-defg-hij')], { account: undefined });
   });
 
   it('passes pagination flags', async () => {
@@ -83,14 +84,14 @@ describe('gog_meet_history', () => {
       all: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['meet', 'history', 'abc-defg-hij', '--max=50', '--page=tok', '--all'],
+      ['meet', 'history', pos('abc-defg-hij'), '--max=50', '--page=tok', '--all'],
       { account: undefined },
     );
   });
 
   it('omits --all when false', async () => {
     await harness.callTool('gog_meet_history', { meetingCode: 'abc-defg-hij', all: false });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', 'abc-defg-hij'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', pos('abc-defg-hij')], { account: undefined });
   });
 });
 
@@ -169,7 +170,7 @@ describe('gog_calendar_calendars', () => {
 describe('gog_calendar_search', () => {
   it('calls runOrDiagnose with just the query', async () => {
     await harness.callTool('gog_calendar_search', { query: 'standup' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'search', 'standup'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'search', pos('standup')], { account: undefined });
   });
 
   // One case per LEGAL window, not one case passing every flag at once. gog
@@ -187,7 +188,7 @@ describe('gog_calendar_search', () => {
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       [
-        'calendar', 'search', 'standup',
+        'calendar', 'search', pos('standup'),
         '--from=today', '--to=tomorrow',
         '--calendar=primary', '--max=10',
       ],
@@ -198,7 +199,7 @@ describe('gog_calendar_search', () => {
   it('anchors --days at --from when both are given', async () => {
     await harness.callTool('gog_calendar_search', { query: 'standup', from: '2026-09-25', days: 7 });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'search', 'standup', '--from=2026-09-25', '--days=7'],
+      ['calendar', 'search', pos('standup'), '--from=2026-09-25', '--days=7'],
       { account: undefined },
     );
   });
@@ -208,7 +209,7 @@ describe('gog_calendar_search', () => {
       vi.mocked(lib.runOrDiagnose).mockClear();
       await harness.callTool('gog_calendar_search', { query: 'standup', [param]: true });
       expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-        ['calendar', 'search', 'standup', flag],
+        ['calendar', 'search', pos('standup'), flag],
         { account: undefined },
       );
     }
@@ -217,7 +218,7 @@ describe('gog_calendar_search', () => {
   it('passes --week-start alongside --week', async () => {
     await harness.callTool('gog_calendar_search', { query: 'standup', week: true, weekStart: 'sun' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'search', 'standup', '--week', '--week-start=sun'],
+      ['calendar', 'search', pos('standup'), '--week', '--week-start=sun'],
       { account: undefined },
     );
   });
@@ -226,7 +227,7 @@ describe('gog_calendar_search', () => {
     await harness.callTool('gog_calendar_search', {
       query: 'standup', today: false, tomorrow: false, week: false,
     });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'search', 'standup'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'search', pos('standup')], { account: undefined });
   });
 });
 
@@ -246,7 +247,7 @@ describe('gog_calendar_changed', () => {
       account: 'me@example.com',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'changed', 'primary', '--calendars=work,personal', '--since=48h', '--max=25', '--all'],
+      ['calendar', 'changed', pos('primary'), '--calendars=work,personal', '--since=48h', '--max=25', '--all'],
       { account: 'me@example.com' },
     );
   });
@@ -271,7 +272,7 @@ describe('gog_calendar_freebusy', () => {
       from: 'A', to: 'B', calendarIds: 'primary,team@x.com', all: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'freebusy', 'primary,team@x.com', '--from=A', '--to=B', '--all'],
+      ['calendar', 'freebusy', pos('primary,team@x.com'), '--from=A', '--to=B', '--all'],
       { account: undefined },
     );
   });
@@ -295,20 +296,20 @@ describe('gog_calendar_colors', () => {
 describe('gog_calendar_acl', () => {
   it('calls runOrDiagnose with calendarId only', async () => {
     await harness.callTool('gog_calendar_acl', { calendarId: 'primary' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', 'primary'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', pos('primary')], { account: undefined });
   });
 
   it('passes pagination flags', async () => {
     await harness.callTool('gog_calendar_acl', { calendarId: 'primary', max: 25, page: 'tok', all: true });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'acl', 'primary', '--max=25', '--page=tok', '--all'],
+      ['calendar', 'acl', pos('primary'), '--max=25', '--page=tok', '--all'],
       { account: undefined },
     );
   });
 
   it('omits --all when false', async () => {
     await harness.callTool('gog_calendar_acl', { calendarId: 'primary', all: false });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', 'primary'], { account: undefined });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', pos('primary')], { account: undefined });
   });
 });
 
@@ -318,7 +319,7 @@ describe('gog_calendar_move', () => {
       calendarId: 'primary', eventId: 'ev1', destinationCalendarId: 'team@x.com',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'move', 'primary', 'ev1', 'team@x.com'],
+      ['calendar', 'move', pos('primary'), pos('ev1'), pos('team@x.com')],
       { account: undefined },
     );
   });
@@ -329,7 +330,7 @@ describe('gog_calendar_move', () => {
       sendUpdates: 'all',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'move', 'primary', 'ev1', 'team@x.com', '--send-updates=all'],
+      ['calendar', 'move', pos('primary'), pos('ev1'), pos('team@x.com'), '--send-updates=all'],
       { account: undefined },
     );
   });
@@ -355,7 +356,7 @@ describe('gog_calendar_out_of_office', () => {
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       [
-        'calendar', 'out-of-office', 'primary',
+        'calendar', 'out-of-office', pos('primary'),
         '--from=2026-06-01', '--to=2026-06-05',
         '--summary=Vacation', '--auto-decline=new',
         '--decline-message=Away', '--all-day',
@@ -377,7 +378,7 @@ describe('gog_meet_participants', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
     await harness.callTool('gog_meet_participants', { meetingCode: 'abc-defg-hij' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['meet', 'participants', 'abc-defg-hij'],
+      ['meet', 'participants', pos('abc-defg-hij')],
       { account: undefined },
     );
   });
@@ -392,7 +393,7 @@ describe('gog_meet_participants', () => {
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       [
-        'meet', 'participants', 'abc-defg-hij',
+        'meet', 'participants', pos('abc-defg-hij'),
         '--conference=conf123',
         '--max=100',
         '--page=tok',
@@ -405,7 +406,7 @@ describe('gog_meet_participants', () => {
   it('omits --all when false', async () => {
     await harness.callTool('gog_meet_participants', { meetingCode: 'abc-defg-hij', all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['meet', 'participants', 'abc-defg-hij'],
+      ['meet', 'participants', pos('abc-defg-hij')],
       { account: undefined },
     );
   });
@@ -415,7 +416,7 @@ describe('gog_calendar_unsubscribe', () => {
   it('calls runOrDiagnose with calendarId', async () => {
     await harness.callTool('gog_calendar_unsubscribe', { calendarId: 'cal@group.calendar.google.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'unsubscribe', 'cal@group.calendar.google.com'],
+      ['calendar', 'unsubscribe', pos('cal@group.calendar.google.com')],
       { account: undefined },
     );
   });
@@ -423,7 +424,7 @@ describe('gog_calendar_unsubscribe', () => {
   it('passes account through', async () => {
     await harness.callTool('gog_calendar_unsubscribe', { calendarId: 'cal', account: 'me@x.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'unsubscribe', 'cal'],
+      ['calendar', 'unsubscribe', pos('cal')],
       { account: 'me@x.com' },
     );
   });
@@ -433,7 +434,7 @@ describe('gog_calendar_delete_calendar', () => {
   it('calls runOrDiagnose with calendarId', async () => {
     await harness.callTool('gog_calendar_delete_calendar', { calendarId: 'cal' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'delete-calendar', 'cal', '--force'],
+      ['calendar', 'delete-calendar', pos('cal'), '--force'],
       { account: undefined },
     );
   });
@@ -441,7 +442,7 @@ describe('gog_calendar_delete_calendar', () => {
   it('passes account through', async () => {
     await harness.callTool('gog_calendar_delete_calendar', { calendarId: 'cal', account: 'me@x.com' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
-      ['calendar', 'delete-calendar', 'cal', '--force'],
+      ['calendar', 'delete-calendar', pos('cal'), '--force'],
       { account: 'me@x.com' },
     );
   });

package/vitest.config.ts

@@ -2,6 +2,11 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
   test: {
+    // The arg-shape tests pass arbitrary server paths; confinement is exercised
+    // explicitly by the tests that narrow GOG_FILE_ROOTS themselves.
+    env: {
+      GOG_FILE_ROOTS: '/',
+    },
     coverage: {
       provider: 'v8',
       include: ['src/**/*.ts'],