* fix(#2831): expand HOME in OpenCode skill/template paths OpenCode does not shell-expand $HOME in @file references on any platform — the literal `@$HOME/...` path is resolved relative to the config command/ dir, producing `command/$HOME/...` (file not found). The previous fix for #2376 only guarded Windows; extend to all platforms. Closes #2831 * test(#2831): assert behavior via exported computePathPrefix, not source grep Addresses CodeRabbit review on PR #2842: - Extracts pathPrefix logic into a named, test-exported computePathPrefix helper in bin/install.js (no behavior change at the call site). - Rewrites bug-2376 and bug-2831 regression tests to call the exported function directly instead of regex-matching install.js source text, per the repo's no-source-grep testing standard. - Wraps temp-dir test setup in try/finally so cleanup runs on assertion failures (no leaked tmp dirs).
This commit is contained in:
@@ -483,6 +483,31 @@ function expandTilde(filePath) {
|
||||
return filePath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute the path prefix used for `@file` references in installed command/skill
|
||||
* markdown. For global installs into a runtime config dir under $HOME, we
|
||||
* normally substitute the home prefix with `$HOME` so paths expand correctly
|
||||
* inside double-quoted shell commands. OpenCode is exempt on every platform:
|
||||
* its `@file` include syntax does NOT shell-expand `$HOME`, so a literal
|
||||
* `@$HOME/...` is treated as a path relative to the config command/ dir, which
|
||||
* resolves to `command/$HOME/...` (file not found). For OpenCode we always emit
|
||||
* the absolute resolved path. (#2376 Windows, #2831 macOS/Linux.)
|
||||
*
|
||||
* @param {object} args
|
||||
* @param {boolean} args.isGlobal - Global runtime install vs local project
|
||||
* @param {boolean} args.isOpencode - Whether the runtime is OpenCode
|
||||
* @param {boolean} args.isWindowsHost - process.platform === 'win32'
|
||||
* @param {string} args.resolvedTarget - Absolute target dir, forward-slashed
|
||||
* @param {string} args.homeDir - User home dir, forward-slashed
|
||||
* @returns {string} pathPrefix ending with '/'
|
||||
*/
|
||||
function computePathPrefix({ isGlobal, isOpencode, isWindowsHost: _isWindowsHost, resolvedTarget, homeDir }) {
|
||||
if (isGlobal && resolvedTarget.startsWith(homeDir) && !isOpencode) {
|
||||
return '$HOME' + resolvedTarget.slice(homeDir.length) + '/';
|
||||
}
|
||||
return `${resolvedTarget}/`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a hook command path using forward slashes for cross-platform compatibility.
|
||||
* On Windows, $HOME is not expanded by cmd.exe/PowerShell, so we use the actual path.
|
||||
@@ -6566,14 +6591,20 @@ function install(isGlobal, runtime = 'claude') {
|
||||
// For global installs: use $HOME/ so paths expand correctly inside double-quoted
|
||||
// shell commands (~ does NOT expand inside double quotes, causing MODULE_NOT_FOUND).
|
||||
// For local installs: use resolved absolute path (may be outside $HOME).
|
||||
// Exception: OpenCode on Windows does not expand $HOME in @file references —
|
||||
// use the absolute path instead so @$HOME/... references resolve correctly (#2376).
|
||||
// Exception: OpenCode does not expand $HOME in @file references on any platform —
|
||||
// `@$HOME/...` is treated as a literal path relative to the config dir, producing
|
||||
// `command/$HOME/...` (file not found). Use the absolute path for OpenCode so
|
||||
// @-references resolve correctly (#2376 Windows, #2831 macOS/Linux).
|
||||
const resolvedTarget = path.resolve(targetDir).replace(/\\/g, '/');
|
||||
const homeDir = os.homedir().replace(/\\/g, '/');
|
||||
const isWindowsHost = process.platform === 'win32';
|
||||
const pathPrefix = isGlobal && resolvedTarget.startsWith(homeDir) && !(isOpencode && isWindowsHost)
|
||||
? '$HOME' + resolvedTarget.slice(homeDir.length) + '/'
|
||||
: `${resolvedTarget}/`;
|
||||
const pathPrefix = computePathPrefix({
|
||||
isGlobal,
|
||||
isOpencode,
|
||||
isWindowsHost,
|
||||
resolvedTarget,
|
||||
homeDir,
|
||||
});
|
||||
|
||||
let runtimeLabel = 'Claude Code';
|
||||
if (isOpencode) runtimeLabel = 'OpenCode';
|
||||
@@ -8417,6 +8448,7 @@ function installAllRuntimes(runtimes, isGlobal, isInteractive) {
|
||||
if (process.env.GSD_TEST_MODE) {
|
||||
module.exports = {
|
||||
yamlIdentifier,
|
||||
computePathPrefix,
|
||||
getCodexSkillAdapterHeader,
|
||||
convertClaudeCommandToCursorSkill,
|
||||
convertClaudeAgentToCursorAgent,
|
||||
|
||||
Reference in New Issue
Block a user