You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 3c2bfa3
Browse filesBrowse the repository at this point in the historyBrowse files
authored and
rsi-pr-agent
committed
fix(fork-sync): one standing blocked and failed issue, rewritten per run
## What Changed
- `fork-sync.ts`: each sync issue kind (blocked, failed) keeps one standing open issue
- A blocked or failed run rewrites that issue's title and body in place; it files only when none is open
- Older open issues of the same kind close with `Superseded by #N.`
- The body gains a short tail: open-since date, target count, last five runs
- A rerun on the same target and detail writes nothing
- Sync doc, glossary, and `fork-sync` skill updated; one new test
```md
Open since 2026-09-27 across 4 targets; each failed run rewrites this issue and a clean run closes it.
## Recent runs
- 2026-09-28 · `v0.0.43-nightly.20260928.2402` · check
- 2026-09-28 · `v0.0.43-nightly.20260928.2375` · check
```
## Why
Failure issues were keyed by step and tag, and block issues by upstream sha.
Every new nightly filed a fresh issue, so four `failed at check` issues sat open at once (#1332, #1354, #1366, #1384).
```text
vp run fork:ci → exit 0
vp run fork:delta --check → exit 0
vp test run scripts/fork-sync.test.ts → 44 passed
```
## Checklist
- [x] This PR is small and focused
- [x] I explained what changed and why
## Fork trailers
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>
| blocked | one block issueper blocking sha, through `gh`|`gh` refuses the write |
21
+
| blocked | one standing block issue, rewritten per run, through `gh`|`gh` refuses the write |
22
22
| report |`.t3/fork-sync/<tag>.json`, typed, written before any post ||
23
23
24
24
A tag the fork already sits on reports `already applied` — after closing the block issues a previous run left open.
@@ -72,17 +72,16 @@ There is no "upstream superseded this" rule: retirement is a traced verdict writ
72
72
73
73
## Block lifecycle
74
74
75
-
A blocked run writes its report first, then files one issue per blocking upstream sha through plain `gh`.
76
-
The title phrase and the sha key the issue; the body carries the conflict table (path, fork commit, upstream commit) and the resume commands.
75
+
A blocked run writes its report first, then rewrites the one open block issue through plain `gh`, filing it only when none is open.
76
+
The body carries the conflict table (path, fork commit, upstream commit), the resume commands, and a tail: open-since date, target count, last five runs.
| Identity | Title phrase `hyprws sync blocked`, label `ci`, and the exact `blocking-sha` body marker |
81
-
| Filed once | Per blocking SHA, including after a manual close |
82
-
| Rerun | Same sha updates the issue; a clean run closes it |
83
-
| Close | A clean run (applied or already-applied) closes each open block issue with `gh issue close --reason completed --comment "Resolved by hyprws <sha>"`; a refusal lands in the report and fails the run |
84
-
| Route | Plain `gh` only |
85
-
| Refusal | A refusing `gh` prints the body; the run exits non-zero |
| Identity | Title phrase `hyprws sync blocked` and label `ci`; the newest open issue is the standing one |
81
+
| Standing | Each blocked run rewrites its title and body; older open block issues close as superseded |
82
+
| Close | A clean run (applied or already-applied) closes each open block issue with `gh issue close --reason completed --comment "Resolved by hyprws <sha>"`; a refusal lands in the report and fails the run |
83
+
| Route | Plain `gh` only |
84
+
| Refusal | A refusing `gh` prints the body; the run exits non-zero |
86
85
87
86
Never post a block to `pingdotgg/t3code`.
88
87
@@ -99,15 +98,13 @@ Rerere replays content resolutions but records nothing for a delete/modify: the
99
98
100
99
## Failure lifecycle
101
100
102
-
A run that fails on a non-blocked step — target, fetch, rebase, check, push, or a crash — files one issue the same way a block does, through the same `gh` route.
101
+
A run that fails on a non-blocked step (target, fetch, rebase, check, push, or a crash) rewrites one standing failure issue the same way a block does, through the same `gh` route.
| Identity | Title phrase `hyprws sync failed`, label `ci`, and the `sync-failure:<step>:<key>` body marker |
107
-
| Key | The failing step plus the target tag, or the trunk sha before a tag resolved |
108
-
| Filed once | Per key, including after a manual close |
109
-
| Rerun | The same failure updates the issue; a dry run reports and never files |
110
-
| Close | A clean run (applied or already-applied) closes it in the same `gh issue close --comment` pass that closes block issues; a refusal lands in the report and fails the run |
| Identity | Title phrase `hyprws sync failed` and label `ci`; the newest open issue is the standing one |
106
+
| Standing | Each failed run rewrites its title and body; a dry run reports and never files |
107
+
| Close | A clean run (applied or already-applied) closes it in the same `gh issue close --comment` pass that closes block issues; a refusal lands in the report and fails the run |
111
108
112
109
## Regenerable files
113
110
@@ -140,7 +137,7 @@ The workflow uses its own `GITHUB_TOKEN` with `issues: write`; never widen the t
140
137
### Labels
141
138
142
139
Block issues carry the governed `ci` label; nothing creates a sync-specific label.
143
-
They are found by the title phrase `hyprws sync blocked` and the `blocking-sha` body marker.
140
+
They are found by the title phrase `hyprws sync blocked`.
|`release/vX.Y.Z-hyprws`| A create-only branch snapshotting the fork stack rebased onto stable upstream `vX.Y.Z`. Stable `vX.Y.Z-hyprws.<n>` tags are cut from it, and later trunk work never moves it. |
26
-
|`hyprws sync blocked`| The fork's block issue: one per blocking upstream sha, labelled `ci` and found by its title phrase and `blocking-sha` body marker. A maintainer resolves it through the `fork-sync` skill. |
27
-
| Nightly channel | The prerelease update channel for `vX.Y.Z-hyprws-nightly.YYYYMMDD.<run>` tags, kept separate from stable fork releases in the desktop updater. |
|`release/vX.Y.Z-hyprws`| A create-only branch snapshotting the fork stack rebased onto stable upstream `vX.Y.Z`. Stable `vX.Y.Z-hyprws.<n>` tags are cut from it, and later trunk work never moves it. |
26
+
|`hyprws sync blocked`| The fork's standing block issue: one open at a time, labelled `ci`, found by its title phrase, and rewritten by each blocked run. A maintainer resolves it through the `fork-sync` skill. |
27
+
| Nightly channel | The prerelease update channel for `vX.Y.Z-hyprws-nightly.YYYYMMDD.<run>` tags, kept separate from stable fork releases in the desktop updater. |
0 commit comments