feat(cli): auto-dispose InstanceContext after effectCmd handlers (anomalyco#25481)

Author: kitlangton

packages/opencode/src/acp/agent.ts

@@ -465,6 +465,26 @@ export class Agent implements ACPAgent {
         return
       }
 
+      case "file.edited": {
+        const props = event.properties
+        const session = this.sessionManager.tryGet(props.sessionID)
+        if (!session) return
+
+        if (this.config.clientCapabilities?.fs?.writeTextFile) {
+          try {
+            await this.connection.writeTextFile({
+              sessionId: session.id,
+              path: props.file,
+              content: await Bun.file(props.file).text(),
+            })
+            log.info("synced file edit to ACP client", { filepath: props.file, sessionId: session.id })
+          } catch (error) {
+            log.error("failed to sync file edit to ACP client", { error, filepath: props.file, sessionId: session.id })
+          }
+        }
+        return
+      }
+
       case "message.part.delta": {
         const props = event.properties
         const session = this.sessionManager.tryGet(props.sessionID)

packages/opencode/src/acp/types.ts

@@ -1,4 +1,4 @@
-import type { McpServer } from "@agentclientprotocol/sdk"
+import type { McpServer, ClientCapabilities } from "@agentclientprotocol/sdk"
 import type { OpencodeClient } from "@opencode-ai/sdk/v2"
 import type { ProviderID, ModelID } from "../provider/schema"
 
@@ -21,4 +21,5 @@ export interface ACPConfig {
     providerID: ProviderID
     modelID: ModelID
   }
+  clientCapabilities?: ClientCapabilities
 }

packages/opencode/src/cli/effect-cmd.ts

@@ -2,6 +2,7 @@ import type { Argv } from "yargs"
 import { Effect, Schema } from "effect"
 import { AppRuntime, type AppServices } from "@/effect/app-runtime"
 import { InstanceStore } from "@/project/instance-store"
+import { InstanceRef } from "@/effect/instance-ref"
 import { cmd } from "./cmd/cmd"
 
 /**
@@ -21,6 +22,11 @@ export const fail = (message: string, exitCode = 1) => Effect.fail(new CliError(
  * Effect-native CLI command builder. Wraps yargs `cmd()` so the handler body is
  * an `Effect` with `InstanceRef` provided and any `AppServices` yieldable.
  *
+ * The handler is wrapped in `Effect.ensuring(store.dispose(ctx))` so the loaded
+ * InstanceContext is disposed (runDisposers + IPC `server.instance.disposed`)
+ * on every Exit — success, typed failure, defect, or interruption. Matches the
+ * legacy `bootstrap()` finally-disposal semantics without per-handler boilerplate.
+ *
  * Errors propagate to the existing top-level handler in `src/index.ts`; use
  * `fail("...")` for user-visible domain failures (clean exit, formatted message).
  *
@@ -47,6 +53,17 @@ export const effectCmd = <Args, A>(opts: {
       // yargs typing wraps Args in ArgumentsCamelCase<WithDoubleDash<...>>; cast at the boundary.
       const args = rawArgs as unknown as Args
       const directory = opts.directory?.(args) ?? process.cwd()
-      await AppRuntime.runPromise(InstanceStore.Service.use((s) => s.provide({ directory }, opts.handler(args))))
+      await AppRuntime.runPromise(
+        InstanceStore.Service.use((store) =>
+          store.provide(
+            { directory },
+            Effect.gen(function* () {
+              const ctx = yield* InstanceRef
+              const body = opts.handler(args)
+              return ctx ? yield* body.pipe(Effect.ensuring(store.dispose(ctx))) : yield* body
+            }),
+          ),
+        ),
+      )
     },
   })

packages/opencode/src/file/index.ts

@@ -72,6 +72,7 @@ export const Event = {
     "file.edited",
     Schema.Struct({
       file: Schema.String,
+      sessionID: Schema.String,
     }),
   ),
 }

packages/opencode/src/tool/apply_patch.ts

@@ -249,7 +249,7 @@ export const ApplyPatchTool = Tool.define(
           if (yield* format.file(edited)) {
             yield* Bom.syncFile(afs, edited, change.bom)
           }
-          yield* bus.publish(File.Event.Edited, { file: edited })
+          yield* bus.publish(File.Event.Edited, { file: edited, sessionID: ctx.sessionID })
         }
       }
 

packages/opencode/src/tool/edit.ts

@@ -108,7 +108,7 @@ export const EditTool = Tool.define(
                 if (yield* format.file(filePath)) {
                   contentNew = yield* Bom.syncFile(afs, filePath, desiredBom)
                 }
-                yield* bus.publish(File.Event.Edited, { file: filePath })
+                yield* bus.publish(File.Event.Edited, { file: filePath, sessionID: ctx.sessionID })
                 yield* bus.publish(FileWatcher.Event.Updated, {
                   file: filePath,
                   event: existed ? "change" : "add",
@@ -152,7 +152,7 @@ export const EditTool = Tool.define(
               if (yield* format.file(filePath)) {
                 contentNew = yield* Bom.syncFile(afs, filePath, desiredBom)
               }
-              yield* bus.publish(File.Event.Edited, { file: filePath })
+              yield* bus.publish(File.Event.Edited, { file: filePath, sessionID: ctx.sessionID })
               yield* bus.publish(FileWatcher.Event.Updated, {
                 file: filePath,
                 event: "change",

packages/opencode/src/tool/write.ts

@@ -65,7 +65,7 @@ export const WriteTool = Tool.define(
           if (yield* format.file(filepath)) {
             yield* Bom.syncFile(fs, filepath, desiredBom)
           }
-          yield* bus.publish(File.Event.Edited, { file: filepath })
+          yield* bus.publish(File.Event.Edited, { file: filepath, sessionID: ctx.sessionID })
           yield* bus.publish(FileWatcher.Event.Updated, {
             file: filepath,
             event: exists ? "change" : "add",

packages/sdk/js/src/gen/types.gen.ts

@@ -490,6 +490,7 @@ export type EventFileEdited = {
   type: "file.edited"
   properties: {
     file: string
+    sessionID?: string
   }
 }
 

packages/sdk/js/src/v2/gen/types.gen.ts

@@ -237,6 +237,7 @@ export type EventFileEdited = {
   type: "file.edited"
   properties: {
     file: string
+    sessionID: string
   }
 }