Skip to content
Merged
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
45 changes: 27 additions & 18 deletions src/renderer/components/TaskModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { MultiProviderDropdown } from './MultiProviderDropdown';
import { type Provider } from '../types';
import { type ProviderRun } from '../types/chat';
import { Separator } from './ui/separator';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip';
import { providerMeta } from '../providers/meta';
import { isValidProviderId } from '@shared/providers/registry';
import { type LinearIssueSummary } from '../types/linear';
Expand Down Expand Up @@ -91,6 +90,7 @@ const TaskModal: React.FC<TaskModalProps> = ({
const [jiraToken, setJiraToken] = useState('');
const [jiraConnectionError, setJiraConnectionError] = useState<string | null>(null);
const [autoApprove, setAutoApprove] = useState(false);
const autoNameInitializedRef = useRef(false);

// GitHub connection state
const {
Expand Down Expand Up @@ -191,20 +191,22 @@ const TaskModal: React.FC<TaskModalProps> = ({
setJiraToken('');
setJiraConnectionError(null);
userHasTypedRef.current = false;
isInitialSetupRef.current = true;
isInitialSetupRef.current = false; // allow typing to mark userHasTyped immediately
autoNameInitializedRef.current = false;

// Generate auto-generated name synchronously to avoid race condition
// Default assumption: autoGenerateName is true (matches DEFAULT_SETTINGS)
// Generate auto-generated name synchronously to avoid race condition.
const suggested = generateFriendlyTaskName(normalizedExisting);
setAutoGeneratedName(suggested);
setTaskName(suggested);
setError(validate(suggested));

// Mark initial setup as complete after state updates
// Use setTimeout to ensure this runs after React's state update cycle
setTimeout(() => {
isInitialSetupRef.current = false;
}, 0);
const applySuggestedName = () => {
if (userHasTypedRef.current) return;
setAutoGeneratedName(suggested);
setTaskName((prev) => {
if (prev) return prev;
setError(validate(suggested));
return suggested;
});
autoNameInitializedRef.current = true;
};
applySuggestedName();

let cancel = false;
window.electronAPI.getSettings().then((res) => {
Expand All @@ -226,23 +228,28 @@ const TaskModal: React.FC<TaskModalProps> = ({
// Auto-generate task name
// Only update if user hasn't typed yet
const autoGenerate = settings?.tasks?.autoGenerateName ?? true;
if (!userHasTypedRef.current) {
if (!autoNameInitializedRef.current && !userHasTypedRef.current && !taskName) {
if (!autoGenerate) {
// User disabled auto-generate, clear the name
setAutoGeneratedName('');
setTaskName('');
setError(null);
} else {
// Ensure auto-generated name is set (may have been cleared by user typing)
setTaskName(suggested);
setError(validate(suggested));
setAutoGeneratedName(suggested);
setTaskName((prev) => {
if (prev) return prev;
setError(validate(suggested));
return suggested;
});
}
autoNameInitializedRef.current = true;
}
});
return () => {
cancel = true;
};
}, [isOpen, normalizedExisting, validate]);
}, [isOpen]);

// Check Linear connection when modal opens
useEffect(() => {
Expand Down Expand Up @@ -406,6 +413,9 @@ const TaskModal: React.FC<TaskModalProps> = ({
onSubmit={(e) => {
e.preventDefault();
setTouched(true);
// User is intentionally submitting; prevent any late auto-generate overrides
userHasTypedRef.current = true;
autoNameInitializedRef.current = true;
const err = validate(taskName);
if (err) {
setError(err);
Expand Down Expand Up @@ -460,7 +470,6 @@ const TaskModal: React.FC<TaskModalProps> = ({
</div>
)}

{/* Provider selector */}
<div className="flex items-center gap-4">
<Label className="shrink-0">AI Provider</Label>
<MultiProviderDropdown
Expand Down