From 694162a7b1d0c916ffa76461bcb5fb77bf046459 Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 8 Oct 2025 14:13:33 +0100
Subject: [PATCH 1/5] fix purity of 'withState' so it returns a new pattern

---
 packages/core/pattern.mjs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index d0be3f599..72f6371b3 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -98,10 +98,7 @@ export class Pattern {
 
   // runs func on query state
   withState(func) {
-    return this.withHaps((haps, state) => {
-      func(state);
-      return haps;
-    });
+    return new Pattern((state) => this.query(func(state)));
   }
 
   /**

From fdde05e75114e8aedb38d89648d83d1c58b3b303 Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 8 Oct 2025 14:51:21 +0100
Subject: [PATCH 2/5] add pattern id to query state controls

---
 packages/core/repl.mjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/repl.mjs b/packages/core/repl.mjs
index 53562f216..8dbfbec75 100644
--- a/packages/core/repl.mjs
+++ b/packages/core/repl.mjs
@@ -214,7 +214,10 @@ export function repl({
       }
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
-        let patterns = Object.values(pPatterns);
+        let patterns = [];
+        for (const [key, value] of Object.entries(pPatterns)) {
+          patterns.push(value.withState(state => state.setControls({id: key})));
+        }
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
           patterns = patterns.map((x) => eachTransform(x));
@@ -228,6 +231,7 @@ export function repl({
           pattern = allTransforms[i](pattern);
         }
       }
+
       if (!isPattern(pattern)) {
         const message = `got "${typeof evaluated}" instead of pattern`;
         throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));

From 086596c47ca564743510301a963815572d6b48b0 Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 8 Oct 2025 14:52:00 +0100
Subject: [PATCH 3/5] fix setControls to do union with existing controls

---
 packages/core/state.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/state.mjs b/packages/core/state.mjs
index 162dc7da9..928710814 100644
--- a/packages/core/state.mjs
+++ b/packages/core/state.mjs
@@ -19,9 +19,9 @@ export class State {
     return this.setSpan(func(this.span));
   }
 
-  // Returns new State with different controls
+  // Returns new State with added controls.
   setControls(controls) {
-    return new State(this.span, controls);
+    return new State(this.span, {...this.controls, ...controls});
   }
 }
 

From ffbbc43c8973059a95cfd69d0594e5cac71905ef Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 8 Oct 2025 15:34:51 +0100
Subject: [PATCH 4/5] add cyclist version to the query metadata

---
 packages/core/cyclist.mjs    | 2 +-
 packages/core/neocyclist.mjs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core/cyclist.mjs b/packages/core/cyclist.mjs
index ad0961032..59e410c53 100644
--- a/packages/core/cyclist.mjs
+++ b/packages/core/cyclist.mjs
@@ -57,7 +57,7 @@ export class Cyclist {
           }
 
           // query the pattern for events
-          const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
+          const haps = this.pattern.queryArc(begin, end, { _cps: this.cps, cyclist: 'cyclist' });
 
           haps.forEach((hap) => {
             if (hap.hasOnset()) {
diff --git a/packages/core/neocyclist.mjs b/packages/core/neocyclist.mjs
index 261f08acb..3e412074d 100644
--- a/packages/core/neocyclist.mjs
+++ b/packages/core/neocyclist.mjs
@@ -38,8 +38,7 @@ export class NeoCyclist {
       if (this.started === false) {
         return;
       }
-
-      const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
+      const haps = this.pattern.queryArc(begin, end, { _cps: this.cps, cyclist: 'neocyclist' });
       haps.forEach((hap) => {
         if (hap.hasOnset()) {
           const timeUntilTrigger = cycleToSeconds(hap.whole.begin - this.cycle, this.cps);

From 64f16c4f337c63692b5f89e8226e37a0db82c923 Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 8 Oct 2025 15:35:34 +0100
Subject: [PATCH 5/5] placate format gods

---
 packages/core/repl.mjs  | 2 +-
 packages/core/state.mjs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/repl.mjs b/packages/core/repl.mjs
index 8dbfbec75..171697eb9 100644
--- a/packages/core/repl.mjs
+++ b/packages/core/repl.mjs
@@ -216,7 +216,7 @@ export function repl({
       if (Object.keys(pPatterns).length) {
         let patterns = [];
         for (const [key, value] of Object.entries(pPatterns)) {
-          patterns.push(value.withState(state => state.setControls({id: key})));
+          patterns.push(value.withState((state) => state.setControls({ id: key })));
         }
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
diff --git a/packages/core/state.mjs b/packages/core/state.mjs
index 928710814..8aa581954 100644
--- a/packages/core/state.mjs
+++ b/packages/core/state.mjs
@@ -21,7 +21,7 @@ export class State {
 
   // Returns new State with added controls.
   setControls(controls) {
-    return new State(this.span, {...this.controls, ...controls});
+    return new State(this.span, { ...this.controls, ...controls });
   }
 }