@orq-ai/node 3.1.11 → 3.1.13

package/src/mcp-server/resources.ts

@@ -2,12 +2,16 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import { ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import {
+  McpServer,
+  ResourceMetadata,
+  ResourceTemplate,
+} from "@modelcontextprotocol/sdk/server/mcp.js";
 import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import { Variables } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
 import { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { OrqCore } from "../core.js";
-import { Result } from "../types/fp.js";
+import { ConsoleLogger } from "./console-logger.js";
 import { MCPScope } from "./scopes.js";
 import { isAsyncIterable, isBinaryData, valueToBase64 } from "./shared.js";
 
@@ -19,7 +23,8 @@ export type ReadResourceCallback = (
 
 export type ResourceDefinition = {
   name: string;
-  description: string;
+  description?: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: string;
   read: ReadResourceCallback;
@@ -35,30 +40,27 @@ export type ReadResourceTemplateCallback = (
 export type ResourceTemplateDefinition = {
   name: string;
   description: string;
+  metadata?: ResourceMetadata;
   scopes?: MCPScope[];
   resource: ResourceTemplate;
   read: ReadResourceTemplateCallback;
 };
 
 export async function formatResult(
-  result: Result<unknown, Error>,
+  value: unknown,
   uri: URL,
-  init: { response?: Response | undefined },
+  init: { mimeType?: string | undefined; response?: Response | undefined },
 ): Promise<ReadResourceResult> {
-  if (!result.ok) {
-    throw result.error;
-  }
-
-  const { value } = result;
   if (typeof value === "undefined") {
     return { contents: [] };
   }
 
-  const { response } = init;
-  const mimeType = response?.headers.get("content-type") ?? "";
   let contents: ReadResourceResult["contents"] = [];
 
-  if (mimeType.search(/\bjson\b/g)) {
+  const mimeType = init.mimeType ?? init.response?.headers.get("content-type")
+    ?? "";
+
+  if (mimeType.search(/\bjson\b/g) !== -1) {
     contents = [{ uri: uri.toString(), mimeType, text: JSON.stringify(value) }];
   } else if (
     mimeType.startsWith("text/event-stream")
@@ -71,7 +73,10 @@ export async function formatResult(
         text: await stringifySSEToJSON(value),
       },
     ];
-  } else if (mimeType.startsWith("text/") && typeof value === "string") {
+  } else if (
+    (mimeType.startsWith("text/") || mimeType.startsWith("application/"))
+    && typeof value === "string"
+  ) {
     contents = [{ uri: uri.toString(), mimeType, text: value }];
   } else if (isBinaryData(value)) {
     const blob = await valueToBase64(value);
@@ -94,3 +99,59 @@ async function stringifySSEToJSON(
 
   return JSON.stringify(payloads);
 }
+
+export function createRegisterResource(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: OrqCore,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceDefinition) => void {
+  return (resource: ResourceDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, ctx) => resource.read(sdk, uri, ctx),
+    );
+
+    logger.debug("Registered resource", { name: resource.name });
+  };
+}
+
+export function createRegisterResourceTemplate(
+  logger: ConsoleLogger,
+  server: McpServer,
+  sdk: OrqCore,
+  allowedScopes: Set<MCPScope>,
+): (resource: ResourceTemplateDefinition) => void {
+  return (resource: ResourceTemplateDefinition): void => {
+    const scopes = resource.scopes ?? [];
+    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+      return;
+    }
+
+    const metadata: ResourceMetadata = {
+      ...resource.metadata,
+      description: resource.description,
+    };
+
+    server.resource(
+      resource.name,
+      resource.resource,
+      metadata,
+      async (uri, vars, ctx) => resource.read(sdk, uri, vars, ctx),
+    );
+
+    logger.debug("Registered resource template", { name: resource.name });
+  };
+}

package/src/mcp-server/server.ts

@@ -6,6 +6,10 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { OrqCore } from "../core.js";
 import { SDKOptions } from "../lib/config.js";
 import type { ConsoleLogger } from "./console-logger.js";
+import {
+  createRegisterResource,
+  createRegisterResourceTemplate,
+} from "./resources.js";
 import { MCPScope, mcpScopes } from "./scopes.js";
 import { createRegisterTool } from "./tools.js";
 import { tool$contactsCreate } from "./tools/contactsCreate.js";
@@ -40,7 +44,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "Orq",
-    version: "3.1.11",
+    version: "3.1.13",
   });
 
   const client = new OrqCore({
@@ -50,7 +54,9 @@ export function createMCPServer(deps: {
     serverURL: deps.serverURL,
     serverIdx: deps.serverIdx,
   });
+
   const scopes = new Set(deps.scopes ?? mcpScopes);
+
   const allowedTools = deps.allowedTools && new Set(deps.allowedTools);
   const tool = createRegisterTool(
     deps.logger,
@@ -59,6 +65,15 @@ export function createMCPServer(deps: {
     scopes,
     allowedTools,
   );
+  const resource = createRegisterResource(deps.logger, server, client, scopes);
+  const resourceTemplate = createRegisterResourceTemplate(
+    deps.logger,
+    server,
+    client,
+    scopes,
+  );
+  const register = { tool, resource, resourceTemplate };
+  void register; // suppress unused warnings
 
   tool(tool$contactsCreate);
   tool(tool$feedbackCreate);

package/src/mcp-server/tools/contactsCreate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$contactsCreate: ToolDefinition<typeof args> = {
-  name: "contacts_create",
+  name: "contacts-create",
   description: `Update user information
 
 Update or add user information to workspace`,

package/src/mcp-server/tools/deploymentsGetConfig.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$deploymentsGetConfig: ToolDefinition<typeof args> = {
-  name: "deployments_get-config",
+  name: "deployments-get-config",
   description: `Get config
 
 Retrieve the deployment configuration`,

package/src/mcp-server/tools/deploymentsInvoke.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$deploymentsInvoke: ToolDefinition<typeof args> = {
-  name: "deployments_invoke",
+  name: "deployments-invoke",
   description: `Invoke
 
 Invoke a deployment with a given payload`,

package/src/mcp-server/tools/deploymentsList.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$deploymentsList: ToolDefinition<typeof args> = {
-  name: "deployments_list",
+  name: "deployments-list",
   description: `List all deployments
 
 Returns a list of your deployments. The deployments are returned sorted by creation date, with the most recent deployments appearing first.`,

package/src/mcp-server/tools/deploymentsMetricsCreate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$deploymentsMetricsCreate: ToolDefinition<typeof args> = {
-  name: "deployments-metrics_create",
+  name: "deployments-metrics-create",
   description: `Add metrics
 
 Add metrics to a deployment`,

package/src/mcp-server/tools/deploymentsStream.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$deploymentsStream: ToolDefinition<typeof args> = {
-  name: "deployments_stream",
+  name: "deployments-stream",
   description: `Stream
 
 Stream deployment generation. Only supported for completions and chat completions.`,

package/src/mcp-server/tools/feedbackCreate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$feedbackCreate: ToolDefinition<typeof args> = {
-  name: "feedback_create",
+  name: "feedback-create",
   description: `Submit feedback
 
 Submit feedback for the LLM transaction via the API`,

package/src/mcp-server/tools/filesCreate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$filesCreate: ToolDefinition<typeof args> = {
-  name: "files_create",
+  name: "files-create",
   description: `Create file
 
 Files are used to upload documents that can be used with features like [Deployments](https://docs.orq.ai/reference/post_v2-deployments-get-config).`,

package/src/mcp-server/tools/filesDelete.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$filesDelete: ToolDefinition<typeof args> = {
-  name: "files_delete",
+  name: "files-delete",
   description: `Delete file`,
   args,
   tool: async (client, args, ctx) => {

package/src/mcp-server/tools/filesGet.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$filesGet: ToolDefinition<typeof args> = {
-  name: "files_get",
+  name: "files-get",
   description: `Retrieve a file
 
 Retrieves the details of an existing file object. After you supply a unique file ID, orq.ai returns the corresponding file object`,

package/src/mcp-server/tools/filesList.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$filesList: ToolDefinition<typeof args> = {
-  name: "files_list",
+  name: "files-list",
   description: `List all files
 
 Returns a list of the files that your account has access to. orq.ai sorts and returns the files by their creation dates, placing the most recently created files at the top.`,

package/src/mcp-server/tools/promptsCreate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsCreate: ToolDefinition<typeof args> = {
-  name: "prompts_create",
+  name: "prompts-create",
   description: `Create a prompt`,
   args,
   tool: async (client, args, ctx) => {

package/src/mcp-server/tools/promptsDelete.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsDelete: ToolDefinition<typeof args> = {
-  name: "prompts_delete",
+  name: "prompts-delete",
   description: `Delete a prompt`,
   args,
   tool: async (client, args, ctx) => {

package/src/mcp-server/tools/promptsGetVersion.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsGetVersion: ToolDefinition<typeof args> = {
-  name: "prompts_get-version",
+  name: "prompts-get-version",
   description: `Retrieve a prompt version
 
 Retrieves a specific version of a prompt by its ID and version ID.`,

package/src/mcp-server/tools/promptsList.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsList: ToolDefinition<typeof args> = {
-  name: "prompts_list",
+  name: "prompts-list",
   description: `List all prompts
 
 Returns a list of your prompts. The prompts are returned sorted by creation date, with the most recent prompts appearing first`,

package/src/mcp-server/tools/promptsListVersions.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsListVersions: ToolDefinition<typeof args> = {
-  name: "prompts_list-versions",
+  name: "prompts-list-versions",
   description: `List all prompt versions
 
 Returns a list of your prompt versions. The prompt versions are returned sorted by creation date, with the most recent prompt versions appearing first`,

package/src/mcp-server/tools/promptsRetrieve.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsRetrieve: ToolDefinition<typeof args> = {
-  name: "prompts_retrieve",
+  name: "prompts-retrieve",
   description: `Retrieve a prompt
 
 Retrieves a prompt object`,

package/src/mcp-server/tools/promptsUpdate.ts

@@ -11,7 +11,7 @@ const args = {
 };
 
 export const tool$promptsUpdate: ToolDefinition<typeof args> = {
-  name: "prompts_update",
+  name: "prompts-update",
   description: `Update a prompt`,
   args,
   tool: async (client, args, ctx) => {

package/src/mcp-server/tools/remoteconfigsRetrieve.ts

@@ -12,7 +12,7 @@ const args = {
 };
 
 export const tool$remoteconfigsRetrieve: ToolDefinition<typeof args> = {
-  name: "remoteconfigs_retrieve",
+  name: "remoteconfigs-retrieve",
   description: `Retrieve a remote config`,
   args,
   tool: async (client, args, ctx) => {

package/src/mcp-server/tools.ts

@@ -102,6 +102,10 @@ export function createRegisterTool(
     }
 
     const toolScopes = tool.scopes ?? [];
+    if (allowedScopes.size > 0 && toolScopes.length === 0) {
+      return;
+    }
+
     if (!toolScopes.every((s) => allowedScopes.has(s))) {
       return;
     }

package/src/models/operations/createcontact.ts

@@ -177,7 +177,7 @@ export const CreateContactResponseBody$inboundSchema: z.ZodType<
   created: z.string().datetime({ offset: true }).transform(v => new Date(v))
     .optional(),
   updated: z.string().datetime({ offset: true }).default(
-    "2025-03-05T20:55:27.080Z",
+    "2025-03-12T18:38:20.017Z",
   ).transform(v => new Date(v)),
 }).transform((v) => {
   return remap$(v, {
@@ -214,7 +214,7 @@ export const CreateContactResponseBody$outboundSchema: z.ZodType<
   tags: z.array(z.string()).optional(),
   metadata: z.record(z.any()).optional(),
   created: z.date().transform(v => v.toISOString()).optional(),
-  updated: z.date().default(() => new Date("2025-03-05T20:55:27.080Z"))
+  updated: z.date().default(() => new Date("2025-03-12T18:38:20.017Z"))
     .transform(v => v.toISOString()),
 }).transform((v) => {
   return remap$(v, {

package/src/models/operations/fileget.ts

@@ -145,7 +145,7 @@ export const FileGetResponseBody$inboundSchema: z.ZodType<
   file_name: z.string(),
   workspace_id: z.string(),
   created: z.string().datetime({ offset: true }).default(
-    "2025-03-05T20:55:28.148Z",
+    "2025-03-12T18:38:21.200Z",
   ).transform(v => new Date(v)),
 }).transform((v) => {
   return remap$(v, {
@@ -179,7 +179,7 @@ export const FileGetResponseBody$outboundSchema: z.ZodType<
   bytes: z.number(),
   fileName: z.string(),
   workspaceId: z.string(),
-  created: z.date().default(() => new Date("2025-03-05T20:55:28.148Z"))
+  created: z.date().default(() => new Date("2025-03-12T18:38:21.200Z"))
     .transform(v => v.toISOString()),
 }).transform((v) => {
   return remap$(v, {

package/src/models/operations/filelist.ts

@@ -195,7 +195,7 @@ export const FileListData$inboundSchema: z.ZodType<
   file_name: z.string(),
   workspace_id: z.string(),
   created: z.string().datetime({ offset: true }).default(
-    "2025-03-05T20:55:28.148Z",
+    "2025-03-12T18:38:21.200Z",
   ).transform(v => new Date(v)),
 }).transform((v) => {
   return remap$(v, {
@@ -229,7 +229,7 @@ export const FileListData$outboundSchema: z.ZodType<
   bytes: z.number(),
   fileName: z.string(),
   workspaceId: z.string(),
-  created: z.date().default(() => new Date("2025-03-05T20:55:28.148Z"))
+  created: z.date().default(() => new Date("2025-03-12T18:38:21.200Z"))
     .transform(v => v.toISOString()),
 }).transform((v) => {
   return remap$(v, {

package/src/models/operations/fileupload.ts

@@ -245,7 +245,7 @@ export const FileUploadResponseBody$inboundSchema: z.ZodType<
   file_name: z.string(),
   workspace_id: z.string(),
   created: z.string().datetime({ offset: true }).default(
-    "2025-03-05T20:55:28.148Z",
+    "2025-03-12T18:38:21.200Z",
   ).transform(v => new Date(v)),
 }).transform((v) => {
   return remap$(v, {
@@ -279,7 +279,7 @@ export const FileUploadResponseBody$outboundSchema: z.ZodType<
   bytes: z.number(),
   fileName: z.string(),
   workspaceId: z.string(),
-  created: z.date().default(() => new Date("2025-03-05T20:55:28.148Z"))
+  created: z.date().default(() => new Date("2025-03-12T18:38:21.200Z"))
     .transform(v => v.toISOString()),
 }).transform((v) => {
   return remap$(v, {