Move copy reqid

Author: Sg312

apps/sim/app/workspace/[workspaceId]/components/message-actions/message-actions.tsx

@@ -10,10 +10,10 @@ import {
   ModalContent,
   ModalFooter,
   ModalHeader,
-  TagIcon,
   Textarea,
   ThumbsDown,
   ThumbsUp,
+  Tooltip,
 } from '@/components/emcn'
 import { useSubmitCopilotFeedback } from '@/hooks/queries/copilot-feedback'
 
@@ -105,6 +105,7 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
       if (chatId && userQuery) {
         setPendingFeedback(type)
         setFeedbackText('')
+        setCopiedRequestId(false)
       }
     },
     [chatId, userQuery]
@@ -133,6 +134,7 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
     if (!open) {
       setPendingFeedback(null)
       setFeedbackText('')
+      setCopiedRequestId(false)
     }
   }, [])
 
@@ -165,31 +167,39 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
         >
           <ThumbsDown className={ICON_CLASS} />
         </button>
-        {requestId && (
-          <button
-            type='button'
-            aria-label='Copy request ID'
-            onClick={copyRequestId}
-            className={BUTTON_CLASS}
-            title={copiedRequestId ? 'Copied!' : 'Copy request ID'}
-          >
-            {copiedRequestId ? (
-              <Check className={ICON_CLASS} />
-            ) : (
-              <TagIcon className={ICON_CLASS} />
-            )}
-          </button>
-        )}
       </div>
 
       <Modal open={pendingFeedback !== null} onOpenChange={handleModalClose}>
         <ModalContent size='sm'>
           <ModalHeader>Give feedback</ModalHeader>
           <ModalBody>
             <div className='flex flex-col gap-2'>
-              <p className='font-medium text-[var(--text-secondary)] text-sm'>
-                {pendingFeedback === 'up' ? 'What did you like?' : 'What could be improved?'}
-              </p>
+              <div className='flex items-start justify-between gap-2'>
+                <p className='font-medium text-[var(--text-secondary)] text-sm'>
+                  {pendingFeedback === 'up' ? 'What did you like?' : 'What could be improved?'}
+                </p>
+                {pendingFeedback === 'down' && requestId && (
+                  <Tooltip.Root>
+                    <Tooltip.Trigger asChild>
+                      <button
+                        type='button'
+                        aria-label='Copy request ID'
+                        onClick={copyRequestId}
+                        className='flex h-[22px] w-[22px] shrink-0 items-center justify-center rounded-full text-[var(--text-icon)] transition-colors hover-hover:bg-[var(--surface-hover)] focus-visible:outline-none'
+                      >
+                        {copiedRequestId ? (
+                          <Check className='h-[14px] w-[14px]' />
+                        ) : (
+                          <Copy className='h-[14px] w-[14px]' />
+                        )}
+                      </button>
+                    </Tooltip.Trigger>
+                    <Tooltip.Content side='top'>
+                      {copiedRequestId ? 'Copied request ID' : 'Copy request ID'}
+                    </Tooltip.Content>
+                  </Tooltip.Root>
+                )}
+              </div>
               <Textarea
                 placeholder={
                   pendingFeedback === 'up'

apps/sim/app/workspace/[workspaceId]/settings/components/mothership/mothership.tsx

@@ -605,7 +605,7 @@ function TracesTab({ environment }: { environment: MothershipEnv }) {
           value={requestIdInput}
           onChange={(e) => setRequestIdInput(e.target.value)}
           onKeyDown={(e) => e.key === 'Enter' && handleLookup()}
-          placeholder='Paste a request ID (go_trace_id)...'
+          placeholder='Paste a request ID (sim_request_id)...'
           className='font-mono text-[13px]'
         />
         <Button variant='primary' onClick={handleLookup} disabled={!requestIdInput.trim()}>

apps/sim/lib/copilot/chat/persisted-message.test.ts

@@ -60,6 +60,20 @@ describe('persisted-message', () => {
     ])
   })
 
+  it('prefers an explicit persisted request ID override', () => {
+    const result: OrchestratorResult = {
+      success: true,
+      content: 'done',
+      requestId: 'go-trace-1',
+      contentBlocks: [],
+      toolCalls: [],
+    }
+
+    const persisted = buildPersistedAssistantMessage(result, 'sim-request-1')
+
+    expect(persisted.requestId).toBe('sim-request-1')
+  })
+
   it('normalizes legacy tool_call and top-level toolCalls shapes', () => {
     const normalized = normalizeMessage({
       id: 'msg-1',

apps/sim/lib/copilot/chat/post.ts

@@ -334,7 +334,7 @@ function buildOnComplete(params: {
         chatId,
         userMessageId,
         ...(result.success
-          ? { assistantMessage: buildPersistedAssistantMessage(result, result.requestId) }
+          ? { assistantMessage: buildPersistedAssistantMessage(result, requestId) }
           : {}),
       })
 
@@ -518,7 +518,7 @@ async function resolveBranch(params: {
 }
 
 export async function handleUnifiedChatPost(req: NextRequest) {
-  const tracker = createRequestTracker()
+  const tracker = createRequestTracker(false)
   let actualChatId: string | undefined
   let userMessageId = ''
   let chatStreamLockAcquired = false

apps/sim/lib/copilot/request/lifecycle/start.ts

@@ -150,9 +150,6 @@ export function createSSEStream(params: StreamingOrchestrationParams): ReadableS
           trace: collector,
           simRequestId: requestId,
           abortSignal: abortController.signal,
-          onGoTraceId: (goTraceId) => {
-            publisher.updateRequestId(goTraceId)
-          },
           onEvent: async (event) => {
             await publisher.publish(event)
           },