@frankzhang2026/opencode-android-orchestrator 1.0.4 → 1.1.0

package/templates/scripts/automation/status.sh

@@ -21,6 +21,28 @@ workspace_json="$(if [[ -f "$workspace_file" ]]; then jq -c . "$workspace_file";
 origin_json="$(if [[ -f "$origin_file" ]]; then jq -c . "$origin_file"; else printf 'null'; fi)"
 baseline_json="$(if [[ -f "$evidence_dir/baseline.json" ]]; then jq -c . "$evidence_dir/baseline.json"; else printf 'null'; fi)"
 red_json="$(if [[ -f "$evidence_dir/red.json" ]]; then jq -c . "$evidence_dir/red.json"; else printf 'null'; fi)"
+preflight_json="$(if [[ -f "$evidence_dir/test-preflight.json" ]]; then jq -c . "$evidence_dir/test-preflight.json"; else printf 'null'; fi)"
+manifest_json="$(if [[ -f "$evidence_dir/test-manifest.json" ]]; then jq -c . "$evidence_dir/test-manifest.json"; else printf 'null'; fi)"
+inventory_baseline_json="$(if [[ -f "$evidence_dir/baseline-inventory.json" ]]; then jq -c . "$evidence_dir/baseline-inventory.json"; else printf 'null'; fi)"
+inventory_green_json="$(if [[ -f "$evidence_dir/green-inventory.json" ]]; then jq -c . "$evidence_dir/green-inventory.json"; else printf 'null'; fi)"
+inventory_status_json="$(if [[ -f "$evidence_dir/inventory-status.json" ]]; then jq -c . "$evidence_dir/inventory-status.json"; else printf 'null'; fi)"
+baseline_recovery_json="$(if [[ -f "$evidence_dir/baseline-recovery.json" ]]; then jq -c . "$evidence_dir/baseline-recovery.json"; else printf 'null'; fi)"
+stage_recovery_json='{}'
+for phase in red green review; do
+    if [[ -f "$evidence_dir/stage-recovery/$phase.json" ]]; then
+        stage_recovery_json="$(jq -nc --argjson current "$stage_recovery_json" --arg phase "$phase" \
+            --slurpfile record "$evidence_dir/stage-recovery/$phase.json" '$current + {($phase): $record[0]}')"
+    fi
+done
+supervision_json=null
+if [[ -f "$AUTOMATION_RUNTIME_ROOT/inbox/queue.json" ]]; then
+    supervision_json="$(jq -c --arg task "$task_id" '
+        ([.items[]? | select(.taskId == $task)] | last | .key) as $key |
+        ([.runs[]?, .active] | map(select(.key == $key)) | last | .supervision) |
+        if . == null then null else {state, stage, deadline, stageDeadline, stopReason, termAt, killAt} end
+    ' "$AUTOMATION_RUNTIME_ROOT/inbox/queue.json")"
+    supervision_json="${supervision_json:-null}"
+fi
 ready_json="$(if [[ -f "$evidence_dir/ready.json" ]]; then jq -c . "$evidence_dir/ready.json"; else printf 'null'; fi)"
 review_json="$(if [[ -f "$evidence_dir/review.json" ]]; then jq -c . "$evidence_dir/review.json"; else printf 'null'; fi)"
 gate_json=null
@@ -93,6 +115,14 @@ jq -n \
     --argjson origin "$origin_json" \
     --argjson baseline "$baseline_json" \
     --argjson red "$red_json" \
+    --argjson testPreflight "$preflight_json" \
+    --argjson testManifest "$manifest_json" \
+    --argjson baselineInventory "$inventory_baseline_json" \
+    --argjson greenInventory "$inventory_green_json" \
+    --argjson inventoryStatus "$inventory_status_json" \
+    --argjson baselineRecovery "$baseline_recovery_json" \
+    --argjson stageRecovery "$stage_recovery_json" \
+    --argjson workerSupervision "$supervision_json" \
     --argjson ready "$ready_json" \
     --argjson gate "$gate_json" \
     --argjson review "$review_json" \
@@ -118,6 +148,14 @@ jq -n \
         directory: $evidence,
         baseline: $baseline,
         red: $red,
+        testPreflight: $testPreflight,
+        testManifest: $testManifest,
+        baselineInventory: $baselineInventory,
+        greenInventory: $greenInventory,
+        inventoryStatus: $inventoryStatus,
+        baselineRecovery: $baselineRecovery,
+        stageRecovery: $stageRecovery,
+        workerSupervision: $workerSupervision,
         ready: $ready,
         latestGate: $gate,
         review: $review,

package/templates/scripts/automation/submit-review.sh

@@ -36,9 +36,18 @@ review_log="$evidence_dir/review-verification.log"
 verification_status=0
 if [[ "$decision" == "APPROVED" ]]; then
     set +e
-    "$SCRIPT_DIR/verify-task.sh" "$task_id" 2>&1 | tee "$review_log"
+    contract="$(automation_contract_path "$task_id")"
+    if [[ "$(jq -r '.schemaVersion' "$contract")" -ge "7" ]]; then
+        node "$AUTOMATION_ROOT/automation/verification/recovery.cjs" --stage review "$contract" "$AUTOMATION_CONFIG" "$AUTOMATION_ROOT" "$evidence_dir" 2>&1 | tee "$review_log"
+    else
+        "$SCRIPT_DIR/verify-task.sh" "$task_id" 2>&1 | tee "$review_log"
+    fi
     verification_status=${PIPESTATUS[0]}
     set -e
+    if [[ "$(jq -r '.schemaVersion' "$contract")" -ge "7" && ( "$verification_status" -eq 75 || "$verification_status" -eq 76 ) ]]; then
+        automation_transition_state "$task_id" "REVIEWING" "BLOCKED" "reviewer" "independent verification stopped; inspect stage-recovery/review.json; no implementation change requested"
+        exit "$verification_status"
+    fi
     if [[ "$verification_status" -ne 0 ]]; then
         decision="CHANGES_REQUESTED"
         summary="Independent verification failed with exit $verification_status. $summary"

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

@@ -26,8 +26,12 @@ fi
 [[ -f "$contract" ]] || automation_die "contract not found: $contract"
 jq -e . "$contract" >/dev/null || automation_die "contract is not valid JSON: $contract"
 
+if [[ "$(jq -r '.schemaVersion' "$contract")" -ge "4" ]]; then
+    node "$AUTOMATION_ROOT/automation/verification/contract.cjs" "$contract" "$AUTOMATION_CONFIG" || \
+        automation_die "V4/V5 contract validation failed"
+else
 jq -e '
-    (.schemaVersion == 1 or .schemaVersion == 2) and
+    (.schemaVersion == 1 or .schemaVersion == 2 or .schemaVersion == 3) and
     (.id | type == "string" and test("^TASK-[A-Z0-9-]+$")) and
     (.title | type == "string" and length > 0) and
     .designApproved == true and
@@ -53,11 +57,60 @@ jq -e '
     ([.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)
+    (if .testPolicy == "not-required" then (.testPolicyReason | type == "string" and length >= 20) else true end) and
+    (if .schemaVersion == 3 then
+        (.acceptanceCriteria | length) as $criterionCount |
+        (.targetTests | length) as $targetCount |
+        (.verification | type == "object" and
+         keys == ["cases", "maxPreparationFixes", "version"] and
+         .version == 1 and
+         (.maxPreparationFixes | type == "number" and floor == . and . >= 0 and . <= 1) and
+         (.cases | type == "array" and length > 0) and
+         ([.cases[].id] | length == (unique | length)) and
+         ([.cases[] | [.test.target, .test.className, .test.name] | @json] | length == (unique | length)) and
+         (any(.cases[]; .intent == "change")) and
+         all(.cases[];
+            type == "object" and
+            ([keys[]] - ["id", "criterion", "intent", "before", "after", "source", "test", "expectedFailure"] | length == 0) and
+            (.id | type == "string" and test("^[A-Z][A-Z0-9-]{2,63}$")) and
+            (.criterion | type == "number" and floor == . and . >= 1 and . <= $criterionCount) and
+            .after == "pass" and
+            (.test | type == "object" and keys == ["className", "name", "target"] and
+             (.target | type == "number" and floor == . and . >= 0 and . < $targetCount) and
+             (.className | type == "string" and length > 0) and
+             (.name | type == "string" and length > 0)) and
+            (if .intent == "preserve" then
+                 .before == "pass" and
+                 (.source == "existingTest" or .source == "baselineCapture" or .source == "measuredFact") and
+                 (has("expectedFailure") | not)
+             elif .intent == "change" then
+                 .before == "fail" and .source == "userRequirement" and
+                 (.expectedFailure | type == "object" and
+                  ([keys[]] - ["type", "messageIncludes", "origin"] | length == 0) and
+                  (.type | type == "string" and length > 0) and
+                  (.origin | type == "string" and length >= 12) and
+                  (if has("messageIncludes") then (.messageIncludes | type == "string" and length >= 3) else true end))
+             elif .intent == "observe" then
+                 .before == "observe" and
+                 (.source == "userRequirement" or .source == "existingTest" or .source == "baselineCapture" or .source == "measuredFact") and
+                 (if has("expectedFailure") then
+                    (.expectedFailure | type == "object" and
+                     ([keys[]] - ["type", "messageIncludes", "origin"] | length == 0) and
+                     (.type | type == "string" and length > 0) and
+                     (.origin | type == "string" and length >= 12) and
+                     (if has("messageIncludes") then (.messageIncludes | type == "string" and length >= 3) else true end))
+                  else true end)
+             else false end)))
+     else true end)
 ' "$contract" >/dev/null || automation_die "contract is missing required fields or violates limits"
+fi
 
 task_id="$(jq -r '.id' "$contract")"
 automation_validate_task_id "$task_id"
+if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
+    jq -e '.gradleVerification.deviceTestTasks | length > 0' "$AUTOMATION_CONFIG" >/dev/null || \
+        automation_die "Device tests are required by this contract but no device test tasks are available"
+fi
 
 if [[ "$contract" == "$AUTOMATION_TASKS_DIR/"* ]]; then
     expected_contract="$(automation_contract_path "$task_id")"
@@ -89,7 +142,7 @@ while IFS=$'\t' read -r gradle_task filter; do
         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
+if [[ "$(jq -r '.schemaVersion' "$contract")" -lt "4" ]] && rg -n -i 'replace with|TASK-EXAMPLE|todo|tbd|placeholder' "$contract" >/dev/null; then
     automation_die "contract still contains template placeholders"
 fi
 

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

@@ -28,4 +28,7 @@ if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
     automation_run_gradle_group "deviceTestTasks" "$AUTOMATION_ROOT"
 fi
 
+if [[ "$(jq -r '.schemaVersion' "$contract")" -ge "4" ]]; then
+    automation_run_inventory check "$task_id"
+fi
 automation_info "integration candidate passed all deterministic verification"

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

@@ -15,6 +15,20 @@ evidence_dir="$(automation_evidence_path "$task_id")"
 [[ -f "$evidence_dir/baseline.json" ]] || { automation_die "baseline evidence is missing"; exit 41; }
 [[ -f "$evidence_dir/red.json" ]] || { automation_die "RED evidence is missing"; exit 41; }
 
+contract_schema="$(jq -er '.schemaVersion' "$contract")"
+if [[ "$contract_schema" == "3" ]]; then
+    preflight_meta="$evidence_dir/test-preflight.json"
+    manifest_meta="$evidence_dir/test-manifest.json"
+    red_meta="$evidence_dir/red.json"
+    [[ -f "$preflight_meta" && -f "$manifest_meta" ]] || { automation_die "structured RED evidence is incomplete"; exit 41; }
+    [[ "$(jq -er '.valid' "$preflight_meta")" == "true" ]] || { automation_die "structured RED preflight was not valid"; exit 41; }
+    [[ "$(jq -er '.contractSha256' "$red_meta")" == "$(automation_file_sha256 "$contract")" ]] || { automation_die "RED contract binding changed"; exit 41; }
+    [[ "$(jq -er '.baselineHead' "$red_meta")" == "$(jq -er '.head' "$evidence_dir/baseline.json")" ]] || { automation_die "RED baseline binding changed"; exit 41; }
+    [[ "$(jq -er '.testDiffSha256' "$red_meta")" == "$(automation_test_diff_sha "$task_id" "$AUTOMATION_ROOT")" ]] || { automation_die "tests changed after structured RED"; exit 41; }
+    [[ "$(jq -er '.preflightSha256' "$red_meta")" == "$(automation_file_sha256 "$preflight_meta")" ]] || { automation_die "RED preflight evidence changed"; exit 41; }
+    [[ "$(jq -er '.manifestSha256' "$red_meta")" == "$(automation_file_sha256 "$manifest_meta")" ]] || { automation_die "RED test manifest changed"; exit 41; }
+fi
+
 "$SCRIPT_DIR/scope-gate.sh" "$task_id"
 
 automation_run_configured_unit_tests "$contract" "$AUTOMATION_ROOT"
@@ -30,6 +44,9 @@ if [[ "$(jq -r '.deviceTestsRequired' "$contract")" == "true" ]]; then
 fi
 
 automation_info "all deterministic verification commands passed"
+if [[ "$contract_schema" -ge "4" ]]; then
+    automation_run_inventory check "$task_id"
+fi
 if [[ -n "${AUTOMATION_QUEUE_RUN_ID:-}" ]]; then
     [[ -n "${AUTOMATION_FULL_TEST_LOG:-}" ]] || automation_die "fresh full unit-test evidence is missing"
     jq -n \