@librechat/agents 3.2.32 → 3.2.34

package/dist/esm/tools/ProgrammaticToolCalling.mjs

@@ -1,20 +1,17 @@
-import { config } from 'dotenv';
-import fetch from 'node-fetch';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import { tool } from '@langchain/core/tools';
-import { CODE_ARTIFACT_PATH_GUIDANCE, getCodeBaseURL, appendFailedExecutionFileReminder, resolveCodeApiAuthHeaders, buildCodeApiHttpErrorMessage, emptyOutputMessage, appendTmpScratchReminder } from './CodeExecutor.mjs';
-import { resolveCodeApiRunTimeoutMs, createCodeApiRunTimeoutSchema, clampCodeApiRunTimeoutMs } from './ptcTimeout.mjs';
-import { Constants } from '../common/enum.mjs';
-import { appendCodeSessionFileSummary } from './CodeSessionFileSummary.mjs';
-
-// src/tools/ProgrammaticToolCalling.ts
+import "../common/enum.mjs";
+import "../common/index.mjs";
+import { appendCodeSessionFileSummary } from "./CodeSessionFileSummary.mjs";
+import { CODE_ARTIFACT_PATH_GUIDANCE, appendFailedExecutionFileReminder, appendTmpScratchReminder, buildCodeApiHttpErrorMessage, emptyOutputMessage, getCodeBaseURL, resolveCodeApiAuthHeaders } from "./CodeExecutor.mjs";
+import { clampCodeApiRunTimeoutMs, createCodeApiRunTimeoutSchema, resolveCodeApiRunTimeoutMs } from "./ptcTimeout.mjs";
+import { tool } from "@langchain/core/tools";
+import { config } from "dotenv";
+import fetch from "node-fetch";
+import { HttpsProxyAgent } from "https-proxy-agent";
+//#region src/tools/ProgrammaticToolCalling.ts
 config();
 /** Default max round-trips to prevent infinite loops */
 const DEFAULT_MAX_ROUND_TRIPS = 20;
 const DEFAULT_RUN_TIMEOUT_MS = resolveCodeApiRunTimeoutMs();
-// ============================================================================
-// Description Components (Single Source of Truth)
-// ============================================================================
 const STATELESS_WARNING = `CRITICAL - STATELESS EXECUTION:
 Each call is a fresh Python interpreter. Variables, imports, and data do NOT persist between calls.
 You MUST complete your entire workflow in ONE code block: query → process → output.
@@ -28,7 +25,7 @@ const CORE_RULES = `Rules:
 - Only print() output returns to the model
 - ${CODE_ARTIFACT_PATH_GUIDANCE}
 - timeout caps one sandbox run/replay iteration, not the total multi-round-trip workflow`;
-const ADDITIONAL_RULES = '- Tool names normalized: hyphens→underscores, keywords get `_tool` suffix';
+const ADDITIONAL_RULES = "- Tool names normalized: hyphens→underscores, keywords get `_tool` suffix";
 const EXAMPLES = `Example (Complete workflow in one call):
   # Query data
   data = await query_database(sql="SELECT * FROM users")
@@ -42,9 +39,6 @@ const EXAMPLES = `Example (Complete workflow in one call):
 Example (Parallel calls):
   sf, ny = await asyncio.gather(get_weather(city="SF"), get_weather(city="NY"))
   print(f"SF: {sf}, NY: {ny}")`;
-// ============================================================================
-// Schema
-// ============================================================================
 const CODE_PARAM_DESCRIPTION = `Python code that calls tools programmatically. Tools are available as async functions.
 
 ${STATELESS_WARNING}
@@ -55,21 +49,21 @@ ${EXAMPLES}
 
 ${CORE_RULES}`;
 function createProgrammaticToolCallingSchema(maxRunTimeoutMs = DEFAULT_RUN_TIMEOUT_MS) {
-    return {
-        type: 'object',
-        properties: {
-            code: {
-                type: 'string',
-                minLength: 1,
-                description: CODE_PARAM_DESCRIPTION,
-            },
-            timeout: createCodeApiRunTimeoutSchema(maxRunTimeoutMs),
-        },
-        required: ['code'],
-    };
+	return {
+		type: "object",
+		properties: {
+			code: {
+				type: "string",
+				minLength: 1,
+				description: CODE_PARAM_DESCRIPTION
+			},
+			timeout: createCodeApiRunTimeoutSchema(maxRunTimeoutMs)
+		},
+		required: ["code"]
+	};
 }
 const ProgrammaticToolCallingSchema = createProgrammaticToolCallingSchema();
-const ProgrammaticToolCallingName = Constants.PROGRAMMATIC_TOOL_CALLING;
+const ProgrammaticToolCallingName = "run_tools_with_code";
 const ProgrammaticToolCallingDescription = `
 Run tools via Python code. Auto-wrapped in async context—just use \`await\` directly.
 
@@ -83,662 +77,478 @@ When to use: loops, conditionals, parallel (\`asyncio.gather\`), multi-step pipe
 ${EXAMPLES}
 `.trim();
 const ProgrammaticToolCallingDefinition = {
-    name: ProgrammaticToolCallingName,
-    description: ProgrammaticToolCallingDescription,
-    schema: ProgrammaticToolCallingSchema,
+	name: ProgrammaticToolCallingName,
+	description: ProgrammaticToolCallingDescription,
+	schema: ProgrammaticToolCallingSchema
 };
-// ============================================================================
-// Helper Functions
-// ============================================================================
 /** Python reserved keywords that get `_tool` suffix in Code API */
 const PYTHON_KEYWORDS = new Set([
-    'False',
-    'None',
-    'True',
-    'and',
-    'as',
-    'assert',
-    'async',
-    'await',
-    'break',
-    'class',
-    'continue',
-    'def',
-    'del',
-    'elif',
-    'else',
-    'except',
-    'finally',
-    'for',
-    'from',
-    'global',
-    'if',
-    'import',
-    'in',
-    'is',
-    'lambda',
-    'nonlocal',
-    'not',
-    'or',
-    'pass',
-    'raise',
-    'return',
-    'try',
-    'while',
-    'with',
-    'yield',
+	"False",
+	"None",
+	"True",
+	"and",
+	"as",
+	"assert",
+	"async",
+	"await",
+	"break",
+	"class",
+	"continue",
+	"def",
+	"del",
+	"elif",
+	"else",
+	"except",
+	"finally",
+	"for",
+	"from",
+	"global",
+	"if",
+	"import",
+	"in",
+	"is",
+	"lambda",
+	"nonlocal",
+	"not",
+	"or",
+	"pass",
+	"raise",
+	"return",
+	"try",
+	"while",
+	"with",
+	"yield"
 ]);
 function isFetchSessionFilesScope(value) {
-    if (value == null || typeof value !== 'object') {
-        return false;
-    }
-    const scope = value;
-    if ((scope.kind === 'agent' || scope.kind === 'user') &&
-        typeof scope.id === 'string') {
-        return true;
-    }
-    return (scope.kind === 'skill' &&
-        typeof scope.id === 'string' &&
-        typeof scope.version === 'number');
+	if (value == null || typeof value !== "object") return false;
+	const scope = value;
+	if ((scope.kind === "agent" || scope.kind === "user") && typeof scope.id === "string") return true;
+	return scope.kind === "skill" && typeof scope.id === "string" && typeof scope.version === "number";
 }
 function isCodeApiAuthHeaders(value) {
-    return value != null && typeof value !== 'string';
+	return value != null && typeof value !== "string";
 }
 function isCodeApiSessionFileWire(value) {
-    return value != null && typeof value === 'object';
+	return value != null && typeof value === "object";
 }
 function isCodeApiSessionFileMetadata(value) {
-    return value != null && typeof value === 'object';
+	return value != null && typeof value === "object";
 }
 function normalizeSessionFile(file, sessionId, scope) {
-    const metadata = isCodeApiSessionFileMetadata(file.metadata)
-        ? file.metadata
-        : undefined;
-    const rawName = typeof file.name === 'string' ? file.name : '';
-    const nameParts = rawName.split('/');
-    const fallbackId = nameParts.length > 1 ? nameParts[1].split('.')[0] : '';
-    const id = typeof file.id === 'string' && file.id !== '' ? file.id : fallbackId;
-    const originalFilename = metadata?.['original-filename'];
-    const name = typeof originalFilename === 'string' ? originalFilename : rawName;
-    const storage_session_id = typeof file.storage_session_id === 'string'
-        ? file.storage_session_id
-        : sessionId;
-    const resource_id = typeof file.resource_id === 'string' && file.resource_id !== ''
-        ? file.resource_id
-        : (scope?.id ?? id);
-    if (scope?.kind === 'skill') {
-        return {
-            storage_session_id,
-            kind: 'skill',
-            id,
-            resource_id,
-            name,
-            version: scope.version,
-        };
-    }
-    if (scope != null) {
-        return {
-            storage_session_id,
-            kind: scope.kind,
-            id,
-            resource_id,
-            name,
-        };
-    }
-    return {
-        storage_session_id,
-        kind: 'user',
-        id,
-        resource_id: id,
-        name,
-    };
+	const metadata = isCodeApiSessionFileMetadata(file.metadata) ? file.metadata : void 0;
+	const rawName = typeof file.name === "string" ? file.name : "";
+	const nameParts = rawName.split("/");
+	const fallbackId = nameParts.length > 1 ? nameParts[1].split(".")[0] : "";
+	const id = typeof file.id === "string" && file.id !== "" ? file.id : fallbackId;
+	const originalFilename = metadata?.["original-filename"];
+	const name = typeof originalFilename === "string" ? originalFilename : rawName;
+	const storage_session_id = typeof file.storage_session_id === "string" ? file.storage_session_id : sessionId;
+	const resource_id = typeof file.resource_id === "string" && file.resource_id !== "" ? file.resource_id : scope?.id ?? id;
+	if (scope?.kind === "skill") return {
+		storage_session_id,
+		kind: "skill",
+		id,
+		resource_id,
+		name,
+		version: scope.version
+	};
+	if (scope != null) return {
+		storage_session_id,
+		kind: scope.kind,
+		id,
+		resource_id,
+		name
+	};
+	return {
+		storage_session_id,
+		kind: "user",
+		id,
+		resource_id: id,
+		name
+	};
 }
 /**
- * Normalizes a tool name to Python identifier format.
- * Must match the Code API's `normalizePythonFunctionName` exactly:
- * 1. Replace hyphens and spaces with underscores
- * 2. Remove any other invalid characters
- * 3. Prefix with underscore if starts with number
- * 4. Append `_tool` if it's a Python keyword
- * @param name - The tool name to normalize
- * @returns Normalized Python-safe identifier
- */
+* Normalizes a tool name to Python identifier format.
+* Must match the Code API's `normalizePythonFunctionName` exactly:
+* 1. Replace hyphens and spaces with underscores
+* 2. Remove any other invalid characters
+* 3. Prefix with underscore if starts with number
+* 4. Append `_tool` if it's a Python keyword
+* @param name - The tool name to normalize
+* @returns Normalized Python-safe identifier
+*/
 function normalizeToPythonIdentifier(name) {
-    let normalized = name.replace(/[-\s]/g, '_');
-    normalized = normalized.replace(/[^a-zA-Z0-9_]/g, '');
-    if (/^[0-9]/.test(normalized)) {
-        normalized = '_' + normalized;
-    }
-    if (PYTHON_KEYWORDS.has(normalized)) {
-        normalized = normalized + '_tool';
-    }
-    return normalized;
+	let normalized = name.replace(/[-\s]/g, "_");
+	normalized = normalized.replace(/[^a-zA-Z0-9_]/g, "");
+	if (/^[0-9]/.test(normalized)) normalized = "_" + normalized;
+	if (PYTHON_KEYWORDS.has(normalized)) normalized = normalized + "_tool";
+	return normalized;
 }
 /**
- * Extracts tool names that are actually called in the Python code.
- * Handles hyphen/underscore conversion since Python identifiers use underscores.
- * @param code - The Python code to analyze
- * @param toolNameMap - Map from normalized Python name to original tool name
- * @returns Set of original tool names found in the code
- */
+* Extracts tool names that are actually called in the Python code.
+* Handles hyphen/underscore conversion since Python identifiers use underscores.
+* @param code - The Python code to analyze
+* @param toolNameMap - Map from normalized Python name to original tool name
+* @returns Set of original tool names found in the code
+*/
 function extractUsedToolNames(code, toolNameMap) {
-    const usedTools = new Set();
-    for (const [pythonName, originalName] of toolNameMap) {
-        const escapedName = pythonName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const pattern = new RegExp(`\\b${escapedName}\\s*\\(`, 'g');
-        if (pattern.test(code)) {
-            usedTools.add(originalName);
-        }
-    }
-    return usedTools;
+	const usedTools = /* @__PURE__ */ new Set();
+	for (const [pythonName, originalName] of toolNameMap) {
+		const escapedName = pythonName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		if (new RegExp(`\\b${escapedName}\\s*\\(`, "g").test(code)) usedTools.add(originalName);
+	}
+	return usedTools;
 }
 /**
- * Filters tool definitions to only include tools actually used in the code.
- * Handles the hyphen-to-underscore conversion for Python compatibility.
- * @param toolDefs - All available tool definitions
- * @param code - The Python code to analyze
- * @param debug - Enable debug logging
- * @returns Filtered array of tool definitions
- */
+* Filters tool definitions to only include tools actually used in the code.
+* Handles the hyphen-to-underscore conversion for Python compatibility.
+* @param toolDefs - All available tool definitions
+* @param code - The Python code to analyze
+* @param debug - Enable debug logging
+* @returns Filtered array of tool definitions
+*/
 function filterToolsByUsage(toolDefs, code, debug = false) {
-    const toolNameMap = new Map();
-    for (const tool of toolDefs) {
-        const pythonName = normalizeToPythonIdentifier(tool.name);
-        toolNameMap.set(pythonName, tool.name);
-    }
-    const usedToolNames = extractUsedToolNames(code, toolNameMap);
-    if (debug) {
-        // eslint-disable-next-line no-console
-        console.log(`[PTC Debug] Tool filtering: found ${usedToolNames.size}/${toolDefs.length} tools in code`);
-        if (usedToolNames.size > 0) {
-            // eslint-disable-next-line no-console
-            console.log(`[PTC Debug] Matched tools: ${Array.from(usedToolNames).join(', ')}`);
-        }
-    }
-    if (usedToolNames.size === 0) {
-        if (debug) {
-            // eslint-disable-next-line no-console
-            console.log('[PTC Debug] No tools detected in code - sending all tools as fallback');
-        }
-        return toolDefs;
-    }
-    return toolDefs.filter((tool) => usedToolNames.has(tool.name));
+	const toolNameMap = /* @__PURE__ */ new Map();
+	for (const tool of toolDefs) {
+		const pythonName = normalizeToPythonIdentifier(tool.name);
+		toolNameMap.set(pythonName, tool.name);
+	}
+	const usedToolNames = extractUsedToolNames(code, toolNameMap);
+	if (debug) {
+		console.log(`[PTC Debug] Tool filtering: found ${usedToolNames.size}/${toolDefs.length} tools in code`);
+		if (usedToolNames.size > 0) console.log(`[PTC Debug] Matched tools: ${Array.from(usedToolNames).join(", ")}`);
+	}
+	if (usedToolNames.size === 0) {
+		if (debug) console.log("[PTC Debug] No tools detected in code - sending all tools as fallback");
+		return toolDefs;
+	}
+	return toolDefs.filter((tool) => usedToolNames.has(tool.name));
 }
 async function fetchSessionFiles(baseUrl, sessionId, scopeOrProxy, proxyOrAuthHeaders, scopedAuthHeaders) {
-    try {
-        const scope = isFetchSessionFilesScope(scopeOrProxy)
-            ? scopeOrProxy
-            : undefined;
-        let proxy;
-        let authHeaders;
-        if (scope == null) {
-            proxy = typeof scopeOrProxy === 'string' ? scopeOrProxy : undefined;
-            authHeaders = isCodeApiAuthHeaders(proxyOrAuthHeaders)
-                ? proxyOrAuthHeaders
-                : undefined;
-        }
-        else if (typeof proxyOrAuthHeaders === 'string') {
-            proxy = proxyOrAuthHeaders;
-            authHeaders = scopedAuthHeaders;
-        }
-        else {
-            authHeaders = proxyOrAuthHeaders ?? scopedAuthHeaders;
-        }
-        const query = new URLSearchParams({ detail: 'full' });
-        if (scope != null) {
-            query.set('kind', scope.kind);
-            query.set('id', scope.id);
-            if (scope.kind === 'skill') {
-                query.set('version', String(scope.version));
-            }
-        }
-        const filesEndpoint = `${baseUrl}/files/${encodeURIComponent(sessionId)}?${query.toString()}`;
-        const resolvedAuthHeaders = await resolveCodeApiAuthHeaders(authHeaders);
-        const fetchOptions = {
-            method: 'GET',
-            headers: {
-                'User-Agent': 'LibreChat/1.0',
-                ...resolvedAuthHeaders,
-            },
-        };
-        if (proxy != null && proxy !== '') {
-            fetchOptions.agent = new HttpsProxyAgent(proxy);
-        }
-        const response = await fetch(filesEndpoint, fetchOptions);
-        if (!response.ok) {
-            throw new Error(await buildCodeApiHttpErrorMessage('GET', filesEndpoint, response));
-        }
-        const files = await response.json();
-        if (!Array.isArray(files) || files.length === 0) {
-            return [];
-        }
-        return files
-            .filter(isCodeApiSessionFileWire)
-            .map((file) => normalizeSessionFile(file, sessionId, scope));
-    }
-    catch (error) {
-        // eslint-disable-next-line no-console
-        console.warn(`Failed to fetch files for session: ${sessionId}, ${error.message}`);
-        return [];
-    }
+	try {
+		const scope = isFetchSessionFilesScope(scopeOrProxy) ? scopeOrProxy : void 0;
+		let proxy;
+		let authHeaders;
+		if (scope == null) {
+			proxy = typeof scopeOrProxy === "string" ? scopeOrProxy : void 0;
+			authHeaders = isCodeApiAuthHeaders(proxyOrAuthHeaders) ? proxyOrAuthHeaders : void 0;
+		} else if (typeof proxyOrAuthHeaders === "string") {
+			proxy = proxyOrAuthHeaders;
+			authHeaders = scopedAuthHeaders;
+		} else authHeaders = proxyOrAuthHeaders ?? scopedAuthHeaders;
+		const query = new URLSearchParams({ detail: "full" });
+		if (scope != null) {
+			query.set("kind", scope.kind);
+			query.set("id", scope.id);
+			if (scope.kind === "skill") query.set("version", String(scope.version));
+		}
+		const filesEndpoint = `${baseUrl}/files/${encodeURIComponent(sessionId)}?${query.toString()}`;
+		const fetchOptions = {
+			method: "GET",
+			headers: {
+				"User-Agent": "LibreChat/1.0",
+				...await resolveCodeApiAuthHeaders(authHeaders)
+			}
+		};
+		if (proxy != null && proxy !== "") fetchOptions.agent = new HttpsProxyAgent(proxy);
+		const response = await fetch(filesEndpoint, fetchOptions);
+		if (!response.ok) throw new Error(await buildCodeApiHttpErrorMessage("GET", filesEndpoint, response));
+		const files = await response.json();
+		if (!Array.isArray(files) || files.length === 0) return [];
+		return files.filter(isCodeApiSessionFileWire).map((file) => normalizeSessionFile(file, sessionId, scope));
+	} catch (error) {
+		console.warn(`Failed to fetch files for session: ${sessionId}, ${error.message}`);
+		return [];
+	}
 }
 /**
- * Makes an HTTP request to the Code API.
- * @param endpoint - The API endpoint URL
- * @param body - The request body
- * @param proxy - Optional HTTP proxy URL
- * @returns The parsed API response
- */
+* Makes an HTTP request to the Code API.
+* @param endpoint - The API endpoint URL
+* @param body - The request body
+* @param proxy - Optional HTTP proxy URL
+* @returns The parsed API response
+*/
 async function makeRequest(endpoint, body, proxy, authHeaders) {
-    const resolvedAuthHeaders = await resolveCodeApiAuthHeaders(authHeaders);
-    const fetchOptions = {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            'User-Agent': 'LibreChat/1.0',
-            ...resolvedAuthHeaders,
-        },
-        body: JSON.stringify(body),
-    };
-    if (proxy != null && proxy !== '') {
-        fetchOptions.agent = new HttpsProxyAgent(proxy);
-    }
-    const response = await fetch(endpoint, fetchOptions);
-    if (!response.ok) {
-        throw new Error(await buildCodeApiHttpErrorMessage('POST', endpoint, response));
-    }
-    return (await response.json());
+	const fetchOptions = {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+			"User-Agent": "LibreChat/1.0",
+			...await resolveCodeApiAuthHeaders(authHeaders)
+		},
+		body: JSON.stringify(body)
+	};
+	if (proxy != null && proxy !== "") fetchOptions.agent = new HttpsProxyAgent(proxy);
+	const response = await fetch(endpoint, fetchOptions);
+	if (!response.ok) throw new Error(await buildCodeApiHttpErrorMessage("POST", endpoint, response));
+	return await response.json();
 }
 /**
- * Unwraps tool responses that may be formatted as tuples or content blocks.
- * MCP tools return [content, artifacts], we need to extract the raw data.
- * @param result - The raw result from tool.invoke()
- * @param isMCPTool - Whether this is an MCP tool (has mcp property)
- * @returns Unwrapped raw data (string, object, or parsed JSON)
- */
+* Unwraps tool responses that may be formatted as tuples or content blocks.
+* MCP tools return [content, artifacts], we need to extract the raw data.
+* @param result - The raw result from tool.invoke()
+* @param isMCPTool - Whether this is an MCP tool (has mcp property)
+* @returns Unwrapped raw data (string, object, or parsed JSON)
+*/
 function unwrapToolResponse(result, isMCPTool) {
-    // Only unwrap if this is an MCP tool and result is a tuple
-    if (!isMCPTool) {
-        return result;
-    }
-    /**
-     * Checks if a value is a content block object (has type and text).
-     */
-    const isContentBlock = (value) => {
-        if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-            return false;
-        }
-        const obj = value;
-        return typeof obj.type === 'string';
-    };
-    /**
-     * Checks if an array is an array of content blocks.
-     */
-    const isContentBlockArray = (arr) => {
-        return arr.length > 0 && arr.every(isContentBlock);
-    };
-    /**
-     * Extracts text from a single content block object.
-     * Returns the text if it's a text block, otherwise returns null.
-     */
-    const extractTextFromBlock = (block) => {
-        if (typeof block !== 'object' || block === null)
-            return null;
-        const b = block;
-        if (b.type === 'text' && typeof b.text === 'string') {
-            return b.text;
-        }
-        return null;
-    };
-    /**
-     * Extracts text from content blocks (array or single object).
-     * Returns combined text or null if no text blocks found.
-     */
-    const extractTextFromContent = (content) => {
-        // Single content block object: { type: 'text', text: '...' }
-        if (typeof content === 'object' &&
-            content !== null &&
-            !Array.isArray(content)) {
-            const text = extractTextFromBlock(content);
-            if (text !== null)
-                return text;
-        }
-        // Array of content blocks: [{ type: 'text', text: '...' }, ...]
-        if (Array.isArray(content) && content.length > 0) {
-            const texts = content
-                .map(extractTextFromBlock)
-                .filter((t) => t !== null);
-            if (texts.length > 0) {
-                return texts.join('\n');
-            }
-        }
-        return null;
-    };
-    /**
-     * Tries to parse a string as JSON if it looks like JSON.
-     */
-    const maybeParseJSON = (str) => {
-        const trimmed = str.trim();
-        if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
-            try {
-                return JSON.parse(trimmed);
-            }
-            catch {
-                return str;
-            }
-        }
-        return str;
-    };
-    // Handle array of content blocks at top level FIRST
-    // (before checking for tuple, since both are arrays)
-    if (Array.isArray(result) && isContentBlockArray(result)) {
-        const extractedText = extractTextFromContent(result);
-        if (extractedText !== null) {
-            return maybeParseJSON(extractedText);
-        }
-    }
-    // Check if result is a tuple/array with [content, artifacts]
-    if (Array.isArray(result) && result.length >= 1) {
-        const [content] = result;
-        // If first element is a string, return it (possibly parsed as JSON)
-        if (typeof content === 'string') {
-            return maybeParseJSON(content);
-        }
-        // Try to extract text from content blocks
-        const extractedText = extractTextFromContent(content);
-        if (extractedText !== null) {
-            return maybeParseJSON(extractedText);
-        }
-        // If first element is an object (but not a text block), return it
-        if (typeof content === 'object' && content !== null) {
-            return content;
-        }
-    }
-    // Handle single content block object at top level (not in tuple)
-    const extractedText = extractTextFromContent(result);
-    if (extractedText !== null) {
-        return maybeParseJSON(extractedText);
-    }
-    // Not a formatted response, return as-is
-    return result;
+	if (!isMCPTool) return result;
+	/**
+	* Checks if a value is a content block object (has type and text).
+	*/
+	const isContentBlock = (value) => {
+		if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+		return typeof value.type === "string";
+	};
+	/**
+	* Checks if an array is an array of content blocks.
+	*/
+	const isContentBlockArray = (arr) => {
+		return arr.length > 0 && arr.every(isContentBlock);
+	};
+	/**
+	* Extracts text from a single content block object.
+	* Returns the text if it's a text block, otherwise returns null.
+	*/
+	const extractTextFromBlock = (block) => {
+		if (typeof block !== "object" || block === null) return null;
+		const b = block;
+		if (b.type === "text" && typeof b.text === "string") return b.text;
+		return null;
+	};
+	/**
+	* Extracts text from content blocks (array or single object).
+	* Returns combined text or null if no text blocks found.
+	*/
+	const extractTextFromContent = (content) => {
+		if (typeof content === "object" && content !== null && !Array.isArray(content)) {
+			const text = extractTextFromBlock(content);
+			if (text !== null) return text;
+		}
+		if (Array.isArray(content) && content.length > 0) {
+			const texts = content.map(extractTextFromBlock).filter((t) => t !== null);
+			if (texts.length > 0) return texts.join("\n");
+		}
+		return null;
+	};
+	/**
+	* Tries to parse a string as JSON if it looks like JSON.
+	*/
+	const maybeParseJSON = (str) => {
+		const trimmed = str.trim();
+		if (trimmed.startsWith("{") || trimmed.startsWith("[")) try {
+			return JSON.parse(trimmed);
+		} catch {
+			return str;
+		}
+		return str;
+	};
+	if (Array.isArray(result) && isContentBlockArray(result)) {
+		const extractedText = extractTextFromContent(result);
+		if (extractedText !== null) return maybeParseJSON(extractedText);
+	}
+	if (Array.isArray(result) && result.length >= 1) {
+		const [content] = result;
+		if (typeof content === "string") return maybeParseJSON(content);
+		const extractedText = extractTextFromContent(content);
+		if (extractedText !== null) return maybeParseJSON(extractedText);
+		if (typeof content === "object" && content !== null) return content;
+	}
+	const extractedText = extractTextFromContent(result);
+	if (extractedText !== null) return maybeParseJSON(extractedText);
+	return result;
 }
 function detectSchemaKind(schema) {
-    const kind = { object: false, string: false };
-    if (!schema || typeof schema !== 'object') {
-        return kind;
-    }
-    const jsonSchemaType = schema.type;
-    if (jsonSchemaType === 'object') {
-        kind.object = true;
-    }
-    else if (jsonSchemaType === 'string') {
-        kind.string = true;
-    }
-    else if (Array.isArray(jsonSchemaType)) {
-        kind.object = jsonSchemaType.includes('object');
-        kind.string = jsonSchemaType.includes('string');
-    }
-    const zodDef = schema._def;
-    if (!zodDef || typeof zodDef !== 'object') {
-        return kind;
-    }
-    const zodType = zodDef.type;
-    const zodTypeName = zodDef
-        .typeName;
-    if (zodType === 'object' || zodTypeName === 'ZodObject') {
-        kind.object = true;
-    }
-    else if (zodType === 'string' || zodTypeName === 'ZodString') {
-        kind.string = true;
-    }
-    const innerSchema = zodDef.innerType ?? zodDef.schema;
-    if (innerSchema) {
-        const innerKind = detectSchemaKind(innerSchema);
-        kind.object ||= innerKind.object;
-        kind.string ||= innerKind.string;
-    }
-    const options = zodDef.options;
-    if (Array.isArray(options)) {
-        for (const option of options) {
-            const optionKind = detectSchemaKind(option);
-            kind.object ||= optionKind.object;
-            kind.string ||= optionKind.string;
-        }
-    }
-    return kind;
+	const kind = {
+		object: false,
+		string: false
+	};
+	if (!schema || typeof schema !== "object") return kind;
+	const jsonSchemaType = schema.type;
+	if (jsonSchemaType === "object") kind.object = true;
+	else if (jsonSchemaType === "string") kind.string = true;
+	else if (Array.isArray(jsonSchemaType)) {
+		kind.object = jsonSchemaType.includes("object");
+		kind.string = jsonSchemaType.includes("string");
+	}
+	const zodDef = schema._def;
+	if (!zodDef || typeof zodDef !== "object") return kind;
+	const zodType = zodDef.type;
+	const zodTypeName = zodDef.typeName;
+	if (zodType === "object" || zodTypeName === "ZodObject") kind.object = true;
+	else if (zodType === "string" || zodTypeName === "ZodString") kind.string = true;
+	const innerSchema = zodDef.innerType ?? zodDef.schema;
+	if (innerSchema) {
+		const innerKind = detectSchemaKind(innerSchema);
+		kind.object ||= innerKind.object;
+		kind.string ||= innerKind.string;
+	}
+	const options = zodDef.options;
+	if (Array.isArray(options)) for (const option of options) {
+		const optionKind = detectSchemaKind(option);
+		kind.object ||= optionKind.object;
+		kind.string ||= optionKind.string;
+	}
+	return kind;
 }
 function getToolInputSchemaKind(tool) {
-    if (tool.constructor.name === 'DynamicTool') {
-        return { object: false, string: true };
-    }
-    const schema = tool.schema;
-    return detectSchemaKind(schema);
+	if (tool.constructor.name === "DynamicTool") return {
+		object: false,
+		string: true
+	};
+	const schema = tool.schema;
+	return detectSchemaKind(schema);
 }
 function normalizeToolInput(input, tool) {
-    const schemaKind = getToolInputSchemaKind(tool);
-    if (typeof input !== 'string') {
-        if (!schemaKind.string || schemaKind.object) {
-            return input;
-        }
-        const inputValue = input.input;
-        if (typeof inputValue === 'string') {
-            return input;
-        }
-        return JSON.stringify(input);
-    }
-    if (!schemaKind.object || schemaKind.string) {
-        return input;
-    }
-    const trimmed = input.trim();
-    if (!trimmed.startsWith('{')) {
-        return input;
-    }
-    try {
-        const parsed = JSON.parse(trimmed);
-        if (typeof parsed === 'object' &&
-            parsed !== null &&
-            !Array.isArray(parsed)) {
-            return parsed;
-        }
-    }
-    catch {
-        return input;
-    }
-    return input;
+	const schemaKind = getToolInputSchemaKind(tool);
+	if (typeof input !== "string") {
+		if (!schemaKind.string || schemaKind.object) return input;
+		if (typeof input.input === "string") return input;
+		return JSON.stringify(input);
+	}
+	if (!schemaKind.object || schemaKind.string) return input;
+	const trimmed = input.trim();
+	if (!trimmed.startsWith("{")) return input;
+	try {
+		const parsed = JSON.parse(trimmed);
+		if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return parsed;
+	} catch {
+		return input;
+	}
+	return input;
 }
 /**
- * Executes tools in parallel when requested by the API.
- * Uses Promise.all for parallel execution, catching individual errors.
- * Unwraps formatted responses (e.g., MCP tool tuples) to raw data.
- * @param toolCalls - Array of tool calls from the API
- * @param toolMap - Map of tool names to executable tools
- * @returns Array of tool results
- */
-async function executeTools(toolCalls, toolMap, programmaticToolName = Constants.PROGRAMMATIC_TOOL_CALLING) {
-    const executions = toolCalls.map(async (call) => {
-        const tool = toolMap.get(call.name);
-        if (!tool) {
-            return {
-                call_id: call.id,
-                result: null,
-                is_error: true,
-                error_message: `Tool '${call.name}' not found. Available tools: ${Array.from(toolMap.keys()).join(', ')}`,
-            };
-        }
-        try {
-            const result = await tool.invoke(normalizeToolInput(call.input, tool), {
-                metadata: { [programmaticToolName]: true },
-            });
-            const isMCPTool = tool.mcp === true;
-            const unwrappedResult = unwrapToolResponse(result, isMCPTool);
-            return {
-                call_id: call.id,
-                result: unwrappedResult,
-                is_error: false,
-            };
-        }
-        catch (error) {
-            return {
-                call_id: call.id,
-                result: null,
-                is_error: true,
-                error_message: error.message || 'Tool execution failed',
-            };
-        }
-    });
-    return await Promise.all(executions);
+* Executes tools in parallel when requested by the API.
+* Uses Promise.all for parallel execution, catching individual errors.
+* Unwraps formatted responses (e.g., MCP tool tuples) to raw data.
+* @param toolCalls - Array of tool calls from the API
+* @param toolMap - Map of tool names to executable tools
+* @returns Array of tool results
+*/
+async function executeTools(toolCalls, toolMap, programmaticToolName = "run_tools_with_code") {
+	const executions = toolCalls.map(async (call) => {
+		const tool = toolMap.get(call.name);
+		if (!tool) return {
+			call_id: call.id,
+			result: null,
+			is_error: true,
+			error_message: `Tool '${call.name}' not found. Available tools: ${Array.from(toolMap.keys()).join(", ")}`
+		};
+		try {
+			const unwrappedResult = unwrapToolResponse(await tool.invoke(normalizeToolInput(call.input, tool), { metadata: { [programmaticToolName]: true } }), tool.mcp === true);
+			return {
+				call_id: call.id,
+				result: unwrappedResult,
+				is_error: false
+			};
+		} catch (error) {
+			return {
+				call_id: call.id,
+				result: null,
+				is_error: true,
+				error_message: error.message || "Tool execution failed"
+			};
+		}
+	});
+	return await Promise.all(executions);
 }
 /**
- * Formats the completed response for the agent.
- *
- * Output includes stdout/stderr plus a compact session-file summary
- * when artifacts were persisted. The artifact still carries every
- * file so the host's session map stays in sync.
- *
- * @param response - The completed API response
- * @returns Tuple of [formatted string, artifact]
- */
-function formatCompletedResponse(response, sourceCode = '') {
-    let formatted = '';
-    if (response.stdout != null && response.stdout !== '') {
-        formatted += `stdout:\n${response.stdout}\n`;
-    }
-    else {
-        formatted += emptyOutputMessage;
-    }
-    if (response.stderr != null && response.stderr !== '') {
-        formatted += `stderr:\n${response.stderr}\n`;
-    }
-    const outputWithReminder = appendTmpScratchReminder(formatted, sourceCode);
-    return [
-        appendCodeSessionFileSummary(outputWithReminder, response.files),
-        {
-            session_id: response.session_id,
-            files: response.files,
-        },
-    ];
+* Formats the completed response for the agent.
+*
+* Output includes stdout/stderr plus a compact session-file summary
+* when artifacts were persisted. The artifact still carries every
+* file so the host's session map stays in sync.
+*
+* @param response - The completed API response
+* @returns Tuple of [formatted string, artifact]
+*/
+function formatCompletedResponse(response, sourceCode = "") {
+	let formatted = "";
+	if (response.stdout != null && response.stdout !== "") formatted += `stdout:\n${response.stdout}\n`;
+	else formatted += emptyOutputMessage;
+	if (response.stderr != null && response.stderr !== "") formatted += `stderr:\n${response.stderr}\n`;
+	return [appendCodeSessionFileSummary(appendTmpScratchReminder(formatted, sourceCode), response.files), {
+		session_id: response.session_id,
+		files: response.files
+	}];
 }
-// ============================================================================
-// Tool Factory
-// ============================================================================
 /**
- * Creates a Programmatic Tool Calling tool for complex multi-tool workflows.
- *
- * This tool enables AI agents to write Python code that orchestrates multiple
- * tool calls programmatically, reducing LLM round-trips and token usage.
- *
- * The tool map must be provided at runtime via config.configurable.toolMap.
- *
- * @param params - Configuration parameters (baseUrl, maxRoundTrips, proxy)
- * @returns A LangChain DynamicStructuredTool for programmatic tool calling
- *
- * @example
- * const ptcTool = createProgrammaticToolCallingTool({ maxRoundTrips: 20 });
- *
- * const [output, artifact] = await ptcTool.invoke(
- *   { code, tools },
- *   { configurable: { toolMap } }
- * );
- */
+* Creates a Programmatic Tool Calling tool for complex multi-tool workflows.
+*
+* This tool enables AI agents to write Python code that orchestrates multiple
+* tool calls programmatically, reducing LLM round-trips and token usage.
+*
+* The tool map must be provided at runtime via config.configurable.toolMap.
+*
+* @param params - Configuration parameters (baseUrl, maxRoundTrips, proxy)
+* @returns A LangChain DynamicStructuredTool for programmatic tool calling
+*
+* @example
+* const ptcTool = createProgrammaticToolCallingTool({ maxRoundTrips: 20 });
+*
+* const [output, artifact] = await ptcTool.invoke(
+*   { code, tools },
+*   { configurable: { toolMap } }
+* );
+*/
 function createProgrammaticToolCallingTool(initParams = {}) {
-    const baseUrl = initParams.baseUrl ?? getCodeBaseURL();
-    const maxRoundTrips = initParams.maxRoundTrips ?? DEFAULT_MAX_ROUND_TRIPS;
-    const maxRunTimeoutMs = resolveCodeApiRunTimeoutMs(initParams.runTimeoutMs);
-    const proxy = initParams.proxy ?? process.env.PROXY;
-    const debug = initParams.debug ?? process.env.PTC_DEBUG === 'true';
-    const EXEC_ENDPOINT = `${baseUrl}/exec/programmatic`;
-    return tool(async (rawParams, config) => {
-        const params = rawParams;
-        const { code } = params;
-        const timeout = clampCodeApiRunTimeoutMs(params.timeout, maxRunTimeoutMs);
-        // Extra params injected by ToolNode (follows web_search pattern).
-        const toolCall = (config.toolCall ?? {});
-        const { toolMap, toolDefs, session_id, _injected_files } = toolCall;
-        if (toolMap == null || toolMap.size === 0) {
-            throw new Error('No toolMap provided. ' +
-                'ToolNode should inject this from AgentContext when invoked through the graph.');
-        }
-        if (toolDefs == null || toolDefs.length === 0) {
-            throw new Error('No tool definitions provided. ' +
-                'Either pass tools in the input or ensure ToolNode injects toolDefs.');
-        }
-        let roundTrip = 0;
-        try {
-            // ====================================================================
-            // Phase 1: Filter tools and make initial request
-            // ====================================================================
-            const effectiveTools = filterToolsByUsage(toolDefs, code, debug);
-            if (debug) {
-                // eslint-disable-next-line no-console
-                console.log(`[PTC Debug] Sending ${effectiveTools.length} tools to API ` +
-                    `(filtered from ${toolDefs.length})`);
-            }
-            /**
-             * File injection: `_injected_files` from ToolNode session
-             * context. The legacy `/files/<session_id>` HTTP fallback was
-             * removed (see `CodeExecutor.ts`) — codeapi's sessionAuth now
-             * requires kind/id query params unavailable at this point.
-             */
-            let files;
-            if (_injected_files && _injected_files.length > 0) {
-                files = _injected_files;
-            }
-            else if (session_id != null && session_id.length > 0) {
-                // eslint-disable-next-line no-console
-                console.debug(`[ProgrammaticToolCalling] No injected files for session_id=${session_id} — exec will run without input files`);
-            }
-            let response = await makeRequest(EXEC_ENDPOINT, {
-                code,
-                tools: effectiveTools,
-                session_id,
-                timeout,
-                ...(files && files.length > 0 ? { files } : {}),
-            }, proxy, initParams.authHeaders);
-            // ====================================================================
-            // Phase 2: Handle response loop
-            // ====================================================================
-            while (response.status === 'tool_call_required') {
-                roundTrip++;
-                if (roundTrip > maxRoundTrips) {
-                    throw new Error(`Exceeded maximum round trips (${maxRoundTrips}). ` +
-                        'This may indicate an infinite loop, excessive tool calls, ' +
-                        'or a logic error in your code.');
-                }
-                if (debug) {
-                    // eslint-disable-next-line no-console
-                    console.log(`[PTC Debug] Round trip ${roundTrip}: ${response.tool_calls?.length ?? 0} tool(s) to execute`);
-                }
-                const toolResults = await executeTools(response.tool_calls ?? [], toolMap);
-                response = await makeRequest(EXEC_ENDPOINT, {
-                    continuation_token: response.continuation_token,
-                    tool_results: toolResults,
-                }, proxy, initParams.authHeaders);
-            }
-            // ====================================================================
-            // Phase 3: Handle final state
-            // ====================================================================
-            if (response.status === 'completed') {
-                return formatCompletedResponse(response, code);
-            }
-            if (response.status === 'error') {
-                throw new Error(`Execution error: ${response.error}` +
-                    (response.stderr != null && response.stderr !== ''
-                        ? `\n\nStderr:\n${response.stderr}`
-                        : ''));
-            }
-            throw new Error(`Unexpected response status: ${response.status}`);
-        }
-        catch (error) {
-            const messageWithReminder = appendFailedExecutionFileReminder(error.message, code);
-            throw new Error(`Programmatic execution failed: ${messageWithReminder}`);
-        }
-    }, {
-        name: Constants.PROGRAMMATIC_TOOL_CALLING,
-        description: ProgrammaticToolCallingDescription,
-        schema: createProgrammaticToolCallingSchema(maxRunTimeoutMs),
-        responseFormat: Constants.CONTENT_AND_ARTIFACT,
-    });
+	const baseUrl = initParams.baseUrl ?? getCodeBaseURL();
+	const maxRoundTrips = initParams.maxRoundTrips ?? DEFAULT_MAX_ROUND_TRIPS;
+	const maxRunTimeoutMs = resolveCodeApiRunTimeoutMs(initParams.runTimeoutMs);
+	const proxy = initParams.proxy ?? process.env.PROXY;
+	const debug = initParams.debug ?? process.env.PTC_DEBUG === "true";
+	const EXEC_ENDPOINT = `${baseUrl}/exec/programmatic`;
+	return tool(async (rawParams, config) => {
+		const params = rawParams;
+		const { code } = params;
+		const timeout = clampCodeApiRunTimeoutMs(params.timeout, maxRunTimeoutMs);
+		const { toolMap, toolDefs, session_id, _injected_files } = config.toolCall ?? {};
+		if (toolMap == null || toolMap.size === 0) throw new Error("No toolMap provided. ToolNode should inject this from AgentContext when invoked through the graph.");
+		if (toolDefs == null || toolDefs.length === 0) throw new Error("No tool definitions provided. Either pass tools in the input or ensure ToolNode injects toolDefs.");
+		let roundTrip = 0;
+		try {
+			const effectiveTools = filterToolsByUsage(toolDefs, code, debug);
+			if (debug) console.log(`[PTC Debug] Sending ${effectiveTools.length} tools to API (filtered from ${toolDefs.length})`);
+			/**
+			* File injection: `_injected_files` from ToolNode session
+			* context. The legacy `/files/<session_id>` HTTP fallback was
+			* removed (see `CodeExecutor.ts`) — codeapi's sessionAuth now
+			* requires kind/id query params unavailable at this point.
+			*/
+			let files;
+			if (_injected_files && _injected_files.length > 0) files = _injected_files;
+			else if (session_id != null && session_id.length > 0) console.debug(`[ProgrammaticToolCalling] No injected files for session_id=${session_id} — exec will run without input files`);
+			let response = await makeRequest(EXEC_ENDPOINT, {
+				code,
+				tools: effectiveTools,
+				session_id,
+				timeout,
+				...files && files.length > 0 ? { files } : {}
+			}, proxy, initParams.authHeaders);
+			while (response.status === "tool_call_required") {
+				roundTrip++;
+				if (roundTrip > maxRoundTrips) throw new Error(`Exceeded maximum round trips (${maxRoundTrips}). This may indicate an infinite loop, excessive tool calls, or a logic error in your code.`);
+				if (debug) console.log(`[PTC Debug] Round trip ${roundTrip}: ${response.tool_calls?.length ?? 0} tool(s) to execute`);
+				const toolResults = await executeTools(response.tool_calls ?? [], toolMap);
+				response = await makeRequest(EXEC_ENDPOINT, {
+					continuation_token: response.continuation_token,
+					tool_results: toolResults
+				}, proxy, initParams.authHeaders);
+			}
+			if (response.status === "completed") return formatCompletedResponse(response, code);
+			if (response.status === "error") throw new Error(`Execution error: ${response.error}` + (response.stderr != null && response.stderr !== "" ? `\n\nStderr:\n${response.stderr}` : ""));
+			throw new Error(`Unexpected response status: ${response.status}`);
+		} catch (error) {
+			const messageWithReminder = appendFailedExecutionFileReminder(error.message, code);
+			throw new Error(`Programmatic execution failed: ${messageWithReminder}`);
+		}
+	}, {
+		name: "run_tools_with_code",
+		description: ProgrammaticToolCallingDescription,
+		schema: createProgrammaticToolCallingSchema(maxRunTimeoutMs),
+		responseFormat: "content_and_artifact"
+	});
 }
-
+//#endregion
 export { ProgrammaticToolCallingDefinition, ProgrammaticToolCallingDescription, ProgrammaticToolCallingName, ProgrammaticToolCallingSchema, createProgrammaticToolCallingSchema, createProgrammaticToolCallingTool, executeTools, extractUsedToolNames, fetchSessionFiles, filterToolsByUsage, formatCompletedResponse, makeRequest, normalizeToPythonIdentifier, unwrapToolResponse };
-//# sourceMappingURL=ProgrammaticToolCalling.mjs.map
+
+//# sourceMappingURL=ProgrammaticToolCalling.mjs.map