moodle-cli 0.7.0 → 0.7.1

package/dist/moodle.js

@@ -4555,7 +4555,7 @@ function escapeXml(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0";
+var VERSION = "0.7.1";
 
 // src/forum.ts
 function parseDiscussionReference(value) {
@@ -6073,6 +6073,7 @@ function asDeploymentError(error) {
 }
 
 // src/mcp/deployment/node-adapters.ts
+import { isDeepStrictEqual } from "util";
 import { spawn as spawn2 } from "child_process";
 import { createHash as createHash2, randomBytes as randomBytes2 } from "crypto";
 import { chmod as chmod5, copyFile, mkdir as mkdir7, mkdtemp, readFile as readFile6, rm as rm6, writeFile as writeFile7 } from "fs/promises";
@@ -6910,6 +6911,19 @@ var FetchManagedWorkerClient = class {
     if (!moodleUser) {
       throw new DeploymentApplyError("MCP_SMOKE_FAILED", "MCP get_user check returned no Moodle user");
     }
+    const coursesResult = await this.mcpCall(input.endpoint, input.mcpAccessToken, "tools/call", { name: "list_courses", arguments: { limit: 1 } }, 4);
+    const courses = readableToolResult(coursesResult).courses;
+    if (!Array.isArray(courses)) throw new DeploymentApplyError("MCP_SMOKE_FAILED", "MCP list_courses returned no course list");
+    if (courses.length) {
+      const first2 = courses[0];
+      if (!isRecord8(first2) || !Number.isSafeInteger(first2.id) || Number(first2.id) <= 0) {
+        throw new DeploymentApplyError("MCP_SMOKE_FAILED", "MCP list_courses returned no usable course ID");
+      }
+      const detail = readableToolResult(await this.mcpCall(input.endpoint, input.mcpAccessToken, "tools/call", { name: "get_course", arguments: { courseId: first2.id } }, 5));
+      if (!isRecord8(detail.course) || !isRecord8(detail.course.course) || detail.course.course.id !== first2.id || !Array.isArray(detail.course.sections)) {
+        throw new DeploymentApplyError("MCP_SMOKE_FAILED", "MCP course lookup did not match the listed course");
+      }
+    }
     return { moodleUser };
   }
   async manageClients(input) {
@@ -6970,6 +6984,7 @@ var FetchManagedWorkerClient = class {
     if (!response.ok || !isRecord8(body) || body.jsonrpc !== "2.0" || body.id !== id || "error" in body || !("result" in body)) {
       throw new DeploymentApplyError("MCP_SMOKE_FAILED", `MCP ${method} check failed`);
     }
+    if (method === "tools/call") readableToolResult(body.result);
     return body.result;
   }
   async fetchWithRetry(input, init, retryable) {
@@ -7119,11 +7134,19 @@ function firstHealthCheck(body, name) {
   const check = checks[name][0];
   return isRecord8(check) ? check : null;
 }
-function mcpUserFullname(result) {
-  if (!isRecord8(result) || !isRecord8(result.structuredContent)) {
-    return null;
+function readableToolResult(result) {
+  if (isRecord8(result) && result.isError !== true && Array.isArray(result.content)) {
+    try {
+      const text = result.content.filter((block) => isRecord8(block) && block.type === "text").map((block) => block.text).join("\n");
+      const parsed = JSON.parse(text);
+      if (isRecord8(parsed) && isDeepStrictEqual(parsed, result.structuredContent)) return parsed;
+    } catch {
+    }
   }
-  const user = result.structuredContent.user;
+  throw new DeploymentApplyError("MCP_CONTENT_INCOMPLETE", "MCP text content is missing the complete structured result");
+}
+function mcpUserFullname(result) {
+  const user = readableToolResult(result).user;
   return isRecord8(user) && typeof user.fullname === "string" && user.fullname.trim() ? user.fullname.trim() : null;
 }
 function parseJsonOutput(output) {
@@ -7650,7 +7673,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "get_overview",
-    description: "Get a bounded dashboard overview with courses, deadlines, and alerts.",
+    description: "Get courses, deadlines and alerts. Course IDs can be used as courseId in other tools; todo due_at values are Unix timestamps in seconds.",
     input: z3.object({
       todoLimit: z3.number().int().min(1).max(100).optional().default(5),
       todoDays: z3.number().int().min(1).max(365).optional(),
@@ -7667,7 +7690,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "list_courses",
-    description: "List the authenticated user's Moodle courses.",
+    description: "List the authenticated user's Moodle courses with IDs and names. Use a returned id as courseId for get_course, list_activities, get_grades or list_forums.",
     input: z3.object({ limit: z3.number().int().min(1).max(200).optional().default(100) }).strict(),
     output: z3.object({ courses: z3.array(courseValue) })
   },
@@ -7867,7 +7890,7 @@ async function callTool(gateway, params) {
     const payload = await runGatewayTool(gateway, name, input);
     const structuredContent = registration.output.parse(wrapToolOutput(name, payload));
     return {
-      content: toolContent(name, payload),
+      content: toolContent(name, payload, structuredContent),
       structuredContent,
       resultType: "complete",
       _meta: RESULT_META
@@ -7878,7 +7901,7 @@ async function callTool(gateway, params) {
     }
     const mapped = mapMoodleError(error);
     return {
-      content: [{ type: "text", text: mapped.message }],
+      content: [{ type: "text", text: JSON.stringify({ error: mapped }) }],
       structuredContent: { error: mapped },
       isError: true,
       resultType: "complete",
@@ -7959,8 +7982,8 @@ function wrapToolOutput(name, payload) {
   }
   return { [keys[name] ?? "result"]: payload };
 }
-function toolContent(name, payload) {
-  const text = { type: "text", text: summarizeToolOutput(name, payload) };
+function toolContent(name, payload, structuredContent) {
+  const text = { type: "text", text: JSON.stringify(structuredContent) };
   if (name !== "get_file" || !isMoodleFile(payload)) return [text];
   return [
     text,
@@ -7974,42 +7997,6 @@ function toolContent(name, payload) {
     }
   ];
 }
-function summarizeToolOutput(name, payload) {
-  if (Array.isArray(payload)) {
-    const labels = {
-      list_courses: ["Moodle course", "Moodle courses"],
-      list_activities: ["activity", "activities"],
-      list_forums: ["forum", "forums"],
-      search_forums: ["forum result", "forum results"]
-    };
-    const [singular, plural] = labels[name] ?? ["result", "results"];
-    return `Found ${payload.length} ${payload.length === 1 ? singular : plural}.`;
-  }
-  if (name === "get_user" && isRecord9(payload)) {
-    return `Authenticated as ${stringValue4(payload.fullname)}.`;
-  }
-  if (name === "get_overview" && isRecord9(payload)) {
-    const courses = Array.isArray(payload.courses) ? payload.courses.length : 0;
-    const todo = Array.isArray(payload.todo) ? payload.todo.length : 0;
-    return `Overview includes ${courses} courses and ${todo} upcoming items.`;
-  }
-  if (name === "get_course" && isRecord9(payload) && isRecord9(payload.course)) {
-    return `Loaded course ${stringValue4(payload.course.fullname) || numberValue3(payload.course.id)}.`;
-  }
-  if (name === "get_activity" && isRecord9(payload)) {
-    return `Loaded activity ${stringValue4(payload.name) || numberValue3(payload.id)}.`;
-  }
-  if (name === "get_grades" && isRecord9(payload)) {
-    return `Loaded grades for ${stringValue4(payload.course_name) || numberValue3(payload.course_id)}.`;
-  }
-  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) {
   const record = isRecord9(error) ? error : {};
   const code = typeof record.code === "string" ? record.code : "";

package/dist/worker/recovery.js

@@ -26452,7 +26452,7 @@ function stringValue(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0";
+var VERSION = "0.7.1";
 
 // src/worker/http.ts
 var HEALTH_PATH = "/healthz";
@@ -29264,7 +29264,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "get_overview",
-    description: "Get a bounded dashboard overview with courses, deadlines, and alerts.",
+    description: "Get courses, deadlines and alerts. Course IDs can be used as courseId in other tools; todo due_at values are Unix timestamps in seconds.",
     input: external_exports.object({
       todoLimit: external_exports.number().int().min(1).max(100).optional().default(5),
       todoDays: external_exports.number().int().min(1).max(365).optional(),
@@ -29281,7 +29281,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "list_courses",
-    description: "List the authenticated user's Moodle courses.",
+    description: "List the authenticated user's Moodle courses with IDs and names. Use a returned id as courseId for get_course, list_activities, get_grades or list_forums.",
     input: external_exports.object({ limit: external_exports.number().int().min(1).max(200).optional().default(100) }).strict(),
     output: external_exports.object({ courses: external_exports.array(courseValue) })
   },
@@ -29481,7 +29481,7 @@ async function callTool(gateway, params) {
     const payload = await runGatewayTool(gateway, name, input2);
     const structuredContent = registration.output.parse(wrapToolOutput(name, payload));
     return {
-      content: toolContent(name, payload),
+      content: toolContent(name, payload, structuredContent),
       structuredContent,
       resultType: "complete",
       _meta: RESULT_META
@@ -29492,7 +29492,7 @@ async function callTool(gateway, params) {
     }
     const mapped = mapMoodleError(error62);
     return {
-      content: [{ type: "text", text: mapped.message }],
+      content: [{ type: "text", text: JSON.stringify({ error: mapped }) }],
       structuredContent: { error: mapped },
       isError: true,
       resultType: "complete",
@@ -29573,8 +29573,8 @@ function wrapToolOutput(name, payload) {
   }
   return { [keys[name] ?? "result"]: payload };
 }
-function toolContent(name, payload) {
-  const text = { type: "text", text: summarizeToolOutput(name, payload) };
+function toolContent(name, payload, structuredContent) {
+  const text = { type: "text", text: JSON.stringify(structuredContent) };
   if (name !== "get_file" || !isMoodleFile(payload)) return [text];
   return [
     text,
@@ -29588,42 +29588,6 @@ function toolContent(name, payload) {
     }
   ];
 }
-function summarizeToolOutput(name, payload) {
-  if (Array.isArray(payload)) {
-    const labels = {
-      list_courses: ["Moodle course", "Moodle courses"],
-      list_activities: ["activity", "activities"],
-      list_forums: ["forum", "forums"],
-      search_forums: ["forum result", "forum results"]
-    };
-    const [singular, plural2] = labels[name] ?? ["result", "results"];
-    return `Found ${payload.length} ${payload.length === 1 ? singular : plural2}.`;
-  }
-  if (name === "get_user" && isRecord7(payload)) {
-    return `Authenticated as ${stringValue4(payload.fullname)}.`;
-  }
-  if (name === "get_overview" && isRecord7(payload)) {
-    const courses = Array.isArray(payload.courses) ? payload.courses.length : 0;
-    const todo = Array.isArray(payload.todo) ? payload.todo.length : 0;
-    return `Overview includes ${courses} courses and ${todo} upcoming items.`;
-  }
-  if (name === "get_course" && isRecord7(payload) && isRecord7(payload.course)) {
-    return `Loaded course ${stringValue4(payload.course.fullname) || numberValue3(payload.course.id)}.`;
-  }
-  if (name === "get_activity" && isRecord7(payload)) {
-    return `Loaded activity ${stringValue4(payload.name) || numberValue3(payload.id)}.`;
-  }
-  if (name === "get_grades" && isRecord7(payload)) {
-    return `Loaded grades for ${stringValue4(payload.course_name) || numberValue3(payload.course_id)}.`;
-  }
-  if (name === "get_thread" && isRecord7(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(error62) {
   const record2 = isRecord7(error62) ? error62 : {};
   const code = typeof record2.code === "string" ? record2.code : "";

package/dist/worker/worker.js

@@ -26452,7 +26452,7 @@ function stringValue(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0";
+var VERSION = "0.7.1";
 
 // src/worker/http.ts
 var HEALTH_PATH = "/healthz";
@@ -29264,7 +29264,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "get_overview",
-    description: "Get a bounded dashboard overview with courses, deadlines, and alerts.",
+    description: "Get courses, deadlines and alerts. Course IDs can be used as courseId in other tools; todo due_at values are Unix timestamps in seconds.",
     input: external_exports.object({
       todoLimit: external_exports.number().int().min(1).max(100).optional().default(5),
       todoDays: external_exports.number().int().min(1).max(365).optional(),
@@ -29281,7 +29281,7 @@ var TOOL_REGISTRATIONS = [
   },
   {
     name: "list_courses",
-    description: "List the authenticated user's Moodle courses.",
+    description: "List the authenticated user's Moodle courses with IDs and names. Use a returned id as courseId for get_course, list_activities, get_grades or list_forums.",
     input: external_exports.object({ limit: external_exports.number().int().min(1).max(200).optional().default(100) }).strict(),
     output: external_exports.object({ courses: external_exports.array(courseValue) })
   },
@@ -29481,7 +29481,7 @@ async function callTool(gateway, params) {
     const payload = await runGatewayTool(gateway, name, input2);
     const structuredContent = registration.output.parse(wrapToolOutput(name, payload));
     return {
-      content: toolContent(name, payload),
+      content: toolContent(name, payload, structuredContent),
       structuredContent,
       resultType: "complete",
       _meta: RESULT_META
@@ -29492,7 +29492,7 @@ async function callTool(gateway, params) {
     }
     const mapped = mapMoodleError(error62);
     return {
-      content: [{ type: "text", text: mapped.message }],
+      content: [{ type: "text", text: JSON.stringify({ error: mapped }) }],
       structuredContent: { error: mapped },
       isError: true,
       resultType: "complete",
@@ -29573,8 +29573,8 @@ function wrapToolOutput(name, payload) {
   }
   return { [keys[name] ?? "result"]: payload };
 }
-function toolContent(name, payload) {
-  const text = { type: "text", text: summarizeToolOutput(name, payload) };
+function toolContent(name, payload, structuredContent) {
+  const text = { type: "text", text: JSON.stringify(structuredContent) };
   if (name !== "get_file" || !isMoodleFile(payload)) return [text];
   return [
     text,
@@ -29588,42 +29588,6 @@ function toolContent(name, payload) {
     }
   ];
 }
-function summarizeToolOutput(name, payload) {
-  if (Array.isArray(payload)) {
-    const labels = {
-      list_courses: ["Moodle course", "Moodle courses"],
-      list_activities: ["activity", "activities"],
-      list_forums: ["forum", "forums"],
-      search_forums: ["forum result", "forum results"]
-    };
-    const [singular, plural2] = labels[name] ?? ["result", "results"];
-    return `Found ${payload.length} ${payload.length === 1 ? singular : plural2}.`;
-  }
-  if (name === "get_user" && isRecord7(payload)) {
-    return `Authenticated as ${stringValue4(payload.fullname)}.`;
-  }
-  if (name === "get_overview" && isRecord7(payload)) {
-    const courses = Array.isArray(payload.courses) ? payload.courses.length : 0;
-    const todo = Array.isArray(payload.todo) ? payload.todo.length : 0;
-    return `Overview includes ${courses} courses and ${todo} upcoming items.`;
-  }
-  if (name === "get_course" && isRecord7(payload) && isRecord7(payload.course)) {
-    return `Loaded course ${stringValue4(payload.course.fullname) || numberValue3(payload.course.id)}.`;
-  }
-  if (name === "get_activity" && isRecord7(payload)) {
-    return `Loaded activity ${stringValue4(payload.name) || numberValue3(payload.id)}.`;
-  }
-  if (name === "get_grades" && isRecord7(payload)) {
-    return `Loaded grades for ${stringValue4(payload.course_name) || numberValue3(payload.course_id)}.`;
-  }
-  if (name === "get_thread" && isRecord7(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(error62) {
   const record2 = isRecord7(error62) ? error62 : {};
   const code = typeof record2.code === "string" ? record2.code : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodle-cli",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Terminal-first CLI for Moodle LMS",
   "license": "MIT",
   "type": "module",