Skip to content

Add timeout for file watcher subscribe to address hangs on Rosetta x86 emulation #5350

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

Closed
matthewijordan wants to merge 4 commits into from
Closed

Add timeout for file watcher subscribe to address hangs on Rosetta x86 emulation #5350

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4f9b8a
Add timeout for file watcher subscribe on Rosetta x86 emulation
matthewijordan Dec 10, 2025
5138362
Update packages/opencode/src/file/watcher.ts
rekram1-node Dec 11, 2025
5f38254
Merge branch 'dev' into fix-rosetta-watcher-timeout
rekram1-node Dec 11, 2025
55a681d
fix
rekram1-node Dec 11, 2025
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
29 changes: 26 additions & 3 deletions packages/opencode/src/file/watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,29 @@ export namespace FileWatcher {
return createWrapper(binding) as typeof import("@parcel/watcher")
})

// WORKAROUND: Timeout for watcher subscribe - hangs indefinitely on x86 emulation via Rosetta (parcel-bundler/watcher#159)
// On timeout: no auto-detection of branch switches or external file changes
const SUBSCRIBE_TIMEOUT_MS = 5000

async function subscribeWithTimeout(
dir: string,
callback: ParcelWatcher.SubscribeCallback,
options: Parameters<typeof ParcelWatcher.subscribe>[2],
): Promise<ParcelWatcher.AsyncSubscription | null> {
const timeout = new Promise<null>((resolve) => {
setTimeout(() => {
log.error("watcher subscribe timeout", { dir })
resolve(null)
}, SUBSCRIBE_TIMEOUT_MS)
})
try {
return await Promise.race([watcher().subscribe(dir, callback, options), timeout])
} catch (e) {
log.warn("watcher subscribe failed", { dir, error: e })
return null
}
}
Comment thread
rekram1-node marked this conversation as resolved.

const state = Instance.state(
async () => {
if (Instance.project.vcs !== "git") return {}
Expand All @@ -57,11 +80,11 @@ export namespace FileWatcher {
}
}

const subs = []
const subs: (ParcelWatcher.AsyncSubscription | null)[] = []
const cfgIgnores = cfg.watcher?.ignore ?? []

subs.push(
await watcher().subscribe(Instance.directory, subscribe, {
await subscribeWithTimeout(Instance.directory, subscribe, {
ignore: [...FileIgnore.PATTERNS, ...cfgIgnores],
backend,
}),
Expand All @@ -70,7 +93,7 @@ export namespace FileWatcher {
const vcsDir = await $`git rev-parse --git-dir`.quiet().nothrow().cwd(Instance.worktree).text()
if (vcsDir && !cfgIgnores.includes(".git") && !cfgIgnores.includes(vcsDir)) {
subs.push(
await watcher().subscribe(vcsDir, subscribe, {
await subscribeWithTimeout(vcsDir, subscribe, {
ignore: ["hooks", "info", "logs", "objects", "refs", "worktrees", "modules", "lfs"],
backend,
}),
Expand Down