Skip to content

Fix god command honoring explicit provider #551

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
garedrag wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −10
Open

Fix god command honoring explicit provider #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions src/renderer/src/store/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,23 +402,22 @@ export function decodeProviderModel(value: string): {
}

/** Build the command line to feed into spawnPty, honoring the provider's flags,
* autoMode, and an optional per-agent model override. Claude keeps the user's
* configured `defaultCommand`; other providers use their preset binary so the
* app works without Claude installed. */
* autoMode, and an optional per-agent model override. An explicit provider
* selects its own binary; custom commands keep the configured default. */
export function buildSpawnCommand(
config: Pick<HarnessConfig, 'defaultCommand' | 'autoMode'>,
model?: string,
provider: AgentProvider = inferAgentProvider(config.defaultCommand)
): string {
const preset = providerPreset(provider);
// Claude keeps the user's configured defaultCommand; custom falls back to it
// too; every other provider (codex, grok, kimi, agy) uses its preset binary so the app
// works even without Claude installed.
const configured = (config.defaultCommand ?? '').trim();
// An explicit provider must win over the global default command. Otherwise a
// Claude god with a Codex worker default is serialized and launched as Codex.
const base =
provider === 'claude'
? config.defaultCommand || preset.defaultCommand
: provider === 'custom'
? config.defaultCommand || ''
provider === 'custom'
? configured
: provider === 'claude' && inferAgentProvider(configured) === 'claude'
? configured
: preset.defaultCommand;
let cmd = base;
if (preset.supportsModel && model && preset.modelFlag) {
Expand Down
7 changes: 7 additions & 0 deletions test/provider-config.test.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ test('provider commands use matching models and equivalent bypass modes', () =>
);
});

test('explicit Claude provider does not inherit a Codex default command', () => {
assert.equal(
buildSpawnCommand({ defaultCommand: 'codex', autoMode: true }, 'claude-sonnet-5', 'claude'),
'claude --model claude-sonnet-5 --permission-mode bypassPermissions'
);
});

test('model picker options stay provider-specific', () => {
assert.equal(
modelsForProvider('claude').find((model) => model.id === 'claude-opus-5')?.label,
Expand Down
Loading