@promptbook/cli 0.114.0-0 → 0.114.0-10

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,

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

@@ -1,5 +1,6 @@
 import type { string_book } from '@promptbook-local/types';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { debounce } from '@promptbook-local/utils';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { resolveBookEditorApiErrorMessage } from './resolveBookEditorApiErrorMessage';
 
 /**
@@ -82,13 +83,6 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
     const [isSaveDebounced, setIsSaveDebounced] = useState(false);
     const [successfulSaveSequence, setSuccessfulSaveSequence] = useState(0);
 
-    /**
-     * Debounce timer ref so pending saves can be replaced before dispatch.
-     *
-     * @private function of useBookEditorWrapper
-     */
-    const debounceTimerRef = useRef<number | null>(null);
-
     /**
      * Stores the newest queued save request.
      *
@@ -175,6 +169,16 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
         [flushSaveQueue],
     );
 
+    /**
+     * Reuses the shared debounce utility while keeping source persistence separate from goal-chat notifications.
+     *
+     * @private function of useBookEditorWrapper
+     */
+    const debouncedEnqueueSave = useMemo(
+        () => debounce(enqueueSave, SAVE_DEBOUNCE_DELAY_MS),
+        [enqueueSave],
+    );
+
     /**
      * Schedules one autosave after the debounce delay.
      *
@@ -182,19 +186,12 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
      */
     const scheduleSave = useCallback(
         (nextSource: string_book, version: number) => {
-            if (debounceTimerRef.current) {
-                clearTimeout(debounceTimerRef.current);
-            }
-
             setIsSaveDebounced(true);
             setSaveStatus('pending');
 
-            debounceTimerRef.current = window.setTimeout(() => {
-                debounceTimerRef.current = null;
-                enqueueSave(nextSource, version, null);
-            }, SAVE_DEBOUNCE_DELAY_MS);
+            debouncedEnqueueSave(nextSource, version, null);
         },
-        [enqueueSave],
+        [debouncedEnqueueSave],
     );
 
     /**
@@ -218,14 +215,10 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
      * @private function of useBookEditorWrapper
      */
     const cancelPendingSave = useCallback(() => {
-        if (debounceTimerRef.current) {
-            clearTimeout(debounceTimerRef.current);
-            debounceTimerRef.current = null;
-        }
-
+        debouncedEnqueueSave.cancel();
         pendingSaveRef.current = null;
         setIsSaveDebounced(false);
-    }, []);
+    }, [debouncedEnqueueSave]);
 
     /**
      * Retries saving the current editor content immediately.
@@ -297,11 +290,9 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
      */
     useEffect(() => {
         return () => {
-            if (debounceTimerRef.current) {
-                clearTimeout(debounceTimerRef.current);
-            }
+            debouncedEnqueueSave.cancel();
         };
-    }, []);
+    }, [debouncedEnqueueSave]);
 
     /**
      * Indicates whether the latest local source revision is already confirmed on the server.
@@ -329,5 +320,4 @@ export function useBookEditorSaving({ agentName, initialAgentSource }: UseBookEd
     };
 }
 
-// TODO: Prompt: Use `import { debounce } from '@promptbook-local/utils';` instead of custom debounce implementation
 // TODO: [🚗] Transfer the saving logic to `<BookEditor/>` be aware of CRDT / yjs approach to be implementable in future

package/apps/agents-server/src/app/agents/[agentName]/chat/AgentChatHistoryClient.tsx

@@ -9,7 +9,10 @@ import { AgentChatPageLayout } from './AgentChatPageLayout';
 import { AgentChatSidebar } from './AgentChatSidebar';
 import { CanonicalAgentChatPanel } from './CanonicalAgentChatPanel';
 import { ExternalUserChatAdminActions } from './ExternalUserChatAdminActions';
+import { TeamMemberFrozenChatPrimaryAgentLink } from './TeamMemberFrozenChatPrimaryAgentLink';
 import { type AgentChatHistoryClientProps, useAgentChatHistoryClientState } from './useAgentChatHistoryClientState';
+import { getTeamMemberUserChatContext } from '../../../../utils/userChat/teamMemberUserChatContext';
+import { USER_CHAT_SOURCES } from '../../../../utils/userChat/UserChatSource';
 
 /**
  * One user-authored chat turn submitted from the canonical chat panel.
@@ -343,15 +346,29 @@ function AgentChatHistoryReadyView(props: AgentChatHistoryReadyViewProps) {
         onAutoExecuteMessageConsumed,
     } = props;
     const isActiveExternalUserChat = activeChatSummary?.isExternalUserChat === true;
+    const teamMemberUserChatContext =
+        activeChatSummary?.source === USER_CHAT_SOURCES.TEAM_MEMBER
+            ? getTeamMemberUserChatContext(renderedActiveMessages)
+            : null;
     const externalUserChatAdminActions =
         isCurrentUserSuperAdmin === true && isActiveExternalUserChat ? (
             <ExternalUserChatAdminActions
                 agentName={agentName}
                 chatId={activeChatId}
+                userId={activeChatSummary?.userId}
                 chatTitle={activeChatSummary?.title || 'Recorded chat'}
                 messages={renderedActiveMessages}
             />
         ) : undefined;
+    const readOnlyExtraActions =
+        teamMemberUserChatContext || externalUserChatAdminActions ? (
+            <>
+                {teamMemberUserChatContext && (
+                    <TeamMemberFrozenChatPrimaryAgentLink context={teamMemberUserChatContext} />
+                )}
+                {externalUserChatAdminActions}
+            </>
+        ) : undefined;
     const chatSurface = (
         <div className="relative flex min-h-0 flex-1 overflow-hidden">
             {isActiveChatLoading ? (
@@ -372,7 +389,8 @@ function AgentChatHistoryReadyView(props: AgentChatHistoryReadyViewProps) {
                     isReadOnly={isActiveChatReadOnly}
                     readOnlySource={activeChatSummary?.source}
                     isExternalUserChat={isActiveExternalUserChat}
-                    readOnlyExtraActions={externalUserChatAdminActions}
+                    isAgentGoalChat={activeChatSummary?.isAgentGoalChat === true}
+                    readOnlyExtraActions={readOnlyExtraActions}
                     projectReferences={projectReferences}
                     messages={renderedActiveMessages}
                     draftMessage={isActiveChatReadOnly ? '' : activeChatDraftMessage}

package/apps/agents-server/src/app/agents/[agentName]/chat/AgentChatSidebarDefault.tsx

@@ -1,4 +1,4 @@
-import { EyeIcon, EyeOffIcon, MessageSquarePlusIcon, Trash2Icon, XIcon } from 'lucide-react';
+import { EyeIcon, EyeOffIcon, MessageSquarePlusIcon, TargetIcon, Trash2Icon, XIcon } from 'lucide-react';
 import { SolidArrowButton } from '../../../../../../../src/book-components/icons/SolidArrowButton';
 import { ChatListLoadingSkeleton } from '../../../../components/Skeleton/ChatListLoadingSkeleton';
 import { AgentChatSidebarActivityIndicator } from './AgentChatSidebarActivityIndicator';
@@ -189,10 +189,16 @@ function AgentChatSidebarDefaultCollapsedRow({ item, onChatSelect }: AgentChatSi
             <span className="absolute left-1.5 top-1.5 z-[5]">
                 <AgentChatSidebarActivityIndicator indicator={item.content.activityIndicator} />
             </span>
-            {item.content.sourceChipLabel && (
-                <span className="absolute left-1.5 bottom-1.5 z-[5] inline-flex items-center rounded-full bg-slate-900/85 px-1.5 py-0.5 text-[8px] font-bold uppercase tracking-[0.18em] text-white shadow-sm">
-                    {item.content.sourceChipLabel}
+            {item.isAgentGoalChat ? (
+                <span className="absolute left-1.5 bottom-1.5 z-[5] inline-flex items-center justify-center rounded-full bg-indigo-600 p-1 text-white shadow-sm">
+                    <TargetIcon className="h-2.5 w-2.5" aria-hidden />
                 </span>
+            ) : (
+                item.content.sourceChipLabel && (
+                    <span className="absolute left-1.5 bottom-1.5 z-[5] inline-flex items-center rounded-full bg-slate-900/85 px-1.5 py-0.5 text-[8px] font-bold uppercase tracking-[0.18em] text-white shadow-sm">
+                        {item.content.sourceChipLabel}
+                    </span>
+                )
             )}
             <span
                 className={`absolute right-0.5 top-0.5 z-[5] inline-flex h-4 min-w-4 items-center justify-center rounded-full px-1 text-[9px] font-bold leading-none shadow-sm ${
@@ -255,10 +261,16 @@ function AgentChatSidebarDefaultExpandedRow({
                 title={item.content.accessibilityLabel}
             >
                 <div className="flex items-center gap-2">
+                    {item.isAgentGoalChat && (
+                        <TargetIcon
+                            className="h-4 w-4 flex-shrink-0 text-indigo-600 dark:text-indigo-300"
+                            aria-hidden
+                        />
+                    )}
                     <div className="agent-chat-sidebar-item-title min-w-0 flex-1 truncate text-sm font-medium text-slate-800 dark:text-slate-100">
                         {item.content.title}
                     </div>
-                    {item.content.sourceChipLabel && (
+                    {!item.isAgentGoalChat && item.content.sourceChipLabel && (
                         <span className="inline-flex flex-shrink-0 items-center rounded-full bg-slate-900 px-2 py-1 text-[10px] font-bold uppercase tracking-[0.18em] text-white">
                             {item.content.sourceChipLabel}
                         </span>

package/apps/agents-server/src/app/agents/[agentName]/chat/AgentGoalChatNotice.tsx

@@ -0,0 +1,23 @@
+'use client';
+
+import { TargetIcon } from 'lucide-react';
+import { useServerLanguage } from '../../../../components/ServerLanguage/ServerLanguageProvider';
+
+/**
+ * Explains what makes the agent goal chat different from a normal conversation.
+ *
+ * @private Agents Server presentation logic for the agent goal chat.
+ */
+export function AgentGoalChatNotice() {
+    const { t: translateText } = useServerLanguage();
+
+    return (
+        <div className="mx-4 mt-4 flex items-start gap-3 rounded-2xl border border-indigo-200 bg-indigo-50/95 px-4 py-3 text-sm text-indigo-900 shadow-sm dark:border-indigo-500/30 dark:bg-indigo-500/10 dark:text-indigo-100">
+            <TargetIcon className="mt-0.5 h-4 w-4 flex-shrink-0" aria-hidden />
+            <div>
+                <div className="font-semibold">{translateText('goalChat.noticeTitle')}</div>
+                <p className="mt-1">{translateText('goalChat.noticeDescription')}</p>
+            </div>
+        </div>
+    );
+}