@promptbook/core 0.104.0-7 → 0.104.0-9

package/esm/typings/src/book-2.0/agent-source/createAgentModelRequirementsWithCommitments.closed.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/typings/src/book-2.0/utils/generatePlaceholderAgentProfileImageUrl.d.ts

@@ -1,4 +1,4 @@
-import type { string_agent_name, string_agent_permanent_id, string_url_image } from '../../types/typeAliases';
+import type { string_agent_name, string_agent_permanent_id, string_url, string_url_image } from '../../types/typeAliases';
 /**
  * Generates an image for the agent to use as profile image
  *
@@ -7,7 +7,7 @@ import type { string_agent_name, string_agent_permanent_id, string_url_image } f
  *
  * @public exported from `@promptbook/core`
  */
-export declare function generatePlaceholderAgentProfileImageUrl(agentIdOrName: string_agent_permanent_id | string_agent_name, agentsServerUrl?: URL): string_url_image;
+export declare function generatePlaceholderAgentProfileImageUrl(agentIdOrName: string_agent_permanent_id | string_agent_name, agentsServerUrl?: URL | string_url): string_url_image;
 /**
  * TODO: [🤹] Figure out best placeholder image generator https://i.pravatar.cc/1000?u=568
  */

package/esm/typings/src/collection/agent-collection/constructors/agent-collection-in-supabase/AgentCollectionInSupabase.d.ts

@@ -1,7 +1,7 @@
 import type { SupabaseClient } from '@supabase/supabase-js';
 import type { AgentBasicInformation } from '../../../../book-2.0/agent-source/AgentBasicInformation';
 import type { string_book } from '../../../../book-2.0/agent-source/string_book';
-import type { string_agent_name } from '../../../../types/typeAliases';
+import type { string_agent_name, string_agent_permanent_id } from '../../../../types/typeAliases';
 import { AgentCollectionInSupabaseOptions } from './AgentCollectionInSupabaseOptions';
 import type { AgentsDatabaseSchema } from './AgentsDatabaseSchema';
 /**
@@ -28,7 +28,11 @@ export declare class AgentCollectionInSupabase {
     /**
      * [🐱‍🚀]@@@
      */
-    getAgentSource(agentName: string_agent_name): Promise<string_book>;
+    getAgentPermanentId(agentNameOrPermanentId: string_agent_name | string_agent_permanent_id): Promise<string_agent_permanent_id>;
+    /**
+     * [🐱‍🚀]@@@
+     */
+    getAgentSource(agentNameOrPermanentId: string_agent_name | string_agent_permanent_id): Promise<string_book>;
     /**
      * Creates a new agent in the collection
      *
@@ -38,7 +42,7 @@ export declare class AgentCollectionInSupabase {
     /**
      * Updates an existing agent in the collection
      */
-    updateAgentSource(agentName: string_agent_name, agentSource: string_book): Promise<void>;
+    updateAgentSource(permanentId: string_agent_permanent_id, agentSource: string_book): Promise<void>;
     /**
      * List agents that are soft deleted (deletedAt IS NOT NULL)
      */
@@ -46,7 +50,7 @@ export declare class AgentCollectionInSupabase {
     /**
      * List history of an agent
      */
-    listAgentHistory(agentName: string_agent_name): Promise<ReadonlyArray<{
+    listAgentHistory(permanentId: string_agent_permanent_id): Promise<ReadonlyArray<{
         id: number;
         createdAt: string;
         agentHash: string;
@@ -55,7 +59,7 @@ export declare class AgentCollectionInSupabase {
     /**
      * Restore a soft-deleted agent by setting deletedAt to NULL
      */
-    restoreAgent(agentIdentifier: string): Promise<void>;
+    restoreAgent(permanentId: string_agent_permanent_id): Promise<void>;
     /**
      * Restore an agent from a specific history entry
      *
@@ -65,7 +69,7 @@ export declare class AgentCollectionInSupabase {
     /**
      * Soft delete an agent by setting deletedAt to current timestamp
      */
-    deleteAgent(agentIdentifier: string): Promise<void>;
+    deleteAgent(permanentId: string_agent_permanent_id): Promise<void>;
     /**
      * Get the Supabase table name with prefix
      *

package/esm/typings/src/collection/agent-collection/constructors/agent-collection-in-supabase/AgentsDatabaseSchema.d.ts

@@ -73,6 +73,7 @@ export type AgentsDatabaseSchema = {
                     id: number;
                     createdAt: string;
                     agentName: string;
+                    permanentId: string;
                     agentHash: string;
                     previousAgentHash: string | null;
                     agentSource: string;
@@ -82,6 +83,7 @@ export type AgentsDatabaseSchema = {
                     id?: number;
                     createdAt: string;
                     agentName: string;
+                    permanentId: string;
                     agentHash: string;
                     previousAgentHash?: string | null;
                     agentSource: string;
@@ -91,6 +93,7 @@ export type AgentsDatabaseSchema = {
                     id?: number;
                     createdAt?: string;
                     agentName?: string;
+                    permanentId?: string;
                     agentHash?: string;
                     previousAgentHash?: string | null;
                     agentSource?: string;
@@ -98,10 +101,10 @@ export type AgentsDatabaseSchema = {
                 };
                 Relationships: [
                     {
-                        foreignKeyName: 'AgentHistory_agentName_fkey';
-                        columns: ['agentName'];
+                        foreignKeyName: 'AgentHistory_permanentId_fkey';
+                        columns: ['permanentId'];
                         referencedRelation: 'Agent';
-                        referencedColumns: ['agentName'];
+                        referencedColumns: ['permanentId'];
                     }
                 ];
             };

package/esm/typings/src/utils/color/utils/colorToDataUrl.d.ts

@@ -1,10 +1,11 @@
+import { string_color, string_data_url, string_url_image } from '../../../types/typeAliases';
 import { Color } from '../Color';
 /**
  * Makes data url from color
  *
  * @public exported from `@promptbook/color`
  */
-export declare function colorToDataUrl(color: Color): string;
+export declare function colorToDataUrl(color: Color | string_color): string_data_url & string_url_image;
 /**
  * TODO: Make as functions NOT const
  */

package/esm/typings/src/version.d.ts

@@ -15,7 +15,7 @@ export declare const BOOK_LANGUAGE_VERSION: string_semantic_version;
 export declare const PROMPTBOOK_ENGINE_VERSION: string_promptbook_version;
 /**
  * Represents the version string of the Promptbook engine.
- * It follows semantic versioning (e.g., `0.104.0-6`).
+ * It follows semantic versioning (e.g., `0.104.0-8`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/core",
-    "version": "0.104.0-7",
+    "version": "0.104.0-9",
     "description": "Promptbook: Turn your company's scattered knowledge into AI ready books",
     "private": false,
     "sideEffects": false,

package/umd/index.umd.js

@@ -28,7 +28,7 @@
      * @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
@@ -11345,7 +11345,12 @@
             };
         }
         // 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 {
@@ -12132,8 +12137,11 @@
      *
      * @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
@@ -12239,20 +12247,35 @@
         /**
          * [🐱‍🚀]@@@
          */
-        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)}
                     `));
@@ -12267,19 +12290,19 @@
         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,
@@ -12302,6 +12325,7 @@
             await this.supabaseClient.from(this.getTableName('AgentHistory')).insert({
                 createdAt: new Date().toISOString(),
                 agentName,
+                permanentId,
                 agentHash,
                 previousAgentHash: null,
                 agentSource,
@@ -12313,17 +12337,17 @@
         /**
          * 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)}
                     `));
@@ -12334,20 +12358,27 @@
             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({
@@ -12359,13 +12390,13 @@
                 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)}
                     `));
@@ -12373,6 +12404,7 @@
             await this.supabaseClient.from(this.getTableName('AgentHistory')).insert({
                 createdAt: new Date().toISOString(),
                 agentName,
+                permanentId,
                 agentHash,
                 previousAgentHash,
                 agentSource,
@@ -12380,7 +12412,7 @@
             });
             // <- 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)
@@ -12420,15 +12452,15 @@
         /**
          * 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)}
                 `));
@@ -12438,15 +12470,15 @@
         /**
          * 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)}
                 `));
@@ -12461,7 +12493,7 @@
             // 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) {
@@ -12474,22 +12506,22 @@
             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)}
                 `));