- {markdown ?
: null}
-
+
+ {markdown ? (
+
+ ) : null}
+ {sending ? (
+
+ {translate('components.native-chat.messageSending', 'Sending…')}
+
+ ) : (
+
+ )}
)
}
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts
index d5b3a81ba29..f0d99960070 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.test.ts
@@ -507,6 +507,65 @@ describe('the notice on each message that did not go through', () => {
}
)
+ // Only a row that has the message ends it; one in doubt or rejected leaves it looking sent.
+ describe('a message whose journal row does not have it yet', () => {
+ const row = (
+ clientMessageId: string,
+ dispatchState: AgentJournalSubmission['dispatchState'],
+ patch: Partial
= {}
+ ): AgentJournalSubmission => ({
+ clientMessageId,
+ fence: 1,
+ payloadFingerprint: 'fp',
+ dispatchState,
+ providerItemId: null,
+ reason: null,
+ submittedAt: 7,
+ resolvedAt: null,
+ ...patch
+ })
+ const stuck = entry('stuck', { state: 'unconfirmed', retryAfterUnknownSubmittedAt: -1 })
+
+ it.each([
+ ['queued', { state: 'queued' as const }, {}],
+ ['in flight', { state: 'dispatching' as const, lastAttemptAt: 2 }, {}],
+ [
+ 'in flight, after a host restart',
+ { state: 'dispatching' as const, lastAttemptAt: 2 },
+ { recovered: true as const }
+ ]
+ ])('says it is sending while your Retry is %s', (_label, patch, rowPatch) => {
+ const doubt = row('m', 'unknown', rowPatch)
+ expect(texts([entry('m', { state: 'unconfirmed', lastAttemptAt: 1 })], [doubt])).toEqual({
+ [agentJournalSubmissionKey('m')]: 'Message delivery is unconfirmed.'
+ })
+ const retried = entry('m', { lastAttemptAt: 1, retryAfterUnknownSubmittedAt: 7, ...patch })
+ expect(texts([retried], [doubt])).toEqual({ [agentJournalSubmissionKey('m')]: SENDING })
+ })
+
+ it.each([
+ ['a live unknown', {}],
+ ['a recovered unknown', { recovered: true as const }]
+ ])('says the second of two in doubt is sending when each row holds %s', (_label, patch) => {
+ const a = entry('a', { state: 'unconfirmed' })
+ const b = entry('b', { state: 'unconfirmed' })
+ expect(texts([a, b], [row('a', 'unknown', patch), row('b', 'unknown', patch)])).toEqual({
+ [agentJournalSubmissionKey('a')]: 'Message delivery is unconfirmed.',
+ [agentJournalSubmissionKey('b')]: SENDING
+ })
+ })
+
+ it('says a requeued message whose row was rejected is sending until its replay answers', () => {
+ const requeued = entry('q', { state: 'queued', lastAttemptAt: 1 })
+ const rejected = row('q', 'rejected', { reason: 'provider said no', resolvedAt: 8 })
+ expect(texts([requeued], [rejected])).toEqual({ [agentJournalSubmissionKey('q')]: SENDING })
+ expect(texts([stuck, requeued], [rejected])).toEqual({
+ [agentJournalSubmissionKey('stuck')]: 'Message delivery is unconfirmed.',
+ [agentJournalSubmissionKey('q')]: SENDING
+ })
+ })
+ })
+
// One state, one surface: a row that says it did not go through never also says it is sending.
it.each([
['rejected', entry('m', { state: 'rejected' }), []],
diff --git a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts
index 65deb1f61ff..8871f01695c 100644
--- a/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts
+++ b/src/renderer/src/components/native-chat/structured-agent-session-delivery-notices.ts
@@ -1,5 +1,6 @@
// Which of the structured chat's own messages say, on their row, that they did not go through, and
-// which say quietly that they are still sending: every other one, until the host holds a row for it.
+// which say quietly that they are still sending: every other one, until the host holds a row that
+// has it (pending or accepted). A row in doubt or rejected does not, so it still reads as sending.
//
// Derived from the outbox on every render and never stored: each failed or held message carries
// its own typed failure, so each row words its own reason. Read through the drain's own rule: while
@@ -142,7 +143,7 @@ export function structuredAgentSessionDeliveryNotices(
agentName: string,
retry: (clientMessageId: string) => void,
/** The journal's rows: rejected ones carry more of a rejection than the message keeps, and a
- * message with none yet is still sending. */
+ * message with no pending or accepted one is still sending. */
submissions: readonly AgentJournalSubmission[],
/** What the loaded start-failure rows state, from `structuredAgentSessionStartFailureFacts`. */
startFailures: readonly AgentSessionFailureFact[],
@@ -182,7 +183,11 @@ export function structuredAgentSessionDeliveryNotices(
retryControl ? { text, onRetry: () => retry(entry.clientMessageId) } : { text }
)
} else if (
- !submissions.some((submission) => submission.clientMessageId === entry.clientMessageId)
+ !submissions.some(
+ (submission) =>
+ submission.clientMessageId === entry.clientMessageId &&
+ (submission.dispatchState === 'pending' || submission.dispatchState === 'accepted')
+ )
) {
notices.set(
agentJournalSubmissionKey(entry.clientMessageId),