@promptbook/cli 0.114.0-0 → 0.114.0-2

package/apps/agents-server/src/utils/stalwart/readStalwartEmailSnapshot.ts

@@ -1,8 +1,14 @@
 import { normalizeEmailDomain } from '../email/agentEmailAddress';
 import { listAgentEmailIdentities, type AgentEmailIdentity } from '../email/listAgentEmailIdentities';
+import type { ManagedServerDnsDiagnostic } from '../../app/superadmin/servers/ServersRegistryDnsTypes';
+import { createStandaloneVpsDomainDnsDiagnostic } from '../standaloneVpsDnsDiagnostics';
 import { readStalwartConfiguration } from './StalwartConfiguration';
 import { listStalwartObjects } from './stalwartJmapClient';
-import { buildStalwartInboundHookUrl, STALWART_MAIL_BRIDGE_LOCAL_PART } from './stalwartMailBridge';
+import {
+    buildStalwartInboundHookUrl,
+    buildStalwartMailServerHostname,
+    STALWART_MAIL_BRIDGE_LOCAL_PART,
+} from './stalwartMailBridge';
 
 /**
  * Read-only operational state shown on Stalwart administration pages.
@@ -19,6 +25,7 @@ export type StalwartEmailSnapshot = {
     readonly isBridgeAccountConfigured: boolean;
     readonly isInboundHookConfigured: boolean;
     readonly agents: ReadonlyArray<AgentEmailIdentity>;
+    readonly mailDnsDiagnostic: ManagedServerDnsDiagnostic;
 };
 
 /**
@@ -33,13 +40,14 @@ export function isStalwartEmailSnapshotOperational(
     snapshot: Pick<
         StalwartEmailSnapshot,
         'isReachable' | 'domainId' | 'isBridgeAccountConfigured' | 'isInboundHookConfigured'
-    >,
+    > & { readonly mailDnsDiagnostic: Pick<ManagedServerDnsDiagnostic, 'status'> },
 ): boolean {
     return Boolean(
         snapshot.isReachable &&
             snapshot.domainId &&
             snapshot.isBridgeAccountConfigured &&
-            snapshot.isInboundHookConfigured,
+            snapshot.isInboundHookConfigured &&
+            snapshot.mailDnsDiagnostic.status === 'verified',
     );
 }
 
@@ -49,13 +57,20 @@ export function isStalwartEmailSnapshotOperational(
 export async function readStalwartEmailSnapshot(domainValue: string): Promise<StalwartEmailSnapshot> {
     const domain = normalizeEmailDomain(domainValue);
     const configuration = readStalwartConfiguration();
-    const agents = await listAgentEmailIdentities(domain);
+    const [agents, mailDnsDiagnostic] = await Promise.all([
+        listAgentEmailIdentities(domain),
+        createStandaloneVpsDomainDnsDiagnostic({
+            domain: buildStalwartMailServerHostname(domain),
+            publicIpAddress: process.env.PTBK_PUBLIC_IP_ADDRESS,
+        }),
+    ]);
     const baseSnapshot = {
         checkedAt: new Date().toISOString(),
         apiUrl: configuration.apiUrl,
         isConfigured: configuration.isConfigured,
         domain,
         agents,
+        mailDnsDiagnostic,
     };
 
     if (!configuration.isConfigured) {
@@ -83,7 +98,10 @@ export async function readStalwartEmailSnapshot(domainValue: string): Promise<St
         return {
             ...baseSnapshot,
             isReachable: true,
-            errorMessage: null,
+            errorMessage:
+                mailDnsDiagnostic.status === 'verified'
+                    ? null
+                    : `Public SMTP delivery needs attention. ${mailDnsDiagnostic.summary}`,
             domainId,
             dnsZoneFile: typeof domainObject?.dnsZoneFile === 'string' ? domainObject.dnsZoneFile : null,
             isBridgeAccountConfigured: accounts.some(

package/apps/agents-server/src/utils/stalwart/stalwartBootstrap.ts

@@ -3,6 +3,7 @@ import { UnexpectedError } from '../../../../../src/errors/UnexpectedError';
 import { spaceTrim } from '../../../../../src/utils/organization/spaceTrim';
 import type { StalwartConfiguration } from './StalwartConfiguration';
 import { callStalwartJmapAllowingBootstrapMode } from './stalwartJmapClient';
+import { buildStalwartMailServerHostname } from './stalwartMailBridge';
 
 /**
  * Whether the initial setup of the bundled Stalwart instance is still pending or already finished.
@@ -50,7 +51,7 @@ const STALWART_BOOTSTRAP_VERIFICATION_DELAY_MS = 1_000;
  */
 export function buildStalwartBootstrapValue(domain: string): Readonly<Record<string, unknown>> {
     return {
-        serverHostname: `mail.${domain}`,
+        serverHostname: buildStalwartMailServerHostname(domain),
         defaultDomain: domain,
         requestTlsCertificate: false,
         generateDkimKeys: true,

package/apps/agents-server/src/utils/stalwart/stalwartMailBridge.ts

@@ -3,6 +3,13 @@
  */
 export const STALWART_MAIL_BRIDGE_LOCAL_PART = 'promptbook-mailbridge';
 
+/**
+ * Builds the canonical public hostname of the Stalwart SMTP server for one Agents Server domain.
+ */
+export function buildStalwartMailServerHostname(domain: string): string {
+    return `mail.${domain}`;
+}
+
 /**
  * Builds the address of the mail bridge mailbox which is also the catch-all address of one domain.
  */

package/apps/agents-server/tests/e2e/e2eEnvironment.cjs

@@ -0,0 +1,49 @@
+'use strict';
+
+/**
+ * Local host and port used by the mocked Supabase API during integration tests.
+ */
+const MOCK_SUPABASE_PORT = 54321;
+
+/**
+ * Base URL served by the mocked Supabase API.
+ */
+const MOCK_SUPABASE_URL = `http://127.0.0.1:${MOCK_SUPABASE_PORT}`;
+
+/**
+ * Local host and port used by the Agents Server application during integration tests.
+ */
+const APP_PORT = 4440;
+
+/**
+ * Base URL served by the Agents Server application during integration tests.
+ */
+const APP_URL = `http://127.0.0.1:${APP_PORT}`;
+
+/**
+ * Shared environment variables required by deterministic E2E builds and runs.
+ */
+const APP_E2E_ENV = Object.freeze({
+    ADMIN_PASSWORD: 'e2e-admin-password',
+    SESSION_SECRET: 'e2e-session-secret-must-differ-from-admin-password',
+    PTBK_AGENTS_SERVER_USER_CHAT_WORKER_TOKEN: 'e2e-user-chat-worker-token-must-differ-from-admin-password',
+    PROMPTBOOK_TEAM_AGENT_ACCESS_TOKEN: 'e2e-team-agent-access-token-must-differ-from-admin-password',
+    NEXT_DIST_DIR: '.next-e2e',
+    NEXT_PUBLIC_SITE_URL: APP_URL,
+    PTBK_AGENTS_SERVER_DATABASE: 'supabase',
+    PTBK_AGENTS_SERVER_SQLITE_PATH: '',
+    SUPABASE_TABLE_PREFIX: '',
+    POSTGRES_URL: '',
+    DATABASE_URL: '',
+    NEXT_PUBLIC_SUPABASE_URL: MOCK_SUPABASE_URL,
+    NEXT_PUBLIC_SUPABASE_ANON_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiJ9.e2e-signature',
+    SUPABASE_SERVICE_ROLE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6InNlcnZpY2Vfcm9sZSJ9.e2e-signature',
+});
+
+module.exports = {
+    APP_E2E_ENV,
+    APP_PORT,
+    APP_URL,
+    MOCK_SUPABASE_PORT,
+    MOCK_SUPABASE_URL,
+};