@promptbook/cli 0.103.0-52 → 0.103.0-54

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

@@ -0,0 +1,147 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { $getTableName } from '../../../database/$getTableName';
+import { $provideSupabase } from '../../../database/$provideSupabase';
+import { isUserAdmin } from '../../../utils/isUserAdmin';
+
+const DEFAULT_PAGE_SIZE = 20;
+const MAX_PAGE_SIZE = 100;
+
+type SortField = 'createdAt' | 'agentName' | 'id';
+type SortOrder = 'asc' | 'desc';
+
+function parsePositiveInt(value: string | null, fallback: number): number {
+    if (!value) return fallback;
+    const parsed = parseInt(value, 10);
+    if (Number.isNaN(parsed) || parsed <= 0) return fallback;
+    return parsed;
+}
+
+function parseSortField(value: string | null): SortField {
+    if (value === 'agentName' || value === 'id') return value;
+    return 'createdAt';
+}
+
+function parseSortOrder(value: string | null): SortOrder {
+    return value === 'asc' ? 'asc' : 'desc';
+}
+
+/**
+ * List chat history with filters, search and pagination.
+ *
+ * Query params:
+ * - page: number (1-based)
+ * - pageSize: number (items per page)
+ * - agentName: filter by agent name
+ * - search: free-text search across agentName, url and ip
+ * - sortBy: createdAt | agentName | id (default: createdAt)
+ * - sortOrder: asc | desc (default: desc)
+ */
+export async function GET(request: NextRequest) {
+    if (!(await isUserAdmin())) {
+        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+    }
+
+    try {
+        const searchParams = request.nextUrl.searchParams;
+
+        const page = parsePositiveInt(searchParams.get('page'), 1);
+        const pageSize = Math.min(
+            MAX_PAGE_SIZE,
+            parsePositiveInt(searchParams.get('pageSize'), DEFAULT_PAGE_SIZE),
+        );
+        const agentName = searchParams.get('agentName');
+        const search = searchParams.get('search')?.trim() || '';
+        const sortBy = parseSortField(searchParams.get('sortBy'));
+        const sortOrder = parseSortOrder(searchParams.get('sortOrder'));
+
+        const supabase = $provideSupabase();
+        const table = await $getTableName('ChatHistory');
+
+        let query = supabase
+            .from(table)
+            .select('*', { count: 'exact' });
+
+        if (agentName) {
+            query = query.eq('agentName', agentName);
+        }
+
+        if (search) {
+            // Note: We intentionally limit search to simple text columns
+            // to keep the query portable and efficient.
+            //
+            // This searches across:
+            // - agentName
+            // - url
+            // - ip
+            const escaped = search.replace(/%/g, '\\%').replace(/_/g, '\\_');
+            query = query.or(
+                `agentName.ilike.%${escaped}%,url.ilike.%${escaped}%,ip.ilike.%${escaped}%`,
+            );
+        }
+
+        query = query.order(sortBy, { ascending: sortOrder === 'asc' });
+
+        const from = (page - 1) * pageSize;
+        const to = from + pageSize - 1;
+
+        query = query.range(from, to);
+
+        const { data, error, count } = await query;
+
+        if (error) {
+            console.error('List chat history error:', error);
+            return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+        }
+
+        return NextResponse.json({
+            items: data ?? [],
+            total: count ?? 0,
+            page,
+            pageSize,
+            sortBy,
+            sortOrder,
+        });
+    } catch (error) {
+        console.error('List chat history error:', error);
+        return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+    }
+}
+
+/**
+ * Delete chat history for a specific agent.
+ *
+ * Query params:
+ * - agentName: name of the agent whose history should be removed
+ */
+export async function DELETE(request: NextRequest) {
+    if (!(await isUserAdmin())) {
+        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+    }
+
+    const searchParams = request.nextUrl.searchParams;
+    const agentName = searchParams.get('agentName');
+
+    if (!agentName) {
+        return NextResponse.json({ error: 'agentName is required' }, { status: 400 });
+    }
+
+    try {
+        const supabase = $provideSupabase();
+        const table = await $getTableName('ChatHistory');
+
+        const { error } = await supabase
+            .from(table)
+            .delete()
+            .eq('agentName', agentName);
+
+        if (error) {
+            console.error('Clear chat history error:', error);
+            return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+        }
+
+        return NextResponse.json({ success: true });
+    } catch (error) {
+        console.error('Clear chat history error:', error);
+        return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
+    }
+}

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

@@ -0,0 +1,17 @@
+import { NextResponse } from 'next/server';
+import { getFederatedServersFromMetadata } from '../../../utils/getFederatedServersFromMetadata';
+
+export const dynamic = 'force-dynamic';
+
+export async function GET() {
+    try {
+        const federatedServers = await getFederatedServersFromMetadata();
+
+        return NextResponse.json({
+            federatedServers,
+        });
+    } catch (error) {
+        console.error('Error fetching federated servers:', error);
+        return NextResponse.json({ error: 'Failed to fetch federated servers' }, { status: 500 });
+    }
+}

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

@@ -11,6 +11,7 @@ import { keepUnused } from '../../../../../../src/utils/organization/keepUnused'
 import { $provideCdnForServer } from '../../../../src/tools/$provideCdnForServer';
 import { getUserFileCdnKey } from '../../../../src/utils/cdn/utils/getUserFileCdnKey';
 import { validateMimeType } from '../../../../src/utils/validators/validateMimeType';
+import { getMetadata } from '../../../database/getMetadata';
 
 export async function POST(request: NextRequest) {
     try {
@@ -18,9 +19,16 @@ export async function POST(request: NextRequest) {
         // await forTime(5000);
 
         const nodeRequest = await nextRequestToNodeRequest(request);
+        let maxFileSizeMb = Number((await getMetadata('MAX_FILE_UPLOAD_SIZE_MB')) || '50'); // <- TODO: [🌲] To /config.ts
+
+        if (Number.isNaN(maxFileSizeMb)) {
+            maxFileSizeMb = 50; // <- TODO: [🌲] To /config.ts
+        }
+
+        const maxFileSize = maxFileSizeMb * 1024 * 1024;
 
         const files = await new Promise<formidable.Files>((resolve, reject) => {
-            const form = formidable({});
+            const form = formidable({ maxFileSize });
             form.parse(nodeRequest as TODO_any, (error, fields, files) => {
                 keepUnused(fields);
 

package/apps/agents-server/src/app/docs/[docId]/page.tsx

@@ -0,0 +1,63 @@
+import { notFound } from 'next/navigation';
+import ReactMarkdown from 'react-markdown';
+import { BookCommitment } from '../../../../../../src/commitments/_base/BookCommitment';
+import { getVisibleCommitmentDefinitions } from '../../../utils/getVisibleCommitmentDefinitions';
+
+type DocPageProps = {
+    params: Promise<{
+        docId: string;
+    }>;
+};
+
+export default async function DocPage(props: DocPageProps) {
+    const { docId } = await props.params;
+
+    // Decode the docId in case it contains encoded characters (though types usually don't)
+    const commitmentType = decodeURIComponent(docId) as BookCommitment;
+    const groupedCommitments = getVisibleCommitmentDefinitions();
+    const group = groupedCommitments.find((g) => g.primary.type === commitmentType || g.aliases.includes(commitmentType));
+
+    if (!group) {
+        notFound();
+    }
+
+    const { primary, aliases } = group;
+
+    return (
+        <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-purple-50">
+            <div className="container mx-auto px-4 py-16">
+                <div className="bg-white rounded-xl shadow-lg border border-gray-200 overflow-hidden">
+                    <div className="p-8 border-b border-gray-100 bg-gray-50/50">
+                        <div className="flex items-center gap-4 mb-4">
+                            <h1 className="text-4xl font-bold text-gray-900 tracking-tight">
+                                <span className="mr-3">{primary.icon}</span>
+                                {primary.type}
+                                {aliases.length > 0 && (
+                                    <span className="text-gray-400 font-normal ml-4 text-2xl">
+                                        / {aliases.join(' / ')}
+                                    </span>
+                                )}
+                            </h1>
+                            <span className="px-3 py-1 rounded-full text-xs font-medium bg-blue-100 text-blue-700">
+                                Commitment
+                            </span>
+                        </div>
+                        {primary.description && (
+                            <p className="text-xl text-gray-600 leading-relaxed max-w-3xl">
+                                {primary.description}
+                            </p>
+                        )}
+                    </div>
+                    
+                    <div className="p-8">
+                        <article className="prose prose-lg prose-slate max-w-none prose-headings:font-bold prose-h2:text-2xl prose-h2:mt-8 prose-h2:mb-4 prose-p:text-gray-600 prose-pre:bg-gray-50 prose-pre:border prose-pre:border-gray-200 prose-pre:text-gray-800">
+                            <ReactMarkdown>
+                                {primary.documentation}
+                            </ReactMarkdown>
+                        </article>
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}

package/apps/agents-server/src/app/docs/page.tsx

@@ -0,0 +1,34 @@
+import Link from 'next/link';
+import { Card } from '../../components/Homepage/Card';
+import { Section } from '../../components/Homepage/Section';
+import { getVisibleCommitmentDefinitions } from '../../utils/getVisibleCommitmentDefinitions';
+
+export default function DocsPage() {
+    const groupedCommitments = getVisibleCommitmentDefinitions();
+
+    return (
+        <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-purple-50">
+            <div className="container mx-auto px-4 py-16">
+                <Section title="Documentation">
+                    {groupedCommitments.map(({ primary, aliases }) => (
+                        <Link key={primary.type} href={`/docs/${primary.type}`} className="block h-full group">
+                            <Card className="h-full group-hover:border-blue-500 transition-colors">
+                                <h3 className="text-xl font-semibold mb-2 group-hover:text-blue-600 transition-colors">
+                                    <span className="mr-2">{primary.icon}</span>
+                                    {primary.type}
+                                    {aliases.length > 0 && (
+                                        <span className="text-gray-400 font-normal text-lg">
+                                            {' / '}
+                                            {aliases.join(' / ')}
+                                        </span>
+                                    )}
+                                </h3>
+                                {primary.description && <p className="text-gray-600 line-clamp-3">{primary.description}</p>}
+                            </Card>
+                        </Link>
+                    ))}
+                </Section>
+            </div>
+        </div>
+    );
+}

package/apps/agents-server/src/app/layout.tsx

@@ -3,7 +3,10 @@ import { LayoutWrapper } from '@/src/components/LayoutWrapper/LayoutWrapper';
 import type { Metadata } from 'next';
 import { Barlow_Condensed } from 'next/font/google';
 import { getMetadata } from '../database/getMetadata';
+import { $provideAgentCollectionForServer } from '../tools/$provideAgentCollectionForServer';
+import { $provideServer } from '../tools/$provideServer';
 import { isUserAdmin } from '../utils/isUserAdmin';
+import { getCurrentUser } from '../utils/getCurrentUser';
 import './globals.css';
 
 const barlowCondensed = Barlow_Condensed({
@@ -13,9 +16,9 @@ const barlowCondensed = Barlow_Condensed({
 });
 
 export async function generateMetadata(): Promise<Metadata> {
+    const { publicUrl } = await $provideServer();
     const serverName = (await getMetadata('SERVER_NAME')) || 'Promptbook Agents Server';
     const serverDescription = (await getMetadata('SERVER_DESCRIPTION')) || 'Agents server powered by Promptbook';
-    const serverUrl = (await getMetadata('SERVER_URL')) || 'https://ptbk.io';
 
     return {
         title: serverName,
@@ -44,7 +47,7 @@ export async function generateMetadata(): Promise<Metadata> {
             description: serverDescription,
             // TODO: images: ['https://www.ptbk.io/design'],
         },
-        metadataBase: new URL(serverUrl),
+        metadataBase: publicUrl,
     };
 }
 
@@ -54,9 +57,22 @@ export default async function RootLayout({
     children: React.ReactNode;
 }>) {
     const isAdmin = await isUserAdmin();
+    const currentUser = await getCurrentUser();
     const serverName = (await getMetadata('SERVER_NAME')) || 'Promptbook Agents Server';
     const serverLogoUrl = (await getMetadata('SERVER_LOGO_URL')) || null;
     const serverFaviconUrl = (await getMetadata('SERVER_FAVICON_URL')) || faviconLogoImage.src;
+    const isFooterShown = ((await getMetadata('IS_FOOTER_SHOWN')) || 'true') === 'true';
+
+    let footerLinks = [];
+    try {
+        const footerLinksString = (await getMetadata('FOOTER_LINKS')) || '[]';
+        footerLinks = JSON.parse(footerLinksString);
+    } catch (error) {
+        console.error('Failed to parse FOOTER_LINKS', error);
+    }
+
+    const collection = await $provideAgentCollectionForServer();
+    const agents = await collection.listAgents();
 
     return (
         <html lang="en">
@@ -83,9 +99,19 @@ export default async function RootLayout({
                 <link rel="icon" href={serverFaviconUrl} type="image/x-icon" />
             </head>
             <body className={`${barlowCondensed.variable} antialiased bg-white text-gray-900`}>
-                <LayoutWrapper isAdmin={isAdmin} serverName={serverName} serverLogoUrl={serverLogoUrl}>
+                <LayoutWrapper
+                    isAdmin={isAdmin}
+                    currentUser={currentUser}
+                    serverName={serverName}
+                    serverLogoUrl={serverLogoUrl}
+                    agents={JSON.parse(JSON.stringify(agents))}
+                    isFooterShown={isFooterShown}
+                    footerLinks={footerLinks}
+                >
                     {children}
                 </LayoutWrapper>
+                {/* Global portal root for modals/popups */}
+                <div id="portal-root" />
             </body>
         </html>
     );

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

@@ -0,0 +1,109 @@
+import { PROMPTBOOK_COLOR } from '@promptbook-local/core';
+import { MetadataRoute } from 'next';
+import { headers } from 'next/headers';
+import { Color } from '../../../../src/utils/color/Color';
+import { getMetadata } from '../database/getMetadata';
+import { $provideServer } from '../tools/$provideServer';
+import { getAgentProfile } from './agents/[agentName]/_utils';
+
+export default async function manifest(): Promise<MetadataRoute.Manifest> {
+    const { publicUrl } = await $provideServer();
+    const serverName = (await getMetadata('SERVER_NAME')) || 'Promptbook Agents Server';
+    const serverDescription = (await getMetadata('SERVER_DESCRIPTION')) || 'Agents server powered by Promptbook';
+
+    const referer = (await headers()).get('referer') || '';
+    const isAgentManifest = referer.includes('/agents/');
+
+    if (!isAgentManifest) {
+        return {
+            name: serverName,
+            short_name: serverName,
+            description: serverDescription,
+            start_url: publicUrl.href,
+            display_override: ['fullscreen', 'minimal-ui'],
+            display: 'standalone',
+            background_color: PROMPTBOOK_COLOR.toHex(),
+            theme_color: PROMPTBOOK_COLOR.toHex(),
+            icons: [
+                // TODO: Create icons for the server homepage
+            ],
+            scope: publicUrl.href,
+        } satisfies MetadataRoute.Manifest;
+    }
+
+    const agentName = decodeURIComponent(referer.split('/agents/')[1]?.split('/')[0]);
+
+    try {
+        const agentProfile = await getAgentProfile(agentName);
+
+        const name = agentProfile.meta.fullname || agentProfile.agentName;
+        const short_name = agentProfile.agentName;
+        const description = agentProfile.meta.description || agentProfile.personaDescription || `Agent ${name}`;
+
+        // Extract brand color from meta
+        const brandColor = Color.from(agentProfile.meta.color || PROMPTBOOK_COLOR);
+        const theme_color = brandColor.toHex();
+        const background_color = '#ffffff';
+
+        const agentUrl = `${publicUrl.href}agents/${encodeURIComponent(agentName)}`;
+
+        const icons: MetadataRoute.Manifest['icons'] = [
+            {
+                src: `${agentUrl}/images/icon-256.png`,
+                sizes: '256x256',
+                type: 'image/png',
+                purpose: 'any',
+            },
+            {
+                src: `${agentUrl}/images/icon-256.png`,
+                sizes: '256x256',
+                type: 'image/png',
+                purpose: 'maskable',
+            },
+        ];
+
+        const screenshots: MetadataRoute.Manifest['screenshots'] = [
+            {
+                src: `${agentUrl}/images/screenshot-fullhd.png`,
+                sizes: '1920x1080',
+                type: 'image/png',
+                form_factor: 'wide',
+                label: 'Full HD Screenshot',
+            },
+            {
+                src: `${agentUrl}/images/screenshot-phone.png`,
+                sizes: '1080x1920',
+                type: 'image/png',
+                form_factor: 'narrow',
+                label: 'Phone Screenshot',
+            },
+        ];
+
+        return {
+            id: agentUrl,
+            name,
+            short_name,
+            description,
+            start_url: `${agentUrl}/chat`,
+            scope: agentUrl,
+            display_override: ['fullscreen', 'minimal-ui'],
+            display: 'standalone',
+            background_color,
+            theme_color,
+            icons,
+            screenshots,
+        } satisfies MetadataRoute.Manifest;
+    } catch (error) {
+        console.warn(`Failed to generate manifest for agent ${agentName}`, error);
+        return {
+            name: agentName,
+            short_name: agentName,
+            start_url: `${publicUrl.href}agents/${encodeURIComponent(agentName)}/chat`,
+            display_override: ['fullscreen', 'minimal-ui'],
+            display: 'standalone',
+            background_color: '#ffffff',
+            theme_color: PROMPTBOOK_COLOR.toHex(),
+            icons: [],
+        } satisfies MetadataRoute.Manifest;
+    }
+}

package/apps/agents-server/src/app/page.tsx

@@ -5,22 +5,18 @@ import moment from 'moment';
 import { headers } from 'next/headers';
 import { AboutPromptbookInformation } from '../../../../src/utils/misc/xAboutPromptbookInformation';
 import { $sideEffect } from '../../../../src/utils/organization/$sideEffect';
-import { AuthControls } from '../components/Auth/AuthControls';
-import { AgentCard } from '../components/Homepage/AgentCard';
-import { ModelCard } from '../components/Homepage/ModelCard';
+import { AgentsList } from '../components/Homepage/AgentsList';
+import { ExternalAgentsSectionClient } from '../components/Homepage/ExternalAgentsSectionClient';
+import { ModelsSection } from '../components/Homepage/ModelsSection';
 import { Section } from '../components/Homepage/Section';
 import { TechInfoCard } from '../components/Homepage/TechInfoCard';
 import { UsersList } from '../components/UsersList/UsersList';
 import VercelDeploymentCard from '../components/VercelDeploymentCard/VercelDeploymentCard';
-import { getMetadata } from '../database/getMetadata';
 import { getLongRunningTask } from '../deamons/longRunningTask';
 import { $provideAgentCollectionForServer } from '../tools/$provideAgentCollectionForServer';
 import { $provideExecutionToolsForServer } from '../tools/$provideExecutionToolsForServer';
 import { $provideServer } from '../tools/$provideServer';
-import { getCurrentUser } from '../utils/getCurrentUser';
-import { getFederatedAgents } from '../utils/getFederatedAgents';
 import { isUserAdmin } from '../utils/isUserAdmin';
-import { AddAgentButton } from './AddAgentButton';
 
 // Add calendar formats that include seconds
 const calendarWithSeconds = {
@@ -36,19 +32,10 @@ export default async function HomePage() {
     $sideEffect(/* Note: [🐶] This will ensure dynamic rendering of page and avoid Next.js pre-render */ headers());
 
     const isAdmin = await isUserAdmin(); /* <- TODO: [👹] Here should be user permissions */
-    const currentUser = await getCurrentUser();
 
     const collection = await $provideAgentCollectionForServer();
     const agents = await collection.listAgents();
 
-    const federatedServersString = (await getMetadata('FEDERATED_SERVERS')) || '';
-    const federatedServers = federatedServersString
-        .split(',')
-        .map((s) => s.trim())
-        .filter((s) => s !== '');
-
-    const externalAgents = await getFederatedAgents(federatedServers);
-
     const longRunningTask = getLongRunningTask();
 
     const executionTools = await $provideExecutionToolsForServer();
@@ -59,38 +46,14 @@ export default async function HomePage() {
     return (
         <div className="min-h-screen bg-gradient-to-br from-blue-50 via-white to-purple-50">
             <div className="container mx-auto px-4 py-16">
-                <div className="flex justify-end mb-4">
-                    <AuthControls initialUser={currentUser} />
-                </div>
-
-                <Section title={`Agents (${agents.length})`}>
-                    {agents.map((agent) => (
-                        <AgentCard key={agent.agentName} agent={agent} href={`/${agent.agentName}`} />
-                    ))}
-                    {isAdmin && <AddAgentButton />}
-                </Section>
-
-                {externalAgents.length > 0 && (
-                    <Section title={`External Agents (${externalAgents.length})`}>
-                        {externalAgents.map((agent) => (
-                            <AgentCard key={agent.url} agent={agent} href={agent.url} />
-                        ))}
-                    </Section>
-                )}
+                <AgentsList agents={[...agents]} isAdmin={isAdmin} />
+
+                <ExternalAgentsSectionClient />
 
-                {isAdmin && <UsersList />}
+                {isAdmin && <UsersList allowCreate={false} />}
 
                 {isAdmin && (
-                    <Section title={`Models (${models.length})`}>
-                        {models.map(({ modelName, modelTitle, modelDescription }) => (
-                            <ModelCard
-                                key={modelName}
-                                modelName={modelName}
-                                modelTitle={modelTitle || modelName}
-                                modelDescription={modelDescription}
-                            />
-                        ))}
-                    </Section>
+                    <ModelsSection models={models} maxVisible={11} showViewAllLink />
                 )}
 
                 {isAdmin && (

package/apps/agents-server/src/app/recycle-bin/RestoreAgentButton.tsx

@@ -0,0 +1,40 @@
+'use client';
+
+import { RefreshCcwIcon } from 'lucide-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { restoreDeletedAgent } from './actions';
+
+type RestoreAgentButtonProps = {
+    agentName: string;
+};
+
+export function RestoreAgentButton({ agentName }: RestoreAgentButtonProps) {
+    const router = useRouter();
+    const [isRestoring, setIsRestoring] = useState(false);
+
+    const handleRestore = async () => {
+        try {
+            setIsRestoring(true);
+            await restoreDeletedAgent(agentName);
+            router.refresh();
+        } catch (error) {
+            console.error('Failed to restore agent:', error);
+            alert('Failed to restore agent');
+        } finally {
+            setIsRestoring(false);
+        }
+    };
+
+    return (
+        <button
+            onClick={handleRestore}
+            disabled={isRestoring}
+            className="flex items-center gap-2 px-3 py-2 bg-white border border-gray-300 rounded hover:bg-gray-50 text-gray-700 disabled:opacity-50"
+            title="Restore agent"
+        >
+            <RefreshCcwIcon className={`w-4 h-4 ${isRestoring ? 'animate-spin' : ''}`} />
+            {isRestoring ? 'Restoring...' : 'Restore'}
+        </button>
+    );
+}

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

@@ -0,0 +1,27 @@
+'use server';
+
+import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
+import { revalidatePath } from 'next/cache';
+
+export async function restoreDeletedAgent(agentName: string) {
+    const collection = await $provideAgentCollectionForServer();
+    
+    // Find the latest history item for this agent
+    const history = await collection.listAgentHistory(agentName);
+    
+    if (history.length === 0) {
+        throw new Error(`No history found for agent ${agentName}`);
+    }
+    
+    const latestVersion = history[0];
+    
+    if (!latestVersion) {
+         throw new Error(`No history found for agent ${agentName}`);
+    }
+
+    await collection.restoreAgent(latestVersion.id);
+    
+    revalidatePath('/recycle-bin');
+    revalidatePath(`/agents/${agentName}`);
+    revalidatePath('/');
+}