@promptbook/cli 0.112.0-57 → 0.112.0-59

package/esm/index.es.js

@@ -58,7 +58,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.112.0-57';
+const PROMPTBOOK_ENGINE_VERSION = '0.112.0-59';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -18137,6 +18137,49 @@ class BaseCommitmentDefinition {
             return this.appendToSystemMessage(requirements, commentSection);
         }
     }
+    /**
+     * Helper method to append a bullet point to an existing `## SectionTitle` section in the system
+     * message, or to create a new section when it does not yet exist.
+     *
+     * Handles the case where the same commitment type appears multiple times in the book source and
+     * all entries should be grouped under one shared heading rather than emitting a duplicate block.
+     *
+     * @param requirements - Current model requirements.
+     * @param sectionTitle - Section title without the `##` prefix.
+     * @param bulletContent - Bullet content without the leading `-   ` prefix.
+     * @returns Requirements with the bullet appended to the section.
+     */
+    appendBulletPointToSection(requirements, sectionTitle, bulletContent) {
+        const sectionHeader = `## ${sectionTitle}`;
+        const bullet = `-   ${bulletContent}`;
+        if (requirements.systemMessage.includes(sectionHeader)) {
+            // Append bullet to end of existing section, before the next h2 heading or end of message
+            const newSystemMessage = requirements.systemMessage.replace(new RegExp(`(## ${sectionTitle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n\\n)([\\s\\S]*?)(?=\\n\\n##|$)`), `$1$2\n${bullet}`);
+            return { ...requirements, systemMessage: newSystemMessage };
+        }
+        return this.appendToSystemMessage(requirements, `${sectionHeader}\n\n${bullet}`, '\n\n');
+    }
+    /**
+     * Helper method to replace an existing `## SectionTitle` section in the system message, or to
+     * append a new one when the section does not yet exist.
+     *
+     * Use this when a commitment type can appear multiple times and each subsequent occurrence should
+     * update the single shared section rather than appending a duplicate block.
+     *
+     * @param requirements - Current model requirements.
+     * @param sectionTitle - Section title without the `##` prefix.
+     * @param sectionContent - Full section content including the `## Title` header line.
+     * @returns Requirements with the section replaced or appended.
+     */
+    replaceOrCreateSection(requirements, sectionTitle, sectionContent) {
+        const sectionHeader = `## ${sectionTitle}`;
+        if (requirements.systemMessage.includes(sectionHeader)) {
+            // Replace all text from the heading until the next h2 heading or end of message
+            const newSystemMessage = requirements.systemMessage.replace(new RegExp(`## ${sectionTitle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?(?=\\n\\n##|$)`), sectionContent);
+            return { ...requirements, systemMessage: newSystemMessage };
+        }
+        return this.appendToSystemMessage(requirements, sectionContent, '\n\n');
+    }
     /**
      * Gets tool function implementations provided by this commitment
      *
@@ -18598,20 +18641,16 @@ class DictionaryCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Get existing dictionary entries from metadata
+        // Store the entry in metadata for debugging and inspection
         const existingDictionary = ((_a = requirements._metadata) === null || _a === void 0 ? void 0 : _a.DICTIONARY) || '';
-        // Merge the new dictionary entry with existing entries
         const mergedDictionary = existingDictionary ? `${existingDictionary}\n${trimmedContent}` : trimmedContent;
-        // Store the merged dictionary in metadata for debugging and inspection
         const updatedMetadata = {
             ...requirements._metadata,
             DICTIONARY: mergedDictionary,
         };
-        // Create the dictionary section for the system message
-        // Format: "# DICTIONARY\nTerm: definition\nTerm: definition..."
-        const dictionarySection = `# DICTIONARY\n${mergedDictionary}`;
+        // Append each dictionary entry as a bullet point under ## Dictionary
         return {
-            ...this.appendToSystemMessage(requirements, dictionarySection),
+            ...this.appendBulletPointToSection(requirements, 'Dictionary', trimmedContent),
             _metadata: updatedMetadata,
         };
     }
@@ -19114,10 +19153,10 @@ class GoalCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Add goal to the system message
-        const goalSection = `Goal: ${trimmedContent}`;
+        // Add goal as a proper h2 section to the system message
+        const goalSection = `## Goal\n\n${trimmedContent}`;
         const requirementsWithGoal = this.appendToSystemMessage(requirements, goalSection, '\n\n');
-        return this.appendToPromptSuffix(requirementsWithGoal, goalSection);
+        return this.appendToPromptSuffix(requirementsWithGoal, trimmedContent);
     }
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
@@ -19637,11 +19676,8 @@ class LanguageCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Add language rule to the system message
-        const languageSection = this.createSystemMessageSection('Language:', spaceTrim$1((block) => `
-                    ${block(trimmedContent)}
-                    <- You are speaking these languages in your responses to the user.
-                `));
+        // Add language as a bullet under a ## Language section
+        const languageSection = `## Language\n\n-   Your language is ${trimmedContent}`;
         return this.appendToSystemMessage(requirements, languageSection, '\n\n');
     }
 }
@@ -19685,15 +19721,16 @@ const MemoryToolNames = {
  */
 function createMemorySystemMessage(extraInstructions) {
     return spaceTrim$1((block) => `
-            Memory:
-            - Prefer storing agent-scoped memories; only make them global when the fact should apply across all your agents.
-            - You can use persistent user memory tools.
-            - Use "${MemoryToolNames.retrieve}" to load relevant memory before answering.
-            - Use "${MemoryToolNames.store}" to save stable user-specific facts that improve future help.
-            - Use "${MemoryToolNames.update}" to refresh an existing memory when the content changes.
-            - Use "${MemoryToolNames.delete}" to delete memories that are no longer accurate (deletions are soft and hidden from future queries).
-            - Store concise memory items and avoid duplicates.
-            - Never claim memory was saved or loaded unless the tool confirms it.
+            ## Memory
+
+            -   Prefer storing agent-scoped memories; only make them global when the fact should apply across all your agents.
+            -   You can use persistent user memory tools.
+            -   Use \`${MemoryToolNames.retrieve}\` to load relevant memory before answering.
+            -   Use \`${MemoryToolNames.store}\` to save stable user-specific facts that improve future help.
+            -   Use \`${MemoryToolNames.update}\` to refresh an existing memory when the content changes.
+            -   Use \`${MemoryToolNames.delete}\` to delete memories that are no longer accurate (deletions are soft and hidden from future queries).
+            -   Store concise memory items and avoid duplicates.
+            -   Never claim memory was saved or loaded unless the tool confirms it.
             ${block(extraInstructions)}
         `);
 }
@@ -20615,10 +20652,8 @@ class MessageCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Create message section for system message
-        const messageSection = `Previous Message: ${trimmedContent}`;
         // Messages represent conversation history and should be included for context
-        return this.appendToSystemMessage(requirements, messageSection, '\n\n');
+        return this.appendBulletPointToSection(requirements, 'Previous messages', trimmedContent);
     }
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
@@ -25412,10 +25447,9 @@ class RuleCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Add rule to the system message
-        const ruleSection = `Rule: ${trimmedContent}`;
-        const requirementsWithRule = this.appendToSystemMessage(requirements, ruleSection, '\n\n');
-        return this.appendToPromptSuffix(requirementsWithRule, ruleSection);
+        // Group all rules under a single ## Rules section as bullet points
+        const requirementsWithRule = this.appendBulletPointToSection(requirements, 'Rules', trimmedContent);
+        return this.appendToPromptSuffix(requirementsWithRule, `-   ${trimmedContent}`);
     }
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
@@ -25651,10 +25685,8 @@ class ScenarioCommitmentDefinition extends BaseCommitmentDefinition {
         if (!trimmedContent) {
             return requirements;
         }
-        // Create scenario section for system message
-        const scenarioSection = `Scenario: ${trimmedContent}`;
         // Scenarios provide important contextual information that affects behavior
-        return this.appendToSystemMessage(requirements, scenarioSection, '\n\n');
+        return this.appendBulletPointToSection(requirements, 'Scenarios', trimmedContent);
     }
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
@@ -26037,8 +26069,8 @@ const teamToolTitles = {};
  * @private
  */
 const TEAM_SYSTEM_MESSAGE_GUIDANCE_LINES = [
-    '- If a teammate is relevant to the request, consult that teammate using the matching tool.',
-    '- Do not ask the user for information that a listed teammate can provide directly.',
+    '-   If a teammate is relevant to the request, consult that teammate using the matching tool.',
+    '-   Do not ask the user for information that a listed teammate can provide directly.',
 ];
 /**
  * Constant for remote agents by Url.
@@ -26166,7 +26198,7 @@ class TeamCommitmentDefinition extends BaseCommitmentDefinition {
                 toolName: entry.toolName,
             });
         }
-        const teamSystemMessage = this.createSystemMessageSection('Teammates:', buildTeamSystemMessageBody(teamEntries));
+        const teamSystemMessage = this.createSystemMessageSection('Teammates', buildTeamSystemMessageBody(teamEntries));
         return this.appendToSystemMessage({
             ...requirements,
             tools: updatedTools,
@@ -26656,36 +26688,38 @@ function createAggregatedUseCommitmentSystemMessage(type, additionalInstructions
     switch (type) {
         case 'USE TIME':
             return spaceTrim$1((block) => `
-                    Time and date context:
-                    - It is ${moment().format('MMMM YYYY')} now.
-                    - If you need more precise current time information, use the tool "get_current_time".
+                    ## Time and date context
+
+                    -   It is ${moment().format('MMMM YYYY')} now.
+                    -   If you need more precise current time information, use the tool \`get_current_time\`.
                     ${block(formatOptionalInstructionBlock('Time instructions', combinedAdditionalInstructions))}
                 `);
         case 'USE BROWSER':
             return spaceTrim$1((block) => `
-                    You have access to browser tools to fetch and access content from the internet.
-                    - Use "fetch_url_content" to retrieve content from specific URLs (webpages or documents) using scrapers.
-                    - Use "run_browser" for real interactive browser automation (navigation, clicks, typing, waiting, scrolling).
-                    When you need to know information from a specific website or document, use the fetch_url_content tool.
+                    ## Browser
+
+                    -   Use \`fetch_url_content\` to retrieve content from specific URLs (webpages or documents) using scrapers.
+                    -   Use \`run_browser\` for real interactive browser automation (navigation, clicks, typing, waiting, scrolling).
+                    -   When you need to know information from a specific website or document, use the tools provided.
                     ${block(formatOptionalInstructionBlock('Browser instructions', combinedAdditionalInstructions))}
                 `);
         case 'USE SEARCH ENGINE':
             return spaceTrim$1((block) => `
-                    Tool:
-                    - You have access to the web search engine via the tool "web_search".
-                    - Use it to find up-to-date information or facts that you don't know.
-                    - When you need to know some information from the internet, use the tool provided to you.
-                    - Do not make up information when you can search for it.
-                    - Do not tell the user you cannot search for information, YOU CAN.
+                    ## Web Search
+
+                    -   Use \`web_search\` to find up-to-date information or facts.
+                    -   When you need to know some information from the internet, use the search tool provided.
+                    -   Do not make up information when you can search for it.
+                    -   Do not tell the user you cannot search for information, YOU CAN.
                     ${block(formatOptionalInstructionBlock('Search instructions', combinedAdditionalInstructions))}
                 `);
         case 'USE DEEPSEARCH':
             return spaceTrim$1((block) => `
-                    Tool:
-                    - You have access to DeepSearch via the tool "deep_search".
-                    - Use it for broader research tasks that need multi-step investigation, comparison, or synthesis across multiple sources.
-                    - Prefer it over quick search when the user asks for a well-grounded brief, report, or deeper investigation.
-                    - Do not pretend you cannot research current information when this tool is available.
+                    ## Deep Research
+
+                    -   Use \`deep_search\` for broader research tasks that need multi-step investigation, comparison, or synthesis across multiple sources.
+                    -   Prefer it over quick search when the user asks for a well-grounded brief, report, or deeper investigation.
+                    -   Do not pretend you cannot research current information when this tool is available.
                     ${block(formatOptionalInstructionBlock('DeepSearch instructions', combinedAdditionalInstructions))}
                 `);
     }
@@ -27015,96 +27049,6 @@ class UseBrowserCommitmentDefinition extends BaseCommitmentDefinition {
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
 
-/**
- * Base Google Calendar API URL.
- *
- * @private constant of callGoogleCalendarApi
- */
-const GOOGLE_CALENDAR_API_BASE_URL = 'https://www.googleapis.com/calendar/v3';
-/**
- * Runs one Google Calendar API request and parses JSON response payload.
- *
- * @private function of UseCalendarCommitmentDefinition
- */
-async function callGoogleCalendarApi(accessToken, options) {
-    const url = new URL(options.path, GOOGLE_CALENDAR_API_BASE_URL);
-    if (options.query) {
-        for (const [key, value] of Object.entries(options.query)) {
-            if (value && value.trim()) {
-                url.searchParams.set(key, value);
-            }
-        }
-    }
-    const response = await fetch(url.toString(), {
-        method: options.method,
-        headers: {
-            Authorization: `Bearer ${accessToken}`,
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-        },
-        body: options.body ? JSON.stringify(options.body) : undefined,
-    });
-    const textPayload = await response.text();
-    const parsedPayload = tryParseJson$2(textPayload);
-    if (options.allowNotFound && response.status === 404) {
-        return null;
-    }
-    if (!response.ok) {
-        throw new Error(spaceTrim$1(`
-                Google Calendar API request failed (${response.status} ${response.statusText}):
-                ${extractGoogleCalendarApiErrorMessage(parsedPayload, textPayload)}
-            `));
-    }
-    return parsedPayload;
-}
-/**
- * Parses raw text into JSON when possible.
- *
- * @private function of callGoogleCalendarApi
- */
-function tryParseJson$2(rawText) {
-    if (!rawText.trim()) {
-        return {};
-    }
-    try {
-        return JSON.parse(rawText);
-    }
-    catch (_a) {
-        return rawText;
-    }
-}
-/**
- * Extracts a user-friendly Google Calendar API error message.
- *
- * @private function of callGoogleCalendarApi
- */
-function extractGoogleCalendarApiErrorMessage(parsedPayload, fallbackText) {
-    if (parsedPayload && typeof parsedPayload === 'object') {
-        const payload = parsedPayload;
-        const errorPayload = payload.error;
-        if (errorPayload && typeof errorPayload === 'object') {
-            const normalizedErrorPayload = errorPayload;
-            const message = typeof normalizedErrorPayload.message === 'string' ? normalizedErrorPayload.message : '';
-            const errors = Array.isArray(normalizedErrorPayload.errors) ? normalizedErrorPayload.errors : [];
-            const flattenedErrors = errors
-                .map((errorEntry) => {
-                if (!errorEntry || typeof errorEntry !== 'object') {
-                    return '';
-                }
-                const normalizedErrorEntry = errorEntry;
-                const detailMessage = typeof normalizedErrorEntry.message === 'string' ? normalizedErrorEntry.message : '';
-                const reason = typeof normalizedErrorEntry.reason === 'string' ? normalizedErrorEntry.reason : '';
-                return [detailMessage, reason].filter(Boolean).join(' | ');
-            })
-                .filter(Boolean);
-            if (message || flattenedErrors.length > 0) {
-                return [message, ...flattenedErrors].filter(Boolean).join(' | ');
-            }
-        }
-    }
-    return fallbackText || 'Unknown Google Calendar API error';
-}
-
 /**
  * Hostnames accepted for Google Calendar references.
  *
@@ -27286,6 +27230,96 @@ function removeTokenFromLine(line, token) {
 }
 // Note: [💞] Ignore a discrepancy between file name and entity name
 
+/**
+ * Base Google Calendar API URL.
+ *
+ * @private constant of callGoogleCalendarApi
+ */
+const GOOGLE_CALENDAR_API_BASE_URL = 'https://www.googleapis.com/calendar/v3';
+/**
+ * Runs one Google Calendar API request and parses JSON response payload.
+ *
+ * @private function of UseCalendarCommitmentDefinition
+ */
+async function callGoogleCalendarApi(accessToken, options) {
+    const url = new URL(options.path, GOOGLE_CALENDAR_API_BASE_URL);
+    if (options.query) {
+        for (const [key, value] of Object.entries(options.query)) {
+            if (value && value.trim()) {
+                url.searchParams.set(key, value);
+            }
+        }
+    }
+    const response = await fetch(url.toString(), {
+        method: options.method,
+        headers: {
+            Authorization: `Bearer ${accessToken}`,
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+        },
+        body: options.body ? JSON.stringify(options.body) : undefined,
+    });
+    const textPayload = await response.text();
+    const parsedPayload = tryParseJson$2(textPayload);
+    if (options.allowNotFound && response.status === 404) {
+        return null;
+    }
+    if (!response.ok) {
+        throw new Error(spaceTrim$1(`
+                Google Calendar API request failed (${response.status} ${response.statusText}):
+                ${extractGoogleCalendarApiErrorMessage(parsedPayload, textPayload)}
+            `));
+    }
+    return parsedPayload;
+}
+/**
+ * Parses raw text into JSON when possible.
+ *
+ * @private function of callGoogleCalendarApi
+ */
+function tryParseJson$2(rawText) {
+    if (!rawText.trim()) {
+        return {};
+    }
+    try {
+        return JSON.parse(rawText);
+    }
+    catch (_a) {
+        return rawText;
+    }
+}
+/**
+ * Extracts a user-friendly Google Calendar API error message.
+ *
+ * @private function of callGoogleCalendarApi
+ */
+function extractGoogleCalendarApiErrorMessage(parsedPayload, fallbackText) {
+    if (parsedPayload && typeof parsedPayload === 'object') {
+        const payload = parsedPayload;
+        const errorPayload = payload.error;
+        if (errorPayload && typeof errorPayload === 'object') {
+            const normalizedErrorPayload = errorPayload;
+            const message = typeof normalizedErrorPayload.message === 'string' ? normalizedErrorPayload.message : '';
+            const errors = Array.isArray(normalizedErrorPayload.errors) ? normalizedErrorPayload.errors : [];
+            const flattenedErrors = errors
+                .map((errorEntry) => {
+                if (!errorEntry || typeof errorEntry !== 'object') {
+                    return '';
+                }
+                const normalizedErrorEntry = errorEntry;
+                const detailMessage = typeof normalizedErrorEntry.message === 'string' ? normalizedErrorEntry.message : '';
+                const reason = typeof normalizedErrorEntry.reason === 'string' ? normalizedErrorEntry.reason : '';
+                return [detailMessage, reason].filter(Boolean).join(' | ');
+            })
+                .filter(Boolean);
+            if (message || flattenedErrors.length > 0) {
+                return [message, ...flattenedErrors].filter(Boolean).join(' | ');
+            }
+        }
+    }
+    return fallbackText || 'Unknown Google Calendar API error';
+}
+
 /**
  * Wallet metadata used by USE CALENDAR when resolving Google Calendar credentials.
  *
@@ -28186,18 +28220,20 @@ class UseCalendarCommitmentDefinition extends BaseCommitmentDefinition {
         if (parsedCommitment.calendar) {
             addConfiguredCalendarIfMissing(existingConfiguredCalendars, parsedCommitment.calendar);
         }
-        const calendarsList = existingConfiguredCalendars.length > 0
-            ? existingConfiguredCalendars
-                .map((calendar) => [
-                `- ${calendar.provider}: ${calendar.url}`,
-                calendar.scopes.length > 0 ? `  scopes: ${calendar.scopes.join(', ')}` : '',
-            ]
-                .filter(Boolean)
-                .join('\n'))
-                .join('\n')
-            : '- Calendar is resolved from runtime context';
+        const calendarBullets = existingConfiguredCalendars.length > 0
+            ? existingConfiguredCalendars.map((calendar) => `-   ${calendar.provider}: ${calendar.url}`).join('\n')
+            : '-   Calendar is resolved from runtime context';
         const extraInstructions = formatOptionalInstructionBlock('Calendar instructions', parsedCommitment.instructions);
-        return this.appendToSystemMessage({
+        const calendarSectionContent = spaceTrim$1((block) => `
+                ## Calendar
+
+                -   Use \`calendar_list_events\`, \`calendar_get_event\`, \`calendar_create_event\`, \`calendar_update_event\`, \`calendar_delete_event\`, and \`calendar_invite_guests\` to manage events in configured calendars.
+                -   Supported operations include read, create, update, delete, invite guests, and reminders.
+                -   Configured calendars:
+                ${block(calendarBullets)}
+                ${block(extraInstructions)}
+            `);
+        return this.replaceOrCreateSection({
             ...requirements,
             tools: createUseCalendarTools(requirements.tools || []),
             _metadata: {
@@ -28205,16 +28241,7 @@ class UseCalendarCommitmentDefinition extends BaseCommitmentDefinition {
                 useCalendar: true,
                 useCalendars: existingConfiguredCalendars,
             },
-        }, spaceTrim$1((block) => `
-                    Calendar tools:
-                    - You can inspect and manage events in configured calendars.
-                    - Supported operations include read, create, update, delete, invite guests, and reminders.
-                    - Configured calendars:
-                      ${block(calendarsList)}
-                    - USE CALENDAR credentials are read from wallet records (ACCESS_TOKEN, service "${UseCalendarWallet.service}", key "${UseCalendarWallet.key}").
-                    - If credentials are missing, ask user to connect calendar credentials in host UI and/or add them to wallet.
-                    ${block(extraInstructions)}
-                `));
+        }, 'Calendar', calendarSectionContent);
     }
     /**
      * Gets human-readable titles for tool functions provided by this commitment.
@@ -28551,18 +28578,6 @@ async function sendEmailViaBrowser(args, agentsServerUrl) {
  * @private internal USE EMAIL constant
  */
 const SEND_EMAIL_TOOL_NAME = 'send_email';
-/**
- * Wallet service used for SMTP credentials required by USE EMAIL.
- *
- * @private internal USE EMAIL constant
- */
-const USE_EMAIL_SMTP_WALLET_SERVICE = 'smtp';
-/**
- * Wallet key used for SMTP credentials required by USE EMAIL.
- *
- * @private internal USE EMAIL constant
- */
-const USE_EMAIL_SMTP_WALLET_KEY = 'use-email-smtp-credentials';
 /**
  * USE EMAIL commitment definition.
  *
@@ -28621,31 +28636,41 @@ class UseEmailCommitmentDefinition extends BaseCommitmentDefinition {
         `);
     }
     applyToAgentModelRequirements(requirements, content) {
+        var _a;
         const parsedCommitment = parseUseEmailCommitmentContent(content);
-        const extraInstructions = formatOptionalInstructionBlock('Email instructions', parsedCommitment.instructions);
-        const senderInstruction = parsedCommitment.senderEmail
-            ? `- Default sender address from commitment: "${parsedCommitment.senderEmail}".`
-            : '';
         const updatedTools = addUseEmailTools(requirements.tools || []);
-        return this.appendToSystemMessage({
+        // Collect all configured sender emails across multiple USE EMAIL commitments
+        const existingSenders = Array.isArray((_a = requirements._metadata) === null || _a === void 0 ? void 0 : _a.useEmailSenders)
+            ? [...requirements._metadata.useEmailSenders]
+            : [];
+        if (parsedCommitment.senderEmail && !existingSenders.includes(parsedCommitment.senderEmail)) {
+            existingSenders.push(parsedCommitment.senderEmail);
+        }
+        const senderBullets = existingSenders.length > 0
+            ? existingSenders
+                .map((email, index) => index === 0
+                ? `-   Default sender address: "${email}".`
+                : `-   Additional sender address: "${email}".`)
+                .join('\n')
+            : '';
+        const extraInstructions = formatOptionalInstructionBlock('Email instructions', parsedCommitment.instructions);
+        const emailSectionContent = spaceTrim$1((block) => `
+                ## Emails
+
+                -   Use \`${SEND_EMAIL_TOOL_NAME}\` to send outbound emails.
+                ${block(senderBullets)}
+                ${block(extraInstructions)}
+            `);
+        return this.replaceOrCreateSection({
             ...requirements,
             tools: updatedTools,
             _metadata: {
                 ...requirements._metadata,
                 useEmail: true,
                 ...(parsedCommitment.senderEmail ? { useEmailSender: parsedCommitment.senderEmail } : {}),
+                useEmailSenders: existingSenders,
             },
-        }, spaceTrim$1((block) => `
-                    Email tool:
-                    - Use "${SEND_EMAIL_TOOL_NAME}" to send outbound emails.
-                    - Prefer \`message\` argument compatible with Promptbook \`Message\` type.
-                    - Include subject in \`message.metadata.subject\` (or use legacy \`subject\` argument).
-                    - USE EMAIL credentials are read from wallet records (ACCESS_TOKEN, service "${USE_EMAIL_SMTP_WALLET_SERVICE}", key "${USE_EMAIL_SMTP_WALLET_KEY}").
-                    - Wallet secret must contain SMTP credentials in JSON format with fields \`host\`, \`port\`, \`secure\`, \`username\`, \`password\`.
-                    - If credentials are missing, ask user to add wallet credentials.
-                    ${block(senderInstruction)}
-                    ${block(extraInstructions)}
-                `));
+        }, 'Emails', emailSectionContent);
     }
     /**
      * Gets human-readable titles for tool functions provided by this commitment.
@@ -28681,13 +28706,13 @@ function addUseEmailTools(existingTools) {
         ...existingTools,
         {
             name: SEND_EMAIL_TOOL_NAME,
-            description: 'Send an outbound email through configured SMTP credentials. Prefer providing Message-like payload in `message`.',
+            description: 'Send an outbound email.',
             parameters: {
                 type: 'object',
                 properties: {
                     message: {
                         type: 'object',
-                        description: 'Preferred input payload compatible with Promptbook Message type. Use metadata.subject for subject line.',
+                        description: 'Email payload. Use metadata.subject for the subject line.',
                     },
                     to: {
                         type: 'string',
@@ -28791,13 +28816,14 @@ class UseImageGeneratorCommitmentDefinition extends BaseCommitmentDefinition {
                 useImageGenerator: content || true,
             },
         }, spaceTrim$1((block) => `
-                    Image generation:
-                    - You do not generate images directly and you do not call any image tool.
-                    - When the user asks for an image, include markdown notation in your message:
-                      \`![<alt text>](?image-prompt=<prompt>)\`
-                    - Keep \`<alt text>\` short and descriptive.
-                    - Keep \`<prompt>\` detailed so the generated image matches the request.
-                    - You can include normal explanatory text before and after the notation.
+                    ## Image generation
+
+                    -   You do not generate images directly and you do not call any image tool.
+                    -   When the user asks for an image, include markdown notation in your message:
+                        \`![<alt text>](?image-prompt=<prompt>)\`
+                    -   Keep \`<alt text>\` short and descriptive.
+                    -   Keep \`<prompt>\` detailed so the generated image matches the request.
+                    -   You can include normal explanatory text before and after the notation.
                     ${block(extraInstructions)}
                 `));
     }
@@ -28977,11 +29003,12 @@ class UsePopupCommitmentDefinition extends BaseCommitmentDefinition {
                 usePopup: content || true,
             },
         }, spaceTrim$1((block) => `
-                    Tool:
-                    - You can open a popup window with a specific URL using the tool "open_popup".
-                    - Use this when you want the user to see or interact with a specific website.
+                    ## Popup
+
+                    -   You can open a popup window with a specific URL using the tool \`open_popup\`.
+                    -   Use this when you want the user to see or interact with a specific website.
                     ${block(extraInstructions)}
-            `));
+                `));
     }
     /**
      * Gets human-readable titles for tool functions provided by this commitment.
@@ -29155,11 +29182,12 @@ class UsePrivacyCommitmentDefinition extends BaseCommitmentDefinition {
                 usePrivacy: content || true,
             },
         }, spaceTrim$1((block) => `
-                    Privacy mode:
-                    - Use "${TURN_PRIVACY_ON_TOOL_NAME}" when the user asks for a private/sensitive conversation.
-                    - This tool requests a UI confirmation dialog. Private mode is enabled only after user confirms.
-                    - Current implementation uses the existing chat private mode (no chat persistence, memory persistence, or self-learning while active).
-                    - Do not claim that end-to-end encryption is implemented yet.
+                    ## Privacy
+
+                    -   Use \`${TURN_PRIVACY_ON_TOOL_NAME}\` when the user asks for a private/sensitive conversation.
+                    -   This tool requests a UI confirmation dialog. Private mode is enabled only after user confirms.
+                    -   Current implementation uses the existing chat private mode (no chat persistence, memory persistence, or self-learning while active).
+                    -   Do not claim that end-to-end encryption is implemented yet.
                     ${block(extraInstructions)}
                 `));
     }
@@ -30783,9 +30811,16 @@ class UseProjectCommitmentDefinition extends BaseCommitmentDefinition {
         }
         const existingConfiguredProjects = normalizeConfiguredProjects((_a = requirements._metadata) === null || _a === void 0 ? void 0 : _a.useProjects);
         addConfiguredProjectIfMissing(existingConfiguredProjects, parsedCommitment.repository);
-        const repositoriesList = existingConfiguredProjects.map((project) => `- ${project.url}`).join('\n');
         const extraInstructions = formatOptionalInstructionBlock('Project instructions', parsedCommitment.instructions);
-        return this.appendToSystemMessage({
+        const sectionContent = spaceTrim$1((block) => `
+                -   You can inspect and edit configured GitHub repositories using project tools.
+                -   Configured repositories:
+                    ${block(existingConfiguredProjects.map((project) => `-   ${project.url}`).join('\n'))}
+                -   When a repository is not obvious from context, pass \`repository\` in tool arguments explicitly.
+                -   If credentials are missing, ask the user to connect their GitHub account in the host UI.
+                ${block(extraInstructions)}
+            `);
+        return this.replaceOrCreateSection({
             ...requirements,
             tools: createUseProjectTools(requirements.tools || []),
             _metadata: {
@@ -30793,16 +30828,7 @@ class UseProjectCommitmentDefinition extends BaseCommitmentDefinition {
                 useProject: true,
                 useProjects: existingConfiguredProjects,
             },
-        }, spaceTrim$1((block) => `
-                    Project tools:
-                    - You can inspect and edit configured GitHub repositories using project tools.
-                    - Configured repositories:
-                      ${block(repositoriesList)}
-                    - When a repository is not obvious from context, pass "repository" in tool arguments explicitly.
-                    - USE PROJECT credentials are read from wallet records (ACCESS_TOKEN, service "${UseProjectWallet.service}", key "${UseProjectWallet.key}").
-                    - If credentials are missing, ask the user to connect credentials in host UI and/or add them to wallet.
-                    ${block(extraInstructions)}
-                `));
+        }, 'GitHub repositories', sectionContent);
     }
     /**
      * Gets human-readable titles for tool functions provided by this commitment.
@@ -31149,11 +31175,12 @@ class UseSpawnCommitmentDefinition extends BaseCommitmentDefinition {
                 useSpawn: content || true,
             },
         }, spaceTrim$1((block) => `
-                    Spawning agents:
-                    - Use "${SPAWN_AGENT_TOOL_NAME}" only when user asks to create a persistent new agent.
-                    - Pass full agent source in \`source\`.
-                    - Keep \`source\` concise; the maximum accepted length is ${CREATE_AGENT_INPUT_SOURCE_MAX_LENGTH} characters.
-                    - Do not add unknown fields in tool arguments.
+                    ## Spawning agents
+
+                    -   Use \`${SPAWN_AGENT_TOOL_NAME}\` only when user asks to create a persistent new agent.
+                    -   Pass full agent source in \`source\`.
+                    -   Keep \`source\` concise; the maximum accepted length is ${CREATE_AGENT_INPUT_SOURCE_MAX_LENGTH} characters.
+                    -   Do not add unknown fields in tool arguments.
                     ${block(extraInstructions)}
                 `));
     }
@@ -31187,13 +31214,14 @@ class UseSpawnCommitmentDefinition extends BaseCommitmentDefinition {
  */
 function createTimeoutSystemMessage(extraInstructions) {
     return spaceTrim$1((block) => `
-            Timeout scheduling:
-            - Use "set_timeout" to wake this same chat thread in the future.
-            - Use "list_timeouts" to review timeout ids/details across all chats for the same user+agent scope.
-            - "cancel_timeout" accepts either one timeout id or \`allActive: true\` to cancel all active timeouts in this same user+agent scope.
-            - Use "update_timeout" to pause/resume, edit next run, edit recurrence, or update timeout payload details.
-            - When one timeout elapses, you will receive a new user-like message that explicitly says it is a timeout wake-up and includes the \`timeoutId\`.
-            - Do not claim a timer was set or cancelled unless the tool confirms it.
+            ## Timeout scheduling
+
+            -   Use \`set_timeout\` to wake this same chat thread in the future.
+            -   Use \`list_timeouts\` to review timeout ids/details across all chats for the same user+agent scope.
+            -   \`cancel_timeout\` accepts either one timeout id or \`allActive: true\` to cancel all active timeouts in this same user+agent scope.
+            -   Use \`update_timeout\` to pause/resume, edit next run, edit recurrence, or update timeout payload details.
+            -   When one timeout elapses, you will receive a new user-like message that explicitly says it is a timeout wake-up and includes the \`timeoutId\`.
+            -   Do not claim a timer was set or cancelled unless the tool confirms it.
             ${block(extraInstructions)}
         `);
 }
@@ -32293,10 +32321,11 @@ class UseUserLocationCommitmentDefinition extends BaseCommitmentDefinition {
                 useUserLocation: content || true,
             },
         }, spaceTrim$1((block) => `
-                    User location:
-                    - Use "${GET_USER_LOCATION_TOOL_NAME}" only when location is needed for a better answer.
-                    - If the tool returns "unavailable" or "permission-denied", ask user to share location or provide city manually.
-                    - Do not invent coordinates or local facts when location is unavailable.
+                    ## User location
+
+                    -   Use \`${GET_USER_LOCATION_TOOL_NAME}\` only when location is needed for a better answer.
+                    -   If the tool returns "unavailable" or "permission-denied", ask user to share location or provide city manually.
+                    -   Do not invent coordinates or local facts when location is unavailable.
                     ${block(extraInstructions)}
                 `));
     }
@@ -45639,7 +45668,7 @@ function createExampleInteractionsContent(parseResult, samples) {
     if (examples.length === 0) {
         return null;
     }
-    return `Example interaction:\n\n${examples.join('\n\n')}`;
+    return `## Sample of communication with the agent:\n\n${examples.join('\n\n')}`;
 }
 /**
  * Collects the individual lines used in the example interaction section.
@@ -45655,11 +45684,11 @@ function collectExampleInteractionLines(parseResult, samples) {
     const examples = [];
     const initialMessage = (_a = parseResult.commitments.find((commitment) => commitment.type === 'INITIAL MESSAGE')) === null || _a === void 0 ? void 0 : _a.content;
     if (initialMessage) {
-        examples.push(`Agent: ${initialMessage}`);
+        examples.push(`**Agent:**\n${initialMessage}`);
     }
     if (samples && samples.length > 0) {
         for (const sample of samples) {
-            examples.push(`User: ${sample.question}\nAgent: ${sample.answer}`);
+            examples.push(`**User:** ${sample.question}\n\n**Agent:**\n${sample.answer}`);
         }
     }
     return examples;