Skip to content

armgit / Piik

Public Imported from GitHub
0

Free, open-source screen sharing for private live streams with friends. Watch together in a browser or self-host Piik. 免费开源的私密屏幕共享,支持游戏直播、一起看电影与自部署。

chore: keep main as a low-frequency integration branch

AAAf95c420717f1
diff --git a/AGENTS.md b/AGENTS.md
index cdc35d66..68763733 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -70,6 +70,14 @@
- Canonical root must be clean current `main` at audit/integration boundaries.
Create branches/worktrees from that exact commit; old branches and worktrees
are never truth sources.
+- `main` is a low-frequency integration branch, never a workbench. Keep work on
+ branches/worktrees and merge only one complete, user-accepted phase per PR,
+ after its related implementation, tests, documentation, and acceptance are
+ complete. Use one squash commit and leave `main` unchanged between phases.
+ Do not merge intermediate checkpoints, release records, metadata-only edits,
+ or follow-up cleanup; fold them into the next phase. A P0/P1 emergency may
+ bypass batching only when the user explicitly authorizes it, still through
+ one coherent PR.
- Preserve user work. Branch, truth-checkpoint, PR, release, recovery, and
cleanup rules are owned by [CONTRIBUTING.md](./CONTRIBUTING.md); do not mirror
that workflow here.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f63ebe3e..aadcd9a4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,11 +15,19 @@ Do not automatically create a truth checkpoint, edit status/memory, run `npm run
Use this path only when the owner explicitly requests it or when closing a major phase or changing a public contract, route/security model, infrastructure, persistent/irreversible state, or release boundary.
+`main` is intentionally low-frequency. It is not a staging branch: all
+intermediate implementation, experiments, evidence collection, release notes,
+and cleanup stay in branches/worktrees. One complete, user-accepted phase lands
+through one squash PR after its related checks and acceptance are finished;
+leave `main` alone until the next material phase. Only a user-authorized P0/P1
+emergency may use a separate PR, and that PR must still contain one coherent
+fix.
+
1. Create one short-lived branch/worktree from exact canonical `main`; use `feat/`, `fix/`, `docs/`, `refactor/`, `test/`, `chore/`, or `spike/` followed by a short description.
2. Update only the single durable owner for changed semantics and any materially changed current snapshot. If semantics remain disputed, record a hold and stop dependent work.
3. Implement and run repository hygiene, `npm run check`, the relevant browser/network gates, and review in proportion to the whole acceptance boundary.
-4. Merge an accepted truth checkpoint before dependent candidates. Rebase or rebuild a retained candidate from that exact `main` once, preserving main's owning truth on conflicts and transplanting only approved scoped code, tests, and new facts.
-5. Open the pull request, resolve required review/checks, squash-merge the coherent phase once, deploy that merged revision when authorized, perform scoped postflight, then audit references and reparse safety before cleanup.
+4. Keep accepted truth checkpoints and dependent candidates on branches until the phase is complete. Rebase or rebuild a retained candidate from exact `main` only when starting a new phase, preserving main's owning truth on conflicts and transplanting only approved scoped code, tests, and new facts.
+5. Open one pull request for the complete phase, resolve required review/checks, squash-merge it once, deploy that merged revision when authorized, perform scoped postflight, then audit references and reparse safety before cleanup.
One coherent phase should leave one meaningful squash commit on `main`. Include
its source, tests, owned semantic documentation, and materially changed status