Port upstream batch 1: teardown fork-remote eligibility (#31) + afk skill desc (#45) - #2
Merged
Merged
Conversation
…nguid#31) + afk skill desc (kunchenguid#45) Cherry-pick-and-port of two upstream commits, adapted to the fork (logic re-applied by hand because the fork diverged at the psmux port; doc deltas folded into CLAUDE.md rather than AGENTS.md). kunchenguid#31 (6f5800e) - fm-teardown.sh: unify the unpushed-work safety check so "HEAD --not --remotes" (on any remote, fork included) is the primary gate for every mode; the local default-branch check now runs only as a fallback for local-only projects whose work is on no remote at all. Fixes false refusal of fork-pushed work (the exact upstream-contribution flow this fork uses). Safety property preserved: truly unpushed work is still refused; --force unchanged. kunchenguid#45 (2a2fe05) - afk SKILL.md: replace a ':' with ';' in the description. Not ported: upstream's tests/fm-teardown.test.sh and its README test-list line. That test drives the script via FM_ROOT_OVERRIDE / FM_STATE_OVERRIDE, scaffolding introduced by the secondmate rewrite (kunchenguid#37), which this fork is deliberately not taking. Adding fork-native override support for a regression test is a sensible follow-up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
First batch of the cherry-pick-and-port of upstream commits into this psmux/Windows fork. Both changes were re-applied by hand: the fork diverged at the psmux port, so upstream diffs don't apply cleanly, and doc deltas land in
CLAUDE.md(not the upstreamAGENTS.md).kunchenguid#31 (6f5800e) - teardown allows work on any remote, incl. a fork
bin/fm-teardown.sh: unify the unpushed-work safety check sogit log HEAD --not --remotes(empty = on any remote, fork included) is the primary gate for every mode. The local default-branch check now runs only as a fallback forlocal-onlyprojects whose work is on no remote at all.--forceunchanged.no-mistakes/direct-PRis unchanged.kunchenguid#45 (2a2fe05) - afk skill description
.agents/skills/afk/SKILL.md: replace a:with;in the description (a colon there can confuse skill-description parsing).Docs
CLAUDE.md: ported the two prose updates from kunchenguid#31 (prime directive #3 wording + thelocal-onlydelivery-mode teardown note).Deliberately not ported
tests/fm-teardown.test.shand its README test-list line. Upstream's test drives the script viaFM_ROOT_OVERRIDE/FM_STATE_OVERRIDE, scaffolding introduced by the secondmate rewrite (feat: support persistent secondmates kunchenguid/firstmate#37), which this fork is not taking. Adding fork-native override support for a regression test is a reasonable follow-up.Verification
bash -n bin/fm-teardown.shpasses.tmuxcalls introduced (fork routes through$FM_MUX).