fix(mcp): tighten channel bridge pending cleanup

steipete · steipete · commit d8b1a415c45c · 2026-05-30T21:24:10.000+01:00
diff --git a/src/mcp/channel-bridge.test.ts b/src/mcp/channel-bridge.test.ts
@@ -23,6 +23,7 @@ type BridgeInternals = {
     event: string;
     payload?: Record<string, unknown>;
   }) => Promise<void>;
+  listPendingApprovals: () => unknown[];
   close: () => Promise<void>;
 };
 
@@ -126,6 +127,29 @@ describe("OpenClawChannelBridge — pendingClaudePermissions / pendingApprovals
     }
   });
 
+  test("listPendingApprovals filters expired entries before the next sweep tick", async () => {
+    const bridge = makeBridge();
+    try {
+      await bridge.handleGatewayEvent({
+        event: "exec.approval.requested",
+        payload: {
+          id: "approval-early-expiry",
+          createdAtMs: 0,
+          expiresAtMs: ONE_MINUTE_MS,
+        },
+      });
+      expect(bridge.pendingApprovals.size).toBe(1);
+
+      vi.advanceTimersByTime(2 * ONE_MINUTE_MS);
+
+      expect(bridge.listPendingApprovals()).toHaveLength(0);
+      expect(bridge.pendingApprovals.size).toBe(0);
+      expect(bridge.pendingSweepInterval).toBeNull();
+    } finally {
+      await bridge.close();
+    }
+  });
+
   test("close() clears both pending maps, stops the sweeper interval, and leaves no scheduled timers", async () => {
     const bridge = makeBridge();
     await bridge.handleClaudePermissionRequest({
diff --git a/src/mcp/channel-bridge.ts b/src/mcp/channel-bridge.ts
@@ -14,7 +14,6 @@ import type {
   ApprovalKind,
   ChatHistoryResult,
   ClaudeChannelMode,
-  ClaudePermissionRequest,
   ConversationDescriptor,
   PendingApproval,
   QueueEvent,
@@ -31,11 +30,6 @@ type PendingWaiter = {
   timeout: NodeJS.Timeout | null;
 };
 
-type PendingClaudePermissionEntry = {
-  request: ClaudePermissionRequest;
-  createdAtMs: number;
-};
-
 type PendingApprovalEntry = {
   approval: PendingApproval;
   trackedAtMs: number;
@@ -58,7 +52,7 @@ export class OpenClawChannelBridge {
   private readonly claudeChannelMode: ClaudeChannelMode;
   private readonly queue: QueueEvent[] = [];
   private readonly pendingWaiters = new Set<PendingWaiter>();
-  private readonly pendingClaudePermissions = new Map<string, PendingClaudePermissionEntry>();
+  private readonly pendingClaudePermissions = new Map<string, number>();
   private readonly pendingApprovals = new Map<string, PendingApprovalEntry>();
   private pendingSweepInterval: NodeJS.Timeout | null = null;
   private server: McpServer | null = null;
@@ -268,6 +262,7 @@ export class OpenClawChannelBridge {
   }
 
   listPendingApprovals(): PendingApproval[] {
+    this.sweepPendingExpired();
     return [...this.pendingApprovals.values()]
       .map((entry) => entry.approval)
       .toSorted((a, b) => {
@@ -330,14 +325,7 @@ export class OpenClawChannelBridge {
     if (this.closed) {
       return;
     }
-    this.pendingClaudePermissions.set(params.requestId, {
-      request: {
-        toolName: params.toolName,
-        description: params.description,
-        inputPreview: params.inputPreview,
-      },
-      createdAtMs: Date.now(),
-    });
+    this.pendingClaudePermissions.set(params.requestId, Date.now());
     this.ensurePendingSweeper();
     this.enqueue({
       cursor: this.nextCursor(),
@@ -459,8 +447,8 @@ export class OpenClawChannelBridge {
   }
 
   private sweepPendingExpired(now: number = Date.now()): void {
-    for (const [id, entry] of this.pendingClaudePermissions) {
-      if (now - entry.createdAtMs >= PENDING_CLAUDE_PERMISSION_TTL_MS) {
+    for (const [id, createdAtMs] of this.pendingClaudePermissions) {
+      if (now - createdAtMs >= PENDING_CLAUDE_PERMISSION_TTL_MS) {
         this.pendingClaudePermissions.delete(id);
       }
     }
diff --git a/src/mcp/channel-server.test.ts b/src/mcp/channel-server.test.ts
@@ -489,17 +489,10 @@ describe("openclaw channel mcp server", () => {
 
       (
         bridge as unknown as {
-          pendingClaudePermissions: Map<string, Record<string, unknown>>;
+          pendingClaudePermissions: Map<string, number>;
           server: { server: { notification: ReturnType<typeof vi.fn> } };
         }
-      ).pendingClaudePermissions.set("abcde", {
-        request: {
-          toolName: "Bash",
-          description: "run npm test",
-          inputPreview: '{"cmd":"npm test"}',
-        },
-        createdAtMs: Date.now(),
-      });
+      ).pendingClaudePermissions.set("abcde", Date.now());
       (
         bridge as unknown as {
           server: { server: { notification: ReturnType<typeof vi.fn> } };

Original file line number	Diff line number	Diff line change
`@@ -489,17 +489,10 @@ describe("openclaw channel mcp server", () => {`
`489`	`489`
`490`	`490`	`(`
`491`	`491`	`bridge as unknown as {`
`492`		`- pendingClaudePermissions: Map<string, Record<string, unknown>>;`
	`492`	`+ pendingClaudePermissions: Map<string, number>;`
`493`	`493`	`server: { server: { notification: ReturnType<typeof vi.fn> } };`
`494`	`494`	`}`
`495`		`- ).pendingClaudePermissions.set("abcde", {`
`496`		`- request: {`
`497`		`- toolName: "Bash",`
`498`		`- description: "run npm test",`
`499`		`- inputPreview: '{"cmd":"npm test"}',`
`500`		`- },`
`501`		`- createdAtMs: Date.now(),`
`502`		`- });`
	`495`	`+ ).pendingClaudePermissions.set("abcde", Date.now());`
`503`	`496`	`(`
`504`	`497`	`bridge as unknown as {`
`505`	`498`	`server: { server: { notification: ReturnType<typeof vi.fn> } };`