Skip to content

Commit 8eadb9c

Browse files
donjor-agent[bot]donjor
authored andcommitted
fix(fork-sync): job mode adds the upstream remote before the dry run (#1852)
## Problem An rsi-pr-agent `fork-sync` job starts from a clone with only `origin`. The driver's first step runs `git fetch --tags --force upstream` (`scripts/fork-sync.ts:1898`), so Job mode fails before the dry run. ## Change Job mode's first step now adds the `upstream` remote unless one exists. ## Scope and approval Part of #1841: the rsi-pr-agent job runs the skill's Job mode; CI adds the same remote in `hyprws-upstream-sync.yml`. ## Verification `vp run fork:ci` → exit 0. Docs-only; the live proof is the first `rsi:fork-sync` run on #1836. Claude Opus 5.5 in Claude Code. ## Fork trailers Fork-Domain: fork-meta Fork-Tier: bugfix Fork-Upstreamable: no Co-authored-by: donjor <[email protected]>
1 parent 434880c commit 8eadb9c

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

‎.agents/skills/fork-sync/SKILL.md‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,18 @@ The body keeps its open-since date, target count, and last five runs; a clean ru
148148
A job resolves a blocked sync without writing the trunk or the candidate.
149149
It hands its resolutions to the next run as data on `sync/resolution`.
150150

151-
1. Run `vp run fork:sync <tag> --dry-run`
152-
2. Resolve `manual` paths per [Conflict](#conflict)
153-
3. `git add` them in the kept worktree; rerun
154-
4. Repeat until the rebase finishes
155-
5. Commit tip adaptation there; rerun once
156-
6. `git update-ref --no-deref HEAD refs/fork-sync/resolution`
157-
7. Report `committed`: rsi-pr-agent pushes `HEAD`; the sync reruns
151+
1. Add the `upstream` remote unless present
152+
2. Run `vp run fork:sync <tag> --dry-run`
153+
3. Resolve `manual` paths per [Conflict](#conflict)
154+
4. `git add` them in the kept worktree; rerun
155+
5. Repeat until the rebase finishes
156+
6. Commit tip adaptation there; rerun once
157+
7. `git update-ref --no-deref HEAD refs/fork-sync/resolution`
158+
8. Report `committed`: rsi-pr-agent pushes `HEAD`; the sync reruns
159+
160+
```sh
161+
git remote add upstream https://github.com/pingdotgg/t3code.git
162+
```
158163

159164
Every rebase rewrites `refs/fork-sync/resolution` before `ci`, so a `ci` failure in the job is expected.
160165
It is one parentless commit:

0 commit comments

Comments
 (0)