Skip to content

Commit af0a18c

Browse files
committed
docs: treat dual-track landing as interim owner intent
Reflect that Go is still unstable and separate release tracks are under consideration, not a finalized dual-merge workflow.
1 parent c008aa3 commit af0a18c

2 files changed

Lines changed: 29 additions & 24 deletions

File tree

‎AGENTS.md‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,25 @@ A pull request targeting neither `dev` nor `dev2-go` is invalid unless it is a
6060
maintainer-controlled release or promotion. A pull request targeting `dev2-go`
6161
without the required Go/native scope must be retargeted to `dev`.
6262

63-
### Dual landing (`dev` and `dev2-go`)
63+
### Interim dual-track intent (`dev` and `dev2-go`)
6464

65-
Each pull request still has **one** base branch. Do not invent a dual-base PR.
65+
The Go port is still stabilizing, so the project is moving toward **two release
66+
tracks** rather than one shared line:
6667

67-
While `dev` and `dev2-go` both remain active integration lines, merged work that
68-
matters on both lines must **also land** on the other line (cherry-pick, paired
69-
follow-up PR, or maintainer backport). Until repository automation does this,
70-
treat dual landing as a required follow-through when finishing issues or PRs,
71-
not as optional cleanup.
68+
- `dev` — TypeScript / Bun track (current release path to `main`)
69+
- `dev2-go` — Go track (may gain its own separate release path; still contains
70+
shared TypeScript surfaces today)
7271

73-
Release promotion remains `dev` → `main` only. Prefer promoting and deploying
74-
merged release-path work within about a week when maintainers direct it.
72+
Owner direction for handling issues and PRs: keep both tracks in mind, and
73+
prefer landing work on **both** `dev` and `dev2-go` when the change belongs on
74+
both, until a pipeline or separate Go release path is decided. Exact mechanics
75+
(which base first, cherry-pick vs paired PR, whether `dev2-go` ships alone) are
76+
still being decided — do not invent dual-base PRs, and do not treat the old
77+
“`dev2-go` = Go-only work” rule as the whole story anymore.
7578

76-
`MAINTAINERS.md` is authoritative for this merge and promotion policy.
79+
Prefer promoting and deploying release-path work within about a week when
80+
maintainers direct it. `MAINTAINERS.md` is authoritative; update it when the
81+
owner finalizes the pipeline / separate-release decision.
7782

7883
## Working rules
7984

‎MAINTAINERS.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ through GitHub repository settings.
1616

1717
## Review and merge policy
1818

19-
- Pull requests target `dev` by default. `dev2-go` is a parallel integration
20-
line for Go native-port work. Each pull request still has one base; the
21-
target-branch check accepts both as integration targets. It cannot
22-
distinguish scoped Go port work from anything else aimed at `dev2-go`, so
23-
that boundary is enforced in review: redirect an out-of-scope pull request to
24-
`dev` rather than treating the automation's silence as approval.
25-
- **Dual landing:** while both `dev` and `dev2-go` remain active, work that
26-
belongs on both lines must land on both after merge (cherry-pick, paired
27-
follow-up PR, or maintainer sync). Do not treat a single-base merge as done
28-
if the other line still needs the change. Automated dual-landing may replace
29-
this manual step once the owner ships the pipeline; until then, dual landing
30-
is expected when handling issues and PRs.
31-
- Promotion to `main` and npm releases remain maintainer-controlled and still
32-
happen only from `dev`. Prefer promoting and deploying release-path merges
19+
- Pull requests still use **one** GitHub base per PR. `dev` remains the default
20+
TypeScript / Bun integration line and the current path to `main`. `dev2-go`
21+
is the Go track; it also carries shared TypeScript today. The target-branch
22+
check accepts both bases.
23+
- **Interim dual-track intent:** the Go port is still finding instability, so
24+
the owner wants two release tracks and is still deciding whether `dev2-go`
25+
can ship separately. Until that is finalized (and until any sync pipeline
26+
lands), when handling issues or PRs prefer getting the same change onto
27+
**both** `dev` and `dev2-go` when it belongs on both (cherry-pick, paired PR,
28+
or maintainer sync). Do not treat “merged to one track only” as finished if
29+
the other track still needs it. Do not hard-code a finished workflow beyond
30+
what the owner has confirmed.
31+
- Promotion to `main` and npm releases remain maintainer-controlled from `dev`
32+
until a separate Go release path exists. Prefer promoting and deploying
3333
within about a week when the owner or maintainers direct it.
3434
- A pull request requires approval from at least one maintainer and successful required CI checks
3535
before merge.

0 commit comments

Comments
 (0)