@takara-ai/miru-code 1.9.0 → 1.10.0

package/src/installer/agents.ts

@@ -5,11 +5,7 @@ import { join } from "node:path";
 import type { AgentId } from "../agents.ts";
 import { INSTRUCTIONS_MARKDOWN } from "./search-policy.ts";
 
-function copilotHooksPath(home: string): string {
-  return join(home, ".copilot", "hooks", "miru-search.json");
-}
-
-/** Shared Copilot / VS Code / Visual Studio config root (MCP, hooks, agents). */
+/** Shared Copilot / VS Code / Visual Studio config root (MCP, agents). */
 export function copilotHomeDir(home: string): string {
   return join(home, ".copilot");
 }
@@ -55,22 +51,15 @@ export function nativeSteSkillDir(home: string, vendor: NativeSkillVendor): stri
   return skillDir(home, `.${vendor}`, "ste");
 }
 
-function kiroHooksPath(home: string): string {
-  return join(home, ".kiro", "settings", "hooks.json");
-}
-
-function windsurfHooksPath(home: string): string {
-  return join(home, ".codeium", "windsurf", "hooks.json");
-}
-
 /** OpenCode config root (`$XDG_CONFIG_HOME/opencode` or `~/.config/opencode`). */
 export function opencodeConfigDir(home: string): string {
   const xdg = process.env.XDG_CONFIG_HOME;
   return xdg ? join(xdg, "opencode") : join(home, ".config", "opencode");
 }
 
-function opencodePluginPath(home: string): string {
-  return join(opencodeConfigDir(home), "plugins", "miru-search-guard.ts");
+/** OpenCode's first-class global skill location for Miru code-search routing. */
+export function opencodeMiruSkillPath(home: string): string {
+  return join(opencodeConfigDir(home), "skills", "miru-code-search", "SKILL.md");
 }
 
 export type InstallAction =
@@ -86,24 +75,24 @@ export type InstallMode = "install" | "uninstall";
 
 export const MIRU_START = "<!-- miru:start -->";
 export const MIRU_END = "<!-- miru:end -->";
+export const MIRU_BUNX_PACKAGE = "@takara-ai/miru-code@latest";
 
 const HOME = homedir();
 
 const STDIO_SERVER_CONFIG: Record<string, unknown> = {
   command: "bunx",
-  args: ["@takara-ai/miru-code"],
+  args: [MIRU_BUNX_PACKAGE, "mcp"],
   type: "stdio",
 };
 
 const BARE_STDIO_SERVER_CONFIG: Record<string, unknown> = {
   command: "bunx",
-  args: ["@takara-ai/miru-code"],
+  args: [MIRU_BUNX_PACKAGE, "mcp"],
 };
 
 const OPENCODE_SERVER_CONFIG: Record<string, unknown> = {
-  command: ["bunx", "@takara-ai/miru-code"],
+  command: ["bunx", MIRU_BUNX_PACKAGE, "mcp"],
   type: "local",
-  enabled: true,
 };
 
 export const INSTRUCTIONS = `${MIRU_START}
@@ -121,7 +110,7 @@ export interface McpConfig {
   format: McpConfigFormat;
 }
 
-export type HooksFormat =
+export type LegacyHooksFormat =
   | "claude"
   | "cursor"
   | "gemini"
@@ -138,8 +127,9 @@ export interface AgentTarget {
   mcp: McpConfig | null;
   instructionsPath: string | null;
   cursorRulesPath: string | null;
-  hooksPath: string | null;
-  hooksFormat: HooksFormat | null;
+  /** Search-hook paths are retained for uninstalling hooks created by older releases. */
+  legacyHooksPath: string | null;
+  legacyHooksFormat: LegacyHooksFormat | null;
   subagentPath: string | null;
   subagentId: AgentId | null;
   /**
@@ -151,6 +141,8 @@ export interface AgentTarget {
    * On-demand STE skill directory (`…/skills/ste/`), or null if unsupported.
    */
   steSkillDir: string | null;
+  /** OpenCode's global Miru code-search skill, advertised on each model step. */
+  miruSkillPath?: string | null;
 }
 
 export function opencodeMcpPath(): string {
@@ -166,11 +158,11 @@ export function opencodeMcpPath(): string {
   return jsonc;
 }
 
-export function vscodeMcpPath(): string {
-  if (process.platform === "darwin") {
+export function vscodeMcpPath(platform: NodeJS.Platform = process.platform): string {
+  if (platform === "darwin") {
     return join(HOME, "Library", "Application Support", "Code", "User", "mcp.json");
   }
-  if (process.platform === "win32") {
+  if (platform === "win32") {
     const appData = process.env.APPDATA ?? HOME;
     return join(appData, "Code", "User", "mcp.json");
   }
@@ -184,23 +176,27 @@ export function visualStudioMcpPath(): string {
   return join(profile, ".mcp.json");
 }
 
-export function visualStudioInstallDir(): string | null {
-  if (process.platform !== "win32") {
+export function visualStudioInstallDir(
+  platform: NodeJS.Platform = process.platform,
+): string | null {
+  if (platform !== "win32") {
     return null;
   }
   const programFiles = process.env.ProgramFiles ?? join("C:", "Program Files");
   return join(programFiles, "Microsoft Visual Studio");
 }
 
-async function detectVisualStudio(): Promise<boolean> {
-  if (process.platform !== "win32") {
+async function detectVisualStudio(dependencies: AgentDetectionDependencies = {}): Promise<boolean> {
+  const platform = dependencies.platform ?? process.platform;
+  if (platform !== "win32") {
     return false;
   }
 
-  const installDir = visualStudioInstallDir();
-  if (installDir && existsSync(installDir)) {
+  const installDir = visualStudioInstallDir(platform);
+  const pathExists = dependencies.existsSync ?? existsSync;
+  if (installDir && pathExists(installDir)) {
     try {
-      const entries = await readdir(installDir);
+      const entries = await (dependencies.readdir ?? ((path: string) => readdir(path)))(installDir);
       if (entries.length > 0) {
         return true;
       }
@@ -210,8 +206,9 @@ async function detectVisualStudio(): Promise<boolean> {
   }
 
   try {
-    const proc = Bun.spawn(["where", "devenv"], { stdout: "pipe", stderr: "ignore" });
-    return (await proc.exited) === 0;
+    return await (dependencies.commandOnPath
+      ? dependencies.commandOnPath("devenv")
+      : commandOnPath("devenv", platform, dependencies.spawn));
   } catch {
     return false;
   }
@@ -233,8 +230,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(join(HOME, ".claude.json"), "mcpServers", STDIO_SERVER_CONFIG),
     instructionsPath: join(HOME, ".claude", "CLAUDE.md"),
     cursorRulesPath: null,
-    hooksPath: join(HOME, ".claude", "settings.json"),
-    hooksFormat: "claude",
+    legacyHooksPath: join(HOME, ".claude", "settings.json"),
+    legacyHooksFormat: "claude",
     subagentPath: join(HOME, ".claude", "agents", "miru-code.md"),
     subagentId: "claude",
     cavemanSkillPath: nativeCavemanSkillPath(HOME, "claude"),
@@ -248,12 +245,13 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(join(HOME, ".cursor", "mcp.json"), "mcpServers", STDIO_SERVER_CONFIG),
     instructionsPath: null,
     cursorRulesPath: join(HOME, ".cursor", "rules", "miru-code.mdc"),
-    hooksPath: join(HOME, ".cursor", "hooks.json"),
-    hooksFormat: "cursor",
+    legacyHooksPath: join(HOME, ".cursor", "hooks.json"),
+    legacyHooksFormat: "cursor",
     subagentPath: join(HOME, ".cursor", "agents", "miru-code.md"),
     subagentId: "cursor",
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
     steSkillDir: SHARED_STE_SKILL_DIR,
+    miruSkillPath: opencodeMiruSkillPath(HOME),
   },
   {
     id: "gemini",
@@ -263,8 +261,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(join(HOME, ".gemini", "settings.json"), "mcpServers", STDIO_SERVER_CONFIG),
     instructionsPath: join(HOME, ".gemini", "GEMINI.md"),
     cursorRulesPath: null,
-    hooksPath: join(HOME, ".gemini", "settings.json"),
-    hooksFormat: "gemini",
+    legacyHooksPath: join(HOME, ".gemini", "settings.json"),
+    legacyHooksFormat: "gemini",
     subagentPath: join(HOME, ".gemini", "agents", "miru-code.md"),
     subagentId: "gemini",
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -278,8 +276,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(join(HOME, ".kiro", "settings", "mcp.json"), "mcpServers", STDIO_SERVER_CONFIG),
     instructionsPath: join(HOME, ".kiro", "steering", "miru.md"),
     cursorRulesPath: null,
-    hooksPath: kiroHooksPath(HOME),
-    hooksFormat: "kiro",
+    legacyHooksPath: join(HOME, ".kiro", "settings", "hooks.json"),
+    legacyHooksFormat: "kiro",
     subagentPath: join(HOME, ".kiro", "agents", "miru-code.md"),
     subagentId: "kiro",
     cavemanSkillPath: nativeCavemanSkillPath(HOME, "kiro"),
@@ -290,11 +288,11 @@ export const AGENT_TARGETS: AgentTarget[] = [
     displayName: "OpenCode",
     binary: "opencode",
     configDir: opencodeConfigDir(HOME),
-    mcp: jsonMcp(opencodeMcpPath(), "mcp", OPENCODE_SERVER_CONFIG),
+    mcp: jsonMcp(opencodeMcpPath(), "mcp.servers", OPENCODE_SERVER_CONFIG),
     instructionsPath: join(opencodeConfigDir(HOME), "AGENTS.md"),
     cursorRulesPath: null,
-    hooksPath: opencodePluginPath(HOME),
-    hooksFormat: "opencode",
+    legacyHooksPath: join(opencodeConfigDir(HOME), "plugins", "miru-search-guard.ts"),
+    legacyHooksFormat: "opencode",
     subagentPath: join(opencodeConfigDir(HOME), "agents", "miru-code.md"),
     subagentId: "opencode",
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -312,8 +310,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     ),
     instructionsPath: null,
     cursorRulesPath: null,
-    hooksPath: copilotHooksPath(HOME),
-    hooksFormat: "vscode",
+    legacyHooksPath: join(copilotHomeDir(HOME), "hooks", "miru-search.json"),
+    legacyHooksFormat: "vscode",
     subagentPath: join(copilotHomeDir(HOME), "agents", "miru-code.agent.md"),
     subagentId: "copilot",
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -333,8 +331,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     },
     instructionsPath: join(HOME, ".codex", "AGENTS.md"),
     cursorRulesPath: null,
-    hooksPath: join(HOME, ".codex", "hooks.json"),
-    hooksFormat: "claude",
+    legacyHooksPath: join(HOME, ".codex", "hooks.json"),
+    legacyHooksFormat: "claude",
     subagentPath: null,
     subagentId: null,
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -348,8 +346,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(vscodeMcpPath(), "servers", STDIO_SERVER_CONFIG),
     instructionsPath: null,
     cursorRulesPath: null,
-    hooksPath: copilotHooksPath(HOME),
-    hooksFormat: "vscode",
+    legacyHooksPath: join(copilotHomeDir(HOME), "hooks", "miru-search.json"),
+    legacyHooksFormat: "vscode",
     subagentPath: null,
     subagentId: null,
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -363,8 +361,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: null,
     instructionsPath: null,
     cursorRulesPath: null,
-    hooksPath: windsurfHooksPath(HOME),
-    hooksFormat: "windsurf",
+    legacyHooksPath: join(HOME, ".codeium", "windsurf", "hooks.json"),
+    legacyHooksFormat: "windsurf",
     subagentPath: null,
     subagentId: null,
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -378,8 +376,8 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(visualStudioMcpPath(), "servers", STDIO_SERVER_CONFIG),
     instructionsPath: null,
     cursorRulesPath: null,
-    hooksPath: copilotHooksPath(HOME),
-    hooksFormat: "vscode",
+    legacyHooksPath: join(copilotHomeDir(HOME), "hooks", "miru-search.json"),
+    legacyHooksFormat: "vscode",
     subagentPath: null,
     subagentId: null,
     cavemanSkillPath: SHARED_CAVEMAN_SKILL,
@@ -387,38 +385,60 @@ export const AGENT_TARGETS: AgentTarget[] = [
   },
 ];
 
-async function commandOnPath(command: string): Promise<boolean> {
-  const lookup = process.platform === "win32" ? ["where", command] : ["which", command];
+async function commandOnPath(
+  command: string,
+  platform: NodeJS.Platform = process.platform,
+  spawn: typeof Bun.spawn = Bun.spawn,
+): Promise<boolean> {
+  const lookup = platform === "win32" ? ["where", command] : ["which", command];
   try {
-    const proc = Bun.spawn(lookup, { stdout: "pipe", stderr: "ignore" });
+    const proc = spawn(lookup, { stdout: "pipe", stderr: "ignore" });
     return (await proc.exited) === 0;
   } catch {
     return false;
   }
 }
 
-export async function isAgentDetected(agent: AgentTarget): Promise<boolean> {
+export interface AgentDetectionDependencies {
+  platform?: NodeJS.Platform;
+  existsSync?: typeof existsSync;
+  readdir?: (path: string) => Promise<string[]>;
+  commandOnPath?: (command: string) => Promise<boolean>;
+  spawn?: typeof Bun.spawn;
+  home?: string;
+}
+
+export async function isAgentDetected(
+  agent: AgentTarget,
+  dependencies: AgentDetectionDependencies = {},
+): Promise<boolean> {
   if (agent.id === "visualstudio") {
-    return detectVisualStudio();
+    return detectVisualStudio(dependencies);
   }
   if (agent.id === "windsurf") {
-    if (agent.configDir && existsSync(agent.configDir)) {
+    if (agent.configDir && (dependencies.existsSync ?? existsSync)(agent.configDir)) {
       return true;
     }
-    if (agent.binary && (await commandOnPath(agent.binary))) {
+    const commandExists = dependencies.commandOnPath
+      ? dependencies.commandOnPath
+      : (command: string) => commandOnPath(command, dependencies.platform, dependencies.spawn);
+    if (agent.binary && (await commandExists(agent.binary))) {
       return true;
     }
     return false;
   }
   // Copilot-specific artifacts only — ~/.copilot alone is shared with VS Code / VS.
   if (agent.id === "copilot") {
-    return isCopilotInstalled(HOME);
+    return isCopilotInstalled(dependencies.home ?? HOME);
   }
-  if (agent.binary && (await commandOnPath(agent.binary))) {
+  const commandExists = dependencies.commandOnPath
+    ? dependencies.commandOnPath
+    : (command: string) => commandOnPath(command, dependencies.platform, dependencies.spawn);
+  if (agent.binary && (await commandExists(agent.binary))) {
     return true;
   }
   if (agent.configDir) {
-    return Bun.file(agent.configDir).exists();
+    return (dependencies.existsSync ?? existsSync)(agent.configDir);
   }
   return false;
 }

package/src/installer/benchmark-mode.ts

@@ -1,4 +1,9 @@
-import { AGENT_TARGETS, type AgentTarget, type InstallAction } from "./agents.ts";
+import {
+  AGENT_TARGETS,
+  type AgentTarget,
+  type InstallAction,
+  MIRU_BUNX_PACKAGE,
+} from "./agents.ts";
 import { removeTomlBlock, stripJsonComments } from "./config.ts";
 
 export const MCP_BENCHMARK_FLAG = "--benchmark";
@@ -7,9 +12,25 @@ const CODEX_MCP_HEADER = "[mcp_servers.miru]";
 
 function codexMcpBlock(enabled: boolean): string {
   const args = enabled
-    ? `["@takara-ai/miru-code", "${MCP_BENCHMARK_FLAG}"]`
-    : '["@takara-ai/miru-code"]';
-  return `${CODEX_MCP_HEADER}\ncommand = "bunx"\nargs = ${args}\n`;
+    ? `["${MIRU_BUNX_PACKAGE}", "mcp", "${MCP_BENCHMARK_FLAG}"]`
+    : `["${MIRU_BUNX_PACKAGE}", "mcp"]`;
+  return `${CODEX_MCP_HEADER}\ncommand = "bunx"\nargs = ${args}\nstartup_timeout_sec = 60\n`;
+}
+
+function withMcpSubcommand(list: string[], command: unknown): string[] {
+  if (list.includes("mcp")) return list;
+  if (command === "miru") return ["mcp", ...list];
+
+  const packageIndex = list.findIndex((item) => /^@takara-ai\/miru-code(?:@.+)?$/.test(item));
+  if (packageIndex >= 0) {
+    return [...list.slice(0, packageIndex + 1), "mcp", ...list.slice(packageIndex + 1)];
+  }
+
+  const miruIndex = list.indexOf("miru");
+  if (miruIndex >= 0) {
+    return [...list.slice(0, miruIndex + 1), "mcp", ...list.slice(miruIndex + 1)];
+  }
+  return list;
 }
 
 export function withBenchmarkFlag(list: string[], enabled: boolean): string[] {
@@ -31,7 +52,7 @@ export function applyBenchmarkFlagToMcpEntry(
 
   if (Array.isArray(next.args)) {
     const args = next.args.filter((item): item is string => typeof item === "string");
-    const updated = withBenchmarkFlag(args, enabled);
+    const updated = withBenchmarkFlag(withMcpSubcommand(args, next.command), enabled);
     if (JSON.stringify(updated) !== JSON.stringify(args)) {
       next.args = updated;
       changed = true;
@@ -40,7 +61,7 @@ export function applyBenchmarkFlagToMcpEntry(
 
   if (Array.isArray(next.command)) {
     const command = next.command.filter((item): item is string => typeof item === "string");
-    const updated = withBenchmarkFlag(command, enabled);
+    const updated = withBenchmarkFlag(withMcpSubcommand(command, next.command), enabled);
     if (JSON.stringify(updated) !== JSON.stringify(command)) {
       next.command = updated;
       changed = true;
@@ -122,7 +143,10 @@ async function setTomlBenchmark(
     return "missing";
   }
   const current = await statusForToml(path);
-  if (current === enabled) {
+  const section =
+    text.slice(text.indexOf(CODEX_MCP_HEADER) + CODEX_MCP_HEADER.length).split(/^\[/m)[0] ?? "";
+  const hasMcpArg = /^args\s*=\s*\[[^\n]*["']mcp["']/m.test(section);
+  if (current === enabled && hasMcpArg) {
     return "unchanged";
   }
 
@@ -190,9 +214,11 @@ async function setJsonBenchmark(
 }
 
 /** Inspect installed Miru MCP configs for `--benchmark`. */
-export async function getBenchmarkModeStatus(): Promise<BenchmarkModeTargetResult[]> {
+export async function getBenchmarkModeStatus(
+  targets: readonly AgentTarget[] = AGENT_TARGETS,
+): Promise<BenchmarkModeTargetResult[]> {
   const results: BenchmarkModeTargetResult[] = [];
-  for (const agent of AGENT_TARGETS) {
+  for (const agent of targets) {
     const mcp = agent.mcp;
     if (!mcp) {
       continue;
@@ -219,9 +245,12 @@ export async function getBenchmarkModeStatus(): Promise<BenchmarkModeTargetResul
 }
 
 /** Enable or disable `--benchmark` on every installed Miru MCP entry. */
-export async function setBenchmarkMode(enabled: boolean): Promise<BenchmarkModeTargetResult[]> {
+export async function setBenchmarkMode(
+  enabled: boolean,
+  targets: readonly AgentTarget[] = AGENT_TARGETS,
+): Promise<BenchmarkModeTargetResult[]> {
   const results: BenchmarkModeTargetResult[] = [];
-  for (const agent of AGENT_TARGETS) {
+  for (const agent of targets) {
     const mcp = agent.mcp;
     if (!mcp) {
       continue;

package/src/installer/config.ts

@@ -1,15 +1,17 @@
 import { unlink } from "node:fs/promises";
-import { type InstallAction, MIRU_END, MIRU_START } from "./agents.ts";
+import { type InstallAction, MIRU_BUNX_PACKAGE, MIRU_END, MIRU_START } from "./agents.ts";
 
 const CODEX_MCP_HEADER = "[mcp_servers.miru]";
 const CODEX_MCP_BLOCK = `[mcp_servers.miru]
 command = "bunx"
-args = ["@takara-ai/miru-code"]
+args = ["${MIRU_BUNX_PACKAGE}", "mcp"]
+startup_timeout_sec = 60
 `;
 /** Same Codex block with `--benchmark` preserved across reinstall. */
 const CODEX_MCP_BLOCK_BENCHMARK = `[mcp_servers.miru]
 command = "bunx"
-args = ["@takara-ai/miru-code", "--benchmark"]
+args = ["${MIRU_BUNX_PACKAGE}", "mcp", "--benchmark"]
+startup_timeout_sec = 60
 `;
 
 /** Strip line and block comments so JSONC configs can be parsed. */
@@ -81,14 +83,16 @@ function sectionObject(
   root: Record<string, unknown>,
   sectionKey: string,
 ): Record<string, unknown> | "error" {
-  const section = root[sectionKey];
-  if (section === undefined) {
-    return {};
-  }
-  if (!section || typeof section !== "object" || Array.isArray(section)) {
-    return "error";
-  }
-  return section as Record<string, unknown>;
+  let section: unknown = root;
+  for (const key of sectionKey.split(".")) {
+    if (!section || typeof section !== "object" || Array.isArray(section)) return "error";
+    const child = (section as Record<string, unknown>)[key];
+    if (child === undefined) return {};
+    section = child;
+  }
+  return section && typeof section === "object" && !Array.isArray(section)
+    ? (section as Record<string, unknown>)
+    : "error";
 }
 
 export async function mergeJsonMember(
@@ -143,11 +147,12 @@ export async function removeJsonMember(
   }
   const nextText = removeJsonMemberText(text, sectionKey, memberKey);
   const nextObject = withRemovedMember(parsed, sectionKey, memberKey);
-  const next = nextText ?? JSON.stringify(nextObject, null, 2);
-  if (ensureTrailingNewline(next) === ensureTrailingNewline(text)) {
-    return "not-found";
+  let next = nextText ?? JSON.stringify(nextObject, null, 2);
+  let nextParsed = parseJsonObject(next);
+  if (nextParsed === "error") {
+    next = JSON.stringify(nextObject, null, 2);
+    nextParsed = parseJsonObject(next);
   }
-  const nextParsed = parseJsonObject(next);
   if (!nextParsed || typeof nextParsed !== "object" || Object.keys(nextParsed).length === 0) {
     await unlink(path);
     return "removed";
@@ -162,14 +167,24 @@ function withMergedMember(
   memberKey: string,
   value: Record<string, unknown>,
 ): Record<string, unknown> {
-  const next = { ...root };
-  const section =
-    next[sectionKey] && typeof next[sectionKey] === "object" && !Array.isArray(next[sectionKey])
-      ? { ...(next[sectionKey] as Record<string, unknown>) }
-      : {};
-  section[memberKey] = value;
-  next[sectionKey] = section;
-  return next;
+  const keys = sectionKey.split(".");
+  const update = (object: Record<string, unknown>, depth: number): Record<string, unknown> => {
+    const next = { ...object };
+    if (depth === keys.length) {
+      next[memberKey] = value;
+      return next;
+    }
+    const key = keys[depth];
+    if (!key) return next;
+    const child = next[key];
+    const section =
+      child && typeof child === "object" && !Array.isArray(child)
+        ? (child as Record<string, unknown>)
+        : {};
+    next[key] = update(section, depth + 1);
+    return next;
+  };
+  return update(root, 0);
 }
 
 function withRemovedMember(
@@ -177,21 +192,29 @@ function withRemovedMember(
   sectionKey: string,
   memberKey: string,
 ): Record<string, unknown> {
-  const next = { ...root };
-  const section =
-    next[sectionKey] && typeof next[sectionKey] === "object" && !Array.isArray(next[sectionKey])
-      ? { ...(next[sectionKey] as Record<string, unknown>) }
-      : null;
-  if (!section || !(memberKey in section)) {
-    return next;
-  }
-  delete section[memberKey];
-  if (Object.keys(section).length === 0) {
-    delete next[sectionKey];
-  } else {
-    next[sectionKey] = section;
-  }
-  return next;
+  const keys = sectionKey.split(".");
+  const remove = (
+    object: Record<string, unknown>,
+    depth: number,
+  ): { value: Record<string, unknown>; changed: boolean } => {
+    const next = { ...object };
+    if (depth === keys.length) {
+      if (!(memberKey in next)) return { value: next, changed: false };
+      delete next[memberKey];
+      return { value: next, changed: true };
+    }
+    const key = keys[depth];
+    const child = key ? next[key] : undefined;
+    if (!key || !child || typeof child !== "object" || Array.isArray(child)) {
+      return { value: next, changed: false };
+    }
+    const result = remove(child as Record<string, unknown>, depth + 1);
+    if (!result.changed) return { value: next, changed: false };
+    if (Object.keys(result.value).length === 0) delete next[key];
+    else next[key] = result.value;
+    return { value: next, changed: true };
+  };
+  return remove(root, 0).value;
 }
 
 function upsertJsonMemberText(
@@ -292,13 +315,38 @@ function hasJsoncSyntax(text: string): boolean {
   return false;
 }
 
-/**
- * Locate a section object at the document root only.
- * Nested keys with the same name (e.g. Claude Code projects.*.mcpServers) are ignored.
- */
+/** Locate an object section by dotted path, matching each key among direct children. */
 function findSectionRange(
   text: string,
   sectionKey: string,
+): { openBrace: number; closeBrace: number; indent: string } | null {
+  const keys = sectionKey.split(".");
+  let container = text;
+  let offset = 0;
+  let result: { openBrace: number; closeBrace: number; indent: string } | null = null;
+  for (let index = 0; index < keys.length; index++) {
+    const key = keys[index];
+    if (!key) return null;
+    result = findDirectSectionRange(container, key);
+    if (!result) return null;
+    if (index < keys.length - 1) {
+      offset += result.openBrace;
+      container = container.slice(result.openBrace, result.closeBrace + 1);
+    }
+  }
+  return result
+    ? {
+        ...result,
+        openBrace: offset + result.openBrace,
+        closeBrace: offset + result.closeBrace,
+      }
+    : null;
+}
+
+/** Locate a single child object in a root object, ignoring similarly named nested keys. */
+function findDirectSectionRange(
+  text: string,
+  sectionKey: string,
 ): { openBrace: number; closeBrace: number; indent: string } | null {
   const keyPrefix = new RegExp(`^"${escapeRegExp(sectionKey)}"\\s*:\\s*\\{`);
   let depth = 0;
@@ -501,6 +549,21 @@ function ensureTrailingNewline(text: string): string {
   return text.endsWith("\n") ? text : `${text}\n`;
 }
 
+/** Internal parser helpers exposed for focused edge-case tests. */
+export const jsoncTestUtils = {
+  hasJsoncSyntax,
+  findSectionRange,
+  findMatchingBrace,
+  parseJsonValueEnd,
+  findMatchingBracket,
+  findStringEnd,
+  skipWhitespace,
+  findLeadingComma,
+  withRemovedMember,
+  upsertJsonMemberText,
+  removeJsonMemberText,
+};
+
 export async function replaceOrAppendMarked(path: string, content: string): Promise<InstallAction> {
   const existed = await Bun.file(path).exists();
   const existing = existed ? await Bun.file(path).text() : "";