@frankzhang2026/opencode-android-orchestrator 0.9.0 → 1.0.0

package/templates/automation/config.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "urn:frankzhang2026:opencode-android-orchestrator:automation-config:v4",
+  "$id": "urn:frankzhang2026:opencode-android-orchestrator:automation-config:v6",
   "title": "OpenCode task orchestration configuration",
   "type": "object",
   "additionalProperties": false,
@@ -11,7 +11,10 @@
       "pattern": "^(?!/)(?!\\.\\.(?:/|$))(?![A-Za-z]:[\\\\/]).+"
     },
     "nullableIdentifier": {
-      "type": ["string", "null"],
+      "type": [
+        "string",
+        "null"
+      ],
       "minLength": 1
     },
     "gradleTask": {
@@ -23,7 +26,9 @@
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
-      "items": { "$ref": "#/$defs/gradleTask" }
+      "items": {
+        "$ref": "#/$defs/gradleTask"
+      }
     }
   },
   "required": [
@@ -38,6 +43,7 @@
     "maxReviewerRestarts",
     "unitTestsEnabled",
     "lintEnabled",
+    "commitMessagePrefixMode",
     "longCommandTimeoutMs",
     "autoCleanupWorktrees",
     "pushAfterAcceptance",
@@ -45,46 +51,117 @@
     "requiredSkills",
     "gradleVerification",
     "androidProject",
-    "protectedPaths"
+    "protectedPaths",
+    "commitPolicy",
+    "queue"
   ],
   "properties": {
-    "schemaVersion": { "const": 4 },
-    "enabled": { "type": "boolean" },
-    "mode": { "enum": ["shadow", "orchestrated"] },
+    "schemaVersion": {
+      "const": 6
+    },
+    "enabled": {
+      "type": "boolean"
+    },
+    "mode": {
+      "enum": [
+        "shadow",
+        "orchestrated"
+      ]
+    },
     "workspaceStrategy": {
-      "enum": ["inPlaceExclusive", "isolatedWorktree"]
-    },
-    "originalBranchDriftPolicy": { "const": "block" },
-    "worktreeBase": { "type": "string" },
-    "maxFixLoops": { "type": "integer", "minimum": 0, "maximum": 1 },
-    "maxReviewCycles": { "type": "integer", "minimum": 0, "maximum": 2 },
-    "maxReviewerRestarts": { "type": "integer", "minimum": 0, "maximum": 3 },
-    "unitTestsEnabled": { "type": "boolean", "default": true },
-    "lintEnabled": { "type": "boolean", "default": false },
+      "enum": [
+        "inPlaceExclusive",
+        "isolatedWorktree"
+      ]
+    },
+    "originalBranchDriftPolicy": {
+      "const": "block"
+    },
+    "worktreeBase": {
+      "type": "string"
+    },
+    "maxFixLoops": {
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 1
+    },
+    "maxReviewCycles": {
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 2
+    },
+    "maxReviewerRestarts": {
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 3
+    },
+    "unitTestsEnabled": {
+      "type": "boolean",
+      "default": true
+    },
+    "lintEnabled": {
+      "type": "boolean",
+      "default": false
+    },
+    "commitMessagePrefixMode": {
+      "enum": [
+        "required",
+        "disabled"
+      ],
+      "default": "required"
+    },
     "longCommandTimeoutMs": {
       "type": "integer",
       "minimum": 120000,
       "maximum": 7200000
     },
-    "autoCleanupWorktrees": { "type": "boolean" },
-    "pushAfterAcceptance": { "const": false },
+    "autoCleanupWorktrees": {
+      "type": "boolean"
+    },
+    "pushAfterAcceptance": {
+      "const": false
+    },
     "approvalPhrases": {
       "type": "object",
       "additionalProperties": false,
-      "required": ["proposal", "contract", "acceptance", "abort", "resume"],
+      "required": [
+        "proposal",
+        "contract",
+        "acceptance",
+        "abort",
+        "resume"
+      ],
       "properties": {
-        "proposal": { "type": "string", "minLength": 4 },
-        "contract": { "type": "string", "minLength": 4 },
-        "acceptance": { "type": "string", "minLength": 4 },
-        "abort": { "type": "string", "minLength": 4 },
-        "resume": { "type": "string", "minLength": 4 }
+        "proposal": {
+          "type": "string",
+          "minLength": 4
+        },
+        "contract": {
+          "type": "string",
+          "minLength": 4
+        },
+        "acceptance": {
+          "type": "string",
+          "minLength": 4
+        },
+        "abort": {
+          "type": "string",
+          "minLength": 4
+        },
+        "resume": {
+          "type": "string",
+          "minLength": 4
+        }
       }
     },
     "requiredSkills": {
       "type": "array",
       "minItems": 6,
       "uniqueItems": true,
-      "items": { "type": "string", "minLength": 1 }
+      "items": {
+        "type": "string",
+        "minLength": 1
+      }
     },
     "gradleVerification": {
       "type": "object",
@@ -97,11 +174,21 @@
         "deviceTestTasks"
       ],
       "properties": {
-        "fullUnitTestTasks": { "$ref": "#/$defs/gradleTaskList" },
-        "focusedTestTasks": { "$ref": "#/$defs/gradleTaskList" },
-        "assembleTasks": { "$ref": "#/$defs/gradleTaskList" },
-        "lintTasks": { "$ref": "#/$defs/gradleTaskList" },
-        "deviceTestTasks": { "$ref": "#/$defs/gradleTaskList" }
+        "fullUnitTestTasks": {
+          "$ref": "#/$defs/gradleTaskList"
+        },
+        "focusedTestTasks": {
+          "$ref": "#/$defs/gradleTaskList"
+        },
+        "assembleTasks": {
+          "$ref": "#/$defs/gradleTaskList"
+        },
+        "lintTasks": {
+          "$ref": "#/$defs/gradleTaskList"
+        },
+        "deviceTestTasks": {
+          "$ref": "#/$defs/gradleTaskList"
+        }
       }
     },
     "androidProject": {
@@ -117,10 +204,26 @@
         "testPaths"
       ],
       "properties": {
-        "name": { "type": "string", "minLength": 1 },
-        "gradleDsl": { "enum": ["kotlin", "groovy", "mixed"] },
-        "settingsFile": { "$ref": "#/$defs/repositoryPath" },
-        "moduleScope": { "enum": ["all", "primary"] },
+        "name": {
+          "type": "string",
+          "minLength": 1
+        },
+        "gradleDsl": {
+          "enum": [
+            "kotlin",
+            "groovy",
+            "mixed"
+          ]
+        },
+        "settingsFile": {
+          "$ref": "#/$defs/repositoryPath"
+        },
+        "moduleScope": {
+          "enum": [
+            "all",
+            "primary"
+          ]
+        },
         "primaryModule": {
           "type": "string",
           "pattern": "^:(?:[A-Za-z0-9_.-]+(?::[A-Za-z0-9_.-]+)*)?$"
@@ -145,9 +248,18 @@
                 "type": "string",
                 "pattern": "^:(?:[A-Za-z0-9_.-]+(?::[A-Za-z0-9_.-]+)*)?$"
               },
-              "directory": { "$ref": "#/$defs/repositoryPath" },
-              "buildFile": { "$ref": "#/$defs/repositoryPath" },
-              "dsl": { "enum": ["kotlin", "groovy"] },
+              "directory": {
+                "$ref": "#/$defs/repositoryPath"
+              },
+              "buildFile": {
+                "$ref": "#/$defs/repositoryPath"
+              },
+              "dsl": {
+                "enum": [
+                  "kotlin",
+                  "groovy"
+                ]
+              },
               "type": {
                 "enum": [
                   "application",
@@ -157,8 +269,12 @@
                   "asset-pack"
                 ]
               },
-              "namespace": { "$ref": "#/$defs/nullableIdentifier" },
-              "applicationId": { "$ref": "#/$defs/nullableIdentifier" }
+              "namespace": {
+                "$ref": "#/$defs/nullableIdentifier"
+              },
+              "applicationId": {
+                "$ref": "#/$defs/nullableIdentifier"
+              }
             }
           }
         },
@@ -168,8 +284,12 @@
           "uniqueItems": true,
           "items": {
             "allOf": [
-              { "$ref": "#/$defs/repositoryPath" },
-              { "pattern": "(^|/)src/main/\\*\\*$" }
+              {
+                "$ref": "#/$defs/repositoryPath"
+              },
+              {
+                "pattern": "(^|/)src/main/\\*\\*$"
+              }
             ]
           }
         },
@@ -179,8 +299,12 @@
           "uniqueItems": true,
           "items": {
             "allOf": [
-              { "$ref": "#/$defs/repositoryPath" },
-              { "pattern": "(^|/)src/(?:test|androidTest)/\\*\\*$" }
+              {
+                "$ref": "#/$defs/repositoryPath"
+              },
+              {
+                "pattern": "(^|/)src/(?:test|androidTest)/\\*\\*$"
+              }
             ]
           }
         }
@@ -190,7 +314,60 @@
       "type": "array",
       "minItems": 1,
       "uniqueItems": true,
-      "items": { "$ref": "#/$defs/repositoryPath" }
+      "items": {
+        "$ref": "#/$defs/repositoryPath"
+      }
+    },
+    "commitPolicy": {
+      "enum": [
+        "humanApproval",
+        "autoCommit"
+      ],
+      "default": "humanApproval"
+    },
+    "queue": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "scanIntervalMs",
+        "maxWorkspaces",
+        "maxWorkspaceBytes"
+      ],
+      "properties": {
+        "scanIntervalMs": {
+          "type": "integer",
+          "minimum": 1000,
+          "maximum": 60000
+        },
+        "maxWorkspaces": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 32
+        },
+        "maxWorkspaceBytes": {
+          "type": "integer",
+          "minimum": 1,
+          "default": 21474836480
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "if": {
+        "properties": {
+          "workspaceStrategy": {
+            "const": "isolatedWorktree"
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "commitPolicy": {
+            "const": "humanApproval"
+          }
+        }
+      }
     }
-  }
+  ]
 }

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

@@ -13,12 +13,13 @@ if [[ "$#" -ne 2 ]]; then
 fi
 
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 automation_require_orchestrated
 automation_require_approval abort "$approval"
 
 current_state="$(automation_read_state "$task_id")"
 case "$current_state" in
-    PREPARING|PENDING|CODING|READY_FOR_REVIEW|REVIEWING|CHANGES_REQUESTED|AWAITING_HUMAN|BLOCKED|TEST_FAILED|NEEDS_HUMAN|INTEGRATION_BLOCKED) ;;
+    PREPARING|PENDING|CODING|READY_FOR_REVIEW|REVIEWING|CHANGES_REQUESTED|AWAITING_HUMAN|READY_TO_COMMIT|BLOCKED|TEST_FAILED|NEEDS_HUMAN|INTEGRATION_BLOCKED) ;;
     *) automation_die "cannot abort $task_id from state $current_state" ;;
 esac
 
@@ -86,8 +87,9 @@ if [[ -d "$task_root" ]]; then
                 fi
             done
             if [[ "$product_path_count" -gt 0 ]]; then
+                commit_message="$(automation_commit_message_at "$source_root" "Archive aborted work for $task_id")"
                 git -C "$task_root" add -- "${changed_paths[@]}"
-                git -C "$task_root" commit --only -m "Archive aborted work for $task_id" -- "${changed_paths[@]}"
+                git -C "$task_root" commit --only -m "$commit_message" -- "${changed_paths[@]}"
                 recovery_commit="$(git -C "$task_root" rev-parse HEAD)"
             else
                 plan_rel="$(jq -er '.planPath' "$origin_file")"

package/templates/scripts/automation/accept-and-integrate.sh

@@ -14,6 +14,11 @@ fi
 
 automation_validate_task_id "$task_id"
 automation_require_orchestrated
+queued_workspace="$(automation_workspace_path "$task_id")"
+if [[ -f "$queued_workspace" && -n "$(jq -r '.queueKey // empty' "$queued_workspace")" ]]; then
+    automation_die "queued acceptance must request integration through the repository queue"
+    exit 1
+fi
 automation_require_approval acceptance "$approval"
 [[ "$(automation_read_state "$task_id")" == "AWAITING_HUMAN" ]] || automation_die "$task_id is not awaiting human acceptance"
 [[ "$(automation_config_value '.pushAfterAcceptance')" == "false" ]] || automation_die "automatic push is forbidden"
@@ -74,6 +79,7 @@ sealed_diff_sha="$(automation_worktree_diff_sha "$task_root")"
 )
 report_file="$evidence_dir/acceptance-report.json"
 [[ "$(jq -er '.sealedDiffSha256' "$report_file")" == "$sealed_diff_sha" ]] || automation_die "acceptance report is stale"
+automation_read_commit_message_prefix_at "$source_root" >/dev/null
 
 automation_acquire_run_lock "$task_id"
 integration_complete=0
@@ -132,9 +138,10 @@ while IFS= read -r path; do
     [[ -n "$path" ]] && commit_paths+=("$path")
 done < <(automation_changed_paths_at "$task_root")
 [[ "${#commit_paths[@]}" -ge 3 ]] || automation_die "final commit must contain product changes and both planning artifacts"
-git -C "$task_root" add -- "${commit_paths[@]}"
 title="$(jq -er '.title' "$task_root/automation/tasks/$task_id.json")"
-git -C "$task_root" commit --only -m "Implement $title ($task_id)" -- "${commit_paths[@]}"
+commit_message="$(automation_commit_message_at "$source_root" "Implement $title ($task_id)")"
+git -C "$task_root" add -- "${commit_paths[@]}"
+git -C "$task_root" commit --only -m "$commit_message" -- "${commit_paths[@]}"
 product_commit="$(git -C "$task_root" rev-parse HEAD)"
 automation_worktree_is_clean "$task_root" || automation_die "task root is dirty after the combined task commit"
 git -C "$task_root" merge-base --is-ancestor "$baseline_head" "$product_commit" || automation_die "combined task commit is not based on the recorded pre-task baseline"

package/templates/scripts/automation/acceptance-report.sh

@@ -8,7 +8,8 @@ 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_read_state "$task_id")" == "AWAITING_HUMAN" ]] || automation_die "$task_id is not AWAITING_HUMAN"
+report_state="$(automation_read_state "$task_id")"
+[[ "$report_state" == "AWAITING_HUMAN" || ( "$report_state" == "READY_TO_COMMIT" && -n "${AUTOMATION_QUEUE_RUN_ID:-}" ) ]] || automation_die "$task_id is not ready for acceptance or authorized local commit"
 
 contract="$(automation_contract_path "$task_id")"
 workspace_file="$(automation_workspace_path "$task_id")"
@@ -60,6 +61,7 @@ automation_worktree_patch_at "$AUTOMATION_ROOT" > "$sealed_diff"
 report_file="$evidence_dir/acceptance-report.json"
 jq -n \
     --arg taskId "$task_id" \
+    --arg state "$report_state" \
     --arg title "$(jq -er '.title' "$contract")" \
     --arg generatedAt "$(automation_now)" \
     --arg originalBranch "$original_branch" \
@@ -88,7 +90,7 @@ jq -n \
     --argjson acceptanceCriteria "$(jq -c '.acceptanceCriteria' "$contract")" \
     --argjson nonGoals "$(jq -c '.nonGoals' "$contract")" \
     --argjson targetTests "$(jq -c '.targetTests' "$contract")" \
-    '{taskId: $taskId, title: $title, state: "AWAITING_HUMAN",
+    '{taskId: $taskId, title: $title, state: $state,
       generatedAt: $generatedAt, originalBranch: $originalBranch,
       originalHeadBeforeContract: $originalHeadBeforeContract,
       baselineHead: $baselineHead, originalHeadCurrent: $originalHeadCurrent,

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

@@ -14,6 +14,10 @@ fi
 
 automation_validate_task_id "$task_id"
 automation_require_orchestrated
+[[ "$(automation_config_value '.schemaVersion')" != "6" ]] || {
+    automation_die "contract approval now enqueues through android_orchestrator_intake or the queue enqueue CLI"
+    exit 1
+}
 automation_require_approval contract "$approval"
 "$SCRIPT_DIR/validate-contract.sh" "$task_id" >/dev/null
 [[ "$(automation_read_state "$task_id")" == "CONTRACT_REVIEW" ]] || automation_die "$task_id is not awaiting contract review"
@@ -33,6 +37,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/begin-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_read_state "$task_id")" == "READY_FOR_REVIEW" ]] || automation_die "$task_id is not READY_FOR_REVIEW"
 
 ready_file="$(automation_evidence_path "$task_id")/ready.json"

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

@@ -15,6 +15,7 @@ if [[ -z "$task_id" || ${#reason} -lt 12 ]]; then
 fi
 
 automation_validate_task_id "$task_id"
+automation_require_queue_execution "$task_id"
 current="$(automation_read_state "$task_id")"
 case "$current" in
     PENDING|CODING)

package/templates/scripts/automation/claim-task.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_require_layout
 
 [[ "$(automation_read_state "$task_id")" == "PENDING" ]] || automation_die "$task_id is not PENDING"