gogcli-mcp-classroom 4.4.0 → 4.5.0

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": "4.4.0"
+    "version": "4.5.0"
   },
   "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": "4.4.0",
+      "version": "4.5.0",
       "author": {
         "name": "Chris Hall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "gogcli-mcp-classroom",
   "displayName": "gogcli (Classroom)",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "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

@@ -34533,10 +34533,8 @@ function errorResult(message) {
 
 // ../../node_modules/@chrischall/mcp-utils/dist/server/confirmation.js
 import { createHash, createHmac, timingSafeEqual } from "node:crypto";
-var DEFAULT_REQUEST_KEY = "confirmation";
-var DEFAULT_CONFIRMATION_LABEL = "Confirm this action should proceed.";
-var UNSUPPORTED_NOTE = "Nothing was done because this client cannot show a confirmation prompt (it declares no MCP elicitation capability), and this action is never taken without one";
-var STATE_PREFIX = "mcpu.confirm.v1.";
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/canonical.js
 function canonicalJson(value) {
   if (value === null || typeof value === "string" || typeof value === "boolean")
     return JSON.stringify(value);
@@ -34547,7 +34545,7 @@ function canonicalJson(value) {
   if (typeof value === "bigint")
     return `{"$bigint":"${value.toString()}"}`;
   if (typeof value === "function" || typeof value === "symbol") {
-    throw new TypeError(`requireConfirmation: cannot bind a ${typeof value} argument value.`);
+    throw new TypeError(`confirmation: cannot bind a ${typeof value} argument value.`);
   }
   if (Array.isArray(value))
     return `[${value.map(canonicalJson).join(",")}]`;
@@ -34569,7 +34567,7 @@ function canonicalJson(value) {
   }
   const proto = Object.getPrototypeOf(value);
   if (proto !== Object.prototype && proto !== null) {
-    throw new TypeError("requireConfirmation: cannot bind a non-plain object argument value (class instance).");
+    throw new TypeError("confirmation: cannot bind a non-plain object argument value (class instance).");
   }
   const entries = Object.entries(value).filter(([, v]) => v !== void 0).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
   return `{${entries.map(([k, v]) => `${JSON.stringify(escapeKey(k))}:${canonicalJson(v)}`).join(",")}}`;
@@ -34577,6 +34575,12 @@ function canonicalJson(value) {
 function escapeKey(key) {
   return key.startsWith("$") ? `$${key}` : key;
 }
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirmation.js
+var DEFAULT_REQUEST_KEY = "confirmation";
+var DEFAULT_CONFIRMATION_LABEL = "Confirm this action should proceed.";
+var UNSUPPORTED_NOTE = "Nothing was done because this client cannot show a confirmation prompt (it declares no MCP elicitation capability), and this action is never taken without one";
+var STATE_PREFIX = "mcpu.confirm.v1.";
 function bindingKey(binding) {
   if (binding.ttlSeconds !== void 0 && !(Number.isFinite(binding.ttlSeconds) && binding.ttlSeconds > 0)) {
     throw new RangeError("requireConfirmation: binding.ttlSeconds must be a finite number greater than 0.");
@@ -34679,6 +34683,264 @@ ${JSON.stringify(preview, null, 2)}`,
   });
 }
 
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-token.js
+import { createHash as createHash2, createHmac as createHmac2, randomBytes, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
+function createSpentTokenStore() {
+  const spent2 = /* @__PURE__ */ new Map();
+  return {
+    has: (nonce) => spent2.has(nonce),
+    add: (nonce, exp) => {
+      spent2.set(nonce, exp);
+    },
+    prune: (now) => {
+      for (const [nonce, exp] of spent2)
+        if (exp < now)
+          spent2.delete(nonce);
+    },
+    clear: () => spent2.clear(),
+    get size() {
+      return spent2.size;
+    }
+  };
+}
+var PROCESS_SPENT = createSpentTokenStore();
+var PREFIX = "mcpu.token.v1.";
+var DEFAULT_TTL_SECONDS = 600;
+function tokenKey(key) {
+  const bytes = typeof key === "string" ? Buffer.from(key, "utf8") : Buffer.from(key);
+  if (bytes.length < 32)
+    throw new RangeError("confirm token: key must be at least 32 bytes.");
+  return bytes;
+}
+function ttlOf(ttlSeconds) {
+  if (ttlSeconds === void 0)
+    return DEFAULT_TTL_SECONDS;
+  if (!(Number.isFinite(ttlSeconds) && ttlSeconds > 0)) {
+    throw new RangeError("confirm token: ttlSeconds must be a finite number greater than 0.");
+  }
+  return ttlSeconds;
+}
+function sign(key, body) {
+  return createHmac2("sha256", key).update(`${PREFIX}${body}`).digest();
+}
+function hashConfirmPayload(payload) {
+  return createHash2("sha256").update(canonicalJson(payload)).digest("base64url");
+}
+function issueConfirmToken(key, binding, options = {}) {
+  const k = tokenKey(key);
+  const now = options.now ?? Date.now();
+  const exp = now + ttlOf(options.ttlSeconds) * 1e3;
+  const claims = {
+    t: binding.tool,
+    ...binding.account === void 0 ? {} : { a: binding.account },
+    g: binding.target,
+    ...binding.revision === void 0 ? {} : { r: binding.revision },
+    h: binding.payloadHash,
+    exp,
+    n: randomBytes(16).toString("base64url")
+  };
+  const body = Buffer.from(JSON.stringify(claims), "utf8").toString("base64url");
+  return { token: `${PREFIX}${body}.${sign(k, body).toString("base64url")}`, expiresAt: new Date(exp).toISOString() };
+}
+function parseClaims(body) {
+  try {
+    const claims = JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
+    return claims && typeof claims === "object" ? claims : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function verifyConfirmToken(key, token, binding, options = {}) {
+  const k = tokenKey(key);
+  const now = options.now ?? Date.now();
+  const spent2 = options.spent ?? PROCESS_SPENT;
+  spent2.prune(now);
+  if (!token.startsWith(PREFIX))
+    return { ok: false, error: "TOKEN_INVALID" };
+  const rest = token.slice(PREFIX.length);
+  const dot = rest.indexOf(".");
+  const body = dot < 0 ? "" : rest.slice(0, dot);
+  const mac3 = Buffer.from(dot < 0 ? "" : rest.slice(dot + 1), "base64url");
+  const expected = sign(k, body);
+  if (!body || mac3.length !== expected.length || !timingSafeEqual2(mac3, expected))
+    return { ok: false, error: "TOKEN_INVALID" };
+  const claims = parseClaims(body);
+  if (!claims)
+    return { ok: false, error: "TOKEN_INVALID" };
+  if (claims.t !== binding.tool || claims.a !== binding.account || claims.g !== binding.target) {
+    return { ok: false, error: "TOKEN_INVALID" };
+  }
+  if (spent2.has(claims.n))
+    return { ok: false, error: "TOKEN_REUSED" };
+  if (now > claims.exp)
+    return { ok: false, error: "TOKEN_EXPIRED" };
+  if (claims.r !== binding.revision)
+    return { ok: false, error: "DRAFT_CHANGED", reason: "revision-changed" };
+  if (claims.h !== binding.payloadHash)
+    return { ok: false, error: "DRAFT_CHANGED", reason: "payload-changed" };
+  spent2.add(claims.n, claims.exp);
+  return { ok: true };
+}
+var CONFIRM_TOKEN_INSTRUCTION = "Show this preview to the user verbatim and proceed only after they explicitly approve in chat. Then call again with confirmToken.";
+var confirmTokenParam = external_exports.string().optional().describe(`ONLY for the two-step confirmation fallback (a client without MCP elicitation). The confirmToken from this same tool's phase-1 "confirmation-required" response, passed back ONLY after the user has seen that preview and explicitly approved it in chat \u2014 never on the first call, never invented, never reused. Call again with the same arguments. Ignored when the client supports elicitation.`);
+var TOKEN_ERROR_NOTE = {
+  TOKEN_EXPIRED: "Nothing was sent or changed: the confirmToken expired. Call again WITHOUT confirmToken for a fresh preview, and ask the user to approve it again.",
+  TOKEN_REUSED: "Nothing was sent or changed by this call: this confirmToken was already used, and one approval acts once. If doing it again is really intended, call again WITHOUT confirmToken and get a new approval.",
+  TOKEN_INVALID: "Nothing was sent or changed: this confirmToken was not issued by this server for this tool, account and target (or the server has restarted since). Call again WITHOUT confirmToken for a fresh preview and approval."
+};
+var CHANGED_NOTE = {
+  "revision-changed": "Nothing was sent or changed: the target was edited since the user approved it (its version rotated), so what would happen is not what they saw.",
+  "payload-changed": "Nothing was sent or changed: what would happen no longer matches what the user approved."
+};
+function isToolResult(value) {
+  return Array.isArray(value.content);
+}
+function rejection2(data) {
+  return { ...textResult({ status: "confirmation-rejected", confirmed: false, dispatched: false, ...data }), isError: true };
+}
+async function tokenConfirmation(action, fb) {
+  const subject = await fb.subject();
+  if (isToolResult(subject))
+    return subject;
+  const binding = {
+    tool: fb.tool,
+    ...fb.account === void 0 ? {} : { account: fb.account },
+    target: subject.target,
+    ...subject.revision === void 0 ? {} : { revision: subject.revision },
+    payloadHash: hashConfirmPayload(subject.payload)
+  };
+  const phaseOne = () => {
+    const { token, expiresAt } = issueConfirmToken(fb.key, binding, { ttlSeconds: fb.ttlSeconds });
+    return {
+      action,
+      preview: subject.preview,
+      confirmToken: token,
+      expiresAt,
+      ttlSeconds: ttlOf(fb.ttlSeconds),
+      instruction: fb.instruction ?? CONFIRM_TOKEN_INSTRUCTION
+    };
+  };
+  if (!fb.confirmToken) {
+    return textResult({ status: "confirmation-required", confirmed: false, dispatched: false, ...phaseOne() });
+  }
+  const verdict = verifyConfirmToken(fb.key, fb.confirmToken, binding, { spent: fb.spent });
+  if (verdict.ok)
+    return void 0;
+  if (verdict.error === "DRAFT_CHANGED") {
+    return rejection2({
+      error: "DRAFT_CHANGED",
+      reason: verdict.reason,
+      note: `${CHANGED_NOTE[verdict.reason]} The current preview and a fresh confirmToken are below.`,
+      ...phaseOne()
+    });
+  }
+  return rejection2({ error: verdict.error, action, note: TOKEN_ERROR_NOTE[verdict.error] });
+}
+async function requireConfirmationWithFallback(ctx, options) {
+  const { tokenFallback, ...confirmation } = options;
+  if (tokenFallback && callerAcceptsFormElicitation(ctx) === false) {
+    return tokenConfirmation(options.action, tokenFallback);
+  }
+  return requireConfirmation(ctx, confirmation);
+}
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-env.js
+import { createHash as createHash3, randomBytes as randomBytes2 } from "node:crypto";
+
+// ../../node_modules/@chrischall/mcp-utils/dist/config/index.js
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
+var PLACEHOLDER_RE = /^\$\{[^}]*\}$/;
+function readEnvVar(key, opts = {}) {
+  const env = opts.env ?? process.env;
+  const raw = env[key];
+  if (typeof raw === "string") {
+    const trimmed = raw.trim();
+    if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
+      return trimmed;
+    }
+  }
+  return opts.default;
+}
+var TRUE_TOKENS = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
+var FALSE_TOKENS = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
+function parseBoolEnv(key, opts = {}) {
+  const fallback = opts.default ?? false;
+  const raw = readEnvVar(key, { env: opts.env });
+  if (raw === void 0)
+    return fallback;
+  const token = raw.toLowerCase();
+  if (TRUE_TOKENS.has(token))
+    return true;
+  if (FALSE_TOKENS.has(token))
+    return false;
+  return fallback;
+}
+function expandPath(p) {
+  let expanded = p;
+  if (p === "~") {
+    expanded = homedir();
+  } else if (p.startsWith("~/")) {
+    expanded = join(homedir(), p.slice(2));
+  }
+  return isAbsolute(expanded) ? expanded : resolve(expanded);
+}
+
+// ../../node_modules/@chrischall/mcp-utils/dist/server/confirm-env.js
+var MODES = /* @__PURE__ */ new Set(["ask-user", "auto", "refuse"]);
+var DEFAULT_TTL_SECONDS2 = 600;
+var warned = /* @__PURE__ */ new Set();
+function readConfirmMode(env = process.env) {
+  const raw = readEnvVar("MCP_CONFIRM_MODE", { env })?.trim().toLowerCase();
+  if (!raw)
+    return "ask-user";
+  if (MODES.has(raw))
+    return raw;
+  if (!warned.has(raw)) {
+    warned.add(raw);
+    process.stderr.write(`MCP_CONFIRM_MODE="${raw}" is not one of ask-user, auto, refuse; treating it as refuse.
+`);
+  }
+  return "refuse";
+}
+function confirmTtlFromEnv(env = process.env) {
+  const raw = readEnvVar("MCP_CONFIRM_TTL_SECONDS", { env })?.trim();
+  return raw && /^[1-9]\d*$/.test(raw) ? Number(raw) : DEFAULT_TTL_SECONDS2;
+}
+var processKey;
+function confirmKeyFromEnv(env = process.env) {
+  const secret = readEnvVar("MCP_CONFIRM_SECRET", { env });
+  if (secret)
+    return createHash3("sha256").update(secret, "utf8").digest();
+  processKey ??= randomBytes2(32);
+  return processKey;
+}
+var CONFIRM_TOKEN_AUTO_INSTRUCTION = "Nothing has been done yet. Review this preview; if it is what was intended, call again with the same arguments plus confirmToken. (This server runs with MCP_CONFIRM_MODE=auto, so the user's approval in chat is not required.)";
+var REFUSE_HINT = "Set MCP_CONFIRM_MODE=ask-user on the server to allow two-step confirmation instead.";
+function confirmationFromEnv(options) {
+  const { tool, account, confirmToken, subject, instruction, spent: spent2, env = process.env, ...confirmation } = options;
+  const mode = readConfirmMode(env);
+  if (mode === "refuse") {
+    return {
+      ...confirmation,
+      unsupportedNote: confirmation.unsupportedNote ? `${confirmation.unsupportedNote} ${REFUSE_HINT}` : REFUSE_HINT
+    };
+  }
+  return {
+    ...confirmation,
+    tokenFallback: {
+      key: confirmKeyFromEnv(env),
+      tool,
+      ...account === void 0 ? {} : { account },
+      ...confirmToken === void 0 ? {} : { confirmToken },
+      subject,
+      ttlSeconds: confirmTtlFromEnv(env),
+      instruction: mode === "auto" ? CONFIRM_TOKEN_AUTO_INSTRUCTION : instruction ?? CONFIRM_TOKEN_INSTRUCTION,
+      ...spent2 === void 0 ? {} : { spent: spent2 }
+    }
+  };
+}
+
 // ../../node_modules/@chrischall/mcp-utils/dist/server/index.js
 var SERVER_PROTOCOL_VERSIONS = Object.freeze([
   "2026-07-28",
@@ -34854,45 +35116,6 @@ function runMcp(opts) {
   return handle;
 }
 
-// ../../node_modules/@chrischall/mcp-utils/dist/config/index.js
-import { homedir } from "node:os";
-import { isAbsolute, join, resolve } from "node:path";
-var PLACEHOLDER_RE = /^\$\{[^}]*\}$/;
-function readEnvVar(key, opts = {}) {
-  const env = opts.env ?? process.env;
-  const raw = env[key];
-  if (typeof raw === "string") {
-    const trimmed = raw.trim();
-    if (trimmed.length > 0 && trimmed !== "undefined" && trimmed !== "null" && !PLACEHOLDER_RE.test(trimmed)) {
-      return trimmed;
-    }
-  }
-  return opts.default;
-}
-var TRUE_TOKENS = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
-var FALSE_TOKENS = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
-function parseBoolEnv(key, opts = {}) {
-  const fallback = opts.default ?? false;
-  const raw = readEnvVar(key, { env: opts.env });
-  if (raw === void 0)
-    return fallback;
-  const token = raw.toLowerCase();
-  if (TRUE_TOKENS.has(token))
-    return true;
-  if (FALSE_TOKENS.has(token))
-    return false;
-  return fallback;
-}
-function expandPath(p) {
-  let expanded = p;
-  if (p === "~") {
-    expanded = homedir();
-  } else if (p.startsWith("~/")) {
-    expanded = join(homedir(), p.slice(2));
-  }
-  return isAbsolute(expanded) ? expanded : resolve(expanded);
-}
-
 // ../../node_modules/@chrischall/mcp-utils/dist/fs/confine.js
 import { existsSync, realpathSync } from "node:fs";
 import { dirname, isAbsolute as isAbsolute2, relative, resolve as resolve2, sep } from "node:path";
@@ -35762,91 +35985,9 @@ function formatAuthHealth(raw, now) {
 }
 
 // ../gogcli-mcp/src/send-confirm-token.ts
-import { createHash as createHash2, createHmac as createHmac2, randomBytes, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
-var CONFIRM_TOKEN_TTL_DEFAULT_SECONDS = 600;
-var PREFIX = "gct1";
-var secret;
-var spent = /* @__PURE__ */ new Map();
-function sendConfirmFallbackEnabled() {
-  return readEnvVar("GOG_SEND_CONFIRM_FALLBACK")?.trim().toLowerCase() === "token";
-}
-function confirmTokenTtlSeconds() {
-  const raw = readEnvVar("GOG_CONFIRM_TTL_SECONDS")?.trim();
-  if (raw && /^\d+$/.test(raw)) {
-    const n = Number(raw);
-    if (n > 0) return n;
-  }
-  return CONFIRM_TOKEN_TTL_DEFAULT_SECONDS;
-}
-function hmacKey() {
-  if (!secret) {
-    const configured = readEnvVar("GOG_CONFIRM_SECRET");
-    secret = configured ? Buffer.from(configured, "utf8") : randomBytes(32);
-  }
-  return secret;
-}
-function canonicalize(value) {
-  if (Array.isArray(value)) return value.map(canonicalize);
-  if (value && typeof value === "object") {
-    const out = {};
-    for (const key of Object.keys(value).sort()) {
-      const v = value[key];
-      if (v !== void 0) out[key] = canonicalize(v);
-    }
-    return out;
-  }
-  return value;
-}
-function hashSendPayload(payload) {
-  return createHash2("sha256").update(JSON.stringify(canonicalize(payload))).digest("hex");
-}
-function sign(body) {
-  return createHmac2("sha256", hmacKey()).update(`${PREFIX}.${body}`).digest("base64url");
-}
-function issueConfirmToken(binding, now = Date.now()) {
-  const exp = now + confirmTokenTtlSeconds() * 1e3;
-  const claims = {
-    t: binding.tool,
-    a: binding.account,
-    g: binding.target,
-    ...binding.revision === void 0 ? {} : { r: binding.revision },
-    h: binding.payloadHash,
-    iat: now,
-    exp,
-    n: randomBytes(16).toString("base64url")
-  };
-  const body = Buffer.from(JSON.stringify(claims), "utf8").toString("base64url");
-  return { token: `${PREFIX}.${body}.${sign(body)}`, expiresAt: new Date(exp).toISOString() };
-}
-function signatureMatches(body, sig) {
-  const expected = Buffer.from(sign(body), "utf8");
-  const actual = Buffer.from(sig, "utf8");
-  return expected.length === actual.length && timingSafeEqual2(expected, actual);
-}
-function parseClaims(body) {
-  try {
-    return JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
-  } catch {
-    return void 0;
-  }
-}
-function verifyConfirmToken(token, binding, now = Date.now()) {
-  for (const [nonce, exp] of spent) if (exp < now) spent.delete(nonce);
-  const parts = token.split(".");
-  if (parts.length !== 3 || parts[0] !== PREFIX || !parts[1] || !parts[2]) return { ok: false, error: "TOKEN_INVALID" };
-  const [, body, sig] = parts;
-  if (!signatureMatches(body, sig)) return { ok: false, error: "TOKEN_INVALID" };
-  const claims = parseClaims(body);
-  if (!claims) return { ok: false, error: "TOKEN_INVALID" };
-  if (claims.t !== binding.tool || claims.a !== binding.account || claims.g !== binding.target) {
-    return { ok: false, error: "TOKEN_INVALID" };
-  }
-  if (spent.has(claims.n)) return { ok: false, error: "TOKEN_REUSED" };
-  if (now > claims.exp) return { ok: false, error: "TOKEN_EXPIRED" };
-  if (claims.r !== binding.revision) return { ok: false, error: "DRAFT_CHANGED", reason: "message-id-rotated" };
-  if (claims.h !== binding.payloadHash) return { ok: false, error: "DRAFT_CHANGED", reason: "payload-changed" };
-  spent.set(claims.n, claims.exp);
-  return { ok: true };
+var spent = createSpentTokenStore();
+function confirmSpentStore() {
+  return spent;
 }
 
 // ../gogcli-mcp/src/dispatch-confirmation.ts
@@ -35856,63 +35997,8 @@ function bodyPreview(text) {
   if (text.length <= BODY_PREVIEW_MAX) return text;
   return `${text.slice(0, BODY_PREVIEW_MAX)}\u2026 [${text.length - BODY_PREVIEW_MAX} more characters not shown]`;
 }
-var CONFIRM_ACTION_INSTRUCTION = "Show this preview to the user verbatim and proceed only after they explicitly approve in chat. Then call again with confirmToken.";
-var FALLBACK_HINT = "Or set GOG_SEND_CONFIRM_FALLBACK=token to enable two-step confirmation.";
-var CONFIRM_FALLBACK_DESCRIPTION = ' If the client cannot show that prompt (no MCP elicitation, e.g. claude.ai) and the server sets GOG_SEND_CONFIRM_FALLBACK=token, a two-step flow applies instead: call WITHOUT confirmToken and nothing is sent or changed \u2014 the result has status "confirmation-required", the full preview and a confirmToken. Show that preview to the user verbatim; only after they explicitly approve it in chat, call again with the SAME arguments plus confirmToken. The tool re-reads what it would act on and refuses (DRAFT_CHANGED, with a fresh preview and token) if it changed; TOKEN_EXPIRED / TOKEN_REUSED / TOKEN_INVALID also do nothing.';
-var confirmTokenParam = external_exports.string().optional().describe(
-  `ONLY for the two-step fallback (client without MCP elicitation, server with GOG_SEND_CONFIRM_FALLBACK=token). The confirmToken from this same tool's phase-1 "confirmation-required" response, passed back ONLY after the user has seen that preview and explicitly approved it in chat \u2014 never on the first call, never invented, never reused. Call again with the same arguments. Ignored when the client supports elicitation.`
-);
-var TOKEN_ERROR_NOTE = {
-  TOKEN_EXPIRED: "Nothing was sent or changed: the confirmToken expired. Call again WITHOUT confirmToken for a fresh preview, and ask the user to approve it again.",
-  TOKEN_REUSED: "Nothing was sent or changed by this call: this confirmToken was already used, and one approval acts once. If doing it again is really intended, call again WITHOUT confirmToken and get a new approval.",
-  TOKEN_INVALID: "Nothing was sent or changed: this confirmToken was not issued by this server for this tool, account and target (or the server has restarted since). Call again WITHOUT confirmToken for a fresh preview and approval."
-};
-var DRAFT_CHANGED_NOTE = {
-  "message-id-rotated": "Nothing was sent or changed: the target was edited since the user approved it (a draft's messageId or an event's version rotated), so what would happen is not what they saw.",
-  "payload-changed": "Nothing was sent or changed: what would happen no longer matches what the user approved."
-};
-function isToolResult(value) {
-  return Array.isArray(value.content);
-}
-function rejection2(data) {
-  return { ...textResult({ status: "confirmation-rejected", confirmed: false, dispatched: false, ...data }), isError: true };
-}
-async function tokenConfirmation(op, fallback) {
-  const subject = await fallback.subject();
-  if (isToolResult(subject)) return subject;
-  const binding = {
-    tool: fallback.tool,
-    account: fallback.account ?? readEnvVar("GOG_ACCOUNT") ?? "",
-    target: subject.target,
-    ...subject.revision === void 0 ? {} : { revision: subject.revision },
-    payloadHash: hashSendPayload(subject.payload)
-  };
-  const phaseOne = () => {
-    const { token, expiresAt } = issueConfirmToken(binding);
-    return {
-      action: op,
-      preview: subject.preview,
-      confirmToken: token,
-      expiresAt,
-      ttlSeconds: confirmTokenTtlSeconds(),
-      instruction: fallback.instruction ?? CONFIRM_ACTION_INSTRUCTION
-    };
-  };
-  if (!fallback.confirmToken) {
-    return textResult({ status: "confirmation-required", confirmed: false, dispatched: false, ...phaseOne() });
-  }
-  const verdict = verifyConfirmToken(fallback.confirmToken, binding);
-  if (verdict.ok) return void 0;
-  if (verdict.error === "DRAFT_CHANGED") {
-    return rejection2({
-      error: "DRAFT_CHANGED",
-      reason: verdict.reason,
-      note: `${DRAFT_CHANGED_NOTE[verdict.reason]} The current preview and a fresh confirmToken are below.`,
-      ...phaseOne()
-    });
-  }
-  return rejection2({ error: verdict.error, action: op, note: TOKEN_ERROR_NOTE[verdict.error] });
-}
+var CONFIRM_ACTION_INSTRUCTION = CONFIRM_TOKEN_INSTRUCTION;
+var CONFIRM_FALLBACK_DESCRIPTION = ' If the client cannot show that prompt (no MCP elicitation, e.g. claude.ai), a two-step flow applies instead: call WITHOUT confirmToken and nothing is sent or changed \u2014 the result has status "confirmation-required", the full preview and a confirmToken. Follow its instruction (by default: show the preview to the user verbatim and only after they explicitly approve it in chat, call again with the SAME arguments plus confirmToken). The tool re-reads what it would act on and refuses (DRAFT_CHANGED, with a fresh preview and token) if it changed; TOKEN_EXPIRED / TOKEN_REUSED / TOKEN_INVALID also do nothing. A server set to MCP_CONFIRM_MODE=refuse refuses instead.';
 function gatedElsewhere(what, via, does, tool) {
   return `${what} ${does} and is not available through ${via}. Use ${tool}, which asks the user to confirm.`;
 }
@@ -35921,17 +36007,23 @@ function hasCommandWord(args, words) {
 }
 async function requireDispatchConfirmation(ctx, options) {
   const { action, fallback } = options;
-  if (fallback && callerAcceptsFormElicitation(ctx) === false && sendConfirmFallbackEnabled()) {
-    return tokenConfirmation(action, fallback);
-  }
-  const note = fallback ? [options.unsupportedNote, FALLBACK_HINT].filter(Boolean).join(" ") : options.unsupportedNote;
-  return requireConfirmation(ctx, {
+  const confirmation = {
     action,
     message: options.message,
     details: options.details,
     confirmationLabel: options.confirmationLabel,
-    ...note ? { unsupportedNote: note } : {}
-  });
+    ...options.unsupportedNote ? { unsupportedNote: options.unsupportedNote } : {}
+  };
+  if (!fallback) return requireConfirmationWithFallback(ctx, confirmation);
+  return requireConfirmationWithFallback(ctx, confirmationFromEnv({
+    ...confirmation,
+    tool: fallback.tool,
+    account: fallback.account ?? readEnvVar("GOG_ACCOUNT") ?? "",
+    confirmToken: fallback.confirmToken,
+    subject: fallback.subject,
+    instruction: fallback.instruction ?? CONFIRM_ACTION_INSTRUCTION,
+    spent: confirmSpentStore()
+  }));
 }
 function resultText(result) {
   const first = result.content[0];
@@ -36581,7 +36673,7 @@ var failIfNotEmptyParam = external_exports.boolean().optional().describe(
 );
 
 // ../gogcli-mcp/src/server.ts
-var VERSION = true ? "4.4.0" : "0.0.0";
+var VERSION = true ? "4.5.0" : "0.0.0";
 
 // ../gogcli-mcp/src/bootstrap-auth.ts
 import { join as join5 } from "node:path";
@@ -36618,12 +36710,12 @@ async function bootstrapGogAuth(env = process.env, options = {}) {
   const [clientId, clientSecret, refreshToken, account] = values;
   const { spawner } = options;
   try {
-    const { createHash: createHash3 } = await import("node:crypto");
+    const { createHash: createHash4 } = await import("node:crypto");
     const { mkdir, readFile, writeFile, chmod } = await import("node:fs/promises");
     const home = options.home ?? (await import("node:os")).homedir();
     const dir = join5(home, ".gogcli-mcp");
     const marker = join5(dir, AUTH_BOOTSTRAP_MARKER);
-    const fingerprint = createHash3("sha256").update(values.join("\0")).digest("hex");
+    const fingerprint = createHash4("sha256").update(values.join("\0")).digest("hex");
     const previous = await readFile(marker, "utf8").catch(() => void 0);
     if (previous === fingerprint && await accountListed(account, spawner)) return "present";
     await run(

package/manifest.json

@@ -3,7 +3,7 @@
   "manifest_version": "0.3",
   "name": "gogcli-mcp-classroom",
   "display_name": "gogcli (Classroom)",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "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": "4.4.0",
+  "version": "4.5.0",
   "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>",
@@ -24,7 +24,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^2.4.0",
+    "@chrischall/mcp-utils": "^2.6.0",
     "@modelcontextprotocol/server": "^2.0.0",
     "zod": "^4.6.1"
   },

package/server.json

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

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

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { registerExtraClassroomTools } from '../../src/tools/classroom-extra.js';
 import * as lib from '../../../gogcli-mcp/src/lib.js';
 import { createTestHarness, type TestHarness } from '@chrischall/mcp-utils/test';
@@ -15,6 +15,9 @@ vi.mock('../../../gogcli-mcp/src/lib.js', async (importOriginal) => {
 
 let harness: TestHarness;
 
+// MCP_CONFIRM_MODE is read per call; a test that sets it must not leak it.
+afterEach(() => { delete process.env.MCP_CONFIRM_MODE; });
+
 beforeEach(async () => {
   vi.clearAllMocks();
   vi.mocked(lib.runOrDiagnose).mockResolvedValue(rawTextResult('{}'));
@@ -269,6 +272,8 @@ describe('gog_classroom_invitations_create', () => {
   });
 
   it('refuses a client that cannot be prompted', async () => {
+
+    process.env.MCP_CONFIRM_MODE = 'refuse';
     vi.mocked(lib.runOrDiagnose).mockResolvedValue(COURSE);
     const h = await createTestHarness(registerExtraClassroomTools);
     const r = JSON.parse((await h.callTool('gog_classroom_invitations_create', { courseId: 'c1', userId: 'u1', role: 'STUDENT' })).content[0]!.text as string);
@@ -278,7 +283,7 @@ describe('gog_classroom_invitations_create', () => {
 
   it('token fallback: phase 1 previews, phase 2 invites', async () => {
     const ORIGINAL = { ...process.env };
-    process.env.GOG_SEND_CONFIRM_FALLBACK = 'token';
+    process.env.MCP_CONFIRM_MODE = 'ask-user';
     try {
       vi.mocked(lib.runOrDiagnose).mockResolvedValue(COURSE);
       const h = await createTestHarness(registerExtraClassroomTools);