lmin/zmo-cli
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(watcher): resolve symlinked .git path before subscribing (#27016)

Browse Source 
Co-authored-by: Simon Klee <hello@simonklee.dk>
This commit is contained in:
Kagura
2026-05-15 15:34:53 +08:00
committed by GitHub
parent ca8f578f2f
commit 1ac3f09468
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/opencode/src/file/watcher.ts
View File

@@ -2,7 +2,7 @@ import { Cause, Effect, Layer, Context, Schema } from "effect"
// @ts-ignore
import { createWrapper } from "@parcel/watcher/wrapper"
import type ParcelWatcher from "@parcel/watcher"
import { readdir } from "fs/promises"
import { readdir, realpath } from "fs/promises"
import path from "path"
import { Bus } from "@/bus"
import { BusEvent } from "@/bus/bus-event"
@@ -131,8 +131,11 @@ export const layer = Layer.effect(
const result = yield* git.run(["rev-parse", "--git-dir"], {
cwd: ctx.worktree,
})
const vcsDir = result.exitCode === 0 ? path.resolve(ctx.worktree, result.text().trim()) : undefined
if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir)) {
const resolved = result.exitCode === 0 ? path.resolve(ctx.worktree, result.text().trim()) : undefined
const vcsDir = resolved
? yield* Effect.promise(() => realpath(resolved).catch(() => resolved))
: undefined
if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir) && (!resolved || !cfgIgnores.includes(resolved))) {
const ignore = (yield* Effect.promise(() => readdir(vcsDir).catch(() => []))).filter(
(entry) => entry !== "HEAD",
)