@frankzhang2026/opencode-android-orchestrator 0.5.0 → 0.6.1

package/templates/automation/config.json

@@ -8,13 +8,15 @@
   "maxFixLoops": 1,
   "maxReviewCycles": 1,
   "maxReviewerRestarts": 2,
+  "longCommandTimeoutMs": 1800000,
   "autoCleanupWorktrees": true,
   "pushAfterAcceptance": false,
   "approvalPhrases": {
     "proposal": "批准方案，生成计划和任务合同。",
     "contract": "合同已复核，批准自动执行到人工验收阶段。",
     "acceptance": "验收通过，提交到原分支。",
-    "abort": "中止任务，封存修改并恢复原分支。"
+    "abort": "中止任务，封存修改并恢复原分支。",
+    "resume": "恢复任务，重新捕获基线并继续自动执行。"
   },
   "plugins": {
     "superpowers": "superpowers@git+https://github.com/obra/superpowers.git#v6.2.0"

package/templates/automation/config.schema.json

@@ -36,6 +36,7 @@
     "maxFixLoops",
     "maxReviewCycles",
     "maxReviewerRestarts",
+    "longCommandTimeoutMs",
     "autoCleanupWorktrees",
     "pushAfterAcceptance",
     "approvalPhrases",
@@ -57,17 +58,23 @@
     "maxFixLoops": { "type": "integer", "minimum": 0, "maximum": 1 },
     "maxReviewCycles": { "type": "integer", "minimum": 0, "maximum": 2 },
     "maxReviewerRestarts": { "type": "integer", "minimum": 0, "maximum": 3 },
+    "longCommandTimeoutMs": {
+      "type": "integer",
+      "minimum": 120000,
+      "maximum": 7200000
+    },
     "autoCleanupWorktrees": { "type": "boolean" },
     "pushAfterAcceptance": { "const": false },
     "approvalPhrases": {
       "type": "object",
       "additionalProperties": false,
-      "required": ["proposal", "contract", "acceptance", "abort"],
+      "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 }
+        "abort": { "type": "string", "minLength": 4 },
+        "resume": { "type": "string", "minLength": 4 }
       }
     },
     "plugins": {

package/templates/scripts/automation/lib.sh

@@ -120,12 +120,14 @@ 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
+        (.longCommandTimeoutMs | type == "number" and . >= 120000 and . <= 7200000 and floor == .) and
         (.autoCleanupWorktrees | type == "boolean") and
         .pushAfterAcceptance == false and
         (.approvalPhrases.proposal | type == "string" and length >= 4) and
         (.approvalPhrases.contract | type == "string" and length >= 4) and
         (.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

package/templates/scripts/automation/preflight.sh

@@ -155,6 +155,7 @@ else
         (last_rule("edit"; "**/src/**") == "deny") and
         (last_rule("bash"; "./scripts/automation/prepare-contract-review.sh *") == "allow") and
         (last_rule("bash"; "./scripts/automation/approve-and-run.sh *") == "allow") and
+        (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

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

@@ -0,0 +1,135 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+# shellcheck source=lib.sh
+source "$SCRIPT_DIR/lib.sh"
+
+task_id="${1:-}"
+approval="${2:-}"
+if [[ "$#" -ne 2 ]]; then
+    printf 'Usage: %s TASK-ID "RESUME-APPROVAL"\n' "$0" >&2
+    exit 2
+fi
+
+automation_validate_task_id "$task_id"
+automation_require_orchestrated
+automation_require_approval resume "$approval"
+
+workspace_file="$(automation_workspace_path "$task_id")"
+origin_file="$(automation_origin_path "$task_id")"
+state_file="$(automation_state_path "$task_id")"
+evidence_dir="$(automation_evidence_path "$task_id")"
+transitions_file="$evidence_dir/transitions.jsonl"
+resumptions_file="$evidence_dir/baseline-resumptions.jsonl"
+
+[[ -f "$workspace_file" ]] || automation_die "workspace metadata is missing for $task_id"
+[[ -f "$origin_file" ]] || automation_die "origin evidence is missing for $task_id"
+[[ -f "$state_file" ]] || automation_die "state is missing for $task_id"
+[[ -f "$transitions_file" ]] || automation_die "transition evidence is missing for $task_id"
+
+automation_acquire_run_lock "$task_id"
+trap 'automation_release_run_lock' EXIT
+
+[[ "$(automation_read_state "$task_id")" == "BLOCKED" ]] || automation_die "$task_id is not BLOCKED"
+
+source_root="$(jq -er '.sourceRoot' "$workspace_file")"
+task_root="$(automation_workspace_task_root "$workspace_file")"
+workspace_strategy="$(automation_workspace_strategy "$workspace_file")"
+original_branch="$(jq -er '.originalBranch' "$workspace_file")"
+task_branch="$(jq -er '.taskBranch' "$workspace_file")"
+baseline_head="$(jq -er '.baselineHead' "$workspace_file")"
+
+[[ "$(jq -r '.repositoryLeaseRequired // false' "$workspace_file")" == "true" ]] || \
+    automation_die "baseline recovery requires a leased transactional workspace"
+[[ -d "$task_root" ]] || automation_die "task root is missing: $task_root"
+automation_require_repository_lease "$task_id" "$source_root" "$workspace_strategy"
+task_root="$(cd "$task_root" && pwd -P)"
+source_root="$(cd "$source_root" && pwd -P)"
+[[ "$source_root" == "$AUTOMATION_ROOT" ]] || automation_die "workspace sourceRoot does not match this repository"
+[[ "$(jq -er '.sourceRoot' "$origin_file")" == "$source_root" ]] || automation_die "origin sourceRoot does not match workspace metadata"
+[[ "$(jq -er '.originalBranch' "$origin_file")" == "$original_branch" ]] || automation_die "origin branch does not match workspace metadata"
+[[ "$(automation_current_branch "$task_root")" == "$task_branch" ]] || automation_die "task branch changed"
+[[ "$(git -C "$task_root" rev-parse HEAD)" == "$baseline_head" ]] || automation_die "task HEAD changed before baseline sealing"
+git -C "$source_root" show-ref --verify --quiet "refs/heads/$original_branch" || automation_die "recorded original branch no longer exists"
+[[ "$(git -C "$source_root" rev-parse "refs/heads/$original_branch")" == "$baseline_head" ]] || automation_die "original branch drifted after task preparation"
+
+for sealed_evidence in baseline.json red.json ready.json review.json reviews.jsonl; do
+    [[ ! -e "$evidence_dir/$sealed_evidence" ]] || \
+        automation_die "$sealed_evidence already exists; baseline-only recovery is forbidden"
+done
+
+state_revision="$(jq -er '.revision' "$state_file")"
+if ! jq -s -e --argjson revision "$state_revision" '
+    length == $revision and
+    length >= 2 and
+    .[-2].from == "PENDING" and
+    .[-2].to == "CODING" and
+    .[-2].actor == "coder-launcher" and
+    .[-2].note == "preflight passed; capturing baseline" and
+    .[-1].from == "CODING" and
+    .[-1].to == "BLOCKED" and
+    (.[-1].actor == "coder" or .[-1].actor == "preflight" or .[-1].actor == "orchestrator") and
+    (.[-1].note | test("baseline|claim|基线"; "i"))
+' "$transitions_file" >/dev/null; then
+    automation_die "BLOCKED state is not a recoverable baseline-capture interruption"
+fi
+
+automation_assert_planning_artifacts_sealed "$task_id" "$task_root"
+changed_paths=()
+while IFS= read -r path; do
+    [[ -n "$path" ]] && changed_paths+=("$path")
+done < <(automation_changed_paths_at "$task_root")
+[[ "${#changed_paths[@]}" -eq 2 ]] || automation_die "baseline recovery requires exactly the sealed plan and contract changes"
+for path in "${changed_paths[@]}"; do
+    automation_is_planning_artifact "$task_id" "$path" || automation_die "product or unrelated change blocks baseline recovery: $path"
+    if git -C "$task_root" ls-files --error-unmatch -- "$path" >/dev/null 2>&1; then
+        automation_die "planning artifact became tracked before baseline recovery: $path"
+    fi
+done
+
+restart_count=0
+if [[ -f "$resumptions_file" ]]; then
+    restart_count="$(jq -s --arg taskId "$task_id" '[.[] | select(.taskId == $taskId)] | length' "$resumptions_file")"
+fi
+max_restarts=1
+[[ "$restart_count" -lt "$max_restarts" ]] || automation_die "baseline restart limit exhausted"
+next_restart=$((restart_count + 1))
+blocked_revision="$state_revision"
+current_diff_sha="$(automation_worktree_diff_sha "$task_root")"
+
+jq -nc \
+    --arg taskId "$task_id" \
+    --arg kind "resume-baseline" \
+    --arg at "$(automation_now)" \
+    --arg diffSha256 "$current_diff_sha" \
+    --argjson blockedRevision "$blocked_revision" \
+    '{taskId: $taskId, kind: $kind, at: $at,
+      blockedRevision: $blockedRevision, diffSha256: $diffSha256}' \
+    | automation_append_json "$(automation_approvals_path "$task_id")"
+
+automation_transition_state \
+    "$task_id" \
+    "BLOCKED" \
+    "PENDING" \
+    "human" \
+    "baseline-only recovery $next_restart/$max_restarts; no product diff and baseline evidence absent"
+
+jq -nc \
+    --arg taskId "$task_id" \
+    --arg at "$(automation_now)" \
+    --arg diffSha256 "$current_diff_sha" \
+    --argjson blockedRevision "$blocked_revision" \
+    --argjson restart "$next_restart" \
+    --argjson maxRestarts "$max_restarts" \
+    '{taskId: $taskId, at: $at, blockedRevision: $blockedRevision,
+      diffSha256: $diffSha256, restart: $restart,
+      maxRestarts: $maxRestarts, route: "BLOCKED->PENDING",
+      baselineEvidencePresent: false, productDiffPresent: false}' \
+    | automation_append_json "$resumptions_file"
+
+automation_info "$task_id baseline-only recovery accepted; restarting deterministic claim flow"
+automation_release_run_lock
+trap - EXIT
+
+"$SCRIPT_DIR/orchestrate-task.sh" "$task_id"

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

@@ -119,13 +119,15 @@ jq -n '{
     maxFixLoops: 1,
     maxReviewCycles: 1,
     maxReviewerRestarts: 2,
+    longCommandTimeoutMs: 1800000,
     autoCleanupWorktrees: true,
     pushAfterAcceptance: false,
     approvalPhrases: {
         proposal: "批准方案，生成计划和任务合同。",
         contract: "合同已复核，批准自动执行到人工验收阶段。",
         acceptance: "验收通过，提交到原分支。",
-        abort: "中止任务，封存修改并恢复原分支。"
+        abort: "中止任务，封存修改并恢复原分支。",
+        resume: "恢复任务，重新捕获基线并继续自动执行。"
     },
     plugins: {
         superpowers: "superpowers@git+https://github.com/obra/superpowers.git#v6.2.0"
@@ -483,9 +485,12 @@ fi
 if run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/resume-review.sh TASK-TEST-003 >/dev/null 2>&1; then
     fail 'reviewer-only recovery accepted a non-review blocker'
 fi
+if run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/resume-task.sh TASK-TEST-003 '恢复任务，重新捕获基线并继续自动执行。' >/dev/null 2>&1; then
+    fail 'baseline-only recovery accepted a preflight blocker'
+fi
 rm "$fixture/unapproved-change.txt"
 pass 'preflight blocks dirty task roots without retrying implicitly'
-pass 'reviewer-only recovery rejects unrelated BLOCKED states'
+pass 'reviewer and baseline recovery reject unrelated BLOCKED states'
 
 printf '%s\n' '# Approved reviewer-fix plan' > "$fixture/docs/plans/TASK-TEST-005.md"
 jq \
@@ -745,6 +750,38 @@ run_fixture ./scripts/automation/abort-task.sh TASK-TEST-009 '中止任务，封
 [[ ! -e "$fixture/docs/plans/TASK-TEST-009.md" && ! -e "$fixture/automation/tasks/TASK-TEST-009.json" ]] || fail 'planning-only abort left generated artifacts in the original worktree'
 pass 'aborting before product edits archives planning artifacts without creating a planning-only commit'
 
+printf '%s\n' '# Baseline interruption recovery plan' > "$fixture/docs/plans/TASK-TEST-010.md"
+jq \
+    '.id = "TASK-TEST-010" |
+     .title = "Recover one interrupted baseline capture" |
+     .planPath = "docs/plans/TASK-TEST-010.md" |
+     .targetTests = [{gradleTask: "testDebugUnitTest", filter: "dev.example.orchestratorfixture.BaselineRecoveryTest"}]' \
+    "$fixture/automation/tasks/TASK-TEST-001.json" \
+    > "$fixture/automation/tasks/TASK-TEST-010.json"
+run_fixture ./scripts/automation/prepare-contract-review.sh TASK-TEST-010 '批准方案，生成计划和任务合同。' >/dev/null
+run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/approve-and-run.sh TASK-TEST-010 '合同已复核，批准自动执行到人工验收阶段。' >/dev/null
+run_fixture ./scripts/automation/transition-state.sh TASK-TEST-010 PENDING CODING coder-launcher 'preflight passed; capturing baseline' >/dev/null
+run_fixture ./scripts/automation/block-task.sh TASK-TEST-010 'claim baseline capture interrupted before metadata sealing' >/dev/null
+if run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/resume-task.sh TASK-TEST-010 '拒绝' >/dev/null 2>&1; then
+    fail 'baseline recovery accepted an invalid confirmation'
+fi
+[[ "$(jq -r '.state' "$runtime_root/state/TASK-TEST-010.json")" == "BLOCKED" ]] || fail 'rejected baseline recovery changed task state'
+run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/resume-task.sh TASK-TEST-010 '恢复任务，重新捕获基线并继续自动执行。' >/dev/null
+[[ "$(jq -r '.state' "$runtime_root/state/TASK-TEST-010.json")" == "PENDING" ]] || fail 'baseline recovery did not return to PENDING'
+[[ "$(jq -s 'length' "$runtime_root/evidence/TASK-TEST-010/baseline-resumptions.jsonl")" -eq 1 ]] || fail 'baseline recovery did not record one bounded resumption'
+[[ "$(jq -s -r '.[-1].kind' "$runtime_root/evidence/TASK-TEST-010/approvals.jsonl")" == "resume-baseline" ]] || fail 'baseline recovery approval was not audited'
+[[ ! -f "$runtime_root/evidence/TASK-TEST-010/baseline.json" ]] || fail 'baseline recovery manufactured baseline evidence'
+pass 'one explicitly approved baseline interruption resumes through PENDING without product changes'
+
+run_fixture ./scripts/automation/transition-state.sh TASK-TEST-010 PENDING CODING coder-launcher 'preflight passed; capturing baseline' >/dev/null
+run_fixture ./scripts/automation/block-task.sh TASK-TEST-010 'claim baseline capture interrupted a second time before metadata sealing' >/dev/null
+if run_fixture env AUTOMATION_SKIP_AGENT_RUN=1 ./scripts/automation/resume-task.sh TASK-TEST-010 '恢复任务，重新捕获基线并继续自动执行。' >/dev/null 2>&1; then
+    fail 'baseline recovery exceeded its one-restart limit'
+fi
+[[ "$(jq -r '.state' "$runtime_root/state/TASK-TEST-010.json")" == "BLOCKED" ]] || fail 'exhausted baseline recovery changed task state'
+pass 'baseline recovery stops after one auditable restart'
+run_fixture ./scripts/automation/abort-task.sh TASK-TEST-010 '中止任务，封存修改并恢复原分支。' >/dev/null
+
 isolated_config_tmp="$(mktemp "$fixture/automation/.config.XXXXXX")"
 jq '.workspaceStrategy = "isolatedWorktree"' "$fixture/automation/config.json" > "$isolated_config_tmp"
 mv "$isolated_config_tmp" "$fixture/automation/config.json"