moodle-cli 0.7.0-alpha.4 → 0.7.0-alpha.6

package/dist/moodle.js

@@ -222,8 +222,16 @@ async function getAuthenticatedSession(baseUrl, options = {}) {
   if (cached) {
     return cached;
   }
+  const cookieWarnings = [];
+  const providerOptions = {
+    ...options,
+    onCookieWarnings: (warnings) => {
+      cookieWarnings.push(...warnings);
+      options.onCookieWarnings?.(warnings);
+    }
+  };
   const browserProvider = options.browserCookieProvider ?? defaultBrowserCookieProvider;
-  const browserCookies = matchingMoodleSessionCookies(await browserProvider(baseUrl, options), baseUrl);
+  const browserCookies = matchingMoodleSessionCookies(await browserProvider(baseUrl, providerOptions), baseUrl);
   const browserSession = await firstValidSession(baseUrl, browserCookies, validate);
   if (browserSession) {
     await refreshSessionCache(baseUrl, browserSession.cookie, browserSession.context, options);
@@ -247,10 +255,22 @@ async function getAuthenticatedSession(baseUrl, options = {}) {
       return { baseUrl, cookie: refreshedSession.cookie, ...refreshedSession.context, fromCache: false };
     }
   }
-  throw new AuthError(`No usable MoodleSession found for ${baseUrl}.`, authFailureHint(baseUrl));
+  throw new AuthError(
+    `No usable MoodleSession found for ${baseUrl}.`,
+    authFailureHint(baseUrl, cookieWarnings, options.platform)
+  );
 }
 async function getAuthenticatedSessionWithBrowserFallback(baseUrl, options = {}) {
-  const authOptions = { ...options, noCache: true, nonInteractive: true };
+  const cookieWarnings = [];
+  const authOptions = {
+    ...options,
+    noCache: true,
+    nonInteractive: true,
+    onCookieWarnings: (warnings) => {
+      cookieWarnings.push(...warnings);
+      options.onCookieWarnings?.(warnings);
+    }
+  };
   const browserAuthOptions = {
     ...authOptions,
     env: { ...options.env ?? process.env, [ENV_MOODLE_SESSION]: void 0 }
@@ -271,6 +291,12 @@ async function getAuthenticatedSessionWithBrowserFallback(baseUrl, options = {})
       }
     }
   }
+  if (cookieAccessBlocked(cookieWarnings)) {
+    throw new AuthError(
+      `Cannot read browser cookies for ${baseUrl}.`,
+      cookieAccessHint(cookieWarnings, options.platform)
+    );
+  }
   const url = loginUrl(baseUrl);
   await (options.openBrowser ?? ((target) => openSystemBrowser(target, options)))(url);
   options.onBrowserOpened?.(url);
@@ -330,7 +356,11 @@ async function defaultBrowserCookieProvider(baseUrl, options = {}) {
     mode: "merge"
   });
   const braveProfiles = await braveProfilePaths(options);
-  const brave = braveProfiles.length ? await getCookies({ url: baseUrl, browsers: ["chrome"], chromeProfile: braveProfiles, mode: "merge" }) : { cookies: [] };
+  const brave = braveProfiles.length ? await getCookies({ url: baseUrl, browsers: ["chrome"], chromeProfile: braveProfiles, mode: "merge" }) : { cookies: [], warnings: [] };
+  const warnings = [...primary.warnings ?? [], ...brave.warnings ?? []];
+  if (warnings.length) {
+    options.onCookieWarnings?.(warnings);
+  }
   return [...primary.cookies, ...brave.cookies].map((cookie) => ({
     name: cookie.name,
     value: cookie.value,
@@ -345,7 +375,7 @@ async function braveProfilePaths(options = {}) {
   const roots = platform === "linux" ? [
     join2(home, ".config/BraveSoftware/Brave-Browser"),
     join2(home, ".var/app/com.brave.Browser/config/BraveSoftware/Brave-Browser")
-  ] : platform === "win32" ? [join2(home, "AppData/Local/BraveSoftware/Brave-Browser/User Data")] : [];
+  ] : platform === "win32" ? [join2(home, "AppData/Local/BraveSoftware/Brave-Browser/User Data")] : platform === "darwin" ? [join2(home, "Library/Application Support/BraveSoftware/Brave-Browser")] : [];
   const profiles = [];
   for (const root of roots) {
     try {
@@ -375,13 +405,36 @@ async function loadSessionsFromOktaCli(baseUrl, options = {}, forceLogin = false
   const refreshed = await readOktaCookies(executable, baseUrl, execFile2);
   return refreshed.length ? refreshed : stored;
 }
-function authFailureHint(baseUrl) {
+var COOKIE_ACCESS_DENIED = /EPERM|EACCES|operation not permitted|permission denied/i;
+function cookieAccessBlocked(warnings) {
+  return warnings.some((warning) => COOKIE_ACCESS_DENIED.test(warning));
+}
+function cookieAccessHint(warnings, platform = process.platform) {
+  const grant = platform === "darwin" ? "Grant Full Disk Access to the application running this command (System Settings > Privacy & Security > Full Disk Access), then restart it." : "Run this command as the user that owns the browser profile, or grant it read access to the browser cookie store.";
   return [
+    "The browser cookie store could not be read, so the session could not be detected.",
+    "If this runs inside a sandboxed app (an IDE or agent terminal), rerun it from a regular terminal first.",
+    grant,
+    `Alternatively set ${ENV_MOODLE_SESSION} to a valid MoodleSession cookie value.`,
+    "",
+    "Cookie store diagnostics:",
+    ...warnings.map((warning) => `  - ${warning}`)
+  ].join("\n");
+}
+function authFailureHint(baseUrl, cookieWarnings = [], platform = process.platform) {
+  if (cookieAccessBlocked(cookieWarnings)) {
+    return cookieAccessHint(cookieWarnings, platform);
+  }
+  const lines = [
     `Log in to ${loginUrl(baseUrl)} in your browser, then rerun the command.`,
     `Or set ${ENV_MOODLE_SESSION} to a valid MoodleSession cookie value.`,
     `For automatic login, install okta-auth: ${OKTA_AUTH_INSTALL_COMMAND}, then run ${OKTA_AUTH_CONFIG_COMMAND}.`,
     `okta-auth: ${OKTA_AUTH_URL}`
-  ].join("\n");
+  ];
+  if (cookieWarnings.length) {
+    lines.push("", "Cookie store diagnostics:", ...cookieWarnings.map((warning) => `  - ${warning}`));
+  }
+  return lines.join("\n");
 }
 async function invalidateCachedSession(baseUrl, options = {}) {
   await deleteCachedSession(baseUrl, cacheOptions(options));
@@ -1010,9 +1063,9 @@ function parseCourseSectionNumbers(html, courseId) {
   for (const href of hrefs) {
     const url = parseMaybeUrl(href.replace(/&/gu, "&"), "https://moodle.invalid");
     const id = url?.searchParams.get("id");
-    const sectionValue = url?.searchParams.get("section");
-    if (id === String(courseId) && sectionValue && /^\d+$/.test(sectionValue)) {
-      const section = Number(sectionValue);
+    const sectionValue2 = url?.searchParams.get("section");
+    if (id === String(courseId) && sectionValue2 && /^\d+$/.test(sectionValue2)) {
+      const section = Number(sectionValue2);
       if (!sections.includes(section)) {
         sections.push(section);
       }
@@ -2286,8 +2339,8 @@ var MoodleClientCore = class {
     }
     if (!response.ok) {
       const context = `HTTP ${response.status} loading ${safeUrl(url)}`;
-      const contentType2 = response.headers.get("content-type")?.toLowerCase() ?? "";
-      if (contentType2.includes("text/html") || contentType2.includes("application/xhtml+xml")) {
+      const contentType3 = response.headers.get("content-type")?.toLowerCase() ?? "";
+      if (contentType3.includes("text/html") || contentType3.includes("application/xhtml+xml")) {
         const moodleError = await response.text().then(parseMoodleErrorHtml).catch(() => null);
         if (moodleError) {
           throw this.errors.api(`${moodleError.message} (${context})`, moodleError.code);
@@ -2669,8 +2722,8 @@ async function probeBaseUrl(baseUrl, options = {}) {
     return { ok: false, message: `Could not reach ${baseUrl}: ${error instanceof Error ? error.message : String(error)}` };
   }
   const body = (await response.text()).slice(0, 5e3).toLowerCase();
-  const contentType2 = response.headers.get("content-type")?.toLowerCase() ?? "";
-  const looksJson = contentType2.includes("application/json") || body.startsWith("{");
+  const contentType3 = response.headers.get("content-type")?.toLowerCase() ?? "";
+  const looksJson = contentType3.includes("application/json") || body.startsWith("{");
   const looksMoodleTokenError = [
     '"errorcode":"missingparam"',
     '"errorcode":"invalidparameter"',
@@ -3745,8 +3798,8 @@ function keepaliveProgramArguments(execPath = process.execPath, argv1 = process.
   }
   return [execPath, resolvedArgv1, ...tail];
 }
-function buildKeepalivePlist(programArguments, intervalMinutes, logPath) {
-  const args = programArguments.map((arg) => `    <string>${escapeXml(arg)}</string>`).join("\n");
+function buildKeepalivePlist(programArguments2, intervalMinutes, logPath) {
+  const args = programArguments2.map((arg) => `    <string>${escapeXml(arg)}</string>`).join("\n");
   return [
     '<?xml version="1.0" encoding="UTF-8"?>',
     '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
@@ -3827,7 +3880,7 @@ function escapeXml(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0-alpha.4";
+var VERSION = "0.7.0-alpha.6";
 
 // src/forum.ts
 function parseDiscussionReference(value) {
@@ -3861,11 +3914,11 @@ async function parseForumReference(value, resolveForumCmid) {
     throw new UsageError("FORUM must be a numeric ID or a full forum URL.");
   }
   if (url.pathname.endsWith("/mod/forum/view.php")) {
-    const forumValue = url.searchParams.get("id");
-    if (!forumValue || !/^\d+$/.test(forumValue)) {
+    const forumValue2 = url.searchParams.get("id");
+    if (!forumValue2 || !/^\d+$/.test(forumValue2)) {
       throw new UsageError("Could not find forum module ID in view.php URL (expected ?id=...).");
     }
-    return Number(forumValue);
+    return Number(forumValue2);
   }
   if (url.pathname.endsWith("/mod/forum/discuss.php")) {
     const discussionValue = url.searchParams.get("d");
@@ -4125,11 +4178,12 @@ async function bridgeRemoteMcp(options) {
     }
     if (response.status === 202 || request.id === void 0) return;
     if (!response.ok) {
+      if (await forwardProtocolNegotiationError(options.output, response, request.id)) return;
       await writeRemoteError(options.output, request.id, response.status);
       return;
     }
-    const contentType2 = response.headers.get("content-type")?.toLowerCase() ?? "";
-    if (contentType2.includes("text/event-stream")) {
+    const contentType3 = response.headers.get("content-type")?.toLowerCase() ?? "";
+    if (contentType3.includes("text/event-stream")) {
       const forwarded = await writeSseMessages(options.output, await response.text(), request.id);
       if (forwarded) negotiatedProtocolVersion = initializedProtocolVersion(request) ?? negotiatedProtocolVersion;
       return;
@@ -4204,6 +4258,30 @@ async function writeRemoteError(output, id, status) {
     data: { type: "REMOTE_MCP_ERROR", status }
   }));
 }
+async function forwardProtocolNegotiationError(output, response, id) {
+  if (response.status !== 400 || !response.headers.get("content-type")?.toLowerCase().includes("application/json")) {
+    return false;
+  }
+  try {
+    const payload = await response.json();
+    if (!isRecord7(payload) || payload.jsonrpc !== "2.0" || payload.id !== id || !isRecord7(payload.error)) {
+      return false;
+    }
+    const data = isRecord7(payload.error.data) ? payload.error.data : void 0;
+    const supported = Array.isArray(data?.supported) ? data.supported.filter((version) => typeof version === "string") : [];
+    if (payload.error.code !== -32022 || typeof data?.requested !== "string" || supported.length === 0) {
+      return false;
+    }
+    await writeJson(output, jsonRpcFailure(id, {
+      code: -32022,
+      message: "Unsupported protocol version",
+      data: { supported, requested: data.requested }
+    }));
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function writeJson(output, value) {
   await output.write(`${JSON.stringify(value)}
 `);
@@ -4387,7 +4465,7 @@ function jsonCodec(container) {
   };
 }
 function jsonRegistration(connection) {
-  return connection.mode === "bridge" ? { command: connection.command, args: ["mcp", "bridge", "--profile", connection.profile] } : {
+  return connection.mode === "bridge" ? { command: connection.command, args: connection.args } : {
     type: "http",
     url: connection.endpoint,
     headers: { Authorization: `Bearer ${connection.accessToken}` }
@@ -4401,7 +4479,7 @@ function tomlBlock(registration, connection) {
   if (connection.mode === "bridge") {
     lines.push(
       `command = ${JSON.stringify(connection.command)}`,
-      `args = ${JSON.stringify(["mcp", "bridge", "--profile", connection.profile])}`
+      `args = ${JSON.stringify(connection.args)}`
     );
   } else {
     lines.push(
@@ -4453,7 +4531,11 @@ function validateProfile(profile) {
 }
 function resolveConnection(options) {
   if (options.mode !== "remote") {
-    return { mode: "bridge", command: options.command ?? "moodle", profile: options.profile };
+    return {
+      mode: "bridge",
+      command: options.command ?? "moodle",
+      args: [...options.commandArgs ?? [], "mcp", "bridge", "--profile", options.profile]
+    };
   }
   if (!options.endpoint || !options.accessToken) {
     throw new Error("Remote MCP connection requires an endpoint and access token");
@@ -4473,6 +4555,15 @@ function resolveConnection(options) {
   return { mode: "remote", endpoint: endpoint.toString(), accessToken: options.accessToken };
 }
 
+// src/mcp/self-command.ts
+function selfCommand(argv = process.argv, execPath = process.execPath) {
+  const script = argv[1];
+  return script && script !== execPath ? { command: execPath, args: [script] } : { command: execPath, args: [] };
+}
+function runtimeCommand(command, args) {
+  return command ? { command, args: [...args ?? []] } : selfCommand();
+}
+
 // src/mcp/connectors/node-connectors.ts
 import { chmod as chmod2, mkdir as mkdir4, readFile as readFile3, rm as rm3, stat as stat2, writeFile as writeFile4 } from "fs/promises";
 import { homedir as homedir5 } from "os";
@@ -4505,9 +4596,11 @@ function createDefaultClientConnectors(profile, options = {}) {
   const home = options.homeDirectory ?? homedir5();
   const platform = options.platform ?? process.platform;
   const fileSystem = options.fileSystem ?? new NodeConnectorFileSystem();
+  const runtime = runtimeCommand(options.command, options.commandArgs);
   const shared = {
     profile,
-    command: options.command,
+    command: runtime.command,
+    commandArgs: runtime.args,
     mode: options.mode,
     endpoint: options.endpoint,
     accessToken: options.accessToken
@@ -5367,7 +5460,8 @@ var ManagedMcpDeployment = class {
           await this.dependencies.wrangler.promote({
             accountId: plan.intent.accountId,
             workerName: plan.intent.workerName,
-            versionId: candidate.versionId
+            versionId: candidate.versionId,
+            releaseDigest: plan.intent.releaseDigest
           });
           promoted = true;
         }
@@ -5409,7 +5503,8 @@ var ManagedMcpDeployment = class {
         await this.dependencies.wrangler.promote({
           accountId: plan.intent.accountId,
           workerName: plan.intent.workerName,
-          versionId: candidate.versionId
+          versionId: candidate.versionId,
+          releaseDigest: plan.intent.releaseDigest
         });
         promoted = true;
       }
@@ -5518,7 +5613,7 @@ var ManagedMcpDeployment = class {
       readinessReasonCode = remoteReadiness.reasonCode;
       sessionRevision = remoteReadiness.revision;
     }
-    const resolvedWorker = worker ? { ...worker, productionEndpoint: receipt.productionEndpoint } : null;
+    const resolvedWorker = worker ? { ...worker, productionEndpoint: receipt.productionEndpoint, releaseDigest: worker.releaseDigest || receipt.releaseDigest } : null;
     return {
       profile,
       worker: resolvedWorker,
@@ -5920,14 +6015,13 @@ function macOSPlan(options, intervalMinutes) {
   const label = `com.moodle-cli.mcp-renewal.${options.profile}`;
   const path4 = `${trimEnd(options.homeDirectory, "/")}/Library/LaunchAgents/${label}.plist`;
   const target = `gui/${options.uid}`;
-  const args = renewalArgs(options.profile);
   const plist = [
     '<?xml version="1.0" encoding="UTF-8"?>',
     '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
     '<plist version="1.0"><dict>',
     `<key>Label</key><string>${xml(label)}</string>`,
     "<key>ProgramArguments</key><array>",
-    ...[options.executable, ...args].map((arg) => `<string>${xml(arg)}</string>`),
+    ...programArguments(options).map((arg) => `<string>${xml(arg)}</string>`),
     "</array>",
     `<key>StartInterval</key><integer>${intervalMinutes * 60}</integer>`,
     "<key>RunAtLoad</key><true/>",
@@ -5951,7 +6045,7 @@ function linuxPlan(options, intervalMinutes) {
   const directory = `${trimEnd(options.homeDirectory, "/")}/.config/systemd/user`;
   const servicePath = `${directory}/${label}.service`;
   const timerPath = `${directory}/${label}.timer`;
-  const command = [options.executable, ...renewalArgs(options.profile)].map(systemdQuote).join(" ");
+  const command = programArguments(options).map(systemdQuote).join(" ");
   const service = [
     "[Unit]",
     `Description=Moodle MCP session renewal (${options.profile})`,
@@ -5995,7 +6089,7 @@ function linuxPlan(options, intervalMinutes) {
 function windowsPlan(options, intervalMinutes) {
   const label = `Moodle CLI MCP Renewal (${options.profile})`;
   const path4 = `${trimEnd(options.homeDirectory, "\\/")}\\AppData\\Local\\moodle-cli\\renewal\\${options.profile}.xml`;
-  const argumentsText = renewalArgs(options.profile).map(windowsArgument).join(" ");
+  const argumentsText = [...options.executableArgs ?? [], ...renewalArgs(options.profile)].map(windowsArgument).join(" ");
   const task = [
     '<?xml version="1.0" encoding="UTF-8"?>',
     '<Task version="1.4" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">',
@@ -6022,6 +6116,9 @@ function windowsPlan(options, intervalMinutes) {
 function renewalArgs(profile) {
   return ["mcp", "renewal", "run", "--profile", profile, "--json"];
 }
+function programArguments(options) {
+  return [options.executable, ...options.executableArgs ?? [], ...renewalArgs(options.profile)];
+}
 function validateOptions(options) {
   if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$/.test(options.profile)) {
     throw new Error("Invalid renewal profile name");
@@ -6029,6 +6126,9 @@ function validateOptions(options) {
   if (!options.executable || /[\r\n]/.test(options.executable)) {
     throw new Error("Invalid renewal executable path");
   }
+  if ((options.executableArgs ?? []).some((arg) => /[\r\n]/.test(arg))) {
+    throw new Error("Invalid renewal executable arguments");
+  }
   if (!options.homeDirectory || /[\r\n]/.test(options.homeDirectory)) {
     throw new Error("Invalid renewal home directory");
   }
@@ -6103,10 +6203,12 @@ function createDefaultRenewalInstaller(profile, options = {}) {
   if (!isSupportedPlatform(platform)) {
     throw new Error(`Moodle MCP renewal is not supported on ${platform}`);
   }
+  const runtime = runtimeCommand(options.executable, options.executableArgs);
   const plan = buildRenewalInstallPlan({
     platform,
     profile,
-    executable: options.executable ?? process.argv[1] ?? process.execPath,
+    executable: runtime.command,
+    executableArgs: runtime.args,
     homeDirectory: options.homeDirectory ?? homedir7(),
     uid: options.uid ?? (typeof process.getuid === "function" ? process.getuid() : void 0),
     intervalMinutes: options.intervalMinutes
@@ -6314,7 +6416,9 @@ ${error.stderr}`)) {
         throw new DeploymentApplyError("INITIAL_WORKER_INVALID", "Wrangler did not return the initialized Worker");
       }
       const productionEndpoint = firstWorkersDevUrl([result.stdout, result.stderr]);
-      return productionEndpoint ? { ...worker, productionEndpoint } : worker;
+      const initialized = productionEndpoint ? { ...worker, productionEndpoint } : worker;
+      await pinExpectedHosts(input.configPath, input.workerName, initialized.productionEndpoint);
+      return initialized;
     } catch (error) {
       const worker = await this.inspect(input.accountId, input.workerName).catch(() => null);
       if (worker || result) {
@@ -6359,6 +6463,8 @@ ${error.stderr}`)) {
       await rm6(outputFilePath, { force: true });
     }
   }
+  // restoreProduction re-deploys an older version whose digest is unknown, so the
+  // release annotation is only written when the caller knows it.
   async promote(input) {
     await this.wrangler([
       "versions",
@@ -6366,7 +6472,8 @@ ${error.stderr}`)) {
       `${input.versionId}@100`,
       "--name",
       input.workerName,
-      "--yes"
+      "--yes",
+      ...input.releaseDigest ? ["--message", `moodle-cli-release:${input.releaseDigest}`] : []
     ], input.accountId);
   }
   async restoreProduction(input) {
@@ -6412,6 +6519,7 @@ var NodeReleaseMaterializer = class {
     await copyFile(this.options.workerBundlePath, workerFile);
     const wranglerConfigPath = join7(artifactDirectory, "wrangler.json");
     const secretsFilePath = join7(artifactDirectory, "secrets.json");
+    const expectedHosts = endpointHosts(plan.intent.workerName, plan.existing?.productionEndpoint);
     const config = {
       $schema: "node_modules/wrangler/config-schema.json",
       name: plan.intent.workerName,
@@ -6419,7 +6527,10 @@ var NodeReleaseMaterializer = class {
       main: `./${basename(workerFile)}`,
       compatibility_date: this.options.compatibilityDate,
       preview_urls: true,
-      vars: { MOODLE_ORIGIN: plan.intent.moodleOrigin },
+      vars: {
+        MOODLE_ORIGIN: plan.intent.moodleOrigin,
+        ...expectedHosts.length ? { EXPECTED_HOSTS: expectedHosts.join(",") } : {}
+      },
       durable_objects: {
         bindings: [{ name: "SESSION_BROKER", class_name: "SessionBroker" }]
       },
@@ -6626,7 +6737,7 @@ var PrivateDeploymentReceiptStore = class {
 function createDefaultManagedDeployment(options) {
   const homeDirectory = options.homeDirectory ?? homedir8();
   const platform = options.platform ?? process.platform;
-  const executable = options.executable ?? process.argv[1] ?? process.execPath;
+  const runtime = runtimeCommand(options.executable, options.executableArgs);
   const defaults = {
     wrangler: new NodeWranglerDeploymentAdapter({ wranglerBinPath: options.wranglerBinPath }),
     materializer: new NodeReleaseMaterializer({
@@ -6640,14 +6751,16 @@ function createDefaultManagedDeployment(options) {
       ...options.renewal,
       platform,
       homeDirectory,
-      executable,
+      executable: runtime.command,
+      executableArgs: runtime.args,
       uid: options.uid
     }),
     clients: new DefaultClientIntegration({
       ...options.connector,
       platform,
       homeDirectory,
-      command: executable
+      command: runtime.command,
+      commandArgs: runtime.args
     }),
     receipts: new PrivateDeploymentReceiptStore(join7(homeDirectory, ".config", "moodle-cli", "mcp", "deployments")),
     createToken: () => randomBytes(32).toString("base64url")
@@ -6671,6 +6784,35 @@ function ownershipId(accountId, workerName) {
 function endpointUrl(endpoint, path4) {
   return `${endpoint.replace(/\/$/u, "")}${path4}`;
 }
+async function pinExpectedHosts(configPath, workerName, productionEndpoint) {
+  let config;
+  try {
+    config = JSON.parse(await readFile6(configPath, "utf8"));
+  } catch {
+    throw new DeploymentApplyError("RELEASE_CONFIG_INVALID", "The generated Wrangler configuration is invalid");
+  }
+  if (!isRecord8(config) || !isRecord8(config.vars)) {
+    throw new DeploymentApplyError("RELEASE_CONFIG_INVALID", "The generated Wrangler configuration is invalid");
+  }
+  const hosts = endpointHosts(workerName, productionEndpoint);
+  if (!hosts.length) {
+    throw new DeploymentApplyError("MISSING_ENDPOINT", "The Worker production endpoint is invalid");
+  }
+  config.vars.EXPECTED_HOSTS = hosts.join(",");
+  await writeFile7(configPath, `${JSON.stringify(config, null, 2)}
+`, { mode: 384 });
+}
+function endpointHosts(workerName, endpoint) {
+  if (!endpoint) return [];
+  try {
+    const productionHost = new URL(endpoint).host.toLowerCase();
+    const workerPrefix = `${workerName.toLowerCase()}.`;
+    const previewHost = productionHost.startsWith(workerPrefix) ? `moodle-cli-candidate-${productionHost}` : void 0;
+    return [productionHost, ...previewHost ? [previewHost] : []];
+  } catch {
+    return [];
+  }
+}
 function isRetryableSessionUpload(status) {
   return status === 401 || isRetryableWorkerPropagation(status);
 }
@@ -6815,6 +6957,8 @@ function isMissing4(error) {
 }
 
 // src/mcp/gateway.ts
+import { parse as parse4 } from "node-html-parser";
+var MAX_MCP_FILE_BYTES = 16 * 1024 * 1024;
 var MoodleGatewayError = class extends Error {
   code;
   constructor(code, message) {
@@ -6850,9 +6994,212 @@ function createMoodleGateway(client) {
       return limit === void 0 ? forums : forums.slice(0, limit);
     },
     searchForums: ({ forumId, ...input }) => client.searchForumContent({ ...input, forumCmid: forumId }),
-    getThread: ({ discussionId }) => client.getForumDiscussion(discussionId)
+    getThread: ({ discussionId }) => client.getForumDiscussion(discussionId),
+    async getFile({ source }) {
+      let target = await resolveFileTarget(client, source);
+      let response = await client.requestAbsolute(target.url);
+      if (isHtml(response)) {
+        const html = await response.text();
+        if (looksLikeLoginPage3(html)) throw fileAuthenticationRequired();
+        const links = resourceLinks2(html, target.url);
+        if (links.length !== 1) {
+          const code = links.length ? "MOODLE_FILE_SOURCE_AMBIGUOUS" : "MOODLE_FILE_NOT_FOUND";
+          throw new MoodleGatewayError(code, "The Moodle resource did not resolve to exactly one file.");
+        }
+        const resolved = await resolveFileTarget(client, links[0].url);
+        target = { ...resolved, name: target.name || links[0].name || resolved.name };
+        response = await client.requestAbsolute(target.url);
+        if (isHtml(response)) {
+          if (looksLikeLoginPage3(await response.text())) throw fileAuthenticationRequired();
+          throw new MoodleGatewayError("MOODLE_FILE_NOT_FOUND", "Moodle did not return a downloadable file.");
+        }
+      }
+      const contentLength = Number(response.headers.get("content-length"));
+      if (Number.isFinite(contentLength) && contentLength > MAX_MCP_FILE_BYTES) {
+        throw fileTooLarge();
+      }
+      const content = await readBoundedBody(response, MAX_MCP_FILE_BYTES);
+      const name = safeFilename(contentDispositionFilename2(response.headers.get("content-disposition"))) ?? safeFilename(target.name) ?? safeFilename(urlFilename2(response.url || target.url));
+      if (!name) {
+        throw new MoodleGatewayError("MOODLE_FILE_NAME_MISSING", "Moodle did not provide a safe filename.");
+      }
+      return {
+        name,
+        mimeType: contentType2(response),
+        bytes: content.byteLength,
+        uri: publicFileUrl(response.url || target.url),
+        blob: encodeBase64(content)
+      };
+    }
   };
 }
+async function resolveFileTarget(client, rawSource) {
+  const source = String(rawSource).trim();
+  if (/^\d+$/u.test(source)) {
+    const activityId = Number(source);
+    if (!Number.isSafeInteger(activityId) || activityId < 1) throw invalidFileSource();
+    return validateFileTarget(client, await fileFromActivity(client, activityId));
+  }
+  let url;
+  try {
+    url = new URL(source);
+  } catch {
+    throw invalidFileSource();
+  }
+  const site = new URL(client.baseUrl);
+  const sitePath = site.pathname.replace(/\/$/u, "");
+  if (url.origin !== site.origin) throw invalidFileSource();
+  if (url.pathname === `${sitePath}/mod/resource/view.php`) {
+    const activityId = Number(url.searchParams.get("id"));
+    if (!Number.isSafeInteger(activityId) || activityId < 1) throw invalidFileSource();
+    return validateFileTarget(client, await fileFromActivity(client, activityId));
+  }
+  if (!url.pathname.startsWith(`${sitePath}/pluginfile.php/`)) throw invalidFileSource();
+  return { url: url.toString(), name: urlFilename2(url.toString()) };
+}
+function validateFileTarget(client, target) {
+  let url;
+  try {
+    url = new URL(target.url);
+  } catch {
+    throw invalidFileSource();
+  }
+  const site = new URL(client.baseUrl);
+  const sitePath = site.pathname.replace(/\/$/u, "");
+  const supportedPath = url.pathname === `${sitePath}/mod/resource/view.php` || url.pathname.startsWith(`${sitePath}/pluginfile.php/`);
+  if (url.origin !== site.origin || !supportedPath) throw invalidFileSource();
+  return target;
+}
+async function fileFromActivity(client, activityId) {
+  const activity = await client.getActivity(activityId);
+  if (activity.type !== "resource" || !("file_entries" in activity) || !Array.isArray(activity.file_entries)) {
+    throw new MoodleGatewayError(
+      "MOODLE_FILE_SOURCE_INVALID",
+      `Activity ${activityId} is not a downloadable resource.`
+    );
+  }
+  if (activity.file_entries.length !== 1) {
+    if (activity.file_entries.length === 0) {
+      const resource = activity;
+      const url = resource.target_url || resource.url;
+      if (url) return { url, name: resource.target_name || void 0 };
+    }
+    throw new MoodleGatewayError(
+      "MOODLE_FILE_SOURCE_AMBIGUOUS",
+      `Activity ${activityId} did not resolve to exactly one file. Inspect file_entries and request one URL.`
+    );
+  }
+  const [entry] = activity.file_entries;
+  return { url: entry.url, name: entry.name };
+}
+function resourceLinks2(html, baseUrl) {
+  const root = parse4(html);
+  const entries = root.querySelectorAll(".resourceworkaround a[href], .resourcecontent a[href], a.resourceworkaround[href]").map((link2) => ({
+    name: link2.textContent.trim(),
+    url: new URL(link2.getAttribute("href") ?? "", baseUrl).toString()
+  })).filter((entry) => entry.url !== baseUrl);
+  return entries.filter((entry, index) => entries.findIndex((candidate) => candidate.url === entry.url) === index);
+}
+async function readBoundedBody(response, maxBytes) {
+  if (!response.body) return new Uint8Array();
+  const reader = response.body.getReader();
+  const chunks2 = [];
+  let bytes = 0;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    bytes += value.byteLength;
+    if (bytes > maxBytes) {
+      await reader.cancel().catch(() => void 0);
+      throw fileTooLarge();
+    }
+    chunks2.push(value);
+  }
+  const content = new Uint8Array(bytes);
+  let offset = 0;
+  for (const chunk of chunks2) {
+    content.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return content;
+}
+function invalidFileSource() {
+  return new MoodleGatewayError(
+    "MOODLE_FILE_SOURCE_INVALID",
+    "Use a positive resource activity ID, a same-site resource URL, or a same-site pluginfile URL."
+  );
+}
+function fileTooLarge() {
+  return new MoodleGatewayError(
+    "MOODLE_FILE_TOO_LARGE",
+    `Moodle files returned through MCP cannot exceed ${MAX_MCP_FILE_BYTES / 1024 / 1024} MiB.`
+  );
+}
+function fileAuthenticationRequired() {
+  return new MoodleGatewayError(
+    "MOODLE_AUTH_REQUIRED",
+    "Moodle returned a login page instead of the requested file."
+  );
+}
+function isHtml(response) {
+  if (/\battachment\b/iu.test(response.headers.get("content-disposition") ?? "")) return false;
+  const type = response.headers.get("content-type")?.toLowerCase() ?? "";
+  return type.includes("text/html") || type.includes("application/xhtml+xml");
+}
+function looksLikeLoginPage3(html) {
+  const root = parse4(html);
+  return root.querySelector('form[action*="/login/"], input[name="password"], #page-login-index') !== null || /<title>\s*(?:log in|login)/iu.test(html);
+}
+function contentType2(response) {
+  return response.headers.get("content-type")?.split(";", 1)[0]?.trim() || "application/octet-stream";
+}
+function contentDispositionFilename2(value) {
+  if (!value) return void 0;
+  const extended = value.match(/filename\*\s*=\s*([^;]+)/iu)?.[1]?.trim().replace(/^"|"$/gu, "");
+  if (extended) {
+    const encoded = extended.replace(/^[^']*'[^']*'/u, "");
+    try {
+      return decodeURIComponent(encoded);
+    } catch {
+      return encoded;
+    }
+  }
+  const quoted = value.match(/filename\s*=\s*"((?:\\.|[^"])*)"/iu)?.[1];
+  if (quoted !== void 0) return quoted.replace(/\\([\\"])/gu, "$1");
+  return value.match(/filename\s*=\s*([^;]+)/iu)?.[1]?.trim();
+}
+function urlFilename2(value) {
+  try {
+    const encoded = new URL(value).pathname.split("/").at(-1) ?? "";
+    try {
+      return decodeURIComponent(encoded);
+    } catch {
+      return encoded;
+    }
+  } catch {
+    return void 0;
+  }
+}
+function safeFilename(value) {
+  const name = value?.split(/[\\/]/u).at(-1)?.replace(/[\u0000-\u001f\u007f]/gu, "").trim();
+  return name && name !== "." && name !== ".." ? name : void 0;
+}
+function publicFileUrl(value) {
+  const url = new URL(value);
+  url.username = "";
+  url.password = "";
+  for (const key of [...url.searchParams.keys()]) {
+    if (key !== "forcedownload" && key !== "download") url.searchParams.delete(key);
+  }
+  return url.toString();
+}
+function encodeBase64(content) {
+  let binary = "";
+  for (let offset = 0; offset < content.byteLength; offset += 32768) {
+    binary += String.fromCharCode(...content.subarray(offset, offset + 32768));
+  }
+  return btoa(binary);
+}
 
 // src/mcp/server.ts
 import { z as z3, ZodError } from "zod";
@@ -6865,14 +7212,122 @@ var READ_ONLY_ANNOTATIONS = {
 };
 var emptyInput = z3.object({}).strict();
 var positiveId = z3.number().int().positive();
-var objectOutput = z3.looseObject({});
-var listOutput = z3.array(objectOutput);
+var integer = z3.number().int();
+var userValue = z3.looseObject({
+  userid: integer,
+  username: z3.string(),
+  fullname: z3.string(),
+  sitename: z3.string(),
+  siteurl: z3.string(),
+  lang: z3.string().optional()
+});
+var courseValue = z3.looseObject({
+  id: integer,
+  shortname: z3.string(),
+  fullname: z3.string(),
+  category: z3.number().int(),
+  visible: z3.boolean(),
+  startdate: z3.number(),
+  enddate: z3.number().optional()
+});
+var activityValue = z3.looseObject({
+  id: integer,
+  name: z3.string(),
+  modname: z3.string(),
+  url: z3.string(),
+  visible: z3.boolean(),
+  description: z3.string()
+});
+var fileEntryValue = z3.looseObject({
+  name: z3.string(),
+  url: z3.string(),
+  requires_authentication: z3.boolean()
+});
+var activityDetailValue = z3.looseObject({
+  id: positiveId,
+  name: z3.string(),
+  type: z3.string(),
+  url: z3.string().optional(),
+  target_name: z3.string().optional(),
+  target_url: z3.string().optional(),
+  file_entries: z3.array(fileEntryValue).optional()
+});
+var sectionValue = z3.looseObject({
+  id: z3.number().int(),
+  name: z3.string(),
+  section: z3.number().int(),
+  visible: z3.boolean(),
+  summary: z3.string(),
+  activities: z3.array(activityValue)
+});
+var todoValue = z3.looseObject({
+  id: z3.number().int(),
+  name: z3.string(),
+  course_id: z3.number().int(),
+  course_name: z3.string(),
+  due_at: z3.number(),
+  url: z3.string()
+});
+var gradeItemValue = z3.looseObject({
+  name: z3.string(),
+  item_type: z3.string(),
+  grade: z3.string(),
+  range: z3.string(),
+  percentage: z3.string(),
+  feedback: z3.string(),
+  url: z3.string()
+});
+var gradesValue = z3.looseObject({
+  course_id: integer,
+  course_name: z3.string(),
+  learner_name: z3.string(),
+  total_grade: z3.string(),
+  total_range: z3.string(),
+  total_percentage: z3.string(),
+  items: z3.array(gradeItemValue)
+});
+var forumValue = z3.looseObject({
+  id: integer,
+  name: z3.string(),
+  course_id: integer,
+  course_name: z3.string(),
+  url: z3.string()
+});
+var forumSearchValue = z3.looseObject({
+  course_id: integer,
+  course_name: z3.string(),
+  forum_id: integer,
+  forum_name: z3.string(),
+  discussion_id: integer,
+  discussion_subject: z3.string(),
+  post_id: integer,
+  snippet: z3.string(),
+  url: z3.string()
+});
+var forumPostValue = z3.looseObject({
+  id: integer,
+  discussion_id: integer,
+  subject: z3.string(),
+  message_text: z3.string(),
+  author: z3.looseObject({ id: integer, fullname: z3.string() }),
+  url: z3.string()
+});
+var threadValue = z3.looseObject({
+  id: integer,
+  subject: z3.string(),
+  course_id: integer,
+  forum_id: integer,
+  group_id: z3.number().int(),
+  group_name: z3.string(),
+  url: z3.string(),
+  posts: z3.array(forumPostValue)
+});
 var TOOL_REGISTRATIONS = [
   {
     name: "get_user",
     description: "Get the authenticated Moodle user and site.",
     input: emptyInput,
-    output: z3.object({ user: objectOutput })
+    output: z3.object({ user: userValue })
   },
   {
     name: "get_overview",
@@ -6882,19 +7337,31 @@ var TOOL_REGISTRATIONS = [
       todoDays: z3.number().int().min(1).max(365).optional(),
       alertsLimit: z3.number().int().min(1).max(100).optional().default(5)
     }).strict(),
-    output: z3.object({ overview: objectOutput })
+    output: z3.object({
+      overview: z3.looseObject({
+        user: userValue,
+        courses: z3.array(courseValue),
+        todo: z3.array(todoValue),
+        errors: z3.array(z3.string())
+      })
+    })
   },
   {
     name: "list_courses",
     description: "List the authenticated user's Moodle courses.",
     input: z3.object({ limit: z3.number().int().min(1).max(200).optional().default(100) }).strict(),
-    output: z3.object({ courses: listOutput })
+    output: z3.object({ courses: z3.array(courseValue) })
   },
   {
     name: "get_course",
     description: "Get one Moodle course and its sections.",
     input: z3.object({ courseId: positiveId }).strict(),
-    output: z3.object({ course: objectOutput })
+    output: z3.object({
+      course: z3.looseObject({
+        course: courseValue,
+        sections: z3.array(sectionValue)
+      })
+    })
   },
   {
     name: "list_activities",
@@ -6903,19 +7370,19 @@ var TOOL_REGISTRATIONS = [
       courseId: positiveId,
       limit: z3.number().int().min(1).max(200).optional().default(100)
     }).strict(),
-    output: z3.object({ activities: listOutput })
+    output: z3.object({ activities: z3.array(activityValue) })
   },
   {
     name: "get_activity",
     description: "Get the supported details for one Moodle activity.",
     input: z3.object({ activityId: positiveId }).strict(),
-    output: z3.object({ activity: objectOutput })
+    output: z3.object({ activity: activityDetailValue })
   },
   {
     name: "get_grades",
     description: "Get the authenticated user's grades for one Moodle course.",
     input: z3.object({ courseId: positiveId }).strict(),
-    output: z3.object({ grades: objectOutput })
+    output: z3.object({ grades: gradesValue })
   },
   {
     name: "list_forums",
@@ -6924,7 +7391,7 @@ var TOOL_REGISTRATIONS = [
       courseId: positiveId.optional(),
       limit: z3.number().int().min(1).max(100).optional().default(50)
     }).strict(),
-    output: z3.object({ forums: listOutput })
+    output: z3.object({ forums: z3.array(forumValue) })
   },
   {
     name: "search_forums",
@@ -6940,13 +7407,28 @@ var TOOL_REGISTRATIONS = [
       maxForums: z3.number().int().min(1).max(50).optional(),
       maxDiscussionsPerForum: z3.number().int().min(1).max(100).optional()
     }).strict(),
-    output: z3.object({ results: listOutput })
+    output: z3.object({ results: z3.array(forumSearchValue) })
   },
   {
     name: "get_thread",
     description: "Get one Moodle forum discussion and its posts.",
     input: z3.object({ discussionId: positiveId }).strict(),
-    output: z3.object({ thread: objectOutput })
+    output: z3.object({ thread: threadValue })
+  },
+  {
+    name: "get_file",
+    description: "Fetch one authenticated Moodle file and return its content directly (maximum 16 MiB).",
+    input: z3.object({
+      source: z3.union([positiveId, z3.string().trim().min(1).max(2048)])
+    }).strict(),
+    output: z3.object({
+      file: z3.object({
+        name: z3.string(),
+        mime_type: z3.string(),
+        bytes: z3.number().int().nonnegative(),
+        uri: z3.string()
+      })
+    })
   }
 ];
 var TOOL_CATALOG = TOOL_REGISTRATIONS.map(({ name, description, input, output }) => ({
@@ -7014,12 +7496,11 @@ function createMoodleMcpServer(gateway, options = {}) {
         }
         if (error instanceof UnsupportedProtocolVersionError) {
           return jsonRpcFailure(id, {
-            code: -32602,
-            message: error.message,
+            code: -32022,
+            message: "Unsupported protocol version",
             data: {
-              type: "UNSUPPORTED_PROTOCOL_VERSION",
-              protocolVersion: error.protocolVersion,
-              supportedVersions: [...error.supportedVersions]
+              supported: [...error.supportedVersions],
+              requested: error.protocolVersion
             }
           });
         }
@@ -7067,7 +7548,7 @@ async function callTool(gateway, params) {
     const payload = await runGatewayTool(gateway, name, input);
     const structuredContent = registration.output.parse(wrapToolOutput(name, payload));
     return {
-      content: [{ type: "text", text: summarizeToolOutput(name, payload) }],
+      content: toolContent(name, payload),
       structuredContent,
       resultType: "complete",
       _meta: RESULT_META
@@ -7128,6 +7609,8 @@ async function runGatewayTool(gateway, name, input) {
       });
     case "get_thread":
       return gateway.getThread({ discussionId: numberValue3(input.discussionId) });
+    case "get_file":
+      return gateway.getFile({ source: fileSource(input.source) });
     default:
       throw new McpCallError("TOOL_NOT_FOUND", `Unknown Moodle tool: ${name}`);
   }
@@ -7145,8 +7628,33 @@ function wrapToolOutput(name, payload) {
     search_forums: "results",
     get_thread: "thread"
   };
+  if (name === "get_file" && isMoodleFile(payload)) {
+    return {
+      file: {
+        name: payload.name,
+        mime_type: payload.mimeType,
+        bytes: payload.bytes,
+        uri: payload.uri
+      }
+    };
+  }
   return { [keys[name] ?? "result"]: payload };
 }
+function toolContent(name, payload) {
+  const text = { type: "text", text: summarizeToolOutput(name, payload) };
+  if (name !== "get_file" || !isMoodleFile(payload)) return [text];
+  return [
+    text,
+    {
+      type: "resource",
+      resource: {
+        uri: payload.uri,
+        mimeType: payload.mimeType,
+        blob: payload.blob
+      }
+    }
+  ];
+}
 function summarizeToolOutput(name, payload) {
   if (Array.isArray(payload)) {
     const labels = {
@@ -7178,6 +7686,9 @@ function summarizeToolOutput(name, payload) {
   if (name === "get_thread" && isRecord9(payload)) {
     return `Loaded forum thread ${stringValue4(payload.subject) || numberValue3(payload.id)}.`;
   }
+  if (name === "get_file" && isMoodleFile(payload)) {
+    return `Loaded Moodle file ${payload.name} (${payload.bytes} bytes).`;
+  }
   return "Moodle request completed.";
 }
 function mapMoodleError(error) {
@@ -7213,6 +7724,9 @@ function optionalNumber(value) {
 function stringValue4(value) {
   return typeof value === "string" ? value : "";
 }
+function fileSource(value) {
+  return typeof value === "number" || typeof value === "string" ? value : "";
+}
 function booleanValue2(value) {
   return value === true;
 }
@@ -7222,6 +7736,9 @@ function enumValue(value, values) {
 function isRecord9(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isMoodleFile(value) {
+  return isRecord9(value) && typeof value.name === "string" && typeof value.mimeType === "string" && typeof value.bytes === "number" && typeof value.uri === "string" && typeof value.blob === "string";
+}
 
 // src/mcp/stdio.ts
 async function serveMoodleMcpStdio(server, options) {
@@ -7309,8 +7826,7 @@ var DefaultMcpCommandService = class {
     this.worker = options.worker ?? new FetchManagedWorkerClient(options.fetchImpl);
     this.renewal = options.renewal ?? new DefaultRenewalIntegration({
       platform: process.platform,
-      homeDirectory: this.homeDirectory,
-      executable: process.argv[1] ?? process.execPath
+      homeDirectory: this.homeDirectory
     });
     this.sessions = options.sessions ?? createBackgroundMoodleSessionSource({
       env: options.env,
@@ -7473,7 +7989,6 @@ var DefaultMcpCommandService = class {
     const connectors = createDefaultClientConnectors(profile, {
       homeDirectory: this.homeDirectory,
       platform: process.platform,
-      command: process.argv[1] ?? "moodle",
       mode: input.mode,
       ...input.mode === "remote" ? { endpoint, accessToken: credentials.mcpAccessToken } : {}
     });
@@ -7676,7 +8191,6 @@ var DefaultMcpCommandService = class {
       compatibilityDate: this.options.compatibilityDate ?? WORKER_COMPATIBILITY_DATE,
       homeDirectory: this.homeDirectory,
       platform: process.platform,
-      executable: process.argv[1] ?? process.execPath,
       fetch: this.options.fetchImpl,
       auth: {
         env: this.options.env,
@@ -7748,8 +8262,7 @@ Selection: `)).trim());
   async connectedClientNames(profile) {
     const connectors = createDefaultClientConnectors(profile, {
       homeDirectory: this.homeDirectory,
-      platform: process.platform,
-      command: process.argv[1] ?? "moodle"
+      platform: process.platform
     });
     const clients = [];
     for (const connector of connectors) {