@miphamai/cli 0.50.0 → 0.51.0

package/src/tools/file/glob.ts

@@ -1,29 +1,44 @@
 import { Glob } from 'bun'
-import type { ToolDefinition } from '../../shared/index.ts'
+import type { ToolDefinition, CredentialMaskingConfig } from '../../shared/index.ts'
 import { resolveSafe } from '../../security/path'
+import type { Service } from '../../vajra'
+import { toolKey } from '../seam'
+import { withValidation } from '../validation'
+import { maskGlobOutput } from '../../core/credential-masker'
 
-export const globTool: ToolDefinition = {
-  name: 'Glob',
-  description: 'Find files matching a glob pattern.',
-  category: 'file',
-  permission: 'auto',
-  parameters: {
-    type: 'object',
-    properties: {
-      pattern: { type: 'string', description: 'Glob pattern (e.g., "src/**/*.ts")' },
-      path: { type: 'string', description: 'Base directory' },
+export function createGlobTool(credentialConfig?: CredentialMaskingConfig): ToolDefinition {
+  return {
+    name: 'Glob',
+    description: 'Find files matching a glob pattern.',
+    category: 'file',
+    permission: 'auto',
+    parameters: {
+      type: 'object',
+      properties: {
+        pattern: { type: 'string', description: 'Glob pattern (e.g., "src/**/*.ts")' },
+        path: { type: 'string', description: 'Base directory' },
+      },
+      required: ['pattern'],
     },
-    required: ['pattern'],
-  },
-  async execute(params, ctx) {
-    const pattern = params.pattern as string
-    const basePath = resolveSafe(ctx.cwd, (params.path as string) || '.')
-    const glob = new Glob(pattern)
-    const results: string[] = []
-    for await (const file of glob.scan({ cwd: basePath, absolute: true })) {
-      results.push(file)
-      if (results.length >= 500) break
-    }
-    return { success: true, content: results.join('\n') || '(no matches)' }
+    async execute(params, ctx) {
+      const pattern = params.pattern as string
+      const basePath = resolveSafe(ctx.cwd, (params.path as string) || '.')
+      const glob = new Glob(pattern)
+      const results: string[] = []
+      for await (const file of glob.scan({ cwd: basePath, absolute: true })) {
+        results.push(file)
+        if (results.length >= 500) break
+      }
+      const content = results.join('\n') || '(no matches)'
+      return { success: true, content: maskGlobOutput(content, credentialConfig) }
+    },
+  }
+}
+
+export const globToolService: Service = {
+  inject: ['credentials'],
+  apply(ctx) {
+    const credentialConfig = ctx.get<CredentialMaskingConfig>('credentials')
+    ctx.provide(toolKey('Glob'), withValidation(createGlobTool(credentialConfig)))
   },
 }

package/src/tools/file/grep.ts

@@ -1,5 +1,9 @@
-import type { ToolDefinition } from '../../shared/index.ts'
+import type { ToolDefinition, CredentialMaskingConfig } from '../../shared/index.ts'
 import { resolveSafe } from '../../security/path'
+import type { Service } from '../../vajra'
+import { toolKey } from '../seam'
+import { withValidation } from '../validation'
+import { maskSearchOutput } from '../../core/credential-masker'
 
 /** Grep stall guard: a search over a huge tree (or a pathological regex) must
  *  not hang the session for minutes. Matches the Bash tool's 120s ceiling. */
@@ -33,79 +37,97 @@ export function truncateGrepOutput(stdout: string): string {
   return `${out.slice(0, GREP_MAX_OUTPUT_CHARS)}\n\n... (truncated)`
 }
 
-export const grepTool: ToolDefinition = {
-  name: 'Grep',
-  description:
-    'Search file contents using ripgrep (rg) — the recommended code search tool. ' +
-    '~10× faster than grep, with automatic fallback to grep if rg is unavailable. ' +
-    'Use this for single-shot regex searches across files. ' +
-    'Prefer Grep over Bash grep/rg for code search; use Bash only for complex ' +
-    'multi-step pipelines (e.g., pipe to sort/uniq/wc, or chained find+xargs). ' +
-    'Best practice: narrow scope with `path` (directory/file) and `include` ' +
-    '(glob pattern, e.g. "*.ts") before searching. ' +
-    'The `pattern` parameter accepts full regex syntax (e.g., "log.*Error", "\\bclass\\s+\\w+").',
-  category: 'file',
-  permission: 'auto',
-  parameters: {
-    type: 'object',
-    properties: {
-      pattern: { type: 'string', description: 'Regex pattern to search for' },
-      path: { type: 'string', description: 'Directory or file to search in' },
-      include: { type: 'string', description: 'File pattern to include (e.g., "*.ts")' },
+export function createGrepTool(credentialConfig?: CredentialMaskingConfig): ToolDefinition {
+  return {
+    name: 'Grep',
+    description:
+      'Search file contents using ripgrep (rg) — the recommended code search tool. ' +
+      '~10× faster than grep, with automatic fallback to grep if rg is unavailable. ' +
+      'Use this for single-shot regex searches across files. ' +
+      'Prefer Grep over Bash grep/rg for code search; use Bash only for complex ' +
+      'multi-step pipelines (e.g., pipe to sort/uniq/wc, or chained find+xargs). ' +
+      'Best practice: narrow scope with `path` (directory/file) and `include` ' +
+      '(glob pattern, e.g. "*.ts") before searching. ' +
+      'The `pattern` parameter accepts full regex syntax (e.g., "log.*Error", "\\bclass\\s+\\w+").',
+    category: 'file',
+    permission: 'auto',
+    parameters: {
+      type: 'object',
+      properties: {
+        pattern: { type: 'string', description: 'Regex pattern to search for' },
+        path: { type: 'string', description: 'Directory or file to search in' },
+        include: { type: 'string', description: 'File pattern to include (e.g., "*.ts")' },
+      },
+      required: ['pattern'],
     },
-    required: ['pattern'],
-  },
-  async execute(params, ctx) {
-    const pattern = params.pattern as string
-    const searchPath = resolveSafe(ctx.cwd, (params.path as string) || '.')
-    const include = params.include as string | undefined
+    async execute(params, ctx) {
+      const pattern = params.pattern as string
+      const searchPath = resolveSafe(ctx.cwd, (params.path as string) || '.')
+      const include = params.include as string | undefined
+
+      // 1. ripgrep (fast path)
+      const rgArgs = ['rg', '-n', '--heading', '--color=never', '-M', '500', pattern]
+      if (include) rgArgs.push('--glob', include)
+      rgArgs.push(searchPath)
+      try {
+        const { stdout, timedOut, exitCode } = await runSearch(rgArgs, ctx.cwd, GREP_TIMEOUT_MS)
+        if (timedOut) {
+          return {
+            success: false,
+            content: '',
+            error: `Grep timed out after ${GREP_TIMEOUT_MS / 1000}s — narrow scope with "path" and "include".`,
+          }
+        }
+        if (exitCode === 1) return { success: true, content: '(no matches)' }
+        if (exitCode === 0) {
+          return {
+            success: true,
+            content: maskSearchOutput(stdout || '(no matches)', credentialConfig, 'heading'),
+          }
+        }
+        // rg exit 2 (error) or null (killed) → fall through to grep
+      } catch {
+        // rg not installed → fall through to grep
+      }
 
-    // 1. ripgrep (fast path)
-    const rgArgs = ['rg', '-n', '--heading', '--color=never', '-M', '500', pattern]
-    if (include) rgArgs.push('--glob', include)
-    rgArgs.push(searchPath)
-    try {
-      const { stdout, timedOut, exitCode } = await runSearch(rgArgs, ctx.cwd, GREP_TIMEOUT_MS)
-      if (timedOut) {
+      // 2. fallback to plain grep
+      const grepArgs = ['grep', '-rn', pattern, searchPath]
+      try {
+        const { stdout, timedOut, exitCode } = await runSearch(grepArgs, ctx.cwd, GREP_TIMEOUT_MS)
+        if (timedOut) {
+          return {
+            success: false,
+            content: '',
+            error: `Grep timed out after ${GREP_TIMEOUT_MS / 1000}s — narrow scope with "path" and "include".`,
+          }
+        }
+        if (exitCode === 1) return { success: true, content: '(no matches)' }
+        if (exitCode === 0) {
+          return {
+            success: true,
+            content: truncateGrepOutput(maskSearchOutput(stdout, credentialConfig, 'filename')),
+          }
+        }
         return {
           success: false,
           content: '',
-          error: `Grep timed out after ${GREP_TIMEOUT_MS / 1000}s — narrow scope with "path" and "include".`,
+          error: 'grep failed. Install ripgrep: brew install ripgrep',
         }
-      }
-      if (exitCode === 1) return { success: true, content: '(no matches)' }
-      if (exitCode === 0) return { success: true, content: stdout || '(no matches)' }
-      // rg exit 2 (error) or null (killed) → fall through to grep
-    } catch {
-      // rg not installed → fall through to grep
-    }
-
-    // 2. fallback to plain grep
-    const grepArgs = ['grep', '-rn', pattern, searchPath]
-    try {
-      const { stdout, timedOut, exitCode } = await runSearch(grepArgs, ctx.cwd, GREP_TIMEOUT_MS)
-      if (timedOut) {
+      } catch {
         return {
           success: false,
           content: '',
-          error: `Grep timed out after ${GREP_TIMEOUT_MS / 1000}s — narrow scope with "path" and "include".`,
+          error: 'grep failed. Install ripgrep: brew install ripgrep',
         }
       }
-      if (exitCode === 1) return { success: true, content: '(no matches)' }
-      if (exitCode === 0) {
-        return { success: true, content: truncateGrepOutput(stdout) }
-      }
-      return {
-        success: false,
-        content: '',
-        error: 'grep failed. Install ripgrep: brew install ripgrep',
-      }
-    } catch {
-      return {
-        success: false,
-        content: '',
-        error: 'grep failed. Install ripgrep: brew install ripgrep',
-      }
-    }
+    },
+  }
+}
+
+export const grepToolService: Service = {
+  inject: ['credentials'],
+  apply(ctx) {
+    const credentialConfig = ctx.get<CredentialMaskingConfig>('credentials')
+    ctx.provide(toolKey('Grep'), withValidation(createGrepTool(credentialConfig)))
   },
 }

package/src/tools/index.ts

@@ -5,8 +5,8 @@ import { toolService, collectTools } from './seam'
 import { readToolService } from './file/read'
 import { writeTool } from './file/write'
 import { editTool } from './file/edit'
-import { globTool } from './file/glob'
-import { grepTool } from './file/grep'
+import { globToolService } from './file/glob'
+import { grepToolService } from './file/grep'
 import { bashToolService } from './exec/bash'
 import { gitTool } from './exec/git'
 import { taskTool } from './exec/task'
@@ -49,8 +49,6 @@ export function createToolRegistry(
     // File tools
     writeTool,
     editTool,
-    globTool,
-    grepTool,
     // Exec tools
     gitTool,
     taskTool,
@@ -87,9 +85,11 @@ export function createToolRegistry(
   for (const tool of plainTools) {
     ctx.mount(toolService(withValidation(tool)))
   }
-  // 注入工具（credentials 依赖）：read + bash
+  // 注入工具（credentials 依赖）：read + bash + grep + glob
   ctx.mount(readToolService)
   ctx.mount(bashToolService)
+  ctx.mount(grepToolService)
+  ctx.mount(globToolService)
 
   return collectTools(ctx)
 }