diff --git a/src/renderer/src/components/dashboard/AgentDashboardDrawer.tsx b/src/renderer/src/components/dashboard/AgentDashboardDrawer.tsx index c948f955a9a..62e7f2e7b12 100644 --- a/src/renderer/src/components/dashboard/AgentDashboardDrawer.tsx +++ b/src/renderer/src/components/dashboard/AgentDashboardDrawer.tsx @@ -137,11 +137,9 @@ export function AgentDashboardDrawer({ close() }, [close]) // Store-driven closes bypass close(); clear menu state for sidebar collapse and workspace-board exclusivity too. - useEffect(() => { - if (!open) { - setMenuOpen(false) - } - }, [open]) + if (!open && menuOpen) { + setMenuOpen(false) + } const handleSheetOpenChange = useCallback( (nextOpen: boolean) => { // Radix can request coordinate-free dismissal; allow only the drawer’s guarded Escape/outside/close paths. diff --git a/src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.tsx b/src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.tsx index d5fc66f6ec3..2a1497cd0e4 100644 --- a/src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.tsx +++ b/src/renderer/src/components/feature-wall/FeatureWallSetupWorkflowActions.tsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useMemo, useState } from 'react' +import { useCallback, useMemo, useState } from 'react' import { ArrowUpRight, Plus, Save, Settings } from 'lucide-react' import { toast } from 'sonner' import { Button } from '@/components/ui/button' @@ -108,13 +108,11 @@ export function SetupScriptAction(): React.JSX.Element { const canConfigure = repo !== null const [setupScript, setSetupScript] = useState('pnpm install') - useEffect(() => { - if (!canConfigure) { - setSetupScript('pnpm install') - return - } - setSetupScript(repo.hookSettings?.scripts?.setup?.trim() || 'pnpm install') - }, [canConfigure, repo]) + const [seededFromRepo, setSeededFromRepo] = useState(undefined) + if (seededFromRepo !== repo) { + setSeededFromRepo(repo) + setSetupScript(repo?.hookSettings?.scripts?.setup?.trim() || 'pnpm install') + } const openLocalCommandSettings = useCallback(() => { if (!repo || !isGitRepoKind(repo)) { diff --git a/src/renderer/src/components/jira-connect-dialog.tsx b/src/renderer/src/components/jira-connect-dialog.tsx index 2df524da932..19fab7e4290 100644 --- a/src/renderer/src/components/jira-connect-dialog.tsx +++ b/src/renderer/src/components/jira-connect-dialog.tsx @@ -1,6 +1,6 @@ import { jiraCredentialStorageCopy } from './jira-credential-storage-copy' import { taskProviderErrorMessage, taskProviderErrorText } from '@/lib/task-provider-error-copy' -import { useId, useLayoutEffect, useState } from 'react' +import { useId, useState } from 'react' import { LoaderCircle, Lock } from 'lucide-react' import { useAppStore } from '@/store' import { useMountedRef } from '@/hooks/useMountedRef' @@ -69,18 +69,19 @@ export function JiraConnectDialog({ const [connectError, setConnectError] = useState(null) // Clear secrets, modes and errors before paint on each open so prior credentials cannot flash or persist. - useLayoutEffect(() => { - if (!open) { - return + const [prevOpen, setPrevOpen] = useState(open) + if (prevOpen !== open) { + setPrevOpen(open) + if (open) { + setInstanceType('cloud') + setServerAuthMethod('pat') + setSiteUrl('') + setEmail('') + setApiToken('') + setConnectState('idle') + setConnectError(null) } - setInstanceType('cloud') - setServerAuthMethod('pat') - setSiteUrl('') - setEmail('') - setApiToken('') - setConnectState('idle') - setConnectError(null) - }, [open]) + } const isServer = instanceType === 'server' // Cloud email and Server Basic username share the identity slot; PAT auth has no identity. diff --git a/src/renderer/src/components/mobile/use-mobile-pairing-connection-mode.ts b/src/renderer/src/components/mobile/use-mobile-pairing-connection-mode.ts index 1a795d3ca40..95cf1380bf1 100644 --- a/src/renderer/src/components/mobile/use-mobile-pairing-connection-mode.ts +++ b/src/renderer/src/components/mobile/use-mobile-pairing-connection-mode.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react' +import { useState } from 'react' import { useAppStore } from '@/store' import { resolveMobilePairingConnectionMode, @@ -15,8 +15,13 @@ export function useMobilePairingConnectionMode(): [ const [connectionMode, setConnectionMode] = useState(() => resolveMobilePairingConnectionMode(savedConnectionMode, { signedIn }) ) - useEffect(() => { + const [resolvedFrom, setResolvedFrom] = useState({ savedConnectionMode, signedIn }) + if ( + resolvedFrom.savedConnectionMode !== savedConnectionMode || + resolvedFrom.signedIn !== signedIn + ) { + setResolvedFrom({ savedConnectionMode, signedIn }) setConnectionMode(resolveMobilePairingConnectionMode(savedConnectionMode, { signedIn })) - }, [savedConnectionMode, signedIn]) + } return [connectionMode, setConnectionMode] } diff --git a/src/renderer/src/components/network/CustomAddressDialog.tsx b/src/renderer/src/components/network/CustomAddressDialog.tsx index 4798f4a7d84..0a40b653d51 100644 --- a/src/renderer/src/components/network/CustomAddressDialog.tsx +++ b/src/renderer/src/components/network/CustomAddressDialog.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import React, { useState } from 'react' import { Dialog, DialogContent, @@ -51,11 +51,13 @@ export function CustomAddressDialog({ const [confirmationFailed, setConfirmationFailed] = useState(false) // Reset on open so canceled edits cannot leak into later visits. - useEffect(() => { + const [seededFor, setSeededFor] = useState({ open, initialValue }) + if (seededFor.open !== open || seededFor.initialValue !== initialValue) { + setSeededFor({ open, initialValue }) if (open) { setValue(initialValue ?? '') } - }, [open, initialValue]) + } const close = (): void => { setSubmitting(false) diff --git a/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx b/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx index 1a606f865d2..6e40a8f9da4 100644 --- a/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx +++ b/src/renderer/src/components/plugins/dialogs/PluginMarketplaceSourceDialog.tsx @@ -1,4 +1,4 @@ -import { useEffect, useRef, useState } from 'react' +import { useRef, useState } from 'react' import { Loader2, RefreshCw, Trash2 } from 'lucide-react' import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api-types' import { translate } from '@/i18n/i18n' @@ -39,12 +39,14 @@ export function PluginMarketplaceSourceDialog({ const [busyAction, setBusyAction] = useState(null) const [error, setError] = useState(null) - useEffect(() => { + const [prevOpen, setPrevOpen] = useState(open) + if (prevOpen !== open) { + setPrevOpen(open) if (!open) { setBusyAction(null) setError(null) } - }, [open]) + } const add = async (): Promise => { if (!url.trim() || !gitRef.trim() || busyAction) { diff --git a/src/renderer/src/components/plugins/state/use-plugin-marketplace-lifecycle.ts b/src/renderer/src/components/plugins/state/use-plugin-marketplace-lifecycle.ts index 9a3dcd31c13..28bab0cc50a 100644 --- a/src/renderer/src/components/plugins/state/use-plugin-marketplace-lifecycle.ts +++ b/src/renderer/src/components/plugins/state/use-plugin-marketplace-lifecycle.ts @@ -1,10 +1,4 @@ -import { - useEffect, - useState, - type Dispatch, - type MutableRefObject, - type SetStateAction -} from 'react' +import { useState, type Dispatch, type MutableRefObject, type SetStateAction } from 'react' import type { PluginHostListEntry } from '../../../../../preload/api-types' import { translate } from '@/i18n/i18n' import { pluginNeedsReview } from '../presentation/plugin-status-presentation' @@ -41,12 +35,13 @@ export function usePluginMarketplaceLifecycle({ const [rollbackError, setRollbackError] = useState(null) const rollbackPlugin = plugins.find((plugin) => plugin.pluginKey === rollbackPluginId) ?? null - useEffect(() => { - if (!mounted || (rollbackPluginId && !rollbackPlugin)) { - setRollbackPluginId(null) - setRollbackError(null) - } - }, [mounted, rollbackPlugin, rollbackPluginId]) + if ( + (!mounted || (rollbackPluginId && !rollbackPlugin)) && + (rollbackPluginId !== null || rollbackError !== null) + ) { + setRollbackPluginId(null) + setRollbackError(null) + } const reloadAfterMutation = async (pluginKeys: string | readonly string[]): Promise => { const changed = new Set(typeof pluginKeys === 'string' ? [pluginKeys] : pluginKeys) diff --git a/src/renderer/src/components/settings/source-control/AutoRenameBranchFromWorkSetting.tsx b/src/renderer/src/components/settings/source-control/AutoRenameBranchFromWorkSetting.tsx index e26874bcbbd..8bd26cfe3e8 100644 --- a/src/renderer/src/components/settings/source-control/AutoRenameBranchFromWorkSetting.tsx +++ b/src/renderer/src/components/settings/source-control/AutoRenameBranchFromWorkSetting.tsx @@ -69,24 +69,18 @@ export function AutoRenameBranchFromWorkSetting({ config.actions, 'branchName' ) - const persistedBranchNameTemplateRef = useRef(persistedBranchNameTemplate) - persistedBranchNameTemplateRef.current = persistedBranchNameTemplate const [branchNameTemplateDraft, setBranchNameTemplateDraft] = useState( persistedBranchNameTemplate ) const [isSavingPrompt, setIsSavingPrompt] = useState(false) const branchNamePromptDirty = branchNameTemplateDraft !== persistedBranchNameTemplate - useEffect(() => { - if (!branchNamePromptDirty) { - setBranchNameTemplateDraft(persistedBranchNameTemplate) - } - }, [branchNamePromptDirty, persistedBranchNameTemplate]) - - useEffect(() => { - setBranchNameTemplateDraft(persistedBranchNameTemplateRef.current) - // Settings owns discard confirmation; keep the draft here for row-specific save/discard controls. - }, [branchPromptDiscardSignal]) + // Settings owns discard confirmation; keep the draft here for row-specific save/discard controls. + const [seenDiscardSignal, setSeenDiscardSignal] = useState(branchPromptDiscardSignal) + if (seenDiscardSignal !== branchPromptDiscardSignal) { + setSeenDiscardSignal(branchPromptDiscardSignal) + setBranchNameTemplateDraft(persistedBranchNameTemplate) + } useEffect(() => { onBranchPromptDirtyChange?.(branchNamePromptDirty) diff --git a/src/renderer/src/components/settings/source-control/source-control-action-recipe-draft-state.ts b/src/renderer/src/components/settings/source-control/source-control-action-recipe-draft-state.ts index 2f3c21f0a3e..1f1ca8f2715 100644 --- a/src/renderer/src/components/settings/source-control/source-control-action-recipe-draft-state.ts +++ b/src/renderer/src/components/settings/source-control/source-control-action-recipe-draft-state.ts @@ -4,7 +4,7 @@ import { type ActionArgumentChoices } from '../../../../../shared/source-control/ai/recipes/source-control-action-argument-document' import { liftActionPermissionArgs } from '../../../../../shared/source-control/ai/recipes/source-control-action-permission-lift' -import { useEffect, useMemo, useRef, useState, type SetStateAction } from 'react' +import { useEffect, useMemo, useState, type SetStateAction } from 'react' import type { SourceControlAiSettings, SourceControlAiModelChoice, @@ -74,8 +74,6 @@ export function useSourceControlActionRecipeDraftState({ writeConfig }: UseSourceControlActionRecipeDraftStateArgs) { const persistedActionRecipeValues = useMemo(() => readActionRecipeInputValues(config), [config]) - const persistedActionRecipeValuesRef = useRef(persistedActionRecipeValues) - persistedActionRecipeValuesRef.current = persistedActionRecipeValues const [storedDraftState, setActionRecipeDraftState] = useState(() => ({ values: persistedActionRecipeValues, baseValues: persistedActionRecipeValues @@ -93,6 +91,15 @@ export function useSourceControlActionRecipeDraftState({ followPersistedRecipeValues(current, persistedActionRecipeValues) ) } + const [seenDiscardSignal, setSeenDiscardSignal] = useState(customPromptDiscardSignal) + if (seenDiscardSignal !== customPromptDiscardSignal) { + actionRecipeDraftState = { + values: persistedActionRecipeValues, + baseValues: persistedActionRecipeValues + } + setSeenDiscardSignal(customPromptDiscardSignal) + setActionRecipeDraftState(actionRecipeDraftState) + } const [savingActionTemplateIds, setSavingActionTemplateIds] = useState< Partial> >({}) @@ -106,13 +113,6 @@ export function useSourceControlActionRecipeDraftState({ ) const actionTemplateDirty = actionRecipeDraftSerialized !== actionRecipeBaseSerialized - useEffect(() => { - setActionRecipeDraftState({ - values: persistedActionRecipeValuesRef.current, - baseValues: persistedActionRecipeValuesRef.current - }) - }, [customPromptDiscardSignal]) - useEffect(() => { onCustomPromptDirtyChange?.(actionTemplateDirty) }, [actionTemplateDirty, onCustomPromptDirtyChange]) diff --git a/src/renderer/src/components/sidebar/HostRenameDialog.tsx b/src/renderer/src/components/sidebar/HostRenameDialog.tsx index 43bcd57fdb9..86f63ddd581 100644 --- a/src/renderer/src/components/sidebar/HostRenameDialog.tsx +++ b/src/renderer/src/components/sidebar/HostRenameDialog.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import React, { useState } from 'react' import { Dialog, DialogContent, @@ -35,11 +35,13 @@ export function HostRenameDialog({ const [value, setValue] = useState(currentOverride ?? '') // Seed persisted names on every open so canceled drafts cannot reappear. - useEffect(() => { + const [seededFor, setSeededFor] = useState({ open, currentOverride }) + if (seededFor.open !== open || seededFor.currentOverride !== currentOverride) { + setSeededFor({ open, currentOverride }) if (open) { setValue(currentOverride ?? '') } - }, [open, currentOverride]) + } const submit = (): void => { void updateSettings({ hostSettingOverrides: applyHostRename(settings, hostId, value) }) diff --git a/src/renderer/src/components/sidebar/project-admission/nested-import/AddRepoNestedImportStep.tsx b/src/renderer/src/components/sidebar/project-admission/nested-import/AddRepoNestedImportStep.tsx index 9ce7c3a9172..6758e376369 100644 --- a/src/renderer/src/components/sidebar/project-admission/nested-import/AddRepoNestedImportStep.tsx +++ b/src/renderer/src/components/sidebar/project-admission/nested-import/AddRepoNestedImportStep.tsx @@ -1,4 +1,4 @@ -import { useEffect, useId, useState, type Dispatch, type SetStateAction } from 'react' +import { useId, useState, type Dispatch, type SetStateAction } from 'react' import { CircleStop, Loader2 } from 'lucide-react' import { DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog' import { Button } from '@/components/ui/button' @@ -46,11 +46,13 @@ export function AddRepoNestedImportStep({ const showSeparateSpinner = isAdding && pendingImportMode === 'separate' const showGroupSpinner = isAdding && pendingImportMode === 'group' - useEffect(() => { + const [prevIsAdding, setPrevIsAdding] = useState(isAdding) + if (prevIsAdding !== isAdding) { + setPrevIsAdding(isAdding) if (!isAdding) { setPendingImportMode(null) } - }, [isAdding]) + } const handleImport = (mode: 'group' | 'separate'): void => { setPendingImportMode(mode) diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts b/src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts index 85fd57f2b84..49fee206fd0 100644 --- a/src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts +++ b/src/renderer/src/components/tab-bar/use-tab-bar-create-menu-controller.ts @@ -267,11 +267,13 @@ export function useTabBarCreateMenuController({ window.addEventListener('blur', dismiss) return () => window.removeEventListener('blur', dismiss) }, [newTabMenuOpen]) - useEffect(() => { + const [prevNewTabMenuOpen, setPrevNewTabMenuOpen] = useState(newTabMenuOpen) + if (prevNewTabMenuOpen !== newTabMenuOpen) { + setPrevNewTabMenuOpen(newTabMenuOpen) if (!newTabMenuOpen) { setCreateMenuQuery('') } - }, [newTabMenuOpen]) + } return { agentMenu, agentPickerInventory,