[deanrie]

Summary

Three pstack fixes by @rudycelekli (two in watch-pr, one in orch), cherry-picked onto main with original authorship (cherry-pick -x) for one review. Each brings a test.

Original	Change
#664	stack discovery no longer confuses a fork head with the upstream branch of the same name
#666	polling sleeps are capped at the deadline instead of overshooting it
#684	orch store prefers the active PR over branch history when both are present

#684 touches orch/store.ts; checked with git merge-tree against #733 (lock takeover): no overlapping hunks.

Close this and merge the originals if that is preferred.

Verification

In pstack/skills/poteto-mode/scripts: bun run typecheck clean, bun test 80 pass / 0 fail. generate-pstack-harness-trees.mjs --check: harness up to date.

[deanrie]

All three originals have landed on main since this was opened, rebased by the maintainers with the authors kept: #664 via #801, #666 via #802, and #684 via #804. The fix files in this branch now match main byte for byte, so this bundle has nothing left to add. Closing.