@promptbook/cli 0.114.0-2 → 0.114.0-20

package/apps/agents-server/src/app/agents/[agentName]/api/book/reference-diagnostics/route.ts

@@ -1,9 +1,12 @@
 import { $provideAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/$provideAgentReferenceResolver';
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
 import { createBookScopedAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/bookScopedAgentReferences';
+import { createAgentInheritanceDiagnostics } from '@/src/utils/agentReferenceResolver/createAgentInheritanceDiagnostics';
 import { createUnresolvedAgentReferenceDiagnostics } from '@/src/utils/agentReferenceResolver/createUnresolvedAgentReferenceDiagnostics';
 import { createAgentNameCollisionDiagnostics } from '@/src/utils/agentReferenceResolver/createAgentNameCollisionDiagnostics';
+import { resolveCoreAgentAwareMissingReferences } from '@/src/utils/agentReferenceResolver/resolveCoreAgentAwareMissingReferences';
 import { getCurrentUser } from '@/src/utils/getCurrentUser';
+import { isUserAdmin } from '@/src/utils/isUserAdmin';
 import { string_book } from '@promptbook-local/types';
 import { serializeError } from '@promptbook-local/utils';
 import { assertsError } from '../../../../../../../../../src/errors/assertsError';
@@ -38,17 +41,35 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
             fallbackResolver: baseAgentReferenceResolver,
         });
 
-        const [referenceDiagnostics, nameCollisionDiagnostics] = await Promise.all([
-            createUnresolvedAgentReferenceDiagnostics(agentSource, agentReferenceResolver),
-            createAgentNameCollisionDiagnostics(agentSource, parentAgentPermanentId, collection),
-        ]);
+        const localServerUrl = new URL(request.url).origin;
+        const [referenceDiagnostics, nameCollisionDiagnostics, inheritanceDiagnostics, isReinstateAllowed] =
+            await Promise.all([
+                createUnresolvedAgentReferenceDiagnostics(agentSource, agentReferenceResolver),
+                createAgentNameCollisionDiagnostics(agentSource, parentAgentPermanentId, collection),
+                createAgentInheritanceDiagnostics({
+                    agentSource,
+                    agentPermanentId: parentAgentPermanentId,
+                    collection,
+                    localServerUrl,
+                }),
+                isUserAdmin(),
+            ]);
+        const missingAgentReferences = await resolveCoreAgentAwareMissingReferences({
+            agentSource,
+            missingAgentReferences: referenceDiagnostics.missingAgentReferences,
+            isReinstateAllowed,
+        });
 
         return new Response(
             JSON.stringify({
                 isSuccessful: true,
                 agentName,
-                diagnostics: [...referenceDiagnostics.diagnostics, ...nameCollisionDiagnostics],
-                missingAgentReferences: referenceDiagnostics.missingAgentReferences,
+                diagnostics: [
+                    ...referenceDiagnostics.diagnostics,
+                    ...nameCollisionDiagnostics,
+                    ...inheritanceDiagnostics,
+                ],
+                missingAgentReferences,
             }),
             {
                 status: 200,
@@ -79,5 +100,7 @@ function isTruthySearchParam(value: string | null): boolean {
     }
 
     const normalizedValue = value.trim().toLowerCase();
-    return normalizedValue === '1' || normalizedValue === 'true' || normalizedValue === 'yes' || normalizedValue === 'on';
+    return (
+        normalizedValue === '1' || normalizedValue === 'true' || normalizedValue === 'yes' || normalizedValue === 'on'
+    );
 }

package/apps/agents-server/src/app/agents/[agentName]/api/book/route.ts

@@ -1,4 +1,6 @@
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
+import { $provideServer } from '@/src/tools/$provideServer';
+import { scheduleAgentGoalChatModifiedNote } from '@/src/utils/agentGoalChat';
 import { $provideAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/$provideAgentReferenceResolver';
 import { invalidateCachedActiveOrganizationSnapshots } from '@/src/utils/agentOrganization/loadAgentOrganizationState';
 import {
@@ -111,6 +113,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
             adamAgentUrl,
             recursionLevel,
             currentAgentUrl: resolvedAgentContext.canonicalAgentUrl,
+            currentAgentAliases: resolvedAgentContext.currentAgentAliases,
             inheritancePath: inheritancePath as Array<string_agent_url>,
             agentReferenceResolver,
             federatedAgentImportConfiguration,
@@ -185,6 +188,12 @@ export async function PUT(request: Request, { params }: { params: Promise<{ agen
 
         const agentId = await collection.getAgentPermanentId(agentName);
         await collection.updateAgentSource(agentId, agentSource, { versionName });
+        scheduleAgentGoalChatModifiedNote({
+            agentPermanentId: agentId,
+            agentName,
+            agentSource,
+            server: await $provideServer(),
+        });
         invalidateCachedActiveOrganizationSnapshots();
         // <- TODO: [🐱‍🚀] Properly type as string_book
 

package/apps/agents-server/src/app/agents/[agentName]/api/book/test.http

@@ -16,7 +16,7 @@ Content-Type: text/plain
 Gabriel Gray
 
 META COLOR #c9c9c9
-PERSONA Friendly and helpful AI agent.
+GOAL Help users as a friendly AI agent.
 RULE Be kind and respectful.
 
 
@@ -33,5 +33,5 @@ Content-Type: text/plain
 Gabriel Gray
 
 META COLOR #242424
-PERSONA Strict and professional AI agent.
-RULE Be strict and professional.
+GOAL Help users as a strict and professional AI agent.
+RULE Be strict and professional.

package/apps/agents-server/src/app/agents/[agentName]/api/chat/resolveAgentChatRouteContext.ts

@@ -3,8 +3,7 @@ import { computeAgentHash } from '@promptbook-local/core';
 import { resolveTeamInternalAgentAccessToken } from '../../../../../../../../src/commitments/_common/teamInternalAgentAccess';
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
 import { $provideOpenAiAgentKitExecutionToolsForServer } from '@/src/tools/$provideOpenAiAgentKitExecutionToolsForServer';
-import { createChatAttachmentTools } from '@/src/tools/createChatAttachmentTools';
-import { createAgentProgressTools } from '@/src/tools/createAgentProgressTools';
+import { createServerChatRuntimeTools } from '@/src/tools/createServerChatRuntimeTools';
 import { $provideAgentReferenceResolver } from '@/src/utils/agentReferenceResolver/$provideAgentReferenceResolver';
 import {
     AGENT_PREPARATION_CHAT_WAIT_TIMEOUT_MS,
@@ -25,7 +24,6 @@ import {
 } from '@/src/utils/metaDisclaimer';
 import { composePromptParametersWithMemoryContext } from '@/src/utils/memoryRuntimeContext';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
 import { resolveUseCalendarGoogleToken } from '@/src/utils/resolveUseCalendarGoogleToken';
 import { resolveUseEmailSmtpCredential } from '@/src/utils/resolveUseEmailSmtpCredential';
@@ -55,7 +53,7 @@ export type ResolvedAgentChatRouteContext = {
     message: string;
     thread?: Array<ChatMessage>;
     attachments: ChatMessage['attachments'];
-    runtimeTools: ReturnType<typeof createAgentProgressTools>;
+    runtimeTools: ReturnType<typeof createServerChatRuntimeTools>;
     promptParameters: ReturnType<typeof composePromptParametersWithMemoryContext>;
     messageSuffix: ReturnType<typeof resolveMessageSuffixFromAgentSource>;
     currentUserIdentity: ResolvedCurrentUserMemoryIdentity | null;
@@ -141,7 +139,6 @@ export async function resolveAgentChatRouteContext(
     const resolvedAgentName = resolvedAgentContext.resolvedAgentName;
     const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
     const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-    const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
     const messageSuffix = resolveMessageSuffixFromAgentSource(agentSource);
     const incomingParameters = normalizeAgentChatIncomingParameters(rawParameters);
     const [preparedAgentModelRequirements, requestIdentities] = await Promise.all([
@@ -166,9 +163,8 @@ export async function resolveAgentChatRouteContext(
         currentUserId: currentUserIdentity?.userId,
         agentId,
         calendarConnections,
-        useEmailConfiguration,
     });
-    const runtimeTools = createAgentProgressTools(createChatAttachmentTools([], attachments));
+    const runtimeTools = createServerChatRuntimeTools(attachments);
     const promptParameters = composePromptParametersWithMemoryContext({
         baseParameters: incomingParameters,
         currentUserIdentity,
@@ -178,7 +174,6 @@ export async function resolveAgentChatRouteContext(
         projectRepositories,
         projectGithubToken,
         emailSmtpCredential,
-        emailFromAddress: useEmailConfiguration.senderEmail,
         calendarGoogleAccessToken,
         calendarConnections,
         chatAttachments: attachments,
@@ -288,9 +283,8 @@ async function resolveAgentChatCredentials(options: {
     currentUserId: number | undefined;
     agentId: string;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    useEmailConfiguration: ReturnType<typeof extractUseEmailConfigurationFromAgentSource>;
 }): Promise<AgentChatCredentials> {
-    const { currentUserId, agentId, calendarConnections, useEmailConfiguration } = options;
+    const { currentUserId, agentId, calendarConnections } = options;
     const [projectGithubToken, calendarGoogleAccessToken, emailSmtpCredential] = await Promise.all([
         resolveUseProjectGithubToken({
             userId: currentUserId,
@@ -302,12 +296,10 @@ async function resolveAgentChatCredentials(options: {
                   agentPermanentId: agentId,
               })
             : Promise.resolve(undefined),
-        useEmailConfiguration.isEnabled
-            ? resolveUseEmailSmtpCredential({
-                  userId: currentUserId,
-                  agentPermanentId: agentId,
-              })
-            : Promise.resolve(undefined),
+        resolveUseEmailSmtpCredential({
+            userId: currentUserId,
+            agentPermanentId: agentId,
+        }),
     ]);
 
     return {

package/apps/agents-server/src/app/agents/[agentName]/api/timeouts/[timeoutId]/route.ts

@@ -1,18 +1,12 @@
 import { NextResponse } from 'next/server';
 import { isPrivateModeEnabledFromRequest } from '@/src/utils/privateMode';
-import {
-    cancelScheduledUserChatTimeout,
-    getAgentScopedUserChatTimeout,
-    notifyUserChatTimeoutScheduleChanged,
-    updateAgentScopedUserChatTimeout,
-} from '@/src/utils/userChatTimeout';
-import type { UpdateAgentScopedUserChatTimeoutPatch } from '@/src/utils/userChatTimeout';
+import { cancelScheduledUserChatTimeout, getAgentScopedUserChatTimeout } from '@/src/utils/userChatTimeout';
 import { resolveUserChatScope } from '../../user-chats/resolveUserChatScope';
 
 /**
- * Updates one durable timeout owned by current user for one agent.
+ * Cancels one planned message of the agent from its goal chat.
  */
-export async function PATCH(
+export async function DELETE(
     request: Request,
     { params }: { params: Promise<{ agentName: string; timeoutId: string }> },
 ) {
@@ -37,170 +31,33 @@ export async function PATCH(
         return NextResponse.json({ error: 'Agent not found.' }, { status: 404 });
     }
 
-    try {
-        const existingTimeout = await getAgentScopedUserChatTimeout({
-            userId: scopeResult.scope.userId,
-            agentPermanentId: scopeResult.scope.agentPermanentId,
-            timeoutId,
-        });
-
-        if (!existingTimeout) {
-            return NextResponse.json({ error: 'Timeout not found.' }, { status: 404 });
-        }
-
-        if (
-            existingTimeout.status === 'COMPLETED' ||
-            existingTimeout.status === 'FAILED' ||
-            existingTimeout.status === 'CANCELLED'
-        ) {
-            return NextResponse.json({ error: 'Timeout is already finished.' }, { status: 409 });
-        }
-
-        if (existingTimeout.status === 'RUNNING') {
-            return NextResponse.json({ error: 'Running timeout cannot be edited.' }, { status: 409 });
-        }
-
-        const parsedPatch = await parseTimeoutPatchPayload(request);
-        if (!parsedPatch) {
-            return NextResponse.json({ error: 'No valid timeout fields provided.' }, { status: 400 });
-        }
-
-        const updatedTimeout = await updateAgentScopedUserChatTimeout({
-            userId: scopeResult.scope.userId,
-            agentPermanentId: scopeResult.scope.agentPermanentId,
-            timeoutId,
-            patch: parsedPatch,
-        });
-
-        if (!updatedTimeout) {
-            return NextResponse.json({ error: 'Timeout not found.' }, { status: 404 });
-        }
-
-        notifyUserChatTimeoutScheduleChanged(updatedTimeout);
-
-        return NextResponse.json(updatedTimeout);
-    } catch (error) {
-        return NextResponse.json(
-            { error: error instanceof Error ? error.message : 'Failed to update timeout.' },
-            { status: 400 },
-        );
-    }
-}
-
-/**
- * Cancels one durable timeout owned by current user for one agent.
- */
-export async function DELETE(
-    request: Request,
-    { params }: { params: Promise<{ agentName: string; timeoutId: string }> },
-) {
-    if (isPrivateModeEnabledFromRequest(request)) {
-        return NextResponse.json({ error: 'Private mode is enabled.' }, { status: 403 });
-    }
-
-    const { agentName: rawAgentName, timeoutId: rawTimeoutId } = await params;
-    const agentName = decodeURIComponent(rawAgentName);
-    const timeoutId = decodeURIComponent(rawTimeoutId);
-    const scopeResult = await resolveUserChatScope(agentName);
-
-    if (!scopeResult.ok) {
-        if (scopeResult.error === 'UNAUTHORIZED') {
-            return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-        }
-
-        if (scopeResult.error === 'FORBIDDEN') {
-            return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
-        }
-
-        return NextResponse.json({ error: 'Agent not found.' }, { status: 404 });
+    if (!scopeResult.scope.viewerCanAccessAgentGoalChat) {
+        return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
     }
 
     try {
+        // Note: Planned messages belong to the agent, so the goal chat may cancel them across every
+        //       chat and every user of the agent
         const existingTimeout = await getAgentScopedUserChatTimeout({
-            userId: scopeResult.scope.userId,
             agentPermanentId: scopeResult.scope.agentPermanentId,
             timeoutId,
         });
 
         if (!existingTimeout) {
-            return NextResponse.json({ error: 'Timeout not found.' }, { status: 404 });
+            return NextResponse.json({ error: 'Planned message not found.' }, { status: 404 });
         }
 
         const cancelledTimeout = await cancelScheduledUserChatTimeout(timeoutId);
 
         if (!cancelledTimeout) {
-            return NextResponse.json({ error: 'Timeout not found.' }, { status: 404 });
+            return NextResponse.json({ error: 'Planned message not found.' }, { status: 404 });
         }
 
         return NextResponse.json(cancelledTimeout);
     } catch (error) {
         return NextResponse.json(
-            { error: error instanceof Error ? error.message : 'Failed to cancel timeout.' },
+            { error: error instanceof Error ? error.message : 'Failed to cancel the planned message.' },
             { status: 500 },
         );
     }
 }
-
-/**
- * Parses and validates timeout update payload from one request.
- */
-async function parseTimeoutPatchPayload(request: Request): Promise<UpdateAgentScopedUserChatTimeoutPatch | null> {
-    const payload = (await request.json().catch(() => ({}))) as {
-        dueAt?: unknown;
-        recurrenceIntervalMs?: unknown;
-        message?: unknown;
-        parameters?: unknown;
-        paused?: unknown;
-        extendByMs?: unknown;
-    };
-
-    const patch: UpdateAgentScopedUserChatTimeoutPatch = {};
-
-    if (typeof payload.dueAt === 'string' && payload.dueAt.trim().length > 0) {
-        const normalizedDueAt = payload.dueAt.trim();
-        const dueAtTimestamp = Date.parse(normalizedDueAt);
-        if (!Number.isFinite(dueAtTimestamp)) {
-            throw new Error('`dueAt` must be a valid ISO timestamp.');
-        }
-        patch.dueAt = new Date(dueAtTimestamp).toISOString();
-    }
-
-    if (payload.recurrenceIntervalMs === null) {
-        patch.recurrenceIntervalMs = null;
-    } else if (typeof payload.recurrenceIntervalMs === 'number') {
-        if (!Number.isFinite(payload.recurrenceIntervalMs) || payload.recurrenceIntervalMs <= 0) {
-            throw new Error('`recurrenceIntervalMs` must be a positive number of milliseconds or `null`.');
-        }
-        patch.recurrenceIntervalMs = Math.floor(payload.recurrenceIntervalMs);
-    }
-
-    if (payload.message === null) {
-        patch.message = null;
-    } else if (typeof payload.message === 'string') {
-        patch.message = payload.message;
-    }
-
-    if (payload.parameters !== undefined) {
-        if (!payload.parameters || typeof payload.parameters !== 'object' || Array.isArray(payload.parameters)) {
-            throw new Error('`parameters` must be a JSON object.');
-        }
-        patch.parameters = payload.parameters as Record<string, unknown>;
-    }
-
-    if (typeof payload.paused === 'boolean') {
-        patch.pausedAt = payload.paused ? new Date().toISOString() : null;
-    }
-
-    if (typeof payload.extendByMs === 'number') {
-        if (!Number.isFinite(payload.extendByMs) || payload.extendByMs <= 0) {
-            throw new Error('`extendByMs` must be a positive number of milliseconds.');
-        }
-        patch.extendByMs = Math.floor(payload.extendByMs);
-    }
-
-    if (patch.dueAt !== undefined && patch.extendByMs !== undefined) {
-        throw new Error('`dueAt` and `extendByMs` cannot be used together.');
-    }
-
-    return Object.keys(patch).length > 0 ? patch : null;
-}

package/apps/agents-server/src/app/agents/[agentName]/api/timeouts/route.ts

@@ -5,12 +5,12 @@ import type { UserChatTimeoutRecord, UserChatTimeoutStatus } from '@/src/utils/u
 import { resolveUserChatScope } from '../user-chats/resolveUserChatScope';
 
 /**
- * Upper bound for one agent-wide timeout listing response.
+ * Upper bound for one agent-wide planned-message listing response.
  */
 const MAX_AGENT_TIMEOUT_MANAGER_ITEMS = 500;
 
 /**
- * Deterministic status order used in the timeout manager table.
+ * Deterministic status order used in the goal-chat planned-message list.
  */
 const TIMEOUT_STATUS_ORDER: Record<UserChatTimeoutStatus, number> = {
     RUNNING: 0,
@@ -21,7 +21,7 @@ const TIMEOUT_STATUS_ORDER: Record<UserChatTimeoutStatus, number> = {
 };
 
 /**
- * Lists all durable timeouts owned by current user for one agent across chats.
+ * Lists every planned message of one agent, as shown in its goal chat.
  */
 export async function GET(request: Request, { params }: { params: Promise<{ agentName: string }> }) {
     if (isPrivateModeEnabledFromRequest(request)) {
@@ -44,9 +44,14 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
         return NextResponse.json({ error: 'Agent not found.' }, { status: 404 });
     }
 
+    if (!scopeResult.scope.viewerCanAccessAgentGoalChat) {
+        return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
+    }
+
     try {
+        // Note: Planned messages belong to the agent, so the goal chat lists them across every chat
+        //       and every user of the agent
         const timeouts = await listAgentUserChatTimeouts({
-            userId: scopeResult.scope.userId,
             agentPermanentId: scopeResult.scope.agentPermanentId,
             limit: MAX_AGENT_TIMEOUT_MANAGER_ITEMS,
         });

package/apps/agents-server/src/app/agents/[agentName]/api/user-chats/[chatId]/route.ts

@@ -41,6 +41,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
             userId: scopeResult.scope.userId,
             viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
             viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+            viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
             agentPermanentId: scopeResult.scope.agentPermanentId,
             chatId,
         });
@@ -86,6 +87,7 @@ export async function PATCH(request: Request, { params }: { params: Promise<{ ag
             userId: scopeResult.scope.userId,
             viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
             viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+            viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
             agentPermanentId: scopeResult.scope.agentPermanentId,
             chatId,
         });
@@ -201,6 +203,7 @@ export async function DELETE(request: Request, { params }: { params: Promise<{ a
             userId: scopeResult.scope.userId,
             viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
             viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+            viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
             agentPermanentId: scopeResult.scope.agentPermanentId,
             chatId,
         });

package/apps/agents-server/src/app/agents/[agentName]/api/user-chats/[chatId]/stream/route.ts

@@ -66,6 +66,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
     const chat = await getUserChat({
         userId: scopeResult.scope.userId,
         viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
+        viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
         agentPermanentId: scopeResult.scope.agentPermanentId,
         chatId,
     });
@@ -133,6 +134,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
                 const currentChat = await getUserChat({
                     userId: scopeResult.scope.userId,
                     viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
+                    viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
                     agentPermanentId: scopeResult.scope.agentPermanentId,
                     chatId,
                 });

package/apps/agents-server/src/app/agents/[agentName]/api/user-chats/resolveUserChatScope.ts

@@ -1,4 +1,5 @@
 import { $provideAgentCollectionForServer } from '@/src/tools/$provideAgentCollectionForServer';
+import { canAccessAgentGoalChat } from '@/src/utils/agentGoalChat';
 import { canAccessAgentVisibility, resolveAgentVisibility } from '@/src/utils/agentAccess';
 import { resolveCurrentUserIdentity } from '@/src/utils/currentUserIdentity';
 import { isUserGlobalAdmin } from '@/src/utils/isUserGlobalAdmin';
@@ -15,6 +16,10 @@ export type ResolvedUserChatScope = {
      * who may browse all 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;
 };
 
@@ -38,9 +43,10 @@ export async function resolveUserChatScope(
 
     try {
         const collection = await $provideAgentCollectionForServer();
-        const [agentPermanentId, viewerIsSuperAdmin] = await Promise.all([
+        const [agentPermanentId, viewerIsSuperAdmin, viewerCanAccessAgentGoalChat] = await Promise.all([
             collection.getAgentPermanentId(agentIdentifier),
             isUserGlobalAdmin(),
+            canAccessAgentGoalChat(),
         ]);
         const visibility = await resolveAgentVisibility(agentPermanentId);
         const isAllowed = canAccessAgentVisibility({
@@ -58,6 +64,7 @@ export async function resolveUserChatScope(
                 userId: currentUserIdentity.userId,
                 viewerIsAdmin: currentUserIdentity.isAdmin,
                 viewerIsSuperAdmin,
+                viewerCanAccessAgentGoalChat,
                 agentPermanentId,
             },
         };

package/apps/agents-server/src/app/agents/[agentName]/api/user-chats/route.ts

@@ -1,3 +1,4 @@
+import { isAgentGoalChatId, prependAgentGoalChatSummarySeed } from '@/src/utils/agentGoalChat';
 import { isPrivateModeEnabledFromRequest } from '@/src/utils/privateMode';
 import {
     createUserChat,
@@ -38,12 +39,16 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
         const requestUrl = new URL(request.url);
         const requestedChatId = normalizeOptionalString(requestUrl.searchParams.get('chat'));
         const showExternalChats = normalizeBooleanFlag(requestUrl.searchParams.get('showExternalChats'));
-        const chatSummarySeeds = await listUserChatSummarySeeds({
-            userId: scopeResult.scope.userId,
-            viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
-            viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+        const chatSummarySeeds = await prependAgentGoalChatSummarySeed({
+            chatSummarySeeds: await listUserChatSummarySeeds({
+                userId: scopeResult.scope.userId,
+                viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
+                viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+                agentPermanentId: scopeResult.scope.agentPermanentId,
+                includeExternalChats: showExternalChats,
+            }),
             agentPermanentId: scopeResult.scope.agentPermanentId,
-            includeExternalChats: showExternalChats,
+            isAgentGoalChatVisible: scopeResult.scope.viewerCanAccessAgentGoalChat,
         });
         const activityUserId =
             (scopeResult.scope.viewerIsAdmin || scopeResult.scope.viewerIsSuperAdmin) && showExternalChats
@@ -62,15 +67,18 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
             }),
         ]);
 
+        // Note: The pinned goal chat is opened only on explicit request, never as the default thread
+        const defaultChatSummarySeed =
+            chatSummarySeeds.find((chat) => !isAgentGoalChatId(chat.id)) || chatSummarySeeds[0] || null;
         const activeChatSummarySeed =
             (requestedChatId ? chatSummarySeeds.find((chat) => chat.id === requestedChatId) : null) ||
-            chatSummarySeeds[0] ||
-            null;
+            defaultChatSummarySeed;
         const activeChat = activeChatSummarySeed
             ? await getUserChat({
                   userId: scopeResult.scope.userId,
                   viewerIsAdmin: scopeResult.scope.viewerIsAdmin,
                   viewerIsSuperAdmin: scopeResult.scope.viewerIsSuperAdmin,
+                  viewerCanAccessAgentGoalChat: scopeResult.scope.viewerCanAccessAgentGoalChat,
                   agentPermanentId: scopeResult.scope.agentPermanentId,
                   chatId: activeChatSummarySeed.id,
               })

package/apps/agents-server/src/app/agents/[agentName]/api/voice/route.ts

@@ -9,7 +9,6 @@ import {
     resolveMetaDisclaimerMarkdownFromAgentSource,
     resolveMetaDisclaimerStatusForUser,
 } from '@/src/utils/metaDisclaimer';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
 import { logCalendarToolCallsActivity } from '@/src/utils/calendars/logCalendarToolCallsActivity';
@@ -122,7 +121,6 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
         const unresolvedAgentSource = resolvedAgentContext.unresolvedAgentSource;
         const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
         const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-        const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
         const projectGithubToken = await resolveUseProjectGithubToken({
             userId: currentUserIdentity?.userId,
             agentPermanentId,
@@ -134,12 +132,10 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
                       agentPermanentId,
                   })
                 : undefined;
-        const emailSmtpCredential = useEmailConfiguration.isEnabled
-            ? await resolveUseEmailSmtpCredential({
-                  userId: currentUserIdentity?.userId,
-                  agentPermanentId,
-              })
-            : undefined;
+        const emailSmtpCredential = await resolveUseEmailSmtpCredential({
+            userId: currentUserIdentity?.userId,
+            agentPermanentId,
+        });
         const disclaimerMarkdown = resolveMetaDisclaimerMarkdownFromAgentSource(agentSource);
 
         if (disclaimerMarkdown) {
@@ -183,7 +179,6 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
             projectRepositories,
             projectGithubToken,
             emailSmtpCredential,
-            emailFromAddress: useEmailConfiguration.senderEmail,
             calendarGoogleAccessToken,
             calendarConnections,
             localServerUrl,