@inkeep/agents-manage-mcp 0.39.5 → 0.41.0

package/src/lib/security.ts

@@ -1,7 +1,11 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: 98cf7172220e
  */
 
+import { Security } from "../models/security.js";
+import { env } from "./env.js";
+
 type OAuth2PasswordFlow = {
   username: string;
   password: string;
@@ -11,29 +15,29 @@ type OAuth2PasswordFlow = {
 };
 
 export enum SecurityErrorCode {
-  Incomplete = 'incomplete',
-  UnrecognisedSecurityType = 'unrecognized_security_type',
+  Incomplete = "incomplete",
+  UnrecognisedSecurityType = "unrecognized_security_type",
 }
 
 export class SecurityError extends Error {
   constructor(
     public code: SecurityErrorCode,
-    message: string
+    message: string,
   ) {
     super(message);
-    this.name = 'SecurityError';
+    this.name = "SecurityError";
   }
 
   static incomplete(): SecurityError {
     return new SecurityError(
       SecurityErrorCode.Incomplete,
-      'Security requirements not met in order to perform the operation'
+      "Security requirements not met in order to perform the operation",
     );
   }
   static unrecognizedType(type: string): SecurityError {
     return new SecurityError(
       SecurityErrorCode.UnrecognisedSecurityType,
-      `Unrecognised security type: ${type}`
+      `Unrecognised security type: ${type}`,
     );
   }
 }
@@ -43,40 +47,43 @@ export type SecurityState = {
   headers: Record<string, string>;
   queryParams: Record<string, string>;
   cookies: Record<string, string>;
-  oauth2: ({ type: 'password' } & OAuth2PasswordFlow) | { type: 'none' };
+  oauth2: ({ type: "password" } & OAuth2PasswordFlow) | { type: "none" };
 };
 
 type SecurityInputBasic = {
-  type: 'http:basic';
-  value: { username?: string | undefined; password?: string | undefined } | null | undefined;
+  type: "http:basic";
+  value:
+    | { username?: string | undefined; password?: string | undefined }
+    | null
+    | undefined;
 };
 
 type SecurityInputBearer = {
-  type: 'http:bearer';
+  type: "http:bearer";
   value: string | null | undefined;
   fieldName: string;
 };
 
 type SecurityInputAPIKey = {
-  type: 'apiKey:header' | 'apiKey:query' | 'apiKey:cookie';
+  type: "apiKey:header" | "apiKey:query" | "apiKey:cookie";
   value: string | null | undefined;
   fieldName: string;
 };
 
 type SecurityInputOIDC = {
-  type: 'openIdConnect';
+  type: "openIdConnect";
   value: string | null | undefined;
   fieldName: string;
 };
 
 type SecurityInputOAuth2 = {
-  type: 'oauth2';
+  type: "oauth2";
   value: string | null | undefined;
   fieldName: string;
 };
 
 type SecurityInputOAuth2ClientCredentials = {
-  type: 'oauth2:client_credentials';
+  type: "oauth2:client_credentials";
   value:
     | { clientID?: string | undefined; clientSecret?: string | undefined }
     | null
@@ -86,13 +93,16 @@ type SecurityInputOAuth2ClientCredentials = {
 };
 
 type SecurityInputOAuth2PasswordCredentials = {
-  type: 'oauth2:password';
-  value: string | null | undefined;
+  type: "oauth2:password";
+  value:
+    | string
+    | null
+    | undefined;
   fieldName?: string;
 };
 
 type SecurityInputCustom = {
-  type: 'http:custom';
+  type: "http:custom";
   value: any | null | undefined;
   fieldName?: string;
 };
@@ -107,39 +117,42 @@ export type SecurityInput =
   | SecurityInputOIDC
   | SecurityInputCustom;
 
-export function resolveSecurity(...options: SecurityInput[][]): SecurityState | null {
+export function resolveSecurity(
+  ...options: SecurityInput[][]
+): SecurityState | null {
   const state: SecurityState = {
     basic: {},
     headers: {},
     queryParams: {},
     cookies: {},
-    oauth2: { type: 'none' },
+    oauth2: { type: "none" },
   };
 
   const option = options.find((opts) => {
     return opts.every((o) => {
       if (o.value == null) {
         return false;
-      }
-      if (o.type === 'http:basic') {
+      } else if (o.type === "http:basic") {
         return o.value.username != null || o.value.password != null;
-      }
-      if (o.type === 'http:custom') {
+      } else if (o.type === "http:custom") {
         return null;
-      }
-      if (o.type === 'oauth2:password') {
-        return typeof o.value === 'string' && !!o.value;
-      }
-      if (o.type === 'oauth2:client_credentials') {
-        if (typeof o.value == 'string') {
+      } else if (o.type === "oauth2:password") {
+        return (
+          typeof o.value === "string" && !!o.value
+        );
+      } else if (o.type === "oauth2:client_credentials") {
+        if (typeof o.value == "string") {
           return !!o.value;
         }
         return o.value.clientID != null || o.value.clientSecret != null;
-      }
-      if (typeof o.value === 'string') {
+      } else if (typeof o.value === "string") {
         return !!o.value;
+      } else {
+        throw new Error(
+          `Unrecognized security type: ${o.type} (value type: ${typeof o
+            .value})`,
+        );
       }
-      throw new Error(`Unrecognized security type: ${o.type} (value type: ${typeof o.value})`);
     });
   });
   if (option == null) {
@@ -154,32 +167,32 @@ export function resolveSecurity(...options: SecurityInput[][]): SecurityState |
     const { type } = spec;
 
     switch (type) {
-      case 'apiKey:header':
+      case "apiKey:header":
         state.headers[spec.fieldName] = spec.value;
         break;
-      case 'apiKey:query':
+      case "apiKey:query":
         state.queryParams[spec.fieldName] = spec.value;
         break;
-      case 'apiKey:cookie':
+      case "apiKey:cookie":
         state.cookies[spec.fieldName] = spec.value;
         break;
-      case 'http:basic':
+      case "http:basic":
         applyBasic(state, spec);
         break;
-      case 'http:custom':
+      case "http:custom":
         break;
-      case 'http:bearer':
+      case "http:bearer":
         applyBearer(state, spec);
         break;
-      case 'oauth2':
+      case "oauth2":
         applyBearer(state, spec);
         break;
-      case 'oauth2:password':
+      case "oauth2:password":
         applyBearer(state, spec);
         break;
-      case 'oauth2:client_credentials':
+      case "oauth2:client_credentials":
         break;
-      case 'openIdConnect':
+      case "openIdConnect":
         applyBearer(state, spec);
         break;
       default:
@@ -191,7 +204,10 @@ export function resolveSecurity(...options: SecurityInput[][]): SecurityState |
   return state;
 }
 
-function applyBasic(state: SecurityState, spec: SecurityInputBasic) {
+function applyBasic(
+  state: SecurityState,
+  spec: SecurityInputBasic,
+) {
   if (spec.value == null) {
     return;
   }
@@ -205,14 +221,14 @@ function applyBearer(
     | SecurityInputBearer
     | SecurityInputOAuth2
     | SecurityInputOIDC
-    | SecurityInputOAuth2PasswordCredentials
+    | SecurityInputOAuth2PasswordCredentials,
 ) {
-  if (typeof spec.value !== 'string' || !spec.value) {
+  if (typeof spec.value !== "string" || !spec.value) {
     return;
   }
 
   let value = spec.value;
-  if (value.slice(0, 7).toLowerCase() !== 'bearer ') {
+  if (value.slice(0, 7).toLowerCase() !== "bearer ") {
     value = `Bearer ${value}`;
   }
 
@@ -220,3 +236,31 @@ function applyBearer(
     state.headers[spec.fieldName] = value;
   }
 }
+export function resolveGlobalSecurity(
+  security: Partial<Security> | null | undefined,
+): SecurityState | null {
+  return resolveSecurity(
+    [
+      {
+        fieldName: "better-auth.session_token",
+        type: "apiKey:cookie",
+        value: security?.cookieAuth ?? env().INKEEPAGENTSMANAGE_COOKIE_AUTH,
+      },
+      {
+        fieldName: "Authorization",
+        type: "http:bearer",
+        value: security?.bearerAuth ?? env().INKEEPAGENTSMANAGE_BEARER_AUTH,
+      },
+    ],
+  );
+}
+
+export async function extractSecurity<
+  T extends string | Record<string, unknown>,
+>(sec: T | (() => Promise<T>) | undefined): Promise<T | undefined> {
+  if (sec == null) {
+    return;
+  }
+
+  return typeof sec === "function" ? sec() : sec;
+}

package/src/lib/url.ts

@@ -1,5 +1,6 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: 8d04acd893d1
  */
 
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -8,22 +9,26 @@ export type Params = Partial<Record<string, string | number>>;
 
 export function pathToFunc(
   pathPattern: string,
-  options?: { charEncoding?: 'percent' | 'none' }
+  options?: { charEncoding?: "percent" | "none" },
 ): (params?: Params) => string {
   const paramRE = /\{([a-zA-Z0-9_]+?)\}/g;
 
   return function buildURLPath(params: Record<string, unknown> = {}): string {
-    return pathPattern.replace(paramRE, (_, placeholder) => {
+    return pathPattern.replace(paramRE, function (_, placeholder) {
       if (!hasOwn.call(params, placeholder)) {
         throw new Error(`Parameter '${placeholder}' is required`);
       }
 
       const value = params[placeholder];
-      if (typeof value !== 'string' && typeof value !== 'number') {
-        throw new Error(`Parameter '${placeholder}' must be a string or number`);
+      if (typeof value !== "string" && typeof value !== "number") {
+        throw new Error(
+          `Parameter '${placeholder}' must be a string or number`,
+        );
       }
 
-      return options?.charEncoding === 'percent' ? encodeURIComponent(`${value}`) : `${value}`;
+      return options?.charEncoding === "percent"
+        ? encodeURIComponent(`${value}`)
+        : `${value}`;
     });
   };
 }

package/src/mcp-server/cli/start/command.ts

@@ -1,90 +1,103 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: 118c0e7211c4
  */
 
-import { buildCommand, numberParser } from '@stricli/core';
-import * as z from 'zod';
-import { consoleLoggerLevels } from '../../console-logger.js';
+import { buildCommand } from "@stricli/core";
+import { numberParser } from "@stricli/core";
+import * as z from "zod";
+import { consoleLoggerLevels } from "../../console-logger.js";
 
 export const startCommand = buildCommand({
   loader: async () => {
-    const { main } = await import('./impl.js');
+    const { main } = await import("./impl.js");
     return main;
   },
   parameters: {
     flags: {
       transport: {
-        kind: 'enum',
-        brief: 'The transport to use for communicating with the server',
-        default: 'stdio',
-        values: ['stdio', 'sse'],
+        kind: "enum",
+        brief: "The transport to use for communicating with the server",
+        default: "stdio",
+        values: ["stdio", "sse"],
       },
       port: {
-        kind: 'parsed',
-        brief: 'The port to use when the SSE transport is enabled',
-        default: '2718',
-        parse: (val: string) => z.coerce.number().int().gte(0).lt(65536).parse(val),
+        kind: "parsed",
+        brief: "The port to use when the SSE transport is enabled",
+        default: "2718",
+        parse: (val: string) =>
+          z.coerce.number().int().gte(0).lt(65536).parse(val),
       },
       tool: {
-        kind: 'parsed',
-        brief: 'Specify tools to mount on the server',
+        kind: "parsed",
+        brief: "Specify tools to mount on the server",
         optional: true,
         variadic: true,
         parse: (value) => {
           return z.string().parse(value);
         },
       },
-      'server-url': {
-        kind: 'parsed',
-        brief: 'Overrides the default server URL used by the SDK',
+      "cookie-auth": {
+        kind: "parsed",
+        brief: "Sets the cookieAuth auth field for the API",
+        optional: true,
+        parse: (value) => {
+          return z.string().parse(value);
+        },
+      },
+      "bearer-auth": {
+        kind: "parsed",
+        brief: "Sets the bearerAuth auth field for the API",
+        optional: true,
+        parse: (value) => {
+          return z.string().parse(value);
+        },
+      },
+      "server-url": {
+        kind: "parsed",
+        brief: "Overrides the default server URL used by the SDK",
         optional: true,
         parse: (value) => new URL(value).toString(),
       },
-      'server-index': {
-        kind: 'parsed',
-        brief: 'Selects a predefined server used by the SDK',
+      "server-index": {
+        kind: "parsed",
+        brief: "Selects a predefined server used by the SDK",
         optional: true,
         parse: numberParser,
       },
-      'log-level': {
-        kind: 'enum',
-        brief: 'The log level to use for the server',
-        default: 'info',
+      "log-level": {
+        kind: "enum",
+        brief: "The log level to use for the server",
+        default: "info",
         values: consoleLoggerLevels,
       },
       env: {
-        kind: 'parsed',
-        brief: 'Environment variables made available to the server',
+        kind: "parsed",
+        brief: "Environment variables made available to the server",
         optional: true,
         variadic: true,
         parse: (val: string) => {
-          const sepIdx = val.indexOf('=');
+          const sepIdx = val.indexOf("=");
           if (sepIdx === -1) {
-            throw new Error('Invalid environment variable format');
+            throw new Error("Invalid environment variable format");
           }
 
           const key = val.slice(0, sepIdx);
           const value = val.slice(sepIdx + 1);
 
           return [
-            z
-              .string()
-              .nonempty({
-                message: 'Environment variable key must be a non-empty string',
-              })
-              .parse(key),
-            z
-              .string()
-              .nonempty({
-                message: 'Environment variable value must be a non-empty string',
-              })
-              .parse(value),
+            z.string().nonempty({
+              message: "Environment variable key must be a non-empty string",
+            }).parse(key),
+            z.string().nonempty({
+              message: "Environment variable value must be a non-empty string",
+            }).parse(value),
           ] satisfies [string, string];
         },
       },
     },
   },
   docs: {
-    brief: 'Run the Model Context Protocol server',
+    brief: "Run the Model Context Protocol server",
   },
 });

package/src/mcp-server/cli/start/impl.ts

@@ -1,22 +1,28 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: deb4e93aa955
  */
 
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import express from 'express';
-import type { SDKOptions } from '../../../lib/config.js';
-import type { LocalContext } from '../../cli.js';
-import { type ConsoleLoggerLevel, createConsoleLogger } from '../../console-logger.js';
-import { createMCPServer } from '../../server.js';
+import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import express from "express";
+import { SDKOptions } from "../../../lib/config.js";
+import { LocalContext } from "../../cli.js";
+import {
+  ConsoleLoggerLevel,
+  createConsoleLogger,
+} from "../../console-logger.js";
+import { createMCPServer } from "../../server.js";
 
 interface StartCommandFlags {
-  readonly transport: 'stdio' | 'sse';
+  readonly transport: "stdio" | "sse";
   readonly port: number;
   readonly tool?: string[];
-  readonly 'server-url'?: string;
-  readonly 'server-index'?: SDKOptions['serverIdx'];
-  readonly 'log-level': ConsoleLoggerLevel;
+  readonly "cookie-auth"?: string;
+  readonly "bearer-auth"?: string;
+  readonly "server-url"?: string;
+  readonly "server-index"?: SDKOptions["serverIdx"];
+  readonly "log-level": ConsoleLoggerLevel;
   readonly env?: [string, string][];
 }
 
@@ -26,10 +32,10 @@ export async function main(this: LocalContext, flags: StartCommandFlags) {
   });
 
   switch (flags.transport) {
-    case 'stdio':
+    case "stdio":
       await startStdio(flags);
       break;
-    case 'sse':
+    case "sse":
       await startSSE(flags);
       break;
     default:
@@ -38,13 +44,17 @@ export async function main(this: LocalContext, flags: StartCommandFlags) {
 }
 
 async function startStdio(flags: StartCommandFlags) {
-  const logger = createConsoleLogger(flags['log-level']);
+  const logger = createConsoleLogger(flags["log-level"]);
   const transport = new StdioServerTransport();
-  const server = createMCPServer({
+  const { server } = createMCPServer({
     logger,
     allowedTools: flags.tool,
-    serverURL: flags['server-url'],
-    serverIdx: flags['server-index'],
+    security: {
+      cookieAuth: flags["cookie-auth"] ?? "",
+      bearerAuth: flags["bearer-auth"] ?? "",
+    },
+    serverURL: flags["server-url"],
+    serverIdx: flags["server-index"],
   });
   await server.connect(transport);
 
@@ -52,24 +62,28 @@ async function startStdio(flags: StartCommandFlags) {
     await server.close();
     process.exit(0);
   };
-  process.on('SIGTERM', abort);
-  process.on('SIGINT', abort);
+  process.on("SIGTERM", abort);
+  process.on("SIGINT", abort);
 }
 
 async function startSSE(flags: StartCommandFlags) {
-  const logger = createConsoleLogger(flags['log-level']);
+  const logger = createConsoleLogger(flags["log-level"]);
   const app = express();
-  const mcpServer = createMCPServer({
+  const { server: mcpServer } = createMCPServer({
     logger,
     allowedTools: flags.tool,
-    serverURL: flags['server-url'],
-    serverIdx: flags['server-index'],
+    security: {
+      cookieAuth: flags["cookie-auth"] ?? "",
+      bearerAuth: flags["bearer-auth"] ?? "",
+    },
+    serverURL: flags["server-url"],
+    serverIdx: flags["server-index"],
   });
   let transport: SSEServerTransport | undefined;
   const controller = new AbortController();
 
-  app.get('/sse', async (_req, res) => {
-    transport = new SSEServerTransport('/message', res);
+  app.get("/sse", async (_req, res) => {
+    transport = new SSEServerTransport("/message", res);
 
     await mcpServer.connect(transport);
 
@@ -78,47 +92,47 @@ async function startSSE(flags: StartCommandFlags) {
     };
   });
 
-  app.post('/message', async (req, res) => {
+  app.post("/message", async (req, res) => {
     if (!transport) {
-      throw new Error('Server transport not initialized');
+      throw new Error("Server transport not initialized");
     }
 
     await transport.handlePostMessage(req, res);
   });
 
-  const httpServer = app.listen(flags.port, '0.0.0.0', () => {
+  const httpServer = app.listen(flags.port, "0.0.0.0", () => {
     const ha = httpServer.address();
-    const host = typeof ha === 'string' ? ha : `${ha?.address}:${ha?.port}`;
-    logger.info('MCP HTTP server started', { host });
+    const host = typeof ha === "string" ? ha : `${ha?.address}:${ha?.port}`;
+    logger.info("MCP HTTP server started", { host });
   });
 
   let closing = false;
-  controller.signal.addEventListener('abort', async () => {
+  controller.signal.addEventListener("abort", async () => {
     if (closing) {
-      logger.info('Received second signal. Forcing shutdown.');
+      logger.info("Received second signal. Forcing shutdown.");
       process.exit(1);
     }
     closing = true;
 
-    logger.info('Shutting down MCP server');
+    logger.info("Shutting down MCP server");
 
     await mcpServer.close();
 
-    logger.info('Shutting down HTTP server');
+    logger.info("Shutting down HTTP server");
 
     const timer = setTimeout(() => {
-      logger.info('Forcing shutdown');
+      logger.info("Forcing shutdown");
       process.exit(1);
     }, 5000);
 
     httpServer.close(() => {
       clearTimeout(timer);
-      logger.info('Graceful shutdown complete');
+      logger.info("Graceful shutdown complete");
       process.exit(0);
     });
   });
 
   const abort = () => controller.abort();
-  process.on('SIGTERM', abort);
-  process.on('SIGINT', abort);
+  process.on("SIGTERM", abort);
+  process.on("SIGINT", abort);
 }

package/src/mcp-server/cli.ts

@@ -1,8 +1,9 @@
 /*
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ * @generated-id: 22d0a5d5ca7f
  */
 
-import type { CommandContext, StricliProcess } from '@stricli/core';
+import { CommandContext, StricliProcess } from "@stricli/core";
 
 export interface LocalContext extends CommandContext {
   readonly process: StricliProcess;