fix: avoid automation startup layer cycle

Author: joshue031

packages/opencode/src/automation/automation.ts

@@ -1538,7 +1538,7 @@ export const defaultLayer = Layer.suspend(() =>
     Layer.provide(SessionPrompt.defaultLayer),
     Layer.provide(SessionSummary.defaultLayer),
     Layer.provide(Provider.defaultLayer),
-    Layer.provide(Worktree.defaultLayer),
+    Layer.provide(Worktree.appLayer),
   ),
 )
 

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

@@ -1,6 +1,7 @@
 import type { Argv } from "yargs"
 import { Effect, Schema } from "effect"
 import { AppRuntime, type AppServices } from "@/effect/app-runtime"
+import { Automation } from "@/automation/automation"
 import { InstanceStore } from "@/project/instance-store"
 import { InstanceRef } from "@/effect/instance-ref"
 import { Instance } from "@/project/instance"
@@ -94,7 +95,16 @@ export const effectCmd = <Args, A>(opts: EffectCmdOpts<Args, A>) =>
       )
       try {
         await Instance.restore(ctx, () =>
-          AppRuntime.runPromise(opts.handler(args).pipe(Effect.provideService(InstanceRef, ctx))),
+          AppRuntime.runPromise(
+            Effect.gen(function* () {
+              yield* Automation.Service.use((automation) =>
+                automation
+                  .init()
+                  .pipe(Effect.catchCause((cause) => Effect.logWarning("automation init failed", { cause }))),
+              )
+              return yield* opts.handler(args)
+            }).pipe(Effect.provideService(InstanceRef, ctx)),
+          ),
         )
       } finally {
         await AppRuntime.runPromise(store.dispose(ctx))

packages/opencode/src/project/bootstrap.ts

@@ -1,6 +1,5 @@
 import { Plugin } from "../plugin"
 import { Format } from "../format"
-import { Automation } from "@/automation/automation"
 import { LSP } from "@/lsp/lsp"
 import { File } from "../file"
 import { Snapshot } from "../snapshot"
@@ -24,7 +23,6 @@ export const layer = Layer.effect(
     // Yield each bootstrap dep at layer init so `run` itself has R = never.
     // InstanceStore imports only the lightweight tag from bootstrap-service.ts,
     // so it can depend on bootstrap without importing this implementation graph.
-    const automation = yield* Automation.Service
     const config = yield* Config.Service
     const file = yield* File.Service
     const fileWatcher = yield* FileWatcher.Service
@@ -47,7 +45,7 @@ export const layer = Layer.effect(
       // Each service self-manages its own slow work via Effect.forkScoped against
       // its per-instance state scope. We just await materialization here.
       yield* Effect.forEach(
-        [automation, reference, lsp, shareNext, format, file, fileWatcher, vcs, snapshot, project],
+        [reference, lsp, shareNext, format, file, fileWatcher, vcs, snapshot, project],
         (s) => s.init().pipe(Effect.catchCause((cause) => Effect.logWarning("init failed", { cause }))),
         { concurrency: "unbounded", discard: true },
       ).pipe(Effect.withSpan("InstanceBootstrap.init"))
@@ -59,7 +57,6 @@ export const layer = Layer.effect(
 
 export const defaultLayer: Layer.Layer<Service> = layer.pipe(
   Layer.provide([
-    Automation.defaultLayer,
     Bus.layer,
     Config.defaultLayer,
     File.defaultLayer,

packages/opencode/src/project/with-instance.ts

@@ -1,3 +1,6 @@
+import { Automation } from "@/automation/automation"
+import { InstanceRef } from "@/effect/instance-ref"
+import { Effect } from "effect"
 import { AppRuntime } from "@/effect/app-runtime"
 import { context } from "./instance-context"
 import { InstanceStore } from "./instance-store"
@@ -6,7 +9,17 @@ export async function provide<R>(input: { directory: string; fn: () => R }): Pro
   const ctx = await AppRuntime.runPromise(
     InstanceStore.Service.use((store) => store.load({ directory: input.directory })),
   )
-  return context.provide(ctx, () => input.fn())
+  return context.provide(ctx, async () => {
+    await AppRuntime.runPromise(
+      Automation.Service.use((automation) =>
+        automation.init().pipe(
+          Effect.catchCause((cause) => Effect.logWarning("automation init failed", { cause })),
+          Effect.provideService(InstanceRef, ctx),
+        ),
+      ),
+    )
+    return input.fn()
+  })
 }
 
 export * as WithInstance from "./with-instance"

packages/opencode/src/server/routes/instance/httpapi/middleware/instance-context.ts

@@ -1,3 +1,4 @@
+import { Automation } from "@/automation/automation"
 import { WorkspaceRef } from "@/effect/instance-ref"
 import { InstanceStore } from "@/project/instance-store"
 import { Effect, Layer } from "effect"
@@ -23,12 +24,18 @@ function decode(input: string): string {
 function provideInstanceContext<E>(
   effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E>,
   store: InstanceStore.Interface,
+  automation: Automation.Interface,
 ): Effect.Effect<HttpServerResponse.HttpServerResponse, E, WorkspaceRouteContext> {
   return Effect.gen(function* () {
     const route = yield* WorkspaceRouteContext
     return yield* store.provide(
       { directory: decode(route.directory) },
-      effect.pipe(Effect.provideService(WorkspaceRef, route.workspaceID)),
+      Effect.gen(function* () {
+        yield* automation
+          .init()
+          .pipe(Effect.catchCause((cause) => Effect.logWarning("automation init failed", { cause })))
+        return yield* effect
+      }).pipe(Effect.provideService(WorkspaceRef, route.workspaceID)),
     )
   })
 }
@@ -37,13 +44,15 @@ export const instanceContextLayer = Layer.effect(
   InstanceContextMiddleware,
   Effect.gen(function* () {
     const store = yield* InstanceStore.Service
-    return InstanceContextMiddleware.of((effect) => provideInstanceContext(effect, store))
+    const automation = yield* Automation.Service
+    return InstanceContextMiddleware.of((effect) => provideInstanceContext(effect, store, automation))
   }),
 )
 
 export const instanceRouterMiddleware = HttpRouter.middleware()(
   Effect.gen(function* () {
     const store = yield* InstanceStore.Service
-    return (effect) => provideInstanceContext(effect, store)
+    const automation = yield* Automation.Service
+    return (effect) => provideInstanceContext(effect, store, automation)
   }),
 )

packages/opencode/test/fixture/automation.ts

@@ -0,0 +1,23 @@
+import { Effect, Layer } from "effect"
+import { Automation } from "../../src/automation/automation"
+
+export const noopAutomationLayer = Layer.succeed(
+  Automation.Service,
+  Automation.Service.of({
+    init: () => Effect.void,
+    list: () => Effect.succeed([]),
+    get: () => Effect.die("unused automation test service"),
+    create: () => Effect.die("unused automation test service"),
+    update: () => Effect.die("unused automation test service"),
+    remove: () => Effect.die("unused automation test service"),
+    duplicate: () => Effect.die("unused automation test service"),
+    runNow: () => Effect.die("unused automation test service"),
+    listRuns: () => Effect.succeed([]),
+    getRun: () => Effect.die("unused automation test service"),
+    listFindings: () => Effect.succeed([]),
+    diff: () => Effect.succeed([]),
+    markRunRead: () => Effect.die("unused automation test service"),
+    archiveRun: () => Effect.die("unused automation test service"),
+    cancelRun: () => Effect.die("unused automation test service"),
+  }),
+)

packages/opencode/test/server/httpapi-instance-context.test.ts

@@ -22,6 +22,7 @@ import { workspaceRouterMiddleware } from "../../src/server/routes/instance/http
 import { resetDatabase } from "../fixture/db"
 import { disposeAllInstances, tmpdirScoped } from "../fixture/fixture"
 import { withFixedWorkspaceID } from "../fixture/flag"
+import { noopAutomationLayer } from "../fixture/automation"
 import { waitGlobalBusEvent } from "./global-bus"
 import { testEffect } from "../lib/effect"
 
@@ -58,7 +59,7 @@ const it = testEffect(
 
 const instanceContextTestLayer = instanceRouterMiddleware
   .combine(workspaceRouterMiddleware)
-  .layer.pipe(Layer.provide(Socket.layerWebSocketConstructorGlobal))
+  .layer.pipe(Layer.provide(noopAutomationLayer), Layer.provide(Socket.layerWebSocketConstructorGlobal))
 
 const localAdapter = (directory: string): WorkspaceAdapter => ({
   name: "Local Test",

packages/opencode/test/server/httpapi-promptasync-context.test.ts

@@ -26,6 +26,7 @@ import { Project } from "../../src/project/project"
 import { instanceRouterMiddleware } from "../../src/server/routes/instance/httpapi/middleware/instance-context"
 import { workspaceRouterMiddleware } from "../../src/server/routes/instance/httpapi/middleware/workspace-routing"
 import { resetDatabase } from "../fixture/db"
+import { noopAutomationLayer } from "../fixture/automation"
 import { disposeAllInstances, tmpdirScoped } from "../fixture/fixture"
 import { testEffect } from "../lib/effect"
 
@@ -62,7 +63,7 @@ const it = testEffect(
 
 const instanceContextTestLayer = instanceRouterMiddleware
   .combine(workspaceRouterMiddleware)
-  .layer.pipe(Layer.provide(Socket.layerWebSocketConstructorGlobal))
+  .layer.pipe(Layer.provide(noopAutomationLayer), Layer.provide(Socket.layerWebSocketConstructorGlobal))
 
 const localAdapter = (directory: string): WorkspaceAdapter => ({
   name: "Local Test",