Skip to content

fix(config): validate auto-orchestrate router model refs #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wangyuxun6699 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(config): validate auto-orchestrate router model refs #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
496e275
fix(config): validate auto-orchestrate router model refs
wangyuxun6699 Jul 7, 2026
82fc061
Merge remote-tracking branch 'upstream/main' into fixchange
wangyuxun6699 Jul 7, 2026
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
28 changes: 21 additions & 7 deletions ui/server/services/pilotdeckConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,16 +221,22 @@ function validateRouterModelRefs(config, errors) {
}

const tokenSaver = router.tokenSaver;
if (!isRecord(tokenSaver)) return;
if (isRecord(tokenSaver)) {
validateModelRef(config, tokenSaver.judge, 'router.tokenSaver.judge', errors);

validateModelRef(config, tokenSaver.judge, 'router.tokenSaver.judge', errors);

if (isRecord(tokenSaver.tiers)) {
for (const [key, tier] of Object.entries(tokenSaver.tiers)) {
if (!isRecord(tier)) continue;
validateModelRef(config, tier.model, `router.tokenSaver.tiers.${key}.model`, errors);
if (isRecord(tokenSaver.tiers)) {
for (const [key, tier] of Object.entries(tokenSaver.tiers)) {
if (!isRecord(tier)) continue;
validateModelRef(config, tier.model, `router.tokenSaver.tiers.${key}.model`, errors);
}
}
}

const autoOrchestrate = router.autoOrchestrate;
if (isRecord(autoOrchestrate)) {
validateModelRef(config, autoOrchestrate.mainAgentModel, 'router.autoOrchestrate.mainAgentModel', errors);
validateModelRef(config, autoOrchestrate.subagentModel, 'router.autoOrchestrate.subagentModel', errors);
}
}

function validateGatewayConfig(config, errors, warnings) {
Expand Down Expand Up @@ -589,6 +595,14 @@ function purgeBootstrapPlaceholder(config) {
}
}
}
if (isRecord(router.autoOrchestrate)) {
if (isOrphanRef(router.autoOrchestrate.mainAgentModel)) {
router.autoOrchestrate.mainAgentModel = agentRef || router.autoOrchestrate.mainAgentModel;
}
if (isOrphanRef(router.autoOrchestrate.subagentModel)) {
router.autoOrchestrate.subagentModel = agentRef || router.autoOrchestrate.subagentModel;
}
}

return config;
}
Expand Down
89 changes: 88 additions & 1 deletion ui/server/services/pilotdeckConfig.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
import { describe, expect, it } from 'vitest';
import { sanitizeProviderCredentials, validatePilotDeckConfig } from './pilotdeckConfig.js';
import fs from 'fs/promises';
import os from 'os';
import path from 'path';
import {
sanitizeProviderCredentials,
validatePilotDeckConfig,
writePilotDeckConfig,
} from './pilotdeckConfig.js';

function validConfig(overrides = {}) {
return {
agent: { model: 'new/m' },
model: {
providers: {
new: {
protocol: 'openai',
url: 'https://example.test/v1',
apiKey: 'key',
models: { m: {} },
},
},
},
...overrides,
};
}

describe('validatePilotDeckConfig gateway validation', () => {
it('rejects non-object gateway config', () => {
Expand Down Expand Up @@ -84,3 +108,66 @@ describe('validatePilotDeckConfig gateway validation', () => {
expect(config.model.providers.ollama.url).toBe('http://localhost:11434/v1');
});
});

describe('validatePilotDeckConfig router auto-orchestrate refs', () => {
it('rejects unknown mainAgentModel provider refs', () => {
const validation = validatePilotDeckConfig(validConfig({
router: {
enabled: true,
autoOrchestrate: {
mainAgentModel: 'old/m',
},
},
}));

expect(validation.valid).toBe(false);
expect(validation.errors).toContain(
'router.autoOrchestrate.mainAgentModel="old/m" doesn\'t resolve to a configured provider/model',
);
});

it('rejects unknown subagentModel provider refs', () => {
const validation = validatePilotDeckConfig(validConfig({
router: {
enabled: true,
autoOrchestrate: {
subagentModel: 'old/m',
},
},
}));

expect(validation.valid).toBe(false);
expect(validation.errors).toContain(
'router.autoOrchestrate.subagentModel="old/m" doesn\'t resolve to a configured provider/model',
);
});

it('repairs auto-orchestrate refs orphaned by provider deletion before saving', async () => {
const previousConfigPath = process.env.PILOTDECK_CONFIG_PATH;
const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'pilotdeck-config-'));
process.env.PILOTDECK_CONFIG_PATH = path.join(tempDir, 'pilotdeck.yaml');

try {
const result = await writePilotDeckConfig(validConfig({
router: {
enabled: true,
autoOrchestrate: {
mainAgentModel: 'old/main',
subagentModel: 'old/sub',
},
},
}));

expect(result.validation.valid).toBe(true);
expect(result.config.router.autoOrchestrate.mainAgentModel).toBe('new/m');
expect(result.config.router.autoOrchestrate.subagentModel).toBe('new/m');
} finally {
if (previousConfigPath === undefined) {
delete process.env.PILOTDECK_CONFIG_PATH;
} else {
process.env.PILOTDECK_CONFIG_PATH = previousConfigPath;
}
await fs.rm(tempDir, { recursive: true, force: true });
}
});
});
23 changes: 22 additions & 1 deletion ui/src/components/settings/view/tabs/PilotDeckConfigTab.cron.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import { isCronConfigEnabled, patch } from './pilotDeckConfigForm';
import { isCronConfigEnabled, patch, rewriteProviderRefs } from './pilotDeckConfigForm';

describe('PilotDeckConfigTab Cron settings', () => {
it.each([
Expand Down Expand Up @@ -27,3 +27,24 @@ describe('PilotDeckConfigTab Cron settings', () => {
expect(config).not.toHaveProperty('cron');
});
});

describe('PilotDeckConfigTab router refs', () => {
it('rewrites auto-orchestrate model refs when renaming a provider', () => {
const config = {
agent: { model: 'old/main' },
router: {
autoOrchestrate: {
mainAgentModel: 'old/main',
subagentModel: 'old/sub',
},
},
};

const updated = rewriteProviderRefs(config, 'old', 'new');

expect(updated.router?.autoOrchestrate?.mainAgentModel).toBe('new/main');
expect(updated.router?.autoOrchestrate?.subagentModel).toBe('new/sub');
expect(config.router.autoOrchestrate.mainAgentModel).toBe('old/main');
expect(config.router.autoOrchestrate.subagentModel).toBe('old/sub');
});
});
83 changes: 3 additions & 80 deletions ui/src/components/settings/view/tabs/PilotDeckConfigTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import {
} from '../../../../shared/catalogProviders';
import { fetchProviderModels, type ApiModelListItem } from '../../../../shared/modelListApi';
import type { SettingsProject } from '../../types/types';
import { isCronConfigEnabled, patch } from './pilotDeckConfigForm';
import { isCronConfigEnabled, patch, rewriteProviderRefs } from './pilotDeckConfigForm';

// ── V2 schema types ────────────────────────────────────────────────────
// Schema mirrors ~/.pilotdeck/pilotdeck.yaml exactly. No more
Expand Down Expand Up @@ -183,6 +183,8 @@ type PilotDeckConfig = {
};
autoOrchestrate?: {
enabled?: boolean;
mainAgentModel?: string;
subagentModel?: string;
triggerTiers?: string[];
slimSystemPrompt?: boolean;
};
Expand Down Expand Up @@ -375,85 +377,6 @@ function configToYamlString(config: PilotDeckConfig): string {
return stringifyYaml(config, { indent: 2, lineWidth: 0 });
}

function rewriteProviderRef(value: unknown, oldProviderId: string, newProviderId: string): unknown {
const oldPrefix = `${oldProviderId}/`;
if (typeof value !== 'string' || !value.startsWith(oldPrefix)) return value;
return `${newProviderId}/${value.slice(oldPrefix.length)}`;
}

function rewriteProviderRefs(config: PilotDeckConfig, oldProviderId: string, newProviderId: string): PilotDeckConfig {
let next = config;

const agentModel = rewriteProviderRef(next.agent?.model, oldProviderId, newProviderId);
if (agentModel !== next.agent?.model) {
next = patch(next, ['agent', 'model'], agentModel);
}

const subagentDefault = rewriteProviderRef(next.agent?.subagents?.default, oldProviderId, newProviderId);
if (subagentDefault !== next.agent?.subagents?.default) {
next = patch(next, ['agent', 'subagents', 'default'], subagentDefault);
}

const memoryModel = rewriteProviderRef(next.memory?.model, oldProviderId, newProviderId);
if (memoryModel !== next.memory?.model) {
next = patch(next, ['memory', 'model'], memoryModel);
}

const memoryLlm = (next.memory as Record<string, unknown> | undefined)?.llm;
if (memoryLlm && typeof memoryLlm === 'object' && !Array.isArray(memoryLlm)) {
const llm = memoryLlm as Record<string, unknown>;
if (llm.provider === oldProviderId) {
next = patch(next, ['memory', 'llm', 'provider'], newProviderId);
}
}

const scenarios = next.router?.scenarios;
if (scenarios) {
const rewritten = Object.fromEntries(
Object.entries(scenarios).map(([key, ref]) => [key, rewriteProviderRef(ref, oldProviderId, newProviderId) as string]),
);
if (Object.entries(scenarios).some(([key, ref]) => rewritten[key] !== ref)) {
next = patch(next, ['router', 'scenarios'], rewritten);
}
}

const fallback = next.router?.fallback;
if (fallback) {
const rewritten = Object.fromEntries(
Object.entries(fallback).map(([key, refs]) => [
key,
refs.map((ref) => rewriteProviderRef(ref, oldProviderId, newProviderId) as string),
]),
);
if (Object.entries(fallback).some(([key, refs]) => rewritten[key].some((ref, index) => ref !== refs[index]))) {
next = patch(next, ['router', 'fallback'], rewritten);
}
}

const judge = rewriteProviderRef(next.router?.tokenSaver?.judge, oldProviderId, newProviderId);
if (judge !== next.router?.tokenSaver?.judge) {
next = patch(next, ['router', 'tokenSaver', 'judge'], judge);
}

const tiers = next.router?.tokenSaver?.tiers;
if (tiers) {
const rewritten = Object.fromEntries(
Object.entries(tiers).map(([key, tier]) => [
key,
{
...tier,
model: rewriteProviderRef(tier.model, oldProviderId, newProviderId) as string | undefined,
},
]),
);
if (Object.entries(tiers).some(([key, tier]) => rewritten[key].model !== tier.model)) {
next = patch(next, ['router', 'tokenSaver', 'tiers'], rewritten);
}
}

return next;
}

function replaceFallbackModelRef(config: PilotDeckConfig, oldRef: string, newRef: string): PilotDeckConfig {
const fallback = config.router?.fallback;
if (!fallback || !oldRef || oldRef === newRef) return config;
Expand Down
Loading