fix(agent): stop the whole-query bonus recounting a one-word name match

Author: bwachman

src/agent/lexical-rank.ts

@@ -96,7 +96,16 @@ export function scoreLexical(
 ): number {
   const name = fields.name.toLowerCase();
   const blob = fields.blob.toLowerCase();
-  let matched = name.includes(rawQuery) ? 1 : 0;
+  // The whole-query bonus lifts a one-word query buried inside a longer name
+  // token ("granola" in mygranolahoard) above a description hit. A word that
+  // is already a name token, exact or folded, was scored by the token pass;
+  // a second point for it would cut its folded matches at the score ratio.
+  const single = new Set(queryTokens).size === 1 ? queryTokens[0] : undefined;
+  const nameHit =
+    single !== undefined &&
+    (fields.nameTokens.includes(single) ||
+      fields.foldedNameTokens.includes(foldPlural(single)));
+  let matched = !nameHit && name.includes(rawQuery) ? 1 : 0;
   let total = matched;
   // A model repeats a word because its sentence needs it ("release ID or
   // release slug"), not to weight it; counting each copy multiplies the

src/agent/tool-search.test.ts

@@ -529,6 +529,18 @@ describe("createToolIndex", () => {
     }
   });
 
+  test("a one-word plural query keeps the tools named for its singular", () => {
+    const nameOnlyIndex = createToolIndex(() => [
+      mcpDef("mcp__linear__list_issues", ""),
+      mcpDef("mcp__linear__get_issue", ""),
+      mcpDef("mcp__linear__save_issue", ""),
+    ]);
+    const ranked = nameOnlyIndex.search("issues", 20);
+    expect(ranked[0]).toBe("mcp__linear__list_issues");
+    expect(ranked).toContain("mcp__linear__get_issue");
+    expect(ranked).toContain("mcp__linear__save_issue");
+  });
+
   test("a malformed input schema still scores on name and description", () => {
     const malformedIndex = createToolIndex(() => [
       {