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 5f769e3
Browse filesBrowse the repository at this point in the historyBrowse files
authored and
rsi-pr-agent
committed
fix(fork): scan skips restored upstream test openers; folds may split a cited mover (#1506)
## Problem
Three tooling gaps block paying down the grandfathered scan findings.
- **Restore reads as a fork block:** `dc56af095d6` restored upstream cases, such as `it("only lists server-known sessions that are running or starting (plus current)", …)`; the scan reports each restore as "gains N fork test block(s)"
- **Mover split refused:** `prove` refuses a non-repair commit owned by several new commits, so Fold A cannot split a mover back into the owners whose blocks it moved
- **Stale doc:** `fork-development.md` lists two harness deferrals the scan no longer implements
## Change
| Part | Change |
| --- | --- |
| B0a | block rule skips an added opener the target file already has, unless the head holds more copies than the target |
| B0b | `memberFindings` accepts an old commit with several owners when every owner cites it under `Squashes:` |
| B0c | drop the `DesktopWindow.test.ts` / `server.test.ts` deferral text |
| Docs | fork-fold skill states the relaxed guard; the sibling table gains the restore row |
The count check keeps a fork block that reuses an upstream title counted.
Under B0b, a split mover's remainder commit must cite the mover too; an owner that does not cite it still refuses.
## Scope and approval
Part of #1493 (plan batch B0, host decisions D1 and D2).
## Verification
- `vp test run scripts/fork-scan-gates.test.ts scripts/fork-scan.test.ts` → exit 0, 44 passed
- `vp test run scripts/fork-fold.test.ts` → exit 0, 33 passed
- Both new tests fail with the old rule
- `vp run typecheck` (scripts) → exit 0
- `vp run fork:ci` → exit 0
Inventory scan from the issue against merge base `b33eda13998b`:
```diff
- historical: 172 finding(s) already on origin/hyprws
+ historical: 167 finding(s) already on origin/hyprws
```
<details>
<summary>Cleared findings (all <code>dc56af095d6</code>)</summary>
| File | Blocks |
| --- | --- |
| `apps/desktop/src/app/DesktopClerk.test.ts` | 1 |
| `apps/mobile/src/features/terminal/terminalMenu.test.ts` | 1 |
| `apps/server/src/pullRequest/PullRequestService.test.ts` | 1 |
| `apps/web/src/components/pullRequest/pullRequestProjectFilter.logic.test.ts` | 7 |
| `apps/web/src/localApi.test.ts` | 2 |
One count shrinks: `175d4928166` `ClaudeAdapter.test.ts` 2 → 1 block; its bare `it.effect(` opener matches upstream's, and a later mover took the block out. Fold A clears that finding.
</details>
Claude Opus 5.5 via Claude Code.
## Fork trailers
Fork-Domain: fork-meta
Fork-Tier: core
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>
Copy file name to clipboardExpand all lines: .agents/skills/fork-fold/SKILL.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -83,7 +83,7 @@ Split each one on a detached copy of the head (`git worktree add --detach <dir>
83
83
84
84
Run the fold with `--head <split head>`: each fixup joins its owner's plan line and squashes there, so the owner's `Squashes:` lists its own old sha, the repair sha, and the repair's references.
85
85
`prove` and `publish` take the pre-split tip as `<old>`; a tree-equal fold needs no retest.
86
-
`prove` also refuses a dropped PR link, a commit naming no `<old>` member or touching a path none of its members touched, and an old commit owned by no new commit or, unless it carries `Fork-Repair`, by several.
86
+
`prove` also refuses a dropped PR link, a commit naming no `<old>` member or touching a path none of its members touched, and an old commit owned by no new commit or by several, unless it carries `Fork-Repair` or every owner cites it under `Squashes:`.
0 commit comments