@promptbook/cli 0.114.0-0 → 0.114.0-10

package/apps/agents-server/src/utils/serverManagement/createManagedServer/seedServerCoreAgents.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import type { Client } from 'pg';
 import { createAgentPersistenceRecords } from '../../../../../../src/collection/agent-collection/constructors/agent-collection-in-supabase/createAgentPersistenceRecords';
 import { DEFAULT_AGENT_VISIBILITY } from '../../agentVisibility';
@@ -40,7 +41,7 @@ export async function seedServerCoreAgents(
         );
 
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${agentTableIdentifier} (
                     "agentName",
                     "createdAt",
@@ -56,7 +57,7 @@ export async function seedServerCoreAgents(
                     "visibility"
                 )
                 VALUES ($1, $2, $3, $4, $5, $6, $7::jsonb, $8, $9::jsonb, $10, $11, $12)
-            `,
+            `),
             [
                 agentInsertRecord.agentName,
                 agentInsertRecord.createdAt,
@@ -84,7 +85,7 @@ export async function seedServerCoreAgents(
         );
 
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${agentHistoryTableIdentifier} (
                     "createdAt",
                     "agentName",
@@ -96,7 +97,7 @@ export async function seedServerCoreAgents(
                     "versionName"
                 )
                 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-            `,
+            `),
             [
                 agentHistoryInsertRecord.createdAt,
                 agentHistoryInsertRecord.agentName,
@@ -130,7 +131,7 @@ async function insertCoreFolder(
     const agentFolderTableIdentifier = quoteIdentifier(`${input.tablePrefix}AgentFolder`);
     const createdAt = new Date().toISOString();
     const insertResult = await client.query<{ id: number }>(
-        `
+        spaceTrim(`
             INSERT INTO ${agentFolderTableIdentifier} (
                 "name",
                 "parentId",
@@ -142,7 +143,7 @@ async function insertCoreFolder(
             )
             VALUES ($1, NULL, $2, NULL, NULL, $3, NULL)
             RETURNING "id"
-        `,
+        `),
         [CORE_AGENT_DIRECTORY_NAME, 0, createdAt],
     );
 

package/apps/agents-server/src/utils/serverManagement/createManagedServer/seedServerDefaultAgents.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { createAgentPersistenceRecords } from '../../../../../../src/collection/agent-collection/constructors/agent-collection-in-supabase/createAgentPersistenceRecords';
 import type { Client } from 'pg';
 import { DEFAULT_AGENT_VISIBILITY } from '../../agentVisibility';
@@ -34,7 +35,7 @@ export async function seedServerDefaultAgents(
         );
 
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${agentTableIdentifier} (
                     "agentName",
                     "createdAt",
@@ -50,7 +51,7 @@ export async function seedServerDefaultAgents(
                     "visibility"
                 )
                 VALUES ($1, $2, $3, $4, $5, $6, $7::jsonb, $8, $9::jsonb, $10, $11, $12)
-            `,
+            `),
             [
                 agentInsertRecord.agentName,
                 agentInsertRecord.createdAt,
@@ -78,7 +79,7 @@ export async function seedServerDefaultAgents(
         );
 
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${agentHistoryTableIdentifier} (
                     "createdAt",
                     "agentName",
@@ -90,7 +91,7 @@ export async function seedServerDefaultAgents(
                     "versionName"
                 )
                 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-            `,
+            `),
             [
                 agentHistoryInsertRecord.createdAt,
                 agentHistoryInsertRecord.agentName,

package/apps/agents-server/src/utils/serverManagement/createManagedServer/seedServerMetadata.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { Client } from 'pg';
 import { createInsertStatement, quoteIdentifier, type SqlRecorder } from './createSqlRecorder';
 import type { NormalizedCreateServerInput } from './normalizeCreateServerInput';
@@ -20,10 +21,10 @@ export async function seedServerMetadata(
 
     for (const metadataEntry of input.metadataEntries) {
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${metadataTableIdentifier} ("key", "value", "note", "createdAt", "updatedAt")
                 VALUES ($1, $2, $3, now(), now())
-            `,
+            `),
             [metadataEntry.key, metadataEntry.value, metadataEntry.note],
         );
 

package/apps/agents-server/src/utils/serverManagement/createManagedServer/seedServerUsers.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { Client } from 'pg';
 import { hashPassword } from '../../auth';
 import { createInsertStatement, quoteIdentifier, type SqlRecorder } from './createSqlRecorder';
@@ -23,10 +24,10 @@ export async function seedServerUsers(
         const passwordHash = await hashPassword(user.password);
 
         await client.query(
-            `
+            spaceTrim(`
                 INSERT INTO ${userTableIdentifier} ("username", "passwordHash", "isAdmin", "createdAt", "updatedAt")
                 VALUES ($1, $2, $3, now(), now())
-            `,
+            `),
             [user.username, passwordHash, user.isAdmin],
         );
 

package/apps/agents-server/src/utils/serverManagement/deleteManagedServer.ts

@@ -47,12 +47,12 @@ export async function deleteManagedServer(options: {
         }
 
         const remainingRows = await client.query<Record<string, unknown>>(
-            `
+            spaceTrim(`
                 SELECT "id", "name", "environment", "domain", "tablePrefix", "createdAt", "updatedAt"
                 FROM "${SERVER_REGISTRY_TABLE_NAME}"
                 ORDER BY "name" ASC
                 LIMIT 1
-            `,
+            `),
         );
 
         await client.query('COMMIT');

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

@@ -1,4 +1,5 @@
 import type { DnsRecordInstruction } from '../dnsRecords/DnsRecordInstruction';
+import { buildStalwartMailServerHostname } from './stalwartMailBridge';
 
 /**
  * One DNS record required or recommended for reliable mail delivery.
@@ -15,18 +16,21 @@ export type EmailDnsInstruction = DnsRecordInstruction & {
  *
  * DKIM records are intentionally read from Stalwart's generated zone because their public keys must never be guessed.
  */
-export function createEmailDnsInstructions(domain: string): EmailDnsInstruction[] {
+export function createEmailDnsInstructions(domain: string, publicIpAddress?: string | null): EmailDnsInstruction[] {
+    const mailServerHostname = buildStalwartMailServerHostname(domain);
+    const resolvedPublicIpAddress = publicIpAddress?.trim() || '<VPS_PUBLIC_IP>';
+
     return [
         {
             type: 'A',
-            name: `mail.${domain}`,
-            value: '<VPS_PUBLIC_IP>',
+            name: mailServerHostname,
+            value: resolvedPublicIpAddress,
             note: 'Mail server host. Use the same public IPv4 address as this VPS.',
         },
         {
             type: 'MX',
             name: domain,
-            value: `10 mail.${domain}.`,
+            value: `10 ${mailServerHostname}.`,
             note: 'Routes inbound mail for the Agents Server domain to Stalwart.',
         },
         {
@@ -50,7 +54,7 @@ export function createEmailDnsInstructions(domain: string): EmailDnsInstruction[
         {
             type: 'A',
             name: `mta-sts.${domain}`,
-            value: '<VPS_PUBLIC_IP>',
+            value: resolvedPublicIpAddress,
             note: 'Hosts the HTTPS MTA-STS policy for this mail domain.',
         },
         {

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

@@ -0,0 +1,53 @@
+import type { DnsRecordsSection } from '../dnsRecords/DnsRecordsSection';
+import { createEmailDnsInstructions } from './createEmailDnsInstructions';
+
+/**
+ * Creates the DNS section which makes agent email deliverable for one Agents Server domain.
+ *
+ * The DKIM records are intentionally not part of this section, because their public keys are generated by Stalwart
+ * and have to be copied from its authoritative zone on `/admin/email-server`.
+ *
+ * @param options - Email domain, public VPS IP address, and the current mail DNS state.
+ * @returns Email section.
+ *
+ * @private shared by the Agents Server DNS instruction views
+ */
+export function createEmailDnsRecordsSection(options: {
+    /**
+     * Domain which sends and receives the agent email.
+     */
+    readonly domain: string;
+
+    /**
+     * Public VPS IP address, when known by the server.
+     */
+    readonly publicIpAddress: string | null | undefined;
+
+    /**
+     * Current DNS verification state of the mail records, when it is known.
+     */
+    readonly statusSummary?: string | null;
+
+    /**
+     * Whether the mail records currently need attention.
+     */
+    readonly isDnsIssue?: boolean;
+}): DnsRecordsSection {
+    return {
+        id: 'email',
+        title: `Email for ${options.domain}`,
+        description: options.publicIpAddress
+            ? `Makes agent email deliverable. The A records use the detected public address of this VPS.`
+            : `Makes agent email deliverable. Replace <VPS_PUBLIC_IP> with the public address of this VPS.`,
+        variants: [
+            {
+                id: 'email',
+                label: 'Email',
+                recordSelection: 'all',
+                records: createEmailDnsInstructions(options.domain, options.publicIpAddress),
+            },
+        ],
+        statusSummary: options.statusSummary ?? null,
+        isDnsIssue: options.isDnsIssue,
+    };
+}

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/src/utils/useEmailSmtpWalletConstants.ts

@@ -1,17 +1,17 @@
 import { spaceTrim } from 'spacetrim';
 
 /**
- * Wallet service id used by USE EMAIL for SMTP credentials.
+ * Wallet service id used by agent email for SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_SERVICE = 'smtp';
 
 /**
- * Wallet key used by USE EMAIL for SMTP credentials.
+ * Wallet key used by agent email for SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_KEY = 'use-email-smtp-credentials';
 
 /**
- * JSON schema expected in ACCESS_TOKEN secret for USE EMAIL SMTP credentials.
+ * JSON schema expected in ACCESS_TOKEN secret for agent email SMTP credentials.
  */
 export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_SCHEMA = {
     type: 'object',
@@ -49,7 +49,7 @@ export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_SCHEMA = {
 } as const;
 
 /**
- * Multiline JSON example for USE EMAIL SMTP secret payload.
+ * Multiline JSON example for agent email SMTP secret payload.
  */
 export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_EXAMPLE = spaceTrim(`
     {
@@ -62,7 +62,7 @@ export const USE_EMAIL_SMTP_WALLET_SECRET_JSON_EXAMPLE = spaceTrim(`
 `);
 
 /**
- * Builds user-facing guidance for missing USE EMAIL SMTP wallet credentials.
+ * Builds user-facing guidance for missing agent email SMTP wallet credentials.
  */
 export function createUseEmailSmtpWalletMissingCredentialMessage(defaultFromAddress?: string): string {
     const defaultSenderLine = defaultFromAddress ? `Default sender from commitment: ${defaultFromAddress}` : undefined;

package/apps/agents-server/src/utils/userChat/UserChatRecord.ts

@@ -41,12 +41,21 @@ export type UserChatSummary = {
     updatedAt: string;
     lastMessageAt: string | null;
     source: UserChatSource;
+    /**
+     * Database user id owning the chat, used to link a super-admin to its owner.
+     */
+    userId?: number;
     isReadOnly: boolean;
     /**
      * True when the chat belongs to a different user than the current viewer
      * (visible only to admins/super-admins browsing external chats).
      */
     isExternalUserChat: boolean;
+    /**
+     * True for the singleton goal chat the agent keeps with itself, which is pinned above
+     * every other chat and rendered with its own icon.
+     */
+    isAgentGoalChat: boolean;
     messagesCount: number;
     title: string;
     preview: string;
@@ -80,6 +89,10 @@ export type GetUserChatOptions = {
      * who may open other users' chats in a view-only mode.
      */
     viewerIsSuperAdmin?: boolean;
+    /**
+     * True when the viewer may read the agent source book and therefore also the agent goal chat.
+     */
+    viewerCanAccessAgentGoalChat?: boolean;
     agentPermanentId: string;
     chatId: string;
 };

package/apps/agents-server/src/utils/userChat/UserChatSource.ts

@@ -6,6 +6,11 @@ export const USER_CHAT_SOURCES = {
     OPENAI_API: 'OPENAI_API',
     TEAM_MEMBER: 'TEAM_MEMBER',
     EMAIL: 'EMAIL',
+
+    /**
+     * Singleton chat every agent keeps with itself to plan work towards its goal.
+     */
+    AGENT_GOAL: 'AGENT_GOAL',
 } as const;
 
 /**
@@ -24,6 +29,10 @@ export function isFrozenUserChatSource(source: UserChatSource): boolean {
  * Resolves a compact chip label for one chat source.
  */
 export function getUserChatSourceChipLabel(source: UserChatSource): string | null {
+    if (source === USER_CHAT_SOURCES.AGENT_GOAL) {
+        return 'GOAL';
+    }
+
     if (source === USER_CHAT_SOURCES.OPENAI_API) {
         return 'API';
     }
@@ -43,6 +52,11 @@ export function getUserChatSourceChipLabel(source: UserChatSource): string | nul
  * Resolves the banner copy used for frozen external chats.
  */
 export function getUserChatSourceBannerLabel(source: UserChatSource): string | null {
+    if (source === USER_CHAT_SOURCES.AGENT_GOAL) {
+        // Note: Goal chats explain their own specialty through a dedicated notice instead of the generic frozen banner
+        return null;
+    }
+
     if (source === USER_CHAT_SOURCES.OPENAI_API) {
         return 'API key';
     }

package/apps/agents-server/src/utils/userChat/appendQueuedUserChatTurn.ts

@@ -29,6 +29,11 @@ export async function appendQueuedUserChatTurn(options: {
     chatId: string;
     clientMessageId: string;
     messageContent: string;
+    /**
+     * Sender persisted for the input message. Defaults to `USER`; autonomous goal-chat turns use
+     * `AGENT` so the transcript cannot imply that the goal-chat owner wrote the internal wake-up.
+     */
+    messageSender?: 'USER' | 'AGENT';
     attachments?: ChatMessage['attachments'];
     replyingTo?: ChatMessage['replyingTo'];
     parameters?: Record<string, unknown>;
@@ -75,6 +80,7 @@ export async function appendQueuedUserChatTurn(options: {
                         messageId: userMessageId,
                         clientMessageId: options.clientMessageId,
                         content: options.messageContent,
+                        ...(options.messageSender ? { sender: options.messageSender } : {}),
                         attachments: options.attachments,
                         replyingTo: options.replyingTo,
                         createdAt: nowIso,
@@ -100,14 +106,15 @@ export async function appendQueuedUserChatTurn(options: {
         });
 
         // Note: Recording is best-effort telemetry for `/admin/chat-history` and must never block the chat turn
+        const isAgentAuthoredInput = options.messageSender === 'AGENT';
         void recordUserChatMessageInChatHistory({
             agentPermanentId: options.agentPermanentId,
             chatId: options.chatId,
             taskId: jobId,
             userId: options.userId,
             message: {
-                role: 'USER',
-                sender: 'USER',
+                role: isAgentAuthoredInput ? 'MODEL' : 'USER',
+                sender: isAgentAuthoredInput ? 'MODEL' : 'USER',
                 content: options.messageContent,
                 attachments: options.attachments,
             },

package/apps/agents-server/src/utils/userChat/createRunUserChatJobExecutionContext.ts

@@ -1,7 +1,6 @@
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
 import { $provideOpenAiAgentKitExecutionToolsForServer } from '@/src/tools/$provideOpenAiAgentKitExecutionToolsForServer';
-import { createAgentProgressTools } from '@/src/tools/createAgentProgressTools';
-import { createChatAttachmentTools } from '@/src/tools/createChatAttachmentTools';
+import { createServerChatRuntimeTools } from '@/src/tools/createServerChatRuntimeTools';
 import {
     AGENT_PREPARATION_CHAT_WAIT_TIMEOUT_MS,
     resolveAgentCollectionTablePrefix,
@@ -14,7 +13,6 @@ import {
     resolveCachedServerAgentModelRequirements,
 } from '@/src/utils/cachedServerAgentRuntime';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { getTeacherRemoteAgent } from '@/src/utils/getTeacherRemoteAgent';
 import { composePromptParametersWithMemoryContext } from '@/src/utils/memoryRuntimeContext';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
@@ -112,7 +110,6 @@ export async function createRunUserChatJobExecutionContext(options: {
     const resolvedAgentName = resolvedAgentContext.resolvedAgentName;
     const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
     const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-    const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
     const agentToolDefinitions = preparedAgentModelRequirements.modelRequirements.tools ?? [];
     const agentKnowledgeSources = preparedAgentModelRequirements.modelRequirements.knowledgeSources ?? [];
 
@@ -124,7 +121,7 @@ export async function createRunUserChatJobExecutionContext(options: {
         toolCount: agentToolDefinitions.length,
         toolHighlights: resolveUserChatProgressToolHighlights(agentToolDefinitions),
         hasCalendarAccess: calendarConnections.length > 0,
-        hasEmailAccess: useEmailConfiguration.isEnabled,
+        hasEmailAccess: true,
         hasProjectAccess: projectRepositories.length > 0,
     };
 
@@ -135,11 +132,8 @@ export async function createRunUserChatJobExecutionContext(options: {
             userId: options.job.userId,
             agentPermanentId,
             calendarConnections,
-            isEmailEnabled: useEmailConfiguration.isEnabled,
         });
-    const runtimeTools = createAgentProgressTools(
-        createChatAttachmentTools([], options.userMessageAttachments || []),
-    );
+    const runtimeTools = createServerChatRuntimeTools(options.userMessageAttachments || []);
 
     /**
      * Full list of tools that were available to the model for this chat turn.
@@ -164,7 +158,6 @@ export async function createRunUserChatJobExecutionContext(options: {
         projectRepositories,
         projectGithubToken,
         emailSmtpCredential,
-        emailFromAddress: useEmailConfiguration.senderEmail,
         calendarGoogleAccessToken,
         calendarConnections,
         chatAttachments: options.userMessageAttachments,
@@ -255,7 +248,6 @@ async function resolveRunUserChatJobCredentials(options: {
     userId: number;
     agentPermanentId: string;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    isEmailEnabled: boolean;
 }) {
     const [projectGithubToken, calendarGoogleAccessToken, emailSmtpCredential] = await Promise.all([
         resolveUseProjectGithubToken({
@@ -268,12 +260,10 @@ async function resolveRunUserChatJobCredentials(options: {
                   agentPermanentId: options.agentPermanentId,
               })
             : Promise.resolve(undefined),
-        options.isEmailEnabled
-            ? resolveUseEmailSmtpCredential({
-                  userId: options.userId,
-                  agentPermanentId: options.agentPermanentId,
-              })
-            : Promise.resolve(undefined),
+        resolveUseEmailSmtpCredential({
+            userId: options.userId,
+            agentPermanentId: options.agentPermanentId,
+        }),
     ]);
 
     return {

package/apps/agents-server/src/utils/userChat/createUserChatSummary.ts

@@ -2,7 +2,7 @@ import type { UserChatRecord, UserChatSummary, UserChatTimeoutActivity } from '.
 import { createUserChatRunningActivity } from './createUserChatRunningActivity';
 import { shortenText } from '../shortenText';
 import { textToPreviewText } from '../textToPreviewText';
-import { isFrozenUserChatSource } from './UserChatSource';
+import { isFrozenUserChatSource, USER_CHAT_SOURCES } from './UserChatSource';
 
 /**
  * Max title length in chat list.
@@ -122,8 +122,14 @@ export function createUserChatSummaryFromSeed(
         options.activeJobCount && options.activeJobCount > 0
             ? options.activeJobCount
             : resolveSummaryPendingActivityCount(chat.updatedAt, chat.pendingAssistantMessageCount);
+    const isAgentGoalChat = chat.source === USER_CHAT_SOURCES.AGENT_GOAL;
+    // Note: Goal chats are owned by the agent rather than by any human, so they are never treated
+    //       as somebody else's chat even when the viewer is not their stored owner
     const isExternalUserChat =
-        options.viewerUserId !== undefined && chat.userId !== undefined && chat.userId !== options.viewerUserId;
+        !isAgentGoalChat &&
+        options.viewerUserId !== undefined &&
+        chat.userId !== undefined &&
+        chat.userId !== options.viewerUserId;
 
     return {
         id: chat.id,
@@ -131,8 +137,10 @@ export function createUserChatSummaryFromSeed(
         updatedAt: chat.updatedAt,
         lastMessageAt: chat.lastMessageAt,
         source: chat.source,
+        userId: chat.userId,
         isReadOnly: isFrozenUserChatSource(chat.source) || isExternalUserChat,
         isExternalUserChat,
+        isAgentGoalChat,
         messagesCount: chat.messagesCount,
         title: shortenText(storedTitle || titleSource || DEFAULT_CHAT_TITLE, CHAT_TITLE_MAX_LENGTH),
         preview: shortenText(previewSource, CHAT_PREVIEW_MAX_LENGTH),

package/apps/agents-server/src/utils/userChat/finalizeUserChatJob.ts

@@ -1,3 +1,4 @@
+import { spaceTrim } from 'spacetrim';
 import { $getTableName } from '@/src/database/$getTableName';
 import { $provideClientSql } from '@/src/database/$provideClientSql';
 import { isAgentsServerSqliteMode } from '@/src/database/agentsServerDatabaseMode';
@@ -46,7 +47,7 @@ async function persistFinalUserChatJobStatus(options: {
         const sql = await $provideClientSql();
         const userChatJobTable = quoteIdentifier(await $getTableName('UserChatJob'));
         const rows = await sql.raw<Array<UserChatJobRecord>>(
-            `
+            spaceTrim(`
                 UPDATE ${userChatJobTable}
                 SET
                     "status" = $1,
@@ -79,7 +80,7 @@ async function persistFinalUserChatJobStatus(options: {
                     "attemptCount",
                     "provider",
                     "failureReason"
-            `,
+            `),
             [
                 options.status,
                 nowIso,