@promptbook/cli 0.114.0-5 → 0.114.0-7

package/apps/agents-server/src/utils/chatTasksAdmin.ts

@@ -72,6 +72,15 @@ export type AdminChatTaskRecord = {
     workerId: string | null;
     queueName: string | null;
 
+    /**
+     * True when the task runs in the agent's own goal chat instead of a chat started by a user.
+     *
+     * Goal-chat tasks keep their normal kind (they really are chat completions / chat timeouts) and
+     * are only flagged, so they stay in the regular task streams while remaining distinguishable
+     * from user-invoked work.
+     */
+    isAgentGoalTask?: boolean;
+
     /**
      * Registered server this task belongs to, when the source task is bound to one server or the
      * VPS-wide superadmin aggregation adds the owning server.

package/apps/agents-server/src/utils/dnsRecords/DnsRecordInstruction.ts

@@ -31,3 +31,23 @@ export type DnsRecordInstruction = {
      */
     readonly note: string | null;
 };
+
+/**
+ * DNS records which belong together and share one all-or-one configuration rule.
+ *
+ * One DNS manual can show more groups at once, for example the server domain records, the generated project domain
+ * records, and the email records of one Agents Server.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export type DnsRecordGroup = {
+    /**
+     * Whether every record of the group or just one of its alternatives must be configured.
+     */
+    readonly recordSelection: DnsRecordSelection;
+
+    /**
+     * DNS records of the group.
+     */
+    readonly records: ReadonlyArray<DnsRecordInstruction>;
+};

package/apps/agents-server/src/utils/dnsRecords/DnsRecordsSection.ts

@@ -0,0 +1,77 @@
+import type { ReactNode } from 'react';
+import type { DnsRecordGroup } from './DnsRecordInstruction';
+
+/**
+ * One alternative setup of a DNS record section.
+ *
+ * A section with a single variant has nothing to choose from, a section with more variants lets the administrator
+ * pick exactly one of them, for example the wildcard or the single-project setup of generated project domains.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export type DnsRecordsSectionVariant = DnsRecordGroup & {
+    /**
+     * Stable identifier of the variant, unique within its section.
+     */
+    readonly id: string;
+
+    /**
+     * Label of the variant button.
+     */
+    readonly label: string;
+
+    /**
+     * Explanation of what the selected variant covers.
+     */
+    readonly description?: ReactNode;
+};
+
+/**
+ * One part of the DNS setup of an Agents Server, for example its domain, its projects, or its email.
+ *
+ * Every page shows the same sections in the same shared component, just filtered down to the sections which are
+ * relevant for that page.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export type DnsRecordsSection = {
+    /**
+     * Stable identifier of the section, unique within one DNS manual.
+     */
+    readonly id: string;
+
+    /**
+     * Human-readable name of the configured part, for example `Email`.
+     */
+    readonly title: string;
+
+    /**
+     * Explanation of what the section configures.
+     */
+    readonly description?: ReactNode;
+
+    /**
+     * Label shown above the variant buttons.
+     */
+    readonly variantsLabel?: string;
+
+    /**
+     * Alternative setups of the section, at least one of them.
+     */
+    readonly variants: ReadonlyArray<DnsRecordsSectionVariant>;
+
+    /**
+     * Current DNS verification state of the section, when it is known.
+     */
+    readonly statusSummary?: string | null;
+
+    /**
+     * Addresses currently returned by public DNS, when verification is available.
+     */
+    readonly resolvedAddresses?: ReadonlyArray<string>;
+
+    /**
+     * Whether the section currently needs attention.
+     */
+    readonly isDnsIssue?: boolean;
+};

package/apps/agents-server/src/utils/dnsRecords/createServerDnsRecordsSections.ts

@@ -0,0 +1,58 @@
+import type { ManagedServerDnsDiagnostic } from '../../app/superadmin/servers/ServersRegistryDnsTypes';
+import { createAgentProjectsDnsRecordsSection } from '../agentProjects/createAgentProjectsDnsRecordsSection';
+import { createEmailDnsRecordsSection } from '../stalwart/createEmailDnsRecordsSection';
+import type { DnsRecordsSection } from './DnsRecordsSection';
+import { createServerDomainDnsRecordsSection } from './createServerDomainDnsRecordsSection';
+
+/**
+ * Creates every DNS section which one Agents Server needs to be fully configured.
+ *
+ * This is the single source of truth of the complete DNS setup of one server, so that `/superadmin/servers` can show
+ * the server domain, the generated project domains, and the email records in one manual and one Cloudflare wizard.
+ *
+ * @param options - Server domain, its DNS diagnostic, and the generated project domain state.
+ * @returns All DNS sections of one server.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function createServerDnsRecordsSections(options: {
+    /**
+     * Public domain of the Agents Server.
+     */
+    readonly serverDomain: string;
+
+    /**
+     * DNS verification details of the server domain, when the deployment provides them.
+     */
+    readonly dnsDiagnostic: ManagedServerDnsDiagnostic | null | undefined;
+
+    /**
+     * Whether at least one generated project domain currently fails DNS verification.
+     */
+    readonly isProjectDnsIssue?: boolean;
+
+    /**
+     * Example generated project domain, when one is already assigned.
+     */
+    readonly projectDomain?: string | null;
+}): ReadonlyArray<DnsRecordsSection> {
+    const publicIpAddress = options.dnsDiagnostic?.publicIpAddress ?? null;
+    const serverDomainSection = createServerDomainDnsRecordsSection({
+        serverDomain: options.serverDomain,
+        dnsDiagnostic: options.dnsDiagnostic,
+    });
+
+    return [
+        ...(serverDomainSection ? [serverDomainSection] : []),
+        createAgentProjectsDnsRecordsSection({
+            isDnsIssue: options.isProjectDnsIssue,
+            projectDomain: options.projectDomain,
+            publicIpAddress,
+            serverDomain: options.serverDomain,
+        }),
+        createEmailDnsRecordsSection({
+            domain: options.serverDomain,
+            publicIpAddress,
+        }),
+    ];
+}

package/apps/agents-server/src/utils/dnsRecords/createServerDomainDnsRecordsSection.ts

@@ -0,0 +1,48 @@
+import {
+    isManagedServerDnsDiagnosticIssue,
+    type ManagedServerDnsDiagnostic,
+} from '../../app/superadmin/servers/ServersRegistryDnsTypes';
+import type { DnsRecordsSection } from './DnsRecordsSection';
+
+/**
+ * Creates the DNS section which makes the Agents Server itself reachable on its own domain.
+ *
+ * @param options - Server domain and its DNS diagnostic.
+ * @returns Server domain section, or `null` when the deployment does not verify server domains.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function createServerDomainDnsRecordsSection(options: {
+    /**
+     * Public domain of the Agents Server.
+     */
+    readonly serverDomain: string;
+
+    /**
+     * DNS verification details of the server domain, when the deployment provides them.
+     */
+    readonly dnsDiagnostic: ManagedServerDnsDiagnostic | null | undefined;
+}): DnsRecordsSection | null {
+    const { dnsDiagnostic, serverDomain } = options;
+
+    if (!dnsDiagnostic || dnsDiagnostic.expectedRecords.length === 0) {
+        return null;
+    }
+
+    return {
+        id: 'server-domain',
+        title: `Server domain ${serverDomain}`,
+        description: `Makes the Agents Server reachable on ${serverDomain} and lets it issue its HTTPS certificate.`,
+        variants: [
+            {
+                id: 'server-domain',
+                label: 'Server domain',
+                recordSelection: 'one',
+                records: dnsDiagnostic.expectedRecords,
+            },
+        ],
+        statusSummary: dnsDiagnostic.summary,
+        resolvedAddresses: dnsDiagnostic.resolvedAddresses,
+        isDnsIssue: isManagedServerDnsDiagnosticIssue(dnsDiagnostic),
+    };
+}

package/apps/agents-server/src/utils/dnsRecords/dnsRecordGroups.ts

@@ -0,0 +1,52 @@
+import type { DnsRecordGroup } from './DnsRecordInstruction';
+
+/**
+ * Determines whether every record of every shown group has to be configured.
+ *
+ * @param recordGroups - Groups shown in one DNS manual.
+ * @returns `true` when no group offers alternatives.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function isEveryDnsRecordGroupRequired(recordGroups: ReadonlyArray<DnsRecordGroup>): boolean {
+    return recordGroups.every((recordGroup) => recordGroup.recordSelection === 'all');
+}
+
+/**
+ * Determines whether every shown group offers alternatives out of which only one may be configured.
+ *
+ * @param recordGroups - Groups shown in one DNS manual.
+ * @returns `true` when no group requires all of its records.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function isEveryDnsRecordGroupAlternative(recordGroups: ReadonlyArray<DnsRecordGroup>): boolean {
+    return recordGroups.every((recordGroup) => recordGroup.recordSelection === 'one');
+}
+
+/**
+ * Determines whether at least one shown group offers alternatives.
+ *
+ * Such a group can conflict with already configured records on the same hostname, so the manual has to mention
+ * removing them.
+ *
+ * @param recordGroups - Groups shown in one DNS manual.
+ * @returns `true` when at least one group offers alternatives.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function hasAlternativeDnsRecordGroup(recordGroups: ReadonlyArray<DnsRecordGroup>): boolean {
+    return recordGroups.some((recordGroup) => recordGroup.recordSelection === 'one');
+}
+
+/**
+ * Counts all records shown in the given groups.
+ *
+ * @param recordGroups - Groups shown in one DNS manual.
+ * @returns Number of shown records.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function countDnsRecordGroupRecords(recordGroups: ReadonlyArray<DnsRecordGroup>): number {
+    return recordGroups.reduce((recordCount, recordGroup) => recordCount + recordGroup.records.length, 0);
+}

package/apps/agents-server/src/utils/dnsRecords/resolveDnsRecordBatchPlan.ts

@@ -1,4 +1,4 @@
-import type { DnsRecordInstruction, DnsRecordSelection } from './DnsRecordInstruction';
+import type { DnsRecordGroup, DnsRecordInstruction, DnsRecordSelection } from './DnsRecordInstruction';
 
 /**
  * Placeholder values like `<VPS_PUBLIC_IP>` have to be filled in by a human before the record can be created.
@@ -79,3 +79,49 @@ export function resolveDnsRecordBatchPlan(options: {
 
     return { applicableRecords, excludedRecords };
 }
+
+/**
+ * Resolves one batch plan for all groups shown in one DNS manual.
+ *
+ * Every group keeps its own all-or-one rule, so a manual which shows the server domain, the generated project
+ * domains, and the email records at once still writes exactly the records which each of these parts needs.
+ *
+ * @param recordGroups - Groups shown in one DNS manual.
+ * @returns One batch plan covering all groups without duplicated records.
+ */
+export function resolveDnsRecordBatchPlanForGroups(recordGroups: ReadonlyArray<DnsRecordGroup>): DnsRecordBatchPlan {
+    const applicableRecords: Array<DnsRecordInstruction> = [];
+    const excludedRecords: Array<ExcludedDnsRecordInstruction> = [];
+    const alreadyPlannedRecordKeys = new Set<string>();
+
+    for (const recordGroup of recordGroups) {
+        const groupBatchPlan = resolveDnsRecordBatchPlan(recordGroup);
+
+        for (const record of groupBatchPlan.applicableRecords) {
+            const recordKey = createDnsRecordKey(record);
+
+            if (alreadyPlannedRecordKeys.has(recordKey)) {
+                continue;
+            }
+
+            alreadyPlannedRecordKeys.add(recordKey);
+            applicableRecords.push(record);
+        }
+
+        excludedRecords.push(...groupBatchPlan.excludedRecords);
+    }
+
+    return { applicableRecords, excludedRecords };
+}
+
+/**
+ * Creates the identity of one DNS record used to keep the batch free of duplicates.
+ *
+ * @param record - DNS record shown in the DNS manual.
+ * @returns Case-insensitive record key.
+ *
+ * @private function of `resolveDnsRecordBatchPlanForGroups`
+ */
+function createDnsRecordKey(record: DnsRecordInstruction): string {
+    return [record.type.toUpperCase(), record.name.toLowerCase(), record.value].join('\t');
+}

package/apps/agents-server/src/utils/getAdminChatTasksResponse/getAdminChatTasks/adminChatTaskSqlQuery.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import type { AdminChatTaskSortField, AdminChatTaskSortOrder, AdminChatTaskView } from '../../chatTasksAdmin';
 import type { ParsedAdminChatTaskQuery } from '../parseAdminChatTaskQuery';
 
@@ -12,7 +13,7 @@ export function createAdminChatTaskBaseQuery(options: {
     userTable: string;
     agentTable: string;
 }): string {
-    return `
+    return spaceTrim(`
         SELECT
             job."id" AS "id",
             'CHAT_COMPLETION'::text AS "kind",
@@ -70,7 +71,7 @@ export function createAdminChatTaskBaseQuery(options: {
         FROM ${options.userChatTimeoutTable} timeout
         LEFT JOIN ${options.userTable} "user" ON "user"."id" = timeout."userId"
         LEFT JOIN ${options.agentTable} agent ON agent."permanentId" = timeout."agentPermanentId"
-    `;
+    `);
 }
 
 /**
@@ -85,19 +86,21 @@ export function createAdminChatTaskListQuery(options: { baseTaskQuery: string; q
     const listQueryParts = createAdminChatTaskListQueryParts(options.query);
 
     return {
-        sql: `
-            WITH tasks AS (
-                ${options.baseTaskQuery}
-            )
-            SELECT
-                task.*,
-                COUNT(*) OVER() AS "totalCount"
-            FROM tasks task
-            ${listQueryParts.whereClause}
-            ORDER BY ${createAdminChatTaskOrderBySql(options.query, 'task')}
-            LIMIT $${listQueryParts.limitPlaceholder}
-            OFFSET $${listQueryParts.offsetPlaceholder}
-        `,
+        sql: spaceTrim(
+            (block) => `
+                WITH tasks AS (
+                    ${block(options.baseTaskQuery)}
+                )
+                SELECT
+                    task.*,
+                    COUNT(*) OVER() AS "totalCount"
+                FROM tasks task
+                ${block(listQueryParts.whereClause)}
+                ORDER BY ${block(createAdminChatTaskOrderBySql(options.query, 'task'))}
+                LIMIT $${listQueryParts.limitPlaceholder}
+                OFFSET $${listQueryParts.offsetPlaceholder}
+            `,
+        ),
         values: listQueryParts.values,
     };
 }
@@ -108,23 +111,25 @@ export function createAdminChatTaskListQuery(options: { baseTaskQuery: string; q
  * @private function of `getAdminChatTasks`
  */
 export function createAdminChatTaskCountersQuery(options: { baseTaskQuery: string }): string {
-    return `
-        WITH tasks AS (
-            ${options.baseTaskQuery}
-        )
-        SELECT
-            COUNT(*) FILTER (WHERE "status" = 'RUNNING') AS "runningCount",
-            COUNT(*) FILTER (WHERE "status" = 'QUEUED') AS "queuedCount",
-            COUNT(*) FILTER (
-                WHERE "status" = 'FAILED'
-                  AND "finishedAt" >= CURRENT_TIMESTAMP - INTERVAL '24 hours'
-            ) AS "failedLast24hCount",
-            CASE
-                WHEN MIN("queuedAt") FILTER (WHERE "status" = 'QUEUED') IS NULL THEN NULL
-                ELSE EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - MIN("queuedAt") FILTER (WHERE "status" = 'QUEUED'))) * 1000
-            END AS "oldestQueuedAgeMs"
-        FROM tasks
-    `;
+    return spaceTrim(
+        (block) => `
+            WITH tasks AS (
+                ${block(options.baseTaskQuery)}
+            )
+            SELECT
+                COUNT(*) FILTER (WHERE "status" = 'RUNNING') AS "runningCount",
+                COUNT(*) FILTER (WHERE "status" = 'QUEUED') AS "queuedCount",
+                COUNT(*) FILTER (
+                    WHERE "status" = 'FAILED'
+                      AND "finishedAt" >= CURRENT_TIMESTAMP - INTERVAL '24 hours'
+                ) AS "failedLast24hCount",
+                CASE
+                    WHEN MIN("queuedAt") FILTER (WHERE "status" = 'QUEUED') IS NULL THEN NULL
+                    ELSE EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - MIN("queuedAt") FILTER (WHERE "status" = 'QUEUED'))) * 1000
+                END AS "oldestQueuedAgeMs"
+            FROM tasks
+        `,
+    );
 }
 
 /**
@@ -265,7 +270,7 @@ function createAdminChatTaskDefaultOrderBySql(view: AdminChatTaskView, alias: st
             return `${createAdminChatTaskTimelineExpressionSql(alias)} DESC NULLS LAST, ${alias}."updatedAt" DESC, ${alias}."createdAt" DESC, ${alias}."id" DESC`;
         case 'active':
         default:
-            return `
+            return spaceTrim(`
                 CASE
                     WHEN ${alias}."status" = 'RUNNING' THEN 0
                     WHEN ${alias}."status" = 'QUEUED' THEN 1
@@ -281,7 +286,7 @@ function createAdminChatTaskDefaultOrderBySql(view: AdminChatTaskView, alias: st
                 END DESC NULLS LAST,
                 ${alias}."updatedAt" DESC,
                 ${alias}."id" DESC
-            `;
+            `);
     }
 }
 
@@ -328,13 +333,13 @@ function createAdminChatTaskCustomOrderBySql(
  * @private function of `getAdminChatTasks`
  */
 function createAdminChatTaskTimelineExpressionSql(alias: string): string {
-    return `
+    return spaceTrim(`
         CASE
             WHEN ${alias}."status" = 'RUNNING' THEN COALESCE(${alias}."startedAt", ${alias}."createdAt")
             WHEN ${alias}."status" = 'QUEUED' THEN ${alias}."createdAt"
             ELSE COALESCE(${alias}."finishedAt", ${alias}."updatedAt", ${alias}."createdAt")
         END
-    `;
+    `);
 }
 
 /**

package/apps/agents-server/src/utils/getAdminChatTasksResponse/getAdminChatTasks/mapAdminChatTaskFallbackRows.ts

@@ -1,3 +1,4 @@
+import { isAgentGoalChatId } from '../../agentGoalChat/agentGoalChatIdentity';
 import type { AdminChatTaskRecord } from '../../chatTasksAdmin';
 import { getUserChatJobRunReportFromParameters } from '../../userChat/userChatJobRunReport';
 import { resolveNullableSqlNumber } from './adminChatTaskSqlValues';
@@ -57,6 +58,7 @@ function mapAdminChatTaskJobRow(
         chatId: row.chatId,
         workerId: null,
         queueName: 'user-chat-jobs',
+        isAgentGoalTask: isAgentGoalChatId(row.chatId),
         runReport: getUserChatJobRunReportFromParameters(row.parameters),
     };
 }
@@ -97,5 +99,6 @@ function mapAdminChatTaskTimeoutRow(
         chatId: row.chatId,
         workerId: null,
         queueName: 'user-chat-timeouts',
+        isAgentGoalTask: isAgentGoalChatId(row.chatId),
     };
 }

package/apps/agents-server/src/utils/getAdminChatTasksResponse/getAdminChatTasks/mapAdminChatTaskSqlRows.ts

@@ -1,3 +1,4 @@
+import { isAgentGoalChatId } from '../../agentGoalChat/agentGoalChatIdentity';
 import type { AdminChatTaskCounters, AdminChatTaskRecord } from '../../chatTasksAdmin';
 import type { UserChatJobStatus } from '../../userChat/UserChatJobRecord';
 import { getUserChatJobRunReportFromParameters } from '../../userChat/userChatJobRunReport';
@@ -79,6 +80,7 @@ export function mapAdminChatTaskSqlRow(row: AdminChatTaskSqlRow): AdminChatTaskR
         chatId: row.chatId,
         workerId: null,
         queueName: row.queueName,
+        isAgentGoalTask: isAgentGoalChatId(row.chatId),
         runReport: getUserChatJobRunReportFromParameters(row.parameters),
     };
 }