@@ -1,4 +1,4 @@
-import { shellQuote } from '@agent-device/kernel/device-shell';
+import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
 import { AppError } from '@agent-device/kernel/errors';
 import type { AgentDeviceRuntime, CommandContext } from '@agent-device/contracts/runtime-contract';
 import {
@@ -163,7 +163,7 @@ async function resolveSelectorInteractionTarget(
         invalidMessage: `Selector ${resolved.selector} resolved to invalid bounds`,
         blockedTargetLabel: `Selector ${selectorExpression}`,
         blockedTargetDetails: { selector: selectorExpression },
-        shellQuotedSelector: shellQuote(selectorExpression),
+        shellQuotedSelector: shellQuoteIfNeeded(selectorExpression),
       }),
   });
   return {
 
@@ -165,7 +165,7 @@ export function resolveNodeTouchPoint(
   node: SnapshotNode,
   nodes: SnapshotState['nodes'],
   failure: { invalidMessage: string; blockedTargetLabel: string } & (
-    | { blockedTargetDetails: { ref: string } }
+    | { blockedTargetDetails: { ref: string }; shellQuotedSelector?: never }
     /**
      * The recovery names a command that takes the selector, so the caller hands it over as one
      * shell word: this entry's eager closure stops short of the kernel's `shellQuote`.
@@ -185,11 +185,7 @@ export function resolveNodeTouchPoint(
       new AppError('COMMAND_FAILED', failure.invalidMessage, {
         reason: INTERACTION_ERROR_REASONS.targetBoundsInvalid,
         ...bareTargetDetails(failure.blockedTargetDetails),
-        ...scrollContainerRecovery(
-          node,
-          nodes,
-          'shellQuotedSelector' in failure ? failure.shellQuotedSelector : undefined,
-        ),
+        ...scrollContainerRecovery(node, nodes, failure.shellQuotedSelector),
       }),
       'no',
     );