feat: auto-allow all tools toggle + fix team color fallback
- Add autoAllowAll setting: overrides all individual auto-allow rules, instantly approves every tool call without user interaction - Settings panel: "Auto-allow all tools" checkbox at top, individual checkboxes greyed out when all-allow is active - Fix team color badge: use getTeamColorSet(teamName) as fallback instead of getMemberColorByName which uses a different palette and produced wrong colors (yellow instead of pink)
This commit is contained in:
parent
0ebfd85b47
commit
73661c80a4
6 changed files with 42 additions and 9 deletions
|
|
@ -2767,6 +2767,9 @@ async function handleToolApprovalSettings(
|
|||
return { success: false, error: 'Settings must be an object' };
|
||||
}
|
||||
const s = settings as Record<string, unknown>;
|
||||
if (typeof s.autoAllowAll !== 'boolean') {
|
||||
return { success: false, error: 'autoAllowAll must be a boolean' };
|
||||
}
|
||||
if (typeof s.autoAllowFileEdits !== 'boolean') {
|
||||
return { success: false, error: 'autoAllowFileEdits must be a boolean' };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -116,6 +116,11 @@ export function shouldAutoAllow(
|
|||
toolName: string,
|
||||
toolInput: Record<string, unknown>
|
||||
): AutoAllowResult {
|
||||
// Auto-allow ALL tools (overrides everything)
|
||||
if (settings.autoAllowAll) {
|
||||
return { autoAllow: true, reason: 'auto_allow_all' };
|
||||
}
|
||||
|
||||
// File edit auto-allow
|
||||
if (settings.autoAllowFileEdits && FILE_EDIT_TOOLS.has(toolName)) {
|
||||
return { autoAllow: true, reason: 'auto_allow_category' };
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import { getTeamColorSet, getThemedBadge } from '@renderer/constants/teamColors'
|
|||
import { useTheme } from '@renderer/hooks/useTheme';
|
||||
import { useStore } from '@renderer/store';
|
||||
import { highlightLines } from '@renderer/utils/syntaxHighlighter';
|
||||
import { getMemberColorByName } from '@shared/constants/memberColors';
|
||||
import { AlertTriangle, FileText, Search, Terminal } from 'lucide-react';
|
||||
|
||||
import { ToolApprovalDiffPreview } from './ToolApprovalDiffPreview';
|
||||
|
|
@ -170,10 +169,9 @@ export const ToolApprovalSheet: React.FC = () => {
|
|||
if (!current) return null;
|
||||
|
||||
// Prefer color from the approval itself (always available, even during provisioning),
|
||||
// fall back to teams list, then deterministic color from team name.
|
||||
// fall back to teams list, then getTeamColorSet hashes unknown names into TEAMMATE_COLORS.
|
||||
const teamSummary = teams.find((t) => t.teamName === current.teamName);
|
||||
const colorName =
|
||||
current.teamColor ?? teamSummary?.color ?? getMemberColorByName(current.teamName);
|
||||
const colorName = current.teamColor ?? teamSummary?.color ?? current.teamName;
|
||||
const teamColor = getTeamColorSet(colorName);
|
||||
const displayName = current.teamDisplayName ?? teamSummary?.displayName ?? current.teamName;
|
||||
|
||||
|
|
|
|||
|
|
@ -50,13 +50,32 @@ export const ToolApprovalSettingsPanel: React.FC = () => {
|
|||
borderColor: 'var(--color-border)',
|
||||
}}
|
||||
>
|
||||
{/* Auto-allow file edits */}
|
||||
{/* Auto-allow ALL */}
|
||||
<label
|
||||
className="flex items-center gap-2 text-xs"
|
||||
className="flex items-center gap-2 text-xs font-medium"
|
||||
style={{ color: 'var(--color-text-secondary)' }}
|
||||
>
|
||||
<Checkbox
|
||||
checked={settings.autoAllowFileEdits}
|
||||
checked={settings.autoAllowAll}
|
||||
onCheckedChange={(checked) => void updateSettings({ autoAllowAll: checked === true })}
|
||||
/>
|
||||
Auto-allow all tools
|
||||
</label>
|
||||
|
||||
{/* Separator */}
|
||||
<div className="border-t" style={{ borderColor: 'var(--color-border)' }} />
|
||||
|
||||
{/* Auto-allow file edits */}
|
||||
<label
|
||||
className="flex items-center gap-2 text-xs"
|
||||
style={{
|
||||
color: 'var(--color-text-secondary)',
|
||||
opacity: settings.autoAllowAll ? 0.5 : 1,
|
||||
}}
|
||||
>
|
||||
<Checkbox
|
||||
checked={settings.autoAllowAll || settings.autoAllowFileEdits}
|
||||
disabled={settings.autoAllowAll}
|
||||
onCheckedChange={(checked) =>
|
||||
void updateSettings({ autoAllowFileEdits: checked === true })
|
||||
}
|
||||
|
|
@ -67,10 +86,14 @@ export const ToolApprovalSettingsPanel: React.FC = () => {
|
|||
{/* Auto-allow safe bash */}
|
||||
<label
|
||||
className="flex items-center gap-2 text-xs"
|
||||
style={{ color: 'var(--color-text-secondary)' }}
|
||||
style={{
|
||||
color: 'var(--color-text-secondary)',
|
||||
opacity: settings.autoAllowAll ? 0.5 : 1,
|
||||
}}
|
||||
>
|
||||
<Checkbox
|
||||
checked={settings.autoAllowSafeBash}
|
||||
checked={settings.autoAllowAll || settings.autoAllowSafeBash}
|
||||
disabled={settings.autoAllowAll}
|
||||
onCheckedChange={(checked) =>
|
||||
void updateSettings({ autoAllowSafeBash: checked === true })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -727,6 +727,7 @@ function loadToolApprovalSettings(): ToolApprovalSettings {
|
|||
const parsed = JSON.parse(raw) as Record<string, unknown>;
|
||||
const d = DEFAULT_TOOL_APPROVAL_SETTINGS;
|
||||
return {
|
||||
autoAllowAll: typeof parsed.autoAllowAll === 'boolean' ? parsed.autoAllowAll : d.autoAllowAll,
|
||||
autoAllowFileEdits:
|
||||
typeof parsed.autoAllowFileEdits === 'boolean'
|
||||
? parsed.autoAllowFileEdits
|
||||
|
|
|
|||
|
|
@ -828,6 +828,8 @@ export type ToolApprovalTimeoutAction = 'allow' | 'deny' | 'wait';
|
|||
|
||||
/** User-configurable auto-allow settings for tool approval. */
|
||||
export interface ToolApprovalSettings {
|
||||
/** Auto-allow ALL tools (overrides individual settings below). */
|
||||
autoAllowAll: boolean;
|
||||
/** Auto-allow file edit tools (Edit, Write, NotebookEdit). */
|
||||
autoAllowFileEdits: boolean;
|
||||
/** Auto-allow safe bash commands (git, pnpm, npm, ls, cat, echo, etc.). */
|
||||
|
|
@ -839,6 +841,7 @@ export interface ToolApprovalSettings {
|
|||
}
|
||||
|
||||
export const DEFAULT_TOOL_APPROVAL_SETTINGS: ToolApprovalSettings = {
|
||||
autoAllowAll: false,
|
||||
autoAllowFileEdits: false,
|
||||
autoAllowSafeBash: false,
|
||||
timeoutAction: 'wait',
|
||||
|
|
|
|||
Loading…
Reference in a new issue