@dexto/server 1.6.20 → 1.6.21

package/dist/hono/routes/a2a-tasks.js

@@ -2,11 +2,19 @@ import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
 import { A2AMethodHandlers } from "../../a2a/jsonrpc/methods.js";
 import { logger } from "@dexto/core";
 import { a2aToInternalMessage } from "../../a2a/adapters/message.js";
+import {
+  BadRequestErrorResponse,
+  InternalErrorResponse,
+  JsonObjectSchema
+} from "../schemas/responses.js";
+function mountA2ATasksSubrouter(app, router) {
+  app.route("/", router);
+}
 const PartSchema = z.discriminatedUnion("kind", [
   z.object({
     kind: z.literal("text").describe("Part type discriminator"),
     text: z.string().describe("Text content"),
-    metadata: z.record(z.any()).optional().describe("Extension metadata")
+    metadata: JsonObjectSchema.optional().describe("Extension metadata")
   }),
   z.object({
     kind: z.literal("file").describe("Part type discriminator"),
@@ -22,12 +30,12 @@ const PartSchema = z.discriminatedUnion("kind", [
         mimeType: z.string().optional().describe("MIME type")
       })
     ]).describe("File data (bytes or URI)"),
-    metadata: z.record(z.any()).optional().describe("Extension metadata")
+    metadata: JsonObjectSchema.optional().describe("Extension metadata")
   }),
   z.object({
     kind: z.literal("data").describe("Part type discriminator"),
-    data: z.record(z.any()).describe("Structured JSON data"),
-    metadata: z.record(z.any()).optional().describe("Extension metadata")
+    data: JsonObjectSchema.describe("Structured JSON data"),
+    metadata: JsonObjectSchema.optional().describe("Extension metadata")
   })
 ]).describe("Message part (text, file, or data)");
 const MessageSchema = z.object({
@@ -36,7 +44,7 @@ const MessageSchema = z.object({
   messageId: z.string().describe("Unique message identifier"),
   taskId: z.string().optional().describe("Associated task ID"),
   contextId: z.string().optional().describe("Context identifier"),
-  metadata: z.record(z.any()).optional().describe("Extension metadata"),
+  metadata: JsonObjectSchema.optional().describe("Extension metadata"),
   extensions: z.array(z.string()).optional().describe("Extension identifiers"),
   referenceTaskIds: z.array(z.string()).optional().describe("Referenced task IDs"),
   kind: z.literal("message").describe("Object type discriminator")
@@ -56,18 +64,114 @@ const TaskStatusSchema = z.object({
   message: MessageSchema.optional().describe("Status message"),
   timestamp: z.string().optional().describe("ISO 8601 timestamp")
 }).describe("Task status");
+const ArtifactSchema = z.object({
+  artifactId: z.string().describe("Unique artifact ID"),
+  name: z.string().optional().describe("Artifact name"),
+  description: z.string().optional().describe("Artifact description"),
+  parts: z.array(PartSchema).describe("Artifact content parts"),
+  metadata: JsonObjectSchema.optional().describe("Extension metadata"),
+  extensions: z.array(z.string()).optional().describe("Extension identifiers")
+}).describe("A2A protocol artifact");
 const TaskSchema = z.object({
   id: z.string().describe("Unique task identifier"),
   contextId: z.string().describe("Context identifier across related tasks"),
   status: TaskStatusSchema.describe("Current task status"),
   history: z.array(MessageSchema).optional().describe("Conversation history"),
-  artifacts: z.array(z.any()).optional().describe("Task artifacts"),
-  metadata: z.record(z.any()).optional().describe("Extension metadata"),
+  artifacts: z.array(ArtifactSchema).optional().describe("Task artifacts"),
+  metadata: JsonObjectSchema.optional().describe("Extension metadata"),
   kind: z.literal("task").describe("Object type discriminator")
 }).describe("A2A Protocol task");
+const TasksListResponseSchema = z.object({
+  tasks: z.array(TaskSchema).describe("Array of tasks"),
+  totalSize: z.number().describe("Total number of tasks"),
+  pageSize: z.number().describe("Number of tasks in this page"),
+  nextPageToken: z.string().describe("Token for next page")
+}).describe("Response body for tasks/list");
 const TaskErrorResponseSchema = z.object({
   error: z.string().describe("Task error message")
 }).strict().describe("A2A task error response");
+function toA2APart(part) {
+  switch (part.kind) {
+    case "text":
+      return {
+        kind: "text",
+        text: part.text,
+        ...part.metadata !== void 0 ? { metadata: part.metadata } : {}
+      };
+    case "file": {
+      const file = "bytes" in part.file ? {
+        bytes: part.file.bytes,
+        ...part.file.name !== void 0 ? { name: part.file.name } : {},
+        ...part.file.mimeType !== void 0 ? { mimeType: part.file.mimeType } : {}
+      } : {
+        uri: part.file.uri,
+        ...part.file.name !== void 0 ? { name: part.file.name } : {},
+        ...part.file.mimeType !== void 0 ? { mimeType: part.file.mimeType } : {}
+      };
+      return {
+        kind: "file",
+        file,
+        ...part.metadata !== void 0 ? { metadata: part.metadata } : {}
+      };
+    }
+    case "data":
+      return {
+        kind: "data",
+        data: part.data,
+        ...part.metadata !== void 0 ? { metadata: part.metadata } : {}
+      };
+  }
+}
+function toA2AMessage(message) {
+  return {
+    role: message.role,
+    parts: message.parts.map(toA2APart),
+    messageId: message.messageId,
+    kind: "message",
+    ...message.taskId !== void 0 ? { taskId: message.taskId } : {},
+    ...message.contextId !== void 0 ? { contextId: message.contextId } : {},
+    ...message.metadata !== void 0 ? { metadata: message.metadata } : {},
+    ...message.extensions !== void 0 ? { extensions: message.extensions } : {},
+    ...message.referenceTaskIds !== void 0 ? { referenceTaskIds: message.referenceTaskIds } : {}
+  };
+}
+function toMessageSendParams(body) {
+  const pushNotificationConfig = body.configuration?.pushNotificationConfig ? {
+    url: body.configuration.pushNotificationConfig.url,
+    ...body.configuration.pushNotificationConfig.headers !== void 0 ? { headers: body.configuration.pushNotificationConfig.headers } : {}
+  } : void 0;
+  const configuration = body.configuration ? {
+    ...body.configuration.acceptedOutputModes !== void 0 ? { acceptedOutputModes: body.configuration.acceptedOutputModes } : {},
+    ...body.configuration.historyLength !== void 0 ? { historyLength: body.configuration.historyLength } : {},
+    ...pushNotificationConfig !== void 0 ? { pushNotificationConfig } : {},
+    ...body.configuration.blocking !== void 0 ? { blocking: body.configuration.blocking } : {}
+  } : void 0;
+  return {
+    message: toA2AMessage(body.message),
+    ...configuration !== void 0 ? { configuration } : {},
+    ...body.metadata !== void 0 ? { metadata: body.metadata } : {}
+  };
+}
+function toListTasksParams(query) {
+  return {
+    ...query.contextId !== void 0 ? { contextId: query.contextId } : {},
+    ...query.status !== void 0 ? { status: query.status } : {},
+    ...query.pageSize !== void 0 ? { pageSize: query.pageSize } : {},
+    ...query.pageToken !== void 0 ? { pageToken: query.pageToken } : {},
+    ...query.historyLength !== void 0 ? { historyLength: query.historyLength } : {},
+    ...query.lastUpdatedAfter !== void 0 ? { lastUpdatedAfter: query.lastUpdatedAfter } : {},
+    ...query.includeArtifacts !== void 0 ? { includeArtifacts: query.includeArtifacts } : {}
+  };
+}
+function readCancelTaskParam(value) {
+  if (Object.prototype.hasOwnProperty.call(value, "id")) {
+    return void 0;
+  }
+  const raw = Object.entries(value).find(
+    ([key, candidate]) => key === "id:cancel" && typeof candidate === "string"
+  )?.[1];
+  return typeof raw === "string" ? raw : void 0;
+}
 const MessageSendRequestSchema = z.object({
   message: MessageSchema.describe("Message to send to the agent"),
   configuration: z.object({
@@ -79,7 +183,7 @@ const MessageSendRequestSchema = z.object({
     }).optional().describe("Push notification configuration"),
     blocking: z.boolean().optional().describe("Wait for task completion")
   }).optional().describe("Optional configuration"),
-  metadata: z.record(z.any()).optional().describe("Optional metadata")
+  metadata: JsonObjectSchema.optional().describe("Optional metadata")
 }).describe("Request body for message/send");
 const TaskListQuerySchema = z.object({
   contextId: z.string().optional().describe("Filter by context ID"),
@@ -140,7 +244,9 @@ function createA2ATasksRouter(getAgent, sseSubscriber) {
             schema: TaskSchema
           }
         }
-      }
+      },
+      400: BadRequestErrorResponse,
+      500: InternalErrorResponse
     }
   });
   const listTasksRoute = createRoute({
@@ -157,15 +263,12 @@ function createA2ATasksRouter(getAgent, sseSubscriber) {
         description: "Task list",
         content: {
           "application/json": {
-            schema: z.object({
-              tasks: z.array(TaskSchema).describe("Array of tasks"),
-              totalSize: z.number().describe("Total number of tasks"),
-              pageSize: z.number().describe("Number of tasks in this page"),
-              nextPageToken: z.string().describe("Token for next page")
-            }).describe("Response body for tasks/list")
+            schema: TasksListResponseSchema
           }
         }
-      }
+      },
+      400: BadRequestErrorResponse,
+      500: InternalErrorResponse
     }
   });
   const getTaskRoute = createRoute({
@@ -205,9 +308,22 @@ function createA2ATasksRouter(getAgent, sseSubscriber) {
     description: "Cancel a running task (A2A tasks/cancel)",
     tags: ["a2a"],
     request: {
-      params: z.object({
-        id: z.string().describe("Task ID")
-      })
+      params: z.preprocess(
+        (value) => {
+          if (value && typeof value === "object" && !Array.isArray(value)) {
+            const raw = readCancelTaskParam(value);
+            if (raw !== void 0) {
+              return {
+                id: raw.endsWith(":cancel") ? raw.slice(0, -":cancel".length) : raw
+              };
+            }
+          }
+          return value;
+        },
+        z.object({
+          id: z.string().describe("Task ID")
+        })
+      )
     },
     responses: {
       200: {
@@ -247,7 +363,7 @@ function createA2ATasksRouter(getAgent, sseSubscriber) {
       const agent = await getAgent(ctx);
       const session = await agent.createSession(taskId);
       const stream = sseSubscriber.createStream(session.id);
-      const { text, image, file } = a2aToInternalMessage(validatedBody.message);
+      const { text, image, file } = a2aToInternalMessage(toA2AMessage(validatedBody.message));
       agent.run(text, image, file, session.id).catch((error) => {
         logger.error(`Error in streaming task ${session.id}: ${error}`);
       });
@@ -265,39 +381,53 @@ function createA2ATasksRouter(getAgent, sseSubscriber) {
       return ctx.json({ error: "Failed to initiate streaming" }, 500);
     }
   });
-  return app.openapi(messageSendRoute, async (ctx) => {
+  const messageSendRouter = new OpenAPIHono().openapi(messageSendRoute, async (ctx) => {
     const handlers = new A2AMethodHandlers(await getAgent(ctx));
     const body = ctx.req.valid("json");
     logger.info("REST: message/send", { hasMessage: !!body.message });
-    const result = await handlers.messageSend(body);
-    return ctx.json(result);
-  }).openapi(listTasksRoute, async (ctx) => {
+    const result = await handlers.messageSend(toMessageSendParams(body));
+    const response = result;
+    return ctx.json(response, 200);
+  });
+  const listTasksRouter = new OpenAPIHono().openapi(listTasksRoute, async (ctx) => {
     const handlers = new A2AMethodHandlers(await getAgent(ctx));
     const query = ctx.req.valid("query");
-    const result = await handlers.tasksList(query);
-    return ctx.json(result);
-  }).openapi(getTaskRoute, async (ctx) => {
+    const result = await handlers.tasksList(toListTasksParams(query));
+    const response = result;
+    return ctx.json(response, 200);
+  });
+  const getTaskRouter = new OpenAPIHono().openapi(getTaskRoute, async (ctx) => {
     const handlers = new A2AMethodHandlers(await getAgent(ctx));
     const { id } = ctx.req.valid("param");
     try {
       const task = await handlers.tasksGet({ id });
-      return ctx.json(task, 200);
+      const response = task;
+      return ctx.json(response, 200);
     } catch (error) {
       logger.warn(`Task ${id} not found: ${error}`);
-      return ctx.json({ error: "Task not found" }, 404);
+      const response = { error: "Task not found" };
+      return ctx.json(response, 404);
     }
-  }).openapi(cancelTaskRoute, async (ctx) => {
+  });
+  const cancelTaskRouter = new OpenAPIHono().openapi(cancelTaskRoute, async (ctx) => {
     const handlers = new A2AMethodHandlers(await getAgent(ctx));
     const { id } = ctx.req.valid("param");
     logger.info(`REST: tasks/cancel ${id}`);
     try {
       const task = await handlers.tasksCancel({ id });
-      return ctx.json(task, 200);
+      const response = task;
+      return ctx.json(response, 200);
     } catch (error) {
       logger.error(`Failed to cancel task ${id}: ${error}`);
-      return ctx.json({ error: "Task not found" }, 404);
+      const response = { error: "Task not found" };
+      return ctx.json(response, 404);
     }
   });
+  mountA2ATasksSubrouter(app, messageSendRouter);
+  mountA2ATasksSubrouter(app, listTasksRouter);
+  mountA2ATasksSubrouter(app, getTaskRouter);
+  mountA2ATasksSubrouter(app, cancelTaskRouter);
+  return app;
 }
 export {
   createA2ATasksRouter

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

@@ -1 +1 @@
-{"version":3,"file":"a2a.d.ts","sourceRoot":"","sources":["../../../src/hono/routes/a2a.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,SAAS,8EAO5D"}
+{"version":3,"file":"a2a.d.ts","sourceRoot":"","sources":["../../../src/hono/routes/a2a.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,SAAS,8EAQ5D"}