From 3fc5e5ab3a8f4f85a560c0922aaadd577f099a57 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 26 Oct 2026 22:35:28 -0700 Subject: [PATCH 01/91] Unify dedicated agent launch choices and argument badges --- .../components/settings/AgentCatalogRow.tsx | 23 +- .../AgentLaunchDefaultsEditor.test.tsx | 16 +- .../settings/AgentLaunchDefaultsEditor.tsx | 36 ++-- .../AgentPermissionChoiceControls.tsx | 83 ++++++-- .../settings/SourceControlActionArguments.tsx | 28 ++- .../SourceControlActionModelPicker.tsx | 201 ++++++++++-------- src/shared/agent-choice-args.ts | 158 ++++++++++++++ src/shared/agent-choice-layers.ts | 57 +++++ src/shared/agent-choice-reconciliation.ts | 112 ++++++++++ src/shared/agent-launch-choices.test.ts | 148 +++++++++++++ src/shared/agent-launch-choices.ts | 47 ++++ src/shared/agent-launch-preferences.ts | 8 +- src/shared/agent-launch-profile.ts | 73 +++++++ src/shared/agent-permission-args.ts | 187 +++++++--------- ...gent-session-option-catalog-antigravity.ts | 14 ++ ...ent-session-option-catalog-claude-codex.ts | 31 +++ .../agent-session-option-catalog-codebuddy.ts | 14 ++ ...nt-session-option-catalog-gemini-cursor.ts | 14 ++ .../agent-session-option-catalog-grok.ts | 14 ++ .../agent-session-option-catalog-muse.ts | 14 ++ .../agent-session-option-catalog-omp.ts | 7 + .../agent-session-option-catalog-opencode.ts | 7 + .../agent-session-option-catalog-types.ts | 2 + src/shared/agent-session-option-catalog.ts | 7 + src/shared/agent-session-option-launch.ts | 13 +- src/shared/tui-agent-launch-defaults.ts | 39 +--- src/shared/tui-agent-permission-lift.ts | 23 +- 27 files changed, 1062 insertions(+), 314 deletions(-) create mode 100644 src/shared/agent-choice-args.ts create mode 100644 src/shared/agent-choice-layers.ts create mode 100644 src/shared/agent-choice-reconciliation.ts create mode 100644 src/shared/agent-launch-choices.test.ts create mode 100644 src/shared/agent-launch-choices.ts create mode 100644 src/shared/agent-launch-profile.ts diff --git a/src/renderer/src/components/settings/AgentCatalogRow.tsx b/src/renderer/src/components/settings/AgentCatalogRow.tsx index 0fd823b2146f..06e4cfd959d6 100644 --- a/src/renderer/src/components/settings/AgentCatalogRow.tsx +++ b/src/renderer/src/components/settings/AgentCatalogRow.tsx @@ -298,17 +298,20 @@ export function AgentCatalogRow({ defaultArgs={defaultArgs} argsOverride={argsOverride} onSaveArgs={onSaveArgs} - permissionChip={ + choiceChips={ permissionChoice?.flag && !permissionChoice.argsSetPermission - ? { - label, - flag: permissionChoice.flag, - removeRecipe: (text) => { - const lifted = liftAgentPermissionArgs(agentId, text) - return lifted.choice !== null ? lifted.args : null - }, - onRemove: () => permissionChoice.onSelect('own') - } + ? [ + { + key: 'permissionMode', + label, + flag: permissionChoice.flag, + onRemove: (text) => { + const lifted = liftAgentPermissionArgs(agentId, text) + permissionChoice.onSelect('own') + return lifted.choice !== null ? lifted.args : text + } + } + ] : undefined } note={ diff --git a/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.test.tsx b/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.test.tsx index d96c66bb0903..88f792001e41 100644 --- a/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.test.tsx +++ b/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.test.tsx @@ -16,14 +16,16 @@ it.each(['', '--default'])( defaultArgs={defaultArgs} argsOverride="" onSaveArgs={vi.fn()} - permissionChip={ + choiceChips={ withChip - ? { - label: 'Claude', - flag: '--permission-mode default', - removeRecipe: () => null, - onRemove: vi.fn() - } + ? [ + { + key: 'permissionMode', + label: 'Claude', + flag: '--permission-mode default', + onRemove: (text) => text + } + ] : undefined } /> diff --git a/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.tsx b/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.tsx index 085d8d626aec..c88ec3ff3fc9 100644 --- a/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.tsx +++ b/src/renderer/src/components/settings/AgentLaunchDefaultsEditor.tsx @@ -9,7 +9,7 @@ import { type AgentDefaultEnvDraftInvalidReason } from './agent-default-env-draft' import { useAgentLaunchFieldWrite } from './use-agent-launch-field-write' -import { AgentPermissionArgsChip } from './AgentPermissionChoiceControls' +import { AgentArgsChoiceChips, type AgentArgsChoice } from './AgentPermissionChoiceControls' export function AgentCommandOverrideInput({ defaultCmd, @@ -87,7 +87,7 @@ export function AgentDefaultArgsInput({ defaultArgs, argsOverride, onSaveArgs, - permissionChip, + choiceChips, note, disabled = false, onDraftChange @@ -95,12 +95,7 @@ export function AgentDefaultArgsInput({ defaultArgs: string argsOverride: string onSaveArgs: (value: string) => void | Promise - permissionChip?: { - label: string - flag: string - removeRecipe: (text: string) => string | null - onRemove: () => void - } + choiceChips?: readonly AgentArgsChoice[] note?: string disabled?: boolean onDraftChange?: (value: string) => void @@ -111,6 +106,7 @@ export function AgentDefaultArgsInput({ const chipButtonRef = useRef(null) const argsDraft = onDraftChange ? argsOverride : (draft ?? argsOverride) const { pending, write } = useAgentLaunchFieldWrite() + const chipFlags = choiceChips?.map((chip) => chip.flag).join(' ') useLayoutEffect(() => { const input = inputRef.current const chip = chipRef.current @@ -128,7 +124,7 @@ export function AgentDefaultArgsInput({ const observer = new ResizeObserver(measure) observer.observe(chip) return () => observer.disconnect() - }, [permissionChip?.flag]) + }, [chipFlags]) const commitArgs = (): void => { if (disabled || pending || (!onDraftChange && draft === null)) { return @@ -164,26 +160,24 @@ export function AgentDefaultArgsInput({ } }} > - {permissionChip && ( - { + onRemove={(chip) => { if (disabled || pending) { return } - if (onDraftChange) { - onDraftChange(permissionChip.removeRecipe(argsDraft) ?? argsDraft) - } else if (draft !== null) { - setDraft(permissionChip.removeRecipe(draft) ?? draft) + const next = chip.onRemove(argsDraft) + if (!onDraftChange && draft !== null) { + setDraft(next) } inputRef.current?.focus() - permissionChip.onRemove() }} /> - )} + ) : null}