golem15/msd-core
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: scope Windows hook syntax to Gemini runtime (#3438)

Browse Source 
* test: cover Windows hook shell drift for Claude (#3413)

* fix: scope Windows hook syntax to Gemini runtime (#3413)

* docs: add changeset for #3413

* docs: set changeset pr for #3413

* fix: route Windows hook formatting through runtime-aware projection seam

* test: cover runtime projection edge cases for Windows hooks

* fix(docs): add shell-command-projection to inventory parity

* docs: align CLI module shipped count after rebase
This commit is contained in:
Tom Boucher
2026-05-12 17:32:50 -04:00
committed by GitHub
parent 8cd874969c
commit 98cc1a84c0
7 changed files with 214 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bin/install.js
View File

@@ -5,6 +5,10 @@ const path = require('path');
const os = require('os');
const readline = require('readline');
const crypto = require('crypto');
const {
formatHookCommandForRuntime: formatHookCommandForShell,
formatManagedHookScriptToken,
} = require('../get-shit-done/bin/lib/shell-command-projection.cjs');
// Colors
const cyan = '\x1b[36m';
@@ -602,17 +606,6 @@ function resolveNodeRunner() {
*
* Returns true if any entry was rewritten.
*/
function formatHookCommandForShell(command, opts) {
const platform = (opts && opts.platform) || process.platform;
return platform === 'win32' ? `& ${command}` : command;
}
function formatManagedHookScriptToken(scriptPath, opts) {
const platform = (opts && opts.platform) || process.platform;
if (platform !== 'win32') return null;
return JSON.stringify(scriptPath.replace(/\\/g, '/'));
}
function resolveBashRunner(opts) {
const platform = (opts && opts.platform) || process.platform;
if (platform !== 'win32') return 'bash';
@@ -691,8 +684,9 @@ function rewriteLegacyManagedNodeHookCommands(settings, absoluteRunner, opts) {
const runnerPath = (m[2] || m[3] || m[4] || '').replace(/\\/g, '/');
const stableRunner = normalizeNodePath(runnerPath);
// Process Cellar paths so they normalize to a stable symlink. On
// Windows, also process already-absolute runners so PowerShell gets
// the call operator needed to invoke a quoted executable path (#3362).
// Windows, already-absolute runners still flow through the projection
// seam because some runtimes need additional wrapper policy while
// others must stay shell-neutral (#3362, #3413).
if (stableRunner === runnerPath && platform !== 'win32') continue;
scriptToken = m[5];
scriptPath = m[6] || m[7] || m[8] || '';
@@ -704,13 +698,16 @@ function rewriteLegacyManagedNodeHookCommands(settings, absoluteRunner, opts) {
const scriptBase = scriptPath.split(/[\\/]/).pop() || '';
if (!MANAGED_HOOK_FILES.has(scriptBase)) continue;
// Skip if already using the desired stable runner.
if (runnerToken !== 'node' && runnerToken === absoluteRunner) {
if (platform !== 'win32' || hadPowerShellCallOperator) continue;
}
const safeScriptToken = formatManagedHookScriptToken(scriptPath, opts) || scriptToken;
h.command = formatHookCommandForShell(`${absoluteRunner} ${safeScriptToken}`, opts);
const projectedCommand = formatHookCommandForShell(`${absoluteRunner} ${safeScriptToken}`, opts);
// Skip only when the existing managed command already matches the
// desired runtime-aware projected shape. This preserves Gemini's
// required PowerShell prefix while still letting Claude strip stale
// prefixes on reinstall (#3413).
if (h.command === projectedCommand) continue;
h.command = projectedCommand;
changed = true;
}
}
@@ -818,11 +815,12 @@ function rewriteLegacyCodexHookBlock(content, absoluteRunner) {
*
* @param {string} configDir - Resolved absolute config directory path
* @param {string} hookName - Hook filename (e.g. 'gsd-statusline.js')
* @param {{ portableHooks?: boolean, platform?: NodeJS.Platform }} [opts] - Options
* @param {{ portableHooks?: boolean, platform?: NodeJS.Platform, runtime?: string }} [opts] - Options
* portableHooks: when true, emit $HOME-relative paths instead of absolute paths.
* Safe for Linux/macOS global installs and WSL/Docker bind-mount scenarios.
* Not suitable for pure Windows (cmd.exe/PowerShell do not expand $HOME).
* platform: test injection for shell command formatting. Defaults to process.platform.
* runtime: target runtime name for shell projection policy.
*/
function buildHookCommand(configDir, hookName, opts) {
if (!opts) opts = {};
@@ -8833,7 +8831,7 @@ function install(isGlobal, runtime = 'claude', options = {}) {
// existing managed hook entries stay bare-`node`-prefixed across reinstalls
// and remain broken under GUI/minimal-PATH runtimes.
const settingsRunner = resolveNodeRunner();
if (settingsRunner && rewriteLegacyManagedNodeHookCommands(settings, settingsRunner)) {
if (settingsRunner && rewriteLegacyManagedNodeHookCommands(settings, settingsRunner, { platform: process.platform, runtime })) {
console.log(` ${green}✓${reset} Rewrote legacy bare-node managed-hook commands to absolute path (#2979)`);
}
// Local installs anchor hook paths so they resolve regardless of cwd (#1906).
@@ -8843,7 +8841,7 @@ function install(isGlobal, runtime = 'claude', options = {}) {
const localPrefix = (runtime === 'gemini' || runtime === 'antigravity')
? dirName
: '"$CLAUDE_PROJECT_DIR"/' + dirName;
const hookOpts = { portableHooks: hasPortableHooks };
const hookOpts = { portableHooks: hasPortableHooks, runtime };
// #2979: local-install hook commands also use the absolute node path so
// GUI/minimal-PATH runtimes can resolve them. Bare `node` fails when the
// host launches the runtime with a stripped PATH (Finder/Antigravity/etc).