refactor(agents): share bundle runtime allowlist gating

vincentkoc · vincentkoc · commit a6390b2b904d · 2026-06-22T23:07:58.000+08:00
diff --git a/src/agents/embedded-agent-runner/run/attempt-tool-construction-plan.ts b/src/agents/embedded-agent-runner/run/attempt-tool-construction-plan.ts
@@ -229,16 +229,14 @@ export function resolveEmbeddedAttemptToolConstructionPlan(params: {
   };
 }
 
-/**
- * Decides whether the bundled MCP runtime is needed for this attempt. Bundle
- * runtime creation follows explicit bundle/plugin allowlist names rather than
- * generic local tool names.
- */
-export function shouldCreateBundleMcpRuntimeForAttempt(params: {
-  toolsEnabled: boolean;
-  disableTools?: boolean;
-  toolsAllow?: string[];
-}): boolean {
+function shouldCreateBundleRuntimeForAttempt(
+  params: {
+    toolsEnabled: boolean;
+    disableTools?: boolean;
+    toolsAllow?: string[];
+  },
+  matchesAllowlist: (normalizedToolName: string) => boolean,
+): boolean {
   if (!params.toolsEnabled || params.disableTools === true) {
     return false;
   }
@@ -251,8 +249,20 @@ export function shouldCreateBundleMcpRuntimeForAttempt(params: {
   if (hasWildcardToolAllowlist(params.toolsAllow)) {
     return true;
   }
-  return params.toolsAllow.some((toolName) => {
-    const normalized = normalizeToolName(toolName);
+  return params.toolsAllow.some((toolName) => matchesAllowlist(normalizeToolName(toolName)));
+}
+
+/**
+ * Decides whether the bundled MCP runtime is needed for this attempt. Bundle
+ * runtime creation follows explicit bundle/plugin allowlist names rather than
+ * generic local tool names.
+ */
+export function shouldCreateBundleMcpRuntimeForAttempt(params: {
+  toolsEnabled: boolean;
+  disableTools?: boolean;
+  toolsAllow?: string[];
+}): boolean {
+  return shouldCreateBundleRuntimeForAttempt(params, (normalized) => {
     return isBundleMcpAllowlistName(normalized) || isPluginGroupAllowlistName(normalized);
   });
 }
@@ -267,20 +277,7 @@ export function shouldCreateBundleLspRuntimeForAttempt(params: {
   disableTools?: boolean;
   toolsAllow?: string[];
 }): boolean {
-  if (!params.toolsEnabled || params.disableTools === true) {
-    return false;
-  }
-  if (!params.toolsAllow) {
-    return true;
-  }
-  if (params.toolsAllow.length === 0) {
-    return false;
-  }
-  if (hasWildcardToolAllowlist(params.toolsAllow)) {
-    return true;
-  }
-  return params.toolsAllow.some((toolName) => {
-    const normalized = normalizeToolName(toolName);
+  return shouldCreateBundleRuntimeForAttempt(params, (normalized) => {
     return normalized.startsWith("lsp_");
   });
 }
