@promptbook/cli 0.112.0-133 → 0.112.0-135

package/apps/agents-server/src/app/admin/chat-feedback/page.tsx

@@ -1,5 +1,5 @@
 import { ForbiddenPage } from '../../../components/ForbiddenPage/ForbiddenPage';
-import { getCurrentUser } from '../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../utils/isUserAdmin';
 import { ChatFeedbackClient } from './ChatFeedbackClient';
 
 /**
@@ -15,9 +15,7 @@ type AdminChatFeedbackPageProps = {
  * Handles admin chat feedback page.
  */
 export default async function AdminChatFeedbackPage({ searchParams }: AdminChatFeedbackPageProps) {
-    const currentUser = await getCurrentUser();
-
-    if (!currentUser) {
+    if (!(await isUserAdmin())) {
         return <ForbiddenPage />;
     }
 

package/apps/agents-server/src/app/admin/chat-history/page.tsx

@@ -1,5 +1,5 @@
 import { ForbiddenPage } from '../../../components/ForbiddenPage/ForbiddenPage';
-import { getCurrentUser } from '../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../utils/isUserAdmin';
 import { ChatHistoryClient } from './ChatHistoryClient';
 
 /**
@@ -15,9 +15,7 @@ type AdminChatHistoryPageProps = {
  * Handles admin chat history page.
  */
 export default async function AdminChatHistoryPage({ searchParams }: AdminChatHistoryPageProps) {
-    const currentUser = await getCurrentUser();
-
-    if (!currentUser) {
+    if (!(await isUserAdmin())) {
         return <ForbiddenPage />;
     }
 

package/apps/agents-server/src/app/agents/[agentName]/api/book/route.ts

@@ -1,5 +1,6 @@
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
 import { $provideAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/$provideAgentReferenceResolver';
+import { invalidateCachedActiveOrganizationSnapshots } from '@/src/utils/agentOrganization/loadAgentOrganizationState';
 import {
     parseBookScopedAgentIdentifier,
     resolveBookScopedAgentContext,
@@ -172,6 +173,7 @@ export async function PUT(request: Request, { params }: { params: Promise<{ agen
 
         const agentId = await collection.getAgentPermanentId(agentName);
         await collection.updateAgentSource(agentId, agentSource, { versionName });
+        invalidateCachedActiveOrganizationSnapshots();
         // <- TODO: [🐱‍🚀] Properly type as string_book
 
         return new Response(

package/apps/agents-server/src/app/api/agents/[agentName]/route.ts

@@ -7,11 +7,23 @@ import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentColle
 import { $provideAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/$provideAgentReferenceResolver';
 import { renameAgentSource } from '@/src/utils/renameAgentSource';
 import { isAgentVisibility, type AgentVisibility } from '@/src/utils/agentVisibility';
-import { TODO_any } from '@promptbook-local/types';
+import { TODO_any, type string_book } from '@promptbook-local/types';
 import { NextResponse } from 'next/server';
-import { buildAgentNameOrIdFilter } from '@/src/utils/agentIdentifier';
+import { findAgentForCallerWriteAccess } from '@/src/utils/findAgentForCallerWriteAccess';
 import { getCurrentUser } from '@/src/utils/getCurrentUser';
 import { resolveServerAgentContext } from '@/src/utils/resolveServerAgentContext';
+import { invalidateCachedActiveOrganizationSnapshots } from '@/src/utils/agentOrganization/loadAgentOrganizationState';
+import type { OwnedAgentRow } from '@/src/utils/agentOwnership';
+
+/**
+ * Resolves the stable identifier used when calling the agent collection.
+ *
+ * @param agent - Persisted agent row.
+ * @returns Permanent id when available, otherwise the legacy agent name.
+ */
+function getAgentCollectionIdentifier(agent: OwnedAgentRow): string {
+    return agent.permanentId || agent.agentName;
+}
 
 /**
  * Handles patch.
@@ -24,6 +36,11 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
             return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
         }
 
+        const targetAgent = await findAgentForCallerWriteAccess(agentName);
+        if (!targetAgent || targetAgent.deletedAt) {
+            return NextResponse.json({ success: false, error: 'Agent not found' }, { status: 404 });
+        }
+
         const body = (await request.json()) as { visibility?: AgentVisibility; name?: string };
 
         if (typeof body.name === 'string') {
@@ -33,9 +50,8 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
             }
 
             const collection = await $provideAgentCollectionForServer();
-            const agentId = await collection.getAgentPermanentId(agentName);
-            const agentSource = await collection.getAgentSource(agentId);
-            const nextAgentSource = renameAgentSource(agentSource, trimmedName);
+            const agentId = getAgentCollectionIdentifier(targetAgent);
+            const nextAgentSource = renameAgentSource(targetAgent.agentSource as string_book, trimmedName);
 
             await collection.updateAgentSource(agentId, nextAgentSource);
             const baseAgentReferenceResolver = await $provideAgentReferenceResolver();
@@ -45,6 +61,7 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
                 localServerUrl: new URL(request.url).origin,
                 fallbackResolver: baseAgentReferenceResolver,
             });
+            invalidateCachedActiveOrganizationSnapshots();
 
             return NextResponse.json({
                 success: true,
@@ -67,13 +84,15 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
             .from(await $getTableName(`Agent`))
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .update({ visibility } as any)
-            .or(buildAgentNameOrIdFilter(agentName))
+            .eq('id', targetAgent.id)
             .is('deletedAt', null);
 
         if (updateResult.error) {
             return NextResponse.json({ success: false, error: updateResult.error.message }, { status: 500 });
         }
 
+        invalidateCachedActiveOrganizationSnapshots();
+
         return NextResponse.json({ success: true });
     } catch (error) {
         return NextResponse.json(
@@ -88,15 +107,20 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
  */
 export async function DELETE(request: Request, { params }: { params: Promise<{ agentName: string }> }) {
     const { agentName } = await params;
-    const collection = await $provideAgentCollectionForServer();
 
     try {
         if (!(await getCurrentUser())) {
             return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
         }
 
-        const agentId = await collection.getAgentPermanentId(agentName);
-        await collection.deleteAgent(agentId);
+        const targetAgent = await findAgentForCallerWriteAccess(agentName);
+        if (!targetAgent || targetAgent.deletedAt) {
+            return NextResponse.json({ success: false, error: 'Agent not found' }, { status: 404 });
+        }
+
+        const collection = await $provideAgentCollectionForServer();
+        await collection.deleteAgent(getAgentCollectionIdentifier(targetAgent));
+        invalidateCachedActiveOrganizationSnapshots();
         return NextResponse.json({ success: true });
     } catch (error) {
         return NextResponse.json(

package/apps/agents-server/src/app/api/chat/route.ts

@@ -1,9 +1,38 @@
 import { createOpenAiExecutionTools } from '@promptbook-local/openai';
+import { NextResponse } from 'next/server';
+import { spaceTrim } from 'spacetrim';
+
+/**
+ * Whether this development-only OpenAI smoke test endpoint is reachable.
+ *
+ * The route exists to verify that the configured `OPENAI_API_KEY` actually
+ * talks to OpenAI, so it must never be exposed in production where it would
+ * let any anonymous client drain the server's paid OpenAI credit by repeatedly
+ * calling this unauthenticated `GET` with attacker-controlled `message`.
+ *
+ * @private internal helper of `/api/chat`
+ */
+const IS_DEVELOPMENT_CHAT_TEST_ENDPOINT_ENABLED = process.env.NODE_ENV !== 'production';
 
 /**
  * Handles get.
  */
 export async function GET(request: Request) {
+    if (!IS_DEVELOPMENT_CHAT_TEST_ENDPOINT_ENABLED) {
+        return NextResponse.json(
+            {
+                error: {
+                    message: spaceTrim(`
+                        Endpoint \`/api/chat\` is a development-only OpenAI smoke test
+                        and is disabled in production.
+                    `),
+                    type: 'not_available_in_production',
+                },
+            },
+            { status: 404 },
+        );
+    }
+
     const { searchParams } = new URL(request.url);
     const message = searchParams.get('message') || 'Hello, who are you?';
 
@@ -21,13 +50,6 @@ export async function GET(request: Request) {
         content: message,
     });
 
-    /*
-    return new Response(JSON.stringify(response, null, 4), {
-        status: 200,
-        headers: { 'Content-Type': 'application/json' },
-    });
-    */
-
     return new Response(response.content, {
         status: 200,
         headers: { 'Content-Type': 'text/markdown' },

package/apps/agents-server/src/app/api/chat-feedback/export/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
 import { $getTableName } from '../../../../database/$getTableName';
 import { $provideSupabase } from '../../../../database/$provideSupabase';
 import { convertToCsv } from '../../../../utils/convertToCsv';
-import { getCurrentUser } from '../../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../../utils/isUserAdmin';
 
 /**
  * Export chat feedback as CSV.
@@ -11,7 +11,7 @@ import { getCurrentUser } from '../../../../utils/getCurrentUser';
  * - agentName: filter by agent name (optional)
  */
 export async function GET(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 

package/apps/agents-server/src/app/api/chat-feedback/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { $getTableName } from '../../../database/$getTableName';
 import { $provideSupabase } from '../../../database/$provideSupabase';
-import { getCurrentUser } from '../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../utils/isUserAdmin';
 
 /**
  * Size of default page.
@@ -58,7 +58,7 @@ function parseSortOrder(value: string | null): SortOrder {
  * - sortOrder: asc | desc (default: desc)
  */
 export async function GET(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
@@ -145,7 +145,7 @@ export async function GET(request: NextRequest) {
  * - agentName: name of the agent whose feedback should be removed
  */
 export async function DELETE(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 

package/apps/agents-server/src/app/api/chat-history/[id]/route.ts

@@ -1,13 +1,13 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { $getTableName } from '../../../../database/$getTableName';
 import { $provideSupabase } from '../../../../database/$provideSupabase';
-import { getCurrentUser } from '../../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../../utils/isUserAdmin';
 
 /**
  * Delete a single chat history entry by ID.
  */
 export async function DELETE(request: NextRequest, context: { params: Promise<{ id: string }> }) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 

package/apps/agents-server/src/app/api/chat-history/export/route.ts

@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
 import { $getTableName } from '../../../../database/$getTableName';
 import { $provideSupabase } from '../../../../database/$provideSupabase';
 import { convertToCsv } from '../../../../utils/convertToCsv';
-import { getCurrentUser } from '../../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../../utils/isUserAdmin';
 
 /**
  * Export chat history as CSV.
@@ -11,7 +11,7 @@ import { getCurrentUser } from '../../../../utils/getCurrentUser';
  * - agentName: filter by agent name (optional)
  */
 export async function GET(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 

package/apps/agents-server/src/app/api/chat-history/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { $getTableName } from '../../../database/$getTableName';
 import { $provideSupabase } from '../../../database/$provideSupabase';
-import { getCurrentUser } from '../../../utils/getCurrentUser';
+import { isUserAdmin } from '../../../utils/isUserAdmin';
 
 /**
  * Size of default page.
@@ -58,7 +58,7 @@ function parseSortOrder(value: string | null): SortOrder {
  * - sortOrder: asc | desc (default: desc)
  */
 export async function GET(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
@@ -135,7 +135,7 @@ export async function GET(request: NextRequest) {
  * - agentName: name of the agent whose history should be removed
  */
 export async function DELETE(request: NextRequest) {
-    if (!(await getCurrentUser())) {
+    if (!(await isUserAdmin())) {
         return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 

package/apps/agents-server/src/app/api/chat-streaming/route.ts

@@ -1,10 +1,39 @@
+import { NextResponse } from 'next/server';
 import { OpenAI } from 'openai';
+import { spaceTrim } from 'spacetrim';
 import { forTime } from 'waitasecond';
 
+/**
+ * Whether this development-only OpenAI streaming smoke test endpoint is reachable.
+ *
+ * The route exists to verify that streaming chat completions work end-to-end,
+ * so it must never be exposed in production where it would let any anonymous
+ * client drain the server's paid OpenAI credit by repeatedly calling this
+ * unauthenticated `GET` with attacker-controlled `message`.
+ *
+ * @private internal helper of `/api/chat-streaming`
+ */
+const IS_DEVELOPMENT_CHAT_STREAMING_TEST_ENDPOINT_ENABLED = process.env.NODE_ENV !== 'production';
+
 /**
  * Handles get.
  */
 export async function GET(request: Request) {
+    if (!IS_DEVELOPMENT_CHAT_STREAMING_TEST_ENDPOINT_ENABLED) {
+        return NextResponse.json(
+            {
+                error: {
+                    message: spaceTrim(`
+                        Endpoint \`/api/chat-streaming\` is a development-only OpenAI smoke test
+                        and is disabled in production.
+                    `),
+                    type: 'not_available_in_production',
+                },
+            },
+            { status: 404 },
+        );
+    }
+
     const { searchParams } = new URL(request.url);
     const message = searchParams.get('message') || 'Hello, who are you?';
 

package/apps/agents-server/src/app/api/elevenlabs/tts/route.ts

@@ -1,5 +1,8 @@
+import { NextRequest } from 'next/server';
+import { spaceTrim } from 'spacetrim';
 import { respondIfClientVersionIsOutdated } from '../../../../utils/clientVersionGuard';
 import { getMetadata } from '@/src/database/getMetadata';
+import { guardPaidApiRequest } from '@/src/utils/paidApiRequestGuard';
 import { textToSpeechText } from '../../../../utils/textToSpeechText';
 
 /**
@@ -37,6 +40,19 @@ const ELEVEN_LABS_API_KEY = process.env.ELEVEN_LABS_API_KEY;
  */
 const MAX_ELEVEN_LABS_TEXT_LENGTH = 4500;
 
+/**
+ * Pattern matching valid ElevenLabs voice identifiers.
+ *
+ * ElevenLabs voice IDs are 20-character alphanumeric strings (e.g.
+ * `21m00Tcm4TlvDq8ikWAM`). Validating with a strict allowlist prevents an
+ * attacker from injecting arbitrary path segments into the upstream URL
+ * (which is built by string interpolation below) and stops requests for
+ * unknown ids that would still bill our ElevenLabs account.
+ *
+ * @private
+ */
+const ELEVEN_LABS_VOICE_ID_PATTERN = /^[A-Za-z0-9]{15,40}$/u;
+
 /**
  * Handles the OPTIONS request from the chat for CORS / preflight.
  *
@@ -59,7 +75,7 @@ export function OPTIONS() {
  *
  * @private
  */
-export async function POST(request: Request) {
+export async function POST(request: NextRequest) {
     const versionMismatchResponse = respondIfClientVersionIsOutdated(request, 'json');
     if (versionMismatchResponse) {
         return versionMismatchResponse;
@@ -87,10 +103,31 @@ export async function POST(request: Request) {
         );
     }
 
+    const guard = await guardPaidApiRequest(request, 'TEXT_TO_SPEECH');
+    if (!guard.ok) {
+        return guard.response;
+    }
+
     const payload = (await request.json().catch(() => null)) as { text?: string; voiceId?: string } | null;
     const rawText = (payload?.text?.toString() ?? '').trim();
     const requestedVoiceId = payload?.voiceId?.toString().trim();
-    const voiceIdToUse = requestedVoiceId || ELEVEN_LABS_VOICE_ID;
+    const voiceIdToUse = resolveValidatedVoiceId(requestedVoiceId);
+
+    if (voiceIdToUse === null) {
+        return new Response(
+            JSON.stringify({
+                error: spaceTrim(`
+                    Invalid \`voiceId\`.
+
+                    ElevenLabs voice ids must be 15–40 alphanumeric characters.
+                `),
+            }),
+            {
+                status: 400,
+                headers: { 'Content-Type': 'application/json' },
+            },
+        );
+    }
 
     if (!rawText) {
         return new Response(
@@ -149,3 +186,24 @@ export async function POST(request: Request) {
         },
     });
 }
+
+/**
+ * Validates the caller-supplied voice id and falls back to the configured default.
+ *
+ * Returns `null` if the caller provided a voice id that does not match the
+ * ElevenLabs format. The default value comes from a trusted environment
+ * variable, so it is forwarded as-is without re-validation.
+ *
+ * @private internal helper of `POST /api/elevenlabs/tts`
+ */
+function resolveValidatedVoiceId(requestedVoiceId: string | undefined): string | null {
+    if (!requestedVoiceId) {
+        return ELEVEN_LABS_VOICE_ID;
+    }
+
+    if (!ELEVEN_LABS_VOICE_ID_PATTERN.test(requestedVoiceId)) {
+        return null;
+    }
+
+    return requestedVoiceId;
+}

package/apps/agents-server/src/app/api/images/[filename]/route.ts

@@ -1,5 +1,6 @@
 import { serializeError, computeHash } from '@promptbook-local/utils';
 import { NextRequest, NextResponse } from 'next/server';
+import { spaceTrim } from 'spacetrim';
 import { assertsError } from '../../../../../../../src/errors/assertsError';
 import type { LlmExecutionTools } from '../../../../../../../src/execution/LlmExecutionTools';
 import { getSingleLlmExecutionTools } from '../../../../../../../src/llm-providers/_multiple/getSingleLlmExecutionTools';
@@ -11,6 +12,50 @@ import { $provideServer } from '../../../../tools/$provideServer';
 import { getGeneratedImageCdnKey } from '../../../../utils/cdn/utils/getGeneratedImageCdnKey';
 import { ensureGeneratedImage } from '../../../../utils/imageGeneration/ensureGeneratedImage';
 import { filenameToPrompt } from '../../../../utils/normalization/filenameToPrompt';
+import { guardPaidApiRequest } from '../../../../utils/paidApiRequestGuard';
+
+/**
+ * Allowlist of image generation models that may be requested by the caller.
+ *
+ * Image generation is one of the most expensive paid AI operations, so we
+ * reject any unknown model id before forwarding to the upstream provider.
+ */
+const ALLOWED_IMAGE_GENERATION_MODELS = new Set<string>([
+    'dall-e-3',
+    'dall-e-2',
+    'gpt-image-1',
+    'gemini-3-pro-image-preview',
+    'gemini-2.0-flash-preview-image-generation',
+]);
+
+/**
+ * Allowlist of image sizes accepted from the caller.
+ *
+ * Larger sizes cost more on every supported provider, so callers must pick a
+ * value from this fixed list instead of supplying arbitrary `${number}x${number}`
+ * strings.
+ */
+const ALLOWED_IMAGE_GENERATION_SIZES = new Set<NonNullable<ImageGenerationModelRequirements['size']>>([
+    '1024x1024',
+    '1792x1024',
+    '1024x1792',
+]);
+
+/**
+ * Allowlist of image quality values accepted from the caller.
+ */
+const ALLOWED_IMAGE_GENERATION_QUALITIES = new Set<NonNullable<ImageGenerationModelRequirements['quality']>>([
+    'standard',
+    'hd',
+]);
+
+/**
+ * Allowlist of image style values accepted from the caller.
+ */
+const ALLOWED_IMAGE_GENERATION_STYLES = new Set<NonNullable<ImageGenerationModelRequirements['style']>>([
+    'vivid',
+    'natural',
+]);
 
 /**
  * Chooses default image model from current provider metadata.
@@ -37,6 +82,63 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
             return NextResponse.json({ error: 'Filename is required' }, { status: 400 });
         }
 
+        const guard = await guardPaidApiRequest(request, 'IMAGE_GENERATION');
+        if (!guard.ok) {
+            return guard.response;
+        }
+
+        if (modelName !== null && !ALLOWED_IMAGE_GENERATION_MODELS.has(modelName)) {
+            return NextResponse.json(
+                {
+                    error: spaceTrim(`
+                        Requested image generation \`modelName\` is not allowed.
+
+                        **Allowed models:** ${Array.from(ALLOWED_IMAGE_GENERATION_MODELS).join(', ')}
+                    `),
+                },
+                { status: 400 },
+            );
+        }
+
+        if (size !== null && !ALLOWED_IMAGE_GENERATION_SIZES.has(size as never)) {
+            return NextResponse.json(
+                {
+                    error: spaceTrim(`
+                        Requested image \`size\` is not allowed.
+
+                        **Allowed sizes:** ${Array.from(ALLOWED_IMAGE_GENERATION_SIZES).join(', ')}
+                    `),
+                },
+                { status: 400 },
+            );
+        }
+
+        if (quality !== null && !ALLOWED_IMAGE_GENERATION_QUALITIES.has(quality as never)) {
+            return NextResponse.json(
+                {
+                    error: spaceTrim(`
+                        Requested image \`quality\` is not allowed.
+
+                        **Allowed values:** ${Array.from(ALLOWED_IMAGE_GENERATION_QUALITIES).join(', ')}
+                    `),
+                },
+                { status: 400 },
+            );
+        }
+
+        if (style !== null && !ALLOWED_IMAGE_GENERATION_STYLES.has(style as never)) {
+            return NextResponse.json(
+                {
+                    error: spaceTrim(`
+                        Requested image \`style\` is not allowed.
+
+                        **Allowed values:** ${Array.from(ALLOWED_IMAGE_GENERATION_STYLES).join(', ')}
+                    `),
+                },
+                { status: 400 },
+            );
+        }
+
         let attachments: unknown[] | undefined;
         if (attachmentsRaw) {
             try {