@frankzhang2026/opencode-android-orchestrator 0.6.1 → 0.8.0

package/templates/automation/task-contract.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "urn:frankzhang2026:opencode-android-orchestrator:task-contract:v1",
+  "$id": "urn:frankzhang2026:opencode-android-orchestrator:task-contract:v2",
   "title": "Scheduled coding task contract",
   "type": "object",
   "additionalProperties": false,
@@ -27,7 +27,7 @@
     "maxChangedFiles",
     "allowedPaths",
     "forbiddenPaths",
-    "allowedSuperpowers",
+    "allowedWorkflowSkills",
     "acceptanceCriteria",
     "nonGoals",
     "targetTests",
@@ -35,7 +35,7 @@
     "testPolicy"
   ],
   "properties": {
-    "schemaVersion": { "const": 1 },
+    "schemaVersion": { "const": 2 },
     "id": { "type": "string", "pattern": "^TASK-[A-Z0-9-]+$" },
     "title": { "type": "string", "minLength": 1 },
     "designApproved": { "const": true },
@@ -53,12 +53,12 @@
       "minItems": 1,
       "items": { "type": "string", "minLength": 1 }
     },
-    "allowedSuperpowers": {
+    "allowedWorkflowSkills": {
       "type": "array",
       "const": [
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
       ]
     },
     "acceptanceCriteria": {

package/templates/automation/tasks/TASK-TEMPLATE.json.example

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": 1,
+  "schemaVersion": 2,
   "id": "TASK-EXAMPLE-001",
   "title": "Replace with one small, observable behavior change",
   "designApproved": true,
@@ -31,15 +31,15 @@
     "**/build.gradle",
     "**/build.gradle.kts"
   ],
-  "allowedSuperpowers": [
-    "test-driven-development",
-    "systematic-debugging",
-    "verification-before-completion"
+  "allowedWorkflowSkills": [
+    "android-orchestrator-test-driven-development",
+    "android-orchestrator-systematic-debugging",
+    "android-orchestrator-verification-before-completion"
   ],
   "acceptanceCriteria": [
     "Replace with an observable input/output or UI behavior",
     "A focused test demonstrates the behavior and is captured RED before implementation",
-    "Unit tests, debug build, and lint all pass"
+    "Debug build passes; unit tests and Android lint also pass when their configuration flags are enabled"
   ],
   "nonGoals": [
     "Do not refactor unrelated screens",

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

@@ -30,12 +30,21 @@ baseline_meta="$evidence_dir/baseline.json"
 protected_hashes="$evidence_dir/protected.sha256"
 started_at="$(automation_now)"
 head_commit="$(git -C "$AUTOMATION_ROOT" rev-parse HEAD)"
-baseline_command="$(automation_gradle_group_command_json "fullUnitTestTasks")"
+unit_tests_enabled="$(automation_config_value '.unitTestsEnabled')"
+baseline_command='[]'
+if [[ "$unit_tests_enabled" == "true" ]]; then
+    baseline_command="$(automation_gradle_group_command_json "fullUnitTestTasks")"
+fi
 
-set +e
-automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT" 2>&1 | tee "$baseline_log"
-baseline_status=${PIPESTATUS[0]}
-set -e
+if [[ "$unit_tests_enabled" == "true" ]]; then
+    set +e
+    automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT" 2>&1 | tee "$baseline_log"
+    baseline_status=${PIPESTATUS[0]}
+    set -e
+else
+    automation_info "skipping baseline unit tests (unitTestsEnabled=false)" | tee "$baseline_log"
+    baseline_status=0
+fi
 
 if [[ "$baseline_status" -ne 0 ]]; then
     jq -n \
@@ -44,8 +53,9 @@ if [[ "$baseline_status" -ne 0 ]]; then
         --arg finishedAt "$(automation_now)" \
         --arg head "$head_commit" \
         --argjson command "$baseline_command" \
+        --argjson unitTestsEnabled "$unit_tests_enabled" \
         --argjson exitCode "$baseline_status" \
-        '{taskId: $taskId, startedAt: $startedAt, finishedAt: $finishedAt, head: $head, command: $command, exitCode: $exitCode}' \
+        '{taskId: $taskId, startedAt: $startedAt, finishedAt: $finishedAt, head: $head, command: $command, unitTestsEnabled: $unitTestsEnabled, exitCode: $exitCode}' \
         | automation_record_json "$baseline_meta"
     automation_transition_state "$task_id" "CODING" "BLOCKED" "preflight" "baseline unit tests failed"
     automation_die "baseline unit tests failed"
@@ -68,7 +78,12 @@ jq -n \
     --arg head "$head_commit" \
     --arg worktree "$AUTOMATION_ROOT" \
     --argjson command "$baseline_command" \
-    '{taskId: $taskId, startedAt: $startedAt, finishedAt: $finishedAt, head: $head, worktree: $worktree, command: $command, exitCode: 0}' \
+    --argjson unitTestsEnabled "$unit_tests_enabled" \
+    '{taskId: $taskId, startedAt: $startedAt, finishedAt: $finishedAt, head: $head, worktree: $worktree, command: $command, unitTestsEnabled: $unitTestsEnabled, exitCode: 0}' \
     | automation_record_json "$baseline_meta"
 
-automation_info "$task_id claimed; baseline is green"
+if [[ "$unit_tests_enabled" == "true" ]]; then
+    automation_info "$task_id claimed; baseline is green"
+else
+    automation_info "$task_id claimed; baseline unit tests were disabled by configuration"
+fi

package/templates/scripts/automation/lib.sh

@@ -111,7 +111,7 @@ automation_validate_config() {
             length > 0 and
             length == (unique | length) and
             all(.[]; gradle_task);
-        .schemaVersion == 3 and
+        .schemaVersion == 4 and
         (.enabled | type == "boolean") and
         (.mode == "shadow" or .mode == "orchestrated") and
         (.workspaceStrategy == "inPlaceExclusive" or .workspaceStrategy == "isolatedWorktree") and
@@ -120,6 +120,8 @@ automation_validate_config() {
         (.maxFixLoops | type == "number" and . >= 0 and . <= 1 and floor == .) and
         (.maxReviewCycles | type == "number" and . >= 0 and . <= 2 and floor == .) and
         (.maxReviewerRestarts | type == "number" and . >= 0 and . <= 3 and floor == .) and
+        (.unitTestsEnabled | type == "boolean") and
+        (.lintEnabled | type == "boolean") and
         (.longCommandTimeoutMs | type == "number" and . >= 120000 and . <= 7200000 and floor == .) and
         (.autoCleanupWorktrees | type == "boolean") and
         .pushAfterAcceptance == false and
@@ -128,8 +130,6 @@ automation_validate_config() {
         (.approvalPhrases.acceptance | type == "string" and length >= 4) and
         (.approvalPhrases.abort | type == "string" and length >= 4) and
         (.approvalPhrases.resume | type == "string" and length >= 4) and
-        (.plugins | type == "object" and keys == ["superpowers"]) and
-        (.plugins.superpowers | type == "string" and length > 0) and
         (.requiredSkills | type == "array" and length >= 6) and
         (.gradleVerification as $verification |
             ($verification | type == "object") and
@@ -302,6 +302,40 @@ automation_run_gradle_group() {
     )
 }
 
+automation_run_configured_unit_tests() {
+    local contract="${1:-}"
+    local root="${2:-$AUTOMATION_ROOT}"
+    local context="${3:-}"
+
+    [[ -n "$contract" && -f "$contract" ]] || automation_die "unit-test contract does not exist: $contract"
+    automation_validate_config || return 1
+    if [[ "$(automation_config_value '.unitTestsEnabled')" != "true" ]]; then
+        automation_info "skipping ${context}unit tests (unitTestsEnabled=false)"
+        return 0
+    fi
+
+    while IFS=$'\t' read -r gradle_task filter; do
+        automation_info "running ${context}focused test ($gradle_task): $filter"
+        automation_run_focused_test "$gradle_task" "$filter" "$root"
+    done < <(jq -r '.targetTests[] | [.gradleTask, .filter] | @tsv' "$contract")
+
+    automation_info "running ${context}full unit tests"
+    automation_run_gradle_group "fullUnitTestTasks" "$root"
+}
+
+automation_run_configured_lint() {
+    local root="${1:-$AUTOMATION_ROOT}"
+
+    automation_validate_config || return 1
+    if [[ "$(automation_config_value '.lintEnabled')" != "true" ]]; then
+        automation_info "skipping Android lint (lintEnabled=false)"
+        return 0
+    fi
+
+    automation_info "running configured Android lint tasks"
+    automation_run_gradle_group "lintTasks" "$root"
+}
+
 automation_run_focused_test() {
     local task="$1"
     local filter="$2"

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

@@ -86,7 +86,7 @@ for _step in 1 2 3 4 5 6 7 8; do
             if [[ -f "$agent_runs" ]]; then
                 review_attempt="$(jq -s --argjson cycle "$review_cycle" '[.[] | select(.role == "scheduled-reviewer" and .cycle == $cycle)] | length' "$agent_runs")"
             fi
-            reviewer_prompt="Use \$scheduled-quality-reviewer with $task_id. This is fresh, non-interactive, read-only review attempt $review_attempt for sealed review cycle $review_cycle. Work within the step budget. Run exactly ./scripts/automation/status.sh $task_id once; its JSON already includes baseline, RED, ready, latest gate, current diff SHA, the sealed-SHA comparison, and runtime.effectiveWorktreeAllowlist, so do not browse the external evidence directory. Then inspect the approved contract and run exactly git diff, excluding the control file and every exact path in that effective list from review findings. Submit exactly one decision. Do not browse generated build reports, list the whole repository, retry denied command variants, or run Gradle commands separately before deciding: submit-review.sh performs and records the focused tests, full unit suite, assembleDebug, and lint for APPROVED. Reserve a tool call for submit-review.sh. Never edit, commit, merge, or push."
+            reviewer_prompt="Use \$scheduled-quality-reviewer with $task_id. This is fresh, non-interactive, read-only review attempt $review_attempt for sealed review cycle $review_cycle. Work within the step budget. Run exactly ./scripts/automation/status.sh $task_id once; its JSON already includes baseline, RED, ready, latest gate, current diff SHA, the sealed-SHA comparison, and runtime.effectiveWorktreeAllowlist, so do not browse the external evidence directory. Then inspect the approved contract and run exactly git diff, excluding the control file and every exact path in that effective list from review findings. Submit exactly one decision. Do not browse generated build reports, list the whole repository, retry denied command variants, or run Gradle commands separately before deciding: submit-review.sh performs and records focused and full unit tests when unitTestsEnabled is true, always runs assembleDebug, and runs Android lint when lintEnabled is true for APPROVED. Reserve a tool call for submit-review.sh. Never edit, commit, merge, or push."
             run_agent scheduled-reviewer "$reviewer_prompt" "$review_cycle" "$review_attempt" || true
             if [[ "$(automation_read_state "$task_id")" == "REVIEWING" ]]; then
                 automation_transition_state "$task_id" "REVIEWING" "BLOCKED" "orchestrator" "reviewer exited without submitting a decision; sealed diff preserved for reviewer-only recovery"

package/templates/scripts/automation/preflight.sh

@@ -127,9 +127,6 @@ else
     if ! automation_resolve_opencode_config "$discovery_dir/config.json" "$discovery_dir/config.err"; then
         automation_die "OpenCode resolved config failed; see $discovery_dir/config.err"
     fi
-    superpowers_pin="$(jq -r '.plugins.superpowers' "$AUTOMATION_CONFIG")"
-    rg -F "$superpowers_pin" "$discovery_dir/config.json" >/dev/null || automation_die "resolved OpenCode config is missing pinned Superpowers"
-
     if ! opencode debug skill > "$discovery_dir/skills.txt" 2> "$discovery_dir/skills.err"; then
         automation_die "OpenCode skill discovery failed; see $discovery_dir/skills.err"
     fi

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

@@ -110,7 +110,7 @@ printf '%s\n' \
 chmod +x "$fixture/gradlew"
 
 jq -n '{
-    schemaVersion: 3,
+    schemaVersion: 4,
     enabled: true,
     mode: "orchestrated",
     workspaceStrategy: "inPlaceExclusive",
@@ -119,6 +119,8 @@ jq -n '{
     maxFixLoops: 1,
     maxReviewCycles: 1,
     maxReviewerRestarts: 2,
+    unitTestsEnabled: true,
+    lintEnabled: false,
     longCommandTimeoutMs: 1800000,
     autoCleanupWorktrees: true,
     pushAfterAcceptance: false,
@@ -129,18 +131,15 @@ jq -n '{
         abort: "中止任务，封存修改并恢复原分支。",
         resume: "恢复任务，重新捕获基线并继续自动执行。"
     },
-    plugins: {
-        superpowers: "superpowers@git+https://github.com/obra/superpowers.git#v6.2.0"
-    },
     requiredSkills: [
-        "brainstorming",
-        "writing-plans",
+        "android-orchestrator-brainstorming",
+        "android-orchestrator-writing-plans",
         "scheduled-quality-orchestrator",
         "scheduled-quality-coder",
         "scheduled-quality-reviewer",
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
     ],
     gradleVerification: {
         fullUnitTestTasks: ["testDebugUnitTest"],
@@ -193,7 +192,7 @@ jq -n '{
 }' > "$fixture/automation/config.json"
 
 jq -n '{
-    schemaVersion: 1,
+    schemaVersion: 2,
     id: "TASK-TEST-001",
     title: "Add an observable greeting behavior",
     designApproved: true,
@@ -225,10 +224,10 @@ jq -n '{
         "**/build.gradle.kts",
         "mobile-client/build.gradle.kts"
     ],
-    allowedSuperpowers: [
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+    allowedWorkflowSkills: [
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
     ],
     acceptanceCriteria: ["Greeting returns the approved value"],
     nonGoals: ["No unrelated refactoring"],
@@ -319,7 +318,29 @@ printf '%s\n' \
 pass 'invalid, duplicate, symbolic-link, patterned, and protected allowlist input fails closed'
 
 run_fixture ./scripts/automation/validate-contract.sh TASK-TEST-001 >/dev/null
-pass 'valid version-3 configuration and task contract are accepted'
+verification_config_backup="$(mktemp "$runtime_root/config.json.XXXXXX")"
+cp "$fixture/automation/config.json" "$verification_config_backup"
+
+unit_enabled_output="$(run_fixture env AUTOMATION_FAKE_GREEN=1 bash -c 'source ./scripts/automation/lib.sh; automation_run_configured_unit_tests ./automation/tasks/TASK-TEST-001.json')"
+[[ "$unit_enabled_output" == *"running focused test"* ]] || fail 'default unit-test policy did not run the focused test'
+[[ "$unit_enabled_output" == *"running full unit tests"* ]] || fail 'default unit-test policy did not run the full unit-test group'
+[[ "$unit_enabled_output" == *"BUILD SUCCESSFUL"* ]] || fail 'enabled unit-test policy did not execute configured tests'
+jq '.unitTestsEnabled = false' "$verification_config_backup" > "$fixture/automation/config.json"
+unit_disabled_output="$(run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_run_configured_unit_tests ./automation/tasks/TASK-TEST-001.json')"
+[[ "$unit_disabled_output" == *"skipping unit tests (unitTestsEnabled=false)"* ]] || fail 'disabled unit-test policy did not skip verification'
+[[ "$unit_disabled_output" != *"BUILD SUCCESSFUL"* ]] || fail 'disabled unit-test policy executed a configured test'
+cp "$verification_config_backup" "$fixture/automation/config.json"
+
+lint_disabled_output="$(run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_run_configured_lint')"
+[[ "$lint_disabled_output" == *"skipping Android lint (lintEnabled=false)"* ]] || fail 'default lint policy did not skip Android lint'
+jq '.lintEnabled = true' "$verification_config_backup" > "$fixture/automation/config.json"
+lint_enabled_output="$(run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_run_configured_lint')"
+[[ "$lint_enabled_output" == *"running configured Android lint tasks"* ]] || fail 'enabled lint policy did not run Android lint'
+[[ "$lint_enabled_output" == *"BUILD SUCCESSFUL"* ]] || fail 'enabled lint policy did not execute the configured lint task'
+cp "$verification_config_backup" "$fixture/automation/config.json"
+rm "$verification_config_backup"
+run_fixture ./scripts/automation/validate-contract.sh TASK-TEST-001 >/dev/null
+pass 'repository configuration defaults unit tests on and lint off and honors both switches'
 
 if run_fixture env AUTOMATION_HUMAN_APPROVED=0 ./scripts/automation/queue-task.sh TASK-TEST-001 >/dev/null 2>&1; then
     fail 'legacy queue accepted without explicit human approval'

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

@@ -27,7 +27,7 @@ fi
 jq -e . "$contract" >/dev/null || automation_die "contract is not valid JSON: $contract"
 
 jq -e '
-    .schemaVersion == 1 and
+    (.schemaVersion == 1 or .schemaVersion == 2) and
     (.id | type == "string" and test("^TASK-[A-Z0-9-]+$")) and
     (.title | type == "string" and length > 0) and
     .designApproved == true and
@@ -37,7 +37,12 @@ jq -e '
     (.maxChangedFiles | type == "number" and . >= 1 and . <= 12 and floor == .) and
     (.allowedPaths | type == "array" and length > 0) and
     (.forbiddenPaths | type == "array" and length > 0) and
-    (.allowedSuperpowers == ["test-driven-development", "systematic-debugging", "verification-before-completion"]) and
+    (if .schemaVersion == 1 then
+        .allowedSuperpowers == ["test-driven-development", "systematic-debugging", "verification-before-completion"]
+     else
+        .allowedWorkflowSkills == ["android-orchestrator-test-driven-development", "android-orchestrator-systematic-debugging", "android-orchestrator-verification-before-completion"] and
+        (has("allowedSuperpowers") | not)
+     end) and
     (.acceptanceCriteria | type == "array" and length > 0) and
     (.nonGoals | type == "array" and length > 0) and
     (.targetTests | type == "array" and length > 0 and all(.[];

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

@@ -16,19 +16,12 @@ contract="$(automation_contract_path "$task_id")"
 
 "$SCRIPT_DIR/integration-scope-gate.sh" "$task_id" "$base" "$head"
 
-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"
-automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT"
+automation_run_configured_unit_tests "$contract" "$AUTOMATION_ROOT" "integration "
 
 automation_info "running configured integration assemble tasks"
 automation_run_gradle_group "assembleTasks" "$AUTOMATION_ROOT"
 
-automation_info "running configured integration Android lint tasks"
-automation_run_gradle_group "lintTasks" "$AUTOMATION_ROOT"
+automation_run_configured_lint "$AUTOMATION_ROOT"
 
 if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
     automation_info "running configured integration device tests"

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

@@ -17,19 +17,12 @@ evidence_dir="$(automation_evidence_path "$task_id")"
 
 "$SCRIPT_DIR/scope-gate.sh" "$task_id"
 
-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"
-automation_run_gradle_group "fullUnitTestTasks" "$AUTOMATION_ROOT"
+automation_run_configured_unit_tests "$contract" "$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"
+automation_run_configured_lint "$AUTOMATION_ROOT"
 
 if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
     automation_info "running configured device tests"