@frankzhang2026/opencode-android-orchestrator 0.7.0 → 0.8.1

package/templates/.opencode/agents/scheduled-coder.md

@@ -77,11 +77,10 @@ permission:
   list: allow
   skill:
     "*": deny
-    "using-superpowers": allow
     "scheduled-quality-coder": allow
-    "test-driven-development": allow
-    "systematic-debugging": allow
-    "verification-before-completion": allow
+    "android-orchestrator-test-driven-development": allow
+    "android-orchestrator-systematic-debugging": allow
+    "android-orchestrator-verification-before-completion": allow
   schedule_job: deny
   list_jobs: deny
   get_version: deny

package/templates/.opencode/agents/scheduled-planner.md

@@ -68,9 +68,8 @@ permission:
   list: allow
   skill:
     "*": deny
-    "using-superpowers": allow
-    "brainstorming": allow
-    "writing-plans": allow
+    "android-orchestrator-brainstorming": allow
+    "android-orchestrator-writing-plans": allow
     "scheduled-quality-orchestrator": allow
   question: allow
   schedule_job: deny
@@ -96,8 +95,9 @@ user provides a natural-language coding request. Remain the conversational
 coordinator through planning, contract approval, unattended execution, final
 human acceptance, and local integration into the recorded original branch.
 
-Load `scheduled-quality-orchestrator`, `brainstorming`, and `writing-plans`
-before taking action, then follow the orchestrator skill literally. Run the
+Load `scheduled-quality-orchestrator`, `android-orchestrator-brainstorming`,
+and `android-orchestrator-writing-plans` before taking action, then follow the
+orchestrator skill literally. Run the
 source preflight before planning. Inspect the current repository code and
 tests, then interactively narrow the request to exactly one small, observable
 behavior change. Ask for clarification when scope, acceptance behavior, edge

package/templates/.opencode/agents/scheduled-reviewer.md

@@ -54,9 +54,8 @@ permission:
   list: allow
   skill:
     "*": deny
-    "using-superpowers": allow
     "scheduled-quality-reviewer": allow
-    "verification-before-completion": allow
+    "android-orchestrator-verification-before-completion": allow
   schedule_job: deny
   list_jobs: deny
   get_version: deny

package/templates/.opencode/skills/scheduled-quality-coder/SKILL.md

@@ -9,8 +9,8 @@ metadata:
 
 # Scheduled quality coder
 
-Execute one task contract. This skill narrows Superpowers into a deterministic,
-non-interactive Android workflow. The scripts are the source of truth for state;
+Execute one task contract through the bundled, deterministic, non-interactive
+Android workflow. The scripts are the source of truth for state;
 your prose is never proof of completion.
 
 ## Required input
@@ -28,8 +28,8 @@ it with `./scripts/automation/block-task.sh <TASK-ID> <reason>` before stopping.
 
 ## Mandatory sequence
 
-1. Load `test-driven-development` and
-   `verification-before-completion`. Do not load any other implementation
+1. Load `android-orchestrator-test-driven-development` and
+   `android-orchestrator-verification-before-completion`. Do not load any other implementation
    workflow skill.
 2. Run `./scripts/automation/status.sh <TASK-ID>` and read the contract.
 3. Branch by deterministic state:
@@ -65,7 +65,7 @@ it with `./scripts/automation/block-task.sh <TASK-ID> <reason>` before stopping.
 7. Run `./scripts/automation/quality-gate.sh <TASK-ID>`.
 8. If the first gate attempt in the current coding cycle fails while state
    remains `CODING`, load
-   `systematic-debugging`, diagnose the root cause, and make at most one fix
+   `android-orchestrator-systematic-debugging`, diagnose the root cause, and make at most one fix
    loop. Then run the gate once more. If it fails again, stop in
    `TEST_FAILED`.
 9. When the gate succeeds, report the changed files and evidence paths. Do not
@@ -92,7 +92,8 @@ human can revise and requeue the contract.
 
 ## Forbidden capabilities
 
-Do not invoke `brainstorming`, `writing-plans`, `using-git-worktrees`,
+Do not invoke `android-orchestrator-brainstorming`,
+`android-orchestrator-writing-plans`, `using-git-worktrees`,
 `finishing-a-development-branch`, `requesting-code-review`, parallel agents, or
 subagent-driven development. Planning and approval happen before this session;
 review happens in a separate fresh read-only session.

package/templates/.opencode/skills/scheduled-quality-orchestrator/SKILL.md

@@ -20,7 +20,8 @@ approvals; state files, hashes, tests, and Git checks grant execution.
    If `ANDROID_HOME` is missing, the working tree is dirty, the branch is detached,
    Git identity is missing, or OpenCode discovery is unsafe, report the exact
    blocker and stop.
-2. Use brainstorming and writing-plans to produce one bounded proposal. After
+2. Use `android-orchestrator-brainstorming` and
+   `android-orchestrator-writing-plans` to produce one bounded proposal. After
    displaying it, immediately call `question` once with `multiple: false` and
    `custom: false`:
 

package/templates/.opencode/skills/scheduled-quality-reviewer/SKILL.md

@@ -15,7 +15,7 @@ you review.
 
 ## Mandatory sequence
 
-1. Load `verification-before-completion`.
+1. Load `android-orchestrator-verification-before-completion`.
 2. Require exactly one task ID or the compatibility token
    `NEXT_REVIEWING`. For the selector token, first run
    `./scripts/automation/select-task.sh REVIEWING` and continue only if

package/templates/README.md

@@ -14,7 +14,7 @@ Migrated template roots:
 - `.opencode/skills`: the three `scheduled-quality-*` skills
 - `scripts/automation`: all 29 deterministic V3 Bash transactions and their
   test runner, preserved as executable files
-- `automation`: the portable V3 configuration render source, both JSON Schemas,
+- `automation`: the portable V4 configuration render source, both JSON Schemas,
   and the task contract example
 - `docs/plans/README.md`: the human-approved plan authoring contract
 - `AGENTS.md.fragment`: a bounded managed block for non-destructive
@@ -50,7 +50,11 @@ resource manifest so its exact-path entries can change without causing package
 integrity drift; failed first-install verification removes a newly bootstrapped
 file during rollback.
 
-The legacy Scheduler field has been removed while Superpowers remains pinned.
+The legacy Scheduler field and external Superpowers plugin dependency have
+been removed. Five namespaced workflow skills are loaded directly from the
+Orchestrator npm package; the optional Superpowers browser companion is not
+distributed.
+
 The scope gates consume generated source-set arrays, and the Shell test fixture
 uses a neutral custom module and package. No shipped template contains a local
 absolute path or project-specific package name.

package/templates/automation/config.json

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": 3,
+  "schemaVersion": 4,
   "enabled": true,
   "mode": "orchestrated",
   "workspaceStrategy": "inPlaceExclusive",
@@ -20,18 +20,15 @@
     "abort": "中止任务，封存修改并恢复原分支。",
     "resume": "恢复任务，重新捕获基线并继续自动执行。"
   },
-  "plugins": {
-    "superpowers": "superpowers@git+https://github.com/obra/superpowers.git#v6.2.0"
-  },
   "requiredSkills": [
-    "brainstorming",
-    "writing-plans",
+    "android-orchestrator-brainstorming",
+    "android-orchestrator-writing-plans",
     "scheduled-quality-orchestrator",
     "scheduled-quality-coder",
     "scheduled-quality-reviewer",
-    "test-driven-development",
-    "systematic-debugging",
-    "verification-before-completion"
+    "android-orchestrator-test-driven-development",
+    "android-orchestrator-systematic-debugging",
+    "android-orchestrator-verification-before-completion"
   ],
   "gradleVerification": {
     "fullUnitTestTasks": [

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:v3",
+  "$id": "urn:frankzhang2026:opencode-android-orchestrator:automation-config:v4",
   "title": "OpenCode task orchestration configuration",
   "type": "object",
   "additionalProperties": false,
@@ -42,14 +42,13 @@
     "autoCleanupWorktrees",
     "pushAfterAcceptance",
     "approvalPhrases",
-    "plugins",
     "requiredSkills",
     "gradleVerification",
     "androidProject",
     "protectedPaths"
   ],
   "properties": {
-    "schemaVersion": { "const": 3 },
+    "schemaVersion": { "const": 4 },
     "enabled": { "type": "boolean" },
     "mode": { "enum": ["shadow", "orchestrated"] },
     "workspaceStrategy": {
@@ -81,14 +80,6 @@
         "resume": { "type": "string", "minLength": 4 }
       }
     },
-    "plugins": {
-      "type": "object",
-      "additionalProperties": false,
-      "required": ["superpowers"],
-      "properties": {
-        "superpowers": { "type": "string", "minLength": 1 }
-      }
-    },
     "requiredSkills": {
       "type": "array",
       "minItems": 6,

package/templates/automation/task-contract.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "urn:frankzhang2026:opencode-android-orchestrator:task-contract:v1",
+  "$id": "urn:frankzhang2026:opencode-android-orchestrator:task-contract:v2",
   "title": "Scheduled coding task contract",
   "type": "object",
   "additionalProperties": false,
@@ -27,7 +27,7 @@
     "maxChangedFiles",
     "allowedPaths",
     "forbiddenPaths",
-    "allowedSuperpowers",
+    "allowedWorkflowSkills",
     "acceptanceCriteria",
     "nonGoals",
     "targetTests",
@@ -35,7 +35,7 @@
     "testPolicy"
   ],
   "properties": {
-    "schemaVersion": { "const": 1 },
+    "schemaVersion": { "const": 2 },
     "id": { "type": "string", "pattern": "^TASK-[A-Z0-9-]+$" },
     "title": { "type": "string", "minLength": 1 },
     "designApproved": { "const": true },
@@ -53,12 +53,12 @@
       "minItems": 1,
       "items": { "type": "string", "minLength": 1 }
     },
-    "allowedSuperpowers": {
+    "allowedWorkflowSkills": {
       "type": "array",
       "const": [
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
       ]
     },
     "acceptanceCriteria": {

package/templates/automation/tasks/TASK-TEMPLATE.json.example

@@ -1,5 +1,5 @@
 {
-  "schemaVersion": 1,
+  "schemaVersion": 2,
   "id": "TASK-EXAMPLE-001",
   "title": "Replace with one small, observable behavior change",
   "designApproved": true,
@@ -31,10 +31,10 @@
     "**/build.gradle",
     "**/build.gradle.kts"
   ],
-  "allowedSuperpowers": [
-    "test-driven-development",
-    "systematic-debugging",
-    "verification-before-completion"
+  "allowedWorkflowSkills": [
+    "android-orchestrator-test-driven-development",
+    "android-orchestrator-systematic-debugging",
+    "android-orchestrator-verification-before-completion"
   ],
   "acceptanceCriteria": [
     "Replace with an observable input/output or UI behavior",

package/templates/scripts/automation/lib.sh

@@ -111,7 +111,7 @@ automation_validate_config() {
             length > 0 and
             length == (unique | length) and
             all(.[]; gradle_task);
-        .schemaVersion == 3 and
+        .schemaVersion == 4 and
         (.enabled | type == "boolean") and
         (.mode == "shadow" or .mode == "orchestrated") and
         (.workspaceStrategy == "inPlaceExclusive" or .workspaceStrategy == "isolatedWorktree") and
@@ -130,8 +130,6 @@ automation_validate_config() {
         (.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
         (.gradleVerification as $verification |
             ($verification | type == "object") and

package/templates/scripts/automation/preflight.sh

@@ -127,9 +127,6 @@ else
     if ! automation_resolve_opencode_config "$discovery_dir/config.json" "$discovery_dir/config.err"; then
         automation_die "OpenCode resolved config failed; see $discovery_dir/config.err"
     fi
-    superpowers_pin="$(jq -r '.plugins.superpowers' "$AUTOMATION_CONFIG")"
-    rg -F "$superpowers_pin" "$discovery_dir/config.json" >/dev/null || automation_die "resolved OpenCode config is missing pinned Superpowers"
-
     if ! opencode debug skill > "$discovery_dir/skills.txt" 2> "$discovery_dir/skills.err"; then
         automation_die "OpenCode skill discovery failed; see $discovery_dir/skills.err"
     fi

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

@@ -110,7 +110,7 @@ printf '%s\n' \
 chmod +x "$fixture/gradlew"
 
 jq -n '{
-    schemaVersion: 3,
+    schemaVersion: 4,
     enabled: true,
     mode: "orchestrated",
     workspaceStrategy: "inPlaceExclusive",
@@ -131,18 +131,15 @@ jq -n '{
         abort: "中止任务，封存修改并恢复原分支。",
         resume: "恢复任务，重新捕获基线并继续自动执行。"
     },
-    plugins: {
-        superpowers: "superpowers@git+https://github.com/obra/superpowers.git#v6.2.0"
-    },
     requiredSkills: [
-        "brainstorming",
-        "writing-plans",
+        "android-orchestrator-brainstorming",
+        "android-orchestrator-writing-plans",
         "scheduled-quality-orchestrator",
         "scheduled-quality-coder",
         "scheduled-quality-reviewer",
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
     ],
     gradleVerification: {
         fullUnitTestTasks: ["testDebugUnitTest"],
@@ -195,7 +192,7 @@ jq -n '{
 }' > "$fixture/automation/config.json"
 
 jq -n '{
-    schemaVersion: 1,
+    schemaVersion: 2,
     id: "TASK-TEST-001",
     title: "Add an observable greeting behavior",
     designApproved: true,
@@ -227,10 +224,10 @@ jq -n '{
         "**/build.gradle.kts",
         "mobile-client/build.gradle.kts"
     ],
-    allowedSuperpowers: [
-        "test-driven-development",
-        "systematic-debugging",
-        "verification-before-completion"
+    allowedWorkflowSkills: [
+        "android-orchestrator-test-driven-development",
+        "android-orchestrator-systematic-debugging",
+        "android-orchestrator-verification-before-completion"
     ],
     acceptanceCriteria: ["Greeting returns the approved value"],
     nonGoals: ["No unrelated refactoring"],

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

@@ -27,7 +27,7 @@ fi
 jq -e . "$contract" >/dev/null || automation_die "contract is not valid JSON: $contract"
 
 jq -e '
-    .schemaVersion == 1 and
+    (.schemaVersion == 1 or .schemaVersion == 2) and
     (.id | type == "string" and test("^TASK-[A-Z0-9-]+$")) and
     (.title | type == "string" and length > 0) and
     .designApproved == true and
@@ -37,7 +37,12 @@ jq -e '
     (.maxChangedFiles | type == "number" and . >= 1 and . <= 12 and floor == .) and
     (.allowedPaths | type == "array" and length > 0) and
     (.forbiddenPaths | type == "array" and length > 0) and
-    (.allowedSuperpowers == ["test-driven-development", "systematic-debugging", "verification-before-completion"]) and
+    (if .schemaVersion == 1 then
+        .allowedSuperpowers == ["test-driven-development", "systematic-debugging", "verification-before-completion"]
+     else
+        .allowedWorkflowSkills == ["android-orchestrator-test-driven-development", "android-orchestrator-systematic-debugging", "android-orchestrator-verification-before-completion"] and
+        (has("allowedSuperpowers") | not)
+     end) and
     (.acceptanceCriteria | type == "array" and length > 0) and
     (.nonGoals | type == "array" and length > 0) and
     (.targetTests | type == "array" and length > 0 and all(.[];