refactor: simplify BM MCP JSON handling

Author: phernandez

bm-client.test.ts

@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it, jest } from "bun:test"
-import { BmClient, stripFrontmatter } from "./bm-client.ts"
+import { BmClient } from "./bm-client.ts"
 
 function mcpResult(payload: unknown) {
   return {
-    structuredContent: payload,
+    structuredContent: { result: payload },
     content: [
       {
         type: "text",
@@ -23,14 +23,6 @@ function setConnected(client: BmClient, callTool: jest.Mock) {
   }
 }
 
-describe("BmClient utility functions", () => {
-  it("strips YAML frontmatter from content", () => {
-    const content =
-      "---\ntitle: Test Note\ndate: 2025-02-08\n---\n\nThis is the actual content"
-    expect(stripFrontmatter(content)).toBe("This is the actual content")
-  })
-})
-
 describe("BmClient MCP behavior", () => {
   let client: BmClient
 
@@ -173,14 +165,14 @@ describe("BmClient MCP behavior", () => {
         query: "marketing strategy",
         page: 1,
         page_size: 3,
-        output_format: "default",
+        output_format: "json",
       },
     })
     expect(results).toHaveLength(1)
     expect(results[0].title).toBe("x")
   })
 
-  it("buildContext calls build_context using json format", async () => {
+  it("buildContext calls build_context using output_format=json", async () => {
     const callTool = jest.fn().mockResolvedValue(
       mcpResult({
         results: [
@@ -206,7 +198,7 @@ describe("BmClient MCP behavior", () => {
       arguments: {
         url: "memory://notes/x",
         depth: 2,
-        format: "json",
+        output_format: "json",
       },
     })
     expect(ctx.results).toHaveLength(1)

bm-client.ts

@@ -19,10 +19,6 @@ const REQUIRED_TOOLS = [
   "move_note",
 ]
 
-export function stripFrontmatter(content: string): string {
-  return content.replace(/^---\n[\s\S]*?\n---\n*/, "").trim()
-}
-
 export interface SearchResult {
   title: string
   permalink: string
@@ -113,28 +109,6 @@ function extractTextFromContent(content: unknown): string {
   return textBlocks.join("\n").trim()
 }
 
-function tryParseJson(text: string): unknown {
-  try {
-    return JSON.parse(text)
-  } catch {
-    // fall through
-  }
-
-  const lines = text.split("\n")
-  for (let i = 0; i < lines.length; i++) {
-    const trimmed = lines[i].trimStart()
-    if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) continue
-
-    try {
-      return JSON.parse(lines.slice(i).join("\n"))
-    } catch {
-      // keep scanning
-    }
-  }
-
-  return text
-}
-
 function isRecoverableConnectionError(err: unknown): boolean {
   const msg = getErrorMessage(err).toLowerCase()
   return (
@@ -404,28 +378,16 @@ export class BmClient {
   ): Promise<unknown> {
     const result = await this.callToolRaw(name, args)
 
-    if (isRecord(result) && result.structuredContent !== undefined) {
-      if (
-        isRecord(result.structuredContent) &&
-        result.structuredContent.result !== undefined
-      ) {
-        return result.structuredContent.result
-      }
-      return result.structuredContent
-    }
-
-    if (isRecord(result) && result.toolResult !== undefined) {
-      return result.toolResult
+    if (!isRecord(result) || result.structuredContent === undefined) {
+      throw new Error(`BM MCP tool ${name} returned no structured payload`)
     }
 
-    if (isRecord(result) && result.content !== undefined) {
-      const text = extractTextFromContent(result.content)
-      if (text.length > 0) {
-        return tryParseJson(text)
-      }
+    const structuredPayload = result.structuredContent
+    if (isRecord(structuredPayload) && structuredPayload.result !== undefined) {
+      return structuredPayload.result
     }
 
-    throw new Error(`BM MCP tool ${name} returned no usable payload`)
+    return structuredPayload
   }
 
   async ensureProject(projectPath: string): Promise<void> {
@@ -446,10 +408,6 @@ export class BmClient {
       output_format: "json",
     })
 
-    if (Array.isArray(payload)) {
-      return payload as ProjectListResult[]
-    }
-
     if (isRecord(payload) && Array.isArray(payload.projects)) {
       return payload.projects as ProjectListResult[]
     }
@@ -462,13 +420,9 @@ export class BmClient {
       query,
       page: 1,
       page_size: limit,
-      output_format: "default",
+      output_format: "json",
     })
 
-    if (typeof payload === "string") {
-      throw new Error(payload)
-    }
-
     if (!isRecord(payload) || !Array.isArray(payload.results)) {
       throw new Error("invalid search_notes response")
     }
@@ -504,11 +458,7 @@ export class BmClient {
       permalink,
       content,
       file_path: filePath,
-      frontmatter: isRecord(payload.frontmatter)
-        ? payload.frontmatter
-        : payload.frontmatter === null
-          ? null
-          : null,
+      frontmatter: isRecord(payload.frontmatter) ? payload.frontmatter : null,
     }
   }
 
@@ -553,7 +503,7 @@ export class BmClient {
     const payload = await this.callTool("build_context", {
       url,
       depth,
-      format: "json",
+      output_format: "json",
     })
 
     if (!isRecord(payload) || !Array.isArray(payload.results)) {
@@ -573,10 +523,6 @@ export class BmClient {
       return payload as RecentResult[]
     }
 
-    if (isRecord(payload) && Array.isArray(payload.items)) {
-      return payload.items as RecentResult[]
-    }
-
     throw new Error("invalid recent_activity response")
   }
 

tools/memory-provider.ts

@@ -81,7 +81,9 @@ async function searchActiveTasks(
       for (const r of results) {
         const score = r.score ? ` (${r.score.toFixed(2)})` : ""
         const preview =
-          (r.content ?? "").length > 200 ? `${(r.content ?? "").slice(0, 200)}…` : (r.content ?? "")
+          (r.content ?? "").length > 200
+            ? `${(r.content ?? "").slice(0, 200)}…`
+            : (r.content ?? "")
         matches.push(
           `- **${r.title}**${score} — ${r.file_path}\n  > ${preview.replace(/\n/g, "\n  > ")}`,
         )

tools/search.ts

@@ -46,9 +46,7 @@ export function registerSearchTool(
               const score = r.score ? ` (${(r.score * 100).toFixed(0)}%)` : ""
               const content = r.content ?? ""
               const preview =
-                content.length > 200
-                  ? `${content.slice(0, 200)}...`
-                  : content
+                content.length > 200 ? `${content.slice(0, 200)}...` : content
               return `${i + 1}. **${r.title}**${score}\n   ${preview}`
             })
             .join("\n\n")