@promptbook/cli 0.114.0-5 → 0.114.0-7

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/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/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/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,

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

@@ -8,7 +8,14 @@ import { USER_CHAT_SOURCES } from './UserChatSource';
  * Loads one user chat by id.
  */
 export async function getUserChat(options: GetUserChatOptions): Promise<UserChatRecord | null> {
-    const { userId, viewerIsAdmin = false, viewerIsSuperAdmin = false, agentPermanentId, chatId } = options;
+    const {
+        userId,
+        viewerIsAdmin = false,
+        viewerIsSuperAdmin = false,
+        viewerCanAccessAgentGoalChat = false,
+        agentPermanentId,
+        chatId,
+    } = options;
     const userChatTable = await provideUserChatTable();
 
     const { data, error } = await userChatTable
@@ -36,5 +43,13 @@ export async function getUserChat(options: GetUserChatOptions): Promise<UserChat
         return viewerIsSuperAdmin ? chat : null;
     }
 
+    if (chat.source === USER_CHAT_SOURCES.AGENT_GOAL) {
+        // Note: Goal chats follow agent-source-book access, and stay readable for the background
+        //       workers that run under the goal chat's own owner identity
+        return viewerCanAccessAgentGoalChat || viewerIsAdmin || viewerIsSuperAdmin || chat.userId === userId
+            ? chat
+            : null;
+    }
+
     return viewerIsAdmin || viewerIsSuperAdmin ? chat : null;
 }

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

@@ -0,0 +1,31 @@
+import { getUserChat } from './getUserChat';
+import type { UserChatRecord } from './UserChatRecord';
+
+/**
+ * Job identity a background runner needs to load the chat it is about to answer.
+ */
+export type UserChatJobRunnerChatIdentity = {
+    readonly userId: number;
+    readonly agentPermanentId: string;
+    readonly chatId: string;
+};
+
+/**
+ * Loads the chat one durable job belongs to, on behalf of the background runner executing it.
+ *
+ * `getUserChat` answers a *viewer* and therefore discloses the externally created chat sources -
+ * `EMAIL`, `OPENAI_API` and `TEAM_MEMBER` - to administrators only. A background runner is not a
+ * viewer: it already owns the job, runs under the job owner's identity, and has to read every chat
+ * source. Without this distinction each externally created job is cancelled as if its chat had been
+ * deleted, so every inbound email stays unanswered.
+ */
+export async function getUserChatForJobRunner(job: UserChatJobRunnerChatIdentity): Promise<UserChatRecord | null> {
+    return await getUserChat({
+        userId: job.userId,
+        // Note: The runner is trusted machinery behind an already-persisted job, not a person browsing
+        //       somebody else's conversation
+        viewerIsAdmin: true,
+        agentPermanentId: job.agentPermanentId,
+        chatId: job.chatId,
+    });
+}