refactor(server): inject config options

packages/core/src/config.ts

@@ -153,9 +153,14 @@ export interface Interface {
   readonly entries: () => Effect.Effect<Entry[]>
 }
 
+export const Options = Schema.Struct({
+  project: Schema.optional(Schema.Boolean),
+})
+export type Options = typeof Options.Type
+
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Config") {}
 
-const layer = Layer.effect(
+export const layer = (options?: Options) => Layer.effect(
   Service,
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
@@ -239,7 +244,7 @@ const layer = Layer.effect(
       const globalAgentsDirectory = AbsolutePath.make(path.join(global.home, ".agents"))
       const globalClaudeDirectory = AbsolutePath.make(path.join(global.home, ".claude"))
       const locationIsGlobal = path.resolve(location.directory) === path.resolve(global.config)
-      const discovered = locationIsGlobal
+      const discovered = locationIsGlobal || options?.project === false
         ? []
         : yield* fs
             .up({
@@ -396,6 +401,6 @@ const layer = Layer.effect(
 
 export const node = makeLocationNode({
   service: Service,
-  layer,
+  layer: layer(),
   deps: [Watcher.node, EventV2.node, FSUtil.node, Global.node, Location.node, Credential.node, WellKnown.node],
 })

packages/core/src/effect/layer-node.ts

@@ -121,7 +121,7 @@ type CheckReplacementErrors<SourceError, ReplacementError> = [Exclude<Replacemen
 type CheckReplacement<Item> = Item extends readonly [Node<infer A, infer E, infer T>, infer Replacement]
   ? Replacement extends Node<NoInfer<A>, infer E2, T>
     ? CheckReplacementErrors<E, NoInfer<E2>>
-    : Replacement extends Layer.Layer<NoInfer<A>, infer E2, never>
+    : Replacement extends Layer.Layer<NoInfer<A>, infer E2, infer _R>
       ? CheckReplacementErrors<E, NoInfer<E2>>
       : { readonly "Invalid replacement": Replacement }
   : { readonly "Invalid replacement": Item }
@@ -133,14 +133,16 @@ type CheckReplacements<Items extends Replacements> = {
 type ValidReplacements<Items extends Replacements> = Items & CheckReplacements<Items>
 
 function replacementNode(source: AnyNode, replacement: AnyNode | Layer.Any) {
-  const replacementNode = isNode(replacement)
+  const replacementNode: AnyNode = isNode(replacement)
     ? replacement
-    : make({
-        ...nodeMakeIdentity(source),
-        layer: replacement as Layer.Layer<unknown, unknown>,
-        deps: [],
+    : {
+        kind: "layer",
+        name: source.name,
+        service: source.service,
+        implementation: replacement,
+        dependencies: source.dependencies,
         tag: source.tag,
-      })
+      }
   if (source.name !== replacementNode.name) {
     throw new Error(`Cannot replace ${source.name} with ${replacementNode.name}`)
   }
@@ -150,11 +152,6 @@ function replacementNode(source: AnyNode, replacement: AnyNode | Layer.Any) {
   return replacementNode
 }
 
-function nodeMakeIdentity(node: AnyNode): NodeIdentity {
-  if (node.service !== undefined) return { service: node.service }
-  return { name: node.name }
-}
-
 function isNode(input: Layer.Any | AnyNode): input is AnyNode {
   return "kind" in input && "dependencies" in input
 }

packages/core/src/filesystem/search.ts

@@ -246,8 +246,8 @@ export const layer = (options?: Options) => Layer.unwrap(
   }),
 )
 
-export function nodeWith(options?: Options) {
-  return makeLocationNode({ service: Service, layer: layer(options), deps: [FSUtil.node, Location.node, Ripgrep.node] })
-}
-
-export const node = nodeWith()
+export const node = makeLocationNode({
+  service: Service,
+  layer: layer(),
+  deps: [FSUtil.node, Location.node, Ripgrep.node],
+})

packages/core/src/filesystem/watcher.ts

@@ -144,11 +144,7 @@ export const layer = (options?: Options) => Layer.effect(
   }),
 )
 
-export function nodeWith(options?: Options) {
-  return makeGlobalNode({ service: Service, layer: layer(options), deps: [] })
-}
-
-export const node = nodeWith()
+export const node = makeGlobalNode({ service: Service, layer: layer(), deps: [] })
 
 function subscribeDirectory(
   native: typeof import("@parcel/watcher") | undefined,

packages/core/src/global.ts

@@ -4,7 +4,6 @@ import { xdgData, xdgCache, xdgConfig, xdgState } from "xdg-basedir"
 import os from "os"
 import { Context, Effect, Layer } from "effect"
 import { Flock } from "./util/flock"
-import { Flag } from "./flag/flag"
 import { makeGlobalNode } from "./effect/app-node"
 
 const app = "opencode"
@@ -61,7 +60,7 @@ export function make(input: Partial<Interface> = {}): Interface {
     home: Path.home,
     data: Path.data,
     cache: Path.cache,
-    config: Flag.OPENCODE_CONFIG_DIR ?? Path.config,
+    config: Path.config,
     state: Path.state,
     tmp: Path.tmp,
     bin: Path.bin,
@@ -73,7 +72,7 @@ export function make(input: Partial<Interface> = {}): Interface {
 
 const layer = Layer.effect(
   Service,
-  Effect.sync(() => Service.of(make())),
+  Effect.sync(() => Service.of(make({ config: process.env.OPENCODE_CONFIG_DIR ?? Path.config }))),
 )
 
 export const node = makeGlobalNode({ service: Service, layer: layer, deps: [] })

packages/core/src/instruction-discovery.ts

@@ -3,7 +3,6 @@ export * as InstructionDiscovery from "./instruction-discovery"
 import { Array, Context, Effect, Layer, Schema } from "effect"
 import { isAbsolute, join, relative, sep } from "path"
 import { FSUtil } from "./fs-util"
-import { Flag } from "./flag/flag"
 import { Global } from "./global"
 import { Location } from "./location"
 import { AbsolutePath } from "./schema"
@@ -22,9 +21,14 @@ export interface Interface {
   readonly load: () => Effect.Effect<Instructions.Instructions>
 }
 
+export const Options = Schema.Struct({
+  project: Schema.optional(Schema.Boolean),
+})
+export type Options = typeof Options.Type
+
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/InstructionDiscovery") {}
 
-const layer = Layer.effect(
+export const layer = (options?: Options) => Layer.effect(
   Service,
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
@@ -52,7 +56,7 @@ const layer = Layer.effect(
         fromProject === "" || (fromProject !== ".." && !fromProject.startsWith(`..${sep}`) && !isAbsolute(fromProject))
       const discovered = new Set(
         yield* Effect.forEach(
-          Flag.OPENCODE_DISABLE_PROJECT_CONFIG || !insideProject
+          options?.project === false || !insideProject
             ? []
             : yield* fs.up({
                 targets: ["AGENTS.md"],
@@ -93,7 +97,11 @@ const layer = Layer.effect(
   }),
 )
 
-export const node = makeLocationNode({ service: Service, layer, deps: [FSUtil.node, Global.node, Location.node] })
+export const node = makeLocationNode({
+  service: Service,
+  layer: layer(),
+  deps: [FSUtil.node, Global.node, Location.node],
+})
 
 function render(files: ReadonlyArray<File>) {
   return files.map((file) => `Instructions from: ${file.path}\n${file.content}`).join("\n\n")

packages/core/src/models-dev.ts

@@ -659,10 +659,6 @@ export const layer = (options?: Options) => Layer.effect(
   }),
 )
 
-export function nodeWith(options?: Options) {
-  return makeGlobalNode({ service: Service, layer: layer(options), deps: [FSUtil.node, EventV2.node, httpClient] })
-}
-
-export const node = nodeWith()
+export const node = makeGlobalNode({ service: Service, layer: layer(), deps: [FSUtil.node, EventV2.node, httpClient] })
 
 export * as ModelsDev from "./models-dev"