Skip to content

perf(skill): optimize permission checks with O(1) lookup #6421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BnayaZil wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

perf(skill): optimize permission checks with O(1) lookup #6421

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3860e77
perf(skill): optimize permission checks with O(1) lookup
BnayaZil Dec 30, 2025
327e41f
Merge branch 'dev' into perf/skill-tool-permission-optimization
BnayaZil Dec 30, 2025
f68def8
remove redundant comment
BnayaZil Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions packages/opencode/src/tool/skill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Agent } from "../agent/agent"
import { Permission } from "../permission"
import { Wildcard } from "../util/wildcard"
import { ConfigMarkdown } from "../config/markdown"
import { Config } from "../config/config"

const parameters = z.object({
name: z.string().describe("The skill identifier from available_skills (e.g., 'code-review')"),
Expand All @@ -16,15 +17,22 @@ export const SkillTool: Tool.Info<typeof parameters> = {
async init(ctx) {
const skills = await Skill.all()

// Filter skills by agent permissions if agent provided
let accessibleSkills = skills
if (ctx?.agent) {
const permissions = ctx.agent.permission.skill
accessibleSkills = skills.filter((skill) => {
const action = Wildcard.all(skill.name, permissions)
return action !== "deny"
})
}
const { accessibleSkills, permissionMap } = ctx?.agent
? skills.reduce(
(acc, skill) => {
const action = Wildcard.all(skill.name, ctx.agent!.permission.skill)
acc.permissionMap.set(skill.name, action)
if (action !== "deny") {
acc.accessibleSkills.push(skill)
}
return acc
},
{
accessibleSkills: [] as typeof skills,
permissionMap: new Map<string, typeof Config.Permission[keyof typeof Config.Permission]>(),
},
)
: { accessibleSkills: skills, permissionMap: null }

const description =
accessibleSkills.length === 0
Expand All @@ -47,20 +55,17 @@ export const SkillTool: Tool.Info<typeof parameters> = {
description,
parameters,
async execute(params, ctx) {
const agent = await Agent.get(ctx.agent)

const skill = await Skill.get(params.name)

if (!skill) {
const available = await Skill.all().then((x) => x.map((s) => s.name).join(", "))
const available = accessibleSkills.map((s) => s.name).join(", ")
throw new Error(`Skill "${params.name}" not found. Available skills: ${available || "none"}`)
}

// Check permission using Wildcard.all on the skill name
const permissions = agent.permission.skill
const action = Wildcard.all(params.name, permissions)
const action = permissionMap?.get(params.name)

if (action === "deny") {
const agent = await Agent.get(ctx.agent)
throw new Permission.RejectedError(
ctx.sessionID,
"skill",
Expand Down