@promptbook/cli 0.114.0-2 → 0.114.0-21

package/apps/agents-server/src/components/NewAgentDialog/newAgentWizardPresets.ts

@@ -356,54 +356,6 @@ export const NEW_AGENT_WIZARD_WRITING_STYLE_PRESETS = [
  * Capability presets available in page 2.
  */
 export const NEW_AGENT_WIZARD_CAPABILITY_PRESETS = [
-    {
-        id: 'browser',
-        labelKey: 'agentCreation.wizard.capabilityBrowser',
-        icon: '🌐',
-        commitmentKeyword: 'USE BROWSER',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
-    {
-        id: 'search-engine',
-        labelKey: 'agentCreation.wizard.capabilitySearchEngine',
-        icon: '🔍',
-        commitmentKeyword: 'USE SEARCH ENGINE',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
-    {
-        id: 'deep-search',
-        labelKey: 'agentCreation.wizard.capabilityDeepSearch',
-        icon: '🔎',
-        commitmentKeyword: 'USE DEEPSEARCH',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
-    {
-        id: 'spawn',
-        labelKey: 'agentCreation.wizard.capabilitySpawn',
-        icon: '🧬',
-        commitmentKeyword: 'USE SPAWN',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
-    {
-        id: 'timeout',
-        labelKey: 'agentCreation.wizard.capabilityTimeout',
-        icon: '⏱️',
-        commitmentKeyword: 'USE TIMEOUT',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
-    {
-        id: 'time',
-        labelKey: 'agentCreation.wizard.capabilityTime',
-        icon: '🕒',
-        commitmentKeyword: 'USE TIME',
-        availability: 'wizard',
-        setupKind: 'none',
-    },
     {
         id: 'user-location',
         labelKey: 'agentCreation.wizard.capabilityUserLocation',
@@ -420,14 +372,6 @@ export const NEW_AGENT_WIZARD_CAPABILITY_PRESETS = [
         availability: 'wizard',
         setupKind: 'calendar',
     },
-    {
-        id: 'email',
-        labelKey: 'agentCreation.wizard.capabilityEmail',
-        icon: '📧',
-        commitmentKeyword: 'USE EMAIL',
-        availability: 'wizard',
-        setupKind: 'email',
-    },
     {
         id: 'popup',
         labelKey: 'agentCreation.wizard.capabilityPopup',

package/apps/agents-server/src/components/WalletRecordDialog/useWalletRecordDialogState.ts

@@ -174,7 +174,7 @@ function isUseCalendarWalletRequest(recordType: WalletRecordType, service: strin
 }
 
 /**
- * Returns true when dialog currently targets USE EMAIL SMTP access token.
+ * Returns true when dialog currently targets the agent email SMTP access token.
  *
  * @private function of WalletRecordDialog
  */

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;
 

package/apps/agents-server/src/database/migratePrefix.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import type { Client } from 'pg';
 import { importRuntimeModule } from './importRuntimeModule';
 import type { DatabaseMigrationAppliedBy, DatabaseMigrationLogger } from './runDatabaseMigrations';
@@ -219,42 +220,42 @@ export async function migratePrefix(options: MigratePrefixOptions): Promise<numb
  * @private function of runDatabaseMigrations
  */
 async function ensureMigrationsTableSchema(options: EnsureMigrationsTableSchemaOptions): Promise<void> {
-    await options.client.query(`
+    await options.client.query(spaceTrim(`
         CREATE TABLE IF NOT EXISTS ${options.migrationsTableIdentifier} (
             "filename" TEXT PRIMARY KEY,
             "appliedAt" TIMESTAMP WITH TIME ZONE DEFAULT now(),
             "appliedBy" TEXT NOT NULL DEFAULT '${options.manualAppliedByDefault}'
         );
-    `);
+    `));
 
-    await options.client.query(`
+    await options.client.query(spaceTrim(`
         ALTER TABLE ${options.migrationsTableIdentifier}
         ADD COLUMN IF NOT EXISTS "appliedBy" TEXT;
-    `);
+    `));
 
     await options.client.query(
-        `
+        spaceTrim(`
         UPDATE ${options.migrationsTableIdentifier}
         SET "appliedBy" = $1
         WHERE "appliedBy" IS NULL;
-        `,
+        `),
         [options.manualAppliedByDefault],
     );
 
-    await options.client.query(`
+    await options.client.query(spaceTrim(`
         ALTER TABLE ${options.migrationsTableIdentifier}
         ALTER COLUMN "appliedBy" SET DEFAULT '${options.manualAppliedByDefault}';
-    `);
+    `));
 
-    await options.client.query(`
+    await options.client.query(spaceTrim(`
         ALTER TABLE ${options.migrationsTableIdentifier}
         ALTER COLUMN "appliedBy" SET NOT NULL;
-    `);
+    `));
 
-    await options.client.query(`
+    await options.client.query(spaceTrim(`
         ALTER TABLE ${options.migrationsTableIdentifier}
         ENABLE ROW LEVEL SECURITY;
-    `);
+    `));
 }
 
 /**

package/apps/agents-server/src/database/migrations/2026-08-0100-agent-goal-chat-source.sql

@@ -0,0 +1,10 @@
+ALTER TABLE "prefix_UserChat"
+DROP CONSTRAINT IF EXISTS "prefix_UserChat_source_check";
+
+ALTER TABLE "prefix_UserChat"
+ADD CONSTRAINT "prefix_UserChat_source_check"
+CHECK ("source" IN ('WEB_UI', 'OPENAI_API', 'TEAM_MEMBER', 'EMAIL', 'AGENT_GOAL'));
+
+CREATE INDEX IF NOT EXISTS "prefix_UserChat_agentPermanentId_goalSource_idx"
+    ON "prefix_UserChat" ("agentPermanentId")
+    WHERE "source" = 'AGENT_GOAL';

package/apps/agents-server/src/database/migrations/2026-08-1800-user-chat-timeout-schedule.sql

@@ -0,0 +1,11 @@
+-- Planned messages can repeat on a cron, for a bounded number of runs, and inside a date window.
+-- Existing rows keep their `recurrenceIntervalMs` behaviour, because every added column is optional.
+ALTER TABLE "prefix_UserChatTimeout"
+    ADD COLUMN IF NOT EXISTS "cronExpression" TEXT NULL,
+    ADD COLUMN IF NOT EXISTS "startsAt" TIMESTAMP WITH TIME ZONE NULL,
+    ADD COLUMN IF NOT EXISTS "endsAt" TIMESTAMP WITH TIME ZONE NULL,
+    ADD COLUMN IF NOT EXISTS "maxRunCount" INTEGER NULL;
+
+CREATE INDEX IF NOT EXISTS "prefix_UserChatTimeout_endsAt_idx"
+    ON "prefix_UserChatTimeout" ("endsAt")
+    WHERE "endsAt" IS NOT NULL;

package/apps/agents-server/src/generated/reservedPaths.ts

@@ -1,43 +1,43 @@
 /**
- * Reserved paths that should not be treated as agent names.
- * This file is auto-generated by scripts/generate-reserved-paths.js
- *
- * ⚠️ WARNING: This code has been generated so that any manual changes will be overwritten
- *
- * @see /apps/agents-server/src/app - source directory for routes
- * @see /apps/agents-server/public - source directory for static files
- * @see /apps/agents-server/src/middleware.ts - where this is used
- */
-export const RESERVED_PATHS: readonly string[] = [
-    "_data",
-    "_next",
-    "admin",
-    "agents",
-    "api",
-    "dashboard",
-    "docs",
-    "embed",
-    "experiments",
-    "favicon.ico",
-    "fonts",
-    "humans.txt",
-    "logo-blue-white-256.png",
-    "manifest.webmanifest",
-    "openapi.json",
-    "promptbook-logo-blue.png",
-    "promptbook-logo-white.png",
-    "recycle-bin",
-    "restricted",
-    "robots.txt",
-    "s3",
-    "search",
-    "security.txt",
-    "sitemap.xml",
-    "sounds",
-    "story",
-    "superadmin",
-    "sw.js",
-    "swagger",
-    "system",
-    "test"
-] as const;
+     * Reserved paths that should not be treated as agent names.
+     * This file is auto-generated by scripts/generate-reserved-paths.js
+     *
+     * ⚠️ WARNING: This code has been generated so that any manual changes will be overwritten
+     *
+     * @see /apps/agents-server/src/app - source directory for routes
+     * @see /apps/agents-server/public - source directory for static files
+     * @see /apps/agents-server/src/middleware.ts - where this is used
+     */
+    export const RESERVED_PATHS: readonly string[] = [
+        "_data",
+        "_next",
+        "admin",
+        "agents",
+        "api",
+        "dashboard",
+        "docs",
+        "embed",
+        "experiments",
+        "favicon.ico",
+        "fonts",
+        "humans.txt",
+        "logo-blue-white-256.png",
+        "manifest.webmanifest",
+        "openapi.json",
+        "promptbook-logo-blue.png",
+        "promptbook-logo-white.png",
+        "recycle-bin",
+        "restricted",
+        "robots.txt",
+        "s3",
+        "search",
+        "security.txt",
+        "sitemap.xml",
+        "sounds",
+        "story",
+        "superadmin",
+        "sw.js",
+        "swagger",
+        "system",
+        "test"
+    ] as const;

package/apps/agents-server/src/instrumentation-node.ts

@@ -70,6 +70,24 @@ export async function registerNodeRuntimeInstrumentation(): Promise<void> {
         });
     }
 
+    try {
+        // Note: Running is the default state of an agent project, so every project which was not
+        //       explicitly stopped is started again right after the server was restarted, and is
+        //       kept running by later passes.
+        const { ensureAgentProjectRuntimeAutostartBootstrapped } = await import(
+            './utils/agentProjects/agentProjectRuntimeAutostartScheduler'
+        );
+        ensureAgentProjectRuntimeAutostartBootstrapped();
+    } catch (error) {
+        console.error('❌ Automatic agent project start failed during Agents Server instrumentation.', {
+            nextRuntime: process.env.NEXT_RUNTIME,
+            nodeEnv: process.env.NODE_ENV,
+            errorName: error instanceof Error ? error.name : undefined,
+            errorMessage: error instanceof Error ? error.message : String(error),
+            errorStack: error instanceof Error ? error.stack : undefined,
+        });
+    }
+
     try {
         // Note: Keeps Let's Encrypt certificates for every assigned server and project
         //       domain obtained and renewed automatically. A domain whose DNS was not

package/apps/agents-server/src/languages/ServerTranslationKeys.ts

@@ -14,7 +14,20 @@ export const SERVER_TRANSLATION_KEYS = [
     'common.chat',
     'chat.answerDurationLabel',
     'common.book',
-    'common.timeouts',
+    'common.goalChat',
+    'goalChat.noticeTitle',
+    'goalChat.noticeDescription',
+    'goalChat.executionDurationLabel',
+    'goalChat.plannedMessagesTitle',
+    'goalChat.plannedMessagesEmptyLabel',
+    'goalChat.plannedMessagesLoadErrorLabel',
+    'goalChat.plannedMessageDefaultLabel',
+    'goalChat.plannedMessageIntervalLabel',
+    'goalChat.plannedMessageCronLabel',
+    'goalChat.plannedMessageRunCountLabel',
+    'goalChat.plannedMessageWindowLabel',
+    'goalChat.plannedMessageCancelLabel',
+    'goalChat.plannedMessageCancellingLabel',
     'common.projects',
     'common.more',
     'chatEnterBehavior.sectionEyebrow',
@@ -164,6 +177,7 @@ export const SERVER_TRANSLATION_KEYS = [
     'header.usageAnalytics',
     'header.taskManager',
     'header.vpsTaskManager',
+    'header.plannedMessageManager',
     'header.messagesEmails',
     'header.emailServer',
     'header.backups',
@@ -319,15 +333,8 @@ export const SERVER_TRANSLATION_KEYS = [
     'agentCreation.wizard.customWritingSamplePlaceholder',
     'agentCreation.wizard.customWritingSamplePreviewTitle',
     'agentCreation.wizard.writingPreviewUserMessage',
-    'agentCreation.wizard.capabilityBrowser',
-    'agentCreation.wizard.capabilitySearchEngine',
-    'agentCreation.wizard.capabilityDeepSearch',
-    'agentCreation.wizard.capabilitySpawn',
-    'agentCreation.wizard.capabilityTimeout',
-    'agentCreation.wizard.capabilityTime',
     'agentCreation.wizard.capabilityUserLocation',
     'agentCreation.wizard.capabilityCalendar',
-    'agentCreation.wizard.capabilityEmail',
     'agentCreation.wizard.capabilityPopup',
     'agentCreation.wizard.capabilityImageGenerator',
     'agentCreation.wizard.capabilityPrivacy',
@@ -338,9 +345,6 @@ export const SERVER_TRANSLATION_KEYS = [
     'agentCreation.wizard.useSetupProjectRepositoryLabel',
     'agentCreation.wizard.useSetupProjectRepositoryPlaceholder',
     'agentCreation.wizard.useSetupProjectRepositoryHint',
-    'agentCreation.wizard.useSetupEmailSenderLabel',
-    'agentCreation.wizard.useSetupEmailSenderPlaceholder',
-    'agentCreation.wizard.useSetupEmailSenderHint',
     'agentCreation.wizard.useSetupCalendarUrlLabel',
     'agentCreation.wizard.useSetupCalendarUrlPlaceholder',
     'agentCreation.wizard.useSetupCalendarUrlHint',
@@ -588,6 +592,7 @@ export const SERVER_TRANSLATION_KEYS = [
     'chat.toolTitle.projectFileDeleter',
     'chat.toolTitle.projectBranchCreator',
     'chat.toolTitle.projectPullRequestCreator',
+    'chat.toolTitle.agentProjectTouched',
     'chatTimeout.defaultLabel',
     'chatTimeout.singleActiveLabel',
     'chatTimeout.multipleActiveLabel',

package/apps/agents-server/src/languages/translations/czech.yaml

@@ -8,7 +8,20 @@ common.profile: Profil
 common.chat: Chat
 chat.answerDurationLabel: 'Odpověď za {duration}'
 common.book: Book
-common.timeouts: Časovače
+common.goalChat: Cíl
+goalChat.noticeTitle: Toto je cílový chat agenta
+goalChat.noticeDescription: Agent si sem píše sám a plánuje práci ke svému cíli, proto je toto vlákno pro lidi jen ke čtení.
+goalChat.executionDurationLabel: 'běželo {duration}'
+goalChat.plannedMessagesTitle: Naplánované zprávy
+goalChat.plannedMessagesEmptyLabel: Žádné naplánované zprávy. Agent se probudí při nové zprávě nebo aktualizaci knihy.
+goalChat.plannedMessagesLoadErrorLabel: Naplánované zprávy se nepodařilo načíst.
+goalChat.plannedMessageDefaultLabel: Naplánované probuzení
+goalChat.plannedMessageIntervalLabel: 'Opakování: {interval}'
+goalChat.plannedMessageCronLabel: 'Opakování podle cronu {cron}'
+goalChat.plannedMessageRunCountLabel: 'Proběhlo {runCount} z {maxRunCount} spuštění'
+goalChat.plannedMessageWindowLabel: 'Od {from} do {to}'
+goalChat.plannedMessageCancelLabel: Zrušit
+goalChat.plannedMessageCancellingLabel: Ruším
 common.projects: Projekty
 common.more: Více
 chatEnterBehavior.sectionEyebrow: Klávesové zkratky
@@ -158,6 +171,7 @@ header.chatHistory: Historie chatů
 header.usageAnalytics: Analytika využití
 header.taskManager: Správa úloh
 header.vpsTaskManager: Správa úloh (všechny servery)
+header.plannedMessageManager: Naplánované zprávy
 header.messagesEmails: Zprávy a e-maily
 header.emailServer: E-mailový server
 header.backups: Zálohy
@@ -313,15 +327,8 @@ agentCreation.wizard.customWritingSampleLabel: Vlastní ukázka stylu
 agentCreation.wizard.customWritingSamplePlaceholder: Napište ukázkovou odpověď, která vystihuje požadovaný tón.
 agentCreation.wizard.customWritingSamplePreviewTitle: Náhled vlastní ukázky
 agentCreation.wizard.writingPreviewUserMessage: Můžeš stručně shrnout, co mám udělat dál?
-agentCreation.wizard.capabilityBrowser: Používá prohlížeč
-agentCreation.wizard.capabilitySearchEngine: Vyhledává na webu
-agentCreation.wizard.capabilityDeepSearch: Provádí hluboký výzkum
-agentCreation.wizard.capabilitySpawn: Vytváří nové agenty
-agentCreation.wizard.capabilityTimeout: Pracuje s časovači
-agentCreation.wizard.capabilityTime: Zná aktuální čas
 agentCreation.wizard.capabilityUserLocation: Pracuje s polohou uživatele
 agentCreation.wizard.capabilityCalendar: Pracuje s kalendářem
-agentCreation.wizard.capabilityEmail: Posílá e-maily
 agentCreation.wizard.capabilityPopup: Otevírá popup rozhraní
 agentCreation.wizard.capabilityImageGenerator: Generuje obrázky
 agentCreation.wizard.capabilityPrivacy: Používá režim soukromí
@@ -332,9 +339,6 @@ agentCreation.wizard.useSetupSectionHint: Zobrazují se zde jen vybrané `USE` c
 agentCreation.wizard.useSetupProjectRepositoryLabel: GitHub repozitář
 agentCreation.wizard.useSetupProjectRepositoryPlaceholder: https://github.com/example/project nebo example/project
 agentCreation.wizard.useSetupProjectRepositoryHint: Vložte URL repozitáře nebo slug `owner/repository`. Pokud znáte jen název, použijte zkratku pro hledání na GitHubu.
-agentCreation.wizard.useSetupEmailSenderLabel: E-mail odesílatele
-agentCreation.wizard.useSetupEmailSenderPlaceholder: agent@example.com
-agentCreation.wizard.useSetupEmailSenderHint: Volitelné. Když pole necháte prázdné, `USE EMAIL` použije nastavení odesílatele z peněženky nebo z běhového prostředí.
 agentCreation.wizard.useSetupCalendarUrlLabel: URL Google Kalendáře
 agentCreation.wizard.useSetupCalendarUrlPlaceholder: https://calendar.google.com/calendar/u/0/r
 agentCreation.wizard.useSetupCalendarUrlHint: Vložte URL Google Kalendáře, aby byl agent omezený na jeden konkrétní kalendář.
@@ -582,6 +586,7 @@ chat.toolTitle.projectFileWriter: Zápis souboru projektu
 chat.toolTitle.projectFileDeleter: Mazání souboru projektu
 chat.toolTitle.projectBranchCreator: Vytvoření větve projektu
 chat.toolTitle.projectPullRequestCreator: Vytvoření pull requestu
+chat.toolTitle.agentProjectTouched: Projekt
 chatTimeout.defaultLabel: Naplánovaný časovač
 chatTimeout.singleActiveLabel: 1 aktivní časovač
 chatTimeout.multipleActiveLabel: '{count} aktivní časovače'

package/apps/agents-server/src/languages/translations/english.yaml

@@ -8,7 +8,20 @@ common.profile: Profile
 common.chat: Chat
 chat.answerDurationLabel: '{duration} to answer'
 common.book: Book
-common.timeouts: Timeouts
+common.goalChat: Goal
+goalChat.noticeTitle: This is the agent's goal chat
+goalChat.noticeDescription: The agent writes here on its own to plan work towards its goal, so this thread is read-only for people.
+goalChat.executionDurationLabel: 'executed for {duration}'
+goalChat.plannedMessagesTitle: Planned messages
+goalChat.plannedMessagesEmptyLabel: No planned messages. The agent will wake up when invoked by a new message or book update.
+goalChat.plannedMessagesLoadErrorLabel: Failed to load planned messages.
+goalChat.plannedMessageDefaultLabel: Planned wake-up
+goalChat.plannedMessageIntervalLabel: Repeats every {interval}
+goalChat.plannedMessageCronLabel: 'Repeats on cron {cron}'
+goalChat.plannedMessageRunCountLabel: '{runCount} of {maxRunCount} runs done'
+goalChat.plannedMessageWindowLabel: 'From {from} to {to}'
+goalChat.plannedMessageCancelLabel: Cancel
+goalChat.plannedMessageCancellingLabel: Cancelling
 common.projects: Projects
 common.more: More
 chatEnterBehavior.sectionEyebrow: Keybindings
@@ -160,6 +173,7 @@ header.chatHistory: Chat history
 header.usageAnalytics: Usage analytics
 header.taskManager: Task manager
 header.vpsTaskManager: Task manager (all servers)
+header.plannedMessageManager: Planned messages
 header.messagesEmails: Messages & Emails
 header.emailServer: Email server
 header.backups: Backups
@@ -317,15 +331,8 @@ agentCreation.wizard.customWritingSampleLabel: Custom writing sample
 agentCreation.wizard.customWritingSamplePlaceholder: Write a sample reply that captures the desired voice.
 agentCreation.wizard.customWritingSamplePreviewTitle: Custom sample preview
 agentCreation.wizard.writingPreviewUserMessage: Can you summarize what I should do next?
-agentCreation.wizard.capabilityBrowser: Can use browser
-agentCreation.wizard.capabilitySearchEngine: Can search the web
-agentCreation.wizard.capabilityDeepSearch: Can do deep research
-agentCreation.wizard.capabilitySpawn: Can create new agents
-agentCreation.wizard.capabilityTimeout: Can manage timers
-agentCreation.wizard.capabilityTime: Knows current time
 agentCreation.wizard.capabilityUserLocation: Can use user location
 agentCreation.wizard.capabilityCalendar: Can manage calendar
-agentCreation.wizard.capabilityEmail: Can send email
 agentCreation.wizard.capabilityPopup: Can open popup UI
 agentCreation.wizard.capabilityImageGenerator: Can generate images
 agentCreation.wizard.capabilityPrivacy: Can use privacy mode
@@ -336,9 +343,6 @@ agentCreation.wizard.useSetupSectionHint: Only the selected `USE` commitments th
 agentCreation.wizard.useSetupProjectRepositoryLabel: GitHub repository
 agentCreation.wizard.useSetupProjectRepositoryPlaceholder: https://github.com/example/project or example/project
 agentCreation.wizard.useSetupProjectRepositoryHint: Paste a repository URL or `owner/repository` slug. If you only know a name, use the GitHub search shortcut.
-agentCreation.wizard.useSetupEmailSenderLabel: Sender email
-agentCreation.wizard.useSetupEmailSenderPlaceholder: agent@example.com
-agentCreation.wizard.useSetupEmailSenderHint: Optional. If empty, `USE EMAIL` falls back to wallet or runtime sender configuration.
 agentCreation.wizard.useSetupCalendarUrlLabel: Google Calendar URL
 agentCreation.wizard.useSetupCalendarUrlPlaceholder: https://calendar.google.com/calendar/u/0/r
 agentCreation.wizard.useSetupCalendarUrlHint: Paste a Google Calendar URL to scope the agent to one calendar.
@@ -586,6 +590,7 @@ chat.toolTitle.projectFileWriter: Writing project file
 chat.toolTitle.projectFileDeleter: Deleting project file
 chat.toolTitle.projectBranchCreator: Creating project branch
 chat.toolTitle.projectPullRequestCreator: Creating pull request
+chat.toolTitle.agentProjectTouched: Project
 chatTimeout.defaultLabel: Scheduled timeout
 chatTimeout.singleActiveLabel: 1 active timeout
 chatTimeout.multipleActiveLabel: '{count} active timeouts'

package/apps/agents-server/src/message-providers/email/smtp/SmtpMessageProvider.ts

@@ -19,7 +19,7 @@ export type SmtpMessageProviderConfiguration = {
 };
 
 /**
- * SMTP-backed message provider used by USE EMAIL runtime sending.
+ * SMTP-backed message provider used by agent email sending.
  */
 export class SmtpMessageProvider implements MessageProvider {
     private readonly transporter: Transporter;

package/apps/agents-server/src/message-providers/email/stalwart/StalwartMessageProvider.ts

@@ -1,4 +1,5 @@
 import type { really_any } from '@promptbook-local/types';
+import { getEmailAddressDomain } from '../../../utils/email/agentEmailAddress';
 import { buildStalwartMailBridgeAddress } from '../../../utils/stalwart/stalwartMailBridge';
 import type { MessageProvider } from '../../interfaces/MessageProvider';
 import type { OutboundEmail } from '../_common/Email';
@@ -17,6 +18,29 @@ export type StalwartMessageProviderConfiguration = {
     readonly password: string;
 };
 
+/**
+ * Loopback host used by the bundled Stalwart installation.
+ */
+const STALWART_DEFAULT_SMTP_HOST = '127.0.0.1';
+
+/**
+ * Submission port of a freshly bootstrapped Stalwart instance.
+ *
+ * Stalwart opens `smtp` on 25 and `submissions` on 465 (implicit TLS); it has **no** listener on the
+ * STARTTLS submission port 587, so mail submitted there is refused.
+ */
+const STALWART_DEFAULT_SUBMISSION_PORT = 465;
+
+/**
+ * Submission port written by older Agents Server installers for the bundled local Stalwart service.
+ */
+const STALWART_LEGACY_LOCAL_SUBMISSION_PORT = 587;
+
+/**
+ * Hostnames which address the bundled Stalwart service on the same VPS.
+ */
+const STALWART_LOCAL_SMTP_HOSTS = new Set(['127.0.0.1', 'localhost', '::1', '[::1]']);
+
 /**
  * Domain-aware Stalwart provider which authenticates through the bridge account matching the sender.
  */
@@ -28,7 +52,7 @@ export class StalwartMessageProvider implements MessageProvider {
      */
     public async send(message: OutboundEmail): Promise<really_any> {
         const senderAddress = parseEmailAddress(message.sender).fullEmail;
-        const senderDomain = senderAddress.slice(senderAddress.lastIndexOf('@') + 1).toLowerCase();
+        const senderDomain = getEmailAddressDomain(senderAddress);
         const provider = new SmtpMessageProvider({
             host: this.configuration.host,
             port: this.configuration.port,
@@ -43,32 +67,48 @@ export class StalwartMessageProvider implements MessageProvider {
 }
 
 /**
- * Submission port of a freshly bootstrapped Stalwart instance.
+ * Resolves Stalwart SMTP settings while repairing the legacy local `587` configuration.
  *
- * Stalwart opens `smtp` on 25 and `submissions` on 465 (implicit TLS); it has **no** listener on the
- * STARTTLS submission port 587, so mail submitted there is refused.
+ * Existing standalone VPS installations can retain explicit `587` / non-secure values in the
+ * running process even after the installer defaults change. Only the known local Stalwart endpoint
+ * is migrated; explicitly configured remote SMTP servers keep their supplied port and TLS mode.
  */
-const STALWART_DEFAULT_SUBMISSION_PORT = 465;
+export function resolveStalwartMessageProviderConfiguration(
+    environment: NodeJS.ProcessEnv,
+): StalwartMessageProviderConfiguration | null {
+    const password = environment.PTBK_STALWART_SMTP_PASSWORD;
+    if (!password) {
+        return null;
+    }
+
+    const host = environment.PTBK_STALWART_SMTP_HOST?.trim() || STALWART_DEFAULT_SMTP_HOST;
+    const configuredPort = Number(environment.PTBK_STALWART_SMTP_PORT || STALWART_DEFAULT_SUBMISSION_PORT);
+    const configuredSecureValue = environment.PTBK_STALWART_SMTP_SECURE?.trim();
+    const isLegacyLocalSubmissionConfiguration =
+        STALWART_LOCAL_SMTP_HOSTS.has(host.toLowerCase()) && configuredPort === STALWART_LEGACY_LOCAL_SUBMISSION_PORT;
+
+    return {
+        host,
+        port: isLegacyLocalSubmissionConfiguration ? STALWART_DEFAULT_SUBMISSION_PORT : configuredPort,
+        isSecure: isLegacyLocalSubmissionConfiguration
+            ? true
+            : configuredSecureValue
+            ? configuredSecureValue === 'true'
+            : true,
+        isTlsCertificateValidationEnabled: environment.PTBK_STALWART_SMTP_TLS_REJECT_UNAUTHORIZED === 'true',
+        username: environment.PTBK_STALWART_SMTP_USERNAME?.trim() || null,
+        password,
+    };
+}
 
 /**
  * Builds the bundled Stalwart provider when its SMTP credential is configured.
  */
 export function createStalwartMessageProviderFromEnvironment(): StalwartMessageProvider | null {
-    const password = process.env.PTBK_STALWART_SMTP_PASSWORD;
-    if (!password) {
+    const configuration = resolveStalwartMessageProviderConfiguration(process.env);
+    if (!configuration) {
         return null;
     }
 
-    // Note: Port 465 speaks implicit TLS, so an unset `PTBK_STALWART_SMTP_SECURE` must default to `true`
-    const configuredSecureValue = process.env.PTBK_STALWART_SMTP_SECURE?.trim();
-
-    return new StalwartMessageProvider({
-        host: process.env.PTBK_STALWART_SMTP_HOST || '127.0.0.1',
-        port: Number(process.env.PTBK_STALWART_SMTP_PORT || STALWART_DEFAULT_SUBMISSION_PORT),
-        isSecure: configuredSecureValue ? configuredSecureValue === 'true' : true,
-        isTlsCertificateValidationEnabled:
-            process.env.PTBK_STALWART_SMTP_TLS_REJECT_UNAUTHORIZED === 'true',
-        username: process.env.PTBK_STALWART_SMTP_USERNAME?.trim() || null,
-        password,
-    });
+    return new StalwartMessageProvider(configuration);
 }

package/apps/agents-server/src/message-providers/email/stalwart/parseInboundStalwartEmail.ts

@@ -14,6 +14,21 @@ export type ParsedInboundStalwartEmail = {
     readonly queueId: string | null;
 };
 
+/**
+ * Rebuilds one RFC 5322 header line from a Stalwart header tuple.
+ *
+ * Stalwart reports every header exactly as it stood on the wire, so its value already carries the
+ * space after the colon and its own terminating line break, while folded values keep their inner
+ * line breaks. Emitting such a value verbatim would write `Name:  value` with a doubled space and,
+ * once the tuples are joined with another line break, an empty line after every header - which ends
+ * the header block right after the first one and turns all remaining headers into message body.
+ */
+function createInboundStalwartHeaderLine([name, value]: readonly [string, string]): string {
+    const headerValue = value.replace(/[\r\n]+$/, '');
+    const separator = /^[ \t]/.test(headerValue) ? '' : ' ';
+    return `${name}:${separator}${headerValue}`;
+}
+
 /**
  * Reconstructs an RFC 5322 message from Stalwart's DATA-stage MTA hook payload.
  */
@@ -38,7 +53,7 @@ export async function parseInboundStalwartEmail(
         .map((recipient) => recipient.address.trim())
         .filter(Boolean);
 
-    if (!headers || typeof contents !== 'string' || envelopeRecipients.length === 0) {
+    if (!headers?.length || typeof contents !== 'string' || envelopeRecipients.length === 0) {
         throw new ParseError(
             spaceTrim(`
                 Stalwart sent an incomplete DATA-stage MTA hook payload.
@@ -49,7 +64,7 @@ export async function parseInboundStalwartEmail(
     }
 
     const rawEmail = `${[...(payload.message?.serverHeaders || []), ...headers]
-        .map(([name, value]) => `${name}: ${value}`)
+        .map(createInboundStalwartHeaderLine)
         .join('\r\n')}\r\n\r\n${contents}`;
 
     let email: InboundEmail;