@promptbook/cli 0.112.0-102 → 0.112.0-104

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/AddAgentButton.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { useRouter } from 'next/navigation';
 import { FileCard } from '../components/Homepage/FileCard';
 import { useAgentNaming } from '../components/AgentNaming/AgentNamingContext';
 import { showAlert } from '../components/AsyncDialogs/asyncDialogs';
@@ -21,15 +20,11 @@ type AddAgentButtonProps = {
  * Renders the add-agent card and creation dialog workflow.
  */
 export function AddAgentButton({ currentFolderId }: AddAgentButtonProps) {
-    const router = useRouter();
     const { formatText } = useAgentNaming();
     const { t } = useServerLanguage();
     const addButtonLabel = formatText(t('agentCreation.addButtonLabel'));
 
     const { isPreparingDialog, openNewAgentDialog, dialog } = useNewAgentDialog({
-        onCreated: ({ targetPath }) => {
-            router.push(targetPath);
-        },
         onCreateFailed: async (error) => {
             console.error('Failed to create agent:', error);
             await showAlert({

package/apps/agents-server/src/app/actions.ts

@@ -8,6 +8,9 @@ import { DEFAULT_NAME_POOL, NAME_POOL_METADATA_KEY, parseNamePool } from '../con
 import { NEW_AGENT_WIZZARD_METADATA_KEY, parseNewAgentWizardMode } from '../constants/newAgentWizard';
 import { getMetadata } from '../database/getMetadata';
 import { $provideAgentCollectionForServer } from '../tools/$provideAgentCollectionForServer';
+import { invalidateCachedActiveOrganizationSnapshots } from '../utils/agentOrganization/loadAgentOrganizationState';
+import { resolveAgentRouteTarget } from '../utils/agentRouting/resolveAgentRouteTarget';
+import { buildAgentChatHref, buildAgentProfileHref } from '../utils/agentRouting/agentRouteHrefs';
 import { type AgentVisibility, parseAgentVisibility } from '../utils/agentVisibility';
 import { authenticateUser } from '../utils/authenticateUser';
 import { createAgentWithDefaultVisibility } from '../utils/createAgentWithDefaultVisibility';
@@ -15,6 +18,16 @@ import { resolveCurrentUserIdentity } from '../utils/currentUserIdentity';
 import { isUserAdmin } from '../utils/isUserAdmin';
 import { clearSession, setSession } from '../utils/session';
 
+/**
+ * Maximum attempts used to confirm a freshly created agent route resolves before navigation starts.
+ */
+const CREATED_AGENT_ROUTE_READY_ATTEMPTS = 20;
+
+/**
+ * Delay between created-agent route-resolution retries.
+ */
+const CREATED_AGENT_ROUTE_READY_DELAY_MS = 100;
+
 /**
  * Creates a new agent from the generated boilerplate template.
  *
@@ -34,6 +47,8 @@ export async function $createAgentAction(): Promise<{ agentName: string_agent_na
     const { agentName, permanentId } = await createAgentWithDefaultVisibility(collection, agentSource, {
         userId: currentUserIdentity?.userId,
     });
+    revalidateCreatedAgentPaths(permanentId);
+    await waitForCreatedAgentRoute(permanentId);
 
     return { agentName, permanentId };
 }
@@ -63,6 +78,39 @@ export async function $getNewAgentCreationSettingsAction(): Promise<{
     };
 }
 
+/**
+ * Clears cached organization snapshots and route payloads after a new agent is created.
+ *
+ * @param permanentId - Canonical identifier of the newly created agent.
+ */
+function revalidateCreatedAgentPaths(permanentId: string_agent_permanent_id): void {
+    invalidateCachedActiveOrganizationSnapshots();
+    revalidatePath('/', 'layout');
+    revalidatePath('/');
+    revalidatePath('/agents');
+    revalidatePath('/dashboard');
+    revalidatePath(buildAgentProfileHref(permanentId));
+    revalidatePath(buildAgentChatHref(permanentId));
+}
+
+/**
+ * Waits until the new agent can be resolved by the same routing helper the chat page uses.
+ *
+ * @param permanentId - Canonical identifier of the newly created agent.
+ */
+async function waitForCreatedAgentRoute(permanentId: string_agent_permanent_id): Promise<void> {
+    for (let attempt = 0; attempt < CREATED_AGENT_ROUTE_READY_ATTEMPTS; attempt++) {
+        const routeTarget = await resolveAgentRouteTarget(permanentId, { forceRefresh: true });
+        if (routeTarget?.kind === 'local' && routeTarget.canonicalAgentId === permanentId) {
+            return;
+        }
+
+        await new Promise((resolve) => setTimeout(resolve, CREATED_AGENT_ROUTE_READY_DELAY_MS));
+    }
+
+    throw new Error(`Created agent "${permanentId}" could not be resolved for routing immediately after creation.`);
+}
+
 /**
  * Creates a new agent using provided book content.
  *
@@ -89,6 +137,8 @@ export async function $createAgentFromBookAction(
         visibility: visibility ?? undefined,
         userId: currentUserIdentity?.userId,
     });
+    revalidateCreatedAgentPaths(permanentId);
+    await waitForCreatedAgentRoute(permanentId);
 
     return { agentName, permanentId };
 }

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.',

package/apps/agents-server/src/app/agents/[agentName]/AgentProfileChat.tsx

@@ -4,7 +4,6 @@ import { usePromise } from '@common/hooks/usePromise';
 import { Chat } from '@promptbook-local/components';
 import { RemoteAgent } from '@promptbook-local/core';
 import { string_book, type ChatMessage } from '@promptbook-local/types';
-import { useRouter } from 'next/navigation';
 import { useCallback, useMemo, useState, type MouseEvent as ReactMouseEvent } from 'react';
 import { spaceTrim } from 'spacetrim';
 import { string_agent_url, string_color } from '../../../../../../src/types/typeAliases';
@@ -24,6 +23,7 @@ import { useServerLanguage } from '../../../components/ServerLanguage/ServerLang
 import { ChatThreadLoadingSkeleton } from '../../../components/Skeleton/ChatThreadLoadingSkeleton';
 import { usePromptbookTheme } from '../../../components/ThemeMode/usePromptbookTheme';
 import type { ServerLanguageCode } from '../../../languages/ServerLanguageRegistry';
+import { buildFreshAgentChatHref } from '../../../utils/agentRouting/agentRouteHrefs';
 import { executeQuickActionButton } from '../../../utils/chat/executeQuickActionButton';
 import { resolveChatMessageValidationIssue } from '../../../utils/chat/validateChatMessageContent';
 import { createServerLanguageMoment } from '../../../utils/localization/createServerLanguageMoment';
@@ -277,7 +277,6 @@ export function AgentProfileChat({
     isHistoryEnabled = false,
     areFileAttachmentsEnabled = true,
 }: AgentProfileChatProps) {
-    const router = useRouter();
     const [isCreatingAgent, setIsCreatingAgent] = useState(false);
     const [optimisticNavigationState, setOptimisticNavigationState] = useState<OptimisticChatNavigationState | null>(null);
     const { formatText } = useAgentNaming();
@@ -409,7 +408,7 @@ export function AgentProfileChat({
             try {
                 const { permanentId } = await $createAgentFromBookAction(bookContent as string_book);
                 if (permanentId) {
-                    router.push(`/agents/${permanentId}`);
+                    window.location.assign(buildFreshAgentChatHref(permanentId));
                 }
             } catch (error) {
                 console.error('Failed to create agent:', error);
@@ -421,7 +420,7 @@ export function AgentProfileChat({
                 setIsCreatingAgent(false);
             }
         },
-        [formatText, router],
+        [formatText],
     );
     const handleFileUpload = useCallback(async (file: File) => chatFileUploadHandler(file), []);
     const fallbackInitialMessage = useMemo(() => {

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

@@ -0,0 +1,18 @@
+import { NextResponse } from 'next/server';
+
+/**
+ * Ensures the readiness route runs in the same runtime as the standalone server.
+ */
+export const runtime = 'nodejs';
+
+/**
+ * Prevents a cached response from hiding readiness failures during deployment handoff.
+ */
+export const dynamic = 'force-dynamic';
+
+/**
+ * Lightweight readiness endpoint used by standalone VPS pm2/nginx handoffs.
+ */
+export async function GET() {
+    return NextResponse.json({ status: 'ok' });
+}