@artinet/sdk 0.5.18 → 0.6.0-preview.1

package/dist/server/express/middeware.js

@@ -2,8 +2,9 @@
  * Copyright 2025 The Artinet Project
  * SPDX-License-Identifier: Apache-2.0
  */
+import { A2A } from "../../types/index.js";
 import { PUSH_NOTIFICATION_NOT_SUPPORTED, INVALID_REQUEST, INVALID_PARAMS, METHOD_NOT_FOUND, AUTHENTICATED_EXTENDED_CARD_NOT_CONFIGURED, } from "../../utils/index.js";
-import { logError } from "../../utils/logging/index.js";
+import { logger } from "../../config/index.js";
 const isValidMethod = (method) => {
     return (method &&
         method !== "" &&
@@ -36,7 +37,7 @@ export async function jsonRPCMiddleware(service, req, res, next, extendedAgentCa
         res.json({
             jsonrpc: "2.0",
             id: id || null,
-            error: { code: -32600, message: "Invalid Request" },
+            error: { code: A2A.ErrorCodeInvalidRequest, message: "Invalid Request" },
         });
         return;
     }
@@ -94,6 +95,8 @@ export async function jsonRPCMiddleware(service, req, res, next, extendedAgentCa
                 result = await service.cancelTask(params);
                 break;
             }
+            //todo: Implement push notifications
+            //todo: Implement Tasks List
             case "tasks/pushNotificationConfig/set":
             case "tasks/pushNotificationConfig/get":
             case "tasks/pushNotificationConfig/delete":
@@ -107,7 +110,8 @@ export async function jsonRPCMiddleware(service, req, res, next, extendedAgentCa
             }
             case "agent/getAuthenticatedExtendedCard": {
                 if (!extendedAgentCard ||
-                    service.agentCard.supportsAuthenticatedExtendedCard !== true) {
+                    (await service.getAgentCard()).supportsAuthenticatedExtendedCard !==
+                        true) {
                     throw AUTHENTICATED_EXTENDED_CARD_NOT_CONFIGURED({
                         data: {
                             message: "Authenticated Extended Card is not configured",
@@ -129,7 +133,10 @@ export async function jsonRPCMiddleware(service, req, res, next, extendedAgentCa
         res.json({ jsonrpc: "2.0", id, result });
     }
     catch (error) {
-        logError("jsonRPCMiddleware", "error detected", error, req.body);
+        logger.error("jsonRPCMiddleware[Error]:", error);
+        logger.warn("jsonRPCMiddleware[Error]: Request body", {
+            request: req.body,
+        });
         return next(error);
     }
 }

package/dist/server/express/server.d.ts

@@ -3,69 +3,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import express from "express";
-import { Agent, AgentCard, FactoryParams as CreateAgentParams } from "../../types/index.js";
+import { A2A } from "../../types/index.js";
+import { Agent } from "../../services/a2a/index.js";
+import { ServiceParams as CreateAgentParams } from "../../services/index.js";
 import { CorsOptions } from "cors";
 export interface ServerParams {
     app?: express.Express;
     corsOptions?: CorsOptions;
     basePath?: string;
-    extendedAgentCard?: AgentCard;
-}
-export declare function createAgentServer(params: ServerParams & {
+    extendedAgentCard?: A2A.AgentCard;
     agent: Agent | CreateAgentParams;
     agentCardPath?: string;
     register?: boolean;
-}): {
-    app: import("express-serve-static-core").Express;
-    agent: Agent<{
-        message: {
-            role: "user" | "agent";
-            kind: "message";
-            parts: ({
-                file: {
-                    bytes: string;
-                    name?: string | undefined;
-                    mimeType?: string | undefined;
-                    uri?: undefined;
-                } | {
-                    uri: string;
-                    name?: string | undefined;
-                    bytes?: undefined;
-                    mimeType?: string | undefined;
-                };
-                kind: "file";
-                metadata?: Record<string, unknown> | undefined;
-            } | {
-                text: string;
-                kind: "text";
-                metadata?: Record<string, unknown> | undefined;
-            } | {
-                data: Record<string, unknown>;
-                kind: "data";
-                metadata?: Record<string, unknown> | undefined;
-            })[];
-            messageId: string;
-            metadata?: Record<string, unknown> | undefined;
-            extensions?: string[] | undefined;
-            referenceTaskIds?: string[] | undefined;
-            taskId?: string | undefined;
-            contextId?: string | undefined;
-        };
-        metadata?: Record<string, unknown> | undefined;
-        configuration?: {
-            historyLength?: number | undefined;
-            pushNotificationConfig?: {
-                url: string;
-                id?: string | undefined;
-                token?: string | undefined;
-                authentication?: {
-                    schemes: string[];
-                    credentials?: string | undefined;
-                } | undefined;
-            } | undefined;
-            acceptedOutputModes?: string[] | undefined;
-            blocking?: boolean | undefined;
-        } | undefined;
-    }, import("../../types/index.js").TaskAndHistory, import("../../types/index.js").UpdateEvent>;
+}
+export declare function rpcParser(req: express.Request, res: express.Response, next: express.NextFunction): void;
+export declare function createAgentServer({ app, basePath, agentCardPath, agent, corsOptions, extendedAgentCard, }: ServerParams): {
+    app: express.Express;
+    agent: Agent;
 };
 export type ExpressAgentServer = ReturnType<typeof createAgentServer>;

package/dist/server/express/server.js

@@ -4,12 +4,17 @@
  */
 import express from "express";
 import { INVALID_REQUEST, PARSE_ERROR } from "../../utils/index.js";
-import { createAgent } from "../../services/index.js";
+import { createAgent, Service, } from "../../services/index.js";
 import cors from "cors";
 import { jsonRPCMiddleware } from "./middeware.js";
 import { errorHandler } from "./errors.js";
-function rpcParser(req, res, next) {
+export function rpcParser(req, res, next) {
     express.json()(req, res, (err) => {
+        if (!req.body || typeof req.body !== "object") {
+            return next(PARSE_ERROR({
+                data: { message: "Invalid request body" },
+            }));
+        }
         if (err) {
             if (err instanceof SyntaxError &&
                 "status" in err &&
@@ -24,41 +29,29 @@ function rpcParser(req, res, next) {
         next();
     });
 }
-function ensureAgent(agentOrParams) {
-    if (agentOrParams &&
-        typeof agentOrParams === "object" &&
-        "agentCard" in agentOrParams &&
-        typeof agentOrParams.agentCard === "object" &&
-        "sendMessage" in agentOrParams &&
-        typeof agentOrParams.sendMessage === "function" &&
-        "streamMessage" in agentOrParams &&
-        typeof agentOrParams.streamMessage === "function" &&
-        "addConnection" in agentOrParams &&
-        typeof agentOrParams.addConnection === "function" &&
-        "removeConnection" in agentOrParams &&
-        typeof agentOrParams.removeConnection === "function" &&
-        "getState" in agentOrParams &&
-        typeof agentOrParams.getState === "function" &&
-        "setState" in agentOrParams &&
-        typeof agentOrParams.setState === "function") {
-        return agentOrParams;
-    }
-    else if (agentOrParams &&
+const isParams = (agentOrParams) => {
+    return (agentOrParams &&
         typeof agentOrParams === "object" &&
         "engine" in agentOrParams &&
         typeof agentOrParams.engine === "function" &&
         "agentCard" in agentOrParams &&
-        typeof agentOrParams.agentCard === "object") {
+        typeof agentOrParams.agentCard === "object");
+};
+const ensureAgent = (agentOrParams) => {
+    if (agentOrParams instanceof Service) {
+        return agentOrParams;
+    }
+    else if (isParams(agentOrParams)) {
         return createAgent(agentOrParams);
     }
     throw new Error("invalid agent or params");
-}
-export function createAgentServer(params) {
-    const { app = express(), basePath = "/", agentCardPath = "/.well-known/agent-card.json", agent, } = params;
+};
+export function createAgentServer({ app = express(), basePath = "/", agentCardPath = "/.well-known/agent-card.json", agent, corsOptions, extendedAgentCard, }) {
     const agentInstance = ensureAgent(agent);
-    app.use(cors(params.corsOptions));
+    app.use(cors(corsOptions));
     if (agentCardPath !== "/.well-known/agent-card.json") {
         // mount at the root for compliance with RFC8615 standard
+        // todo: align with emerging multi-agent standards
         app.use("/.well-known/agent-card.json", (_, res) => {
             res.json(agentInstance.agentCard);
         });
@@ -80,7 +73,7 @@ export function createAgentServer(params) {
     app.post(basePath, rpcParser, async (req, res, next) => {
         const { jsonrpc } = req.body;
         if (jsonrpc === "2.0") {
-            return await jsonRPCMiddleware(agentInstance, req, res, next, params.extendedAgentCard);
+            return await jsonRPCMiddleware(agentInstance, req, res, next, extendedAgentCard);
         }
         next(INVALID_REQUEST({ data: { message: "Invalid JSON-RPC request" } }));
     });

package/dist/services/a2a/execute.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright 2025 The Artinet Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { A2A } from "../../types/index.js";
+export declare const execute: (engine: A2A.Engine, context: A2A.Context) => Promise<void>;

package/dist/services/a2a/execute.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2025 The Artinet Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export const execute = async (engine, context) => {
+    try {
+        if (context.publisher.onStart) {
+            await context.publisher.onStart(context);
+        }
+        for await (const update of engine(context)) {
+            if ((await context.isCancelled()) || context.abortSignal.aborted) {
+                await context.publisher.onCancel(update);
+                break;
+            }
+            await context.publisher.onUpdate(update);
+        }
+    }
+    catch (error) {
+        await context.publisher.onError(error);
+        throw error;
+    }
+    finally {
+        await context.publisher.onComplete();
+    }
+};

package/dist/services/a2a/factory/builder.d.ts

@@ -10,11 +10,12 @@
  * workflows with type-safe step composition and automatic execution orchestration.
  *
  * @module A2ABuilder
- * @version 0.5.7
+ * @version 0.6.0-preview
  * @since 0.5.6
  * @author The Artinet Project
  */
-import { StepBuilder, Step, StepOutput, StepOutputWithForwardArgs, MessageSendParams, TextPart, DataPart, FilePart, AgentEngine, StepWithKind, FactoryParams } from "../../../types/index.js";
+import { StepBuilder, Step, A2A, StepWithKind, OutputType, BaseArgs, EmptyArgs, OutArgsOf, PartContent } from "../../../types/index.js";
+import { ServiceParams } from "./service.js";
 /**
  * Type alias for text-based workflow steps.
  *
@@ -24,7 +25,7 @@ import { StepBuilder, Step, StepOutput, StepOutputWithForwardArgs, MessageSendPa
  * decision making.
  *
  * @template TCommand - The command type, defaults to MessageSendParams
- * @template TPart - The text part type, defaults to TextPart["text"]
+ * @template TPart - The text part type, defaults to A2A.TextPart["text"]
  * @template TInboundArgs - Arguments received from previous step
  * @template TForwardArgs - Arguments passed to next step
  * @template TOutput - The output type of the step
@@ -40,7 +41,7 @@ import { StepBuilder, Step, StepOutput, StepOutputWithForwardArgs, MessageSendPa
  * @public
  * @since 0.5.6
  */
-export type textStep<TCommand extends MessageSendParams = MessageSendParams, TPart extends TextPart["text"] = TextPart["text"], TInboundArgs extends readonly unknown[] = [], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>> = Step<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>;
+export type textStep<TInboundArgs extends BaseArgs = EmptyArgs, TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.TextPart["text"], TForwardArgs> = OutputType<A2A.TextPart["text"], TForwardArgs>> = Step<A2A.TextPart["text"], TInboundArgs, TForwardArgs, TOutput>;
 /**
  * Type alias for file-based workflow steps.
  *
@@ -49,7 +50,7 @@ export type textStep<TCommand extends MessageSendParams = MessageSendParams, TPa
  * file generation, and file-based data operations.
  *
  * @template TCommand - The command type, defaults to MessageSendParams
- * @template TPart - The file part type, defaults to FilePart["file"]
+ * @template TPart - The file part type, defaults to A2A.FilePart["file"]
  * @template TInboundArgs - Arguments received from previous step
  * @template TForwardArgs - Arguments passed to next step
  * @template TOutput - The output type of the step
@@ -69,7 +70,7 @@ export type textStep<TCommand extends MessageSendParams = MessageSendParams, TPa
  * @public
  * @since 0.5.6
  */
-export type fileStep<TCommand extends MessageSendParams = MessageSendParams, TPart extends FilePart["file"] = FilePart["file"], TInboundArgs extends readonly unknown[] = [], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>> = Step<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>;
+export type fileStep<TInboundArgs extends BaseArgs = EmptyArgs, TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.FilePart["file"], TForwardArgs> = OutputType<A2A.FilePart["file"], TForwardArgs>> = Step<A2A.FilePart["file"], TInboundArgs, TForwardArgs, TOutput>;
 /**
  * Type alias for data-based workflow steps.
  *
@@ -78,7 +79,7 @@ export type fileStep<TCommand extends MessageSendParams = MessageSendParams, TPa
  * and structured data transformations.
  *
  * @template TCommand - The command type, defaults to MessageSendParams
- * @template TPart - The data part type, defaults to DataPart["data"]
+ * @template TPart - The data part type, defaults to A2A.DataPart["data"]
  * @template TInboundArgs - Arguments received from previous step
  * @template TForwardArgs - Arguments passed to next step
  * @template TOutput - The output type of the step
@@ -98,17 +99,7 @@ export type fileStep<TCommand extends MessageSendParams = MessageSendParams, TPa
  * @public
  * @since 0.5.6
  */
-export type dataStep<TCommand extends MessageSendParams = MessageSendParams, TPart extends DataPart["data"] = DataPart["data"], TInboundArgs extends readonly unknown[] = [], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>> = Step<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>;
-/**
- * Utility type to extract forward arguments from step output.
- *
- * This helper type extracts the forward arguments type from a step output,
- * enabling proper type chaining between workflow steps.
- *
- * @template O - The output type to extract arguments from
- * @internal
- */
-type OutArgsOf<O> = O extends StepOutputWithForwardArgs<any, infer A> ? A : [];
+export type dataStep<TInboundArgs extends BaseArgs = EmptyArgs, TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.DataPart["data"], TForwardArgs> = OutputType<A2A.DataPart["data"], TForwardArgs>> = Step<A2A.DataPart["data"], TInboundArgs, TForwardArgs, TOutput>;
 /**
  * Fluent builder for constructing A2A agent execution engines.
  *
@@ -137,14 +128,14 @@ type OutArgsOf<O> = O extends StepOutputWithForwardArgs<any, infer A> ? A : [];
  * @public
  * @since 0.5.6
  */
-export declare class EngineBuilder<TCommand extends MessageSendParams = MessageSendParams, TInboundArgs extends readonly unknown[] = []> implements StepBuilder<TCommand, TInboundArgs> {
+export declare class EngineBuilder<TInboundArgs extends BaseArgs = EmptyArgs> implements StepBuilder<TInboundArgs> {
     private steps;
     /**
      * Protected constructor to enforce factory method usage.
      *
      * @param steps - Initial steps array
      */
-    protected constructor(steps?: Array<StepWithKind<TCommand, any, any, any, any, any>>);
+    protected constructor(steps?: Array<StepWithKind<any, any, any, any, any>>);
     /**
      * Creates a new EngineBuilder instance.
      *
@@ -157,8 +148,8 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * const builder = EngineBuilder.create<MyCommand, [string, number]>();
      * ```
      */
-    static create<TCommand extends MessageSendParams = MessageSendParams, TInboundArgs extends readonly unknown[] = []>(): EngineBuilder<TCommand, TInboundArgs>;
-    addStep<TPart extends DataPart["data"] | FilePart["file"] | TextPart["text"] = TextPart["text"], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>, TKind extends "text" | "file" | "data" = "text">(step: StepWithKind<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput, TKind>): EngineBuilder<TCommand, OutArgsOf<TOutput>>;
+    static create<TInboundArgs extends BaseArgs = EmptyArgs>(): EngineBuilder<TInboundArgs>;
+    addStep<TPart extends PartContent = A2A.TextPart["text"], TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<TPart, TForwardArgs> = OutputType<TPart, TForwardArgs>, TKind extends "text" | "file" | "data" = "text">(step: StepWithKind<TPart, TInboundArgs, TForwardArgs, TOutput, TKind>): EngineBuilder<OutArgsOf<TOutput>>;
     /**
      * Adds a text processing step to the workflow.
      *
@@ -175,7 +166,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * });
      * ```
      */
-    text<TPart extends TextPart["text"] = TextPart["text"], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>>(step: textStep<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>): EngineBuilder<TCommand, OutArgsOf<TOutput>>;
+    text<TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.TextPart["text"], TForwardArgs> = OutputType<A2A.TextPart["text"], TForwardArgs>>(step: textStep<TInboundArgs, TForwardArgs, TOutput> | string): EngineBuilder<OutArgsOf<TOutput>>;
     /**
      * Adds a file processing step to the workflow.
      *
@@ -196,7 +187,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * });
      * ```
      */
-    file<TPart extends FilePart["file"] = FilePart["file"], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>>(step: fileStep<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>): EngineBuilder<TCommand, OutArgsOf<TOutput>>;
+    file<TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.FilePart["file"], TForwardArgs> = OutputType<A2A.FilePart["file"], TForwardArgs>>(step: fileStep<TInboundArgs, TForwardArgs, TOutput>): EngineBuilder<OutArgsOf<TOutput>>;
     /**
      * Adds a data processing step to the workflow.
      *
@@ -216,7 +207,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * });
      * ```
      */
-    data<TPart extends DataPart["data"] = DataPart["data"], TForwardArgs extends readonly unknown[] = [], TOutput extends StepOutput<TPart> | StepOutputWithForwardArgs<TPart, TForwardArgs> | Array<TPart> | TPart = StepOutput<TPart>>(step: dataStep<TCommand, TPart, TInboundArgs, TForwardArgs, TOutput>): EngineBuilder<TCommand, OutArgsOf<TOutput>>;
+    data<TForwardArgs extends BaseArgs = EmptyArgs, TOutput extends OutputType<A2A.DataPart["data"], TForwardArgs> = OutputType<A2A.DataPart["data"], TForwardArgs>>(step: dataStep<TInboundArgs, TForwardArgs, TOutput>): EngineBuilder<OutArgsOf<TOutput>>;
     /**
      * Creates a complete A2A agent using the built workflow.
      *
@@ -234,7 +225,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * });
      * ```
      */
-    createAgent(params: Omit<FactoryParams, "engine">): import("../service.js").A2AService;
+    createAgent(params: Omit<ServiceParams, "engine">): import("../service.js").Service;
     /**
      * Creates an agent execution engine from the built workflow.
      *
@@ -246,7 +237,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * // Use engine with service execution
      * ```
      */
-    createAgentEngine(): AgentEngine;
+    createAgentEngine(): A2A.Engine;
     /**
      * Builds the step list for the workflow.
      *
@@ -258,7 +249,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
      * const steps = builder.build();
      * ```
      */
-    build(): StepWithKind<TCommand, any, any, any, any, any>[];
+    build(): StepWithKind<any, any, any, any, any>[];
 }
 /**
  * Convenience factory function for creating an agent builder with default parameters.
@@ -275,56 +266,7 @@ export declare class EngineBuilder<TCommand extends MessageSendParams = MessageS
  * @public
  * @since 0.5.6
  */
-export declare const AgentBuilder: () => EngineBuilder<{
-    message: {
-        role: "user" | "agent";
-        kind: "message";
-        parts: ({
-            file: {
-                bytes: string;
-                name?: string | undefined;
-                mimeType?: string | undefined;
-                uri?: undefined;
-            } | {
-                uri: string;
-                name?: string | undefined;
-                bytes?: undefined;
-                mimeType?: string | undefined;
-            };
-            kind: "file";
-            metadata?: Record<string, unknown> | undefined;
-        } | {
-            text: string;
-            kind: "text";
-            metadata?: Record<string, unknown> | undefined;
-        } | {
-            data: Record<string, unknown>;
-            kind: "data";
-            metadata?: Record<string, unknown> | undefined;
-        })[];
-        messageId: string;
-        metadata?: Record<string, unknown> | undefined;
-        extensions?: string[] | undefined;
-        referenceTaskIds?: string[] | undefined;
-        taskId?: string | undefined;
-        contextId?: string | undefined;
-    };
-    metadata?: Record<string, unknown> | undefined;
-    configuration?: {
-        historyLength?: number | undefined;
-        pushNotificationConfig?: {
-            url: string;
-            id?: string | undefined;
-            token?: string | undefined;
-            authentication?: {
-                schemes: string[];
-                credentials?: string | undefined;
-            } | undefined;
-        } | undefined;
-        acceptedOutputModes?: string[] | undefined;
-        blocking?: boolean | undefined;
-    } | undefined;
-}, []>;
+export declare const AgentBuilder: () => EngineBuilder<EmptyArgs>;
 /**
  * Creates an agent execution engine from a list of workflow steps.
  *
@@ -347,5 +289,4 @@ export declare const AgentBuilder: () => EngineBuilder<{
  * @public
  * @since 0.5.6
  */
-export declare function createAgentExecutor(stepsList: StepWithKind[]): AgentEngine;
-export {};
+export declare function createAgentExecutor(stepsList: StepWithKind[]): A2A.Engine;

package/dist/services/a2a/factory/builder.js

@@ -10,11 +10,11 @@
  * workflows with type-safe step composition and automatic execution orchestration.
  *
  * @module A2ABuilder
- * @version 0.5.7
+ * @version 0.6.0-preview
  * @since 0.5.6
  * @author The Artinet Project
  */
-import { TaskState, } from "../../../types/index.js";
+import { A2A, } from "../../../types/index.js";
 import { createAgent } from "./service.js";
 import { v4 as uuidv4 } from "uuid";
 import { getContent } from "../helpers/content.js";
@@ -76,10 +76,7 @@ export class EngineBuilder {
         return new EngineBuilder();
     }
     addStep(step) {
-        return new EngineBuilder([
-            ...this.steps,
-            step,
-        ]);
+        return new EngineBuilder([...this.steps, step]);
     }
     /**
      * Adds a text processing step to the workflow.
@@ -99,7 +96,7 @@ export class EngineBuilder {
      */
     text(step) {
         return this.addStep({
-            step: step,
+            step: typeof step === "string" ? () => step : step,
             kind: "text",
         });
     }
@@ -285,21 +282,25 @@ const partToMessagePart = (kind, part) => {
  */
 export function createAgentExecutor(stepsList) {
     return async function* (context) {
-        const content = getContent(context.command.message);
+        const content = getContent(context.userMessage);
+        let _skipStep = false;
         const stepArgs = {
-            command: context.command,
+            message: context.messages,
             context: context,
             content: content,
-            args: [],
+            skip: () => {
+                _skipStep = true;
+                return;
+            },
         };
         const contextId = context.contextId;
-        const taskId = context.State().task.id;
+        const taskId = context.taskId;
         if (!contextId || !taskId) {
             throw new Error("Context ID and task ID are required");
         }
         const taskStarted = SUBMITTED_UPDATE(taskId, contextId);
         yield taskStarted;
-        let finalState = TaskState.completed;
+        let finalState = A2A.TaskState.completed;
         const finalMessage = {
             taskId: taskId,
             contextId: contextId,
@@ -309,11 +310,15 @@ export function createAgentExecutor(stepsList) {
             parts: [],
         };
         for (const step of stepsList) {
-            if (context.isCancelled()) {
-                finalState = TaskState.canceled;
+            if (await context.isCancelled()) {
+                finalState = A2A.TaskState.canceled;
                 break;
             }
             const ret = await step.step({ ...stepArgs });
+            if (_skipStep) {
+                _skipStep = false;
+                continue;
+            }
             let parts = [];
             if (Array.isArray(ret)) {
                 parts = ret.map((part) => partToMessagePart(step.kind, part));
@@ -325,7 +330,7 @@ export function createAgentExecutor(stepsList) {
                 });
                 yield taskStatusUpdate;
             }
-            else if (ret !== null && typeof ret === "object") {
+            else if (ret !== null && typeof ret === "object" && "parts" in ret) {
                 parts = Array.isArray(ret.parts)
                     ? ret.parts.map((part) => partToMessagePart(step.kind, part))
                     : [partToMessagePart(step.kind, ret.parts)];