refactor: switch Plugin to direct self-reexport imports

packages/opencode/src/agent/agent.ts

@@ -17,7 +17,7 @@ import { Permission } from "@/permission"
 import { mergeDeep, pipe, sortBy, values } from "remeda"
 import { Global } from "@/global"
 import path from "path"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Skill } from "../skill"
 import { Effect, Context, Layer } from "effect"
 import { InstanceState } from "@/effect"

packages/opencode/src/cli/cmd/providers.ts

@@ -9,7 +9,7 @@ import path from "path"
 import os from "os"
 import { Config } from "../../config"
 import { Global } from "../../global"
-import { Plugin } from "../../plugin"
+import { Plugin } from "../../plugin/plugin"
 import { Instance } from "../../project/instance"
 import type { Hooks } from "@opencode-ai/plugin"
 import { Process } from "../../util"

packages/opencode/src/effect/app-runtime.ts

@@ -14,7 +14,7 @@ import { File } from "@/file"
 import { FileWatcher } from "@/file/watcher"
 import { Storage } from "@/storage"
 import { Snapshot } from "@/snapshot"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Provider } from "@/provider"
 import { ProviderAuth } from "@/provider"
 import { Agent } from "@/agent/agent"

packages/opencode/src/effect/bootstrap-runtime.ts

@@ -1,7 +1,7 @@
 import { Layer, ManagedRuntime } from "effect"
 import { memoMap } from "./run-service"
 
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { LSP } from "@/lsp"
 import { FileWatcher } from "@/file/watcher"
 import { Format } from "@/format"

packages/opencode/src/permission/arity.ts

@@ -1,14 +1,15 @@
-export function prefix(tokens: string[]) {
-  for (let len = tokens.length; len > 0; len--) {
-    const prefix = tokens.slice(0, len).join(" ")
-    const arity = ARITY[prefix]
-    if (arity !== undefined) return tokens.slice(0, arity)
+export namespace BashArity {
+  export function prefix(tokens: string[]) {
+    for (let len = tokens.length; len > 0; len--) {
+      const prefix = tokens.slice(0, len).join(" ")
+      const arity = ARITY[prefix]
+      if (arity !== undefined) return tokens.slice(0, arity)
+    }
+    if (tokens.length === 0) return []
+    return tokens.slice(0, 1)
   }
-  if (tokens.length === 0) return []
-  return tokens.slice(0, 1)
-}
 
-/* Generated with following prompt:
+  /* Generated with following prompt:
 You are generating a dictionary of command-prefix arities for bash-style commands.
 This dictionary is used to identify the "human-understandable command" from an input shell command.### **RULES (follow strictly)**1. Each entry maps a **command prefix string → number**, representing how many **tokens** define the command.
 2. **Flags NEVER count as tokens**. Only subcommands count.
@@ -21,142 +22,142 @@ This dictionary is used to identify the "human-understandable command" from an i
 * `npm run dev` → `npm run dev` (because `npm run` has arity 3)
 * `python script.py` → `python script.py` (default: whole input, not in dictionary)### **Now generate the dictionary.**
 */
-const ARITY: Record<string, number> = {
-  cat: 1, // cat file.txt
-  cd: 1, // cd /path/to/dir
-  chmod: 1, // chmod 755 script.sh
-  chown: 1, // chown user:group file.txt
-  cp: 1, // cp source.txt dest.txt
-  echo: 1, // echo "hello world"
-  env: 1, // env
-  export: 1, // export PATH=/usr/bin
-  grep: 1, // grep pattern file.txt
-  kill: 1, // kill 1234
-  killall: 1, // killall process
-  ln: 1, // ln -s source target
-  ls: 1, // ls -la
-  mkdir: 1, // mkdir new-dir
-  mv: 1, // mv old.txt new.txt
-  ps: 1, // ps aux
-  pwd: 1, // pwd
-  rm: 1, // rm file.txt
-  rmdir: 1, // rmdir empty-dir
-  sleep: 1, // sleep 5
-  source: 1, // source ~/.bashrc
-  tail: 1, // tail -f log.txt
-  touch: 1, // touch file.txt
-  unset: 1, // unset VAR
-  which: 1, // which node
-  aws: 3, // aws s3 ls
-  az: 3, // az storage blob list
-  bazel: 2, // bazel build
-  brew: 2, // brew install node
-  bun: 2, // bun install
-  "bun run": 3, // bun run dev
-  "bun x": 3, // bun x vite
-  cargo: 2, // cargo build
-  "cargo add": 3, // cargo add tokio
-  "cargo run": 3, // cargo run main
-  cdk: 2, // cdk deploy
-  cf: 2, // cf push app
-  cmake: 2, // cmake build
-  composer: 2, // composer require laravel
-  consul: 2, // consul members
-  "consul kv": 3, // consul kv get config/app
-  crictl: 2, // crictl ps
-  deno: 2, // deno run server.ts
-  "deno task": 3, // deno task dev
-  doctl: 3, // doctl kubernetes cluster list
-  docker: 2, // docker run nginx
-  "docker builder": 3, // docker builder prune
-  "docker compose": 3, // docker compose up
-  "docker container": 3, // docker container ls
-  "docker image": 3, // docker image prune
-  "docker network": 3, // docker network inspect
-  "docker volume": 3, // docker volume ls
-  eksctl: 2, // eksctl get clusters
-  "eksctl create": 3, // eksctl create cluster
-  firebase: 2, // firebase deploy
-  flyctl: 2, // flyctl deploy
-  gcloud: 3, // gcloud compute instances list
-  gh: 3, // gh pr list
-  git: 2, // git checkout main
-  "git config": 3, // git config user.name
-  "git remote": 3, // git remote add origin
-  "git stash": 3, // git stash pop
-  go: 2, // go build
-  gradle: 2, // gradle build
-  helm: 2, // helm install mychart
-  heroku: 2, // heroku logs
-  hugo: 2, // hugo new site blog
-  ip: 2, // ip link show
-  "ip addr": 3, // ip addr show
-  "ip link": 3, // ip link set eth0 up
-  "ip netns": 3, // ip netns exec foo bash
-  "ip route": 3, // ip route add default via 1.1.1.1
-  kind: 2, // kind delete cluster
-  "kind create": 3, // kind create cluster
-  kubectl: 2, // kubectl get pods
-  "kubectl kustomize": 3, // kubectl kustomize overlays/dev
-  "kubectl rollout": 3, // kubectl rollout restart deploy/api
-  kustomize: 2, // kustomize build .
-  make: 2, // make build
-  mc: 2, // mc ls myminio
-  "mc admin": 3, // mc admin info myminio
-  minikube: 2, // minikube start
-  mongosh: 2, // mongosh test
-  mysql: 2, // mysql -u root
-  mvn: 2, // mvn compile
-  ng: 2, // ng generate component home
-  npm: 2, // npm install
-  "npm exec": 3, // npm exec vite
-  "npm init": 3, // npm init vue
-  "npm run": 3, // npm run dev
-  "npm view": 3, // npm view react version
-  nvm: 2, // nvm use 18
-  nx: 2, // nx build
-  openssl: 2, // openssl genrsa 2048
-  "openssl req": 3, // openssl req -new -key key.pem
-  "openssl x509": 3, // openssl x509 -in cert.pem
-  pip: 2, // pip install numpy
-  pipenv: 2, // pipenv install flask
-  pnpm: 2, // pnpm install
-  "pnpm dlx": 3, // pnpm dlx create-next-app
-  "pnpm exec": 3, // pnpm exec vite
-  "pnpm run": 3, // pnpm run dev
-  poetry: 2, // poetry add requests
-  podman: 2, // podman run alpine
-  "podman container": 3, // podman container ls
-  "podman image": 3, // podman image prune
-  psql: 2, // psql -d mydb
-  pulumi: 2, // pulumi up
-  "pulumi stack": 3, // pulumi stack output
-  pyenv: 2, // pyenv install 3.11
-  python: 2, // python -m venv env
-  rake: 2, // rake db:migrate
-  rbenv: 2, // rbenv install 3.2.0
-  "redis-cli": 2, // redis-cli ping
-  rustup: 2, // rustup update
-  serverless: 2, // serverless invoke
-  sfdx: 3, // sfdx force:org:list
-  skaffold: 2, // skaffold dev
-  sls: 2, // sls deploy
-  sst: 2, // sst deploy
-  swift: 2, // swift build
-  systemctl: 2, // systemctl restart nginx
-  terraform: 2, // terraform apply
-  "terraform workspace": 3, // terraform workspace select prod
-  tmux: 2, // tmux new -s dev
-  turbo: 2, // turbo run build
-  ufw: 2, // ufw allow 22
-  vault: 2, // vault login
-  "vault auth": 3, // vault auth list
-  "vault kv": 3, // vault kv get secret/api
-  vercel: 2, // vercel deploy
-  volta: 2, // volta install node
-  wp: 2, // wp plugin install
-  yarn: 2, // yarn add react
-  "yarn dlx": 3, // yarn dlx create-react-app
-  "yarn run": 3, // yarn run dev
+  const ARITY: Record<string, number> = {
+    cat: 1, // cat file.txt
+    cd: 1, // cd /path/to/dir
+    chmod: 1, // chmod 755 script.sh
+    chown: 1, // chown user:group file.txt
+    cp: 1, // cp source.txt dest.txt
+    echo: 1, // echo "hello world"
+    env: 1, // env
+    export: 1, // export PATH=/usr/bin
+    grep: 1, // grep pattern file.txt
+    kill: 1, // kill 1234
+    killall: 1, // killall process
+    ln: 1, // ln -s source target
+    ls: 1, // ls -la
+    mkdir: 1, // mkdir new-dir
+    mv: 1, // mv old.txt new.txt
+    ps: 1, // ps aux
+    pwd: 1, // pwd
+    rm: 1, // rm file.txt
+    rmdir: 1, // rmdir empty-dir
+    sleep: 1, // sleep 5
+    source: 1, // source ~/.bashrc
+    tail: 1, // tail -f log.txt
+    touch: 1, // touch file.txt
+    unset: 1, // unset VAR
+    which: 1, // which node
+    aws: 3, // aws s3 ls
+    az: 3, // az storage blob list
+    bazel: 2, // bazel build
+    brew: 2, // brew install node
+    bun: 2, // bun install
+    "bun run": 3, // bun run dev
+    "bun x": 3, // bun x vite
+    cargo: 2, // cargo build
+    "cargo add": 3, // cargo add tokio
+    "cargo run": 3, // cargo run main
+    cdk: 2, // cdk deploy
+    cf: 2, // cf push app
+    cmake: 2, // cmake build
+    composer: 2, // composer require laravel
+    consul: 2, // consul members
+    "consul kv": 3, // consul kv get config/app
+    crictl: 2, // crictl ps
+    deno: 2, // deno run server.ts
+    "deno task": 3, // deno task dev
+    doctl: 3, // doctl kubernetes cluster list
+    docker: 2, // docker run nginx
+    "docker builder": 3, // docker builder prune
+    "docker compose": 3, // docker compose up
+    "docker container": 3, // docker container ls
+    "docker image": 3, // docker image prune
+    "docker network": 3, // docker network inspect
+    "docker volume": 3, // docker volume ls
+    eksctl: 2, // eksctl get clusters
+    "eksctl create": 3, // eksctl create cluster
+    firebase: 2, // firebase deploy
+    flyctl: 2, // flyctl deploy
+    gcloud: 3, // gcloud compute instances list
+    gh: 3, // gh pr list
+    git: 2, // git checkout main
+    "git config": 3, // git config user.name
+    "git remote": 3, // git remote add origin
+    "git stash": 3, // git stash pop
+    go: 2, // go build
+    gradle: 2, // gradle build
+    helm: 2, // helm install mychart
+    heroku: 2, // heroku logs
+    hugo: 2, // hugo new site blog
+    ip: 2, // ip link show
+    "ip addr": 3, // ip addr show
+    "ip link": 3, // ip link set eth0 up
+    "ip netns": 3, // ip netns exec foo bash
+    "ip route": 3, // ip route add default via 1.1.1.1
+    kind: 2, // kind delete cluster
+    "kind create": 3, // kind create cluster
+    kubectl: 2, // kubectl get pods
+    "kubectl kustomize": 3, // kubectl kustomize overlays/dev
+    "kubectl rollout": 3, // kubectl rollout restart deploy/api
+    kustomize: 2, // kustomize build .
+    make: 2, // make build
+    mc: 2, // mc ls myminio
+    "mc admin": 3, // mc admin info myminio
+    minikube: 2, // minikube start
+    mongosh: 2, // mongosh test
+    mysql: 2, // mysql -u root
+    mvn: 2, // mvn compile
+    ng: 2, // ng generate component home
+    npm: 2, // npm install
+    "npm exec": 3, // npm exec vite
+    "npm init": 3, // npm init vue
+    "npm run": 3, // npm run dev
+    "npm view": 3, // npm view react version
+    nvm: 2, // nvm use 18
+    nx: 2, // nx build
+    openssl: 2, // openssl genrsa 2048
+    "openssl req": 3, // openssl req -new -key key.pem
+    "openssl x509": 3, // openssl x509 -in cert.pem
+    pip: 2, // pip install numpy
+    pipenv: 2, // pipenv install flask
+    pnpm: 2, // pnpm install
+    "pnpm dlx": 3, // pnpm dlx create-next-app
+    "pnpm exec": 3, // pnpm exec vite
+    "pnpm run": 3, // pnpm run dev
+    poetry: 2, // poetry add requests
+    podman: 2, // podman run alpine
+    "podman container": 3, // podman container ls
+    "podman image": 3, // podman image prune
+    psql: 2, // psql -d mydb
+    pulumi: 2, // pulumi up
+    "pulumi stack": 3, // pulumi stack output
+    pyenv: 2, // pyenv install 3.11
+    python: 2, // python -m venv env
+    rake: 2, // rake db:migrate
+    rbenv: 2, // rbenv install 3.2.0
+    "redis-cli": 2, // redis-cli ping
+    rustup: 2, // rustup update
+    serverless: 2, // serverless invoke
+    sfdx: 3, // sfdx force:org:list
+    skaffold: 2, // skaffold dev
+    sls: 2, // sls deploy
+    sst: 2, // sst deploy
+    swift: 2, // swift build
+    systemctl: 2, // systemctl restart nginx
+    terraform: 2, // terraform apply
+    "terraform workspace": 3, // terraform workspace select prod
+    tmux: 2, // tmux new -s dev
+    turbo: 2, // turbo run build
+    ufw: 2, // ufw allow 22
+    vault: 2, // vault login
+    "vault auth": 3, // vault auth list
+    "vault kv": 3, // vault kv get secret/api
+    vercel: 2, // vercel deploy
+    volta: 2, // volta install node
+    wp: 2, // wp plugin install
+    yarn: 2, // yarn add react
+    "yarn dlx": 3, // yarn dlx create-react-app
+    "yarn run": 3, // yarn run dev
+  }
 }
-export * as BashArity from "./arity"

packages/opencode/src/plugin/index.ts

@@ -1 +0,0 @@
-export * as Plugin from "./plugin"

packages/opencode/src/plugin/plugin.ts

@@ -285,3 +285,5 @@ export const layer = Layer.effect(
 )
 
 export const defaultLayer = layer.pipe(Layer.provide(Bus.layer), Layer.provide(Config.defaultLayer))
+
+export * as Plugin from "./plugin"

packages/opencode/src/project/bootstrap.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { Format } from "../format"
 import { LSP } from "../lsp"
 import { File } from "../file"

packages/opencode/src/provider/auth.ts

@@ -4,7 +4,7 @@ import { Auth } from "@/auth"
 import { InstanceState } from "@/effect"
 import { zod } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { ProviderID } from "./schema"
 import { Array as Arr, Effect, Layer, Record, Result, Context, Schema } from "effect"
 import z from "zod"

packages/opencode/src/provider/provider.ts

@@ -7,7 +7,7 @@ import { NoSuchModelError, type Provider as SDK } from "ai"
 import { Log } from "../util"
 import { Npm } from "../npm"
 import { Hash } from "@opencode-ai/shared/util/hash"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { type LanguageModelV3 } from "@ai-sdk/provider"
 import * as ModelsDev from "./models"

packages/opencode/src/pty/service.ts

@@ -7,7 +7,7 @@ import z from "zod"
 import { Log } from "../util"
 import { lazy } from "@opencode-ai/shared/util/lazy"
 import { Shell } from "@/shell/shell"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { PtyID } from "./schema"
 import { Effect, Layer, Context } from "effect"
 import { EffectBridge } from "@/effect"

packages/opencode/src/session/compaction.ts

@@ -9,7 +9,7 @@ import { Token } from "../util"
 import { Log } from "../util"
 import { SessionProcessor } from "./processor"
 import { Agent } from "@/agent/agent"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Config } from "@/config"
 import { NotFoundError } from "@/storage"
 import { ModelID, ProviderID } from "@/provider/schema"

packages/opencode/src/session/llm.ts

@@ -10,7 +10,7 @@ import { Config } from "@/config"
 import { Instance } from "@/project/instance"
 import type { Agent } from "@/agent/agent"
 import type { MessageV2 } from "./message-v2"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { SystemPrompt } from "./system"
 import { Flag } from "@/flag/flag"
 import { Permission } from "@/permission"

packages/opencode/src/session/processor.ts

@@ -4,7 +4,7 @@ import { Agent } from "@/agent/agent"
 import { Bus } from "@/bus"
 import { Config } from "@/config"
 import { Permission } from "@/permission"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Snapshot } from "@/snapshot"
 import * as Session from "./session"
 import { LLM } from "./llm"

packages/opencode/src/session/prompt.ts

@@ -15,7 +15,7 @@ import { Bus } from "../bus"
 import { ProviderTransform } from "../provider"
 import { SystemPrompt } from "./system"
 import { Instruction } from "./instruction"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import PROMPT_PLAN from "../session/prompt/plan.txt"
 import BUILD_SWITCH from "../session/prompt/build-switch.txt"
 import MAX_STEPS from "../session/prompt/max-steps.txt"

packages/opencode/src/skill/discovery.ts

@@ -6,110 +6,111 @@ import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Global } from "../global"
 import { Log } from "../util"
 
-const skillConcurrency = 4
-const fileConcurrency = 8
+export namespace Discovery {
+  const skillConcurrency = 4
+  const fileConcurrency = 8
 
-class IndexSkill extends Schema.Class<IndexSkill>("IndexSkill")({
-  name: Schema.String,
-  files: Schema.Array(Schema.String),
-}) {}
+  class IndexSkill extends Schema.Class<IndexSkill>("IndexSkill")({
+    name: Schema.String,
+    files: Schema.Array(Schema.String),
+  }) {}
 
-class Index extends Schema.Class<Index>("Index")({
-  skills: Schema.Array(IndexSkill),
-}) {}
+  class Index extends Schema.Class<Index>("Index")({
+    skills: Schema.Array(IndexSkill),
+  }) {}
 
-export interface Interface {
-  readonly pull: (url: string) => Effect.Effect<string[]>
-}
+  export interface Interface {
+    readonly pull: (url: string) => Effect.Effect<string[]>
+  }
 
-export class Service extends Context.Service<Service, Interface>()("@opencode/SkillDiscovery") {}
+  export class Service extends Context.Service<Service, Interface>()("@opencode/SkillDiscovery") {}
 
-export const layer: Layer.Layer<Service, never, AppFileSystem.Service | Path.Path | HttpClient.HttpClient> =
-  Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const log = Log.create({ service: "skill-discovery" })
-      const fs = yield* AppFileSystem.Service
-      const path = yield* Path.Path
-      const http = HttpClient.filterStatusOk(withTransientReadRetry(yield* HttpClient.HttpClient))
-      const cache = path.join(Global.Path.cache, "skills")
+  export const layer: Layer.Layer<Service, never, AppFileSystem.Service | Path.Path | HttpClient.HttpClient> =
+    Layer.effect(
+      Service,
+      Effect.gen(function* () {
+        const log = Log.create({ service: "skill-discovery" })
+        const fs = yield* AppFileSystem.Service
+        const path = yield* Path.Path
+        const http = HttpClient.filterStatusOk(withTransientReadRetry(yield* HttpClient.HttpClient))
+        const cache = path.join(Global.Path.cache, "skills")
 
-      const download = Effect.fn("Discovery.download")(function* (url: string, dest: string) {
-        if (yield* fs.exists(dest).pipe(Effect.orDie)) return true
+        const download = Effect.fn("Discovery.download")(function* (url: string, dest: string) {
+          if (yield* fs.exists(dest).pipe(Effect.orDie)) return true
 
-        return yield* HttpClientRequest.get(url).pipe(
-          http.execute,
-          Effect.flatMap((res) => res.arrayBuffer),
-          Effect.flatMap((body) => fs.writeWithDirs(dest, new Uint8Array(body))),
-          Effect.as(true),
-          Effect.catch((err) =>
-            Effect.sync(() => {
-              log.error("failed to download", { url, err })
-              return false
-            }),
-          ),
-        )
-      })
-
-      const pull = Effect.fn("Discovery.pull")(function* (url: string) {
-        const base = url.endsWith("/") ? url : `${url}/`
-        const index = new URL("index.json", base).href
-        const host = base.slice(0, -1)
-
-        log.info("fetching index", { url: index })
-
-        const data = yield* HttpClientRequest.get(index).pipe(
-          HttpClientRequest.acceptJson,
-          http.execute,
-          Effect.flatMap(HttpClientResponse.schemaBodyJson(Index)),
-          Effect.catch((err) =>
-            Effect.sync(() => {
-              log.error("failed to fetch index", { url: index, err })
-              return null
-            }),
-          ),
-        )
-
-        if (!data) return []
-
-        const list = data.skills.filter((skill) => {
-          if (!skill.files.includes("SKILL.md")) {
-            log.warn("skill entry missing SKILL.md", { url: index, skill: skill.name })
-            return false
-          }
-          return true
+          return yield* HttpClientRequest.get(url).pipe(
+            http.execute,
+            Effect.flatMap((res) => res.arrayBuffer),
+            Effect.flatMap((body) => fs.writeWithDirs(dest, new Uint8Array(body))),
+            Effect.as(true),
+            Effect.catch((err) =>
+              Effect.sync(() => {
+                log.error("failed to download", { url, err })
+                return false
+              }),
+            ),
+          )
         })
 
-        const dirs = yield* Effect.forEach(
-          list,
-          (skill) =>
-            Effect.gen(function* () {
-              const root = path.join(cache, skill.name)
+        const pull = Effect.fn("Discovery.pull")(function* (url: string) {
+          const base = url.endsWith("/") ? url : `${url}/`
+          const index = new URL("index.json", base).href
+          const host = base.slice(0, -1)
 
-              yield* Effect.forEach(
-                skill.files,
-                (file) => download(new URL(file, `${host}/${skill.name}/`).href, path.join(root, file)),
-                {
-                  concurrency: fileConcurrency,
-                },
-              )
+          log.info("fetching index", { url: index })
 
-              const md = path.join(root, "SKILL.md")
-              return (yield* fs.exists(md).pipe(Effect.orDie)) ? root : null
-            }),
-          { concurrency: skillConcurrency },
-        )
+          const data = yield* HttpClientRequest.get(index).pipe(
+            HttpClientRequest.acceptJson,
+            http.execute,
+            Effect.flatMap(HttpClientResponse.schemaBodyJson(Index)),
+            Effect.catch((err) =>
+              Effect.sync(() => {
+                log.error("failed to fetch index", { url: index, err })
+                return null
+              }),
+            ),
+          )
 
-        return dirs.filter((dir): dir is string => dir !== null)
-      })
+          if (!data) return []
 
-      return Service.of({ pull })
-    }),
+          const list = data.skills.filter((skill) => {
+            if (!skill.files.includes("SKILL.md")) {
+              log.warn("skill entry missing SKILL.md", { url: index, skill: skill.name })
+              return false
+            }
+            return true
+          })
+
+          const dirs = yield* Effect.forEach(
+            list,
+            (skill) =>
+              Effect.gen(function* () {
+                const root = path.join(cache, skill.name)
+
+                yield* Effect.forEach(
+                  skill.files,
+                  (file) => download(new URL(file, `${host}/${skill.name}/`).href, path.join(root, file)),
+                  {
+                    concurrency: fileConcurrency,
+                  },
+                )
+
+                const md = path.join(root, "SKILL.md")
+                return (yield* fs.exists(md).pipe(Effect.orDie)) ? root : null
+              }),
+            { concurrency: skillConcurrency },
+          )
+
+          return dirs.filter((dir): dir is string => dir !== null)
+        })
+
+        return Service.of({ pull })
+      }),
+    )
+
+  export const defaultLayer: Layer.Layer<Service> = layer.pipe(
+    Layer.provide(FetchHttpClient.layer),
+    Layer.provide(AppFileSystem.defaultLayer),
+    Layer.provide(NodePath.layer),
   )
-
-export const defaultLayer: Layer.Layer<Service> = layer.pipe(
-  Layer.provide(FetchHttpClient.layer),
-  Layer.provide(AppFileSystem.defaultLayer),
-  Layer.provide(NodePath.layer),
-)
-export * as Discovery from "./discovery"
+}

packages/opencode/src/skill/skill.ts

@@ -15,7 +15,7 @@ import { Config } from "../config"
 import { ConfigMarkdown } from "../config"
 import { Glob } from "@opencode-ai/shared/util/glob"
 import { Log } from "../util"
-import * as Discovery from "./discovery"
+import { Discovery } from "./discovery"
 
 const log = Log.create({ service: "skill" })
 const EXTERNAL_DIRS = [".claude", ".agents"]

packages/opencode/src/tool/bash.ts

@@ -16,7 +16,7 @@ import { Shell } from "@/shell/shell"
 
 import { BashArity } from "@/permission/arity"
 import * as Truncate from "./truncate"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Effect, Stream } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"

packages/opencode/src/tool/registry.ts

@@ -16,7 +16,7 @@ import * as Tool from "./tool"
 import { Config } from "../config"
 import { type ToolContext as PluginToolContext, type ToolDefinition } from "@opencode-ai/plugin"
 import z from "zod"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { Provider } from "../provider"
 import { ProviderID, type ModelID } from "../provider/schema"
 import { WebSearchTool } from "./websearch"

packages/opencode/test/session/compaction.test.ts

@@ -12,7 +12,7 @@ import { Token } from "../../src/util"
 import { Instance } from "../../src/project/instance"
 import { Log } from "../../src/util"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { provideTmpdirInstance, tmpdir } from "../fixture/fixture"
 import { Session as SessionNs } from "../../src/session"
 import { MessageV2 } from "../../src/session/message-v2"

packages/opencode/test/session/processor-effect.test.ts

@@ -7,7 +7,7 @@ import { Agent as AgentSvc } from "../../src/agent/agent"
 import { Bus } from "../../src/bus"
 import { Config } from "../../src/config"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider } from "../../src/provider"
 import { ModelID, ProviderID } from "../../src/provider/schema"
 import { Session } from "../../src/session"

packages/opencode/test/session/prompt-effect.test.ts

@@ -11,7 +11,7 @@ import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
 import { MCP } from "../../src/mcp"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"
 import { Env } from "../../src/env"
 import { ModelID, ProviderID } from "../../src/provider/schema"

packages/opencode/test/session/snapshot-tool-race.test.ts

@@ -37,7 +37,7 @@ import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
 import { MCP } from "../../src/mcp"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"
 import { Env } from "../../src/env"
 import { Question } from "../../src/question"

packages/opencode/test/tool/bash.test.ts

@@ -13,7 +13,7 @@ import { Truncate } from "../../src/tool"
 import { SessionID, MessageID } from "../../src/session/schema"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 
 const runtime = ManagedRuntime.make(
   Layer.mergeAll(