singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(worktree): resolve 8.3 short paths and use shell mode for .bat hooks on Windows (#1956)

Browse source 
Resolve Windows 8.3 short paths (RUNNER~1 → runneradmin) via realpathSync.native()
and use shell mode for .bat/.cmd files in worktree post-create hooks. Fixes
pre-existing windows-portability CI failure.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
TÂCHES 2026-03-21 20:52:30 -06:00 • committed by GitHub
parent 60885610ac
commit 79e49aa413
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/resources/extensions/gsd/auto-worktree.ts
View file

@ -471,13 +471,21 @@ export function runWorktreePostCreateHook(
}
if (!hookPath) return null;
// Resolve relative paths against the source project root
const resolved = isAbsolute(hookPath) ? hookPath : join(sourceDir, hookPath);
// Resolve relative paths against the source project root.
// On Windows, convert 8.3 short paths (e.g. RUNNER~1) to long paths
// so execFileSync can locate the file correctly.
let resolved = isAbsolute(hookPath) ? hookPath : join(sourceDir, hookPath);
if (!existsSync(resolved)) {
return `Worktree post-create hook not found: ${resolved}`;
}
if (process.platform === "win32") {
try { resolved = realpathSync.native(resolved); } catch { /* keep original */ }
}
try {
// .bat/.cmd files on Windows require shell mode — execFileSync cannot
// spawn them directly (EINVAL).
const needsShell = process.platform === "win32" && /\.(bat|cmd)$/i.test(resolved);
execFileSync(resolved, [], {
cwd: worktreeDir,
env: {
@ -488,6 +496,7 @@ export function runWorktreePostCreateHook(
stdio: ["ignore", "pipe", "pipe"],
encoding: "utf-8",
timeout: 30_000, // 30 second timeout
shell: needsShell,
});
return null;
} catch (err) {