@promptbook/core 0.104.0-7 → 0.104.0-9

package/esm/index.es.js

@@ -27,7 +27,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.104.0-7';
+const PROMPTBOOK_ENGINE_VERSION = '0.104.0-9';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -11344,7 +11344,12 @@ async function createAgentModelRequirementsWithCommitments(agentSource, modelNam
         };
     }
     // Apply each commitment in order using reduce-like pattern
-    for (const commitment of filteredCommitments) {
+    for (let i = 0; i < filteredCommitments.length; i++) {
+        const commitment = filteredCommitments[i];
+        // CLOSED commitment should work only if its the last commitment in the book
+        if (commitment.type === 'CLOSED' && i !== filteredCommitments.length - 1) {
+            continue;
+        }
         const definition = getCommitmentDefinition(commitment.type);
         if (definition) {
             try {
@@ -12131,8 +12136,11 @@ const DEFAULT_BOOK = padBook(validateBook(spaceTrim$2(`
  *
  * @public exported from `@promptbook/core`
  */
-function generatePlaceholderAgentProfileImageUrl(agentIdOrName, agentsServerUrl = new URL(CORE_SERVER.urls[0])) {
-    return `${agentsServerUrl}agents/${agentIdOrName}/images/default-avatar.png`;
+function generatePlaceholderAgentProfileImageUrl(agentIdOrName, agentsServerUrl = CORE_SERVER.urls[0]) {
+    if (typeof agentsServerUrl === 'string') {
+        agentsServerUrl = new URL(agentsServerUrl);
+    }
+    return `${agentsServerUrl.href}agents/${agentIdOrName}/images/default-avatar.png`;
 }
 /**
  * TODO: [🤹] Figure out best placeholder image generator https://i.pravatar.cc/1000?u=568
@@ -12238,20 +12246,35 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
     /**
      * [🐱‍🚀]@@@
      */
-    async getAgentSource(agentName) {
+    async getAgentPermanentId(agentNameOrPermanentId) {
+        const selectResult = await this.supabaseClient
+            .from(this.getTableName('Agent'))
+            .select('permanentId')
+            .or(`agentName.eq.${agentNameOrPermanentId},permanentId.eq.${agentNameOrPermanentId}`)
+            .single();
+        if (selectResult.error || !selectResult.data) {
+            throw new NotFoundError(`Agent with name not id "${agentNameOrPermanentId}" not found`);
+        }
+        return selectResult.data.permanentId;
+    }
+    /**
+     * [🐱‍🚀]@@@
+     */
+    async getAgentSource(agentNameOrPermanentId) {
         const selectResult = await this.supabaseClient
             .from(this.getTableName('Agent'))
             .select('agentSource')
-            .or(`agentName.eq.${agentName},permanentId.eq.${agentName}`);
+            .or(`agentName.eq.${agentNameOrPermanentId},permanentId.eq.${agentNameOrPermanentId}`)
+            .is('deletedAt', null);
         if (selectResult.data && selectResult.data.length === 0) {
-            throw new NotFoundError(`Agent "${agentName}" not found`);
+            throw new NotFoundError(`Agent "${agentNameOrPermanentId}" not found`);
         }
         else if (selectResult.data && selectResult.data.length > 1) {
-            throw new UnexpectedError(`More agents with agentName="${agentName}" found`);
+            throw new UnexpectedError(`More agents with name or id "${agentNameOrPermanentId}" found`);
         }
         else if (selectResult.error) {
             throw new DatabaseError(spaceTrim((block) => `
-                        Error fetching agent "${agentName}" from Supabase:
+                        Error fetching agent "${agentNameOrPermanentId}" from Supabase:
                         
                         ${block(selectResult.error.message)}
                     `));
@@ -12266,19 +12289,19 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
     async createAgent(agentSource) {
         let agentProfile = parseAgentSource(agentSource);
         //     <- TODO: [🕛]
-        const { agentName, agentHash } = agentProfile;
+        // 1. Extract permanentId from the source if present
         let { permanentId } = agentProfile;
+        // 2. Remove META ID from the source
+        const lines = agentSource.split('\n');
+        const strippedLines = lines.filter((line) => !line.trim().startsWith('META ID '));
+        if (lines.length !== strippedLines.length) {
+            agentSource = strippedLines.join('\n');
+            // 3. Re-parse the agent source to get the correct hash and other info
+            agentProfile = parseAgentSource(agentSource);
+        }
+        const { agentName, agentHash } = agentProfile;
         if (!permanentId) {
             permanentId = $randomBase58(14);
-            const lines = agentSource.split('\n');
-            if (lines.length > 0) {
-                lines.splice(1, 0, `META ID ${permanentId}`);
-                agentSource = lines.join('\n');
-            }
-            else {
-                agentSource = `META ID ${permanentId}\n${agentSource}`;
-            }
-            agentProfile = parseAgentSource(agentSource);
         }
         const insertAgentResult = await this.supabaseClient.from(this.getTableName('Agent')).insert({
             agentName,
@@ -12301,6 +12324,7 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         await this.supabaseClient.from(this.getTableName('AgentHistory')).insert({
             createdAt: new Date().toISOString(),
             agentName,
+            permanentId,
             agentHash,
             previousAgentHash: null,
             agentSource,
@@ -12312,17 +12336,17 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
     /**
      * Updates an existing agent in the collection
      */
-    async updateAgentSource(agentName, agentSource) {
-        console.log('!!! updateAgentSource', { agentName });
+    async updateAgentSource(permanentId, agentSource) {
+        console.log('!!! updateAgentSource', { permanentId });
         const selectPreviousAgentResult = await this.supabaseClient
             .from(this.getTableName('Agent'))
             .select('agentHash,agentName,permanentId')
-            .eq('agentName', agentName)
+            .eq('permanentId', permanentId)
             .single();
         if (selectPreviousAgentResult.error) {
             throw new DatabaseError(spaceTrim((block) => `
                 
-                        Error fetching agent "${agentName}" from Supabase:
+                        Error fetching agent "${permanentId}" from Supabase:
                         
                         ${block(selectPreviousAgentResult.error.message)}
                     `));
@@ -12333,20 +12357,27 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         const previousPermanentId = selectPreviousAgentResult.data.permanentId;
         let agentProfile = parseAgentSource(agentSource);
         //     <- TODO: [🕛]
-        const { agentHash } = agentProfile;
-        let { permanentId } = agentProfile;
-        if (!permanentId && previousPermanentId) {
-            permanentId = previousPermanentId;
-            const lines = agentSource.split('\n');
-            if (lines.length > 0) {
-                lines.splice(1, 0, `META ID ${permanentId}`);
-                agentSource = lines.join('\n');
-            }
-            else {
-                agentSource = `META ID ${permanentId}\n${agentSource}`;
-            }
+        // 1. Extract permanentId from the source if present
+        let { permanentId: newPermanentId } = agentProfile;
+        // 2. Remove META ID from the source
+        const lines = agentSource.split('\n');
+        const strippedLines = lines.filter((line) => !line.trim().startsWith('META ID '));
+        if (lines.length !== strippedLines.length) {
+            agentSource = strippedLines.join('\n');
+            // 3. Re-parse the agent source to get the correct hash and other info
             agentProfile = parseAgentSource(agentSource);
         }
+        const { agentHash, agentName } = agentProfile;
+        if (!newPermanentId && previousPermanentId) {
+            newPermanentId = previousPermanentId;
+        }
+        if (!newPermanentId) {
+            newPermanentId = $randomBase58(14);
+        }
+        if (newPermanentId !== permanentId) {
+            // [🧠] Should be allowed to change permanentId?
+            throw new UnexpectedError(`Permanent ID mismatch: "${permanentId}" (argument) !== "${newPermanentId}" (in source)`);
+        }
         const updateAgentResult = await this.supabaseClient
             .from(this.getTableName('Agent'))
             .update({
@@ -12358,13 +12389,13 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
             agentSource,
             promptbookEngineVersion: PROMPTBOOK_ENGINE_VERSION,
         })
-            .eq('agentName', agentName);
+            .eq('permanentId', permanentId);
         // console.log('[🐱‍🚀] updateAgent', updateResult);
         // console.log('[🐱‍🚀] old', oldAgentSource);
         // console.log('[🐱‍🚀] new', newAgentSource);
         if (updateAgentResult.error) {
             throw new DatabaseError(spaceTrim((block) => `
-                        Error updating agent "${agentName}" in Supabase:
+                        Error updating agent "${permanentId}" in Supabase:
                         
                         ${block(updateAgentResult.error.message)}
                     `));
@@ -12372,6 +12403,7 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         await this.supabaseClient.from(this.getTableName('AgentHistory')).insert({
             createdAt: new Date().toISOString(),
             agentName,
+            permanentId,
             agentHash,
             previousAgentHash,
             agentSource,
@@ -12379,7 +12411,7 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         });
         // <- TODO: [🧠] What to do with `insertAgentHistoryResult.error`, ignore? wait?
     }
-    // TODO: [🐱‍🚀] public async getAgentSourceSubject(agentName: string_agent_name): Promise<BehaviorSubject<string_book>>
+    // TODO: [🐱‍🚀] public async getAgentSourceSubject(permanentId: string_agent_permanent_id): Promise<BehaviorSubject<string_book>>
     //            Use Supabase realtime logic
     /**
      * List agents that are soft deleted (deletedAt IS NOT NULL)
@@ -12419,15 +12451,15 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
     /**
      * List history of an agent
      */
-    async listAgentHistory(agentName) {
+    async listAgentHistory(permanentId) {
         const result = await this.supabaseClient
             .from(this.getTableName('AgentHistory'))
             .select('id, createdAt, agentHash, promptbookEngineVersion')
-            .eq('agentName', agentName)
+            .eq('permanentId', permanentId)
             .order('createdAt', { ascending: false });
         if (result.error) {
             throw new DatabaseError(spaceTrim((block) => `
-                    Error listing history for agent "${agentName}" from Supabase:
+                    Error listing history for agent "${permanentId}" from Supabase:
 
                     ${block(result.error.message)}
                 `));
@@ -12437,15 +12469,15 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
     /**
      * Restore a soft-deleted agent by setting deletedAt to NULL
      */
-    async restoreAgent(agentIdentifier) {
+    async restoreAgent(permanentId) {
         const updateResult = await this.supabaseClient
             .from(this.getTableName('Agent'))
             .update({ deletedAt: null })
-            .or(`agentName.eq.${agentIdentifier},permanentId.eq.${agentIdentifier}`)
+            .eq('permanentId', permanentId)
             .not('deletedAt', 'is', null);
         if (updateResult.error) {
             throw new DatabaseError(spaceTrim((block) => `
-                    Error restoring agent "${agentIdentifier}" from Supabase:
+                    Error restoring agent "${permanentId}" from Supabase:
 
                     ${block(updateResult.error.message)}
                 `));
@@ -12460,7 +12492,7 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         // First, get the history entry
         const historyResult = await this.supabaseClient
             .from(this.getTableName('AgentHistory'))
-            .select('agentName, agentSource')
+            .select('permanentId, agentSource')
             .eq('id', historyId)
             .single();
         if (historyResult.error) {
@@ -12473,22 +12505,22 @@ class AgentCollectionInSupabase /* TODO: [🐱‍🚀] implements Agent */ {
         if (!historyResult.data) {
             throw new NotFoundError(`History entry with id "${historyId}" not found`);
         }
-        const { agentName, agentSource } = historyResult.data;
+        const { permanentId, agentSource } = historyResult.data;
         // Update the agent with the source from the history entry
-        await this.updateAgentSource(agentName, agentSource);
+        await this.updateAgentSource(permanentId, agentSource);
     }
     /**
      * Soft delete an agent by setting deletedAt to current timestamp
      */
-    async deleteAgent(agentIdentifier) {
+    async deleteAgent(permanentId) {
         const updateResult = await this.supabaseClient
             .from(this.getTableName('Agent'))
             .update({ deletedAt: new Date().toISOString() })
-            .or(`agentName.eq.${agentIdentifier},permanentId.eq.${agentIdentifier}`)
+            .eq('permanentId', permanentId)
             .is('deletedAt', null);
         if (updateResult.error) {
             throw new DatabaseError(spaceTrim((block) => `
-                    Error deleting agent "${agentIdentifier}" from Supabase:
+                    Error deleting agent "${permanentId}" from Supabase:
 
                     ${block(updateResult.error.message)}
                 `));