🔀 feat: Show the Conversation Pull Request in the Sidebar List (#16815)

* feat: Show the Conversation Pull Request in the Sidebar List

Add a batch lookup route and a sidebar row mark: the state icon with the CI dot, opening the same card beside the row on hover. The row keeps the conversation's own title.

* fix: Address Review Findings on the Sidebar Pull Request Batch and Row Mark

Cap the whole batch with a configurable deadline, make the row mark a keyboard-reachable button that opens the card on focus, refresh rows when the window regains focus through the shared batch, and show a retryable failure state instead of treating a failed first lookup as no pull request.

* fix: Send Sidebar Pull Request Batches One at a Time

Queue every batch request behind the one before it, so an oversized list or an overlapping flush cannot multiply the server's configured lookup concurrency, and bound how long one request may hold the queue so a request that never answers cannot stop the rest.

* fix: Keep the Batch Request Timeout Above the Server Deadline

Default the client's request timeout to just past the longest batchTimeoutSeconds a deployment may configure, so a queued request never starts while the previous request's server-side lookups are still running.

* fix: Keep Batch Lookups Inside the Concurrency Limit and Per-Entry Failures Per Entry

Share one lookup limiter across every batch request so lookups that outlive a request's deadline keep their slot, answer a missing token only for the conversations that needed it, and point the row at its pull request description only while that text is in the page.

* fix: Bound Batch Reads, Scope Concurrency Per Credential, and Gate the Sidebar on the Batch Version

Start the batch deadline when the request arrives and bound the config and lane reads, count lookup slots per credential, advertise a batch route version and ask only a server that has it, take no row space for an absent mark, show a failed refresh over a cached empty answer, keep a malformed response from stalling the request queue, and repair the lane recording tests that still used a mock removed on dev.

* fix: Move Capability Resolution Into the Package and Harden the Batch Route and Queue

Resolve the pull request startup capabilities in packages/api so the route stays wiring only, bound the config and lane reads by the configured deadline, merge identical lanes before taking limiter slots, fall back to the single route when a replica has no batch route, and dispose the batch queue when the signed-in user changes.

* fix: Abort the Batch Fallback With Its Request So the Queue Never Overlaps It

Give the batch fetcher the request's abort signal and pass it to every single-route call, abort a request that times out or is disposed, and stop the fallback workers from starting more calls once it has.

* fix: Forward the Abort Signal to the Batch POST

Pass the request's abort signal through the batch fetcher, the data-provider call and Axios, so a batch request that times out or is disposed is cancelled instead of continuing beside the next one, and settle a request promptly when it is aborted.

* fix: Close the Pull Request Lookup Follow-Ups and Cancel Abandoned Sidebar Rows

Author: berry-13

api/server/routes/__test-utils__/convos-route-mocks.js

@@ -148,7 +148,9 @@ module.exports = {
     ),
     createBackgroundTaskPolicyMiddleware: jest.fn(() => (_req, _res, next) => next()),
     createGitHubPullRequestSource: jest.fn(() => ({ find: jest.fn() })),
+    createProxyAwareFetch: jest.fn(() => jest.fn()),
     createPullRequestLookup: jest.fn(() => jest.fn()),
+    createConversationPullRequestsHandler: jest.fn(() => jest.fn()),
     createConversationPullRequestHandler: jest.fn(
       () => (_req, res) => res.status(200).json({ pullRequest: null }),
     ),

api/server/routes/__tests__/config.spec.js

@@ -181,6 +181,7 @@ describe('GET /api/config', () => {
       expect(response.body).not.toHaveProperty('conversationImportMaxFileSize');
       expect(response.body).not.toHaveProperty('insightsEnabled');
       expect(response.body).not.toHaveProperty('pullRequestsEnabled');
+      expect(response.body).not.toHaveProperty('pullRequestsBatchVersion');
       expect(response.body).not.toHaveProperty('mcpApps');
     });
 
@@ -683,9 +684,26 @@ describe('GET /api/config', () => {
         });
         const response = await request(createApp(mockUser)).get('/api/config');
         expect(response.body.pullRequestsEnabled).toBe(expected);
+        /** The batch route's version rides with the flag, so a client never sees one without the other. */
+        if (expected) {
+          expect(response.body.pullRequestsBatchVersion).toBe(1);
+          expect(response.body.pullRequestsMaxConcurrentLookups).toBe(4);
+        } else {
+          expect(response.body).not.toHaveProperty('pullRequestsBatchVersion');
+          expect(response.body).not.toHaveProperty('pullRequestsMaxConcurrentLookups');
+        }
       },
     );
 
+    it('advertises the configured lookup limit so a fallback client can keep to it', async () => {
+      mockGetAppConfig.mockResolvedValue({
+        ...baseAppConfig,
+        endpoints: { agents: { pullRequests: { enabled: true, maxConcurrentLookups: 2 } } },
+      });
+      const response = await request(createApp(mockUser)).get('/api/config');
+      expect(response.body.pullRequestsMaxConcurrentLookups).toBe(2);
+    });
+
     it('should not advertise pull requests for a config with no endpoints', async () => {
       mockGetAppConfig.mockResolvedValue(baseAppConfig);
       const response = await request(createApp(mockUser)).get('/api/config');

api/server/routes/config.js

@@ -23,6 +23,7 @@ const {
   resolveCodeWorkspaceInheritanceCapability,
   resolveCodeEnvironmentTransitionVersion,
   loadConversationListLimits,
+  resolvePullRequestCapabilities,
 } = require('@librechat/api');
 const {
   DEFAULT_MCP_APP_CSP_LIMITS,
@@ -331,8 +332,7 @@ router.get('/', async function (req, res) {
       langfuseConnectionAccess,
       insightsEnabled: isEnabled(process.env.ENABLE_INSIGHTS),
       /** Lets the client skip the pull request lookup entirely when the feature is off. */
-      pullRequestsEnabled:
-        appConfig?.endpoints?.[EModelEndpoint.agents]?.pullRequests?.enabled === true,
+      ...resolvePullRequestCapabilities(appConfig),
       compactionEnabled: appConfig?.summarization?.enabled !== false,
       ...(codeEnvironmentDecisionVersion != null ? { codeEnvironmentDecisionVersion } : {}),
       mcpApps: resolveMCPAppsPolicy(

api/server/routes/convos.js

@@ -21,7 +21,9 @@ const {
   createBackgroundTaskPolicyMiddleware,
   createConversationPullRequestHandler,
   createGitHubPullRequestSource,
+  createProxyAwareFetch,
   createPullRequestLookup,
+  createConversationPullRequestsHandler,
   backgroundTaskRegistry,
   createSubagentThreadViewHandler,
   createGeneratedTitleHandler,
@@ -170,10 +172,20 @@ const backgroundTaskIndexHandler = createBackgroundTaskIndexHandler({
 const backgroundTaskCancelHandler = createBackgroundTaskCancelHandler({
   registry: backgroundTaskRegistry,
 });
+/** One lookup, so the header's single route and the sidebar's batch route share its cache. */
+const pullRequestLookup = createPullRequestLookup({
+  source: createGitHubPullRequestSource({ fetchFn: createProxyAwareFetch() }),
+});
 const conversationPullRequestHandler = createConversationPullRequestHandler({
   getConvoLaneGit: db.getConvoLaneGit,
   getAppConfig,
-  lookup: createPullRequestLookup({ source: createGitHubPullRequestSource({ fetchFn: fetch }) }),
+  lookup: pullRequestLookup,
+  env: process.env,
+});
+const conversationPullRequestsHandler = createConversationPullRequestsHandler({
+  getConvosLaneGit: db.getConvosLaneGit,
+  getAppConfig,
+  lookup: pullRequestLookup,
   env: process.env,
 });
 router.use(requireJwtAuth);
@@ -248,6 +260,7 @@ router.post(
   subagentControlHandler,
 );
 router.get('/:parentConversationId/subagents', parentSubagentIndexHandler);
+router.post('/pull-requests', conversationPullRequestsHandler);
 router.get('/:conversationId/pull-request', conversationPullRequestHandler);
 router.get('/:conversationId/background-tasks', backgroundTaskPolicy, backgroundTaskIndexHandler);
 router.post(

api/server/services/ToolService.js

@@ -2376,6 +2376,7 @@ async function loadToolsForExecution({
                   environmentId: codeExecutionContext.codeWorkspace.environmentId,
                   workspaceId: codeExecutionContext.codeWorkspace.workspaceId,
                 },
+                admittedEpoch: req.resolvedConversation?.codeAttachmentEpoch,
                 getConvoLaneContext,
                 reserveConvoLaneGitSeq,
                 setConvoLaneGit,

api/server/services/__tests__/ToolService.spec.js

@@ -3274,6 +3274,55 @@ describe('ToolService - Action Capability Gating', () => {
       expect(mockSetConvoLaneGit).toHaveBeenCalledWith(input);
     });
 
+    it.each([
+      ['a moved conversation', 3, 3],
+      ['a conversation never moved', 0, 0],
+      ['a conversation whose admitted read carried no epoch', undefined, undefined],
+    ])(
+      'fences the lane report by the epoch of the admitted decision for %s',
+      async (_label, admitted, expected) => {
+        const capabilities = [
+          AgentCapabilities.tools,
+          AgentCapabilities.execute_code,
+          AgentCapabilities.stateful_code_sessions,
+        ];
+        const req = createMockReq(capabilities);
+        req.config.endpoints[EModelEndpoint.agents].pullRequests = { enabled: true };
+        req.resolvedConversation = {
+          conversationId: 'resolved-convo',
+          codeWorkspaces: [{ environmentId: 'personal-machine', workspaceId: 'project-a' }],
+          ...(admitted === undefined ? {} : { codeAttachmentEpoch: admitted }),
+        };
+        req.body = {
+          conversationId: 'resolved-convo',
+          codeWorkspaces: [{ environmentId: 'personal-machine', workspaceId: 'project-a' }],
+        };
+        mockGetEndpointsConfig.mockResolvedValue(createEndpointsConfig(capabilities));
+        req.config.endpoints[EModelEndpoint.agents].statefulCodeSessions = {
+          environments: [attachedEnvironment()],
+        };
+        mockCreateLaneGitRecorder.mockClear();
+
+        await loadToolsForExecution({
+          req,
+          res: {},
+          agent: {
+            id: 'attached-agent',
+            tools: [Tools.execute_code],
+            stateful_code_sessions: true,
+            stateful_code_environment: 'agent-user',
+            code_environment_id: 'personal-machine',
+          },
+          conversationId: 'resolved-convo',
+          toolNames: [AgentConstants.BASH_TOOL],
+          toolRegistry: new Map([[AgentConstants.BASH_TOOL, { name: AgentConstants.BASH_TOOL }]]),
+          actionsEnabled: false,
+        });
+
+        expect(mockCreateLaneGitRecorder.mock.calls[0][0].admittedEpoch).toBe(expected);
+      },
+    );
+
     it.each([
       ['unset', undefined],
       ['disabled', { enabled: false }],

client/src/components/Chat/PullRequest/Chip.tsx

@@ -5,31 +5,10 @@ import { useAgentsMapContext, useChatContext } from '~/Providers';
 import { TONE_DOT_CLASS, presentPullRequest } from './status';
 import { URLIcon } from '~/components/Endpoints/URLIcon';
 import { summarizePullRequest } from './summary';
+import PullRequestPanel from './Panel';
 import { useLocalize } from '~/hooks';
 import PullRequestIcon from './Icon';
-import PullRequestCard from './Card';
-import { cn } from '~/utils';
-
-/** Slides in from the chip's side, left to right, and fades; reduced motion only fades. */
-const cardClass = cn(
-  'border-border-light bg-surface-secondary text-text-primary z-[200] w-80 max-w-[calc(100vw-2rem)] rounded-xl border shadow-lg focus:outline-none',
-  'origin-left -translate-x-3 opacity-0 transition duration-200 ease-out',
-  'data-[enter]:translate-x-0 data-[enter]:opacity-100',
-  'data-[leave]:-translate-x-3 data-[leave]:opacity-0',
-  'motion-reduce:translate-x-0 motion-reduce:transition-opacity',
-);
-
-function CiDot({ dotClass }: { dotClass: string }) {
-  return (
-    <span
-      data-testid="pull-request-ci-dot"
-      className={cn(
-        'ring-presentation absolute -right-0.5 -bottom-0.5 size-2 rounded-full ring-2',
-        dotClass,
-      )}
-    />
-  );
-}
+import CiDot from './CiDot';
 
 /** The agent's picture with the CI dot on its corner. */
 function AgentAvatar({
@@ -72,7 +51,6 @@ function PullRequestChip({ conversationId }: { conversationId: string }) {
     hideTimeout: 150,
   });
   const open = Ariakit.useStoreState(hovercard, 'open');
-  const cardElement = Ariakit.useStoreState(hovercard, 'contentElement');
   const { data, isError, refetch } = useConversationPullRequestQuery(conversationId);
   const pullRequest = data?.pullRequest;
 
@@ -108,21 +86,12 @@ function PullRequestChip({ conversationId }: { conversationId: string }) {
           </Ariakit.Button>
         }
       />
-      <Ariakit.Hovercard
-        gutter={8}
-        portal
-        unmountOnHide
-        autoFocusOnShow={false}
-        aria-label={localize('com_ui_pull_request')}
-        className={cardClass}
-      >
-        <PullRequestCard
-          pullRequest={pullRequest}
-          refreshFailed={isError}
-          onRetry={() => void refetch()}
-          portalElement={cardElement}
-        />
-      </Ariakit.Hovercard>
+      <PullRequestPanel
+        store={hovercard}
+        pullRequest={pullRequest}
+        refreshFailed={isError}
+        onRetry={() => void refetch()}
+      />
     </Ariakit.HovercardProvider>
   );
 }

client/src/components/Chat/PullRequest/CiDot.tsx

@@ -0,0 +1,25 @@
+import { cn } from '~/utils';
+
+/**
+ * The CI status dot that sits on the corner of the picture or icon it describes. The ring is
+ * painted in the surface the dot sits on, so the caller names that surface.
+ */
+export default function CiDot({
+  dotClass,
+  ringClassName = 'ring-presentation',
+}: {
+  dotClass: string;
+  ringClassName?: string;
+}) {
+  return (
+    <span
+      data-testid="pull-request-ci-dot"
+      aria-hidden="true"
+      className={cn(
+        'pointer-events-none absolute -right-0.5 -bottom-0.5 size-2 rounded-full ring-2',
+        ringClassName,
+        dotClass,
+      )}
+    />
+  );
+}

client/src/components/Chat/PullRequest/Panel.tsx

@@ -0,0 +1,58 @@
+import * as Ariakit from '@ariakit/react';
+import type { TConversationPullRequest } from 'librechat-data-provider';
+import { useLocalize } from '~/hooks';
+import PullRequestCard from './Card';
+import { cn } from '~/utils';
+
+/** Slides in from the anchor's side, left to right, and fades; reduced motion only fades. */
+export const panelClass = cn(
+  'border-border-light bg-surface-secondary text-text-primary z-[200] w-80 max-w-[calc(100vw-2rem)] rounded-xl border shadow-lg focus:outline-none',
+  'origin-left -translate-x-3 opacity-0 transition duration-200 ease-out',
+  'data-[enter]:translate-x-0 data-[enter]:opacity-100',
+  'data-[leave]:-translate-x-3 data-[leave]:opacity-0',
+  'motion-reduce:translate-x-0 motion-reduce:transition-opacity',
+);
+
+/**
+ * The card as a hovercard beside its anchor. It is portaled, and a portal's events still bubble
+ * to the React tree that rendered it, so anything that sits inside a clickable row stops them
+ * here: a click on the card must not open the row it hangs from.
+ */
+export default function PullRequestPanel({
+  store,
+  pullRequest,
+  refreshFailed,
+  onRetry,
+}: {
+  store: Ariakit.HovercardStore;
+  pullRequest: TConversationPullRequest;
+  refreshFailed: boolean;
+  onRetry: () => void;
+}) {
+  const localize = useLocalize();
+  const panelElement = Ariakit.useStoreState(store, 'contentElement');
+  const stop = (event: { stopPropagation: () => void }) => event.stopPropagation();
+
+  return (
+    <Ariakit.Hovercard
+      store={store}
+      gutter={8}
+      portal
+      unmountOnHide
+      autoFocusOnShow={false}
+      aria-label={localize('com_ui_pull_request')}
+      className={panelClass}
+      onClick={stop}
+      onDoubleClick={stop}
+      onContextMenu={stop}
+      onKeyDown={stop}
+    >
+      <PullRequestCard
+        pullRequest={pullRequest}
+        refreshFailed={refreshFailed}
+        onRetry={onRetry}
+        portalElement={panelElement}
+      />
+    </Ariakit.Hovercard>
+  );
+}