fix: integrate upstream fleet-sync timeout and backend-selector fixes - #9
Merged
Merged
Conversation
* fix backend selector task id resolution * no-mistakes(document): Document selector resolution behavior
* fix bootstrap fleet sync timeout * no-mistakes(review): Fix bootstrap fleet-sync timeout regressions * no-mistakes(document): Sync bootstrap timeout docs * no-mistakes(lint): Clean ShellCheck directives * no-mistakes: apply CI fixes * no-mistakes: apply CI fixes
…ate-r7 # Conflicts: # bin/fm-bootstrap.sh
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
2 participants
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.
Summary
Upstream integration: merges
kunchenguid/firstmatemain into the fork, bringing in two upstream bugfixes that landed after the previous catch-up (#8).fix: scale bootstrap fleet-sync timeout (#341)- bootstrap's fleet-sync timeout now scales with origin-backed project clone count (max(20, 5 + 3 * count)) instead of a flat 20s, and relays completed sync output before a timeout skip line.fix: resolve backend selectors by exact task id first (#342)- backend selector resolution (bin/fm-backend.sh,bin/backends/*.sh,bin/fm-peek.sh,bin/fm-send.sh) now matches an exact task id before falling back to broader matching, fixing ambiguous selector resolution.Conflict resolution
bin/fm-bootstrap.shconflicted: our fork sourcesfm-clickstack-lib.sh(the ClickStack webhook-receiver wiring) right before sourcingfm-backend.sh, while upstream's fleet-sync-timeout commit addeddisable=SC1091to everyshellcheck source=comment in that same block, including the one abovefm-backend.sh.Resolved by integrating both: kept the fork's
fm-clickstack-lib.shsource line and gave it the samedisable=SC1091shellcheck comment upstream applied to its neighbors, so the whole block is consistent and the ClickStack wiring is preserved unchanged.The backend-selector fix (
#342) touchedbin/fm-backend.sh,bin/backends/{herdr,tmux,zellij}.sh,bin/fm-peek.sh,bin/fm-send.sh, and related docs/tests - all auto-merged cleanly since the fork had no local changes to those files.Validation
shellcheck bin/*.sh bin/backends/*.sh tests/*.sh- clean.for t in tests/*.test.sh; do bash "$t"; done- all 56 behavior tests passed (matches.no-mistakes.yaml'stestcommand and CI).Fork-only change; not upstreamed.