Skip to content

Commit 3c21735

Browse files
thdxrthdxr
committed
refactor: migrate from Bun.Glob to npm glob package
Replace Bun.Glob usage with a new Glob utility wrapper around the npm 'glob' package. This moves us off Bun-specific APIs toward standard Node.js compatible solutions. Changes: - Add new src/util/glob.ts utility module with scan(), scanSync(), and match() - Default include option is 'file' (only returns files, not directories) - Add symlink option (default: false) to control symlink following - Migrate all 12 files using Bun.Glob to use the new Glob utility - Add comprehensive tests for the glob utility Breaking changes: - Removed support for include: 'dir' option (use include: 'all' and filter manually) - symlink now defaults to false (was true in most Bun.Glob usages) Files migrated: - src/util/log.ts - src/util/filesystem.ts - src/tool/truncation.ts - src/session/instruction.ts - src/storage/json-migration.ts - src/storage/storage.ts - src/project/project.ts - src/cli/cmd/tui/context/theme.tsx - src/config/config.ts - src/tool/registry.ts - src/skill/skill.ts - src/file/ignore.ts
1 parent 56dda4c commit 3c21735

17 files changed

Lines changed: 226 additions & 122 deletions

File tree

‎bun.lock‎

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"@actions/artifact": "5.0.1",
7171
"@tsconfig/bun": "catalog:",
7272
"@types/mime-types": "3.0.1",
73+
"glob": "13.0.5",
7374
"husky": "9.1.7",
7475
"prettier": "3.6.2",
7576
"semver": "^7.6.0",

‎packages/opencode/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
"diff": "catalog:",
108108
"drizzle-orm": "1.0.0-beta.12-a5629fb",
109109
"fuzzysort": "3.1.0",
110+
"glob": "13.0.5",
110111
"google-auth-library": "10.5.0",
111112
"gray-matter": "4.0.3",
112113
"hono": "catalog:",

‎packages/opencode/src/cli/cmd/tui/context/theme.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import path from "path"
33
import { createEffect, createMemo, onMount } from "solid-js"
44
import { useSync } from "@tui/context/sync"
55
import { createSimpleContext } from "./helper"
6+
import { Glob } from "../../../../util/glob"
67
import aura from "./theme/aura.json" with { type: "json" }
78
import ayu from "./theme/ayu.json" with { type: "json" }
89
import catppuccin from "./theme/catppuccin.json" with { type: "json" }
@@ -391,7 +392,6 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
391392
},
392393
})
393394

394-
const CUSTOM_THEME_GLOB = new Bun.Glob("themes/*.json")
395395
async function getCustomThemes() {
396396
const directories = [
397397
Global.Path.config,
@@ -405,11 +405,10 @@ async function getCustomThemes() {
405405

406406
const result: Record<string, ThemeJson> = {}
407407
for (const dir of directories) {
408-
for await (const item of CUSTOM_THEME_GLOB.scan({
408+
for (const item of await Glob.scan("themes/*.json", {
409+
cwd: dir,
409410
absolute: true,
410-
followSymlinks: true,
411411
dot: true,
412-
cwd: dir,
413412
})) {
414413
const name = path.basename(item, ".json")
415414
result[name] = await Filesystem.readJson(item)

‎packages/opencode/src/config/config.ts‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { constants, existsSync } from "fs"
2828
import { Bus } from "@/bus"
2929
import { GlobalBus } from "@/bus/global"
3030
import { Event } from "../server/event"
31+
import { Glob } from "../util/glob"
3132
import { PackageRegistry } from "@/bun/registry"
3233
import { proxied } from "@/util/proxied"
3334
import { iife } from "@/util/iife"
@@ -351,14 +352,12 @@ export namespace Config {
351352
return ext.length ? file.slice(0, -ext.length) : file
352353
}
353354

354-
const COMMAND_GLOB = new Bun.Glob("{command,commands}/**/*.md")
355355
async function loadCommand(dir: string) {
356356
const result: Record<string, Command> = {}
357-
for await (const item of COMMAND_GLOB.scan({
357+
for (const item of await Glob.scan("{command,commands}/**/*.md", {
358+
cwd: dir,
358359
absolute: true,
359-
followSymlinks: true,
360360
dot: true,
361-
cwd: dir,
362361
})) {
363362
const md = await ConfigMarkdown.parse(item).catch(async (err) => {
364363
const message = ConfigMarkdown.FrontmatterError.isInstance(err)
@@ -390,15 +389,13 @@ export namespace Config {
390389
return result
391390
}
392391

393-
const AGENT_GLOB = new Bun.Glob("{agent,agents}/**/*.md")
394392
async function loadAgent(dir: string) {
395393
const result: Record<string, Agent> = {}
396394

397-
for await (const item of AGENT_GLOB.scan({
395+
for (const item of await Glob.scan("{agent,agents}/**/*.md", {
396+
cwd: dir,
398397
absolute: true,
399-
followSymlinks: true,
400398
dot: true,
401-
cwd: dir,
402399
})) {
403400
const md = await ConfigMarkdown.parse(item).catch(async (err) => {
404401
const message = ConfigMarkdown.FrontmatterError.isInstance(err)
@@ -430,14 +427,12 @@ export namespace Config {
430427
return result
431428
}
432429

433-
const MODE_GLOB = new Bun.Glob("{mode,modes}/*.md")
434430
async function loadMode(dir: string) {
435431
const result: Record<string, Agent> = {}
436-
for await (const item of MODE_GLOB.scan({
432+
for (const item of await Glob.scan("{mode,modes}/*.md", {
433+
cwd: dir,
437434
absolute: true,
438-
followSymlinks: true,
439435
dot: true,
440-
cwd: dir,
441436
})) {
442437
const md = await ConfigMarkdown.parse(item).catch(async (err) => {
443438
const message = ConfigMarkdown.FrontmatterError.isInstance(err)
@@ -467,15 +462,13 @@ export namespace Config {
467462
return result
468463
}
469464

470-
const PLUGIN_GLOB = new Bun.Glob("{plugin,plugins}/*.{ts,js}")
471465
async function loadPlugin(dir: string) {
472466
const plugins: string[] = []
473467

474-
for await (const item of PLUGIN_GLOB.scan({
468+
for (const item of await Glob.scan("{plugin,plugins}/*.{ts,js}", {
469+
cwd: dir,
475470
absolute: true,
476-
followSymlinks: true,
477471
dot: true,
478-
cwd: dir,
479472
})) {
480473
plugins.push(pathToFileURL(item).href)
481474
}

‎packages/opencode/src/file/ignore.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { sep } from "node:path"
2+
import { Glob } from "../util/glob"
23

34
export namespace FileIgnore {
45
const FOLDERS = new Set([
@@ -53,19 +54,17 @@ export namespace FileIgnore {
5354
"**/.nyc_output/**",
5455
]
5556

56-
const FILE_GLOBS = FILES.map((p) => new Bun.Glob(p))
57-
5857
export const PATTERNS = [...FILES, ...FOLDERS]
5958

6059
export function match(
6160
filepath: string,
6261
opts?: {
63-
extra?: Bun.Glob[]
64-
whitelist?: Bun.Glob[]
62+
extra?: string[]
63+
whitelist?: string[]
6564
},
6665
) {
67-
for (const glob of opts?.whitelist || []) {
68-
if (glob.match(filepath)) return false
66+
for (const pattern of opts?.whitelist || []) {
67+
if (Glob.match(pattern, filepath)) return false
6968
}
7069

7170
const parts = filepath.split(sep)
@@ -74,8 +73,8 @@ export namespace FileIgnore {
7473
}
7574

7675
const extra = opts?.extra || []
77-
for (const glob of [...FILE_GLOBS, ...extra]) {
78-
if (glob.match(filepath)) return true
76+
for (const pattern of [...FILES, ...extra]) {
77+
if (Glob.match(pattern, filepath)) return true
7978
}
8079

8180
return false

‎packages/opencode/src/project/project.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { iife } from "@/util/iife"
1313
import { GlobalBus } from "@/bus/global"
1414
import { existsSync } from "fs"
1515
import { git } from "../util/git"
16+
import { Glob } from "../util/glob"
1617

1718
export namespace Project {
1819
const log = Log.create({ service: "project" })
@@ -262,16 +263,11 @@ export namespace Project {
262263
if (input.vcs !== "git") return
263264
if (input.icon?.override) return
264265
if (input.icon?.url) return
265-
const glob = new Bun.Glob("**/{favicon}.{ico,png,svg,jpg,jpeg,webp}")
266-
const matches = await Array.fromAsync(
267-
glob.scan({
268-
cwd: input.worktree,
269-
absolute: true,
270-
onlyFiles: true,
271-
followSymlinks: false,
272-
dot: false,
273-
}),
274-
)
266+
const matches = await Glob.scan("**/{favicon}.{ico,png,svg,jpg,jpeg,webp}", {
267+
cwd: input.worktree,
268+
absolute: true,
269+
include: "file",
270+
})
275271
const shortest = matches.sort((a, b) => a.length - b.length)[0]
276272
if (!shortest) return
277273
const buffer = await Filesystem.readBytes(shortest)

‎packages/opencode/src/session/instruction.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { Config } from "../config/config"
66
import { Instance } from "../project/instance"
77
import { Flag } from "@/flag/flag"
88
import { Log } from "../util/log"
9+
import { Glob } from "../util/glob"
910
import type { MessageV2 } from "./message-v2"
1011

1112
const log = Log.create({ service: "instruction" })
@@ -98,13 +99,11 @@ export namespace InstructionPrompt {
9899
instruction = path.join(os.homedir(), instruction.slice(2))
99100
}
100101
const matches = path.isAbsolute(instruction)
101-
? await Array.fromAsync(
102-
new Bun.Glob(path.basename(instruction)).scan({
103-
cwd: path.dirname(instruction),
104-
absolute: true,
105-
onlyFiles: true,
106-
}),
107-
).catch(() => [])
102+
? await Glob.scan(path.basename(instruction), {
103+
cwd: path.dirname(instruction),
104+
absolute: true,
105+
include: "file",
106+
}).catch(() => [])
108107
: await resolveRelative(instruction)
109108
matches.forEach((p) => {
110109
paths.add(path.resolve(p))

‎packages/opencode/src/skill/skill.ts‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Flag } from "@/flag/flag"
1212
import { Bus } from "@/bus"
1313
import { Session } from "@/session"
1414
import { Discovery } from "./discovery"
15+
import { Glob } from "../util/glob"
1516

1617
export namespace Skill {
1718
const log = Log.create({ service: "skill" })
@@ -44,10 +45,9 @@ export namespace Skill {
4445
// External skill directories to search for (project-level and global)
4546
// These follow the directory layout used by Claude Code and other agents.
4647
const EXTERNAL_DIRS = [".claude", ".agents"]
47-
const EXTERNAL_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
48-
49-
const OPENCODE_SKILL_GLOB = new Bun.Glob("{skill,skills}/**/SKILL.md")
50-
const SKILL_GLOB = new Bun.Glob("**/SKILL.md")
48+
const EXTERNAL_SKILL_PATTERN = "skills/**/SKILL.md"
49+
const OPENCODE_SKILL_PATTERN = "{skill,skills}/**/SKILL.md"
50+
const SKILL_PATTERN = "**/SKILL.md"
5151

5252
export const state = Instance.state(async () => {
5353
const skills: Record<string, Info> = {}
@@ -88,15 +88,12 @@ export namespace Skill {
8888
}
8989

9090
const scanExternal = async (root: string, scope: "global" | "project") => {
91-
return Array.fromAsync(
92-
EXTERNAL_SKILL_GLOB.scan({
93-
cwd: root,
94-
absolute: true,
95-
onlyFiles: true,
96-
followSymlinks: true,
97-
dot: true,
98-
}),
99-
)
91+
return Glob.scan(EXTERNAL_SKILL_PATTERN, {
92+
cwd: root,
93+
absolute: true,
94+
include: "file",
95+
dot: true,
96+
})
10097
.then((matches) => Promise.all(matches.map(addSkill)))
10198
.catch((error) => {
10299
log.error(`failed to scan ${scope} skills`, { dir: root, error })
@@ -123,12 +120,12 @@ export namespace Skill {
123120

124121
// Scan .opencode/skill/ directories
125122
for (const dir of await Config.directories()) {
126-
for await (const match of OPENCODE_SKILL_GLOB.scan({
123+
const matches = await Glob.scan(OPENCODE_SKILL_PATTERN, {
127124
cwd: dir,
128125
absolute: true,
129-
onlyFiles: true,
130-
followSymlinks: true,
131-
})) {
126+
include: "file",
127+
})
128+
for (const match of matches) {
132129
await addSkill(match)
133130
}
134131
}
@@ -142,12 +139,12 @@ export namespace Skill {
142139
log.warn("skill path not found", { path: resolved })
143140
continue
144141
}
145-
for await (const match of SKILL_GLOB.scan({
142+
const matches = await Glob.scan(SKILL_PATTERN, {
146143
cwd: resolved,
147144
absolute: true,
148-
onlyFiles: true,
149-
followSymlinks: true,
150-
})) {
145+
include: "file",
146+
})
147+
for (const match of matches) {
151148
await addSkill(match)
152149
}
153150
}
@@ -157,12 +154,12 @@ export namespace Skill {
157154
const list = await Discovery.pull(url)
158155
for (const dir of list) {
159156
dirs.add(dir)
160-
for await (const match of SKILL_GLOB.scan({
157+
const matches = await Glob.scan(SKILL_PATTERN, {
161158
cwd: dir,
162159
absolute: true,
163-
onlyFiles: true,
164-
followSymlinks: true,
165-
})) {
160+
include: "file",
161+
})
162+
for (const match of matches) {
166163
await addSkill(match)
167164
}
168165
}

0 commit comments

Comments
 (0)