Remove dead pending-connection count and cover the plural retry copy

Author: TheGreatAxios

src/agent/tool-search.test.ts

@@ -298,10 +298,10 @@ describe("createToolSearchTool", () => {
       search: (query) => createToolIndex(() => live).search(query),
       lookup: (name) => live.find((def) => def.name === name),
       promote: () => undefined,
-      awaitPendingConnections: async (timeoutMs = 50) => {
+      awaitPendingConnections: async (timeoutMs?: number) => {
         await Promise.race([
           connected,
-          new Promise((resolve) => setTimeout(resolve, timeoutMs)),
+          new Promise((resolve) => setTimeout(resolve, timeoutMs ?? 50)),
         ]);
         return live.length === 0 ? 1 : 0;
       },
@@ -335,6 +335,19 @@ describe("createToolSearchTool", () => {
     expect(out).not.toContain("different keywords");
   });
 
+  test("two pending connectors report the plural connecting copy", async () => {
+    const tool = createToolSearchTool({
+      search: () => [],
+      lookup: () => undefined,
+      promote: () => undefined,
+      awaitPendingConnections: async () => 2,
+    });
+    const out = await call(tool, { query: "linear" });
+    expect(out).toContain("2 connectors are still connecting");
+    expect(out).toMatch(/retry.*shortly/i);
+    expect(out).not.toContain("different keywords");
+  });
+
   test("a genuine miss keeps the keyword advice and omits the retry caveat", async () => {
     const tool = createToolSearchTool({
       search: () => [],

src/agent/tools.ts

@@ -323,10 +323,6 @@ export interface AgentToolset {
   // second add of an active name; failed rows retry through connectMCPServer
   // without a second persist. Still true while disable is in progress.
   hasMCPServer: (name: string) => boolean;
-  // Live MCP handshake depth: non-zero while any server is still connecting.
-  // tool_search consults this on a miss — waiting briefly and reporting a
-  // retry signal instead of a definitive negative mid-handshake.
-  pendingMcpConnectionCount: () => number;
   // Bounded wait for in-flight MCP handshakes; resolves to the remaining
   // count. Capped by `timeoutMs` so a hung authorization never hangs the
   // caller — the tool_search bound passes briefly by default.
@@ -762,10 +758,6 @@ export async function createAgentToolset(
   const connectedClients = new Map<string, MCPClient>();
   const inFlightConnections = new Map<string, Promise<void>>();
   const inFlightEpochs = new Map<string, number>();
-  // Live handshake depth for tool_search: a miss waits briefly for these
-  // before answering, so a mid-handshake search finds late-mounting tools
-  // instead of reporting a definitive negative.
-  const pendingMcpConnectionCount = (): number => inFlightConnections.size;
   // Bounded wait for in-flight handshakes; resolves to the remaining count.
   // Capped by `timeoutMs` so a hung authorization never hangs the caller.
   const awaitPendingMcpConnections = async (
@@ -1260,7 +1252,6 @@ export async function createAgentToolset(
     disconnectMCPServer: publicDisconnectMCPServer,
     hasMCPServer: (name) =>
       connectedClients.has(name) || inFlightConnections.has(name),
-    pendingMcpConnectionCount,
     awaitPendingMcpConnections,
     setMcpServersSource: (source) => {
       mcpServersSource = source;