@matimo/core 0.1.0-alpha.8 → 0.1.0

package/dist/executors/function-executor.js

@@ -1,7 +1,5 @@
-import fs from 'fs';
 import path from 'path';
 import { pathToFileURL } from 'node:url';
-import axios from 'axios';
 import { MatimoError, ErrorCode } from '../errors/matimo-error';
 import { getGlobalMatimoLogger } from '../logging/logger';
 /**
@@ -20,10 +18,17 @@ export class FunctionExecutor {
         this.toolsPath = toolsPath || process.cwd();
     }
     /**
-     * Execute a tool that runs an async function
-     * Supports both embedded code and external .ts/.js files
+     * Execute a tool that runs an async function.
+     * Supports both embedded code and external .ts/.js files.
+     *
+     * @param tool - Tool definition
+     * @param params - Tool parameters
+     * @param credentials - Optional per-call credential overrides passed as `context.credentials`
+     *   to the tool function. The function can use them with:
+     *   `const token = context?.credentials?.MY_TOKEN ?? process.env.MY_TOKEN;`
+     *   Values are never logged. Falls back to undefined when not provided.
      */
-    async execute(tool, params) {
+    async execute(tool, params, credentials) {
         if (tool.execution.type !== 'function') {
             throw new MatimoError('Tool execution type is not function', ErrorCode.EXECUTION_FAILED, {
                 expectedType: 'function',
@@ -129,7 +134,7 @@ export class FunctionExecutor {
                     import(fileUrl)
                         .then((module) => {
                         const fn = (module.default || module);
-                        const result = fn(params);
+                        const result = fn(params, credentials ? { credentials } : undefined);
                         // Handle both Promise and non-Promise returns
                         if (result instanceof Promise) {
                             result.then(handleSuccess).catch(handleError);
@@ -141,28 +146,43 @@ export class FunctionExecutor {
                         .catch(handleError);
                 }
                 else {
-                    // Execute embedded code (legacy) - create function from string
-                    // SECURITY WARNING: Embedded code execution runs arbitrary JS with fs/path/axios access.
-                    // This is a potential RCE vector if tool YAML files come from untrusted sources.
-                    // Embedded code is DISABLED by default. Must explicitly opt-in via MATIMO_ALLOW_EMBEDDED_CODE=true
-                    const embeddedCodeDisabled = process.env.MATIMO_ALLOW_EMBEDDED_CODE !== 'true';
-                    if (embeddedCodeDisabled) {
-                        throw new MatimoError('Embedded code execution is disabled by default for security. Use external .ts/.js files instead.', ErrorCode.EXECUTION_FAILED, {
+                    // ── Embedded code execution ──────────────────────────────────────
+                    // Requires explicit admin opt-in: MATIMO_ALLOW_EMBEDDED_CODE=true
+                    // Even when enabled, a static security scan runs before evaluation
+                    // to block known exploit patterns. No dangerous globals are passed
+                    // into the sandbox — only `params` is accessible.
+                    if (process.env.MATIMO_ALLOW_EMBEDDED_CODE !== 'true') {
+                        throw new MatimoError(`Tool '${tool.name}': embedded code execution is disabled by default. ` +
+                            'Set MATIMO_ALLOW_EMBEDDED_CODE=true to enable, or use a colocated .ts/.js file instead ' +
+                            "(set execution.code to its relative path, e.g. './my-tool.ts').", ErrorCode.EXECUTION_FAILED, {
                             toolName: tool.name,
-                            recommendation: 'Create a separate .ts file in the tool directory instead of using embedded code',
-                            enableFeatureFlag: 'Set MATIMO_ALLOW_EMBEDDED_CODE=true to enable (not recommended)',
+                            recommendation: 'Create a separate .ts file in the tool directory and set execution.code to its relative path',
                         });
                     }
-                    // Log warning when embedded code is executed
+                    // Static security scan — reject code containing dangerous constructs
+                    // BEFORE new Function() is ever called.
+                    const BLOCKED_PATTERNS = [
+                        { re: /\brequire\s*\(/u, label: 'require()' },
+                        { re: /\bimport\s*\(/u, label: 'dynamic import()' },
+                        { re: /\bprocess\b/u, label: 'process object' },
+                        { re: /\b__dirname\b|\b__filename\b/u, label: '__dirname / __filename' },
+                        { re: /\beval\s*\(/u, label: 'eval()' },
+                        { re: /\bnew\s+Function\b/u, label: 'new Function()' },
+                        { re: /\bglobalThis\b|\bglobal\b/u, label: 'global / globalThis' },
+                    ];
+                    for (const { re, label } of BLOCKED_PATTERNS) {
+                        if (re.test(code)) {
+                            throw new MatimoError(`Embedded code in tool '${tool.name}' contains a blocked construct: '${label}'. ` +
+                                'Embedded code may only access the provided params argument.', ErrorCode.EXECUTION_FAILED, { toolName: tool.name, blockedConstruct: label });
+                        }
+                    }
                     const logger = getGlobalMatimoLogger();
-                    logger.warn(`⚠️  Warning: Executing embedded code from tool '${tool.name}'. This carries security risks if tool YAML is from untrusted sources.`, { toolName: tool.name });
-                    // In ESM modules, require is not available by default
-                    // We pass a safe require function that embedded code can use
-                    const functionBody = `return (${code})`;
-                    const fn = new Function(functionBody)();
-                    // Pass undefined for require in ESM - embedded code should use import syntax
-                    const result = fn(params, {}, fs, path, axios, undefined);
-                    // Handle both Promise and non-Promise returns
+                    logger.warn(`Executing embedded code for tool '${tool.name}'. Ensure this tool YAML is from a trusted source.`, { toolName: tool.name });
+                    // Execute with strict mode and only params in scope.
+                    // No fs, path, axios, or require are passed — embedded code is
+                    // intentionally limited to pure data transformation of params.
+                    const fn = new Function('params', '"use strict";\nreturn (' + code + ')(params);');
+                    const result = fn(params);
                     if (result instanceof Promise) {
                         result.then(handleSuccess).catch(handleError);
                     }

package/dist/executors/function-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"function-executor.js","sourceRoot":"","sources":["../../src/executors/function-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function-executor.js","sourceRoot":"","sources":["../../src/executors/function-executor.ts"],"names":[],"mappings":"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"}

package/dist/executors/http-executor.d.ts

@@ -5,20 +5,95 @@ import { ToolDefinition } from '../core/schema';
  */
 export declare class HttpExecutor {
     /**
-     * Execute a tool that makes an HTTP request
+     * Execute a tool that makes an HTTP request.
+     *
+     * @param tool - Tool definition
+     * @param params - Tool parameters (already env-injected by MatimoInstance)
+     * @param credentials - Optional per-call credential overrides. Used for
+     *   `authentication.type: basic` (username_env / password_env keys) instead of
+     *   reading from `process.env`. Other auth schemes (bearer, api_key) are handled
+     *   upstream via parameter templating in MatimoInstance.injectAuthParameters().
+     *   Values are never logged.
      */
-    execute(tool: ToolDefinition, params: Record<string, unknown>): Promise<unknown>;
+    execute(tool: ToolDefinition, params: Record<string, unknown>, credentials?: Record<string, string>): Promise<unknown>;
+    /**
+     * Automatically inject `Authorization: Basic <base64(username:password)>` when
+     * the tool declares `authentication.type: basic` with `username_env` and `password_env`.
+     *
+     * This is a zero-friction pattern: developers only set two natural env vars
+     * (e.g. TWILIO_ACCOUNT_SID + TWILIO_AUTH_TOKEN) and Matimo handles encoding.
+     * No pre-computed base64 credential string required.
+     *
+     * When `credentials` is provided the lookup order is:
+     *   1. `credentials[envVarName]`  (per-call override — multi-tenant use)
+     *   2. `process.env[envVarName]`  (singleton / single-tenant fallback)
+     *
+     * Credential values are never logged or included in error details.
+     */
+    private applyBasicAuth;
     /**
      * Replace parameter placeholders in a string
      */
     private templateString;
+    /**
+     * Check if a string is an unfilled placeholder
+     * Only matches single placeholders like "{param}", not "{...}" or embedded placeholders
+     */
+    private isUnfilledPlaceholder;
+    /**
+     * Validate that all URL parameters are provided
+     */
+    private validateUrlParameters;
     /**
      * Build query string from query_params, only including provided values
      */
     private buildQueryString;
     /**
-     * Replace parameter placeholders in an object (headers, body)
-     * Recursively handles nested objects
+     * Replace parameter placeholders in an object (headers, body, query params)
+     *
+     * CORE PRINCIPLE: "Define once in YAML, embed correctly at execution time"
+     *
+     * This method intelligently handles different parameter types:
+     * - STRING placeholders like "{title}": Always templated as strings
+     * - OBJECT placeholders like "{parent}": Embedded directly as JSON objects (not stringified) if paramDefinitions specifies type:object
+     * - ARRAY placeholders like "{items}": Embedded directly as JSON arrays (not stringified) if paramDefinitions specifies type:array
+     *
+     * Key behaviors:
+     * - Recursively processes nested objects
+     * - Skips keys with unfilled placeholders (e.g., "{sort_by}" when sort_by not provided)
+     * - Uses parameter schema type from YAML to determine how to embed values
+     * - Preserves JSON structure for complex types (objects/arrays) sent to APIs
+     *
+     * @example
+     * ```
+     * // YAML definition:
+     * parameters:
+     *   parent:
+     *     type: object  // <-- Tells executor to embed as-is, not stringify
+     *   items:
+     *     type: array   // <-- Tells executor to embed as-is, not stringify
+     *   title:
+     *     type: string  // <-- String templating applies
+     *
+     * body:
+     *   parent: "{parent}"  // Object embedded as {"id": "123", ...}
+     *   items: "{items}"    // Array embedded as [{"name": "a"}, ...]
+     *   title: "{title}"    // String embedded as "My Title"
+     *
+     * // JavaScript call:
+     * const result = await matimo.execute('notion_create_page', {
+     *   parent: { database_id: 'abc123' },  // JavaScript object
+     *   items: [{ type: 'text' }],          // JavaScript array
+     *   title: 'Create This Page'           // String
+     * });
+     *
+     * // HTTP body sent to API:
+     * {
+     *   "parent": {"database_id": "abc123"},     // Proper JSON object
+     *   "items": [{"type": "text"}],            // Proper JSON array
+     *   "title": "Create This Page"             // String
+     * }
+     * ```
      */
     private templateObject;
 }

package/dist/executors/http-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-executor.d.ts","sourceRoot":"","sources":["../../src/executors/http-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;;GAGG;AAEH,qBAAa,YAAY;IACvB;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAoFtF;;OAEG;IACH,OAAO,CAAC,cAAc;IAWtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;;OAGG;IACH,OAAO,CAAC,cAAc;CA2BvB;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"http-executor.d.ts","sourceRoot":"","sources":["../../src/executors/http-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;;GAGG;AAEH,qBAAa,YAAY;IACvB;;;;;;;;;;OAUG;IACG,OAAO,CACX,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC;IAmHnB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,cAAc;IA4BtB;;OAEG;IACH,OAAO,CAAC,cAAc;IAatB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAyB7B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,OAAO,CAAC,cAAc;CA+GvB;AAED,eAAe,YAAY,CAAC"}

package/dist/executors/http-executor.js

@@ -1,15 +1,23 @@
 import axios from 'axios';
 import { applyParameterEncodings } from '../encodings/parameter-encoding';
-import { MatimoError, ErrorCode } from '../errors/matimo-error';
+import { MatimoError, ErrorCode, fromHttpError } from '../errors/matimo-error';
 /**
  * HttpExecutor - Executes HTTP requests
  * Handles authentication, retries, and response validation
  */
 export class HttpExecutor {
     /**
-     * Execute a tool that makes an HTTP request
+     * Execute a tool that makes an HTTP request.
+     *
+     * @param tool - Tool definition
+     * @param params - Tool parameters (already env-injected by MatimoInstance)
+     * @param credentials - Optional per-call credential overrides. Used for
+     *   `authentication.type: basic` (username_env / password_env keys) instead of
+     *   reading from `process.env`. Other auth schemes (bearer, api_key) are handled
+     *   upstream via parameter templating in MatimoInstance.injectAuthParameters().
+     *   Values are never logged.
      */
-    async execute(tool, params) {
+    async execute(tool, params, credentials) {
         if (tool.execution.type !== 'http') {
             throw new MatimoError('Tool execution type is not http', ErrorCode.EXECUTION_FAILED, {
                 expectedType: 'http',
@@ -24,6 +32,8 @@ export class HttpExecutor {
         if (parameterEncodings && parameterEncodings.length > 0) {
             finalParams = applyParameterEncodings(params, parameterEncodings);
         }
+        // Validate URL parameters are provided
+        this.validateUrlParameters(url, finalParams);
         // Implement parameter templating
         let finalUrl = this.templateString(url, finalParams);
         // Handle query parameters - only include non-empty ones
@@ -33,10 +43,17 @@ export class HttpExecutor {
                 finalUrl += '?' + queryString;
             }
         }
-        const templatedHeaders = this.templateObject(headers, finalParams);
+        const templatedHeaders = this.templateObject(headers, finalParams, tool.parameters);
+        // Natively handle HTTP Basic Auth when authentication.type === 'basic' and
+        // username_env/password_env are declared. This eliminates the need for
+        // developers to pre-compute base64 credentials as a separate env var step.
+        // Credentials override takes precedence over process.env when provided.
+        this.applyBasicAuth(tool, templatedHeaders, credentials);
         const templatedBody = body && typeof body === 'object'
-            ? this.templateObject(body, finalParams)
-            : body;
+            ? this.templateObject(body, finalParams, tool.parameters)
+            : typeof body === 'string'
+                ? this.templateString(body, finalParams)
+                : body;
         // Build request config
         const requestConfig = {
             method,
@@ -46,7 +63,25 @@ export class HttpExecutor {
             requestConfig.headers = templatedHeaders;
         }
         if (templatedBody !== undefined) {
-            requestConfig.data = templatedBody;
+            // If Content-Type is application/x-www-form-urlencoded and body is an object,
+            // convert to URLSearchParams for proper form encoding by axios
+            const contentType = templatedHeaders['Content-Type'] ||
+                templatedHeaders['content-type'];
+            if (contentType?.includes('application/x-www-form-urlencoded') &&
+                typeof templatedBody === 'object' &&
+                templatedBody !== null &&
+                !(templatedBody instanceof FormData)) {
+                const params = new URLSearchParams();
+                for (const [key, value] of Object.entries(templatedBody)) {
+                    if (value !== undefined && value !== null) {
+                        params.append(key, String(value));
+                    }
+                }
+                requestConfig.data = params;
+            }
+            else {
+                requestConfig.data = templatedBody;
+            }
         }
         if (timeout !== undefined) {
             requestConfig.timeout = timeout;
@@ -62,17 +97,43 @@ export class HttpExecutor {
             };
         }
         catch (error) {
-            const axiosError = error;
-            const status = axiosError.response?.status || 500;
-            const details = axiosError.response?.data || {};
-            return {
-                success: false,
-                error: axiosError.message || String(error),
-                statusCode: status,
-                details,
-            };
+            // If this is already a MatimoError, rethrow to preserve semantics
+            if (error instanceof MatimoError) {
+                throw error;
+            }
+            // Normalize any HTTP/axios-like or generic errors into MatimoError.
+            // This keeps callers consistent and preserves original cause via details.cause.
+            throw fromHttpError(error, 'HTTP request failed');
         }
     }
+    /**
+     * Automatically inject `Authorization: Basic <base64(username:password)>` when
+     * the tool declares `authentication.type: basic` with `username_env` and `password_env`.
+     *
+     * This is a zero-friction pattern: developers only set two natural env vars
+     * (e.g. TWILIO_ACCOUNT_SID + TWILIO_AUTH_TOKEN) and Matimo handles encoding.
+     * No pre-computed base64 credential string required.
+     *
+     * When `credentials` is provided the lookup order is:
+     *   1. `credentials[envVarName]`  (per-call override — multi-tenant use)
+     *   2. `process.env[envVarName]`  (singleton / single-tenant fallback)
+     *
+     * Credential values are never logged or included in error details.
+     */
+    applyBasicAuth(tool, headers, credentials) {
+        const auth = tool.authentication;
+        if (auth?.type !== 'basic' || !auth.username_env || !auth.password_env) {
+            return;
+        }
+        // Prefer per-call credentials, fall back to process.env
+        const username = (credentials && credentials[auth.username_env]) ?? process.env[auth.username_env];
+        const password = (credentials && credentials[auth.password_env]) ?? process.env[auth.password_env];
+        if (!username || !password) {
+            throw new MatimoError(`Basic Auth requires env vars '${auth.username_env}' and '${auth.password_env}' to be set`, ErrorCode.AUTH_FAILED, { toolName: tool.name, username_env: auth.username_env, password_env: auth.password_env });
+        }
+        const encoded = Buffer.from(`${username}:${password}`).toString('base64');
+        headers['Authorization'] = `Basic ${encoded}`;
+    }
     /**
      * Replace parameter placeholders in a string
      */
@@ -80,12 +141,42 @@ export class HttpExecutor {
         let result = str;
         for (const [key, value] of Object.entries(params)) {
             const placeholder = `{${key}}`;
-            if (value !== undefined && value !== null && value !== '') {
-                result = result.replace(new RegExp(placeholder, 'g'), String(value));
+            // Allow empty-string values to be substituted (validation allows empty strings)
+            if (value !== undefined && value !== null) {
+                const replacement = String(value);
+                result = result.replace(new RegExp(placeholder, 'g'), () => replacement);
             }
         }
         return result;
     }
+    /**
+     * Check if a string is an unfilled placeholder
+     * Only matches single placeholders like "{param}", not "{...}" or embedded placeholders
+     */
+    isUnfilledPlaceholder(str) {
+        // Match exactly "{word}" where word is a valid identifier
+        return /^\{[a-zA-Z_][a-zA-Z0-9_]*\}$/.test(str);
+    }
+    /**
+     * Validate that all URL parameters are provided
+     */
+    validateUrlParameters(url, params) {
+        // Extract all placeholders from URL like {param_name}
+        const urlParamMatches = url.match(/\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g);
+        if (!urlParamMatches) {
+            return; // No parameters in URL
+        }
+        for (const match of urlParamMatches) {
+            const paramName = match.slice(1, -1); // Remove { }
+            const paramValue = params[paramName];
+            // Check if parameter is missing or undefined
+            if (paramValue === undefined) {
+                throw new MatimoError(`Required URL parameter '${paramName}' is missing`, ErrorCode.INVALID_SCHEMA, { url, missingParam: paramName });
+            }
+            // Allow null, empty string, 0, false, etc. as valid values
+            // Just ensure the parameter is defined
+        }
+    }
     /**
      * Build query string from query_params, only including provided values
      */
@@ -101,32 +192,145 @@ export class HttpExecutor {
         return parts.join('&');
     }
     /**
-     * Replace parameter placeholders in an object (headers, body)
-     * Recursively handles nested objects
+     * Replace parameter placeholders in an object (headers, body, query params)
+     *
+     * CORE PRINCIPLE: "Define once in YAML, embed correctly at execution time"
+     *
+     * This method intelligently handles different parameter types:
+     * - STRING placeholders like "{title}": Always templated as strings
+     * - OBJECT placeholders like "{parent}": Embedded directly as JSON objects (not stringified) if paramDefinitions specifies type:object
+     * - ARRAY placeholders like "{items}": Embedded directly as JSON arrays (not stringified) if paramDefinitions specifies type:array
+     *
+     * Key behaviors:
+     * - Recursively processes nested objects
+     * - Skips keys with unfilled placeholders (e.g., "{sort_by}" when sort_by not provided)
+     * - Uses parameter schema type from YAML to determine how to embed values
+     * - Preserves JSON structure for complex types (objects/arrays) sent to APIs
+     *
+     * @example
+     * ```
+     * // YAML definition:
+     * parameters:
+     *   parent:
+     *     type: object  // <-- Tells executor to embed as-is, not stringify
+     *   items:
+     *     type: array   // <-- Tells executor to embed as-is, not stringify
+     *   title:
+     *     type: string  // <-- String templating applies
+     *
+     * body:
+     *   parent: "{parent}"  // Object embedded as {"id": "123", ...}
+     *   items: "{items}"    // Array embedded as [{"name": "a"}, ...]
+     *   title: "{title}"    // String embedded as "My Title"
+     *
+     * // JavaScript call:
+     * const result = await matimo.execute('notion_create_page', {
+     *   parent: { database_id: 'abc123' },  // JavaScript object
+     *   items: [{ type: 'text' }],          // JavaScript array
+     *   title: 'Create This Page'           // String
+     * });
+     *
+     * // HTTP body sent to API:
+     * {
+     *   "parent": {"database_id": "abc123"},     // Proper JSON object
+     *   "items": [{"type": "text"}],            // Proper JSON array
+     *   "title": "Create This Page"             // String
+     * }
+     * ```
      */
-    templateObject(obj, params) {
+    templateObject(obj, params, paramDefinitions) {
         const result = {};
         for (const [key, value] of Object.entries(obj)) {
             if (typeof value === 'string') {
-                result[key] = this.templateString(value, params);
+                // Check if this is exactly a placeholder like "{parent}"
+                const paramNameMatch = value.match(/^\{([a-zA-Z_][a-zA-Z0-9_]*)\}$/);
+                if (paramNameMatch) {
+                    const paramName = paramNameMatch[1];
+                    const paramValue = params[paramName];
+                    // If parameter is defined in schema with type object or array,
+                    // embed the value directly instead of stringifying
+                    if (paramValue !== undefined && paramDefinitions?.[paramName]) {
+                        const paramType = paramDefinitions[paramName].type;
+                        if ((paramType === 'object' || paramType === 'array') && paramValue !== null) {
+                            result[key] = paramValue;
+                            continue;
+                        }
+                    }
+                }
+                // Otherwise, do normal string templating
+                const templated = this.templateString(value, params);
+                if (templated !== undefined &&
+                    templated !== null &&
+                    !this.isUnfilledPlaceholder(templated)) {
+                    // Extract parameter name from template (e.g., "{page_size}" → "page_size")
+                    const paramName = paramNameMatch ? paramNameMatch[1] : null;
+                    // If this is a single parameter placeholder, use the parameter's defined type
+                    if (paramName && paramDefinitions?.[paramName]) {
+                        const paramType = paramDefinitions[paramName].type;
+                        if (paramType === 'number' && !isNaN(Number(templated))) {
+                            result[key] = Number(templated);
+                        }
+                        else if (paramType === 'boolean') {
+                            result[key] = templated === 'true' || templated === '1' || templated === 'yes';
+                        }
+                        else {
+                            result[key] = templated;
+                        }
+                    }
+                    else {
+                        result[key] = templated;
+                    }
+                }
             }
             else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
                 // Recursively template nested objects
-                result[key] = this.templateObject(value, params);
+                const nestedResult = this.templateObject(value, params, paramDefinitions);
+                // Only include nested object if it has content
+                if (Object.keys(nestedResult).length > 0) {
+                    result[key] = nestedResult;
+                }
             }
             else if (Array.isArray(value)) {
                 // Handle arrays of objects
-                result[key] = value.map((item) => {
+                const templatedArray = value
+                    .map((item) => {
                     if (typeof item === 'string') {
-                        return this.templateString(item, params);
+                        const templated = this.templateString(item, params);
+                        // Skip unfilled placeholders; allow empty strings
+                        if (templated !== undefined &&
+                            templated !== null &&
+                            !this.isUnfilledPlaceholder(templated)) {
+                            // Extract parameter name from template
+                            const paramNameMatch = item.match(/^\{([a-zA-Z_][a-zA-Z0-9_]*)\}$/);
+                            const paramName = paramNameMatch ? paramNameMatch[1] : null;
+                            // If this is a single parameter placeholder, use the parameter's defined type
+                            if (paramName && paramDefinitions?.[paramName]) {
+                                const paramType = paramDefinitions[paramName].type;
+                                if (paramType === 'number' && !isNaN(Number(templated))) {
+                                    return Number(templated);
+                                }
+                                else if (paramType === 'boolean') {
+                                    return templated === 'true' || templated === '1' || templated === 'yes';
+                                }
+                            }
+                            return templated;
+                        }
+                        return null;
                     }
                     else if (typeof item === 'object' && item !== null && !Array.isArray(item)) {
-                        return this.templateObject(item, params);
+                        const templated = this.templateObject(item, params, paramDefinitions);
+                        // Only include if has content
+                        return Object.keys(templated).length > 0 ? templated : null;
                     }
                     return item;
-                });
+                })
+                    .filter((item) => item !== null);
+                // Only include array if it has items
+                if (templatedArray.length > 0) {
+                    result[key] = templatedArray;
+                }
             }
-            else {
+            else if (value !== undefined && value !== null) {
                 result[key] = value;
             }
         }

package/dist/executors/http-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../src/executors/http-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http-executor.js","sourceRoot":"","sources":["../../src/executors/http-executor.ts"],"names":[],"mappings":"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"}