fix: improve debug forcing for coils, contacts, and variables

src/renderer/components/_atoms/graphical-editor/fbd/variable.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import * as Popover from '@radix-ui/react-popover'
 import { useOpenPLCStore } from '@root/renderer/store'
 import { PLCVariable } from '@root/types/PLC'
@@ -58,33 +59,10 @@ const VariableElement = (block: VariableProps) => {
     project: {
       data: { pous, dataTypes },
     },
-    workspace: {
-      isDebuggerVisible,
-      debugVariableIndexes,
-      debugVariableValues,
-      debugForcedVariables,
-      fbSelectedInstance,
-      fbDebugInstances,
-    },
+    workspace: { isDebuggerVisible, debugVariableIndexes, debugVariableValues, debugForcedVariables },
     workspaceActions: { setDebugForcedVariables },
   } = useOpenPLCStore()
-
-  // Helper to get composite key with FB instance context
-  const getCompositeKey = (variableName: string): string => {
-    const currentPou = pous.find((p) => p.data.name === editor.meta.name)
-    if (currentPou?.type === 'function-block') {
-      const fbTypeKey = currentPou.data.name.toUpperCase()
-      const selectedKey = fbSelectedInstance.get(fbTypeKey)
-      if (selectedKey) {
-        const instances = fbDebugInstances.get(fbTypeKey) || []
-        const selectedInstance = instances.find((inst) => inst.key === selectedKey)
-        if (selectedInstance) {
-          return `${selectedInstance.programName}:${selectedInstance.fbVariableName}.${variableName}`
-        }
-      }
-    }
-    return `${editor.meta.name}:${variableName}`
-  }
+  const getCompositeKey = useDebugCompositeKey()
 
   const inputVariableRef = useRef<
     HTMLTextAreaElement & {

src/renderer/components/_atoms/graphical-editor/ladder/coil.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import * as Popover from '@radix-ui/react-popover'
 import {
   DefaultCoil,
@@ -126,33 +127,10 @@ export const Coil = (block: CoilProps) => {
     },
     ladderFlows,
     ladderFlowActions: { updateNode },
-    workspace: {
-      isDebuggerVisible,
-      debugVariableValues,
-      debugVariableIndexes,
-      debugForcedVariables,
-      fbSelectedInstance,
-      fbDebugInstances,
-    },
+    workspace: { isDebuggerVisible, debugVariableValues, debugVariableIndexes, debugForcedVariables },
     workspaceActions: { setDebugForcedVariables },
   } = useOpenPLCStore()
-
-  // Helper to get composite key with FB instance context
-  const getCompositeKey = (variableName: string): string => {
-    const currentPou = pous.find((p) => p.data.name === editor.meta.name)
-    if (currentPou?.type === 'function-block') {
-      const fbTypeKey = currentPou.data.name.toUpperCase()
-      const selectedKey = fbSelectedInstance.get(fbTypeKey)
-      if (selectedKey) {
-        const instances = fbDebugInstances.get(fbTypeKey) || []
-        const selectedInstance = instances.find((inst) => inst.key === selectedKey)
-        if (selectedInstance) {
-          return `${selectedInstance.programName}:${selectedInstance.fbVariableName}.${variableName}`
-        }
-      }
-    }
-    return `${editor.meta.name}:${variableName}`
-  }
+  const getCompositeKey = useDebugCompositeKey()
 
   const coil = DEFAULT_COIL_TYPES[data.variant]
   const [coilVariableValue, setCoilVariableValue] = useState<string>(data.variable.name)
@@ -164,7 +142,14 @@ export const Coil = (block: CoilProps) => {
     }
 
     const compositeKey = getCompositeKey(data.variable.name)
-    const value = debugVariableValues.get(compositeKey)
+    const isForced = debugForcedVariables.has(compositeKey)
+
+    // When forced, use immediate value from debugForcedVariables (no 200ms poll delay)
+    const value = isForced
+      ? debugForcedVariables.get(compositeKey)
+        ? '1'
+        : '0'
+      : debugVariableValues.get(compositeKey)
 
     if (value === undefined) {
       return undefined
@@ -173,10 +158,8 @@ export const Coil = (block: CoilProps) => {
     const isTrue = value === '1' || value.toUpperCase() === 'TRUE'
     const displayState = data.variant === 'negated' ? !isTrue : isTrue
 
-    const isForced = debugForcedVariables.has(compositeKey)
     if (isForced) {
-      const forcedValue = debugForcedVariables.get(compositeKey)
-      return forcedValue ? '#80C000' : '#4080FF'
+      return displayState ? '#80C000' : '#4080FF'
     }
 
     return displayState ? '#00FF00' : '#0464FB'

src/renderer/components/_atoms/graphical-editor/ladder/contact.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import * as Popover from '@radix-ui/react-popover'
 import {
   DefaultContact,
@@ -93,33 +94,10 @@ export const Contact = (block: ContactProps) => {
     },
     ladderFlows,
     ladderFlowActions: { updateNode },
-    workspace: {
-      isDebuggerVisible,
-      debugVariableValues,
-      debugVariableIndexes,
-      debugForcedVariables,
-      fbSelectedInstance,
-      fbDebugInstances,
-    },
+    workspace: { isDebuggerVisible, debugVariableValues, debugVariableIndexes, debugForcedVariables },
     workspaceActions: { setDebugForcedVariables },
   } = useOpenPLCStore()
-
-  // Helper to get composite key with FB instance context
-  const getCompositeKey = (variableName: string): string => {
-    const currentPou = pous.find((p) => p.data.name === editor.meta.name)
-    if (currentPou?.type === 'function-block') {
-      const fbTypeKey = currentPou.data.name.toUpperCase()
-      const selectedKey = fbSelectedInstance.get(fbTypeKey)
-      if (selectedKey) {
-        const instances = fbDebugInstances.get(fbTypeKey) || []
-        const selectedInstance = instances.find((inst) => inst.key === selectedKey)
-        if (selectedInstance) {
-          return `${selectedInstance.programName}:${selectedInstance.fbVariableName}.${variableName}`
-        }
-      }
-    }
-    return `${editor.meta.name}:${variableName}`
-  }
+  const getCompositeKey = useDebugCompositeKey()
 
   const contact = DEFAULT_CONTACT_TYPES[data.variant]
   const [contactVariableValue, setContactVariableValue] = useState<string>(data.variable.name)
@@ -131,7 +109,14 @@ export const Contact = (block: ContactProps) => {
     }
 
     const compositeKey = getCompositeKey(data.variable.name)
-    const value = debugVariableValues.get(compositeKey)
+    const isForced = debugForcedVariables.has(compositeKey)
+
+    // When forced, use immediate value from debugForcedVariables (no 200ms poll delay)
+    const value = isForced
+      ? debugForcedVariables.get(compositeKey)
+        ? '1'
+        : '0'
+      : debugVariableValues.get(compositeKey)
 
     if (value === undefined) {
       return undefined
@@ -140,10 +125,8 @@ export const Contact = (block: ContactProps) => {
     const isTrue = value === '1' || value.toUpperCase() === 'TRUE'
     const displayState = data.variant === 'negated' ? !isTrue : isTrue
 
-    const isForced = debugForcedVariables.has(compositeKey)
     if (isForced) {
-      const forcedValue = debugForcedVariables.get(compositeKey)
-      return forcedValue ? '#80C000' : '#4080FF'
+      return displayState ? '#80C000' : '#4080FF'
     }
 
     return displayState ? '#00FF00' : '#0464FB'

src/renderer/components/_atoms/graphical-editor/ladder/variable.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import * as Popover from '@radix-ui/react-popover'
 import { useOpenPLCStore } from '@root/renderer/store'
 import { RungLadderState } from '@root/renderer/store/slices'
@@ -65,6 +66,7 @@ const VariableElement = (block: VariableProps) => {
     workspace: { isDebuggerVisible, debugVariableIndexes, debugForcedVariables },
     workspaceActions: { setDebugForcedVariables },
   } = useOpenPLCStore()
+  const getCompositeKey = useDebugCompositeKey()
 
   const inputVariableRef = useRef<
     HTMLTextAreaElement & {
@@ -280,7 +282,7 @@ const VariableElement = (block: VariableProps) => {
 
     if (!data.variable.name) return
 
-    const compositeKey = `${editor.meta.name}:${data.variable.name}`
+    const compositeKey = getCompositeKey(data.variable.name)
     const variableIndex = debugVariableIndexes.get(compositeKey)
 
     if (variableIndex === undefined) return
@@ -302,7 +304,7 @@ const VariableElement = (block: VariableProps) => {
 
     if (!data.variable.name) return
 
-    const compositeKey = `${editor.meta.name}:${data.variable.name}`
+    const compositeKey = getCompositeKey(data.variable.name)
     const variableIndex = debugVariableIndexes.get(compositeKey)
 
     if (variableIndex === undefined) return
@@ -324,7 +326,7 @@ const VariableElement = (block: VariableProps) => {
 
     if (!data.variable.name) return
 
-    const compositeKey = `${editor.meta.name}:${data.variable.name}`
+    const compositeKey = getCompositeKey(data.variable.name)
     const variableIndex = debugVariableIndexes.get(compositeKey)
 
     if (variableIndex === undefined) return
@@ -352,7 +354,7 @@ const VariableElement = (block: VariableProps) => {
       return
     }
 
-    const compositeKey = `${editor.meta.name}:${data.variable.name}`
+    const compositeKey = getCompositeKey(data.variable.name)
     const variableIndex = debugVariableIndexes.get(compositeKey)
 
     if (variableIndex === undefined) {
@@ -446,7 +448,7 @@ const VariableElement = (block: VariableProps) => {
   const variableType = getVariableType()
   const isBoolVariable = variableType?.toUpperCase() === 'BOOL'
 
-  const compositeKey = `${editor.meta.name}:${data.variable.name}`
+  const compositeKey = getCompositeKey(data.variable.name)
   const isForced = debugForcedVariables.has(compositeKey)
   const forcedValue = debugForcedVariables.get(compositeKey)
 

src/renderer/components/_molecules/graphical-editor/fbd/index.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import { CustomFbdNodeTypes, customNodeTypes } from '@root/renderer/components/_atoms/graphical-editor/fbd'
 import { BlockNode } from '@root/renderer/components/_atoms/graphical-editor/fbd/block'
 import { getVariableRestrictionType } from '@root/renderer/components/_atoms/graphical-editor/utils'
@@ -47,36 +48,14 @@ export const FBDBody = ({ rung, nodeDivergences = [], isDebuggerActive = false }
     modals,
     modalActions: { closeModal, openModal },
     snapshotActions: { addSnapshot },
-    workspace: { isDebuggerVisible, debugVariableValues, debugForcedVariables, fbSelectedInstance, fbDebugInstances },
+    workspace: { isDebuggerVisible, debugVariableValues, debugForcedVariables },
   } = useOpenPLCStore()
+  const getCompositeKey = useDebugCompositeKey()
 
   const pous = project.data.pous
 
   const pouRef = pous.find((pou) => pou.data.name === editor.meta.name)
 
-  // Get FB instance context for function block POUs
-  const fbInstanceContext = useMemo(() => {
-    if (!pouRef || pouRef.type !== 'function-block') return null
-    const fbTypeKey = pouRef.data.name.toUpperCase() // Canonical key for map lookups
-    const selectedKey = fbSelectedInstance.get(fbTypeKey)
-    if (!selectedKey) return null
-    const instances = fbDebugInstances.get(fbTypeKey) || []
-    return instances.find((inst) => inst.key === selectedKey) || null
-  }, [pouRef, fbSelectedInstance, fbDebugInstances])
-
-  // Helper to get composite key for variable lookup, handling FB instance context
-  const getCompositeKey = useCallback(
-    (variableName: string): string => {
-      if (fbInstanceContext) {
-        // For FB POUs, transform to instance context: main:MOTOR_SPEED0.varName
-        return `${fbInstanceContext.programName}:${fbInstanceContext.fbVariableName}.${variableName}`
-      }
-      // For programs, use standard format: pouName:varName
-      return `${editor.meta.name}:${variableName}`
-    },
-    [fbInstanceContext, editor.meta.name],
-  )
-
   const [rungLocal, setRungLocal] = useState<FBDRungState>(rung)
   const [dragging, setDragging] = useState(false)
 
@@ -132,7 +111,7 @@ export const FBDBody = ({ rung, nodeDivergences = [], isDebuggerActive = false }
 
       // For program POUs, verify the program instance exists
       // For FB POUs, skip this check since getCompositeKey already handles instance context
-      if (!fbInstanceContext) {
+      if (pouRef?.type !== 'function-block') {
         const instances = project.data.configuration.resource.instances
         const programInstance = instances.find((inst: { program: string }) => inst.program === editor.meta.name)
         if (!programInstance) return undefined

src/renderer/components/_molecules/graphical-editor/ladder/rung/body.tsx

@@ -1,3 +1,4 @@
+import { useDebugCompositeKey } from '@hooks/use-debug-composite-key'
 import { getVariableRestrictionType } from '@root/renderer/components/_atoms/graphical-editor/utils'
 import { useOpenPLCStore } from '@root/renderer/store'
 import type { RungLadderState } from '@root/renderer/store/slices'
@@ -76,35 +77,13 @@ export const RungBody = ({ rung, className, nodeDivergences = [], isDebuggerActi
     searchQuery,
     searchActions: { setSearchNodePosition },
     snapshotActions: { addSnapshot },
-    workspace: { isDebuggerVisible, debugVariableValues, fbSelectedInstance, fbDebugInstances },
+    workspace: { isDebuggerVisible, debugVariableValues },
   } = useOpenPLCStore()
+  const getCompositeKey = useDebugCompositeKey()
 
   const pouRef = project.data.pous.find((pou) => pou.data.name === editor.meta.name)
   const nodeTypes = useMemo(() => customNodeTypes, [])
 
-  // Get FB instance context for function block POUs
-  const fbInstanceContext = useMemo(() => {
-    if (!pouRef || pouRef.type !== 'function-block') return null
-    const fbTypeKey = pouRef.data.name.toUpperCase() // Canonical key for map lookups
-    const selectedKey = fbSelectedInstance.get(fbTypeKey)
-    if (!selectedKey) return null
-    const instances = fbDebugInstances.get(fbTypeKey) || []
-    return instances.find((inst) => inst.key === selectedKey) || null
-  }, [pouRef, fbSelectedInstance, fbDebugInstances])
-
-  // Helper to get composite key for variable lookup, handling FB instance context
-  const getCompositeKey = useCallback(
-    (variableName: string): string => {
-      if (fbInstanceContext) {
-        // For FB POUs, transform to instance context: main:MOTOR_SPEED0.varName
-        return `${fbInstanceContext.programName}:${fbInstanceContext.fbVariableName}.${variableName}`
-      }
-      // For programs, use standard format: pouName:varName
-      return `${editor.meta.name}:${variableName}`
-    },
-    [fbInstanceContext, editor.meta.name],
-  )
-
   const [rungLocal, setRungLocal] = useState<RungLadderState>(rung)
   const [dragging, setDragging] = useState(false)
 
@@ -158,7 +137,7 @@ export const RungBody = ({ rung, className, nodeDivergences = [], isDebuggerActi
 
       // For program POUs, verify the program instance exists
       // For FB POUs, skip this check since getCompositeKey already handles instance context
-      if (!fbInstanceContext) {
+      if (pouRef?.type !== 'function-block') {
         const instances = project.data.configuration.resource.instances
         const programInstance = instances.find((inst) => inst.program === editor.meta.name)
         if (!programInstance) return undefined

src/renderer/hooks/index.ts

@@ -1,2 +1,3 @@
 export * from './use-compiler'
+export * from './use-debug-composite-key'
 export * from './use-store-selectors'