@takara-ai/miru-code 1.8.2 → 1.10.0

package/src/installer/prompt.ts

@@ -113,18 +113,9 @@ function parseArrowKey(chunk: Buffer, text: string): string | null {
     const introducer = text.charAt(1);
     if (introducer === "[" || introducer === "O") {
       const arrow = text.charAt(text.length - 1);
-      if (arrow === "A") {
-        return "up";
-      }
-      if (arrow === "B") {
-        return "down";
-      }
-      if (arrow === "C") {
-        return "right";
-      }
-      if (arrow === "D") {
-        return "left";
-      }
+      return (
+        ({ A: "up", B: "down", C: "right", D: "left" } as Record<string, string>)[arrow] ?? null
+      );
     }
   }
 
@@ -308,9 +299,13 @@ function updateConfirmPromptLine(question: string, yesSelected: boolean): void {
   );
 }
 
-export async function promptConfirm(question: string, defaultYes = true): Promise<boolean> {
+export async function promptConfirm(
+  question: string,
+  defaultYes = true,
+  io: { input?: typeof input; output?: typeof output } = {},
+): Promise<boolean> {
   if (!input.isTTY) {
-    const rl = readline.createInterface({ input, output });
+    const rl = readline.createInterface({ input: io.input ?? input, output: io.output ?? output });
     try {
       const hintText = defaultYes ? dim("[Y/n]") : dim("[y/N]");
       const answer = (await rl.question(`${question} ${hintText} `)).trim().toLowerCase();
@@ -354,10 +349,13 @@ export async function promptConfirm(question: string, defaultYes = true): Promis
 export async function promptMultiSelectLegacy<T>(
   title: string,
   items: Array<{ label: string; value: T; checked: boolean }>,
+  io: { input?: typeof input; output?: typeof output } = {},
 ): Promise<T[] | null> {
-  output.write("\n");
-  output.write(`${bold(title)}\n`);
-  divider("─", 48, output);
+  const promptInput = io.input ?? input;
+  const promptOutput = io.output ?? output;
+  promptOutput.write("\n");
+  promptOutput.write(`${bold(title)}\n`);
+  divider("─", 48, promptOutput);
 
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
@@ -365,13 +363,13 @@ export async function promptMultiSelectLegacy<T>(
       continue;
     }
     const mark = item.checked ? cyan("[x]") : dim("[ ]");
-    output.write(`  ${dim(String(i + 1).padStart(2))}. ${mark} ${item.label}\n`);
+    promptOutput.write(`  ${dim(String(i + 1).padStart(2))}. ${mark} ${item.label}\n`);
   }
 
-  output.write("\n");
-  hint("Enter numbers (1,3), 'all', or press Enter for defaults", output);
+  promptOutput.write("\n");
+  hint("Enter numbers (1,3), 'all', or press Enter for defaults", promptOutput);
 
-  const rl = readline.createInterface({ input, output });
+  const rl = readline.createInterface({ input: promptInput, output: promptOutput });
   try {
     const answer = (await rl.question(`${dim("> ")}`)).toLowerCase();
     if (!answer) {
@@ -390,7 +388,7 @@ export async function promptMultiSelectLegacy<T>(
     }
 
     if (indices.size === 0) {
-      warn("No valid selection.", output);
+      warn("No valid selection.", promptOutput);
       return null;
     }
 

package/src/installer/search-policy.ts

@@ -28,15 +28,17 @@ export function buildSearchPolicyBody(native: NativeToolNames): string {
 
 ${SNIPPET_GUIDANCE}
 
+\`repo\` is optional, set it for another repo.
+
 Use Miru MCP tools:
 - \`locate\` — exact substring (env var, symbol, error code); prefer \`mode=count\` or \`locations\`
-- \`search\` — one call per conceptual question; pass project root as \`repo\`
+- \`search\` — one call per conceptual question; use \`include\` / \`exclude\` Gitignore-style globs to scope files (same syntax as \`locate\`)
 - \`expand\` — more context in the same file when \`truncated: true\` (\`file_path\` + \`anchor_line\`)
 - \`find_related\` — similar code in other files (hits may also be snippets; use \`expand\` if truncated)
 
 Call shapes:
-- \`locate(literal="<exact substring>", repo="<project root>")\` — prefer \`mode="locations"\`/\`"count"\`
-- \`search(query="<natural language>", repo="<project root>")\`
+- \`locate(literal="<exact substring>")\` — prefer \`mode="locations"\`/\`"count"\`
+- \`search(query="<natural language>", include=["src/auth/**"])\` — use the same \`include\` / \`exclude\` globs on \`locate\` when scoping an exact-string search
 
 Stop rules:
 - Literal in the request → \`locate\`, not \`search\`
@@ -54,7 +56,7 @@ ${buildSearchPolicyTable(native)}`;
 export function buildMcpWorkflow(native: NativeToolNames): string {
   return `### MCP workflow
 
-1. Call \`search\` with \`repo\` set to the project root (local path or https:// git URL).
+1. Call \`search\`; add \`repo\` only for another repo.
 2. For exact literals, call \`locate\` (prefer \`mode=count\` or \`locations\`).
 3. On \`truncated: true\`, call \`expand\` — only if the snippet doesn't already answer.
 4. Use \`find_related\` to trace similar code in other files — not for more context in the same file.
@@ -71,7 +73,7 @@ miru find-related src/auth.ts 42 .
 \`\`\`
 
 After large refactors or CLI-only use, run \`miru clear <path>\` to rebuild the disk cache.
-If \`miru\` is not on \`$PATH\`, use \`bunx @takara-ai/miru-code\`.`;
+If \`miru\` is not on \`$PATH\`, use \`bunx @takara-ai/miru-code@latest\`.`;
 
 export function buildSubagentBody(native: NativeToolNames): string {
   return `When Miru MCP is available, use MCP \`search\`, \`locate\`, \`expand\`, and \`find_related\` — not ${native.explorationDenied} for exploration.
@@ -118,7 +120,7 @@ export const MCP_SERVER_INSTRUCTIONS =
   "Exact token (identifier, quoted string, env var, error code) → `locate`; everything else → `search` once, no paraphrase retries. " +
   `${SNIPPET_GUIDANCE} ` +
   "`find_related` traces similar code elsewhere, not more context in the same file. " +
-  "Always pass the project root as `repo`; local repos return `absolute_path` — use Read only to edit. " +
+  "`repo` is optional, good for multi repo workflows. " +
   "Native Grep/Glob only outside the indexed repo or for non-code tasks. " +
   "Default indexed scope is code, config, and docs; an empty result can mean out-of-scope, not nonexistent. " +
   "On credential errors, call this server's `auth` tool — not the host `mcp_auth` tool.";
@@ -134,7 +136,7 @@ export const MCP_BENCHMARK_SERVER_INSTRUCTIONS =
 
 export const MCP_SEARCH_TOOL_DESCRIPTION =
   "Your default search for all code search queries in this indexed repo — the best, fastest, and cheapest way to find code; better than any other tool. " +
-  "Returns compact snippets (~±15 lines). One call per question. " +
+  "Returns up to 5 compact snippets (~±15 lines). One call per question. Use `include` / `exclude` Gitignore-style globs to scope files; these work the same way on `locate`. " +
   "Exact literal (env var, symbol, error code, quoted text)? Use `locate` instead. " +
   "On `truncated: true`, call `expand` — only if the snippet doesn't already answer the question.";
 
@@ -155,11 +157,9 @@ export const MCP_EXPAND_TOOL_DESCRIPTION =
   "Use only if `truncated: true` and the snippet doesn't already answer the question — not for similar code elsewhere (use find_related).";
 
 export const MCP_FIND_RELATED_TOOL_DESCRIPTION =
-  "Find code similar to a file:line in OTHER parts of the codebase. Results may be snippets; use `expand` when `truncated: true`. " +
+  "Find up to 5 chunks similar to a file:line in OTHER parts of the codebase. Results may be snippets; use `expand` when `truncated: true`. " +
   "For more context in the same file, use `expand` instead.";
 
 export const MCP_READ_BENCHMARK_TOOL_DESCRIPTION =
   "Cumulative Miru vs Grep token savings from saved `search` and `locate` calls. Returns compact totals {n,saved,save_pct,miru,grep}. " +
   "Do not call unless the user asks about savings.";
-
-export const SEARCH_GUARD_EXPAND_HINT = SNIPPET_GUIDANCE;

package/src/mcp/index-cache.ts

@@ -49,6 +49,11 @@ type CacheEntry = {
   lastError: Error | null;
 };
 
+export interface IndexCacheDependencies {
+  fromSource?: typeof MiruIndex.fromSource;
+  watch?: typeof watch;
+}
+
 export function mcpWatchEnabled(): boolean {
   const raw = process.env.MIRU_MCP_WATCH;
   return raw !== "0" && raw !== "false";
@@ -76,12 +81,20 @@ export function shouldIgnoreWatchPath(relativePath: string | null | undefined):
 export class IndexCache {
   private readonly content: ContentType[];
   private readonly defaultRef: string | null;
+  private readonly fromSource: typeof MiruIndex.fromSource;
+  private readonly watchSource: typeof watch;
   private readonly entries = new Map<string, CacheEntry>();
   readonly watchers = new Map<string, WatcherHandle>();
 
-  constructor(content: ContentType[] = defaultContentTypes(), defaultRef: string | null = null) {
+  constructor(
+    content: ContentType[] = defaultContentTypes(),
+    defaultRef: string | null = null,
+    dependencies: IndexCacheDependencies = {},
+  ) {
     this.content = content;
     this.defaultRef = defaultRef;
+    this.fromSource = dependencies.fromSource ?? MiruIndex.fromSource;
+    this.watchSource = dependencies.watch ?? watch;
   }
 
   private ensureEntry(cacheKey: string, source: string): CacheEntry {
@@ -128,7 +141,7 @@ export class IndexCache {
   ): Promise<MiruIndex> {
     const entry = this.ensureEntry(cacheKey, source);
     const task = (async () => {
-      const index = await MiruIndex.fromSource(source, this.content, undefined, ref);
+      const index = await this.fromSource(source, this.content, undefined, ref);
       if (!isGitUrl(source)) {
         await index.saveToCache(resolve(source));
       }
@@ -342,7 +355,7 @@ export class IndexCache {
 
     let nativeWatcher: ReturnType<typeof watch> | null = null;
     try {
-      nativeWatcher = watch(resolved, { recursive: true }, (_event, filename) => {
+      nativeWatcher = this.watchSource(resolved, { recursive: true }, (_event, filename) => {
         this.noteFileChange(path, filename);
       });
     } catch {

package/src/mcp/server.ts

@@ -24,17 +24,15 @@ import {
 import { formatLiteralLocate } from "../literal.ts";
 import type { Chunk, ContentType, SearchResult } from "../types.ts";
 import {
-  clampMcpTopK,
   DEFAULT_EXPAND_AFTER,
   DEFAULT_EXPAND_BEFORE,
-  DEFAULT_MCP_TOP_K,
   dedupeResultsByFile,
   expandChunksAtLine,
   formatExpandResults,
   formatResults,
   localRepoRoot,
-  MAX_MCP_TOP_K,
   resolveChunk,
+  SEARCH_RESULT_COUNT,
 } from "../utils.ts";
 import { registerAuthTool, toolErrorText } from "./auth-tool.ts";
 import {
@@ -46,12 +44,13 @@ import { getIndexForRepo, type IndexCache, toolText } from "./index-cache.ts";
 import { MiruMcpServer } from "./runtime.ts";
 
 const REPO_DESCRIPTION =
-  "https:// or http:// git URL (e.g. https://github.com/org/repo) or local directory path to index and search. " +
-  "Pass the project root for local workspaces. " +
+  "`repo` is optional. Set a local path or Git URL for another repo. " +
   "The index is built on the first tool call and cached for the session.";
 
 const BENCHMARK_SKIP_NOTES = {
   local_repo_only: "Benchmark comparisons require a local repo path; git URL repos are skipped.",
+  filtered_search:
+    "Benchmark comparisons are skipped when search is restricted by include/exclude patterns.",
   limited_locate:
     "Benchmark comparison skipped: locate.limit is global, while rg/grep limits are per file. Omit limit for a valid token and recall comparison.",
   incompatible_literal_baseline:
@@ -121,9 +120,26 @@ async function persistBenchmarkQuery(
 
 export function createMcpServer(
   cache: IndexCache,
-  options?: { benchmark?: boolean },
+  options?: {
+    benchmark?: boolean;
+    dependencies?: {
+      withGrepTimeoutFallback?: typeof withGrepTimeoutFallback;
+      benchmarkSearchComparison?: typeof benchmarkSearchComparison;
+      benchmarkLocateComparison?: typeof benchmarkLocateComparison;
+      selectComparableLiteralSearchTool?: typeof selectComparableLiteralSearchTool;
+      readBenchmarkRollup?: typeof readBenchmarkRollup;
+    };
+  },
 ): MiruMcpServer {
+  const defaultRepo = process.cwd();
   const benchmark = options?.benchmark ?? false;
+  const dependencies = options?.dependencies;
+  const runWithGrepFallback = dependencies?.withGrepTimeoutFallback ?? withGrepTimeoutFallback;
+  const compareSearch = dependencies?.benchmarkSearchComparison ?? benchmarkSearchComparison;
+  const compareLocate = dependencies?.benchmarkLocateComparison ?? benchmarkLocateComparison;
+  const selectLiteralBaseline =
+    dependencies?.selectComparableLiteralSearchTool ?? selectComparableLiteralSearchTool;
+  const readRollup = dependencies?.readBenchmarkRollup ?? readBenchmarkRollup;
   const server = new MiruMcpServer(
     {
       name: "miru",
@@ -139,37 +155,46 @@ export function createMcpServer(
   server.registerTool(
     "search",
     {
-      description: `${MCP_SEARCH_TOOL_DESCRIPTION} Indexes \`repo\` on first call; later calls reuse the session cache.`,
+      description: `${MCP_SEARCH_TOOL_DESCRIPTION} Indexes the selected directory or URL on first call; later calls reuse the session cache.`,
       inputSchema: {
         query: z
           .string()
           .describe(
             "Natural language or code query — your default for all code search in this repo.",
           ),
-        repo: z.string().describe(REPO_DESCRIPTION),
-        top_k: z
-          .number()
-          .int()
+        repo: z.string().optional().describe(REPO_DESCRIPTION),
+        include: z
+          .array(z.string().min(1))
+          .min(1)
+          .optional()
+          .describe(
+            'Gitignore-style glob patterns; only matching files are searched (e.g. ["src/auth/**", "docs/**/*.md"]). Same semantics as `locate.include`.',
+          ),
+        exclude: z
+          .array(z.string().min(1))
           .min(1)
-          .max(MAX_MCP_TOP_K)
           .optional()
-          .describe(`Number of results (default ${DEFAULT_MCP_TOP_K}, max ${MAX_MCP_TOP_K}).`),
+          .describe(
+            "Gitignore-style glob patterns; matching files are skipped. Same semantics as `locate.exclude`.",
+          ),
         dedupe_by_file: z
           .boolean()
           .optional()
           .describe("Keep only the best hit per file (default true)."),
       },
     },
-    async ({ query, repo, top_k: topK, dedupe_by_file: dedupeByFile }) => {
+    async ({ query, repo, include, exclude, dedupe_by_file: dedupeByFile }) => {
       try {
-        const index = await getIndexForRepo(repo, cache);
-        const repoRoot = localRepoRoot(repo);
-        const k = clampMcpTopK(topK);
-
+        const source = repo ?? defaultRepo;
+        const index = await getIndexForRepo(source, cache);
+        const repoRoot = localRepoRoot(source);
+        const k = SEARCH_RESULT_COUNT;
         let skip: BenchmarkSkipReason | undefined;
-        if (benchmark && repoRoot) {
-          const comparison = await withGrepTimeoutFallback(() =>
-            benchmarkSearchComparison({
+        if (benchmark && (include || exclude)) {
+          skip = "filtered_search";
+        } else if (benchmark && repoRoot) {
+          const comparison = await runWithGrepFallback(() =>
+            compareSearch({
               query,
               repoPath: repoRoot,
               index,
@@ -199,7 +224,7 @@ export function createMcpServer(
           skip = "local_repo_only";
         }
 
-        let results = await index.search({ query, topK: k });
+        let results = await index.search({ query, topK: k, include, exclude });
         if (dedupeByFile !== false) {
           results = dedupeResultsByFile(results);
         }
@@ -237,7 +262,7 @@ export function createMcpServer(
           .describe(
             "Alias for `literal` — accepted so a call shaped like `search(query=...)` still resolves as an exact-substring lookup.",
           ),
-        repo: z.string().describe(REPO_DESCRIPTION),
+        repo: z.string().optional().describe(REPO_DESCRIPTION),
         mode: z
           .enum(["count", "locations", "lines"])
           .optional()
@@ -283,19 +308,20 @@ export function createMcpServer(
         return toolErrorText(new Error("locate requires `literal` (exact substring to find)."));
       }
       try {
-        const index = await getIndexForRepo(repo, cache);
+        const source = repo ?? defaultRepo;
+        const index = await getIndexForRepo(source, cache);
 
         let skip: BenchmarkSkipReason | undefined;
-        const repoRoot = localRepoRoot(repo);
+        const repoRoot = localRepoRoot(source);
         if (benchmark && repoRoot && typeof lit === "string") {
           if (locateOpts.limit != null) {
             skip = "limited_locate";
-          } else if (!selectComparableLiteralSearchTool()) {
+          } else if (!selectLiteralBaseline()) {
             skip = "incompatible_literal_baseline";
           }
           if (!skip) {
-            const comparison = await withGrepTimeoutFallback(() =>
-              benchmarkLocateComparison({
+            const comparison = await runWithGrepFallback(() =>
+              compareLocate({
                 literal: lit,
                 repoPath: repoRoot,
                 index,
@@ -335,7 +361,7 @@ export function createMcpServer(
           .number()
           .int()
           .describe("Line from the search hit (`anchor_line` when truncated, else `start_line`)."),
-        repo: z.string().describe(REPO_DESCRIPTION),
+        repo: z.string().optional().describe(REPO_DESCRIPTION),
         before: z
           .number()
           .int()
@@ -352,8 +378,9 @@ export function createMcpServer(
     },
     async ({ file_path: filePath, anchor_line: anchorLine, repo, before, after }) => {
       try {
-        const index = await getIndexForRepo(repo, cache);
-        const repoRoot = localRepoRoot(repo);
+        const source = repo ?? defaultRepo;
+        const index = await getIndexForRepo(source, cache);
+        const repoRoot = localRepoRoot(source);
         const beforeCount = before ?? DEFAULT_EXPAND_BEFORE;
         const afterCount = after ?? DEFAULT_EXPAND_AFTER;
         const { anchor, chunks: expanded } = expandChunksAtLine(
@@ -396,29 +423,21 @@ export function createMcpServer(
           .number()
           .int()
           .describe("Line from the search hit (`anchor_line` when truncated, else `start_line`)."),
-        repo: z.string().describe(REPO_DESCRIPTION),
-        top_k: z
-          .number()
-          .int()
-          .min(1)
-          .max(MAX_MCP_TOP_K)
-          .optional()
-          .describe(
-            `Number of similar chunks to return (default ${DEFAULT_MCP_TOP_K}, max ${MAX_MCP_TOP_K}).`,
-          ),
+        repo: z.string().optional().describe(REPO_DESCRIPTION),
       },
     },
-    async ({ file_path: filePath, anchor_line: anchorLine, repo, top_k: topK }) => {
+    async ({ file_path: filePath, anchor_line: anchorLine, repo }) => {
       try {
-        const index = await getIndexForRepo(repo, cache);
-        const repoRoot = localRepoRoot(repo);
+        const source = repo ?? defaultRepo;
+        const index = await getIndexForRepo(source, cache);
+        const repoRoot = localRepoRoot(source);
         const chunk = resolveChunk(index.chunks, filePath, anchorLine, repoRoot);
         if (!chunk) {
           return toolText(
             `No chunk found at ${filePath}:${anchorLine}. Make sure the file is indexed and the line number is within a known chunk.`,
           );
         }
-        const results = await index.findRelated(chunk, clampMcpTopK(topK));
+        const results = await index.findRelated(chunk, SEARCH_RESULT_COUNT);
         if (results.length === 0) {
           return toolText(`No related chunks found for ${filePath}:${anchorLine}.`);
         }
@@ -453,7 +472,7 @@ export function createMcpServer(
       },
       async ({ repo }) => {
         try {
-          const rollup = await readBenchmarkRollup({ repo });
+          const rollup = await readRollup({ repo });
           return toolText(JSON.stringify(rollup));
         } catch (err) {
           return toolText(err instanceof Error ? err.message : String(err));

package/src/mcp/stdio.ts

@@ -45,6 +45,21 @@ export class StdioTransport {
   private buffer = "";
   private started = false;
   private abortController: AbortController | null = null;
+  private readonly inputStream: () => ReadableStream<Uint8Array<ArrayBufferLike>>;
+  private readonly writeText: (text: string) => Promise<unknown>;
+
+  constructor(
+    options: {
+      inputStream?: () => ReadableStream<Uint8Array<ArrayBufferLike>>;
+      writeText?: (text: string) => Promise<unknown>;
+      stdin?: { stream: () => ReadableStream<Uint8Array<ArrayBufferLike>> };
+      bunWrite?: (destination: typeof Bun.stdout, text: string) => Promise<unknown>;
+    } = {},
+  ) {
+    this.inputStream = options.inputStream ?? (() => (options.stdin ?? Bun.stdin).stream());
+    this.writeText =
+      options.writeText ?? ((text) => (options.bunWrite ?? Bun.write)(Bun.stdout, text));
+  }
 
   onmessage?: (message: JsonRpcMessage) => void | Promise<void>;
   onerror?: (error: Error) => void;
@@ -56,7 +71,7 @@ export class StdioTransport {
     }
     this.started = true;
     this.abortController = new AbortController();
-    const reader = Bun.stdin.stream().getReader();
+    const reader = this.inputStream().getReader();
     const decoder = new TextDecoder();
 
     try {
@@ -85,7 +100,7 @@ export class StdioTransport {
 
   async send(message: JsonRpcMessage): Promise<void> {
     const line = `${JSON.stringify(message)}\n`;
-    await Bun.write(Bun.stdout, line);
+    await this.writeText(line);
   }
 
   private async append(chunk: string): Promise<void> {