gogcli-mcp-classroom 2.0.4 → 2.0.7

package/.claude-plugin/marketplace.json

@@ -7,7 +7,7 @@
   },
   "metadata": {
     "description": "Extended Google Classroom for Claude via gogcli — auth + full Classroom support (courses, rosters, coursework, submissions, announcements, topics, invitations)",
-    "version": "2.0.4"
+    "version": "2.0.7"
   },
   "plugins": [
     {
@@ -15,7 +15,7 @@
       "displayName": "gogcli (Classroom)",
       "source": "./",
       "description": "Extended Google Classroom for Claude via gogcli — auth + full Classroom support (courses, rosters, coursework, submissions, announcements, topics, invitations)",
-      "version": "2.0.4",
+      "version": "2.0.7",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp-classroom",
   "displayName": "gogcli (Classroom)",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "Extended Google Classroom for Claude via gogcli — auth + full Classroom support (courses, rosters, coursework, submissions, announcements, topics, invitations)",
   "author": {
     "name": "Chris Hall",

package/dist/index.js

@@ -30864,6 +30864,11 @@ var EMPTY_COMPLETION_RESULT = {
 // ../gogcli-mcp/src/runner.ts
 import { spawn } from "node:child_process";
 var TIMEOUT_MS = 3e4;
+function envOrUndefined(key) {
+  const value = process.env[key];
+  if (!value || value.startsWith("${")) return void 0;
+  return value;
+}
 function formatTimeout(ms) {
   const seconds = Math.round(ms / 1e3);
   if (seconds >= 60) {
@@ -30874,7 +30879,7 @@ function formatTimeout(ms) {
 }
 async function run(args, options = {}) {
   const { account, spawner = spawn, interactive = false, timeout } = options;
-  const effectiveAccount = account ?? process.env.GOG_ACCOUNT;
+  const effectiveAccount = account ?? envOrUndefined("GOG_ACCOUNT");
   const fullArgs = ["--json", "--color=never"];
   if (!interactive) {
     fullArgs.push("--no-input");
@@ -30886,7 +30891,7 @@ async function run(args, options = {}) {
   const effectiveTimeout = timeout ?? TIMEOUT_MS;
   return new Promise((resolve, reject) => {
     const { GOG_ACCESS_TOKEN: _, ...cleanEnv } = process.env;
-    const child = spawner(process.env.GOG_PATH ?? "gog", fullArgs, { env: cleanEnv });
+    const child = spawner(envOrUndefined("GOG_PATH") ?? "gog", fullArgs, { env: cleanEnv });
     const stdoutChunks = [];
     const stderrChunks = [];
     let settled = false;
@@ -31061,83 +31066,6 @@ function registerClassroomTools(server2) {
   }, async ({ courseId, account }) => {
     return runOrDiagnose(["classroom", "courses", "get", courseId], { account });
   });
-  server2.registerTool("gog_classroom_courses_create", {
-    description: "Create a new Google Classroom course.",
-    inputSchema: {
-      name: external_exports.string().describe("Course name"),
-      owner: external_exports.string().optional().describe('Owner user ID (default: "me")'),
-      section: external_exports.string().optional().describe("Section"),
-      descriptionHeading: external_exports.string().optional().describe("Description heading"),
-      description: external_exports.string().optional().describe("Description"),
-      room: external_exports.string().optional().describe("Room"),
-      state: external_exports.string().optional().describe("Course state: ACTIVE, ARCHIVED, PROVISIONED, DECLINED, SUSPENDED"),
-      account: accountParam
-    }
-  }, async ({ name, owner, section, descriptionHeading, description, room, state, account }) => {
-    const args = ["classroom", "courses", "create", `--name=${name}`];
-    if (owner) args.push(`--owner=${owner}`);
-    if (section) args.push(`--section=${section}`);
-    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
-    if (description) args.push(`--description=${description}`);
-    if (room) args.push(`--room=${room}`);
-    if (state) args.push(`--state=${state}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_courses_update", {
-    description: "Update an existing Google Classroom course.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      name: external_exports.string().optional().describe("Course name"),
-      owner: external_exports.string().optional().describe("Owner user ID"),
-      section: external_exports.string().optional().describe("Section"),
-      descriptionHeading: external_exports.string().optional().describe("Description heading"),
-      description: external_exports.string().optional().describe("Description"),
-      room: external_exports.string().optional().describe("Room"),
-      state: external_exports.string().optional().describe("Course state: ACTIVE, ARCHIVED, PROVISIONED, DECLINED, SUSPENDED"),
-      account: accountParam
-    }
-  }, async ({ courseId, name, owner, section, descriptionHeading, description, room, state, account }) => {
-    const args = ["classroom", "courses", "update", courseId];
-    if (name) args.push(`--name=${name}`);
-    if (owner) args.push(`--owner=${owner}`);
-    if (section) args.push(`--section=${section}`);
-    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
-    if (description) args.push(`--description=${description}`);
-    if (room) args.push(`--room=${room}`);
-    if (state) args.push(`--state=${state}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_courses_delete", {
-    description: "Delete a Google Classroom course.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, account }) => {
-    return runOrDiagnose(["classroom", "courses", "delete", courseId], { account });
-  });
-  server2.registerTool("gog_classroom_courses_archive", {
-    description: "Archive a Google Classroom course.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, account }) => {
-    return runOrDiagnose(["classroom", "courses", "archive", courseId], { account });
-  });
-  server2.registerTool("gog_classroom_courses_unarchive", {
-    description: "Unarchive a Google Classroom course (restore to ACTIVE).",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, account }) => {
-    return runOrDiagnose(["classroom", "courses", "unarchive", courseId], { account });
-  });
   server2.registerTool("gog_classroom_students_list", {
     description: "List students enrolled in a Google Classroom course.",
     annotations: { readOnlyHint: true },
@@ -31166,30 +31094,6 @@ function registerClassroomTools(server2) {
   }, async ({ courseId, userId, account }) => {
     return runOrDiagnose(["classroom", "students", "get", courseId, userId], { account });
   });
-  server2.registerTool("gog_classroom_students_add", {
-    description: "Add a student to a Google Classroom course.",
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      userId: external_exports.string().describe('Student user ID (or "me")'),
-      enrollmentCode: external_exports.string().optional().describe("Enrollment code (required if adding self via code)"),
-      account: accountParam
-    }
-  }, async ({ courseId, userId, enrollmentCode, account }) => {
-    const args = ["classroom", "students", "add", courseId, userId];
-    if (enrollmentCode) args.push(`--enrollment-code=${enrollmentCode}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_students_remove", {
-    description: "Remove a student from a Google Classroom course.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      userId: external_exports.string().describe("Student user ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, userId, account }) => {
-    return runOrDiagnose(["classroom", "students", "remove", courseId, userId], { account });
-  });
   server2.registerTool("gog_classroom_teachers_list", {
     description: "List teachers in a Google Classroom course.",
     annotations: { readOnlyHint: true },
@@ -31218,27 +31122,6 @@ function registerClassroomTools(server2) {
   }, async ({ courseId, userId, account }) => {
     return runOrDiagnose(["classroom", "teachers", "get", courseId, userId], { account });
   });
-  server2.registerTool("gog_classroom_teachers_add", {
-    description: "Add a teacher to a Google Classroom course.",
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      userId: external_exports.string().describe("Teacher user ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, userId, account }) => {
-    return runOrDiagnose(["classroom", "teachers", "add", courseId, userId], { account });
-  });
-  server2.registerTool("gog_classroom_teachers_remove", {
-    description: "Remove a teacher from a Google Classroom course.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      userId: external_exports.string().describe("Teacher user ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, userId, account }) => {
-    return runOrDiagnose(["classroom", "teachers", "remove", courseId, userId], { account });
-  });
   server2.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 },
@@ -31296,78 +31179,6 @@ function registerClassroomTools(server2) {
   }, async ({ courseId, courseworkId, account }) => {
     return runOrDiagnose(["classroom", "coursework", "get", courseId, courseworkId], { account });
   });
-  server2.registerTool("gog_classroom_coursework_create", {
-    description: "Create a new coursework item (assignment, question, etc.) in a course.",
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      title: external_exports.string().describe("Coursework title"),
-      description: external_exports.string().optional().describe("Description"),
-      type: external_exports.string().optional().describe("Work type (ASSIGNMENT, SHORT_ANSWER_QUESTION, MULTIPLE_CHOICE_QUESTION). Default: ASSIGNMENT"),
-      state: external_exports.string().optional().describe("State: PUBLISHED or DRAFT"),
-      maxPoints: external_exports.number().optional().describe("Max points"),
-      due: external_exports.string().optional().describe("Due datetime (combined date+time)"),
-      dueDate: external_exports.string().optional().describe("Due date (YYYY-MM-DD)"),
-      dueTime: external_exports.string().optional().describe("Due time (HH:MM)"),
-      scheduled: external_exports.string().optional().describe("Scheduled publish time"),
-      topic: external_exports.string().optional().describe("Topic ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
-    const args = ["classroom", "coursework", "create", courseId, `--title=${title}`];
-    if (description) args.push(`--description=${description}`);
-    if (type) args.push(`--type=${type}`);
-    if (state) args.push(`--state=${state}`);
-    if (maxPoints !== void 0) args.push(`--max-points=${maxPoints}`);
-    if (due) args.push(`--due=${due}`);
-    if (dueDate) args.push(`--due-date=${dueDate}`);
-    if (dueTime) args.push(`--due-time=${dueTime}`);
-    if (scheduled) args.push(`--scheduled=${scheduled}`);
-    if (topic) args.push(`--topic=${topic}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_coursework_update", {
-    description: "Update an existing coursework item.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      courseworkId: external_exports.string().describe("Coursework ID"),
-      title: external_exports.string().optional().describe("New title"),
-      description: external_exports.string().optional().describe("New description"),
-      type: external_exports.string().optional().describe("Work type"),
-      state: external_exports.string().optional().describe("State: PUBLISHED or DRAFT"),
-      maxPoints: external_exports.number().optional().describe("Max points"),
-      due: external_exports.string().optional().describe("Due datetime"),
-      dueDate: external_exports.string().optional().describe("Due date (YYYY-MM-DD)"),
-      dueTime: external_exports.string().optional().describe("Due time (HH:MM)"),
-      scheduled: external_exports.string().optional().describe("Scheduled publish time"),
-      topic: external_exports.string().optional().describe("Topic ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, courseworkId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
-    const args = ["classroom", "coursework", "update", courseId, courseworkId];
-    if (title) args.push(`--title=${title}`);
-    if (description) args.push(`--description=${description}`);
-    if (type) args.push(`--type=${type}`);
-    if (state) args.push(`--state=${state}`);
-    if (maxPoints !== void 0) args.push(`--max-points=${maxPoints}`);
-    if (due) args.push(`--due=${due}`);
-    if (dueDate) args.push(`--due-date=${dueDate}`);
-    if (dueTime) args.push(`--due-time=${dueTime}`);
-    if (scheduled) args.push(`--scheduled=${scheduled}`);
-    if (topic) args.push(`--topic=${topic}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_coursework_delete", {
-    description: "Delete a coursework item.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      courseworkId: external_exports.string().describe("Coursework ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, courseworkId, account }) => {
-    return runOrDiagnose(["classroom", "coursework", "delete", courseId, courseworkId], { account });
-  });
   server2.registerTool("gog_classroom_submissions_list", {
     description: "List student submissions for a coursework item.",
     annotations: { readOnlyHint: true },
@@ -31494,7 +31305,7 @@ function registerClassroomTools(server2) {
     inputSchema: {
       courseId: external_exports.string().describe("Course ID"),
       text: external_exports.string().describe("Announcement text"),
-      state: external_exports.string().optional().describe("State: PUBLISHED or DRAFT"),
+      state: external_exports.enum(["PUBLISHED", "DRAFT"]).optional().describe("State"),
       scheduled: external_exports.string().optional().describe("Scheduled publish time"),
       account: accountParam
     }
@@ -31504,35 +31315,6 @@ function registerClassroomTools(server2) {
     if (scheduled) args.push(`--scheduled=${scheduled}`);
     return runOrDiagnose(args, { account });
   });
-  server2.registerTool("gog_classroom_announcements_update", {
-    description: "Update an existing announcement.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      announcementId: external_exports.string().describe("Announcement ID"),
-      text: external_exports.string().optional().describe("New text"),
-      state: external_exports.string().optional().describe("State: PUBLISHED or DRAFT"),
-      scheduled: external_exports.string().optional().describe("Scheduled publish time"),
-      account: accountParam
-    }
-  }, async ({ courseId, announcementId, text, state, scheduled, account }) => {
-    const args = ["classroom", "announcements", "update", courseId, announcementId];
-    if (text) args.push(`--text=${text}`);
-    if (state) args.push(`--state=${state}`);
-    if (scheduled) args.push(`--scheduled=${scheduled}`);
-    return runOrDiagnose(args, { account });
-  });
-  server2.registerTool("gog_classroom_announcements_delete", {
-    description: "Delete an announcement.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      announcementId: external_exports.string().describe("Announcement ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, announcementId, account }) => {
-    return runOrDiagnose(["classroom", "announcements", "delete", courseId, announcementId], { account });
-  });
   server2.registerTool("gog_classroom_topics_list", {
     description: "List topics in a Google Classroom course.",
     annotations: { readOnlyHint: true },
@@ -31561,39 +31343,6 @@ function registerClassroomTools(server2) {
   }, async ({ courseId, topicId, account }) => {
     return runOrDiagnose(["classroom", "topics", "get", courseId, topicId], { account });
   });
-  server2.registerTool("gog_classroom_topics_create", {
-    description: "Create a topic in a Google Classroom course.",
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      name: external_exports.string().describe("Topic name"),
-      account: accountParam
-    }
-  }, async ({ courseId, name, account }) => {
-    return runOrDiagnose(["classroom", "topics", "create", courseId, `--name=${name}`], { account });
-  });
-  server2.registerTool("gog_classroom_topics_update", {
-    description: "Rename an existing topic.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      topicId: external_exports.string().describe("Topic ID"),
-      name: external_exports.string().describe("New topic name"),
-      account: accountParam
-    }
-  }, async ({ courseId, topicId, name, account }) => {
-    return runOrDiagnose(["classroom", "topics", "update", courseId, topicId, `--name=${name}`], { account });
-  });
-  server2.registerTool("gog_classroom_topics_delete", {
-    description: "Delete a topic.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      topicId: external_exports.string().describe("Topic ID"),
-      account: accountParam
-    }
-  }, async ({ courseId, topicId, account }) => {
-    return runOrDiagnose(["classroom", "topics", "delete", courseId, topicId], { account });
-  });
   server2.registerTool("gog_classroom_invitations_list", {
     description: "List Google Classroom invitations.",
     annotations: { readOnlyHint: true },
@@ -31624,17 +31373,6 @@ function registerClassroomTools(server2) {
   }, async ({ invitationId, account }) => {
     return runOrDiagnose(["classroom", "invitations", "get", invitationId], { account });
   });
-  server2.registerTool("gog_classroom_invitations_create", {
-    description: "Create an invitation to a Google Classroom course.",
-    inputSchema: {
-      courseId: external_exports.string().describe("Course ID"),
-      userId: external_exports.string().describe("User ID to invite"),
-      role: external_exports.enum(["STUDENT", "TEACHER", "OWNER"]).describe("Role for the invited user"),
-      account: accountParam
-    }
-  }, async ({ courseId, userId, role, account }) => {
-    return runOrDiagnose(["classroom", "invitations", "create", courseId, userId, `--role=${role}`], { account });
-  });
   server2.registerTool("gog_classroom_invitations_accept", {
     description: "Accept a Google Classroom invitation.",
     inputSchema: {
@@ -31644,16 +31382,6 @@ function registerClassroomTools(server2) {
   }, async ({ invitationId, account }) => {
     return runOrDiagnose(["classroom", "invitations", "accept", invitationId], { account });
   });
-  server2.registerTool("gog_classroom_invitations_delete", {
-    description: "Delete (revoke) a Google Classroom invitation.",
-    annotations: { destructiveHint: true },
-    inputSchema: {
-      invitationId: external_exports.string().describe("Invitation ID"),
-      account: accountParam
-    }
-  }, async ({ invitationId, account }) => {
-    return runOrDiagnose(["classroom", "invitations", "delete", invitationId], { account });
-  });
   server2.registerTool("gog_classroom_profile_get", {
     description: "Get a Google Classroom user profile. Omit userId to fetch the authenticated user.",
     annotations: { readOnlyHint: true },
@@ -31668,6 +31396,7 @@ function registerClassroomTools(server2) {
   });
   server2.registerTool("gog_classroom_run", {
     description: "Run any gog classroom subcommand not covered by the other tools (guardians, guardian-invitations, materials, coursework assignees, announcement assignees, etc.). Run `gog classroom --help` for the full list, or `gog classroom <subcommand> --help` for flags.",
+    annotations: { destructiveHint: true },
     inputSchema: {
       subcommand: external_exports.string().describe('The gog classroom subcommand to run, e.g. "guardians", "materials", "guardian-invitations"'),
       args: external_exports.array(external_exports.string()).describe("Additional positional args and flags"),
@@ -31679,7 +31408,7 @@ function registerClassroomTools(server2) {
 }
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "2.0.4" : "0.0.0";
+var VERSION = true ? "2.0.7" : "0.0.0";
 function createServer(options) {
   return new McpServer({
     name: options?.name ?? "gogcli",
@@ -31688,7 +31417,279 @@ function createServer(options) {
 }
 
 // src/tools/classroom-extra.ts
-function registerExtraClassroomTools(_server) {
+var courseState = external_exports.enum(["ACTIVE", "ARCHIVED", "PROVISIONED", "DECLINED", "SUSPENDED"]);
+var workState = external_exports.enum(["PUBLISHED", "DRAFT"]);
+var workType = external_exports.enum(["ASSIGNMENT", "SHORT_ANSWER_QUESTION", "MULTIPLE_CHOICE_QUESTION"]);
+var courseSharedFields = {
+  owner: external_exports.string().optional().describe('Owner user ID (default "me" on create)'),
+  section: external_exports.string().optional().describe("Section"),
+  descriptionHeading: external_exports.string().optional().describe("Description heading"),
+  description: external_exports.string().optional().describe("Description"),
+  room: external_exports.string().optional().describe("Room"),
+  state: courseState.optional().describe("Course state")
+};
+var courseworkSharedFields = {
+  description: external_exports.string().optional().describe("Description"),
+  type: workType.optional().describe("Work type (default: ASSIGNMENT)"),
+  state: workState.optional().describe("State"),
+  maxPoints: external_exports.number().optional().describe("Max points"),
+  due: external_exports.string().optional().describe("Due datetime (combined date+time)"),
+  dueDate: external_exports.string().optional().describe("Due date (YYYY-MM-DD)"),
+  dueTime: external_exports.string().optional().describe("Due time (HH:MM)"),
+  scheduled: external_exports.string().optional().describe("Scheduled publish time"),
+  topic: external_exports.string().optional().describe("Topic ID")
+};
+function registerExtraClassroomTools(server2) {
+  server2.registerTool("gog_classroom_courses_create", {
+    description: "Create a new Google Classroom course.",
+    inputSchema: {
+      name: external_exports.string().describe("Course name"),
+      ...courseSharedFields,
+      account: accountParam
+    }
+  }, async ({ name, owner, section, descriptionHeading, description, room, state, account }) => {
+    const args = ["classroom", "courses", "create", `--name=${name}`];
+    if (owner) args.push(`--owner=${owner}`);
+    if (section) args.push(`--section=${section}`);
+    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
+    if (description) args.push(`--description=${description}`);
+    if (room) args.push(`--room=${room}`);
+    if (state) args.push(`--state=${state}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_courses_update", {
+    description: "Update an existing Google Classroom course.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      name: external_exports.string().optional().describe("Course name"),
+      ...courseSharedFields,
+      account: accountParam
+    }
+  }, async ({ courseId, name, owner, section, descriptionHeading, description, room, state, account }) => {
+    const args = ["classroom", "courses", "update", courseId];
+    if (name) args.push(`--name=${name}`);
+    if (owner) args.push(`--owner=${owner}`);
+    if (section) args.push(`--section=${section}`);
+    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
+    if (description) args.push(`--description=${description}`);
+    if (room) args.push(`--room=${room}`);
+    if (state) args.push(`--state=${state}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_courses_delete", {
+    description: "Delete a Google Classroom course.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(["classroom", "courses", "delete", courseId], { account });
+  });
+  server2.registerTool("gog_classroom_courses_archive", {
+    description: "Archive a Google Classroom course.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(["classroom", "courses", "archive", courseId], { account });
+  });
+  server2.registerTool("gog_classroom_courses_unarchive", {
+    description: "Unarchive a Google Classroom course (restore to ACTIVE).",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(["classroom", "courses", "unarchive", courseId], { account });
+  });
+  server2.registerTool("gog_classroom_students_add", {
+    description: "Add a student to a Google Classroom course.",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      userId: external_exports.string().describe('Student user ID (or "me")'),
+      enrollmentCode: external_exports.string().optional().describe("Enrollment code (required if adding self via code)"),
+      account: accountParam
+    }
+  }, async ({ courseId, userId, enrollmentCode, account }) => {
+    const args = ["classroom", "students", "add", courseId, userId];
+    if (enrollmentCode) args.push(`--enrollment-code=${enrollmentCode}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_students_remove", {
+    description: "Remove a student from a Google Classroom course.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      userId: external_exports.string().describe("Student user ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(["classroom", "students", "remove", courseId, userId], { account });
+  });
+  server2.registerTool("gog_classroom_teachers_add", {
+    description: "Add a teacher to a Google Classroom course.",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      userId: external_exports.string().describe("Teacher user ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(["classroom", "teachers", "add", courseId, userId], { account });
+  });
+  server2.registerTool("gog_classroom_teachers_remove", {
+    description: "Remove a teacher from a Google Classroom course.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      userId: external_exports.string().describe("Teacher user ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(["classroom", "teachers", "remove", courseId, userId], { account });
+  });
+  server2.registerTool("gog_classroom_coursework_create", {
+    description: "Create a new coursework item (assignment, question, etc.) in a course.",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      title: external_exports.string().describe("Coursework title"),
+      ...courseworkSharedFields,
+      account: accountParam
+    }
+  }, async ({ courseId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
+    const args = ["classroom", "coursework", "create", courseId, `--title=${title}`];
+    if (description) args.push(`--description=${description}`);
+    if (type) args.push(`--type=${type}`);
+    if (state) args.push(`--state=${state}`);
+    if (maxPoints !== void 0) args.push(`--max-points=${maxPoints}`);
+    if (due) args.push(`--due=${due}`);
+    if (dueDate) args.push(`--due-date=${dueDate}`);
+    if (dueTime) args.push(`--due-time=${dueTime}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    if (topic) args.push(`--topic=${topic}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_coursework_update", {
+    description: "Update an existing coursework item.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      courseworkId: external_exports.string().describe("Coursework ID"),
+      title: external_exports.string().optional().describe("New title"),
+      ...courseworkSharedFields,
+      account: accountParam
+    }
+  }, async ({ courseId, courseworkId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
+    const args = ["classroom", "coursework", "update", courseId, courseworkId];
+    if (title) args.push(`--title=${title}`);
+    if (description) args.push(`--description=${description}`);
+    if (type) args.push(`--type=${type}`);
+    if (state) args.push(`--state=${state}`);
+    if (maxPoints !== void 0) args.push(`--max-points=${maxPoints}`);
+    if (due) args.push(`--due=${due}`);
+    if (dueDate) args.push(`--due-date=${dueDate}`);
+    if (dueTime) args.push(`--due-time=${dueTime}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    if (topic) args.push(`--topic=${topic}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_coursework_delete", {
+    description: "Delete a coursework item.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      courseworkId: external_exports.string().describe("Coursework ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, courseworkId, account }) => {
+    return runOrDiagnose(["classroom", "coursework", "delete", courseId, courseworkId], { account });
+  });
+  server2.registerTool("gog_classroom_announcements_update", {
+    description: "Update an existing announcement.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      announcementId: external_exports.string().describe("Announcement ID"),
+      text: external_exports.string().optional().describe("New text"),
+      state: workState.optional().describe("State"),
+      scheduled: external_exports.string().optional().describe("Scheduled publish time"),
+      account: accountParam
+    }
+  }, async ({ courseId, announcementId, text, state, scheduled, account }) => {
+    const args = ["classroom", "announcements", "update", courseId, announcementId];
+    if (text) args.push(`--text=${text}`);
+    if (state) args.push(`--state=${state}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    return runOrDiagnose(args, { account });
+  });
+  server2.registerTool("gog_classroom_announcements_delete", {
+    description: "Delete an announcement.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      announcementId: external_exports.string().describe("Announcement ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, announcementId, account }) => {
+    return runOrDiagnose(["classroom", "announcements", "delete", courseId, announcementId], { account });
+  });
+  server2.registerTool("gog_classroom_topics_create", {
+    description: "Create a topic in a Google Classroom course.",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      name: external_exports.string().describe("Topic name"),
+      account: accountParam
+    }
+  }, async ({ courseId, name, account }) => {
+    return runOrDiagnose(["classroom", "topics", "create", courseId, `--name=${name}`], { account });
+  });
+  server2.registerTool("gog_classroom_topics_update", {
+    description: "Rename an existing topic.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      topicId: external_exports.string().describe("Topic ID"),
+      name: external_exports.string().describe("New topic name"),
+      account: accountParam
+    }
+  }, async ({ courseId, topicId, name, account }) => {
+    return runOrDiagnose(["classroom", "topics", "update", courseId, topicId, `--name=${name}`], { account });
+  });
+  server2.registerTool("gog_classroom_topics_delete", {
+    description: "Delete a topic.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      topicId: external_exports.string().describe("Topic ID"),
+      account: accountParam
+    }
+  }, async ({ courseId, topicId, account }) => {
+    return runOrDiagnose(["classroom", "topics", "delete", courseId, topicId], { account });
+  });
+  server2.registerTool("gog_classroom_invitations_create", {
+    description: "Create an invitation to a Google Classroom course.",
+    inputSchema: {
+      courseId: external_exports.string().describe("Course ID"),
+      userId: external_exports.string().describe("User ID to invite"),
+      role: external_exports.enum(["STUDENT", "TEACHER", "OWNER"]).describe("Role for the invited user"),
+      account: accountParam
+    }
+  }, async ({ courseId, userId, role, account }) => {
+    return runOrDiagnose(["classroom", "invitations", "create", courseId, userId, `--role=${role}`], { account });
+  });
+  server2.registerTool("gog_classroom_invitations_delete", {
+    description: "Delete (revoke) a Google Classroom invitation.",
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      invitationId: external_exports.string().describe("Invitation ID"),
+      account: accountParam
+    }
+  }, async ({ invitationId, account }) => {
+    return runOrDiagnose(["classroom", "invitations", "delete", invitationId], { account });
+  });
 }
 
 // src/index.ts

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-classroom",
   "display_name": "gogcli (Classroom)",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "description": "Extended Google Classroom for Claude via gogcli — auth + full Classroom support (courses, rosters, coursework, submissions, announcements, topics, invitations)",
   "author": {
     "name": "Chris Hall",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gogcli-mcp-classroom",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "mcpName": "io.github.chrischall/gogcli-mcp-classroom",
   "description": "Extended Google Classroom MCP server via gogcli — auth + full Classroom support",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",

package/server.json

@@ -7,12 +7,12 @@
     "source": "github",
     "subfolder": "packages/gogcli-mcp-classroom"
   },
-  "version": "2.0.4",
+  "version": "2.0.7",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "gogcli-mcp-classroom",
-      "version": "2.0.4",
+      "version": "2.0.7",
       "transport": {
         "type": "stdio"
       },

package/src/tools/classroom-extra.ts

@@ -1,5 +1,303 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
+import { accountParam, runOrDiagnose } from '../../../gogcli-mcp/src/lib.js';
 
-export function registerExtraClassroomTools(_server: McpServer): void {
-  /* no extras yet */
+const courseState = z.enum(['ACTIVE', 'ARCHIVED', 'PROVISIONED', 'DECLINED', 'SUSPENDED']);
+const workState = z.enum(['PUBLISHED', 'DRAFT']);
+const workType = z.enum(['ASSIGNMENT', 'SHORT_ANSWER_QUESTION', 'MULTIPLE_CHOICE_QUESTION']);
+
+// Fields shared by courses_create and courses_update. `name` is required on
+// create, optional on update — keep it out of this fragment so each tool can
+// declare its own rule.
+const courseSharedFields = {
+  owner: z.string().optional().describe('Owner user ID (default "me" on create)'),
+  section: z.string().optional().describe('Section'),
+  descriptionHeading: z.string().optional().describe('Description heading'),
+  description: z.string().optional().describe('Description'),
+  room: z.string().optional().describe('Room'),
+  state: courseState.optional().describe('Course state'),
+};
+
+// Fields shared by coursework_create and coursework_update.
+const courseworkSharedFields = {
+  description: z.string().optional().describe('Description'),
+  type: workType.optional().describe('Work type (default: ASSIGNMENT)'),
+  state: workState.optional().describe('State'),
+  maxPoints: z.number().optional().describe('Max points'),
+  due: z.string().optional().describe('Due datetime (combined date+time)'),
+  dueDate: z.string().optional().describe('Due date (YYYY-MM-DD)'),
+  dueTime: z.string().optional().describe('Due time (HH:MM)'),
+  scheduled: z.string().optional().describe('Scheduled publish time'),
+  topic: z.string().optional().describe('Topic ID'),
+};
+
+export function registerExtraClassroomTools(server: McpServer): void {
+  server.registerTool('gog_classroom_courses_create', {
+    description: 'Create a new Google Classroom course.',
+    inputSchema: {
+      name: z.string().describe('Course name'),
+      ...courseSharedFields,
+      account: accountParam,
+    },
+  }, async ({ name, owner, section, descriptionHeading, description, room, state, account }) => {
+    const args = ['classroom', 'courses', 'create', `--name=${name}`];
+    if (owner) args.push(`--owner=${owner}`);
+    if (section) args.push(`--section=${section}`);
+    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
+    if (description) args.push(`--description=${description}`);
+    if (room) args.push(`--room=${room}`);
+    if (state) args.push(`--state=${state}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_courses_update', {
+    description: 'Update an existing Google Classroom course.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      name: z.string().optional().describe('Course name'),
+      ...courseSharedFields,
+      account: accountParam,
+    },
+  }, async ({ courseId, name, owner, section, descriptionHeading, description, room, state, account }) => {
+    const args = ['classroom', 'courses', 'update', courseId];
+    if (name) args.push(`--name=${name}`);
+    if (owner) args.push(`--owner=${owner}`);
+    if (section) args.push(`--section=${section}`);
+    if (descriptionHeading) args.push(`--description-heading=${descriptionHeading}`);
+    if (description) args.push(`--description=${description}`);
+    if (room) args.push(`--room=${room}`);
+    if (state) args.push(`--state=${state}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_courses_delete', {
+    description: 'Delete a Google Classroom course.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(['classroom', 'courses', 'delete', courseId], { account });
+  });
+
+  server.registerTool('gog_classroom_courses_archive', {
+    description: 'Archive a Google Classroom course.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(['classroom', 'courses', 'archive', courseId], { account });
+  });
+
+  server.registerTool('gog_classroom_courses_unarchive', {
+    description: 'Unarchive a Google Classroom course (restore to ACTIVE).',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, account }) => {
+    return runOrDiagnose(['classroom', 'courses', 'unarchive', courseId], { account });
+  });
+
+  server.registerTool('gog_classroom_students_add', {
+    description: 'Add a student to a Google Classroom course.',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      userId: z.string().describe('Student user ID (or "me")'),
+      enrollmentCode: z.string().optional().describe('Enrollment code (required if adding self via code)'),
+      account: accountParam,
+    },
+  }, async ({ courseId, userId, enrollmentCode, account }) => {
+    const args = ['classroom', 'students', 'add', courseId, userId];
+    if (enrollmentCode) args.push(`--enrollment-code=${enrollmentCode}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_students_remove', {
+    description: 'Remove a student from a Google Classroom course.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      userId: z.string().describe('Student user ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(['classroom', 'students', 'remove', courseId, userId], { account });
+  });
+
+  server.registerTool('gog_classroom_teachers_add', {
+    description: 'Add a teacher to a Google Classroom course.',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      userId: z.string().describe('Teacher user ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(['classroom', 'teachers', 'add', courseId, userId], { account });
+  });
+
+  server.registerTool('gog_classroom_teachers_remove', {
+    description: 'Remove a teacher from a Google Classroom course.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      userId: z.string().describe('Teacher user ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, userId, account }) => {
+    return runOrDiagnose(['classroom', 'teachers', 'remove', courseId, userId], { account });
+  });
+
+  server.registerTool('gog_classroom_coursework_create', {
+    description: 'Create a new coursework item (assignment, question, etc.) in a course.',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      title: z.string().describe('Coursework title'),
+      ...courseworkSharedFields,
+      account: accountParam,
+    },
+  }, async ({ courseId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
+    const args = ['classroom', 'coursework', 'create', courseId, `--title=${title}`];
+    if (description) args.push(`--description=${description}`);
+    if (type) args.push(`--type=${type}`);
+    if (state) args.push(`--state=${state}`);
+    if (maxPoints !== undefined) args.push(`--max-points=${maxPoints}`);
+    if (due) args.push(`--due=${due}`);
+    if (dueDate) args.push(`--due-date=${dueDate}`);
+    if (dueTime) args.push(`--due-time=${dueTime}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    if (topic) args.push(`--topic=${topic}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_coursework_update', {
+    description: 'Update an existing coursework item.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      courseworkId: z.string().describe('Coursework ID'),
+      title: z.string().optional().describe('New title'),
+      ...courseworkSharedFields,
+      account: accountParam,
+    },
+  }, async ({ courseId, courseworkId, title, description, type, state, maxPoints, due, dueDate, dueTime, scheduled, topic, account }) => {
+    const args = ['classroom', 'coursework', 'update', courseId, courseworkId];
+    if (title) args.push(`--title=${title}`);
+    if (description) args.push(`--description=${description}`);
+    if (type) args.push(`--type=${type}`);
+    if (state) args.push(`--state=${state}`);
+    if (maxPoints !== undefined) args.push(`--max-points=${maxPoints}`);
+    if (due) args.push(`--due=${due}`);
+    if (dueDate) args.push(`--due-date=${dueDate}`);
+    if (dueTime) args.push(`--due-time=${dueTime}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    if (topic) args.push(`--topic=${topic}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_coursework_delete', {
+    description: 'Delete a coursework item.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      courseworkId: z.string().describe('Coursework ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, courseworkId, account }) => {
+    return runOrDiagnose(['classroom', 'coursework', 'delete', courseId, courseworkId], { account });
+  });
+
+  server.registerTool('gog_classroom_announcements_update', {
+    description: 'Update an existing announcement.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      announcementId: z.string().describe('Announcement ID'),
+      text: z.string().optional().describe('New text'),
+      state: workState.optional().describe('State'),
+      scheduled: z.string().optional().describe('Scheduled publish time'),
+      account: accountParam,
+    },
+  }, async ({ courseId, announcementId, text, state, scheduled, account }) => {
+    const args = ['classroom', 'announcements', 'update', courseId, announcementId];
+    if (text) args.push(`--text=${text}`);
+    if (state) args.push(`--state=${state}`);
+    if (scheduled) args.push(`--scheduled=${scheduled}`);
+    return runOrDiagnose(args, { account });
+  });
+
+  server.registerTool('gog_classroom_announcements_delete', {
+    description: 'Delete an announcement.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      announcementId: z.string().describe('Announcement ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, announcementId, account }) => {
+    return runOrDiagnose(['classroom', 'announcements', 'delete', courseId, announcementId], { account });
+  });
+
+  server.registerTool('gog_classroom_topics_create', {
+    description: 'Create a topic in a Google Classroom course.',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      name: z.string().describe('Topic name'),
+      account: accountParam,
+    },
+  }, async ({ courseId, name, account }) => {
+    return runOrDiagnose(['classroom', 'topics', 'create', courseId, `--name=${name}`], { account });
+  });
+
+  server.registerTool('gog_classroom_topics_update', {
+    description: 'Rename an existing topic.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      topicId: z.string().describe('Topic ID'),
+      name: z.string().describe('New topic name'),
+      account: accountParam,
+    },
+  }, async ({ courseId, topicId, name, account }) => {
+    return runOrDiagnose(['classroom', 'topics', 'update', courseId, topicId, `--name=${name}`], { account });
+  });
+
+  server.registerTool('gog_classroom_topics_delete', {
+    description: 'Delete a topic.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      topicId: z.string().describe('Topic ID'),
+      account: accountParam,
+    },
+  }, async ({ courseId, topicId, account }) => {
+    return runOrDiagnose(['classroom', 'topics', 'delete', courseId, topicId], { account });
+  });
+
+  server.registerTool('gog_classroom_invitations_create', {
+    description: 'Create an invitation to a Google Classroom course.',
+    inputSchema: {
+      courseId: z.string().describe('Course ID'),
+      userId: z.string().describe('User ID to invite'),
+      role: z.enum(['STUDENT', 'TEACHER', 'OWNER']).describe('Role for the invited user'),
+      account: accountParam,
+    },
+  }, async ({ courseId, userId, role, account }) => {
+    return runOrDiagnose(['classroom', 'invitations', 'create', courseId, userId, `--role=${role}`], { account });
+  });
+
+  server.registerTool('gog_classroom_invitations_delete', {
+    description: 'Delete (revoke) a Google Classroom invitation.',
+    annotations: { destructiveHint: true },
+    inputSchema: {
+      invitationId: z.string().describe('Invitation ID'),
+      account: accountParam,
+    },
+  }, async ({ invitationId, account }) => {
+    return runOrDiagnose(['classroom', 'invitations', 'delete', invitationId], { account });
+  });
 }

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

@@ -1,12 +1,264 @@
-import { describe, it, expect, vi } from 'vitest';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { registerExtraClassroomTools } from '../../src/tools/classroom-extra.js';
+import * as lib from '../../../gogcli-mcp/src/lib.js';
+import { setupExtrasHandlers, toText, type ToolHandler } from '../../../gogcli-mcp/tests/helpers/extras-harness.js';
 
-describe('registerExtraClassroomTools', () => {
-  it('registers no tools (no extras yet)', () => {
-    const server = new McpServer({ name: 'test', version: '0.0.0' });
-    const spy = vi.spyOn(server, 'registerTool');
-    registerExtraClassroomTools(server);
-    expect(spy).not.toHaveBeenCalled();
+vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof lib>();
+  return {
+    ...actual,
+    runOrDiagnose: vi.fn(),
+  };
+});
+
+let handlers: Map<string, ToolHandler>;
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  vi.mocked(lib.runOrDiagnose).mockResolvedValue(toText('{}'));
+  handlers = setupExtrasHandlers(registerExtraClassroomTools);
+});
+
+describe('gog_classroom_courses_create', () => {
+  it('calls runOrDiagnose with required name only', async () => {
+    await handlers.get('gog_classroom_courses_create')!({ name: 'Math 101' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'courses', 'create', '--name=Math 101'],
+      { account: undefined },
+    );
+  });
+
+  it('passes all optional flags', async () => {
+    await handlers.get('gog_classroom_courses_create')!({
+      name: 'Math 101',
+      owner: 'me',
+      section: 'Section A',
+      descriptionHeading: 'Welcome',
+      description: 'Algebra',
+      room: 'R101',
+      state: 'ACTIVE',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'courses', 'create', '--name=Math 101', '--owner=me', '--section=Section A', '--description-heading=Welcome', '--description=Algebra', '--room=R101', '--state=ACTIVE'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_courses_update', () => {
+  it('calls runOrDiagnose with courseId only', async () => {
+    await handlers.get('gog_classroom_courses_update')!({ courseId: 'c1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'courses', 'update', 'c1'], { account: undefined });
+  });
+
+  it('passes all optional flags', async () => {
+    await handlers.get('gog_classroom_courses_update')!({
+      courseId: 'c1',
+      name: 'New Name',
+      owner: 'me',
+      section: 'B',
+      descriptionHeading: 'Heading',
+      description: 'Desc',
+      room: 'R2',
+      state: 'ARCHIVED',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'courses', 'update', 'c1', '--name=New Name', '--owner=me', '--section=B', '--description-heading=Heading', '--description=Desc', '--room=R2', '--state=ARCHIVED'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_courses_delete', () => {
+  it('calls runOrDiagnose with courseId', async () => {
+    await handlers.get('gog_classroom_courses_delete')!({ courseId: 'c1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'courses', 'delete', 'c1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_courses_archive', () => {
+  it('calls runOrDiagnose with courseId', async () => {
+    await handlers.get('gog_classroom_courses_archive')!({ courseId: 'c1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'courses', 'archive', 'c1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_courses_unarchive', () => {
+  it('calls runOrDiagnose with courseId', async () => {
+    await handlers.get('gog_classroom_courses_unarchive')!({ courseId: 'c1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'courses', 'unarchive', 'c1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_students_add', () => {
+  it('calls runOrDiagnose with courseId and userId', async () => {
+    await handlers.get('gog_classroom_students_add')!({ courseId: 'c1', userId: 'u1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'students', 'add', 'c1', 'u1'], { account: undefined });
+  });
+
+  it('passes --enrollment-code when provided', async () => {
+    await handlers.get('gog_classroom_students_add')!({ courseId: 'c1', userId: 'u1', enrollmentCode: 'abc123' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'students', 'add', 'c1', 'u1', '--enrollment-code=abc123'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_students_remove', () => {
+  it('calls runOrDiagnose with courseId and userId', async () => {
+    await handlers.get('gog_classroom_students_remove')!({ courseId: 'c1', userId: 'u1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'students', 'remove', 'c1', 'u1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_teachers_add', () => {
+  it('calls runOrDiagnose with courseId and userId', async () => {
+    await handlers.get('gog_classroom_teachers_add')!({ courseId: 'c1', userId: 'u1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'teachers', 'add', 'c1', 'u1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_teachers_remove', () => {
+  it('calls runOrDiagnose with courseId and userId', async () => {
+    await handlers.get('gog_classroom_teachers_remove')!({ courseId: 'c1', userId: 'u1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'teachers', 'remove', 'c1', 'u1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_coursework_create', () => {
+  it('calls runOrDiagnose with required title only', async () => {
+    await handlers.get('gog_classroom_coursework_create')!({ courseId: 'c1', title: 'HW1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'coursework', 'create', 'c1', '--title=HW1'],
+      { account: undefined },
+    );
+  });
+
+  it('passes all optional flags', async () => {
+    await handlers.get('gog_classroom_coursework_create')!({
+      courseId: 'c1',
+      title: 'HW1',
+      description: 'Chapter 1',
+      type: 'ASSIGNMENT',
+      state: 'PUBLISHED',
+      maxPoints: 100,
+      due: '2026-05-01T23:59',
+      dueDate: '2026-05-01',
+      dueTime: '23:59',
+      scheduled: '2026-04-30T12:00',
+      topic: 't1',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'coursework', 'create', 'c1', '--title=HW1', '--description=Chapter 1', '--type=ASSIGNMENT', '--state=PUBLISHED', '--max-points=100', '--due=2026-05-01T23:59', '--due-date=2026-05-01', '--due-time=23:59', '--scheduled=2026-04-30T12:00', '--topic=t1'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_coursework_update', () => {
+  it('calls runOrDiagnose with ids only', async () => {
+    await handlers.get('gog_classroom_coursework_update')!({ courseId: 'c1', courseworkId: 'w1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'coursework', 'update', 'c1', 'w1'], { account: undefined });
+  });
+
+  it('passes all optional flags', async () => {
+    await handlers.get('gog_classroom_coursework_update')!({
+      courseId: 'c1',
+      courseworkId: 'w1',
+      title: 'New Title',
+      description: 'Desc',
+      type: 'SHORT_ANSWER_QUESTION',
+      state: 'DRAFT',
+      maxPoints: 50,
+      due: '2026-05-01T23:59',
+      dueDate: '2026-05-01',
+      dueTime: '23:59',
+      scheduled: '2026-04-30T12:00',
+      topic: 't1',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'coursework', 'update', 'c1', 'w1', '--title=New Title', '--description=Desc', '--type=SHORT_ANSWER_QUESTION', '--state=DRAFT', '--max-points=50', '--due=2026-05-01T23:59', '--due-date=2026-05-01', '--due-time=23:59', '--scheduled=2026-04-30T12:00', '--topic=t1'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_coursework_delete', () => {
+  it('calls runOrDiagnose with ids', async () => {
+    await handlers.get('gog_classroom_coursework_delete')!({ courseId: 'c1', courseworkId: 'w1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'coursework', 'delete', 'c1', 'w1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_announcements_update', () => {
+  it('calls runOrDiagnose with ids only', async () => {
+    await handlers.get('gog_classroom_announcements_update')!({ courseId: 'c1', announcementId: 'a1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'announcements', 'update', 'c1', 'a1'], { account: undefined });
+  });
+
+  it('passes all optional flags', async () => {
+    await handlers.get('gog_classroom_announcements_update')!({
+      courseId: 'c1',
+      announcementId: 'a1',
+      text: 'edited',
+      state: 'PUBLISHED',
+      scheduled: '2026-05-01T12:00',
+    });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'announcements', 'update', 'c1', 'a1', '--text=edited', '--state=PUBLISHED', '--scheduled=2026-05-01T12:00'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_announcements_delete', () => {
+  it('calls runOrDiagnose with ids', async () => {
+    await handlers.get('gog_classroom_announcements_delete')!({ courseId: 'c1', announcementId: 'a1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'announcements', 'delete', 'c1', 'a1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_topics_create', () => {
+  it('calls runOrDiagnose with courseId and name', async () => {
+    await handlers.get('gog_classroom_topics_create')!({ courseId: 'c1', name: 'Week 1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'topics', 'create', 'c1', '--name=Week 1'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_topics_update', () => {
+  it('calls runOrDiagnose with ids and name', async () => {
+    await handlers.get('gog_classroom_topics_update')!({ courseId: 'c1', topicId: 't1', name: 'Week 2' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'topics', 'update', 'c1', 't1', '--name=Week 2'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_topics_delete', () => {
+  it('calls runOrDiagnose with ids', async () => {
+    await handlers.get('gog_classroom_topics_delete')!({ courseId: 'c1', topicId: 't1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'topics', 'delete', 'c1', 't1'], { account: undefined });
+  });
+});
+
+describe('gog_classroom_invitations_create', () => {
+  it('calls runOrDiagnose with courseId, userId, role', async () => {
+    await handlers.get('gog_classroom_invitations_create')!({ courseId: 'c1', userId: 'u1', role: 'STUDENT' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(
+      ['classroom', 'invitations', 'create', 'c1', 'u1', '--role=STUDENT'],
+      { account: undefined },
+    );
+  });
+});
+
+describe('gog_classroom_invitations_delete', () => {
+  it('calls runOrDiagnose with invitationId', async () => {
+    await handlers.get('gog_classroom_invitations_delete')!({ invitationId: 'i1' });
+    expect(lib.runOrDiagnose).toHaveBeenCalledWith(['classroom', 'invitations', 'delete', 'i1'], { account: undefined });
   });
 });