@promptbook/cli 0.114.0-5 → 0.114.0-7

package/apps/agents-server/src/components/CloudflareDnsWizard/CloudflareDnsWizard.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { useState } from 'react';
-import type { DnsRecordInstruction, DnsRecordSelection } from '../../utils/dnsRecords/DnsRecordInstruction';
-import { resolveDnsRecordBatchPlan } from '../../utils/dnsRecords/resolveDnsRecordBatchPlan';
+import type { DnsRecordGroup } from '../../utils/dnsRecords/DnsRecordInstruction';
+import { resolveDnsRecordBatchPlanForGroups } from '../../utils/dnsRecords/resolveDnsRecordBatchPlan';
 import { CloudflareDnsApiTokenImportStep } from './CloudflareDnsApiTokenImportStep';
 import { CloudflareDnsCheckStep } from './CloudflareDnsCheckStep';
 import { CloudflareDnsManualStep } from './CloudflareDnsManualStep';
@@ -15,14 +15,14 @@ import { CloudflareDnsZoneFileImportStep } from './CloudflareDnsZoneFileImportSt
  *
  * The record table remains the single source of truth for the values to configure. This wizard adds the two batch
  * ways of configuring all of them at once - an API token import and a zone file import - and keeps the manual steps
- * as a fallback.
+ * as a fallback. All record groups of the DNS manual, for example the server domain, the generated project domains,
+ * and the email records, are configured by this one wizard together.
  *
  * @private shared by the Agents Server DNS instruction views
  */
 export function CloudflareDnsWizard({
     domain,
-    recordSelection,
-    records,
+    recordGroups,
 }: {
     /**
      * Hostname whose DNS records are being configured.
@@ -30,16 +30,11 @@ export function CloudflareDnsWizard({
     readonly domain: string;
 
     /**
-     * Whether all listed records or one listed alternative must be configured.
+     * All record groups displayed by the parent instruction panel.
      */
-    readonly recordSelection: DnsRecordSelection;
-
-    /**
-     * The canonical DNS records displayed by the parent instruction panel.
-     */
-    readonly records: ReadonlyArray<DnsRecordInstruction>;
+    readonly recordGroups: ReadonlyArray<DnsRecordGroup>;
 }) {
-    const batchPlan = resolveDnsRecordBatchPlan({ records, recordSelection });
+    const batchPlan = resolveDnsRecordBatchPlanForGroups(recordGroups);
     const isBatchImportAvailable = batchPlan.applicableRecords.length > 0;
     const availableSteps = CLOUDFLARE_DNS_WIZARD_STEPS.filter((step) => isBatchImportAvailable || !step.isBatchStep);
     const [currentStep, setCurrentStep] = useState<CloudflareDnsWizardStep>(
@@ -67,11 +62,7 @@ export function CloudflareDnsWizard({
             />
 
             {currentStep === 'import-with-api-token' ? (
-                <CloudflareDnsApiTokenImportStep
-                    batchPlan={batchPlan}
-                    domain={domain}
-                    recordSelection={recordSelection}
-                />
+                <CloudflareDnsApiTokenImportStep batchPlan={batchPlan} domain={domain} recordGroups={recordGroups} />
             ) : null}
 
             {currentStep === 'import-zone-file' ? (
@@ -79,10 +70,10 @@ export function CloudflareDnsWizard({
             ) : null}
 
             {currentStep === 'add-manually' ? (
-                <CloudflareDnsManualStep domain={domain} recordSelection={recordSelection} records={records} />
+                <CloudflareDnsManualStep domain={domain} recordGroups={recordGroups} />
             ) : null}
 
-            {currentStep === 'check-dns' ? <CloudflareDnsCheckStep recordSelection={recordSelection} /> : null}
+            {currentStep === 'check-dns' ? <CloudflareDnsCheckStep recordGroups={recordGroups} /> : null}
         </section>
     );
 }

package/apps/agents-server/src/components/CloudflareDnsWizard/useCloudflareDnsRecordImport.ts

@@ -2,7 +2,7 @@
 
 import { useCallback, useState } from 'react';
 import type { CloudflareDnsBatchApplication } from '../../utils/cloudflare/CloudflareDnsBatchApplication';
-import type { DnsRecordInstruction, DnsRecordSelection } from '../../utils/dnsRecords/DnsRecordInstruction';
+import type { DnsRecordGroup } from '../../utils/dnsRecords/DnsRecordInstruction';
 
 /**
  * Endpoint which writes the records of one DNS manual into Cloudflare.
@@ -23,8 +23,7 @@ const CLOUDFLARE_DNS_IMPORT_ENDPOINT = '/api/admin/dns-records/cloudflare';
  */
 export function useCloudflareDnsRecordImport(options: {
     readonly domain: string;
-    readonly recordSelection: DnsRecordSelection;
-    readonly records: ReadonlyArray<DnsRecordInstruction>;
+    readonly recordGroups: ReadonlyArray<DnsRecordGroup>;
 }): {
     readonly isImporting: boolean;
     readonly application: CloudflareDnsBatchApplication | null;
@@ -34,7 +33,7 @@ export function useCloudflareDnsRecordImport(options: {
     const [isImporting, setIsImporting] = useState(false);
     const [application, setApplication] = useState<CloudflareDnsBatchApplication | null>(null);
     const [errorMessage, setErrorMessage] = useState<string | null>(null);
-    const { domain, recordSelection, records } = options;
+    const { domain, recordGroups } = options;
 
     const importRecords = useCallback(
         async (apiToken: string) => {
@@ -46,7 +45,7 @@ export function useCloudflareDnsRecordImport(options: {
                 const response = await fetch(CLOUDFLARE_DNS_IMPORT_ENDPOINT, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ apiToken, domain, recordSelection, records }),
+                    body: JSON.stringify({ apiToken, domain, recordGroups }),
                 });
                 const payload = (await response.json().catch(() => null)) as
                     | (CloudflareDnsBatchApplication & { readonly error?: string })
@@ -64,7 +63,7 @@ export function useCloudflareDnsRecordImport(options: {
                 setIsImporting(false);
             }
         },
-        [domain, recordSelection, records],
+        [domain, recordGroups],
     );
 
     return { isImporting, application, errorMessage, importRecords };

package/apps/agents-server/src/components/DnsRecordsInstructions/DnsRecordsInstructions.tsx

@@ -1,21 +1,32 @@
-import type { ReactNode } from 'react';
+'use client';
+
+import { useState, type ReactNode } from 'react';
 import type { DnsProviderGuide } from '../../utils/dnsProviderGuides';
-import type { DnsRecordInstruction, DnsRecordSelection } from '../../utils/dnsRecords/DnsRecordInstruction';
+import type { DnsRecordGroup } from '../../utils/dnsRecords/DnsRecordInstruction';
+import type { DnsRecordsSection, DnsRecordsSectionVariant } from '../../utils/dnsRecords/DnsRecordsSection';
+import {
+    hasAlternativeDnsRecordGroup,
+    isEveryDnsRecordGroupAlternative,
+    isEveryDnsRecordGroupRequired,
+} from '../../utils/dnsRecords/dnsRecordGroups';
 import { CloudflareDnsWizard } from '../CloudflareDnsWizard/CloudflareDnsWizard';
 import { DnsProviderGuides } from '../DnsProviderGuides/DnsProviderGuides';
+import { DnsRecordsSectionPanel } from './DnsRecordsSectionPanel';
 
 /**
- * Standardized DNS record configuration panel shared by Agents Server administration views.
+ * The one DNS record configuration panel of the Agents Server administration.
+ *
+ * Every administration view uses this same component and just passes the sections which are relevant for it - the
+ * Super Admin servers page passes all sections of one server, while a subpage such as `/admin/email-server` passes
+ * only its own section. All shown sections are configured by one shared Cloudflare wizard.
  *
  * @private shared by the Agents Server DNS instruction views
  */
 export function DnsRecordsInstructions({
     description,
     domain,
-    recordSelection,
-    records,
     providerGuides,
-    resolvedAddresses,
+    sections,
     title,
 }: {
     /**
@@ -24,94 +35,79 @@ export function DnsRecordsInstructions({
     readonly description?: ReactNode;
 
     /**
-     * Domain whose records are being configured.
+     * Domain whose DNS zone holds all shown records.
      */
     readonly domain: string;
 
-    /**
-     * Whether every shown record or just one alternative must be configured.
-     */
-    readonly recordSelection: DnsRecordSelection;
-
-    /**
-     * DNS records to configure at the provider.
-     */
-    readonly records: ReadonlyArray<DnsRecordInstruction>;
-
     /**
      * Optional provider-specific documentation links.
      */
     readonly providerGuides?: ReadonlyArray<DnsProviderGuide>;
 
     /**
-     * Addresses currently returned by public DNS, when verification is available.
+     * Parts of the DNS setup shown in this manual.
      */
-    readonly resolvedAddresses?: ReadonlyArray<string>;
+    readonly sections: ReadonlyArray<DnsRecordsSection>;
 
     /**
      * Context-specific panel title.
      */
     readonly title?: ReactNode;
 }) {
-    const recordSelectionInstruction =
-        recordSelection === 'one' ? 'Add one of the records above' : 'Add all records shown above';
+    const [selectedVariantIdBySectionId, setSelectedVariantIdBySectionId] = useState<Record<string, string>>({});
+    const selectedVariantBySection = sections.map((section) => ({
+        section,
+        selectedVariant: resolveSelectedDnsRecordsSectionVariant(
+            section,
+            selectedVariantIdBySectionId[section.id] || null,
+        ),
+    }));
+    const recordGroups: ReadonlyArray<DnsRecordGroup> = selectedVariantBySection.flatMap(({ selectedVariant }) =>
+        selectedVariant ? [selectedVariant] : [],
+    );
+    const isRecordShown = recordGroups.some((recordGroup) => recordGroup.records.length > 0);
 
     return (
         <div className="space-y-4 rounded-xl border border-amber-200 bg-amber-50 px-4 py-4 text-sm text-amber-900">
-            {title || description || resolvedAddresses?.length ? (
+            {title || description ? (
                 <div className="space-y-1">
                     {title ? <p className="font-semibold">{title}</p> : null}
                     {description ? <div>{description}</div> : null}
-                    {resolvedAddresses?.length ? (
-                        <p className="text-xs text-amber-800">
-                            Currently resolves to: <span className="font-mono">{resolvedAddresses.join(', ')}</span>
-                        </p>
-                    ) : null}
                 </div>
             ) : null}
 
-            {records.length ? (
-                <div className="overflow-x-auto rounded-lg border border-amber-200 bg-white">
-                    <table className="min-w-full divide-y divide-amber-100 text-xs">
-                        <thead className="bg-amber-100/60 text-amber-900">
-                            <tr>
-                                <th className="px-3 py-2 text-left font-semibold">Type</th>
-                                <th className="px-3 py-2 text-left font-semibold">Name</th>
-                                <th className="px-3 py-2 text-left font-semibold">Value</th>
-                                <th className="px-3 py-2 text-left font-semibold">When to use</th>
-                            </tr>
-                        </thead>
-                        <tbody className="divide-y divide-amber-100">
-                            {records.map((record) => (
-                                <tr key={`${record.type}-${record.name}-${record.value}`}>
-                                    <td className="px-3 py-2 font-mono font-semibold text-amber-900">{record.type}</td>
-                                    <td className="px-3 py-2 font-mono text-slate-800">{record.name}</td>
-                                    <td className="px-3 py-2 font-mono text-slate-800">{record.value}</td>
-                                    <td className="px-3 py-2 text-amber-900">{record.note || 'Required.'}</td>
-                                </tr>
-                            ))}
-                        </tbody>
-                    </table>
-                </div>
-            ) : null}
+            {selectedVariantBySection.map(({ section, selectedVariant }) =>
+                selectedVariant ? (
+                    <DnsRecordsSectionPanel
+                        key={section.id}
+                        onSelectVariant={(variantId) =>
+                            setSelectedVariantIdBySectionId((selectedVariantIds) => ({
+                                ...selectedVariantIds,
+                                [section.id]: variantId,
+                            }))
+                        }
+                        section={section}
+                        selectedVariant={selectedVariant}
+                    />
+                ) : null,
+            )}
 
             <div className="space-y-2">
-                <p className="font-medium">How to fix it</p>
+                <p className="font-medium">How to set it up</p>
                 <ol className="list-decimal space-y-1 pl-5 text-amber-900">
                     <li>Open your DNS provider for this domain.</li>
                     <li>
-                        {recordSelectionInstruction} for <span className="font-mono">{domain}</span>.
+                        {resolveDnsRecordSelectionInstruction(recordGroups)} for{' '}
+                        <span className="font-mono">{domain}</span>.
                     </li>
-                    {recordSelection === 'one' ? (
+                    {hasAlternativeDnsRecordGroup(recordGroups) ? (
                         <li>Remove conflicting A, AAAA, or CNAME records for the same hostname.</li>
                     ) : null}
                     <li>Wait for DNS propagation, then refresh this page.</li>
                 </ol>
             </div>
 
-            {records.length ? (
-                <CloudflareDnsWizard domain={domain} recordSelection={recordSelection} records={records} />
-            ) : null}
+            {isRecordShown ? <CloudflareDnsWizard domain={domain} recordGroups={recordGroups} /> : null}
 
             <div className="space-y-2">
                 <p className="font-medium">Provider guides</p>
@@ -123,3 +119,41 @@ export function DnsRecordsInstructions({
         </div>
     );
 }
+
+/**
+ * Resolves which variant of one section is currently shown.
+ *
+ * The first variant is the recommended one, so it stays selected until the administrator picks another one.
+ *
+ * @param section - Section whose variant is resolved.
+ * @param selectedVariantId - Variant picked by the administrator, when there is one.
+ * @returns Selected variant, or `null` for a section without any variant.
+ *
+ * @private function of <DnsRecordsInstructions/>
+ */
+function resolveSelectedDnsRecordsSectionVariant(
+    section: DnsRecordsSection,
+    selectedVariantId: string | null,
+): DnsRecordsSectionVariant | null {
+    return section.variants.find((variant) => variant.id === selectedVariantId) || section.variants[0] || null;
+}
+
+/**
+ * Resolves how many of the shown records an administrator has to configure.
+ *
+ * @param recordGroups - Currently selected groups of all shown sections.
+ * @returns Instruction sentence without the domain.
+ *
+ * @private function of <DnsRecordsInstructions/>
+ */
+function resolveDnsRecordSelectionInstruction(recordGroups: ReadonlyArray<DnsRecordGroup>): string {
+    if (isEveryDnsRecordGroupRequired(recordGroups)) {
+        return 'Add all records shown above';
+    }
+
+    if (isEveryDnsRecordGroupAlternative(recordGroups)) {
+        return 'Add one of the records above';
+    }
+
+    return 'Add all records shown above, and only one record from each group of alternatives';
+}

package/apps/agents-server/src/components/DnsRecordsInstructions/DnsRecordsSectionPanel.tsx

@@ -0,0 +1,63 @@
+'use client';
+
+import type { DnsRecordsSection, DnsRecordsSectionVariant } from '../../utils/dnsRecords/DnsRecordsSection';
+import { DnsRecordsSectionVariantTabs } from './DnsRecordsSectionVariantTabs';
+import { DnsRecordsTable } from './DnsRecordsTable';
+
+/**
+ * Renders one part of the DNS setup - its explanation, its optional setup variants, and its records.
+ *
+ * @private internal part of <DnsRecordsInstructions/>
+ */
+export function DnsRecordsSectionPanel({
+    onSelectVariant,
+    section,
+    selectedVariant,
+}: {
+    /**
+     * Called with the identifier of the newly selected variant of this section.
+     */
+    readonly onSelectVariant: (variantId: string) => void;
+
+    /**
+     * Section to render.
+     */
+    readonly section: DnsRecordsSection;
+
+    /**
+     * Variant of the section which is currently selected.
+     */
+    readonly selectedVariant: DnsRecordsSectionVariant;
+}) {
+    return (
+        <section aria-label={section.title} className="space-y-3 rounded-lg border border-amber-200 bg-white/70 p-4">
+            <div className="space-y-1">
+                <h3 className="font-semibold">{section.title}</h3>
+                {section.description ? <div className="text-amber-900">{section.description}</div> : null}
+                {section.statusSummary ? (
+                    <p className={section.isDnsIssue ? 'text-amber-800' : 'text-emerald-700'}>
+                        {section.statusSummary}
+                    </p>
+                ) : null}
+                {section.resolvedAddresses?.length ? (
+                    <p className="text-xs text-amber-800">
+                        Currently resolves to: <span className="font-mono">{section.resolvedAddresses.join(', ')}</span>
+                    </p>
+                ) : null}
+            </div>
+
+            {section.variants.length > 1 ? (
+                <DnsRecordsSectionVariantTabs
+                    label={section.variantsLabel || 'Setup'}
+                    onSelect={onSelectVariant}
+                    selectedVariantId={selectedVariant.id}
+                    variants={section.variants}
+                />
+            ) : null}
+
+            {selectedVariant.description ? <div className="text-amber-900">{selectedVariant.description}</div> : null}
+
+            {selectedVariant.records.length ? <DnsRecordsTable records={selectedVariant.records} /> : null}
+        </section>
+    );
+}

package/apps/agents-server/src/components/DnsRecordsInstructions/DnsRecordsSectionVariantTabs.tsx

@@ -0,0 +1,67 @@
+'use client';
+
+import type { DnsRecordsSectionVariant } from '../../utils/dnsRecords/DnsRecordsSection';
+
+/**
+ * Renders the accessible variant switch of one DNS record section.
+ *
+ * @private internal part of <DnsRecordsInstructions/>
+ */
+export function DnsRecordsSectionVariantTabs({
+    label,
+    onSelect,
+    selectedVariantId,
+    variants,
+}: {
+    /**
+     * Label of the whole variant group.
+     */
+    readonly label: string;
+
+    /**
+     * Called with the identifier of the newly selected variant.
+     */
+    readonly onSelect: (variantId: string) => void;
+
+    /**
+     * Identifier of the currently selected variant.
+     */
+    readonly selectedVariantId: string;
+
+    /**
+     * Alternative setups of the section.
+     */
+    readonly variants: ReadonlyArray<DnsRecordsSectionVariant>;
+}) {
+    return (
+        <div>
+            <p className="mb-2 text-xs font-semibold uppercase tracking-wide text-amber-700">{label}</p>
+            <div
+                className="flex flex-wrap gap-1 rounded-md border border-amber-200 bg-white p-1"
+                role="tablist"
+                aria-label={label}
+            >
+                {variants.map((variant) => {
+                    const isSelected = variant.id === selectedVariantId;
+
+                    return (
+                        <button
+                            key={variant.id}
+                            type="button"
+                            role="tab"
+                            aria-selected={isSelected}
+                            onClick={() => onSelect(variant.id)}
+                            className={`flex-1 rounded px-2 py-2 text-xs font-semibold transition ${
+                                isSelected
+                                    ? 'bg-amber-700 text-white shadow-sm'
+                                    : 'text-amber-800 hover:bg-amber-50 hover:text-amber-950'
+                            }`}
+                        >
+                            {variant.label}
+                        </button>
+                    );
+                })}
+            </div>
+        </div>
+    );
+}

package/apps/agents-server/src/components/DnsRecordsInstructions/DnsRecordsTable.tsx

@@ -0,0 +1,40 @@
+import type { DnsRecordInstruction } from '../../utils/dnsRecords/DnsRecordInstruction';
+
+/**
+ * Renders the canonical table of DNS records which an administrator copies to their DNS provider.
+ *
+ * @private internal part of <DnsRecordsInstructions/>
+ */
+export function DnsRecordsTable({
+    records,
+}: {
+    /**
+     * DNS records of one section variant.
+     */
+    readonly records: ReadonlyArray<DnsRecordInstruction>;
+}) {
+    return (
+        <div className="overflow-x-auto rounded-lg border border-amber-200 bg-white">
+            <table className="min-w-full divide-y divide-amber-100 text-xs">
+                <thead className="bg-amber-100/60 text-amber-900">
+                    <tr>
+                        <th className="px-3 py-2 text-left font-semibold">Type</th>
+                        <th className="px-3 py-2 text-left font-semibold">Name</th>
+                        <th className="px-3 py-2 text-left font-semibold">Value</th>
+                        <th className="px-3 py-2 text-left font-semibold">When to use</th>
+                    </tr>
+                </thead>
+                <tbody className="divide-y divide-amber-100">
+                    {records.map((record) => (
+                        <tr key={`${record.type}-${record.name}-${record.value}`}>
+                            <td className="px-3 py-2 font-mono font-semibold text-amber-900">{record.type}</td>
+                            <td className="px-3 py-2 font-mono text-slate-800">{record.name}</td>
+                            <td className="px-3 py-2 font-mono text-slate-800">{record.value}</td>
+                            <td className="px-3 py-2 text-amber-900">{record.note || 'Required.'}</td>
+                        </tr>
+                    ))}
+                </tbody>
+            </table>
+        </div>
+    );
+}

package/apps/agents-server/src/components/Header/buildActiveAgentViewItems.ts

@@ -49,10 +49,6 @@ export function buildActiveAgentViewItems({
             label: createAgentViewLabel('Chat', translate),
             href: `${activeAgentBasePath}/chat`,
         },
-        {
-            label: createAgentViewLabel('Timeouts', translate),
-            href: `${activeAgentBasePath}/timeouts`,
-        },
     ];
 
     if (isProjectsViewVisible) {
@@ -67,6 +63,11 @@ export function buildActiveAgentViewItems({
             label: createAgentViewLabel('Book', translate),
             href: `${activeAgentBasePath}/book`,
         });
+        // Note: The goal chat is readable by exactly who may read the agent source book
+        items.push({
+            label: createAgentViewLabel('Goal', translate),
+            href: `${activeAgentBasePath}/goal`,
+        });
     }
 
     if (agentMoreViewItems.length > 0) {

package/apps/agents-server/src/components/Header/createAgentViewLabel.tsx

@@ -1,10 +1,10 @@
 import {
-    Clock3Icon,
     FileTextIcon,
     FolderKanbanIcon,
     MessageSquareIcon,
     MoreHorizontalIcon,
     NotebookPenIcon,
+    TargetIcon,
 } from 'lucide-react';
 import type { ServerTranslationKey } from '../../languages/ServerTranslationKeys';
 
@@ -13,7 +13,7 @@ import type { ServerTranslationKey } from '../../languages/ServerTranslationKeys
  *
  * @private type of Header
  */
-export type AgentHierarchyView = 'Profile' | 'Chat' | 'Book' | 'Timeouts' | 'Projects' | 'More';
+export type AgentHierarchyView = 'Profile' | 'Chat' | 'Book' | 'Goal' | 'Projects' | 'More';
 
 /**
  * Icon displayed next to each hierarchy view label.
@@ -22,7 +22,7 @@ const AGENT_VIEW_ICON_MAP: Record<AgentHierarchyView, typeof FileTextIcon> = {
     Profile: FileTextIcon,
     Chat: MessageSquareIcon,
     Book: NotebookPenIcon,
-    Timeouts: Clock3Icon,
+    Goal: TargetIcon,
     Projects: FolderKanbanIcon,
     More: MoreHorizontalIcon,
 };
@@ -34,7 +34,7 @@ const AGENT_VIEW_TRANSLATION_KEY_MAP: Record<AgentHierarchyView, ServerTranslati
     Profile: 'common.profile',
     Chat: 'common.chat',
     Book: 'common.book',
-    Timeouts: 'common.timeouts',
+    Goal: 'common.goalChat',
     Projects: 'common.projects',
     More: 'common.more',
 };

package/apps/agents-server/src/components/Header/resolveActiveAgentNavigation.ts

@@ -41,8 +41,8 @@ function resolveAgentHierarchyView(segment: string | undefined): AgentHierarchyV
         return 'Book';
     }
 
-    if (segment === 'timeouts') {
-        return 'Timeouts';
+    if (segment === 'goal') {
+        return 'Goal';
     }
 
     if (segment === 'projects') {

package/apps/agents-server/src/components/Homepage/useAgentsListImportExportState.ts

@@ -2,6 +2,7 @@
 
 import JSZip from 'jszip';
 import { useCallback, useRef, useState, type DragEvent } from 'react';
+import { spaceTrim } from 'spacetrim';
 import { downloadBlob, parseFilenameFromContentDisposition } from '../../utils/download/browserFileDownload';
 import { showAlert, showConfirm, showPrompt } from '../AsyncDialogs/asyncDialogs';
 
@@ -323,7 +324,10 @@ async function uploadAgentsImportFiles(options: {
         formData.append(FILES_FORM_FIELD, file);
     }
 
-    formData.append(TARGET_FOLDER_ID_FORM_FIELD, options.targetFolderId === null ? 'null' : String(options.targetFolderId));
+    formData.append(
+        TARGET_FOLDER_ID_FORM_FIELD,
+        options.targetFolderId === null ? 'null' : String(options.targetFolderId),
+    );
     formData.append(CONFLICT_RESOLUTION_FORM_FIELD, options.conflictResolution);
 
     return fetch(AGENTS_IMPORT_ENDPOINT, {
@@ -392,11 +396,16 @@ async function promptAgentsImportConflictResolution(
 ): Promise<Exclude<AgentsImportConflictResolution, 'ASK'> | null> {
     const decision = await showPrompt({
         title: 'Duplicate agents',
-        message: [
-            'Some dropped books have the same agent name as existing agents but different book source.',
-            'Type `duplicate` to import them as additional agents, or `skip` to skip the conflicting books.',
-            createWarningListMessage(conflicts.map((conflict) => `${conflict.agentName}: ${conflict.path}`)),
-        ].join('\n\n'),
+        message: spaceTrim(
+            (block) => `
+                Some dropped books have the same agent name as existing agents but different book source.
+                Type \`duplicate\` to import them as additional agents, or \`skip\` to skip the conflicting books.
+
+                ${block(
+                    createWarningListMessage(conflicts.map((conflict) => `${conflict.agentName}: ${conflict.path}`)),
+                )}
+            `,
+        ),
         inputLabel: 'Decision',
         defaultValue: 'skip',
         placeholder: 'duplicate or skip',
@@ -437,10 +446,13 @@ async function confirmNonBookZipEntries(files: ReadonlyArray<File>): Promise<boo
 
     return showConfirm({
         title: 'Import agents',
-        message: [
-            'The ZIP archive contains files that are not `.book` files. They will be ignored.',
-            createWarningListMessage(nonBookZipEntryPaths),
-        ].join('\n\n'),
+        message: spaceTrim(
+            (block) => `
+                The ZIP archive contains files that are not \`.book\` files. They will be ignored.
+
+                ${block(createWarningListMessage(nonBookZipEntryPaths))}
+            `,
+        ),
         confirmLabel: 'Import agents',
         cancelLabel: 'Cancel',
     }).catch(() => false);

package/apps/agents-server/src/components/_utils/generateMetaTxt.ts

@@ -18,7 +18,7 @@ const AGENT_PROFILE_DISALLOWED_SUBPATHS = [
     '/agents/*/images',
     '/agents/*/integration',
     '/agents/*/system-message',
-    '/agents/*/timeouts',
+    '/agents/*/goal',
     '/agents/*/website-integration',
 ] as const;