addin editor serialization in the span too

sourcegraph · Nov 21, 2024 · e2505cb · e2505cb
1 parent 826c229
commit e2505cb
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/vscode/webviews/chat/Transcript.tsx b/vscode/webviews/chat/Transcript.tsx
@@ -271,14 +271,9 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
     const humanEditorRef = useRef<PromptEditorRefAPI | null>(null)
     useImperativeHandle(parentEditorRef, () => humanEditorRef.current)
 
-    const startSpanAndSubmit = (
-        action: 'edit' | 'submit',
-        editorValue: SerializedPromptEditorValue,
-        intentFromSubmit?: ChatMessage['intent']
-    ) => {
+    const onUserAction = (action: 'edit' | 'submit', intentFromSubmit?: ChatMessage['intent']) => {
+        // Start the span as soon as the user initiates the action
         const startMark = performance.mark('startSubmit')
-
-        // Start the span as soon as the user clicks the submit button
         const spanManager = new SpanManager('cody-webview')
         const span = spanManager.startSpan('chat-interaction', {
             attributes: {
@@ -295,6 +290,13 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
         const spanContext = trace.setSpan(context.active(), span)
         setActiveChatContext(spanContext)
 
+        // Serialize the editor value after starting the span
+        const editorValue = humanEditorRef.current?.getSerializedValue()
+        if (!editorValue) {
+            console.error('Failed to serialize editor value')
+            return
+        }
+
         const commonProps = {
             editorValue,
             intent: intentFromSubmit || intentResults.current?.intent,
@@ -315,17 +317,17 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
     }
 
     const onEditSubmit = useCallback(
-        (editorValue: SerializedPromptEditorValue, intentFromSubmit?: ChatMessage['intent']): void => {
-            startSpanAndSubmit('edit', editorValue, intentFromSubmit)
+        (intentFromSubmit?: ChatMessage['intent']): void => {
+            onUserAction('edit', intentFromSubmit)
         },
-        [startSpanAndSubmit]
+        [onUserAction]
     )
 
     const onFollowupSubmit = useCallback(
-        (editorValue: SerializedPromptEditorValue, intentFromSubmit?: ChatMessage['intent']): void => {
-            startSpanAndSubmit('submit', editorValue, intentFromSubmit)
+        (intentFromSubmit?: ChatMessage['intent']): void => {
+            onUserAction('submit', intentFromSubmit)
         },
-        [startSpanAndSubmit]
+        [onUserAction]
     )
 
     const extensionAPI = useExtensionAPI()
@@ -494,7 +496,7 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
         (intent: ChatMessage['intent']) => {
             const editorState = humanEditorRef.current?.getSerializedValue()
             if (editorState) {
-                onEditSubmit(editorState, intent)
+                onEditSubmit(intent)
                 telemetryRecorder.recordEvent('onebox.intentCorrection', 'clicked', {
                     metadata: {
                         recordsPrivateMetadataTranscript: 1,
@@ -519,10 +521,7 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
                 return
             }
             await editor.addMentions(corpusContextItems, 'before', ' ')
-            const newEditorState = humanEditorRef.current?.getSerializedValue()
-            if (newEditorState) {
-                onEditSubmit(newEditorState, 'chat')
-            }
+            onEditSubmit('chat')
         }
     }, [corpusContextItems, onEditSubmit])
 
@@ -560,7 +559,9 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
                 isSent={!humanMessage.isUnsentFollowup}
                 isPendingPriorResponse={priorAssistantMessageIsLoading}
                 onChange={onChange}
-                onSubmit={humanMessage.isUnsentFollowup ? onFollowupSubmit : onEditSubmit}
+                onSubmit={
+                    humanMessage.isUnsentFollowup ? () => onFollowupSubmit() : () => onEditSubmit()
+                }
                 onStop={onStop}
                 isFirstInteraction={isFirstInteraction}
                 isLastInteraction={isLastInteraction}