feat: bridge Codex v0.6.1 handoff-push hardening into OpenCode (v0.5.1)

Port Codex commit 0c6df429 (Harden handoff push approval flow) into the
OpenCode-native handoff skill, adapted to OpenCode's path/dialect and
preserving local rules. Bumps to v0.5.1.

- handoff/SKILL.md Phase 4: upstream detection via @{u}, push-remote URL
  verify, same-turn GitHub dest-evidence (gh auth/api user/repo view
  viewerPermission, require WRITE+), single command-shape rule, fail closed
  on permission denial. Codex ["git","push"] + /approve translated to the
  OpenCode permission-prompt model.
- Preserved OpenCode-local rules: hesitate on main/master/develop; runtime
  push failures (auth/network/rejected) remain non-fatal.
- VERSION 0.5.0 -> 0.5.1; CHANGELOG v0.5.1 section; README version refs;
  production/test-evidence/latest.md refreshed from stale v0.3.0.

Verified: bash .opencode/audit.sh all (0 errors); token-leak grep clean;
Phase 4 snippets exercised on upstream and no-upstream branches.

Plan: .opencode/plans/migrate-codex-v0.6.1.md

Author: Cipher-85

.opencode/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

.opencode/plans/migrate-codex-v0.6.1.md

@@ -0,0 +1,91 @@
+# Migration Plan: Codex Game Studios v0.6.1 → OpenCode Game Studios
+
+> **Status**: APPROVED by user (0.5.1 patch bump; full GitHub dest-evidence port;
+> OpenCode permission-prompt dialect). Executing.
+> **Source**: Codex commit `0c6df429` (2026-07-15) — "Harden handoff push
+> approval flow" + `0dd1bd3` (2026-07-15) — "Bump Codex package to 0.6.1".
+> **Target**: OpenCode Game Studios, `.opencode/VERSION` = `0.5.0`.
+> **Scope**: Single feature — handoff Phase-4 push-approval hardening. 5 files.
+
+## What's new upstream since the last bridge
+
+Two commits land after the v0.5–v0.6 bridge (`0a726f0`, 2026-07-12):
+
+- `0c6df429` — substantive: hardens `handoff/SKILL.md` Phase 4 "Push Handoff"
+  (+50/-5). Adds upstream detection, push-remote URL verify, same-turn GitHub
+  destination evidence (account/repo/permission), single command-shape rule, and
+  fail-closed on policy denial.
+- `0dd1bd3` — metadata only: VERSION, CHANGELOG, README, test-evidence. Its
+  `.codex/*` deltas are Codex-internal and intentionally not ported.
+
+The intervening `79e30c3` "Release Codex v0.6.0" is ~90% `.codex/*` internals
+(`validate_smoke.py`, role-activation fixtures, CCGS frontmatter) — already
+excluded by the established "no Codex-platform internals" policy; its advisory
+smoke content was bridged in the v0.5.0 Phase-3 work.
+
+## Adaptation decisions (Codex → OpenCode)
+
+1. **Path/dialect**: Codex `.agents/skills/handoff/SKILL.md` → OpenCode
+   `.opencode/skills/handoff/SKILL.md`. Codex `$handoff` → OpenCode `/handoff`.
+2. **Approval dialect**: Codex `["git","push"]` JSON escalation + `/approve` →
+   OpenCode native permission-prompt model. On denial, fail closed; user may
+   re-run the push once permission is granted. `/approve` does not exist in
+   OpenCode and is dropped.
+3. **Wording**: "Codex surface" → "OpenCode session".
+4. **GitHub dest-evidence**: full port — `gh auth status`, `gh api user`,
+   `gh repo view … viewerPermission` (require `WRITE`/`MAINTAIN`/`ADMIN`).
+   Network-restricted sandbox failures are not treated as invalid credentials.
+5. **Preserved local improvements** (not in upstream, must not be lost):
+   - "Hesitate if branch is `main`/`master`/`develop` — ask before pushing."
+   - Runtime push failures (auth/network/rejected) remain non-fatal — handoff is
+     valid locally; continue to Phase 5.
+6. **Version**: OpenCode owns its line. Single-skill hardening = patch bump
+   `0.5.0` → `0.5.1`.
+7. **Audit gate**: `run_handoff_review` (`.opencode/audit.sh:333-406`) enforces
+   27 review-contract phrases — all in the Round-1/Round-2 sections, none in
+   Phase 4 — so the Phase-4 edit is gate-safe. The runtime token-scan forbids
+   `.codex`, `.agents/skills`, `$skill`, "CCGS skill" — ported text avoids them.
+
+---
+
+## File 1: `.opencode/skills/handoff/SKILL.md` — Phase 4 rewrite (lines 230-251)
+
+Replace the `## Phase 4: Push Handoff` block through the "hesitate if main/
+master/develop" paragraph with the hardened, OpenCode-adapted version that adds:
+upstream detection via `git rev-parse --abbrev-ref --symbolic-full-name '@{u}'`;
+push-remote URL verification; same-turn GitHub destination evidence; single
+command-shape rule; OpenCode permission-prompt authorization; fail-closed on
+denial. Preserves: `main`/`master`/`develop` hesitation + non-fatal runtime
+failure resilience.
+
+## File 2: `.opencode/VERSION`
+
+`0.5.0` → `0.5.1`.
+
+## File 3: `CHANGELOG.md`
+
+Prepend `## v0.5.1 - 2026-07-16` section describing the hardened push routing,
+GitHub dest-evidence, permission-prompt dialect translation, and preserved local
+rules; note Codex-platform internals intentionally not ported.
+
+## File 4: `README.md`
+
+Update version references: badge (line 16), package-version text (line 72), tree
+comment (line 445) — all `0.5.0` → `0.5.1`.
+
+## File 5: `production/test-evidence/latest.md`
+
+Refresh from stale v0.3.0/2026-07-06 to v0.5.1/2026-07-16; record the actual
+`audit.sh all` result from verification.
+
+---
+
+## Verification
+
+1. `bash .opencode/audit.sh all` — expect pass, 0 errors; watch `handoff-review`,
+   `release` (VERSION↔CHANGELOG consistency), `closeout`, `runtime` token-scan.
+2. Token-leak grep on the edited skill — expect no matches for `.agents/skills`,
+   `.codex`, `["git","push"]` JSON, `$handoff`, `/approve`, "Codex surface",
+   "CCGS skill".
+3. Exercise the Phase 4 snippets on a no-upstream branch and on `main` (which has
+   `origin/main`) to confirm the upstream-detection branch logic reads correctly.

.opencode/skills/handoff/SKILL.md

@@ -229,26 +229,68 @@ Never use `--no-verify`. Never amend as a workaround for a failed hook.
 
 ## Phase 4: Push Handoff
 
-Determine the current branch:
+Determine the current branch and its configured upstream:
 
 ```bash
 git rev-parse --abbrev-ref HEAD
+git rev-parse --abbrev-ref --symbolic-full-name '@{u}'
 ```
 
-Push the handoff commit to the current branch's remote. This is a routine
-backup of the handoff state — not a merge decision and not a push to main.
-Explicit `/handoff` invocation is normal push authorization for the standard
-handoff commit.
+Treat a non-zero upstream lookup as the expected no-upstream case, not as a
+Phase failure. Do not substitute a different branch. If an upstream exists,
+derive its remote name from the returned `<remote>/<branch>` value and verify
+that remote's push URL. If no upstream exists, verify `origin` because it is the
+only remote authorized for the setup push:
+
+```bash
+git remote get-url --push <upstream-remote>
+git remote get-url --push origin
+```
 
-- If the branch has an upstream: `git push`
-- If the branch has no upstream: `git push -u origin <branch>`
+Run only the command that matches the detected upstream state. Halt if the
+required push remote is missing.
 
-Never force-push. If the push fails (auth, network, rejected), report it and
-continue to Phase 5 — the handoff is valid locally regardless.
+When the push remote is on `github.com`, establish destination evidence in this
+same handoff turn immediately before the push:
 
-Pushing to a feature or test branch is expected handoff behavior. Only
-hesitate if the current branch is `main`, `master`, or `develop` — in that
-case, ask the user before pushing.
+```bash
+gh auth status -h github.com
+gh api user --jq .login
+gh repo view <owner>/<repo> --json viewerPermission --jq .viewerPermission
+```
+
+Derive `<owner>/<repo>` from the verified remote URL. Run these read-only GitHub
+checks with the network access they require; a failure from a network-restricted
+sandbox is not evidence that the stored credential is invalid. Never request or
+display a token. Continue only when the authenticated account and a `WRITE`,
+`MAINTAIN`, or `ADMIN` permission establish that the destination is authorized.
+Otherwise halt and report the exact failed check.
+
+Push the handoff commit only if the handoff trigger or user instruction
+authorizes it. This is a routine backup of the handoff state — not a merge
+decision and not a push to main. Use exactly one of these command shapes:
+
+- If the branch has an upstream: `git push`.
+- If the branch has no upstream: `git push -u origin <branch>`.
+
+Explicit `/handoff` invocation is normal push authorization for the standard
+handoff commit; the OpenCode session will surface its native permission prompt
+for the `git push` command. The justification must state that this is the
+explicitly authorized, non-force handoff push; name the verified remote,
+authenticated account, and permission; and identify the current branch/upstream.
+
+Never force-push. If the OpenCode permission prompt or approval review denies
+the push, halt Phase 4 — report the exact denial and do not retry with another
+command shape, indirect execution, or workaround. The user may re-run the
+handoff push once the permission is granted; do not bypass the prompt.
+
+If the push instead fails for runtime reasons (auth token rejected, network,
+remote rejected), report it and continue to Phase 5 — the handoff is valid
+locally regardless.
+
+Pushing to a feature or test branch is expected handoff behavior. Only hesitate
+if the current branch is `main`, `master`, or `develop` — in that case, ask the
+user before pushing.
 
 ## Phase 5: Report And Stop
 

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v0.5.1 - 2026-07-16
+
+Bridged Codex Game Studios handoff-push hardening (upstream commit `0c6df429`)
+into the OpenCode-native port.
+
+- Hardened `/handoff` Phase 4 push routing: existing-upstream branches use plain
+  `git push`, branches without an upstream use `git push -u origin <branch>`.
+- Added same-turn GitHub destination evidence (`gh auth status`, `gh api user`,
+  `gh repo view … viewerPermission`) before handoff pushes, requiring
+  `WRITE`/`MAINTAIN`/`ADMIN`; network-restricted sandbox failures are not
+  treated as invalid credentials.
+- Translated Codex's `["git","push"]` escalation + `/approve` dialect to the
+  OpenCode native permission-prompt model; policy denial fails closed with no
+  command-shape workaround.
+- Preserved OpenCode-local rules: hesitate before pushing `main`/`master`/
+  `develop`, and runtime push failures remain non-fatal (handoff valid locally).
+
+Codex-platform internals from the v0.6.0/v0.6.1 releases (`.codex/*` validators,
+`validate_smoke.py`, role-activation fixtures, CCGS frontmatter) are
+intentionally not ported — OpenCode's Task/subagent model and `.opencode`
+structure make them inapplicable or already-equivalent.
+
 ## v0.5.0 - 2026-07-12
 
 Bridged Codex Game Studios v0.5–v0.6 (upstream commit 259cff8) into the

README.md

@@ -13,7 +13,7 @@
   <a href=".opencode/skills"><img src="https://img.shields.io/badge/skills-77-green" alt="77 Skills"></a>
   <a href=".opencode/commands"><img src="https://img.shields.io/badge/commands-77-yellow" alt="77 Commands"></a>
   <a href=".opencode/hooks"><img src="https://img.shields.io/badge/hooks-12-orange" alt="12 Hooks"></a>
-  <a href=".opencode/VERSION"><img src="https://img.shields.io/badge/version-0.5.0-blue" alt="v0.5.0"></a>
+  <a href=".opencode/VERSION"><img src="https://img.shields.io/badge/version-0.5.1-blue" alt="v0.5.1"></a>
   <a href="https://opencode.ai"><img src="https://img.shields.io/badge/built%20for-OpenCode-f5f5f5" alt="Built for OpenCode"></a>
 </p>
 
@@ -69,7 +69,7 @@ first brainstorm to launch.
 
 ## Current Status
 
-Package version: `0.5.0` (see [`.opencode/VERSION`](.opencode/VERSION)).
+Package version: `0.5.1` (see [`.opencode/VERSION`](.opencode/VERSION)).
 
 This release includes:
 - Hard `/resume-from-handoff` lane-selection boundary: focus arguments only bias
@@ -442,7 +442,7 @@ opencode.json                        # Permissions, plugin ref, instruction file
   uninstall.sh                       # Coexistence-aware uninstaller
   audit.sh                           # Validation dispatcher
   release.sh                         # Version management + GitHub releases
-  VERSION                            # Package version (0.5.0)
+  VERSION                            # Package version (0.5.1)
 design/                              # GDDs, narrative docs (AGENTS.md + registry/)
 docs/                                # Technical docs, ADRs, engine reference
 production/                          # Sprint plans, milestones, session state

production/test-evidence/latest.md

@@ -1,42 +1,65 @@
 # Latest Test Evidence
 
-Date: 2026-07-06
+Date: 2026-07-16
 
-Scope: OpenCode Game Studios v0.3.0 — migration of Codex Game Studios v0.3.3
-continuity-routing rework, v0.4.0 numbered closeout, and v0.4.1 role-agent
-delegation contract into the OpenCode-native port.
+Scope: OpenCode Game Studios v0.5.1 — port of Codex Game Studios handoff-push
+hardening (upstream commit `0c6df429`, "Harden handoff push approval flow") into
+the OpenCode-native port. Version-bump metadata from upstream `0dd1bd3`
+("Bump Codex package to 0.6.1") applied in OpenCode form (own version line).
 
 ## Commands Run
 
 ```bash
 bash .opencode/audit.sh all
-bash .opencode/audit.sh closeout
-bash .opencode/audit.sh release
+rg -n '\.agents/skills|\.codex|"\["git|\$handoff|\$skill|/approve|Codex surface|CCGS skill' .opencode/skills/handoff/SKILL.md
+git rev-parse --abbrev-ref HEAD
+git rev-parse --abbrev-ref --symbolic-full-name '@{u}'
+git remote get-url --push origin
 ```
 
 ## Result
 
-- `.opencode/audit.sh all`: pass (0 errors)
+- `bash .opencode/audit.sh all`: pass (0 errors)
   - agents: 49 checked
   - skills: 77 checked
   - closeout: 19 checked (15 marker-triggered + complete, 4 no-marker skipped)
-  - runtime: no stale `.claude/` or `CLAUDE.md` references
+  - active-state checkpoint: 38 files, 0 violations
+  - playtest-focus: 3 surfaces
+  - bug-lifecycle: 2 surfaces
+  - handoff-review: 2 surfaces — `handoff/SKILL.md (review gate contract)`
+    and `AGENTS.md (handoff review exception)` both pass; the Phase 4 edit did
+    not disturb the 27 required review-contract phrases (all live in the
+    Round-1/Round-2 sections)
+  - resume contract: 0 violations
+  - runtime: no `.claude/` or `CLAUDE.md` references
   - config: opencode.json valid; all instruction files exist
+  - install-safety: 5 guards pass
   - hooks: 12 checked; fixture tests 11 passed, 0 failed
   - smoke: 49 agents, 77 skills, 77 commands, 12 hooks, 17 agent-memory, 15 rules
-- `.opencode/audit.sh closeout`: pass (0 errors)
-- `.opencode/audit.sh release`: pass — VERSION 0.3.0, CHANGELOG has v0.3.0 section
+- Token-leak grep over the edited skill: no matches (exit 1) — no `.agents/`,
+  `.codex`, `["git","push"]` JSON, `$handoff`/`$skill`, `/approve`,
+  "Codex surface", or "CCGS skill" tokens leaked into the OpenCode skill.
+- Phase 4 snippet exercise:
+  - Current branch resolves to `main`.
+  - Upstream detection returns `origin/main` (exit 0) — the existing-upstream
+    case routes to plain `git push`.
+  - `git remote get-url --push origin` returns the verified github.com push URL.
+  - A temporary no-upstream branch yields the expected non-zero lookup
+    (`fatal: no upstream configured`, exit 128), which the skill treats as the
+    no-upstream case routing to `git push -u origin <branch>` — not a Phase
+    failure. Temp branch created and deleted during the check.
 
 ## Notes
 
 - Verification ran in `/Users/yongatron/Development/opencode-game-studios`.
-- A scoped grep over every edited file confirmed no stale upstream tokens
-  leaked (`$skill` syntax, `.codex/docs`, `.agents/skills`, "Codex subagent",
-  "CCGS skill" all absent).
-- `## Session Worklist` is referenced consistently across 25 files; its schema
-  is defined in `.opencode/docs/session-continuity.md`,
-  `/resume-from-handoff`, and `/studio-next`.
-- The new `run_closeout` audit section translates the upstream
-  `validate_runtime.py` CLOSEOUT enforcement (REQUIRED_CLOSEOUT_ROUTING_SKILLS,
-  CLOSEOUT_MARKERS, CLOSEOUT_REQUIRED_PHRASES, CLOSEOUT_FORBIDDEN_PHRASES) into
-  an rg-based shell check, since this port has no Python runtime validator.
+- Files changed this session: `.opencode/skills/handoff/SKILL.md` (Phase 4
+  rewrite), `.opencode/VERSION` (`0.5.0` → `0.5.1`), `CHANGELOG.md`
+  (v0.5.1 section), `README.md` (version badge + two text refs),
+  `production/test-evidence/latest.md` (this file), and the migration plan at
+  `.opencode/plans/migrate-codex-v0.6.1.md`.
+- OpenCode-local rules preserved through the port: hesitate before pushing
+  `main`/`master`/`develop`; runtime push failures (auth/network/rejected)
+  remain non-fatal.
+- Codex-platform internals from the v0.6.0/v0.6.1 releases (`.codex/*`
+  validators, `validate_smoke.py`, role-activation fixtures, CCGS frontmatter)
+  intentionally not ported — out of scope per the established bridging policy.