@promptbook/cli 0.112.0-102 → 0.112.0-103

package/apps/agents-server/README.md

@@ -41,12 +41,6 @@ ptbk agents-server start --agent github-copilot --model gpt-5.4 --thinking-level
 <a id="agents-server-env-admin-password"></a>
 -   `ADMIN_PASSWORD`: Password for the built-in `admin` login on a self-hosted Agents Server. Choose a private value before using the admin UI.
 
-<a id="agents-server-env-next-public-cdn-storage-provider"></a>
--   `NEXT_PUBLIC_CDN_STORAGE_PROVIDER`: File storage provider for uploads. Use `s3` for S3-compatible storage such as the VPS installer's self-contained MinIO service or external S3, and `vercel` for Vercel Blob.
-
-<a id="agents-server-env-s3-cdn"></a>
--   `CDN_BUCKET`, `CDN_ENDPOINT`, `CDN_ACCESS_KEY_ID`, `CDN_SECRET_ACCESS_KEY`, `NEXT_PUBLIC_CDN_PUBLIC_URL`, and `NEXT_PUBLIC_CDN_PATH_PREFIX`: S3-compatible upload configuration used when `NEXT_PUBLIC_CDN_STORAGE_PROVIDER=s3`.
-
 ## Creating servers
 
 When creating new Agents server, search across the repository for [☁]

package/apps/agents-server/src/app/admin/image-generator-test/ImageAttachmentsEditor.tsx

@@ -1,8 +1,8 @@
-import { upload } from '@vercel/blob/client';
 import { useCallback, useRef, useState, type ChangeEvent } from 'react';
 import { showAlert } from '../../../components/AsyncDialogs/asyncDialogs';
 import { getSafeCdnPath } from '../../../utils/cdn/utils/getSafeCdnPath';
 import { normalizeUploadFilename } from '../../../utils/normalization/normalizeUploadFilename';
+import { uploadFileToServer } from '../../../utils/upload/uploadFileToServer';
 import type { UseImageGeneratorTestState } from './useImageGeneratorTestState';
 
 /**
@@ -36,17 +36,22 @@ async function uploadImageAttachment(
     file: File,
 ): Promise<UseImageGeneratorTestState['prompts'][number]['attachments'][number]> {
     const normalizedFilename = normalizeUploadFilename(file.name);
-    const uploadPath = getSafeCdnPath({ pathname: normalizedFilename });
-    const blob = await upload(uploadPath, file, {
-        access: 'public',
-        handleUploadUrl: '/api/upload',
+    const uploadPath = getSafeCdnPath({
+        pathname: normalizedFilename,
+        pathPrefix: process.env.NEXT_PUBLIC_CDN_PATH_PREFIX,
+    });
+    const uploadResult = await uploadFileToServer({
+        file,
+        pathname: uploadPath,
+        purpose: 'IMAGE_GENERATOR_TEST_ATTACHMENT',
+        contentType: file.type,
     });
 
     return {
         id: createAttachmentIdentifier(),
         name: file.name,
         type: file.type,
-        url: blob.url,
+        url: uploadResult.url,
     };
 }
 

package/apps/agents-server/src/app/admin/metadata/MetadataClient.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { upload } from '@vercel/blob/client';
 import { FileTextIcon, HashIcon, ImageIcon, ListIcon, ShieldIcon, ToggleLeftIcon, TypeIcon, Upload } from 'lucide-react';
 import Link from 'next/link';
 import { Fragment, useEffect, useRef, useState } from 'react';
@@ -8,6 +7,7 @@ import { showConfirm } from '../../../components/AsyncDialogs/asyncDialogs';
 import { getMetadataDefinition, metadataDefaults, type MetadataDefinition } from '../../../database/metadataDefaults';
 import { getSafeCdnPath } from '../../../utils/cdn/utils/getSafeCdnPath';
 import { normalizeUploadFilename } from '../../../utils/normalization/normalizeUploadFilename';
+import { buildDefaultUserFileUploadPath, uploadFileToServer } from '../../../utils/upload/uploadFileToServer';
 import { getDeprecatedLimitMetadataDefinition, type DeprecatedLimitMetadataDefinition } from '../../../constants/serverLimits';
 
 /**
@@ -502,23 +502,21 @@ export function MetadataClient() {
         try {
             setUploading(true);
 
-            const pathPrefix = process.env.NEXT_PUBLIC_CDN_PATH_PREFIX || '';
             const normalizedFilename = normalizeUploadFilename(file.name);
-            const uploadPath = pathPrefix
-                ? `${pathPrefix}/user/files/${normalizedFilename}`
-                : `user/files/${normalizedFilename}`;
-            const safeUploadPath = getSafeCdnPath({ pathname: uploadPath });
-
-            const blob = await upload(safeUploadPath, file, {
-                access: 'public',
-                handleUploadUrl: '/api/upload',
-                clientPayload: JSON.stringify({
-                    purpose: formState.key || 'METADATA_IMAGE',
-                    contentType: file.type,
-                }),
+            const uploadPath = buildDefaultUserFileUploadPath(normalizedFilename);
+            const safeUploadPath = getSafeCdnPath({
+                pathname: uploadPath,
+                pathPrefix: process.env.NEXT_PUBLIC_CDN_PATH_PREFIX,
             });
 
-            const fileUrl = blob.url;
+            const uploadResult = await uploadFileToServer({
+                file,
+                pathname: safeUploadPath,
+                purpose: formState.key || 'METADATA_IMAGE',
+                contentType: file.type,
+            });
+
+            const fileUrl = uploadResult.url;
 
             const LONG_URL = `${process.env.NEXT_PUBLIC_CDN_PUBLIC_URL!}/${process.env
                 .NEXT_PUBLIC_CDN_PATH_PREFIX!}/user/files/`;

package/apps/agents-server/src/app/admin/servers/useCreateServerWizard.ts

@@ -1,6 +1,5 @@
 'use client';
 
-import { upload } from '@vercel/blob/client';
 import { useCallback, useMemo, useRef, useState, type ChangeEvent, type RefObject } from 'react';
 import { showAlert } from '../../../components/AsyncDialogs/asyncDialogs';
 import { useDirtyModalGuard } from '../../../components/utils/useDirtyModalGuard';
@@ -8,6 +7,7 @@ import { buildServerTablePrefix } from '../../../utils/buildServerTablePrefix';
 import type { ChatFeedbackMode } from '../../../utils/chatFeedbackMode';
 import { getSafeCdnPath } from '../../../utils/cdn/utils/getSafeCdnPath';
 import { normalizeUploadFilename } from '../../../utils/normalization/normalizeUploadFilename';
+import { buildDefaultUserFileUploadPath, uploadFileToServer } from '../../../utils/upload/uploadFileToServer';
 import type { ManagedServerEnvironment } from './useServersRegistryState';
 
 /**
@@ -425,22 +425,21 @@ export function useCreateServerWizard(options: UseCreateServerWizardOptions): Us
                 setIsUploadingIcon(true);
                 setWizardError(null);
 
-                const pathPrefix = process.env.NEXT_PUBLIC_CDN_PATH_PREFIX || '';
                 const normalizedFilename = normalizeUploadFilename(file.name);
-                const uploadPath = pathPrefix
-                    ? `${pathPrefix}/user/files/${normalizedFilename}`
-                    : `user/files/${normalizedFilename}`;
-
-                const blob = await upload(getSafeCdnPath({ pathname: uploadPath }), file, {
-                    access: 'public',
-                    handleUploadUrl: '/api/upload',
-                    clientPayload: JSON.stringify({
-                        purpose: 'SERVER_ICON',
-                        contentType: file.type,
-                    }),
+                const uploadPath = buildDefaultUserFileUploadPath(normalizedFilename);
+                const safeUploadPath = getSafeCdnPath({
+                    pathname: uploadPath,
+                    pathPrefix: process.env.NEXT_PUBLIC_CDN_PATH_PREFIX,
                 });
 
-                updateWizardField('iconUrl', blob.url);
+                const uploadResult = await uploadFileToServer({
+                    file,
+                    pathname: safeUploadPath,
+                    purpose: 'SERVER_ICON',
+                    contentType: file.type,
+                });
+
+                updateWizardField('iconUrl', uploadResult.url);
             } catch (uploadError) {
                 setWizardError({
                     message: uploadError instanceof Error ? uploadError.message : 'Failed to upload the server icon.',