Files
oh-my-opencode/src/shared/skill-path-resolver.ts
T
YeonGyu-Kim c750781be4 fix(shared): avoid false-positive skill path resolution on npm scoped packages (#2857)
The @scope/path regex incorrectly matched npm scoped package references
like 'require(\"@scope/pkg\")' or '--package=@scope/pkg'. Added context
filtering to exclude matches preceded by npm/import indicators.

🤖 Generated with OhMyOpenCode assistance
https://github.com/code-yeongyu/oh-my-opencode
2026-04-12 02:28:46 +09:00

27 lines
973 B
TypeScript

import { isAbsolute, relative, resolve, sep } from "node:path"
function looksLikeFilePath(path: string): boolean {
if (path.endsWith("/")) return true
const lastSegment = path.split("/").pop() ?? ""
return /\.[a-zA-Z0-9]+$/.test(lastSegment)
}
export function resolveSkillPathReferences(content: string, basePath: string): string {
const normalizedBase = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath
return content.replace(
/(?<![a-zA-Z0-9="\(])@([a-zA-Z0-9_-]+\/[a-zA-Z0-9_.\-\/]*)/g,
(match, relativePath: string) => {
if (!looksLikeFilePath(relativePath)) return match
const resolvedPath = resolve(normalizedBase, relativePath)
const relativePathFromBase = relative(normalizedBase, resolvedPath)
if (relativePathFromBase.startsWith("..") || isAbsolute(relativePathFromBase)) {
return match
}
if (relativePath.endsWith("/") && !resolvedPath.endsWith(sep)) {
return `${resolvedPath}/`
}
return resolvedPath
}
)
}