@takara-ai/miru-code 0.4.4 → 0.4.6

package/README.md

@@ -25,7 +25,7 @@ miru setup --key YOUR_TOKEN   # non-interactive
 miru setup --clear            # remove stored key
 ```
 
-MCP loads your key from `credentials.json` automatically. Set `TAKARA_API_KEY` in MCP config only to override.
+MCP loads your key from `credentials.json` automatically — no env block needed in MCP config.
 
 ## Add to your IDE
 
@@ -39,7 +39,7 @@ Interactive — pick your agent and what to enable (MCP, instructions, sub-agent
 miru uninstall   # remove miru config
 ```
 
-**Supported:** Cursor · Claude Code · Gemini CLI · Kiro · OpenCode · GitHub Copilot · Codex · VS Code
+**Supported:** Cursor · Claude Code · Gemini CLI · Kiro · OpenCode · GitHub Copilot · Codex · VS Code · Visual Studio (Windows)
 
 | IDE | Config written by `miru install` |
 |-----|----------------------------------|
@@ -50,6 +50,7 @@ miru uninstall   # remove miru config
 | OpenCode | `~/.config/opencode/opencode.json(c)` + agents dir |
 | GitHub Copilot | `~/.copilot/mcp-config.json` + `~/.copilot/agents/miru-code.agent.md` |
 | Codex / VS Code | MCP config only |
+| Visual Studio | `%USERPROFILE%\.mcp.json` (Windows, Copilot Agent Mode) |
 
 **Team sub-agent in a repo** (optional):
 
@@ -132,12 +133,13 @@ See `.env.example` for more.
 {
   "miru": {
     "command": "miru",
-    "args": [],
-    "env": { "TAKARA_API_KEY": "your-token" }
+    "args": []
   }
 }
 ```
 
+Run `miru setup` once so the server can load your key from `credentials.json`.
+
 Use `bunx` + `@takara-ai/miru-code` if `miru` is not global. Wrapper key varies by IDE (`mcpServers`, `servers`, or `mcp`).
 
 ## Developing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takara-ai/miru-code",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Miru (見る) — hybrid code search for agents. Bun, TypeScript, Takara embeddings.",
   "type": "module",
   "license": "MIT",

package/src/cache.ts

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { rm } from "node:fs/promises";
-import { join, resolve } from "node:path";
+import { join } from "node:path";
 import { resolveEmbeddingDimensions, resolveEmbeddingModel } from "./embeddings/openai.ts";
 import {
   loadBm25,
@@ -12,6 +12,7 @@ import {
 import { resolveSemanticStorage, semanticStorageFromMetadata } from "./index/vector-storage.ts";
 import type { Chunk, ContentType } from "./types.ts";
 import { chunkFromDict } from "./types.ts";
+import { computeSourceCacheKey } from "./utils.ts";
 
 export function resolveCacheFolder(): string {
   const name = "miru";
@@ -30,8 +31,8 @@ export function resolveCacheFolder(): string {
   return base;
 }
 
-export function findIndexCachePath(path: string): string {
-  const normalized = resolve(path);
+export function findIndexCachePath(path: string, ref?: string | null): string {
+  const normalized = computeSourceCacheKey(path, ref);
   const subdir = createHash("sha256").update(normalized, "utf-8").digest("hex");
   return join(resolveCacheFolder(), subdir, "index");
 }

package/src/chunking/structural.ts

@@ -5,7 +5,16 @@ import {
   splitLinesKeepEnds,
 } from "./lines.ts";
 
-const SUPPORTED_STRUCTURAL_LANGUAGES = new Set(["python", "go", "typescript", "javascript"]);
+const SUPPORTED_STRUCTURAL_LANGUAGES = new Set([
+  "python",
+  "go",
+  "typescript",
+  "javascript",
+  "cpp",
+  "c",
+]);
+
+const BRACE_FAMILY_LANGUAGES = new Set(["cpp", "c"]);
 
 export function chunkStructural(
   source: string,
@@ -164,9 +173,27 @@ function declPattern(language: string): RegExp {
   if (language === "go") {
     return /^\s*(func\b|type\b.*\b(struct|interface)\b)/;
   }
+  if (language === "cpp") {
+    return /^\s*(?:(?:template\s*<[^>]*>\s*)?(?:class|struct|namespace|enum(?:\s+class)?)\b|(?!(?:if|for|while|switch|catch|return|sizeof|static_assert|else|do)\b)(?:[\w:~<>,*&]+\s+)+\w+\s*\([^;{}]*\)\s*(?:const)?\s*(?:override)?(?:\s*=\s*0)?)/;
+  }
+  if (language === "c") {
+    return /^\s*(?:struct|enum|union|typedef)\b|(?!(?:if|for|while|switch|return|sizeof|else|do)\b)(?:[\w:*\s]+\s+)+\w+\s*\([^;{}]*\)/;
+  }
   return /^\s*(export\s+)?(async\s+function\b|function\b|class\b|interface\b|type\b|(?:const|let|var)\s+[A-Za-z_$][\w$]*\s*=\s*(?:async\s*)?(?:\([^)]*\)|[A-Za-z_$][\w$]*)(?:\s*:\s*[^=]+)?\s*=>)/;
 }
 
+function isBraceFamilyTypeDecl(text: string, language: string): boolean {
+  if (language === "cpp") {
+    return /^\s*(?:(?:template\s*<[^>]*>\s*)?(?:class|struct|namespace|enum(?:\s+class)?)\b)/.test(
+      text,
+    );
+  }
+  if (language === "c") {
+    return /^\s*(?:struct|enum|union)\b/.test(text);
+  }
+  return false;
+}
+
 function braceUnits(lines: LineGroup[], language: string): ChunkBoundary[] {
   const units: ChunkBoundary[] = [];
   const full = lines.map((l) => l.text).join("");
@@ -178,6 +205,13 @@ function braceUnits(lines: LineGroup[], language: string): ChunkBoundary[] {
     if (!re.test(text)) {
       continue;
     }
+    if (
+      BRACE_FAMILY_LANGUAGES.has(language) &&
+      lineIndent(text) > 0 &&
+      !isBraceFamilyTypeDecl(text, language)
+    ) {
+      continue;
+    }
     if (firstDeclStart === null) {
       firstDeclStart = lines[i]?.start;
     }

package/src/cli.ts

@@ -1,5 +1,4 @@
 #!/usr/bin/env bun
-import { resolve } from "node:path";
 import { type AgentId, writeAgentFile } from "./agents.ts";
 import { clearCache } from "./cache.ts";
 import {
@@ -12,8 +11,8 @@ import {
   success,
 } from "./cli-ui.ts";
 import { loadStoredCredentials } from "./credentials.ts";
-import { loadEnvFiles } from "./env-files.ts";
 import { normalizeTakaraApiKeyEnv } from "./env.ts";
+import { loadEnvFiles } from "./env-files.ts";
 import {
   AGENT_IDS,
   formatUnknownAgent,
@@ -27,7 +26,7 @@ import { MiruIndex } from "./miru-index.ts";
 import { ensureCredentials, runClearCredentials, runSetup } from "./setup.ts";
 import { withSpinner } from "./spinner.ts";
 import type { ContentType, SearchResult } from "./types.ts";
-import { formatResults, resolveChunk, resolveContent } from "./utils.ts";
+import { formatResults, resolveChunk, resolveContent, resolveSearchPath } from "./utils.ts";
 
 loadEnvFiles();
 normalizeTakaraApiKeyEnv();
@@ -283,7 +282,7 @@ async function runCli(argv: string[]): Promise<void> {
   }
 
   if (command === "clear") {
-    const path = resolve(rest[0] ?? process.cwd());
+    const path = resolveSearchPath(rest[0] ?? process.cwd());
     await runClear(path);
     return;
   }
@@ -298,7 +297,7 @@ async function runCli(argv: string[]): Promise<void> {
       printCommandHelp("search");
       process.exit(1);
     }
-    const path = resolve(sizedRest[1] ?? process.cwd());
+    const path = resolveSearchPath(sizedRest[1] ?? process.cwd());
     await runSearch(path, query, topK, content, jsonFlag);
     return;
   }
@@ -311,7 +310,7 @@ async function runCli(argv: string[]): Promise<void> {
       process.exit(1);
     }
     const line = Number(lineRaw);
-    const path = resolve(sizedRest[2] ?? process.cwd());
+    const path = resolveSearchPath(sizedRest[2] ?? process.cwd());
     try {
       await runFindRelated(path, filePath, line, topK, content, jsonFlag);
     } catch (err) {

package/src/env.ts

@@ -33,7 +33,8 @@ export function envOptionalInt(names: string[], min = 1): number | undefined {
 
 export const TAKARA_API_KEY_ENV = "TAKARA_API_KEY";
 
-const TAKARA_API_KEY_PLACEHOLDERS = new Set(["${TAKARA_API_KEY}", "$TAKARA_API_KEY"]);
+const MCP_KEY_PLACEHOLDER = "$" + "{TAKARA_API_KEY}";
+const TAKARA_API_KEY_PLACEHOLDERS = new Set([MCP_KEY_PLACEHOLDER, "$TAKARA_API_KEY"]);
 
 /** True when the value is a real key, not empty or an unexpanded MCP env placeholder. */
 export function isUsableTakaraApiKey(value: string | undefined): boolean {

package/src/index/files.ts

@@ -21,11 +21,14 @@ const EXTENSION_TO_LANGUAGE: Record<string, string> = {
   ".kt": "kotlin",
   ".kts": "kotlin",
   ".c": "c",
-  ".h": "c",
+  ".h": "cpp",
   ".cpp": "cpp",
   ".cc": "cpp",
   ".cxx": "cpp",
   ".hpp": "cpp",
+  ".hh": "cpp",
+  ".hxx": "cpp",
+  ".h++": "cpp",
   ".cs": "csharp",
   ".rb": "ruby",
   ".php": "php",

package/src/installer/agents.ts

@@ -1,4 +1,5 @@
 import { existsSync } from "node:fs";
+import { readdir } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import type { AgentId } from "../agents.ts";
@@ -19,30 +20,21 @@ export const MIRU_END = "<!-- miru:end -->";
 
 const HOME = homedir();
 
-const TAKARA_KEY_PLACEHOLDER = "$" + "{TAKARA_API_KEY}";
-
-const MCP_ENV: Record<string, string> = {
-  TAKARA_API_KEY: TAKARA_KEY_PLACEHOLDER,
-};
-
 const STDIO_SERVER_CONFIG: Record<string, unknown> = {
   command: "bunx",
   args: ["@takara-ai/miru-code"],
   type: "stdio",
-  env: MCP_ENV,
 };
 
 const BARE_STDIO_SERVER_CONFIG: Record<string, unknown> = {
   command: "bunx",
   args: ["@takara-ai/miru-code"],
-  env: MCP_ENV,
 };
 
 const OPENCODE_SERVER_CONFIG: Record<string, unknown> = {
   command: ["bunx", "@takara-ai/miru-code"],
   type: "local",
   enabled: true,
-  environment: MCP_ENV,
 };
 
 export const INSTRUCTIONS = `${MIRU_START}
@@ -54,7 +46,7 @@ A \`miru\` MCP server is available with two tools:
 
 Always call \`search\` before using Grep, Glob, or Read to explore the codebase. Use Grep/Glob/Read only for exact path lookup, exhaustive literal matches, or when the returned chunk lacks enough context.
 
-Run \`miru setup\` once to store your API key — the MCP server loads it from \`credentials.json\`. Optionally set \`TAKARA_API_KEY\` in MCP config to override.
+Run \`miru setup\` once to store your API key — the MCP server loads it from \`credentials.json\` automatically.
 
 Pass \`--content docs\` to search documentation, \`--content config\` for config files, or \`--content all\` for everything.
 
@@ -92,7 +84,7 @@ export interface McpConfig {
 }
 
 export interface AgentTarget {
-  id: AgentId | "codex" | "vscode";
+  id: AgentId | "codex" | "vscode" | "visualstudio";
   displayName: string;
   binary: string | null;
   configDir: string | null;
@@ -128,6 +120,45 @@ export function vscodeMcpPath(): string {
   return join(xdg, "Code", "User", "mcp.json");
 }
 
+/** Global MCP config for Visual Studio (GitHub Copilot Agent Mode). */
+export function visualStudioMcpPath(): string {
+  const profile = process.env.USERPROFILE ?? HOME;
+  return join(profile, ".mcp.json");
+}
+
+export function visualStudioInstallDir(): string | null {
+  if (process.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") {
+    return false;
+  }
+
+  const installDir = visualStudioInstallDir();
+  if (installDir && existsSync(installDir)) {
+    try {
+      const entries = await readdir(installDir);
+      if (entries.length > 0) {
+        return true;
+      }
+    } catch {
+      // ignore unreadable install directory
+    }
+  }
+
+  try {
+    const proc = Bun.spawn(["where", "devenv"], { stdout: "pipe", stderr: "ignore" });
+    return (await proc.exited) === 0;
+  } catch {
+    return false;
+  }
+}
+
 function jsonMcp(path: string, key: string, entry: Record<string, unknown>): McpConfig {
   return { path, key, memberKey: "miru", entry, format: "json" };
 }
@@ -171,7 +202,6 @@ export const AGENT_TARGETS: AgentTarget[] = [
     mcp: jsonMcp(join(HOME, ".kiro", "settings", "mcp.json"), "mcpServers", {
       ...STDIO_SERVER_CONFIG,
       env: {
-        ...MCP_ENV,
         PATH: "/usr/local/bin:/usr/bin:/bin",
       },
     }),
@@ -225,19 +255,34 @@ export const AGENT_TARGETS: AgentTarget[] = [
     subagentPath: null,
     subagentId: null,
   },
+  {
+    id: "visualstudio",
+    displayName: process.platform === "win32" ? "Visual Studio" : "Visual Studio (Windows)",
+    binary: null,
+    configDir: visualStudioInstallDir(),
+    mcp: jsonMcp(visualStudioMcpPath(), "servers", STDIO_SERVER_CONFIG),
+    instructionsPath: null,
+    subagentPath: null,
+    subagentId: null,
+  },
 ];
 
+async function commandOnPath(command: string): Promise<boolean> {
+  const lookup = process.platform === "win32" ? ["where", command] : ["which", command];
+  try {
+    const proc = Bun.spawn(lookup, { stdout: "pipe", stderr: "ignore" });
+    return (await proc.exited) === 0;
+  } catch {
+    return false;
+  }
+}
+
 export async function isAgentDetected(agent: AgentTarget): Promise<boolean> {
-  if (agent.binary) {
-    try {
-      const proc = Bun.spawn(["which", agent.binary], { stdout: "pipe", stderr: "ignore" });
-      const code = await proc.exited;
-      if (code === 0) {
-        return true;
-      }
-    } catch {
-      // which unavailable
-    }
+  if (agent.id === "visualstudio") {
+    return detectVisualStudio();
+  }
+  if (agent.binary && (await commandOnPath(agent.binary))) {
+    return true;
   }
   if (agent.configDir) {
     return Bun.file(agent.configDir).exists();

package/src/installer/config.ts

@@ -6,7 +6,6 @@ const CODEX_MCP_HEADER = "[mcp_servers.miru]";
 const CODEX_MCP_BLOCK = `[mcp_servers.miru]
 command = "bunx"
 args = ["@takara-ai/miru-code"]
-env = { TAKARA_API_KEY = "\${TAKARA_API_KEY}" }
 `;
 
 /** Strip line and block comments so JSONC configs can be parsed. */

package/src/utils.ts

@@ -62,3 +62,8 @@ export function computeSourceCacheKey(source: string, ref?: string | null): stri
   }
   return resolve(source);
 }
+
+/** Resolve a local search path; leave git URLs unchanged for remote indexing. */
+export function resolveSearchPath(path: string): string {
+  return isGitUrl(path) ? path : resolve(path);
+}