swipium 1.5.0 → 2.0.1
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 +183 -0
- package/README.md +173 -280
- package/THREAT_MODEL.md +223 -47
- package/dist/appMap/automationLink.js +30 -27
- package/dist/appMap/automationLink.js.map +1 -1
- package/dist/appMap/build.js +47 -21
- package/dist/appMap/build.js.map +1 -1
- package/dist/appMap/codeIndex.js +2 -2
- package/dist/appMap/codeIndex.js.map +1 -1
- package/dist/appMap/featureIndex.js +3 -3
- package/dist/appMap/featureIndex.js.map +1 -1
- package/dist/appMap/featureModel.js +2 -2
- package/dist/appMap/featureModel.js.map +1 -1
- package/dist/appMap/firstRunApply.js +2 -2
- package/dist/appMap/firstRunApply.js.map +1 -1
- package/dist/appMap/issues.js +10 -10
- package/dist/appMap/issues.js.map +1 -1
- package/dist/appMap/migrations.js +5 -5
- 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 +77 -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 +2 -2
- package/dist/appMap/query.js.map +1 -1
- package/dist/appMap/runtimeMerge.js +3 -3
- 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 +1 -1
- package/dist/appMap/screenMatch.js.map +1 -1
- package/dist/appMap/staticScan.js +17 -17
- package/dist/appMap/staticScan.js.map +1 -1
- package/dist/appMap/store.js +55 -7
- package/dist/appMap/store.js.map +1 -1
- package/dist/appMap/tsAstScan.js +3 -3
- package/dist/appMap/tsAstScan.js.map +1 -1
- package/dist/artifacts/bundletool.js +5 -5
- package/dist/artifacts/bundletool.js.map +1 -1
- package/dist/artifacts/resolve.js +10 -10
- package/dist/artifacts/resolve.js.map +1 -1
- package/dist/automation/capabilities.js +3 -3
- package/dist/automation/capabilities.js.map +1 -1
- package/dist/automation/gestures.js +1 -1
- package/dist/automation/gestures.js.map +1 -1
- package/dist/automation/plan.js +7 -7
- package/dist/automation/plan.js.map +1 -1
- package/dist/automation/report.js +3 -3
- package/dist/automation/report.js.map +1 -1
- package/dist/automation/selectors.js +14 -25
- 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 +5 -5
- package/dist/automation/waits.js.map +1 -1
- package/dist/automation/webview.js +2 -2
- package/dist/automation/webview.js.map +1 -1
- package/dist/automationGen/appiumModel.js +13 -7
- package/dist/automationGen/appiumModel.js.map +1 -1
- package/dist/automationGen/ciEmitter.js +5 -5
- 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 +265 -106
- 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 +71 -26
- package/dist/automationGen/projectProfile.js.map +1 -1
- package/dist/automationGen/pythonEmitter.js +276 -105
- 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/{tools/automationGenerate.js → automationGen/run.js} +72 -113
- package/dist/automationGen/run.js.map +1 -0
- package/dist/automationGen/suitePlan.js +6 -4
- package/dist/automationGen/suitePlan.js.map +1 -1
- package/dist/automationGen/validation.js +20 -8
- package/dist/automationGen/validation.js.map +1 -1
- package/dist/build/parseBuildLog.js +2 -2
- package/dist/build/parseBuildLog.js.map +1 -1
- package/dist/build/plan.js +7 -7
- 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 +35 -14
- package/dist/cli/scan.js.map +1 -1
- package/dist/cli/suite.js +6 -6
- 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 +45 -14
- package/dist/context/detect.js.map +1 -1
- package/dist/context/findApps.js +6 -6
- 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 +3 -3
- package/dist/core/target.js.map +1 -1
- package/dist/core/targetPlan.js +65 -62
- package/dist/core/targetPlan.js.map +1 -1
- package/dist/drivers/DirectDriver.js +300 -36
- package/dist/drivers/DirectDriver.js.map +1 -1
- package/dist/drivers/SimctlDriver.js +120 -7
- package/dist/drivers/SimctlDriver.js.map +1 -1
- package/dist/drivers/WdaDriver.js +350 -50
- package/dist/drivers/WdaDriver.js.map +1 -1
- package/dist/explore/candidates.js +2 -2
- package/dist/explore/candidates.js.map +1 -1
- package/dist/explore/graph.js +5 -5
- package/dist/explore/graph.js.map +1 -1
- package/dist/explore/policy.js +5 -5
- package/dist/explore/policy.js.map +1 -1
- package/dist/explore/runner.js +301 -284
- package/dist/explore/runner.js.map +1 -1
- package/dist/explore/signatures.js +1 -1
- package/dist/featureTesting/executionBootstrap.js +29 -30
- package/dist/featureTesting/executionBootstrap.js.map +1 -1
- package/dist/featureTesting/featureMap.js +2 -2
- package/dist/featureTesting/featureMap.js.map +1 -1
- package/dist/featureTesting/featureScope.js +12 -12
- package/dist/featureTesting/featureScope.js.map +1 -1
- package/dist/featureTesting/mapFeatureScope.js +7 -7
- package/dist/featureTesting/mapFeatureScope.js.map +1 -1
- package/dist/featureTesting/objectiveModel.js +10 -10
- package/dist/featureTesting/objectiveModel.js.map +1 -1
- package/dist/featureTesting/resultMerge.js +6 -6
- package/dist/featureTesting/resultMerge.js.map +1 -1
- package/dist/featureTesting/sources.js +4 -4
- package/dist/featureTesting/sources.js.map +1 -1
- package/dist/featureTesting/suiteBridge.js +1 -1
- package/dist/featureTesting/suiteBridge.js.map +1 -1
- package/dist/featureTesting/synonyms.js +1 -1
- package/dist/featureTesting/synonyms.js.map +1 -1
- package/dist/featureTesting/testCaseFactory.js +11 -11
- package/dist/featureTesting/testCaseFactory.js.map +1 -1
- package/dist/featureTesting/testPlan.js +3 -3
- 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 +5 -5
- package/dist/firstRun/classifyScreen.js.map +1 -1
- package/dist/firstRun/firstRunPlanner.js +11 -11
- package/dist/firstRun/firstRunPlanner.js.map +1 -1
- package/dist/firstRun/firstRunRunner.js +8 -8
- package/dist/firstRun/firstRunRunner.js.map +1 -1
- package/dist/firstRun/generatedDataPolicy.js +9 -9
- package/dist/firstRun/generatedDataPolicy.js.map +1 -1
- package/dist/firstRun/inputPlanner.js +5 -5
- 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 +33 -3
- 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 +20 -10
- package/dist/flows/generate.js.map +1 -1
- package/dist/flows/pack.js +3 -3
- 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 +111 -23
- package/dist/flows/repair.js.map +1 -1
- package/dist/flows/run.js +153 -57
- package/dist/flows/run.js.map +1 -1
- package/dist/flows/schema.js +50 -5
- package/dist/flows/schema.js.map +1 -1
- package/dist/flows/seedExec.js +4 -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/issues/classify.js +16 -16
- package/dist/issues/classify.js.map +1 -1
- package/dist/issues/fingerprint.js +24 -4
- package/dist/issues/fingerprint.js.map +1 -1
- package/dist/issues/index.js +94 -31
- package/dist/issues/index.js.map +1 -1
- package/dist/issues/metrics.js +4 -4
- 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 +4 -4
- package/dist/issues/report.js.map +1 -1
- package/dist/issues/reportBridge.js +4 -4
- 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 +75 -7
- 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 +32 -7
- 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 +1 -1
- package/dist/lib/image.js.map +1 -1
- package/dist/lib/lockfile.js +370 -31
- package/dist/lib/lockfile.js.map +1 -1
- package/dist/lib/needsInput.js +3 -3
- package/dist/lib/needsInput.js.map +1 -1
- package/dist/lib/png.js +2 -2
- 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 +79 -10
- package/dist/lib/result.js.map +1 -1
- package/dist/lib/schemaHash.js +3 -3
- package/dist/lib/schemaHash.js.map +1 -1
- package/dist/lib/sensitive.js +3 -2
- 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 +52 -10
- 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 +294 -15
- package/dist/lib/wda.js.map +1 -1
- package/dist/mobileAudit/checks.js +12 -12
- 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 +1 -1
- package/dist/mobileAudit/profiles.js.map +1 -1
- package/dist/mobileAudit/results.js +3 -3
- package/dist/mobileAudit/results.js.map +1 -1
- package/dist/mobileAudit/runner.js +72 -18
- 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 +219 -36
- package/dist/oracle/failures.js.map +1 -1
- package/dist/oracle/health.js +63 -17
- package/dist/oracle/health.js.map +1 -1
- package/dist/oracle/locator.js +13 -13
- 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 +4 -4
- package/dist/orchestration/goal.js.map +1 -1
- package/dist/orchestration/testThis/execute.js +62 -21
- package/dist/orchestration/testThis/execute.js.map +1 -1
- package/dist/orchestration/testThis/pipeline.js +119 -30
- package/dist/orchestration/testThis/pipeline.js.map +1 -1
- package/dist/orchestration/testThis/plan.js +162 -73
- package/dist/orchestration/testThis/plan.js.map +1 -1
- package/dist/orchestration/testThis/sessionIntent.js +72 -0
- package/dist/orchestration/testThis/sessionIntent.js.map +1 -0
- package/dist/orchestration/testThis/terminal.js +34 -16
- package/dist/orchestration/testThis/terminal.js.map +1 -1
- package/dist/orchestration/testThis/types.js +1 -1
- package/dist/orchestration/testThis/types.js.map +1 -1
- package/dist/plan/plan.js +9 -9
- package/dist/plan/plan.js.map +1 -1
- package/dist/prompts/index.js +22 -22
- package/dist/prompts/index.js.map +1 -1
- package/dist/report/export.js +392 -37
- 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/policy.js +7 -4
- package/dist/report/policy.js.map +1 -1
- package/dist/report/qaLevel.js +8 -8
- package/dist/report/qaLevel.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/toolHealth.js +124 -0
- package/dist/report/toolHealth.js.map +1 -0
- package/dist/server.js +472 -45
- 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 +2 -2
- package/dist/services/build.js.map +1 -1
- package/dist/{tools → services}/flowGenerate.js +29 -13
- package/dist/services/flowGenerate.js.map +1 -0
- package/dist/services/preflight.js +4 -4
- package/dist/services/preflight.js.map +1 -1
- package/dist/services/prepareAndroid.js +46 -8
- package/dist/services/prepareAndroid.js.map +1 -1
- package/dist/services/prepareIos.js +24 -9
- package/dist/services/prepareIos.js.map +1 -1
- package/dist/services/report.js +100 -45
- package/dist/services/report.js.map +1 -1
- package/dist/services/smoke.js +32 -16
- package/dist/services/smoke.js.map +1 -1
- package/dist/services/suiteGenerate.js +28 -3
- package/dist/services/suiteGenerate.js.map +1 -1
- package/dist/services/testSuiteKnowledge.js +40 -27
- package/dist/services/testSuiteKnowledge.js.map +1 -1
- package/dist/session/attach.js +270 -6
- package/dist/session/attach.js.map +1 -1
- package/dist/session/processRegistry.js +317 -48
- package/dist/session/processRegistry.js.map +1 -1
- package/dist/session/progress.js +1 -1
- package/dist/session/retention.js +201 -0
- package/dist/session/retention.js.map +1 -0
- package/dist/session/store.js +275 -48
- package/dist/session/store.js.map +1 -1
- package/dist/snapshot/overlays.js +53 -8
- package/dist/snapshot/overlays.js.map +1 -1
- package/dist/snapshot/parse.js +28 -4
- package/dist/snapshot/parse.js.map +1 -1
- package/dist/snapshot/present.js +11 -5
- 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 +46 -2
- package/dist/state/profile.js.map +1 -1
- package/dist/suite/compile.js +9 -5
- package/dist/suite/compile.js.map +1 -1
- package/dist/suite/lint.js +4 -4
- package/dist/suite/lint.js.map +1 -1
- package/dist/suite/pom.js +50 -41
- 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 +9 -7
- package/dist/suite/testcase.js.map +1 -1
- package/dist/testSuite/exporter.js +4 -4
- package/dist/testSuite/exporter.js.map +1 -1
- package/dist/testSuite/generator.js +13 -9
- 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 +5 -5
- package/dist/testSuite/merge.js.map +1 -1
- package/dist/testSuite/schema.js +5 -5
- package/dist/testSuite/schema.js.map +1 -1
- package/dist/testSuite/store.js +3 -3
- 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 +794 -164
- package/dist/tools/act.js.map +1 -1
- package/dist/tools/agent.js +451 -128
- package/dist/tools/agent.js.map +1 -1
- package/dist/tools/appControl.js +69 -19
- package/dist/tools/appControl.js.map +1 -1
- package/dist/tools/appMap.js +188 -130
- package/dist/tools/appMap.js.map +1 -1
- package/dist/tools/build.js +32 -42
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/bundletool.js +21 -31
- package/dist/tools/bundletool.js.map +1 -1
- package/dist/tools/clearOverlay.js +55 -12
- package/dist/tools/clearOverlay.js.map +1 -1
- package/dist/tools/device.js +76 -24
- package/dist/tools/device.js.map +1 -1
- package/dist/tools/doctor.js +68 -28
- package/dist/tools/doctor.js.map +1 -1
- package/dist/tools/explore.js +41 -47
- package/dist/tools/explore.js.map +1 -1
- package/dist/tools/featureTesting.js +31 -48
- package/dist/tools/featureTesting.js.map +1 -1
- package/dist/tools/firstRun.js +34 -41
- package/dist/tools/firstRun.js.map +1 -1
- package/dist/tools/flow.js +183 -103
- package/dist/tools/flow.js.map +1 -1
- package/dist/tools/flowRepair.js +25 -13
- package/dist/tools/flowRepair.js.map +1 -1
- package/dist/tools/generate.js +52 -89
- package/dist/tools/generate.js.map +1 -1
- package/dist/tools/getArtifact.js +16 -5
- package/dist/tools/getArtifact.js.map +1 -1
- package/dist/tools/health.js +15 -12
- package/dist/tools/health.js.map +1 -1
- package/dist/tools/ios.js +45 -223
- package/dist/tools/ios.js.map +1 -1
- package/dist/tools/issues.js +251 -35
- package/dist/tools/issues.js.map +1 -1
- package/dist/tools/jobs.js +41 -16
- package/dist/tools/jobs.js.map +1 -1
- package/dist/tools/metro.js +36 -35
- package/dist/tools/metro.js.map +1 -1
- package/dist/tools/mobileAudit.js +50 -45
- package/dist/tools/mobileAudit.js.map +1 -1
- package/dist/tools/network.js +31 -14
- package/dist/tools/network.js.map +1 -1
- package/dist/tools/note.js +26 -26
- package/dist/tools/note.js.map +1 -1
- package/dist/tools/prepareIosTarget.js +10 -16
- package/dist/tools/prepareIosTarget.js.map +1 -1
- package/dist/tools/prepareTarget.js +117 -50
- package/dist/tools/prepareTarget.js.map +1 -1
- package/dist/tools/report.js +11 -22
- package/dist/tools/report.js.map +1 -1
- package/dist/tools/resolveArtifact.js +11 -15
- package/dist/tools/resolveArtifact.js.map +1 -1
- package/dist/tools/resolveTarget.js +78 -24
- package/dist/tools/resolveTarget.js.map +1 -1
- package/dist/tools/screenRecord.js +23 -21
- package/dist/tools/screenRecord.js.map +1 -1
- package/dist/tools/screenshot.js +23 -16
- package/dist/tools/screenshot.js.map +1 -1
- package/dist/tools/smoke.js +20 -16
- package/dist/tools/smoke.js.map +1 -1
- package/dist/tools/snapshot.js +155 -118
- package/dist/tools/snapshot.js.map +1 -1
- package/dist/tools/startSession.js +104 -116
- package/dist/tools/startSession.js.map +1 -1
- package/dist/tools/suite.js +72 -43
- package/dist/tools/suite.js.map +1 -1
- package/dist/tools/testSuite.js +30 -20
- package/dist/tools/testSuite.js.map +1 -1
- package/dist/tools/testThis.js +24 -28
- package/dist/tools/testThis.js.map +1 -1
- package/dist/tools/visual.js +686 -210
- package/dist/tools/visual.js.map +1 -1
- package/dist/tools/wait.js +9 -38
- package/dist/tools/wait.js.map +1 -1
- package/dist/tools/wda.js +187 -57
- package/dist/tools/wda.js.map +1 -1
- package/dist/version.js +31 -22
- package/dist/version.js.map +1 -1
- package/dist/visual/ocr.js +53 -6
- package/dist/visual/ocr.js.map +1 -1
- package/dist/visual/provider.js +80 -12
- 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 +194 -128
- package/docs/physical-devices.md +84 -0
- package/docs/tools.md +812 -152
- package/package.json +3 -2
- package/dist/tools/assertVisual.js +0 -84
- package/dist/tools/assertVisual.js.map +0 -1
- package/dist/tools/automationGenerate.js.map +0 -1
- package/dist/tools/capabilities.js +0 -179
- 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.map +0 -1
- package/dist/tools/history.js +0 -86
- package/dist/tools/history.js.map +0 -1
- package/dist/tools/locator.js +0 -85
- package/dist/tools/locator.js.map +0 -1
- package/dist/tools/permissions.js +0 -174
- package/dist/tools/permissions.js.map +0 -1
- package/dist/tools/plan.js +0 -52
- package/dist/tools/plan.js.map +0 -1
- package/dist/tools/screenInfo.js +0 -76
- package/dist/tools/screenInfo.js.map +0 -1
- package/dist/tools/seed.js +0 -133
- package/dist/tools/seed.js.map +0 -1
- package/dist/tools/state.js +0 -217
- package/dist/tools/state.js.map +0 -1
- package/dist/tools/visualText.js +0 -106
- package/dist/tools/visualText.js.map +0 -1
package/dist/tools/build.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// qa_build (
|
|
1
|
+
// qa_build (1.5.0 consolidation: the former plan/build twins are one tool with a mode enum).
|
|
2
2
|
//
|
|
3
3
|
// mode:"plan" (default): side-effect-free. Proposes the exact prerequisite + build commands and the
|
|
4
4
|
// artifact globs the build will produce. An agent shows this and asks before compiling.
|
|
@@ -8,13 +8,14 @@
|
|
|
8
8
|
// (GRADLE_FAILED / XCODEBUILD_FAILED / FLUTTER_BUILD_FAILED / BUILD_TIMED_OUT). On success it
|
|
9
9
|
// re-resolves the produced artifact so the next step (qa_prepare_target / qa_test_this) has it.
|
|
10
10
|
import { z } from 'zod';
|
|
11
|
-
import { qaOk, qaError, qaAnnotate } from '../lib/result.js';
|
|
11
|
+
import { qaOk, qaError, qaAnnotate, unknownSessionError } from '../lib/result.js';
|
|
12
12
|
import { qaFail } from '../oracle/failures.js';
|
|
13
13
|
import { requireConsent, consumeConsent } from '../consent/consent.js';
|
|
14
|
-
import { resolveProjectRoot } from '../context/projectRoot.js';
|
|
14
|
+
import { resolveProjectRoot, unresolvedProjectRootError } from '../context/projectRoot.js';
|
|
15
15
|
import { buildPlan } from '../build/plan.js';
|
|
16
16
|
import { executeBuild } from '../services/build.js';
|
|
17
|
-
|
|
17
|
+
import { runWithSignal } from '../lib/abortScope.js';
|
|
18
|
+
const DEFAULT_BUILD_TIMEOUT_MS = 20 * 60_000; // 20 min, native builds are slow
|
|
18
19
|
async function rootFrom(server, sessions, sessionId, projectRoot) {
|
|
19
20
|
if (sessionId) {
|
|
20
21
|
const r = sessions.get(sessionId)?.root;
|
|
@@ -24,13 +25,7 @@ async function rootFrom(server, sessions, sessionId, projectRoot) {
|
|
|
24
25
|
const resolved = await resolveProjectRoot(server, projectRoot);
|
|
25
26
|
if (!resolved.root)
|
|
26
27
|
return {
|
|
27
|
-
error:
|
|
28
|
-
what: 'Could not resolve a project root',
|
|
29
|
-
changedState: false,
|
|
30
|
-
retrySafe: true,
|
|
31
|
-
nextSteps: ['Pass projectRoot or call qa_start_session.'],
|
|
32
|
-
clientHint: resolved.hint,
|
|
33
|
-
}),
|
|
28
|
+
error: unresolvedProjectRootError(resolved),
|
|
34
29
|
};
|
|
35
30
|
return resolved.root;
|
|
36
31
|
}
|
|
@@ -46,27 +41,25 @@ function planSummary(plan) {
|
|
|
46
41
|
export function registerBuild(server, sessions) {
|
|
47
42
|
server.registerTool('qa_build', {
|
|
48
43
|
title: 'Plan or run a build from source',
|
|
49
|
-
description: 'Build the app from source
|
|
44
|
+
description: 'Build the app from source, or just propose how. mode:"plan" (default, side-effect free): exact prerequisite + build commands, ' +
|
|
45
|
+
'cwd, expected artifact globs, toolchain status per framework (Expo/RN/native/Flutter). mode:"run" (consent-gated job, needs ' +
|
|
46
|
+
'sessionId): runs them, stores a build log artifact, and re-resolves the produced artifact; failures are typed ' +
|
|
47
|
+
'(GRADLE_FAILED, XCODEBUILD_FAILED, FLUTTER_BUILD_FAILED, BUILD_TIMED_OUT, DEPENDENCY_INSTALL_REQUIRED, ...). A build failure is ' +
|
|
48
|
+
'not a test failure.',
|
|
50
49
|
inputSchema: {
|
|
51
|
-
mode: z
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
.describe('plan (default): side-effect-free — return the exact commands, expected artifacts, and toolchain status without building. run: execute the planned prerequisites + build as a consent-gated background job.'),
|
|
55
|
-
sessionId: z
|
|
56
|
-
.string()
|
|
57
|
-
.optional()
|
|
58
|
-
.describe('Session from qa_start_session. Optional in mode:"plan" (projectRoot works too); REQUIRED in mode:"run" — the build log is stored as a session artifact.'),
|
|
59
|
-
projectRoot: z.string().optional().describe('(mode:"plan" only) Resolve the project without a session.'),
|
|
50
|
+
mode: z.enum(['plan', 'run']).optional(),
|
|
51
|
+
sessionId: z.string().optional().describe('Required for run (stores the build log).'),
|
|
52
|
+
projectRoot: z.string().optional().describe('plan: resolve the project without a session.'),
|
|
60
53
|
platform: z.enum(['android', 'ios']),
|
|
61
54
|
variant: z.enum(['debug', 'release']).optional(),
|
|
62
|
-
timeoutMs: z.number().optional().describe(`
|
|
63
|
-
consentId: z.string().optional().describe('
|
|
64
|
-
approve: z.boolean().optional().describe('
|
|
55
|
+
timeoutMs: z.number().optional().describe(`run: per-step timeout (default ${DEFAULT_BUILD_TIMEOUT_MS}).`),
|
|
56
|
+
consentId: z.string().optional().describe('run'),
|
|
57
|
+
approve: z.boolean().optional().describe('run'),
|
|
65
58
|
},
|
|
66
59
|
}, async ({ mode, sessionId, projectRoot, platform, variant, timeoutMs, consentId, approve }) => {
|
|
67
60
|
const effectiveMode = mode ?? 'plan';
|
|
68
61
|
const notes = [];
|
|
69
|
-
// ---- mode:"plan"
|
|
62
|
+
// ---- mode:"plan": read-only proposal (merged twin, 1.5.0). ----
|
|
70
63
|
if (effectiveMode === 'plan') {
|
|
71
64
|
const ignored = [
|
|
72
65
|
timeoutMs !== undefined && 'timeoutMs',
|
|
@@ -74,7 +67,7 @@ export function registerBuild(server, sessions) {
|
|
|
74
67
|
approve !== undefined && 'approve',
|
|
75
68
|
].filter((x) => !!x);
|
|
76
69
|
if (ignored.length)
|
|
77
|
-
notes.push(`ignored parameter(s) not applicable to mode:"plan": ${ignored.join(', ')}
|
|
70
|
+
notes.push(`ignored parameter(s) not applicable to mode:"plan": ${ignored.join(', ')}; re-run with mode:"run" to build`);
|
|
78
71
|
const root = await rootFrom(server, sessions, sessionId, projectRoot);
|
|
79
72
|
if (typeof root !== 'string')
|
|
80
73
|
return qaAnnotate(root.error, notes);
|
|
@@ -84,9 +77,9 @@ export function registerBuild(server, sessions) {
|
|
|
84
77
|
}
|
|
85
78
|
return qaAnnotate(qaOk({ plan }, `${planSummary(plan)}\nExecute with qa_build { mode:"run" }.`), notes);
|
|
86
79
|
}
|
|
87
|
-
// ---- mode:"run"
|
|
80
|
+
// ---- mode:"run": consent-gated build job (formerly the bare qa_build). ----
|
|
88
81
|
if (projectRoot !== undefined)
|
|
89
|
-
notes.push('ignored parameter not applicable to mode:"run": projectRoot
|
|
82
|
+
notes.push('ignored parameter not applicable to mode:"run": projectRoot (mode:"run" builds the session\'s project root)');
|
|
90
83
|
if (!sessionId) {
|
|
91
84
|
return qaAnnotate(qaError({
|
|
92
85
|
what: 'qa_build mode:"run" needs a sessionId (the build log is stored as a session artifact)',
|
|
@@ -97,12 +90,7 @@ export function registerBuild(server, sessions) {
|
|
|
97
90
|
}
|
|
98
91
|
const session = sessions.get(sessionId);
|
|
99
92
|
if (!session)
|
|
100
|
-
return qaAnnotate(
|
|
101
|
-
what: `Unknown sessionId "${sessionId}"`,
|
|
102
|
-
changedState: false,
|
|
103
|
-
retrySafe: true,
|
|
104
|
-
nextSteps: ['Call qa_start_session first.'],
|
|
105
|
-
}), notes);
|
|
93
|
+
return qaAnnotate(unknownSessionError(sessionId), notes);
|
|
106
94
|
const plan = await buildPlan({ projectRoot: session.root, platform: platform, variant });
|
|
107
95
|
if (plan.failureCode)
|
|
108
96
|
return qaAnnotate(qaFail(plan.failureCode, { what: plan.notes[0] ?? 'Cannot build', extra: { plan } }), notes);
|
|
@@ -110,7 +98,8 @@ export function registerBuild(server, sessions) {
|
|
|
110
98
|
return qaAnnotate(qaFail('BUILD_COMMAND_UNAVAILABLE', { what: `Missing toolchain: ${plan.missingToolchain.join(', ')}`, extra: { plan } }), notes);
|
|
111
99
|
if (!plan.build)
|
|
112
100
|
return qaAnnotate(qaFail('BUILD_COMMAND_UNAVAILABLE', { extra: { plan } }), notes);
|
|
113
|
-
// Consent: building from source
|
|
101
|
+
// Consent (risk high): building from source runs arbitrary repo scripts (gradle/xcodebuild/
|
|
102
|
+
// npm lifecycle hooks), spends minutes, and writes into the project tree.
|
|
114
103
|
const steps = [...plan.prerequisites, plan.build];
|
|
115
104
|
const affects = { commands: steps.map((s) => s.command), cwd: plan.build.cwd };
|
|
116
105
|
const gate = consumeConsent(consentId, approve, { action: 'build_from_source', affects });
|
|
@@ -118,14 +107,14 @@ export function registerBuild(server, sessions) {
|
|
|
118
107
|
sessions.recordMutation(session, {
|
|
119
108
|
tool: 'qa_build',
|
|
120
109
|
action: 'build_from_source',
|
|
121
|
-
risk: '
|
|
110
|
+
risk: 'high',
|
|
122
111
|
target: affects,
|
|
123
112
|
consent: { required: true, approved: false },
|
|
124
113
|
status: 'requested',
|
|
125
114
|
});
|
|
126
115
|
return qaAnnotate(requireConsent({
|
|
127
116
|
action: 'build_from_source',
|
|
128
|
-
risk: '
|
|
117
|
+
risk: 'high',
|
|
129
118
|
exactCommand: steps.map((s) => `(${s.cwd}) ${s.command}`).join('\n'),
|
|
130
119
|
affects,
|
|
131
120
|
explain: `Build ${plan.framework}/${platform}/${plan.variant} from source. This runs:\n${steps.map((s) => `• ${s.label}: ${s.command}`).join('\n')}`,
|
|
@@ -134,13 +123,14 @@ export function registerBuild(server, sessions) {
|
|
|
134
123
|
sessions.recordMutation(session, {
|
|
135
124
|
tool: 'qa_build',
|
|
136
125
|
action: 'build_from_source',
|
|
137
|
-
risk: '
|
|
126
|
+
risk: 'high',
|
|
138
127
|
target: affects,
|
|
139
128
|
consent: { required: true, consentId, approved: true },
|
|
140
129
|
status: 'approved',
|
|
141
130
|
});
|
|
142
131
|
const job = sessions.createJob(session, `build:${platform}`);
|
|
143
|
-
|
|
132
|
+
// The job runs in its own cancellation scope (abortScope), not the starting call's.
|
|
133
|
+
void runWithSignal(sessions.abortSignal(session, job.jobId), () => runBuild(sessions, session, job, plan, timeoutMs ?? DEFAULT_BUILD_TIMEOUT_MS, { affects, consentId }));
|
|
144
134
|
return qaAnnotate(qaOk({ jobId: job.jobId, status: 'running', kind: job.kind, plan }, `Started ${plan.framework}/${platform} build as job ${job.jobId}. Poll qa_job_status { sessionId:"${session.id}", jobId:"${job.jobId}" }.`), notes);
|
|
145
135
|
});
|
|
146
136
|
}
|
|
@@ -156,7 +146,7 @@ async function runBuild(sessions, session, job, plan, timeoutMs, mutation) {
|
|
|
156
146
|
sessions.recordMutation(session, {
|
|
157
147
|
tool: 'qa_build',
|
|
158
148
|
action: 'build_from_source',
|
|
159
|
-
risk: '
|
|
149
|
+
risk: 'high',
|
|
160
150
|
target: mutation.affects,
|
|
161
151
|
consent: { required: true, consentId: mutation.consentId, approved: true },
|
|
162
152
|
status: 'blocked',
|
|
@@ -184,7 +174,7 @@ async function runBuild(sessions, session, job, plan, timeoutMs, mutation) {
|
|
|
184
174
|
sessions.recordMutation(session, {
|
|
185
175
|
tool: 'qa_build',
|
|
186
176
|
action: 'build_from_source',
|
|
187
|
-
risk: '
|
|
177
|
+
risk: 'high',
|
|
188
178
|
target: mutation.affects,
|
|
189
179
|
consent: { required: true, consentId: mutation.consentId, approved: true },
|
|
190
180
|
status: 'blocked',
|
|
@@ -205,7 +195,7 @@ async function runBuild(sessions, session, job, plan, timeoutMs, mutation) {
|
|
|
205
195
|
sessions.recordMutation(session, {
|
|
206
196
|
tool: 'qa_build',
|
|
207
197
|
action: 'build_from_source',
|
|
208
|
-
risk: '
|
|
198
|
+
risk: 'high',
|
|
209
199
|
target: { ...mutation.affects, artifact: res.artifact.path },
|
|
210
200
|
consent: { required: true, consentId: mutation.consentId, approved: true },
|
|
211
201
|
status: 'executed',
|
package/dist/tools/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/tools/build.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/tools/build.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/bundletool.js
CHANGED
|
@@ -1,46 +1,35 @@
|
|
|
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
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
.describe('Build a device-specific APK set for a connected device (bundletool --connected-device) instead of a universal APK.'),
|
|
24
|
-
install: z
|
|
25
|
-
.boolean()
|
|
26
|
-
.optional()
|
|
27
|
-
.describe('With connectedDevice, also install the APK set on the device (bundletool install-apks). Requires an online adb device. Consent-gated (installs app code on a real device/emulator).'),
|
|
28
|
-
device: z
|
|
29
|
-
.string()
|
|
30
|
-
.optional()
|
|
31
|
-
.describe('adb serial to target for connectedDevice build/install (defaults to the only connected device).'),
|
|
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).'),
|
|
32
26
|
consentId: z.string().optional(),
|
|
33
27
|
approve: z.boolean().optional(),
|
|
34
28
|
},
|
|
35
29
|
}, async ({ sessionId, aab, force, connectedDevice, install, device, consentId, approve }) => {
|
|
36
30
|
const session = sessions.get(sessionId);
|
|
37
31
|
if (!session)
|
|
38
|
-
return
|
|
39
|
-
what: `Unknown sessionId "${sessionId}"`,
|
|
40
|
-
changedState: false,
|
|
41
|
-
retrySafe: true,
|
|
42
|
-
nextSteps: ['Call qa_start_session first.'],
|
|
43
|
-
});
|
|
32
|
+
return unknownSessionError(sessionId);
|
|
44
33
|
// Resolve the .aab if not given.
|
|
45
34
|
let aabPath = aab;
|
|
46
35
|
if (!aabPath) {
|
|
@@ -53,9 +42,9 @@ export function registerBundletool(server, sessions) {
|
|
|
53
42
|
});
|
|
54
43
|
aabPath = found.path;
|
|
55
44
|
}
|
|
56
|
-
// 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
|
|
57
46
|
// is safe and ungated). Confirm intent BEFORE any work, regardless of whether bundletool is
|
|
58
|
-
// installed. Mirrors qa_prepare_target /
|
|
47
|
+
// installed. Mirrors qa_prepare_target / qa_prepare_ios_target.
|
|
59
48
|
let mutationConsent;
|
|
60
49
|
if (connectedDevice && install) {
|
|
61
50
|
const affects = { aab: aabPath, device: device ?? '(only connected device)' };
|
|
@@ -83,7 +72,7 @@ export function registerBundletool(server, sessions) {
|
|
|
83
72
|
const launcher = await findBundletool();
|
|
84
73
|
if (!launcher) {
|
|
85
74
|
return qaFail('AAB_NEEDS_BUNDLETOOL', {
|
|
86
|
-
what: `bundletool is not installed
|
|
75
|
+
what: `bundletool is not installed, cannot convert ${aabPath}`,
|
|
87
76
|
nextSteps: [
|
|
88
77
|
'Install bundletool (brew install bundletool) or set $BUNDLETOOL_JAR to bundletool.jar.',
|
|
89
78
|
'Or build an APK directly: qa_build { platform: "android", variant: "debug" } (./gradlew assembleDebug).',
|
|
@@ -93,7 +82,8 @@ export function registerBundletool(server, sessions) {
|
|
|
93
82
|
}
|
|
94
83
|
const job = sessions.createJob(session, 'bundletool:convert');
|
|
95
84
|
if (connectedDevice) {
|
|
96
|
-
|
|
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 }));
|
|
97
87
|
return qaOk({
|
|
98
88
|
jobId: job.jobId,
|
|
99
89
|
status: 'running',
|
|
@@ -104,8 +94,8 @@ export function registerBundletool(server, sessions) {
|
|
|
104
94
|
bundletool: launcher.describe,
|
|
105
95
|
}, `Building${install ? ' + installing' : ''} a device-specific APK set from ${aabPath} as job ${job.jobId} (${launcher.describe}). Poll qa_job_status.`);
|
|
106
96
|
}
|
|
107
|
-
void runConvert(sessions, session, job, aabPath, !!force);
|
|
108
|
-
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.`);
|
|
109
99
|
});
|
|
110
100
|
}
|
|
111
101
|
async function runDeviceApkSet(sessions, session, job, aabPath, opts) {
|
|
@@ -224,7 +214,7 @@ async function runConvert(sessions, session, job, aabPath, force) {
|
|
|
224
214
|
return;
|
|
225
215
|
}
|
|
226
216
|
prog.done('Universal APK ready.');
|
|
227
|
-
sessions.addWorkaround(session, `converted .aab
|
|
217
|
+
sessions.addWorkaround(session, `converted .aab > universal .apk via bundletool (${result.fromCache ? 'cached' : 'built'})`);
|
|
228
218
|
upd({
|
|
229
219
|
status: 'done',
|
|
230
220
|
progress: 'done',
|
|
@@ -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,11 +1,12 @@
|
|
|
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
|
+
import { classifyFlowDriverError } from '../flows/run.js';
|
|
9
10
|
const STRATEGIES = [
|
|
10
11
|
'auto',
|
|
11
12
|
'hide_keyboard',
|
|
@@ -49,7 +50,9 @@ async function handleNativeAlert(d, action) {
|
|
|
49
50
|
export function registerClearOverlay(server, sessions) {
|
|
50
51
|
server.registerTool('qa_clear_overlay', {
|
|
51
52
|
title: 'Clear an overlay',
|
|
52
|
-
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.',
|
|
53
56
|
inputSchema: {
|
|
54
57
|
sessionId: z.string(),
|
|
55
58
|
strategy: z.enum(STRATEGIES).optional().describe('default "auto"'),
|
|
@@ -57,9 +60,18 @@ export function registerClearOverlay(server, sessions) {
|
|
|
57
60
|
},
|
|
58
61
|
}, async ({ sessionId, strategy = 'auto', targetRef }) => {
|
|
59
62
|
const session = sessions.get(sessionId);
|
|
60
|
-
|
|
63
|
+
if (!session)
|
|
64
|
+
return unknownSessionError(sessionId);
|
|
65
|
+
const { driver: d, blocked } = await getDriver(session);
|
|
61
66
|
if (!session || !d) {
|
|
62
|
-
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
|
+
}));
|
|
63
75
|
}
|
|
64
76
|
const obstructionFor = async () => {
|
|
65
77
|
if (!targetRef)
|
|
@@ -92,10 +104,25 @@ export function registerClearOverlay(server, sessions) {
|
|
|
92
104
|
const treeOverlays = detectTreeOverlays(nodes, parsedBefore?.screen);
|
|
93
105
|
const overlaysBefore = treeOverlays.map((o) => o.type);
|
|
94
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;
|
|
95
109
|
const doHideKeyboard = async () => {
|
|
96
110
|
if (await safe(() => d.imeShown(), false)) {
|
|
97
|
-
|
|
98
|
-
|
|
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';
|
|
99
126
|
}
|
|
100
127
|
else {
|
|
101
128
|
cleared.push({ type: 'keyboard', action: 'not_visible_or_unsupported' });
|
|
@@ -166,22 +193,38 @@ export function registerClearOverlay(server, sessions) {
|
|
|
166
193
|
else if (treeOverlays.some((o) => o.type === 'rn_logbox' || o.type === 'rn_redbox'))
|
|
167
194
|
await doMinimizeLogbox();
|
|
168
195
|
else if (fgOverlay?.type === 'permission_dialog')
|
|
169
|
-
cleared.push({ type: 'permission_dialog', action: 'present
|
|
196
|
+
cleared.push({ type: 'permission_dialog', action: 'present; call allow_permission/deny_permission deliberately' });
|
|
170
197
|
else if (treeOverlays.some((o) => o.type === 'native_dialog'))
|
|
171
|
-
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)' });
|
|
172
199
|
else
|
|
173
200
|
await doTapOutside();
|
|
174
201
|
break;
|
|
175
202
|
}
|
|
176
203
|
}
|
|
177
204
|
catch (e) {
|
|
205
|
+
const msg = String(e?.message ?? e);
|
|
178
206
|
return qaError({
|
|
179
|
-
what: `clear_overlay "${strategy}" failed: ${
|
|
207
|
+
what: `clear_overlay "${strategy}" failed: ${msg}`,
|
|
180
208
|
changedState: true,
|
|
181
209
|
retrySafe: true,
|
|
210
|
+
failureCode: /BACKEND_UNSUPPORTED|not supported by the WDA backend/.test(msg)
|
|
211
|
+
? 'BACKEND_UNSUPPORTED'
|
|
212
|
+
: classifyFlowDriverError(e),
|
|
182
213
|
nextSteps: ['Re-snapshot and inspect the overlay.'],
|
|
183
214
|
});
|
|
184
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 });
|
|
227
|
+
}
|
|
185
228
|
await new Promise((r) => setTimeout(r, 500));
|
|
186
229
|
const after = (await obstructionFor()).obstructed;
|
|
187
230
|
let parsedAfter;
|
|
@@ -216,7 +259,7 @@ export function registerClearOverlay(server, sessions) {
|
|
|
216
259
|
overlaysBefore,
|
|
217
260
|
remaining,
|
|
218
261
|
...(targetRef ? { targetObstructedBefore: before, targetObstructedAfter: after } : {}),
|
|
219
|
-
}, `outcome: ${outcome}\ncleared: ${cleared.map((c) => `${c.type}:${c.action}`).join(', ') || '(none)'}${targetRef ? `\ntarget ${targetRef} obstructed: ${before}
|
|
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(', ')}` : ''}`);
|
|
220
263
|
});
|
|
221
264
|
}
|
|
222
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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"}
|