feat(bin): make an unobserved result a third value that cannot pass (land of upstream #1827) - #55
Open
sbracewell64 wants to merge 1 commit into
Open
feat(bin): make an unobserved result a third value that cannot pass (land of upstream #1827)#55sbracewell64 wants to merge 1 commit into
sbracewell64 wants to merge 1 commit into
Conversation
…land of upstream kunchenguid#1827) Ports upstream PR kunchenguid#1827 onto this fork's trunk. Nothing here is redesigned: bin/fm-verify.sh, bin/fm-verify-lib.sh, the PASS / FAIL / NO_VERIFIER_RAN law, the check-conclusion partition (STARTUP_FAILURE as could-not-observe, CANCELLED/TIMED_OUT as not-observed rather than FAIL), the shared rollup rule for skipped/stale/neutral checks, the bearings label, and the witnessed-red test controls are upstream's as written. Provenance: upstream PR kunchenguid#1827 head commit 0c3afca its base 2cf0283 landed onto ed376cf (sbracewell64/firstmate main) The two trunks diverged at upstream kunchenguid#1495, so the diff did not apply cleanly. Resolutions, all of them fork-versus-upstream divergence rather than changes to what kunchenguid#1827 does: bin/fm-bearings-snapshot.sh - upstream sources bin/fm-timeout-lib.sh here; this fork has no such file and inlines its own bounded gh call instead. Only the fm-verify-lib.sh sourcing this contribution adds is kept. The check-rollup splice itself applied unchanged. bin/fm-test-run.sh - upstream's hunk carried three family entries; two of them (fm-sessionstart-run.sh, fm-timeout-lib.sh) are for files this fork does not have. Only the bin/fm-verify-lib.sh entry, which is this contribution's own, is landed. bin/fm-brief.sh - upstream had no verification-discipline block at all, so the contribution introduced one. This fork already had one, in the older two-bullet form, shared by the ship, scout and secondmate scaffolds. Its single definition is replaced in place with the contribution's three-valued text rather than adding a second definition, so all three scaffolds move together and the one-owner rule holds. The header comment describing that block is updated to the text it now emits. tests/fm-brief.test.sh - both suites are kept. This fork's test_standing_worker_rules_by_variant asserted the old block's wording; those three assertions are re-pointed at the replacement text (witnessed negative control, the three-valued rule, and missing-artifact-is-could-not-observe), which is the same intent against the sentences that now exist. Upstream's test_verification_discipline_is_the_type_rule is added alongside it. docs/scripts.md - the fm-timeout-lib.sh row upstream's hunk carried does not belong on this fork; the two fm-verify rows are landed. Verified on this fork: bin/fm-lint.sh clean (ShellCheck 0.11.0, exit 0), bin/fm-doc-audience-check.sh ok (surfaces=72 local_links=213), and tests/fm-verify.test.sh, tests/fm-brief.test.sh and tests/fm-bearings-snapshot.test.sh all pass.
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
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.
Ports upstream PR kunchenguid#1827 onto this fork's trunk. Nothing here is redesigned:
bin/fm-verify.sh,bin/fm-verify-lib.sh, the PASS / FAIL / NO_VERIFIER_RAN law, the check-conclusion partition, the shared rollup rule for skipped/stale/neutral checks, the bearings label, and the witnessed-red test controls are upstream's as written.Provenance
0c3afca2cf0283ed376cf(sbracewell64/firstmate main)The two trunks diverged at upstream kunchenguid#1495, so the diff did not apply cleanly.
Conflict resolutions
All of them fork-versus-upstream divergence rather than changes to what kunchenguid#1827 does.
bin/fm-bearings-snapshot.sh- upstream sourcesbin/fm-timeout-lib.shhere; this fork has no such file and inlines its own boundedghcall instead. Only thefm-verify-lib.shsourcing this contribution adds is kept. The check-rollup splice itself applied unchanged.bin/fm-test-run.sh- upstream's hunk carried three family entries; two of them (fm-sessionstart-run.sh,fm-timeout-lib.sh) are for files this fork does not have. Only thebin/fm-verify-lib.shentry, which is this contribution's own, is landed.bin/fm-brief.sh- upstream had no verification-discipline block at all, so the contribution introduced one. This fork already had one, in the older two-bullet form, shared by the ship, scout and secondmate scaffolds. Its single definition is replaced in place with the contribution's three-valued text rather than adding a second definition, so all three scaffolds move together and the one-owner rule holds. The header comment describing that block is updated to the text it now emits.tests/fm-brief.test.sh- both suites are kept. This fork'stest_standing_worker_rules_by_variantasserted the old block's wording; those three assertions are re-pointed at the replacement text (witnessed negative control, the three-valued rule, and missing-artifact-is-could-not-observe), which is the same intent against the sentences that now exist. Upstream'stest_verification_discipline_is_the_type_ruleis added alongside it.docs/scripts.md- thefm-timeout-lib.shrow upstream's hunk carried does not belong on this fork; the twofm-verifyrows are landed.Contribution containment
git merge-tree --write-tree fork/main HEADexits 0, and the tree it writes is byte-identical to this branch's own tree, so the branch carries only this contribution on top of the current trunk. Both directions of that check were controlled: merge-tree against the raw upstream branch exits 1 (conflicts), and the written tree diffs non-empty againstfork/main.Test evidence
Run on this branch in an isolated worktree at
83db581.bin/fm-lint.shbin/fm-doc-audience-check.shtests/fm-verify.test.shtests/fm-brief.test.shtests/fm-bearings-snapshot.test.shbin/fm-test-run.sh --changed --base fork/mainThe one failure, disclosed
tests/fm-calm-pi-extension.test.shfails with:This is pre-existing and unrelated. Proved on the base before claiming so: a clean
git archive fork/mainextraction, with none of this branch's changes present, runs the same suite and exits 1 with the identical error. This branch touches no file that suite reads; the cause is that this environment'snodehas no TypeScript loader.Check state
Fork CI is currently failing wholesale on this repository, with a separate diagnosis lane live on it. If every check on this PR reports failure, that is the standing condition rather than a result this branch produced; the local evidence above is what stands behind it.