@promptbook/cli 0.104.0 → 0.105.0-0

package/umd/index.umd.js

@@ -56,7 +56,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.104.0';
+    const PROMPTBOOK_ENGINE_VERSION = '0.105.0-0';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -3502,7 +3502,7 @@
      *
      * @public exported from `@promptbook/utils`
      */
-    function deserializeError(error) {
+    function deserializeError(error, isStackAddedToMessage = true) {
         const { name, stack, id } = error; // Added id
         let { message } = error;
         let ErrorClass = ALL_ERRORS[error.name];
@@ -3510,7 +3510,7 @@
             ErrorClass = Error;
             message = `${name}: ${message}`;
         }
-        if (stack !== undefined && stack !== '') {
+        if (isStackAddedToMessage && stack !== undefined && stack !== '') {
             message = spaceTrim__default["default"]((block) => `
                 ${block(message)}
 
@@ -4312,6 +4312,9 @@
      * @public exported from `@promptbook/utils`
      */
     function parseNumber(value) {
+        if (value === null || value === undefined) {
+            return 0;
+        }
         const originalValue = value;
         if (typeof value === 'number') {
             value = value.toString(); // <- TODO: Maybe more efficient way to do this
@@ -19504,83 +19507,180 @@
                     content: msg.content,
                 }));
             }
-            const rawRequest = {
-                ...modelSettings,
-                messages: [
-                    ...(currentModelRequirements.systemMessage === undefined
-                        ? []
-                        : [
-                            {
-                                role: 'system',
-                                content: currentModelRequirements.systemMessage,
-                            },
-                        ]),
-                    ...threadMessages,
-                    {
-                        role: 'user',
-                        content: rawPromptContent,
-                    },
-                ],
-                user: (_a = this.options.userId) === null || _a === void 0 ? void 0 : _a.toString(),
-                tools: currentModelRequirements.tools === undefined
-                    ? undefined
-                    : mapToolsToOpenAi(currentModelRequirements.tools),
+            const messages = [
+                ...(currentModelRequirements.systemMessage === undefined
+                    ? []
+                    : [
+                        {
+                            role: 'system',
+                            content: currentModelRequirements.systemMessage,
+                        },
+                    ]),
+                ...threadMessages,
+                {
+                    role: 'user',
+                    content: rawPromptContent,
+                },
+            ];
+            let totalUsage = {
+                price: uncertainNumber(0),
+                input: {
+                    tokensCount: uncertainNumber(0),
+                    charactersCount: uncertainNumber(0),
+                    wordsCount: uncertainNumber(0),
+                    sentencesCount: uncertainNumber(0),
+                    linesCount: uncertainNumber(0),
+                    paragraphsCount: uncertainNumber(0),
+                    pagesCount: uncertainNumber(0),
+                },
+                output: {
+                    tokensCount: uncertainNumber(0),
+                    charactersCount: uncertainNumber(0),
+                    wordsCount: uncertainNumber(0),
+                    sentencesCount: uncertainNumber(0),
+                    linesCount: uncertainNumber(0),
+                    paragraphsCount: uncertainNumber(0),
+                    pagesCount: uncertainNumber(0),
+                },
             };
+            const toolCalls = [];
             const start = $getCurrentDate();
-            if (this.options.isVerbose) {
-                console.info(colors__default["default"].bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
-            }
-            try {
-                const rawResponse = await this.limiter
-                    .schedule(() => this.makeRequestWithNetworkRetry(() => client.chat.completions.create(rawRequest)))
-                    .catch((error) => {
-                    assertsError(error);
-                    if (this.options.isVerbose) {
-                        console.info(colors__default["default"].bgRed('error'), error);
-                    }
-                    throw error;
-                });
+            const tools = 'tools' in prompt && Array.isArray(prompt.tools) ? prompt.tools : currentModelRequirements.tools;
+            let isLooping = true;
+            while (isLooping) {
+                const rawRequest = {
+                    ...modelSettings,
+                    messages,
+                    user: (_a = this.options.userId) === null || _a === void 0 ? void 0 : _a.toString(),
+                    tools: tools === undefined ? undefined : mapToolsToOpenAi(tools),
+                };
                 if (this.options.isVerbose) {
-                    console.info(colors__default["default"].bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
-                }
-                const complete = $getCurrentDate();
-                if (!rawResponse.choices[0]) {
-                    throw new PipelineExecutionError(`No choises from ${this.title}`);
-                }
-                if (rawResponse.choices.length > 1) {
-                    // TODO: This should be maybe only warning
-                    throw new PipelineExecutionError(`More than one choise from ${this.title}`);
-                }
-                const resultContent = rawResponse.choices[0].message.content;
-                const usage = this.computeUsage(content || '', resultContent || '', rawResponse);
-                if (resultContent === null) {
-                    throw new PipelineExecutionError(`No response message from ${this.title}`);
+                    console.info(colors__default["default"].bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                 }
-                return exportJson({
-                    name: 'promptResult',
-                    message: `Result of \`OpenAiCompatibleExecutionTools.callChatModel\``,
-                    order: [],
-                    value: {
-                        content: resultContent,
-                        modelName: rawResponse.model || modelName,
-                        timing: {
-                            start,
-                            complete,
+                try {
+                    const rawResponse = await this.limiter
+                        .schedule(() => this.makeRequestWithNetworkRetry(() => client.chat.completions.create(rawRequest)))
+                        .catch((error) => {
+                        assertsError(error);
+                        if (this.options.isVerbose) {
+                            console.info(colors__default["default"].bgRed('error'), error);
+                        }
+                        throw error;
+                    });
+                    if (this.options.isVerbose) {
+                        console.info(colors__default["default"].bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
+                    }
+                    if (!rawResponse.choices[0]) {
+                        throw new PipelineExecutionError(`No choises from ${this.title}`);
+                    }
+                    const responseMessage = rawResponse.choices[0].message;
+                    messages.push(responseMessage);
+                    const usage = this.computeUsage(content || '', responseMessage.content || '', rawResponse);
+                    totalUsage = addUsage(totalUsage, usage);
+                    if (responseMessage.tool_calls && responseMessage.tool_calls.length > 0) {
+                        await forEachAsync(responseMessage.tool_calls, {}, async (toolCall) => {
+                            const functionName = toolCall.function.name;
+                            const functionArgs = toolCall.function.arguments;
+                            const executionTools = this.options
+                                .executionTools;
+                            if (!executionTools || !executionTools.script) {
+                                throw new PipelineExecutionError(`Model requested tool '${functionName}' but no executionTools.script were provided in OpenAiCompatibleExecutionTools options`);
+                            }
+                            // TODO: [DRY] Use some common tool caller
+                            const scriptTools = Array.isArray(executionTools.script)
+                                ? executionTools.script
+                                : [executionTools.script];
+                            let functionResponse;
+                            try {
+                                const scriptTool = scriptTools[0]; // <- TODO: [🧠] Which script tool to use?
+                                functionResponse = await scriptTool.execute({
+                                    scriptLanguage: 'javascript',
+                                    script: `
+                                    const args = ${functionArgs};
+                                    return await ${functionName}(args);
+                                `,
+                                    parameters: {}, // <- TODO: [🧠] What parameters to pass?
+                                });
+                            }
+                            catch (error) {
+                                assertsError(error);
+                                functionResponse = `Error: ${error.message}`;
+                            }
+                            messages.push({
+                                role: 'tool',
+                                tool_call_id: toolCall.id,
+                                content: functionResponse,
+                            });
+                            toolCalls.push({
+                                name: functionName,
+                                arguments: functionArgs,
+                                result: functionResponse,
+                                rawToolCall: toolCall,
+                            });
+                        });
+                        continue;
+                    }
+                    const complete = $getCurrentDate();
+                    const resultContent = responseMessage.content;
+                    if (resultContent === null) {
+                        throw new PipelineExecutionError(`No response message from ${this.title}`);
+                    }
+                    isLooping = false;
+                    return exportJson({
+                        name: 'promptResult',
+                        message: `Result of \`OpenAiCompatibleExecutionTools.callChatModel\``,
+                        order: [],
+                        value: {
+                            content: resultContent,
+                            modelName: rawResponse.model || modelName,
+                            timing: {
+                                start,
+                                complete,
+                            },
+                            usage: totalUsage,
+                            toolCalls,
+                            rawPromptContent,
+                            rawRequest,
+                            rawResponse,
                         },
-                        usage,
-                        rawPromptContent,
-                        rawRequest,
-                        rawResponse,
-                        // <- [🗯]
-                    },
-                });
-            }
-            catch (error) {
-                assertsError(error);
-                // Check if this is an unsupported parameter error
-                if (!isUnsupportedParameterError(error)) {
-                    // If we have attemptStack, include it in the error message
-                    if (attemptStack.length > 0) {
+                    });
+                }
+                catch (error) {
+                    isLooping = false;
+                    assertsError(error);
+                    // Check if this is an unsupported parameter error
+                    if (!isUnsupportedParameterError(error)) {
+                        // If we have attemptStack, include it in the error message
+                        if (attemptStack.length > 0) {
+                            throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
+                                attemptStack
+                                    .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                                    (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                                    `, Error: ${a.errorMessage}` +
+                                    (a.stripped ? ' (stripped and retried)' : ''))
+                                    .join('\n') +
+                                `\nFinal error: ${error.message}`);
+                        }
+                        throw error;
+                    }
+                    // Parse which parameter is unsupported
+                    const unsupportedParameter = parseUnsupportedParameterError(error.message);
+                    if (!unsupportedParameter) {
+                        if (this.options.isVerbose) {
+                            console.warn(colors__default["default"].bgYellow('Warning'), 'Could not parse unsupported parameter from error:', error.message);
+                        }
+                        throw error;
+                    }
+                    // Create a unique key for this model + parameter combination to prevent infinite loops
+                    const retryKey = `${modelName}-${unsupportedParameter}`;
+                    if (retriedUnsupportedParameters.has(retryKey)) {
+                        // Already retried this parameter, throw the error with attemptStack
+                        attemptStack.push({
+                            modelName,
+                            unsupportedParameter,
+                            errorMessage: error.message,
+                            stripped: true,
+                        });
                         throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
                             attemptStack
                                 .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
@@ -19590,52 +19690,25 @@
                                 .join('\n') +
                             `\nFinal error: ${error.message}`);
                     }
-                    throw error;
-                }
-                // Parse which parameter is unsupported
-                const unsupportedParameter = parseUnsupportedParameterError(error.message);
-                if (!unsupportedParameter) {
+                    // Mark this parameter as retried
+                    retriedUnsupportedParameters.add(retryKey);
+                    // Log warning in verbose mode
                     if (this.options.isVerbose) {
-                        console.warn(colors__default["default"].bgYellow('Warning'), 'Could not parse unsupported parameter from error:', error.message);
+                        console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
                     }
-                    throw error;
-                }
-                // Create a unique key for this model + parameter combination to prevent infinite loops
-                const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (retriedUnsupportedParameters.has(retryKey)) {
-                    // Already retried this parameter, throw the error with attemptStack
+                    // Add to attemptStack
                     attemptStack.push({
                         modelName,
                         unsupportedParameter,
                         errorMessage: error.message,
                         stripped: true,
                     });
-                    throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                        attemptStack
-                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
-                            (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
-                            `, Error: ${a.errorMessage}` +
-                            (a.stripped ? ' (stripped and retried)' : ''))
-                            .join('\n') +
-                        `\nFinal error: ${error.message}`);
+                    // Remove the unsupported parameter and retry
+                    const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
+                    return this.callChatModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
                 }
-                // Mark this parameter as retried
-                retriedUnsupportedParameters.add(retryKey);
-                // Log warning in verbose mode
-                if (this.options.isVerbose) {
-                    console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
-                }
-                // Add to attemptStack
-                attemptStack.push({
-                    modelName,
-                    unsupportedParameter,
-                    errorMessage: error.message,
-                    stripped: true,
-                });
-                // Remove the unsupported parameter and retry
-                const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callChatModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
             }
+            throw new PipelineExecutionError(`Tool calling loop did not return a result from ${this.title}`);
         }
         /**
          * Calls OpenAI API to use a complete model.
@@ -23428,6 +23501,79 @@
      * Note: [💞] Ignore a discrepancy between file name and entity name
      */
 
+    /**
+     * IMPORT commitment definition
+     *
+     * The IMPORT commitment tells the agent to import content from another agent at the current location.
+     *
+     * Example usage in agent source:
+     *
+     * ```book
+     * IMPORT https://s6.ptbk.io/benjamin-white
+     * ```
+     *
+     * @private [🪔] Maybe export the commitments through some package
+     */
+    class ImportCommitmentDefinition extends BaseCommitmentDefinition {
+        constructor(type = 'IMPORT') {
+            super(type);
+        }
+        /**
+         * Short one-line description of IMPORT.
+         */
+        get description() {
+            return 'Import content from another agent.';
+        }
+        /**
+         * Icon for this commitment.
+         */
+        get icon() {
+            return '📥';
+        }
+        /**
+         * Markdown documentation for IMPORT commitment.
+         */
+        get documentation() {
+            return spaceTrim$1.spaceTrim(`
+            # ${this.type}
+
+            Imports content from another agent at the location of the commitment.
+
+            ## Examples
+
+            \`\`\`book
+            My AI Agent
+
+            IMPORT https://s6.ptbk.io/benjamin-white
+            RULE Speak only in English.
+            \`\`\`
+        `);
+        }
+        applyToAgentModelRequirements(requirements, content) {
+            const trimmedContent = content.trim();
+            if (!trimmedContent) {
+                return requirements;
+            }
+            if (!isValidAgentUrl(trimmedContent)) {
+                throw new Error(spaceTrim$1.spaceTrim((block) => `
+                        Invalid agent URL in IMPORT commitment: "${trimmedContent}"
+
+                        \`\`\`book
+                        ${block(content)}
+                        \`\`\`
+                `));
+            }
+            const importedAgentUrl = trimmedContent;
+            return {
+                ...requirements,
+                importedAgentUrls: [...(requirements.importedAgentUrls || []), importedAgentUrl],
+            };
+        }
+    }
+    /**
+     * Note: [💞] Ignore a discrepancy between file name and entity name
+     */
+
     /**
      * GOAL commitment definition
      *
@@ -25789,7 +25935,7 @@
             // Add 'web_browser' to tools if not already present
             const updatedTools = existingTools.some((tool) => tool.name === 'web_browser')
                 ? existingTools
-                : [
+                : ([
                     // TODO: [🔰] Use through proper MCP server
                     ...existingTools,
                     {
@@ -25809,7 +25955,7 @@
                             required: ['url'],
                         },
                     },
-                ];
+                ]);
             // Return requirements with updated tools and metadata
             return {
                 ...requirements,
@@ -26111,6 +26257,8 @@
         new FormatCommitmentDefinition('FORMAT'),
         new FormatCommitmentDefinition('FORMATS'),
         new FromCommitmentDefinition('FROM'),
+        new ImportCommitmentDefinition('IMPORT'),
+        new ImportCommitmentDefinition('IMPORTS'),
         new ModelCommitmentDefinition('MODEL'),
         new ModelCommitmentDefinition('MODELS'),
         new ActionCommitmentDefinition('ACTION'),