gogcli-mcp 4.2.5 → 4.4.0

package/tests/tools/auth.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerAuthTools, authToolsFor } from '../../src/tools/auth.js';
 import * as runner from '../../src/runner.js';
 import { createTestHarness } from '@chrischall/mcp-utils/test';
+import { pos } from '../../src/argv.js';
 
 vi.mock('../../src/runner.js');
 
@@ -108,7 +109,7 @@ describe('gog_auth_add', () => {
     const harness = await setupHandlers();
     const result = await harness.callTool('gog_auth_add', { email: 'user@gmail.com' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--services', 'all'],
+      ['auth', 'add', pos('user@gmail.com'), '--services', 'all'],
       { interactive: true, timeout: 300_000 },
     );
     expect(result.content[0].text).toBe('Authorization successful for user@gmail.com');
@@ -119,7 +120,7 @@ describe('gog_auth_add', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_auth_add', { email: 'user@gmail.com', services: 'sheets,gmail' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--services', 'sheets,gmail'],
+      ['auth', 'add', pos('user@gmail.com'), '--services', 'sheets,gmail'],
       { interactive: true, timeout: 300_000 },
     );
   });
@@ -137,7 +138,7 @@ describe('gog_auth_add', () => {
       extraScopes: 'https://www.googleapis.com/auth/bigquery.readonly',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--services', 'sheets',
+      ['auth', 'add', pos('user@gmail.com'), '--services', 'sheets',
         '--extra-scopes=https://www.googleapis.com/auth/bigquery.readonly', '--force-consent'],
       { interactive: true, timeout: 300_000 },
     );
@@ -148,7 +149,7 @@ describe('gog_auth_add', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_auth_add', { email: 'user@gmail.com' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--services', 'all'],
+      ['auth', 'add', pos('user@gmail.com'), '--services', 'all'],
       { interactive: true, timeout: 300_000 },
     );
   });
@@ -229,7 +230,7 @@ describe('gog_auth_add_url', () => {
     const harness = await setupHandlers();
     const result = await harness.callTool('gog_auth_add_url', { email: 'user@gmail.com' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '1', '--services', 'all', '--force-consent'],
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '1', '--services', 'all', '--force-consent'],
       { redactMode: 'tokens' },
     );
     expect(result.content[0].text).toContain('accounts.google.com');
@@ -240,7 +241,7 @@ describe('gog_auth_add_url', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_auth_add_url', { email: 'user@gmail.com', services: 'gmail,drive' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
       { redactMode: 'tokens' },
     );
   });
@@ -254,7 +255,7 @@ describe('gog_auth_add_url', () => {
       extraScopes: 'https://www.googleapis.com/auth/bigquery.readonly',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '1', '--services', 'sheets', '--force-consent',
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '1', '--services', 'sheets', '--force-consent',
         '--extra-scopes=https://www.googleapis.com/auth/bigquery.readonly'],
       { redactMode: 'tokens' },
     );
@@ -277,7 +278,7 @@ describe('gog_auth_add_complete', () => {
       redirectUrl: 'http://127.0.0.1:59436/oauth2/callback?code=abc&state=xyz',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '2', '--auth-url',
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '2', '--auth-url',
         'http://127.0.0.1:59436/oauth2/callback?code=abc&state=xyz', '--services', 'all', '--force-consent'],
     );
     expect(result.content[0].text).toContain('stored');
@@ -292,7 +293,7 @@ describe('gog_auth_add_complete', () => {
       services: 'gmail,drive',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '2', '--auth-url',
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '2', '--auth-url',
         'http://127.0.0.1/cb?code=c&state=s', '--services', 'gmail,drive', '--force-consent'],
     );
   });
@@ -307,7 +308,7 @@ describe('gog_auth_add_complete', () => {
       extraScopes: 'https://www.googleapis.com/auth/bigquery.readonly',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'user@gmail.com', '--remote', '--step', '2', '--auth-url',
+      ['auth', 'add', pos('user@gmail.com'), '--remote', '--step', '2', '--auth-url',
         'http://127.0.0.1/cb?code=c&state=s', '--services', 'sheets', '--force-consent',
         '--extra-scopes=https://www.googleapis.com/auth/bigquery.readonly'],
     );
@@ -332,7 +333,7 @@ describe('authToolsFor (least-privilege default services)', () => {
     const harness = await gmailHarness();
     await harness.callTool('gog_auth_add_url', { email: 'u@x.com' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'u@x.com', '--remote', '--step', '1', '--services', 'gmail', '--force-consent'],
+      ['auth', 'add', pos('u@x.com'), '--remote', '--step', '1', '--services', 'gmail', '--force-consent'],
       { redactMode: 'tokens' },
     );
   });
@@ -342,7 +343,7 @@ describe('authToolsFor (least-privilege default services)', () => {
     const harness = await gmailHarness();
     await harness.callTool('gog_auth_add', { email: 'u@x.com' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'u@x.com', '--services', 'gmail'],
+      ['auth', 'add', pos('u@x.com'), '--services', 'gmail'],
       { interactive: true, timeout: 300_000 },
     );
   });
@@ -355,7 +356,7 @@ describe('authToolsFor (least-privilege default services)', () => {
       redirectUrl: 'http://127.0.0.1/cb?code=c&state=s',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'u@x.com', '--remote', '--step', '2', '--auth-url',
+      ['auth', 'add', pos('u@x.com'), '--remote', '--step', '2', '--auth-url',
         'http://127.0.0.1/cb?code=c&state=s', '--services', 'gmail', '--force-consent'],
     );
   });
@@ -365,7 +366,7 @@ describe('authToolsFor (least-privilege default services)', () => {
     const harness = await gmailHarness();
     await harness.callTool('gog_auth_add_url', { email: 'u@x.com', services: 'gmail,drive' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['auth', 'add', 'u@x.com', '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
+      ['auth', 'add', pos('u@x.com'), '--remote', '--step', '1', '--services', 'gmail,drive', '--force-consent'],
       { redactMode: 'tokens' },
     );
   });
@@ -381,10 +382,36 @@ describe('gog_auth_run', () => {
   });
 
   it('works with empty args array', async () => {
-    vi.mocked(runner.run).mockResolvedValue('token info');
+    vi.mocked(runner.run).mockResolvedValue('accounts');
     const harness = await setupHandlers();
-    await harness.callTool('gog_auth_run', { subcommand: 'tokens', args: [] });
-    expect(runner.run).toHaveBeenCalledWith(['auth', 'tokens'], {});
+    await harness.callTool('gog_auth_run', { subcommand: 'list', args: [] });
+    expect(runner.run).toHaveBeenCalledWith(['auth', 'list'], {});
+  });
+
+  it.each(['list', 'status', 'services', 'remove', 'alias'])('allows %s', async (subcommand) => {
+    vi.mocked(runner.run).mockResolvedValue('ok');
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_run', { subcommand, args: [] });
+    expect(result.isError).toBeFalsy();
+    expect(runner.run).toHaveBeenCalledWith(['auth', subcommand], {});
+  });
+
+  // SEC-3: `auth tokens export --out <path>` writes a long-lived refresh token
+  // to disk, where an attach path can read it back out. Credentials and the
+  // keyring are the same class. Only the account-management subset is exposed.
+  it.each([
+    ['tokens', ['export', 'me@example.com', '--out=/tmp/t.json']],
+    ['tokens', ['import', '/tmp/t.json']],
+    ['credentials', ['list']],
+    ['keyring', []],
+    ['add', ['me@example.com']],
+    ['service-account', ['set']],
+  ])('refuses auth %s %j', async (subcommand, args) => {
+    const harness = await setupHandlers();
+    const result = await harness.callTool('gog_auth_run', { subcommand, args });
+    expect(result.isError).toBe(true);
+    expect(result.content[0].text).toMatch(/not available through gog_auth_run/);
+    expect(runner.run).not.toHaveBeenCalled();
   });
 
   it('returns error text on failure', async () => {

package/tests/tools/calendar.test.ts

@@ -2,15 +2,20 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerCalendarTools, CALENDAR_EVENTS_COMPACT_FIELDS } from '../../src/tools/calendar.js';
 import * as runner from '../../src/runner.js';
 import { createTestHarness } from '@chrischall/mcp-utils/test';
+import { pos } from '../../src/argv.js';
+import type { GogArg } from '../../src/runner.js';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => createTestHarness(registerCalendarTools);
+// The dispatch rail asks before guest-visible / outbound calls; this client accepts.
+const setupHandlers = () => createTestHarness(registerCalendarTools, {
+  elicitation: async () => ({ action: 'accept', content: { confirmed: true } }),
+});
 
 // gog_calendar_events answers in the compact rung by default, so every call
 // carries the mask. These keep the window-flag tests below about window flags
 // while still asserting the shipped default rather than an opted-out view.
-const evArgs = (...extra: string[]) =>
+const evArgs = (...extra: GogArg[]) =>
   ['calendar', 'events', ...extra, `--fields=${CALENDAR_EVENTS_COMPACT_FIELDS}`];
 const evOpts = { account: undefined, fieldsMask: CALENDAR_EVENTS_COMPACT_FIELDS };
 
@@ -67,7 +72,7 @@ describe('gog_calendar_events', () => {
       query: 'standup',
       all: true,
     });
-    expect(runner.run).toHaveBeenCalledWith(evArgs('primary', '--from=2026-01-01', '--to=2026-01-31', '--query=standup', '--all'), evOpts);
+    expect(runner.run).toHaveBeenCalledWith(evArgs(pos('primary'), '--from=2026-01-01', '--to=2026-01-31', '--query=standup', '--all'), evOpts);
   });
 
   it('appends --today on its own', async () => {
@@ -118,7 +123,7 @@ describe('gog_calendar_get', () => {
     vi.mocked(runner.run).mockResolvedValue('{"id":"evt1"}');
     const harness = await setupHandlers();
     await harness.callTool('gog_calendar_get', { calendarId: 'primary', eventId: 'evt1' });
-    expect(runner.run).toHaveBeenCalledWith(['calendar', 'event', 'primary', 'evt1'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['calendar', 'event', pos('primary'), pos('evt1')], { account: undefined });
   });
 
   it('appends --timezone when provided', async () => {
@@ -126,7 +131,7 @@ describe('gog_calendar_get', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_calendar_get', { calendarId: 'primary', eventId: 'evt1', timezone: 'local' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'event', 'primary', 'evt1', '--timezone=local'],
+      ['calendar', 'event', pos('primary'), pos('evt1'), '--timezone=local'],
       { account: undefined },
     );
   });
@@ -150,7 +155,7 @@ describe('gog_calendar_create', () => {
       to: '2026-04-14T09:30:00Z',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'create', 'primary', '--summary=Standup', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z'],
+      ['calendar', 'create', pos('primary'), '--summary=Standup', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z'],
       { account: undefined },
     );
   });
@@ -171,7 +176,7 @@ describe('gog_calendar_create', () => {
     });
     expect(runner.run).toHaveBeenCalledWith(
       [
-        'calendar', 'create', 'primary',
+        'calendar', 'create', pos('primary'),
         '--summary=All-day', '--from=2026-04-14', '--to=2026-04-15',
         '--description=Desc', '--location=NYC', '--attendees=a@b.com,c@d.com', '--all-day',
         '--timezone=America/New_York',
@@ -195,7 +200,7 @@ describe('gog_calendar_create', () => {
     });
     expect(runner.run).toHaveBeenCalledWith(
       [
-        'calendar', 'create', 'primary',
+        'calendar', 'create', pos('primary'),
         '--summary=Sync', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z',
         '--with-zoom',
       ],
@@ -210,7 +215,7 @@ describe('gog_calendar_create', () => {
       calendarId: 'primary', summary: 's', from: 'f', to: 't', withZoom: false,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'create', 'primary', '--summary=s', '--from=f', '--to=t'],
+      ['calendar', 'create', pos('primary'), '--summary=s', '--from=f', '--to=t'],
       { account: undefined },
     );
   });
@@ -233,7 +238,7 @@ describe('gog_calendar_update', () => {
       summary: 'New Title',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--summary=New Title'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--summary=New Title'],
       { account: undefined },
     );
   });
@@ -246,12 +251,12 @@ describe('gog_calendar_update', () => {
       calendarId: 'primary', eventId: 'evt1', attachments: ['https://drive.google.com/file/d/a', 'https://x.test/b.pdf'],
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--attachment=https://drive.google.com/file/d/a', '--attachment=https://x.test/b.pdf'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--attachment=https://drive.google.com/file/d/a', '--attachment=https://x.test/b.pdf'],
       { account: undefined },
     );
     await harness.callTool('gog_calendar_update', { calendarId: 'primary', eventId: 'evt1', attachments: [''] });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--attachment='],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--attachment='],
       { account: undefined },
     );
   });
@@ -271,7 +276,7 @@ describe('gog_calendar_update', () => {
     });
     expect(runner.run).toHaveBeenCalledWith(
       [
-        'calendar', 'update', 'primary', 'evt1',
+        'calendar', 'update', pos('primary'), pos('evt1'),
         '--summary=New', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T10:00:00Z',
         '--description=Desc', '--location=NYC', '--attendees=a@b.com',
       ],
@@ -290,7 +295,7 @@ describe('gog_calendar_update', () => {
     });
     expect(runner.run).toHaveBeenCalledWith(
       [
-        'calendar', 'update', 'primary', 'evt1',
+        'calendar', 'update', pos('primary'), pos('evt1'),
         '--add-attendee=room@resource.calendar.google.com;resource,x@y.com;optional',
       ],
       { account: undefined },
@@ -305,7 +310,7 @@ describe('gog_calendar_update', () => {
       calendarId: 'primary', eventId: 'evt1', withZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--with-zoom'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--with-zoom'],
       { account: undefined },
     );
 
@@ -315,7 +320,7 @@ describe('gog_calendar_update', () => {
       calendarId: 'primary', eventId: 'evt1', regenerateZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--regenerate-zoom'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--regenerate-zoom'],
       { account: undefined },
     );
 
@@ -325,7 +330,7 @@ describe('gog_calendar_update', () => {
       calendarId: 'primary', eventId: 'evt1', removeZoom: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--remove-zoom'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--remove-zoom'],
       { account: undefined },
     );
   });
@@ -338,7 +343,7 @@ describe('gog_calendar_update', () => {
       calendarId: 'primary', eventId: 'evt1', removeMeet: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--remove-meet'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--remove-meet'],
       { account: undefined },
     );
   });
@@ -351,7 +356,7 @@ describe('gog_calendar_update', () => {
       withZoom: false, regenerateZoom: false, removeZoom: false,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1'],
+      ['calendar', 'update', pos('primary'), pos('evt1')],
       { account: undefined },
     );
   });
@@ -369,7 +374,7 @@ describe('gog_calendar_delete', () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
     const harness = await setupHandlers();
     await harness.callTool('gog_calendar_delete', { calendarId: 'primary', eventId: 'evt1' });
-    expect(runner.run).toHaveBeenCalledWith(['calendar', 'delete', 'primary', 'evt1', '--force'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['calendar', 'delete', pos('primary'), pos('evt1'), '--force'], { account: undefined });
   });
 
   it('returns error text on failure', async () => {
@@ -386,7 +391,7 @@ describe('gog_calendar_respond', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_calendar_respond', { calendarId: 'primary', eventId: 'evt1', status: 'accepted' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'respond', 'primary', 'evt1', '--status=accepted'],
+      ['calendar', 'respond', pos('primary'), pos('evt1'), '--status=accepted'],
       { account: undefined },
     );
   });
@@ -401,7 +406,7 @@ describe('gog_calendar_respond', () => {
       comment: 'Can\'t make it',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'respond', 'primary', 'evt1', '--status=declined', '--comment=Can\'t make it'],
+      ['calendar', 'respond', pos('primary'), pos('evt1'), '--status=declined', '--comment=Can\'t make it'],
       { account: undefined },
     );
   });
@@ -500,7 +505,7 @@ describe('gog_calendar_create reminders', () => {
       reminders: ['popup:30m', 'email:1d'],
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'create', 'primary', '--summary=Standup', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z',
+      ['calendar', 'create', pos('primary'), '--summary=Standup', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z',
         '--reminder=popup:30m', '--reminder=email:1d'],
       { account: undefined },
     );
@@ -517,7 +522,7 @@ describe('gog_calendar_create reminders', () => {
       noReminders: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'create', 'primary', '--summary=Quiet', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z',
+      ['calendar', 'create', pos('primary'), '--summary=Quiet', '--from=2026-04-14T09:00:00Z', '--to=2026-04-14T09:30:00Z',
         '--no-reminders'],
       { account: undefined },
     );
@@ -559,7 +564,7 @@ describe('gog_calendar_update reminders', () => {
       calendarId: 'primary', eventId: 'evt1', reminders: ['popup:15m'],
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--reminder=popup:15m'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--reminder=popup:15m'],
       { account: undefined },
     );
   });
@@ -573,7 +578,7 @@ describe('gog_calendar_update reminders', () => {
       calendarId: 'primary', eventId: 'evt1', reminders: [],
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--reminder='],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--reminder='],
       { account: undefined },
     );
   });
@@ -585,7 +590,7 @@ describe('gog_calendar_update reminders', () => {
       calendarId: 'primary', eventId: 'evt1', noReminders: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--no-reminders'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--no-reminders'],
       { account: undefined },
     );
   });
@@ -597,7 +602,7 @@ describe('gog_calendar_update reminders', () => {
       calendarId: 'primary', eventId: 'evt1', summary: 'Renamed',
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['calendar', 'update', 'primary', 'evt1', '--summary=Renamed'],
+      ['calendar', 'update', pos('primary'), pos('evt1'), '--summary=Renamed'],
       { account: undefined },
     );
   });

package/tests/tools/chat.test.ts

@@ -2,10 +2,14 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerChatTools } from '../../src/tools/chat.js';
 import * as runner from '../../src/runner.js';
 import { createTestHarness } from '@chrischall/mcp-utils/test';
+import { pos } from '../../src/argv.js';
 
 vi.mock('../../src/runner.js');
 
-const setupHandlers = () => createTestHarness(registerChatTools);
+// The dispatch rail asks before guest-visible / outbound calls; this client accepts.
+const setupHandlers = () => createTestHarness(registerChatTools, {
+  elicitation: async () => ({ action: 'accept', content: { confirmed: true } }),
+});
 
 beforeEach(() => vi.clearAllMocks());
 
@@ -58,7 +62,7 @@ describe('gog_chat_spaces_find', () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_spaces_find', { displayName: 'Team' });
-    expect(runner.run).toHaveBeenCalledWith(['chat', 'spaces', 'find', 'Team'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['chat', 'spaces', 'find', pos('Team')], { account: undefined });
   });
 
   it('passes --exact and --max', async () => {
@@ -66,7 +70,7 @@ describe('gog_chat_spaces_find', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_spaces_find', { displayName: 'Team', exact: true, max: 5 });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'spaces', 'find', 'Team', '--exact', '--max=5'],
+      ['chat', 'spaces', 'find', pos('Team'), '--exact', '--max=5'],
       { account: undefined },
     );
   });
@@ -78,7 +82,7 @@ describe('gog_chat_spaces_create', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_spaces_create', { displayName: 'Launch', members: ['a@b.com', 'c@d.com'] });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'spaces', 'create', 'Launch', '--member=a@b.com', '--member=c@d.com'],
+      ['chat', 'spaces', 'create', pos('Launch'), '--member=a@b.com', '--member=c@d.com'],
       { account: undefined },
     );
   });
@@ -87,7 +91,7 @@ describe('gog_chat_spaces_create', () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_spaces_create', { displayName: 'Solo' });
-    expect(runner.run).toHaveBeenCalledWith(['chat', 'spaces', 'create', 'Solo'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['chat', 'spaces', 'create', pos('Solo')], { account: undefined });
   });
 });
 
@@ -97,7 +101,7 @@ describe('gog_chat_threads_list', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_threads_list', { space: 'spaces/AAA', max: 10 });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'threads', 'list', 'spaces/AAA', '--max=10'],
+      ['chat', 'threads', 'list', pos('spaces/AAA'), '--max=10'],
       { account: undefined },
     );
   });
@@ -108,7 +112,7 @@ describe('gog_chat_messages_list', () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_messages_list', { space: 'spaces/AAA' });
-    expect(runner.run).toHaveBeenCalledWith(['chat', 'messages', 'list', 'spaces/AAA'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['chat', 'messages', 'list', pos('spaces/AAA')], { account: undefined });
   });
 
   it('filters by thread, unread and order', async () => {
@@ -118,7 +122,7 @@ describe('gog_chat_messages_list', () => {
       space: 'spaces/AAA', thread: 'spaces/AAA/threads/T', unread: true, order: 'createTime desc', max: 50,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'list', 'spaces/AAA', '--thread=spaces/AAA/threads/T', '--unread',
+      ['chat', 'messages', 'list', pos('spaces/AAA'), '--thread=spaces/AAA/threads/T', '--unread',
         '--order=createTime desc', '--max=50'],
       { account: undefined },
     );
@@ -138,7 +142,7 @@ describe('gog_chat_messages_search', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_messages_search', { query: 'project decision' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'search', 'project decision'],
+      ['chat', 'messages', 'search', pos('project decision')],
       { account: undefined },
     );
   });
@@ -156,7 +160,7 @@ describe('gog_chat_messages_search', () => {
       all: true,
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'search', 'from:alice@example.com budget', '--order=create_time desc',
+      ['chat', 'messages', 'search', pos('from:alice@example.com budget'), '--order=create_time desc',
         '--view=full', '--markup=markdown', '--max=100', '--page=tok', '--all'],
       { account: undefined },
     );
@@ -198,7 +202,7 @@ describe('gog_chat_messages_send', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_messages_send', { space: 'spaces/AAA', text: 'hi' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'send', 'spaces/AAA', '--text=hi'],
+      ['chat', 'messages', 'send', pos('spaces/AAA'), '--text=hi'],
       { account: undefined },
     );
   });
@@ -210,7 +214,7 @@ describe('gog_chat_messages_send', () => {
       space: 'spaces/AAA', text: 'see this', thread: 'spaces/AAA/threads/T', attach: ['/tmp/a.png'],
     });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'send', 'spaces/AAA', '--text=see this', '--thread=spaces/AAA/threads/T', '--attach=/tmp/a.png'],
+      ['chat', 'messages', 'send', pos('spaces/AAA'), '--text=see this', '--thread=spaces/AAA/threads/T', '--attach=/tmp/a.png'],
       { account: undefined },
     );
   });
@@ -234,7 +238,7 @@ describe('gog_chat_messages_send', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_messages_send', { space: 'spaces/AAA', attach: ['/tmp/a.png'] });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'send', 'spaces/AAA', '--attach=/tmp/a.png'],
+      ['chat', 'messages', 'send', pos('spaces/AAA'), '--attach=/tmp/a.png'],
       { account: undefined },
     );
   });
@@ -253,7 +257,7 @@ describe('gog_chat_dm_send', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_dm_send', { email: 'a@b.com', text: 'hi' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'dm', 'send', 'a@b.com', '--text=hi'],
+      ['chat', 'dm', 'send', pos('a@b.com'), '--text=hi'],
       { account: undefined },
     );
   });
@@ -263,7 +267,7 @@ describe('gog_chat_dm_send', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_dm_send', { email: 'a@b.com', text: 'hi', thread: 'spaces/D/threads/T' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'dm', 'send', 'a@b.com', '--text=hi', '--thread=spaces/D/threads/T'],
+      ['chat', 'dm', 'send', pos('a@b.com'), '--text=hi', '--thread=spaces/D/threads/T'],
       { account: undefined },
     );
   });
@@ -274,7 +278,7 @@ describe('gog_chat_dm_space', () => {
     vi.mocked(runner.run).mockResolvedValue('{}');
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_dm_space', { email: 'a@b.com' });
-    expect(runner.run).toHaveBeenCalledWith(['chat', 'dm', 'space', 'a@b.com'], { account: undefined });
+    expect(runner.run).toHaveBeenCalledWith(['chat', 'dm', 'space', pos('a@b.com')], { account: undefined });
   });
 });
 
@@ -284,7 +288,7 @@ describe('gog_chat_reactions_list', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_reactions_list', { message: 'MSG', space: 'spaces/AAA', max: 10 });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'reactions', 'list', 'MSG', '--space=spaces/AAA', '--max=10'],
+      ['chat', 'messages', 'reactions', 'list', pos('MSG'), '--space=spaces/AAA', '--max=10'],
       { account: undefined },
     );
   });
@@ -294,7 +298,7 @@ describe('gog_chat_reactions_list', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_reactions_list', { message: 'spaces/AAA/messages/M' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'reactions', 'list', 'spaces/AAA/messages/M'],
+      ['chat', 'messages', 'reactions', 'list', pos('spaces/AAA/messages/M')],
       { account: undefined },
     );
   });
@@ -306,7 +310,7 @@ describe('gog_chat_reactions_create', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_reactions_create', { message: 'spaces/AAA/messages/M', emoji: '👍' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'reactions', 'create', 'spaces/AAA/messages/M', '👍'],
+      ['chat', 'messages', 'reactions', 'create', pos('spaces/AAA/messages/M'), pos('👍')],
       { account: undefined },
     );
   });
@@ -316,7 +320,7 @@ describe('gog_chat_reactions_create', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_reactions_create', { message: 'M', emoji: '👍', space: 'spaces/AAA' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'reactions', 'create', 'M', '👍', '--space=spaces/AAA'],
+      ['chat', 'messages', 'reactions', 'create', pos('M'), pos('👍'), '--space=spaces/AAA'],
       { account: undefined },
     );
   });
@@ -328,7 +332,7 @@ describe('gog_chat_reactions_delete', () => {
     const harness = await setupHandlers();
     await harness.callTool('gog_chat_reactions_delete', { reaction: 'spaces/AAA/messages/M/reactions/R' });
     expect(runner.run).toHaveBeenCalledWith(
-      ['chat', 'messages', 'reactions', 'delete', 'spaces/AAA/messages/M/reactions/R'],
+      ['chat', 'messages', 'reactions', 'delete', pos('spaces/AAA/messages/M/reactions/R')],
       { account: undefined },
     );
   });
@@ -342,3 +346,28 @@ describe('gog_chat_run', () => {
     expect(runner.run).toHaveBeenCalledWith(['chat', 'spaces', 'list'], { account: undefined });
   });
 });
+
+// SEC-3/SEC-4: every model-supplied server path must resolve inside an
+// operator-configured root (GOG_FILE_ROOTS). The suite runs with '/' so the
+// arg-shape tests can use any path; these narrow it.
+async function withFileRoots<T>(roots: string, fn: () => Promise<T>): Promise<T> {
+  const prev = process.env.GOG_FILE_ROOTS;
+  process.env.GOG_FILE_ROOTS = roots;
+  try {
+    return await fn();
+  } finally {
+    process.env.GOG_FILE_ROOTS = prev;
+  }
+}
+
+describe('gog_chat_messages_send — server paths', () => {
+  it('refuses an attach path outside GOG_FILE_ROOTS', async () => {
+    const harness = await setupHandlers();
+    const result = await withFileRoots('/srv/gog-files', () => harness.callTool('gog_chat_messages_send', {
+      space: 'spaces/AAA', attach: ['/etc/passwd'],
+    }));
+    expect(result.isError).toBe(true);
+    expect(result.content[0].text).toContain('attach "/etc/passwd" is outside');
+    expect(runner.run).not.toHaveBeenCalled();
+  });
+});