wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): preserve requested cwd for runner-spawned sessions (#315)

Browse Source
This commit is contained in:
ROOOO
2026-03-19 15:15:41 +08:00
committed by GitHub
parent 987010f447
commit 397ef35f5c
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/utils/spawnHappyCLI.test.ts
+18 -2
View File
@@ -124,12 +124,28 @@ describe('spawnHappyCLI windowsHide behavior', () => {
expect(options.env?.HAPI_INVOKED_CWD).toBe(childCwd);
});
it('keeps an existing absolute HAPI_INVOKED_CWD when provided explicitly', async () => {
it('prefers the explicit child cwd over an inherited HAPI_INVOKED_CWD', async () => {
const { spawnHappyCLI } = await import('./spawnHappyCLI');
const inheritedInvokedCwd = 'C:\\workspace\\other-project';
const childCwd = 'C:\\workspace\\project';
spawnHappyCLI(['runner', 'start-sync'], {
cwd: childCwd,
env: {
HAPI_INVOKED_CWD: inheritedInvokedCwd
},
stdio: 'ignore'
});
const options = getSpawnOptionsOrThrow();
expect(options.env?.HAPI_INVOKED_CWD).toBe(childCwd);
});
it('keeps an existing absolute HAPI_INVOKED_CWD when no child cwd is provided', async () => {
const { spawnHappyCLI } = await import('./spawnHappyCLI');
const inheritedInvokedCwd = 'C:\\workspace\\other-project';
spawnHappyCLI(['runner', 'start-sync'], {
cwd: 'C:\\workspace\\project',
env: {
HAPI_INVOKED_CWD: inheritedInvokedCwd
},
cli/src/utils/spawnHappyCLI.ts
+6 -3
View File
@@ -136,9 +136,12 @@ export function spawnHappyCLI(args: string[], options: SpawnOptions = {}): Child
if (!isBunCompiled()) {
const finalEnv = { ...process.env, ...options.env };
const invokedCwd = finalEnv.HAPI_INVOKED_CWD?.trim();
finalEnv.HAPI_INVOKED_CWD = invokedCwd && isCrossPlatformAbsolutePath(invokedCwd)
? invokedCwd
: resolveInvokedCwd(options.cwd);
const hasExplicitCwd = 'cwd' in options && options.cwd !== undefined;
finalEnv.HAPI_INVOKED_CWD = hasExplicitCwd
? resolveInvokedCwd(options.cwd)
: invokedCwd && isCrossPlatformAbsolutePath(invokedCwd)
? invokedCwd
: resolveInvokedCwd(options.cwd);
finalOptions.env = finalEnv;
}
if (process.platform === 'win32' && options.detached) {