@softeria/ms-365-mcp-server 0.142.0 → 0.144.0

package/README.md

@@ -619,6 +619,8 @@ Environment variables:
 - `MS365_MCP_MAX_ITEMS=<n>`: Maximum number of items accumulated when `fetchAllPages: true` (positive integer, default `10000`). Pagination stops and the response is truncated once this many items are collected.
 - `MS365_MCP_ALLOW_PAGINATION=0|false|no`: Disable multi-page following entirely. When set, the `fetchAllPages` parameter is not advertised on tools, and any request that still passes it returns only the first page (default: pagination enabled).
 - `MS365_MCP_BODY_FORMAT=html`: Return email bodies as HTML instead of plain text (default: text)
+- `MS365_MCP_MESSAGE_SIGNOFF_PREFIX=<text>`: Signoff prepended to outgoing messages so recipients can tell they were agent-sent, e.g. `🤖`. Default: none. CLI equivalent: `--message-signoff-prefix <text>` (see Message Signoff below)
+- `MS365_MCP_MESSAGE_SIGNOFF_SUFFIX=<text>`: Signoff appended to outgoing messages. Default: none. CLI equivalent: `--message-signoff-suffix <text>`. `--no-message-signoff` disables both (see Message Signoff below)
 - `MS365_MCP_RATE_LIMIT_DISABLED=true|1`: Disable per-IP rate limiting in HTTP mode (default: enabled — 30 req/min on `/authorize`, `/token`, `/register`; 120 req/min on `/mcp`)
 - `MS365_MCP_TRUST_PROXY_HOPS=<n>`: Number of trusted reverse-proxy hops in HTTP mode (default `1`). Accurate per-IP rate limiting depends on this matching your deployment — set to the number of proxies in front of the server, `0` to use the raw socket peer IP, or a comma-separated subnet list
 - `MS365_MCP_CLOUD_TYPE=global|china`: Microsoft cloud environment (alternative to --cloud flag)
@@ -774,6 +776,14 @@ The Key Vault integration uses `DefaultAzureCredential` from the Azure Identity
 
 The Azure Key Vault packages (`@azure/identity` and `@azure/keyvault-secrets`) are optional dependencies. They are only loaded when `MS365_MCP_KEYVAULT_URL` is configured. If you don't use Key Vault, these packages are not required.
 
+## Message Signoff
+
+Outgoing messages can be wrapped in a configurable signoff (e.g. a `🤖` prefix) so recipients can tell agent-sent messages from ones you typed yourself. Off by default — enable it with `--message-signoff-prefix` / `--message-signoff-suffix` (env: `MS365_MCP_MESSAGE_SIGNOFF_PREFIX` / `MS365_MCP_MESSAGE_SIGNOFF_SUFFIX`); `--no-message-signoff` or an empty env value turns it back off.
+
+Once configured, it applies to all Teams messages (sends, replies and edits, including via `graph-batch`), to direct mail sends (`send-mail`, reply/forward, their shared-mailbox variants, and group thread replies), and to mail drafts as their content is written — `send-draft-message` sends a draft as-is, so a draft you wrote yourself goes out untouched. A message that already carries the marker is not signed twice, and a send whose body cannot take the signoff is refused rather than sent unsigned.
+
+Markers may contain markup (e.g. a coloured `<span>`) as long as it renders visible text. Note that the signoff is a guardrail against an agent misusing the tools it was given, not a hard security boundary — an agent with shell access on the same machine could simply restart the server without it.
+
 ## Production Deployment
 
 See [docs/deployment.md](docs/deployment.md) for a full guide to hosting the server for organization-wide access, including Docker, Azure Container Apps, Azure App Service, Azure AD app registration, reverse proxy setup, client configuration, and exposed endpoints.

package/dist/__tests__/graph-client.test.js

@@ -0,0 +1,128 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import GraphClient from "../graph-client.js";
+import { fetchWithResilience } from "../lib/graph-resilience.js";
+vi.mock("../logger.js", () => ({
+  default: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn()
+  }
+}));
+vi.mock("../lib/graph-resilience.js", () => ({
+  fetchWithResilience: vi.fn(),
+  getSharedBreaker: vi.fn(() => ({})),
+  loadResilienceConfig: vi.fn(() => ({}))
+}));
+const fetchWithResilienceMock = vi.mocked(fetchWithResilience);
+function createGraphClient() {
+  return new GraphClient(
+    {
+      getToken: vi.fn().mockResolvedValue("token")
+    },
+    {
+      clientId: "client-id",
+      tenantId: "tenant-id",
+      cloudType: "global"
+    }
+  );
+}
+describe("GraphClient audit metadata", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+  it("adds HTTP status metadata to successful Graph responses", async () => {
+    fetchWithResilienceMock.mockResolvedValue(
+      new Response(JSON.stringify({ id: "user-1" }), {
+        status: 200,
+        headers: { "content-type": "application/json" }
+      })
+    );
+    const result = await createGraphClient().graphRequest("/me");
+    expect(result._meta).toMatchObject({ http_status: 200 });
+    expect(JSON.parse(result.content[0].text)).toEqual({ id: "user-1" });
+  });
+  it("preserves HTTP status metadata when response headers are requested", async () => {
+    fetchWithResilienceMock.mockResolvedValue(
+      new Response(JSON.stringify({ id: "task-1" }), {
+        status: 200,
+        headers: { "content-type": "application/json", etag: 'W/"etag-1"' }
+      })
+    );
+    const result = await createGraphClient().graphRequest("/me/planner/tasks/task-1", {
+      includeHeaders: true
+    });
+    expect(result._meta).toMatchObject({ http_status: 200 });
+    expect(JSON.parse(result.content[0].text)).toMatchObject({
+      id: "task-1",
+      _etag: 'W/"etag-1"'
+    });
+  });
+  it("adds HTTP status and Graph error code metadata to failed Graph responses", async () => {
+    fetchWithResilienceMock.mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          error: {
+            code: "accessDenied",
+            message: "Access denied"
+          }
+        }),
+        {
+          status: 403,
+          statusText: "Forbidden",
+          headers: { "content-type": "application/json" }
+        }
+      )
+    );
+    const result = await createGraphClient().graphRequest("/me/drive");
+    expect(result.isError).toBe(true);
+    expect(result._meta).toMatchObject({
+      http_status: 403,
+      error_code: "accessDenied"
+    });
+    expect(JSON.parse(result.content[0].text).error).toContain(
+      "Microsoft Graph API error: 403 Forbidden"
+    );
+  });
+  it("adds aggregate subrequest metadata to successful Graph batch responses", async () => {
+    fetchWithResilienceMock.mockResolvedValue(
+      new Response(
+        JSON.stringify({
+          responses: [
+            { id: "1", status: 200, body: { id: "message-1" } },
+            {
+              id: "2",
+              status: 403,
+              body: { error: { code: "accessDenied", message: "Access denied" } }
+            },
+            {
+              id: "3",
+              status: 429,
+              body: { error: { code: "tooManyRequests", message: "Slow down" } }
+            },
+            {
+              id: "4",
+              status: 403,
+              body: { error: { code: "accessDenied", message: "Access denied" } }
+            }
+          ]
+        }),
+        {
+          status: 200,
+          headers: { "content-type": "application/json" }
+        }
+      )
+    );
+    const result = await createGraphClient().graphRequest("/$batch", {
+      method: "POST",
+      body: JSON.stringify({ requests: [] })
+    });
+    expect(result.isError).toBeUndefined();
+    expect(result._meta).toMatchObject({
+      http_status: 200,
+      graph_batch_subrequest_count: 4,
+      graph_batch_http_status_counts: { "200": 1, "403": 2, "429": 1 },
+      graph_batch_error_code_counts: { accessDenied: 2, tooManyRequests: 1 }
+    });
+  });
+});

package/dist/__tests__/graph-tools.test.js

@@ -3,14 +3,23 @@ import { z } from "zod";
 import { tmpdir } from "os";
 import { join } from "path";
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "fs";
+const loggerMock = vi.hoisted(() => ({
+  info: vi.fn(),
+  warn: vi.fn(),
+  error: vi.fn(),
+  debug: vi.fn()
+}));
 vi.mock("../logger.js", () => ({
-  default: {
-    info: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-    debug: vi.fn()
-  }
+  default: loggerMock
 }));
+const auditLogMock = vi.hoisted(() => vi.fn());
+vi.mock("../audit-log.js", async () => {
+  const actual = await vi.importActual("../audit-log.js");
+  return {
+    ...actual,
+    auditLog: auditLogMock
+  };
+});
 const mockEndpoints = [];
 vi.mock("../generated/client-beta.js", () => ({ api: { endpoints: [] } }));
 vi.mock("../generated/client.js", () => ({
@@ -89,10 +98,6 @@ async function loadModule() {
   const mod = await import("../graph-tools.js");
   return mod;
 }
-async function spyOnAuditLogger() {
-  const { __testing } = await import("../audit-log.js");
-  return vi.spyOn(__testing.auditLogger, "info").mockImplementation(() => __testing.auditLogger);
-}
 function createMockServer() {
   const tools = /* @__PURE__ */ new Map();
   return {
@@ -123,6 +128,187 @@ describe("graph-tools", () => {
     mockEndpointsJson = [];
     vi.clearAllMocks();
   });
+  describe("audit outcome metadata", () => {
+    it("includes HTTP status on successful Graph tool calls", async () => {
+      const endpoint = makeEndpoint();
+      const config = makeConfig();
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([
+        {
+          content: [{ type: "text", text: JSON.stringify({ value: [] }) }],
+          _meta: { http_status: 200 }
+        }
+      ]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(
+        server,
+        graphClient
+      );
+      await server.tools.get("test-tool").handler({});
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "test-tool",
+          status: "success",
+          http_status: 200
+        })
+      );
+    });
+    it("includes HTTP status and Graph error code on failed Graph tool calls", async () => {
+      const endpoint = makeEndpoint();
+      const config = makeConfig();
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: "Microsoft Graph API error: 403 Forbidden" })
+            }
+          ],
+          isError: true,
+          _meta: { http_status: 403, error_code: "accessDenied" }
+        }
+      ]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      await server.tools.get("test-tool").handler({});
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "test-tool",
+          status: "error",
+          http_status: 403,
+          error_code: "accessDenied"
+        })
+      );
+    });
+    it("includes HTTP status on utility tool calls that reach Graph", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const graphClient = {
+        graphRequest: vi.fn().mockResolvedValue({
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                contentType: "image/jpeg",
+                encoding: "base64",
+                contentBytes: "aGk="
+              })
+            }
+          ],
+          _meta: { http_status: 200 }
+        })
+      };
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      await server.tools.get("download-bytes").handler({ target: "/me/photo/$value" });
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "download-bytes",
+          status: "success",
+          http_method: "GET",
+          http_status: 200
+        })
+      );
+    });
+    it("includes HTTP status and Graph error code on failed utility Graph calls", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const graphClient = {
+        graphRequest: vi.fn().mockResolvedValue({
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: "Microsoft Graph API error: 403 Forbidden" })
+            }
+          ],
+          isError: true,
+          _meta: { http_status: 403, error_code: "accessDenied" }
+        })
+      };
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      await server.tools.get("download-bytes").handler({ target: "/me/photo/$value" });
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "download-bytes",
+          status: "error",
+          http_status: 403,
+          error_code: "accessDenied"
+        })
+      );
+    });
+    it("copies Graph batch outcome metadata into audit events", async () => {
+      const endpoint = makeEndpoint({
+        method: "post",
+        path: "/$batch",
+        alias: "graph-batch",
+        parameters: [{ name: "body", type: "Body", schema: z.object({}).passthrough() }]
+      });
+      const config = makeConfig({
+        pathPattern: "/$batch",
+        method: "post",
+        toolName: "graph-batch"
+      });
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                responses: [
+                  { id: "1", status: 200, body: { id: "message-1" } },
+                  {
+                    id: "2",
+                    status: 403,
+                    body: { error: { code: "accessDenied", message: "Access denied" } }
+                  }
+                ]
+              })
+            }
+          ],
+          _meta: {
+            http_status: 200,
+            graph_batch_subrequest_count: 2,
+            graph_batch_http_status_counts: { "200": 1, "403": 1 },
+            graph_batch_error_code_counts: { accessDenied: 1 }
+          }
+        }
+      ]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(
+        server,
+        graphClient
+      );
+      await server.tools.get("graph-batch").handler({
+        body: { requests: [{ id: "1", method: "GET", url: "/me" }] }
+      });
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "graph-batch",
+          status: "success",
+          http_status: 200,
+          graph_batch_subrequest_count: 2,
+          graph_batch_http_status_counts: { "200": 1, "403": 1 },
+          graph_batch_error_code_counts: { accessDenied: 1 }
+        })
+      );
+    });
+  });
   describe("$count advanced query mode", () => {
     it("should set ConsistencyLevel: eventual header when $count=true", async () => {
       const endpoint = makeEndpoint();
@@ -166,12 +352,11 @@ describe("graph-tools", () => {
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
       registerGraphTools(server, graphClient);
-      const auditSpy = await spyOnAuditLogger();
       await server.tools.get("get-drive-item").handler({
         driveId: "drive-1",
         driveItemId: "item-2"
       });
-      expect(auditSpy).toHaveBeenCalledWith(
+      expect(auditLogMock).toHaveBeenCalledWith(
         expect.objectContaining({
           event: "tool.call",
           tool: "get-drive-item",
@@ -182,7 +367,6 @@ describe("graph-tools", () => {
           }
         })
       );
-      auditSpy.mockRestore();
     });
     it("adds target_resource to failed generated Graph tool audit events", async () => {
       const endpoint = makeEndpoint({
@@ -210,13 +394,12 @@ describe("graph-tools", () => {
         server,
         graphClient
       );
-      const auditSpy = await spyOnAuditLogger();
       const result = await server.tools.get("get-drive-item").handler({
         driveId: "drive-1",
         driveItemId: "item-2"
       });
       expect(result.isError).toBe(true);
-      expect(auditSpy).toHaveBeenCalledWith(
+      expect(auditLogMock).toHaveBeenCalledWith(
         expect.objectContaining({
           event: "tool.call",
           tool: "get-drive-item",
@@ -228,7 +411,6 @@ describe("graph-tools", () => {
           }
         })
       );
-      auditSpy.mockRestore();
     });
     it("derives target_resource from generic ID path parameters", async () => {
       const endpoint = makeEndpoint({
@@ -248,11 +430,10 @@ describe("graph-tools", () => {
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
       registerGraphTools(server, graphClient);
-      const auditSpy = await spyOnAuditLogger();
       await server.tools.get("get-mail-message").handler({
         messageId: "message-1"
       });
-      expect(auditSpy).toHaveBeenCalledWith(
+      expect(auditLogMock).toHaveBeenCalledWith(
         expect.objectContaining({
           event: "tool.call",
           tool: "get-mail-message",
@@ -263,7 +444,6 @@ describe("graph-tools", () => {
           }
         })
       );
-      auditSpy.mockRestore();
     });
     it("omits target_resource when an ID path parameter is missing", async () => {
       const endpoint = makeEndpoint({
@@ -287,18 +467,16 @@ describe("graph-tools", () => {
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
       registerGraphTools(server, graphClient);
-      const auditSpy = await spyOnAuditLogger();
       await server.tools.get("get-drive-item").handler({
         driveId: "drive-1"
       });
-      const [payload] = auditSpy.mock.calls[0];
+      const [payload] = auditLogMock.mock.calls[0];
       expect(payload).toMatchObject({
         event: "tool.call",
         tool: "get-drive-item",
         status: "success"
       });
       expect(payload).not.toHaveProperty("target_resource");
-      auditSpy.mockRestore();
     });
     it("omits SharePoint path parameters from target_resource", async () => {
       const endpoint = makeEndpoint({
@@ -322,12 +500,11 @@ describe("graph-tools", () => {
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
       registerGraphTools(server, graphClient);
-      const auditSpy = await spyOnAuditLogger();
       await server.tools.get("get-sharepoint-site-by-path").handler({
         siteId: "contoso.sharepoint.com",
         path: "/sites/Finance"
       });
-      expect(auditSpy).toHaveBeenCalledWith(
+      expect(auditLogMock).toHaveBeenCalledWith(
         expect.objectContaining({
           event: "tool.call",
           tool: "get-sharepoint-site-by-path",
@@ -338,9 +515,8 @@ describe("graph-tools", () => {
           }
         })
       );
-      const [payload] = auditSpy.mock.calls[0];
+      const [payload] = auditLogMock.mock.calls[0];
       expect(JSON.stringify(payload)).not.toContain("Finance");
-      auditSpy.mockRestore();
     });
     it("omits target_resource for generated broad list/search audit events", async () => {
       const endpoint = makeEndpoint({
@@ -359,16 +535,14 @@ describe("graph-tools", () => {
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
       registerGraphTools(server, graphClient);
-      const auditSpy = await spyOnAuditLogger();
       await server.tools.get("list-mail-messages").handler({ search: "budget" });
-      const [payload] = auditSpy.mock.calls[0];
+      const [payload] = auditLogMock.mock.calls[0];
       expect(payload).toMatchObject({
         event: "tool.call",
         tool: "list-mail-messages",
         status: "success"
       });
       expect(payload).not.toHaveProperty("target_resource");
-      auditSpy.mockRestore();
     });
   });
   describe("fetchAllPages pagination", () => {
@@ -411,6 +585,55 @@ describe("graph-tools", () => {
       expect(parsed.value.map((v) => v.id)).toEqual(["1", "2", "3"]);
       expect(parsed["@odata.nextLink"]).toBeUndefined();
     });
+    it("returns and audits a later-page Graph error instead of partial success", async () => {
+      const endpoint = makeEndpoint();
+      const config = makeConfig();
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                value: [{ id: "1" }],
+                "@odata.nextLink": "https://graph.microsoft.com/v1.0/me/messages?$skip=1"
+              })
+            }
+          ],
+          _meta: { http_status: 200 }
+        },
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: "Microsoft Graph API error: 429 Too Many Requests" })
+            }
+          ],
+          isError: true,
+          _meta: { http_status: 429, error_code: "tooManyRequests" }
+        }
+      ]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      const result = await server.tools.get("test-tool").handler({ fetchAllPages: true });
+      expect(result.isError).toBe(true);
+      expect(JSON.parse(result.content[0].text).error).toContain("429 Too Many Requests");
+      expect(graphClient.graphRequest).toHaveBeenCalledTimes(2);
+      expect(loggerMock.error).not.toHaveBeenCalledWith(
+        expect.stringContaining("Error during pagination")
+      );
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "test-tool",
+          status: "error",
+          http_status: 429,
+          error_code: "tooManyRequests"
+        })
+      );
+    });
     it("merges all pages under --toon and encodes the combined result once (#560)", async () => {
       const endpoint = makeEndpoint();
       const config = makeConfig();
@@ -1021,7 +1244,8 @@ describe("graph-tools", () => {
       const graphClient = {
         downloadToFile: vi.fn().mockResolvedValue({
           contentType: "image/jpeg",
-          contentLength: 2
+          contentLength: 2,
+          httpStatus: 200
         })
       };
       const server = createMockServer();
@@ -1039,6 +1263,15 @@ describe("graph-tools", () => {
       expect(result.isError).toBeUndefined();
       const payload = JSON.parse(result.content[0].text);
       expect(payload).toEqual({ path: outputPath, contentType: "image/jpeg", bytesWritten: 2 });
+      expect(result._meta).toMatchObject({ http_status: 200 });
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "download-bytes-to-file",
+          status: "success",
+          http_status: 200
+        })
+      );
     });
     it("rejects a relative outputPath", async () => {
       mockEndpoints.length = 0;
@@ -1178,7 +1411,8 @@ describe("graph-tools", () => {
                 "@microsoft.graph.downloadUrl": downloadUrl
               })
             }
-          ]
+          ],
+          _meta: { http_status: 200 }
         })
       };
       const server = createMockServer();
@@ -1196,6 +1430,15 @@ describe("graph-tools", () => {
       expect(payload.name).toBe("report.pdf");
       expect(payload.size).toBe(12727);
       expect(payload.contentType).toBe("application/pdf");
+      expect(result._meta).toMatchObject({ http_status: 200 });
+      expect(auditLogMock).toHaveBeenCalledWith(
+        expect.objectContaining({
+          event: "tool.call",
+          tool: "get-download-url",
+          status: "success",
+          http_status: 200
+        })
+      );
     });
     it("forces a JSON body on the metadata request so it works under --toon (#560)", async () => {
       mockEndpoints.length = 0;

package/dist/auth-tools.js

@@ -34,7 +34,6 @@ function registerAuthTools(server, authManager) {
                 type: "text",
                 text: JSON.stringify({
                   status: "Login successful",
-                  message: "Browser authentication completed successfully.",
                   ...loginResult
                 })
               }

package/dist/cli.js

@@ -3,6 +3,7 @@ import { readFileSync } from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 import { getCombinedPresetPattern, listPresets, presetRequiresOrgMode } from "./tool-categories.js";
+import { assertSignoffMarkersVisible } from "./lib/message-signoff.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const packageJsonPath = path.join(__dirname, "..", "package.json");
 const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
@@ -15,6 +16,12 @@ program.name("ms-365-mcp-server").description("Microsoft 365 MCP Server").versio
   "--expected-home-account-id <id>",
   "Require local MSAL authentication to use this exact MSAL homeAccountId"
 ).option("--read-only", "Start server in read-only mode, disabling write operations").option(
+  "--message-signoff-prefix <text>",
+  "Signoff prepended to outgoing messages (Teams sends, replies and edits; mail sends and drafts) so recipients can tell they were agent-sent, e.g. \u{1F916} (default: none). Equivalent env var: MS365_MCP_MESSAGE_SIGNOFF_PREFIX."
+).option(
+  "--message-signoff-suffix <text>",
+  "Signoff appended to outgoing messages (default: none). Equivalent env var: MS365_MCP_MESSAGE_SIGNOFF_SUFFIX."
+).option("--no-message-signoff", "Disable both message signoffs, overriding the env vars.").option(
   "--http [address]",
   'Use Streamable HTTP transport instead of stdio. Format: [host:]port (e.g., "localhost:3000", ":3000", "3000"). Default: all interfaces on port 3000'
 ).option(
@@ -65,6 +72,17 @@ program.name("ms-365-mcp-server").description("Microsoft 365 MCP Server").versio
 function parseArgs() {
   program.parse();
   const options = program.opts();
+  if (typeof options.messageSignoffSuffix === "string") {
+    process.env.MS365_MCP_MESSAGE_SIGNOFF_SUFFIX = options.messageSignoffSuffix;
+  }
+  if (typeof options.messageSignoffPrefix === "string") {
+    process.env.MS365_MCP_MESSAGE_SIGNOFF_PREFIX = options.messageSignoffPrefix;
+  }
+  if (options.messageSignoff === false) {
+    process.env.MS365_MCP_MESSAGE_SIGNOFF_SUFFIX = "";
+    process.env.MS365_MCP_MESSAGE_SIGNOFF_PREFIX = "";
+  }
+  assertSignoffMarkersVisible();
   if (options.listPresets) {
     const presets = listPresets();
     console.log(JSON.stringify({ presets }, null, 2));