fix(android): retain verified spec selections (#224)

android/app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "cn.ilapage.goauto.agent"
         minSdk = 23
         targetSdk = 34
-        versionCode = 57
-        versionName = "0.9.44"
+        versionCode = 59
+        versionName = "0.9.46"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

android/app/src/main/java/cn/ilapage/goauto/agent/automation/PurchaseRehearsalExecutor.kt

@@ -608,7 +608,11 @@ class PurchaseRehearsalExecutor(
         return matchingCandidates.size == 1 && matchingCandidates.single() == target
     }
 
-    private data class ExactSpecSelectionProof(val dimension: String, val target: String)
+    private data class ExactSpecSelectionProof(
+        val dimension: String,
+        val target: String,
+        val panelType: SpecPanelType,
+    )
 
     private fun exactSpecSelectionProof(
         screen: ParsedPddScreen,
@@ -620,7 +624,7 @@ class PurchaseRehearsalExecutor(
         val tokenCandidates = screen.dimensions.filter { it.key == dimension }.flatMap { it.values }.filter { candidate ->
             if (dimension == "size") SpecValueNormalizer.primarySizeToken(candidate.text) == token else candidate.text == token
         }
-        return ExactSpecSelectionProof(dimension, target).takeIf {
+        return ExactSpecSelectionProof(dimension, target, screen.specPanelType).takeIf {
             tokenCandidates.size == 1 && tokenCandidates.single().text == target
         }
     }
@@ -631,6 +635,9 @@ class PurchaseRehearsalExecutor(
         val summaryTokenMatched: Boolean,
         val candidateCount: Int,
         val proofPresent: Boolean,
+        val targetMatchCount: Int = 0,
+        val relocationAttempted: Boolean = false,
+        val relocationSwipes: Int = 0,
     )
 
     private fun verifyExactSpecSelection(
@@ -641,15 +648,21 @@ class PurchaseRehearsalExecutor(
     ): FinalSpecVerification {
         val candidates = screen.dimensions.filter { it.key == dimension }.flatMap { it.values }
         val matchingNodes = candidates.filter { it.text == target }
-        val proofPresent = proof?.dimension == dimension && proof.target == target
+        val proofPresent = proof?.dimension == dimension && proof.target == target && proof.panelType == screen.specPanelType
         if (matchingNodes.size == 1 && (matchingNodes.single().node.selected || matchingNodes.single().node.checked)) {
-            return FinalSpecVerification(true, "selected_node", false, candidates.size, proofPresent)
+            return FinalSpecVerification(true, "selected_node", false, candidates.size, proofPresent, matchingNodes.size)
+        }
+        if (candidates.any { it.text != target && (it.node.selected || it.node.checked) }) {
+            return FinalSpecVerification(false, "visible_selected_conflict", false, candidates.size, proofPresent, matchingNodes.size)
         }
 
         val token = if (dimension == "size") SpecValueNormalizer.primarySizeToken(target) else target.trim()
         val summaryTokenMatched = !token.isNullOrBlank() && SpecValueNormalizer.summaryHasExactToken(screen.selectedSummary, token)
         if (!summaryTokenMatched) {
-            return FinalSpecVerification(false, "summary_token_missing", false, candidates.size, proofPresent)
+            if (screen.selectedSummary == null && screen.specPanelOpen && proofPresent) {
+                return FinalSpecVerification(true, "attempt_selection_state", false, candidates.size, true, matchingNodes.size)
+            }
+            return FinalSpecVerification(false, "summary_token_missing", false, candidates.size, proofPresent, matchingNodes.size)
         }
         // PDD can rerender or scroll the previously selected dimension out of
         // the current viewport while the selected summary remains visible. A
@@ -660,18 +673,83 @@ class PurchaseRehearsalExecutor(
             if (dimension == "size") SpecValueNormalizer.primarySizeToken(candidate.text) == token else candidate.text == token
         }
         if (visibleTokenMatches.size == 1 && visibleTokenMatches.single().text == target) {
-            return FinalSpecVerification(true, "visible_candidate", true, candidates.size, proofPresent)
+            return FinalSpecVerification(true, "visible_candidate", true, candidates.size, proofPresent, matchingNodes.size)
         }
         if (visibleTokenMatches.isNotEmpty()) {
-            return FinalSpecVerification(false, "visible_candidate_conflict", true, candidates.size, proofPresent)
+            return FinalSpecVerification(false, "visible_candidate_conflict", true, candidates.size, proofPresent, matchingNodes.size)
         }
         return if (proofPresent) {
-            FinalSpecVerification(true, "attempt_selection_proof", true, candidates.size, true)
+            FinalSpecVerification(true, "attempt_selection_proof", true, candidates.size, true, matchingNodes.size)
         } else {
-            FinalSpecVerification(false, "selection_proof_missing", true, candidates.size, false)
+            FinalSpecVerification(false, "selection_proof_missing", true, candidates.size, false, matchingNodes.size)
         }
     }
 
+    private fun verifyExactSpecSelectionWithRelocation(
+        input: PurchaseExecutionInput,
+        dimension: String,
+        target: String,
+        proof: ExactSpecSelectionProof?,
+    ): FinalSpecVerification {
+        var screen = currentScreen(input)
+        screen.problem?.let {
+            return FinalSpecVerification(false, it.code, false, 0, proof != null)
+        }
+        var verification = verifyExactSpecSelection(screen, dimension, target, proof)
+        if (verification.confirmed || verification.targetMatchCount > 0 || verification.reason == "visible_selected_conflict") return verification
+        if (!screen.specPanelOpen) return verification.copy(reason = "relocation_panel_closed", relocationAttempted = true)
+
+        var signature = screen.dimensions.joinToString("|") { item ->
+            "${item.key}:${item.values.joinToString(",") { value -> "${value.text}:${value.available}" }}"
+        }
+        var swipes = 0
+        for ((direction, limit) in listOf(SwipeDirection.DOWN to 3, SwipeDirection.UP to 6)) {
+            for (attempt in 0 until limit) {
+                val container = screen.specPanelContainer
+                    ?: return verification.copy(
+                        reason = "relocation_container_missing",
+                        relocationAttempted = true,
+                        relocationSwipes = swipes,
+                    )
+                if (!driver.swipePurchaseIn(container, direction, 350)) {
+                    return verification.copy(
+                        reason = "relocation_swipe_failed",
+                        relocationAttempted = true,
+                        relocationSwipes = swipes,
+                    )
+                }
+                swipes++
+                pause(300)
+                screen = currentScreen(input)
+                screen.problem?.let {
+                    return verification.copy(
+                        reason = it.code,
+                        relocationAttempted = true,
+                        relocationSwipes = swipes,
+                    )
+                }
+                if (!screen.specPanelOpen) {
+                    return verification.copy(
+                        reason = "relocation_panel_closed",
+                        relocationAttempted = true,
+                        relocationSwipes = swipes,
+                    )
+                }
+                verification = verifyExactSpecSelection(screen, dimension, target, proof).copy(
+                    relocationAttempted = true,
+                    relocationSwipes = swipes,
+                )
+                if (verification.confirmed || verification.targetMatchCount > 0 || verification.reason == "visible_selected_conflict") return verification
+                val refreshedSignature = screen.dimensions.joinToString("|") { item ->
+                    "${item.key}:${item.values.joinToString(",") { value -> "${value.text}:${value.available}" }}"
+                }
+                if (refreshedSignature == signature) break
+                signature = refreshedSignature
+            }
+        }
+        return verification.copy(relocationAttempted = true, relocationSwipes = swipes)
+    }
+
     private data class SpecLookup(val node: SnapshotNode? = null, val failure: PurchaseExecutionOutcome? = null)
 
     /**
@@ -759,23 +837,26 @@ class PurchaseRehearsalExecutor(
         observedPrice: Long?,
         selectionProofs: Map<String, ExactSpecSelectionProof>,
     ): PurchaseExecutionOutcome? {
-        val screen = currentScreen(input)
-        screen.problem?.let { return failure(it.code, it.message) }
         val selected = listOf("color" to input.mappedColor, "size" to input.mappedSize).filter { it.second.isNotBlank() }.map { (dimension, rawTarget) ->
             dimension to (normalizedTarget(dimension, rawTarget)
                 ?: return failure(SPEC_SAFE_TARGET_MISSING, "下发规格无法安全规范化"))
         }
         selected.forEach { (dimension, target) ->
-            val verification = verifyExactSpecSelection(screen, dimension, target, selectionProofs[dimension])
+            val verification = verifyExactSpecSelectionWithRelocation(input, dimension, target, selectionProofs[dimension])
             if (!verification.confirmed) {
+                val screen = currentScreen(input)
                 val panel = screen.specPanelType.name.lowercase()
                 val diagnostic = "dimension=$dimension,reason=${verification.reason},panel=$panel," +
                     "summary=${screen.selectedSummary != null},tokenMatched=${verification.summaryTokenMatched}," +
-                    "candidates=${verification.candidateCount},proof=${verification.proofPresent}"
+                    "candidates=${verification.candidateCount},targetMatches=${verification.targetMatchCount}," +
+                    "proof=${verification.proofPresent}," +
+                    "relocated=${verification.relocationAttempted},relocationSwipes=${verification.relocationSwipes}"
                 return failure(SPEC_SELECTION_UNCONFIRMED, "最终规格复核未能确认精确选中状态 [$diagnostic]")
             }
         }
         if (readQuantity() != input.quantity) return failure("PURCHASE_QUANTITY_MISMATCH", "最终数量复核失败")
+        val screen = currentScreen(input)
+        screen.problem?.let { return failure(it.code, it.message) }
         val price = screen.priceCent ?: observedPrice ?: return failure("RULE_NOT_MATCHED", "最终价格复核失败")
         if (price !in input.minUnitPriceCent..input.maxUnitPriceCent) {
             return failure("PURCHASE_PRICE_OUT_OF_RANGE", "当前商品单价超出允许范围", price)

android/app/src/test/java/cn/ilapage/goauto/agent/PurchaseRehearsalExecutorTest.kt

@@ -233,7 +233,7 @@ class PurchaseRehearsalExecutorTest {
     }
 
     @Test
-    fun `final verification rejects prior proof when selected summary is no longer visible`() {
+    fun `final verification keeps exact attempt selection when summary is no longer visible`() {
         val driver = FakePurchaseDriver(
             hideColorAfterQuantitySet = true,
             hideSelectedSummaryAfterQuantitySet = true,
@@ -241,11 +241,42 @@ class PurchaseRehearsalExecutorTest {
         val outcome = PurchaseRehearsalExecutor(driver, { driver.browser = true; true }, { null }, pause = {})
             .execute(input(), PurchaseRuleParser.parse(rule()), PurchaseAgentCapabilities.supported)
 
+        assertEquals("rehearsal_completed", outcome.resultType)
+        assertEquals(1, driver.clicked.count { it == "黑色" })
+    }
+
+    @Test
+    fun `final verification reuses exact attempt state without scrolling back`() {
+        val driver = FakePurchaseDriver(
+            hideColorAfterQuantitySet = true,
+            hideSelectedSummaryAfterQuantitySet = true,
+            restoreHiddenColorOnDownSwipe = true,
+        )
+        val outcome = PurchaseRehearsalExecutor(driver, { driver.browser = true; true }, { null }, pause = {})
+            .execute(input(), PurchaseRuleParser.parse(rule()), PurchaseAgentCapabilities.supported)
+
+        assertEquals("rehearsal_completed", outcome.resultType)
+        assertFalse(driver.swipeInPaths.contains("scroll"))
+        assertEquals(1, driver.clicked.count { it == "黑色" })
+        assertEquals(1, driver.clicked.count { it == "XL" })
+    }
+
+    @Test
+    fun `final verification rejects explicit conflicting selected color`() {
+        val driver = FakePurchaseDriver(
+            colors = listOf("黑色", "白色"),
+            hideSelectedSummaryAfterQuantitySet = true,
+            selectedColorOverrideAfterQuantitySet = "白色",
+        )
+        val outcome = PurchaseRehearsalExecutor(driver, { driver.browser = true; true }, { null }, pause = {})
+            .execute(input(), PurchaseRuleParser.parse(rule()), PurchaseAgentCapabilities.supported)
+
         assertEquals("failed", outcome.resultType)
         assertEquals("PURCHASE_SPEC_SELECTION_UNCONFIRMED", outcome.errorCode)
         assertTrue(outcome.message.contains("dimension=color"))
-        assertTrue(outcome.message.contains("reason=summary_token_missing"))
-        assertTrue(outcome.message.contains("proof=true"))
+        assertTrue(outcome.message.contains("reason=visible_selected_conflict"))
+        assertTrue(outcome.message.contains("targetMatches=1"))
+        assertEquals(1, driver.clicked.count { it == "黑色" })
     }
 
     @Test
@@ -950,6 +981,8 @@ class PurchaseRehearsalExecutorTest {
         private val hideColorAfterQuantitySet: Boolean = false,
         private val hideSizeAfterQuantitySet: Boolean = false,
         private val hideSelectedSummaryAfterQuantitySet: Boolean = false,
+        private val restoreHiddenColorOnDownSwipe: Boolean = false,
+        private val selectedColorOverrideAfterQuantitySet: String? = null,
         private val selectedSummaryOverrideAfterQuantitySet: String? = null,
         private val finalSizesAfterQuantitySet: List<String>? = null,
         soldOut: Boolean = false,
@@ -981,6 +1014,7 @@ class PurchaseRehearsalExecutorTest {
         private var reviewPage = false
         private var pddCaptureCount = 0
         private var browserCaptureCount = 0
+        private var hiddenColorRestored = false
         val clicked = mutableListOf<String>()
         val clickedPaths = mutableListOf<String>()
 
@@ -1045,7 +1079,7 @@ class PurchaseRehearsalExecutorTest {
                     node("panel-title", "确认款式", 20, 396, 300, 430),
                 ))
             }
-            val hideColor = hideColorAfterQuantitySet && quantity == 2L
+            val hideColor = hideColorAfterQuantitySet && quantity == 2L && !hiddenColorRestored
             val hideSize = hideSizeAfterQuantitySet && quantity == 2L
             val hideSummary = hideSelectedSummaryAfterQuantitySet && quantity == 2L
             val displayedSummary = if (quantity == 2L && selectedSummaryOverrideAfterQuantitySet != null) {
@@ -1064,8 +1098,20 @@ class PurchaseRehearsalExecutorTest {
             }
             if (!hideColor) {
                 nodes += node("scroll/color-heading", "颜色分类", 20, 410, 300, 450, parentPath = "scroll")
+                val selectedColor = if (quantity == 2L) selectedColorOverrideAfterQuantitySet ?: color else color
                 colors.forEachIndexed { index, value ->
-                    nodes += node("scroll/color-$index", value, 20 + index * 220, 470, 200 + index * 220, 540, clickable = true, selected = color == value, enabled = !allSpecsUnavailable, parentPath = "scroll")
+                    nodes += node(
+                        "scroll/color-$index",
+                        value,
+                        20 + index * 220,
+                        470,
+                        200 + index * 220,
+                        540,
+                        clickable = true,
+                        selected = selectedColor == value,
+                        enabled = !allSpecsUnavailable,
+                        parentPath = "scroll",
+                    )
                 }
             }
             if (!hideSize) {
@@ -1185,6 +1231,9 @@ class PurchaseRehearsalExecutorTest {
 
         override fun swipePurchaseIn(target: SnapshotNode, direction: SwipeDirection, durationMs: Long): Boolean {
             swipeInPaths += target.path
+            if (restoreHiddenColorOnDownSwipe && quantity == 2L && direction == SwipeDirection.DOWN) {
+                hiddenColorRestored = true
+            }
             return swipePurchase(direction, durationMs)
         }