ask-marcel-office-cli 2.2.0 → 2.3.0

package/dist/index.js

@@ -1910,14 +1910,6 @@ var createNodeProcessRunner = () => ({
     }
   })
 });
-// src/use-cases/commands/download-drive-item-as-markdown.ts
-var exports_download_drive_item_as_markdown = {};
-__export(exports_download_drive_item_as_markdown, {
-  schema: () => schema,
-  meta: () => meta3,
-  execute: () => execute
-});
-
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -15450,8 +15442,50 @@ function date4(params) {
 
 // node_modules/zod/v4/classic/external.js
 config(en_default());
+// src/use-cases/commands/reject-unknown-params.ts
+var camelToKebab = (value) => value.replaceAll(/[A-Z]/g, (c) => `-${c.toLowerCase()}`);
+var allowedKeys = (schema) => {
+  if (!(schema instanceof exports_external.ZodObject))
+    return [];
+  return Object.keys(schema.shape);
+};
+var unknownParamError = (unknown2, allowed) => {
+  const named = unknown2.map((k) => `--${camelToKebab(k)}`).join(", ");
+  const supported = allowed.map((k) => `--${camelToKebab(k)}`).toSorted((a, b) => a.localeCompare(b)).join(", ");
+  return {
+    type: "validation_error",
+    code: "unknown_parameter",
+    message: `${named} ${unknown2.length === 1 ? "is not a parameter" : "are not parameters"} of this command, so it would have been ignored rather than applied. Supported: ${supported || "(none)"}.`
+  };
+};
+var rejectUnknownParams = (schema, params) => {
+  const allowed = allowedKeys(schema);
+  if (allowed.length === 0)
+    return;
+  const unknown2 = Object.keys(params).filter((key) => !allowed.includes(key));
+  if (unknown2.length === 0)
+    return;
+  return err(unknownParamError(unknown2, allowed));
+};
+var withUnknownParamRejection = (command) => {
+  const { executeLocal } = command;
+  return {
+    ...command,
+    execute: async (graph, params) => rejectUnknownParams(command.schema, params) ?? await command.execute(graph, params),
+    ...executeLocal === undefined ? {} : { executeLocal: async (fs, params) => rejectUnknownParams(command.schema, params) ?? await executeLocal(fs, params) }
+  };
+};
+
+// src/use-cases/commands/download-drive-item-as-markdown.ts
+var exports_download_drive_item_as_markdown = {};
+__export(exports_download_drive_item_as_markdown, {
+  schema: () => schema,
+  meta: () => meta3,
+  execute: () => execute
+});
+
 // src/use-cases/commands/format-zod-error.ts
-var camelToKebab = (s) => s.replaceAll(/([A-Z])/g, "-$1").toLowerCase();
+var camelToKebab2 = (s) => s.replaceAll(/([A-Z])/g, "-$1").toLowerCase();
 var humanize = (issue2) => {
   if (issue2.code === "invalid_type")
     return "is missing";
@@ -15470,7 +15504,7 @@ var formatZodError = (error48) => {
     if (issue2.path.length === 0)
       return `<root>: ${issue2.message}`;
     const path = renderPath(issue2.path);
-    const flag = `--${camelToKebab(path)}`;
+    const flag = `--${camelToKebab2(path)}`;
     return `${flag} ${humanize(issue2)}`;
   }).join("; ");
 };
@@ -18201,7 +18235,6 @@ var execute6 = async (graph, params) => {
 var meta8 = {
   summary: 'Download the binary content of a file stored in OneDrive / SharePoint, with the bytes inlined. The CLI follows the Graph 302 → SharePoint media-transform redirect internally so the LLM never has to fetch an external URL. The bytes are CONTENT-SNIFFED, not judged by extension: if they decode as valid UTF-8 they come back as `{contentType: "text/plain", size, text}` (avoids ~33% base64 bloat, works for any text file regardless of name); otherwise as `{contentType, size, base64}`. A binary file that happens to be named `.txt` is returned faithfully as base64 — never silently corrupted into `�` by a forced text decode.',
   category: "drive",
-  commandAliases: ["download-onedrive-file-content"],
   graphMethod: "GET",
   graphPathTemplate: "/drives/{drive-id}/items/{item-id}/content",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/driveitem-get-content",
@@ -18475,7 +18508,6 @@ var meta9 = {
       name: "event-id",
       key: "eventId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Graph event ID. Returned by `ask-marcel-office list-calendar-events` in the `id` field of each event."
     },
     ...selectExpandOptions
@@ -18661,8 +18693,8 @@ var meta10 = {
   graphPathTemplate: "/me/calendarView?startDateTime={start-date-time}&endDateTime={end-date-time}",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/user-list-calendarview",
   options: [
-    { name: "start-date-time", key: "startDateTime", required: true, aliases: [{ name: "start", key: "start" }], description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
-    { name: "end-date-time", key: "endDateTime", required: true, aliases: [{ name: "end", key: "end" }], description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "start-date-time", key: "startDateTime", required: true, description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "end-date-time", key: "endDateTime", required: true, description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
     ...odataQueryOptions
   ],
   example: "ask-marcel-office list-calendar-view --start-date-time 'start-of-week' --end-date-time 'end-of-week'",
@@ -18698,7 +18730,7 @@ __export(exports_get_drive_delta, {
   execute: () => execute10
 });
 var baseSchema4 = exports_external.object({ driveId: exports_external.string().min(1), itemId: exports_external.string().min(1) });
-var { execute: execute10, schema: schema10 } = buildNoSkipListCommand((p) => `/drives/${p.driveId}/items/${p.itemId}/delta()`, baseSchema4);
+var { execute: execute10, schema: schema10 } = buildPickODataListCommand((p) => `/drives/${p.driveId}/items/${p.itemId}/delta()`, baseSchema4, ["top", "select", "expand"]);
 var meta12 = {
   summary: "Get the incremental change set (added / modified / deleted items) under a OneDrive / SharePoint folder. Use the `@odata.deltaLink` from a previous response to resume.",
   category: "drive",
@@ -18716,10 +18748,9 @@ var meta12 = {
       name: "item-id",
       key: "itemId",
       required: true,
-      description: "driveItem ID of the folder whose subtree to track. Use the root folder ID from `get-drive-root-item` to track the entire drive. Accepts `--folder-id` as an alias for parity with `list-folder-files` (same concept, same flag name).",
-      aliases: [{ name: "folder-id", key: "folderId" }]
+      description: "driveItem ID of the folder whose subtree to track. Use the root folder ID from `get-drive-root-item` to track the entire drive."
     },
-    ...noSkipOptions
+    ...pickODataOptions(["top", "select", "expand"])
   ],
   example: "ask-marcel-office get-drive-delta --drive-id 'b!1234' --item-id '01ROOT'",
   responseShape: "collection of changed Microsoft Graph `driveItem` resources under `data.value[]`. Cursor tokens are hoisted to envelope level: top-level `nextLink` while paging, then top-level `deltaLink` on the final page.",
@@ -18777,7 +18808,6 @@ var meta14 = {
       name: "drive-id",
       key: "driveId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: DRIVE_ID_DESCRIPTION
     },
     ...selectExpandOptions
@@ -19045,8 +19075,7 @@ var meta19 = {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Outlook message ID. Returned by `ask-marcel-office list-mail-messages` or `list-mail-folder-messages`. Accepts `--id` as an alias."
+      description: "Outlook message ID. Returned by `ask-marcel-office list-mail-messages` or `list-mail-folder-messages`."
     },
     ...selectExpandOptions
   ],
@@ -19252,8 +19281,7 @@ var meta20 = {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Outlook message ID. Returned by `list-mail-messages` or `list-mail-folder-messages`. Accepts `--id` as an alias."
+      description: "Outlook message ID. Returned by `list-mail-messages` or `list-mail-folder-messages`."
     },
     {
       name: "inline-images",
@@ -19390,8 +19418,7 @@ var meta21 = {
       name: "message-id",
       key: "messageId",
       required: false,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Read the signature from THIS message instead of scanning the sent folder. Use when the scan finds nothing (the message was composed in Outlook desktop) or to pin a specific signature. Source from list-mail-folder-messages --mail-folder-id sentitems. Accepts `--id` as an alias.",
+      description: "Read the signature from THIS message instead of scanning the sent folder. Use when the scan finds nothing (the message was composed in Outlook desktop) or to pin a specific signature. Source from list-mail-folder-messages --mail-folder-id sentitems.",
       argumentHint: { kind: "idOrName" }
     }
   ],
@@ -19650,11 +19677,7 @@ var meta25 = {
       name: "onenote-page-id",
       key: "onenotePageId",
       required: true,
-      description: "OneNote page ID. Returned by `ask-marcel-office list-onenote-section-pages`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "page-id", key: "pageId" }
-      ]
+      description: "OneNote page ID. Returned by `ask-marcel-office list-onenote-section-pages`."
     },
     {
       name: "inline-images",
@@ -19701,11 +19724,7 @@ var meta26 = {
       name: "onenote-page-id",
       key: "onenotePageId",
       required: true,
-      description: "OneNote page ID. Returned by `ask-marcel-office list-onenote-section-pages`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "page-id", key: "pageId" }
-      ]
+      description: "OneNote page ID. Returned by `ask-marcel-office list-onenote-section-pages`."
     }
   ],
   example: "ask-marcel-office get-onenote-page-content --onenote-page-id '1-abc...'",
@@ -19733,11 +19752,7 @@ var meta27 = {
       name: "planner-bucket-id",
       key: "plannerBucketId",
       required: true,
-      description: "Planner bucket ID. Returned by `ask-marcel-office list-plan-buckets`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "bucket-id", key: "bucketId" }
-      ]
+      description: "Planner bucket ID. Returned by `ask-marcel-office list-plan-buckets`."
     }
   ],
   example: "ask-marcel-office get-planner-bucket --planner-bucket-id 'sFNeQRFu_kqhxpwwAhmA15gAGfoT'",
@@ -19764,11 +19779,7 @@ var meta28 = {
       name: "planner-plan-id",
       key: "plannerPlanId",
       required: true,
-      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "plan-id", key: "planId" }
-      ]
+      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`."
     }
   ],
   example: "ask-marcel-office get-planner-plan --planner-plan-id 'xqQg5FS2LkCp935s-FIFm5gAB6'",
@@ -19795,11 +19806,7 @@ var meta29 = {
       name: "planner-task-id",
       key: "plannerTaskId",
       required: true,
-      description: "Planner task ID. Returned by `ask-marcel-office list-planner-tasks` or `list-plan-tasks`. Accepts `--task-id` as a shorter alias (each task command targets exactly one of Planner or To Do, so within this command's flag set there is no ambiguity).",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "task-id", key: "taskId" }
-      ]
+      description: "Planner task ID. Returned by `ask-marcel-office list-planner-tasks` or `list-plan-tasks`."
     }
   ],
   example: "ask-marcel-office get-planner-task-details --planner-task-id '01tx7Ic7-USXEwt0lvR1cmgAH8gK'",
@@ -19826,11 +19833,7 @@ var meta30 = {
       name: "planner-task-id",
       key: "plannerTaskId",
       required: true,
-      description: "Planner task ID. Returned by `ask-marcel-office list-planner-tasks` or `list-plan-tasks`. Accepts `--task-id` as a shorter alias (each task command targets exactly one of Planner or To Do, so within this command's flag set there is no ambiguity).",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "task-id", key: "taskId" }
-      ]
+      description: "Planner task ID. Returned by `ask-marcel-office list-planner-tasks` or `list-plan-tasks`."
     }
   ],
   example: "ask-marcel-office get-planner-task --planner-task-id '01tx7Ic7-USXEwt0lvR1cmgAH8gK'",
@@ -19925,8 +19928,7 @@ var meta33 = {
       name: "list-item-id",
       key: "listItemId",
       required: true,
-      description: "listItem ID (typically a small integer). Returned by `ask-marcel-office list-sharepoint-site-list-items`.",
-      aliases: [{ name: "item-id", key: "itemId" }]
+      description: "listItem ID (typically a small integer). Returned by `ask-marcel-office list-sharepoint-site-list-items`."
     },
     ...selectExpandOptions
   ],
@@ -19984,7 +19986,6 @@ var meta35 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID. Either the composite ID (`hostname,site-collection-id,site-id`) returned by `ask-marcel-office search-sharepoint-sites-by-name`, or the literal `root` to refer to the tenant root site."
     },
     ...selectExpandOptions
@@ -20037,21 +20038,18 @@ var meta36 = {
       name: "schedules",
       key: "schedules",
       required: true,
-      aliases: [{ name: "emails", key: "emails" }],
       description: "Comma-separated SMTP addresses of the users and/or room resources to check (e.g. `alice@contoso.com,bob@contoso.com,room-4a@contoso.com`). Resolve names to addresses first via `list-relevant-people` or `microsoft-search-query`."
     },
     {
       name: "start-date-time",
       key: "startDateTime",
       required: true,
-      aliases: [{ name: "start", key: "start" }],
       description: `Window lower bound (interpreted as UTC). ${RELATIVE_DATE_DESCRIPTION}`
     },
     {
       name: "end-date-time",
       key: "endDateTime",
       required: true,
-      aliases: [{ name: "end", key: "end" }],
       description: `Window upper bound (interpreted as UTC). Graph caps the span at 62 days. ${RELATIVE_DATE_DESCRIPTION}`
     },
     {
@@ -20128,11 +20126,10 @@ var meta38 = {
       name: "calendar-id",
       key: "calendarId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Calendar ID, or `primary` / `default` for the signed-in user’s default calendar. Returned by `ask-marcel-office list-calendars`."
     },
-    { name: "start-date-time", key: "startDateTime", required: true, aliases: [{ name: "start", key: "start" }], description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
-    { name: "end-date-time", key: "endDateTime", required: true, aliases: [{ name: "end", key: "end" }], description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "start-date-time", key: "startDateTime", required: true, description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "end-date-time", key: "endDateTime", required: true, description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
     ...odataQueryOptions
   ],
   example: "ask-marcel-office list-specific-calendar-view --calendar-id 'primary' --start-date-time '2026-04-01T00:00:00Z' --end-date-time '2026-05-01T00:00:00Z'",
@@ -20199,7 +20196,6 @@ var meta40 = {
       name: "team-id",
       key: "teamId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams team ID. Returned by `ask-marcel-office list-joined-teams`."
     },
     ...selectExpandOptions
@@ -20262,18 +20258,13 @@ var meta41 = {
       name: "todo-task-list-id",
       key: "todoTaskListId",
       required: true,
-      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`.",
-      aliases: [
-        { name: "task-list-id", key: "taskListId" },
-        { name: "todo-list-id", key: "todoListId" }
-      ]
+      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`."
     },
     {
       name: "todo-task-id",
       key: "todoTaskId",
       required: true,
-      description: "To Do task ID. Returned by `ask-marcel-office list-todo-tasks`. Accepts `--task-id` as a shorter alias (within this command's flag set the To Do context is unambiguous).",
-      aliases: [{ name: "task-id", key: "taskId" }]
+      description: "To Do task ID. Returned by `ask-marcel-office list-todo-tasks`."
     },
     ...selectExpandOptions
   ],
@@ -20354,11 +20345,10 @@ var meta43 = {
       name: "event-id",
       key: "eventId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Recurring event ID. Returned by `ask-marcel-office list-specific-calendar-events`."
     },
-    { name: "start-date-time", key: "startDateTime", required: true, aliases: [{ name: "start", key: "start" }], description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
-    { name: "end-date-time", key: "endDateTime", required: true, aliases: [{ name: "end", key: "end" }], description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "start-date-time", key: "startDateTime", required: true, description: `Lower bound. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "end-date-time", key: "endDateTime", required: true, description: `Upper bound. ${RELATIVE_DATE_DESCRIPTION}` },
     ...odataQueryOptions
   ],
   example: "ask-marcel-office list-calendar-event-instances --calendar-id 'AAMkAGI2THVS...' --event-id 'AAMkABC...' --start-date-time '2026-04-01T00:00:00Z' --end-date-time '2026-05-01T00:00:00Z'",
@@ -20460,14 +20450,12 @@ var meta46 = {
       name: "start-date-time",
       key: "startDateTime",
       required: true,
-      aliases: [{ name: "start", key: "start" }],
       description: `Lower bound (required on the first call only — the deltaLink token encodes it for resumes). ${RELATIVE_DATE_DESCRIPTION}`
     },
     {
       name: "end-date-time",
       key: "endDateTime",
       required: true,
-      aliases: [{ name: "end", key: "end" }],
       description: `Upper bound (required on the first call only — the deltaLink token encodes it for resumes). ${RELATIVE_DATE_DESCRIPTION}`
     },
     ...topOnlyOptions
@@ -20536,7 +20524,6 @@ var meta48 = {
       name: "chat-id",
       key: "chatId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams chat ID, e.g. `19:abc...@thread.v2`. " + "Source the ID via `ask-marcel-office list-chats` (returns chat metadata for the signed-in user). " + "Alternative sources outside the CLI: the Teams desktop / web client (Open in browser → URL contains the chat thread ID), Microsoft Graph Explorer, " + "or URL-decode the `19%3ameeting_...%40thread.v2` segment of an `onlineMeeting.joinUrl` from `list-calendar-events`."
     },
     ...pickODataOptions(CHAT_MEMBERS_ODATA_KEYS)
@@ -20762,8 +20749,7 @@ var meta55 = {
       name: "item-id",
       key: "itemId",
       required: true,
-      description: 'driveItem ID of the folder (Graph identifies folders as driveItems too — there is no separate folder type). Use the root folder ID from `ask-marcel-office get-drive-root-item` to list the top of a drive. Accepts `--folder-id` as an alias since the command name implies "folder".',
-      aliases: [{ name: "folder-id", key: "folderId" }]
+      description: "driveItem ID of the folder (Graph identifies folders as driveItems too — there is no separate folder type). Use the root folder ID from `ask-marcel-office get-drive-root-item` to list the top of a drive."
     },
     ...noSkipOptions,
     TENANT_ID_OPTION
@@ -20843,12 +20829,7 @@ var meta57 = {
       name: "todo-task-list-id",
       key: "todoTaskListId",
       required: true,
-      description: "todoTaskList ID. Returned by `ask-marcel-office list-todo-task-lists`. The well-known name `tasks` (the default list) is accepted on this incomplete-tasks endpoint specifically — sibling commands like `list-todo-tasks` and `list-todo-tasks-delta` only accept resolved IDs. There is no Graph endpoint that returns incomplete tasks across every list — call this once per list.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "task-list-id", key: "taskListId" },
-        { name: "todo-list-id", key: "todoListId" }
-      ]
+      description: "todoTaskList ID. Returned by `ask-marcel-office list-todo-task-lists`. The well-known name `tasks` (the default list) is accepted on this incomplete-tasks endpoint specifically — sibling commands like `list-todo-tasks` and `list-todo-tasks-delta` only accept resolved IDs. There is no Graph endpoint that returns incomplete tasks across every list — call this once per list."
     },
     ...odataQueryOptions
   ],
@@ -20906,8 +20887,7 @@ var meta59 = {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Outlook message ID. Returned by `ask-marcel-office list-mail-messages` or `list-mail-folder-messages`. Accepts `--id` as an alias."
+      description: "Outlook message ID. Returned by `ask-marcel-office list-mail-messages` or `list-mail-folder-messages`."
     },
     ...odataQueryOptions
   ],
@@ -20936,7 +20916,6 @@ var meta60 = {
       name: "mail-folder-id",
       key: "mailFolderId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "mailFolder ID. Returned by `ask-marcel-office list-mail-folders`. Well-known names also work, e.g. `inbox`, `sentitems`, `drafts`."
     },
     ...odataQueryOptions
@@ -20966,7 +20945,6 @@ var meta61 = {
       name: "mail-folder-id",
       key: "mailFolderId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "mailFolder ID. Returned by `ask-marcel-office list-mail-folders`. Well-known names also work, e.g. `inbox`, `sentitems`, `drafts`. When listing `drafts`, a `conversationId` `$filter` is not a reliable check for whether a draft already exists on a thread: reply and forward drafts can split across several conversationIds, and `$filter` on Drafts is not read-your-writes consistent. Match client-side on subject and recipients instead, or use the `find-mail-drafts` command, which does exactly that."
     },
     ...odataQueryOptions
@@ -21065,7 +21043,6 @@ var meta65 = {
       name: "notebook-id",
       key: "notebookId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "OneNote notebook ID. Returned by `ask-marcel-office list-onenote-notebooks`."
     },
     ...odataQueryOptions
@@ -21116,11 +21093,7 @@ var meta67 = {
       name: "onenote-section-id",
       key: "onenoteSectionId",
       required: true,
-      description: "OneNote section ID. Returned by `ask-marcel-office list-onenote-notebook-sections` or `list-all-onenote-sections`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "section-id", key: "sectionId" }
-      ]
+      description: "OneNote section ID. Returned by `ask-marcel-office list-onenote-notebook-sections` or `list-all-onenote-sections`."
     },
     ...odataQueryOptions
   ],
@@ -21149,11 +21122,7 @@ var meta68 = {
       name: "planner-plan-id",
       key: "plannerPlanId",
       required: true,
-      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "plan-id", key: "planId" }
-      ]
+      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`."
     },
     ...selectOnlyOptions
   ],
@@ -21182,11 +21151,7 @@ var meta69 = {
       name: "planner-plan-id",
       key: "plannerPlanId",
       required: true,
-      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "plan-id", key: "planId" }
-      ]
+      description: "Planner plan ID. Returned in the `planId` field of any task from `ask-marcel-office list-planner-tasks`."
     }
   ],
   example: "ask-marcel-office list-plan-tasks --planner-plan-id 'xqQg5FS2LkCp935s-FIFm5gAB6'",
@@ -21256,7 +21221,6 @@ var meta72 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID. Returned by `ask-marcel-office search-sharepoint-sites-by-name`."
     },
     ...noSkipOptions
@@ -21325,7 +21289,6 @@ var meta74 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID. Returned by `ask-marcel-office search-sharepoint-sites-by-name`."
     },
     ...noSkipOptions
@@ -21360,7 +21323,6 @@ var meta75 = {
       name: "calendar-id",
       key: "calendarId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Calendar ID, or the well-known short name `primary` / `default` for the signed-in user’s default calendar. Use `ask-marcel-office list-calendars` to discover non-default calendar IDs."
     },
     ...odataQueryOptions
@@ -21390,7 +21352,6 @@ var meta76 = {
       name: "team-id",
       key: "teamId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams team ID. Returned by `ask-marcel-office list-joined-teams`."
     },
     ...filterSelectOptions
@@ -21419,18 +21380,13 @@ var meta77 = {
       name: "todo-task-list-id",
       key: "todoTaskListId",
       required: true,
-      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`.",
-      aliases: [
-        { name: "task-list-id", key: "taskListId" },
-        { name: "todo-list-id", key: "todoListId" }
-      ]
+      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`."
     },
     {
       name: "todo-task-id",
       key: "todoTaskId",
       required: true,
-      description: "To Do task ID. Returned by `ask-marcel-office list-todo-tasks`. Accepts `--task-id` as a shorter alias (within this command's flag set the To Do context is unambiguous).",
-      aliases: [{ name: "task-id", key: "taskId" }]
+      description: "To Do task ID. Returned by `ask-marcel-office list-todo-tasks`."
     },
     ...odataQueryOptions
   ],
@@ -21491,12 +21447,7 @@ var meta79 = {
       name: "todo-task-list-id",
       key: "todoTaskListId",
       required: true,
-      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "task-list-id", key: "taskListId" },
-        { name: "todo-list-id", key: "todoListId" }
-      ]
+      description: "To Do task list ID. Returned by `ask-marcel-office list-todo-task-lists`."
     },
     ...odataQueryOptions
   ],
@@ -21647,7 +21598,6 @@ var meta83 = {
       name: "drive-id",
       key: "driveId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Graph drive ID to search inside. Use `ask-marcel-office list-drives` for the personal OneDrive, or `ask-marcel-office list-sharepoint-site-drives --site-id <id>` for a SharePoint document library."
     },
     { name: "query", key: "query", required: true, description: "Free-text search query. Matches filename, content, and metadata." },
@@ -21668,31 +21618,30 @@ __export(exports_search_onenote_pages, {
 });
 var noFilterShape = Object.fromEntries(Object.entries(odataQuerySchema.shape).filter(([key]) => key !== "filter"));
 var noFilterOptions = odataQueryOptions.filter((o) => o.name !== "filter");
-var schema82 = exports_external.object({ titleSubstring: exports_external.string().min(1) }).extend(noFilterShape);
+var schema82 = exports_external.object({ query: exports_external.string().min(1) }).extend(noFilterShape);
 var execute82 = async (graph, params) => {
   const parsed = schema82.safeParse(params);
   if (!parsed.success)
     return err({ type: "validation_error", message: formatZodError(parsed.error) });
-  const path = appendOData(`/me/onenote/pages?$filter=contains(title,'${odataStringLiteral(parsed.data.titleSubstring)}')`, parsed.data);
+  const path = appendOData(`/me/onenote/pages?$filter=contains(title,'${odataStringLiteral(parsed.data.query)}')`, parsed.data);
   return graph.get(path);
 };
 var meta84 = {
   summary: "Find OneNote pages whose title contains a substring (case-sensitive — page content is NOT searched). Microsoft removed full-text OneNote `?search=` from v1.0 Graph; only $filter against `title` remains, which is what this command runs. Accepts the OData passthrough flags top/skip/select/orderby/expand. The filter passthrough is intentionally omitted — the path already pins a `$filter` for the title-contains predicate, and Graph rejects two `$filter` query params.",
   category: "notes",
   graphMethod: "GET",
-  graphPathTemplate: "/me/onenote/pages?$filter=contains(title,'{title-substring}')",
+  graphPathTemplate: "/me/onenote/pages?$filter=contains(title,'{query}')",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/onenote-list-pages",
   options: [
     {
-      name: "title-substring",
-      key: "titleSubstring",
+      name: "query",
+      key: "query",
       required: true,
-      description: "Substring to look for inside OneNote page titles (case-sensitive, exact substring). " + "This is title-only — full-text body search is not available on OneNote pages in v1.0 Graph. " + "Use `list-onenote-section-pages` if you already know the section.",
-      aliases: [{ name: "query", key: "query" }]
+      description: "Substring to look for inside OneNote page TITLES (case-sensitive, exact substring — not a full-text query, despite the flag name shared with the other search commands). " + "Full-text body search is not available on OneNote pages in v1.0 Graph. " + "Use `list-onenote-section-pages` if you already know the section."
     },
     ...noFilterOptions
   ],
-  example: "ask-marcel-office search-onenote-pages --title-substring 'meeting notes' --top 25",
+  example: "ask-marcel-office search-onenote-pages --query 'meeting notes' --top 25",
   responseShape: "collection of Microsoft Graph `onenotePage` resources under `value[]` whose title contains the substring",
   pagination: true
 };
@@ -22642,7 +22591,6 @@ var meta92 = {
       name: "event-id",
       key: "eventId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Outlook calendar event ID. Returned by `ask-marcel-office list-calendar-events` or `get-calendar-event`."
     },
     ...odataQueryOptions
@@ -22747,6 +22695,7 @@ var findBodyInsertStart = (html) => {
   return match === null ? 0 : match.index + match[0].length;
 };
 var commentCarriesQuoteBoundary = (commentHtml) => findQuoteBoundary(commentHtml) !== -1;
+var bodyCarriesQuote = (contentType, content) => contentType.toLowerCase() === "html" ? findQuoteBoundary(content) !== -1 : findPlainTextQuoteBoundary(content) !== -1;
 var boundaryMarkerRefusal = (flagName) => `${flagName} carries a quoted-reply boundary marker (a pasted gmail_quote container, an Outlook divRplyFwdMsg / appendonsend / border-top separator, or a bold From: + Sent: header pair). It would be kept verbatim, and a later \`update-mail-draft --comment\` edit would cut the draft at that marker and lose the real quoted history below it. Remove the pasted quote from your text, or pass --body-content-type Text to have it escaped into literal characters.`;
 var insertCommentAboveQuote = (html, commentHtml) => {
   const at = findBodyInsertStart(html);
@@ -22790,7 +22739,7 @@ var schema93 = exports_external.object({
   forwardMessageId: exports_external.string().min(1),
   toRecipients: exports_external.string().min(1),
   ccRecipients: exports_external.string().optional(),
-  bodyContent: exports_external.string().min(1),
+  comment: exports_external.string().min(1),
   subject: exports_external.string().optional(),
   bodyContentType: exports_external.enum(["Text", "HTML"]).optional()
 });
@@ -22809,7 +22758,7 @@ var readDraftBody = async (graph, created, draftId) => {
       type: "api_error",
       status: 500,
       code: "draft_body_unreadable",
-      message: `Draft ${draftId} was created but its body could not be read back, so the comment was never written into it. The draft exists - review it in Outlook Drafts, or set its body with \`update-mail-draft --message-id ${draftId} --body-content ...\`.`
+      message: `Draft ${draftId} was created but its body could not be read back, so the comment was never written into it. The draft exists - review it in Outlook Drafts, or revise it with \`update-mail-draft --message-id ${draftId}\` in comment mode (see \`ask-marcel-office docs update-mail-draft\`).`
     });
   }
   return ok(parsed.data.body);
@@ -22821,13 +22770,13 @@ var execute93 = async (graph, params) => {
       type: "validation_error",
       message: formatZodError(parsed.error)
     });
-  const { forwardMessageId, toRecipients, ccRecipients, bodyContent, subject, bodyContentType } = parsed.data;
+  const { forwardMessageId, toRecipients, ccRecipients, comment, subject, bodyContentType } = parsed.data;
   const asHtml = bodyContentType === "HTML";
-  if (asHtml && commentCarriesQuoteBoundary(bodyContent)) {
-    return err({ type: "validation_error", message: boundaryMarkerRefusal("--body-content") });
+  if (asHtml && commentCarriesQuoteBoundary(comment)) {
+    return err({ type: "validation_error", message: boundaryMarkerRefusal("--comment") });
   }
   const created = await graph.post(`/me/messages/${forwardMessageId}/createForward`, {
-    comment: asHtml ? "" : bodyContent,
+    comment: asHtml ? "" : comment,
     toRecipients: parseRecipients2(toRecipients)
   });
   if (!created.ok)
@@ -22857,10 +22806,10 @@ var execute93 = async (graph, params) => {
   if (draftBody.value.contentType.toLowerCase() !== "html") {
     return err({
       type: "validation_error",
-      message: `The forwarded draft's body is ${draftBody.value.contentType}, not HTML, so HTML cannot be placed above the quoted original without rewriting it. Draft ${draftId} was already created - set its text with \`update-mail-draft --message-id ${draftId} --comment "..."\`, or delete it in Outlook Drafts and retry without --body-content-type HTML.`
+      message: `The forwarded draft's body is ${draftBody.value.contentType}, not HTML, so HTML cannot be placed above the quoted original without rewriting it. Draft ${draftId} was already created - revise it with \`update-mail-draft --message-id ${draftId}\` in comment mode, or delete it in Outlook Drafts and retry without --body-content-type HTML.`
     });
   }
-  const spliced = insertCommentAboveQuote(draftBody.value.content, bodyContent);
+  const spliced = insertCommentAboveQuote(draftBody.value.content, comment);
   const patch = { body: { contentType: "HTML", content: spliced.html } };
   if (ccRecipients)
     patch.ccRecipients = parseRecipients2(ccRecipients);
@@ -22879,8 +22828,7 @@ var meta95 = {
       name: "forward-message-id",
       key: "forwardMessageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "The message being forwarded. Source from list-mail-folder-messages or search-mail-messages. Accepts `--id` as an alias.",
+      description: "The message being forwarded. Source from list-mail-folder-messages or search-mail-messages.",
       argumentHint: { kind: "idOrName" }
     },
     {
@@ -22896,10 +22844,10 @@ var meta95 = {
       description: "Comma-separated list of CC recipient email addresses."
     },
     {
-      name: "body-content",
-      key: "bodyContent",
+      name: "comment",
+      key: "comment",
       required: true,
-      description: "The comment text, placed above the quoted forwarded message. Plain text by default; pass --body-content-type HTML to send it as markup."
+      description: "The comment text, placed above the quoted forwarded message. Named for Graph's own createForward payload field, and the same word update-mail-draft uses for the same role. Plain text by default; pass --body-content-type HTML to send it as markup."
     },
     {
       name: "subject",
@@ -22911,12 +22859,12 @@ var meta95 = {
       name: "body-content-type",
       key: "bodyContentType",
       required: false,
-      description: "Format of --body-content: Text (default) or HTML. Text is handed to Graph as the forward comment, which HTML-escapes it, so markup shows as literal characters. HTML instead creates the draft with an empty comment and splices your markup in at the TOP of the body — above Graph's separator (the `<hr>` line) and the forwarded original, so your comment leads the body content — leaving the original and its styles byte-identical. Rejected when your markup itself contains a quote boundary marker (a pasted reply chain), and when the original is a plain-text message.",
+      description: "Format of --comment: Text (default) or HTML. Text is handed to Graph as the forward comment, which HTML-escapes it, so markup shows as literal characters. HTML instead creates the draft with an empty comment and splices your markup in at the TOP of the body — above Graph's separator (the `<hr>` line) and the forwarded original, so your comment leads the body content — leaving the original and its styles byte-identical. Rejected when your markup itself contains a quote boundary marker (a pasted reply chain), and when the original is a plain-text message.",
       argumentHint: { kind: "magicValue", values: ["Text", "HTML"] }
     }
   ],
-  example: 'ask-marcel-office create-forward-draft --forward-message-id "AAMkAD..." --to-recipients "bob@example.com" --body-content "Bob owns this now, forwarding for your action."',
-  bodyTemplate: "Text: POST { comment: '{body-content}', toRecipients: '{to-recipients}' } then optional PATCH { ccRecipients?: '{cc-recipients}', subject?: '{subject}' }. HTML ({body-content-type}): POST { comment: '', toRecipients: '{to-recipients}' } then ONE PATCH { body: { contentType: 'HTML', content: <'{body-content}' spliced at the top of the body, above Graph's <hr> separator and the quote> }, ccRecipients?: '{cc-recipients}', subject?: '{subject}' }",
+  example: 'ask-marcel-office create-forward-draft --forward-message-id "AAMkAD..." --to-recipients "bob@example.com" --comment "Bob owns this now, forwarding for your action."',
+  bodyTemplate: "Text: POST { comment: '{comment}', toRecipients: '{to-recipients}' } then optional PATCH { ccRecipients?: '{cc-recipients}', subject?: '{subject}' }. HTML ({body-content-type}): POST { comment: '', toRecipients: '{to-recipients}' } then ONE PATCH { body: { contentType: 'HTML', content: <'{comment}' spliced at the top of the body, above Graph's <hr> separator and the quote> }, ccRecipients?: '{cc-recipients}', subject?: '{subject}' }",
   mutates: true,
   scopesRequired: ["Mail.ReadWrite"],
   responseShape: "A confirmation of the write, NOT the whole message: `{ id, subject, toRecipients, ccRecipients, bccRecipients, importance, bodyPreview, isDraft, webLink, conversationId }` (only the fields Graph returned; `{ ok: true }` when Graph answers 204). The `body` is deliberately omitted — you just wrote it, and echoing a long thread's quoted history back cost ~174 KB of context per call. Read the full body with `get-mail-message --id <the returned id>` when you actually need it; `bodyPreview` is Graph's ~255-char summary, enough to confirm WHICH draft answered. The `id` is the draft — refine it with `update-mail-draft`, or open Outlook Drafts to review and send. Dedup caveat: a `conversationId` `$filter` on the Drafts folder is not a reliable 'does a draft already exist on this thread' check. Reply and forward drafts do not always inherit the inbound message's `conversationId` (one thread can split across several), and Graph `$filter` on Drafts is not read-your-writes consistent, so a just-created draft can be missed. To find existing drafts, use the `find-mail-drafts` command, which scans recent drafts and matches client-side on subject and recipients; to revise a draft this session created, reuse the returned `id`."
@@ -23036,7 +22984,7 @@ __export(exports_create_reply_draft, {
 });
 var schema95 = exports_external.object({
   replyToMessageId: exports_external.string().min(1),
-  bodyContent: exports_external.string().min(1),
+  comment: exports_external.string().min(1),
   subject: exports_external.string().optional(),
   replyAll: exports_external.enum(["true", "false"]).optional(),
   bodyContentType: exports_external.enum(["Text", "HTML"]).optional()
@@ -23056,7 +23004,7 @@ var readDraftBody2 = async (graph, created, draftId) => {
       type: "api_error",
       status: 500,
       code: "draft_body_unreadable",
-      message: `Draft ${draftId} was created but its body could not be read back, so the reply text was never written into it. The draft exists - review it in Outlook Drafts, or set its body with \`update-mail-draft --message-id ${draftId} --body-content ...\`.`
+      message: `Draft ${draftId} was created but its body could not be read back, so the reply text was never written into it. The draft exists - review it in Outlook Drafts, or revise it with \`update-mail-draft --message-id ${draftId}\` in comment mode (see \`ask-marcel-office docs update-mail-draft\`).`
     });
   }
   return ok(parsed.data.body);
@@ -23065,13 +23013,13 @@ var execute95 = async (graph, params) => {
   const parsed = schema95.safeParse(params);
   if (!parsed.success)
     return err({ type: "validation_error", message: formatZodError(parsed.error) });
-  const { replyToMessageId, bodyContent, subject, replyAll, bodyContentType } = parsed.data;
+  const { replyToMessageId, comment, subject, replyAll, bodyContentType } = parsed.data;
   const action = replyAll === "false" ? "createReply" : "createReplyAll";
   const asHtml = bodyContentType === "HTML";
-  if (asHtml && commentCarriesQuoteBoundary(bodyContent)) {
-    return err({ type: "validation_error", message: boundaryMarkerRefusal("--body-content") });
+  if (asHtml && commentCarriesQuoteBoundary(comment)) {
+    return err({ type: "validation_error", message: boundaryMarkerRefusal("--comment") });
   }
-  const created = await graph.post(`/me/messages/${replyToMessageId}/${action}`, { comment: asHtml ? "" : bodyContent });
+  const created = await graph.post(`/me/messages/${replyToMessageId}/${action}`, { comment: asHtml ? "" : comment });
   if (!created.ok)
     return created;
   if (!isUnsentDraft2(created.value)) {
@@ -23097,10 +23045,10 @@ var execute95 = async (graph, params) => {
   if (draftBody.value.contentType.toLowerCase() !== "html") {
     return err({
       type: "validation_error",
-      message: `The thread's draft body is ${draftBody.value.contentType}, not HTML, so HTML cannot be placed above its quoted history without rewriting the quote. Draft ${draftId} was already created - reply to it with \`update-mail-draft --message-id ${draftId} --comment "..."\`, or delete it in Outlook Drafts and retry without --body-content-type HTML.`
+      message: `The thread's draft body is ${draftBody.value.contentType}, not HTML, so HTML cannot be placed above its quoted history without rewriting the quote. Draft ${draftId} was already created - revise it with \`update-mail-draft --message-id ${draftId}\` in comment mode, or delete it in Outlook Drafts and retry without --body-content-type HTML.`
     });
   }
-  const spliced = insertCommentAboveQuote(draftBody.value.content, bodyContent);
+  const spliced = insertCommentAboveQuote(draftBody.value.content, comment);
   const patch = { body: { contentType: "HTML", content: spliced.html } };
   if (subject)
     patch.subject = subject;
@@ -23117,21 +23065,20 @@ var meta97 = {
       name: "reply-to-message-id",
       key: "replyToMessageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "The message being replied to. Source from list-mail-folder-messages or search-mail-messages. Accepts `--id` as an alias.",
+      description: "The message being replied to. Source from list-mail-folder-messages or search-mail-messages.",
       argumentHint: { kind: "idOrName" }
     },
     {
-      name: "body-content",
-      key: "bodyContent",
+      name: "comment",
+      key: "comment",
       required: true,
-      description: "The reply text, placed above the quoted history. Plain text by default; pass --body-content-type HTML to send it as markup."
+      description: "The reply text, placed above the quoted history. Named for Graph's own createReply payload field, and the same word update-mail-draft uses for the same role. Plain text by default; pass --body-content-type HTML to send it as markup."
     },
     {
       name: "body-content-type",
       key: "bodyContentType",
       required: false,
-      description: "Format of --body-content: Text (default) or HTML. Text is handed to Graph as the reply comment, which HTML-escapes it, so markup shows as literal characters. HTML instead creates the draft with an empty comment and splices your markup in at the TOP of the body — above Graph's reply separator (the `<hr>` line) and the quoted thread, so your reply leads the body content — leaving the quoted thread and its styles byte-identical. Rejected when your markup itself contains a quote boundary marker (a pasted reply chain), and when the thread is a plain-text one.",
+      description: "Format of --comment: Text (default) or HTML. Text is handed to Graph as the reply comment, which HTML-escapes it, so markup shows as literal characters. HTML instead creates the draft with an empty comment and splices your markup in at the TOP of the body — above Graph's reply separator (the `<hr>` line) and the quoted thread, so your reply leads the body content — leaving the quoted thread and its styles byte-identical. Rejected when your markup itself contains a quote boundary marker (a pasted reply chain), and when the thread is a plain-text one.",
       argumentHint: { kind: "magicValue", values: ["Text", "HTML"] }
     },
     {
@@ -23148,8 +23095,8 @@ var meta97 = {
       argumentHint: { kind: "magicValue", values: ["true", "false"] }
     }
   ],
-  example: 'ask-marcel-office create-reply-draft --reply-to-message-id "AAMkAD..." --body-content "Confirmed for Contoso, aligned with the group choice."',
-  bodyTemplate: "Text: POST { comment: '{body-content}' } then optional PATCH { subject?: '{subject}' }. HTML ({body-content-type}): POST { comment: '' } then ONE PATCH { body: { contentType: 'HTML', content: <'{body-content}' spliced at the top of the body, above Graph's <hr> separator and the quote> }, subject?: '{subject}' }",
+  example: 'ask-marcel-office create-reply-draft --reply-to-message-id "AAMkAD..." --comment "Confirmed for Contoso, aligned with the group choice."',
+  bodyTemplate: "Text: POST { comment: '{comment}' } then optional PATCH { subject?: '{subject}' }. HTML ({body-content-type}): POST { comment: '' } then ONE PATCH { body: { contentType: 'HTML', content: <'{comment}' spliced at the top of the body, above Graph's <hr> separator and the quote> }, subject?: '{subject}' }",
   mutates: true,
   scopesRequired: ["Mail.ReadWrite"],
   responseShape: "A confirmation of the write, NOT the whole message: `{ id, subject, toRecipients, ccRecipients, bccRecipients, importance, bodyPreview, isDraft, webLink, conversationId }` (only the fields Graph returned; `{ ok: true }` when Graph answers 204). The `body` is deliberately omitted — you just wrote it, and echoing a long thread's quoted history back cost ~174 KB of context per call. Read the full body with `get-mail-message --id <the returned id>` when you actually need it; `bodyPreview` is Graph's ~255-char summary, enough to confirm WHICH draft answered. The `id` is the draft — refine it with `update-mail-draft`, or open Outlook Drafts to review and send. Dedup caveat: a `conversationId` `$filter` on the Drafts folder is not a reliable 'does a draft already exist on this thread' check. Reply and forward drafts do not always inherit the inbound message's `conversationId` (one thread can split across several), and Graph `$filter` on Drafts is not read-your-writes consistent, so a just-created draft can be missed. To find existing drafts, use the `find-mail-drafts` command, which scans recent drafts and matches client-side on subject and recipients; to revise a draft this session created, reuse the returned `id`."
@@ -23167,6 +23114,7 @@ var schema96 = exports_external.object({
   subject: exports_external.string().optional(),
   bodyContent: exports_external.string().optional(),
   comment: exports_external.string().min(1).optional(),
+  replaceQuotedHistory: exports_external.enum(["true", "false"]).optional(),
   bodyContentType: exports_external.enum(["Text", "HTML"]).optional(),
   toRecipients: exports_external.string().optional(),
   ccRecipients: exports_external.string().optional(),
@@ -23178,6 +23126,10 @@ var noQuoteRefusal = (messageId) => ({
   type: "validation_error",
   message: `Draft ${messageId} has no quoted reply history to preserve, so there is nothing for --comment to sit above. Use --body-content to replace the whole body instead.`
 });
+var quotedHistoryRefusal = (messageId) => ({
+  type: "validation_error",
+  message: `Draft ${messageId} carries quoted reply history, and --body-content replaces the entire body, quote included. Revise only your own text with --comment, which keeps the quote byte-identical, or pass --replace-quoted-history true to drop the quote deliberately.`
+});
 var reviseBodyAboveQuote = (draft, messageId, comment, asHtml) => {
   if (draft.contentType.toLowerCase() !== "html") {
     if (asHtml) {
@@ -23212,11 +23164,19 @@ var readDraft = async (graph, messageId) => {
   }
   return ok(parsed.data);
 };
+var guardQuotedHistory = async (graph, messageId) => {
+  const draft = await readDraft(graph, messageId);
+  if (!draft.ok)
+    return draft;
+  if (!bodyCarriesQuote(draft.value.body.contentType, draft.value.body.content))
+    return ok(undefined);
+  return err(quotedHistoryRefusal(messageId));
+};
 var execute96 = async (graph, params) => {
   const parsed = schema96.safeParse(params);
   if (!parsed.success)
     return err({ type: "validation_error", message: formatZodError(parsed.error) });
-  const { messageId, subject, bodyContent, comment, bodyContentType, toRecipients, ccRecipients, bccRecipients, importance } = parsed.data;
+  const { messageId, subject, bodyContent, comment, replaceQuotedHistory, bodyContentType, toRecipients, ccRecipients, bccRecipients, importance } = parsed.data;
   if ([subject, bodyContent, comment, toRecipients, ccRecipients, bccRecipients, importance].every((v) => v === undefined)) {
     return err({
       type: "validation_error",
@@ -23232,6 +23192,11 @@ var execute96 = async (graph, params) => {
   if (comment !== undefined && bodyContentType === "HTML" && commentCarriesQuoteBoundary(comment)) {
     return err({ type: "validation_error", message: boundaryMarkerRefusal("--comment") });
   }
+  if (bodyContent !== undefined && replaceQuotedHistory !== "true") {
+    const guarded = await guardQuotedHistory(graph, messageId);
+    if (!guarded.ok)
+      return guarded;
+  }
   const body = {};
   if (subject !== undefined)
     body.subject = subject;
@@ -23257,18 +23222,17 @@ var execute96 = async (graph, params) => {
   return slimDraftResult(await graph.patch(`/me/messages/${messageId}`, body));
 };
 var meta98 = {
-  summary: "Update an existing mail draft. PATCH /me/messages/{id} — modifies a draft created by create-mail-draft (or any existing draft in the Drafts folder). Only the fields you pass are updated; omitted fields are left unchanged. At least one field must be provided. On a THREADED draft (one made by create-reply-draft / create-forward-draft), revise your text with --comment, which rewrites only what sits above the quoted history and leaves the quote byte-identical; --body-content would replace the whole body and drop the thread. Passing an EMPTY string to a recipient flag clears that list, which is how you drop recipients a reply-all or forward inherited; omitting the flag leaves the list alone. Returns a slim confirmation (id, subject, recipients, importance, bodyPreview, …) - NOT the full body, which you just wrote; read it back with get-mail-message if you need the whole draft before sending.",
+  summary: "Update an existing mail draft. PATCH /me/messages/{id} — modifies a draft created by create-mail-draft (or any existing draft in the Drafts folder). Only the fields you pass are updated; omitted fields are left unchanged. At least one field must be provided. On a THREADED draft (one made by create-reply-draft / create-forward-draft), revise your text with --comment, which rewrites only what sits above the quoted history and leaves the quote byte-identical; --body-content replaces the whole body and would drop the thread, so it is REFUSED on a draft that still carries a quote unless you pass --replace-quoted-history true. Passing an EMPTY string to a recipient flag clears that list, which is how you drop recipients a reply-all or forward inherited; omitting the flag leaves the list alone. Returns a slim confirmation (id, subject, recipients, importance, bodyPreview, …) - NOT the full body, which you just wrote; read it back with get-mail-message if you need the whole draft before sending.",
   category: "mail",
   graphMethod: "PATCH",
-  graphPathTemplate: "/me/messages/{message-id} (+ a GET of body,isDraft first when {comment} is used)",
+  graphPathTemplate: "/me/messages/{message-id} (+ a GET of body,isDraft first when {comment} is used, or when {body-content} is used without {replace-quoted-history})",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/message-update",
   options: [
     {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Draft message ID to update. Source from create-mail-draft response or list-mail-folder-messages --mail-folder-id drafts. Accepts `--id` as an alias.",
+      description: "Draft message ID to update. Source from create-mail-draft response or list-mail-folder-messages --mail-folder-id drafts.",
       argumentHint: { kind: "idOrName" }
     },
     {
@@ -23281,7 +23245,7 @@ var meta98 = {
       name: "body-content",
       key: "bodyContent",
       required: false,
-      description: "New email body content. Replaces the ENTIRE body, quoted history included. On a threaded reply or forward draft this is almost never what you want - use --comment to revise only your own text and keep the quote. Pass --body-content-type HTML for rich text. Mutually exclusive with --comment."
+      description: "New email body content. Replaces the ENTIRE body, quoted history included. On a threaded reply or forward draft that is almost never what you want, so the command reads the draft first and REFUSES when it still carries a quote - use --comment to revise only your own text and keep the quote, or pass --replace-quoted-history true to drop it deliberately. Note the sibling commands: create-reply-draft / create-forward-draft name their above-the-quote text --comment; --body-content exists only here. Pass --body-content-type HTML for rich text. Mutually exclusive with --comment."
     },
     {
       name: "comment",
@@ -23289,6 +23253,13 @@ var meta98 = {
       required: false,
       description: "Rewrite ONLY the reply text above the quoted history on a threaded draft, keeping the quote and its styles byte-identical. This is the flag for revising a draft made by create-reply-draft or create-forward-draft; repeated edits replace your text rather than stacking. Refused when the draft has no quoted history (use --body-content), when it is not a draft, and when HTML markup you pass carries a quote boundary marker of its own. Mutually exclusive with --body-content."
     },
+    {
+      name: "replace-quoted-history",
+      key: "replaceQuotedHistory",
+      required: false,
+      description: "Allow --body-content to drop the quoted history on a threaded draft. Without it, --body-content is REFUSED when the draft still carries a quote, because replacing the whole body there silently loses the thread; the refusal points at --comment, which revises only your own text. Pass `true` for the deliberate case: strip the quote but keep the draft threaded on its conversation. Ignored in comment mode, which never touches the quote.",
+      argumentHint: { kind: "magicValue", values: ["true", "false"] }
+    },
     {
       name: "body-content-type",
       key: "bodyContentType",
@@ -23323,7 +23294,7 @@ var meta98 = {
     }
   ],
   example: 'ask-marcel-office update-mail-draft --message-id "AAMkAD..." --subject "Updated: Q3 Report" --to-recipients "alice@example.com,charlie@example.com"',
-  bodyTemplate: "{ subject?: '{subject}', body?: { contentType: '{body-content-type}', content: '{body-content}' }, toRecipients?: '{to-recipients}', ccRecipients?: '{cc-recipients}', bccRecipients?: '{bcc-recipients}', importance?: '{importance}' } — only provided fields are sent. With '{comment}': body.content is the draft's own body with the text above the quote replaced, and body.contentType is the draft's own, unchanged",
+  bodyTemplate: "{ subject?: '{subject}', body?: { contentType: '{body-content-type}', content: '{body-content}' }, toRecipients?: '{to-recipients}', ccRecipients?: '{cc-recipients}', bccRecipients?: '{bcc-recipients}', importance?: '{importance}' } — only provided fields are sent. With '{comment}': body.content is the draft's own body with the text above the quote replaced, and body.contentType is the draft's own, unchanged. A '{body-content}' aimed at a draft that still carries a quote costs one GET of body,isDraft and is refused unless '{replace-quoted-history}' is true",
   mutates: true,
   scopesRequired: ["Mail.ReadWrite"],
   responseShape: "A confirmation of the write, NOT the whole message: `{ id, subject, toRecipients, ccRecipients, bccRecipients, importance, bodyPreview, isDraft, webLink, conversationId }` (only the fields Graph returned; `{ ok: true }` when Graph answers 204). The `body` is deliberately omitted — you just wrote it, and echoing a long thread's quoted history back cost ~174 KB of context per call. Read the full body with `get-mail-message --id <the returned id>` when you actually need it; `bodyPreview` is Graph's ~255-char summary, enough to confirm WHICH draft answered. The `id` is the draft — refine it with `update-mail-draft`, or open Outlook Drafts to review and send. Dedup caveat: a `conversationId` `$filter` on the Drafts folder is not a reliable 'does a draft already exist on this thread' check. Reply and forward drafts do not always inherit the inbound message's `conversationId` (one thread can split across several), and Graph `$filter` on Drafts is not read-your-writes consistent, so a just-created draft can be missed. To find existing drafts, use the `find-mail-drafts` command, which scans recent drafts and matches client-side on subject and recipients; to revise a draft this session created, reuse the returned `id`."
@@ -23361,7 +23332,6 @@ var execute97 = async (graph, params) => {
 var meta99 = {
   summary: "Unzip a `.zip` from a OneDrive / SharePoint item and convert every contained file in one call — so \"read the handover archive\" doesn't need a separate unzip + per-file conversion. Office files (docx/xlsx/pptx/odt/ods/odp and their macro-enabled / template variants) are converted to markdown via the local pipelines; plain-text entries (txt/md/csv/json/yaml/…) are decoded inline; legacy OLE .xls (sheetjs) and .doc (word-extractor, text only) are extracted; an Outlook .msg entry is rendered to markdown (headers + body, with its own attachments converted recursively); PDFs have their text layer extracted (text/plain); images, binaries, nested archives, legacy .ppt, and scanned/image-only PDFs (no text layer) are listed with a note (not unpacked) so one unsupported entry never fails the whole archive. Pass `--include-metadata true` to append each Office file's side-channel metadata block. Capped at 100 entries (the archive is buffered in memory); beyond that the response is flagged `truncated`.",
   category: "drive",
-  commandAliases: ["convert-drive-item-zip"],
   graphMethod: "GET",
   graphPathTemplate: "/drives/{drive-id}/items/{item-id}/content",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/driveitem-get-content",
@@ -23439,7 +23409,6 @@ var execute98 = async (_graph, _params) => err({
 var meta100 = {
   summary: "Convert a file ON DISK to markdown — the only command that never calls Microsoft Graph (works offline, no login). Runs the same local pipelines as `download-drive-item-as-markdown`: docx (mammoth → turndown), xlsx (sheetjs tables, `--max-cells` OOM cap), pptx (per-slide text), odt/ods/odp, csv, pdf (text layer via unpdf), legacy OLE .xls / .doc, Outlook .msg (headers + body with the quoted reply chain stripped — `--keep-quoted true` restores it — and inline `cid:` images shown as placeholders, attachments converted recursively), plain-text passthrough — and a `.zip` is unpacked with every contained file converted in one call (legacy GBK / CP437 entry names decoded, not mojibaked). What it canNOT do locally: convert TO pdf, and Loop/Fluid/Whiteboard sources — both need a Graph server round-trip (upload to OneDrive and use the drive-item siblings). Pass `--include-metadata true` for the Office side-channel metadata blocks; `--inline-images true` to embed docx images as base64 data URIs.",
   category: "meta",
-  commandAliases: ["convert-local-file"],
   graphMethod: "GET",
   graphPathTemplate: "(local) reads {path} from the local filesystem; not a Graph endpoint",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/",
@@ -23572,7 +23541,6 @@ var execute100 = async (graph, params) => {
 var meta102 = {
   summary: "Unzip a `.zip` Outlook mail attachment and convert every contained file in one call — the mail-side mirror of `convert-drive-item-zip-to-markdown`, so reading a zipped vendor deck doesn't need `get-mail-attachment` + manual `unzip` + per-file conversion. Pulls the fileAttachment bytes, unzips them (legacy GBK / CP437 entry names — Chinese vendor archives written by WinRAR / Windows Explorer — are decoded correctly, not mojibaked), and runs each file through the local pipelines: Office files (docx/xlsx/pptx/odt/ods/odp and macro-enabled / template variants) → markdown; plain-text entries decoded inline; legacy OLE .xls (sheetjs) and .doc (word-extractor, text only) extracted; an inner Outlook .msg rendered; PDFs have their text layer extracted; images, binaries, nested archives, legacy .ppt, and scanned/image-only PDFs are listed with a note (not unpacked) so one unsupported entry never fails the whole archive. Pass `--include-metadata true` to append each Office file's side-channel metadata block. Capped at 100 entries; beyond that the response is flagged `truncated`. itemAttachment / referenceAttachment are rejected (no inline zip payload).",
   category: "mail",
-  commandAliases: ["convert-mail-attachment-zip"],
   graphMethod: "GET",
   graphPathTemplate: "/me/messages/{message-id}/attachments/{attachment-id}",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/attachment-get",
@@ -23685,8 +23653,7 @@ var meta104 = {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Outlook message ID. Returned by `list-mail-messages` or `list-mail-folder-messages`. Accepts `--id` as an alias."
+      description: "Outlook message ID. Returned by `list-mail-messages` or `list-mail-folder-messages`."
     }
   ],
   example: "ask-marcel-office extract-sharepoint-links-in-mail --message-id 'AAMkADk0...'",
@@ -23738,7 +23705,6 @@ var meta106 = {
       name: "chat-id",
       key: "chatId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams chat ID, e.g. `19:abc...@thread.v2`. Returned by `list-chats`."
     },
     ...selectExpandOptions
@@ -23825,7 +23791,6 @@ var meta108 = {
       name: "chat-id",
       key: "chatId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Teams chat ID — typically `19:<thread>@unq.gbl.spaces` (1:1) or `19:<thread>@thread.v2` (group). Source via `list-chats` or `list-teams-chats-with-messages`."
     }
   ],
@@ -23923,7 +23888,6 @@ var meta109 = {
       name: "chat-id",
       key: "chatId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Teams chat ID — typically `19:<thread>@unq.gbl.spaces` (1:1) or `19:<thread>@thread.v2` (group). Source via `list-chats` or `list-teams-chats-with-messages`."
     },
     {
@@ -24640,7 +24604,6 @@ var meta117 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID or userPrincipalName (UPN) — typically the user's email address. Discover via `list-relevant-people` (relevance-ranked colleagues) or `microsoft-search-query --query <name>` (federated person search across the tenant directory)."
     },
     ...odataQueryOptions
@@ -24898,7 +24861,6 @@ var meta127 = {
       name: "team-id",
       key: "teamId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams team ID."
     }
   ],
@@ -24948,7 +24910,6 @@ var meta129 = {
       name: "calendar-group-id",
       key: "calendarGroupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Calendar group ID. Returned by `list-calendar-groups`."
     },
     ...odataQueryOptions
@@ -24998,7 +24959,6 @@ var meta131 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID. Returned by `search-sharepoint-sites-by-name`."
     },
     ...selectExpandOptions
@@ -25027,7 +24987,6 @@ var meta132 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID."
     },
     ...noSkipOptions
@@ -25058,7 +25017,6 @@ var meta133 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID."
     },
     ...noSkipOptions
@@ -25326,15 +25284,15 @@ __export(exports_get_drive_root_delta, {
   meta: () => meta140,
   execute: () => execute138
 });
-var baseSchema67 = exports_external.object({}).strict();
-var { execute: execute138, schema: schema138 } = buildNoSkipListCommand(() => "/me/drive/root/delta()", baseSchema67);
+var baseSchema67 = exports_external.object({});
+var { execute: execute138, schema: schema138 } = buildPickODataListCommand(() => "/me/drive/root/delta()", baseSchema67, ["top", "select", "expand"]);
 var meta140 = {
   summary: "Track incremental changes (added / modified / deleted items) anywhere under the signed-in user's OneDrive root. **Takes zero required arguments** — acts implicitly on the signed-in user's primary OneDrive; use `get-drive-delta` to target a specific drive by ID. The first call returns a snapshot plus `@odata.deltaLink`; subsequent calls with that link return only what has changed since. Cross-folder companion to `get-drive-delta` (which scopes to one specific folder).",
   category: "drive",
   graphMethod: "GET",
   graphPathTemplate: "/me/drive/root/delta()",
   graphDocsUrl: "https://learn.microsoft.com/en-us/graph/api/driveitem-delta",
-  options: [...noSkipOptions],
+  options: [...pickODataOptions(["top", "select", "expand"])],
   example: "ask-marcel-office get-drive-root-delta",
   responseShape: "collection of Microsoft Graph `driveItem` resources under `data.value[]`. Cursor tokens are hoisted to envelope level: top-level `nextLink` while paging, then top-level `deltaLink` on the final page.",
   pagination: true,
@@ -25451,7 +25409,6 @@ var meta144 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID."
     }
   ],
@@ -25491,8 +25448,7 @@ var meta145 = {
       name: "list-item-id",
       key: "listItemId",
       required: true,
-      description: "List item ID inside the list. Returned by `list-sharepoint-site-list-items`.",
-      aliases: [{ name: "item-id", key: "itemId" }]
+      description: "List item ID inside the list. Returned by `list-sharepoint-site-list-items`."
     },
     ...noSkipOptions
   ],
@@ -25528,11 +25484,7 @@ var meta146 = {
       name: "message-rule-id",
       key: "messageRuleId",
       required: true,
-      description: "Message rule ID. Returned by `list-mail-rules`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "rule-id", key: "ruleId" }
-      ]
+      description: "Message rule ID. Returned by `list-mail-rules`."
     }
   ],
   example: "ask-marcel-office get-mail-rule --message-rule-id 'AQAAANC...'",
@@ -25682,7 +25634,6 @@ var meta151 = {
       name: "team-id",
       key: "teamId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Microsoft Teams team ID. Returned by `list-joined-teams`."
     },
     ...selectExpandOptions
@@ -25711,12 +25662,7 @@ var meta152 = {
       name: "todo-task-list-id",
       key: "todoTaskListId",
       required: true,
-      description: "Microsoft To Do task list ID. Returned by `list-todo-task-lists`.",
-      aliases: [
-        { name: "id", key: "id" },
-        { name: "task-list-id", key: "taskListId" },
-        { name: "todo-list-id", key: "todoListId" }
-      ]
+      description: "Microsoft To Do task list ID. Returned by `list-todo-task-lists`."
     }
   ],
   example: "ask-marcel-office list-todo-tasks-delta --todo-task-list-id 'AAMkAD...'",
@@ -25840,7 +25786,6 @@ var meta155 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID, UPN, or email (returns the full profile via the elevated token), OR a display name (returns relevant-people candidates on the basic token). Discover ids via `list-relevant-people` or `microsoft-search-query`."
     },
     ...selectExpandOptions
@@ -25882,7 +25827,6 @@ var meta156 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID or UPN — typically the user's email address. Discover via `list-relevant-people` (relevance-ranked colleagues) or `microsoft-search-query --query <name>` (federated person search across the tenant directory)."
     },
     ...selectExpandOptions
@@ -25954,7 +25898,6 @@ var meta159 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID. Use `list-groups` to find one."
     },
     ...selectExpandOptions
@@ -25983,7 +25926,6 @@ var meta160 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID. Use `list-groups` to find one."
     },
     ...odataQueryOptions
@@ -26013,7 +25955,6 @@ var meta161 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID. Use `list-groups` to find one."
     },
     ...odataQueryOptions
@@ -26043,7 +25984,6 @@ var meta162 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID for a unified (Microsoft 365) group. Use `list-groups` to find one."
     },
     ...odataQueryOptions
@@ -26073,17 +26013,15 @@ var meta163 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID for a unified (Microsoft 365) group."
     },
     {
       name: "start-date-time",
       key: "startDateTime",
       required: true,
-      aliases: [{ name: "start", key: "start" }],
       description: `Start of the window (recurrences are expanded across it). ${RELATIVE_DATE_DESCRIPTION}`
     },
-    { name: "end-date-time", key: "endDateTime", required: true, aliases: [{ name: "end", key: "end" }], description: `End of the window. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "end-date-time", key: "endDateTime", required: true, description: `End of the window. ${RELATIVE_DATE_DESCRIPTION}` },
     ...odataQueryOptions
   ],
   example: "ask-marcel-office list-group-calendar-view --group-id 'a1b2c3d4-...' --start-date-time '2026-04-01T00:00:00Z' --end-date-time '2026-05-01T00:00:00Z'",
@@ -26111,7 +26049,6 @@ var meta164 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID for a unified (Microsoft 365) group."
     },
     ...odataQueryOptions
@@ -26141,7 +26078,6 @@ var meta165 = {
       name: "group-id",
       key: "groupId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD group object ID for a unified (Microsoft 365) group."
     },
     ...odataQueryOptions
@@ -26176,8 +26112,7 @@ var meta166 = {
       name: "message-id",
       key: "messageId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
-      description: "Outlook message ID. Returned by `list-mail-messages` or `search-mail-messages`. Accepts `--id` as an alias."
+      description: "Outlook message ID. Returned by `list-mail-messages` or `search-mail-messages`."
     }
   ],
   example: "ask-marcel-office get-mail-message-mime --message-id 'AAMkAD...'",
@@ -26192,10 +26127,19 @@ __export(exports_list_mail_folder_messages_delta, {
   meta: () => meta167,
   execute: () => execute165
 });
-var baseSchema87 = exports_external.object({ mailFolderId: exports_external.string().min(1) });
-var { execute: execute165, schema: schema165 } = buildListCommand((p) => `/me/mailFolders/${p.mailFolderId}/messages/delta()`, baseSchema87);
+var schema165 = exports_external.object({ mailFolderId: exports_external.string().min(1) }).extend(pickODataShape(["top", "select", "filter", "expand"]));
+var execute165 = async (graph, params) => {
+  const parsed = schema165.safeParse(params);
+  if (!parsed.success)
+    return err({ type: "validation_error", message: formatZodError(parsed.error) });
+  const { mailFolderId, top, ...odata } = parsed.data;
+  const headers = {};
+  if (top !== undefined)
+    headers["Prefer"] = `odata.maxpagesize=${top}`;
+  return graph.get(appendOData(`/me/mailFolders/${mailFolderId}/messages/delta()`, odata), headers);
+};
 var meta167 = {
-  summary: "Track incremental changes (added / updated / deleted messages) within a single mail folder using Microsoft Graph delta tokens. The first call returns the current snapshot plus a `@odata.deltaLink`; subsequent calls with that link return only what has changed since.",
+  summary: 'Track incremental changes (added / updated / deleted messages) within a single mail folder using Microsoft Graph delta tokens. The first call returns the current snapshot plus a `@odata.deltaLink`; subsequent calls with that link return only what has changed since. `--top` is translated into the `Prefer: odata.maxpagesize=N` header: as a `$top` query parameter Graph reads a satisfied count as "sync complete" and hands back a deltaLink after N items, silently abandoning the rest of the folder. `$skip` and `$orderby` are NOT exposed — Graph ignores the former on this endpoint and rejects the latter unless it merely restates the default `receivedDateTime desc`.',
   category: "mail",
   graphMethod: "GET",
   graphPathTemplate: "/me/mailFolders/{mail-folder-id}/messages/delta()",
@@ -26205,15 +26149,14 @@ var meta167 = {
       name: "mail-folder-id",
       key: "mailFolderId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Mail folder ID or well-known name (`inbox`, `archive`, `sentitems`, `deleteditems`, `junkemail`, `drafts`). Returned by `list-mail-folders`."
     },
-    ...odataQueryOptions
+    ...pickODataOptions(["top", "select", "filter", "expand"])
   ],
   example: "ask-marcel-office list-mail-folder-messages-delta --mail-folder-id 'inbox'",
-  responseShape: "collection of Microsoft Graph `message` resources under `data.value[]`. Cursor tokens are hoisted to envelope level: top-level `nextLink` while paging, then top-level `deltaLink` on the final page (CLI strips the original `@odata.*` keys from `data`).",
+  responseShape: "collection of Microsoft Graph `message` resources under `data.value[]`. Cursor tokens are hoisted to envelope level: top-level `nextLink` while paging, then top-level `deltaLink` on the final page (CLI strips the original `@odata.*` keys from `data`). A `deltaLink` on the FIRST page means the folder is fully synced, not that it was truncated.",
   pagination: true,
-  paginationStrategy: "deltaLink"
+  paginationStrategy: "preferMaxPageSize"
 };
 
 // src/use-cases/commands/list-shared-mailbox-messages.ts
@@ -26223,8 +26166,8 @@ __export(exports_list_shared_mailbox_messages, {
   meta: () => meta168,
   execute: () => execute166
 });
-var baseSchema88 = exports_external.object({ userId: exports_external.string().min(1) });
-var { execute: execute166, schema: schema166 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/messages`, baseSchema88);
+var baseSchema87 = exports_external.object({ userId: exports_external.string().min(1) });
+var { execute: execute166, schema: schema166 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/messages`, baseSchema87);
 var meta168 = {
   summary: "List messages from a shared or delegated mailbox the signed-in user has read access to. Same shape as `list-mail-messages` but scoped to a specific mailbox owner. 403 if the signed-in user does not have shared access to that mailbox.",
   category: "mail",
@@ -26236,7 +26179,6 @@ var meta168 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID or UPN of the shared mailbox or delegated user. The signed-in user must have `Mail.Read.Shared` access (granted by the mailbox owner)."
     },
     ...odataQueryOptions
@@ -26253,8 +26195,8 @@ __export(exports_list_shared_mailbox_folder_messages, {
   meta: () => meta169,
   execute: () => execute167
 });
-var baseSchema89 = exports_external.object({ userId: exports_external.string().min(1), mailFolderId: exports_external.string().min(1) });
-var { execute: execute167, schema: schema167 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/mailFolders/${p.mailFolderId}/messages`, baseSchema89);
+var baseSchema88 = exports_external.object({ userId: exports_external.string().min(1), mailFolderId: exports_external.string().min(1) });
+var { execute: execute167, schema: schema167 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/mailFolders/${p.mailFolderId}/messages`, baseSchema88);
 var meta169 = {
   summary: "List messages in a single folder of a shared / delegated mailbox.",
   category: "mail",
@@ -26288,8 +26230,8 @@ __export(exports_get_shared_mailbox_message, {
   meta: () => meta170,
   execute: () => execute168
 });
-var baseSchema90 = exports_external.object({ userId: exports_external.string().min(1), messageId: exports_external.string().min(1) });
-var { execute: execute168, schema: schema168 } = buildSelectableCommand((p) => `/users/${encodeURIComponent(p.userId)}/messages/${p.messageId}`, baseSchema90);
+var baseSchema89 = exports_external.object({ userId: exports_external.string().min(1), messageId: exports_external.string().min(1) });
+var { execute: execute168, schema: schema168 } = buildSelectableCommand((p) => `/users/${encodeURIComponent(p.userId)}/messages/${p.messageId}`, baseSchema89);
 var meta170 = {
   summary: "Return a single message from a shared / delegated mailbox. Use `--select` to fetch only specific fields (e.g. `--select id,subject,from,receivedDateTime`) — sibling to `get-mail-message` for /me.",
   category: "mail",
@@ -26343,7 +26285,6 @@ var meta171 = {
       name: "conversation-id",
       key: "conversationId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Outlook `conversationId` of any message in the thread (returned by every mail-listing command and by `get-mail-message`)."
     },
     ...allowedOptions
@@ -26360,8 +26301,8 @@ __export(exports_list_focused_inbox_overrides, {
   meta: () => meta172,
   execute: () => execute170
 });
-var baseSchema91 = exports_external.object({}).strict();
-var { execute: execute170, schema: schema170 } = buildListCommand(() => "/me/inferenceClassification/overrides", baseSchema91);
+var baseSchema90 = exports_external.object({}).strict();
+var { execute: execute170, schema: schema170 } = buildListCommand(() => "/me/inferenceClassification/overrides", baseSchema90);
 var meta172 = {
   summary: "List the signed-in user's Focused Inbox classification overrides — sender addresses they've manually moved to Focused or Other, which override Microsoft's automatic classifier.",
   category: "mail",
@@ -26401,8 +26342,8 @@ __export(exports_list_shared_calendar_events, {
   meta: () => meta174,
   execute: () => execute172
 });
-var baseSchema92 = exports_external.object({ userId: exports_external.string().min(1) });
-var { execute: execute172, schema: schema172 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/calendar/events`, baseSchema92);
+var baseSchema91 = exports_external.object({ userId: exports_external.string().min(1) });
+var { execute: execute172, schema: schema172 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/calendar/events`, baseSchema91);
 var meta174 = {
   summary: "List events from another user's primary calendar (shared / delegated access). 403 without `Calendars.Read.Shared`.",
   category: "calendar",
@@ -26414,7 +26355,6 @@ var meta174 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID or UPN whose calendar to read. Requires `Calendars.Read.Shared` access (granted by the calendar owner)."
     },
     ...odataQueryOptions
@@ -26431,8 +26371,8 @@ __export(exports_get_shared_calendar_view, {
   meta: () => meta175,
   execute: () => execute173
 });
-var baseSchema93 = exports_external.object({ userId: exports_external.string().min(1), startDateTime: isoDateTimeField, endDateTime: isoDateTimeField });
-var { execute: execute173, schema: schema173 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/calendarView?startDateTime=${encodeURIComponent(p.startDateTime)}&endDateTime=${encodeURIComponent(p.endDateTime)}`, baseSchema93);
+var baseSchema92 = exports_external.object({ userId: exports_external.string().min(1), startDateTime: isoDateTimeField, endDateTime: isoDateTimeField });
+var { execute: execute173, schema: schema173 } = buildListCommand((p) => `/users/${encodeURIComponent(p.userId)}/calendarView?startDateTime=${encodeURIComponent(p.startDateTime)}&endDateTime=${encodeURIComponent(p.endDateTime)}`, baseSchema92);
 var meta175 = {
   summary: "Return a date-windowed calendar view from another user's primary calendar (shared / delegated access). Recurrences expanded into individual occurrences.",
   category: "calendar",
@@ -26444,11 +26384,10 @@ var meta175 = {
       name: "user-id",
       key: "userId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "Azure AD user ID or UPN of the calendar owner."
     },
-    { name: "start-date-time", key: "startDateTime", required: true, aliases: [{ name: "start", key: "start" }], description: `Start of the window. ${RELATIVE_DATE_DESCRIPTION}` },
-    { name: "end-date-time", key: "endDateTime", required: true, aliases: [{ name: "end", key: "end" }], description: `End of the window. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "start-date-time", key: "startDateTime", required: true, description: `Start of the window. ${RELATIVE_DATE_DESCRIPTION}` },
+    { name: "end-date-time", key: "endDateTime", required: true, description: `End of the window. ${RELATIVE_DATE_DESCRIPTION}` },
     ...odataQueryOptions
   ],
   example: "ask-marcel-office list-shared-calendar-view --user-id 'colleague@contoso.com' --start-date-time '2026-04-01T00:00:00Z' --end-date-time '2026-05-01T00:00:00Z'",
@@ -26463,8 +26402,8 @@ __export(exports_list_sharepoint_list_columns, {
   meta: () => meta176,
   execute: () => execute174
 });
-var baseSchema94 = exports_external.object({ siteId: exports_external.string().min(1), listId: exports_external.string().min(1) });
-var { execute: execute174, schema: schema174 } = buildSelectableCommand((p) => `/sites/${p.siteId}/lists/${p.listId}/columns`, baseSchema94);
+var baseSchema93 = exports_external.object({ siteId: exports_external.string().min(1), listId: exports_external.string().min(1) });
+var { execute: execute174, schema: schema174 } = buildSelectableCommand((p) => `/sites/${p.siteId}/lists/${p.listId}/columns`, baseSchema93);
 var meta176 = {
   summary: "List the column definitions (schema) of a SharePoint list. Useful before reading list items so you know which fields exist and their types. Note: Graph silently ignores `$top` and `$skip` on this endpoint, so the CLI exposes only `--select` and `--expand`.",
   category: "sharepoint",
@@ -26497,8 +26436,8 @@ __export(exports_get_sharepoint_list_column, {
   meta: () => meta177,
   execute: () => execute175
 });
-var baseSchema95 = exports_external.object({ siteId: exports_external.string().min(1), listId: exports_external.string().min(1), columnId: exports_external.string().min(1) });
-var { execute: execute175, schema: schema175 } = buildSelectableCommand((p) => `/sites/${p.siteId}/lists/${p.listId}/columns/${p.columnId}`, baseSchema95);
+var baseSchema94 = exports_external.object({ siteId: exports_external.string().min(1), listId: exports_external.string().min(1), columnId: exports_external.string().min(1) });
+var { execute: execute175, schema: schema175 } = buildSelectableCommand((p) => `/sites/${p.siteId}/lists/${p.listId}/columns/${p.columnId}`, baseSchema94);
 var meta177 = {
   summary: "Return a single column definition from a SharePoint list.",
   category: "sharepoint",
@@ -26557,8 +26496,8 @@ var wrapOnenote5kLimit = (inner14) => async (graph, params) => {
 };
 
 // src/use-cases/commands/list-sharepoint-site-onenote-notebooks.ts
-var baseSchema96 = exports_external.object({ siteId: exports_external.string().min(1) });
-var inner14 = buildListCommand((p) => `/sites/${p.siteId}/onenote/notebooks`, baseSchema96);
+var baseSchema95 = exports_external.object({ siteId: exports_external.string().min(1) });
+var inner14 = buildListCommand((p) => `/sites/${p.siteId}/onenote/notebooks`, baseSchema95);
 var execute176 = wrapOnenote5kLimit(inner14.execute);
 var { schema: schema176 } = inner14;
 var meta178 = {
@@ -26572,7 +26511,6 @@ var meta178 = {
       name: "site-id",
       key: "siteId",
       required: true,
-      aliases: [{ name: "id", key: "id" }],
       description: "SharePoint site ID."
     },
     ...odataQueryOptions
@@ -26589,8 +26527,8 @@ __export(exports_list_sharepoint_site_onenote_notebook_sections, {
   meta: () => meta179,
   execute: () => execute177
 });
-var baseSchema97 = exports_external.object({ siteId: exports_external.string().min(1), notebookId: exports_external.string().min(1) });
-var inner15 = buildListCommand((p) => `/sites/${p.siteId}/onenote/notebooks/${p.notebookId}/sections`, baseSchema97);
+var baseSchema96 = exports_external.object({ siteId: exports_external.string().min(1), notebookId: exports_external.string().min(1) });
+var inner15 = buildListCommand((p) => `/sites/${p.siteId}/onenote/notebooks/${p.notebookId}/sections`, baseSchema96);
 var execute177 = wrapOnenote5kLimit(inner15.execute);
 var { schema: schema177 } = inner15;
 var meta179 = {
@@ -26626,8 +26564,8 @@ __export(exports_list_sharepoint_site_onenote_section_pages, {
   meta: () => meta180,
   execute: () => execute178
 });
-var baseSchema98 = exports_external.object({ siteId: exports_external.string().min(1), onenoteSectionId: exports_external.string().min(1) });
-var inner16 = buildListCommand((p) => `/sites/${p.siteId}/onenote/sections/${p.onenoteSectionId}/pages`, baseSchema98);
+var baseSchema97 = exports_external.object({ siteId: exports_external.string().min(1), onenoteSectionId: exports_external.string().min(1) });
+var inner16 = buildListCommand((p) => `/sites/${p.siteId}/onenote/sections/${p.onenoteSectionId}/pages`, baseSchema97);
 var execute178 = wrapOnenote5kLimit(inner16.execute);
 var { schema: schema178 } = inner16;
 var meta180 = {
@@ -26647,8 +26585,7 @@ var meta180 = {
       name: "onenote-section-id",
       key: "onenoteSectionId",
       required: true,
-      description: "OneNote section ID inside the site.",
-      aliases: [{ name: "section-id", key: "sectionId" }]
+      description: "OneNote section ID inside the site."
     },
     ...odataQueryOptions
   ],
@@ -26689,8 +26626,7 @@ var meta181 = {
       name: "onenote-page-id",
       key: "onenotePageId",
       required: true,
-      description: "OneNote page ID inside the site.",
-      aliases: [{ name: "page-id", key: "pageId" }]
+      description: "OneNote page ID inside the site."
     }
   ],
   example: "ask-marcel-office get-sharepoint-site-onenote-page-content --site-id 'contoso.sharepoint.com,...' --onenote-page-id 'p1'",
@@ -26705,8 +26641,8 @@ __export(exports_list_drive_item_thumbnails, {
   meta: () => meta182,
   execute: () => execute180
 });
-var baseSchema99 = exports_external.object({ driveId: exports_external.string().min(1), itemId: exports_external.string().min(1), ...tenantIdShape });
-var { execute: execute180, schema: schema180 } = buildNoSkipListCommand((p) => `/drives/${p.driveId}/items/${p.itemId}/thumbnails`, baseSchema99);
+var baseSchema98 = exports_external.object({ driveId: exports_external.string().min(1), itemId: exports_external.string().min(1), ...tenantIdShape });
+var { execute: execute180, schema: schema180 } = buildNoSkipListCommand((p) => `/drives/${p.driveId}/items/${p.itemId}/thumbnails`, baseSchema98);
 var meta182 = {
   summary: "List thumbnail URLs (small / medium / large) for a OneDrive / SharePoint file. Each thumbnail set has pre-signed CDN URLs you can render in a UI without further auth.",
   category: "drive",
@@ -26836,8 +26772,8 @@ __export(exports_list_rooms, {
   meta: () => meta184,
   execute: () => execute182
 });
-var baseSchema100 = exports_external.object({}).strict();
-var { execute: execute182, schema: schema182 } = buildListCommand(() => "/places/microsoft.graph.room", baseSchema100);
+var baseSchema99 = exports_external.object({}).strict();
+var { execute: execute182, schema: schema182 } = buildListCommand(() => "/places/microsoft.graph.room", baseSchema99);
 var meta184 = {
   summary: "List bookable meeting rooms in the tenant. Each `room` has `displayName`, `emailAddress`, `capacity`, `building`, `floorNumber`, and `isWheelChairAccessible`. Use the `emailAddress` as a meeting `attendee` for room booking. Pass `--top 5` to limit the response — large tenants return tens of KB by default.",
   category: "calendar",
@@ -26857,8 +26793,8 @@ __export(exports_list_room_lists, {
   meta: () => meta185,
   execute: () => execute183
 });
-var baseSchema101 = exports_external.object({}).strict();
-var { execute: execute183, schema: schema183 } = buildListCommand(() => "/places/microsoft.graph.roomList", baseSchema101);
+var baseSchema100 = exports_external.object({}).strict();
+var { execute: execute183, schema: schema183 } = buildListCommand(() => "/places/microsoft.graph.roomList", baseSchema100);
 var meta185 = {
   summary: "List room lists — usually one per building. Use these to scope a room search by location: a roomList groups the rooms in one office, then `/places/{roomList}/rooms` lists just those rooms. Pass `--top N` to limit the response on large tenants.",
   category: "calendar",
@@ -26878,8 +26814,8 @@ __export(exports_list_trending_insights, {
   meta: () => meta186,
   execute: () => execute184
 });
-var baseSchema102 = exports_external.object({}).strict();
-var { execute: execute184, schema: schema184 } = buildListCommand(() => "/me/insights/trending", baseSchema102);
+var baseSchema101 = exports_external.object({}).strict();
+var { execute: execute184, schema: schema184 } = buildListCommand(() => "/me/insights/trending", baseSchema101);
 var meta186 = {
   summary: "List documents trending around the signed-in user — files popular in their working network (colleagues' recent edits, shares, opens). Microsoft's relevance ranking, useful for surfacing unfamiliar but related work.",
   category: "drive",
@@ -26893,7 +26829,7 @@ var meta186 = {
 };
 
 // src/use-cases/commands/index.ts
-var commands = {
+var modules = {
   "list-drives": exports_list_drives,
   "get-drive-root-item": exports_get_drive_root_item,
   "list-folder-files": exports_list_folder_files,
@@ -27079,6 +27015,7 @@ var commands = {
   "list-todo-tasks-delta": exports_list_todo_tasks_delta,
   "next-page": exports_next_page
 };
+var commands = Object.fromEntries(Object.entries(modules).map(([name, command]) => [name, withUnknownParamRejection(command)]));
 // src/composition/build-deps.ts
 import { join as join2 } from "node:path";
 var defaultCachePath = (home) => join2(home, ".ask-marcel", "token-cache.json");