@frankzhang2026/opencode-android-orchestrator 0.9.0 → 1.0.0

package/templates/scripts/automation/lib.sh

@@ -50,6 +50,9 @@ AUTOMATION_WORKSPACES_DIR="$AUTOMATION_RUNTIME_ROOT/workspaces"
 AUTOMATION_WORKTREE_ALLOWLIST_RELATIVE_PATH=".automation-worktree-allowlist"
 AUTOMATION_WORKTREE_ALLOWLIST_MAX_BYTES=65536
 AUTOMATION_WORKTREE_ALLOWLIST_MAX_ENTRIES=256
+AUTOMATION_COMMIT_MESSAGE_PREFIX_RELATIVE_PATH="automation/automation-commit-prefix"
+AUTOMATION_COMMIT_MESSAGE_PREFIX_FILE_MAX_BYTES=4096
+AUTOMATION_COMMIT_MESSAGE_PREFIX_MAX_BYTES=256
 
 automation_info() {
     printf '[automation] %s\n' "$*"
@@ -111,7 +114,9 @@ automation_validate_config() {
             length > 0 and
             length == (unique | length) and
             all(.[]; gradle_task);
-        .schemaVersion == 4 and
+        (.schemaVersion == 5 or .schemaVersion == 6) and
+        ((.commitPolicy // "humanApproval") == "humanApproval" or .commitPolicy == "autoCommit") and
+        (.workspaceStrategy != "isolatedWorktree" or (.commitPolicy // "humanApproval") == "humanApproval") and
         (.enabled | type == "boolean") and
         (.mode == "shadow" or .mode == "orchestrated") and
         (.workspaceStrategy == "inPlaceExclusive" or .workspaceStrategy == "isolatedWorktree") and
@@ -122,6 +127,7 @@ automation_validate_config() {
         (.maxReviewerRestarts | type == "number" and . >= 0 and . <= 3 and floor == .) and
         (.unitTestsEnabled | type == "boolean") and
         (.lintEnabled | type == "boolean") and
+        (.commitMessagePrefixMode == "required" or .commitMessagePrefixMode == "disabled") and
         (.longCommandTimeoutMs | type == "number" and . >= 120000 and . <= 7200000 and floor == .) and
         (.autoCleanupWorktrees | type == "boolean") and
         .pushAfterAcceptance == false and
@@ -213,6 +219,26 @@ automation_workspace_path() {
     printf '%s/%s.json\n' "$AUTOMATION_WORKSPACES_DIR" "$task_id"
 }
 
+automation_require_queue_execution() {
+    local task_id="$1"
+    local workspace_file queue_key group
+    workspace_file="$(automation_workspace_path "$task_id")"
+    [[ -f "$workspace_file" ]] || return 0
+    queue_key="$(jq -r '.queueKey // empty' "$workspace_file")"
+    [[ -n "$queue_key" ]] || return 0
+    [[ -n "${AUTOMATION_QUEUE_RUN_ID:-}" ]] || {
+        automation_die "queued tasks must use the repository queue for execution, integration and recovery"
+        return 1
+    }
+    group="$(ps -o pgid= -p "$$" | tr -d ' ')"
+    jq -e --arg key "$queue_key" --arg run "$AUTOMATION_QUEUE_RUN_ID" --argjson group "$group" \
+        '.active.key == $key and .active.id == $run and .active.worker.pid == $group' \
+        "$AUTOMATION_RUNTIME_ROOT/inbox/queue.json" >/dev/null || {
+            automation_die "current process does not own this task queue execution"
+            return 1
+        }
+}
+
 automation_workspace_strategy() {
     local workspace_file="$1"
     jq -er '.workspaceStrategy // "isolatedWorktree"' "$workspace_file"
@@ -246,6 +272,92 @@ automation_config_value() {
     jq -r "$query" "$AUTOMATION_CONFIG"
 }
 
+automation_read_commit_message_prefix_at() {
+    local root="$1"
+    local config_file="$root/automation/config.json"
+    local prefix_file="$root/$AUTOMATION_COMMIT_MESSAGE_PREFIX_RELATIVE_PATH"
+    local mode byte_count line prefix prefix_bytes
+    local active_count=0
+
+    if [[ -L "$config_file" || ! -f "$config_file" ]]; then
+        automation_die "missing or unsafe automation configuration: $config_file"
+        return 1
+    fi
+    mode="$(jq -er '.commitMessagePrefixMode' "$config_file")" || {
+        automation_die "commitMessagePrefixMode is missing from $config_file"
+        return 1
+    }
+    case "$mode" in
+        disabled) return 0 ;;
+        required) ;;
+        *)
+            automation_die "unsupported commitMessagePrefixMode: $mode"
+            return 1
+            ;;
+    esac
+
+    if [[ ! -e "$prefix_file" && ! -L "$prefix_file" ]]; then
+        automation_die "commit-message prefix is required; fill $prefix_file before starting a task"
+        return 1
+    fi
+    if [[ -L "$prefix_file" || ! -f "$prefix_file" ]]; then
+        automation_die "commit-message prefix must be a regular file, not a symlink: $prefix_file"
+        return 1
+    fi
+    byte_count="$(wc -c < "$prefix_file" | tr -d '[:space:]')"
+    if [[ ! "$byte_count" =~ ^[0-9]+$ ]] || \
+       [[ "$byte_count" -gt "$AUTOMATION_COMMIT_MESSAGE_PREFIX_FILE_MAX_BYTES" ]]; then
+        automation_die "commit-message prefix file exceeds $AUTOMATION_COMMIT_MESSAGE_PREFIX_FILE_MAX_BYTES bytes: $prefix_file"
+        return 1
+    fi
+
+    while IFS= read -r line || [[ -n "$line" ]]; do
+        line="${line%$'\r'}"
+        [[ -z "$line" || "$line" =~ ^[[:space:]]*$ || "$line" =~ ^[[:space:]]*# ]] && continue
+        active_count=$((active_count + 1))
+        if [[ "$active_count" -gt 1 ]]; then
+            automation_die "commit-message prefix must contain exactly one non-comment line: $prefix_file"
+            return 1
+        fi
+        if [[ "$line" == [[:space:]]* || "$line" == *[[:space:]] ]]; then
+            automation_die "commit-message prefix must not have leading or trailing whitespace"
+            return 1
+        fi
+        case "$line" in
+            *[[:cntrl:]]*)
+                automation_die "commit-message prefix must not contain control characters"
+                return 1
+                ;;
+        esac
+        prefix="$line"
+    done < "$prefix_file"
+
+    if [[ "$active_count" -eq 0 ]]; then
+        automation_die "commit-message prefix is not configured; fill $prefix_file before starting a task"
+        return 1
+    fi
+    prefix_bytes="$(printf '%s' "$prefix" | wc -c | tr -d '[:space:]')"
+    if [[ ! "$prefix_bytes" =~ ^[0-9]+$ ]] || \
+       [[ "$prefix_bytes" -gt "$AUTOMATION_COMMIT_MESSAGE_PREFIX_MAX_BYTES" ]]; then
+        automation_die "commit-message prefix exceeds $AUTOMATION_COMMIT_MESSAGE_PREFIX_MAX_BYTES UTF-8 bytes"
+        return 1
+    fi
+    printf '%s\n' "$prefix"
+}
+
+automation_commit_message_at() {
+    local root="$1"
+    local base_message="$2"
+    local prefix
+
+    prefix="$(automation_read_commit_message_prefix_at "$root")" || return 1
+    if [[ -n "$prefix" ]]; then
+        printf '%s %s\n' "$prefix" "$base_message"
+    else
+        printf '%s\n' "$base_message"
+    fi
+}
+
 automation_validate_gradle_task() {
     local task="${1:-}"
     local safe_task_pattern='^([A-Za-z][A-Za-z0-9_.-]*|(:[A-Za-z0-9_.-]+)+)$'
@@ -296,12 +408,75 @@ automation_run_gradle_group() {
         return 1
     }
 
+    if [[ "$group" == "fullUnitTestTasks" && -n "${AUTOMATION_QUEUE_RUN_ID:-}" ]]; then
+        automation_run_fresh_unit_tests "$root" "${tasks[@]}"
+        return $?
+    fi
     (
         cd "$root"
         ./gradlew "${tasks[@]}"
     )
 }
 
+# Queue execution reruns Test tasks while preserving compilation/build caches.
+# The init script disables only Test output reuse, including FROM-CACHE, and
+# emits actual test counts. No clean task or model polling is involved.
+automation_run_fresh_unit_tests() {
+    local root="$1"
+    shift
+    local init_file log_file result elapsed start
+    mkdir -p "$AUTOMATION_RUNTIME_ROOT/gradle"
+    init_file="$(mktemp "$AUTOMATION_RUNTIME_ROOT/gradle/fresh-tests.XXXXXX")"
+    log_file="${init_file}.log"
+    cat > "$init_file" <<'GRADLE'
+gradle.allprojects { project ->
+    project.tasks.withType(org.gradle.api.tasks.testing.Test).configureEach { testTask ->
+        outputs.upToDateWhen { false }
+        outputs.doNotCacheIf('Orchestrator requires fresh unit-test execution') { true }
+        if (testTask.hasProperty('dryRun')) testTask.dryRun = false
+        afterSuite { descriptor, result ->
+            if (descriptor.parent == null) {
+                logger.lifecycle("ORCHESTRATOR_TEST_RESULT|${testTask.path}|${result.testCount}|${result.failedTestCount}|${result.skippedTestCount}")
+            }
+        }
+    }
+}
+gradle.taskGraph.whenReady { graph ->
+    graph.allTasks.findAll { it instanceof org.gradle.api.tasks.testing.Test }.each { task ->
+        task.logger.lifecycle("ORCHESTRATOR_TEST_EXPECTED|${task.path}")
+    }
+}
+gradle.taskGraph.afterTask { task, state ->
+    if (task instanceof org.gradle.api.tasks.testing.Test && state.noSource) {
+        task.logger.lifecycle("ORCHESTRATOR_TEST_NO_SOURCE|${task.path}")
+    }
+}
+GRADLE
+    start="$(date +%s)"
+    set +e
+    (cd "$root" && ./gradlew "$@" --no-configuration-cache --console=plain --init-script "$init_file") 2>&1 | tee "$log_file"
+    result=${PIPESTATUS[0]}
+    set -e
+    elapsed=$(( $(date +%s) - start ))
+    [[ "$result" -eq 0 ]] || return "$result"
+    # A successful build with only cached, skipped or empty suites is not proof
+    # that the required regression tests actually executed.
+    awk -F '|' '
+      /^ORCHESTRATOR_TEST_EXPECTED\|/ { expected[$2] = 1; count++ }
+      /^ORCHESTRATOR_TEST_RESULT\|/ { verified[$2] = 1; total += $3 - $5; failed += $4 }
+      /^ORCHESTRATOR_TEST_NO_SOURCE\|/ { verified[$2] = 1 }
+      END {
+        for (task in expected) if (!verified[task]) missing++
+        exit !(count > 0 && total > 0 && failed == 0 && missing == 0)
+      }' "$log_file" || {
+        automation_die "full unit tests produced no fresh successful test results"
+        return 1
+    }
+    AUTOMATION_FULL_TEST_LOG="$log_file"
+    AUTOMATION_FULL_TEST_ELAPSED="$elapsed"
+    automation_info "fresh full unit tests executed in ${elapsed}s; log: $log_file"
+}
+
 automation_run_configured_unit_tests() {
     local contract="${1:-}"
     local root="${2:-$AUTOMATION_ROOT}"
@@ -309,6 +484,12 @@ automation_run_configured_unit_tests() {
 
     [[ -n "$contract" && -f "$contract" ]] || automation_die "unit-test contract does not exist: $contract"
     automation_validate_config || return 1
+    if [[ -n "${AUTOMATION_QUEUE_RUN_ID:-}" ]]; then
+        [[ "$(automation_config_value '.unitTestsEnabled')" == "true" ]] || {
+            automation_die "queued execution requires full unit tests"
+            return 1
+        }
+    fi
     if [[ "$(automation_config_value '.unitTestsEnabled')" != "true" ]]; then
         automation_info "skipping ${context}unit tests (unitTestsEnabled=false)"
         return 0
@@ -453,7 +634,7 @@ automation_validate_worktree_allowlist_entry_at() {
             ;;
     esac
     case "$path" in
-        /*|./*|.|..|.git|.git/*|docs/plans|docs/plans/*|"$AUTOMATION_WORKTREE_ALLOWLIST_RELATIVE_PATH")
+        /*|./*|.|..|.git|.git/*|docs/plans|docs/plans/*|"$AUTOMATION_WORKTREE_ALLOWLIST_RELATIVE_PATH"|"$AUTOMATION_COMMIT_MESSAGE_PREFIX_RELATIVE_PATH")
             automation_die "worktree allowlist entry is reserved or unsafe: $path"
             return 1
             ;;
@@ -608,6 +789,7 @@ automation_worktree_path_is_allowlisted() {
     local entry
 
     [[ "$path" == "$AUTOMATION_WORKTREE_ALLOWLIST_RELATIVE_PATH" ]] && return 0
+    [[ "$path" == "$AUTOMATION_COMMIT_MESSAGE_PREFIX_RELATIVE_PATH" ]] && return 0
     while IFS= read -r entry; do
         [[ -n "$entry" ]] || continue
         [[ "$path" == "$entry" ]] && return 0
@@ -971,6 +1153,7 @@ automation_transition_allowed() {
         READY_FOR_REVIEW:REVIEWING:orchestrator) return 0 ;;
         READY_FOR_REVIEW:BLOCKED:orchestrator) return 0 ;;
         REVIEWING:AWAITING_HUMAN:reviewer) return 0 ;;
+        REVIEWING:READY_TO_COMMIT:reviewer) return 0 ;;
         REVIEWING:CHANGES_REQUESTED:reviewer) return 0 ;;
         REVIEWING:BLOCKED:orchestrator) return 0 ;;
         BLOCKED:REVIEWING:human) return 0 ;;
@@ -979,6 +1162,7 @@ automation_transition_allowed() {
         AWAITING_HUMAN:INTEGRATING:integrator) return 0 ;;
         INTEGRATING:COMPLETED:integrator) return 0 ;;
         INTEGRATING:INTEGRATION_BLOCKED:integrator) return 0 ;;
+        READY_TO_COMMIT:ABORTED:human) return 0 ;;
         PREPARING:ABORTED:human|PENDING:ABORTED:human|CODING:ABORTED:human|READY_FOR_REVIEW:ABORTED:human|REVIEWING:ABORTED:human|CHANGES_REQUESTED:ABORTED:human|AWAITING_HUMAN:ABORTED:human|BLOCKED:ABORTED:human|TEST_FAILED:ABORTED:human|NEEDS_HUMAN:ABORTED:human|INTEGRATION_BLOCKED:ABORTED:human) return 0 ;;
         *) return 1 ;;
     esac

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

@@ -8,6 +8,7 @@ source "$SCRIPT_DIR/lib.sh"
 task_id="${1:-}"
 [[ "$#" -eq 1 ]] || { printf 'Usage: %s TASK-ID\n' "$0" >&2; exit 2; }
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 automation_require_orchestrated
 
 workspace_file="$(automation_workspace_path "$task_id")"
@@ -19,6 +20,7 @@ source_root="$(jq -er '.sourceRoot' "$workspace_file")"
 if [[ "$(jq -r '.repositoryLeaseRequired // false' "$workspace_file")" == "true" ]]; then
     automation_require_repository_lease "$task_id" "$source_root" "$workspace_strategy"
 fi
+automation_read_commit_message_prefix_at "$source_root" >/dev/null
 
 automation_acquire_run_lock "$task_id"
 trap 'automation_release_run_lock' EXIT
@@ -62,6 +64,12 @@ run_agent() {
 }
 
 for _step in 1 2 3 4 5 6 7 8; do
+    if [[ -n "${AUTOMATION_QUEUE_RUN_ID:-}" ]] && jq -e --arg id "$task_id" \
+        'any(.items[]; .taskId == $id and .request.kind == "abort")' \
+        "$AUTOMATION_RUNTIME_ROOT/inbox/queue.json" >/dev/null; then
+        automation_info "$task_id has an approved abort request; returning at a safe agent boundary"
+        exit 0
+    fi
     state="$(automation_read_state "$task_id")"
     case "$state" in
         PENDING|CODING)
@@ -98,6 +106,10 @@ for _step in 1 2 3 4 5 6 7 8; do
                 ./scripts/automation/resume-review-fix.sh "$task_id"
             ) || true
             ;;
+        READY_TO_COMMIT)
+            automation_info "$task_id reached READY_TO_COMMIT; queue executor will verify the sealed authorization"
+            exit 0
+            ;;
         AWAITING_HUMAN)
             automation_info "$task_id reached AWAITING_HUMAN"
             (

package/templates/scripts/automation/preflight.sh

@@ -47,6 +47,17 @@ mode="$(automation_config_value '.mode')"
 
 [[ "$enabled" == "true" ]] || fail_or_warn "automation is disabled"
 [[ "$mode" == "orchestrated" ]] || fail_or_warn "automation mode is $mode, not orchestrated"
+prefix_validation_error=""
+prefix_root="$AUTOMATION_ROOT"
+if [[ -n "$task_id" ]]; then
+    prefix_workspace_file="$(automation_workspace_path "$task_id")"
+    if [[ -f "$prefix_workspace_file" ]]; then
+        prefix_root="$(jq -er '.sourceRoot' "$prefix_workspace_file")"
+    fi
+fi
+if ! prefix_validation_error="$(automation_read_commit_message_prefix_at "$prefix_root" 2>&1 >/dev/null)"; then
+    fail_or_warn "$prefix_validation_error"
+fi
 
 if [[ "${AUTOMATION_TEST_MODE:-0}" != "1" ]]; then
     [[ -n "${ANDROID_HOME:-}" ]] || fail_or_warn "ANDROID_HOME is not set; configure the Android SDK environment before running OpenCode"
@@ -55,11 +66,15 @@ if [[ "${AUTOMATION_TEST_MODE:-0}" != "1" ]]; then
     fi
 fi
 
-if [[ -z "$task_id" ]] && ! automation_worktree_is_clean; then
+intake_mode=0
+if [[ "$source_mode" == "1" && "$(automation_config_value '.schemaVersion')" == "6" ]]; then
+    intake_mode=1
+fi
+if [[ -z "$task_id" && "$intake_mode" != "1" ]] && ! automation_worktree_is_clean; then
     fail_or_warn "Git worktree is dirty"
 fi
 
-if [[ "$source_mode" == "1" ]]; then
+if [[ "$source_mode" == "1" && "$intake_mode" != "1" ]]; then
     repository_lease_file="$(automation_repository_lease_dir)/lease.json"
     if [[ -f "$repository_lease_file" ]]; then
         fail_or_warn "repository workspace is leased by $(jq -r '.taskId // "an unknown task"' "$repository_lease_file")"
@@ -147,7 +162,7 @@ else
         def last_rule($permission; $pattern):
             [.permission[] | select(.permission == $permission and .pattern == $pattern) | .action][-1];
         (last_rule("*"; "*") == "deny") and
-        (last_rule("edit"; "docs/plans/**") == "allow") and
+        (((last_rule("edit"; "docs/plans/**") == "allow") and
         (last_rule("edit"; "automation/tasks/**") == "allow") and
         (last_rule("edit"; "**/src/**") == "deny") and
         (last_rule("bash"; "./scripts/automation/prepare-contract-review.sh *") == "allow") and
@@ -155,7 +170,13 @@ else
         (last_rule("bash"; "./scripts/automation/resume-task.sh *") == "allow") and
         (last_rule("bash"; "./scripts/automation/resume-review.sh *") == "allow") and
         (last_rule("bash"; "./scripts/automation/accept-and-integrate.sh *") == "allow") and
-        (last_rule("bash"; "./scripts/automation/abort-task.sh *") == "allow") and
+        (last_rule("bash"; "./scripts/automation/abort-task.sh *") == "allow")) or
+         ((last_rule("read"; "*") == "deny") and
+          (last_rule("edit"; "*") == "deny") and
+          (last_rule("bash"; "*") == "deny") and
+          (last_rule("android_orchestrator_snapshot"; "*") == "allow") and
+          (last_rule("android_orchestrator_intake"; "*") == "allow") and
+          (last_rule("android_orchestrator_queue"; "*") == "allow"))) and
         (last_rule("android_orchestrator_status"; "*") == "allow") and
         (last_rule("android_orchestrator_doctor"; "*") == "allow") and
         (last_rule("schedule_job"; "*") == "deny") and

package/templates/scripts/automation/prepare-contract-review.sh

@@ -14,6 +14,10 @@ fi
 
 automation_validate_task_id "$task_id"
 automation_require_orchestrated
+[[ "$(automation_config_value '.schemaVersion')" != "6" ]] || {
+    automation_die "use android_orchestrator_intake draft to seal artifacts in the independent inbox"
+    exit 1
+}
 automation_require_approval proposal "$approval"
 automation_assert_repository_lease_available "$task_id"
 "$SCRIPT_DIR/validate-contract.sh" "$task_id" >/dev/null

package/templates/scripts/automation/quality-gate.sh

@@ -8,6 +8,7 @@ source "$SCRIPT_DIR/lib.sh"
 task_id="${1:-}"
 [[ -n "$task_id" ]] || { printf 'Usage: %s TASK-ID\n' "$0" >&2; exit 2; }
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 [[ "$(automation_read_state "$task_id")" == "CODING" ]] || automation_die "$task_id is not CODING"
 "$SCRIPT_DIR/validate-contract.sh" "$task_id" >/dev/null
 

package/templates/scripts/automation/record-red.sh

@@ -16,6 +16,7 @@ if [[ -z "$task_id" || -z "$expected" || "$separator" != "--" || -z "$filter" ||
 fi
 
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 automation_validate_test_filter "$filter"
 [[ ${#expected} -ge 3 ]] || automation_die "expected failure text is too short"
 [[ "$(automation_read_state "$task_id")" == "CODING" ]] || automation_die "$task_id is not CODING"

package/templates/scripts/automation/resume-review-fix.sh

@@ -8,6 +8,7 @@ source "$SCRIPT_DIR/lib.sh"
 task_id="${1:-}"
 [[ "$#" -eq 1 ]] || { printf 'Usage: %s TASK-ID\n' "$0" >&2; exit 2; }
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 [[ "$(automation_read_state "$task_id")" == "CHANGES_REQUESTED" ]] || automation_die "$task_id is not CHANGES_REQUESTED"
 
 workspace_file="$(automation_workspace_path "$task_id")"

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

@@ -8,6 +8,7 @@ source "$SCRIPT_DIR/lib.sh"
 task_id="${1:-}"
 [[ "$#" -eq 1 ]] || { printf 'Usage: %s TASK-ID\n' "$0" >&2; exit 2; }
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 automation_require_orchestrated
 
 workspace_file="$(automation_workspace_path "$task_id")"

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

@@ -13,6 +13,7 @@ if [[ "$#" -ne 2 ]]; then
 fi
 
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 automation_require_orchestrated
 automation_require_approval resume "$approval"
 

package/templates/scripts/automation/scope-gate.sh

@@ -17,9 +17,17 @@ baseline_meta="$evidence_dir/baseline.json"
 
 baseline_head="$(jq -er '.head' "$baseline_meta")"
 current_head="$(git -C "$AUTOMATION_ROOT" rev-parse HEAD)"
-[[ "$baseline_head" == "$current_head" ]] || { automation_die "HEAD changed after baseline"; exit 40; }
-
 workspace_file="$(automation_workspace_path "$task_id")"
+if [[ "$baseline_head" != "$current_head" ]]; then
+    automation_require_queue_execution "$task_id"
+    jq -e --arg original "$baseline_head" --arg current "$current_head" \
+        '.queueKey != null and .workspaceStrategy == "isolatedWorktree" and
+         .originalBaselineHead == $original and .baselineHead == $current and
+         .revalidationRunId != null' "$workspace_file" >/dev/null || {
+        automation_die "HEAD changed after baseline"
+        exit 40
+    }
+fi
 planning_commit_policy="$(jq -r '.planningArtifactsCommitPolicy // "legacyCommittedSeparately"' "$workspace_file")"
 if [[ "$planning_commit_policy" == "withProductChanges" ]]; then
     automation_assert_planning_artifacts_sealed "$task_id" "$AUTOMATION_ROOT" || exit 40

package/templates/scripts/automation/show-acceptance-review.sh

@@ -45,6 +45,8 @@ report_diff_sha="$(jq -er '.sealedDiffSha256' "$report_file")"
 changed_count="$(jq -er '.changedPaths | length' "$report_file")"
 max_changed_files="$(jq -er '.maxChangedFiles' "$report_file")"
 device_tests_required="$(jq -r '.deviceTestsRequired' "$report_file")"
+title="$(jq -er '.title' "$report_file")"
+commit_message="$(automation_commit_message_at "$source_root" "Implement $title ($task_id)")"
 
 printf '# 🔔 人工验收提醒\n\n'
 printf '自动执行已停在 `AWAITING_HUMAN`。下面内容已重新核对 sealed diff；此时代码、计划与任务合同均尚未提交或集成。\n\n'
@@ -58,6 +60,7 @@ printf '| 任务分支收尾 | 成功集成后自动删除；失败或阻塞时
 printf '| sealed diff SHA | `%s` |\n' "$report_diff_sha"
 printf '| 变更范围 | 实际 %s 个 / 合同上限 %s 个 |\n' "$changed_count" "$max_changed_files"
 printf '| 提交策略 | 代码、测试、计划与任务合同合并为一个提交 |\n'
+printf '| 预计提交信息 | `%s` |\n' "$commit_message"
 printf '| 自动证据 | Baseline ✓ · RED ✓ · G1–G6 ✓ · Reviewer APPROVED ✓ |\n'
 printf '\n## 必须重点复核\n\n'
 printf '### P0 · 真实行为是否满足合同\n\n'

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

@@ -16,6 +16,7 @@ if [[ -z "$task_id" || -z "$decision" || -z "$summary" ]]; then
 fi
 
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 [[ "$decision" == "APPROVED" || "$decision" == "CHANGES_REQUESTED" ]] || automation_die "invalid review decision: $decision"
 [[ ${#summary} -ge 20 ]] || automation_die "review summary must contain at least 20 characters"
 [[ "$(automation_read_state "$task_id")" == "REVIEWING" ]] || automation_die "$task_id is not REVIEWING"
@@ -64,8 +65,13 @@ jq -nc \
     | automation_append_json "$evidence_dir/reviews.jsonl"
 
 if [[ "$decision" == "APPROVED" ]]; then
-    automation_transition_state "$task_id" "REVIEWING" "AWAITING_HUMAN" "reviewer" "independent review approved; human acceptance required"
-    automation_info "$task_id approved and awaiting human acceptance"
+    workspace_file="$(automation_workspace_path "$task_id")"
+    if [[ -n "${AUTOMATION_QUEUE_RUN_ID:-}" && "$(jq -r '.commitPolicy // "humanApproval"' "$workspace_file")" == "autoCommit" ]]; then
+        automation_transition_state "$task_id" "REVIEWING" "READY_TO_COMMIT" "reviewer" "independent review approved; sealed automatic local commit authorization must be verified"
+    else
+        automation_transition_state "$task_id" "REVIEWING" "AWAITING_HUMAN" "reviewer" "independent review approved; human acceptance required"
+        automation_info "$task_id approved and awaiting human acceptance"
+    fi
 else
     automation_transition_state "$task_id" "REVIEWING" "CHANGES_REQUESTED" "reviewer" "$summary"
     automation_warn "$task_id requires changes"