refactor: share mcp loopback scope params

vincentkoc · vincentkoc · commit 16808524cbd3 · 2026-06-02T06:44:47.000+02:00
diff --git a/src/gateway/mcp-http.runtime.ts b/src/gateway/mcp-http.runtime.ts
@@ -19,7 +19,7 @@ type CachedScopedTools = {
   time: number;
 };
 
-export function resolveMcpLoopbackScopedTools(params: {
+type McpLoopbackScopeParams = {
   cfg: OpenClawConfig;
   sessionKey: string;
   messageProvider: string | undefined;
@@ -30,18 +30,13 @@ export function resolveMcpLoopbackScopedTools(params: {
   inboundEventKind: InboundEventKind | undefined;
   sourceReplyDeliveryMode: SourceReplyDeliveryMode | undefined;
   senderIsOwner: boolean | undefined;
-}): { agentId: string | undefined; tools: McpLoopbackTool[] } {
+};
+
+export function resolveMcpLoopbackScopedTools(
+  params: McpLoopbackScopeParams,
+): { agentId: string | undefined; tools: McpLoopbackTool[] } {
   const scoped = resolveGatewayScopedTools({
-    cfg: params.cfg,
-    sessionKey: params.sessionKey,
-    messageProvider: params.messageProvider,
-    currentChannelId: params.currentChannelId,
-    currentThreadTs: params.currentThreadTs,
-    currentMessageId: params.currentMessageId,
-    accountId: params.accountId,
-    inboundEventKind: params.inboundEventKind,
-    sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-    senderIsOwner: params.senderIsOwner,
+    ...params,
     surface: "loopback",
     excludeToolNames: NATIVE_TOOL_EXCLUDE,
   });
@@ -54,18 +49,7 @@ export function resolveMcpLoopbackScopedTools(params: {
 export class McpLoopbackToolCache {
   #entries = new Map<string, CachedScopedTools>();
 
-  resolve(params: {
-    cfg: OpenClawConfig;
-    sessionKey: string;
-    messageProvider: string | undefined;
-    currentChannelId: string | undefined;
-    currentThreadTs: string | undefined;
-    currentMessageId: string | number | undefined;
-    accountId: string | undefined;
-    inboundEventKind: InboundEventKind | undefined;
-    sourceReplyDeliveryMode: SourceReplyDeliveryMode | undefined;
-    senderIsOwner: boolean | undefined;
-  }): CachedScopedTools {
+  resolve(params: McpLoopbackScopeParams): CachedScopedTools {
     const cacheKey = [
       params.sessionKey,
       params.messageProvider ?? "",
@@ -83,18 +67,7 @@ export class McpLoopbackToolCache {
       return cached;
     }
 
-    const next = resolveMcpLoopbackScopedTools({
-      cfg: params.cfg,
-      sessionKey: params.sessionKey,
-      messageProvider: params.messageProvider,
-      currentChannelId: params.currentChannelId,
-      currentThreadTs: params.currentThreadTs,
-      currentMessageId: params.currentMessageId,
-      accountId: params.accountId,
-      inboundEventKind: params.inboundEventKind,
-      sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-      senderIsOwner: params.senderIsOwner,
-    });
+    const next = resolveMcpLoopbackScopedTools(params);
     const nextEntry: CachedScopedTools = {
       agentId: next.agentId,
       tools: next.tools,
