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

Merge pull request #4021 from jeremymcs/fix/merged-node-modules-non-gsd-scopes

Browse source 
fix(cli): include all internal node_modules in pnpm merged dir
This commit is contained in:
Jeremy McSpadden 2026-04-12 02:23:42 -05:00 • committed by GitHub
commit 791ce1b35e
2 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/resource-loader.ts
View file

@ -399,12 +399,15 @@ function reconcileMergedNodeModules(
console.error(`[gsd] WARN: Failed to read hoisted node_modules at ${hoisted}: ${err instanceof Error ? err.message : err}`)
}
// Overlay @gsd* workspace scopes from internal node_modules
// Overlay internal node_modules entries that weren't hoisted.
// This covers @gsd/* workspace packages AND optional deps like
// @anthropic-ai/claude-agent-sdk that npm keeps internal.
try {
for (const entry of readdirSync(internal, { withFileTypes: true })) {
if (!entry.name.startsWith('@gsd')) continue
if (entry.name.startsWith('.')) continue
const link = join(agentNodeModules, entry.name)
try { lstatSync(link); unlinkSync(link) } catch { /* didn't exist */ }
// Replace hoisted symlink with internal version (internal takes precedence)
try { lstatSync(link); unlinkSync(link) } catch { /* didn't exist — will create below */ }
try { symlinkSync(join(internal, entry.name), link); linkedCount++ } catch { /* skip individual */ }
}
} catch (err) {

51
src/tests/node-modules-symlink.test.ts
View file

@ -147,9 +147,9 @@ test("pnpm layout: merged node_modules contains entries from both hoisted and in
symlinkSync(join(hoisted, entry.name), join(agentNodeModules, entry.name));
}
// Overlay @gsd* workspace scopes from internal (these take precedence)
// Overlay all non-dotfile entries from internal (these take precedence)
for (const entry of readdirSync(internal, { withFileTypes: true })) {
if (!entry.name.startsWith("@gsd")) continue;
if (entry.name.startsWith(".")) continue;
const link = join(agentNodeModules, entry.name);
try { lstatSync(link); unlinkSync(link); } catch { /* didn't exist */ }
symlinkSync(join(internal, entry.name), link);
@ -173,6 +173,53 @@ test("pnpm layout: merged node_modules contains entries from both hoisted and in
assert.equal(gsdTarget, join(internal, "@gsd"), "@gsd should point to internal node_modules");
});
test("pnpm layout: non-@gsd internal deps (e.g. @anthropic-ai) are included in merged dir", (t) => {
// Regression: PR #3564 narrowed the internal overlay to @gsd* only,
// dropping optionalDependencies like @anthropic-ai/claude-agent-sdk
// that npm installs internally rather than hoisting.
const tmp = mkdtempSync(join(tmpdir(), "gsd-pnpm-internal-optional-"));
t.after(() => rmSync(tmp, { recursive: true, force: true }));
const hoisted = join(tmp, "node_modules");
const pkgRoot = join(hoisted, "gsd-pi");
const internal = join(pkgRoot, "node_modules");
const agentNodeModules = join(tmp, "agent", "node_modules");
// Hoisted: only external deps (no @anthropic-ai — it's internal-only)
mkdirSync(join(hoisted, "yaml"), { recursive: true });
mkdirSync(pkgRoot, { recursive: true });
// Internal: workspace packages + optional dep that wasn't hoisted
mkdirSync(join(internal, "@gsd", "pi-ai"), { recursive: true });
mkdirSync(join(internal, "@anthropic-ai", "claude-agent-sdk"), { recursive: true });
mkdirSync(agentNodeModules, { recursive: true });
// Link hoisted entries
for (const entry of readdirSync(hoisted, { withFileTypes: true })) {
if (entry.name === "gsd-pi" || entry.name.startsWith(".")) continue;
symlinkSync(join(hoisted, entry.name), join(agentNodeModules, entry.name));
}
// Overlay all non-dotfile internal entries (the fixed logic)
for (const entry of readdirSync(internal, { withFileTypes: true })) {
if (entry.name.startsWith(".")) continue;
const link = join(agentNodeModules, entry.name);
try { lstatSync(link); unlinkSync(link); } catch { /* didn't exist */ }
symlinkSync(join(internal, entry.name), link);
}
// @anthropic-ai must be present — this is what broke in #3564
assert.ok(existsSync(join(agentNodeModules, "@anthropic-ai")), "@anthropic-ai should resolve from internal");
assert.ok(existsSync(join(agentNodeModules, "@anthropic-ai", "claude-agent-sdk")), "@anthropic-ai/claude-agent-sdk should resolve");
// @gsd still resolves
assert.ok(existsSync(join(agentNodeModules, "@gsd")), "@gsd should resolve");
// Hoisted deps still resolve
assert.ok(existsSync(join(agentNodeModules, "yaml")), "yaml should resolve");
});
test("hasMissingWorkspaceScopes detects pnpm layout", (t) => {
const tmp = mkdtempSync(join(tmpdir(), "gsd-pnpm-detect-"));
t.after(() => rmSync(tmp, { recursive: true, force: true }));