@frankzhang2026/opencode-android-orchestrator 0.9.0 → 0.10.0

package/templates/scripts/automation/approve-and-run.sh

@@ -33,6 +33,7 @@ plan="$source_root/$plan_rel"
 [[ "$(git -C "$source_root" rev-parse HEAD)" == "$original_head" ]] || automation_die "original HEAD changed after contract review began"
 [[ "$(automation_file_sha256 "$contract")" == "$(jq -er '.contractSha256' "$origin_file")" ]] || automation_die "contract changed after proposal approval"
 [[ "$(automation_file_sha256 "$plan")" == "$(jq -er '.planSha256' "$origin_file")" ]] || automation_die "plan changed after proposal approval"
+automation_read_commit_message_prefix_at "$source_root" >/dev/null
 
 changed_paths=()
 while IFS= read -r path; do

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,7 @@ automation_validate_config() {
             length > 0 and
             length == (unique | length) and
             all(.[]; gradle_task);
-        .schemaVersion == 4 and
+        .schemaVersion == 5 and
         (.enabled | type == "boolean") and
         (.mode == "shadow" or .mode == "orchestrated") and
         (.workspaceStrategy == "inPlaceExclusive" or .workspaceStrategy == "isolatedWorktree") and
@@ -122,6 +125,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
@@ -246,6 +250,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_.-]+)+)$'
@@ -453,7 +543,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 +698,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

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

@@ -19,6 +19,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

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"

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/tests/run-tests.sh

@@ -110,7 +110,7 @@ printf '%s\n' \
 chmod +x "$fixture/gradlew"
 
 jq -n '{
-    schemaVersion: 4,
+    schemaVersion: 5,
     enabled: true,
     mode: "orchestrated",
     workspaceStrategy: "inPlaceExclusive",
@@ -121,6 +121,7 @@ jq -n '{
     maxReviewerRestarts: 2,
     unitTestsEnabled: true,
     lintEnabled: false,
+    commitMessagePrefixMode: "required",
     longCommandTimeoutMs: 1800000,
     autoCleanupWorktrees: true,
     pushAfterAcceptance: false,
@@ -249,6 +250,8 @@ jq -n '{
     git commit -qm 'Create automation fixture'
 )
 
+printf '%s\n' '批次甲' > "$fixture/automation/automation-commit-prefix"
+
 printf '%s\n' \
     '# Exact repository-relative paths intentionally kept local' \
     'local/operator-note.txt' \
@@ -260,6 +263,37 @@ run_fixture ./scripts/automation/preflight.sh --source >/dev/null
 allowlisted_changes="$(run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_changed_paths')"
 [[ -z "$allowlisted_changes" ]] || fail "allowlisted paths remained visible: $allowlisted_changes"
 
+printf '%s\n' \
+    '# 必填：请在下一行填写当前 Git 提交文案前缀' \
+    '# 示例：XXX' \
+    > "$fixture/automation/automation-commit-prefix"
+if run_fixture ./scripts/automation/preflight.sh --source >/dev/null 2>&1; then
+    fail 'normal preflight accepted an unconfigured required commit prefix'
+fi
+run_fixture ./scripts/automation/preflight.sh --shadow >/dev/null 2>&1 || \
+    fail 'shadow preflight rejected the intentionally unconfigured installation template'
+rm "$fixture/automation/automation-commit-prefix"
+if run_fixture ./scripts/automation/preflight.sh --source >/dev/null 2>&1; then
+    fail 'normal preflight accepted a missing required commit prefix'
+fi
+run_fixture ./scripts/automation/preflight.sh --shadow >/dev/null 2>&1 || \
+    fail 'shadow preflight rejected a missing required commit prefix'
+printf '%s\n' '批次甲' > "$fixture/automation/automation-commit-prefix"
+pass 'required missing or unconfigured commit prefix blocks task startup but not shadow verification'
+
+printf '%s\n' '批次甲' '第二行无效' > "$fixture/automation/automation-commit-prefix"
+if run_fixture ./scripts/automation/preflight.sh --source >/dev/null 2>&1; then
+    fail 'preflight accepted more than one active commit-prefix line'
+fi
+rm "$fixture/automation/automation-commit-prefix"
+ln -s ../local/operator-note.txt "$fixture/automation/automation-commit-prefix"
+if run_fixture ./scripts/automation/preflight.sh --source >/dev/null 2>&1; then
+    fail 'preflight accepted a symbolic-link commit-prefix file'
+fi
+rm "$fixture/automation/automation-commit-prefix"
+printf '%s\n' '批次甲' > "$fixture/automation/automation-commit-prefix"
+pass 'invalid and symbolic-link commit-prefix files fail closed'
+
 printf '%s\n' \
     'local/operator-note.txt' \
     'local/generated-note.txt' \
@@ -288,6 +322,10 @@ printf '%s\n' 'automation/config.json' > "$fixture/.automation-worktree-allowlis
 if run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_changed_paths >/dev/null' 2>/dev/null; then
     fail 'worktree allowlist accepted a protected automation path'
 fi
+printf '%s\n' 'automation/automation-commit-prefix' > "$fixture/.automation-worktree-allowlist"
+if run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_changed_paths >/dev/null' 2>/dev/null; then
+    fail 'worktree allowlist accepted the reserved commit-prefix control file'
+fi
 printf '%s\n' 'local/*.json' > "$fixture/.automation-worktree-allowlist"
 if run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_changed_paths >/dev/null' 2>/dev/null; then
     fail 'worktree allowlist accepted a glob pattern'
@@ -595,6 +633,11 @@ approved_baseline="$(jq -er '.baselineHead' "$runtime_root/workspaces/TASK-TEST-
 [[ "$(git -C "$fixture" rev-list --count "$approved_baseline..automation/task-test-004")" -eq 0 ]] || fail 'contract approval created a planning-only commit'
 [[ "$(jq -r '.contractCommit' "$runtime_root/evidence/TASK-TEST-004/origin.json")" == "null" ]] || fail 'contract approval recorded a commit before product integration'
 [[ "$(git -C "$fixture" status --porcelain --untracked-files=all -- docs/plans/TASK-TEST-004.md automation/tasks/TASK-TEST-004.json | wc -l | tr -d ' ')" -eq 2 ]] || fail 'sealed planning artifacts were not left pending on the task branch'
+printf '%s\n' '# 尚未填写提交前缀' > "$fixture/automation/automation-commit-prefix"
+if run_task "$task_root" env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/orchestrate-task.sh TASK-TEST-004 >/dev/null 2>&1; then
+    fail 'direct task launcher bypassed the required commit-prefix gate'
+fi
+printf '%s\n' '批次甲' > "$fixture/automation/automation-commit-prefix"
 [[ -f "$runtime_root/locks/repository.workspace.lease/lease.json" ]] || fail 'persistent repository lease was not created'
 leased_status="$(run_fixture ./scripts/automation/status.sh TASK-TEST-004)"
 [[ "$(jq -r '.runtime.repositoryLeaseMatches' <<< "$leased_status")" == "true" ]] || fail 'status did not verify the repository lease'
@@ -611,6 +654,7 @@ pass 'contract approval switches to a leased task branch while deferring the sea
 
 git -C "$fixture" add -- \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/operator-note.txt \
     local/generated-note.txt
 run_task "$task_root" ./scripts/automation/claim-task.sh TASK-TEST-004 >/dev/null
@@ -628,7 +672,8 @@ if jq -e '.changedPaths | any(. == "local/operator-note.txt" or . == "local/gene
 fi
 if rg -F 'diff --git a/local/operator-note.txt b/local/operator-note.txt' "$runtime_root/evidence/TASK-TEST-004/sealed.diff" >/dev/null || \
    rg -F 'diff --git a/local/generated-note.txt b/local/generated-note.txt' "$runtime_root/evidence/TASK-TEST-004/sealed.diff" >/dev/null || \
-   rg -F 'diff --git a/.automation-worktree-allowlist b/.automation-worktree-allowlist' "$runtime_root/evidence/TASK-TEST-004/sealed.diff" >/dev/null; then
+   rg -F 'diff --git a/.automation-worktree-allowlist b/.automation-worktree-allowlist' "$runtime_root/evidence/TASK-TEST-004/sealed.diff" >/dev/null || \
+   rg -F 'diff --git a/automation/automation-commit-prefix b/automation/automation-commit-prefix' "$runtime_root/evidence/TASK-TEST-004/sealed.diff" >/dev/null; then
     fail 'sealed diff included allowlisted local content'
 fi
 [[ "$(jq -r '.evidence.qualityGate' "$runtime_root/evidence/TASK-TEST-004/acceptance-report.json")" == "PASSED" ]] || fail 'acceptance package omitted quality-gate status'
@@ -637,6 +682,7 @@ acceptance_card="$(run_fixture ./scripts/automation/show-acceptance-review.sh TA
 [[ "$acceptance_card" == *"P0 · 真实行为是否满足合同"* ]] || fail 'acceptance review omitted behavioral focus'
 [[ "$acceptance_card" == *"P0 · 旧行为与范围是否被误伤"* ]] || fail 'acceptance review omitted regression and scope focus'
 [[ "$acceptance_card" == *"sealed diff SHA"* ]] || fail 'acceptance review omitted sealed binding'
+[[ "$acceptance_card" == *"批次甲 Implement"* ]] || fail 'acceptance review omitted the current prefixed commit message'
 [[ "$acceptance_card" == *"成功集成后自动删除；失败或阻塞时保留"* ]] || fail 'acceptance review omitted task branch cleanup policy'
 pass 'automated evidence becomes one focused, SHA-verified human acceptance card'
 
@@ -654,8 +700,10 @@ if run_fixture env AUTOMATION_FAKE_GREEN=1 ./scripts/automation/accept-and-integ
 fi
 pass 'integrator requires final acceptance bound to the sealed diff'
 
+printf '%s\n' '批次甲-提交时' > "$fixture/automation/automation-commit-prefix"
 run_fixture env AUTOMATION_FAKE_GREEN=1 ./scripts/automation/accept-and-integrate.sh TASK-TEST-004 '验收通过，提交到原分支。' >/dev/null
 combined_commit="$(jq -er '.productCommit' "$runtime_root/workspaces/TASK-TEST-004.json")"
+[[ "$(git -C "$fixture" show -s --format=%s "$combined_commit")" == "批次甲-提交时 Implement "* ]] || fail 'combined task commit did not re-read the latest prefix at commit time'
 [[ "$(jq -r '.state' "$runtime_root/state/TASK-TEST-004.json")" == "COMPLETED" ]] || fail 'final integration did not reach COMPLETED'
 [[ "$(git -C "$fixture" symbolic-ref --short HEAD)" == "$original_branch" ]] || fail 'integrator changed the original branch identity'
 [[ -f "$fixture/mobile-client/src/main/java/dev/example/orchestratorfixture/OrchestratedFlow.kt" ]] || fail 'product change was not integrated into original branch'
@@ -670,7 +718,7 @@ for combined_path in \
         fail "combined task commit omitted $combined_path"
 done
 if git -C "$fixture" diff-tree --no-commit-id --name-only -r "$combined_commit" | \
-    rg -x 'local/(operator-note|generated-note)\.txt|\.automation-worktree-allowlist' >/dev/null; then
+    rg -x 'local/(operator-note|generated-note)\.txt|\.automation-worktree-allowlist|automation/automation-commit-prefix' >/dev/null; then
     fail 'combined task commit included an allowlisted local path or its control file'
 fi
 [[ "$(cat "$fixture/local/operator-note.txt")" == "operator local edit" ]] || fail 'tracked allowlisted content changed during integration'
@@ -678,6 +726,7 @@ fi
 staged_allowlist_paths="$(git -C "$fixture" diff --cached --name-only HEAD -- | LC_ALL=C sort)"
 for staged_allowlist_path in \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/generated-note.txt \
     local/operator-note.txt; do
     printf '%s\n' "$staged_allowlist_paths" | \
@@ -688,6 +737,7 @@ run_fixture bash -c 'source ./scripts/automation/lib.sh; automation_worktree_is_
 pass 'in-place integration preserves allowlisted local state without evidence or commit leakage'
 git -C "$fixture" restore --staged -- \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/operator-note.txt \
     local/generated-note.txt
 [[ "$(jq -r '.contractCommit' "$runtime_root/evidence/TASK-TEST-004/origin.json")" == "$combined_commit" ]] || fail 'origin evidence did not bind the contract to the combined task commit'
@@ -714,8 +764,10 @@ jq \
     > "$fixture/automation/tasks/TASK-TEST-008.json"
 run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-008 '批准方案，生成计划和任务合同。' >/dev/null
 run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/approve-and-run.sh TASK-TEST-008 '合同已复核，批准自动执行到人工验收阶段。' >/dev/null
+printf '%s\n' '批次乙' > "$fixture/automation/automation-commit-prefix"
 git -C "$fixture" add -- \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/operator-note.txt \
     local/generated-note.txt
 printf '%s\n' 'class AbortArchive { fun value() = "preserved" }' > "$fixture/mobile-client/src/main/java/dev/example/orchestratorfixture/AbortArchive.kt"
@@ -728,16 +780,18 @@ fi
 rm "$fixture/out-of-contract.txt"
 run_fixture ./scripts/automation/abort-task.sh TASK-TEST-008 '中止任务，封存修改并恢复原分支。' >/dev/null
 abort_recovery_commit="$(jq -er '.recoveryCommit' "$runtime_root/evidence/TASK-TEST-008/abort.json")"
+[[ "$(git -C "$fixture" show -s --format=%s "$abort_recovery_commit")" == "批次乙 Archive aborted work for TASK-TEST-008" ]] || fail 'abort recovery commit did not read the updated prefix'
 git -C "$fixture" cat-file -e "$abort_recovery_commit:mobile-client/src/main/java/dev/example/orchestratorfixture/AbortArchive.kt" || fail 'abort recovery commit omitted the allowed change'
 git -C "$fixture" cat-file -e "$abort_recovery_commit:docs/plans/TASK-TEST-008.md" || fail 'abort recovery commit omitted the sealed plan'
 git -C "$fixture" cat-file -e "$abort_recovery_commit:automation/tasks/TASK-TEST-008.json" || fail 'abort recovery commit omitted the sealed contract'
 if git -C "$fixture" diff-tree --no-commit-id --name-only -r "$abort_recovery_commit" | \
-    rg -x 'local/(operator-note|generated-note)\.txt|\.automation-worktree-allowlist' >/dev/null; then
+    rg -x 'local/(operator-note|generated-note)\.txt|\.automation-worktree-allowlist|automation/automation-commit-prefix' >/dev/null; then
     fail 'abort recovery commit included an allowlisted local path or its control file'
 fi
 staged_abort_allowlist_paths="$(git -C "$fixture" diff --cached --name-only HEAD -- | LC_ALL=C sort)"
 for staged_allowlist_path in \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/generated-note.txt \
     local/operator-note.txt; do
     printf '%s\n' "$staged_abort_allowlist_paths" | \
@@ -750,6 +804,7 @@ done
 pass 'abort refuses unrelated files and archives allowed uncommitted changes in a recovery commit'
 git -C "$fixture" restore --staged -- \
     .automation-worktree-allowlist \
+    automation/automation-commit-prefix \
     local/operator-note.txt \
     local/generated-note.txt