Skip to content

Commit da8c088

Browse files
os-steveclaude
andcommitted
fix(pm): read every Blocked-by: directive on a line, and every ref in one
`check-half-states.mjs` took ONE target from a line stating several, and for a directive whose remainder is prose it took whichever number the ref walk reached first. Both readings under-report a block that H19's row then releases: a live body with nine `·`-separated backticked directives resolved 1 target and printed 「1 of 1 CLOSED」, and a body whose directive opens with a possessive resolved that possessive — a card that was never a blocker — and dropped both real blockers. Two halves, in the two places they belong: - the shared decorated-directive reader now splits a line at every FURTHER key that follows a separator run, so each directive yields its own value and the whole directive family gains it. A key after a WORD is still prose. - the `Blocked-by:` walk now takes EVERY ref in a directive's value instead of the leading run. The run was taken to keep a context `#N` out of the index, and it did not: a prose-opening value filed a phantom AND dropped the real blockers. An extra target can only withhold a discharge; a dropped one releases a live block. Self-test: the two measured live shapes as fixtures (9 targets, both real blockers), the two dark controls (one directive is one target; prose outside a directive invents nothing), the family pin on a non-`Blocked-by:` key, and the end-to-end count 「1 of 2」 from a two-directive body line. Claude-Session: https://claude.ai/code/session_017ETYWqMQD4qMtZzAGovWNi Co-authored-by: Claude <noreply@anthropic.com>
1 parent 57ceb9d commit da8c088

1 file changed

Lines changed: 101 additions & 22 deletions

File tree

‎scripts/pm/check-half-states.mjs‎

Lines changed: 101 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,6 +1873,19 @@ function stripMatchingDecoration(value, opener) {
18731873
return out;
18741874
}
18751875

1876+
/**
1877+
* What may sit BETWEEN two directives on one line: decoration, spaces and a
1878+
* list separator, nothing else. That class is the whole guard — a key after a
1879+
* WORD stays the mid-sentence mention the anchoring above protects (「seats
1880+
* park the `Blocked-by: #1` line in comments」), a key after 「` · `」 is the
1881+
* second directive of a list a seat really wrote.
1882+
*/
1883+
const DIRECTIVE_SEPARATOR = String.raw`[ \t]*(?:${DIRECTIVE_MARKER}[ \t]*)*[·•|,;、]+[ \t]*`;
1884+
1885+
/** A FURTHER directive on the same line, its own opening decoration captured. */
1886+
const nextDirectiveOnLine = (key) =>
1887+
new RegExp(`${DIRECTIVE_SEPARATOR}((?:${DIRECTIVE_MARKER}[ \\t]*)*)${directiveKey(key)}[ \\t]*`);
1888+
18761889
/**
18771890
* Every value carried by a `<key>:` directive line in this text, decoration
18781891
* removed, empties dropped — the one reader H9 and the `Blocked-by:` index
@@ -1883,16 +1896,37 @@ function stripMatchingDecoration(value, opener) {
18831896
* silently kept its trailing backtick is exactly the regression this shares a
18841897
* cause with.
18851898
*
1899+
* ## EVERY directive on the line, never the first one alone
1900+
*
1901+
* A seat fits as many directives on a line as it likes — nine `·`-separated
1902+
* backticked ones is a MEASURED live shape — and this used to hand back ONE
1903+
* value per line: the first key, then the rest of the line as its value. Every
1904+
* family therefore read the others as that value's prose, which for the
1905+
* `Blocked-by:` index meant eight blockers dropped in silence and a block that
1906+
* reads as EXPIRED (「1 of 1」 on a card stating nine). So the line splits at
1907+
* every FURTHER key after a separator run; ⛔ a key after a WORD is prose.
1908+
*
18861909
* @param {string} text
18871910
* @param {'Blocked-by'|'Restart-when'|'Maintainer-action'|'Unlock-action'} key
18881911
* @returns {string[]}
18891912
*/
18901913
export function directiveValues(text, key) {
18911914
const re = new RegExp(`^${DIRECTIVE_PREFIX}${directiveKey(key)}[ \\t]*(\\S.*)$`, 'gm');
1915+
const next = nextDirectiveOnLine(key);
18921916
const out = [];
1893-
for (const m of String(text ?? '').matchAll(re)) {
1894-
const value = stripMatchingDecoration(m[2], m[1]);
1917+
const take = (raw, opener) => {
1918+
const value = stripMatchingDecoration(raw, opener);
18951919
if (value) out.push(value);
1920+
};
1921+
for (const m of String(text ?? '').matchAll(re)) {
1922+
let opener = m[1];
1923+
let rest = m[2];
1924+
for (let split = next.exec(rest); split; split = next.exec(rest)) {
1925+
take(rest.slice(0, split.index), opener);
1926+
opener = split[1];
1927+
rest = rest.slice(split.index + split[0].length);
1928+
}
1929+
take(rest, opener);
18961930
}
18971931
return out;
18981932
}
@@ -3671,13 +3705,21 @@ export function h13DomainWithoutPmState(issue, nowMs = Date.now()) {
36713705
* line because it sits in code, this one reads a line whose code markers
36723706
* are the author formatting a directive. Both serve the same test — would
36733707
* the unlock sweep's grep act on this line — and its answer here is yes.
3674-
* 2. **Only the LEADING ref run is taken.** Real lines carry trailing prose —
3675-
* 「Blocked-by: #9689 (the relocation it needs is the same edit)」 — and
3676-
* prose can name a second card that is context, not a blocker. Scanning
3677-
* the whole value would manufacture a dependent for it, and the cost lands
3678-
* on a THIRD card (a phantom "missing cache" row against someone who did
3679-
* nothing wrong). So the scan walks refs and separators from the start of
3680-
* the value and stops at the first token that is neither.
3708+
* 2. **EVERY ref in a directive's value is a target**, never the leading run
3709+
* alone. That run was taken to keep a `#N` in trailing prose out of the
3710+
* index (a phantom "missing cache" row against a third card), and it does
3711+
* not buy that: a value whose FIRST ref is prose — the measured
3712+
* 「Blocked-by: objectui#7434's PR #8090 … and whatever PR repairs
3713+
* objectui#8065」 — indexed the possessive, a card that was never a
3714+
* blocker, and dropped both real blockers. So the run files a phantom too;
3715+
* what it ADDS is substitution, and a block whose real blockers are
3716+
* invisible reads as expired. Reading every ref can only ADD a target, and
3717+
* an extra target can only WITHHOLD a discharge (H19 counts it open and
3718+
* names it on the row) — ⛔ never found a release: this file's standing
3719+
* posture on an ambiguity (#4690), applied to the value rather than to the
3720+
* resolution. The context ref that rides along is the price, it is named
3721+
* on the row, and unlike the comment archive the line carrying it is
3722+
* rewritable by the seat that wrote it.
36813723
*
36823724
* The key is matched case-sensitively and line-anchored, byte-stable like H4
36833725
* and H9: a lowercase or mid-sentence spelling is a line the real scan cannot
@@ -3686,18 +3728,18 @@ export function h13DomainWithoutPmState(issue, nowMs = Date.now()) {
36863728
* @param {string} body
36873729
* @returns {{ repo: string|null, number: number }[]}
36883730
*/
3731+
const BLOCKED_BY_REF = /(?<![A-Za-z0-9._\/-])([A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)?)?#(\d+)/gu;
3732+
36893733
export function blockedByTargets(body) {
36903734
const out = [];
3691-
// The shared decorated-directive reader: the value arrives trimmed and with
3692-
// a matching trailing marker already removed, so the ref walk below sees
3693-
// 「#9823」 whether the author wrote it bare, bulleted, bolded or in code.
3735+
// The shared decorated-directive reader: ONE value per directive, trimmed
3736+
// and with a matching trailing marker already removed, so the scan below
3737+
// sees 「#9823」 whether the author wrote it bare, bulleted, bolded or in
3738+
// code. A qualifier must TOUCH its `#` and no match may START inside a
3739+
// path-like token, so a URL fragment in a value names no target.
36943740
for (const value of directiveValues(body, 'Blocked-by')) {
3695-
let rest = value;
3696-
for (;;) {
3697-
const ref = /^[\s,;+、]*(?:and[ \t]+)?([A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)?)?#(\d+)/u.exec(rest);
3698-
if (!ref) break;
3741+
for (const ref of value.matchAll(BLOCKED_BY_REF)) {
36993742
out.push({ repo: ref[1] ?? null, number: Number(ref[2]) });
3700-
rest = rest.slice(ref[0].length);
37013743
}
37023744
}
37033745
return out;
@@ -26713,13 +26755,13 @@ async function selfTest() {
2671326755
numbersOf(blockedByTargets('Blocked-by: #9689 (the relocation it needs is the same edit; doing them in the other order means touching the line twice).')),
2671426756
'9689',
2671526757
);
26716-
// The reason only the LEADING run is taken: a `#N` inside the trailing prose
26717-
// is context, not a blocker, and indexing it would file a phantom
26718-
// missing-cache row against a third card that did nothing wrong.
26758+
// ⭐ The leading run is GONE: a `#N` in the trailing prose is now a target
26759+
// too. It can only WITHHOLD a discharge, while the run it replaces
26760+
// SUBSTITUTED a false blocker for two real ones (the #8093 shape below).
2671926761
t(
26720-
'blockedByTargets: a ref inside the trailing prose is NOT a blocker',
26762+
'blockedByTargets: a ref inside the trailing prose is a target too, and can only withhold',
2672126763
numbersOf(blockedByTargets('Blocked-by: #123 (see #456 for the background)')),
26722-
'123',
26764+
'123,456',
2672326765
);
2672426766
t('blockedByTargets: a comma-separated run is all blockers', numbersOf(blockedByTargets('Blocked-by: #6234, #6245')), '6234,6245');
2672526767
t('blockedByTargets: the `and` connector is a separator', numbersOf(blockedByTargets('Blocked-by: #1 and #2')), '1,2');
@@ -26748,6 +26790,34 @@ async function selfTest() {
2674826790
// live machinery and must be reported as part of the index it feeds.
2674926791
t('blockedByTargets: a fenced line still counts (this reader greps, it does not read prose)', numbersOf(blockedByTargets('```\nBlocked-by: #42\n```')), '42');
2675026792

26793+
// -- Multiplicity and substitution, both MEASURED on live bodies ----------
26794+
// objectui#8347: NINE `·`-separated backticked directives on ONE line. The
26795+
// reader took the first and H19 printed 「1 of 1 … CLOSED」 — the row the
26796+
// unlock scan releases from — while three of the nine were open.
26797+
const nineOnOneLine =
26798+
'`Blocked-by: #8345` · `Blocked-by: #8648` · `Blocked-by: #8649` · `Blocked-by: #8650` · ' +
26799+
'`Blocked-by: #8651` · `Blocked-by: #8652` · `Blocked-by: #8653` · `Blocked-by: #8654` · `Blocked-by: #8655`';
26800+
t('blockedByTargets: the #8347 shape — nine directives on one line are NINE targets', numbersOf(blockedByTargets(nineOnOneLine)), '8345,8648,8649,8650,8651,8652,8653,8654,8655');
26801+
t('directiveValues: …and each directive is its own CLEAN value, decoration stripped per directive', directiveValues(nineOnOneLine, 'Blocked-by').join('|'), '#8345|#8648|#8649|#8650|#8651|#8652|#8653|#8654|#8655');
26802+
// objectui#8093: ONE directive whose remainder is prose naming three
26803+
// numbers. The leading run returned the POSSESSIVE — never a blocker — and
26804+
// dropped both real ones: a substituted target answers the liveness
26805+
// question about the wrong card, which is the worse of the two failures.
26806+
const proseRemainder =
26807+
"`Blocked-by:` objectui#7434's PR #8090 (the `AGENTS.md` half, draft, awaiting human merge) " +
26808+
'and whatever PR repairs objectui#8065 (the `skills/objectui` half).';
26809+
t('blockedByTargets: the #8093 shape — both REAL blockers are read, not dropped', blockedByTargets(proseRemainder).map((r) => `${r.repo ?? ''}#${r.number}`).join(','), 'objectui#7434,#8090,objectui#8065');
26810+
// The dark controls: one directive is one target, and prose OUTSIDE a
26811+
// directive is not a directive however many numbers it names.
26812+
t('blockedByTargets: ONE directive still yields exactly one target', numbersOf(blockedByTargets('`Blocked-by: #4242`')), '4242');
26813+
t('blockedByTargets: prose naming `#n` OUTSIDE any directive invents nothing', numbersOf(blockedByTargets('We will wait for #9 and #10 before starting.')), '');
26814+
t('blockedByTargets: a URL fragment inside a value is not a target', numbersOf(blockedByTargets('Blocked-by: #12 (trail: https://example.test/issues/8347#40)')), '12');
26815+
// The whole directive family reads through `directiveValues`, so all of it
26816+
// gains the multiplicity — pinned on a NON-`Blocked-by:` key, beside the pin
26817+
// that a key after a WORD is still prose and invents nothing.
26818+
t('directiveValues: a second directive on one line is read for EVERY family', directiveValues('`Restart-when: closed acme/w#9` · `Restart-when: manual — x`', 'Restart-when').join('|'), 'closed acme/w#9|manual — x');
26819+
t('directiveValues: …and a key after a WORD is still prose, not a second directive', directiveValues('Restart-when: closed acme/w#9 — seats park the `Restart-when: manual` line in comments', 'Restart-when').length, 1);
26820+
2675126821
// The index.
2675226822
const idx = (issues) => buildBlockingIndex(issues, { repo: 'objectstack-ai/objectstack' });
2675326823
t('index: a local ref creates an entry', idx([carded(9849, [], 'Blocked-by: #9823')]).get(9823).join(','), '9849');
@@ -27142,6 +27212,15 @@ async function selfTest() {
2714227212
t('H19: …names the target that is still open', partialRow.includes('`#3`'), true);
2714327213
t('H19: …and does not decide the card is unblocked', partialRow.includes('it does not decide it'), true);
2714427214
t('H19: two closed of two reads as 2 of 2', h19row(blockedCard(1), [target(2, 'closed'), target(3, 'closed')]).includes('2 of 2'), true);
27215+
// ⭐ End to end from the BODY, because the COUNT is what a reader trusts: two
27216+
// directives on ONE line, one closed and one open, must read 「1 of 2」 — the
27217+
// 「1 of 1」 it used to print is a FULL discharge on a card with an open
27218+
// blocker, which is the row the unlock scan releases from.
27219+
const twoOnOneLine = blockedCard(1, '`Blocked-by: #2` · `Blocked-by: #3`');
27220+
const twoResolved = blockerTargetsFor(twoOnOneLine, null, REPO_OS).map((tg, i) => ({ ...tg, state: i === 0 ? 'closed' : 'open', closedAt: null, detail: null }));
27221+
t('H19: a two-directive line resolves TWO targets', twoResolved.map((tg) => tg.number).join(','), '2,3');
27222+
t('H19: …so the row reads 1 of 2, never 1 of 1', h19row(twoOnOneLine, twoResolved, REPO_OS).includes('1 of 2 `Blocked-by:` target(s)'), true);
27223+
t('H19: …and calls it a PARTIAL discharge rather than a full one', h19row(twoOnOneLine, twoResolved, REPO_OS).includes('Every target it names is closed'), false);
2714527224

2714627225
// UNRESOLVED — never reads as clean, and never reads as closed either.
2714727226
const unresolvedOnly = h19BlockOutlivedBlocker(blockedCard(1), [foreign('objectstack-ai/cloud', 88, 'unresolved', { detail: 'HTTP 404' })]);

0 commit comments

Comments
 (0)