From 70c40a12e589c3611f80898d4d53939790cbd7e7 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Thu, 16 Apr 2026 11:25:50 -0400
Subject: [PATCH] refactor: switch small standalone namespaces to self-reexport
 imports

---
 packages/opencode/src/effect/app-runtime.ts     | 2 +-
 packages/opencode/src/permission/arity.ts       | 1 +
 packages/opencode/src/permission/index.ts       | 1 -
 packages/opencode/src/skill/discovery.ts        | 1 +
 packages/opencode/src/skill/index.ts            | 1 -
 packages/opencode/src/tool/bash.ts              | 2 +-
 packages/opencode/test/permission/arity.test.ts | 2 +-
 packages/opencode/test/skill/discovery.test.ts  | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/effect/app-runtime.ts b/packages/opencode/src/effect/app-runtime.ts
index 95ba29b303..f06c41e319 100644
--- a/packages/opencode/src/effect/app-runtime.ts
+++ b/packages/opencode/src/effect/app-runtime.ts
@@ -19,7 +19,7 @@ import { Provider } from "@/provider"
 import { ProviderAuth } from "@/provider"
 import { Agent } from "@/agent/agent"
 import { Skill } from "@/skill"
-import { Discovery } from "@/skill"
+import { Discovery } from "@/skill/discovery"
 import { Question } from "@/question"
 import { Permission } from "@/permission"
 import { Todo } from "@/session/todo"
diff --git a/packages/opencode/src/permission/arity.ts b/packages/opencode/src/permission/arity.ts
index b96ddbd48c..e82fb5bfc0 100644
--- a/packages/opencode/src/permission/arity.ts
+++ b/packages/opencode/src/permission/arity.ts
@@ -159,3 +159,4 @@ const ARITY: Record<string, number> = {
   "yarn dlx": 3, // yarn dlx create-react-app
   "yarn run": 3, // yarn run dev
 }
+export * as BashArity from "./arity"
diff --git a/packages/opencode/src/permission/index.ts b/packages/opencode/src/permission/index.ts
index 33d71d69f6..7d8a2fff82 100644
--- a/packages/opencode/src/permission/index.ts
+++ b/packages/opencode/src/permission/index.ts
@@ -1,2 +1 @@
 export * as Permission from "./permission"
-export * as BashArity from "./arity"
diff --git a/packages/opencode/src/skill/discovery.ts b/packages/opencode/src/skill/discovery.ts
index ce348c764c..e0927abd06 100644
--- a/packages/opencode/src/skill/discovery.ts
+++ b/packages/opencode/src/skill/discovery.ts
@@ -112,3 +112,4 @@ export const defaultLayer: Layer.Layer<Service> = layer.pipe(
   Layer.provide(AppFileSystem.defaultLayer),
   Layer.provide(NodePath.layer),
 )
+export * as Discovery from "./discovery"
diff --git a/packages/opencode/src/skill/index.ts b/packages/opencode/src/skill/index.ts
index 7fb9d19473..6d7b428dfb 100644
--- a/packages/opencode/src/skill/index.ts
+++ b/packages/opencode/src/skill/index.ts
@@ -1,2 +1 @@
 export * as Skill from "./skill"
-export * as Discovery from "./discovery"
diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index 8f135324c8..6260b22216 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -14,7 +14,7 @@ import { fileURLToPath } from "url"
 import { Flag } from "@/flag/flag"
 import { Shell } from "@/shell/shell"
 
-import { BashArity } from "@/permission"
+import { BashArity } from "@/permission/arity"
 import * as Truncate from "./truncate"
 import { Plugin } from "@/plugin"
 import { Effect, Stream } from "effect"
diff --git a/packages/opencode/test/permission/arity.test.ts b/packages/opencode/test/permission/arity.test.ts
index f8ef1f780e..634e41e724 100644
--- a/packages/opencode/test/permission/arity.test.ts
+++ b/packages/opencode/test/permission/arity.test.ts
@@ -1,5 +1,5 @@
 import { test, expect } from "bun:test"
-import { BashArity } from "../../src/permission"
+import { BashArity } from "../../src/permission/arity"
 
 test("arity 1 - unknown commands default to first token", () => {
   expect(BashArity.prefix(["unknown", "command", "subcommand"])).toEqual(["unknown"])
diff --git a/packages/opencode/test/skill/discovery.test.ts b/packages/opencode/test/skill/discovery.test.ts
index caba1128fd..3f82103293 100644
--- a/packages/opencode/test/skill/discovery.test.ts
+++ b/packages/opencode/test/skill/discovery.test.ts
@@ -1,6 +1,6 @@
 import { describe, test, expect, beforeAll, afterAll } from "bun:test"
 import { Effect } from "effect"
-import { Discovery } from "../../src/skill"
+import { Discovery } from "../../src/skill/discovery"
 import { Global } from "../../src/global"
 import { Filesystem } from "../../src/util"
 import { rm } from "fs/promises"