fix(k1): keep reconnect feedback in place

apps/control-station/test/devicePluginFrontendBoundary.test.mjs

@@ -633,7 +633,7 @@ test("top-right device utility is an explicit pending-aware K1 scenario reset",
     /const modeResetInFlight = pendingAction === "mode" \|\| modeResetPending !== null/,
   );
   assert.match(provisioning, /if \(modeResetInFlight\) return/);
-  assert.equal((provisioning.match(/disabled=\{modeResetInFlight\}/g) ?? []).length, 2);
+  assert.equal((provisioning.match(/disabled=\{modeResetInFlight\}/g) ?? []).length, 1);
   assert.match(provisioning, /disabled=\{isBusy \|\| modeResetInFlight\}/);
 
   assert.match(connection, /const hydratedScenarioResetKey = useRef<string \| null>\(null\)/);

apps/control-station/test/k1SupervisorPresentation.test.mjs

@@ -19,6 +19,7 @@ let K1ProvisioningPipeline;
 let RuntimeActionFenceTestContext;
 let emptySearchPresentation;
 let emptyProvisioningAttemptPresentation;
+let emptyReadOnlyReconnectPresentation;
 let provisioningAttemptViewState;
 let unavailablePhysicalRetirementAuthority;
 let connectionAttemptOwnsAppliedNetworkRecovery;
@@ -125,6 +126,7 @@ before(async () => {
     RuntimeActionFenceTestContext,
     emptySearchPresentation,
     emptyProvisioningAttemptPresentation,
+    emptyReadOnlyReconnectPresentation,
     provisioningAttemptViewState,
     unavailablePhysicalRetirementAuthority,
     connectionAttemptOwnsAppliedNetworkRecovery,
@@ -5228,11 +5230,21 @@ test("an unresolved physical command has one explicit server-bound read-only rec
     },
     desiredMode: "bridge",
   }, { publicSearch: false });
-  assert.equal(
+  const pendingReconnect = buttonMarkupWithText(
-    (pendingMarkup.match(/class="connection-action-progress"/g) ?? []).length,
+    pendingMarkup,
-    1,
+    "Переподключаемся…",
   );
-  assert.doesNotMatch(pendingMarkup, /Переподключиться|Подключить новый K1|Подтверждаю:/);
+  assert.equal(pendingReconnect.length, 1);
+  assert.match(pendingReconnect[0], /disabled/);
+  assert.match(pendingReconnect[0], /aria-busy="true"/);
+  assert.match(pendingReconnect[0], /nodedc-activity-indicator/);
+  const pendingConnectNew = buttonMarkupWithText(
+    pendingMarkup,
+    "Подключить новый K1",
+  );
+  assert.equal(pendingConnectNew.length, 1);
+  assert.match(pendingConnectNew[0], /disabled/);
+  assert.doesNotMatch(pendingMarkup, /connection-action-progress|Подтверждаю:/);
 
   const source = readFileSync(provisioningSourceUrl, "utf8");
   const physicalRecovery = sourceSlice(
@@ -5443,18 +5455,16 @@ test("unavailable physical replacement stays CAS-protected behind the simple new
     },
     desiredMode: "bridge",
   }, { publicSearch: false });
-  assert.match(
+  const bothPendingReconnect = buttonMarkupWithText(
     bothPendingMarkup,
-    /Проверяем прежний K1 без повторения START, STOP или настроек сети/,
+    "Переподключаемся…",
-  );
-  assert.equal(
-    (bothPendingMarkup.match(/class="connection-action-progress"/g) ?? []).length,
-    1,
-  );
-  assert.doesNotMatch(
-    bothPendingMarkup,
-    /Переподключиться|Подключить новый K1|Подтверждаю:/,
   );
+  assert.equal(bothPendingReconnect.length, 1);
+  assert.match(bothPendingReconnect[0], /disabled/);
+  assert.match(bothPendingReconnect[0], /aria-busy="true"/);
+  assert.match(bothPendingReconnect[0], /nodedc-activity-indicator/);
+  assert.match(bothPendingMarkup, /Прежнее подключение не подтверждено/);
+  assert.doesNotMatch(bothPendingMarkup, /connection-action-progress|Подтверждаю:/);
 
   const bothResolvedActive = structuredClone(bothAllowed);
   bothResolvedActive.physical_command.status = "resolved";
@@ -6140,6 +6150,92 @@ test("unknown and cold durable recovery offer one reconnect and one new-device p
   assert.match(unrelatedMarkup, /Результат применения сети не подтверждён/);
 });
 
+test("read-only reconnect keeps its card and loader across a transient projection", async () => {
+  const initialState = terminalConnectionRecoveryState();
+  initialState.connection_attempt = null;
+  let currentState = initialState;
+  let resolveVerification;
+  let markVerificationStarted;
+  const verificationStarted = new Promise((resolve) => {
+    markVerificationStarted = resolve;
+  });
+  const controller = {
+    ...provisioningController(initialState),
+    verifyConnection: async () => {
+      markVerificationStarted();
+      return new Promise((resolve) => {
+        resolveVerification = resolve;
+      });
+    },
+    getConnectionRecoveryObservationTarget: () =>
+      recommendedConnectionRecoveryObservationTarget(currentState),
+    isSnapshotRuntimeCurrent: (runtimeId) =>
+      runtimeId === currentState.snapshot_runtime_id,
+  };
+  const props = () => ({
+    controller: { ...controller, state: currentState },
+    desiredMode: "bridge",
+  });
+  const harness = createStatefulProvisioningHarness(props());
+
+  try {
+    let tree = harness.render(props());
+    const reconnect = actionByLabel(tree, "Переподключиться");
+    assert.ok(reconnect);
+    reconnect.props.onClick();
+    await Promise.race([
+      verificationStarted,
+      new Promise((_, reject) => setTimeout(
+        () => reject(new Error("read-only reconnect did not dispatch")),
+        100,
+      )),
+    ]);
+
+    const transientState = structuredClone(initialState);
+    transientState.connection_policy.allowed_actions =
+      transientState.connection_policy.allowed_actions.filter(
+        (action) => action !== "observe-configured-device-network",
+      );
+    delete transientState.connection_policy.actions[
+      "observe-configured-device-network"
+    ];
+    currentState = transientState;
+    tree = harness.render(props());
+    const pendingMarkup = renderToStaticMarkup(tree);
+    const pendingReconnect = buttonMarkupWithText(
+      pendingMarkup,
+      "Переподключаемся…",
+    );
+    assert.equal(pendingReconnect.length, 1);
+    assert.match(pendingReconnect[0], /disabled/);
+    assert.match(pendingReconnect[0], /aria-busy="true"/);
+    assert.match(pendingReconnect[0], /nodedc-activity-indicator/);
+    assert.match(pendingMarkup, /Сохранённое подключение требует проверки/);
+    assert.doesNotMatch(pendingMarkup, /connection-action-progress/);
+    assert.equal(
+      harness.stateValue(emptyReadOnlyReconnectPresentation)?.kind,
+      "connection",
+    );
+
+    currentState = initialState;
+    resolveVerification({
+      succeeded: false,
+      reconciliationCompleted: false,
+      observedState: initialState,
+    });
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    tree = harness.render(props());
+    const failedMarkup = renderToStaticMarkup(tree);
+    const retry = buttonMarkupWithText(failedMarkup, "Переподключиться");
+    assert.equal(retry.length, 1);
+    assert.doesNotMatch(retry[0], /disabled|aria-busy="true"/);
+    assert.match(failedMarkup, /Проверьте питание и сеть, затем повторите проверку/);
+    assert.equal(harness.stateValue(emptyReadOnlyReconnectPresentation), null);
+  } finally {
+    harness.dispose();
+  }
+});
+
 test("cold saved new-device path resets once, performs zero Scan, and survives reload", async () => {
   const state = terminalConnectionRecoveryState();
   state.connection_attempt = null;
@@ -6753,7 +6849,7 @@ test("applied-network recovery spends the old intent and admits only explicit se
   assert.match(source, /BLE-команда не повторяется/);
   assert.match(
     source,
-    /status=\{\s*searchActive[\s\S]*?: physicalRecoveryRequired[\s\S]*?: networkRecoveryRequired[\s\S]*?>\s*\{searchActive \? \([\s\S]*?Поиск Bluetooth · \{scanSecondsRemaining \?\? 6\} с[\s\S]*?: networkRecoveryRequired && !connectionAttemptSettling \? \(/,
+    /status=\{\s*searchActive[\s\S]*?: presentedPhysicalRecoveryRequired[\s\S]*?: networkRecoveryRequired[\s\S]*?>\s*\{searchActive \? \([\s\S]*?Поиск Bluetooth · \{scanSecondsRemaining \?\? 6\} с[\s\S]*?: networkRecoveryRequired && !connectionAttemptSettling \? \(/,
   );
 
   assert.match(

plugins/xgrids-k1/frontend/src/components/K1ProvisioningPipeline.tsx

@@ -85,6 +85,20 @@ interface DevicePresentationSnapshot {
   rssi: number | null;
 }
 
+export interface ReadOnlyReconnectPresentation {
+  kind: "connection" | "physical";
+  key: string;
+  actionEpoch: number;
+  snapshotRuntimeId: string;
+  deviceId: string;
+  connectionMode: ConnectionMode;
+}
+
+export function emptyReadOnlyReconnectPresentation():
+  ReadOnlyReconnectPresentation | null {
+  return null;
+}
+
 export interface PhysicalReopenPresentation {
   key: string;
   snapshotRuntimeId: string;
@@ -1256,10 +1270,10 @@ export function K1ProvisioningPipeline({
     useState<string | null>(null);
   const [escapedConnectionRecoveryKey, setEscapedConnectionRecoveryKey] =
     useState<string | null>(null);
-  const [failedConnectionRecoveryKey, setFailedConnectionRecoveryKey] =
+  const [readOnlyReconnectPresentation, setReadOnlyReconnectPresentation] =
-    useState<string | null>(null);
+    useState<ReadOnlyReconnectPresentation | null>(
-  const [failedPhysicalRecoveryKey, setFailedPhysicalRecoveryKey] =
+      emptyReadOnlyReconnectPresentation,
-    useState<string | null>(null);
+    );
   // Browser-local generation for work which may settle after an awaited
   // controller call. A scenario reset does not replace snapshot_runtime_id,
   // so runtime identity alone cannot prevent an old Scan/Verify/Retire result
@@ -1607,8 +1621,7 @@ export function K1ProvisioningPipeline({
     setCandidateUnavailableMessage(null);
     setEscapedAppliedAttemptKey(null);
     setEscapedConnectionRecoveryKey(null);
-    setFailedConnectionRecoveryKey(null);
+    setReadOnlyReconnectPresentation(null);
-    setFailedPhysicalRecoveryKey(null);
     setSearchPresentation(null);
     setScanSecondsRemaining(null);
   }, [scenarioResetPresentationKey]);
@@ -1638,12 +1651,21 @@ export function K1ProvisioningPipeline({
   const connectionAttemptSettling = connectionAttemptView === "submitting"
     || connectionAttemptView === "settling";
   const connectionAttemptFailed = connectionAttemptView === "failed";
+  const currentReadOnlyReconnectPresentation =
+    readOnlyReconnectPresentation?.snapshotRuntimeId === snapshotRuntimeId
+      ? readOnlyReconnectPresentation
+      : null;
+  const connectionRecoveryVerificationPending =
+    currentReadOnlyReconnectPresentation?.kind === "connection";
+  const physicalRecoveryVerificationPending =
+    currentReadOnlyReconnectPresentation?.kind === "physical";
   const provisioningMutationBusy = Boolean(
     presentedPendingAction
     || modeResetPending !== null
     || currentPreparingReconfigurationRequest
     || searchDisplayActive
     || connectionAttemptSettling
+    || currentReadOnlyReconnectPresentation
   );
   const isBusy = provisioningMutationBusy;
   const activeSearchSequence = searchDisplayActive
@@ -1783,10 +1805,10 @@ export function K1ProvisioningPipeline({
     connectionRecoveryKey,
     escapedConnectionRecoveryKey,
   ) && !(searchRequested && !searchDisplayActive);
-  const connectionRecoveryVerificationFailed = Boolean(
+  const presentedConnectionRecoveryRequired = connectionRecoveryRequired
-    connectionRecoveryKey
+    || connectionRecoveryVerificationPending;
-    && failedConnectionRecoveryKey === connectionRecoveryKey,
+  const presentedPhysicalRecoveryRequired = physicalRecoveryRequired
-  );
+    || physicalRecoveryVerificationPending;
   const appliedControlSettlementPending = Boolean(
     unresolvedAppliedAttempt
     && ["accepted", "running"].includes(unresolvedAppliedAttempt.status)
@@ -1818,26 +1840,22 @@ export function K1ProvisioningPipeline({
   const physicalRecoveryAuthorityKey = physicalRecoveryPresentationAuthorityKey(
     state,
   );
-  const physicalRecoveryVerificationFailed = Boolean(
-    physicalRecoveryAuthorityKey
-    && failedPhysicalRecoveryKey === physicalRecoveryAuthorityKey,
-  );
   const physicalReadOnlyVerificationAvailable = Boolean(
-    physicalRecoveryTarget?.serverBound,
+    physicalRecoveryTarget?.serverBound || physicalRecoveryVerificationPending,
   );
-  useEffect(() => {
+  const presentedPhysicalRecoveryMode = physicalRecoveryBinding?.connectionMode
-    if (
+    ?? (physicalRecoveryVerificationPending
-      failedPhysicalRecoveryKey
+      ? currentReadOnlyReconnectPresentation?.connectionMode
-      && failedPhysicalRecoveryKey !== physicalRecoveryAuthorityKey
+      : null);
-    ) {
+  const physicalRecoveryModeLabel = presentedPhysicalRecoveryMode
-      setFailedPhysicalRecoveryKey(null);
-    }
-  }, [failedPhysicalRecoveryKey, physicalRecoveryAuthorityKey]);
-  const physicalRecoveryModeLabel = physicalRecoveryBinding
     ? connectionModeOptions.find(
-        (option) => option.value === physicalRecoveryBinding.connectionMode,
+        (option) => option.value === presentedPhysicalRecoveryMode,
-      )?.label ?? physicalRecoveryBinding.connectionMode
+      )?.label ?? presentedPhysicalRecoveryMode
     : "Прежнее подключение";
+  const presentedPhysicalRecoveryDeviceId = physicalRecoveryBinding?.deviceId
+    ?? (physicalRecoveryVerificationPending
+      ? currentReadOnlyReconnectPresentation?.deviceId
+      : null);
   const reconfigurationTargetAllowed = reconfiguration === null
     || (
       selectedTarget !== null
@@ -1888,9 +1906,15 @@ export function K1ProvisioningPipeline({
       || connectedEndpoint
       || "Активное подключение"
     : null;
+  const verificationActionPending = presentedPendingAction === "verify"
+    || connectionRecoveryVerificationPending
+    || physicalRecoveryVerificationPending;
+  const connectionReconnectPending = presentedConnectionRecoveryRequired
+    && verificationActionPending;
+  const physicalReconnectPending = presentedPhysicalRecoveryRequired
+    && verificationActionPending;
   const connectionActionPending = presentedPendingAction === "connect"
-    || presentedPendingAction === "verify";
+    || verificationActionPending;
-  const verificationActionPending = presentedPendingAction === "verify";
   const networkActionPending = presentedPendingAction === "connect"
     || presentedPendingAction === "mode"
     || Boolean(
@@ -1924,8 +1948,8 @@ export function K1ProvisioningPipeline({
   const changeNetworkActionApplicable = connectionMode === "bridge"
     && connectedReconfigurationActionApplicable(state, "prepare-change-network");
   const showNetworkStep = Boolean(
-    !physicalRecoveryRequired
+    !presentedPhysicalRecoveryRequired
-    && !connectionRecoveryRequired
+    && !presentedConnectionRecoveryRequired
     && (
       selectedModeConnected
       || explicitProvisioningDraftRetained
@@ -2141,8 +2165,6 @@ export function K1ProvisioningPipeline({
     setPreparingReconfigurationRequest(null);
     setCandidateUnavailableMessage(null);
     setEscapedConnectionRecoveryKey(null);
-    setFailedConnectionRecoveryKey(null);
-    setFailedPhysicalRecoveryKey(null);
     resetSearchPresentation();
   }, [
     activeBindingKey,
@@ -2550,51 +2572,67 @@ export function K1ProvisioningPipeline({
     if (
       !connectionRecoveryTarget?.serverBound
       || !snapshotRuntimeId
+      || !connectionRecoveryKey
       || isBusy
       || typeof getConnectionRecoveryObservationTarget !== "function"
     ) return;
     const actionEpoch = localScenarioActionEpoch.current;
     const verificationKey = connectionRecoveryKey;
-    setCandidateUnavailableMessage(null);
+    setReadOnlyReconnectPresentation({
-    const dispatched = await dispatchConnectionRecoveryObservationForCurrentRuntime(
+      kind: "connection",
-      snapshotRuntimeId,
+      key: verificationKey,
-      connectionRecoveryTarget,
-      isSnapshotRuntimeCurrent,
-      getConnectionRecoveryObservationTarget,
-      async (target) => {
-        const request = observationRequest(
-          target,
-          reconfigurationRevision,
-          reconfigurationIntentId,
-        );
-        if (!request) return null;
-        return verifyConnection(request, { surfaceErrors: false });
-      },
-    );
-    if (!localScenarioActionEpochIsCurrent(
       actionEpoch,
-      localScenarioActionEpoch.current,
+      snapshotRuntimeId,
-    )) return;
+      deviceId: connectionRecoveryTarget.deviceId,
-    if (!dispatched.dispatched || !dispatched.result) {
+      connectionMode: connectionRecoveryTarget.connectionMode,
-      setFailedConnectionRecoveryKey(verificationKey);
+    });
-      setCandidateUnavailableMessage(
-        "Не удалось начать переподключение: состояние K1 изменилось. Подключите новый K1 через ручной Bluetooth-поиск.",
-      );
-      return;
-    }
-    if (
-      typeof isSnapshotRuntimeCurrent === "function"
-      && !isSnapshotRuntimeCurrent(snapshotRuntimeId)
-    ) return;
-    if (!dispatched.result.succeeded) {
-      setFailedConnectionRecoveryKey(verificationKey);
-      setCandidateUnavailableMessage(
-        "Не удалось переподключиться к прежнему K1. Подключите новый K1 через ручной Bluetooth-поиск.",
-      );
-      return;
-    }
-    setFailedConnectionRecoveryKey(null);
     setCandidateUnavailableMessage(null);
+    try {
+      const dispatched = await dispatchConnectionRecoveryObservationForCurrentRuntime(
+        snapshotRuntimeId,
+        connectionRecoveryTarget,
+        isSnapshotRuntimeCurrent,
+        getConnectionRecoveryObservationTarget,
+        async (target) => {
+          const request = observationRequest(
+            target,
+            reconfigurationRevision,
+            reconfigurationIntentId,
+          );
+          if (!request) return null;
+          return verifyConnection(request, { surfaceErrors: false });
+        },
+      );
+      if (!localScenarioActionEpochIsCurrent(
+        actionEpoch,
+        localScenarioActionEpoch.current,
+      )) return;
+      if (!dispatched.dispatched || !dispatched.result) {
+        setCandidateUnavailableMessage(
+          "Не удалось начать переподключение: состояние K1 изменилось. Повторите проверку или подключите новый K1 через ручной Bluetooth-поиск.",
+        );
+        return;
+      }
+      if (
+        typeof isSnapshotRuntimeCurrent === "function"
+        && !isSnapshotRuntimeCurrent(snapshotRuntimeId)
+      ) return;
+      if (!dispatched.result.succeeded) {
+        setCandidateUnavailableMessage(
+          "Не удалось переподключиться к прежнему K1. Проверьте питание и сеть, затем повторите проверку.",
+        );
+        return;
+      }
+      setCandidateUnavailableMessage(null);
+    } finally {
+      setReadOnlyReconnectPresentation((current) => (
+        current?.kind === "connection"
+          && current.key === verificationKey
+          && current.actionEpoch === actionEpoch
+          ? null
+          : current
+      ));
+    }
   };
 
   const refreshCorrelatedConnectionFailure = async () => {
@@ -2611,8 +2649,7 @@ export function K1ProvisioningPipeline({
     setPasswordVisible(false);
     setConnectionAttemptPresentation(null);
     setCandidateUnavailableMessage(null);
-    setFailedConnectionRecoveryKey(null);
+    setReadOnlyReconnectPresentation(null);
-    setFailedPhysicalRecoveryKey(null);
   };
 
   const verifyPhysicalRecovery = async () => {
@@ -2621,6 +2658,8 @@ export function K1ProvisioningPipeline({
     if (
       !physicalRecoveryRequired
       || !physicalRecoveryTarget?.serverBound
+      || !snapshotRuntimeId
+      || !verificationKey
       || isBusy
     ) return;
     const request = observationRequest(
@@ -2629,57 +2668,69 @@ export function K1ProvisioningPipeline({
       reconfigurationIntentId,
     );
     if (!request) {
-      setFailedPhysicalRecoveryKey(verificationKey);
       setCandidateUnavailableMessage(
         "Не удалось переподключиться к прежнему K1. Подключите новый K1 вручную.",
       );
       return;
     }
-
+    setReadOnlyReconnectPresentation({
-    const modeAuthority = await commitDesiredModeForExplicitAction(
+      kind: "physical",
-      physicalRecoveryTarget.connectionMode,
+      key: verificationKey,
-    );
-    if (!localScenarioActionEpochIsCurrent(
       actionEpoch,
-      localScenarioActionEpoch.current,
+      snapshotRuntimeId,
-    )) return;
+      deviceId: physicalRecoveryTarget.deviceId,
-    if (!modeAuthority) {
+      connectionMode: physicalRecoveryTarget.connectionMode,
-      setFailedPhysicalRecoveryKey(verificationKey);
+    });
-      setCandidateUnavailableMessage(
-        "Не удалось переподключиться: состояние K1 изменилось. Подключите новый K1 вручную.",
-      );
-      return;
-    }
-    const actionFence = activateRuntimeActionFence(modeAuthority);
-    if (!actionFence || !runtimeActionIsCurrent(actionFence)) return;
-
     setCandidateUnavailableMessage(null);
     try {
-      const result = await verifyConnection(request);
+      const modeAuthority = await commitDesiredModeForExplicitAction(
-      if (!runtimeClickIsCurrent(actionFence)) return;
+        physicalRecoveryTarget.connectionMode,
-      if (!result.succeeded) {
+      );
-        setFailedPhysicalRecoveryKey(verificationKey);
+      if (!localScenarioActionEpochIsCurrent(
+        actionEpoch,
+        localScenarioActionEpoch.current,
+      )) return;
+      if (!modeAuthority) {
         setCandidateUnavailableMessage(
-          "Не удалось переподключиться к прежнему K1. Подключите новый K1 вручную.",
+          "Не удалось переподключиться: состояние K1 изменилось. Повторите проверку или подключите новый K1 вручную.",
         );
         return;
       }
-      if (
+      const actionFence = activateRuntimeActionFence(modeAuthority);
-        result.observedState
+      if (!actionFence || !runtimeActionIsCurrent(actionFence)) return;
-        && isRecoveredPhysicalScanning(
+      try {
-          result.observedState,
+        const result = await verifyConnection(request);
-          physicalRecoveryTarget.connectionMode,
+        if (!runtimeClickIsCurrent(actionFence)) return;
-        )
+        if (!result.succeeded) {
-      ) {
+          setCandidateUnavailableMessage(
-        setCandidateUnavailableMessage(
+            "Не удалось переподключиться к прежнему K1. Проверьте питание и сеть, затем повторите проверку.",
-          "K1 подтвердил продолжающееся сканирование. Новая команда не отправлялась; доступна одна явная остановка.",
+          );
-        );
+          return;
-        return;
+        }
+        if (
+          result.observedState
+          && isRecoveredPhysicalScanning(
+            result.observedState,
+            physicalRecoveryTarget.connectionMode,
+          )
+        ) {
+          setCandidateUnavailableMessage(
+            "K1 подтвердил продолжающееся сканирование. Новая команда не отправлялась; доступна одна явная остановка.",
+          );
+          return;
+        }
+        setCandidateUnavailableMessage(null);
+      } finally {
+        retireRuntimeClickFence(actionFence);
       }
-      setFailedPhysicalRecoveryKey(null);
-      setCandidateUnavailableMessage(null);
     } finally {
-      retireRuntimeClickFence(actionFence);
+      setReadOnlyReconnectPresentation((current) => (
+        current?.kind === "physical"
+          && current.key === verificationKey
+          && current.actionEpoch === actionEpoch
+          ? null
+          : current
+      ));
     }
   };
 
@@ -2779,8 +2830,6 @@ export function K1ProvisioningPipeline({
       setReconfigurationDevicePresentation(null);
       setEscapedAppliedAttemptKey(null);
       setEscapedConnectionRecoveryKey(null);
-      setFailedConnectionRecoveryKey(null);
-      setFailedPhysicalRecoveryKey(null);
       resetSearchPresentation();
       await onDesiredModeChange(value);
     } finally {
@@ -3023,30 +3072,41 @@ export function K1ProvisioningPipeline({
       ) : null}
     </>
   );
-  const connectionRecoveryModeLabel = connectionRecoveryTarget
+  const presentedConnectionRecoveryMode = connectionRecoveryTarget?.connectionMode
+    ?? (connectionRecoveryVerificationPending
+      ? currentReadOnlyReconnectPresentation?.connectionMode
+      : null);
+  const connectionRecoveryModeLabel = presentedConnectionRecoveryMode
     ? connectionModeOptions.find(
-        (option) => option.value === connectionRecoveryTarget.connectionMode,
+        (option) => option.value === presentedConnectionRecoveryMode,
-      )?.label ?? connectionRecoveryTarget.connectionMode
+      )?.label ?? presentedConnectionRecoveryMode
     : null;
-  const connectionRecoveryActions = connectionRecoveryRequired ? (
+  const presentedConnectionRecoveryDeviceId = connectionRecoveryTarget?.deviceId
+    ?? (connectionRecoveryVerificationPending
+      ? currentReadOnlyReconnectPresentation?.deviceId
+      : null);
+  const connectionRecoveryActions = presentedConnectionRecoveryRequired ? (
     <>
-      {connectionRecoveryTarget && !connectionRecoveryVerificationFailed ? (
+      {connectionRecoveryTarget || connectionRecoveryVerificationPending ? (
         <Button
           width="full"
           variant="primary"
-          icon={<Icon name="refresh" />}
+          icon={connectionReconnectPending
-          disabled={
+            ? <ActivityIndicator size="compact" />
-            isBusy
+            : <Icon name="refresh" />}
-          }
+          disabled={isBusy}
+          aria-busy={connectionReconnectPending || undefined}
           onClick={() => void verifyConnectionRecoveryTarget()}
         >
-          Переподключиться
+          {connectionReconnectPending
+            ? "Переподключаемся…"
+            : "Переподключиться"}
         </Button>
       ) : null}
       <Button
         width="full"
         variant={
-          connectionRecoveryTarget && !connectionRecoveryVerificationFailed
+          connectionRecoveryTarget || connectionRecoveryVerificationPending
             ? "secondary"
             : "primary"
         }
@@ -3101,7 +3161,7 @@ export function K1ProvisioningPipeline({
                 ? `Поиск · ${scanSecondsRemaining ?? 6} с`
                 : connectionAttemptSettling
                   ? "Устройство выбрано"
-                : physicalRecoveryRequired
+                : presentedPhysicalRecoveryRequired
                   ? verificationActionPending
                     ? "Переподключаемся…"
                     : "Нужно выбрать действие"
@@ -3109,10 +3169,12 @@ export function K1ProvisioningPipeline({
                   ? appliedControlSettlementPending
                     ? "Подтверждаем управление"
                     : "Управление не подтверждено · выбор заблокирован"
-                : connectionRecoveryRequired
+                : presentedConnectionRecoveryRequired
-                  ? connectionRecoveryTarget
+                  ? connectionReconnectPending
-                    ? "Нужна проверка"
+                    ? "Переподключаемся…"
-                    : "Нужен новый поиск"
+                    : connectionRecoveryTarget
+                      ? "Нужна проверка"
+                      : "Нужен новый поиск"
                 : connectionEstablished
                   ? "Подключение установлено"
                   : explicitProvisioningDraftStale
@@ -3128,14 +3190,17 @@ export function K1ProvisioningPipeline({
           tone={
               searchActive
                 ? "accent"
-                : physicalRecoveryRequired
+                : verificationActionPending
-                  && verificationActionPending
+                  && (
+                    presentedPhysicalRecoveryRequired
+                    || presentedConnectionRecoveryRequired
+                  )
                   ? "accent"
                 : connectionEstablished
                 ? "success"
                 : networkRecoveryRequired
-                  || physicalRecoveryRequired
+                  || presentedPhysicalRecoveryRequired
-                  || connectionRecoveryRequired
+                  || presentedConnectionRecoveryRequired
                   || explicitProvisioningDraftStale
                   ? "warning"
                   : "neutral"
@@ -3168,52 +3233,47 @@ export function K1ProvisioningPipeline({
                       ?? "Сервис не определил точный прежний K1 для безопасной проверки"}
                 </small>
               </div>
-            ) : physicalRecoveryRequired && verificationActionPending ? (
+            ) : presentedPhysicalRecoveryRequired ? (
               <div
-                className="connection-action-progress"
+                className="field-stack"
-                role="status"
+                aria-busy={physicalReconnectPending || undefined}
-                aria-live="polite"
-                aria-busy="true"
               >
-                <ActivityIndicator />
-                <strong>Проверяем прежний K1 без повторения START, STOP или настроек сети…</strong>
-              </div>
-            ) : physicalRecoveryRequired ? (
-              <div className="field-stack">
                 <div className="connection-summary" role="status">
                   <span>Прежнее подключение не подтверждено</span>
                   <strong>{physicalRecoveryModeLabel}</strong>
                   <small>
-                    {physicalRecoveryBinding?.deviceId
+                    {presentedPhysicalRecoveryDeviceId ?? "Прежний K1"}
-                      ?? "Прежний K1"}
                   </small>
                 </div>
                 <p className="safety-note">
                   Переподключитесь к прежнему K1 или начните чистое подключение
                   нового устройства.
                 </p>
-                {physicalReadOnlyVerificationAvailable
+                {physicalReadOnlyVerificationAvailable ? (
-                  && !physicalRecoveryVerificationFailed ? (
                   <Button
                     width="full"
                     variant="primary"
-                    icon={<Icon name="refresh" />}
+                    icon={physicalReconnectPending
+                      ? <ActivityIndicator size="compact" />
+                      : <Icon name="refresh" />}
                     disabled={isBusy || !physicalRecoveryTarget?.serverBound}
+                    aria-busy={physicalReconnectPending || undefined}
                     onClick={() => void verifyPhysicalRecovery()}
                   >
-                    Переподключиться
+                    {physicalReconnectPending
+                      ? "Переподключаемся…"
+                      : "Переподключиться"}
                   </Button>
                 ) : null}
                 <Button
                   width="full"
                   variant={
                     physicalReadOnlyVerificationAvailable
-                    && !physicalRecoveryVerificationFailed
                     ? "secondary"
                     : "primary"
                   }
                   icon={<Icon name="search" />}
-                  disabled={modeResetInFlight}
+                  disabled={isBusy || modeResetInFlight}
                   onClick={() => void changeDesiredConnectionMode(connectionMode)}
                 >
                   Подключить новый K1
@@ -3224,8 +3284,11 @@ export function K1ProvisioningPipeline({
                   </p>
                 ) : null}
               </div>
-            ) : connectionRecoveryRequired ? (
+            ) : presentedConnectionRecoveryRequired ? (
-              <div className="field-stack">
+              <div
+                className="field-stack"
+                aria-busy={connectionReconnectPending || undefined}
+              >
                 {correlatedConnectionAttempt && error ? (
                   <K1OperatorError
                     message={error}
@@ -3251,8 +3314,8 @@ export function K1ProvisioningPipeline({
                           ?? connectionRecoveryAttempt?.connection_mode
                           ?? requestedModeLabel}
                       </strong>
-                      {connectionRecoveryTarget?.deviceId ? (
+                      {presentedConnectionRecoveryDeviceId ? (
-                        <small>{connectionRecoveryTarget.deviceId}</small>
+                        <small>{presentedConnectionRecoveryDeviceId}</small>
                       ) : null}
                     </div>
                     <p className="safety-note">