@promptbook/cli 0.113.0-8 → 0.113.0-9

package/apps/agents-server/src/app/admin/update/UpdateJobCard.tsx

@@ -9,8 +9,10 @@ import { downloadBlob, parseFilenameFromContentDisposition } from '../../../util
 import { formatHumanReadableTimestamp } from './formatHumanReadableTimestamp';
 import { getUpdateJobFailureMessage } from './getUpdateJobFailureMessage';
 import { getUpdateJobSuccessMessage } from './getUpdateJobSuccessMessage';
+import { UpdateDatabaseMigrationsPanel } from './UpdateDatabaseMigrationsPanel';
 import type { UpdateJobSnapshot } from './UpdateOverview';
 import type { UpdateClientState } from './useUpdateClientState';
+import { UPDATE_PAGE_CARD_CLASS_NAME } from './updatePageCardClassName';
 
 /**
  * Duration (ms) of the transient "Copied!" / "Saved!" feedback shown next to log action buttons.
@@ -59,10 +61,10 @@ export function UpdateJobCard({ state, language }: UpdateJobCardProps) {
     const jobStatus = job?.status ?? 'idle';
 
     return (
-        <Card className="hover:border-gray-200 hover:shadow-md">
-            <div className="space-y-4">
+        <Card className={UPDATE_PAGE_CARD_CLASS_NAME}>
+            <div className="min-w-0 space-y-4">
                 <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
-                    <div>
+                    <div className="min-w-0">
                         <h2 className="text-lg font-semibold text-slate-900">Update job</h2>
                         <p className="mt-1 text-sm text-slate-500">
                             The update runs in the background so the browser request can finish cleanly before pm2
@@ -74,11 +76,15 @@ export function UpdateJobCard({ state, language }: UpdateJobCardProps) {
 
                 <UpdateJobSummaryGrid job={job} language={language} />
                 <UpdateJobStatusMessage job={job} />
+                <UpdateDatabaseMigrationsPanel
+                    databaseMigrations={job?.databaseMigrations ?? null}
+                    isJobIdle={jobStatus === 'idle'}
+                />
 
                 {job?.logFilePath && (
                     <div className="text-xs text-slate-500">
                         Installer log:
-                        <span className="ml-2 font-mono text-slate-700">{job.logFilePath}</span>
+                        <span className="ml-2 break-all font-mono text-slate-700">{job.logFilePath}</span>
                     </div>
                 )}
                 {job?.status === 'failed' && <UpdateJobLogActions />}
@@ -103,7 +109,7 @@ export function UpdateJobCard({ state, language }: UpdateJobCardProps) {
 function UpdateJobStatusBadge({ status }: { readonly status: UpdateJobStatus }) {
     return (
         <span
-            className={`inline-flex items-center gap-2 rounded-full border px-3 py-1 text-xs font-semibold uppercase tracking-wide ${getUpdateJobStatusClassName(
+            className={`inline-flex shrink-0 items-center gap-2 rounded-full border px-3 py-1 text-xs font-semibold uppercase tracking-wide ${getUpdateJobStatusClassName(
                 status,
             )}`}
         >
@@ -125,8 +131,9 @@ function UpdateJobSummaryGrid({
     readonly language: ServerLanguageCode;
 }) {
     return (
-        <dl className="grid gap-4 text-sm text-slate-600 md:grid-cols-2 xl:grid-cols-4">
+        <dl className="grid min-w-0 gap-4 text-sm text-slate-600 md:grid-cols-2 xl:grid-cols-5">
             <UpdateJobMetric label="Target" value={job?.targetEnvironment.label || 'Production'} />
+            <UpdateJobMetric label="Trigger" value={formatUpdateJobTrigger(job)} />
             <UpdateJobMetric label="Step" value={job?.currentStep || 'Idle'} />
             <UpdateJobMetric label="Started" value={formatHumanReadableTimestamp(job?.startedAt, language)} />
             <UpdateJobMetric label="Finished" value={formatHumanReadableTimestamp(job?.finishedAt, language)} />
@@ -134,6 +141,20 @@ function UpdateJobSummaryGrid({
     );
 }
 
+/**
+ * Formats the update job trigger for the summary grid.
+ *
+ * @param job - Latest job snapshot.
+ * @returns Human-readable trigger label.
+ */
+function formatUpdateJobTrigger(job: UpdateJobSnapshot | null): string {
+    if (!job || job.status === 'idle') {
+        return 'Manual';
+    }
+
+    return job.trigger === 'automatic' ? 'Automatic' : 'Manual';
+}
+
 /**
  * Renders one update job metric.
  *
@@ -141,9 +162,9 @@ function UpdateJobSummaryGrid({
  */
 function UpdateJobMetric({ label, value }: UpdateJobMetricProps) {
     return (
-        <div className="rounded-xl border border-slate-200 bg-slate-50 px-4 py-3">
+        <div className="min-w-0 rounded-xl border border-slate-200 bg-slate-50 px-4 py-3">
             <dt className="text-xs font-semibold uppercase tracking-wide text-slate-500">{label}</dt>
-            <dd className="mt-1 text-slate-900">{value}</dd>
+            <dd className="mt-1 break-words text-slate-900">{value}</dd>
         </div>
     );
 }

package/apps/agents-server/src/app/admin/update/UpdateOverview.ts

@@ -11,13 +11,54 @@ export type UpdateEnvironmentOption = {
     readonly isCustom: boolean;
 };
 
+/**
+ * Browser-safe database migration status recorded during one self-update job.
+ *
+ * @private type of `<UpdateClient/>`
+ */
+export type UpdateDatabaseMigrationStatus =
+    | 'pending'
+    | 'running'
+    | 'succeeded'
+    | 'failed'
+    | 'skipped'
+    | 'unknown';
+
+/**
+ * Browser-safe database migration summary for one table prefix.
+ *
+ * @private type of `<UpdateClient/>`
+ */
+export type UpdateDatabaseMigrationPrefixSummary = {
+    readonly prefix: string;
+    readonly appliedCount: number;
+    readonly appliedMigrationFiles: ReadonlyArray<string>;
+};
+
+/**
+ * Browser-safe database migration snapshot recorded during one self-update job.
+ *
+ * @private type of `<UpdateClient/>`
+ */
+export type UpdateDatabaseMigrationSnapshot = {
+    readonly status: UpdateDatabaseMigrationStatus;
+    readonly processedPrefixes: ReadonlyArray<string>;
+    readonly totalMigrationFiles: number | null;
+    readonly perPrefix: ReadonlyArray<UpdateDatabaseMigrationPrefixSummary>;
+    readonly isSkippedDueToActiveMigrationLock: boolean | null;
+    readonly errorMessage: string | null;
+    readonly summaryFilePath: string | null;
+};
+
 /**
  * Browser-safe latest update-job snapshot.
  *
  * @private type of `<UpdateClient/>`
  */
 export type UpdateJobSnapshot = {
+    readonly jobId: string | null;
     readonly status: 'idle' | 'running' | 'succeeded' | 'failed';
+    readonly trigger: 'manual' | 'automatic';
     readonly pid: number | null;
     readonly targetBranch: string | null;
     readonly targetEnvironment: UpdateEnvironmentOption;
@@ -30,6 +71,30 @@ export type UpdateJobSnapshot = {
     readonly isStale: boolean;
     readonly logTail: string | null;
     readonly logFilePath: string | null;
+    readonly databaseMigrations: UpdateDatabaseMigrationSnapshot;
+};
+
+/**
+ * Browser-safe automatic self-update configuration.
+ *
+ * @private type of `<UpdateClient/>`
+ */
+export type AutomaticUpdateConfiguration = {
+    readonly isEnabled: boolean;
+    readonly environment: UpdateEnvironmentOption;
+    readonly cronExpression: string;
+};
+
+/**
+ * Browser-safe summary of one installed Agents Server version.
+ *
+ * @private type of `<UpdateClient/>`
+ */
+export type UpdateInstalledVersion = {
+    readonly name: string;
+    readonly directoryPath: string;
+    readonly modifiedAt: string | null;
+    readonly isCurrent: boolean;
 };
 
 /**
@@ -69,6 +134,9 @@ export type UpdateOverview = {
     readonly originRepositoryUrl: string;
     readonly isOriginRepositoryDefault: boolean;
     readonly defaultOriginRepositoryUrl: string;
+    readonly automaticConfiguration: AutomaticUpdateConfiguration;
+    readonly installedVersions: ReadonlyArray<UpdateInstalledVersion>;
+    readonly garbageCollectionKeepVersionsCount: number;
     readonly job: UpdateJobSnapshot;
     readonly error?: string;
 };

package/apps/agents-server/src/app/admin/update/updatePageCardClassName.ts

@@ -0,0 +1,6 @@
+/**
+ * Shared card styling for `/admin/update` cards that should size to their content inside stacked grids.
+ *
+ * @private constant of `/admin/update`
+ */
+export const UPDATE_PAGE_CARD_CLASS_NAME = '!h-auto min-w-0 hover:border-gray-200 hover:shadow-md';

package/apps/agents-server/src/app/admin/update/useUpdateClientState.ts

@@ -1,15 +1,31 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { CustomCommitPickerCandidate } from './CustomCommitPicker';
 import { getUpdateJobSuccessMessage } from './getUpdateJobSuccessMessage';
-import type { UpdateEnvironmentOption, UpdateOverview } from './UpdateOverview';
+import type { AutomaticUpdateConfiguration, UpdateEnvironmentOption, UpdateOverview } from './UpdateOverview';
 
 /**
  * Interval (ms) used while polling a running standalone VPS update job.
  */
 const UPDATE_OVERVIEW_REFRESH_INTERVAL_MS = 4000;
 
+/**
+ * Default draft shown before the update overview finishes loading.
+ */
+const DEFAULT_AUTOMATIC_UPDATE_CRON_EXPRESSION = '0 0 * * *';
+
+/**
+ * Draft state used by the automatic self-update configuration form.
+ *
+ * @private type of `useUpdateClientState`
+ */
+type AutomaticUpdateConfigurationDraft = {
+    readonly isEnabled: boolean;
+    readonly environmentId: string;
+    readonly cronExpression: string;
+};
+
 /**
  * Options for loading the standalone VPS update overview.
  *
@@ -31,6 +47,19 @@ type StartUpdateRequestBody = {
     readonly originRepositoryUrl: string | null;
 };
 
+/**
+ * Body sent when saving automatic self-update configuration.
+ *
+ * @private type of `useUpdateClientState`
+ */
+type SaveAutomaticUpdateConfigurationRequestBody = {
+    readonly automaticConfiguration: {
+        readonly isEnabled: boolean;
+        readonly environment: string;
+        readonly cronExpression: string;
+    };
+};
+
 /**
  * Options used to build the start-update request body.
  *
@@ -66,9 +95,12 @@ export type UpdateClientState = {
     readonly selectedEnvironment: UpdateEnvironmentOption | null;
     readonly customRef: string;
     readonly originRepositoryUrlOverride: string;
+    readonly automaticConfigurationDraft: AutomaticUpdateConfigurationDraft;
     readonly isAdvancedExpanded: boolean;
     readonly isLoading: boolean;
     readonly isStartingUpdate: boolean;
+    readonly isSavingAutomaticConfiguration: boolean;
+    readonly deletingVersionName: string | null;
     readonly errorMessage: string | null;
     readonly successMessage: string | null;
     readonly isCustomEnvironmentSelected: boolean;
@@ -77,15 +109,18 @@ export type UpdateClientState = {
     readonly isCustomRefRelease: boolean;
     readonly isCustomRefMissing: boolean;
     readonly isOriginRepositoryUrlOverrideChanged: boolean;
+    readonly isAutomaticConfigurationChanged: boolean;
     readonly updateTerminalId: string;
     readonly updateTerminalEmptyState: string;
     readonly loadOverview: (options?: LoadUpdateOverviewOptions) => Promise<void>;
     readonly startUpdate: () => Promise<void>;
+    readonly deleteInstalledVersion: (versionName: string) => Promise<void>;
+    readonly saveAutomaticConfiguration: () => Promise<void>;
+    readonly changeAutomaticUpdateEnabled: (isEnabled: boolean) => void;
+    readonly selectAutomaticUpdateEnvironment: (environmentId: string) => void;
+    readonly changeAutomaticUpdateCronExpression: (cronExpression: string) => void;
     readonly selectEnvironment: (environmentId: string) => void;
-    readonly selectCustomRef: (
-        nextRef: string,
-        matchedCandidate: CustomCommitPickerCandidate | null,
-    ) => void;
+    readonly selectCustomRef: (nextRef: string, matchedCandidate: CustomCommitPickerCandidate | null) => void;
     readonly changeOriginRepositoryUrlOverride: (nextValue: string) => void;
     readonly toggleAdvanced: () => void;
 };
@@ -103,11 +138,19 @@ export function useUpdateClientState(): UpdateClientState {
     const [customRef, setCustomRef] = useState<string>('');
     const [customCandidate, setCustomCandidate] = useState<CustomCommitPickerCandidate | null>(null);
     const [originRepositoryUrlOverride, setOriginRepositoryUrlOverride] = useState<string>('');
+    const [automaticConfigurationDraft, setAutomaticConfigurationDraft] = useState<AutomaticUpdateConfigurationDraft>({
+        isEnabled: false,
+        environmentId: 'production',
+        cronExpression: DEFAULT_AUTOMATIC_UPDATE_CRON_EXPRESSION,
+    });
     const [isAdvancedExpanded, setIsAdvancedExpanded] = useState<boolean>(false);
     const [isLoading, setIsLoading] = useState(true);
     const [isStartingUpdate, setIsStartingUpdate] = useState(false);
+    const [isSavingAutomaticConfiguration, setIsSavingAutomaticConfiguration] = useState(false);
+    const [deletingVersionName, setDeletingVersionName] = useState<string | null>(null);
     const [errorMessage, setErrorMessage] = useState<string | null>(null);
     const [successMessage, setSuccessMessage] = useState<string | null>(null);
+    const isAutomaticConfigurationDirtyRef = useRef(false);
 
     const loadOverview = useCallback(async (options?: LoadUpdateOverviewOptions): Promise<void> => {
         try {
@@ -123,6 +166,9 @@ export function useUpdateClientState(): UpdateClientState {
                 (currentSelectedEnvironmentId) => currentSelectedEnvironmentId || payload.currentEnvironment.id,
             );
             setOriginRepositoryUrlOverride((currentValue) => currentValue || payload.originRepositoryUrl);
+            if (!isAutomaticConfigurationDirtyRef.current) {
+                setAutomaticConfigurationDraft(createAutomaticUpdateConfigurationDraft(payload.automaticConfiguration));
+            }
             if (payload.job.status === 'succeeded') {
                 setSuccessMessage(getUpdateJobSuccessMessage(payload.job));
             } else if (payload.job.status === 'failed') {
@@ -172,6 +218,10 @@ export function useUpdateClientState(): UpdateClientState {
         overview,
         originRepositoryUrlOverride,
     );
+    const isAutomaticConfigurationChanged = isAutomaticUpdateConfigurationChanged(
+        automaticConfigurationDraft,
+        overview?.automaticConfiguration ?? null,
+    );
     const updateTerminalId = buildUpdateTerminalId(overview);
     const updateTerminalEmptyState = getUpdateTerminalEmptyState(isLoading, overview);
 
@@ -218,6 +268,67 @@ export function useUpdateClientState(): UpdateClientState {
         selectedEnvironment,
     ]);
 
+    const deleteInstalledVersion = useCallback(async (versionName: string): Promise<void> => {
+        try {
+            setDeletingVersionName(versionName);
+            setErrorMessage(null);
+            setSuccessMessage(null);
+
+            const payload = await deleteInstalledVersionRequest(versionName);
+
+            setOverview(payload);
+            setSuccessMessage(`Deleted the installed Agents Server version ${versionName}.`);
+        } catch (error) {
+            setErrorMessage(getErrorMessage(error, 'Failed to delete the installed version.'));
+        } finally {
+            setDeletingVersionName(null);
+        }
+    }, []);
+
+    const saveAutomaticConfiguration = useCallback(async (): Promise<void> => {
+        try {
+            setIsSavingAutomaticConfiguration(true);
+            setErrorMessage(null);
+            setSuccessMessage(null);
+
+            const payload = await saveAutomaticUpdateConfiguration(automaticConfigurationDraft);
+
+            setOverview(payload);
+            setSelectedEnvironmentId(payload.currentEnvironment.id);
+            setAutomaticConfigurationDraft(createAutomaticUpdateConfigurationDraft(payload.automaticConfiguration));
+            isAutomaticConfigurationDirtyRef.current = false;
+            setSuccessMessage('Automatic self-update configuration saved.');
+        } catch (error) {
+            setErrorMessage(getErrorMessage(error, 'Failed to save automatic self-update configuration.'));
+        } finally {
+            setIsSavingAutomaticConfiguration(false);
+        }
+    }, [automaticConfigurationDraft]);
+
+    const changeAutomaticUpdateEnabled = useCallback((isEnabled: boolean): void => {
+        isAutomaticConfigurationDirtyRef.current = true;
+        setAutomaticConfigurationDraft((currentDraft) => ({
+            ...currentDraft,
+            isEnabled,
+        }));
+    }, []);
+
+    const selectAutomaticUpdateEnvironment = useCallback((environmentId: string): void => {
+        isAutomaticConfigurationDirtyRef.current = true;
+        setAutomaticConfigurationDraft((currentDraft) => ({
+            ...currentDraft,
+            environmentId,
+        }));
+    }, []);
+
+    const changeAutomaticUpdateCronExpression = useCallback((cronExpression: string): void => {
+        isAutomaticConfigurationDirtyRef.current = true;
+        setAutomaticConfigurationDraft((currentDraft) => ({
+            ...currentDraft,
+            cronExpression,
+        }));
+    }, []);
+
     const selectEnvironment = useCallback((environmentId: string): void => {
         setSelectedEnvironmentId(environmentId);
     }, []);
@@ -239,9 +350,12 @@ export function useUpdateClientState(): UpdateClientState {
         selectedEnvironment,
         customRef,
         originRepositoryUrlOverride,
+        automaticConfigurationDraft,
         isAdvancedExpanded,
         isLoading,
         isStartingUpdate,
+        isSavingAutomaticConfiguration,
+        deletingVersionName,
         errorMessage,
         successMessage,
         isCustomEnvironmentSelected,
@@ -250,10 +364,16 @@ export function useUpdateClientState(): UpdateClientState {
         isCustomRefRelease,
         isCustomRefMissing,
         isOriginRepositoryUrlOverrideChanged,
+        isAutomaticConfigurationChanged,
         updateTerminalId,
         updateTerminalEmptyState,
         loadOverview,
         startUpdate,
+        deleteInstalledVersion,
+        saveAutomaticConfiguration,
+        changeAutomaticUpdateEnabled,
+        selectAutomaticUpdateEnvironment,
+        changeAutomaticUpdateCronExpression,
         selectEnvironment,
         selectCustomRef,
         changeOriginRepositoryUrlOverride: setOriginRepositoryUrlOverride,
@@ -304,6 +424,76 @@ async function startUpdateJob(requestBody: StartUpdateRequestBody): Promise<Upda
     return payload;
 }
 
+/**
+ * Deletes one old installed Agents Server version through the admin API.
+ *
+ * @param versionName - Release directory name to delete.
+ * @returns Updated overview snapshot returned by the server.
+ *
+ * @private function of `useUpdateClientState`
+ */
+async function deleteInstalledVersionRequest(versionName: string): Promise<UpdateOverview> {
+    const response = await fetch('/api/admin/update/versions', {
+        method: 'DELETE',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ versionName }),
+    });
+    const payload = (await response.json()) as UpdateOverview;
+
+    if (!response.ok) {
+        throw new Error(payload.error || 'Failed to delete the installed version.');
+    }
+
+    return payload;
+}
+
+/**
+ * Saves automatic self-update configuration with the prepared API request body.
+ *
+ * @param draft - Automatic self-update form draft.
+ * @returns Updated overview snapshot returned by the server.
+ *
+ * @private function of `useUpdateClientState`
+ */
+async function saveAutomaticUpdateConfiguration(draft: AutomaticUpdateConfigurationDraft): Promise<UpdateOverview> {
+    const response = await fetch('/api/admin/update', {
+        method: 'PATCH',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(createSaveAutomaticUpdateConfigurationRequestBody(draft)),
+    });
+    const payload = (await response.json()) as UpdateOverview;
+
+    if (!response.ok) {
+        throw new Error(payload.error || 'Failed to save automatic self-update configuration.');
+    }
+
+    return payload;
+}
+
+/**
+ * Builds the PATCH body for saving automatic self-update configuration.
+ *
+ * @param draft - Automatic self-update form draft.
+ * @returns Request body accepted by `/api/admin/update`.
+ *
+ * @private function of `useUpdateClientState`
+ */
+function createSaveAutomaticUpdateConfigurationRequestBody(
+    draft: AutomaticUpdateConfigurationDraft,
+): SaveAutomaticUpdateConfigurationRequestBody {
+    return {
+        automaticConfiguration: {
+            isEnabled: draft.isEnabled,
+            environment: draft.environmentId,
+            cronExpression: draft.cronExpression.trim(),
+        },
+    };
+}
+
 /**
  * Builds the POST body for starting the update without mixing UI state decisions into the network call.
  *
@@ -328,6 +518,48 @@ function createStartUpdateRequestBody(options: CreateStartUpdateRequestBodyOptio
     };
 }
 
+/**
+ * Creates a form draft from the persisted automatic self-update configuration.
+ *
+ * @param configuration - Persisted automatic configuration.
+ * @returns Form draft.
+ *
+ * @private function of `useUpdateClientState`
+ */
+function createAutomaticUpdateConfigurationDraft(
+    configuration: AutomaticUpdateConfiguration,
+): AutomaticUpdateConfigurationDraft {
+    return {
+        isEnabled: configuration.isEnabled,
+        environmentId: configuration.environment.id,
+        cronExpression: configuration.cronExpression,
+    };
+}
+
+/**
+ * Returns whether the automatic self-update draft differs from the persisted configuration.
+ *
+ * @param draft - Current form draft.
+ * @param configuration - Persisted automatic configuration from the overview.
+ * @returns `true` when there are unsaved automatic self-update changes.
+ *
+ * @private function of `useUpdateClientState`
+ */
+function isAutomaticUpdateConfigurationChanged(
+    draft: AutomaticUpdateConfigurationDraft,
+    configuration: AutomaticUpdateConfiguration | null,
+): boolean {
+    if (!configuration) {
+        return false;
+    }
+
+    return (
+        draft.isEnabled !== configuration.isEnabled ||
+        draft.environmentId !== configuration.environment.id ||
+        draft.cronExpression.trim() !== configuration.cronExpression
+    );
+}
+
 /**
  * Resolves the success message shown after the update job is accepted by the server.
  *
@@ -411,7 +643,9 @@ function isOriginRepositoryUrlOverrideChangedForOverview(
  * @private function of `useUpdateClientState`
  */
 function buildUpdateTerminalId(overview: UpdateOverview | null): string {
-    return `standalone-vps-update:${overview?.job.startedAt || overview?.job.finishedAt || overview?.job.status || 'loading'}`;
+    return `standalone-vps-update:${
+        overview?.job.startedAt || overview?.job.finishedAt || overview?.job.status || 'loading'
+    }`;
 }
 
 /**

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

@@ -19,9 +19,9 @@ import { useServerLanguage } from '../../../components/ServerLanguage/ServerLang
 import { ChatThreadLoadingSkeleton } from '../../../components/Skeleton/ChatThreadLoadingSkeleton';
 import { useSoundSystem } from '../../../components/SoundSystemProvider/SoundSystemProvider';
 import { fetchCalendarOAuthStatus, type CalendarOAuthStatusResponse } from '../../../utils/calendarOAuthClient';
+import { createAttachmentAwareCitationLabelResolver } from '../../../utils/chat/createAttachmentAwareCitationLabelResolver';
 import { createDefaultChatEffects } from '../../../utils/chat/createDefaultChatEffects';
 import { executeQuickActionButton } from '../../../utils/chat/executeQuickActionButton';
-import { resolveAgentsServerCitationLabel } from '../../../utils/chat/resolveAgentsServerCitationLabel';
 import {
     isChatFeedbackEnabled,
     toChatComponentFeedbackMode,
@@ -144,6 +144,7 @@ export function AgentChatWrapper(props: AgentChatWrapperProps) {
     const sendMessage = useSendMessageToLlmChat();
     const [githubAppStatus, setGithubAppStatus] = useState<GithubAppStatusResponse | null>(null);
     const [calendarOAuthStatus, setCalendarOAuthStatus] = useState<CalendarOAuthStatusResponse | null>(null);
+    const [renderedMessages, setRenderedMessages] = useState<ReadonlyArray<ChatMessage>>([]);
     const currentAgentPermanentId = useMemo(() => {
         return typeof (agent as { permanentId?: unknown } | undefined)?.permanentId === 'string'
             ? ((agent as { permanentId?: string }).permanentId as string)
@@ -283,6 +284,19 @@ export function AgentChatWrapper(props: AgentChatWrapperProps) {
         t,
     });
 
+    // Track rendered messages so cited chat attachments resolve to their original filenames.
+    const handleChatMessagesChange = useCallback(
+        (messages: ReadonlyArray<ChatMessage>) => {
+            setRenderedMessages(messages);
+            handleMessagesChange(messages);
+        },
+        [handleMessagesChange],
+    );
+    const resolveCitationLabel = useMemo(
+        () => createAttachmentAwareCitationLabelResolver(renderedMessages),
+        [renderedMessages],
+    );
+
     // Handle errors from chat
     const handleError = useCallback((error: unknown, retry: () => void) => {
         if (error instanceof ClientVersionMismatchError) {
@@ -439,7 +453,7 @@ export function AgentChatWrapper(props: AgentChatWrapperProps) {
             autoExecuteMessage={effectiveAutoExecuteMessage}
             autoExecuteMessageAttachments={effectiveAutoExecuteMessageAttachments}
             persistenceKey={persistenceKey}
-            onChange={handleMessagesChange}
+            onChange={handleChatMessagesChange}
             onInputTextChange={onInputTextChange}
             onActionButton={executeQuickActionButton}
             sendMessage={sendMessage}
@@ -459,7 +473,7 @@ export function AgentChatWrapper(props: AgentChatWrapperProps) {
             onReset={onStartNewChat}
             resetMode={onStartNewChat ? 'delegate' : undefined}
             teamAgentProfiles={teamAgentProfiles}
-            resolveCitationLabel={resolveAgentsServerCitationLabel}
+            resolveCitationLabel={resolveCitationLabel}
         >
             {allowFileAttachments && !fileUploadAvailability.isUploadAvailable && (
                 <FileUploadUnavailableNotice className="mx-4 mt-4" />

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

@@ -14,9 +14,9 @@ import { useServerLanguage } from '../../../../components/ServerLanguage/ServerL
 import { ChatThreadLoadingSkeleton } from '../../../../components/Skeleton/ChatThreadLoadingSkeleton';
 import { useSoundSystem } from '../../../../components/SoundSystemProvider/SoundSystemProvider';
 import { usePromptbookTheme } from '../../../../components/ThemeMode/usePromptbookTheme';
+import { createAttachmentAwareCitationLabelResolver } from '../../../../utils/chat/createAttachmentAwareCitationLabelResolver';
 import { createDefaultChatEffects } from '../../../../utils/chat/createDefaultChatEffects';
 import { executeQuickActionButton } from '../../../../utils/chat/executeQuickActionButton';
-import { resolveAgentsServerCitationLabel } from '../../../../utils/chat/resolveAgentsServerCitationLabel';
 import { downloadChatPdfFromServer } from '../../../../utils/chatExport/downloadChatPdfFromServer';
 import {
     isChatFeedbackEnabled,
@@ -217,6 +217,10 @@ export function CanonicalAgentChatSurface({
         ),
         [activeTimeouts, cancelAction, currentTimestamp, extraActions, isReadOnly, onCancelActiveTimeout],
     );
+    const resolveCitationLabel = useMemo(
+        () => createAttachmentAwareCitationLabelResolver(state.renderedMessages),
+        [state.renderedMessages],
+    );
     const shouldRenderLoadingSkeleton = state.initialMessage === undefined && state.renderedMessages.length === 0;
     const chatElement = shouldRenderLoadingSkeleton ? (
         renderCanonicalAgentChatLoadingSkeleton()
@@ -266,7 +270,7 @@ export function CanonicalAgentChatSurface({
             teamAgentProfiles={state.teamAgentProfiles}
             extraActions={extraActionNodes}
             saveFormatHandlers={saveFormatHandlers}
-            resolveCitationLabel={resolveAgentsServerCitationLabel}
+            resolveCitationLabel={resolveCitationLabel}
             theme={promptbookTheme}
         >
             {!isReadOnly && areFileAttachmentsEnabled && !fileUploadAvailability.isUploadAvailable && (