The legacy instance paths were no longer running InstanceBootstrap, so the file watcher service was never started for normal Hono/CLI flows. Restored bootstrap initialization

Author: Eric-Guo

packages/opencode/src/cli/bootstrap.ts

@@ -1,9 +1,11 @@
 import { AppRuntime } from "@/effect/app-runtime"
+import { InstanceBootstrap } from "../project/bootstrap"
 import { Instance } from "../project/instance"
 
 export async function bootstrap<T>(directory: string, cb: () => Promise<T>) {
   return Instance.provide({
     directory,
+    init: () => AppRuntime.runPromise(InstanceBootstrap.Service.use((bootstrap) => bootstrap.run)),
     fn: async () => {
       try {
         const result = await cb()

packages/opencode/src/cli/cmd/tui/worker.ts

@@ -2,6 +2,7 @@ import { Installation } from "@/installation"
 import { Server } from "@/server/server"
 import * as Log from "@opencode-ai/core/util/log"
 import { Instance } from "@/project/instance"
+import { InstanceBootstrap } from "@/project/bootstrap"
 import { Rpc } from "@/util/rpc"
 import { upgrade } from "@/cli/upgrade"
 import { Config } from "@/config/config"
@@ -76,6 +77,7 @@ export const rpc = {
   async checkUpgrade(input: { directory: string }) {
     await Instance.provide({
       directory: input.directory,
+      init: () => AppRuntime.runPromise(InstanceBootstrap.Service.use((bootstrap) => bootstrap.run)),
       fn: async () => {
         await upgrade().catch(() => {})
       },

packages/opencode/src/effect/app-runtime.ts

@@ -40,6 +40,7 @@ import { Truncate } from "@/tool/truncate"
 import { ToolRegistry } from "@/tool/registry"
 import { Format } from "@/format"
 import { Project } from "@/project/project"
+import { InstanceBootstrap } from "@/project/bootstrap"
 import { Vcs } from "@/project/vcs"
 import { Workspace } from "@/control-plane/workspace"
 import { Worktree } from "@/worktree"
@@ -91,6 +92,7 @@ export const AppLayer = Layer.mergeAll(
   ToolRegistry.defaultLayer,
   Format.defaultLayer,
   Project.defaultLayer,
+  InstanceBootstrap.defaultLayer,
   Vcs.defaultLayer,
   Workspace.defaultLayer,
   Worktree.defaultLayer,

packages/opencode/src/server/routes/instance/middleware.ts

@@ -1,5 +1,6 @@
 import type { MiddlewareHandler } from "hono"
 import { Instance } from "@/project/instance"
+import { InstanceBootstrap } from "@/project/bootstrap"
 import { AppRuntime } from "@/effect/app-runtime"
 import { AppFileSystem } from "@opencode-ai/core/filesystem"
 import { WorkspaceContext } from "@/control-plane/workspace-context"
@@ -23,6 +24,7 @@ export function InstanceMiddleware(workspaceID?: WorkspaceID): MiddlewareHandler
       async fn() {
         return Instance.provide({
           directory,
+          init: () => AppRuntime.runPromise(InstanceBootstrap.Service.use((bootstrap) => bootstrap.run)),
           async fn() {
             return next()
           },

packages/opencode/src/server/workspace.ts

@@ -5,6 +5,7 @@ import { WorkspaceID } from "@/control-plane/schema"
 import { WorkspaceContext } from "@/control-plane/workspace-context"
 import { Workspace } from "@/control-plane/workspace"
 import { Flag } from "@opencode-ai/core/flag/flag"
+import { InstanceBootstrap } from "@/project/bootstrap"
 import { Instance } from "@/project/instance"
 import { Session } from "@/session/session"
 import { SessionID } from "@/session/schema"
@@ -99,6 +100,7 @@ export function WorkspaceRouterMiddleware(upgrade: UpgradeWebSocket): Middleware
         fn: () =>
           Instance.provide({
             directory: target.directory,
+            init: () => AppRuntime.runPromise(InstanceBootstrap.Service.use((bootstrap) => bootstrap.run)),
             async fn() {
               return next()
             },

packages/opencode/test/file/watcher.test.ts

@@ -5,6 +5,7 @@ import path from "path"
 import { ConfigProvider, Deferred, Effect, Layer, ManagedRuntime, Option } from "effect"
 import { tmpdir } from "../fixture/fixture"
 import { Bus } from "../../src/bus"
+import { bootstrap } from "../../src/cli/bootstrap"
 import { Config } from "@/config/config"
 import { FileWatcher } from "../../src/file/watcher"
 import { Git } from "../../src/git"
@@ -170,6 +171,34 @@ describeWatcher("FileWatcher", () => {
     )
   })
 
+  test("bootstrap starts root watcher events", async () => {
+    await using tmp = await tmpdir({ git: true })
+    const file = path.join(tmp.path, "bootstrap-watch.txt")
+    const previousFileWatcher = process.env.OPENCODE_EXPERIMENTAL_FILEWATCHER
+    const previousDisableFileWatcher = process.env.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER
+
+    process.env.OPENCODE_EXPERIMENTAL_FILEWATCHER = "true"
+    process.env.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER = "false"
+
+    try {
+      await bootstrap(tmp.path, async () => {
+        await Effect.runPromise(ready(tmp.path))
+        await Effect.runPromise(
+          nextUpdate(
+            tmp.path,
+            (evt) => evt.file === file && evt.event === "add",
+            Effect.promise(() => fs.writeFile(file, "bootstrap")),
+          ).pipe(Effect.tap((evt) => Effect.sync(() => expect(evt).toEqual({ file, event: "add" })))),
+        )
+      })
+    } finally {
+      if (previousFileWatcher === undefined) delete process.env.OPENCODE_EXPERIMENTAL_FILEWATCHER
+      else process.env.OPENCODE_EXPERIMENTAL_FILEWATCHER = previousFileWatcher
+      if (previousDisableFileWatcher === undefined) delete process.env.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER
+      else process.env.OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER = previousDisableFileWatcher
+    }
+  })
+
   test("watches non-git roots", async () => {
     await using tmp = await tmpdir()
     const file = path.join(tmp.path, "plain.txt")