From d9e97d3ce4e07aaf26375a44057607eac1158063 Mon Sep 17 00:00:00 2001 From: Danyang Chen Date: Sun, 8 Nov 2026 19:49:07 +0800 Subject: [PATCH] fix(workflow): read a declared pr value only as a number, and name a loop's until output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A declared `pr`/`pull` OUTPUT took the first run of digits anywhere in the value, so "none — blocked on issue 2658", "12.5" and "0" all became pull numbers. Only a value that is the number itself now counts: a positive integer, an optional leading `#`, an optional trailing parenthetical. `edgeOutputs` read only `edge.when`, while `missingVerdicts` also read a loop's `until`, so a node gated only by its loop was failed for an OUTPUT it was never told to print. Name the `until` port too, deduped the way `when` values are, so both name the same set for a node. Fixes #2685 --- changelog.d/2685-output-evidence.fixed.md | 1 + docs/subsystems/workflow.md | 2 +- plugins/workflow/src/graph.js | 30 +++++++++------ plugins/workflow/test/graph.test.js | 39 +++++++++++++++++++- plugins/workflow/test/step-artifacts.test.js | 20 ++++++++++ 5 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 changelog.d/2685-output-evidence.fixed.md diff --git a/changelog.d/2685-output-evidence.fixed.md b/changelog.d/2685-output-evidence.fixed.md new file mode 100644 index 000000000..2f1bdfcb5 --- /dev/null +++ b/changelog.d/2685-output-evidence.fixed.md @@ -0,0 +1 @@ +A declared `pr`/`pull` OUTPUT now counts as delivery evidence only when its value is the pull number itself — a positive integer, an optional leading `#`, an optional trailing parenthetical such as `2657 (verified)` — so a step that says it has no pull request is no longer read as one, and a loop's `until` output reaches the step body the same way a `when` condition does, so a looping node is told the line it must print instead of failing for silence ([#2685](https://github.com/ThinkFlowLab/FlyBot/issues/2685)). diff --git a/docs/subsystems/workflow.md b/docs/subsystems/workflow.md index 4bcf781dd..c35adfe50 100644 --- a/docs/subsystems/workflow.md +++ b/docs/subsystems/workflow.md @@ -61,7 +61,7 @@ Everything in `plugins/workflow/`: the graph rules, the run store, the matcher, While another dsh holds the Bot team the host is read-only (`roster.readOnly`): the page still reads through `workflow/state`, keeps its controls disabled, and offers no **Edit**, **Add link** or wire port, so it cannot take a change that core would refuse with `bot/read-only` and then drop (#2187). The same window draws the sidebar's workflow list without **New**, the row's **Rename**/**Delete** or **Hand a task to a Workflow**: the list is read-only too, and an `roster.readOnly` that is not a string, or holds only whitespace, counts as writable — trimmed the way `core/src/client/workflows.js:570` trims it (#2200). The Stage a row opens carries the same lock: it prints the host's sentence under `role="status"` and draws no **Hand a task to a Workflow**, no **Re-match**, no **Pause**/**Resume**/**Stop**, no **Edit**/drag palette and no **Reset**, while the row click, **Progress**, **Flow** and viewing a run still work; a writable roster draws every control exactly as before (#2213). Mounting the list in a read-only window still reads `projects` so the Project filter fills, but it sends no `workflow/ingest` for the open cards: ingest is a claim/match write the host refuses, so a reader opening the list writes nothing; a writable window still ingests every open card (#2222). The read-only sentence can also land after the list has mounted — a cold window starts on the empty roster, `ready: false` and no `readOnly` — so the ingest step asks the value the latest render saw rather than the one the mount saw, and it skips the board read and stops between two cards once the window has turned read-only. The Settings page draws no read-only sentence of its own: the host's Settings header already prints one for every page it shows (`core/src/client/settings.js` `bt-read-only`, `role="status"`, `hostText(roster.readOnly)`), and a second copy inside the page said the same thing twice (#2202). 3. **A live run advances only when its ephemeral Bot replies, following the graph's edges in order.** That reply advances the run and may appear on the workflow stage log; it is not delivered into a persistent sidebar Bot conversation (for example Chief). The `workflow-step` send middleware denies those replies after `stepResult` runs. Nodes start only when their forward predecessors finish and edges reach them. **Early termination (#1537, #1538, #1546, #1570, #1571):** When a node completes **or fails**, the run ends immediately with status `done`, sets `run.earlyEnd` to the condition name, and does not advance to successors, take a success-path `loop`, or burn `onFail` recovery attempts. The two markers that report the task itself end it only on a structured signal (#1546): `needs-human` and `already-claimed` must be a declared OUTPUT whose value **equals** the marker, or a whole reply line that is exactly `EARLY-END ` in any case. A step that quotes an issue title, negates the label or reports it absent keeps running. `tip-unchanged` (#1570) and `open-pr` (#1571) accept that same structured signal — in a declared OUTPUT the value counts as a whole word, so a brief that names `data-open-project` is not `open-pr` (#1866) — and also honor their prose fallbacks (`tip unchanged` / `unchanged tip`, `open PR already` / `already has an open PR` / `has an open PR` / `found an open PR`), so a Bot that forgets the structured marker cannot soft-lock Claim↔Verify on the same tip. See `checkEarlyEnd` in Key files. Factory prompt guidance lives in `EARLY_END_GUIDANCE` (`plugins/workflow/src/template.js`) for Settings graphs that wire Triage / Claim / Verify: Verify must escalate once on an unchanged tip, not re-run the full suite. There is no scripted or seeded run path: `workflow/state` exposes only `live === true` runs — the running ones, plus the last run when it is still `live` and ended `failed` — a failed sibling stays on the stage beside whatever is running now, with `run.failure` (`{ code, at, nodeName?, text? }`) naming what ended it, so the room does not have to open Runs to learn that a run failed (#1493, #1494). The failed sibling is left out when a running run carries the same task id: that is a retry, and the live run keeps the row (#1507). History entries carry the run `id` and the same `failure`, so a Runs row shows when the run ended and why, and a row for a run already on the stage is not listed twice. A run does not create a schedule. `scheduleLabel` is display text. When the host can create Bots, starting a live run (`assign`, `run_workflow`, `ingest`) spawns one ephemeral Bot per node from that node's prompt, role, model and tools, sends it the step from the Main Bot, and removes every instance when the run finishes, fails for good, or is reset. A `failOnce` retry keeps them. They are hidden and left out of the sidebar. Loading the plugin does not spawn Bots for the default workflows. Plugin unload (`dispose`) and the load-time `reap` both end a live run still marked `running`: in-flight nodes are failed, the run is archived as `failed`, and any ephemeral Bot ids are released. A **read-only** host — a second window on the same `DSH_HOME`, the reader `home-lock` describes — does neither: it never ran those runs, so it cannot tell which of them a dead host left behind, and it must not end them, release their step Bots or write its older copy over the writer's store; both calls return without touching the record and the writer's own `reap` decides (#2673). A run already written as `running` with no ephemeral map (an older unload) is healed the same way on the next load (#1414). Loading is also the one moment a run the host left behind is noticed when its ephemeral map is still present: `reap` releases those instances and records the run as `failed`. Nothing resumes it. A run that already ended keeps its own status (#1388). `workflow/reset` stopping one live run ends it the same way before its Bots are released: nodes still `running` become `failed`, so the strip cannot keep painting a run that is over (#1424). A graph edit that drops a node that is still running ends that run the way Stop does: the node is failed, the run is archived `failed`, its node Bots are released, and the queue drains (#1549); an id whose release failed stays named on that archived run, and the next load's `reap` retries it, instead of the edit forgetting it (the #1616 contract). Every wait is bounded (#1530). A dispatch that does not land is not marked handed: the chat names the code and the attempt, and it is retried after a short backoff at most twice, never twice inside one hand-off, so a 429 is not hammered. When it still does not land, the step and the run fail with the reason written into the chat. Each running live step also holds a deadline — its workflow's `stepTimeoutMinutes`, `DEFAULT_STEP_TIMEOUT_MINUTES` (45 minutes) unless the record sets one, an integer from 1 to 120 given at create, through `define_workflow`, or through `workflow/step-timeout` (armed even when the host cannot spawn ephemeral Bots; #1530, #1580); when it expires the node and the run fail as `failed`, the run's ephemeral Bots are released, the chat and `run.failure` say the step's deadline was reached (`step deadline reached (45 min)`, the number its lane set), and `warn` names it once; the line never reads as a reply that did not arrive, because a step still working is killed by the same timer (#1868). The deadline is cleared as soon as the step moves, and by Pause, Reset, delete, `reap`, `dispose` and a Stop that released every Bot; a run the owner paused holds none, and Resume arms it again from that moment. A timer never outlives the run that started it. A reply that matches no running step — its run ended, or the node already moved — is reported through `warn` once per Bot and run instead of being dropped silently. A reply fails that node on a structured signal only: the host's failure notice carries `failure: true`, which the middleware hands `stepResult` as `ok: false` (a caller-set `ok: false` counts too), so an answer that quotes `could not answer your message` or `model call failed` while auditing it advances the step (#2677). An old host without the marker falls back to the notice shape at the start of the text only (` could not answer your message: …`), never a free substring, and a 429 or rate-limit mention in any other reply does not fail a step. Stop and Reset (`workflow/reset`) follow the same order as `dispose`: they release the run's Bots before the record forgets their ids, and an id whose release failed stays named on the still-live run, so the next Stop, Reset, dispose or load-time `reap` retries it (#1476). A run left that way is marked `paused` and `releasePending` and shows as Paused: it hands off no further node, `resume` is refused with an error, and Stop again is the retry. It also keeps the deadline of the node it was on — the one paused state that holds one — and a graph save re-syncs timers without taking it away (a save that cleared it left the run holding its slot with nothing left to free it); the deadline releases again there, ends the run as `paused-expired` and frees the slot, re-arming itself while a Bot still will not go (#2453, P-560). A whole-workflow Reset that could not release every Bot freezes every run it did not reset, because each of them has lost the ids whose release did go. The markers go away when the run ends: Stop again, `dispose`, `reap`, or its own completion. 4. Each workflow keeps a FIFO queue and up to `maxConcurrent` live runs (default 2, an integer from 1 to 8 on the record, via `workflow/concurrency`, or in Settings → Workflow graphs). A task that does not fit is enqueued. When a run finishes, every workflow with a free slot is drained, oldest enqueue first. A new assign on a workflow that already has a queue waits behind it. A task does not replace a running run or release that run's Bots. Migrating an old store keeps only runs that were still `running` with ephemeral Bot ids; other legacy scripted rows are dropped from active state (finished tasks may remain in lane history). History records a finished or failed live run. Lowering the cap does not stop a run that has already started. Assigning `{ botId }` claims the card for that local Bot and does not enqueue. A remote Bot is refused. `activeCount` is `runningOf(lane)` — live runs with `live === true` and `status === 'running'`. The stage aggregate chip and the Runs tab (运行记录) must agree: every such run appears as its own running row and progress card with its own `status` (never a hardcoded Running), the chip count does not exceed that list, and a failed sibling appears with its time and reason. On the Runs list, the clock stays in a non-shrinking column with a gap before the status chip, and a Failed row paints the Failed chip once — a generic Failed with no host detail does not also draw `wf-hist-reason` (#1618). -5. A node declares up to eight inputs and eight outputs. A required input is an output of the same name on an ancestor, or `task`, `title`, or `brief` on a root. A start with no provider is refused, and Bots spawned for that attempt are released. On a Bot-backed run a successor stays queued until its required inputs are present. If every forward predecessor is done, failed or skipped and an input is still missing, that node fails and the run stops. The dispatch text carries `Input : `. It also lists the OUTPUT lines the step owes — its declared ports plus every output its outgoing edges read (`edgeOutputs` in `src/graph.js`), spelled `OUTPUT : ` when an edge compares that output against a value — so a node that declares no outputs is still told which line its own gate reads (#2669). The Bot reports `OUTPUT : `; a single declared output may be the reply body. A declared output a gate reads is required (§3): when a `when`/`else` or `until` edge reads it and the step's reply does not produce it, the step fails with `failure.text` `Missing OUTPUT ` instead of settling, so the gate never reads silence as "not this branch" and the run cannot close `done` on it; a delivered value that does not equal `eq` still completes the step and skips the untaken branch (#1773). One exception keeps the work a step already did (#2583, #2658): when `state` is the only gate-read output missing and the step's own reply shows its result — a pull request link, `pull/`, a line saying it opened PR #n, a `Claimed-by:` / `Claimed #n` line, or its own declared OUTPUT names the delivery (`pr`/`pull` with a pull number such as `2657 (verified)`, or `merged`/`merge-commit` carrying a 40-character commit sha; any other output name counts for nothing) — the step stands as `done`, the run takes the node's first declared `state` branch (on the fast line `state: ready → claim`, so the pull request reaches gate/enqueue instead of the `else` route the step never chose), and the run record carries `outputMissing: true` and `producedPull: ` when a pull request was named; every other missing verdict still fails, and a step whose reply shows no such result still fails the same way. `stepArtifacts` reads that evidence and `firstBranchValue` names the branch, both in `src/graph.js`; the engine has no GitHub client, so the reply is the only evidence it can read. Nodes start in edge order. +5. A node declares up to eight inputs and eight outputs. A required input is an output of the same name on an ancestor, or `task`, `title`, or `brief` on a root. A start with no provider is refused, and Bots spawned for that attempt are released. On a Bot-backed run a successor stays queued until its required inputs are present. If every forward predecessor is done, failed or skipped and an input is still missing, that node fails and the run stops. The dispatch text carries `Input : `. It also lists the OUTPUT lines the step owes — its declared ports plus every output its outgoing edges read, whether a condition's `when` or a loop's `until` (`edgeOutputs` in `src/graph.js`) — spelled `OUTPUT : ` when an edge compares that output against a value — so a node that declares no outputs is still told which line its own gate reads (#2669, #2685). The Bot reports `OUTPUT : `; a single declared output may be the reply body. A declared output a gate reads is required (§3): when a `when`/`else` or `until` edge reads it and the step's reply does not produce it, the step fails with `failure.text` `Missing OUTPUT ` instead of settling, so the gate never reads silence as "not this branch" and the run cannot close `done` on it; a delivered value that does not equal `eq` still completes the step and skips the untaken branch (#1773). One exception keeps the work a step already did (#2583, #2658): when `state` is the only gate-read output missing and the step's own reply shows its result — a pull request link, `pull/`, a line saying it opened PR #n, a `Claimed-by:` / `Claimed #n` line, or its own declared OUTPUT names the delivery (`pr`/`pull` whose value is only a pull number — a positive integer, optional leading `#`, optional trailing parenthetical such as `2657 (verified)` — or `merged`/`merge-commit` carrying a 40-character commit sha; any other output name counts for nothing) — the step stands as `done`, the run takes the node's first declared `state` branch (on the fast line `state: ready → claim`, so the pull request reaches gate/enqueue instead of the `else` route the step never chose), and the run record carries `outputMissing: true` and `producedPull: ` when a pull request was named; every other missing verdict still fails, and a step whose reply shows no such result still fails the same way. `stepArtifacts` reads that evidence and `firstBranchValue` names the branch, both in `src/graph.js`; the engine has no GitHub client, so the reply is the only evidence it can read. Nodes start in edge order. 6. Each node is a real ephemeral Bot for that run, then it is removed. A permanent sidebar Bot (`botId`) is optional and is not required for the step to run. **File and shell rights are the same as a normal sidebar Bot's:** every node Bot gets the `danger-full-access` preset, and `EPHEMERAL_DENIED_TOOLS` still refuses the team-admin tools at the guard and approval layers (#1466, 29 names). **`node.tools` selects connectors only:** `spawn` passes the node's cleaned list to `fb.bot.create`, the host records it as `stepTools`, and `connector-access.js` allows `mcp__github__*` for `github` and `mcp__composio__*` for `composio` — a connector the node did not name is refused, and a node that names none reaches none. The list is also stored in `fields.tools` for the UI. A hidden run Bot cannot show an approval card, so the approval seam answers the same way the guard does. The host stores this on the run Bot as `stepTools` and `permission`. 7. A loop edge (`loop: true`, `max` from 1 to 8, default 3, optional `until: { output, eq }`) is the only cycle for success paths. The body runs again until `until` matches or `max` runs have finished, and the forward edges wait until then. Restarting the body drops the branch choice made inside it and queues a sibling that the previous pass skipped, so the next pass can take the other side. A `when: { output, eq }` edge is taken only when that output equals `eq`. `when: { else: true }` is taken only when no other `when` matched. A `when` or `until` that is present but cannot be honoured — a blank output name, or one outside `/^[a-z][a-z0-9-]{0,40}$/` such as `result_ok` — refuses the save with `A condition link needs an output name like "ready"` (or the loop's own line) instead of being dropped: before #2155 the refused `when` was indistinguishable from an absent one and the edge fired unconditionally, which is the opposite of what the author asked. An absent `when`/`until` is still a plain link, no early stop. Settings → Workflow graphs keeps **Add link** disabled for a Condition with a blank output name, and the refusal shows in the page's `.wf-err` alert. A node whose forward edges are all closed is `skipped` and does not block a join. A run cannot spin: every loop has a max. An `onFail` edge (`onFail: true`, `max` recoveries from 1 to 8, default 3) provides failure recovery: when a node fails, if an `onFail` edge points from that node back to an upstream target and recoveries remain (tracked in `failAttempts` per edge), the workflow resets every node from the recovery target through the failing node (the target to `running`, the rest to `queued`) and re-runs them in order. After `max` recoveries are used, the node fails permanently and the run stops. An `onFail` edge does not interfere with `failOnce` retry (which restarts the same node once) or success-path `loop` edges. Settings → Workflow graphs can add a link, a condition, or a loop; a failure recovery edge is added through `define_workflow` (`onFail: true`) and has no Settings control yet. 8. Auto-assign considers an `open` card only. Every saved board write reaches the hook, including a card a Bot records for itself through `track_tasks`, so a `workflow:` on the card a Bot wrote starts that run (#1462). A saved Bot claim beats a workflow trigger. Otherwise first hit wins: a `workflow:` token, then `workflowId` / `workflow`, then an assignee that names a workflow, then a `bot:` token, then an assignee that names a local Bot, then the longest trigger in the title, note, criteria or tags — an ASCII trigger must match a whole word (`notice` does not match `noticeable`, `pr` does not match `Improve`), while a non-ASCII trigger matches inside a longer text because CJK has no word boundary. A miss returns no route. A second ingest of the same task and target is a no-op, and a live run for that task id is not restarted. A stored claim yields only to the card's own named target — a `workflow:`/`bot:` token, `workflowId`/`workflow`, or an assignee naming a workflow or local Bot — and only when that target is live and different: the claim and its route go, the card is matched again, and exactly one of each remains. A trigger, or a card that names nothing, never invalidates a claim; a claim naming a workflow or Bot that no longer exists keeps today's behaviour, because this invalidates on named intent and does not guess. `heldTasks`/`heldTaskCount` on `workflow/state` are that claim map read back per workflow, and `rematch: true` is the person's explicit drop for one task (#1647). A claim that yields leaves one line on the source workflow's log — `Task re-matched · → ` — in the same store write that attaches the new target, so the graph that lost the card says where it went (#1668). diff --git a/plugins/workflow/src/graph.js b/plugins/workflow/src/graph.js index e00d5c0aa..25c6e36ea 100644 --- a/plugins/workflow/src/graph.js +++ b/plugins/workflow/src/graph.js @@ -118,7 +118,11 @@ const CLAIM_ISSUE = /^\s*claimed\s+#\d+/i // names and shapes count, so a step that says nothing is still not evidence. const PULL_OUTPUTS = new Set(['pr', 'pull']) const MERGE_OUTPUTS = new Set(['merged', 'merge-commit']) -const PULL_NUMBER = /\d+/ +// #2685: the value itself must be the pull number — a positive integer, an optional +// leading `#`, an optional trailing parenthetical (`2657 (verified)`). A sentence that +// mentions an issue, a decimal or `0` is not delivery evidence; the prose rules below +// still decide on their own terms. +const PULL_NUMBER = /^\s*#?([1-9]\d*)\s*(?:\([^)]*\))?\s*$/ const COMMIT_SHA = /\b[0-9a-f]{40}\b/i export function stepArtifacts(text, outputs) { @@ -139,7 +143,7 @@ export function stepArtifacts(text, outputs) { if (!merged && MERGE_OUTPUTS.has(key) && COMMIT_SHA.test(line)) merged = true if (pull == null && PULL_OUTPUTS.has(key)) { const number = PULL_NUMBER.exec(line) - if (number) pull = Number(number[0]) + if (number) pull = Number(number[1]) } } const claimed = haystack.split('\n').some(line => CLAIM_LINE.test(line) || CLAIM_ISSUE.test(line)) @@ -645,20 +649,24 @@ export function firstBranchValue(graph, nodeId, name) { return null } -// #2669: a node is told which OUTPUT lines to print, and the names come from its own -// declared ports — but the edges leaving it read outputs too, so a node that declares -// none was never told the line its gate reads. Name them, with the values those edges -// compare against, so the step can answer the gate it is judged by. +// #2669, #2685: a node is told which OUTPUT lines to print, and the names come from +// its own declared ports — but the edges leaving it read outputs too, so a node that +// declares none was never told the line its gate reads. Name them, with the values +// those edges compare against, so the step can answer the gate it is judged by. A +// loop's `until` is one of those gates, and missingVerdicts below reads the same two. export function edgeOutputs(graph, nodeId) { ensure(graph) const values = new Map() + const add = (output, eq) => { + if (!output) return + if (!values.has(output)) values.set(output, []) + const list = values.get(output) + if (eq != null && !list.includes(eq)) list.push(eq) + } for (const edge of graph.edges) { if (edge.from !== nodeId) continue - if (edge.when?.else === true || !edge.when?.output) continue - const name = edge.when.output - if (!values.has(name)) values.set(name, []) - const list = values.get(name) - if (edge.when.eq != null && !list.includes(edge.when.eq)) list.push(edge.when.eq) + if (edge.when && edge.when.else !== true) add(edge.when.output, edge.when.eq) + if (edge.until) add(edge.until.output, edge.until.eq) } return [...values].map(([name, list]) => ({ name, values: list })) } diff --git a/plugins/workflow/test/graph.test.js b/plugins/workflow/test/graph.test.js index 592e2d214..7a4abc3d5 100644 --- a/plugins/workflow/test/graph.test.js +++ b/plugins/workflow/test/graph.test.js @@ -2,7 +2,7 @@ import assert from 'node:assert/strict' import { test } from 'node:test' import { addNode, chainLabel, cleanLine, cleanPrompt, completeNode, connectNodes, cutCodePoints, doneCount, edgeOutputs, failNode, freshStatus, - layerMarks, moveNode, nextDemoOp, normalizeGraph, readStepResult, reconnectEdge, removeEdge, removeNode, retryNode, + layerMarks, missingVerdicts, moveNode, nextDemoOp, normalizeGraph, readStepResult, reconnectEdge, removeEdge, removeNode, retryNode, rowPreview, startFrontier, summarizeTask, validateGraph, } from '../src/graph.js' import { deliveryWorkflow, weeklyWorkflow } from '../src/template.js' @@ -248,3 +248,40 @@ test('#2669: edgeOutputs names the OUTPUT every outgoing edge reads, with its va assert.deepEqual(edgeOutputs(graph, 'claim'), [], 'a node whose edges read no output names none') assert.deepEqual(edgeOutputs(graph, 'nope'), []) }) + +// #2685: a node whose only gate is its loop's `until` is failed by missingVerdicts for +// a line it was never told to print, because edgeOutputs read only `when` edges. The +// two must name the same set for that node. +test('#2685: edgeOutputs offers a loop until port, and missingVerdicts agrees', () => { + const graph = normalizeGraph({ + nodes: [ + { id: 'scout', name: 'Scout' }, + { id: 'finish', name: 'Finish' }, + ], + edges: [ + { from: 'scout', to: 'scout', loop: true, max: 3, until: { output: 'ready', eq: 'yes' } }, + { from: 'scout', to: 'finish' }, + ], + }) + assert.deepEqual(edgeOutputs(graph, 'scout'), [{ name: 'ready', values: ['yes'] }], + 'the loop until port is named with the value it compares against') + assert.deepEqual(missingVerdicts(graph, 'scout', {}), ['ready']) + assert.deepEqual(edgeOutputs(graph, 'scout').map(port => port.name), missingVerdicts(graph, 'scout', {}), + 'the outputs a node owes and the ones it is told to print are the same set') + assert.deepEqual(missingVerdicts(graph, 'scout', { ready: 'yes' }), []) +}) + +test('#2685: until values dedupe into the when entry of the same name', () => { + const graph = normalizeGraph({ + nodes: [ + { id: 'a', name: 'A' }, + { id: 'b', name: 'B' }, + ], + edges: [ + { from: 'a', to: 'b', when: { output: 'state', eq: 'ready' } }, + { from: 'a', to: 'a', loop: true, max: 2, until: { output: 'state', eq: 'done' } }, + ], + }) + assert.deepEqual(edgeOutputs(graph, 'a'), [{ name: 'state', values: ['ready', 'done'] }], + 'one entry per name, values in edge order, deduped the same way as when') +}) diff --git a/plugins/workflow/test/step-artifacts.test.js b/plugins/workflow/test/step-artifacts.test.js index 97763e3bf..4958a0dd6 100644 --- a/plugins/workflow/test/step-artifacts.test.js +++ b/plugins/workflow/test/step-artifacts.test.js @@ -54,6 +54,26 @@ test('#2658: a value without a pull number is not guessed', () => { assert.deepEqual(stepArtifacts(other.text, other.outputs), { pull: null, claimed: false }) }) +// #2685: the declared path took any run of digits, so a value that says there is no +// pull request ("blocked on issue 2658"), a decimal, or `0` became one. Only a value +// that *is* the number counts: a positive integer, optional leading `#`, optional +// trailing parenthetical. +test('#2685: a declared pr value counts only when it is the pull number', () => { + assert.deepEqual(stepArtifacts('', { pr: 'none — blocked on issue 2658' }), { pull: null, claimed: false }) + assert.deepEqual(stepArtifacts('', { pr: '12.5' }), { pull: null, claimed: false }) + assert.deepEqual(stepArtifacts('', { pr: '0' }), { pull: null, claimed: false }) + assert.deepEqual(stepArtifacts('', { pr: 'PR #2657, not merged' }), { pull: null, claimed: false }) + assert.deepEqual(stepArtifacts('', { pr: '#2657' }), { pull: 2657, claimed: false }) + assert.deepEqual(stepArtifacts('', { pr: '2657 (verified)' }), { pull: 2657, claimed: false }) + assert.deepEqual(stepArtifacts('', { pull: '42' }), { pull: 42, claimed: false }) +}) + +test('#2685: the prose rules still read a pull request the usual way', () => { + assert.equal(stepArtifacts('Opened https://github.com/o/r/pull/2657 for it.', {}).pull, 2657) + assert.equal(stepArtifacts('Branch pushed; see pull/2657 for details.', {}).pull, 2657) + assert.equal(stepArtifacts('Opened PR #2657 with the fix.', {}).pull, 2657) +}) + test('#2658: a 40-character sha in merged or merge-commit counts as delivered', () => { const merged = stepOf(`OUTPUT merged: ${SHA}`) assert.deepEqual(stepArtifacts(merged.text, merged.outputs), { pull: null, claimed: false, merged: true })