@avaprotocol/sdk-js 2.5.0 → 2.5.2-dev.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @avaprotocol/sdk-js
 
+## 2.5.1
+
+### Patch Changes
+
+- 6a3d621: Standardize input format of Manual Trigger headers
+- Updated dependencies [6a3d621]
+  - @avaprotocol/types@2.3.1
+
 ## 2.5.0
 
 ### Minor Changes

package/dist/index.js

@@ -17458,8 +17458,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
       data: props.data,
       input: props.input
     });
-    this.headersMap = props.headersMap;
-    this.pathParamsMap = props.pathParamsMap;
+    this.headers = props.headers;
+    this.pathParams = props.pathParams;
   }
   toRequest() {
     const trigger = new avs_pb6.TaskTrigger();
@@ -17475,15 +17475,15 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
         config.setData(inputValue);
       }
     }
-    if (this.headersMap && this.headersMap.length > 0) {
+    if (this.headers && Object.keys(this.headers).length > 0) {
       const headersMap = config.getHeadersMap();
-      this.headersMap.forEach(([key, value]) => {
+      Object.entries(this.headers).forEach(([key, value]) => {
         headersMap.set(key, value);
       });
     }
-    if (this.pathParamsMap && this.pathParamsMap.length > 0) {
+    if (this.pathParams && Object.keys(this.pathParams).length > 0) {
       const pathParamsMap = config.getPathparamsMap();
-      this.pathParamsMap.forEach(([key, value]) => {
+      Object.entries(this.pathParams).forEach(([key, value]) => {
         pathParamsMap.set(key, value);
       });
     }
@@ -17495,8 +17495,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
     const obj = raw.toObject();
     let data = null;
     const input = void 0;
-    let headersMap = void 0;
-    let pathParamsMap = void 0;
+    let headers = void 0;
+    let pathParams = void 0;
     const manualTrigger = raw.getManual();
     if (manualTrigger) {
       const config = manualTrigger.getConfig();
@@ -17506,16 +17506,16 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
         }
         const headersMapProto = config.getHeadersMap();
         if (headersMapProto && headersMapProto.getLength() > 0) {
-          headersMap = [];
+          headers = {};
           headersMapProto.forEach((value, key) => {
-            headersMap.push([key, value]);
+            headers[key] = value;
           });
         }
         const pathParamsMapProto = config.getPathparamsMap();
         if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-          pathParamsMap = [];
+          pathParams = {};
           pathParamsMapProto.forEach((value, key) => {
-            pathParamsMap.push([key, value]);
+            pathParams[key] = value;
           });
         }
       }
@@ -17525,8 +17525,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
       type: import_types6.TriggerType.Manual,
       data,
       input,
-      headersMap,
-      pathParamsMap
+      headers,
+      pathParams
     });
   }
   getInputVariables() {
@@ -17535,45 +17535,26 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
   /**
    * Extract output data from RunTriggerResp for manual triggers
    * @param outputData - The RunTriggerResp containing manual trigger output
-   * @returns Plain JavaScript object with manual trigger data in standard structure
+   * @returns The parsed JSON data directly (similar to CustomCode output)
    */
   static fromOutputData(outputData) {
     const manualOutput = outputData.getManualTrigger();
     if (!manualOutput) {
       return null;
     }
-    const result = {};
     const dataValue = manualOutput.getData();
     if (dataValue) {
       try {
-        result.data = convertProtobufValueToJs(dataValue);
+        return convertProtobufValueToJs(dataValue);
       } catch (error) {
         console.warn(
           "Failed to convert manual trigger data from protobuf Value:",
           error
         );
-        result.data = dataValue;
+        return null;
       }
-    } else {
-      result.data = null;
-    }
-    const headersMapProto = manualOutput.getHeadersMap();
-    if (headersMapProto && headersMapProto.getLength() > 0) {
-      const headersArray = [];
-      headersMapProto.forEach((value, key) => {
-        headersArray.push([key, value]);
-      });
-      result.headers = headersArray;
-    }
-    const pathParamsMapProto = manualOutput.getPathparamsMap();
-    if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-      const pathParamsArray = [];
-      pathParamsMapProto.forEach((value, key) => {
-        pathParamsArray.push([key, value]);
-      });
-      result.pathParams = pathParamsArray;
     }
-    return result;
+    return null;
   }
 };
 var manual_default = ManualTrigger2;
@@ -17904,9 +17885,9 @@ var RestAPINode2 = class _RestAPINode extends Node {
     config.setUrl(configData.url);
     config.setMethod(configData.method);
     config.setBody(configData.body || "");
-    if (configData.headersMap && configData.headersMap.length > 0) {
+    if (configData.headers && Object.keys(configData.headers).length > 0) {
       const headersMap = config.getHeadersMap();
-      configData.headersMap.forEach(([key, value]) => {
+      Object.entries(configData.headers).forEach(([key, value]) => {
         headersMap.set(key, value);
       });
     }
@@ -17922,7 +17903,19 @@ var RestAPINode2 = class _RestAPINode extends Node {
     return new _RestAPINode({
       ...obj,
       type: import_types12.NodeType.RestAPI,
-      data: raw.getRestApi().getConfig().toObject(),
+      data: {
+        url: raw.getRestApi().getConfig().getUrl(),
+        method: raw.getRestApi().getConfig().getMethod(),
+        body: raw.getRestApi().getConfig().getBody(),
+        headers: (() => {
+          const headersMap = raw.getRestApi().getConfig().getHeadersMap();
+          const headers = {};
+          headersMap.forEach((value, key) => {
+            headers[key] = value;
+          });
+          return headers;
+        })()
+      },
       input
       // Include input data from top-level TaskNode
     });
@@ -18280,9 +18273,9 @@ var LoopNode2 = class _LoopNode extends Node {
     }
     if (typeof executionMode === "string") {
       switch (executionMode.toLowerCase()) {
-        case "parallel":
+        case import_types17.ExecutionMode.Parallel:
           return 1;
-        case "sequential":
+        case import_types17.ExecutionMode.Sequential:
         default:
           return 0;
       }
@@ -18384,7 +18377,7 @@ var LoopNode2 = class _LoopNode extends Node {
             url: apiConfig.url,
             method: apiConfig.method,
             body: apiConfig.body || "",
-            headersMap: apiConfig.headersMap
+            headers: apiConfig.headers
           });
           loopNode.setRestApi(restApi);
         }
@@ -18793,159 +18786,21 @@ var Step = class _Step {
       case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
         const manualTrigger = typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
         if (manualTrigger) {
-          const result = {};
           if (typeof manualTrigger.hasData === "function" && manualTrigger.hasData()) {
             try {
-              const userData = convertProtobufValueToJs(
-                manualTrigger.getData()
-              );
-              if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
-                result.data = userData.data;
-                if (userData.headers) {
-                  if (Array.isArray(userData.headers)) {
-                    if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                      result.headers = userData.headers;
-                    } else {
-                      const headersArray = [];
-                      for (const header of userData.headers) {
-                        for (const [key, value] of Object.entries(header)) {
-                          headersArray.push([key, value]);
-                        }
-                      }
-                      result.headers = headersArray;
-                    }
-                  } else {
-                    const headersArray = [];
-                    for (const [key, value] of Object.entries(userData.headers)) {
-                      headersArray.push([key, value]);
-                    }
-                    result.headers = headersArray;
-                  }
-                }
-                if (userData.pathParams) {
-                  if (Array.isArray(userData.pathParams)) {
-                    if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                      result.pathParams = userData.pathParams;
-                    } else {
-                      const pathParamsArray = [];
-                      for (const pathParam of userData.pathParams) {
-                        for (const [key, value] of Object.entries(pathParam)) {
-                          pathParamsArray.push([key, value]);
-                        }
-                      }
-                      result.pathParams = pathParamsArray;
-                    }
-                  } else {
-                    const pathParamsArray = [];
-                    for (const [key, value] of Object.entries(userData.pathParams)) {
-                      pathParamsArray.push([key, value]);
-                    }
-                    result.pathParams = pathParamsArray;
-                  }
-                }
-              } else {
-                result.data = userData;
-              }
+              return convertProtobufValueToJs(manualTrigger.getData());
             } catch (error) {
               console.warn(
                 "Failed to convert manual trigger data from protobuf Value:",
                 error
               );
-              result.data = manualTrigger.getData();
+              return manualTrigger.getData();
             }
           } else if (manualTrigger.data) {
-            const userData = typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
-            if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
-              result.data = userData.data;
-              if (userData.headers) {
-                if (Array.isArray(userData.headers)) {
-                  if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                    result.headers = userData.headers;
-                  } else {
-                    const headersArray = [];
-                    for (const header of userData.headers) {
-                      for (const [key, value] of Object.entries(header)) {
-                        headersArray.push([key, value]);
-                      }
-                    }
-                    result.headers = headersArray;
-                  }
-                } else {
-                  const headersArray = [];
-                  for (const [key, value] of Object.entries(userData.headers)) {
-                    headersArray.push([key, value]);
-                  }
-                  result.headers = headersArray;
-                }
-              }
-              if (userData.pathParams) {
-                if (Array.isArray(userData.pathParams)) {
-                  if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                    result.pathParams = userData.pathParams;
-                  } else {
-                    const pathParamsArray = [];
-                    for (const pathParam of userData.pathParams) {
-                      for (const [key, value] of Object.entries(pathParam)) {
-                        pathParamsArray.push([key, value]);
-                      }
-                    }
-                    result.pathParams = pathParamsArray;
-                  }
-                } else {
-                  const pathParamsArray = [];
-                  for (const [key, value] of Object.entries(userData.pathParams)) {
-                    pathParamsArray.push([key, value]);
-                  }
-                  result.pathParams = pathParamsArray;
-                }
-              }
-            } else {
-              result.data = userData;
-            }
-          }
-          if (typeof manualTrigger.getHeadersMap === "function") {
-            const headersMap = manualTrigger.getHeadersMap();
-            if (headersMap && headersMap.getLength() > 0) {
-              const headersArray = [];
-              headersMap.forEach((value, key) => {
-                headersArray.push([key, value]);
-              });
-              result.headers = headersArray;
-            }
-          } else if (manualTrigger.headers) {
-            const headersArray = [];
-            for (const [key, value] of Object.entries(manualTrigger.headers)) {
-              headersArray.push([key, value]);
-            }
-            result.headers = headersArray;
+            return typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
           }
-          if (typeof manualTrigger.getPathparamsMap === "function") {
-            const pathParamsMap = manualTrigger.getPathparamsMap();
-            if (pathParamsMap && pathParamsMap.getLength() > 0) {
-              const pathParamsArray = [];
-              pathParamsMap.forEach((value, key) => {
-                pathParamsArray.push([key, value]);
-              });
-              result.pathParams = pathParamsArray;
-            }
-          } else if (manualTrigger.pathparams) {
-            const pathParamsArray = [];
-            for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
-              pathParamsArray.push([key, value]);
-            }
-            result.pathParams = pathParamsArray;
-          }
-          if (Object.keys(result).length === 0) {
-            const objData = manualTrigger.toObject?.() || manualTrigger;
-            if (objData && objData.data === void 0) {
-              result.data = null;
-            } else {
-              return { data: objData };
-            }
-          }
-          return result;
         }
-        return { data: null };
+        return null;
       }
       // Node outputs - RESTORE MISSING CASES
       case avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER:
@@ -19810,15 +19665,15 @@ var Client = class extends BaseClient {
           const protobufValue = convertJSValueToProtobuf(manualData.data);
           manualOutput.setData(protobufValue);
         }
-        if (manualData.headersMap) {
+        if (manualData.headers) {
           const headersMap = manualOutput.getHeadersMap();
-          manualData.headersMap.forEach(([key, value]) => {
+          Object.entries(manualData.headers).forEach(([key, value]) => {
             headersMap.set(key, value);
           });
         }
-        if (manualData.pathParamsMap) {
+        if (manualData.pathParams) {
           const pathParamsMap = manualOutput.getPathparamsMap();
-          manualData.pathParamsMap.forEach(([key, value]) => {
+          Object.entries(manualData.pathParams).forEach(([key, value]) => {
             pathParamsMap.set(key, value);
           });
         }

package/dist/index.mjs

@@ -17436,8 +17436,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
       data: props.data,
       input: props.input
     });
-    this.headersMap = props.headersMap;
-    this.pathParamsMap = props.pathParamsMap;
+    this.headers = props.headers;
+    this.pathParams = props.pathParams;
   }
   toRequest() {
     const trigger = new avs_pb6.TaskTrigger();
@@ -17453,15 +17453,15 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
         config.setData(inputValue);
       }
     }
-    if (this.headersMap && this.headersMap.length > 0) {
+    if (this.headers && Object.keys(this.headers).length > 0) {
       const headersMap = config.getHeadersMap();
-      this.headersMap.forEach(([key, value]) => {
+      Object.entries(this.headers).forEach(([key, value]) => {
         headersMap.set(key, value);
       });
     }
-    if (this.pathParamsMap && this.pathParamsMap.length > 0) {
+    if (this.pathParams && Object.keys(this.pathParams).length > 0) {
       const pathParamsMap = config.getPathparamsMap();
-      this.pathParamsMap.forEach(([key, value]) => {
+      Object.entries(this.pathParams).forEach(([key, value]) => {
         pathParamsMap.set(key, value);
       });
     }
@@ -17473,8 +17473,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
     const obj = raw.toObject();
     let data = null;
     const input = void 0;
-    let headersMap = void 0;
-    let pathParamsMap = void 0;
+    let headers = void 0;
+    let pathParams = void 0;
     const manualTrigger = raw.getManual();
     if (manualTrigger) {
       const config = manualTrigger.getConfig();
@@ -17484,16 +17484,16 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
         }
         const headersMapProto = config.getHeadersMap();
         if (headersMapProto && headersMapProto.getLength() > 0) {
-          headersMap = [];
+          headers = {};
           headersMapProto.forEach((value, key) => {
-            headersMap.push([key, value]);
+            headers[key] = value;
           });
         }
         const pathParamsMapProto = config.getPathparamsMap();
         if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-          pathParamsMap = [];
+          pathParams = {};
           pathParamsMapProto.forEach((value, key) => {
-            pathParamsMap.push([key, value]);
+            pathParams[key] = value;
           });
         }
       }
@@ -17503,8 +17503,8 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
       type: TriggerType11.Manual,
       data,
       input,
-      headersMap,
-      pathParamsMap
+      headers,
+      pathParams
     });
   }
   getInputVariables() {
@@ -17513,45 +17513,26 @@ var ManualTrigger2 = class _ManualTrigger extends Trigger {
   /**
    * Extract output data from RunTriggerResp for manual triggers
    * @param outputData - The RunTriggerResp containing manual trigger output
-   * @returns Plain JavaScript object with manual trigger data in standard structure
+   * @returns The parsed JSON data directly (similar to CustomCode output)
    */
   static fromOutputData(outputData) {
     const manualOutput = outputData.getManualTrigger();
     if (!manualOutput) {
       return null;
     }
-    const result = {};
     const dataValue = manualOutput.getData();
     if (dataValue) {
       try {
-        result.data = convertProtobufValueToJs(dataValue);
+        return convertProtobufValueToJs(dataValue);
       } catch (error) {
         console.warn(
           "Failed to convert manual trigger data from protobuf Value:",
           error
         );
-        result.data = dataValue;
+        return null;
       }
-    } else {
-      result.data = null;
-    }
-    const headersMapProto = manualOutput.getHeadersMap();
-    if (headersMapProto && headersMapProto.getLength() > 0) {
-      const headersArray = [];
-      headersMapProto.forEach((value, key) => {
-        headersArray.push([key, value]);
-      });
-      result.headers = headersArray;
-    }
-    const pathParamsMapProto = manualOutput.getPathparamsMap();
-    if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-      const pathParamsArray = [];
-      pathParamsMapProto.forEach((value, key) => {
-        pathParamsArray.push([key, value]);
-      });
-      result.pathParams = pathParamsArray;
     }
-    return result;
+    return null;
   }
 };
 var manual_default = ManualTrigger2;
@@ -17890,9 +17871,9 @@ var RestAPINode2 = class _RestAPINode extends Node {
     config.setUrl(configData.url);
     config.setMethod(configData.method);
     config.setBody(configData.body || "");
-    if (configData.headersMap && configData.headersMap.length > 0) {
+    if (configData.headers && Object.keys(configData.headers).length > 0) {
       const headersMap = config.getHeadersMap();
-      configData.headersMap.forEach(([key, value]) => {
+      Object.entries(configData.headers).forEach(([key, value]) => {
         headersMap.set(key, value);
       });
     }
@@ -17908,7 +17889,19 @@ var RestAPINode2 = class _RestAPINode extends Node {
     return new _RestAPINode({
       ...obj,
       type: NodeType6.RestAPI,
-      data: raw.getRestApi().getConfig().toObject(),
+      data: {
+        url: raw.getRestApi().getConfig().getUrl(),
+        method: raw.getRestApi().getConfig().getMethod(),
+        body: raw.getRestApi().getConfig().getBody(),
+        headers: (() => {
+          const headersMap = raw.getRestApi().getConfig().getHeadersMap();
+          const headers = {};
+          headersMap.forEach((value, key) => {
+            headers[key] = value;
+          });
+          return headers;
+        })()
+      },
       input
       // Include input data from top-level TaskNode
     });
@@ -18273,9 +18266,9 @@ var LoopNode2 = class _LoopNode extends Node {
     }
     if (typeof executionMode === "string") {
       switch (executionMode.toLowerCase()) {
-        case "parallel":
+        case ExecutionMode.Parallel:
           return 1;
-        case "sequential":
+        case ExecutionMode.Sequential:
         default:
           return 0;
       }
@@ -18377,7 +18370,7 @@ var LoopNode2 = class _LoopNode extends Node {
             url: apiConfig.url,
             method: apiConfig.method,
             body: apiConfig.body || "",
-            headersMap: apiConfig.headersMap
+            headers: apiConfig.headers
           });
           loopNode.setRestApi(restApi);
         }
@@ -18788,159 +18781,21 @@ var Step = class _Step {
       case avs_pb20.Execution.Step.OutputDataCase.MANUAL_TRIGGER: {
         const manualTrigger = typeof step.getManualTrigger === "function" ? step.getManualTrigger() : step.manualTrigger;
         if (manualTrigger) {
-          const result = {};
           if (typeof manualTrigger.hasData === "function" && manualTrigger.hasData()) {
             try {
-              const userData = convertProtobufValueToJs(
-                manualTrigger.getData()
-              );
-              if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
-                result.data = userData.data;
-                if (userData.headers) {
-                  if (Array.isArray(userData.headers)) {
-                    if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                      result.headers = userData.headers;
-                    } else {
-                      const headersArray = [];
-                      for (const header of userData.headers) {
-                        for (const [key, value] of Object.entries(header)) {
-                          headersArray.push([key, value]);
-                        }
-                      }
-                      result.headers = headersArray;
-                    }
-                  } else {
-                    const headersArray = [];
-                    for (const [key, value] of Object.entries(userData.headers)) {
-                      headersArray.push([key, value]);
-                    }
-                    result.headers = headersArray;
-                  }
-                }
-                if (userData.pathParams) {
-                  if (Array.isArray(userData.pathParams)) {
-                    if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                      result.pathParams = userData.pathParams;
-                    } else {
-                      const pathParamsArray = [];
-                      for (const pathParam of userData.pathParams) {
-                        for (const [key, value] of Object.entries(pathParam)) {
-                          pathParamsArray.push([key, value]);
-                        }
-                      }
-                      result.pathParams = pathParamsArray;
-                    }
-                  } else {
-                    const pathParamsArray = [];
-                    for (const [key, value] of Object.entries(userData.pathParams)) {
-                      pathParamsArray.push([key, value]);
-                    }
-                    result.pathParams = pathParamsArray;
-                  }
-                }
-              } else {
-                result.data = userData;
-              }
+              return convertProtobufValueToJs(manualTrigger.getData());
             } catch (error) {
               console.warn(
                 "Failed to convert manual trigger data from protobuf Value:",
                 error
               );
-              result.data = manualTrigger.getData();
+              return manualTrigger.getData();
             }
           } else if (manualTrigger.data) {
-            const userData = typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
-            if (userData && typeof userData === "object" && userData.data !== void 0 && (userData.headers !== void 0 || userData.pathParams !== void 0)) {
-              result.data = userData.data;
-              if (userData.headers) {
-                if (Array.isArray(userData.headers)) {
-                  if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                    result.headers = userData.headers;
-                  } else {
-                    const headersArray = [];
-                    for (const header of userData.headers) {
-                      for (const [key, value] of Object.entries(header)) {
-                        headersArray.push([key, value]);
-                      }
-                    }
-                    result.headers = headersArray;
-                  }
-                } else {
-                  const headersArray = [];
-                  for (const [key, value] of Object.entries(userData.headers)) {
-                    headersArray.push([key, value]);
-                  }
-                  result.headers = headersArray;
-                }
-              }
-              if (userData.pathParams) {
-                if (Array.isArray(userData.pathParams)) {
-                  if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                    result.pathParams = userData.pathParams;
-                  } else {
-                    const pathParamsArray = [];
-                    for (const pathParam of userData.pathParams) {
-                      for (const [key, value] of Object.entries(pathParam)) {
-                        pathParamsArray.push([key, value]);
-                      }
-                    }
-                    result.pathParams = pathParamsArray;
-                  }
-                } else {
-                  const pathParamsArray = [];
-                  for (const [key, value] of Object.entries(userData.pathParams)) {
-                    pathParamsArray.push([key, value]);
-                  }
-                  result.pathParams = pathParamsArray;
-                }
-              }
-            } else {
-              result.data = userData;
-            }
-          }
-          if (typeof manualTrigger.getHeadersMap === "function") {
-            const headersMap = manualTrigger.getHeadersMap();
-            if (headersMap && headersMap.getLength() > 0) {
-              const headersArray = [];
-              headersMap.forEach((value, key) => {
-                headersArray.push([key, value]);
-              });
-              result.headers = headersArray;
-            }
-          } else if (manualTrigger.headers) {
-            const headersArray = [];
-            for (const [key, value] of Object.entries(manualTrigger.headers)) {
-              headersArray.push([key, value]);
-            }
-            result.headers = headersArray;
+            return typeof manualTrigger.data.getKindCase === "function" ? convertProtobufValueToJs(manualTrigger.data) : manualTrigger.data;
           }
-          if (typeof manualTrigger.getPathparamsMap === "function") {
-            const pathParamsMap = manualTrigger.getPathparamsMap();
-            if (pathParamsMap && pathParamsMap.getLength() > 0) {
-              const pathParamsArray = [];
-              pathParamsMap.forEach((value, key) => {
-                pathParamsArray.push([key, value]);
-              });
-              result.pathParams = pathParamsArray;
-            }
-          } else if (manualTrigger.pathparams) {
-            const pathParamsArray = [];
-            for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
-              pathParamsArray.push([key, value]);
-            }
-            result.pathParams = pathParamsArray;
-          }
-          if (Object.keys(result).length === 0) {
-            const objData = manualTrigger.toObject?.() || manualTrigger;
-            if (objData && objData.data === void 0) {
-              result.data = null;
-            } else {
-              return { data: objData };
-            }
-          }
-          return result;
         }
-        return { data: null };
+        return null;
       }
       // Node outputs - RESTORE MISSING CASES
       case avs_pb20.Execution.Step.OutputDataCase.ETH_TRANSFER:
@@ -19815,15 +19670,15 @@ var Client = class extends BaseClient {
           const protobufValue = convertJSValueToProtobuf(manualData.data);
           manualOutput.setData(protobufValue);
         }
-        if (manualData.headersMap) {
+        if (manualData.headers) {
           const headersMap = manualOutput.getHeadersMap();
-          manualData.headersMap.forEach(([key, value]) => {
+          Object.entries(manualData.headers).forEach(([key, value]) => {
             headersMap.set(key, value);
           });
         }
-        if (manualData.pathParamsMap) {
+        if (manualData.pathParams) {
           const pathParamsMap = manualOutput.getPathparamsMap();
-          manualData.pathParamsMap.forEach(([key, value]) => {
+          Object.entries(manualData.pathParams).forEach(([key, value]) => {
             pathParamsMap.set(key, value);
           });
         }

package/dist/models/node/loop.js

@@ -81,9 +81,9 @@ class LoopNode extends Node {
         }
         if (typeof executionMode === "string") {
             switch (executionMode.toLowerCase()) {
-                case "parallel":
+                case ExecutionMode.Parallel:
                     return 1;
-                case "sequential":
+                case ExecutionMode.Sequential:
                 default:
                     return 0; // Default to sequential for safety
             }
@@ -191,7 +191,7 @@ class LoopNode extends Node {
                         url: apiConfig.url,
                         method: apiConfig.method,
                         body: apiConfig.body || "",
-                        headersMap: apiConfig.headersMap,
+                        headers: apiConfig.headers,
                     });
                     loopNode.setRestApi(restApi);
                 }

package/dist/models/node/restApi.d.ts

@@ -12,11 +12,11 @@ declare class RestAPINode extends Node {
         url: string;
         method: string;
         body?: string;
-        headersMap?: Array<[string, string]>;
+        headers?: Record<string, string>;
     }): avs_pb.RestAPINode;
     static fromResponse(raw: avs_pb.TaskNode): RestAPINode;
     toRequest(): avs_pb.TaskNode;
-    static fromOutputData(outputData: avs_pb.RunNodeWithInputsResp): any;
+    static fromOutputData(outputData: avs_pb.RunNodeWithInputsResp): Record<string, unknown> | null;
 }
 export default RestAPINode;
 //# sourceMappingURL=restApi.d.ts.map

package/dist/models/node/restApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../../src/models/node/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAS5B,cAAM,WAAY,SAAQ,IAAI;gBAChB,KAAK,EAAE,gBAAgB;IAInC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;KACtC,GAAG,MAAM,CAAC,WAAW;IAmBtB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,WAAW;IAmBtD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAwB5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,GAAG;CAerE;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../../src/models/node/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAGL,gBAAgB,EAEjB,MAAM,oBAAoB,CAAC;AAS5B,cAAM,WAAY,SAAQ,IAAI;gBAChB,KAAK,EAAE,gBAAgB;IAInC;;;;OAIG;IACH,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE;QACpC,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAClC,GAAG,MAAM,CAAC,WAAW;IAmBtB,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,WAAW;IA+BtD,SAAS,IAAI,MAAM,CAAC,QAAQ;IAwB5B,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CAehG;AAED,eAAe,WAAW,CAAC"}

package/dist/models/node/restApi.js

@@ -18,9 +18,9 @@ class RestAPINode extends Node {
         config.setUrl(configData.url);
         config.setMethod(configData.method);
         config.setBody(configData.body || "");
-        if (configData.headersMap && configData.headersMap.length > 0) {
+        if (configData.headers && Object.keys(configData.headers).length > 0) {
             const headersMap = config.getHeadersMap();
-            configData.headersMap.forEach(([key, value]) => {
+            Object.entries(configData.headers).forEach(([key, value]) => {
                 headersMap.set(key, value);
             });
         }
@@ -39,7 +39,19 @@ class RestAPINode extends Node {
         return new RestAPINode({
             ...obj,
             type: NodeType.RestAPI,
-            data: raw.getRestApi().getConfig().toObject(),
+            data: {
+                url: raw.getRestApi().getConfig().getUrl(),
+                method: raw.getRestApi().getConfig().getMethod(),
+                body: raw.getRestApi().getConfig().getBody(),
+                headers: (() => {
+                    const headersMap = raw.getRestApi().getConfig().getHeadersMap();
+                    const headers = {};
+                    headersMap.forEach((value, key) => {
+                        headers[key] = value;
+                    });
+                    return headers;
+                })(),
+            },
             input: input, // Include input data from top-level TaskNode
         });
     }

package/dist/models/step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAMhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IAslB9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../../src/models/step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAMhD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEhE,cAAM,IAAK,YAAW,SAAS;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,SAAS;IAc5B;;;OAGG;IACH,MAAM,IAAI,SAAS;IAgBnB,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,eAAe;IA8Z9D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI;CAqFvD;AAED,eAAe,IAAI,CAAC"}

package/dist/models/step.js

@@ -136,210 +136,26 @@ class Step {
                     ? step.getManualTrigger()
                     : step.manualTrigger;
                 if (manualTrigger) {
-                    const result = {};
-                    // Check for the new data field structure
+                    // For manual triggers, return the data content directly (similar to CustomCode)
+                    // Headers and pathParams are config-only fields, not output fields
                     if (typeof manualTrigger.hasData === "function" &&
                         manualTrigger.hasData()) {
                         try {
-                            const userData = convertProtobufValueToJs(manualTrigger.getData());
-                            // Check if the userData is the new format with nested structure
-                            if (userData && typeof userData === 'object' &&
-                                userData.data !== undefined &&
-                                (userData.headers !== undefined || userData.pathParams !== undefined)) {
-                                // This is the new format where the entire structure is in the data field
-                                // Flatten it by extracting the nested data
-                                result.data = userData.data;
-                                if (userData.headers) {
-                                    // Convert headers to consistent Array<[string, string]> format
-                                    if (Array.isArray(userData.headers)) {
-                                        // Check if it's already in Array<[string, string]> format
-                                        if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                                            result.headers = userData.headers;
-                                        }
-                                        else {
-                                            // Convert from Array<{key: value}> to Array<[string, string]>
-                                            const headersArray = [];
-                                            for (const header of userData.headers) {
-                                                for (const [key, value] of Object.entries(header)) {
-                                                    headersArray.push([key, value]);
-                                                }
-                                            }
-                                            result.headers = headersArray;
-                                        }
-                                    }
-                                    else {
-                                        // Convert object to Array<[string, string]> format
-                                        const headersArray = [];
-                                        for (const [key, value] of Object.entries(userData.headers)) {
-                                            headersArray.push([key, value]);
-                                        }
-                                        result.headers = headersArray;
-                                    }
-                                }
-                                if (userData.pathParams) {
-                                    // Convert pathParams to consistent Array<[string, string]> format
-                                    if (Array.isArray(userData.pathParams)) {
-                                        // Check if it's already in Array<[string, string]> format
-                                        if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                                            result.pathParams = userData.pathParams;
-                                        }
-                                        else {
-                                            // Convert from Array<{key: value}> to Array<[string, string]>
-                                            const pathParamsArray = [];
-                                            for (const pathParam of userData.pathParams) {
-                                                for (const [key, value] of Object.entries(pathParam)) {
-                                                    pathParamsArray.push([key, value]);
-                                                }
-                                            }
-                                            result.pathParams = pathParamsArray;
-                                        }
-                                    }
-                                    else {
-                                        // Convert object to Array<[string, string]> format
-                                        const pathParamsArray = [];
-                                        for (const [key, value] of Object.entries(userData.pathParams)) {
-                                            pathParamsArray.push([key, value]);
-                                        }
-                                        result.pathParams = pathParamsArray;
-                                    }
-                                }
-                            }
-                            else {
-                                // This is the old format with just user data
-                                result.data = userData;
-                            }
+                            return convertProtobufValueToJs(manualTrigger.getData());
                         }
                         catch (error) {
                             console.warn("Failed to convert manual trigger data from protobuf Value:", error);
-                            result.data = manualTrigger.getData();
+                            return manualTrigger.getData();
                         }
                     }
                     else if (manualTrigger.data) {
                         // For plain objects, try to convert or use directly
-                        const userData = typeof manualTrigger.data.getKindCase === "function"
+                        return typeof manualTrigger.data.getKindCase === "function"
                             ? convertProtobufValueToJs(manualTrigger.data)
                             : manualTrigger.data;
-                        // Check if the userData is the new format with nested structure
-                        if (userData && typeof userData === 'object' &&
-                            userData.data !== undefined &&
-                            (userData.headers !== undefined || userData.pathParams !== undefined)) {
-                            // This is the new format where the entire structure is in the data field
-                            // Flatten it by extracting the nested data
-                            result.data = userData.data;
-                            if (userData.headers) {
-                                // Convert headers to consistent Array<[string, string]> format
-                                if (Array.isArray(userData.headers)) {
-                                    // Check if it's already in Array<[string, string]> format
-                                    if (userData.headers.length > 0 && Array.isArray(userData.headers[0])) {
-                                        result.headers = userData.headers;
-                                    }
-                                    else {
-                                        // Convert from Array<{key: value}> to Array<[string, string]>
-                                        const headersArray = [];
-                                        for (const header of userData.headers) {
-                                            for (const [key, value] of Object.entries(header)) {
-                                                headersArray.push([key, value]);
-                                            }
-                                        }
-                                        result.headers = headersArray;
-                                    }
-                                }
-                                else {
-                                    // Convert object to Array<[string, string]> format
-                                    const headersArray = [];
-                                    for (const [key, value] of Object.entries(userData.headers)) {
-                                        headersArray.push([key, value]);
-                                    }
-                                    result.headers = headersArray;
-                                }
-                            }
-                            if (userData.pathParams) {
-                                // Convert pathParams to consistent Array<[string, string]> format
-                                if (Array.isArray(userData.pathParams)) {
-                                    // Check if it's already in Array<[string, string]> format
-                                    if (userData.pathParams.length > 0 && Array.isArray(userData.pathParams[0])) {
-                                        result.pathParams = userData.pathParams;
-                                    }
-                                    else {
-                                        // Convert from Array<{key: value}> to Array<[string, string]>
-                                        const pathParamsArray = [];
-                                        for (const pathParam of userData.pathParams) {
-                                            for (const [key, value] of Object.entries(pathParam)) {
-                                                pathParamsArray.push([key, value]);
-                                            }
-                                        }
-                                        result.pathParams = pathParamsArray;
-                                    }
-                                }
-                                else {
-                                    // Convert object to Array<[string, string]> format
-                                    const pathParamsArray = [];
-                                    for (const [key, value] of Object.entries(userData.pathParams)) {
-                                        pathParamsArray.push([key, value]);
-                                    }
-                                    result.pathParams = pathParamsArray;
-                                }
-                            }
-                        }
-                        else {
-                            // This is the old format with just user data
-                            result.data = userData;
-                        }
-                    }
-                    // Include headers for webhook testing - use consistent Array<[string, string]> format
-                    if (typeof manualTrigger.getHeadersMap === "function") {
-                        const headersMap = manualTrigger.getHeadersMap();
-                        if (headersMap && headersMap.getLength() > 0) {
-                            const headersArray = [];
-                            headersMap.forEach((value, key) => {
-                                headersArray.push([key, value]);
-                            });
-                            result.headers = headersArray;
-                        }
-                    }
-                    else if (manualTrigger.headers) {
-                        // For plain objects, convert to consistent Array<[string, string]> format
-                        const headersArray = [];
-                        for (const [key, value] of Object.entries(manualTrigger.headers)) {
-                            headersArray.push([key, value]);
-                        }
-                        result.headers = headersArray;
-                    }
-                    // Include pathParams for webhook testing - use consistent Array<[string, string]> format
-                    if (typeof manualTrigger.getPathparamsMap === "function") {
-                        const pathParamsMap = manualTrigger.getPathparamsMap();
-                        if (pathParamsMap && pathParamsMap.getLength() > 0) {
-                            const pathParamsArray = [];
-                            pathParamsMap.forEach((value, key) => {
-                                pathParamsArray.push([key, value]);
-                            });
-                            result.pathParams = pathParamsArray;
-                        }
-                    }
-                    else if (manualTrigger.pathparams) {
-                        // For plain objects, convert to consistent Array<[string, string]> format
-                        const pathParamsArray = [];
-                        for (const [key, value] of Object.entries(manualTrigger.pathparams)) {
-                            pathParamsArray.push([key, value]);
-                        }
-                        result.pathParams = pathParamsArray;
-                    }
-                    // Check if this is the new format with no data field or null data
-                    if (Object.keys(result).length === 0) {
-                        const objData = manualTrigger.toObject?.() || manualTrigger;
-                        if (objData && objData.data === undefined) {
-                            // No data was provided, return null
-                            result.data = null;
-                        }
-                        else {
-                            // Fallback to old structure for backward compatibility
-                            return { data: objData };
-                        }
                     }
-                    // For manual triggers, return the flat structure
-                    return result;
                 }
-                return { data: null };
+                return null;
             }
             // Node outputs - RESTORE MISSING CASES
             case avs_pb.Execution.Step.OutputDataCase.ETH_TRANSFER:

package/dist/models/trigger/manual.d.ts

@@ -2,8 +2,8 @@ import * as avs_pb from "@/grpc_codegen/avs_pb";
 import Trigger from "./interface";
 import { ManualTriggerProps } from "@avaprotocol/types";
 declare class ManualTrigger extends Trigger {
-    headersMap?: Array<[string, string]>;
-    pathParamsMap?: Array<[string, string]>;
+    headers?: Record<string, string>;
+    pathParams?: Record<string, string>;
     constructor(props: ManualTriggerProps);
     toRequest(): avs_pb.TaskTrigger;
     static fromResponse(raw: avs_pb.TaskTrigger): ManualTrigger;
@@ -11,9 +11,9 @@ declare class ManualTrigger extends Trigger {
     /**
      * Extract output data from RunTriggerResp for manual triggers
      * @param outputData - The RunTriggerResp containing manual trigger output
-     * @returns Plain JavaScript object with manual trigger data in standard structure
+     * @returns The parsed JSON data directly (similar to CustomCode output)
      */
-    static fromOutputData(outputData: avs_pb.RunTriggerResp): Record<string, unknown> | null;
+    static fromOutputData(outputData: avs_pb.RunTriggerResp): unknown;
 }
 export default ManualTrigger;
 //# sourceMappingURL=manual.d.ts.map

package/dist/models/trigger/manual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manual.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/manual.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAMlC,OAAO,EAEL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,cAAM,aAAc,SAAQ,OAAO;IAC1B,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrC,aAAa,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;gBAEnC,KAAK,EAAE,kBAAkB;IAWrC,SAAS,IAAI,MAAM,CAAC,WAAW;IAyC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,aAAa;IA+C3D,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKnD;;;;OAIG;IACH,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,MAAM,CAAC,cAAc,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CA6ClC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"manual.d.ts","sourceRoot":"","sources":["../../../src/models/trigger/manual.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,OAAO,MAAM,aAAa,CAAC;AAMlC,OAAO,EAEL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,cAAM,aAAc,SAAQ,OAAO;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAE/B,KAAK,EAAE,kBAAkB;IAWrC,SAAS,IAAI,MAAM,CAAC,WAAW;IAyC/B,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,GAAG,aAAa;IA+C3D,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAKnD;;;;OAIG;IACH,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,MAAM,CAAC,cAAc,GAChC,OAAO;CAuBX;AAED,eAAe,aAAa,CAAC"}

package/dist/models/trigger/manual.js

@@ -10,8 +10,8 @@ class ManualTrigger extends Trigger {
             data: props.data,
             input: props.input,
         });
-        this.headersMap = props.headersMap;
-        this.pathParamsMap = props.pathParamsMap;
+        this.headers = props.headers;
+        this.pathParams = props.pathParams;
     }
     toRequest() {
         const trigger = new avs_pb.TaskTrigger();
@@ -29,17 +29,17 @@ class ManualTrigger extends Trigger {
                 config.setData(inputValue);
             }
         }
-        // Set headers if provided - use map format consistent with REST API nodes
-        if (this.headersMap && this.headersMap.length > 0) {
+        // Set headers if provided - direct object to protobuf map mapping
+        if (this.headers && Object.keys(this.headers).length > 0) {
             const headersMap = config.getHeadersMap();
-            this.headersMap.forEach(([key, value]) => {
+            Object.entries(this.headers).forEach(([key, value]) => {
                 headersMap.set(key, value);
             });
         }
-        // Set pathParams if provided - use map format consistent with REST API nodes
-        if (this.pathParamsMap && this.pathParamsMap.length > 0) {
+        // Set pathParams if provided - direct object to protobuf map mapping
+        if (this.pathParams && Object.keys(this.pathParams).length > 0) {
             const pathParamsMap = config.getPathparamsMap();
-            this.pathParamsMap.forEach(([key, value]) => {
+            Object.entries(this.pathParams).forEach(([key, value]) => {
                 pathParamsMap.set(key, value);
             });
         }
@@ -51,8 +51,8 @@ class ManualTrigger extends Trigger {
         const obj = raw.toObject();
         let data = null;
         const input = undefined;
-        let headersMap = undefined;
-        let pathParamsMap = undefined;
+        let headers = undefined;
+        let pathParams = undefined;
         const manualTrigger = raw.getManual();
         if (manualTrigger) {
             const config = manualTrigger.getConfig();
@@ -61,20 +61,20 @@ class ManualTrigger extends Trigger {
                 if (config.hasData()) {
                     data = extractInputFromProtobuf(config.getData());
                 }
-                // Extract headers - convert map to array format
+                // Extract headers - direct protobuf map to object mapping
                 const headersMapProto = config.getHeadersMap();
                 if (headersMapProto && headersMapProto.getLength() > 0) {
-                    headersMap = [];
+                    headers = {};
                     headersMapProto.forEach((value, key) => {
-                        headersMap.push([key, value]);
+                        headers[key] = value;
                     });
                 }
-                // Extract pathParams - convert map to array format
+                // Extract pathParams - direct protobuf map to object mapping
                 const pathParamsMapProto = config.getPathparamsMap();
                 if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-                    pathParamsMap = [];
+                    pathParams = {};
                     pathParamsMapProto.forEach((value, key) => {
-                        pathParamsMap.push([key, value]);
+                        pathParams[key] = value;
                     });
                 }
             }
@@ -84,8 +84,8 @@ class ManualTrigger extends Trigger {
             type: TriggerType.Manual,
             data: data,
             input: input,
-            headersMap: headersMap,
-            pathParamsMap: pathParamsMap,
+            headers: headers,
+            pathParams: pathParams,
         });
     }
     getInputVariables() {
@@ -95,47 +95,26 @@ class ManualTrigger extends Trigger {
     /**
      * Extract output data from RunTriggerResp for manual triggers
      * @param outputData - The RunTriggerResp containing manual trigger output
-     * @returns Plain JavaScript object with manual trigger data in standard structure
+     * @returns The parsed JSON data directly (similar to CustomCode output)
      */
     static fromOutputData(outputData) {
         const manualOutput = outputData.getManualTrigger();
         if (!manualOutput) {
             return null;
         }
-        const result = {};
-        // Extract data
+        // Extract only the data - headers and pathParams are config-only fields
         const dataValue = manualOutput.getData();
         if (dataValue) {
             try {
-                result.data = convertProtobufValueToJs(dataValue);
+                // ManualTrigger data can be any valid JSON (objects, arrays, primitives)
+                return convertProtobufValueToJs(dataValue);
             }
             catch (error) {
                 console.warn("Failed to convert manual trigger data from protobuf Value:", error);
-                result.data = dataValue;
+                return null;
             }
         }
-        else {
-            result.data = null;
-        }
-        // Extract headers - convert map to array format for consistency
-        const headersMapProto = manualOutput.getHeadersMap();
-        if (headersMapProto && headersMapProto.getLength() > 0) {
-            const headersArray = [];
-            headersMapProto.forEach((value, key) => {
-                headersArray.push([key, value]);
-            });
-            result.headers = headersArray;
-        }
-        // Extract pathParams - convert map to array format for consistency
-        const pathParamsMapProto = manualOutput.getPathparamsMap();
-        if (pathParamsMapProto && pathParamsMapProto.getLength() > 0) {
-            const pathParamsArray = [];
-            pathParamsMapProto.forEach((value, key) => {
-                pathParamsArray.push([key, value]);
-            });
-            result.pathParams = pathParamsArray;
-        }
-        return result;
+        return null;
     }
 }
 export default ManualTrigger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avaprotocol/sdk-js",
-  "version": "2.5.0",
+  "version": "2.5.2-dev.0",
   "description": "A JavaScript/TypeScript SDK designed to simplify integration with Ava Protocol's AVS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
     "prepare": "node ../../scripts/prepare-package.js"
   },
   "dependencies": {
-    "@avaprotocol/types": "^2.3.0",
+    "@avaprotocol/types": "^2.3.1",
     "@grpc/grpc-js": "^1.11.3",
     "@grpc/proto-loader": "^0.7.13",
     "dotenv": "^16.4.5",