@littlebearapps/outlook-assistant 3.8.1 → 3.8.2

package/auth/device-code.js

@@ -11,6 +11,10 @@ const https = require('https');
 const querystring = require('querystring');
 const config = require('../config');
 
+// Fail fast if the OAuth endpoint is unreachable (e.g. blocked outbound
+// egress in a sandboxed connector) instead of hanging indefinitely. (#213)
+const REQUEST_TIMEOUT_MS = 15000;
+
 /**
  * POST helper for OAuth2 endpoints
  * @param {string} url - Full URL to POST to
@@ -41,6 +45,13 @@ function postRequest(url, postData) {
       }
     );
     req.on('error', reject);
+    req.setTimeout(REQUEST_TIMEOUT_MS, () => {
+      req.destroy(
+        new Error(
+          'Device code request timed out — network egress to login.microsoftonline.com may be blocked.'
+        )
+      );
+    });
     req.write(postData);
     req.end();
   });

package/auth/tools.js

@@ -208,10 +208,22 @@ async function handleDeviceCodeAuth() {
   }
 
   console.error('[AUTH] Starting device code flow...');
-  const response = await initiateDeviceCodeFlow(
-    clientId,
-    config.AUTH_CONFIG.scopes
-  );
+
+  // #213 — initiation can throw (blocked network egress in a sandboxed
+  // connector, AADSTS9002331 audience mismatch, invalid_client, non-JSON
+  // proxy page). Without this guard the exception propagates to the
+  // top-level dispatcher, which returns a content-less error and the client
+  // renders EMPTY OUTPUT. Mirror the try/catch that step 2
+  // (handleDeviceCodeComplete) already has, and surface actionable hints.
+  let response;
+  try {
+    response = await initiateDeviceCodeFlow(
+      clientId,
+      config.AUTH_CONFIG.scopes
+    );
+  } catch (error) {
+    return buildDeviceCodeErrorResponse(error);
+  }
 
   // Store in memory and persist to disk
   pendingDeviceCode = {
@@ -242,6 +254,57 @@ async function handleDeviceCodeAuth() {
   };
 }
 
+/**
+ * Build a visible, actionable MCP error result for a failed device-code
+ * initiation. Adds remediation hints for the common remote-connector
+ * failure modes. (#213)
+ * @param {Error} error
+ * @returns {object} - MCP response ({ content, isError: true })
+ */
+function buildDeviceCodeErrorResponse(error) {
+  const msg = (error && error.message) || String(error);
+  const code = error && error.code;
+  const hints = [];
+
+  if (/AADSTS9002331/i.test(msg) || /personal.*account/i.test(msg)) {
+    hints.push(
+      'This app registration appears to accept personal Microsoft accounts only. Set `OUTLOOK_AUTH_AUDIENCE=consumers` (or the correct tenant GUID) in your MCP env and retry.'
+    );
+  }
+  if (
+    /invalid_client|unauthorized_client|AADSTS7000218|AADSTS700016/i.test(msg)
+  ) {
+    hints.push(
+      "Enable 'Allow public client flows' under Azure → App registration → Authentication → Advanced settings, and add the `nativeclient` redirect URI (Mobile and desktop applications platform)."
+    );
+  }
+  if (
+    code === 'ENOTFOUND' ||
+    code === 'ETIMEDOUT' ||
+    code === 'ECONNREFUSED' ||
+    code === 'ECONNRESET' ||
+    /timed out|ENOTFOUND|ETIMEDOUT|ECONNREFUSED|ECONNRESET|network|Failed to parse response/i.test(
+      msg
+    )
+  ) {
+    hints.push(
+      'Could not reach `login.microsoftonline.com`. Outbound network access may be blocked in this environment (e.g. a sandboxed connector or corporate proxy). Check egress/firewall/proxy settings.'
+    );
+  }
+
+  const lines = ['## Device Code Authentication Failed', '', `Error: ${msg}`];
+  if (hints.length) {
+    lines.push('', 'Suggested fixes:', ...hints.map((h) => `- ${h}`));
+  }
+
+  console.error(`[AUTH] Device code initiation failed: ${msg}`);
+
+  return {
+    content: [{ type: 'text', text: lines.join('\n') }],
+    isError: true,
+  };
+}
+
 /**
  * Device code flow step 2 — poll until the user completes authentication.
  * Checks in-memory state first, falls back to disk-persisted state.

package/index.js

@@ -10,7 +10,7 @@ const {
   StdioServerTransport,
 } = require('@modelcontextprotocol/sdk/server/stdio.js');
 const config = require('./config');
-const { coerceArgsAgainstSchema } = require('./utils/schema-coerce');
+const { createRequestHandler } = require('./request-handler');
 
 // Import module tools
 const { authTools, setToolCount } = require('./auth');
@@ -69,118 +69,9 @@ const server = new Server(
   }
 );
 
-// Handle all requests
-server.fallbackRequestHandler = async (request) => {
-  try {
-    const { method, params, id } = request;
-    console.error(`REQUEST: ${method} [${id}]`);
-
-    // Initialize handler
-    if (method === 'initialize') {
-      console.error(`INITIALIZE REQUEST: ID [${id}]`);
-      return {
-        protocolVersion: '2024-11-05',
-        capabilities: {
-          tools: TOOLS.reduce((acc, tool) => {
-            acc[tool.name] = {};
-            return acc;
-          }, {}),
-        },
-        serverInfo: {
-          name: config.SERVER_NAME,
-          version: config.SERVER_VERSION,
-        },
-      };
-    }
-
-    // Tools list handler
-    if (method === 'tools/list') {
-      console.error(`TOOLS LIST REQUEST: ID [${id}]`);
-      console.error(`TOOLS COUNT: ${TOOLS.length}`);
-      console.error(`TOOLS NAMES: ${TOOLS.map((t) => t.name).join(', ')}`);
-
-      return {
-        tools: TOOLS.map((tool) => ({
-          name: tool.name,
-          description: tool.description,
-          inputSchema: tool.inputSchema,
-          ...(tool.annotations && { annotations: tool.annotations }),
-        })),
-      };
-    }
-
-    // Required empty responses for other capabilities
-    if (method === 'resources/list') return { resources: [] };
-    if (method === 'prompts/list') return { prompts: [] };
-
-    // Tool call handler
-    if (method === 'tools/call') {
-      try {
-        const { name, arguments: args = {} } = params || {};
-
-        console.error(`TOOL CALL: ${name}`);
-
-        // Find the tool handler
-        const tool = TOOLS.find((t) => t.name === name);
-
-        if (tool && tool.handler) {
-          // Coerce + validate args against the tool's inputSchema before
-          // dispatching. Catches array-as-string, boolean-as-string, unknown
-          // params, and out-of-enum action values at the MCP boundary so
-          // handlers receive properly-typed JS values. (#160, #162)
-          if (tool.inputSchema) {
-            const coerced = coerceArgsAgainstSchema(args, tool.inputSchema);
-            if (coerced.error) {
-              return {
-                content: [
-                  {
-                    type: 'text',
-                    text: `Invalid arguments for tool '${name}':\n${coerced.error}`,
-                  },
-                ],
-                isError: true,
-              };
-            }
-            return await tool.handler(coerced.args);
-          }
-          return await tool.handler(args);
-        }
-
-        // Tool not found
-        return {
-          error: {
-            code: -32601,
-            message: `Tool not found: ${name}`,
-          },
-        };
-      } catch (error) {
-        console.error(`Error in tools/call:`, error);
-        return {
-          error: {
-            code: -32603,
-            message: `Error processing tool call: ${error.message}`,
-          },
-        };
-      }
-    }
-
-    // For any other method, return method not found
-    return {
-      error: {
-        code: -32601,
-        message: `Method not found: ${method}`,
-      },
-    };
-  } catch (error) {
-    console.error(`Error in fallbackRequestHandler:`, error);
-    return {
-      error: {
-        code: -32603,
-        message: `Error processing request: ${error.message}`,
-      },
-    };
-  }
-};
+// Handle all requests. Dispatch + error-shaping logic lives in
+// request-handler.js so it is unit-testable without starting the transport.
+server.fallbackRequestHandler = createRequestHandler(TOOLS);
 
 // Make the script executable
 process.on('SIGTERM', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@littlebearapps/outlook-assistant",
-  "version": "3.8.1",
+  "version": "3.8.2",
   "mcpName": "io.github.littlebearapps/outlook-assistant",
   "description": "Outlook Assistant — MCP server with 22 tools for email, calendar, contacts, and settings via Microsoft Graph API",
   "main": "index.js",
@@ -38,7 +38,9 @@
     "calendar",
     "contacts",
     "model-context-protocol",
-    "anthropic"
+    "mcp-server",
+    "anthropic",
+    "outlook-assistant"
   ],
   "author": "Little Bear Apps <hello@littlebearapps.com>",
   "license": "MIT",