ソースを参照

Clarify V2 integration branch workflow

Alvin Unreal 3 ヶ月 前
コミット
438c75f170
1 ファイル変更19 行追加4 行削除
  1. 19 4
      AGENTS.md

+ 19 - 4
AGENTS.md

@@ -102,15 +102,16 @@ oh-my-opencode-slim/
 
 
 ## V2 Branch and Worktree Workflow
 ## V2 Branch and Worktree Workflow
 
 
-Keep `master` stable for the npm `latest` release. Use `v2-beta` as the V2
-integration and npm `beta` release branch, but do not develop unrelated features
-directly on it.
+Keep `master` stable for the npm `latest` release. Use `v2-beta` as the central
+V2 integration branch: merge focused V2 feature branches there, test the combined
+V2 experience there, and publish npm `beta` releases from there. Do not develop
+unrelated features directly on `v2-beta`; keep it as the shared integration point.
 
 
 Recommended branch flow:
 Recommended branch flow:
 
 
 ```text
 ```text
 master              stable latest users
 master              stable latest users
-v2-beta            V2 integration branch; publish @beta from here
+v2-beta            central V2 integration/test branch; publish @beta here
 v2/<feature-name>  focused V2 feature branches merged into v2-beta
 v2/<feature-name>  focused V2 feature branches merged into v2-beta
 ```
 ```
 
 
@@ -132,6 +133,20 @@ git worktree add ../oh-my-opencode-slim-v2-<feature-name> \
 Create PRs from `v2/<feature-name>` into `v2-beta`. Merge into `master` only
 Create PRs from `v2/<feature-name>` into `v2-beta`. Merge into `master` only
 when V2 is ready to become the stable `latest` release.
 when V2 is ready to become the stable `latest` release.
 
 
+To test all V2 work together, use `v2-beta` after feature branches are merged:
+
+```bash
+git checkout v2-beta
+git pull --ff-only origin v2-beta
+bun run check:ci
+bun run typecheck
+bun test
+```
+
+If a merged feature needs more work, continue on its focused branch or create a
+new `v2/<feature-name>` follow-up branch from the latest `v2-beta`, then merge it
+back into `v2-beta` again when ready.
+
 ## Tmux Session Lifecycle Management
 ## Tmux Session Lifecycle Management
 
 
 When working with tmux integration, understanding the session lifecycle is crucial for preventing orphaned processes and ghost panes.
 When working with tmux integration, understanding the session lifecycle is crucial for preventing orphaned processes and ghost panes.