Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/config/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ export function mergeImportedConfig(
const services: ServicesConfig["services"] = structuredClone(localConfig.services);

for (const [name, importedService] of Object.entries(importedConfig.services)) {
if (services[name]) continue;
services[name] = structuredClone(importedService);
services[name].source = importedService.source ?? "remote";
}
Expand Down
6 changes: 3 additions & 3 deletions tests/config/loader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ describe("loadConfig", () => {
});

describe("mergeImportedConfig", () => {
test("imported service wins and source comes from imported config", () => {
test("local bootstrap service wins over imported service", () => {
const local = {
services: {
shared: {
Expand All @@ -559,8 +559,8 @@ describe("mergeImportedConfig", () => {

const merged = mergeImportedConfig(local, imported);
const shared = merged.services.shared!;
expect(shared.backend).toBe("http");
expect(shared.source).toBe("remote");
expect(shared.backend).toBe("stdio");
expect(shared.source).toBe("local");
});

test("imported services default to remote source", () => {
Expand Down