fix(agent-core-v2): expire MCP auth flows by host clock

Author: elkaix

packages/agent-core-v2/src/app/mcpManagement/mcpManagementService.ts

@@ -19,6 +19,7 @@ import {
 } from '#/mcpCore/oauth/service';
 import { canonicalMcpOAuthResource } from '#/mcpCore/oauth/store';
 import { IHostEnvironment } from '#/os/interface/hostEnvironment';
+import { IHostClock } from '#/os/interface/hostClock';
 import { IHostProcessService } from '#/os/interface/hostProcess';
 import { LocalRuntime } from '#/runtime/localRuntime';
 import { RuntimeRegistry } from '#/runtime/runtimeRegistry';
@@ -62,7 +63,7 @@ export class McpManagementService extends Disposable implements IMcpManagementSe
 
   private readonly authFlows = new Map<
     string,
-    { flow: BeginAuthorizationResult; idleTimer: NodeJS.Timeout }
+    { flow: BeginAuthorizationResult; idleTimer: NodeJS.Timeout; expiresAt: number }
   >();
 
   constructor(
@@ -74,6 +75,7 @@ export class McpManagementService extends Disposable implements IMcpManagementSe
     @IRuntimeResolver private readonly runtimeResolver: IRuntimeResolver,
     @IWorkspaceInstanceManager private readonly workspaceInstances: IWorkspaceInstanceManager,
     @IHostEnvironment private readonly hostEnvironment: IHostEnvironment,
+    @IHostClock private readonly clock: IHostClock,
     @IHostProcessService private readonly hostProcess: IHostProcessService,
     @ILogService private readonly log: ILogService,
   ) {
@@ -291,7 +293,11 @@ export class McpManagementService extends Disposable implements IMcpManagementSe
         void expired?.flow.cancel();
       }, AUTH_FLOW_IDLE_TIMEOUT_MS);
       idleTimer.unref();
-      this.authFlows.set(flowId, { flow, idleTimer });
+      this.authFlows.set(flowId, {
+        flow,
+        idleTimer,
+        expiresAt: this.clock.now().getTime() + AUTH_FLOW_IDLE_TIMEOUT_MS,
+      });
       return {
         status: 'authorization-required',
         flowId,
@@ -320,7 +326,11 @@ export class McpManagementService extends Disposable implements IMcpManagementSe
         `MCP OAuth timeoutMs must be an integer between 1 and ${MAX_AUTH_TIMEOUT_MS}`,
       );
     }
-    const active = this.authFlows.get(handle.flowId);
+    let active = this.authFlows.get(handle.flowId);
+    if (active !== undefined && active.expiresAt <= this.clock.now().getTime()) {
+      await this.cancelServerAuth(handle);
+      active = undefined;
+    }
     if (active === undefined) {
       throw new Error2(ErrorCodes.REQUEST_INVALID, `Unknown MCP OAuth flow: ${handle.flowId}`);
     }

packages/agent-core-v2/test/app/mcpManagement/mcpManagement.test.ts

@@ -34,6 +34,7 @@ import { McpOAuthService, type McpOAuthEvent } from '#/mcpCore/oauth/service';
 import { HostFileSystem } from '#/os/backends/node-local/hostFsService';
 import { HostProcessService } from '#/os/backends/node-local/hostProcessService';
 import { IHostEnvironment } from '#/os/interface/hostEnvironment';
+import { IHostClock } from '#/os/interface/hostClock';
 import { IHostFileSystem } from '#/os/interface/hostFileSystem';
 import { IHostProcessService } from '#/os/interface/hostProcess';
 import { InMemoryStorageService } from '#/persistence/backends/memory/inMemoryStorageService';
@@ -80,6 +81,7 @@ describe('McpManagementService', () => {
   let getOrCreate: Mock<IWorkspaceInstanceManager['getOrCreate']>;
   let findContaining: Mock<IWorkspaceInstanceManager['findContaining']>;
   let management: IMcpManagementService;
+  let clockNowMs: number;
 
   beforeEach(() => {
     home = mkdtempSync(join(tmpdir(), 'pythinker-mcp-management-home-'));
@@ -95,6 +97,7 @@ describe('McpManagementService', () => {
     identitySnapshot = stubAgentIdentity({ slug: 'test-agent' }).current();
     identityReady = Promise.resolve(identitySnapshot);
     trusted = true;
+    clockNowMs = Date.UTC(2026, 0, 1);
     getOrCreate = vi.fn<IWorkspaceInstanceManager['getOrCreate']>(async () =>
       ({ id: 'test-workspace' }) as unknown as WorkspaceInstance,
     );
@@ -130,6 +133,11 @@ describe('McpManagementService', () => {
           homeDir: home,
           ready: Promise.resolve(),
         });
+        reg.defineInstance(IHostClock, {
+          _serviceBrand: undefined,
+          now: () => new Date(clockNowMs),
+          timeZone: () => 'UTC',
+        });
         reg.defineInstance(IHostProcessService, hostProcess);
         reg.definePartialInstance(IAtomicDocumentStore, {
           get: async <T>() => (trusted ? ({} as T) : undefined),
@@ -1571,31 +1579,25 @@ describe('McpManagementService', () => {
         auth: 'oauth',
       });
       const cancel = vi.fn(async () => undefined);
-      const beginSpy = vi.spyOn(oauth, 'beginAuthorization').mockResolvedValue({
+      vi.spyOn(oauth, 'beginAuthorization').mockResolvedValue({
         authorizationUrl: new URL('https://oauthable.example.test/authorize'),
         complete: vi.fn(async () => undefined),
         cancel,
       });
-      vi.useFakeTimers();
-      try {
-        const begun = await management.beginServerAuth({ source: 'global', name: 'oauthable' });
-        if (begun.status !== 'authorization-required') {
-          throw new Error(`expected authorization-required, got ${begun.status}`);
-        }
+      const begun = await management.beginServerAuth({ source: 'global', name: 'oauthable' });
+      if (begun.status !== 'authorization-required') {
+        throw new Error(`expected authorization-required, got ${begun.status}`);
+      }
 
-        await vi.advanceTimersByTimeAsync(15 * 60_000);
+      clockNowMs += 15 * 60_000;
 
-        expect(cancel).toHaveBeenCalledTimes(1);
-        await expect(
-          management.completeServerAuth({ flowId: begun.flowId, timeoutMs: 1000 }),
-        ).rejects.toMatchObject({
-          code: ErrorCodes.REQUEST_INVALID,
-          message: `Unknown MCP OAuth flow: ${begun.flowId}`,
-        });
-      } finally {
-        vi.useRealTimers();
-        beginSpy.mockRestore();
-      }
+      await expect(
+        management.completeServerAuth({ flowId: begun.flowId, timeoutMs: 1000 }),
+      ).rejects.toMatchObject({
+        code: ErrorCodes.REQUEST_INVALID,
+        message: `Unknown MCP OAuth flow: ${begun.flowId}`,
+      });
+      expect(cancel).toHaveBeenCalledTimes(1);
     });
 
     it('complete rejects on timeout when the browser callback never arrives', async () => {