@aaronsb/google-workspace-mcp 2.3.0 → 2.5.0

package/build/server/session/context.js

@@ -0,0 +1,56 @@
+/**
+ * Session context formatter — builds a markdown footer with ambient
+ * workspace awareness (email deltas, next calendar event).
+ */
+/** Format the session context footer for a tool response. */
+export function sessionContext(_toolName, email, tracker) {
+    if (!email)
+        return '';
+    const session = tracker.getContext(email);
+    if (!session?.initialized)
+        return '';
+    const lines = [];
+    // Email delta
+    const delta = session.currentUnreadCount - session.baselineUnreadCount;
+    if (delta > 0) {
+        lines.push(`- ${delta} new unread email${delta !== 1 ? 's' : ''} since session start (${session.currentUnreadCount} unread, ${session.currentTodayEmailCount} today)`);
+    }
+    else if (delta < 0) {
+        const abs = Math.abs(delta);
+        lines.push(`- ${abs} fewer unread since session start (${session.currentUnreadCount} unread, ${session.currentTodayEmailCount} today)`);
+    }
+    else {
+        lines.push(`- No new unread emails since session start (${session.currentUnreadCount} unread, ${session.currentTodayEmailCount} today)`);
+    }
+    // Next event
+    if (session.nextEvent) {
+        const label = formatEventTime(session.nextEvent.startTime);
+        lines.push(`- Next: "${session.nextEvent.summary}" ${label}`);
+    }
+    else {
+        lines.push('- No more events today');
+    }
+    return `\n\n---\n**Session context** (${email}):\n${lines.join('\n')}`;
+}
+/** Format event start as relative ("in 25 min") or absolute ("at 2:30 PM"). */
+function formatEventTime(startTime) {
+    if (!startTime)
+        return '';
+    try {
+        const start = new Date(startTime);
+        if (isNaN(start.getTime()))
+            return `at ${startTime}`;
+        const diffMs = start.getTime() - Date.now();
+        if (diffMs < 0)
+            return 'now (started)';
+        const diffMin = Math.round(diffMs / 60_000);
+        if (diffMin < 120) {
+            return diffMin <= 1 ? 'in 1 min' : `in ${diffMin} min`;
+        }
+        return `at ${start.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true })}`;
+    }
+    catch {
+        return `at ${startTime}`;
+    }
+}
+//# sourceMappingURL=context.js.map

package/build/server/session/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/server/session/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,6DAA6D;AAC7D,MAAM,UAAU,cAAc,CAC5B,SAAiB,EACjB,KAAyB,EACzB,OAAuB;IAEvB,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,EAAE,WAAW;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,cAAc;IACd,MAAM,KAAK,GAAG,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IACvE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,oBAAoB,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,yBAAyB,OAAO,CAAC,kBAAkB,YAAY,OAAO,CAAC,sBAAsB,SAAS,CAAC,CAAC;IACzK,CAAC;SAAM,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,sCAAsC,OAAO,CAAC,kBAAkB,YAAY,OAAO,CAAC,sBAAsB,SAAS,CAAC,CAAC;IAC1I,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,+CAA+C,OAAO,CAAC,kBAAkB,YAAY,OAAO,CAAC,sBAAsB,SAAS,CAAC,CAAC;IAC3I,CAAC;IAED,aAAa;IACb,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,KAAK,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,SAAS,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,iCAAiC,KAAK,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AACzE,CAAC;AAED,+EAA+E;AAC/E,SAAS,eAAe,CAAC,SAAiB;IACxC,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QAClC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,MAAM,SAAS,EAAE,CAAC;QAErD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5C,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,eAAe,CAAC;QAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;QAC5C,IAAI,OAAO,GAAG,GAAG,EAAE,CAAC;YAClB,OAAO,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC;QACzD,CAAC;QAED,OAAO,MAAM,KAAK,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACzG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,SAAS,EAAE,CAAC;IAC3B,CAAC;AACH,CAAC"}

package/build/server/session/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Session module — lazy singleton for the session tracker.
+ */
+import { SessionTracker } from './tracker.js';
+/** Get (or create) the singleton session tracker. */
+export declare function getSessionTracker(): SessionTracker;
+export { SessionTracker } from './tracker.js';
+export type { AccountSession, NextEvent } from './tracker.js';
+export { sessionContext } from './context.js';

package/build/server/session/index.js

@@ -0,0 +1,14 @@
+/**
+ * Session module — lazy singleton for the session tracker.
+ */
+import { SessionTracker } from './tracker.js';
+let _tracker;
+/** Get (or create) the singleton session tracker. */
+export function getSessionTracker() {
+    if (!_tracker)
+        _tracker = new SessionTracker();
+    return _tracker;
+}
+export { SessionTracker } from './tracker.js';
+export { sessionContext } from './context.js';
+//# sourceMappingURL=index.js.map

package/build/server/session/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,IAAI,QAAoC,CAAC;AAEzC,qDAAqD;AACrD,MAAM,UAAU,iBAAiB;IAC/B,IAAI,CAAC,QAAQ;QAAE,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;IAC/C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC"}

package/build/server/session/tracker.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Session tracker — per-account in-memory state for ambient context.
+ *
+ * Captures baseline workspace counters on first use per account,
+ * refreshes periodically via fire-and-forget, and exposes current
+ * deltas for context injection.
+ *
+ * Refresh is gated by epoch distance — only polls Google APIs when
+ * at least REFRESH_EPOCH_INTERVAL tool calls have elapsed since the
+ * last refresh, keeping API usage bounded.
+ */
+export interface NextEvent {
+    summary: string;
+    startTime: string;
+}
+export interface AccountSession {
+    baselineUnreadCount: number;
+    currentUnreadCount: number;
+    baselineTodayEmailCount: number;
+    currentTodayEmailCount: number;
+    nextEvent: NextEvent | null;
+    lastRefreshedEpoch: number;
+    initialized: boolean;
+}
+export declare class SessionTracker {
+    private sessions;
+    /** Capture baseline on first call per account. Blocks until complete. */
+    ensureBaseline(email: string, epoch: number): Promise<void>;
+    /** Fire-and-forget async refresh, gated by epoch staleness. Never throws. */
+    refresh(email: string, epoch: number): void;
+    /** Return current session data, or undefined if not tracked. */
+    getContext(email: string): AccountSession | undefined;
+    /** Clear all state (for testing). */
+    reset(): void;
+    private _doRefresh;
+}

package/build/server/session/tracker.js

@@ -0,0 +1,135 @@
+/**
+ * Session tracker — per-account in-memory state for ambient context.
+ *
+ * Captures baseline workspace counters on first use per account,
+ * refreshes periodically via fire-and-forget, and exposes current
+ * deltas for context injection.
+ *
+ * Refresh is gated by epoch distance — only polls Google APIs when
+ * at least REFRESH_EPOCH_INTERVAL tool calls have elapsed since the
+ * last refresh, keeping API usage bounded.
+ */
+import { execute } from '../../executor/gws.js';
+/** Minimum epoch distance between refresh polls per account. */
+const REFRESH_EPOCH_INTERVAL = 10;
+/** Format today's date as YYYY/MM/DD for Gmail search queries. */
+function todayQuery() {
+    const d = new Date();
+    return `${d.getFullYear()}/${String(d.getMonth() + 1).padStart(2, '0')}/${String(d.getDate()).padStart(2, '0')}`;
+}
+/** ISO string for end of today (23:59:59 local time). */
+function endOfDayISO() {
+    const d = new Date();
+    d.setHours(23, 59, 59, 999);
+    return d.toISOString();
+}
+async function fetchUnreadCount(account) {
+    const result = await execute([
+        'gmail', 'users', 'messages', 'list',
+        '--params', JSON.stringify({ userId: 'me', q: 'is:unread', maxResults: 1 }),
+    ], { account });
+    const data = result.data;
+    return Number(data.resultSizeEstimate ?? 0);
+}
+async function fetchTodayEmailCount(account) {
+    const result = await execute([
+        'gmail', 'users', 'messages', 'list',
+        '--params', JSON.stringify({ userId: 'me', q: `after:${todayQuery()}`, maxResults: 1 }),
+    ], { account });
+    const data = result.data;
+    return Number(data.resultSizeEstimate ?? 0);
+}
+async function fetchNextEvent(account) {
+    const result = await execute([
+        'calendar', 'events', 'list',
+        '--params', JSON.stringify({
+            calendarId: 'primary',
+            timeMin: new Date().toISOString(),
+            timeMax: endOfDayISO(),
+            maxResults: 1,
+            orderBy: 'startTime',
+            singleEvents: true,
+        }),
+    ], { account });
+    const data = result.data;
+    const items = (data.items ?? []);
+    if (items.length === 0)
+        return null;
+    const event = items[0];
+    const start = event.start;
+    return {
+        summary: String(event.summary ?? '(no title)'),
+        startTime: start?.dateTime ?? start?.date ?? '',
+    };
+}
+export class SessionTracker {
+    sessions = new Map();
+    /** Capture baseline on first call per account. Blocks until complete. */
+    async ensureBaseline(email, epoch) {
+        if (this.sessions.has(email))
+            return;
+        try {
+            const [unread, today, nextEvt] = await Promise.allSettled([
+                fetchUnreadCount(email),
+                fetchTodayEmailCount(email),
+                fetchNextEvent(email),
+            ]);
+            const session = {
+                baselineUnreadCount: unread.status === 'fulfilled' ? unread.value : 0,
+                currentUnreadCount: unread.status === 'fulfilled' ? unread.value : 0,
+                baselineTodayEmailCount: today.status === 'fulfilled' ? today.value : 0,
+                currentTodayEmailCount: today.status === 'fulfilled' ? today.value : 0,
+                nextEvent: nextEvt.status === 'fulfilled' ? nextEvt.value : null,
+                lastRefreshedEpoch: epoch,
+                initialized: true,
+            };
+            this.sessions.set(email, session);
+        }
+        catch (err) {
+            process.stderr.write(`[gws-mcp] session baseline failed for ${email}: ${err instanceof Error ? err.message : String(err)}\n`);
+        }
+    }
+    /** Fire-and-forget async refresh, gated by epoch staleness. Never throws. */
+    refresh(email, epoch) {
+        const session = this.sessions.get(email);
+        if (!session?.initialized)
+            return;
+        if (epoch - session.lastRefreshedEpoch < REFRESH_EPOCH_INTERVAL)
+            return;
+        void this._doRefresh(email, epoch);
+    }
+    /** Return current session data, or undefined if not tracked. */
+    getContext(email) {
+        return this.sessions.get(email);
+    }
+    /** Clear all state (for testing). */
+    reset() {
+        this.sessions.clear();
+    }
+    async _doRefresh(email, epoch) {
+        const session = this.sessions.get(email);
+        if (!session)
+            return;
+        try {
+            const [unread, today, nextEvt] = await Promise.allSettled([
+                fetchUnreadCount(email),
+                fetchTodayEmailCount(email),
+                fetchNextEvent(email),
+            ]);
+            // Guard against stale write: a newer refresh may have landed while we awaited
+            if (session.lastRefreshedEpoch > epoch)
+                return;
+            if (unread.status === 'fulfilled')
+                session.currentUnreadCount = unread.value;
+            if (today.status === 'fulfilled')
+                session.currentTodayEmailCount = today.value;
+            if (nextEvt.status === 'fulfilled')
+                session.nextEvent = nextEvt.value;
+            session.lastRefreshedEpoch = epoch;
+        }
+        catch (err) {
+            process.stderr.write(`[gws-mcp] session refresh failed for ${email}: ${err instanceof Error ? err.message : String(err)}\n`);
+        }
+    }
+}
+//# sourceMappingURL=tracker.js.map

package/build/server/session/tracker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../../../src/server/session/tracker.ts"],"names":[],"mappings":"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"}

package/build/services/calendar/patch.js

@@ -82,7 +82,8 @@ export const calendarPatch = {
             const summary = requireString(params, 'summary');
             const start = requireString(params, 'start');
             const end = requireString(params, 'end');
-            const args = ['calendar', '+insert', '--summary', summary, '--start', start, '--end', end];
+            const calendarId = params.calendarId || 'primary';
+            const args = ['calendar', '+insert', '--calendar', calendarId, '--summary', summary, '--start', start, '--end', end];
             if (params.description)
                 args.push('--description', String(params.description));
             if (params.location)
@@ -102,9 +103,10 @@ export const calendarPatch = {
         },
         delete: async (params, account) => {
             const eventId = requireString(params, 'eventId');
+            const calendarId = params.calendarId || 'primary';
             await execute([
                 'calendar', 'events', 'delete',
-                '--params', JSON.stringify({ calendarId: 'primary', eventId }),
+                '--params', JSON.stringify({ calendarId, eventId }),
             ], { account });
             return {
                 text: `Event deleted: ${eventId}` + nextSteps('calendar', 'delete', { email: account }),

package/build/services/calendar/patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/services/calendar/patch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/services/calendar/patch.ts"],"names":[],"mappings":"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"}

package/build/services/docs/patch.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Docs patch — custom handlers for operations that use batchUpdate.
+ *
+ * insertText and replaceText use documents.batchUpdate which requires
+ * a --json request body, not --params.
+ */
+import type { ServicePatch } from '../../factory/types.js';
+export declare const docsPatch: ServicePatch;

package/build/services/docs/patch.js

@@ -0,0 +1,72 @@
+/**
+ * Docs patch — custom handlers for operations that use batchUpdate.
+ *
+ * insertText and replaceText use documents.batchUpdate which requires
+ * a --json request body, not --params.
+ */
+import { execute } from '../../executor/gws.js';
+import { nextSteps } from '../../server/formatting/next-steps.js';
+import { requireString } from '../../server/handlers/validate.js';
+export const docsPatch = {
+    customHandlers: {
+        insertText: async (params, account) => {
+            const documentId = requireString(params, 'documentId');
+            const text = requireString(params, 'text');
+            const index = Number(params.index);
+            if (!Number.isInteger(index) || index < 1) {
+                throw new Error('index must be a positive integer (1 = start of document body)');
+            }
+            const body = {
+                requests: [{
+                        insertText: {
+                            text,
+                            location: { index },
+                        },
+                    }],
+            };
+            await execute([
+                'docs', 'documents', 'batchUpdate',
+                '--params', JSON.stringify({ documentId }),
+                '--json', JSON.stringify(body),
+            ], { account });
+            return {
+                text: `Text inserted at index ${index}.\n\n**Document:** ${documentId}\n**Inserted:** ${text.length} characters` +
+                    nextSteps('docs', 'insertText', { email: account }),
+                refs: { documentId, index, length: text.length },
+            };
+        },
+        replaceText: async (params, account) => {
+            const documentId = requireString(params, 'documentId');
+            const findText = requireString(params, 'findText');
+            const replaceWith = requireString(params, 'replaceWith');
+            const matchCase = params.matchCase !== false;
+            const body = {
+                requests: [{
+                        replaceAllText: {
+                            containsText: {
+                                text: findText,
+                                matchCase,
+                            },
+                            replaceText: replaceWith,
+                        },
+                    }],
+            };
+            const result = await execute([
+                'docs', 'documents', 'batchUpdate',
+                '--params', JSON.stringify({ documentId }),
+                '--json', JSON.stringify(body),
+            ], { account });
+            // Extract occurrence count from the reply
+            const data = result.data;
+            const replies = data.replies || [];
+            const replaceReply = replies[0]?.replaceAllText;
+            const occurrences = replaceReply?.occurrencesChanged || 0;
+            return {
+                text: `Text replaced.\n\n**Document:** ${documentId}\n**Found:** "${findText}"\n**Replaced with:** "${replaceWith}"\n**Occurrences:** ${occurrences}` +
+                    nextSteps('docs', 'replaceText', { email: account }),
+                refs: { documentId, occurrences },
+            };
+        },
+    },
+};
+//# sourceMappingURL=patch.js.map

package/build/services/docs/patch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch.js","sourceRoot":"","sources":["../../../src/services/docs/patch.ts"],"names":[],"mappings":"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"}

package/build/services/drive/patch.js

@@ -13,7 +13,7 @@ import { execute } from '../../executor/gws.js';
 import { formatFileList, formatFileDetail } from '../../server/formatting/markdown.js';
 import { nextSteps } from '../../server/formatting/next-steps.js';
 import { requireString } from '../../server/handlers/validate.js';
-import { ensureWorkspaceDir, resolveWorkspacePath, verifyPathSafety } from '../../executor/workspace.js';
+import { ensureWorkspaceDir, getWorkspaceDir, resolveWorkspacePath, verifyPathSafety } from '../../executor/workspace.js';
 import { isTextFile, formatFileOutput, buildImageBlock, buildImageBlockFromFile, isImageFile } from '../../executor/file-output.js';
 /** Read a file from workspace and build the output result with optional inline content. */
 async function readWorkspaceFile(filePath, filename, mimeType) {
@@ -57,7 +57,7 @@ export const drivePatch = {
             // Get file metadata for filename and mime type
             const metaResult = await execute([
                 'drive', 'files', 'get',
-                '--params', JSON.stringify({ fileId, fields: 'name,mimeType' }),
+                '--params', JSON.stringify({ fileId, fields: 'name,mimeType', supportsAllDrives: true }),
             ], { account });
             const meta = metaResult.data;
             const filename = String(params.outputPath || meta.name || `file-${fileId}`);
@@ -69,11 +69,12 @@ export const drivePatch = {
             const outputPath = resolveWorkspacePath(filename);
             await verifyPathSafety(outputPath);
             // Download directly to disk via --output (preserves binary integrity)
+            // cwd must match workspace so gws directory-fence accepts the output path
             await execute([
                 'drive', 'files', 'get',
-                '--params', JSON.stringify({ fileId, alt: 'media' }),
+                '--params', JSON.stringify({ fileId, alt: 'media', supportsAllDrives: true }),
                 '--output', outputPath,
-            ], { account });
+            ], { account, cwd: getWorkspaceDir() });
             const output = await readWorkspaceFile(outputPath, filename, mimeType);
             return {
                 text: formatFileOutput(output) + nextSteps('drive', 'download', { email: account }),
@@ -92,7 +93,7 @@ export const drivePatch = {
             // Get file metadata
             const metaResult = await execute([
                 'drive', 'files', 'get',
-                '--params', JSON.stringify({ fileId, fields: 'name,mimeType,size' }),
+                '--params', JSON.stringify({ fileId, fields: 'name,mimeType,size', supportsAllDrives: true }),
             ], { account });
             const meta = metaResult.data;
             const filename = String(meta.name || `image-${fileId}`);
@@ -106,9 +107,9 @@ export const drivePatch = {
             try {
                 await execute([
                     'drive', 'files', 'get',
-                    '--params', JSON.stringify({ fileId, alt: 'media' }),
+                    '--params', JSON.stringify({ fileId, alt: 'media', supportsAllDrives: true }),
                     '--output', tmpPath,
-                ], { account });
+                ], { account, cwd: path.dirname(tmpPath) });
                 const buffer = await fs.readFile(tmpPath);
                 const imageBlock = buildImageBlock(buffer, filename, mimeType);
                 if (!imageBlock) {
@@ -141,7 +142,7 @@ export const drivePatch = {
             // Get source file name
             const metaResult = await execute([
                 'drive', 'files', 'get',
-                '--params', JSON.stringify({ fileId, fields: 'name' }),
+                '--params', JSON.stringify({ fileId, fields: 'name', supportsAllDrives: true }),
             ], { account });
             const meta = metaResult.data;
             const baseName = String(meta.name || `export-${fileId}`).replace(/\.[^.]+$/, '');
@@ -153,11 +154,12 @@ export const drivePatch = {
             const outputPath = resolveWorkspacePath(filename);
             await verifyPathSafety(outputPath);
             // Export directly to disk via --output (preserves binary integrity)
+            // cwd must match workspace so gws directory-fence accepts the output path
             await execute([
                 'drive', 'files', 'export',
-                '--params', JSON.stringify({ fileId, mimeType }),
+                '--params', JSON.stringify({ fileId, mimeType, supportsAllDrives: true }),
                 '--output', outputPath,
-            ], { account });
+            ], { account, cwd: getWorkspaceDir() });
             const output = await readWorkspaceFile(outputPath, filename, mimeType);
             return {
                 text: formatFileOutput(output) + nextSteps('drive', 'export', { email: account }),
@@ -172,6 +174,159 @@ export const drivePatch = {
                 ...(output.imageBlock ? { content: [output.imageBlock] } : {}),
             };
         },
+        listComments: async (params, account) => {
+            const fileId = requireString(params, 'fileId');
+            const includeDeleted = params.includeDeleted ? 'true' : 'false';
+            const result = await execute([
+                'drive', 'comments', 'list',
+                '--params', JSON.stringify({
+                    fileId,
+                    includeDeleted,
+                    fields: 'comments(id, content, htmlContent, author(displayName, emailAddress), createdTime, modifiedTime, resolved, quotedFileContent, replies(id, content, author(displayName), createdTime)), nextPageToken',
+                    supportsAllDrives: true,
+                }),
+            ], { account });
+            const data = result.data;
+            const comments = (data.comments || []);
+            if (comments.length === 0) {
+                return {
+                    text: 'No comments on this file.' +
+                        nextSteps('drive', 'listComments', { email: account }),
+                    refs: { fileId, count: 0 },
+                };
+            }
+            const lines = comments.map((c) => {
+                const author = c.author?.displayName || 'Unknown';
+                const resolved = c.resolved ? ' [RESOLVED]' : '';
+                const quoted = c.quotedFileContent
+                    ? `\n  > "${c.quotedFileContent.value}"`
+                    : '';
+                const replies = (c.replies || []);
+                const replyLines = replies.map((r) => {
+                    const rAuthor = r.author?.displayName || 'Unknown';
+                    return `  - **${rAuthor}:** ${r.content}`;
+                }).join('\n');
+                return `- **${author}**${resolved}: ${c.content}${quoted}` +
+                    (replyLines ? `\n${replyLines}` : '') +
+                    `\n  _ID: ${c.id}_`;
+            });
+            return {
+                text: `## Comments (${comments.length})\n\n${lines.join('\n\n')}` +
+                    nextSteps('drive', 'listComments', { email: account }),
+                refs: { fileId, count: comments.length },
+            };
+        },
+        getComment: async (params, account) => {
+            const fileId = requireString(params, 'fileId');
+            const commentId = requireString(params, 'commentId');
+            const result = await execute([
+                'drive', 'comments', 'get',
+                '--params', JSON.stringify({
+                    fileId,
+                    commentId,
+                    fields: 'id, content, htmlContent, author(displayName, emailAddress), createdTime, modifiedTime, resolved, quotedFileContent, replies(id, content, htmlContent, author(displayName), createdTime)',
+                    supportsAllDrives: true,
+                }),
+            ], { account });
+            const c = result.data;
+            const author = c.author?.displayName || 'Unknown';
+            const resolved = c.resolved ? ' [RESOLVED]' : '';
+            const quoted = c.quotedFileContent
+                ? `\n> "${c.quotedFileContent.value}"`
+                : '';
+            const replies = (c.replies || []);
+            const replyLines = replies.map((r) => {
+                const rAuthor = r.author?.displayName || 'Unknown';
+                return `- **${rAuthor}** (${r.createdTime}): ${r.content}`;
+            }).join('\n');
+            return {
+                text: `## Comment by ${author}${resolved}\n\n${c.content}${quoted}\n\n**Created:** ${c.createdTime}\n**Modified:** ${c.modifiedTime}` +
+                    (replyLines ? `\n\n### Replies\n\n${replyLines}` : '') +
+                    nextSteps('drive', 'getComment', { email: account }),
+                refs: { commentId: c.id, fileId, resolved: c.resolved },
+            };
+        },
+        addComment: async (params, account) => {
+            const fileId = requireString(params, 'fileId');
+            const content = requireString(params, 'content');
+            const quotedText = params.quotedText ? String(params.quotedText) : undefined;
+            const body = { content };
+            if (quotedText) {
+                body.quotedFileContent = { value: quotedText };
+            }
+            const result = await execute([
+                'drive', 'comments', 'create',
+                '--params', JSON.stringify({
+                    fileId,
+                    fields: 'id, content, htmlContent, author(displayName), createdTime, quotedFileContent',
+                    supportsAllDrives: true,
+                }),
+                '--json', JSON.stringify(body),
+            ], { account });
+            const data = result.data;
+            return {
+                text: `Comment added.\n\n**ID:** ${data.id}\n**Content:** ${data.content}` +
+                    (quotedText ? `\n**Anchored to:** "${quotedText}"` : '') +
+                    nextSteps('drive', 'addComment', { email: account }),
+                refs: { commentId: data.id, fileId },
+            };
+        },
+        resolveComment: async (params, account) => {
+            const fileId = requireString(params, 'fileId');
+            const commentId = requireString(params, 'commentId');
+            const resolved = params.resolved !== false;
+            // Fetch existing comment to preserve content when updating
+            const existing = await execute([
+                'drive', 'comments', 'get',
+                '--params', JSON.stringify({
+                    fileId,
+                    commentId,
+                    fields: 'content',
+                    supportsAllDrives: true,
+                }),
+            ], { account });
+            const existingData = existing.data;
+            const result = await execute([
+                'drive', 'comments', 'update',
+                '--params', JSON.stringify({
+                    fileId,
+                    commentId,
+                    fields: 'id, content, resolved',
+                    supportsAllDrives: true,
+                }),
+                '--json', JSON.stringify({
+                    content: existingData.content || '',
+                    resolved,
+                }),
+            ], { account });
+            const data = result.data;
+            return {
+                text: `Comment ${resolved ? 'resolved' : 'reopened'}.\n\n**ID:** ${data.id}\n**Resolved:** ${resolved}` +
+                    nextSteps('drive', 'resolveComment', { email: account }),
+                refs: { commentId: data.id, fileId, resolved },
+            };
+        },
+        replyToComment: async (params, account) => {
+            const fileId = requireString(params, 'fileId');
+            const commentId = requireString(params, 'commentId');
+            const content = requireString(params, 'content');
+            const result = await execute([
+                'drive', 'replies', 'create',
+                '--params', JSON.stringify({
+                    fileId,
+                    commentId,
+                    fields: 'id, content, htmlContent, author(displayName), createdTime',
+                    supportsAllDrives: true,
+                }),
+                '--json', JSON.stringify({ content }),
+            ], { account });
+            const data = result.data;
+            return {
+                text: `Reply added.\n\n**ID:** ${data.id}\n**Content:** ${data.content}` +
+                    nextSteps('drive', 'replyToComment', { email: account }),
+                refs: { replyId: data.id, commentId, fileId },
+            };
+        },
     },
 };
 //# sourceMappingURL=patch.js.map