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

refactor(file): yield instance context in watcher (#25205)

Browse Source
This commit is contained in:
Kit Langton
2026-04-30 21:45:21 -04:00
committed by GitHub
parent a083c88e87
commit c2a97a7a6c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import { BusEvent } from "@/bus/bus-event"
import { InstanceState } from "@/effect/instance-state" import { InstanceState } from "@/effect/instance-state"
import { Flag } from "@opencode-ai/core/flag/flag" import { Flag } from "@opencode-ai/core/flag/flag"
import { Git } from "@/git" import { Git } from "@/git"
import { Instance } from "@/project/instance"
import { lazy } from "@/util/lazy" import { lazy } from "@/util/lazy"
import { Config } from "@/config/config" import { Config } from "@/config/config"
import { FileIgnore } from "./ignore" import { FileIgnore } from "./ignore"
@@ -76,25 +75,27 @@ export const layer = Layer.effect(
function* () { function* () {
if (yield* Flag.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER) return if (yield* Flag.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER) return
log.info("init", { directory: Instance.directory }) const ctx = yield* InstanceState.context
log.info("init", { directory: ctx.directory })
const backend = getBackend() const backend = getBackend()
if (!backend) { if (!backend) {
log.error("watcher backend not supported", { directory: Instance.directory, platform: process.platform }) log.error("watcher backend not supported", { directory: ctx.directory, platform: process.platform })
return return
} }
const w = watcher() const w = watcher()
if (!w) return if (!w) return
log.info("watcher backend", { directory: Instance.directory, platform: process.platform, backend }) log.info("watcher backend", { directory: ctx.directory, platform: process.platform, backend })
const subs: ParcelWatcher.AsyncSubscription[] = [] const subs: ParcelWatcher.AsyncSubscription[] = []
yield* Effect.addFinalizer(() => yield* Effect.addFinalizer(() =>
Effect.promise(() => Promise.allSettled(subs.map((sub) => sub.unsubscribe()))), Effect.promise(() => Promise.allSettled(subs.map((sub) => sub.unsubscribe()))),
) )
const cb: ParcelWatcher.SubscribeCallback = Instance.bind((err, evts) => { const cb: ParcelWatcher.SubscribeCallback = InstanceState.bind((err, evts) => {
if (err) return if (err) return
for (const evt of evts) { for (const evt of evts) {
if (evt.type === "create") void Bus.publish(Event.Updated, { file: evt.path, event: "add" }) if (evt.type === "create") void Bus.publish(Event.Updated, { file: evt.path, event: "add" })
@@ -122,19 +123,18 @@ export const layer = Layer.effect(
const cfgIgnores = cfg.watcher?.ignore ?? [] const cfgIgnores = cfg.watcher?.ignore ?? []
if (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) { if (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) {
yield* subscribe(Instance.directory, [ yield* subscribe(ctx.directory, [
...FileIgnore.PATTERNS, ...FileIgnore.PATTERNS,
...cfgIgnores, ...cfgIgnores,
...protecteds(Instance.directory), ...protecteds(ctx.directory),
]) ])
} }
if (Instance.project.vcs === "git") { if (ctx.project.vcs === "git") {
const result = yield* git.run(["rev-parse", "--git-dir"], { const result = yield* git.run(["rev-parse", "--git-dir"], {
cwd: Instance.project.worktree, cwd: ctx.worktree,
}) })
const vcsDir = const vcsDir = result.exitCode === 0 ? path.resolve(ctx.worktree, result.text().trim()) : undefined
result.exitCode === 0 ? path.resolve(Instance.project.worktree, result.text().trim()) : undefined
if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir)) { if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir)) {
const ignore = (yield* Effect.promise(() => readdir(vcsDir).catch(() => []))).filter( const ignore = (yield* Effect.promise(() => readdir(vcsDir).catch(() => []))).filter(
(entry) => entry !== "HEAD", (entry) => entry !== "HEAD",