Merge branch 'main' into repo-assist/feat-sumby-averageby-2026-03-8d8d6841f6117a18

Author: dsyme

.github/workflows/repo-assist.lock.yml

@@ -58,11 +58,11 @@ safe-outputs:
   add-labels:
     allowed: [bug, enhancement, "help wanted", "good first issue", "spam", "off topic", documentation, question, duplicate, wontfix, "needs triage", "needs investigation", "breaking change", performance, security, refactor]
     max: 30
-    target: "*" 
+    target: "*"
   remove-labels:
     allowed: [bug, enhancement, "help wanted", "good first issue", "spam", "off topic", documentation, question, duplicate, wontfix, "needs triage", "needs investigation", "breaking change", performance, security, refactor]
     max: 5
-    target: "*" 
+    target: "*"
 
 tools:
   web-fetch:
@@ -150,8 +150,7 @@ steps:
           json.dump(result, f, indent=2)
       EOF
 
-source: githubnext/agentics/workflows/repo-assist.md@ec7d342403c9912c87320110f8822a8fbb817a0c
-engine: copilot
+source: githubnext/agentics/workflows/repo-assist.md@4ee2ca4faa30612b9ed0d207472068f5efc9ecf3
 ---
 
 # Repo Assist
@@ -160,7 +159,7 @@ engine: copilot
 
 Take heed of **instructions**: "${{ steps.sanitized.outputs.text }}"
 
-If these are non-empty (not ""), then you have been triggered via `/repo-assist <instructions>`. Follow the user's instructions instead of the normal scheduled workflow. Focus exclusively on those instructions. Apply all the same guidelines (read AGENTS.md, run formatters/linters/tests, be polite, use AI disclosure). Skip the weighted task selection and Task 11 reporting, and instead directly do what the user requested. If no specific instructions were provided (empty or blank), proceed with the normal scheduled workflow below. 
+If these are non-empty (not ""), then you have been triggered via `/repo-assist <instructions>`. Follow the user's instructions instead of the normal scheduled workflow. Focus exclusively on those instructions. Apply all the same guidelines (read AGENTS.md, run formatters/linters/tests, be polite, use AI disclosure). Skip the weighted task selection and Task 11 reporting, and instead directly do what the user requested. If no specific instructions were provided (empty or blank), proceed with the normal scheduled workflow below.
 
 Then exit  -  do not run the normal workflow after completing the instructions.
 
@@ -231,7 +230,7 @@ Update memory with labels applied and cursor position.
 1. Review issues labelled `bug`, `help wanted`, or `good first issue`, plus any identified as fixable during investigation.
 2. For each fixable issue:
    a. Check memory — skip if you've already tried and the attempt is still open. Never create duplicate PRs.
-   b. Create a fresh branch off `main`: `repo-assist/fix-issue-<N>-<desc>`.
+   b. Create a fresh branch off the default branch of the repository: `repo-assist/fix-issue-<N>-<desc>`.
    c. Implement a minimal, surgical fix. Do not refactor unrelated code.
    d. **Build and test (required)**: do not create a PR if the build fails or tests fail due to your changes. If tests fail due to infrastructure, create the PR but document it.
    e. Add a test for the bug if feasible; re-run tests.
@@ -256,7 +255,7 @@ Study the codebase and make clearly beneficial, low-risk improvements. **Be high
 
 Good candidates: code clarity and readability, removing dead code, API usability, documentation gaps, reducing duplication.
 
-Check memory for already-submitted ideas; do not re-propose them. Create a fresh branch `repo-assist/improve-<desc>` off `main`, implement the improvement, build and test (same requirements as Task 3), then create a draft PR with AI disclosure, rationale, and Test Status section. If not ready to implement, file an issue instead. Update memory.
+Check memory for already-submitted ideas; do not re-propose them. Create a fresh branch `repo-assist/improve-<desc>` off the default branch of the repository, implement the improvement, build and test (same requirements as Task 3), then create a draft PR with AI disclosure, rationale, and Test Status section. If not ready to implement, file an issue instead. Update memory.
 
 ### Task 6: Maintain Repo Assist PRs
 
@@ -297,7 +296,7 @@ Maintain a single open issue titled `[Repo Assist] Monthly Activity {YYYY}-{MM}`
 
    ## Suggested Actions for Maintainer
 
-   **Comprehensive list** of all pending actions requiring maintainer attention (excludes items already actioned and checked off). 
+   **Comprehensive list** of all pending actions requiring maintainer attention (excludes items already actioned and checked off).
    - Reread the issue you're updating before you update it  -  there may be new checkbox adjustments since your last update that require you to adjust the suggested actions.
    - List **all** the comments, PRs, and issues that need attention
    - Exclude **all** items that have either
@@ -363,4 +362,4 @@ Maintain a single open issue titled `[Repo Assist] Monthly Activity {YYYY}-{MM}`
 - **Systematic**: use the backlog cursor to process oldest issues first over successive runs. Do not stop early.
 - **Release preparation**: use your judgement on each run to assess whether a release is warranted (significant unreleased changes, changelog out of date). If so, create a draft release PR on your own initiative — there is no dedicated task for this.
 - **Quality over quantity**: noise erodes trust. Do nothing rather than add low-value output.
-- **Bias toward action**: While avoiding spam, actively seek ways to contribute value within the two selected tasks. A "no action" run should be genuinely exceptional.
+- **Bias toward action**: While avoiding spam, actively seek ways to contribute value within the two selected tasks. A "no action" run should be genuinely exceptional.

.github/workflows/repo-assist.md

@@ -6,6 +6,7 @@ Release notes:
     - adds TaskSeq.scan and TaskSeq.scanAsync, #289
     - adds TaskSeq.pairwise, #289
     - adds TaskSeq.sum, sumBy, sumByAsync, average, averageBy, averageByAsync
+    - fixes: CancellationToken passed to GetAsyncEnumerator is now honored in MoveNextAsync, #179
 
 0.4.0
     - overhaul all doc comments, add exceptions, improve IDE quick-info experience, #136, #220, #234

release-notes.txt

@@ -63,6 +63,7 @@
     <Compile Include="TaskSeq.Do.Tests.fs" />
     <Compile Include="TaskSeq.Let.Tests.fs" />
     <Compile Include="TaskSeq.Using.Tests.fs" />
+    <Compile Include="TaskSeq.CancellationToken.Tests.fs" />
   </ItemGroup>
 
   <ItemGroup>

src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj

@@ -0,0 +1,154 @@
+module TaskSeq.Tests.CancellationToken
+
+open System
+open System.Threading
+open System.Threading.Tasks
+
+open Xunit
+open FsUnit.Xunit
+
+open FSharp.Control
+
+/// An infinite taskSeq that yields 1 forever
+let private infiniteOnes () = taskSeq {
+    while true do
+        yield 1
+}
+
+/// A finite taskSeq with a few items
+let private fiveItems () = taskSeq {
+    yield 1
+    yield 2
+    yield 3
+    yield 4
+    yield 5
+}
+
+module Cancellation =
+
+    [<Fact>]
+    let ``GetAsyncEnumerator with pre-cancelled token: first MoveNextAsync throws OperationCanceledException`` () = task {
+        use cts = new CancellationTokenSource()
+        cts.Cancel()
+        use enum = (infiniteOnes ()).GetAsyncEnumerator(cts.Token)
+
+        fun () -> enum.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+    }
+
+    [<Fact>]
+    let ``GetAsyncEnumerator with pre-cancelled token: MoveNextAsync on finite seq also throws`` () = task {
+        use cts = new CancellationTokenSource()
+        cts.Cancel()
+        use enum = (fiveItems ()).GetAsyncEnumerator(cts.Token)
+
+        fun () -> enum.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+    }
+
+    [<Fact>]
+    let ``GetAsyncEnumerator with non-cancelled token: iteration proceeds normally`` () = task {
+        use cts = new CancellationTokenSource()
+        use enum = (fiveItems ()).GetAsyncEnumerator(cts.Token)
+        let mutable count = 0
+        let mutable canContinue = true
+
+        while canContinue do
+            let! hasNext = enum.MoveNextAsync()
+
+            if hasNext then count <- count + 1 else canContinue <- false
+
+        count |> should equal 5
+    }
+
+    [<Fact>]
+    let ``GetAsyncEnumerator with CancellationToken.None: iteration proceeds normally`` () = task {
+        use enum = (fiveItems ()).GetAsyncEnumerator(CancellationToken.None)
+        let mutable count = 0
+        let mutable canContinue = true
+
+        while canContinue do
+            let! hasNext = enum.MoveNextAsync()
+
+            if hasNext then count <- count + 1 else canContinue <- false
+
+        count |> should equal 5
+    }
+
+    [<Fact>]
+    let ``Token cancelled after partial iteration: next MoveNextAsync throws OperationCanceledException`` () = task {
+        use cts = new CancellationTokenSource()
+        use enum = (fiveItems ()).GetAsyncEnumerator(cts.Token)
+
+        // Consume first two items normally
+        let! _ = enum.MoveNextAsync()
+        let! _ = enum.MoveNextAsync()
+
+        // Cancel the token
+        cts.Cancel()
+
+        // Next call should throw
+        fun () -> enum.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+    }
+
+    [<Fact>]
+    let ``Infinite sequence with pre-cancelled token: throws immediately without consuming any items`` () = task {
+        use cts = new CancellationTokenSource()
+        cts.Cancel()
+        let mutable itemsConsumed = 0
+
+        let seq = taskSeq {
+            while true do
+                itemsConsumed <- itemsConsumed + 1
+                yield itemsConsumed
+        }
+
+        use enum = seq.GetAsyncEnumerator(cts.Token)
+
+        fun () -> enum.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+
+        // The body should not have run (cancellation checked before advancing state machine)
+        itemsConsumed |> should equal 0
+    }
+
+    [<Fact>]
+    let ``Token cancelled mid-iteration of infinite sequence terminates with OperationCanceledException`` () = task {
+        use cts = new CancellationTokenSource()
+        use enum = (infiniteOnes ()).GetAsyncEnumerator(cts.Token)
+
+        // Iterate a few steps without cancellation
+        for _ in 1..5 do
+            let! hasNext = enum.MoveNextAsync()
+            hasNext |> should be True
+
+        // Now cancel
+        cts.Cancel()
+
+        // Next call should throw
+        fun () -> enum.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+    }
+
+    [<Fact>]
+    let ``Multiple enumerators of same sequence respect independent cancellation tokens`` () = task {
+        let source = fiveItems ()
+        use cts1 = new CancellationTokenSource()
+        use cts2 = new CancellationTokenSource()
+
+        // Cancel only the first token
+        cts1.Cancel()
+
+        use enum1 = source.GetAsyncEnumerator(cts1.Token)
+        use enum2 = source.GetAsyncEnumerator(cts2.Token)
+
+        // enum1 should throw (cancelled)
+        fun () -> enum1.MoveNextAsync().AsTask() |> Task.ignore
+        |> should throwAsync typeof<OperationCanceledException>
+
+        // enum2 should work normally (not cancelled)
+        let! hasNext = enum2.MoveNextAsync()
+        hasNext |> should be True
+        enum2.Current |> should equal 1
+    }

src/FSharp.Control.TaskSeq.Test/TaskSeq.CancellationToken.Tests.fs

@@ -242,6 +242,11 @@ and [<NoComparison; NoEquality>] TaskSeq<'Machine, 'T
                 Debug.logInfo "at MoveNextAsync: normal resumption scenario"
 
                 let data = this._machine.Data
+
+                // Honor the cancellation token passed to GetAsyncEnumerator (fixes #179).
+                // ThrowIfCancellationRequested() is a no-op for CancellationToken.None.
+                data.cancellationToken.ThrowIfCancellationRequested()
+
                 data.promiseOfValueOrEnd.Reset()
                 let mutable ts = this