ToothFairyAI_Public/tf_code
1
0
Fork 0
mirror of https://gitea.toothfairyai.com/ToothFairyAI/tf_code.git synced 2026-03-31 14:22:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "refactor: migrate from Bun.Glob to npm glob package"

Browse Source 
This reverts commit 3c21735b35.
This commit is contained in:
Dax Raad
2026-02-19 12:48:43 -05:00
parent 50883cc1e9
commit af72010e9f
17 changed files with 122 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/opencode/src/skill/skill.ts
View File

@@ -12,7 +12,6 @@ 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" })
@@ -45,9 +44,10 @@ 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_PATTERN = "skills/**/SKILL.md"
const OPENCODE_SKILL_PATTERN = "{skill,skills}/**/SKILL.md"
const SKILL_PATTERN = "**/SKILL.md"
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")
export const state = Instance.state(async () => {
const skills: Record<string, Info> = {}
@@ -88,12 +88,15 @@ export namespace Skill {
}
const scanExternal = async (root: string, scope: "global" | "project") => {
return Glob.scan(EXTERNAL_SKILL_PATTERN, {
cwd: root,
absolute: true,
include: "file",
dot: true,
})
return Array.fromAsync(
EXTERNAL_SKILL_GLOB.scan({
cwd: root,
absolute: true,
onlyFiles: true,
followSymlinks: true,
dot: true,
}),
)
.then((matches) => Promise.all(matches.map(addSkill)))
.catch((error) => {
log.error(`failed to scan ${scope} skills`, { dir: root, error })
@@ -120,12 +123,12 @@ export namespace Skill {
// Scan .opencode/skill/ directories
for (const dir of await Config.directories()) {
const matches = await Glob.scan(OPENCODE_SKILL_PATTERN, {
for await (const match of OPENCODE_SKILL_GLOB.scan({
cwd: dir,
absolute: true,
include: "file",
})
for (const match of matches) {
onlyFiles: true,
followSymlinks: true,
})) {
await addSkill(match)
}
}
@@ -139,12 +142,12 @@ export namespace Skill {
log.warn("skill path not found", { path: resolved })
continue
}
const matches = await Glob.scan(SKILL_PATTERN, {
for await (const match of SKILL_GLOB.scan({
cwd: resolved,
absolute: true,
include: "file",
})
for (const match of matches) {
onlyFiles: true,
followSymlinks: true,
})) {
await addSkill(match)
}
}
@@ -154,12 +157,12 @@ export namespace Skill {
const list = await Discovery.pull(url)
for (const dir of list) {
dirs.add(dir)
const matches = await Glob.scan(SKILL_PATTERN, {
for await (const match of SKILL_GLOB.scan({
cwd: dir,
absolute: true,
include: "file",
})
for (const match of matches) {
onlyFiles: true,
followSymlinks: true,
})) {
await addSkill(match)
}
}