Skip to content

fix(mcp): match fidelity globs with path.Match, not filepath.Match #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tiendungdev wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −4
Open

fix(mcp): match fidelity globs with path.Match, not filepath.Match #647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions internal/mcp/fidelity_globs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mcp

import (
"path"
"path/filepath"
"strings"

Expand Down Expand Up @@ -89,7 +90,8 @@ func fidelityDecideForPath(rules []fidelityRule, relPath string) func(elide.Decl
// matchFidelityGlob matches a glob against a forward-slash relative
// path. It extends matchPathPattern's basename/prefix semantics with
// explicit `**` support so the documented `internal/**` / `**/*.go`
// forms work as written (Go's filepath.Match never crosses `/`).
// forms work as written (a single `*` never crosses `/` — see
// matchSegmentGlob for why that requires path.Match, not filepath.Match).
func matchFidelityGlob(pattern, rel string) bool {
pattern = filepath.ToSlash(pattern)
rel = filepath.ToSlash(rel)
Expand Down Expand Up @@ -125,13 +127,20 @@ func matchFidelityGlob(pattern, rel string) bool {
}

// matchSegmentGlob applies the single-segment glob semantics shared
// with matchPathPattern: filepath.Match against the full path and the
// with matchPathPattern: a glob match against the full path and the
// basename, plus a bare directory-prefix shortcut.
//
// path.Match, not filepath.Match. Both callers hand this function a
// forward-slash path, and filepath.Match's separator is the platform's:
// on Windows '/' is an ordinary character there, so `*` crosses it and
// `internal/*.go` matches `internal/sub/x.go`. path.Match's separator is
// always '/', which is the semantics this file's `**` handling — and its
// own doc-comment — already assume.
func matchSegmentGlob(pattern, rel string) bool {
if ok, _ := filepath.Match(pattern, rel); ok {
if ok, _ := path.Match(pattern, rel); ok {
return true
}
if ok, _ := filepath.Match(pattern, filepath.Base(rel)); ok {
if ok, _ := path.Match(pattern, path.Base(rel)); ok {
return true
}
if strings.HasSuffix(pattern, "/*") {
Expand Down
Loading