Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion clients/vscode/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,16 @@ function makeAvailabilityProbe(
*/
function resolveSidecarPath(context: vscode.ExtensionContext): string {
const bundled = path.join(context.extensionPath, 'sidecar', 'server.js');
// Dev fallback: monorepo layout clients/vscode -> packages/core.
// Dev path: monorepo layout clients/vscode -> packages/core.
const dev = path.join(context.extensionPath, '..', '..', 'packages', 'core', 'dist', 'server.js');
// In development (`--extensionDevelopmentPath`), prefer the LIVE monorepo
// build so core edits take effect on the next `task build` without a
// re-bundle — a stale `sidecar/server.js` from an earlier `vscode:package`
// must not shadow it. A packaged VSIX has no dev path, so it always uses the
// bundled sidecar (ADR-017).
if (context.extensionMode === vscode.ExtensionMode.Development && existsSync(dev)) {
return dev;
}
return existsSync(bundled) ? bundled : dev;
}

Expand Down
Loading