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
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ import { getAutomationTemplates, type AutomationTemplate } from './automation-te
export const AUTOMATION_EDITOR_PICKER_TRIGGER_CLASS =
'border-input bg-input/30 shadow-xs hover:bg-accent/60 dark:bg-input/30 dark:hover:bg-input/50'

export const AUTOMATION_EDITOR_SEGMENTED_GROUP_CLASS =
'grid w-full grid-cols-2 rounded-md bg-muted p-0.5'

export const AUTOMATION_EDITOR_SEGMENTED_ITEM_CLASS =
'h-7 rounded-sm border-0 bg-transparent shadow-none hover:bg-card/70 data-[state=on]:bg-card data-[state=on]:text-card-foreground data-[state=on]:shadow-xs'

export type AutomationDraft = {
name: string
prompt: string
Expand Down Expand Up @@ -215,8 +209,6 @@ export function AutomationEditorDialog({
draft={draft}
visibleAgents={visibleAgents}
pickerTriggerClassName={AUTOMATION_EDITOR_PICKER_TRIGGER_CLASS}
segmentedGroupClassName={AUTOMATION_EDITOR_SEGMENTED_GROUP_CLASS}
segmentedItemClassName={AUTOMATION_EDITOR_SEGMENTED_ITEM_CLASS}
onProjectChange={onProjectChange}
getRepoHostLabel={getRepoHostLabel}
allowAddProject={allowAddProject}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ function renderSidebar(
draft={draft}
visibleAgents={AGENT_CATALOG}
pickerTriggerClassName=""
segmentedGroupClassName=""
segmentedItemClassName=""
onProjectChange={vi.fn()}
onDraftChange={(updater) => {
onDraftChange(updater)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ type AutomationEditorSettingsSidebarProps = {
draft: AutomationDraft
visibleAgents: AgentCatalogEntry[]
pickerTriggerClassName: string
segmentedGroupClassName: string
segmentedItemClassName: string
onProjectChange: (projectId: string) => void
getRepoHostLabel?: (repo: Repo) => string | null | undefined
allowAddProject?: boolean
Expand All @@ -63,8 +61,6 @@ export function AutomationEditorSettingsSidebar({
draft,
visibleAgents,
pickerTriggerClassName,
segmentedGroupClassName,
segmentedItemClassName,
onProjectChange,
getRepoHostLabel,
allowAddProject,
Expand Down Expand Up @@ -136,18 +132,11 @@ export function AutomationEditorSettingsSidebar({
worktrees={worktrees}
repoMap={repoMap}
pickerTriggerClassName={pickerTriggerClassName}
segmentedGroupClassName={segmentedGroupClassName}
segmentedItemClassName={segmentedItemClassName}
onDraftChange={onDraftChange}
/>
</div>
<div className="mb-4">
<AutomationSessionField
draft={draft}
toggleGroupClassName={segmentedGroupClassName}
toggleItemClassName={segmentedItemClassName}
onDraftChange={onDraftChange}
/>
<AutomationSessionField draft={draft} onDraftChange={onDraftChange} />
</div>
<Field
className="mb-4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,11 @@ import { translate } from '@/i18n/i18n'

type AutomationSessionFieldProps = {
draft: AutomationDraft
toggleGroupClassName: string
toggleItemClassName: string
onDraftChange: (updater: (current: AutomationDraft) => AutomationDraft) => void
}

export function AutomationSessionField({
draft,
toggleGroupClassName,
toggleItemClassName,
onDraftChange
}: AutomationSessionFieldProps): React.JSX.Element {
return (
Expand Down Expand Up @@ -62,12 +58,12 @@ export function AutomationSessionField({
}))
}}
size="sm"
className={toggleGroupClassName}
variant="segmented-card"
>
<ToggleGroupItem value="fresh" className={toggleItemClassName}>
<ToggleGroupItem value="fresh">
{translate('auto.components.automations.AutomationSessionField.c90888ee94', 'Fresh')}
</ToggleGroupItem>
<ToggleGroupItem value="reuse" className={toggleItemClassName}>
<ToggleGroupItem value="reuse">
{translate('auto.components.automations.AutomationSessionField.f3c76dce51', 'Reuse')}
</ToggleGroupItem>
</ToggleGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ type AutomationWorkspaceFieldProps = {
worktrees: Worktree[]
repoMap: Map<string, Repo>
pickerTriggerClassName: string
segmentedGroupClassName: string
segmentedItemClassName: string
onDraftChange: (updater: (current: AutomationDraft) => AutomationDraft) => void
}

Expand All @@ -25,8 +23,6 @@ export function AutomationWorkspaceField({
worktrees,
repoMap,
pickerTriggerClassName,
segmentedGroupClassName,
segmentedItemClassName,
onDraftChange
}: AutomationWorkspaceFieldProps): React.JSX.Element {
return (
Expand Down Expand Up @@ -72,12 +68,12 @@ export function AutomationWorkspaceField({
}))
}
size="sm"
className={segmentedGroupClassName}
variant="segmented-card"
>
<ToggleGroupItem value="existing" className={segmentedItemClassName}>
<ToggleGroupItem value="existing">
{translate('auto.components.automations.AutomationEditorDialog.a2e688226d', 'Worktree')}
</ToggleGroupItem>
<ToggleGroupItem value="new_per_run" className={segmentedItemClassName}>
<ToggleGroupItem value="new_per_run">
{translate('auto.components.automations.AutomationEditorDialog.6ff66f9012', 'New run')}
</ToggleGroupItem>
</ToggleGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export function BrowserPageContextMenu({
onKeyDown={handleMenuKeyDown}
data-testid="browser-context-menu"
style={{ left: contextMenu.x, top: contextMenu.y }}
className="fixed z-50 max-h-screen min-w-[13rem] scrollbar-sleek overflow-y-auto rounded-[11px] border border-black/14 bg-floating-surface p-1 text-black shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl dark:border-white/14 dark:text-white dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)]"
className="fixed z-50 max-h-screen min-w-[13rem] scrollbar-sleek overflow-y-auto rounded-[11px] border border-black/14 bg-floating-surface p-1 text-popover-foreground shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl dark:border-white/14 dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)]"
>
<BrowserPageContextMenuItems
menu={contextMenu}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function RemoteBrowserPageContextMenu({
role="menu"
data-testid="remote-browser-context-menu"
style={{ left: contextMenu.x, top: contextMenu.y }}
className="fixed z-50 min-w-[13rem] overflow-hidden rounded-[11px] border border-black/14 bg-floating-surface p-1 text-black shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl dark:border-white/14 dark:text-white dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)]"
className="fixed z-50 min-w-[13rem] overflow-hidden rounded-[11px] border border-black/14 bg-floating-surface p-1 text-popover-foreground shadow-[0_16px_36px_rgba(0,0,0,0.24),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-2xl dark:border-white/14 dark:shadow-[0_20px_44px_rgba(0,0,0,0.42),inset_0_1px_0_rgba(255,255,255,0.04)]"
>
{contextMenu.linkUrl ? (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function TerminalConfigImportModal({

return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="max-w-sm sm:max-w-sm">
<DialogContent className="flex max-h-[calc(100vh-3rem)] max-w-sm flex-col sm:max-w-sm">
<DialogHeader>
<DialogTitle>{copy.title}</DialogTitle>
<DialogDescription>{copy.description}</DialogDescription>
Expand All @@ -143,91 +143,97 @@ export function TerminalConfigImportModal({
</div>
) : null}

{loading ? (
<p className="text-xs text-muted-foreground">
{translate(
'auto.components.settings.GhosttyImportModal.023a52c1f7',
'Loading preview…'
)}
</p>
) : preview == null ? null : preview.found ? (
<div className="space-y-3">
{configPaths.length > 0 && !applied && (
<p className="text-xs text-muted-foreground break-all">
{configPaths.length === 1
? translate('auto.components.settings.GhosttyImportModal.1f744a72f4', 'Config')
: translate('auto.components.settings.GhosttyImportModal.273e7e81fe', 'Configs')}
: {configPaths.join(', ')}
</p>
)}
{applied ? (
<div>
<p className="text-xs font-medium text-green-600 mb-1">
{translate(
'auto.components.settings.GhosttyImportModal.4466f4cdaa',
'Import complete'
)}
{/* Long previews (many unsupported keys) scroll here so the header and actions stay on screen. */}
<div className="-mx-6 min-h-0 flex-1 overflow-y-auto px-6 scrollbar-sleek empty:hidden">
{loading ? (
<p className="text-xs text-muted-foreground">
{translate(
'auto.components.settings.GhosttyImportModal.023a52c1f7',
'Loading preview…'
)}
</p>
) : preview == null ? null : preview.found ? (
<div className="space-y-3">
{configPaths.length > 0 && !applied && (
<p className="text-xs text-muted-foreground break-all">
{configPaths.length === 1
? translate('auto.components.settings.GhosttyImportModal.1f744a72f4', 'Config')
: translate(
'auto.components.settings.GhosttyImportModal.273e7e81fe',
'Configs'
)}
: {configPaths.join(', ')}
</p>
<ul className="text-xs space-y-1">
{Object.entries(preview.diff).map(([key, value]) => (
<li key={key} className="flex justify-between gap-2">
<span className="text-muted-foreground">{SETTING_LABELS[key] ?? key}</span>
<span className="font-mono">{formatPreviewEntry(preview, key, value)}</span>
</li>
))}
</ul>
</div>
) : hasChanges ? (
<div>
<p className="text-xs font-medium mb-1">
)}
{applied ? (
<div>
<p className="text-xs font-medium text-green-600 mb-1">
{translate(
'auto.components.settings.GhosttyImportModal.4466f4cdaa',
'Import complete'
)}
</p>
<ul className="text-xs space-y-1">
{Object.entries(preview.diff).map(([key, value]) => (
<li key={key} className="flex justify-between gap-2">
<span className="text-muted-foreground">{SETTING_LABELS[key] ?? key}</span>
<span className="font-mono">{formatPreviewEntry(preview, key, value)}</span>
</li>
))}
</ul>
</div>
) : hasChanges ? (
<div>
<p className="text-xs font-medium mb-1">
{translate(
'auto.components.settings.GhosttyImportModal.a4c5dec640',
'Settings to update'
)}
</p>
<ul className="text-xs space-y-1">
{Object.entries(preview.diff).map(([key, value]) => (
<li key={key} className="flex justify-between gap-2">
<span className="text-muted-foreground">{SETTING_LABELS[key] ?? key}</span>
<span className="font-mono">{formatPreviewEntry(preview, key, value)}</span>
</li>
))}
</ul>
</div>
) : (
<p className="text-xs text-muted-foreground">
{translate(
'auto.components.settings.GhosttyImportModal.a4c5dec640',
'Settings to update'
'auto.components.settings.GhosttyImportModal.674b5ccd6b',
'No new settings to import — your current settings already match.'
)}
</p>
<ul className="text-xs space-y-1">
{Object.entries(preview.diff).map(([key, value]) => (
<li key={key} className="flex justify-between gap-2">
<span className="text-muted-foreground">{SETTING_LABELS[key] ?? key}</span>
<span className="font-mono">{formatPreviewEntry(preview, key, value)}</span>
</li>
))}
</ul>
</div>
) : (
<p className="text-xs text-muted-foreground">
{translate(
'auto.components.settings.GhosttyImportModal.674b5ccd6b',
'No new settings to import — your current settings already match.'
)}
</p>
)}
)}

{!applied && applyError && <p className="text-xs text-red-500">{applyError}</p>}
{!applied && applyError && <p className="text-xs text-red-500">{applyError}</p>}

{!applied && preview.unsupportedKeys.length > 0 && (
<div>
<p className="text-xs font-medium mb-1">
{translate(
'auto.components.settings.GhosttyImportModal.b58d4c9051',
'Unsupported keys'
)}
</p>
<ul className="text-xs space-y-1">
{preview.unsupportedKeys.map((key) => (
<li key={key} className="text-muted-foreground">
{key}
</li>
))}
</ul>
</div>
)}
</div>
) : preview.error ? (
<p className="text-xs text-red-500">{preview.error}</p>
) : (
<p className="text-xs text-muted-foreground">{copy.notFound}</p>
)}
{!applied && preview.unsupportedKeys.length > 0 && (
<div>
<p className="text-xs font-medium mb-1">
{translate(
'auto.components.settings.GhosttyImportModal.b58d4c9051',
'Unsupported keys'
)}
</p>
<ul className="text-xs space-y-1">
{preview.unsupportedKeys.map((key) => (
<li key={key} className="text-muted-foreground">
{key}
</li>
))}
</ul>
</div>
)}
</div>
) : preview.error ? (
<p className="text-xs text-red-500">{preview.error}</p>
) : (
<p className="text-xs text-muted-foreground">{copy.notFound}</p>
)}
</div>

<DialogFooter>
{applied ? (
Expand Down
Loading
Loading