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

package/README.md

@@ -174,7 +174,7 @@ moodle mcp bridge
 
 The default client connection uses `moodle mcp bridge`, which keeps the Bearer token out of client configuration. Use `moodle mcp connect CLIENT --mode remote` for clients that support authenticated remote MCP headers.
 
-Alpha version `0.7.0-alpha.3` supports MCP `2026-07-28` and a stateless compatibility lane for `2025-11-25` clients.
+Alpha version `0.7.0-alpha.4` supports MCP `2026-07-28` and a stateless compatibility lane for `2025-11-25` clients.
 
 ### Configuration
 

package/dist/moodle.js

@@ -98,7 +98,7 @@ var MoodleAPIError = class extends CliError {
   moodleErrorCode;
   constructor(message, moodleErrorCode) {
     const auth = isLoginErrorCode(moodleErrorCode);
-    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /^HTTP 404\b/.test(message);
+    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /\bHTTP 404\b/.test(message);
     super(auth ? "auth" : notFound ? "not_found" : "upstream", message, auth ? "Run `moodle auth login`." : void 0);
     this.moodleErrorCode = moodleErrorCode;
   }
@@ -898,6 +898,32 @@ function htmlText(value, baseUrl) {
 
 // src/scraper.ts
 import { parse as parse2 } from "node-html-parser";
+function parseMoodleErrorHtml(html) {
+  const root = parse2(html);
+  const messageNode = first(root, [
+    ".errormessage",
+    ".alert-danger .alert-message",
+    "[data-region='error-message']",
+    ".alert-danger[role='alert']",
+    ".alert-danger"
+  ]);
+  if (!messageNode) {
+    return null;
+  }
+  const messageRoot = parse2(messageNode.toString());
+  for (const unwanted of messageRoot.querySelectorAll(
+    "button, .close, .errorcode, .stacktrace, .debuginfo, .backtrace, a.alert-link, a[href*='/error/']"
+  )) {
+    unwanted.remove();
+  }
+  const message = cleanText(messageRoot.textContent);
+  if (!message) {
+    return null;
+  }
+  const errorCodeText = cleanNodeText(root.querySelector(".errorcode"));
+  const errorCode = errorCodeText.match(/^error\s+code\s*:\s*([a-z][a-z0-9_]*)\s*$/iu)?.[1] ?? moodleDocsErrorCode(root);
+  return { message, ...errorCode ? { code: errorCode } : {} };
+}
 function parsePageContext(html, baseUrl) {
   const root = parse2(html);
   const config = parseMoodleConfig(html);
@@ -1329,6 +1355,16 @@ function selectedGroupName(root, groupId) {
   }
   return "";
 }
+function moodleDocsErrorCode(root) {
+  for (const link2 of root.querySelectorAll("a[href*='/error/']")) {
+    const href = link2.getAttribute("href") ?? "";
+    const code = href.match(/\/error\/[^/]+\/([a-z][a-z0-9_]*)/iu)?.[1];
+    if (code) {
+      return code;
+    }
+  }
+  return void 0;
+}
 function cleanNodeText(node) {
   return cleanText(node?.textContent ?? "");
 }
@@ -1818,7 +1854,7 @@ var MoodleClientCoreApiError = class extends MoodleClientCoreError {
   moodleErrorCode;
   constructor(message, moodleErrorCode) {
     const auth = isLoginErrorCode2(moodleErrorCode);
-    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /^HTTP 404\b/.test(message);
+    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /\bHTTP 404\b/.test(message);
     super(
       auth ? "auth" : notFound ? "not_found" : "upstream",
       message,
@@ -2249,7 +2285,15 @@ var MoodleClientCore = class {
       throw this.errors.api("Session expired", "servicerequireslogin");
     }
     if (!response.ok) {
-      throw this.errors.api(`HTTP ${response.status} loading ${safeUrl(url)}`);
+      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 moodleError = await response.text().then(parseMoodleErrorHtml).catch(() => null);
+        if (moodleError) {
+          throw this.errors.api(`${moodleError.message} (${context})`, moodleError.code);
+        }
+      }
+      throw this.errors.api(context);
     }
     return response;
   }
@@ -2715,84 +2759,163 @@ function isMissingFileError2(error) {
   return isRecord5(error) && error.code === "ENOENT";
 }
 
+// src/terminal-table.ts
+import Table from "tty-table";
+var DEFAULT_WIDTH = 120;
+var MIN_TABLE_WIDTH = 40;
+function renderTerminalTable(columns, rows, options = {}) {
+  const tableWidth = Math.max(MIN_TABLE_WIDTH, options.width ?? process.stdout.columns ?? DEFAULT_WIDTH);
+  const tableColumns = columns.map((column, index) => ({
+    align: "left",
+    alias: sanitizeTerminalText(column.label),
+    headerAlign: "left",
+    value: `column_${index}`
+  }));
+  const data = rows.map((row) => Object.fromEntries(
+    tableColumns.map((column, index) => [column.value, sanitizeTerminalText(row[index] ?? "")])
+  ));
+  const tableOptions = {
+    COLUMNS: tableWidth,
+    compact: true,
+    marginLeft: 0,
+    marginTop: 0,
+    width: String(tableWidth)
+  };
+  const output = Table(tableColumns, data, tableOptions).render();
+  return [options.title ? sanitizeTerminalText(options.title) : "", output].filter(Boolean).join("\n");
+}
+function renderKeyValueTable(rows, options = {}) {
+  const present = rows.filter(([, value]) => value !== "");
+  if (present.length === 0) {
+    return options.title ? `${options.title}
+No details` : "No details";
+  }
+  const columns = [
+    { label: "Field" },
+    { label: "Value" }
+  ];
+  return renderTerminalTable(columns, present, options);
+}
+function sanitizeTerminalText(value) {
+  return value.replace(/\r\n?/gu, "\n").replace(/\t/gu, " ").replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]/gu, "");
+}
+
 // src/formatters.ts
 function formatUser(user) {
-  return formatKeyValues([
+  return renderKeyValueTable([
     ["User", user.fullname],
     ["Username", user.username],
     ["User ID", String(user.userid)],
     ["Site", user.sitename],
     ["URL", user.siteurl],
     ["Language", user.lang ?? ""]
-  ]);
+  ], { title: "User" });
 }
 function formatCourses(courses) {
-  return formatColumns([["ID", "Short Name", "Full Name"], ...courses.map((course) => [String(course.id), course.shortname, course.fullname])]);
+  return renderTerminalTable(
+    [
+      { label: "ID" },
+      { label: "Short Name" },
+      { label: "Full Name" }
+    ],
+    courses.map((course) => [String(course.id), course.shortname, course.fullname]),
+    { title: "Enrolled Units" }
+  );
 }
 function formatCourseSections(sections) {
   const lines = ["Course"];
-  for (const section of sections) {
-    lines.push(`  ${section.name || `Section ${section.section}`}${section.visible ? "" : " (hidden)"}`);
+  for (const [sectionIndex, section] of sections.entries()) {
+    const sectionLast = sectionIndex === sections.length - 1;
+    lines.push(`${sectionLast ? "\u2514\u2500\u2500" : "\u251C\u2500\u2500"} ${section.name || `Section ${section.section}`}${section.visible ? "" : " (hidden)"}`);
     if (!section.activities.length) {
-      lines.push("    No activities");
+      lines.push(`${sectionLast ? "    " : "\u2502   "}\u2514\u2500\u2500 No activities`);
       continue;
     }
-    for (const activity of section.activities) {
-      lines.push(`    ${activity.name}${activity.visible ? "" : " (hidden)"} (${activity.modname})`);
+    for (const [activityIndex, activity] of section.activities.entries()) {
+      const activityPrefix = activityIndex === section.activities.length - 1 ? "\u2514\u2500\u2500" : "\u251C\u2500\u2500";
+      lines.push(`${sectionLast ? "    " : "\u2502   "}${activityPrefix} ${activity.name}${activity.visible ? "" : " (hidden)"} (${activity.modname})`);
     }
   }
-  return lines.join("\n");
+  return sanitizeTerminalText(lines.join("\n"));
 }
 function formatActivityList(value) {
   const activities = Array.isArray(value) && value[0] && "activities" in value[0] ? value.flatMap((section) => section.activities) : value;
-  return formatColumns([["ID", "Type", "Name"], ...activities.map((activity) => [String(activity.id), activity.modname, activity.name])]);
+  return renderTerminalTable(
+    [
+      { label: "ID" },
+      { label: "Type" },
+      { label: "Name" }
+    ],
+    activities.map((activity) => [String(activity.id), activity.modname, activity.name]),
+    { title: "Activities" }
+  );
 }
 function formatTodo(items) {
-  if (!items.length) {
-    return "No upcoming items";
-  }
-  return formatColumns([
-    ["Due", "Course", "Activity", "Type", "Action"],
-    ...items.map((item) => [
-      item.due_at ? String(item.due_at) : "-",
-      item.course_name,
-      item.activity_name || item.name,
-      item.modname || item.event_type,
-      item.actionable ? item.action_name : ""
-    ])
-  ]);
+  const columns = [
+    { label: "Due" },
+    { label: "Unit" },
+    { label: "Activity" },
+    { label: "Type" },
+    { label: "Action" }
+  ];
+  const rows = items.length ? items.map((item) => [
+    `${item.overdue ? "Overdue \xB7 " : ""}${formatTimestamp(item.due_at)}`,
+    `${item.course_name}${item.course_progress === void 0 ? "" : ` (${item.course_progress}%)`}`,
+    item.activity_name || item.name,
+    item.modname || item.event_type,
+    item.actionable ? item.action_name : ""
+  ]) : [["No upcoming items", "", "", "", ""]];
+  return renderTerminalTable(columns, rows, { title: "Todo" });
 }
 function formatAlerts(alerts) {
-  const lines = [
-    `Notifications: ${alerts.notification_count}`,
-    `Unread notifications: ${alerts.unread_notification_count}`,
-    `Direct messages: ${alerts.direct_message_count}`,
-    `Unread direct messages: ${alerts.unread_direct_message_count}`
-  ];
-  for (const notification of alerts.notifications) {
-    lines.push(`${notification.created_pretty || notification.created_at} ${notification.short_subject || notification.subject}`);
-  }
-  return lines.join("\n");
+  const summary = renderKeyValueTable([
+    ["Notifications", String(alerts.notification_count)],
+    ["Unread notifications", String(alerts.unread_notification_count)],
+    ["Direct messages", String(alerts.direct_message_count)],
+    ["Unread direct messages", String(alerts.unread_direct_message_count)]
+  ], { title: "Alerts" });
+  if (!alerts.notifications.length) return summary;
+  const notifications = renderTerminalTable(
+    [
+      { label: "When" },
+      { label: "Subject" }
+    ],
+    alerts.notifications.map((notification) => [
+      notification.created_pretty || formatTimestamp(notification.created_at),
+      notification.short_subject || notification.subject
+    ]),
+    { title: "Notifications" }
+  );
+  return `${summary}
+
+${notifications}`;
 }
 function formatGrades(grades) {
-  return formatColumns([
-    ["Item", "Grade", "Range", "Percent", "Feedback"],
-    ...grades.items.map((item) => [item.name, item.grade, item.range, item.percentage, item.feedback])
-  ]);
+  return renderTerminalTable(
+    [
+      { label: "Item" },
+      { label: "Grade" },
+      { label: "Range" },
+      { label: "Percent" },
+      { label: "Feedback" }
+    ],
+    grades.items.map((item) => [item.name, item.grade, item.range, item.percentage, item.feedback]),
+    { title: grades.course_name ? `Grades \xB7 ${grades.course_name}` : "Grades" }
+  );
 }
 function formatActivityDetail(activity) {
   const rows = Object.entries(activity).filter(([, value]) => value !== "" && value !== void 0 && !(Array.isArray(value) && value.length === 0)).map(([key, value]) => [key, Array.isArray(value) ? value.join("\n") : String(value)]);
-  return formatKeyValues(rows);
+  return renderKeyValueTable(rows, { title: "Activity" });
 }
 function formatDownloadReceipt(receipt) {
-  return formatKeyValues([
+  return renderKeyValueTable([
     ["File", receipt.file_path],
     ["Filename", receipt.filename],
     ["Bytes", String(receipt.bytes_written)],
     ["Content type", receipt.content_type],
     ["Source", receipt.source_url],
     ["Final URL", receipt.final_url]
-  ]);
+  ], { title: "Download" });
 }
 function formatForumDiscussion(discussion, options = {}) {
   const lines = [`Discussion: ${discussion.id}`];
@@ -2810,13 +2933,13 @@ function formatForumDiscussion(discussion, options = {}) {
   }
   if (!discussion.posts.length) {
     lines.push("", "No posts");
-    return lines.join("\n");
+    return sanitizeTerminalText(lines.join("\n"));
   }
   for (const post of discussion.posts) {
     const marker = options.highlightPostId === post.id ? "*" : "-";
     lines.push("", `${marker} Post ${post.id}`);
     lines.push(`  Author: ${post.author.fullname || "-"}`);
-    lines.push(`  When: ${post.created_pretty || (post.time_created ? String(post.time_created) : "-")}`);
+    lines.push(`  When: ${post.created_pretty || formatTimestamp(post.time_created)}`);
     if (post.subject) {
       lines.push(`  Subject: ${post.subject}`);
     }
@@ -2835,58 +2958,68 @@ function formatForumDiscussion(discussion, options = {}) {
       lines.push(`  Images: ${post.image_urls.length}`);
     }
   }
-  return lines.join("\n");
+  return sanitizeTerminalText(lines.join("\n"));
 }
 function formatForumDiscussionRefs(forumCmid, refs) {
-  const lines = [`Forum ${forumCmid}: Discussions`];
-  if (!refs.length) {
-    return `${lines[0]}
-No discussions`;
-  }
-  for (const ref of refs) {
-    lines.push([ref.id, ref.subject, ref.group_name, ref.url].filter(Boolean).join(" | "));
-  }
-  return lines.join("\n");
+  return renderTerminalTable(
+    [
+      { label: "ID" },
+      { label: "Subject" },
+      { label: "Group" },
+      { label: "URL" }
+    ],
+    refs.length ? refs.map((ref) => [String(ref.id), ref.subject, ref.group_name, ref.url]) : [["No discussions", "", "", ""]],
+    { title: `Forum ${forumCmid} \xB7 Discussions` }
+  );
 }
 function formatForumActivities(forums) {
-  if (!forums.length) {
-    return "Forums\nNo forums";
-  }
-  return [
-    "Forums",
-    ...forums.map((forum) => [forum.id, forum.name, forum.course_name, forum.course_id || "", forum.url].filter(Boolean).join(" | "))
-  ].join("\n");
+  return renderTerminalTable(
+    [
+      { label: "ID" },
+      { label: "Forum" },
+      { label: "Unit" },
+      { label: "URL" }
+    ],
+    forums.length ? forums.map((forum) => [String(forum.id), forum.name, forum.course_name, forum.url]) : [["No forums", "", "", ""]],
+    { title: "Forums" }
+  );
 }
 function formatForumSearchHits(hits) {
-  if (!hits.length) {
-    return "Forum Search\nNo matches";
-  }
-  return [
-    "Forum Search",
-    ...hits.map(
-      (hit) => [
-        hit.course_name,
-        hit.forum_name,
-        hit.discussion_subject,
-        hit.discussion_id || "",
-        hit.post_id || "",
-        hit.matched_in,
-        hit.author_name,
-        hit.snippet || hit.discussion_subject,
-        hit.url
-      ].filter(Boolean).join(" | ")
-    )
-  ].join("\n");
+  return renderTerminalTable(
+    [
+      { label: "Discussion" },
+      { label: "Post" },
+      { label: "Unit" },
+      { label: "Forum" },
+      { label: "Subject" },
+      { label: "Author" },
+      { label: "Match" },
+      { label: "Snippet" },
+      { label: "URL" }
+    ],
+    hits.length ? hits.map((hit) => [
+      String(hit.discussion_id),
+      String(hit.post_id),
+      hit.course_name,
+      hit.forum_name,
+      hit.discussion_subject,
+      hit.author_name,
+      hit.matched_in,
+      hit.snippet || hit.discussion_subject,
+      hit.url
+    ]) : [["No matches", "", "", "", "", "", "", "", ""]],
+    { title: "Forum Search" }
+  );
 }
 function formatAuthStatus(status) {
-  return formatKeyValues([
+  return renderKeyValueTable([
     ["Site", status.base_url],
     ["Cached session", status.session_cached ? "yes" : "no"],
     ["Cache age", status.cache_age_minutes === null ? "" : `${status.cache_age_minutes} min`],
     ["Session alive", status.session_alive === null ? status.session_cached ? "unknown" : "" : status.session_alive ? "yes" : "no"],
     ["Server timeout in", formatDuration(status.session_time_remaining_seconds)],
     ["Keepalive agent", status.keepalive_installed ? `installed (${status.keepalive_plist_path})` : "not installed"]
-  ]);
+  ], { title: "Authentication" });
 }
 function formatKeepaliveResult(result) {
   switch (result.status) {
@@ -2919,17 +3052,11 @@ function preview(value, maxLen = 100) {
   const cleaned = value.split(/\s+/).filter(Boolean).join(" ");
   return cleaned.length <= maxLen ? cleaned : `${cleaned.slice(0, maxLen - 1)}\u2026`;
 }
-function formatKeyValues(rows) {
-  const present = rows.filter(([, value]) => value);
-  const width = Math.max(0, ...present.map(([key]) => key.length));
-  return present.map(([key, value]) => `${key.padEnd(width)}  ${value}`).join("\n");
-}
-function formatColumns(rows) {
-  if (!rows.length) {
-    return "";
-  }
-  const widths = rows[0].map((_, index) => Math.max(...rows.map((row) => (row[index] ?? "").length)));
-  return rows.map((row) => row.map((cell, index) => cell.padEnd(widths[index])).join("  ").trimEnd()).join("\n");
+function formatTimestamp(value) {
+  if (value <= 0) return "-";
+  const date = new Date(value * 1e3);
+  const pad = (part) => String(part).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
 }
 
 // src/download.ts
@@ -3700,7 +3827,7 @@ function escapeXml(value) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0-alpha.3";
+var VERSION = "0.7.0-alpha.4";
 
 // src/forum.ts
 function parseDiscussionReference(value) {

package/dist/worker/worker.js

@@ -5996,7 +5996,7 @@ function problemResponse(status, code, title, detail, headers) {
 }
 
 // src/version.ts
-var VERSION = "0.7.0-alpha.3";
+var VERSION = "0.7.0-alpha.4";
 
 // src/worker/http.ts
 var HEALTH_PATH = "/healthz";
@@ -21154,6 +21154,32 @@ function htmlText(value, baseUrl) {
 
 // src/scraper.ts
 var import_node_html_parser2 = __toESM(require_dist(), 1);
+function parseMoodleErrorHtml(html) {
+  const root = (0, import_node_html_parser2.parse)(html);
+  const messageNode = first(root, [
+    ".errormessage",
+    ".alert-danger .alert-message",
+    "[data-region='error-message']",
+    ".alert-danger[role='alert']",
+    ".alert-danger"
+  ]);
+  if (!messageNode) {
+    return null;
+  }
+  const messageRoot = (0, import_node_html_parser2.parse)(messageNode.toString());
+  for (const unwanted of messageRoot.querySelectorAll(
+    "button, .close, .errorcode, .stacktrace, .debuginfo, .backtrace, a.alert-link, a[href*='/error/']"
+  )) {
+    unwanted.remove();
+  }
+  const message = cleanText(messageRoot.textContent);
+  if (!message) {
+    return null;
+  }
+  const errorCodeText = cleanNodeText(root.querySelector(".errorcode"));
+  const errorCode = errorCodeText.match(/^error\s+code\s*:\s*([a-z][a-z0-9_]*)\s*$/iu)?.[1] ?? moodleDocsErrorCode(root);
+  return { message, ...errorCode ? { code: errorCode } : {} };
+}
 function parsePageContext(html, baseUrl) {
   const root = (0, import_node_html_parser2.parse)(html);
   const config2 = parseMoodleConfig(html);
@@ -21585,6 +21611,16 @@ function selectedGroupName(root, groupId) {
   }
   return "";
 }
+function moodleDocsErrorCode(root) {
+  for (const link of root.querySelectorAll("a[href*='/error/']")) {
+    const href = link.getAttribute("href") ?? "";
+    const code = href.match(/\/error\/[^/]+\/([a-z][a-z0-9_]*)/iu)?.[1];
+    if (code) {
+      return code;
+    }
+  }
+  return void 0;
+}
 function cleanNodeText(node) {
   return cleanText(node?.textContent ?? "");
 }
@@ -22074,7 +22110,7 @@ var MoodleClientCoreApiError = class extends MoodleClientCoreError {
   moodleErrorCode;
   constructor(message, moodleErrorCode) {
     const auth = isLoginErrorCode(moodleErrorCode);
-    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /^HTTP 404\b/.test(message);
+    const notFound = ["invalidrecord", "invalidcoursemodule"].includes(moodleErrorCode ?? "") || /\bHTTP 404\b/.test(message);
     super(
       auth ? "auth" : notFound ? "not_found" : "upstream",
       message,
@@ -22505,7 +22541,15 @@ var MoodleClientCore = class {
       throw this.errors.api("Session expired", "servicerequireslogin");
     }
     if (!response.ok) {
-      throw this.errors.api(`HTTP ${response.status} loading ${safeUrl(url2)}`);
+      const context = `HTTP ${response.status} loading ${safeUrl(url2)}`;
+      const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
+      if (contentType.includes("text/html") || contentType.includes("application/xhtml+xml")) {
+        const moodleError = await response.text().then(parseMoodleErrorHtml).catch(() => null);
+        if (moodleError) {
+          throw this.errors.api(`${moodleError.message} (${context})`, moodleError.code);
+        }
+      }
+      throw this.errors.api(context);
     }
     return response;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moodle-cli",
-  "version": "0.7.0-alpha.3",
+  "version": "0.7.0-alpha.4",
   "description": "Terminal-first CLI for Moodle LMS",
   "license": "MIT",
   "type": "module",
@@ -35,6 +35,7 @@
     "@steipete/sweet-cookie": "^0.4.0",
     "commander": "^13.1.0",
     "node-html-parser": "^7.0.1",
+    "tty-table": "^5.0.0",
     "wrangler": "^4.120.0",
     "yaml": "^2.8.0",
     "zod": "^4.0.5"