gogcli-mcp-calendar 2.7.1 → 2.18.0

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-calendar",
   "display_name": "gogcli (Calendar)",
-  "version": "2.7.1",
+  "version": "2.18.0",
   "description": "Extended Google Calendar for Claude via gogcli — auth + Calendar events + Meet space management",
   "author": {
     "name": "Chris Hall",
@@ -58,6 +58,18 @@
       "name": "gog_auth_add",
       "description": "Authorize a Google account via browser-based OAuth"
     },
+    {
+      "name": "gog_auth_health",
+      "description": "Live per-account token health: validity, age, and pre-expiry warnings (detects invalid_grant)"
+    },
+    {
+      "name": "gog_auth_add_url",
+      "description": "Begin remote/headless OAuth (step 1): return a sign-in URL to open in any browser"
+    },
+    {
+      "name": "gog_auth_add_complete",
+      "description": "Complete remote/headless OAuth (step 2): exchange the pasted redirect URL and store the token"
+    },
     {
       "name": "gog_auth_list",
       "description": "List all Google accounts stored in gogcli"
@@ -110,6 +122,10 @@
       "name": "gog_calendar_search",
       "description": "Full-text search for events with optional time filters"
     },
+    {
+      "name": "gog_calendar_changed",
+      "description": "List most recently changed events (including cancellations) across calendars"
+    },
     {
       "name": "gog_calendar_freebusy",
       "description": "Query free/busy intervals for one or more calendars"
@@ -130,6 +146,14 @@
       "name": "gog_calendar_out_of_office",
       "description": "Create an Out of Office event that auto-declines invitations"
     },
+    {
+      "name": "gog_calendar_unsubscribe",
+      "description": "Remove a calendar from your calendar list"
+    },
+    {
+      "name": "gog_calendar_delete_calendar",
+      "description": "Delete an owned secondary calendar"
+    },
     {
       "name": "gog_meet_create",
       "description": "Create a Google Meet space"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-calendar",
-  "version": "2.7.1",
+  "version": "2.18.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>",
@@ -19,11 +19,12 @@
     "build": "tsc --noEmit && npm run bundle",
     "bundle": "node ../../scripts/bundle.js src/index.ts dist/index.js",
     "typecheck": "tsc --noEmit",
-    "test": "vitest run",
+    "test": "vitest run --coverage",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
+    "@chrischall/mcp-utils": "^0.13.3",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "zod": "^4.4.3"
   },

package/src/index.ts

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { createServer, registerAuthTools, registerCalendarTools } from '../../gogcli-mcp/src/lib.js';
+import { runMcp } from '@chrischall/mcp-utils';
+import { VERSION, authToolsFor, registerCalendarTools } from '../../gogcli-mcp/src/lib.js';
 import { registerExtraCalendarTools } from './tools/calendar-extra.js';
 
-const server = createServer({ name: 'gogcli-calendar' });
-registerAuthTools(server);
-registerCalendarTools(server);
-registerExtraCalendarTools(server);
-
-const transport = new StdioServerTransport();
-await server.connect(transport);
+await runMcp({
+  name: 'gogcli-calendar',
+  version: VERSION,
+  tools: [authToolsFor('calendar'), registerCalendarTools, registerExtraCalendarTools],
+});

package/src/tools/calendar-extra.ts

@@ -54,7 +54,7 @@ export function registerExtraCalendarTools(server: McpServer): void {
       account: accountParam,
     },
   }, async ({ meetingCode, account }) => {
-    return runOrDiagnose(['meet', 'end', meetingCode], { account });
+    return runOrDiagnose(['meet', 'end', meetingCode, '--force'], { account }); // gog gates this op; without --force the runner's --no-input makes it refuse
   });
 
   server.registerTool('gog_meet_history', {
@@ -159,6 +159,27 @@ export function registerExtraCalendarTools(server: McpServer): void {
     return runOrDiagnose(args, { account });
   });
 
+  server.registerTool('gog_calendar_changed', {
+    description: 'List most recently changed events (including cancellations/deletions) across one or more calendars, ordered by last-modification time. Requires gog >= 0.31.1.',
+    annotations: { readOnlyHint: true },
+    inputSchema: {
+      calendarId: z.string().optional().describe('Calendar ID (default: primary)'),
+      calendarIds: z.string().optional().describe('Comma-separated calendar IDs, names, or indices'),
+      since: z.string().optional().describe('Lower bound for last-modification time (RFC3339, date, or Go duration like 24h, 168h; default: 720h / 30 days). Google rejects windows too far in the past (410 updatedMinTooLongAgo) — retry with a shorter duration if that happens'),
+      max: z.number().optional().describe('Max results (default: 10)'),
+      all: z.boolean().optional().describe('Fetch from all calendars'),
+      account: accountParam,
+    },
+  }, async ({ calendarId, calendarIds, since, max, all, account }) => {
+    const args = ['calendar', 'changed'];
+    if (calendarId) args.push(calendarId);
+    if (calendarIds) args.push(`--calendars=${calendarIds}`);
+    if (since) args.push(`--since=${since}`);
+    if (max !== undefined) args.push(`--max=${max}`);
+    if (all) args.push('--all');
+    return runOrDiagnose(args, { account });
+  });
+
   server.registerTool('gog_calendar_freebusy', {
     description: 'Query free/busy intervals for one or more calendars over a time window.',
     annotations: { readOnlyHint: true },
@@ -245,6 +266,28 @@ export function registerExtraCalendarTools(server: McpServer): void {
     return runOrDiagnose(args, { account });
   });
 
+  server.registerTool('gog_calendar_unsubscribe', {
+    description: 'Remove a calendar from your calendar list (the underlying calendar is not deleted — you can re-subscribe). For deleting a secondary calendar you own, use gog_calendar_delete_calendar.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      calendarId: z.string().describe('Calendar ID or alias to remove from your calendar list'),
+      account: accountParam,
+    },
+  }, async ({ calendarId, account }) => {
+    return runOrDiagnose(['calendar', 'unsubscribe', calendarId], { account });
+  });
+
+  server.registerTool('gog_calendar_delete_calendar', {
+    description: 'Permanently delete an owned secondary calendar and all its events. Cannot delete your primary calendar. To merely remove a calendar you do not own from your list, use gog_calendar_unsubscribe.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      calendarId: z.string().describe('Owned secondary calendar ID or alias'),
+      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
+  });
+
   server.registerTool('gog_meet_participants', {
     description: 'List participants from the latest (or a specific) Meet call.',
     annotations: { readOnlyHint: true },

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

@@ -1,7 +1,8 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerExtraCalendarTools } from '../../src/tools/calendar-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,22 +12,22 @@ 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(registerExtraCalendarTools);
+  vi.mocked(lib.runOrDiagnose).mockResolvedValue(rawTextResult('{}'));
+  harness = await createTestHarness(registerExtraCalendarTools);
 });
 
 describe('gog_meet_create', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_meet_create')!({});
+    await harness.callTool('gog_meet_create', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'create'], { account: undefined });
   });
 
   it('passes --access and --open when provided', async () => {
-    await handlers.get('gog_meet_create')!({ access: 'open', open: true });
+    await harness.callTool('gog_meet_create', { access: 'open', open: true });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['meet', 'create', '--access=open', '--open'],
       { account: undefined },
@@ -34,21 +35,21 @@ describe('gog_meet_create', () => {
   });
 
   it('omits --open when false', async () => {
-    await handlers.get('gog_meet_create')!({ open: false });
+    await harness.callTool('gog_meet_create', { open: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'create'], { account: undefined });
   });
 });
 
 describe('gog_meet_get', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
-    await handlers.get('gog_meet_get')!({ meetingCode: 'abc-defg-hij' });
+    await harness.callTool('gog_meet_get', { meetingCode: 'abc-defg-hij' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'get', 'abc-defg-hij'], { account: undefined });
   });
 });
 
 describe('gog_meet_update', () => {
   it('calls runOrDiagnose with meetingCode and --access', async () => {
-    await handlers.get('gog_meet_update')!({ meetingCode: 'abc-defg-hij', access: 'restricted' });
+    await harness.callTool('gog_meet_update', { meetingCode: 'abc-defg-hij', access: 'restricted' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['meet', 'update', 'abc-defg-hij', '--access=restricted'],
       { account: undefined },
@@ -56,26 +57,26 @@ describe('gog_meet_update', () => {
   });
 
   it('omits --access when not provided', async () => {
-    await handlers.get('gog_meet_update')!({ meetingCode: 'abc-defg-hij' });
+    await harness.callTool('gog_meet_update', { meetingCode: 'abc-defg-hij' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'update', 'abc-defg-hij'], { account: undefined });
   });
 });
 
 describe('gog_meet_end', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
-    await handlers.get('gog_meet_end')!({ meetingCode: 'abc-defg-hij' });
-    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'end', 'abc-defg-hij'], { account: undefined });
+    await harness.callTool('gog_meet_end', { meetingCode: 'abc-defg-hij' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'end', 'abc-defg-hij', '--force'], { account: undefined });
   });
 });
 
 describe('gog_meet_history', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
-    await handlers.get('gog_meet_history')!({ meetingCode: 'abc-defg-hij' });
+    await harness.callTool('gog_meet_history', { meetingCode: 'abc-defg-hij' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', 'abc-defg-hij'], { account: undefined });
   });
 
   it('passes pagination flags', async () => {
-    await handlers.get('gog_meet_history')!({
+    await harness.callTool('gog_meet_history', {
       meetingCode: 'abc-defg-hij',
       max: 50,
       page: 'tok',
@@ -88,7 +89,7 @@ describe('gog_meet_history', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_meet_history')!({ meetingCode: 'abc-defg-hij', all: false });
+    await harness.callTool('gog_meet_history', { meetingCode: 'abc-defg-hij', all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['meet', 'history', 'abc-defg-hij'], { account: undefined });
   });
 });
@@ -97,7 +98,7 @@ describe('gog_meet_history', () => {
 
 describe('gog_zoom_auth_setup', () => {
   it('passes credentials and uses default alias when omitted', async () => {
-    await handlers.get('gog_zoom_auth_setup')!({
+    await harness.callTool('gog_zoom_auth_setup', {
       accountId: 'acct',
       clientId: 'cid',
       clientSecret: 'csecret',
@@ -112,7 +113,7 @@ describe('gog_zoom_auth_setup', () => {
   });
 
   it('passes --alias and --skip-validate when provided', async () => {
-    await handlers.get('gog_zoom_auth_setup')!({
+    await harness.callTool('gog_zoom_auth_setup', {
       accountId: 'acct', clientId: 'cid', clientSecret: 'csecret',
       alias: 'work', skipValidate: true,
     });
@@ -130,12 +131,12 @@ describe('gog_zoom_auth_setup', () => {
 
 describe('gog_zoom_auth_doctor', () => {
   it('validates default alias', async () => {
-    await handlers.get('gog_zoom_auth_doctor')!({});
+    await harness.callTool('gog_zoom_auth_doctor', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['zoom', 'auth', 'doctor'], { account: undefined });
   });
 
   it('passes --alias when provided', async () => {
-    await handlers.get('gog_zoom_auth_doctor')!({ alias: 'work' });
+    await harness.callTool('gog_zoom_auth_doctor', { alias: 'work' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['zoom', 'auth', 'doctor', '--alias=work'],
       { account: undefined },
@@ -147,12 +148,12 @@ describe('gog_zoom_auth_doctor', () => {
 
 describe('gog_calendar_calendars', () => {
   it('calls runOrDiagnose with no flags', async () => {
-    await handlers.get('gog_calendar_calendars')!({});
+    await harness.callTool('gog_calendar_calendars', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'calendars'], { account: undefined });
   });
 
   it('passes pagination flags', async () => {
-    await handlers.get('gog_calendar_calendars')!({ max: 50, page: 'tok', all: true });
+    await harness.callTool('gog_calendar_calendars', { max: 50, page: 'tok', all: true });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['calendar', 'calendars', '--max=50', '--page=tok', '--all'],
       { account: undefined },
@@ -160,19 +161,19 @@ describe('gog_calendar_calendars', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_calendar_calendars')!({ all: false });
+    await harness.callTool('gog_calendar_calendars', { all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'calendars'], { account: undefined });
   });
 });
 
 describe('gog_calendar_search', () => {
   it('calls runOrDiagnose with just the query', async () => {
-    await handlers.get('gog_calendar_search')!({ query: 'standup' });
+    await harness.callTool('gog_calendar_search', { query: 'standup' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'search', 'standup'], { account: undefined });
   });
 
   it('passes all filter flags when provided', async () => {
-    await handlers.get('gog_calendar_search')!({
+    await harness.callTool('gog_calendar_search', {
       query: 'standup',
       from: 'today',
       to: 'tomorrow',
@@ -197,16 +198,43 @@ describe('gog_calendar_search', () => {
   });
 
   it('omits boolean flags when false', async () => {
-    await handlers.get('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 });
   });
 });
 
+describe('gog_calendar_changed', () => {
+  it('calls runOrDiagnose with no flags by default', async () => {
+    await harness.callTool('gog_calendar_changed', {});
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'changed'], { account: undefined });
+  });
+
+  it('passes calendarId positionally and all flags', async () => {
+    await harness.callTool('gog_calendar_changed', {
+      calendarId: 'primary',
+      calendarIds: 'work,personal',
+      since: '48h',
+      max: 25,
+      all: true,
+      account: 'me@example.com',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['calendar', 'changed', 'primary', '--calendars=work,personal', '--since=48h', '--max=25', '--all'],
+      { account: 'me@example.com' },
+    );
+  });
+
+  it('omits --all when false', async () => {
+    await harness.callTool('gog_calendar_changed', { all: false });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'changed'], { account: undefined });
+  });
+});
+
 describe('gog_calendar_freebusy', () => {
   it('calls runOrDiagnose with required from/to only', async () => {
-    await handlers.get('gog_calendar_freebusy')!({ from: 'A', to: 'B' });
+    await harness.callTool('gog_calendar_freebusy', { from: 'A', to: 'B' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['calendar', 'freebusy', '--from=A', '--to=B'],
       { account: undefined },
@@ -214,7 +242,7 @@ describe('gog_calendar_freebusy', () => {
   });
 
   it('passes calendarIds and --all when provided', async () => {
-    await handlers.get('gog_calendar_freebusy')!({
+    await harness.callTool('gog_calendar_freebusy', {
       from: 'A', to: 'B', calendarIds: 'primary,team@x.com', all: true,
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -224,7 +252,7 @@ describe('gog_calendar_freebusy', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_calendar_freebusy')!({ from: 'A', to: 'B', all: false });
+    await harness.callTool('gog_calendar_freebusy', { from: 'A', to: 'B', all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['calendar', 'freebusy', '--from=A', '--to=B'],
       { account: undefined },
@@ -234,19 +262,19 @@ describe('gog_calendar_freebusy', () => {
 
 describe('gog_calendar_colors', () => {
   it('calls runOrDiagnose with the colors subcommand', async () => {
-    await handlers.get('gog_calendar_colors')!({});
+    await harness.callTool('gog_calendar_colors', {});
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'colors'], { account: undefined });
   });
 });
 
 describe('gog_calendar_acl', () => {
   it('calls runOrDiagnose with calendarId only', async () => {
-    await handlers.get('gog_calendar_acl')!({ calendarId: 'primary' });
+    await harness.callTool('gog_calendar_acl', { calendarId: 'primary' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', 'primary'], { account: undefined });
   });
 
   it('passes pagination flags', async () => {
-    await handlers.get('gog_calendar_acl')!({ calendarId: 'primary', max: 25, page: 'tok', all: true });
+    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'],
       { account: undefined },
@@ -254,14 +282,14 @@ describe('gog_calendar_acl', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_calendar_acl')!({ calendarId: 'primary', all: false });
+    await harness.callTool('gog_calendar_acl', { calendarId: 'primary', all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(['calendar', 'acl', 'primary'], { account: undefined });
   });
 });
 
 describe('gog_calendar_move', () => {
   it('calls runOrDiagnose with the three positionals', async () => {
-    await handlers.get('gog_calendar_move')!({
+    await harness.callTool('gog_calendar_move', {
       calendarId: 'primary', eventId: 'ev1', destinationCalendarId: 'team@x.com',
     });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
@@ -271,7 +299,7 @@ describe('gog_calendar_move', () => {
   });
 
   it('passes --send-updates when provided', async () => {
-    await handlers.get('gog_calendar_move')!({
+    await harness.callTool('gog_calendar_move', {
       calendarId: 'primary', eventId: 'ev1', destinationCalendarId: 'team@x.com',
       sendUpdates: 'all',
     });
@@ -284,7 +312,7 @@ describe('gog_calendar_move', () => {
 
 describe('gog_calendar_out_of_office', () => {
   it('calls runOrDiagnose with required from/to only', async () => {
-    await handlers.get('gog_calendar_out_of_office')!({ from: '2026-06-01', to: '2026-06-05' });
+    await harness.callTool('gog_calendar_out_of_office', { from: '2026-06-01', to: '2026-06-05' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['calendar', 'out-of-office', '--from=2026-06-01', '--to=2026-06-05'],
       { account: undefined },
@@ -292,7 +320,7 @@ describe('gog_calendar_out_of_office', () => {
   });
 
   it('passes calendarId and all optional flags when provided', async () => {
-    await handlers.get('gog_calendar_out_of_office')!({
+    await harness.callTool('gog_calendar_out_of_office', {
       from: '2026-06-01', to: '2026-06-05',
       calendarId: 'primary',
       summary: 'Vacation',
@@ -312,7 +340,7 @@ describe('gog_calendar_out_of_office', () => {
   });
 
   it('omits --all-day when false', async () => {
-    await handlers.get('gog_calendar_out_of_office')!({ from: '2026-06-01', to: '2026-06-05', allDay: false });
+    await harness.callTool('gog_calendar_out_of_office', { from: '2026-06-01', to: '2026-06-05', allDay: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['calendar', 'out-of-office', '--from=2026-06-01', '--to=2026-06-05'],
       { account: undefined },
@@ -322,7 +350,7 @@ describe('gog_calendar_out_of_office', () => {
 
 describe('gog_meet_participants', () => {
   it('calls runOrDiagnose with meetingCode', async () => {
-    await handlers.get('gog_meet_participants')!({ meetingCode: 'abc-defg-hij' });
+    await harness.callTool('gog_meet_participants', { meetingCode: 'abc-defg-hij' });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['meet', 'participants', 'abc-defg-hij'],
       { account: undefined },
@@ -330,7 +358,7 @@ describe('gog_meet_participants', () => {
   });
 
   it('passes --conference and pagination flags', async () => {
-    await handlers.get('gog_meet_participants')!({
+    await harness.callTool('gog_meet_participants', {
       meetingCode: 'abc-defg-hij',
       conference: 'conf123',
       max: 100,
@@ -350,10 +378,46 @@ describe('gog_meet_participants', () => {
   });
 
   it('omits --all when false', async () => {
-    await handlers.get('gog_meet_participants')!({ meetingCode: 'abc-defg-hij', all: false });
+    await harness.callTool('gog_meet_participants', { meetingCode: 'abc-defg-hij', all: false });
     expect(lib.runOrDiagnose).toHaveBeenCalledWith(
       ['meet', 'participants', 'abc-defg-hij'],
       { account: undefined },
     );
   });
 });
+
+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'],
+      { account: undefined },
+    );
+  });
+
+  it('passes account through', async () => {
+    await harness.callTool('gog_calendar_unsubscribe', { calendarId: 'cal', account: 'me@x.com' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['calendar', 'unsubscribe', 'cal'],
+      { account: 'me@x.com' },
+    );
+  });
+});
+
+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'],
+      { account: undefined },
+    );
+  });
+
+  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'],
+      { account: 'me@x.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"]
 }