@frankzhang2026/opencode-android-orchestrator 0.2.0 → 0.3.0

package/templates/scripts/automation/tests/run-tests.sh

@@ -137,10 +137,18 @@ jq -n '{
         "systematic-debugging",
         "verification-before-completion"
     ],
+    gradleVerification: {
+        fullUnitTestTasks: ["testDebugUnitTest"],
+        focusedTestTasks: ["testDebugUnitTest"],
+        assembleTasks: ["assembleDebug"],
+        lintTasks: ["lint"],
+        deviceTestTasks: ["connectedDebugAndroidTest"]
+    },
     androidProject: {
         name: "automation-shell-fixture",
         gradleDsl: "kotlin",
         settingsFile: "settings.gradle.kts",
+        moduleScope: "all",
         primaryModule: ":mobile-client",
         modules: [{
             gradlePath: ":mobile-client",
@@ -217,7 +225,10 @@ jq -n '{
     ],
     acceptanceCriteria: ["Greeting returns the approved value"],
     nonGoals: ["No unrelated refactoring"],
-    targetTests: ["dev.example.orchestratorfixture.GreetingTest"],
+    targetTests: [{
+        gradleTask: "testDebugUnitTest",
+        filter: "dev.example.orchestratorfixture.GreetingTest"
+    }],
     deviceTestsRequired: false,
     testPolicy: "required",
     testPolicyReason: "The behavior requires a focused regression test"
@@ -273,11 +284,17 @@ pass 'illegal state transition is rejected'
 run_fixture ./scripts/automation/claim-task.sh TASK-TEST-001 >/dev/null
 [[ "$(jq -r '.state' "$runtime_root/state/TASK-TEST-001.json")" == "CODING" ]] || fail 'claim did not create CODING state'
 [[ -f "$runtime_root/evidence/TASK-TEST-001/baseline.json" ]] || fail 'baseline metadata missing'
+jq -e \
+    '.command == ["./gradlew", "testDebugUnitTest"]' \
+    "$runtime_root/evidence/TASK-TEST-001/baseline.json" >/dev/null || fail 'baseline command does not match the configured task matrix'
 pass 'claim verifies workspace identity and records a green baseline'
 
 printf '%s\n' 'class GreetingTest { fun expectedBehavior() = Unit }' > "$fixture/mobile-client/src/test/java/dev/example/orchestratorfixture/GreetingTest.kt"
 run_fixture ./scripts/automation/record-red.sh TASK-TEST-001 'expected missing behavior' -- dev.example.orchestratorfixture.GreetingTest >/dev/null
 [[ "$(jq -r '.exitCode' "$runtime_root/evidence/TASK-TEST-001/red.json")" -ne 0 ]] || fail 'RED evidence exit code was not captured'
+jq -e \
+    '.command == ["./gradlew", "testDebugUnitTest", "--tests", "dev.example.orchestratorfixture.GreetingTest"]' \
+    "$runtime_root/evidence/TASK-TEST-001/red.json" >/dev/null || fail 'RED command does not bind the configured task and filter'
 pass 'focused failing test records genuine RED evidence'
 
 printf '%s\n' 'unsafe' > "$fixture/automation/forbidden-change.txt"
@@ -338,7 +355,7 @@ jq \
     '.id = "TASK-TEST-002" |
      .title = "Exercise the bounded verification failure loop" |
      .planPath = "docs/plans/TASK-TEST-002.md" |
-     .targetTests = ["dev.example.orchestratorfixture.FailureLoopTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.FailureLoopTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-002.json"
 (
@@ -375,7 +392,7 @@ jq \
     '.id = "TASK-TEST-003" |
      .title = "Verify dirty worktree preflight blocking" |
      .planPath = "docs/plans/TASK-TEST-003.md" |
-     .targetTests = ["dev.example.orchestratorfixture.PreflightBlockTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.PreflightBlockTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-003.json"
 (
@@ -402,7 +419,7 @@ jq \
     '.id = "TASK-TEST-005" |
      .title = "Exercise the bounded reviewer repair cycle" |
      .planPath = "docs/plans/TASK-TEST-005.md" |
-     .targetTests = ["dev.example.orchestratorfixture.ReviewerFixTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.ReviewerFixTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-005.json"
 (
@@ -452,7 +469,7 @@ jq \
     '.id = "TASK-TEST-004" |
      .title = "Exercise in-place transactional integration" |
      .planPath = "docs/plans/TASK-TEST-004.md" |
-     .targetTests = ["dev.example.orchestratorfixture.OrchestratedFlowTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.OrchestratedFlowTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-004.json"
 
@@ -557,7 +574,7 @@ jq \
     '.id = "TASK-TEST-008" |
      .title = "Archive an interrupted in-place task" |
      .planPath = "docs/plans/TASK-TEST-008.md" |
-     .targetTests = ["dev.example.orchestratorfixture.AbortArchiveTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.AbortArchiveTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-008.json"
 run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-008 '批准方案，生成计划和任务合同。' >/dev/null
@@ -586,7 +603,7 @@ jq \
     '.id = "TASK-TEST-009" |
      .title = "Abort before product editing" |
      .planPath = "docs/plans/TASK-TEST-009.md" |
-     .targetTests = ["dev.example.orchestratorfixture.PlanningOnlyAbortTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.PlanningOnlyAbortTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-009.json"
 run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-009 '批准方案，生成计划和任务合同。' >/dev/null
@@ -611,7 +628,7 @@ jq \
     '.id = "TASK-TEST-007" |
      .title = "Keep optional isolated workspace support" |
      .planPath = "docs/plans/TASK-TEST-007.md" |
-     .targetTests = ["dev.example.orchestratorfixture.IsolatedFlowTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.IsolatedFlowTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-007.json"
 run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-007 '批准方案，生成计划和任务合同。' >/dev/null
@@ -654,7 +671,7 @@ jq \
     '.id = "TASK-TEST-006" |
      .title = "Block an advanced original branch" |
      .planPath = "docs/plans/TASK-TEST-006.md" |
-     .targetTests = ["dev.example.orchestratorfixture.AdvancedOriginalTest"]' \
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.AdvancedOriginalTest"}]' \
     "$fixture/automation/tasks/TASK-TEST-001.json" \
     > "$fixture/automation/tasks/TASK-TEST-006.json"
 run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-006 '批准方案，生成计划和任务合同。' >/dev/null

package/templates/scripts/automation/validate-contract.sh

@@ -13,6 +13,7 @@ input="${1:-}"
 [[ -n "$input" ]] || { usage; exit 2; }
 automation_require_command jq
 automation_require_layout
+automation_validate_config
 
 if [[ "$input" == */* || "$input" == *.json || "$input" == *.example ]]; then
     contract="$input"
@@ -39,7 +40,12 @@ jq -e '
     (.allowedSuperpowers == ["test-driven-development", "systematic-debugging", "verification-before-completion"]) and
     (.acceptanceCriteria | type == "array" and length > 0) and
     (.nonGoals | type == "array" and length > 0) and
-    (.targetTests | type == "array" and length > 0) and
+    (.targetTests | type == "array" and length > 0 and all(.[];
+        type == "object" and
+        keys == ["filter", "gradleTask"] and
+        (.gradleTask | type == "string" and test("^(?:[A-Za-z][A-Za-z0-9_.-]*|(?::[A-Za-z0-9_.-]+)+)$")) and
+        (.filter | type == "string" and test("^[A-Za-z0-9_.#$*-]+$")))) and
+    ([.targetTests[].filter] | length == (unique | length)) and
     (.deviceTestsRequired | type == "boolean") and
     (.testPolicy == "required" or .testPolicy == "not-required") and
     (if .testPolicy == "not-required" then (.testPolicyReason | type == "string" and length >= 20) else true end)
@@ -68,10 +74,15 @@ while IFS= read -r protected; do
     fi
 done < <(jq -r '.protectedPaths[]' "$AUTOMATION_CONFIG")
 
-safe_filter_pattern='^[A-Za-z0-9_.#$*-]+$'
-while IFS= read -r filter; do
-    [[ "$filter" =~ $safe_filter_pattern ]] || automation_die "unsafe target test filter: $filter"
-done < <(jq -r '.targetTests[]' "$contract")
+while IFS=$'\t' read -r gradle_task filter; do
+    automation_validate_gradle_task "$gradle_task"
+    automation_validate_test_filter "$filter"
+    jq -e \
+        --arg task "$gradle_task" \
+        '.gradleVerification.focusedTestTasks | index($task) != null' \
+        "$AUTOMATION_CONFIG" >/dev/null || \
+        automation_die "target test Gradle task is not allowed by automation/config.json: $gradle_task"
+done < <(jq -r '.targetTests[] | [.gradleTask, .filter] | @tsv' "$contract")
 
 if rg -n -i 'replace with|TASK-EXAMPLE|todo|tbd|placeholder' "$contract" >/dev/null; then
     automation_die "contract still contains template placeholders"

package/templates/scripts/automation/verify-integration.sh

@@ -12,26 +12,27 @@ head="${3:-}"
 automation_validate_task_id "$task_id"
 [[ "$(automation_read_state "$task_id")" == "INTEGRATING" ]] || automation_die "$task_id is not INTEGRATING"
 contract="$(automation_contract_path "$task_id")"
+"$SCRIPT_DIR/validate-contract.sh" "$task_id" >/dev/null
 
 "$SCRIPT_DIR/integration-scope-gate.sh" "$task_id" "$base" "$head"
 
-while IFS= read -r filter; do
-    automation_info "running integration focused test: $filter"
-    ./gradlew testDebugUnitTest --tests "$filter"
-done < <(jq -r '.targetTests[]' "$contract")
+while IFS=$'\t' read -r gradle_task filter; do
+    automation_info "running integration focused test ($gradle_task): $filter"
+    automation_run_focused_test "$gradle_task" "$filter" "$AUTOMATION_ROOT"
+done < <(jq -r '.targetTests[] | [.gradleTask, .filter] | @tsv' "$contract")
 
 automation_info "running integration full unit tests"
-./gradlew testDebugUnitTest
+automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT"
 
-automation_info "building integration debug APK"
-./gradlew assembleDebug
+automation_info "running configured integration assemble tasks"
+automation_run_gradle_group "assembleTasks" "$AUTOMATION_ROOT"
 
-automation_info "running integration Android lint"
-./gradlew lint
+automation_info "running configured integration Android lint tasks"
+automation_run_gradle_group "lintTasks" "$AUTOMATION_ROOT"
 
 if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
-    automation_info "running integration connected device tests"
-    ./gradlew connectedDebugAndroidTest
+    automation_info "running configured integration device tests"
+    automation_run_gradle_group "deviceTestTasks" "$AUTOMATION_ROOT"
 fi
 
 automation_info "integration candidate passed all deterministic verification"

package/templates/scripts/automation/verify-task.sh

@@ -17,38 +17,23 @@ evidence_dir="$(automation_evidence_path "$task_id")"
 
 "$SCRIPT_DIR/scope-gate.sh" "$task_id"
 
-while IFS= read -r filter; do
-    automation_info "running focused test: $filter"
-    (
-        cd "$AUTOMATION_ROOT"
-        ./gradlew testDebugUnitTest --tests "$filter"
-    )
-done < <(jq -r '.targetTests[]' "$contract")
+while IFS=$'\t' read -r gradle_task filter; do
+    automation_info "running focused test ($gradle_task): $filter"
+    automation_run_focused_test "$gradle_task" "$filter" "$AUTOMATION_ROOT"
+done < <(jq -r '.targetTests[] | [.gradleTask, .filter] | @tsv' "$contract")
 
 automation_info "running full unit tests"
-(
-    cd "$AUTOMATION_ROOT"
-    ./gradlew testDebugUnitTest
-)
-
-automation_info "building debug APK"
-(
-    cd "$AUTOMATION_ROOT"
-    ./gradlew assembleDebug
-)
-
-automation_info "running Android lint"
-(
-    cd "$AUTOMATION_ROOT"
-    ./gradlew lint
-)
+automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT"
+
+automation_info "running configured assemble tasks"
+automation_run_gradle_group "assembleTasks" "$AUTOMATION_ROOT"
+
+automation_info "running configured Android lint tasks"
+automation_run_gradle_group "lintTasks" "$AUTOMATION_ROOT"
 
 if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
-    automation_info "running connected device tests"
-    (
-        cd "$AUTOMATION_ROOT"
-        ./gradlew connectedDebugAndroidTest
-    )
+    automation_info "running configured device tests"
+    automation_run_gradle_group "deviceTestTasks" "$AUTOMATION_ROOT"
 fi
 
 automation_info "all deterministic verification commands passed"