@promptbook/cli 0.104.0-0 → 0.104.0-2

package/apps/agents-server/src/database/migrations/2025-12-0640-openai-assistant-cache.sql

@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS "prefix_OpenAiAssistantCache" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+    "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+
+    "agentHash" TEXT NOT NULL,
+    "assistantId" TEXT NOT NULL
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS "prefix_OpenAiAssistantCache_agentHash_idx" ON "prefix_OpenAiAssistantCache" ("agentHash");
+
+ALTER TABLE "prefix_OpenAiAssistantCache" ENABLE ROW LEVEL SECURITY;

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

@@ -47,6 +47,7 @@ export type AgentsServerDatabase = {
                     agentName: string;
                     createdAt: string;
                     updatedAt: string | null;
+                    permanentId: string | null;
                     agentHash: string;
                     agentSource: string;
                     agentProfile: Json;
@@ -54,12 +55,15 @@ export type AgentsServerDatabase = {
                     usage: Json | null;
                     preparedModelRequirements: Json | null;
                     preparedExternals: Json | null;
+                    deletedAt: string | null;
+                    visibility: 'PUBLIC' | 'PRIVATE';
                 };
                 Insert: {
                     id?: number;
                     agentName: string;
                     createdAt: string;
                     updatedAt?: string | null;
+                    permanentId?: string | null;
                     agentHash: string;
                     agentSource: string;
                     agentProfile: Json;
@@ -67,12 +71,15 @@ export type AgentsServerDatabase = {
                     usage?: Json | null;
                     preparedModelRequirements?: Json | null;
                     preparedExternals?: Json | null;
+                    deletedAt?: string | null;
+                    visibility?: 'PUBLIC' | 'PRIVATE';
                 };
                 Update: {
                     id?: number;
                     agentName?: string;
                     createdAt?: string;
                     updatedAt?: string | null;
+                    permanentId?: string | null;
                     agentHash?: string;
                     agentSource?: string;
                     agentProfile?: Json;
@@ -80,6 +87,8 @@ export type AgentsServerDatabase = {
                     usage?: Json | null;
                     preparedModelRequirements?: Json | null;
                     preparedExternals?: Json | null;
+                    deletedAt?: string | null;
+                    visibility?: 'PUBLIC' | 'PRIVATE';
                 };
                 Relationships: [];
             };
@@ -272,6 +281,30 @@ export type AgentsServerDatabase = {
                 };
                 Relationships: [];
             };
+            OpenAiAssistantCache: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    updatedAt: string;
+                    agentHash: string;
+                    assistantId: string;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    agentHash: string;
+                    assistantId: string;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    agentHash?: string;
+                    assistantId?: string;
+                };
+                Relationships: [];
+            };
             ApiTokens: {
                 Row: {
                     id: number;
@@ -299,6 +332,82 @@ export type AgentsServerDatabase = {
                 };
                 Relationships: [];
             };
+            Image: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    updatedAt: string;
+                    filename: string;
+                    prompt: string;
+                    cdnUrl: string;
+                    cdnKey: string;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    filename: string;
+                    prompt: string;
+                    cdnUrl: string;
+                    cdnKey: string;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    updatedAt?: string;
+                    filename?: string;
+                    prompt?: string;
+                    cdnUrl?: string;
+                    cdnKey?: string;
+                };
+                Relationships: [];
+            };
+            File: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    userId: number | null;
+                    fileName: string;
+                    fileSize: number;
+                    fileType: string;
+                    storageUrl: string | null;
+                    shortUrl: string | null;
+                    purpose: string;
+                    status: 'UPLOADING' | 'COMPLETED' | 'FAILED';
+                };
+                Insert: {
+                    id?: number;
+                    createdAt?: string;
+                    userId?: number | null;
+                    fileName: string;
+                    fileSize: number;
+                    fileType: string;
+                    storageUrl?: string | null;
+                    shortUrl?: string | null;
+                    purpose: string;
+                    status?: 'UPLOADING' | 'COMPLETED' | 'FAILED';
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    userId?: number | null;
+                    fileName?: string;
+                    fileSize?: number;
+                    fileType?: string;
+                    storageUrl?: string | null;
+                    shortUrl?: string | null;
+                    purpose?: string;
+                    status?: 'UPLOADING' | 'COMPLETED' | 'FAILED';
+                };
+                Relationships: [
+                    {
+                        foreignKeyName: 'File_userId_fkey';
+                        columns: ['userId'];
+                        referencedRelation: 'User';
+                        referencedColumns: ['id'];
+                    },
+                ];
+            };
         };
         Views: Record<string, never>;
         Functions: Record<string, never>;

package/apps/agents-server/src/generated/reservedPaths.ts

@@ -0,0 +1,27 @@
+/**
+ * Reserved paths that should not be treated as agent names.
+ * This file is auto-generated by scripts/generate-reserved-paths.js
+ *
+ * ⚠️ WARNING: This code has been generated so that any manual changes will be overwritten
+ *
+ * @see /apps/agents-server/src/app - source directory
+ * @see /apps/agents-server/src/middleware.ts - where this is used
+ */
+export const RESERVED_PATHS: readonly string[] = [
+    "_next",
+    "admin",
+    "agents",
+    "api",
+    "docs",
+    "embed",
+    "favicon.ico",
+    "humans.txt",
+    "manifest.webmanifest",
+    "recycle-bin",
+    "restricted",
+    "robots.txt",
+    "security.txt",
+    "sitemap.xml",
+    "sw.js",
+    "test"
+] as const;

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

@@ -2,9 +2,11 @@ import { TODO_any } from '@promptbook-local/types';
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from 'next/server';
 import { SERVERS, SUPABASE_TABLE_PREFIX } from '../config';
+import { $getTableName } from './database/$getTableName';
+import { RESERVED_PATHS } from './generated/reservedPaths';
 import { isIpAllowed } from './utils/isIpAllowed';
 
-// Note: Re-implementing normalizeTo_PascalCase to avoid importing from @promptbook-local/utils which might have Node.js dependencies
+// Note: Re-implementing normalizeTo_PascalCase to avoid importing from @promptbook-local/utils which might have Node.js dependencies !!!!
 function normalizeTo_PascalCase(text: string): string {
     return text
         .replace(/(?:^\w|[A-Z]|\b\w)/g, (word, index) => {
@@ -58,7 +60,7 @@ export async function middleware(req: NextRequest) {
                 });
 
                 const { data } = await supabase
-                    .from(`${tablePrefix}Metadata`)
+                    .from(await $getTableName(`Metadata`))
                     .select('value')
                     .eq('key', 'RESTRICT_IP')
                     .single();
@@ -107,7 +109,7 @@ export async function middleware(req: NextRequest) {
                     });
 
                     const { data } = await supabase
-                        .from(`${tablePrefix}ApiTokens`)
+                        .from(await $getTableName(`ApiTokens`))
                         .select('id')
                         .eq('token', token)
                         .eq('isRevoked', false)
@@ -186,22 +188,7 @@ export async function middleware(req: NextRequest) {
 
     if (
         potentialAgentName &&
-        ![
-            'agents',
-            'api',
-            'admin',
-            'docs',
-            'test',
-            'embed',
-            '_next',
-            'manifest.webmanifest',
-            'sw.js',
-            'favicon.ico',
-            'sitemap.xml',
-            'robots.txt',
-            'security.txt',
-            'humans.txt',
-        ].includes(potentialAgentName) &&
+        !RESERVED_PATHS.includes(potentialAgentName) &&
         !potentialAgentName.startsWith('.') &&
         // Note: Other static files are excluded by the matcher configuration below
         true
@@ -256,7 +243,7 @@ export async function middleware(req: NextRequest) {
 
                 try {
                     const { data } = await supabase
-                        .from(`${prefix}Agent`)
+                        .from(await $getTableName(`Agent`))
                         .select('agentName')
                         .or(orFilter)
                         .limit(1)

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

@@ -1,3 +1,5 @@
+import { $provideSupabaseForServer } from '../database/$provideSupabaseForServer';
+import { TrackedFilesStorage } from '../utils/cdn/classes/TrackedFilesStorage';
 import { VercelBlobStorage } from '../utils/cdn/classes/VercelBlobStorage';
 import { IIFilesStorageWithCdn } from '../utils/cdn/interfaces/IFilesStorage';
 
@@ -13,12 +15,15 @@ let cdn: IIFilesStorageWithCdn | null = null;
  */
 export function $provideCdnForServer(): IIFilesStorageWithCdn {
     if (!cdn) {
-        cdn = new VercelBlobStorage({
+        const inner = new VercelBlobStorage({
             token: process.env.VERCEL_BLOB_READ_WRITE_TOKEN!,
             pathPrefix: process.env.NEXT_PUBLIC_CDN_PATH_PREFIX!,
             cdnPublicUrl: new URL(process.env.NEXT_PUBLIC_CDN_PUBLIC_URL!),
         });
 
+        const supabase = $provideSupabaseForServer();
+        cdn = new TrackedFilesStorage(inner, supabase);
+
         /*
         cdn = new DigitalOceanSpaces({
             bucket: process.env.CDN_BUCKET!,

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

@@ -0,0 +1,57 @@
+import { SupabaseClient } from '@supabase/supabase-js';
+import { $getTableName } from '../../../database/$getTableName';
+import { AgentsServerDatabase } from '../../../database/schema';
+import type { IFile, IIFilesStorageWithCdn } from '../interfaces/IFilesStorage';
+
+export class TrackedFilesStorage implements IIFilesStorageWithCdn {
+    public constructor(
+        private readonly inner: IIFilesStorageWithCdn,
+        private readonly supabase: SupabaseClient<AgentsServerDatabase>,
+    ) {}
+
+    public get cdnPublicUrl(): URL {
+        return this.inner.cdnPublicUrl;
+    }
+
+    public get pathPrefix(): string | undefined {
+        return this.inner.pathPrefix;
+    }
+
+    public getItemUrl(key: string): URL {
+        return this.inner.getItemUrl(key);
+    }
+
+    public async getItem(key: string): Promise<IFile | null> {
+        return this.inner.getItem(key);
+    }
+
+    public async removeItem(key: string): Promise<void> {
+        return this.inner.removeItem(key);
+    }
+
+    public async setItem(key: string, file: IFile): Promise<void> {
+        console.log('!!! 0', { key, file });
+
+        await this.inner.setItem(key, file);
+
+        try {
+            const { userId, purpose } = file;
+            const cdnUrl = this.getItemUrl(key).href;
+
+            console.log('!!! 1', { userId, purpose, cdnUrl, key, file });
+
+            await this.supabase.from(await $getTableName('File')).insert({
+                userId: userId || null,
+                fileName: key,
+                fileSize: file.fileSize ?? file.data.length,
+                fileType: file.type,
+                cdnUrl,
+                purpose: purpose || 'UNKNOWN',
+            });
+
+            console.log('!!! 2', { userId, purpose, cdnUrl, key, file });
+        } catch (error) {
+            console.error('Failed to track upload:', error);
+        }
+    }
+}

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

@@ -14,6 +14,10 @@ export class VercelBlobStorage implements IIFilesStorageWithCdn {
         return this.config.cdnPublicUrl;
     }
 
+    public get pathPrefix() {
+        return this.config.pathPrefix;
+    }
+
     public constructor(private readonly config: IVercelBlobStorageConfig) {}
 
     public getItemUrl(key: string): URL {

package/apps/agents-server/src/utils/cdn/interfaces/IFilesStorage.ts

@@ -5,6 +5,23 @@ export type IFile = {
     // Maybe TODO name: string_name;
     type: string_mime_type;
     data: Buffer;
+
+    /**
+     * User who uploaded the file
+     */
+    userId?: number;
+
+    /**
+     * Purpose of the upload (e.g. KNOWLEDGE, SERVER_FAVICON_URL)
+     */
+    purpose?: string;
+
+    /**
+     * Size of the file in bytes
+     *
+     * Note: This is optional, if not provided, the size of the buffer is used
+     */
+    fileSize?: number;
 };
 
 /**
@@ -17,6 +34,7 @@ export type IFilesStorage = Omit<IStorage<IFile>, 'length' | 'clear' | 'key'>;
  */
 export type IIFilesStorageWithCdn = IFilesStorage & {
     readonly cdnPublicUrl: URL;
+    readonly pathPrefix?: string;
     getItemUrl(key: string): URL;
 };
 

package/apps/agents-server/src/utils/getUserIdFromRequest.ts

@@ -0,0 +1,33 @@
+import { NextRequest } from 'next/server';
+import { $getTableName } from '../database/$getTableName';
+import { $provideSupabaseForServer } from '../database/$provideSupabaseForServer';
+import { getSession } from './session';
+
+export async function getUserIdFromRequest(request: NextRequest): Promise<number | null> {
+    try {
+        // 1. Try to get user from session (cookie)
+        const session = await getSession();
+        if (session && session.username) {
+            const supabase = $provideSupabaseForServer();
+            const { data } = await supabase
+                .from(await $getTableName('User'))
+                .select('id')
+                .eq('username', session.username)
+                .single();
+
+            if (data) {
+                return data.id;
+            }
+        }
+
+        // 2. Try to get user from API key (Authorization header)
+        // TODO: [🧠] Implement linking API keys to users if needed
+        // const authHeader = request.headers.get('authorization');
+        // ...
+
+    } catch (error) {
+        console.error('Error getting user ID from request:', error);
+    }
+
+    return null;
+}

package/apps/agents-server/src/utils/handleChatCompletion.ts

@@ -2,11 +2,13 @@ import { $getTableName } from '@/src/database/$getTableName';
 import { $provideSupabaseForServer } from '@/src/database/$provideSupabaseForServer';
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
 import { $provideOpenAiAssistantExecutionToolsForServer } from '@/src/tools/$provideOpenAiAssistantExecutionToolsForServer';
-import { Agent, computeAgentHash, PROMPTBOOK_ENGINE_VERSION } from '@promptbook-local/core';
+import { Agent, computeAgentHash, parseAgentSource, PROMPTBOOK_ENGINE_VERSION } from '@promptbook-local/core';
+import { OpenAiAssistantExecutionTools } from '@promptbook-local/openai';
 import { ChatMessage, ChatPromptResult, Prompt, string_book, TODO_any } from '@promptbook-local/types';
 import { computeHash } from '@promptbook-local/utils';
 import { NextRequest, NextResponse } from 'next/server';
 import { validateApiKey } from './validateApiKey';
+import { isAgentDeleted } from '../app/agents/[agentName]/_utils';
 
 export async function handleChatCompletion(
     request: NextRequest,
@@ -60,6 +62,19 @@ export async function handleChatCompletion(
             );
         }
 
+        // Check if agent is deleted
+        if (await isAgentDeleted(agentName)) {
+            return NextResponse.json(
+                {
+                    error: {
+                        message: 'This agent has been deleted. You can restore it from the Recycle Bin.',
+                        type: 'agent_deleted',
+                    },
+                },
+                { status: 410 }, // Gone - indicates the resource is no longer available
+            );
+        }
+
         const collection = await $provideAgentCollectionForServer();
         let agentSource: string_book;
         try {
@@ -99,7 +114,50 @@ export async function handleChatCompletion(
             );
         }
 
-        const openAiAssistantExecutionTools = await $provideOpenAiAssistantExecutionToolsForServer();
+        const agentHash = computeAgentHash(agentSource);
+        const supabase = $provideSupabaseForServer();
+        const { data: assistantCache } = await supabase
+            .from(await $getTableName('OpenAiAssistantCache'))
+            .select('assistantId')
+            .eq('agentHash', agentHash)
+            .single();
+
+        let openAiAssistantExecutionTools = await $provideOpenAiAssistantExecutionToolsForServer();
+
+        if (assistantCache?.assistantId) {
+            console.log(`[🐱‍🚀] Reusing assistant ${assistantCache.assistantId} for agent ${agentName} (hash: ${agentHash})`);
+            openAiAssistantExecutionTools = openAiAssistantExecutionTools.getAssistant(assistantCache.assistantId);
+        } else {
+            console.log(`[🐱‍🚀] Creating NEW assistant for agent ${agentName} (hash: ${agentHash})`);
+            // Parse to get instructions and name
+            const parsed = parseAgentSource(agentSource);
+            const name = parsed.agentName || agentName;
+            // Extract PERSONA
+            const baseInstructions = parsed.personaDescription || 'You are a helpful assistant.';
+
+            // Note: Append context to instructions
+            const contextLines = agentSource.split('\n').filter((line) => line.startsWith('CONTEXT '));
+            const contextInstructions = contextLines.join('\n');
+            const instructions = contextInstructions ? `${baseInstructions}\n\n${contextInstructions}` : baseInstructions;
+
+            // Create assistant
+            const newAssistantTools = await openAiAssistantExecutionTools.createNewAssistant({
+                name,
+                instructions,
+                // knowledgeSources?
+            });
+
+            // Save to cache
+            const newAssistantId = newAssistantTools.assistantId;
+            if (newAssistantId) {
+                await supabase.from(await $getTableName('OpenAiAssistantCache')).insert({
+                    agentHash,
+                    assistantId: newAssistantId,
+                });
+                openAiAssistantExecutionTools = newAssistantTools;
+            }
+        }
+
         const agent = new Agent({
             agentSource,
             executionTools: {
@@ -108,7 +166,6 @@ export async function handleChatCompletion(
             isVerbose: true, // or false
         });
 
-        const agentHash = computeAgentHash(agentSource);
         const userAgent = request.headers.get('user-agent');
         const ip =
             request.headers.get('x-forwarded-for') ||
@@ -138,7 +195,6 @@ export async function handleChatCompletion(
             content: lastMessage.content,
         };
 
-        const supabase = $provideSupabaseForServer();
         await supabase.from(await $getTableName('ChatHistory')).insert({
             createdAt: new Date().toISOString(),
             messageHash: computeHash(userMessageContent),

package/apps/agents-server/src/utils/normalization/filenameToPrompt.ts

@@ -0,0 +1,21 @@
+import { capitalize } from '../../../../../src/utils/normalization/capitalize';
+
+/**
+ * Converts a filename like "cat-sitting-on-keyboard.png" to a prompt like "Cat sitting on keyboard"
+ *
+ * @param filename - The filename to convert
+ * @returns The normalized prompt
+ */
+export function filenameToPrompt(filename: string): string {
+    // Remove file extension
+    const withoutExtension = filename.replace(/\.[^/.]+$/, '');
+
+    // Replace dashes and underscores with spaces
+    const withSpaces = withoutExtension.replace(/[-_]/g, ' ');
+
+    // Capitalize each word
+    const words = withSpaces.split(' ');
+    const capitalizedWords = words.map(word => capitalize(word));
+
+    return capitalizedWords.join(' ');
+}

package/apps/agents-server/src/utils/validateApiKey.ts

@@ -1,6 +1,7 @@
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest } from 'next/server';
 import { SERVERS, SUPABASE_TABLE_PREFIX } from '../../config';
+import { $getTableName } from '../database/$getTableName';
 
 // Note: Re-implementing normalizeTo_PascalCase to avoid importing from @promptbook-local/utils which might have Node.js dependencies
 function normalizeTo_PascalCase(text: string): string {
@@ -95,7 +96,7 @@ export async function validateApiKey(request: NextRequest): Promise<ApiKeyValida
         });
 
         const { data, error } = await supabase
-            .from(`${tablePrefix}ApiTokens`)
+            .from(await $getTableName(`ApiTokens`))
             .select('id, isRevoked')
             .eq('token', token)
             .single();