Skip to content

Commit 792459c

Browse files
Sg312Sg312
committed
Update
1 parent 9b4ca6f commit 792459c

16 files changed

Lines changed: 538 additions & 162 deletions

File tree

‎apps/sim/app/api/copilot/chat/abort/route.ts‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,39 @@ export async function POST(request: Request) {
7171
}
7272
if (chatId) rootSpan.setAttribute(TraceAttr.ChatId, chatId)
7373

74+
// ORDER MATTERS: local abort FIRST, Go explicit-abort SECOND.
75+
//
76+
// Sim and Go each own a separate Redis instance and do not share
77+
// state through it — the only signal that crosses the service
78+
// boundary is this HTTP call. So the race to win is purely
79+
// Sim-internal:
80+
//
81+
// - `abortActiveStream` flips the AbortController (reason =
82+
// AbortReason.UserStop) that's wrapped around the in-flight
83+
// `fetchGo('/api/mothership', ...)` SSE stream. Once flipped,
84+
// the stream throws AbortError on the next chunk read, and
85+
// the lifecycle catch block's classifier sees
86+
// `signal.aborted = true` with an explicit-stop reason → the
87+
// root span gets stamped `cancel_reason = explicit_stop` and
88+
// the `request.cancelled` event fires correctly.
89+
//
90+
// - If we call Go first (old order), Go's context cancels from
91+
// its own explicit-abort handler, the /api/mothership stream
92+
// errors with "context canceled", and Sim's catch block fires
93+
// BEFORE we've flipped the local AbortController. At that
94+
// point `signal.aborted` is still false, so the classifier
95+
// falls through to `client_disconnect` / `unknown` and the
96+
// root ends up as `outcome = error` — which is what we saw
97+
// in trace 25f31730082078cef54653b1740caf12.
98+
//
99+
// Go's explicit-abort endpoint still runs second: it's what tells
100+
// Go-side billing "this was intentional, flush the paused ledger"
101+
// and is unaffected by the reorder (Go's context is already
102+
// cancelled by the time we get there; the endpoint's job is
103+
// billing semantics, not cancelling in-flight work).
104+
const aborted = await abortActiveStream(streamId)
105+
rootSpan.setAttribute(TraceAttr.CopilotAbortLocalAborted, aborted)
106+
74107
let goAbortOk = false
75108
try {
76109
const headers: Record<string, string> = { 'Content-Type': 'application/json' }
@@ -94,7 +127,7 @@ export async function POST(request: Request) {
94127
spanName: 'sim → go /api/streams/explicit-abort',
95128
operation: 'explicit_abort',
96129
attributes: {
97-
'copilot.stream.id': streamId,
130+
[TraceAttr.StreamId]: streamId,
98131
...(chatId ? { [TraceAttr.ChatId]: chatId } : {}),
99132
},
100133
}).finally(() => clearTimeout(timeout))
@@ -103,16 +136,13 @@ export async function POST(request: Request) {
103136
}
104137
goAbortOk = true
105138
} catch (err) {
106-
logger.warn('Explicit abort marker request failed; proceeding with local abort', {
139+
logger.warn('Explicit abort marker request failed after local abort', {
107140
streamId,
108141
error: err instanceof Error ? err.message : String(err),
109142
})
110143
}
111144
rootSpan.setAttribute(TraceAttr.CopilotAbortGoMarkerOk, goAbortOk)
112145

113-
const aborted = await abortActiveStream(streamId)
114-
rootSpan.setAttribute(TraceAttr.CopilotAbortLocalAborted, aborted)
115-
116146
if (chatId) {
117147
// `waitForPendingChatStream` blocks up to 8s waiting for the
118148
// prior stream's release. It's THE single most likely stall

‎apps/sim/app/api/copilot/chat/stop/route.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ const StopSchema = z.object({
5858
streamId: z.string(),
5959
content: z.string(),
6060
contentBlocks: z.array(ContentBlockSchema).optional(),
61+
/**
62+
* Optional because older clients may not send it, but strongly
63+
* recommended: without it, the stopped assistant message persisted
64+
* below loses its `requestId`, which breaks the "Copy request ID"
65+
* button in the UI (it's the only handle the user has for filing
66+
* bug reports about a hung / bad turn).
67+
*/
68+
requestId: z.string().optional(),
6169
})
6270

6371
/**
@@ -84,13 +92,16 @@ export async function POST(req: NextRequest) {
8492
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
8593
}
8694

87-
const { chatId, streamId, content, contentBlocks } = StopSchema.parse(await req.json())
95+
const { chatId, streamId, content, contentBlocks, requestId } = StopSchema.parse(
96+
await req.json()
97+
)
8898
span.setAttributes({
8999
[TraceAttr.ChatId]: chatId,
90100
[TraceAttr.StreamId]: streamId,
91101
[TraceAttr.UserId]: session.user.id,
92102
[TraceAttr.CopilotStopContentLength]: content.length,
93103
[TraceAttr.CopilotStopBlocksCount]: contentBlocks?.length ?? 0,
104+
...(requestId ? { [TraceAttr.RequestId]: requestId } : {}),
94105
})
95106

96107
const [row] = await db
@@ -141,6 +152,13 @@ export async function POST(req: NextRequest) {
141152
content,
142153
timestamp: new Date().toISOString(),
143154
contentBlocks: synthesizedStoppedBlocks,
155+
// Preserve the requestId onto the persisted aborted message
156+
// so the UI's "Copy request ID" button keeps working after
157+
// the chat history refetches and replaces the in-memory
158+
// streaming message with this persisted version. Without
159+
// this, the button blinks out ~1-2s after the user hits
160+
// Stop because the refetched message has no requestId.
161+
...(requestId ? { requestId } : {}),
144162
})
145163
const assistantMessage: PersistedMessage = normalized
146164
setClause.messages = sql`${copilotChats.messages} || ${JSON.stringify([assistantMessage])}::jsonb`

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

Lines changed: 76 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -138,35 +138,86 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
138138
}
139139
}, [])
140140

141-
if (!content) return null
141+
// Render the action row whenever there's ANYTHING to act on. For a
142+
// normal assistant turn that's `content`; for an aborted / error /
143+
// content-less turn it's the `requestId` alone — users still need to
144+
// be able to grab the trace ID for bug reports in those cases.
145+
const hasContent = Boolean(content)
146+
if (!hasContent && !requestId) return null
147+
148+
const canSubmitFeedback = Boolean(chatId && userQuery)
142149

143150
return (
144151
<>
145152
<div className='flex items-center gap-0.5'>
146-
<button
147-
type='button'
148-
aria-label='Copy message'
149-
onClick={copyToClipboard}
150-
className={BUTTON_CLASS}
151-
>
152-
{copied ? <Check className={ICON_CLASS} /> : <Copy className={ICON_CLASS} />}
153-
</button>
154-
<button
155-
type='button'
156-
aria-label='Like'
157-
onClick={() => handleFeedbackClick('up')}
158-
className={BUTTON_CLASS}
159-
>
160-
<ThumbsUp className={ICON_CLASS} />
161-
</button>
162-
<button
163-
type='button'
164-
aria-label='Dislike'
165-
onClick={() => handleFeedbackClick('down')}
166-
className={BUTTON_CLASS}
167-
>
168-
<ThumbsDown className={ICON_CLASS} />
169-
</button>
153+
{hasContent && (
154+
<Tooltip.Root>
155+
<Tooltip.Trigger asChild>
156+
<button
157+
type='button'
158+
aria-label='Copy message'
159+
onClick={copyToClipboard}
160+
className={BUTTON_CLASS}
161+
>
162+
{copied ? <Check className={ICON_CLASS} /> : <Copy className={ICON_CLASS} />}
163+
</button>
164+
</Tooltip.Trigger>
165+
<Tooltip.Content side='top'>
166+
{copied ? 'Copied message' : 'Copy message'}
167+
</Tooltip.Content>
168+
</Tooltip.Root>
169+
)}
170+
{canSubmitFeedback && (
171+
<>
172+
<Tooltip.Root>
173+
<Tooltip.Trigger asChild>
174+
<button
175+
type='button'
176+
aria-label='Like'
177+
onClick={() => handleFeedbackClick('up')}
178+
className={BUTTON_CLASS}
179+
>
180+
<ThumbsUp className={ICON_CLASS} />
181+
</button>
182+
</Tooltip.Trigger>
183+
<Tooltip.Content side='top'>Good response</Tooltip.Content>
184+
</Tooltip.Root>
185+
<Tooltip.Root>
186+
<Tooltip.Trigger asChild>
187+
<button
188+
type='button'
189+
aria-label='Dislike'
190+
onClick={() => handleFeedbackClick('down')}
191+
className={BUTTON_CLASS}
192+
>
193+
<ThumbsDown className={ICON_CLASS} />
194+
</button>
195+
</Tooltip.Trigger>
196+
<Tooltip.Content side='top'>Bad response</Tooltip.Content>
197+
</Tooltip.Root>
198+
</>
199+
)}
200+
{requestId && (
201+
<Tooltip.Root>
202+
<Tooltip.Trigger asChild>
203+
<button
204+
type='button'
205+
aria-label='Copy request ID'
206+
onClick={copyRequestId}
207+
className={BUTTON_CLASS}
208+
>
209+
{copiedRequestId ? (
210+
<Check className={ICON_CLASS} />
211+
) : (
212+
<Copy className={ICON_CLASS} />
213+
)}
214+
</button>
215+
</Tooltip.Trigger>
216+
<Tooltip.Content side='top'>
217+
{copiedRequestId ? 'Copied request ID' : 'Copy request ID'}
218+
</Tooltip.Content>
219+
</Tooltip.Root>
220+
)}
170221
</div>
171222

172223
<Modal open={pendingFeedback !== null} onOpenChange={handleModalClose}>

‎apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,26 @@ export function MothershipChat({
179179
onOptionSelect={isLastMessage ? onSubmit : undefined}
180180
onWorkspaceResourceSelect={onWorkspaceResourceSelect}
181181
/>
182-
{!isThisStreaming && (msg.content || msg.contentBlocks?.length) && (
183-
<div className='mt-2.5'>
184-
<MessageActions
185-
content={msg.content}
186-
chatId={chatId}
187-
userQuery={precedingUserMsg?.content}
188-
requestId={msg.requestId}
189-
/>
190-
</div>
191-
)}
182+
{/*
183+
Render the actions row whenever the assistant turn has
184+
settled (not streaming) AND there's anything to act on.
185+
We intentionally include `requestId` in the trigger so
186+
that aborted or content-less turns still surface the
187+
copy-trace-ID button — dropping the row in those cases
188+
makes it impossible for a user to grab the request ID
189+
needed for bug reports.
190+
*/}
191+
{!isThisStreaming &&
192+
(msg.content || msg.contentBlocks?.length || msg.requestId) && (
193+
<div className='mt-2.5'>
194+
<MessageActions
195+
content={msg.content}
196+
chatId={chatId}
197+
userQuery={precedingUserMsg?.content}
198+
requestId={msg.requestId}
199+
/>
200+
</div>
201+
)}
192202
</div>
193203
)
194204
})}

0 commit comments

Comments
 (0)