From 6e55ddd078c38f0ede90716bb1555c3d8f72af25 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Sun, 12 Jul 2026 22:07:20 +0000
Subject: [PATCH] fix(config): load configs across git boundaries (#36568)

Co-authored-by: Dax Raad <thdxr@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
---
 packages/opencode/src/config/config.ts       |  4 +--
 packages/opencode/src/config/paths.ts        | 14 +++------
 packages/opencode/test/config/config.test.ts | 31 ++++++++++++++++++++
 packages/web/src/content/docs/config.mdx     |  2 +-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/packages/opencode/src/config/config.ts b/packages/opencode/src/config/config.ts
index 86238f1a84..e3823056dc 100644
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -404,7 +404,7 @@ const layer = Layer.effect(
         }
 
         if (!Flag.OPENCODE_DISABLE_PROJECT_CONFIG) {
-          for (const file of yield* ConfigPaths.files("opencode", ctx.directory, ctx.worktree).pipe(Effect.orDie)) {
+          for (const file of yield* ConfigPaths.files("opencode", ctx.directory).pipe(Effect.orDie)) {
             yield* merge(file, yield* loadFile(file, authEnv), "local")
           }
         }
@@ -413,7 +413,7 @@ const layer = Layer.effect(
         result.mode = result.mode || {}
         result.plugin = result.plugin || []
 
-        const directories = yield* ConfigPaths.directories(ctx.directory, ctx.worktree)
+        const directories = yield* ConfigPaths.directories(ctx.directory)
 
         if (Flag.OPENCODE_CONFIG_DIR) {
           yield* Effect.logDebug("loading config from OPENCODE_CONFIG_DIR", { path: Flag.OPENCODE_CONFIG_DIR })
diff --git a/packages/opencode/src/config/paths.ts b/packages/opencode/src/config/paths.ts
index 11d90f1292..f9e91693aa 100644
--- a/packages/opencode/src/config/paths.ts
+++ b/packages/opencode/src/config/paths.ts
@@ -7,29 +7,23 @@ import { unique } from "remeda"
 import * as Effect from "effect/Effect"
 import { FSUtil } from "@opencode-ai/core/fs-util"
 
-export const files = Effect.fn("ConfigPaths.projectFiles")(function* (
-  name: string,
-  directory: string,
-  worktree?: string,
-) {
+export const files = Effect.fn("ConfigPaths.projectFiles")(function* (name: string, directory: string) {
   const afs = yield* FSUtil.Service
   return (yield* afs.up({
     targets: [`${name}.jsonc`, `${name}.json`],
     start: directory,
-    stop: worktree,
   })).toReversed()
 })
 
-export const directories = Effect.fn("ConfigPaths.directories")(function* (directory: string, worktree?: string) {
+export const directories = Effect.fn("ConfigPaths.directories")(function* (directory: string) {
   const afs = yield* FSUtil.Service
   return unique([
     Global.Path.config,
     ...(!Flag.OPENCODE_DISABLE_PROJECT_CONFIG
-      ? yield* afs.up({
+      ? (yield* afs.up({
           targets: [".opencode"],
           start: directory,
-          stop: worktree,
-        })
+        })).toReversed()
       : []),
     ...(yield* afs.up({
       targets: [".opencode"],
diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts
index ac408ea812..f29c7b57d4 100644
--- a/packages/opencode/test/config/config.test.ts
+++ b/packages/opencode/test/config/config.test.ts
@@ -999,6 +999,37 @@ it.instance("resolves scoped npm plugins in config", () =>
   }),
 )
 
+it.effect("loads shared config above a child git repository", () =>
+  Effect.gen(function* () {
+    const root = yield* tmpdirScoped()
+    const global = yield* tmpdirScoped()
+    const workspace = path.join(root, "workspace")
+    const project = path.join(workspace, "project")
+
+    yield* writeConfigEffect(path.join(workspace, ".opencode"), {
+      model: "shared/model",
+      username: "shared-user",
+    })
+    yield* writeConfigEffect(path.join(project, ".opencode"), { username: "project-user" })
+    yield* Effect.promise(async () => {
+      const child = Bun.spawn(["git", "init"], { cwd: project, stdout: "ignore", stderr: "ignore" })
+      await child.exited
+    })
+
+    yield* withGlobalConfigDir(
+      global,
+      withInstanceDir(
+        project,
+        Effect.gen(function* () {
+          const config = yield* Config.use.get()
+          expect(config.model).toBe("shared/model")
+          expect(config.username).toBe("project-user")
+        }),
+      ),
+    )
+  }),
+)
+
 it.effect("merges plugin arrays from global and local configs", () =>
   withConfigTree(
     {
diff --git a/packages/web/src/content/docs/config.mdx b/packages/web/src/content/docs/config.mdx
index fbf41d4fe9..fe44817280 100644
--- a/packages/web/src/content/docs/config.mdx
+++ b/packages/web/src/content/docs/config.mdx
@@ -116,7 +116,7 @@ For project-specific TUI settings, add `tui.json` alongside it.
 Place project specific config in the root of your project.
 :::
 
-When OpenCode starts up, it first looks for a config file in the current directory, then traverses up to the nearest Git directory.
+When OpenCode starts up, it looks for config files in the current directory and every ancestor directory. Ancestor configs are loaded first, so configs closer to the current directory can override them. This traversal continues across Git repository boundaries.
 
 This is also safe to be checked into Git and uses the same schema as the global one.