@dexto/server 1.3.0 → 1.4.0

package/dist/hono/routes/messages.js

@@ -1,26 +1,27 @@
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
 import { streamSSE } from "hono/streaming";
-import { LLM_PROVIDERS, LLM_ROUTERS } from "@dexto/core";
+import { LLM_PROVIDERS } from "@dexto/core";
 import { TokenUsageSchema } from "../schemas/responses.js";
+const TextPartSchema = z.object({
+  type: z.literal("text").describe("Content type identifier"),
+  text: z.string().describe("Text content")
+}).describe("Text content part");
+const ImagePartSchema = z.object({
+  type: z.literal("image").describe("Content type identifier"),
+  image: z.string().describe("Base64-encoded image data or URL"),
+  mimeType: z.string().optional().describe("MIME type (e.g., image/png)")
+}).describe("Image content part");
+const FilePartSchema = z.object({
+  type: z.literal("file").describe("Content type identifier"),
+  data: z.string().describe("Base64-encoded file data or URL"),
+  mimeType: z.string().describe("MIME type (e.g., application/pdf)"),
+  filename: z.string().optional().describe("Optional filename")
+}).describe("File content part");
+const ContentPartSchema = z.discriminatedUnion("type", [TextPartSchema, ImagePartSchema, FilePartSchema]).describe("Content part - text, image, or file");
 const MessageBodySchema = z.object({
-  message: z.string().optional().describe("The user message text"),
-  sessionId: z.string().min(1, "Session ID is required").describe("The session to use for this message"),
-  imageData: z.object({
-    image: z.string().describe("Base64-encoded image data"),
-    mimeType: z.string().describe("The MIME type of the image (e.g., image/png)")
-  }).optional().describe("Optional image data to include with the message"),
-  fileData: z.object({
-    data: z.string().describe("Base64-encoded file data"),
-    mimeType: z.string().describe("The MIME type of the file (e.g., application/pdf)"),
-    filename: z.string().optional().describe("The filename")
-  }).optional().describe("Optional file data to include with the message")
-}).refine(
-  (data) => {
-    const msg = (data.message ?? "").trim();
-    return msg.length > 0 || !!data.imageData || !!data.fileData;
-  },
-  { message: "Must provide either message text, image data, or file data" }
-).describe("Request body for sending a message to the agent");
+  content: z.union([z.string(), z.array(ContentPartSchema)]).describe("Message content - string for text, or ContentPart[] for multimodal"),
+  sessionId: z.string().min(1, "Session ID is required").describe("The session to use for this message")
+}).describe("Request body for sending a message to the agent");
 const ResetBodySchema = z.object({
   sessionId: z.string().min(1, "Session ID is required").describe("The ID of the session to reset")
 }).describe("Request body for resetting a conversation");
@@ -72,8 +73,7 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
               tokenUsage: TokenUsageSchema.optional().describe("Token usage statistics"),
               reasoning: z.string().optional().describe("Extended thinking content from reasoning models"),
               model: z.string().optional().describe("Model used for this response"),
-              provider: z.enum(LLM_PROVIDERS).optional().describe("LLM provider"),
-              router: z.enum(LLM_ROUTERS).optional().describe("Router used (e.g., vercel)")
+              provider: z.enum(LLM_PROVIDERS).optional().describe("LLM provider")
             }).strict()
           }
         }
@@ -108,7 +108,7 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
     method: "post",
     path: "/message-stream",
     summary: "Stream message response",
-    description: "Sends a message and streams the response via Server-Sent Events (SSE). Returns SSE stream directly in response. Events include llm:thinking, llm:chunk, llm:tool-call, llm:tool-result, llm:response, and llm:error.",
+    description: "Sends a message and streams the response via Server-Sent Events (SSE). Returns SSE stream directly in response. Events include llm:thinking, llm:chunk, llm:tool-call, llm:tool-result, llm:response, and llm:error. If the session is busy processing another message, returns 202 with queue information.",
     tags: ["messages"],
     request: {
       body: {
@@ -144,23 +144,28 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
           }
         }
       },
+      202: {
+        description: "Session is busy processing another message. Use the queue endpoints to manage pending messages.",
+        content: {
+          "application/json": {
+            schema: z.object({
+              busy: z.literal(true).describe("Indicates session is busy"),
+              sessionId: z.string().describe("The session ID"),
+              queueLength: z.number().describe("Current number of messages in queue"),
+              hint: z.string().describe("Instructions for the client")
+            }).strict()
+          }
+        }
+      },
       400: { description: "Validation error" }
     }
   });
   return app.openapi(messageRoute, async (ctx) => {
     const agent = getAgent();
     agent.logger.info("Received message via POST /api/message");
-    const { message, sessionId, imageData, fileData } = ctx.req.valid("json");
-    const imageDataInput = imageData ? { image: imageData.image, mimeType: imageData.mimeType } : void 0;
-    const fileDataInput = fileData ? {
-      data: fileData.data,
-      mimeType: fileData.mimeType,
-      ...fileData.filename && { filename: fileData.filename }
-    } : void 0;
-    if (imageDataInput) agent.logger.info("Image data included in message.");
-    if (fileDataInput) agent.logger.info("File data included in message.");
+    const { content, sessionId } = ctx.req.valid("json");
     agent.logger.info(`Message for session: ${sessionId}`);
-    agent.run(message || "", imageDataInput, fileDataInput, sessionId, false).catch((error) => {
+    agent.generate(content, sessionId).catch((error) => {
       agent.logger.error(
         `Error in async message processing: ${error instanceof Error ? error.message : String(error)}`
       );
@@ -169,21 +174,9 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
   }).openapi(messageSyncRoute, async (ctx) => {
     const agent = getAgent();
     agent.logger.info("Received message via POST /api/message-sync");
-    const { message, sessionId, imageData, fileData } = ctx.req.valid("json");
-    const imageDataInput = imageData ? { image: imageData.image, mimeType: imageData.mimeType } : void 0;
-    const fileDataInput = fileData ? {
-      data: fileData.data,
-      mimeType: fileData.mimeType,
-      ...fileData.filename && { filename: fileData.filename }
-    } : void 0;
-    if (imageDataInput) agent.logger.info("Image data included in message.");
-    if (fileDataInput) agent.logger.info("File data included in message.");
+    const { content, sessionId } = ctx.req.valid("json");
     agent.logger.info(`Message for session: ${sessionId}`);
-    const result = await agent.generate(message || "", {
-      sessionId,
-      imageData: imageDataInput,
-      fileData: fileDataInput
-    });
+    const result = await agent.generate(content, sessionId);
     const llmConfig = agent.stateManager.getLLMConfig(sessionId);
     return ctx.json({
       response: result.content,
@@ -191,9 +184,7 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
       tokenUsage: result.usage,
       reasoning: result.reasoning,
       model: llmConfig.model,
-      provider: llmConfig.provider,
-      router: "vercel"
-      // Hardcoded for now since we only use Vercel AI SDK
+      provider: llmConfig.provider
     });
   }).openapi(resetRoute, async (ctx) => {
     const agent = getAgent();
@@ -203,22 +194,23 @@ function createMessagesRouter(getAgent, approvalCoordinator) {
     return ctx.json({ status: "reset initiated", sessionId });
   }).openapi(messageStreamRoute, async (ctx) => {
     const agent = getAgent();
-    const body = ctx.req.valid("json");
-    const { message = "", sessionId, imageData, fileData } = body;
-    const imageDataInput = imageData ? { image: imageData.image, mimeType: imageData.mimeType } : void 0;
-    const fileDataInput = fileData ? {
-      data: fileData.data,
-      mimeType: fileData.mimeType,
-      ...fileData.filename && { filename: fileData.filename }
-    } : void 0;
+    const { content, sessionId } = ctx.req.valid("json");
+    const isBusy = await agent.isSessionBusy(sessionId);
+    if (isBusy) {
+      const queuedMessages = await agent.getQueuedMessages(sessionId);
+      return ctx.json(
+        {
+          busy: true,
+          sessionId,
+          queueLength: queuedMessages.length,
+          hint: "Use POST /api/queue/{sessionId} to queue this message, or wait for the current request to complete."
+        },
+        202
+      );
+    }
     const abortController = new AbortController();
     const { signal } = abortController;
-    const iterator = await agent.stream(message, {
-      sessionId,
-      imageData: imageDataInput,
-      fileData: fileDataInput,
-      signal
-    });
+    const iterator = await agent.stream(content, sessionId, { signal });
     return streamSSE(ctx, async (stream) => {
       const pendingApprovalEvents = [];
       if (approvalCoordinator) {

package/dist/hono/routes/prompts.d.ts

@@ -10,14 +10,14 @@ export declare function createPromptsRouter(getAgent: () => DextoAgent): OpenAPI
                     source: "config" | "custom" | "mcp";
                     description?: string | undefined;
                     title?: string | undefined;
+                    metadata?: {
+                        [x: string]: import("hono/utils/types").JSONValue;
+                    } | undefined;
                     arguments?: {
                         name: string;
                         description?: string | undefined;
                         required?: boolean | undefined;
                     }[] | undefined;
-                    metadata?: {
-                        [x: string]: import("hono/utils/types").JSONValue;
-                    } | undefined;
                 }[];
             };
             outputFormat: "json";
@@ -51,14 +51,14 @@ export declare function createPromptsRouter(getAgent: () => DextoAgent): OpenAPI
                     source: "config" | "custom" | "mcp";
                     description?: string | undefined;
                     title?: string | undefined;
+                    metadata?: {
+                        [x: string]: import("hono/utils/types").JSONValue;
+                    } | undefined;
                     arguments?: {
                         name: string;
                         description?: string | undefined;
                         required?: boolean | undefined;
                     }[] | undefined;
-                    metadata?: {
-                        [x: string]: import("hono/utils/types").JSONValue;
-                    } | undefined;
                 };
             };
             outputFormat: "json";

package/dist/hono/routes/queue.cjs

@@ -0,0 +1,202 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var queue_exports = {};
+__export(queue_exports, {
+  createQueueRouter: () => createQueueRouter
+});
+module.exports = __toCommonJS(queue_exports);
+var import_zod_openapi = require("@hono/zod-openapi");
+var import_responses = require("../schemas/responses.js");
+const QueuedMessageSchema = import_zod_openapi.z.object({
+  id: import_zod_openapi.z.string().describe("Unique identifier for the queued message"),
+  content: import_zod_openapi.z.array(import_responses.ContentPartSchema).describe("Message content parts"),
+  queuedAt: import_zod_openapi.z.number().describe("Unix timestamp when message was queued"),
+  metadata: import_zod_openapi.z.record(import_zod_openapi.z.unknown()).optional().describe("Optional metadata")
+}).strict().describe("A message waiting in the queue");
+const TextPartSchema = import_zod_openapi.z.object({
+  type: import_zod_openapi.z.literal("text").describe("Content type identifier"),
+  text: import_zod_openapi.z.string().describe("Text content")
+}).describe("Text content part");
+const ImagePartSchema = import_zod_openapi.z.object({
+  type: import_zod_openapi.z.literal("image").describe("Content type identifier"),
+  image: import_zod_openapi.z.string().describe("Base64-encoded image data or URL"),
+  mimeType: import_zod_openapi.z.string().optional().describe("MIME type (e.g., image/png)")
+}).describe("Image content part");
+const FilePartSchema = import_zod_openapi.z.object({
+  type: import_zod_openapi.z.literal("file").describe("Content type identifier"),
+  data: import_zod_openapi.z.string().describe("Base64-encoded file data or URL"),
+  mimeType: import_zod_openapi.z.string().describe("MIME type (e.g., application/pdf)"),
+  filename: import_zod_openapi.z.string().optional().describe("Optional filename")
+}).describe("File content part");
+const QueueContentPartSchema = import_zod_openapi.z.discriminatedUnion("type", [TextPartSchema, ImagePartSchema, FilePartSchema]).describe("Content part - text, image, or file");
+const QueueMessageBodySchema = import_zod_openapi.z.object({
+  content: import_zod_openapi.z.union([import_zod_openapi.z.string(), import_zod_openapi.z.array(QueueContentPartSchema)]).describe("Message content - string for text, or ContentPart[] for multimodal")
+}).describe("Request body for queueing a message");
+function createQueueRouter(getAgent) {
+  const app = new import_zod_openapi.OpenAPIHono();
+  const getQueueRoute = (0, import_zod_openapi.createRoute)({
+    method: "get",
+    path: "/queue/{sessionId}",
+    summary: "Get queued messages",
+    description: "Returns all messages waiting in the queue for a session",
+    tags: ["queue"],
+    request: {
+      params: import_zod_openapi.z.object({
+        sessionId: import_zod_openapi.z.string().min(1).describe("Session ID")
+      })
+    },
+    responses: {
+      200: {
+        description: "List of queued messages",
+        content: {
+          "application/json": {
+            schema: import_zod_openapi.z.object({
+              messages: import_zod_openapi.z.array(QueuedMessageSchema).describe("Queued messages"),
+              count: import_zod_openapi.z.number().describe("Number of messages in queue")
+            }).strict()
+          }
+        }
+      },
+      404: { description: "Session not found" }
+    }
+  });
+  const queueMessageRoute = (0, import_zod_openapi.createRoute)({
+    method: "post",
+    path: "/queue/{sessionId}",
+    summary: "Queue a message",
+    description: "Adds a message to the queue for processing when the session is no longer busy",
+    tags: ["queue"],
+    request: {
+      params: import_zod_openapi.z.object({
+        sessionId: import_zod_openapi.z.string().min(1).describe("Session ID")
+      }),
+      body: {
+        content: { "application/json": { schema: QueueMessageBodySchema } }
+      }
+    },
+    responses: {
+      201: {
+        description: "Message queued successfully",
+        content: {
+          "application/json": {
+            schema: import_zod_openapi.z.object({
+              queued: import_zod_openapi.z.literal(true).describe("Indicates message was queued"),
+              id: import_zod_openapi.z.string().describe("ID of the queued message"),
+              position: import_zod_openapi.z.number().describe("Position in the queue (1-based)")
+            }).strict()
+          }
+        }
+      },
+      404: { description: "Session not found" }
+    }
+  });
+  const removeQueuedMessageRoute = (0, import_zod_openapi.createRoute)({
+    method: "delete",
+    path: "/queue/{sessionId}/{messageId}",
+    summary: "Remove queued message",
+    description: "Removes a specific message from the queue",
+    tags: ["queue"],
+    request: {
+      params: import_zod_openapi.z.object({
+        sessionId: import_zod_openapi.z.string().min(1).describe("Session ID"),
+        messageId: import_zod_openapi.z.string().min(1).describe("ID of the queued message to remove")
+      })
+    },
+    responses: {
+      200: {
+        description: "Message removed successfully",
+        content: {
+          "application/json": {
+            schema: import_zod_openapi.z.object({
+              removed: import_zod_openapi.z.literal(true).describe("Indicates message was removed"),
+              id: import_zod_openapi.z.string().describe("ID of the removed message")
+            }).strict()
+          }
+        }
+      },
+      404: { description: "Session or message not found" }
+    }
+  });
+  const clearQueueRoute = (0, import_zod_openapi.createRoute)({
+    method: "delete",
+    path: "/queue/{sessionId}",
+    summary: "Clear message queue",
+    description: "Removes all messages from the queue for a session",
+    tags: ["queue"],
+    request: {
+      params: import_zod_openapi.z.object({
+        sessionId: import_zod_openapi.z.string().min(1).describe("Session ID")
+      })
+    },
+    responses: {
+      200: {
+        description: "Queue cleared successfully",
+        content: {
+          "application/json": {
+            schema: import_zod_openapi.z.object({
+              cleared: import_zod_openapi.z.literal(true).describe("Indicates queue was cleared"),
+              count: import_zod_openapi.z.number().describe("Number of messages that were removed")
+            }).strict()
+          }
+        }
+      },
+      404: { description: "Session not found" }
+    }
+  });
+  return app.openapi(getQueueRoute, async (ctx) => {
+    const agent = getAgent();
+    const { sessionId } = ctx.req.valid("param");
+    const messages = await agent.getQueuedMessages(sessionId);
+    return ctx.json({
+      messages,
+      count: messages.length
+    });
+  }).openapi(queueMessageRoute, async (ctx) => {
+    const agent = getAgent();
+    const { sessionId } = ctx.req.valid("param");
+    const { content: rawContent } = ctx.req.valid("json");
+    const content = typeof rawContent === "string" ? [{ type: "text", text: rawContent }] : rawContent;
+    const result = await agent.queueMessage(sessionId, { content });
+    return ctx.json(
+      {
+        queued: result.queued,
+        id: result.id,
+        position: result.position
+      },
+      201
+    );
+  }).openapi(removeQueuedMessageRoute, async (ctx) => {
+    const agent = getAgent();
+    const { sessionId, messageId } = ctx.req.valid("param");
+    const removed = await agent.removeQueuedMessage(sessionId, messageId);
+    if (!removed) {
+      return ctx.json({ error: "Message not found in queue" }, 404);
+    }
+    return ctx.json({ removed: true, id: messageId });
+  }).openapi(clearQueueRoute, async (ctx) => {
+    const agent = getAgent();
+    const { sessionId } = ctx.req.valid("param");
+    const count = await agent.clearMessageQueue(sessionId);
+    return ctx.json({ cleared: true, count });
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createQueueRouter
+});

package/dist/hono/routes/queue.d.ts

@@ -0,0 +1,171 @@
+import { OpenAPIHono } from '@hono/zod-openapi';
+import type { DextoAgent } from '@dexto/core';
+export declare function createQueueRouter(getAgent: () => DextoAgent): OpenAPIHono<import("hono").Env, {
+    "/queue/:sessionId": {
+        $get: {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            };
+            output: {};
+            outputFormat: string;
+            status: 404;
+        } | {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            };
+            output: {
+                messages: {
+                    content: ({
+                        type: "text";
+                        text: string;
+                    } | {
+                        type: "image";
+                        image: string;
+                        mimeType?: string | undefined;
+                    } | {
+                        type: "file";
+                        mimeType: string;
+                        data: string;
+                        filename?: string | undefined;
+                    } | {
+                        type: "ui-resource";
+                        mimeType: string;
+                        uri: string;
+                        content?: string | undefined;
+                        blob?: string | undefined;
+                        metadata?: {
+                            title?: string | undefined;
+                            preferredSize?: {
+                                width: number;
+                                height: number;
+                            } | undefined;
+                        } | undefined;
+                    })[];
+                    id: string;
+                    queuedAt: number;
+                    metadata?: {
+                        [x: string]: import("hono/utils/types").JSONValue;
+                    } | undefined;
+                }[];
+                count: number;
+            };
+            outputFormat: "json";
+            status: 200;
+        };
+    };
+} & {
+    "/queue/:sessionId": {
+        $post: {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            } & {
+                json: {
+                    content: string | ({
+                        type: "text";
+                        text: string;
+                    } | {
+                        type: "image";
+                        image: string;
+                        mimeType?: string | undefined;
+                    } | {
+                        type: "file";
+                        mimeType: string;
+                        data: string;
+                        filename?: string | undefined;
+                    })[];
+                };
+            };
+            output: {};
+            outputFormat: string;
+            status: 404;
+        } | {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            } & {
+                json: {
+                    content: string | ({
+                        type: "text";
+                        text: string;
+                    } | {
+                        type: "image";
+                        image: string;
+                        mimeType?: string | undefined;
+                    } | {
+                        type: "file";
+                        mimeType: string;
+                        data: string;
+                        filename?: string | undefined;
+                    })[];
+                };
+            };
+            output: {
+                id: string;
+                queued: true;
+                position: number;
+            };
+            outputFormat: "json";
+            status: 201;
+        };
+    };
+} & {
+    "/queue/:sessionId/:messageId": {
+        $delete: {
+            input: {
+                param: {
+                    sessionId: string;
+                    messageId: string;
+                };
+            };
+            output: {};
+            outputFormat: string;
+            status: 404;
+        } | {
+            input: {
+                param: {
+                    sessionId: string;
+                    messageId: string;
+                };
+            };
+            output: {
+                id: string;
+                removed: true;
+            };
+            outputFormat: "json";
+            status: 200;
+        };
+    };
+} & {
+    "/queue/:sessionId": {
+        $delete: {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            };
+            output: {};
+            outputFormat: string;
+            status: 404;
+        } | {
+            input: {
+                param: {
+                    sessionId: string;
+                };
+            };
+            output: {
+                count: number;
+                cleared: true;
+            };
+            outputFormat: "json";
+            status: 200;
+        };
+    };
+}, "/">;
+//# sourceMappingURL=queue.d.ts.map

package/dist/hono/routes/queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/hono/routes/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,aAAa,CAAC;AAsD3D,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAoL3D"}