gogcli-mcp 2.30.0 → 4.0.0

package/src/tools/classroom.ts

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { accountParam, runOrDiagnose, registerRunTool, pageTokenParam, pageAliasParam, resolvePageToken} from './utils.js';
 
@@ -6,7 +6,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_courses_list', {
     description: 'List Google Classroom courses.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       state: z.string().optional().describe('Comma-separated course states (ACTIVE, ARCHIVED, PROVISIONED, DECLINED, SUSPENDED)'),
       teacher: z.string().optional().describe('Filter by teacher user ID'),
       student: z.string().optional().describe('Filter by student user ID'),
@@ -15,7 +15,7 @@ export function registerClassroomTools(server: McpServer): void {
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ state, teacher, student, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'courses', 'list'];
     if (state) args.push(`--state=${state}`);
@@ -31,10 +31,10 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_courses_get', {
     description: 'Get a single Google Classroom course by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, account }) => {
     return runOrDiagnose(['classroom', 'courses', 'get', courseId], { account });
   });
@@ -42,14 +42,14 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_students_list', {
     description: 'List students enrolled in a Google Classroom course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       max: z.number().optional().describe('Max results per page'),
       pageToken: pageTokenParam,
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'students', 'list', courseId];
     if (max !== undefined) args.push(`--max=${max}`);
@@ -62,11 +62,11 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_students_get', {
     description: 'Get a specific student enrolled in a course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       userId: z.string().describe('Student user ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, userId, account }) => {
     return runOrDiagnose(['classroom', 'students', 'get', courseId, userId], { account });
   });
@@ -74,14 +74,14 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_teachers_list', {
     description: 'List teachers in a Google Classroom course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       max: z.number().optional().describe('Max results per page'),
       pageToken: pageTokenParam,
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'teachers', 'list', courseId];
     if (max !== undefined) args.push(`--max=${max}`);
@@ -94,11 +94,11 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_teachers_get', {
     description: 'Get a specific teacher in a course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       userId: z.string().describe('Teacher user ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, userId, account }) => {
     return runOrDiagnose(['classroom', 'teachers', 'get', courseId, userId], { account });
   });
@@ -106,7 +106,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_roster', {
     description: 'List the full roster (students and/or teachers) of a Google Classroom course. Omit both flags to return both groups.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       students: z.boolean().optional().describe('Include students only'),
       teachers: z.boolean().optional().describe('Include teachers only'),
@@ -115,7 +115,7 @@ export function registerClassroomTools(server: McpServer): void {
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, students, teachers, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'roster', courseId];
     if (students) args.push('--students');
@@ -130,7 +130,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_coursework_list', {
     description: 'List coursework (assignments, questions, materials) for a course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       state: z.string().optional().describe('Filter by coursework state (PUBLISHED, DRAFT, DELETED)'),
       topic: z.string().optional().describe('Filter by topic ID'),
@@ -141,7 +141,7 @@ export function registerClassroomTools(server: McpServer): void {
       all: z.boolean().optional().describe('Fetch all pages'),
       scanPages: z.number().optional().describe('Max pages to scan when filtering'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, state, topic, orderBy, max, pageToken, page, all, scanPages, account }) => {
     const args = ['classroom', 'coursework', 'list', courseId];
     if (state) args.push(`--state=${state}`);
@@ -158,11 +158,11 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_coursework_get', {
     description: 'Get a single coursework item by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, account }) => {
     return runOrDiagnose(['classroom', 'coursework', 'get', courseId, courseworkId], { account });
   });
@@ -170,7 +170,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_list', {
     description: 'List student submissions for a coursework item.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       state: z.string().optional().describe('Filter by submission state'),
@@ -181,7 +181,7 @@ export function registerClassroomTools(server: McpServer): void {
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, state, late, user, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'submissions', 'list', courseId, courseworkId];
     if (state) args.push(`--state=${state}`);
@@ -197,12 +197,12 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_get', {
     description: 'Get a single submission by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       submissionId: z.string().describe('Submission ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, submissionId, account }) => {
     return runOrDiagnose(['classroom', 'submissions', 'get', courseId, courseworkId, submissionId], { account });
   });
@@ -210,14 +210,14 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_grade', {
     description: 'Grade a student submission. Set draft and/or assigned grade values.',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       submissionId: z.string().describe('Submission ID'),
       draft: z.string().optional().describe('Draft grade value'),
       assigned: z.string().optional().describe('Assigned (final) grade value'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, submissionId, draft, assigned, account }) => {
     const args = ['classroom', 'submissions', 'grade', courseId, courseworkId, submissionId];
     if (draft) args.push(`--draft=${draft}`);
@@ -228,12 +228,12 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_return', {
     description: 'Return a graded submission to the student.',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       submissionId: z.string().describe('Submission ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, submissionId, account }) => {
     return runOrDiagnose(['classroom', 'submissions', 'return', courseId, courseworkId, submissionId], { account });
   });
@@ -241,12 +241,12 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_turn_in', {
     description: 'Turn in a student submission (student action).',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       submissionId: z.string().describe('Submission ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, submissionId, account }) => {
     return runOrDiagnose(['classroom', 'submissions', 'turn-in', courseId, courseworkId, submissionId], { account });
   });
@@ -254,12 +254,12 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_submissions_reclaim', {
     description: 'Reclaim a turned-in submission (student action to edit a submission).',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       courseworkId: z.string().describe('Coursework ID'),
       submissionId: z.string().describe('Submission ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, courseworkId, submissionId, account }) => {
     return runOrDiagnose(['classroom', 'submissions', 'reclaim', courseId, courseworkId, submissionId], { account });
   });
@@ -267,7 +267,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_announcements_list', {
     description: 'List announcements in a Google Classroom course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       state: z.string().optional().describe('Filter by announcement state'),
       orderBy: z.string().optional().describe('Sort order'),
@@ -276,7 +276,7 @@ export function registerClassroomTools(server: McpServer): void {
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, state, orderBy, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'announcements', 'list', courseId];
     if (state) args.push(`--state=${state}`);
@@ -291,24 +291,24 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_announcements_get', {
     description: 'Get a single announcement by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       announcementId: z.string().describe('Announcement ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, announcementId, account }) => {
     return runOrDiagnose(['classroom', 'announcements', 'get', courseId, announcementId], { account });
   });
 
   server.registerTool('gog_classroom_announcements_create', {
     description: 'Create an announcement in a Google Classroom course.',
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       text: z.string().describe('Announcement text'),
       state: z.enum(['PUBLISHED', 'DRAFT']).optional().describe('State'),
       scheduled: z.string().optional().describe('Scheduled publish time'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, text, state, scheduled, account }) => {
     const args = ['classroom', 'announcements', 'create', courseId, `--text=${text}`];
     if (state) args.push(`--state=${state}`);
@@ -319,14 +319,14 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_topics_list', {
     description: 'List topics in a Google Classroom course.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       max: z.number().optional().describe('Max results per page'),
       pageToken: pageTokenParam,
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'topics', 'list', courseId];
     if (max !== undefined) args.push(`--max=${max}`);
@@ -339,11 +339,11 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_topics_get', {
     description: 'Get a single topic by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       courseId: z.string().describe('Course ID'),
       topicId: z.string().describe('Topic ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ courseId, topicId, account }) => {
     return runOrDiagnose(['classroom', 'topics', 'get', courseId, topicId], { account });
   });
@@ -351,7 +351,7 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_invitations_list', {
     description: 'List Google Classroom invitations.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       course: z.string().optional().describe('Filter by course ID'),
       user: z.string().optional().describe('Filter by user ID'),
       max: z.number().optional().describe('Max results per page'),
@@ -359,7 +359,7 @@ export function registerClassroomTools(server: McpServer): void {
       page: pageAliasParam,
       all: z.boolean().optional().describe('Fetch all pages'),
       account: accountParam,
-    },
+    }),
   }, async ({ course, user, max, pageToken, page, all, account }) => {
     const args = ['classroom', 'invitations', 'list'];
     if (course) args.push(`--course=${course}`);
@@ -374,20 +374,20 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_invitations_get', {
     description: 'Get a single invitation by ID.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       invitationId: z.string().describe('Invitation ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ invitationId, account }) => {
     return runOrDiagnose(['classroom', 'invitations', 'get', invitationId], { account });
   });
 
   server.registerTool('gog_classroom_invitations_accept', {
     description: 'Accept a Google Classroom invitation.',
-    inputSchema: {
+    inputSchema: z.object({
       invitationId: z.string().describe('Invitation ID'),
       account: accountParam,
-    },
+    }),
   }, async ({ invitationId, account }) => {
     return runOrDiagnose(['classroom', 'invitations', 'accept', invitationId], { account });
   });
@@ -395,10 +395,10 @@ export function registerClassroomTools(server: McpServer): void {
   server.registerTool('gog_classroom_profile_get', {
     description: 'Get a Google Classroom user profile. Omit userId to fetch the authenticated user.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       userId: z.string().optional().describe('User ID (omit for self)'),
       account: accountParam,
-    },
+    }),
   }, async ({ userId, account }) => {
     const args = ['classroom', 'profile', 'get'];
     if (userId) args.push(userId);

package/src/tools/contacts.ts

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { accountParam, runOrDiagnose, registerRunTool } from './utils.js';
 
@@ -6,10 +6,10 @@ export function registerContactsTools(server: McpServer): void {
   server.registerTool('gog_contacts_search', {
     description: 'Search personal Google Contacts by name, email, or phone. For searching the Workspace directory (internal users not in your personal contacts), use gog_people_search from gogcli-mcp-contacts.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       query: z.string().describe('Search query (name, email, or phone)'),
       account: accountParam,
-    },
+    }),
   }, async ({ query, account }) => {
     return runOrDiagnose(['contacts', 'search', query], { account });
   });
@@ -17,9 +17,9 @@ export function registerContactsTools(server: McpServer): void {
   server.registerTool('gog_contacts_list', {
     description: 'List all Google Contacts.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       account: accountParam,
-    },
+    }),
   }, async ({ account }) => {
     return runOrDiagnose(['contacts', 'list'], { account });
   });
@@ -27,10 +27,10 @@ export function registerContactsTools(server: McpServer): void {
   server.registerTool('gog_contacts_get', {
     description: 'Get a contact by resource name.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       resourceName: z.string().describe('Contact resource name (e.g. people/c12345)'),
       account: accountParam,
-    },
+    }),
   }, async ({ resourceName, account }) => {
     return runOrDiagnose(['contacts', 'get', resourceName], { account });
   });
@@ -38,7 +38,7 @@ export function registerContactsTools(server: McpServer): void {
   server.registerTool('gog_contacts_create', {
     description: 'Create a new Google Contact.',
     annotations: { destructiveHint: false },
-    inputSchema: {
+    inputSchema: z.object({
       givenName: z.string().describe('Given (first) name'),
       familyName: z.string().optional().describe('Family (last) name'),
       email: z.string().optional().describe('Email address'),
@@ -46,7 +46,7 @@ export function registerContactsTools(server: McpServer): void {
       org: z.string().optional().describe('Organization/company name'),
       title: z.string().optional().describe('Job title'),
       account: accountParam,
-    },
+    }),
   }, async ({ givenName, familyName, email, phone, org, title, account }) => {
     const args = ['contacts', 'create', `--given=${givenName}`];
     if (familyName) args.push(`--family=${familyName}`);

package/src/tools/docs.ts

@@ -1,4 +1,4 @@
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpServer } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { accountParam, runOrDiagnose, registerRunTool } from './utils.js';
 
@@ -6,10 +6,10 @@ export function registerDocsTools(server: McpServer): void {
   server.registerTool('gog_docs_info', {
     description: 'Get Google Doc metadata: title, ID, and other properties.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       docId: z.string().describe('Doc ID (from the URL)'),
       account: accountParam,
-    },
+    }),
   }, async ({ docId, account }) => {
     return runOrDiagnose(['docs', 'info', docId], { account });
   });
@@ -17,11 +17,11 @@ export function registerDocsTools(server: McpServer): void {
   server.registerTool('gog_docs_cat', {
     description: 'Read a Google Doc as plain text.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       docId: z.string().describe('Doc ID (from the URL)'),
       chips: z.boolean().optional().describe('Render Google Docs smart chips (people, dates, rich links) inline in the text output'),
       account: accountParam,
-    },
+    }),
   }, async ({ docId, chips, account }) => {
     const args = ['docs', 'cat', docId];
     if (chips) args.push('--chips');
@@ -30,10 +30,10 @@ export function registerDocsTools(server: McpServer): void {
 
   server.registerTool('gog_docs_create', {
     description: 'Create a new Google Doc. Returns JSON with the new docId and URL.',
-    inputSchema: {
+    inputSchema: z.object({
       title: z.string().describe('Title for the new document'),
       account: accountParam,
-    },
+    }),
   }, async ({ title, account }) => {
     return runOrDiagnose(['docs', 'create', title], { account });
   });
@@ -41,7 +41,7 @@ export function registerDocsTools(server: McpServer): void {
   server.registerTool('gog_docs_write', {
     description: 'Write text content to a Google Doc, replacing existing body content by default. Set append=true to add after existing content.',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       docId: z.string().describe('Doc ID (from the URL)'),
       text: z.string().describe('Text content to write'),
       append: z.boolean().optional().describe('Append to existing content instead of replacing (default: false)'),
@@ -59,7 +59,7 @@ export function registerDocsTools(server: McpServer): void {
       keepWithNext: z.boolean().optional().describe('Keep the paragraph with the next paragraph (true) or clear that setting (false)'),
       batch: z.string().optional().describe('Append this mutation to a persisted batch (from gog_batch_begin in gogcli-mcp-docs) instead of applying it — nothing changes in the doc until the batch is submitted.'),
       account: accountParam,
-    },
+    }),
   }, async ({ docId, text, append, checkOrphans, bullets, bulletPreset, ordered, noBullets, indentStart, indentEnd, indentFirstLine, spaceAbove, spaceBelow, keepLinesTogether, keepWithNext, batch, account }) => {
     const args = ['docs', 'write', docId, `--text=${text}`];
     if (append) args.push('--append');
@@ -82,12 +82,12 @@ export function registerDocsTools(server: McpServer): void {
   server.registerTool('gog_docs_find_replace', {
     description: 'Find and replace text in a Google Doc.',
     annotations: { destructiveHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       docId: z.string().describe('Doc ID (from the URL)'),
       find: z.string().describe('Text to find'),
       replace: z.string().describe('Replacement text'),
       account: accountParam,
-    },
+    }),
   }, async ({ docId, find, replace, account }) => {
     return runOrDiagnose(['docs', 'find-replace', docId, find, replace], { account });
   });
@@ -95,10 +95,10 @@ export function registerDocsTools(server: McpServer): void {
   server.registerTool('gog_docs_structure', {
     description: 'Show a Google Doc\'s structure with numbered paragraphs. Useful for understanding the document layout before making index-based edits.',
     annotations: { readOnlyHint: true },
-    inputSchema: {
+    inputSchema: z.object({
       docId: z.string().describe('Doc ID (from the URL)'),
       account: accountParam,
-    },
+    }),
   }, async ({ docId, account }) => {
     return runOrDiagnose(['docs', 'structure', docId], { account });
   });