@promptbook/cli 0.103.0-53 → 0.103.0-54

package/apps/agents-server/src/database/schema.ts

@@ -242,6 +242,57 @@ export type AgentsServerDatabase = {
                 };
                 Relationships: [];
             };
+            LlmCache: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    updatedAt: string;
+                    hash: string;
+                    value: Json;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    hash: string;
+                    value: Json;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    hash?: string;
+                    value?: Json;
+                };
+                Relationships: [];
+            };
+            ApiTokens: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    updatedAt: string;
+                    token: string;
+                    note: string | null;
+                    isRevoked: boolean;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    token: string;
+                    note?: string | null;
+                    isRevoked?: boolean;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    token?: string;
+                    note?: string | null;
+                    isRevoked?: boolean;
+                };
+                Relationships: [];
+            };
         };
         Views: Record<string, never>;
         Functions: Record<string, never>;

package/apps/agents-server/src/middleware.ts

@@ -75,9 +75,57 @@ export async function middleware(req: NextRequest) {
     const allowedIps =
         allowedIpsMetadata !== null && allowedIpsMetadata !== undefined ? allowedIpsMetadata : allowedIpsEnv;
 
+    let isValidToken = false;
+    const authHeader = req.headers.get('authorization');
+
+    if (authHeader && authHeader.startsWith('Bearer ')) {
+        const token = authHeader.split(' ')[1];
+
+        if (token.startsWith('ptbk_')) {
+            const host = req.headers.get('host');
+            let tablePrefix = SUPABASE_TABLE_PREFIX;
+
+            if (host && SERVERS && SERVERS.length > 0) {
+                if (SERVERS.some((server) => server === host)) {
+                    let serverName = host;
+                    serverName = serverName.replace(/\.ptbk\.io$/, '');
+                    serverName = normalizeTo_PascalCase(serverName);
+                    tablePrefix = `server_${serverName}_`;
+                }
+            }
+
+            const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL;
+            const supabaseKey = process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY;
+
+            if (supabaseUrl && supabaseKey) {
+                try {
+                    const supabase = createClient(supabaseUrl, supabaseKey, {
+                        auth: {
+                            persistSession: false,
+                            autoRefreshToken: false,
+                        },
+                    });
+
+                    const { data } = await supabase
+                        .from(`${tablePrefix}ApiTokens`)
+                        .select('id')
+                        .eq('token', token)
+                        .eq('isRevoked', false)
+                        .single();
+
+                    if (data) {
+                        isValidToken = true;
+                    }
+                } catch (error) {
+                    console.error('Error validating token in middleware:', error);
+                }
+            }
+        }
+    }
+
     const isIpAllowedResult = isIpAllowed(ip, allowedIps);
     const isLoggedIn = req.cookies.has('sessionToken');
-    const isAccessRestricted = !isIpAllowedResult && !isLoggedIn;
+    const isAccessRestricted = !isIpAllowedResult && !isLoggedIn && !isValidToken;
 
     // Handle OPTIONS (preflight) requests globally
     if (req.method === 'OPTIONS') {

package/apps/agents-server/src/tools/$provideCdnForServer.ts

@@ -1,4 +1,4 @@
-import { DigitalOceanSpaces } from '../utils/cdn/classes/DigitalOceanSpaces';
+import { VercelBlobStorage } from '../utils/cdn/classes/VercelBlobStorage';
 import { IIFilesStorageWithCdn } from '../utils/cdn/interfaces/IFilesStorage';
 
 /**
@@ -13,14 +13,10 @@ let cdn: IIFilesStorageWithCdn | null = null;
  */
 export function $provideCdnForServer(): IIFilesStorageWithCdn {
     if (!cdn) {
-        cdn = new DigitalOceanSpaces({
-            bucket: process.env.CDN_BUCKET!,
+        cdn = new VercelBlobStorage({
+            token: process.env.BLOB_READ_WRITE_TOKEN!,
             pathPrefix: process.env.NEXT_PUBLIC_CDN_PATH_PREFIX!,
-            endpoint: process.env.CDN_ENDPOINT!,
-            accessKeyId: process.env.CDN_ACCESS_KEY_ID!,
-            secretAccessKey: process.env.CDN_SECRET_ACCESS_KEY!,
             cdnPublicUrl: new URL(process.env.NEXT_PUBLIC_CDN_PUBLIC_URL!),
-            gzip: true,
         });
     }
 

package/apps/agents-server/src/tools/$provideExecutionToolsForServer.ts

@@ -1,6 +1,7 @@
 'use server';
 
 import {
+    cacheLlmTools,
     _AnthropicClaudeMetadataRegistration,
     _AzureOpenAiMetadataRegistration,
     _BoilerplateScraperMetadataRegistration,
@@ -26,6 +27,7 @@ import { $provideFilesystemForNode } from '../../../../src/scrapers/_common/regi
 import { $provideScrapersForNode } from '../../../../src/scrapers/_common/register/$provideScrapersForNode';
 import { $provideScriptingForNode } from '../../../../src/scrapers/_common/register/$provideScriptingForNode';
 import { $sideEffect } from '../../../../src/utils/organization/$sideEffect';
+import { SupabaseCacheStorage } from '../utils/cache/SupabaseCacheStorage';
 
 $sideEffect(
     _AnthropicClaudeMetadataRegistration,
@@ -90,10 +92,17 @@ export async function $provideExecutionToolsForServer(): Promise<ExecutionTools>
         isCacheReloaded,
     }; /* <- TODO: ` satisfies PrepareAndScrapeOptions` */
     const fs = await $provideFilesystemForNode(prepareAndScrapeOptions);
-    const { /* [0] strategy,*/ llm } = await $provideLlmToolsForCli({
+    const { /* [0] strategy,*/ llm: llmUncached } = await $provideLlmToolsForCli({
         cliOptions,
         ...prepareAndScrapeOptions,
     });
+
+    const llm = cacheLlmTools(llmUncached, {
+        storage: new SupabaseCacheStorage(),
+        isVerbose,
+        isCacheReloaded,
+    });
+
     const executables = await $provideExecutablesForNode(prepareAndScrapeOptions);
 
     executionTools = {

package/apps/agents-server/src/utils/cache/SupabaseCacheStorage.ts

@@ -0,0 +1,55 @@
+import { TODO_any } from '@promptbook-local/types';
+import { $getTableName } from '../../database/$getTableName';
+import { $provideSupabaseForServer } from '../../database/$provideSupabaseForServer';
+import { Json } from '../../database/schema';
+
+/**
+ * Storage for LLM cache using Supabase
+ */
+export class SupabaseCacheStorage {
+    // implements PromptbookStorage<TODO_any>
+
+    /**
+     * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
+     */
+    public async getItem(key: string): Promise<TODO_any | null> {
+        const supabase = $provideSupabaseForServer();
+        const tableName = await $getTableName('LlmCache');
+
+        const { data } = await supabase.from(tableName).select('value').eq('hash', key).maybeSingle();
+
+        if (!data) {
+            return null;
+        }
+
+        return data.value;
+    }
+
+    /**
+     * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
+     */
+    public async setItem(key: string, value: TODO_any): Promise<void> {
+        const supabase = $provideSupabaseForServer();
+        const tableName = await $getTableName('LlmCache');
+
+        await supabase.from(tableName).upsert(
+            {
+                hash: key,
+                value: value as Json,
+            },
+            {
+                onConflict: 'hash',
+            },
+        );
+    }
+
+    /**
+     * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists
+     */
+    public async removeItem(key: string): Promise<void> {
+        const supabase = $provideSupabaseForServer();
+        const tableName = await $getTableName('LlmCache');
+
+        await supabase.from(tableName).delete().eq('hash', key);
+    }
+}

package/apps/agents-server/src/utils/cdn/classes/VercelBlobStorage.ts

@@ -0,0 +1,63 @@
+import { del, put } from '@vercel/blob';
+import { validateMimeType } from '../../validators/validateMimeType';
+import type { IFile, IIFilesStorageWithCdn } from '../interfaces/IFilesStorage';
+
+type IVercelBlobStorageConfig = {
+    readonly token: string;
+    readonly cdnPublicUrl: URL;
+    readonly pathPrefix?: string;
+    // Note: Vercel Blob automatically handles compression/serving
+};
+
+export class VercelBlobStorage implements IIFilesStorageWithCdn {
+    public get cdnPublicUrl() {
+        return this.config.cdnPublicUrl;
+    }
+
+    public constructor(private readonly config: IVercelBlobStorageConfig) {}
+
+    public getItemUrl(key: string): URL {
+        const path = this.config.pathPrefix ? `${this.config.pathPrefix}/${key}` : key;
+        return new URL(path, this.cdnPublicUrl);
+    }
+
+    public async getItem(key: string): Promise<IFile | null> {
+        const url = this.getItemUrl(key);
+
+        const response = await fetch(url);
+
+        if (response.status === 404) {
+            return null;
+        }
+
+        if (!response.ok) {
+            throw new Error(`Failed to fetch blob from ${url}: ${response.statusText}`);
+        }
+
+        const arrayBuffer = await response.arrayBuffer();
+        const buffer = Buffer.from(arrayBuffer);
+        const contentType = response.headers.get('content-type') || 'application/octet-stream';
+
+        return {
+            type: validateMimeType(contentType),
+            data: buffer,
+        };
+    }
+
+    public async removeItem(key: string): Promise<void> {
+        const url = this.getItemUrl(key).toString();
+        await del(url, { token: this.config.token });
+    }
+
+    public async setItem(key: string, file: IFile): Promise<void> {
+        const path = this.config.pathPrefix ? `${this.config.pathPrefix}/${key}` : key;
+        
+        await put(path, file.data, {
+            access: 'public',
+            addRandomSuffix: false,
+            contentType: file.type,
+            token: this.config.token,
+            // Note: We rely on Vercel Blob for compression
+        });
+    }
+}

package/esm/index.es.js

@@ -47,7 +47,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.103.0-53';
+const PROMPTBOOK_ENGINE_VERSION = '0.103.0-54';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -22535,6 +22535,12 @@ class ActionCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Define agent capabilities and actions it can perform.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '⚡';
+    }
     /**
      * Markdown documentation for ACTION commitment.
      */
@@ -22614,6 +22620,12 @@ class DeleteCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Remove or **disregard** certain information, context, or previous commitments.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🗑️';
+    }
     /**
      * Markdown documentation for DELETE commitment.
      */
@@ -22730,6 +22742,12 @@ class FormatCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Specify output structure or formatting requirements.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '📜';
+    }
     /**
      * Markdown documentation for FORMAT commitment.
      */
@@ -22805,6 +22823,12 @@ class GoalCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Define main **goals** the AI assistant should achieve, with later goals having higher priority.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🎯';
+    }
     /**
      * Markdown documentation for GOAL commitment.
      */
@@ -22901,6 +22925,12 @@ class KnowledgeCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Add domain **knowledge** via direct text or external sources (RAG).';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🧠';
+    }
     /**
      * Markdown documentation for KNOWLEDGE commitment.
      */
@@ -23002,6 +23032,12 @@ class MemoryCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Remember past interactions and user **preferences** for personalized responses.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🧠';
+    }
     /**
      * Markdown documentation for MEMORY commitment.
      */
@@ -23100,6 +23136,12 @@ class AgentMessageCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Defines a **message from the agent** in the conversation history.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🤖';
+    }
     /**
      * Markdown documentation for AGENT MESSAGE commitment.
      */
@@ -23171,6 +23213,12 @@ class InitialMessageCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Defines the **initial message** shown to the user when the chat starts.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '👋';
+    }
     /**
      * Markdown documentation for INITIAL MESSAGE commitment.
      */
@@ -23229,6 +23277,12 @@ class MessageCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Include actual **messages** the AI assistant has sent during conversation history.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '💬';
+    }
     /**
      * Markdown documentation for MESSAGE commitment.
      */
@@ -23335,6 +23389,12 @@ class UserMessageCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Defines a **message from the user** in the conversation history.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🧑';
+    }
     /**
      * Markdown documentation for USER MESSAGE commitment.
      */
@@ -23408,6 +23468,12 @@ class MetaCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Set meta-information about the agent (IMAGE, LINK, TITLE, DESCRIPTION, etc.).';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return 'ℹ️';
+    }
     /**
      * Markdown documentation for META commitment.
      */
@@ -23535,6 +23601,12 @@ class MetaColorCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return "Set the agent's accent color.";
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🎨';
+    }
     /**
      * Markdown documentation for META COLOR commitment.
      */
@@ -23613,6 +23685,12 @@ class MetaImageCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return "Set the agent's profile image URL.";
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🖼️';
+    }
     /**
      * Markdown documentation for META IMAGE commitment.
      */
@@ -23703,6 +23781,12 @@ class ModelCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Enforce AI model requirements including name and technical parameters.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '⚙️';
+    }
     /**
      * Markdown documentation for MODEL commitment.
      */
@@ -23938,6 +24022,12 @@ class NoteCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Add developer-facing notes without changing behavior or output.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '📝';
+    }
     /**
      * Markdown documentation for NOTE commitment.
      */
@@ -24040,6 +24130,12 @@ class PersonaCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Define who the agent is: background, expertise, and personality.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '👤';
+    }
     /**
      * Markdown documentation for PERSONA commitment.
      */
@@ -24167,6 +24263,12 @@ class RuleCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Add behavioral rules the agent must follow.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '⚖️';
+    }
     /**
      * Markdown documentation for RULE/RULES commitment.
      */
@@ -24243,6 +24345,12 @@ class SampleCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Provide example responses to guide behavior.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🔍';
+    }
     /**
      * Markdown documentation for SAMPLE/EXAMPLE commitment.
      */
@@ -24320,6 +24428,12 @@ class ScenarioCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Define specific **situations** or contexts for AI responses, with later scenarios having higher priority.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🎭';
+    }
     /**
      * Markdown documentation for SCENARIO commitment.
      */
@@ -24436,6 +24550,12 @@ class StyleCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Control the tone and writing style of responses.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🖋️';
+    }
     /**
      * Markdown documentation for STYLE commitment.
      */
@@ -24505,6 +24625,12 @@ class NotYetImplementedCommitmentDefinition extends BaseCommitmentDefinition {
     get description() {
         return 'Placeholder commitment that appends content verbatim to the system message.';
     }
+    /**
+     * Icon for this commitment.
+     */
+    get icon() {
+        return '🚧';
+    }
     /**
      * Markdown documentation available at runtime.
      */