ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(skill): emit base directory as filesystem path, not file:// URL (#33580)

Browse source 
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
This commit is contained in:
Chris Yuan 2026-06-24 13:08:22 +08:00 • committed by GitHub
commit 246d40db73
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packages/core/src/tool/skill.ts
View file

@ -1,7 +1,6 @@
export * as SkillTool from "./skill" export * as SkillTool from "./skill"
import path from "path" import path from "path"
import { pathToFileURL } from "url"
import { ToolFailure } from "@opencode-ai/llm" import { ToolFailure } from "@opencode-ai/llm"
import { Effect, Layer, Schema } from "effect" import { Effect, Layer, Schema } from "effect"
import { FSUtil } from "../fs-util" import { FSUtil } from "../fs-util"
@ -39,7 +38,7 @@ export const toModelOutput = (skill: SkillV2.Info, files: ReadonlyArray<string>)
"", "",
skill.content.trim(), skill.content.trim(),
"", "",
`Base directory for this skill: ${pathToFileURL(directory).href}`, `Base directory for this skill: ${directory}`,
"Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.", "Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
"Note: file list is sampled.", "Note: file list is sampled.",
"", "",

3
packages/core/test/tool-skill.test.ts
View file

@ -1,6 +1,5 @@
import fs from "fs/promises" import fs from "fs/promises"
import path from "path" import path from "path"
import { pathToFileURL } from "url"
import { describe, expect } from "bun:test" import { describe, expect } from "bun:test"
import { Effect, Layer } from "effect" import { Effect, Layer } from "effect"
import { FSUtil } from "@opencode-ai/core/fs-util" import { FSUtil } from "@opencode-ai/core/fs-util"
@ -90,7 +89,7 @@ describe("SkillTool", () => {
value: SkillTool.toModelOutput(info, [reference]), value: SkillTool.toModelOutput(info, [reference]),
}) })
expect(SkillTool.toModelOutput(info, [reference])).toContain( expect(SkillTool.toModelOutput(info, [reference])).toContain(
`Base directory for this skill: ${pathToFileURL(directory).href}`, `Base directory for this skill: ${directory}`,
) )
expect( expect(
yield* settleTool(registry, { yield* settleTool(registry, {

3
packages/opencode/src/tool/skill.ts
View file

@ -1,5 +1,4 @@
import path from "path" import path from "path"
import { pathToFileURL } from "url"
import { Effect, Schema } from "effect" import { Effect, Schema } from "effect"
import { Ripgrep } from "@opencode-ai/core/ripgrep" import { Ripgrep } from "@opencode-ai/core/ripgrep"
import { Skill } from "../skill" import { Skill } from "../skill"
@ -33,7 +32,7 @@ export const SkillTool = Tool.define(
}) })
const dir = path.dirname(info.location) const dir = path.dirname(info.location)
const base = pathToFileURL(dir).href const base = dir
const files = yield* ripgrep.find({ const files = yield* ripgrep.find({
cwd: dir, cwd: dir,
pattern: "!**/SKILL.md", pattern: "!**/SKILL.md",

3
packages/opencode/test/tool/skill.test.ts
View file

@ -4,7 +4,6 @@ import { Ripgrep } from "@opencode-ai/core/ripgrep"
import { Cause, Effect, Exit, Layer } from "effect" import { Cause, Effect, Exit, Layer } from "effect"
import { afterEach, describe, expect } from "bun:test" import { afterEach, describe, expect } from "bun:test"
import path from "path" import path from "path"
import { pathToFileURL } from "url"
import type { Permission } from "../../src/permission" import type { Permission } from "../../src/permission"
import type { Tool } from "@/tool/tool" import type { Tool } from "@/tool/tool"
import { SkillTool } from "../../src/tool/skill" import { SkillTool } from "../../src/tool/skill"
@ -90,7 +89,7 @@ Use this skill.
expect(requests[0].always).toContain("tool-skill") expect(requests[0].always).toContain("tool-skill")
expect(result.metadata.dir).toBe(skill) expect(result.metadata.dir).toBe(skill)
expect(result.output).toContain(`<skill_content name="tool-skill">`) expect(result.output).toContain(`<skill_content name="tool-skill">`)
expect(result.output).toContain(`Base directory for this skill: ${pathToFileURL(skill).href}`) expect(result.output).toContain(`Base directory for this skill: ${skill}`)
expect(result.output).toContain(`<file>${file}</file>`) expect(result.output).toContain(`<file>${file}</file>`)
}), }),
) )