@promptbook/cli 0.113.0-1 → 0.113.0-10

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]/api/book/route.ts

@@ -8,6 +8,7 @@ import {
 import { loadFederatedAgentImportConfiguration } from '@/src/utils/federatedAgentImportConfiguration';
 import { getCurrentUser } from '@/src/utils/getCurrentUser';
 import { getWellKnownAgentUrl } from '@/src/utils/getWellKnownAgentUrl';
+import { createLocalAgentSourceImporter } from '@/src/utils/createLocalAgentSourceImporter';
 import { resolveInheritedAgentSource } from '@/src/utils/resolveInheritedAgentSource';
 import { padBook, validateBook } from '@promptbook-local/core';
 import type { string_agent_url } from '@promptbook-local/types';
@@ -96,13 +97,24 @@ export async function GET(request: Request, { params }: { params: Promise<{ agen
         const agentSource = resolvedAgentContext.unresolvedAgentSource;
         const agentReferenceResolver = resolvedAgentContext.scopedAgentReferenceResolver;
         const federatedAgentImportConfiguration = await loadFederatedAgentImportConfiguration();
+        const adamAgentUrl = await getWellKnownAgentUrl('ADAM');
+        const localServerUrl = new URL(request.url).origin;
+        const agentSourceImporter = createLocalAgentSourceImporter({
+            collection,
+            localServerUrls: [localServerUrl],
+            localAgentUrls: [adamAgentUrl],
+            adamAgentUrl,
+            fallbackResolver: baseAgentReferenceResolver,
+            federatedAgentImportConfiguration,
+        });
         const effectiveAgentSource = await resolveInheritedAgentSource(agentSource, {
-            adamAgentUrl: await getWellKnownAgentUrl('ADAM'),
+            adamAgentUrl,
             recursionLevel,
             currentAgentUrl: resolvedAgentContext.canonicalAgentUrl,
             inheritancePath: inheritancePath as Array<string_agent_url>,
             agentReferenceResolver,
             federatedAgentImportConfiguration,
+            agentSourceImporter,
         });
         const etag = `W/"${computeHash(effectiveAgentSource)}"`;
 

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 && (