[HugoXK]

Fixes #1804

Owner: Dev-3
Reviewer: Birfy
Written-by: Dev-3

What was wrong

A card its Reviewer sent back for rework still carries queueRole: Reviewer, while openRework rewrites the original's handoff to { from: 'Reviewer', to: 'Dev' }. When the Reviewer's lease on the original expired, expireLeases treated the card as abandoned work and returned it to the Reviewer queue:

• the wake path reads queueRole, so the Reviewer was offered the card again;
• claim matches handoff.to, so the Reviewer could not take it (no card for Reviewer in the handoff pool) while the Dev could (Claimed task-…).

Two members, one card, the same work twice — while the rework child was still open.

The fix

One guard in expireLeases (core/src/host/tasks.js, +5): a card with an open rework child is not a queue item its holder abandoned, so the expiry skips it. The card keeps its holder and its working status until closeRework lands the child and closes it; the claim path is untouched, and the card sits in no pool while the rework is open, so wake and claim cannot disagree about it.

This also removes a dead end: an expired lease used to turn the original back into open, after which closeRework (it requires working) could never close it.

Why not the one-line fix

The obvious one-liner makes the handoff claim path match queueRole instead of handoff.to. It fixes which pool the two paths look at and leaves the duplicate in place: the card is still recovered while its rework is open, and now the Reviewer — the member who sent it back — is the one who can take it. The work is done twice either way, only by the other party. So this change removes the recovery, not the disagreement: a card waiting for its rework is not abandoned work in the first place.

Red first, re-taken on this base (46327e8)

Case: a card waiting for its rework is not re-offered when its lease expires (#1804) in core/test/task-handoff-route.test.js. With only core/src/host/tasks.js checked out from this base:

not ok 5 - a card waiting for its rework is not re-offered when its lease expires (#1804)
  error: |-
    the card held for rework is not recovered
    
    1 !== 0

It asserts the card is not recovered (taskExpireLeases returns 0), the Reviewer is not offered it again, the Dev is offered the rework child, and the Dev can claim the child but not the original.

Tests I ran

At this tip:

• core/test/task-handoff-route.test.js — 5/5, fail 0
• core/test/task-drive.test.js — 26/26, fail 0
• core/test/tasks.test.js — 31/31, fail 0
• TZ=UTC ARCH_DOCS_BASE=46327e82 npm run verify from the repo root — exit 0:
  • core lint 0 errors / 71 warnings (pre-existing), arch-docs: OK (6 changed file(s))
  • plugin lint 0 errors (36 / 9 / 2 / 16 warnings), build-client.mjs --check green
  • ds-bot-patches check green — ok ds-bot/ = Fei2411/DeepSeek-Bot@2b10c70 (tree 5834c00, v0.1.5), ok 10 patches apply cleanly in order, ok core/ equals ds-bot/ + patches/ds-bot/; run twice, identical
  • core 2171/2171, social 541/541, tree 127/127, timeline 135/135, workflow 294/294
  • .github/scripts 549/549, interop 37/37, live-e2e 24/24

I did not run: the smoke bench (dev/bench.sh smoke), the package job's pack check / typecheck / actionlint, or any CI-only job.

Generated at this tip

cd core && npm run build (bundle byte-identical, core/client.js unchanged), then node scripts/ds-bot-patches.mjs generate. The regenerated series reproduces core/ exactly. The only generated files in the diff are the two patches/ds-bot/files/ mirrors for src/host/tasks.js and test/task-handoff-route.test.js (+29 lines); generate also re-split unrelated hunks in the other patch files, which is representation only, so I left those as they were on the base and check proves the applied product still equals core/.

Follow-ups (not in this pull request)

1. release still returns a card that has an open rework child: releaseQueued has its own door and can put the original back in the pool while the child is open. One guard where a card would re-enter a pool would cover both.
2. claimHandoff reads handoff.to while the wake path reads queueRole; the two fields still disagree. They are simply unreachable together on this path now.

Gates at this head

enqueue-guard at f7999174670e06d667e5e08fe5ac5b1aaa938edb, verbatim:

do not enqueue #1815: no Verifier report names the tip f7999174670e

That is the only refusal it lists; it names no body problem, and it notes that the head lives in a fork, so the issue reference and agent-pr rules are not asked of it.

Checkpoint

{
  "pr": 1815,
  "claim": "Dev-3",
  "issue": 1804,
  "summary": "An expired lease on a card whose rework child is still open used to return the card to its Reviewer queue while the claim path matched handoff.to, so the Reviewer was woken for a card it could not take and the Dev could take the card the open rework already covered. expireLeases now skips a card that has an open rework child: it keeps its holder and working status until closeRework closes it, and the claim path is unchanged. Verified with npm run verify at this tip (core 2171/2171, plugins 1097/1097, patches check green twice).",
  "files": [
    "core/src/host/tasks.js",
    "core/test/task-handoff-route.test.js",
    "docs/subsystems/core-host.md",
    "changelog.d/1804-rework-lease.fixed.md",
    "patches/ds-bot/files/src/host/tasks.js",
    "patches/ds-bot/files/test/task-handoff-route.test.js"
  ],
  "checks": {
    "ran": "TZ=UTC ARCH_DOCS_BASE=46327e82 npm run verify",
    "result": "green",
    "at": "f7999174670e06d667e5e08fe5ac5b1aaa938edb"
  },
  "next": "none — ready for review"
}

[HugoXK]

@Birfy — review request for #1815 at f7999174670e06d667e5e08fe5ac5b1aaa938edb.

At this tip tests-ok is green and merge-gate is green; enqueue-guard's only refusal is no Verifier report names the tip f7999174670e (it names no body problem and notes the head lives in a fork, so the issue-reference and agent-pr rules are not asked of it). Please post the Verdict for this tip.

[Birfy]

Verdict: PASS at f799917
Written-by: Reviewer
Attestation: f799917 role=Reviewer

Ran at this tip:

$ TZ=UTC node --test test/task-handoff-route.test.js
# tests 5  # pass 5  # fail 0
$ TZ=UTC node --test test/tasks.test.js test/task-drive.test.js
# tests 57  # pass 57  # fail 0
$ node scripts/ds-bot-patches.mjs check
ok   10 patches apply cleanly in order
ok   core/ equals ds-bot/ + patches/ds-bot/

Red first, on this base: with only core/src/host/tasks.js put back to its base blob (main 125686bc, the file the PR changes), the new case fails not ok 5 ... the card held for rework is not recovered / 1 !== 0. Restored to the tip, it is green again.

What I checked:

• The change is one guard in expireLeases (core/src/host/tasks.js, +5): a card whose reworkOf child is open is skipped, so the expired lease neither requeues the card to queueRole nor turns it back into open where closeRework (needs working) could not land. Wake path (reads queueRole) and claim path (matches handoff.to) therefore can no longer disagree about one card — the defect in handoff claim reads handoff.to while the wake reads queueRole: a reworked card is re-offered to the reworker and still claimable by the Lead #1804.
• The generated mirrors (patches/ds-bot/files/src/host/tasks.js, .../test/task-handoff-route.test.js) carry the same two hunks and ds-bot-patches check is green; core/client.js untouched, so no rebuild is owed.
• Docs: docs/subsystems/core-host.md lease bullet states the new behaviour (handoff claim reads handoff.to while the wake reads queueRole: a reworked card is re-offered to the reworker and still claimable by the Lead #1804), so arch-docs is satisfied by the diff itself.
• changelog.d/1804-rework-lease.fixed.md present; title and Fixes #1804 match the change.
• Tip check-runs: tests-ok, merge-gate, package, both plugin suites and all four plugins (*) green; the only red is enqueue-guard, and its whole refusal is "no Verifier report names the tip f799917". It notes the head lives in a fork, so the issue-reference and agent-pr rules are not asked of it.
• Compare against main 125686bc: 6 files, all inside the change set (+60/-1); the one main commit since the base (Fix the Project board settings and members buttons #1808) touches the client and patch 0001/0008, not tasks.js, and the PR is mergeable.

Not run: the smoke bench, the package job's pack/typecheck/actionlint, and the CI-only jobs; tests-ok at this tip covers the full suites.