The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
fix(omp): resolve file:// URLs and WSL drive paths the way Node does
Kyle Elliottf1b475cde59a
diff --git a/cli/beacon-hooks/cmd/omp_paths_test.go b/cli/beacon-hooks/cmd/omp_paths_test.goindex 6820d28c..114ccae4 100644--- a/cli/beacon-hooks/cmd/omp_paths_test.go+++ b/cli/beacon-hooks/cmd/omp_paths_test.go@@ -137,6 +137,11 @@ func TestOmpDriveAliasPathFollowsTheHost(t *testing.T) {{"C:/Users/me/a.go", "linux", true, "/mnt/c/Users/me/a.go"},{`C:\Users\me\a.go`, "linux", false, `C:\Users\me\a.go`},{"/c/Users/me/a.go", "darwin", false, "/c/Users/me/a.go"},+ // `..` stops at the drive root, as path.win32.normalize stops it, rather than climbing+ // out of the drive's mount.+ {`C:\..\Windows\a.go`, "linux", true, "/mnt/c/Windows/a.go"},+ {`C:\a\.\b\..\c.go`, "linux", true, "/mnt/c/a/c.go"},+ {`C:\`, "linux", true, "/mnt/c"},} {if got := ompDriveAliasPath(tc.path, tc.goos, tc.wsl); got != tc.want {t.Errorf("ompDriveAliasPath(%q, %s, wsl=%v) = %q, want %q", tc.path, tc.goos, tc.wsl, got, tc.want)@@ -144,6 +149,30 @@ func TestOmpDriveAliasPathFollowsTheHost(t *testing.T) {}}+// A `file://` URL names the path Node's url.fileURLToPath gives it on the host, which is how these+// runtimes read one. On Windows that is a drive or UNC path, not the URL's `/C:/...` path, which is+// not absolute there.+func TestFileURLPathFollowsTheHost(t *testing.T) {+ for _, tc := range []struct{ url, goos, want string }{+ {"file:///C:/Users/me/a.go", "windows", `C:\Users\me\a.go`},+ {"file:///c:/my%20docs/a.go", "windows", `c:\my docs\a.go`},+ {"file://localhost/C:/a.go", "windows", `C:\a.go`},+ {"file://C:/a.go", "windows", `C:\a.go`},+ {"file://server/share/a.go", "windows", `\\server\share\a.go`},+ {"file:///Users/me/a.go", "windows", ""},+ {"file:///C:/a%5Cb.go", "windows", ""},+ {"file:///repo/main.go", "darwin", "/repo/main.go"},+ {"file://localhost/repo/main.go", "linux", "/repo/main.go"},+ {"file:///repo/my%20notes.md", "linux", "/repo/my notes.md"},+ {"file://server/share/a.go", "linux", ""},+ {"file:///repo/a%2Fb.go", "linux", ""},+ } {+ if got := fileURLPath(tc.url, tc.goos); got != tc.want {+ t.Errorf("fileURLPath(%q, %s) = %q, want %q", tc.url, tc.goos, got, tc.want)+ }+ }+}+// Oh My Pi's default edit format can change several files in one call. Its result names no single// path, so each changed file is recorded as its own file.modified, keeping the edit's operation.func TestOmpMultiFileEditRecordsEachFile(t *testing.T) {diff --git a/cli/beacon-hooks/cmd/pi_family.go b/cli/beacon-hooks/cmd/pi_family.goindex 5e2c463c..68658ee3 100644--- a/cli/beacon-hooks/cmd/pi_family.go+++ b/cli/beacon-hooks/cmd/pi_family.go@@ -4,7 +4,6 @@ import ("encoding/json""net/url""os"- "path""path/filepath""regexp""runtime"@@ -394,7 +393,7 @@ func ompDeviceCall(call piToolCall) (piToolCall, bool) {// treats as one; the goose mapper refuses web URLs there for the same reason, and the collector// accepts only `file://` URIs. The runtime draws the same line: it reports a read's source as a// `path`, a `url` or an `internal` resource. A `file://` URI is a path spelled as a URI, and is-// recorded as the path.+// recorded as the path; see fileURLPath.func piFilePath(target string) string {scheme, _, ok := strings.Cut(target, "://")if !ok || !isURIScheme(scheme) {@@ -403,11 +402,54 @@ func piFilePath(target string) string {if !strings.EqualFold(scheme, "file") {return ""}+ return fileURLPath(target, runtime.GOOS)+}++// fileURLPath returns the path a `file://` URL names on goos, or "" when it names none.+//+// It follows Node's url.fileURLToPath, which is what these runtimes, written in TypeScript, use+// to turn the URL into the path they read. The two platforms disagree. On Windows,+// `file:///C:/Users/me/a.go` names `C:\Users\me\a.go` and `file://server/share/a.go` names the+// share `\\server\share\a.go`; a URL with no drive and no host names nothing. Elsewhere the+// URL's path is the path, and a URL with a host names nothing. An encoded separator never names a+// path on either. Taking the URL's path as written on Windows gave `/C:/Users/me/a.go`, which is+// not absolute there, and was then joined onto the working directory.+func fileURLPath(target, goos string) string {parsed, err := url.Parse(target)- if err != nil || (parsed.Host != "" && !strings.EqualFold(parsed.Host, "localhost")) {+ if err != nil {+ return ""+ }+ host, escaped := parsed.Host, parsed.EscapedPath()+ if strings.EqualFold(host, "localhost") {+ host = ""+ }+ // `file://C:/a.go` puts the drive where a host would go; the URL standard reads it as the+ // path's drive letter.+ if len(host) == 2 && host[1] == ':' && isDriveLetter(host[:1]) {+ escaped, host = "/"+host+escaped, ""+ }+ lower := strings.ToLower(escaped)+ if strings.Contains(lower, "%2f") || (goos == "windows" && strings.Contains(lower, "%5c")) {+ return ""+ }+ p, err := url.PathUnescape(escaped)+ if err != nil {+ return ""+ }+ if goos != "windows" {+ if host != "" {+ return ""+ }+ return p+ }+ p = strings.ReplaceAll(p, "/", `\`)+ if host != "" {+ return `\\` + host + p+ }+ if len(p) < 3 || !isDriveLetter(p[1:2]) || p[2] != ':' {return ""}- return parsed.Path+ return p[1:]}// isURIScheme reports whether s is an RFC 3986 scheme. A single letter is not accepted, so a@@ -585,6 +627,10 @@ func ompToolPath(target, cwd, goos string, wsl bool) string {// its normalizeWindowsDriveAliasPath: on Windows, an MSYS or WSL mount root (`/c/...`,// `/mnt/c/...`) is the drive itself (`C:\...`); under WSL, a pasted Windows path (`C:\...`,// `C:/...`) is that drive's mount (`/mnt/c/...`). Anywhere else the path is left alone.+//+// The WSL direction normalizes the Windows path first, as the runtime does with+// path.win32.normalize, so a `..` stops at the drive root: `C:\..\Windows` is `/mnt/c/Windows`,+// never a directory above the drive's mount.func ompDriveAliasPath(p, goos string, wsl bool) string {switch {case goos == "windows":@@ -609,8 +655,23 @@ func ompDriveAliasPath(p, goos string, wsl bool) string {if match == nil {return p}- segments := append([]string{"/mnt", strings.ToLower(match[1])}, nonEmpty(strings.Split(match[2], `\`))...)- return path.Join(segments...)+ var segments []string+ for _, segment := range strings.Split(match[2], `\`) {+ switch segment {+ case "", ".":+ case "..":+ if len(segments) > 0 {+ segments = segments[:len(segments)-1]+ }+ default:+ segments = append(segments, segment)+ }+ }+ mount := "/mnt/" + strings.ToLower(match[1])+ if len(segments) == 0 {+ return mount+ }+ return mount + "/" + strings.Join(segments, "/")default:return p}