swipium 1.4.0 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +313 -0
- package/README.md +175 -219
- package/THREAT_MODEL.md +223 -47
- package/dist/appMap/automationLink.js +39 -26
- package/dist/appMap/automationLink.js.map +1 -1
- package/dist/appMap/build.js +68 -20
- package/dist/appMap/build.js.map +1 -1
- package/dist/appMap/codeIndex.js +31 -5
- package/dist/appMap/codeIndex.js.map +1 -1
- package/dist/appMap/featureIndex.js +23 -5
- package/dist/appMap/featureIndex.js.map +1 -1
- package/dist/appMap/featureModel.js +44 -8
- package/dist/appMap/featureModel.js.map +1 -1
- package/dist/appMap/firstRunApply.js +24 -6
- package/dist/appMap/firstRunApply.js.map +1 -1
- package/dist/appMap/fsWalk.js +19 -2
- package/dist/appMap/fsWalk.js.map +1 -1
- package/dist/appMap/issues.js +10 -30
- package/dist/appMap/issues.js.map +1 -1
- package/dist/appMap/migrations.js +6 -6
- package/dist/appMap/migrations.js.map +1 -1
- package/dist/appMap/prelaunch.js +2 -2
- package/dist/appMap/prelaunch.js.map +1 -1
- package/dist/appMap/projectRegistry.js +83 -11
- package/dist/appMap/projectRegistry.js.map +1 -1
- package/dist/appMap/provenance.js +2 -2
- package/dist/appMap/provenance.js.map +1 -1
- package/dist/appMap/query.js +21 -5
- package/dist/appMap/query.js.map +1 -1
- package/dist/appMap/runtimeMerge.js +12 -5
- package/dist/appMap/runtimeMerge.js.map +1 -1
- package/dist/appMap/schema.js +1 -1
- package/dist/appMap/schema.js.map +1 -1
- package/dist/appMap/screenMatch.js +6 -2
- package/dist/appMap/screenMatch.js.map +1 -1
- package/dist/appMap/staticScan.js +151 -39
- package/dist/appMap/staticScan.js.map +1 -1
- package/dist/appMap/store.js +58 -85
- package/dist/appMap/store.js.map +1 -1
- package/dist/appMap/tsAstScan.js +34 -12
- package/dist/appMap/tsAstScan.js.map +1 -1
- package/dist/artifacts/bundletool.js +49 -12
- package/dist/artifacts/bundletool.js.map +1 -1
- package/dist/artifacts/resolve.js +41 -14
- package/dist/artifacts/resolve.js.map +1 -1
- package/dist/automation/capabilities.js +112 -30
- package/dist/automation/capabilities.js.map +1 -1
- package/dist/automation/gestures.js +6 -2
- package/dist/automation/gestures.js.map +1 -1
- package/dist/automation/plan.js +71 -23
- package/dist/automation/plan.js.map +1 -1
- package/dist/automation/report.js +15 -5
- package/dist/automation/report.js.map +1 -1
- package/dist/automation/selectors.js +22 -28
- package/dist/automation/selectors.js.map +1 -1
- package/dist/automation/types.js +1 -1
- package/dist/automation/types.js.map +1 -1
- package/dist/automation/waits.js +14 -8
- package/dist/automation/waits.js.map +1 -1
- package/dist/automation/webview.js +9 -3
- package/dist/automation/webview.js.map +1 -1
- package/dist/automationGen/appiumModel.js +16 -8
- package/dist/automationGen/appiumModel.js.map +1 -1
- package/dist/automationGen/ciEmitter.js +6 -6
- package/dist/automationGen/ciEmitter.js.map +1 -1
- package/dist/automationGen/identifiers.js +224 -0
- package/dist/automationGen/identifiers.js.map +1 -0
- package/dist/automationGen/jsEmitter.js +288 -121
- package/dist/automationGen/jsEmitter.js.map +1 -1
- package/dist/automationGen/packagePatch.js +2 -2
- package/dist/automationGen/packagePatch.js.map +1 -1
- package/dist/automationGen/platformResolve.js +36 -0
- package/dist/automationGen/platformResolve.js.map +1 -0
- package/dist/automationGen/projectProfile.js +76 -27
- package/dist/automationGen/projectProfile.js.map +1 -1
- package/dist/automationGen/pythonEmitter.js +278 -107
- package/dist/automationGen/pythonEmitter.js.map +1 -1
- package/dist/automationGen/readmeEmitter.js +7 -6
- package/dist/automationGen/readmeEmitter.js.map +1 -1
- package/dist/automationGen/run.js +388 -0
- package/dist/automationGen/run.js.map +1 -0
- package/dist/automationGen/suitePlan.js +17 -10
- package/dist/automationGen/suitePlan.js.map +1 -1
- package/dist/automationGen/validation.js +52 -12
- package/dist/automationGen/validation.js.map +1 -1
- package/dist/build/parseBuildLog.js +235 -31
- package/dist/build/parseBuildLog.js.map +1 -1
- package/dist/build/plan.js +39 -18
- package/dist/build/plan.js.map +1 -1
- package/dist/ci/preflight.js +13 -4
- package/dist/ci/preflight.js.map +1 -1
- package/dist/cli/gc.js +74 -0
- package/dist/cli/gc.js.map +1 -0
- package/dist/cli/init.js +217 -26
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/main.js +50 -0
- package/dist/cli/main.js.map +1 -0
- package/dist/cli/report.js +218 -0
- package/dist/cli/report.js.map +1 -0
- package/dist/cli/scan.js +36 -15
- package/dist/cli/scan.js.map +1 -1
- package/dist/cli/suite.js +7 -7
- package/dist/cli/suite.js.map +1 -1
- package/dist/cli/verify.js +7 -7
- package/dist/cli/verify.js.map +1 -1
- package/dist/consent/consent.js +162 -5
- package/dist/consent/consent.js.map +1 -1
- package/dist/context/detect.js +55 -18
- package/dist/context/detect.js.map +1 -1
- package/dist/context/findApps.js +22 -8
- package/dist/context/findApps.js.map +1 -1
- package/dist/context/projectRoot.js +174 -19
- package/dist/context/projectRoot.js.map +1 -1
- package/dist/context/scan.js +1 -1
- package/dist/context/scan.js.map +1 -1
- package/dist/core/capabilityGroups.js +90 -0
- package/dist/core/capabilityGroups.js.map +1 -0
- package/dist/core/target.js +10 -8
- package/dist/core/target.js.map +1 -1
- package/dist/core/targetPlan.js +160 -39
- package/dist/core/targetPlan.js.map +1 -1
- package/dist/drivers/DirectDriver.js +317 -43
- package/dist/drivers/DirectDriver.js.map +1 -1
- package/dist/drivers/SimctlDriver.js +124 -8
- package/dist/drivers/SimctlDriver.js.map +1 -1
- package/dist/drivers/WdaDriver.js +365 -55
- package/dist/drivers/WdaDriver.js.map +1 -1
- package/dist/explore/candidates.js +7 -3
- package/dist/explore/candidates.js.map +1 -1
- package/dist/explore/graph.js +15 -6
- package/dist/explore/graph.js.map +1 -1
- package/dist/explore/memory.js +4 -1
- package/dist/explore/memory.js.map +1 -1
- package/dist/explore/planner.js +54 -9
- package/dist/explore/planner.js.map +1 -1
- package/dist/explore/policy.js +11 -6
- package/dist/explore/policy.js.map +1 -1
- package/dist/explore/runner.js +363 -190
- package/dist/explore/runner.js.map +1 -1
- package/dist/explore/signatures.js +4 -2
- package/dist/explore/signatures.js.map +1 -1
- package/dist/explore/suite.js +3 -1
- package/dist/explore/suite.js.map +1 -1
- package/dist/featureTesting/executionBootstrap.js +137 -29
- package/dist/featureTesting/executionBootstrap.js.map +1 -1
- package/dist/featureTesting/featureMap.js +6 -3
- package/dist/featureTesting/featureMap.js.map +1 -1
- package/dist/featureTesting/featureScope.js +101 -20
- package/dist/featureTesting/featureScope.js.map +1 -1
- package/dist/featureTesting/mapFeatureScope.js +44 -15
- package/dist/featureTesting/mapFeatureScope.js.map +1 -1
- package/dist/featureTesting/objectiveModel.js +15 -11
- package/dist/featureTesting/objectiveModel.js.map +1 -1
- package/dist/featureTesting/resultMerge.js +16 -8
- package/dist/featureTesting/resultMerge.js.map +1 -1
- package/dist/featureTesting/sources.js +8 -5
- package/dist/featureTesting/sources.js.map +1 -1
- package/dist/featureTesting/suiteBridge.js +8 -2
- package/dist/featureTesting/suiteBridge.js.map +1 -1
- package/dist/featureTesting/synonyms.js +32 -4
- package/dist/featureTesting/synonyms.js.map +1 -1
- package/dist/featureTesting/testCaseFactory.js +27 -15
- package/dist/featureTesting/testCaseFactory.js.map +1 -1
- package/dist/featureTesting/testPlan.js +34 -12
- package/dist/featureTesting/testPlan.js.map +1 -1
- package/dist/firstRun/authStateMachine.js +1 -1
- package/dist/firstRun/authStateMachine.js.map +1 -1
- package/dist/firstRun/classifyScreen.js +9 -6
- package/dist/firstRun/classifyScreen.js.map +1 -1
- package/dist/firstRun/firstRunPlanner.js +16 -13
- package/dist/firstRun/firstRunPlanner.js.map +1 -1
- package/dist/firstRun/firstRunRunner.js +92 -31
- package/dist/firstRun/firstRunRunner.js.map +1 -1
- package/dist/firstRun/generatedDataPolicy.js +25 -15
- package/dist/firstRun/generatedDataPolicy.js.map +1 -1
- package/dist/firstRun/inputPlanner.js +45 -11
- package/dist/firstRun/inputPlanner.js.map +1 -1
- package/dist/firstRun/onboardingStateMachine.js +1 -1
- package/dist/firstRun/onboardingStateMachine.js.map +1 -1
- package/dist/firstRun/paywallPolicy.js +3 -3
- package/dist/firstRun/paywallPolicy.js.map +1 -1
- package/dist/firstRun/types.js +1 -1
- package/dist/firstRun/types.js.map +1 -1
- package/dist/fixtures/catalog.js +72 -9
- package/dist/fixtures/catalog.js.map +1 -1
- package/dist/fixtures/load.js +50 -0
- package/dist/fixtures/load.js.map +1 -0
- package/dist/flows/discover.js +2 -2
- package/dist/flows/discover.js.map +1 -1
- package/dist/flows/generate.js +68 -17
- package/dist/flows/generate.js.map +1 -1
- package/dist/flows/lint.js +88 -14
- package/dist/flows/lint.js.map +1 -1
- package/dist/flows/pack.js +21 -5
- package/dist/flows/pack.js.map +1 -1
- package/dist/flows/paths.js +57 -0
- package/dist/flows/paths.js.map +1 -0
- package/dist/flows/repair.js +176 -37
- package/dist/flows/repair.js.map +1 -1
- package/dist/flows/run.js +308 -99
- package/dist/flows/run.js.map +1 -1
- package/dist/flows/schema.js +107 -25
- package/dist/flows/schema.js.map +1 -1
- package/dist/flows/seedExec.js +8 -4
- package/dist/flows/seedExec.js.map +1 -1
- package/dist/flows/templates.js +5 -5
- package/dist/index.js +50 -8
- package/dist/index.js.map +1 -1
- package/dist/ios/signing.js +32 -3
- package/dist/ios/signing.js.map +1 -1
- package/dist/issues/classify.js +28 -20
- package/dist/issues/classify.js.map +1 -1
- package/dist/issues/fingerprint.js +35 -9
- package/dist/issues/fingerprint.js.map +1 -1
- package/dist/issues/index.js +93 -46
- package/dist/issues/index.js.map +1 -1
- package/dist/issues/metrics.js +6 -5
- package/dist/issues/metrics.js.map +1 -1
- package/dist/issues/recurrence.js +35 -8
- package/dist/issues/recurrence.js.map +1 -1
- package/dist/issues/report.js +12 -8
- package/dist/issues/report.js.map +1 -1
- package/dist/issues/reportBridge.js +40 -9
- package/dist/issues/reportBridge.js.map +1 -1
- package/dist/issues/schema.js +2 -2
- package/dist/issues/schema.js.map +1 -1
- package/dist/issues/sourceRevision.js +2 -2
- package/dist/issues/sourceRevision.js.map +1 -1
- package/dist/issues/store.js +110 -32
- package/dist/issues/store.js.map +1 -1
- package/dist/lib/abortScope.js +48 -0
- package/dist/lib/abortScope.js.map +1 -0
- package/dist/lib/android.js +84 -8
- package/dist/lib/android.js.map +1 -1
- package/dist/lib/coordSpace.js +1 -1
- package/dist/lib/coordSpace.js.map +1 -1
- package/dist/lib/device.js +53 -12
- package/dist/lib/device.js.map +1 -1
- package/dist/lib/gestures.js +141 -0
- package/dist/lib/gestures.js.map +1 -0
- package/dist/lib/gitignore.js +4 -3
- package/dist/lib/gitignore.js.map +1 -1
- package/dist/lib/image.js +12 -3
- package/dist/lib/image.js.map +1 -1
- package/dist/lib/lockfile.js +399 -0
- package/dist/lib/lockfile.js.map +1 -0
- package/dist/lib/needsInput.js +9 -6
- package/dist/lib/needsInput.js.map +1 -1
- package/dist/lib/png.js +4 -3
- package/dist/lib/png.js.map +1 -1
- package/dist/lib/redact.js +170 -9
- package/dist/lib/redact.js.map +1 -1
- package/dist/lib/result.js +94 -10
- package/dist/lib/result.js.map +1 -1
- package/dist/lib/schemaHash.js +7 -5
- package/dist/lib/schemaHash.js.map +1 -1
- package/dist/lib/sensitive.js +6 -3
- package/dist/lib/sensitive.js.map +1 -1
- package/dist/lib/simctl.js +3 -3
- package/dist/lib/simctl.js.map +1 -1
- package/dist/lib/spawn.js +78 -17
- package/dist/lib/spawn.js.map +1 -1
- package/dist/lib/toolAnnotations.js +114 -0
- package/dist/lib/toolAnnotations.js.map +1 -0
- package/dist/lib/wda.js +321 -25
- package/dist/lib/wda.js.map +1 -1
- package/dist/lib/wdaConfig.js +12 -5
- package/dist/lib/wdaConfig.js.map +1 -1
- package/dist/lib/wdaTune.js +52 -23
- package/dist/lib/wdaTune.js.map +1 -1
- package/dist/mobileAudit/checks.js +150 -28
- package/dist/mobileAudit/checks.js.map +1 -1
- package/dist/mobileAudit/evidence.js +4 -4
- package/dist/mobileAudit/evidence.js.map +1 -1
- package/dist/mobileAudit/profiles.js +121 -20
- package/dist/mobileAudit/profiles.js.map +1 -1
- package/dist/mobileAudit/results.js +9 -4
- package/dist/mobileAudit/results.js.map +1 -1
- package/dist/mobileAudit/runner.js +214 -35
- package/dist/mobileAudit/runner.js.map +1 -1
- package/dist/oracle/auth.js +1 -1
- package/dist/oracle/auth.js.map +1 -1
- package/dist/oracle/failures.js +1085 -145
- package/dist/oracle/failures.js.map +1 -1
- package/dist/oracle/health.js +148 -26
- package/dist/oracle/health.js.map +1 -1
- package/dist/oracle/locator.js +148 -19
- package/dist/oracle/locator.js.map +1 -1
- package/dist/oracle/record.js +3 -3
- package/dist/oracle/record.js.map +1 -1
- package/dist/orchestration/envelope.js +2 -2
- package/dist/orchestration/envelope.js.map +1 -1
- package/dist/orchestration/goal.js +7 -13
- package/dist/orchestration/goal.js.map +1 -1
- package/dist/orchestration/testThis/execute.js +167 -0
- package/dist/orchestration/testThis/execute.js.map +1 -0
- package/dist/orchestration/testThis/pipeline.js +413 -0
- package/dist/orchestration/testThis/pipeline.js.map +1 -0
- package/dist/orchestration/testThis/plan.js +519 -0
- package/dist/orchestration/testThis/plan.js.map +1 -0
- package/dist/orchestration/testThis/sessionIntent.js +72 -0
- package/dist/orchestration/testThis/sessionIntent.js.map +1 -0
- package/dist/orchestration/testThis/terminal.js +136 -0
- package/dist/orchestration/testThis/terminal.js.map +1 -0
- package/dist/orchestration/testThis/types.js +12 -0
- package/dist/orchestration/testThis/types.js.map +1 -0
- package/dist/plan/plan.js +9 -9
- package/dist/plan/plan.js.map +1 -1
- package/dist/prompts/index.js +24 -24
- package/dist/prompts/index.js.map +1 -1
- package/dist/report/coverage.js +0 -1
- package/dist/report/coverage.js.map +1 -1
- package/dist/report/evidence.js.map +1 -1
- package/dist/report/export.js +449 -72
- package/dist/report/export.js.map +1 -1
- package/dist/report/findingsDedupe.js +41 -0
- package/dist/report/findingsDedupe.js.map +1 -0
- package/dist/report/flake.js +13 -14
- package/dist/report/flake.js.map +1 -1
- package/dist/report/history.js +72 -38
- package/dist/report/history.js.map +1 -1
- package/dist/report/policy.js +18 -7
- package/dist/report/policy.js.map +1 -1
- package/dist/report/qaLevel.js +10 -16
- package/dist/report/qaLevel.js.map +1 -1
- package/dist/report/readiness.js +42 -12
- package/dist/report/readiness.js.map +1 -1
- package/dist/report/sarifSources.js +160 -0
- package/dist/report/sarifSources.js.map +1 -0
- package/dist/report/summary.js +2 -2
- package/dist/report/summary.js.map +1 -1
- package/dist/report/testCatalog.js +4 -4
- package/dist/report/testCatalog.js.map +1 -1
- package/dist/report/timing.js +23 -23
- package/dist/report/timing.js.map +1 -1
- package/dist/report/toolHealth.js +124 -0
- package/dist/report/toolHealth.js.map +1 -0
- package/dist/server.js +501 -69
- package/dist/server.js.map +1 -1
- package/dist/services/automationGenerate.js +8 -2
- package/dist/services/automationGenerate.js.map +1 -1
- package/dist/services/build.js +10 -4
- package/dist/services/build.js.map +1 -1
- package/dist/services/flowGenerate.js +75 -0
- package/dist/services/flowGenerate.js.map +1 -0
- package/dist/services/preflight.js +40 -8
- package/dist/services/preflight.js.map +1 -1
- package/dist/services/prepareAndroid.js +92 -18
- package/dist/services/prepareAndroid.js.map +1 -1
- package/dist/services/prepareIos.js +94 -17
- package/dist/services/prepareIos.js.map +1 -1
- package/dist/services/report.js +271 -80
- package/dist/services/report.js.map +1 -1
- package/dist/services/smoke.js +68 -22
- package/dist/services/smoke.js.map +1 -1
- package/dist/services/suiteGenerate.js +43 -6
- package/dist/services/suiteGenerate.js.map +1 -1
- package/dist/services/testSuiteKnowledge.js +78 -33
- package/dist/services/testSuiteKnowledge.js.map +1 -1
- package/dist/session/attach.js +284 -4
- package/dist/session/attach.js.map +1 -1
- package/dist/session/processRegistry.js +433 -0
- package/dist/session/processRegistry.js.map +1 -0
- package/dist/session/progress.js +1 -1
- package/dist/session/progress.js.map +1 -1
- package/dist/session/retention.js +201 -0
- package/dist/session/retention.js.map +1 -0
- package/dist/session/store.js +459 -59
- package/dist/session/store.js.map +1 -1
- package/dist/snapshot/overlays.js +60 -10
- package/dist/snapshot/overlays.js.map +1 -1
- package/dist/snapshot/parse.js +30 -12
- package/dist/snapshot/parse.js.map +1 -1
- package/dist/snapshot/present.js +36 -6
- package/dist/snapshot/present.js.map +1 -1
- package/dist/snapshot/settle.js +39 -9
- package/dist/snapshot/settle.js.map +1 -1
- package/dist/state/consent.js +99 -0
- package/dist/state/consent.js.map +1 -0
- package/dist/state/profile.js +82 -11
- package/dist/state/profile.js.map +1 -1
- package/dist/suite/compile.js +15 -6
- package/dist/suite/compile.js.map +1 -1
- package/dist/suite/lint.js +22 -4
- package/dist/suite/lint.js.map +1 -1
- package/dist/suite/pom.js +75 -44
- package/dist/suite/pom.js.map +1 -1
- package/dist/suite/secretGuard.js +266 -0
- package/dist/suite/secretGuard.js.map +1 -0
- package/dist/suite/testcase.js +15 -11
- package/dist/suite/testcase.js.map +1 -1
- package/dist/testSuite/exporter.js +7 -3
- package/dist/testSuite/exporter.js.map +1 -1
- package/dist/testSuite/generator.js +43 -14
- package/dist/testSuite/generator.js.map +1 -1
- package/dist/testSuite/history.js +1 -1
- package/dist/testSuite/history.js.map +1 -1
- package/dist/testSuite/issueLinks.js +3 -3
- package/dist/testSuite/issueLinks.js.map +1 -1
- package/dist/testSuite/lint.js +4 -4
- package/dist/testSuite/lint.js.map +1 -1
- package/dist/testSuite/merge.js +13 -7
- package/dist/testSuite/merge.js.map +1 -1
- package/dist/testSuite/schema.js +21 -16
- package/dist/testSuite/schema.js.map +1 -1
- package/dist/testSuite/store.js +12 -4
- package/dist/testSuite/store.js.map +1 -1
- package/dist/testSuite/traceability.js +2 -2
- package/dist/testSuite/traceability.js.map +1 -1
- package/dist/tools/act.js +868 -174
- package/dist/tools/act.js.map +1 -1
- package/dist/tools/agent.js +521 -112
- package/dist/tools/agent.js.map +1 -1
- package/dist/tools/appControl.js +82 -19
- package/dist/tools/appControl.js.map +1 -1
- package/dist/tools/appMap.js +393 -189
- package/dist/tools/appMap.js.map +1 -1
- package/dist/tools/build.js +92 -51
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/bundletool.js +141 -40
- package/dist/tools/bundletool.js.map +1 -1
- package/dist/tools/clearOverlay.js +98 -18
- package/dist/tools/clearOverlay.js.map +1 -1
- package/dist/tools/device.js +108 -19
- package/dist/tools/device.js.map +1 -1
- package/dist/tools/doctor.js +98 -35
- package/dist/tools/doctor.js.map +1 -1
- package/dist/tools/explore.js +110 -42
- package/dist/tools/explore.js.map +1 -1
- package/dist/tools/featureTesting.js +152 -130
- package/dist/tools/featureTesting.js.map +1 -1
- package/dist/tools/firstRun.js +94 -66
- package/dist/tools/firstRun.js.map +1 -1
- package/dist/tools/flow.js +347 -132
- package/dist/tools/flow.js.map +1 -1
- package/dist/tools/flowRepair.js +42 -10
- package/dist/tools/flowRepair.js.map +1 -1
- package/dist/tools/generate.js +199 -0
- package/dist/tools/generate.js.map +1 -0
- package/dist/tools/getArtifact.js +37 -8
- package/dist/tools/getArtifact.js.map +1 -1
- package/dist/tools/health.js +17 -12
- package/dist/tools/health.js.map +1 -1
- package/dist/tools/ios.js +148 -194
- package/dist/tools/ios.js.map +1 -1
- package/dist/tools/issues.js +256 -171
- package/dist/tools/issues.js.map +1 -1
- package/dist/tools/jobs.js +55 -11
- package/dist/tools/jobs.js.map +1 -1
- package/dist/tools/metro.js +84 -38
- package/dist/tools/metro.js.map +1 -1
- package/dist/tools/mobileAudit.js +83 -26
- package/dist/tools/mobileAudit.js.map +1 -1
- package/dist/tools/network.js +36 -14
- package/dist/tools/network.js.map +1 -1
- package/dist/tools/note.js +31 -17
- package/dist/tools/note.js.map +1 -1
- package/dist/tools/prepareIosTarget.js +31 -14
- package/dist/tools/prepareIosTarget.js.map +1 -1
- package/dist/tools/prepareTarget.js +193 -47
- package/dist/tools/prepareTarget.js.map +1 -1
- package/dist/tools/report.js +16 -8
- package/dist/tools/report.js.map +1 -1
- package/dist/tools/resolveArtifact.js +12 -12
- package/dist/tools/resolveArtifact.js.map +1 -1
- package/dist/tools/resolveTarget.js +81 -18
- package/dist/tools/resolveTarget.js.map +1 -1
- package/dist/tools/screenRecord.js +85 -20
- package/dist/tools/screenRecord.js.map +1 -1
- package/dist/tools/screenshot.js +42 -18
- package/dist/tools/screenshot.js.map +1 -1
- package/dist/tools/smoke.js +29 -12
- package/dist/tools/smoke.js.map +1 -1
- package/dist/tools/snapshot.js +157 -107
- package/dist/tools/snapshot.js.map +1 -1
- package/dist/tools/startSession.js +117 -84
- package/dist/tools/startSession.js.map +1 -1
- package/dist/tools/suite.js +391 -310
- package/dist/tools/suite.js.map +1 -1
- package/dist/tools/testSuite.js +112 -36
- package/dist/tools/testSuite.js.map +1 -1
- package/dist/tools/testThis.js +35 -802
- package/dist/tools/testThis.js.map +1 -1
- package/dist/tools/visual.js +698 -116
- package/dist/tools/visual.js.map +1 -1
- package/dist/tools/wait.js +9 -23
- package/dist/tools/wait.js.map +1 -1
- package/dist/tools/wda.js +312 -54
- package/dist/tools/wda.js.map +1 -1
- package/dist/version.js +37 -64
- package/dist/version.js.map +1 -1
- package/dist/visual/ocr.js +65 -8
- package/dist/visual/ocr.js.map +1 -1
- package/dist/visual/provider.js +87 -15
- package/dist/visual/provider.js.map +1 -1
- package/docs/README.md +24 -10
- package/docs/ci-reports.md +328 -0
- package/docs/concepts.md +227 -0
- package/docs/flows.md +153 -0
- package/docs/mcp-server.md +210 -104
- package/docs/physical-devices.md +84 -0
- package/docs/tools.md +808 -217
- package/package.json +16 -6
- package/dist/appMap/diff.js +0 -60
- package/dist/appMap/diff.js.map +0 -1
- package/dist/automation/maestroIr.js +0 -282
- package/dist/automation/maestroIr.js.map +0 -1
- package/dist/interop/maestro.js +0 -151
- package/dist/interop/maestro.js.map +0 -1
- package/dist/tools/assertVisual.js +0 -74
- package/dist/tools/assertVisual.js.map +0 -1
- package/dist/tools/automationGenerate.js +0 -394
- package/dist/tools/automationGenerate.js.map +0 -1
- package/dist/tools/capabilities.js +0 -209
- package/dist/tools/capabilities.js.map +0 -1
- package/dist/tools/detectContext.js +0 -41
- package/dist/tools/detectContext.js.map +0 -1
- package/dist/tools/flowGenerate.js +0 -55
- package/dist/tools/flowGenerate.js.map +0 -1
- package/dist/tools/history.js +0 -56
- package/dist/tools/history.js.map +0 -1
- package/dist/tools/idling.js +0 -104
- package/dist/tools/idling.js.map +0 -1
- package/dist/tools/inputCapabilities.js +0 -30
- package/dist/tools/inputCapabilities.js.map +0 -1
- package/dist/tools/locator.js +0 -57
- package/dist/tools/locator.js.map +0 -1
- package/dist/tools/maestro.js +0 -78
- package/dist/tools/maestro.js.map +0 -1
- package/dist/tools/permissions.js +0 -149
- package/dist/tools/permissions.js.map +0 -1
- package/dist/tools/plan.js +0 -49
- package/dist/tools/plan.js.map +0 -1
- package/dist/tools/screenInfo.js +0 -70
- package/dist/tools/screenInfo.js.map +0 -1
- package/dist/tools/seed.js +0 -101
- package/dist/tools/seed.js.map +0 -1
- package/dist/tools/state.js +0 -170
- package/dist/tools/state.js.map +0 -1
- package/dist/tools/visualText.js +0 -61
- package/dist/tools/visualText.js.map +0 -1
package/dist/tools/bundletool.js
CHANGED
|
@@ -1,55 +1,69 @@
|
|
|
1
|
-
// qa_bundletool (hardening P0.2)
|
|
1
|
+
// qa_bundletool (hardening P0.2): convert an .aab to an installable universal .apk via bundletool,
|
|
2
2
|
// cached under .swipium/artifacts/. Runs as a job (conversion can take a minute). Returns a typed
|
|
3
3
|
// AAB_NEEDS_BUNDLETOOL / AAB_BUILD_APKS_FAILED blocker when it cannot, never a generic error.
|
|
4
4
|
import { z } from 'zod';
|
|
5
|
-
import { qaOk,
|
|
5
|
+
import { qaOk, unknownSessionError } from '../lib/result.js';
|
|
6
6
|
import { qaFail } from '../oracle/failures.js';
|
|
7
7
|
import { requireConsent, consumeConsent } from '../consent/consent.js';
|
|
8
8
|
import { resolveArtifact } from '../artifacts/resolve.js';
|
|
9
9
|
import { convertAabToApk, findBundletool, buildAndInstallApkSet } from '../artifacts/bundletool.js';
|
|
10
10
|
import { startProgress } from '../session/progress.js';
|
|
11
11
|
import { log } from '../lib/logger.js';
|
|
12
|
+
import { runWithSignal } from '../lib/abortScope.js';
|
|
12
13
|
export function registerBundletool(server, sessions) {
|
|
13
14
|
server.registerTool('qa_bundletool', {
|
|
14
|
-
title: 'Convert .aab
|
|
15
|
-
description: 'Convert an
|
|
15
|
+
title: 'Convert .aab > installable .apk',
|
|
16
|
+
description: 'Convert an .aab (not directly installable) into an installable APK with bundletool, cached under .swipium/artifacts/, before ' +
|
|
17
|
+
'qa_prepare_target. Default: a universal .apk (debug keystore). connectedDevice:true builds a device-specific APK set; ' +
|
|
18
|
+
'install:true also installs it (consent-gated). Runs as a job; typed blockers (BUNDLETOOL_MISSING, AAB_BUILD_APKS_FAILED, …).',
|
|
16
19
|
inputSchema: {
|
|
17
20
|
sessionId: z.string(),
|
|
18
|
-
aab: z.string().optional().describe('
|
|
19
|
-
force: z.boolean().optional().describe('Rebuild even if
|
|
20
|
-
connectedDevice: z.boolean().optional().describe('
|
|
21
|
-
install: z.boolean().optional().describe('With connectedDevice
|
|
22
|
-
|
|
21
|
+
aab: z.string().optional().describe('Default: the best .aab in the project.'),
|
|
22
|
+
force: z.boolean().optional().describe('Rebuild even if cached.'),
|
|
23
|
+
connectedDevice: z.boolean().optional().describe('Device-specific APK set (--connected-device).'),
|
|
24
|
+
install: z.boolean().optional().describe('With connectedDevice: install-apks on the device (consent-gated).'),
|
|
25
|
+
device: z.string().optional().describe('adb serial (default: the only connected device).'),
|
|
23
26
|
consentId: z.string().optional(),
|
|
24
27
|
approve: z.boolean().optional(),
|
|
25
28
|
},
|
|
26
|
-
}, async ({ sessionId, aab, force, connectedDevice, install,
|
|
29
|
+
}, async ({ sessionId, aab, force, connectedDevice, install, device, consentId, approve }) => {
|
|
27
30
|
const session = sessions.get(sessionId);
|
|
28
31
|
if (!session)
|
|
29
|
-
return
|
|
32
|
+
return unknownSessionError(sessionId);
|
|
30
33
|
// Resolve the .aab if not given.
|
|
31
34
|
let aabPath = aab;
|
|
32
35
|
if (!aabPath) {
|
|
33
36
|
const r = await resolveArtifact({ projectRoot: session.root, platform: 'android' }, false);
|
|
34
37
|
const found = [r.best, ...r.candidates].find((c) => c?.type === 'aab');
|
|
35
38
|
if (!found)
|
|
36
|
-
return qaFail('NO_BUILD_ARTIFACT', {
|
|
39
|
+
return qaFail('NO_BUILD_ARTIFACT', {
|
|
40
|
+
what: 'No .aab found to convert',
|
|
41
|
+
nextSteps: ['Pass aab=, or build an APK directly with qa_build.'],
|
|
42
|
+
});
|
|
37
43
|
aabPath = found.path;
|
|
38
44
|
}
|
|
39
|
-
// Installing an APK set runs app code on a real device/emulator
|
|
45
|
+
// Installing an APK set runs app code on a real device/emulator, so it's consent-gated (build-only
|
|
40
46
|
// is safe and ungated). Confirm intent BEFORE any work, regardless of whether bundletool is
|
|
41
|
-
// installed. Mirrors qa_prepare_target /
|
|
47
|
+
// installed. Mirrors qa_prepare_target / qa_prepare_ios_target.
|
|
42
48
|
let mutationConsent;
|
|
43
49
|
if (connectedDevice && install) {
|
|
44
|
-
const affects = { aab: aabPath, device:
|
|
50
|
+
const affects = { aab: aabPath, device: device ?? '(only connected device)' };
|
|
45
51
|
const gate = consumeConsent(consentId, approve, { action: 'install_app', affects });
|
|
46
52
|
if (!gate.approved) {
|
|
47
|
-
sessions.recordMutation(session, {
|
|
53
|
+
sessions.recordMutation(session, {
|
|
54
|
+
tool: 'qa_bundletool',
|
|
55
|
+
action: 'install_app',
|
|
56
|
+
risk: 'medium',
|
|
57
|
+
target: affects,
|
|
58
|
+
consent: { required: true, approved: false },
|
|
59
|
+
status: 'requested',
|
|
60
|
+
});
|
|
48
61
|
return requireConsent({
|
|
49
|
-
action: 'install_app',
|
|
50
|
-
|
|
62
|
+
action: 'install_app',
|
|
63
|
+
risk: 'medium',
|
|
64
|
+
exactCommand: `bundletool build-apks --connected-device${device ? ` --device-id ${device}` : ''} --bundle ${aabPath} && bundletool install-apks --apks <set>`,
|
|
51
65
|
affects,
|
|
52
|
-
explain: `Build a device-specific APK set from ${aabPath} and INSTALL it on ${
|
|
66
|
+
explain: `Build a device-specific APK set from ${aabPath} and INSTALL it on ${device ?? 'the connected device'}? It pushes app code to the device.`,
|
|
53
67
|
});
|
|
54
68
|
}
|
|
55
69
|
mutationConsent = { required: true, consentId, approved: true };
|
|
@@ -58,7 +72,7 @@ export function registerBundletool(server, sessions) {
|
|
|
58
72
|
const launcher = await findBundletool();
|
|
59
73
|
if (!launcher) {
|
|
60
74
|
return qaFail('AAB_NEEDS_BUNDLETOOL', {
|
|
61
|
-
what: `bundletool is not installed
|
|
75
|
+
what: `bundletool is not installed, cannot convert ${aabPath}`,
|
|
62
76
|
nextSteps: [
|
|
63
77
|
'Install bundletool (brew install bundletool) or set $BUNDLETOOL_JAR to bundletool.jar.',
|
|
64
78
|
'Or build an APK directly: qa_build { platform: "android", variant: "debug" } (./gradlew assembleDebug).',
|
|
@@ -68,38 +82,94 @@ export function registerBundletool(server, sessions) {
|
|
|
68
82
|
}
|
|
69
83
|
const job = sessions.createJob(session, 'bundletool:convert');
|
|
70
84
|
if (connectedDevice) {
|
|
71
|
-
|
|
72
|
-
|
|
85
|
+
// Jobs run in their own cancellation scope (abortScope), not the starting call's.
|
|
86
|
+
void runWithSignal(sessions.abortSignal(session, job.jobId), () => runDeviceApkSet(sessions, session, job, aabPath, { install: !!install, deviceId: device, force: !!force, mutationConsent }));
|
|
87
|
+
return qaOk({
|
|
88
|
+
jobId: job.jobId,
|
|
89
|
+
status: 'running',
|
|
90
|
+
kind: job.kind,
|
|
91
|
+
aab: aabPath,
|
|
92
|
+
mode: 'connected-device',
|
|
93
|
+
install: !!install,
|
|
94
|
+
bundletool: launcher.describe,
|
|
95
|
+
}, `Building${install ? ' + installing' : ''} a device-specific APK set from ${aabPath} as job ${job.jobId} (${launcher.describe}). Poll qa_job_status.`);
|
|
73
96
|
}
|
|
74
|
-
void runConvert(sessions, session, job, aabPath, !!force);
|
|
75
|
-
return qaOk({ jobId: job.jobId, status: 'running', kind: job.kind, aab: aabPath, mode: 'universal', bundletool: launcher.describe }, `Converting ${aabPath}
|
|
97
|
+
void runWithSignal(sessions.abortSignal(session, job.jobId), () => runConvert(sessions, session, job, aabPath, !!force));
|
|
98
|
+
return qaOk({ jobId: job.jobId, status: 'running', kind: job.kind, aab: aabPath, mode: 'universal', bundletool: launcher.describe }, `Converting ${aabPath} > universal APK as job ${job.jobId} (${launcher.describe}). Poll qa_job_status.`);
|
|
76
99
|
});
|
|
77
100
|
}
|
|
78
101
|
async function runDeviceApkSet(sessions, session, job, aabPath, opts) {
|
|
79
102
|
const signal = sessions.abortSignal(session, job.jobId);
|
|
80
103
|
const upd = (patch) => sessions.updateJobIfRunning(session, job, patch);
|
|
81
|
-
const prog = startProgress(sessions, session, job, 'building_apk_set', {
|
|
104
|
+
const prog = startProgress(sessions, session, job, 'building_apk_set', {
|
|
105
|
+
statusText: 'Building a device-specific APK set with bundletool --connected-device.',
|
|
106
|
+
nextExpected: opts.install ? 'Install the APK set on the device.' : 'Cache the APK set.',
|
|
107
|
+
});
|
|
82
108
|
try {
|
|
83
|
-
const result = await buildAndInstallApkSet(aabPath, session.root, {
|
|
109
|
+
const result = await buildAndInstallApkSet(aabPath, session.root, {
|
|
110
|
+
deviceId: opts.deviceId,
|
|
111
|
+
install: opts.install,
|
|
112
|
+
signal,
|
|
113
|
+
force: opts.force,
|
|
114
|
+
});
|
|
84
115
|
if (signal?.aborted)
|
|
85
116
|
return;
|
|
86
|
-
const logUri = result.logText
|
|
117
|
+
const logUri = result.logText
|
|
118
|
+
? sessions.saveArtifact(session, 'logs', `bundletool-apks-${job.jobId}.log`, result.logText, 'text/plain', 'bundletool device APK set log')
|
|
119
|
+
: undefined;
|
|
87
120
|
if (!result.ok) {
|
|
88
121
|
if (opts.install) {
|
|
89
|
-
sessions.recordMutation(session, {
|
|
122
|
+
sessions.recordMutation(session, {
|
|
123
|
+
tool: 'qa_bundletool',
|
|
124
|
+
action: 'install_app',
|
|
125
|
+
risk: 'medium',
|
|
126
|
+
target: { aab: aabPath, device: opts.deviceId ?? null, apksPath: result.apksPath ?? null },
|
|
127
|
+
consent: opts.mutationConsent ?? { required: true, approved: true },
|
|
128
|
+
status: 'blocked',
|
|
129
|
+
detail: `${result.failureCode}: ${result.error}`,
|
|
130
|
+
});
|
|
90
131
|
}
|
|
91
|
-
upd({
|
|
132
|
+
upd({
|
|
133
|
+
status: 'failed',
|
|
134
|
+
error: `${result.failureCode}: ${result.error}`,
|
|
135
|
+
result: {
|
|
136
|
+
failureCode: result.failureCode,
|
|
137
|
+
apksPath: result.apksPath ?? null,
|
|
138
|
+
command: result.buildCommand ?? null,
|
|
139
|
+
logUri,
|
|
140
|
+
aab: aabPath,
|
|
141
|
+
},
|
|
142
|
+
resultText: `❌ ${result.failureCode}: ${result.error}`,
|
|
143
|
+
endedAt: Date.now(),
|
|
144
|
+
});
|
|
92
145
|
return;
|
|
93
146
|
}
|
|
94
147
|
if (result.installed) {
|
|
95
148
|
sessions.addEnvChange(session, `installed APK set from ${aabPath} on ${opts.deviceId ?? 'connected device'}`);
|
|
96
|
-
sessions.recordMutation(session, {
|
|
149
|
+
sessions.recordMutation(session, {
|
|
150
|
+
tool: 'qa_bundletool',
|
|
151
|
+
action: 'install_app',
|
|
152
|
+
risk: 'medium',
|
|
153
|
+
target: { aab: aabPath, device: opts.deviceId ?? null, apksPath: result.apksPath ?? null },
|
|
154
|
+
consent: opts.mutationConsent ?? { required: true, approved: true },
|
|
155
|
+
status: 'executed',
|
|
156
|
+
});
|
|
97
157
|
}
|
|
98
158
|
prog.done(result.installed ? 'Device APK set built + installed.' : 'Device APK set built.');
|
|
99
159
|
sessions.addWorkaround(session, `built device-specific APK set via bundletool${result.installed ? ' + installed' : ''}`);
|
|
100
160
|
upd({
|
|
101
|
-
status: 'done',
|
|
102
|
-
|
|
161
|
+
status: 'done',
|
|
162
|
+
progress: 'done',
|
|
163
|
+
result: {
|
|
164
|
+
converted: true,
|
|
165
|
+
mode: 'connected-device',
|
|
166
|
+
installed: !!result.installed,
|
|
167
|
+
originalArtifact: aabPath,
|
|
168
|
+
apksPath: result.apksPath ?? null,
|
|
169
|
+
buildCommand: result.buildCommand ?? null,
|
|
170
|
+
installCommand: result.installCommand ?? null,
|
|
171
|
+
logUri,
|
|
172
|
+
},
|
|
103
173
|
resultText: result.installed
|
|
104
174
|
? `✅ Device-specific APK set installed from ${aabPath}. The app is on the device; continue with qa_prepare_target { bindOnly: true } or qa_smoke.`
|
|
105
175
|
: `✅ Device-specific APK set: ${result.apksPath}. Install it with qa_bundletool { connectedDevice: true, install: true } or bundletool install-apks.`,
|
|
@@ -110,27 +180,52 @@ async function runDeviceApkSet(sessions, session, job, aabPath, opts) {
|
|
|
110
180
|
if (signal?.aborted)
|
|
111
181
|
return;
|
|
112
182
|
log('error', 'bundletool device APK set job failed', { jobId: job.jobId, err: String(e) });
|
|
113
|
-
upd({
|
|
183
|
+
upd({
|
|
184
|
+
status: 'failed',
|
|
185
|
+
error: String(e),
|
|
186
|
+
result: { failureCode: 'AAB_DEVICE_SPEC_FAILED' },
|
|
187
|
+
resultText: `❌ bundletool error: ${String(e)}`,
|
|
188
|
+
endedAt: Date.now(),
|
|
189
|
+
});
|
|
114
190
|
}
|
|
115
191
|
}
|
|
116
192
|
async function runConvert(sessions, session, job, aabPath, force) {
|
|
117
193
|
const signal = sessions.abortSignal(session, job.jobId);
|
|
118
194
|
const upd = (patch) => sessions.updateJobIfRunning(session, job, patch);
|
|
119
|
-
const prog = startProgress(sessions, session, job, 'converting_aab', {
|
|
195
|
+
const prog = startProgress(sessions, session, job, 'converting_aab', {
|
|
196
|
+
statusText: 'Building a universal APK from the .aab with bundletool.',
|
|
197
|
+
nextExpected: 'Extract universal.apk and cache it.',
|
|
198
|
+
});
|
|
120
199
|
try {
|
|
121
200
|
const result = await convertAabToApk(aabPath, session.root, { signal, force });
|
|
122
201
|
if (signal?.aborted)
|
|
123
202
|
return;
|
|
124
203
|
if (!result.ok) {
|
|
125
|
-
const logUri = result.error
|
|
126
|
-
|
|
204
|
+
const logUri = result.error
|
|
205
|
+
? sessions.saveArtifact(session, 'logs', `bundletool-${Date.now()}.log`, `${result.command ?? ''}\n${result.error}`, 'text/plain', 'bundletool conversion log')
|
|
206
|
+
: undefined;
|
|
207
|
+
upd({
|
|
208
|
+
status: 'failed',
|
|
209
|
+
error: `${result.failureCode}: ${result.error}`,
|
|
210
|
+
result: { failureCode: result.failureCode, command: result.command, logUri, aab: aabPath },
|
|
211
|
+
resultText: `❌ ${result.failureCode}: ${result.error}`,
|
|
212
|
+
endedAt: Date.now(),
|
|
213
|
+
});
|
|
127
214
|
return;
|
|
128
215
|
}
|
|
129
216
|
prog.done('Universal APK ready.');
|
|
130
|
-
sessions.addWorkaround(session, `converted .aab
|
|
217
|
+
sessions.addWorkaround(session, `converted .aab > universal .apk via bundletool (${result.fromCache ? 'cached' : 'built'})`);
|
|
131
218
|
upd({
|
|
132
|
-
status: 'done',
|
|
133
|
-
|
|
219
|
+
status: 'done',
|
|
220
|
+
progress: 'done',
|
|
221
|
+
result: {
|
|
222
|
+
converted: true,
|
|
223
|
+
fromCache: !!result.fromCache,
|
|
224
|
+
originalArtifact: aabPath,
|
|
225
|
+
generatedApk: result.apkPath,
|
|
226
|
+
apksPath: result.apksPath ?? null,
|
|
227
|
+
command: result.command ?? null,
|
|
228
|
+
},
|
|
134
229
|
resultText: `✅ ${result.fromCache ? 'Using cached' : 'Built'} universal APK: ${result.apkPath}. Next: qa_prepare_target { apk: "${result.apkPath}" }.`,
|
|
135
230
|
endedAt: Date.now(),
|
|
136
231
|
});
|
|
@@ -139,7 +234,13 @@ async function runConvert(sessions, session, job, aabPath, force) {
|
|
|
139
234
|
if (signal?.aborted)
|
|
140
235
|
return;
|
|
141
236
|
log('error', 'bundletool job failed', { jobId: job.jobId, err: String(e) });
|
|
142
|
-
upd({
|
|
237
|
+
upd({
|
|
238
|
+
status: 'failed',
|
|
239
|
+
error: String(e),
|
|
240
|
+
result: { failureCode: 'AAB_BUILD_APKS_FAILED' },
|
|
241
|
+
resultText: `❌ bundletool error: ${String(e)}`,
|
|
242
|
+
endedAt: Date.now(),
|
|
243
|
+
});
|
|
143
244
|
}
|
|
144
245
|
}
|
|
145
246
|
//# sourceMappingURL=bundletool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundletool.js","sourceRoot":"","sources":["../../src/tools/bundletool.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"bundletool.js","sourceRoot":"","sources":["../../src/tools/bundletool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,23 @@
|
|
|
1
|
-
// qa_clear_overlay
|
|
1
|
+
// qa_clear_overlay: clear common overlays so a covered CTA becomes tappable (Phase 2 CR5).
|
|
2
2
|
// Strategies: auto | hide_keyboard | press_back | tap_outside | minimize_logbox |
|
|
3
3
|
// dismiss_logbox | allow_permission | deny_permission | dismiss_toast_if_possible.
|
|
4
4
|
import { z } from 'zod';
|
|
5
|
-
import { qaOk, qaError } from '../lib/result.js';
|
|
6
|
-
import { getDriver } from '../session/attach.js';
|
|
5
|
+
import { qaOk, qaError, unknownSessionError } from '../lib/result.js';
|
|
6
|
+
import { blockedDeviceResult, getDriver } from '../session/attach.js';
|
|
7
7
|
import { parseSnapshot, boundsContain } from '../snapshot/parse.js';
|
|
8
8
|
import { detectTreeOverlays, classifyForeground, obstructionAt } from '../snapshot/overlays.js';
|
|
9
|
-
|
|
9
|
+
import { classifyFlowDriverError } from '../flows/run.js';
|
|
10
|
+
const STRATEGIES = [
|
|
11
|
+
'auto',
|
|
12
|
+
'hide_keyboard',
|
|
13
|
+
'press_back',
|
|
14
|
+
'tap_outside',
|
|
15
|
+
'minimize_logbox',
|
|
16
|
+
'dismiss_logbox',
|
|
17
|
+
'allow_permission',
|
|
18
|
+
'deny_permission',
|
|
19
|
+
'dismiss_toast_if_possible',
|
|
20
|
+
];
|
|
10
21
|
const center = (b) => ({ x: Math.round((b[0] + b[2]) / 2), y: Math.round((b[1] + b[3]) / 2) });
|
|
11
22
|
async function safe(fn, fallback) {
|
|
12
23
|
try {
|
|
@@ -39,7 +50,9 @@ async function handleNativeAlert(d, action) {
|
|
|
39
50
|
export function registerClearOverlay(server, sessions) {
|
|
40
51
|
server.registerTool('qa_clear_overlay', {
|
|
41
52
|
title: 'Clear an overlay',
|
|
42
|
-
description: 'Clear
|
|
53
|
+
description: 'Clear what blocks the screen: auto (topmost), hide_keyboard, press_back, tap_outside, minimize_logbox / dismiss_logbox ' +
|
|
54
|
+
'(RN), allow_permission / deny_permission, dismiss_toast_if_possible. targetRef reports whether that element was ' +
|
|
55
|
+
'obstructed before/after. Returns what was cleared and what remains.',
|
|
43
56
|
inputSchema: {
|
|
44
57
|
sessionId: z.string(),
|
|
45
58
|
strategy: z.enum(STRATEGIES).optional().describe('default "auto"'),
|
|
@@ -47,9 +60,18 @@ export function registerClearOverlay(server, sessions) {
|
|
|
47
60
|
},
|
|
48
61
|
}, async ({ sessionId, strategy = 'auto', targetRef }) => {
|
|
49
62
|
const session = sessions.get(sessionId);
|
|
50
|
-
|
|
63
|
+
if (!session)
|
|
64
|
+
return unknownSessionError(sessionId);
|
|
65
|
+
const { driver: d, blocked } = await getDriver(session);
|
|
51
66
|
if (!session || !d) {
|
|
52
|
-
return
|
|
67
|
+
return (blockedDeviceResult(blocked) ??
|
|
68
|
+
qaError({
|
|
69
|
+
what: 'No device attached',
|
|
70
|
+
changedState: false,
|
|
71
|
+
retrySafe: true,
|
|
72
|
+
failureCode: 'NO_DEVICE',
|
|
73
|
+
nextSteps: ['Call qa_prepare_target first.'],
|
|
74
|
+
}));
|
|
53
75
|
}
|
|
54
76
|
const obstructionFor = async () => {
|
|
55
77
|
if (!targetRef)
|
|
@@ -67,7 +89,8 @@ export function registerClearOverlay(server, sessions) {
|
|
|
67
89
|
return { obstructed: false };
|
|
68
90
|
const c = center(node.bounds);
|
|
69
91
|
// re-resolve the target in the FRESH tree by matching bounds/id
|
|
70
|
-
const fresh = parsed.allNodes.find((x) => x.id && node.id && x.id === node.id) ??
|
|
92
|
+
const fresh = parsed.allNodes.find((x) => x.id && node.id && x.id === node.id) ??
|
|
93
|
+
parsed.allNodes.find((x) => boundsContain(x.bounds, c.x, c.y));
|
|
71
94
|
return { obstructed: obstructionAt(parsed.allNodes, fresh, c.x, c.y).obstructed, node: fresh };
|
|
72
95
|
};
|
|
73
96
|
const before = (await obstructionFor()).obstructed;
|
|
@@ -81,18 +104,45 @@ export function registerClearOverlay(server, sessions) {
|
|
|
81
104
|
const treeOverlays = detectTreeOverlays(nodes, parsedBefore?.screen);
|
|
82
105
|
const overlaysBefore = treeOverlays.map((o) => o.type);
|
|
83
106
|
const fgOverlay = classifyForeground(session.appId, fg);
|
|
107
|
+
// Set when the keyboard is up and could not be dismissed: typed KEYBOARD_NOT_DISMISSIBLE.
|
|
108
|
+
let keyboardStuck;
|
|
84
109
|
const doHideKeyboard = async () => {
|
|
85
110
|
if (await safe(() => d.imeShown(), false)) {
|
|
86
|
-
|
|
87
|
-
|
|
111
|
+
// Backend-native hide first (WDA /wda/keyboard/dismiss; adb BACK-if-shown). A BACK
|
|
112
|
+
// fallback only where BACK is a real key (Android). On iOS it is not a keyboard dismiss.
|
|
113
|
+
let hid;
|
|
114
|
+
let why = '';
|
|
115
|
+
try {
|
|
116
|
+
hid = d.hideKeyboard ? await d.hideKeyboard() : (await d.pressKey('back'), true);
|
|
117
|
+
}
|
|
118
|
+
catch (e) {
|
|
119
|
+
hid = false;
|
|
120
|
+
why = String(e?.message ?? e);
|
|
121
|
+
}
|
|
122
|
+
if (hid)
|
|
123
|
+
cleared.push({ type: 'keyboard', action: 'hidden' });
|
|
124
|
+
else
|
|
125
|
+
keyboardStuck = why || 'the backend has no generic way to dismiss this keyboard';
|
|
88
126
|
}
|
|
89
127
|
else {
|
|
90
128
|
cleared.push({ type: 'keyboard', action: 'not_visible_or_unsupported' });
|
|
91
129
|
}
|
|
92
130
|
};
|
|
93
|
-
const doTapOutside = async () => {
|
|
94
|
-
|
|
95
|
-
|
|
131
|
+
const doTapOutside = async () => {
|
|
132
|
+
const sz = await safe(() => d.screenSize(), null);
|
|
133
|
+
const x = Math.round((sz?.width ?? 1080) * 0.5);
|
|
134
|
+
const y = Math.round((sz?.height ?? 2000) * 0.08);
|
|
135
|
+
await d.pressXY(x, y, 80);
|
|
136
|
+
cleared.push({ type: 'unknown', action: 'tap_outside' });
|
|
137
|
+
};
|
|
138
|
+
const doMinimizeLogbox = async () => {
|
|
139
|
+
const ok = await tapByText(d, nodes, /minimize/i);
|
|
140
|
+
cleared.push({ type: 'rn_logbox', action: ok ? 'minimized' : 'minimize_not_found' });
|
|
141
|
+
};
|
|
142
|
+
const doDismissLogbox = async () => {
|
|
143
|
+
const ok = await tapByText(d, nodes, /dismiss/i);
|
|
144
|
+
cleared.push({ type: 'rn_logbox', action: ok ? 'dismissed' : 'dismiss_not_found' });
|
|
145
|
+
};
|
|
96
146
|
const doAllowPermission = async () => {
|
|
97
147
|
if (await handleNativeAlert(d, 'accept')) {
|
|
98
148
|
cleared.push({ type: 'permission_dialog', action: 'allowed_native_alert' });
|
|
@@ -143,16 +193,37 @@ export function registerClearOverlay(server, sessions) {
|
|
|
143
193
|
else if (treeOverlays.some((o) => o.type === 'rn_logbox' || o.type === 'rn_redbox'))
|
|
144
194
|
await doMinimizeLogbox();
|
|
145
195
|
else if (fgOverlay?.type === 'permission_dialog')
|
|
146
|
-
cleared.push({ type: 'permission_dialog', action: 'present
|
|
196
|
+
cleared.push({ type: 'permission_dialog', action: 'present; call allow_permission/deny_permission deliberately' });
|
|
147
197
|
else if (treeOverlays.some((o) => o.type === 'native_dialog'))
|
|
148
|
-
cleared.push({ type: 'native_dialog', action: 'present
|
|
198
|
+
cleared.push({ type: 'native_dialog', action: 'present; handle via qa_act (e.g. tap a dialog button)' });
|
|
149
199
|
else
|
|
150
200
|
await doTapOutside();
|
|
151
201
|
break;
|
|
152
202
|
}
|
|
153
203
|
}
|
|
154
204
|
catch (e) {
|
|
155
|
-
|
|
205
|
+
const msg = String(e?.message ?? e);
|
|
206
|
+
return qaError({
|
|
207
|
+
what: `clear_overlay "${strategy}" failed: ${msg}`,
|
|
208
|
+
changedState: true,
|
|
209
|
+
retrySafe: true,
|
|
210
|
+
failureCode: /BACKEND_UNSUPPORTED|not supported by the WDA backend/.test(msg)
|
|
211
|
+
? 'BACKEND_UNSUPPORTED'
|
|
212
|
+
: classifyFlowDriverError(e),
|
|
213
|
+
nextSteps: ['Re-snapshot and inspect the overlay.'],
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
if (keyboardStuck) {
|
|
217
|
+
return qaError({
|
|
218
|
+
what: `The soft keyboard is up and could not be dismissed (${keyboardStuck.slice(0, 240)}). Nothing was changed.`,
|
|
219
|
+
changedState: false,
|
|
220
|
+
retrySafe: false,
|
|
221
|
+
failureCode: 'KEYBOARD_NOT_DISMISSIBLE',
|
|
222
|
+
nextSteps: [
|
|
223
|
+
'Submit the field with qa_act action:"press" key:"enter", or tap the app\'s own Done/Return button.',
|
|
224
|
+
'Or tap a non-input area (qa_clear_overlay strategy:"tap_outside"), then re-snapshot.',
|
|
225
|
+
],
|
|
226
|
+
}, { strategy, cleared });
|
|
156
227
|
}
|
|
157
228
|
await new Promise((r) => setTimeout(r, 500));
|
|
158
229
|
const after = (await obstructionFor()).obstructed;
|
|
@@ -162,7 +233,9 @@ export function registerClearOverlay(server, sessions) {
|
|
|
162
233
|
if (afterXml)
|
|
163
234
|
parsedAfter = parseSnapshot(afterXml);
|
|
164
235
|
}
|
|
165
|
-
catch {
|
|
236
|
+
catch {
|
|
237
|
+
/* keep undefined */
|
|
238
|
+
}
|
|
166
239
|
const afterOverlays = parsedAfter ? detectTreeOverlays(parsedAfter.allNodes, parsedAfter.screen) : [];
|
|
167
240
|
const remaining = afterOverlays.map((o) => o.type);
|
|
168
241
|
// Outcome (Phase 2.2): distinguish cleared / reappeared (persistent) / not_dismissible /
|
|
@@ -179,7 +252,14 @@ export function registerClearOverlay(server, sessions) {
|
|
|
179
252
|
outcome = overlaysBefore.length && remaining.length >= overlaysBefore.length ? 'reappeared' : 'not_dismissible';
|
|
180
253
|
else
|
|
181
254
|
outcome = 'cleared';
|
|
182
|
-
return qaOk({
|
|
255
|
+
return qaOk({
|
|
256
|
+
strategy,
|
|
257
|
+
outcome,
|
|
258
|
+
cleared,
|
|
259
|
+
overlaysBefore,
|
|
260
|
+
remaining,
|
|
261
|
+
...(targetRef ? { targetObstructedBefore: before, targetObstructedAfter: after } : {}),
|
|
262
|
+
}, `outcome: ${outcome}\ncleared: ${cleared.map((c) => `${c.type}:${c.action}`).join(', ') || '(none)'}${targetRef ? `\ntarget ${targetRef} obstructed: ${before} > ${after}` : ''}${remaining.length ? `\nremaining overlays: ${remaining.join(', ')}` : ''}`);
|
|
183
263
|
});
|
|
184
264
|
}
|
|
185
265
|
//# sourceMappingURL=clearOverlay.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clearOverlay.js","sourceRoot":"","sources":["../../src/tools/clearOverlay.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"clearOverlay.js","sourceRoot":"","sources":["../../src/tools/clearOverlay.ts"],"names":[],"mappings":"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"}
|