Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

fix: prevent duplicate assistant message IDs in turn streams with mcp_auth_required (#923)

harshil-209604c3aa70a694
diff --git a/.changeset/prevent-duplicate-assistant-id-mcp-auth.md b/.changeset/prevent-duplicate-assistant-id-mcp-auth.md
new file mode 100644
index 000000000..da96720f9
--- /dev/null
+++ b/.changeset/prevent-duplicate-assistant-id-mcp-auth.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge-assistant-ui-runtime": patch
+---
+
+Prevent duplicate assistant message IDs when a turn stream finishes on mcp.auth_required without model messages.
diff --git a/packages/assistant-ui-runtime/package.json b/packages/assistant-ui-runtime/package.json
index 826be2947..b27110583 100644
--- a/packages/assistant-ui-runtime/package.json
+++ b/packages/assistant-ui-runtime/package.json
@@ -54,6 +54,7 @@
"sideEffects": false,
"scripts": {
"build": "tsup",
+ "format": "prettier --write \"src/**/*.{ts,tsx}\" \"test/**/*.{ts,tsx}\" \"*.md\" --config ../../.prettierrc",
"lint": "eslint src --fix --cache --cache-location ../../.eslintcache --cache-strategy content",
"lint:ci": "eslint src --cache --cache-location ../../.eslintcache",
"pack:dry": "pnpm build && pnpm pack --dry-run",
diff --git a/packages/assistant-ui-runtime/src/convertTurnMessages.ts b/packages/assistant-ui-runtime/src/convertTurnMessages.ts
index 58d5fdec4..adaa04b8b 100644
--- a/packages/assistant-ui-runtime/src/convertTurnMessages.ts
+++ b/packages/assistant-ui-runtime/src/convertTurnMessages.ts
@@ -1193,8 +1193,13 @@ export function projectSessionMessages(
};
}
- if (isContinuation && last?.role === 'assistant') {
- messages = [...messages.slice(0, -1), assistantMessage];
+ // Update existing assistant message in-place if already present (for
+ // continuation turns where assistantMessage reuses last.id, or when a turn
+ // with zero root model messages was already projected by projectHistoryTurns).
+ // Otherwise, append assistantMessage to the thread.
+ const existingIndex = messages.findIndex(m => m.id === assistantMessage.id);
+ if (existingIndex !== -1) {
+ messages = [...messages.slice(0, existingIndex), assistantMessage, ...messages.slice(existingIndex + 1)];
} else {
messages = [...messages, assistantMessage];
}
diff --git a/packages/assistant-ui-runtime/test/convertTurnMessages.test.ts b/packages/assistant-ui-runtime/test/convertTurnMessages.test.ts
index 36da8e1b4..a319b0a53 100644
--- a/packages/assistant-ui-runtime/test/convertTurnMessages.test.ts
+++ b/packages/assistant-ui-runtime/test/convertTurnMessages.test.ts
@@ -33,7 +33,12 @@ import {
} from '../src/convertTurnMessages.js';
import { buildRootAssistantContent, ingestTurnEvent, PeerThreadFoldState } from '../src/foldPeerThreads.js';
import { findPausedAssistantMessage } from '../src/requiredActionInputs.js';
-import { createEmptySessionSnapshot, replaceSessionSnapshot, turnToSessionRecord } from '../src/sessionSnapshot.js';
+import {
+ createEmptySessionSnapshot,
+ replaceSessionSnapshot,
+ type SessionSnapshot,
+ turnToSessionRecord,
+} from '../src/sessionSnapshot.js';
import { TOOL_APPROVAL_THREAD_ID_CUSTOM_KEY } from '../src/toolApproval.js';
import {
applyUserToolResponsesToFold,
@@ -1913,6 +1918,60 @@ describe('convertTurnMessages', () => {
reason: 'stop',
});
});
+
+ it('prevents duplicate assistant message IDs if an activeStream matches an already projected turn', () => {
+ const foldState = new PeerThreadFoldState();
+ const mcpServers = [
+ {
+ id: 'test-mcp',
+ name: 'test-mcp',
+ authUrl: 'https://test/auth',
+ },
+ ];
+ const snapshot: SessionSnapshot = {
+ ...createEmptySessionSnapshot(),
+ fold: foldState,
+ turns: [
+ {
+ id: turnId,
+ userText: 'hello',
+ createdAt,
+ input: [{ type: 'user.message', content: 'hello' }],
+ rootModelMessageIds: [],
+ state: {
+ status: 'done',
+ completedAt: createdAt,
+ requiredActions: [
+ {
+ type: 'mcp.auth_required',
+ id: 'mcp-auth-1',
+ createdAt,
+ mcpServers,
+ },
+ ],
+ },
+ },
+ ],
+ activeStream: {
+ turnId,
+ update: {
+ content: [{ type: 'text', text: 'This agent needs access to external services before it can continue.' }],
+ status: { type: 'requires-action', reason: 'interrupt' },
+ metadata: { custom: { pendingMcpAuth: true, mcpServers } },
+ },
+ isContinuation: false,
+ streamComplete: true,
+ },
+ };
+
+ const messages = projectSessionMessages(snapshot);
+ const assistantMessages = messages.filter(m => m.role === 'assistant');
+ expect(assistantMessages).toHaveLength(1);
+ expect(assistantMessages[0]?.id).toBe(`${turnId}-assistant`);
+
+ const messageIds = messages.map(m => m.id);
+ expect(new Set(messageIds).size).toBe(messageIds.length);
+ });
});
describe('ask-user reload projection', () => {
diff --git a/packages/assistant-ui-runtime/test/useTrueForgeAgentMessages.test.tsx b/packages/assistant-ui-runtime/test/useTrueForgeAgentMessages.test.tsx
index 0822a7d4b..3cf425e3a 100644
--- a/packages/assistant-ui-runtime/test/useTrueForgeAgentMessages.test.tsx
+++ b/packages/assistant-ui-runtime/test/useTrueForgeAgentMessages.test.tsx
@@ -1501,4 +1501,51 @@ describe('useTrueForgeAgentMessages', () => {
expect(onError).toHaveBeenCalledWith(expect.any(Error));
});
});
+
+ it('does not produce duplicate assistant message IDs when turn ends on mcp.auth_required with zero model messages', async () => {
+ const mcpServers = [
+ {
+ id: 'linear-mcp',
+ name: 'linear-mcp',
+ authUrl: 'https://internal.test/oauth',
+ },
+ ];
+
+ vi.mocked(streamTurnContent).mockImplementation(
+ async function* (_server, _sessionId, _fold, _options, _signal, _baseline, onTurnIdAvailable) {
+ const turnId = 'gateway-turn-mcp-1';
+ onTurnIdAvailable?.(turnId);
+ yield {
+ content: [
+ { type: 'text' as const, text: 'This agent needs access to external services before it can continue.' },
+ ],
+ status: { type: 'requires-action' as const, reason: 'interrupt' as const },
+ metadata: { custom: { pendingMcpAuth: true, mcpServers } },
+ };
+ },
+ );
+
+ const { result } = renderHook(() =>
+ useTrueForgeAgentMessages({
+ server: mockServer,
+ sessionId: 'session-1',
+ }),
+ );
+
+ await waitFor(() => expect(result.current.isLoading).toBe(false));
+
+ await act(async () => {
+ await result.current.sendTurn({ userMessage: 'hello' });
+ });
+
+ const assistantMessages = result.current.messages.filter(m => m.role === 'assistant');
+ expect(assistantMessages).toHaveLength(1);
+ expect(assistantMessages[0]?.id).toBe('gateway-turn-mcp-1-assistant');
+ expect(assistantMessages[0]?.status).toEqual({ type: 'requires-action', reason: 'interrupt' });
+ expect(assistantMessages[0]?.metadata.custom?.['pendingMcpAuth']).toBe(true);
+
+ const ids = result.current.messages.map(m => m.id);
+ const uniqueIds = new Set(ids);
+ expect(ids.length).toBe(uniqueIds.size);
+ });
});