refactor: migrate from Bun.Glob to npm glob package (#14317)

This commit is contained in:
Dax
2026-02-19 13:40:09 -05:00
committed by GitHub
parent 7e35d0c610
commit cb8b74d3f1
17 changed files with 315 additions and 127 deletions

View File

@@ -12,6 +12,7 @@ import { Flag } from "@/flag/flag"
import { Bus } from "@/bus"
import { Session } from "@/session"
import { Discovery } from "./discovery"
import { Glob } from "../util/glob"
export namespace Skill {
const log = Log.create({ service: "skill" })
@@ -44,10 +45,9 @@ export namespace Skill {
// External skill directories to search for (project-level and global)
// These follow the directory layout used by Claude Code and other agents.
const EXTERNAL_DIRS = [".claude", ".agents"]
const EXTERNAL_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
const OPENCODE_SKILL_GLOB = new Bun.Glob("{skill,skills}/**/SKILL.md")
const SKILL_GLOB = new Bun.Glob("**/SKILL.md")
const EXTERNAL_SKILL_PATTERN = "skills/**/SKILL.md"
const OPENCODE_SKILL_PATTERN = "{skill,skills}/**/SKILL.md"
const SKILL_PATTERN = "**/SKILL.md"
export const state = Instance.state(async () => {
const skills: Record<string, Info> = {}
@@ -88,15 +88,13 @@ export namespace Skill {
}
const scanExternal = async (root: string, scope: "global" | "project") => {
return Array.fromAsync(
EXTERNAL_SKILL_GLOB.scan({
cwd: root,
absolute: true,
onlyFiles: true,
followSymlinks: true,
dot: true,
}),
)
return Glob.scan(EXTERNAL_SKILL_PATTERN, {
cwd: root,
absolute: true,
include: "file",
dot: true,
symlink: true,
})
.then((matches) => Promise.all(matches.map(addSkill)))
.catch((error) => {
log.error(`failed to scan ${scope} skills`, { dir: root, error })
@@ -123,12 +121,13 @@ export namespace Skill {
// Scan .opencode/skill/ directories
for (const dir of await Config.directories()) {
for await (const match of OPENCODE_SKILL_GLOB.scan({
const matches = await Glob.scan(OPENCODE_SKILL_PATTERN, {
cwd: dir,
absolute: true,
onlyFiles: true,
followSymlinks: true,
})) {
include: "file",
symlink: true,
})
for (const match of matches) {
await addSkill(match)
}
}
@@ -142,12 +141,13 @@ export namespace Skill {
log.warn("skill path not found", { path: resolved })
continue
}
for await (const match of SKILL_GLOB.scan({
const matches = await Glob.scan(SKILL_PATTERN, {
cwd: resolved,
absolute: true,
onlyFiles: true,
followSymlinks: true,
})) {
include: "file",
symlink: true,
})
for (const match of matches) {
await addSkill(match)
}
}
@@ -157,12 +157,13 @@ export namespace Skill {
const list = await Discovery.pull(url)
for (const dir of list) {
dirs.add(dir)
for await (const match of SKILL_GLOB.scan({
const matches = await Glob.scan(SKILL_PATTERN, {
cwd: dir,
absolute: true,
onlyFiles: true,
followSymlinks: true,
})) {
include: "file",
symlink: true,
})
for (const match of matches) {
await addSkill(match)
}
}