From 02cd79a6d981df25f7d75ed6a47024565db29ed5 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Mon, 25 Aug 2025 08:44:18 -0500
Subject: [PATCH 01/80] Add wavetable oscillator with scanning, warps, and
 detune

---
 packages/core/controls.mjs         |  39 +++
 packages/sampler/sample-server.mjs |  39 ++-
 packages/superdough/helpers.mjs    |  28 +-
 packages/superdough/index.mjs      |   1 +
 packages/superdough/superdough.mjs |  12 +-
 packages/superdough/synth.mjs      |  27 +-
 packages/superdough/wavetable.mjs  | 253 +++++++++++++++++++
 packages/superdough/worklets.mjs   | 393 ++++++++++++++++++++++++++---
 8 files changed, 715 insertions(+), 77 deletions(-)
 create mode 100644 packages/superdough/wavetable.mjs

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index e6181d453..ba77f1a35 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -87,6 +87,45 @@ export function registerControl(names, ...aliases) {
  */
 export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
 
+/**
+ * Position in the wavetable of the wavetable oscillator
+ *
+ * @name wtPos
+ * @param {number | Pattern} position Position in the wavetable from 0 to 1
+ * @synonyms wavetablePosition
+ *
+ */
+export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition');
+
+/**
+ * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator
+ *
+ * @name wtWarp
+ * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
+ * @synonyms wavetableWarp
+ *
+ */
+export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp');
+
+/**
+ * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator.
+ *
+ * The current options are:
+ * 0 = asym
+ * 1 = mirror
+ * 2 = bend+
+ * 3 = bend-
+ * 4 = bend+/-
+ * 5 = sync
+ * 6 = quantize
+ *
+ * @name wtWarpMode
+ * @param {number | Pattern} mode Warp mode: an integer
+ * @synonyms wavetableWarpMode
+ *
+ */
+export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', 'wavetableWarpMode');
+
 /**
  * Define a custom webaudio node to use as a sound source.
  *
diff --git a/packages/sampler/sample-server.mjs b/packages/sampler/sample-server.mjs
index 08456add9..2832741aa 100644
--- a/packages/sampler/sample-server.mjs
+++ b/packages/sampler/sample-server.mjs
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 import cowsay from 'cowsay';
-import { createReadStream, existsSync } from 'fs';
+import { createReadStream, existsSync, writeFileSync } from 'fs';
 import { readdir } from 'fs/promises';
 import http from 'http';
-import { join, sep } from 'path';
+import { join, sep, resolve } from 'path';
 import os from 'os';
 
 // eslint-disable-next-line
@@ -36,17 +36,19 @@ async function getFilesInDirectory(directory) {
   return files;
 }
 
-async function getBanks(directory) {
+async function getBanks(directory, flat = false) {
   let files = await getFilesInDirectory(directory);
   let banks = {};
   directory = directory.split(sep).join('/');
   files = files.map((path) => {
     path = path.split(sep).join('/');
-    const [bank] = path.split('/').slice(-2);
+    const subDir = path.replace(directory, '');
+    const subDirFlat = subDir.replaceAll('/', '_').slice(1); // remove initial underscore
+    const subDirFlatStem = subDirFlat.replace(/\.[^.]+$/, ''); // remove extension
+    let bank = flat ? subDirFlatStem : subDir.split('/')[0];
     banks[bank] = banks[bank] || [];
-    const relativeUrl = path.replace(directory, '');
-    banks[bank].push(relativeUrl);
-    return relativeUrl;
+    banks[bank].push(subDir);
+    return subDir;
   });
   banks._base = `http://localhost:5432`;
   return { banks, files };
@@ -54,14 +56,25 @@ async function getBanks(directory) {
 
 const args = process.argv.slice(2);
 
+function getArgValue(flag) {
+  const i = args.indexOf(flag);
+  if (i !== -1) {
+    const nextIsFlag = args[i + 1]?.startsWith('--') ?? true;
+    if (nextIsFlag) return true;
+    return args[i + 1];
+  }
+}
+
 // eslint-disable-next-line
-const directory = process.cwd();
+let directory = getArgValue('--dir') || process.cwd();
+directory = resolve(directory);
 
 if (args.includes('--json')) {
-  const { banks, files } = await getBanks(directory);
+  const { banks } = await getBanks(directory, getArgValue('--flat'));
   const json = JSON.stringify(banks);
-  console.log(json);
-  process.exit(0);
+  const outFile = resolve(directory, 'strudel.json');
+  writeFileSync(outFile, json, 'utf8');
+  console.log(`Wrote json to ${outFile}`);
 }
 
 console.log(
@@ -74,7 +87,7 @@ console.log(
 
 const server = http.createServer(async (req, res) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
-  const { banks, files } = await getBanks(directory);
+  const { banks, files } = await getBanks(directory, getArgValue('--flat'));
   if (req.url === '/') {
     res.setHeader('Content-Type', 'application/json');
     return res.end(JSON.stringify(banks));
@@ -82,7 +95,7 @@ const server = http.createServer(async (req, res) => {
   let subpath = decodeURIComponent(req.url);
   const filePath = join(directory, subpath.split('/').join(sep));
 
-  //console.log('GET:', filePath);
+  // console.log('GET:', filePath);
   const isFound = existsSync(filePath);
   if (!isFound) {
     res.statusCode = 404;
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 81bec9399..7879cff00 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -1,5 +1,5 @@
 import { getAudioContext } from './superdough.mjs';
-import { clamp, nanFallback } from './util.mjs';
+import { clamp, nanFallback, midiToFreq, noteToMidi } from './util.mjs';
 import { getNoiseBuffer } from './noise.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
@@ -21,7 +21,9 @@ const getSlope = (y1, y2, x1, x2) => {
 export function getWorklet(ac, processor, params, config) {
   const node = new AudioWorkletNode(ac, processor, config);
   Object.entries(params).forEach(([key, value]) => {
-    node.parameters.get(key).value = value;
+    if (value !== undefined) {
+      node.parameters.get(key).value = value;
+    }
   });
   return node;
 }
@@ -307,3 +309,25 @@ export function applyFM(param, value, begin) {
   }
   return { stop };
 }
+
+export const getFrequencyFromValue = (value, defaultNote = 36) => {
+  let { note, freq } = value;
+  note = note || defaultNote;
+  if (typeof note === 'string') {
+    note = noteToMidi(note); // e.g. c3 => 48
+  }
+  // get frequency
+  if (!freq && typeof note === 'number') {
+    freq = midiToFreq(note); // + 48);
+  }
+
+  return Number(freq);
+};
+
+export const destroyAudioWorkletNode = (node) => {
+  if (node == null) {
+    return;
+  }
+  node.disconnect();
+  node.parameters.get('end')?.setValueAtTime(0, 0);
+};
diff --git a/packages/superdough/index.mjs b/packages/superdough/index.mjs
index fd49fe338..a7e87ffae 100644
--- a/packages/superdough/index.mjs
+++ b/packages/superdough/index.mjs
@@ -11,3 +11,4 @@ export * from './synth.mjs';
 export * from './zzfx.mjs';
 export * from './logger.mjs';
 export * from './dspworklet.mjs';
+export * from './wavetable.mjs';
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index eb1466d91..37579005a 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -555,6 +555,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     tremolophase = 0,
     tremoloshape,
     s = getDefaultValue('s'),
+    wt,
     bank,
     source,
     gain = getDefaultValue('gain'),
@@ -681,8 +682,13 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   let sourceNode;
   if (source) {
     sourceNode = source(t, value, hapDuration, cps);
-  } else if (getSound(s)) {
-    const { onTrigger } = getSound(s);
+  } else {
+    const soundSource = wt ?? s;
+    const sound = getSound(soundSource);
+    if (!sound) {
+      throw new Error(`sound ${soundSource} not found! Is it loaded?`);
+    }
+    const { onTrigger } = sound;
     const onEnded = () => {
       audioNodes.forEach((n) => n?.disconnect());
       activeSoundSources.delete(chainID);
@@ -693,8 +699,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       sourceNode = soundHandle.node;
       activeSoundSources.set(chainID, soundHandle);
     }
-  } else {
-    throw new Error(`sound ${s} not found! Is it loaded?`);
   }
   if (!sourceNode) {
     // if onTrigger does not return anything, we will just silently skip
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index 71138ae41..5b1b4edf1 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -1,39 +1,20 @@
-import { clamp, midiToFreq, noteToMidi } from './util.mjs';
+import { clamp } from './util.mjs';
 import { registerSound, getAudioContext, soundMap, getLfo } from './superdough.mjs';
 import {
   applyFM,
+  destroyAudioWorkletNode,
   gainNode,
   getADSRValues,
+  getFrequencyFromValue,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
-  webAudioTimeout,
   getWorklet,
   noises,
+  webAudioTimeout,
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
-const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq } = value;
-  note = note || defaultNote;
-  if (typeof note === 'string') {
-    note = noteToMidi(note); // e.g. c3 => 48
-  }
-  // get frequency
-  if (!freq && typeof note === 'number') {
-    freq = midiToFreq(note); // + 48);
-  }
-
-  return Number(freq);
-};
-function destroyAudioWorkletNode(node) {
-  if (node == null) {
-    return;
-  }
-  node.disconnect();
-  node.parameters.get('end')?.setValueAtTime(0, 0);
-}
-
 const waveforms = ['triangle', 'square', 'sawtooth', 'sine'];
 const waveformAliases = [
   ['tri', 'triangle'],
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
new file mode 100644
index 000000000..d18f1fdff
--- /dev/null
+++ b/packages/superdough/wavetable.mjs
@@ -0,0 +1,253 @@
+import { getAudioContext, registerSound } from './index.mjs';
+import { clamp, getSoundIndex, valueToMidi } from './util.mjs';
+import {
+  destroyAudioWorkletNode,
+  getADSRValues,
+  getFrequencyFromValue,
+  getParamADSR,
+  getPitchEnvelope,
+  getVibratoOscillator,
+  getWorklet,
+  webAudioTimeout,
+} from './helpers.mjs';
+import { logger } from './logger.mjs';
+
+const WT_MAX_MIP_LEVELS = 6;
+export const WarpMode = Object.freeze({
+  NONE: 0,
+  ASYM: 1,
+  MIRROR: 2,
+  BENDP: 3,
+  BENDM: 4,
+  BENDMP: 5,
+  SYNC: 6,
+  QUANT: 7,
+  FOLD: 8,
+  PWM: 9,
+  ORBIT: 10,
+  SPIN: 11,
+  CHAOS: 12,
+  PRIMES: 13,
+  BINARY: 14,
+  BROWNIAN: 15,
+  RECIPROCAL: 16,
+  WORMHOLE: 17,
+  LOGISTIC: 18,
+  SIGMOID: 19,
+  FRACTAL: 20,
+  FLIP: 21,
+});
+
+async function loadWavetableFrames(url, label, frameLen = 256) {
+  const ac = getAudioContext();
+  const buf = await loadBuffer(url, ac, label);
+  const ch0 = buf.getChannelData(0);
+  const total = ch0.length;
+  const numFrames = Math.floor(total / frameLen);
+  const frames = new Array(numFrames);
+  for (let i = 0; i < numFrames; i++) {
+    const start = i * frameLen;
+    frames[i] = ch0.subarray(start, start + frameLen);
+  }
+
+  // build mipmaps
+  const mipmaps = [frames];
+  let levelFrames = frames;
+  for (let level = 1; level < WT_MAX_MIP_LEVELS; level++) {
+    const prevLen = levelFrames[0].length;
+    if (prevLen <= 32) break;
+    const nextLen = prevLen >> 1;
+    const next = levelFrames.map((src) => {
+      const out = new Float32Array(nextLen);
+      for (let j = 0; j < nextLen; j++) {
+        out[j] = (src[2 * j] + src[2 * j + 1]) / 2;
+      }
+      return out;
+    });
+    mipmaps.push(next);
+    levelFrames = next;
+  }
+  return { frames, mipmaps, frameLen, numFrames };
+}
+
+const loadCache = {};
+
+function humanFileSize(bytes, si) {
+  var thresh = si ? 1000 : 1024;
+  if (bytes < thresh) return bytes + ' B';
+  var units = si
+    ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+    : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+  var u = -1;
+  do {
+    bytes /= thresh;
+    ++u;
+  } while (bytes >= thresh);
+  return bytes.toFixed(1) + ' ' + units[u];
+}
+
+export function getTableInfo(hapValue, bank) {
+  const { wt, n = 0 } = hapValue;
+  let midi = valueToMidi(hapValue, 36);
+  let transpose = midi - 36; // C3 is middle C;
+  const index = getSoundIndex(n, bank.length);
+  const tableUrl = bank[index];
+  const label = `${wt}:${index}`;
+  return { transpose, tableUrl, index, midi, label };
+}
+
+const loadBuffer = (url, ac, wt, n = 0) => {
+  const label = wt ? `table "${wt}:${n}"` : 'table';
+  url = url.replace('#', '%23');
+  if (!loadCache[url]) {
+    logger(`[wavetable] load ${label}..`, 'load-table', { url });
+    const timestamp = Date.now();
+    loadCache[url] = fetch(url)
+      .then((res) => res.arrayBuffer())
+      .then(async (res) => {
+        const took = Date.now() - timestamp;
+        const size = humanFileSize(res.byteLength);
+        logger(`[wavetable] load ${label}... done! loaded ${size} in ${took}ms`, 'loaded-table', { url });
+        const decoded = await ac.decodeAudioData(res);
+        return decoded;
+      });
+  }
+  return loadCache[url];
+};
+
+function githubPath(base, subpath = '') {
+  if (!base.startsWith('github:')) {
+    throw new Error('expected "github:" at the start of pseudoUrl');
+  }
+  let [_, path] = base.split('github:');
+  path = path.endsWith('/') ? path.slice(0, -1) : path;
+  if (path.split('/').length === 2) {
+    // assume main as default branch if none set
+    path += '/main';
+  }
+  return `https://raw.githubusercontent.com/${path}/${subpath}`;
+}
+
+const _processTables = (json, baseUrl, frameLen) => {
+  return Object.entries(json).forEach(([key, value]) => {
+    if (typeof value === 'string') {
+      value = [value];
+    }
+    if (typeof value !== 'object') {
+      throw new Error('wrong json format for ' + key);
+    }
+    baseUrl = value._base || baseUrl;
+    if (baseUrl.startsWith('github:')) {
+      baseUrl = githubPath(baseUrl, '');
+    }
+    value = value.map((v) => baseUrl + v);
+    registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, value, frameLen), {
+      type: 'wavetable',
+      tables: value,
+      baseUrl,
+      frameLen,
+    });
+  });
+};
+
+/**
+ * Loads a collection of wavetables to use with `wt`
+ *
+ * @name tables
+ */
+export const tables = async (url, frameLen, json) => {
+  if (json !== undefined) return _processTables(json, url, frameLen);
+  if (url.startsWith('github:')) {
+    url = githubPath(url, 'strudel.json');
+  }
+  if (url.startsWith('local:')) {
+    url = `http://localhost:5432`;
+  }
+  if (typeof fetch !== 'function') {
+    // not a browser
+    return;
+  }
+  const base = url.split('/').slice(0, -1).join('/');
+  if (typeof fetch === 'undefined') {
+    // skip fetch when in node / testing
+    return;
+  }
+  return fetch(url)
+    .then((res) => res.json())
+    .then((json) => _processTables(json, url, frameLen))
+    .catch((error) => {
+      console.error(error);
+      throw new Error(`error loading "${url}"`);
+    });
+};
+
+async function onTriggerSynth(t, value, onended, bank, frameLen) {
+  let { s, n = 0, duration } = value;
+  const ac = getAudioContext();
+  let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
+  let sourceDesc, holdEnd, envEnd;
+  let { unison = 5, spread = 0.6, detune, wtPos, wtWarp, wtWarpMode } = value;
+  if (typeof wtWarpMode === 'string') {
+    wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
+  }
+  detune = detune ?? 0.18;
+  const frequency = getFrequencyFromValue(value);
+  const voices = clamp(unison, 1, 100);
+  let { tableUrl, label } = getTableInfo(value, bank);
+  const payload = await loadWavetableFrames(tableUrl, label, frameLen);
+  holdEnd = t + duration;
+  envEnd = holdEnd + release + 0.01;
+  const worklet = getWorklet(
+    ac,
+    'wavetable-oscillator-processor',
+    {
+      begin: t,
+      end: envEnd,
+      frequency,
+      detune,
+      position: wtPos,
+      warp: wtWarp,
+      warpMode: wtWarpMode,
+      voices,
+      spread,
+    },
+    { outputChannelCount: [2] },
+  );
+  worklet.port.postMessage({ type: 'tables', payload });
+  sourceDesc = { source: worklet };
+  const { source } = sourceDesc;
+  if (ac.currentTime > t) {
+    logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
+    return;
+  }
+  if (!source) {
+    logger(`[wavetable] could not load "${s}:${n}"`, 'error');
+    return;
+  }
+  let vibratoOscillator = getVibratoOscillator(source.detune, value, t);
+  const envGain = ac.createGain();
+  const node = source.connect(envGain);
+  getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
+  getPitchEnvelope(source.detune, value, t, holdEnd);
+
+  const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
+  node.connect(out);
+  let handle = { node: out, bufferSource: source };
+  let timeoutNode = webAudioTimeout(
+    ac,
+    () => {
+      source.disconnect();
+      destroyAudioWorkletNode(source);
+      vibratoOscillator?.stop();
+      node.disconnect();
+      out.disconnect();
+      onended();
+    },
+    t,
+    envEnd,
+  );
+  handle.stop = (time) => {
+    timeoutNode.stop(time);
+  };
+  return handle;
+}
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 2406d56dc..7775803d9 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -6,7 +6,21 @@ import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-const _mod = (n, m) => ((n % m) + m) % m;
+const mod = (n, m) => ((n % m) + m) % m;
+const lerp = (a, b, n) => n * (b - a) + a;
+const pv = (arr, n) => arr[n] ?? arr[0];
+const frac = (x) => x - Math.floor(x);
+const ffloor = (x) => x | 0; // fast floor for non-negative
+
+const getUnisonDetune = (unison, detune, voiceIndex) => {
+  if (unison < 2) {
+    return 0;
+  }
+  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
+};
+const applySemitoneDetuneToFrequency = (frequency, detune) => {
+  return frequency * Math.pow(2, detune / 12);
+};
 
 // Restrict phase to the range [0, maxPhase) via wrapping
 function wrapPhase(phase, maxPhase = 1) {
@@ -150,7 +164,7 @@ class LFOProcessor extends AudioWorkletProcessor {
     const blockSize = output[0].length ?? 0;
 
     if (this.phase == null) {
-      this.phase = _mod(time * frequency + phaseoffset, 1);
+      this.phase = mod(time * frequency + phaseoffset, 1);
     }
     const dt = frequency / sampleRate;
     for (let n = 0; n < blockSize; n++) {
@@ -378,21 +392,6 @@ class DistortProcessor extends AudioWorkletProcessor {
 registerProcessor('distort-processor', DistortProcessor);
 
 // SUPERSAW
-function lerp(a, b, n) {
-  return n * (b - a) + a;
-}
-
-function getUnisonDetune(unison, detune, voiceIndex) {
-  if (unison < 2) {
-    return 0;
-  }
-  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
-}
-
-function applySemitoneDetuneToFrequency(frequency, detune) {
-  return frequency * Math.pow(2, detune / 12);
-}
-
 class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
@@ -454,29 +453,31 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
     }
 
     const output = outputs[0];
-    const voices = params.voices[0];
-    const freqspread = params.freqspread[0];
-    const panspread = params.panspread[0] * 0.5 + 0.5;
-    const gain1 = Math.sqrt(1 - panspread);
-    const gain2 = Math.sqrt(panspread);
 
-    for (let n = 0; n < voices; n++) {
-      const isOdd = (n & 1) == 1;
-      let gainL = gain1;
-      let gainR = gain2;
-      // invert right and left gain
-      if (isOdd) {
-        gainL = gain2;
-        gainR = gain1;
-      }
-      for (let i = 0; i < output[0].length; i++) {
-        // Main detuning
-        let freq = applySemitoneDetuneToFrequency(params.frequency[i] ?? params.frequency[0], params.detune[0] / 100);
+    for (let i = 0; i < output[0].length; i++) {
+      const detune = pv(params.detune, i);
+      const voices = pv(params.voices, i);
+      const freqspread = pv(params.freqspread, i);
+      const panspread = pv(params.panspread, i) * 0.5 + 0.5;
+      const gain1 = Math.sqrt(1 - panspread);
+      const gain2 = Math.sqrt(panspread);
+      let freq = pv(params.frequency, i);
+      // Main detuning
+      freq = applySemitoneDetuneToFrequency(freq, detune / 100);
+      for (let n = 0; n < voices; n++) {
+        const isOdd = (n & 1) == 1;
+        let gainL = gain1;
+        let gainR = gain2;
+        // invert right and left gain
+        if (isOdd) {
+          gainL = gain2;
+          gainR = gain1;
+        }
         // Individual voice detuning
         freq = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
         // We must wrap this here because it is passed into sawblep below which
         // has domain [0, 1]
-        const dt = _mod(freq / sampleRate, 1);
+        const dt = mod(freq / sampleRate, 1);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
@@ -907,3 +908,325 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('byte-beat-processor', ByteBeatProcessor);
+
+
+export const WarpMode = Object.freeze({
+  NONE: 0,
+  ASYM: 1,
+  MIRROR: 2,
+  BENDP: 3,
+  BENDM: 4,
+  BENDMP: 5,
+  SYNC: 6,
+  QUANT: 7,
+  FOLD: 8,
+  PWM: 9,
+  ORBIT: 10,
+  SPIN: 11,
+  CHAOS: 12,
+  PRIMES: 13,
+  BINARY: 14,
+  BROWNIAN: 15,
+  RECIPROCAL: 16,
+  WORMHOLE: 17,
+  LOGISTIC: 18,
+  SIGMOID: 19,
+  FRACTAL: 20,
+  FLIP: 21,
+});
+
+function hash32(u) {
+  u = u + 0x7ed55d16 + (u << 12);
+  u = u ^ 0xc761c23c ^ (u >>> 19);
+  u = u + 0x165667b1 + (u << 5);
+  u = (u + 0xd3a2646c) ^ (u << 9);
+  u = u + 0xfd7046c5 + (u << 3);
+  u = u ^ 0xb55a4f09 ^ (u >>> 16);
+  return u >>> 0;
+}
+const hash01 = (i) => (hash32(i) >>> 8) / 0x01000000;
+
+function bitReverse(i, n) {
+  let r = 0;
+  for (let b = 0; b < n; b++) {
+    r = (r << 1) | (i & 1);
+    i >>>= 1;
+  }
+  return r;
+}
+
+function noise(x) {
+  const i = Math.floor(x),
+    f = x - i;
+  const a = hash01(i),
+    b = hash01(i + 1);
+  return a + (b - a) * f;
+}
+
+function brownian(x, oct = 4) {
+  let amp = 0.5,
+    sum = 0,
+    norm = 0,
+    freq = 1;
+  for (let o = 0; o < oct; o++) {
+    sum += amp * noise(x * freq);
+    norm += amp;
+    amp *= 0.5;
+    freq *= 2;
+  }
+  return (sum / norm) * 2 - 1;
+}
+
+class WavetableOscillatorProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [
+      { name: 'begin', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
+      { name: 'end', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
+      { name: 'frequency', defaultValue: 220, minValue: 0.01, maxValue: 20000 },
+      { name: 'detune', defaultValue: 0 },
+      { name: 'position', defaultValue: 0, minValue: 0, maxValue: 1 },
+      { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
+      { name: 'warpMode', defaultValue: 0 },
+      { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
+      { name: 'spread', defaultValue: 0, minValue: 0, maxValue: 1 },
+    ];
+  }
+
+  constructor(options) {
+    super(options);
+    this.tables = null;
+    this.frameLen = 0;
+    this.numFrames = 0;
+    this.phase = [];
+    this.syncRatio = 1;
+
+    this.port.onmessage = (e) => {
+      const { type, payload } = e.data || {};
+      if (type === 'tables') {
+        this.tables = payload.mipmaps;
+        this.frameLen = payload.frameLen;
+        this.numFrames = this.tables[0].length;
+      }
+    };
+    this.lfoPhase = 0;
+  }
+
+  _chooseMip(dphi) {
+    const approxHarm = Math.min(64, 1 / Math.max(1e-6, dphi));
+    let level = 0;
+    while (level + 1 < (this.tables?.length || 1) && approxHarm < this.tables[level][0].length / 8) {
+      level++;
+    }
+    return level;
+  }
+
+  _mirror(x) {
+    return 1 - Math.abs(2 * x - 1);
+  }
+
+  _toBits(amt, min = 2, max = 12) {
+    const b = max + (min - max) * amt;
+    return { b, n: Math.round(Math.pow(2, b)) };
+  }
+
+  _warpPhase(phase, amt, mode) {
+    switch (mode) {
+      case WarpMode.NONE: {
+        return phase;
+      }
+      case WarpMode.ASYM: {
+        const a = 0.01 + 0.99 * amt;
+        return phase < a ? (0.5 * phase) / a : 0.5 + (0.5 * (phase - a)) / (1 - a);
+      }
+      case WarpMode.MIRROR: {
+        // Asym, then mirror
+        return this._mirror(this._warpPhase(phase, amt, WarpMode.ASYM));
+      }
+      case WarpMode.BENDP: {
+        return Math.pow(phase, 1 + 3 * amt);
+      }
+      case WarpMode.BENDM: {
+        return Math.pow(phase, 1 / (1 + 3 * amt));
+      }
+      case WarpMode.BENDMP: {
+        return amt < 0.5 ? this._warpPhase(phase, 1 - 2 * amt, 3) : this._warpPhase(phase, 2 * amt - 1, 2);
+      }
+      case WarpMode.SYNC: {
+        const syncRatio = Math.pow(16, amt * amt);
+        return (phase * syncRatio) % 1;
+      }
+      case WarpMode.QUANT: {
+        const { n } = this._toBits(amt);
+        return ffloor(phase * n) / n;
+      }
+      case WarpMode.FOLD: {
+        const K = 7;
+        const k = 1 + Math.max(1, Math.round(K * amt));
+        return Math.abs(frac(k * phase) - 0.5) * 2;
+      }
+      case WarpMode.PWM: {
+        const w = clamp(0.5 + 0.49 * (2 * amt - 1), 0, 1);
+        if (phase < w) return (phase / w) * 0.5;
+        return 0.5 + ((phase - w) / (1 - w)) * 0.5;
+      }
+      case WarpMode.ORBIT: {
+        const depth = 0.5 * amt;
+        const n = 3;
+        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
+      }
+      case WarpMode.SPIN: {
+        const depth = 0.5 * amt;
+        const { n } = this._toBits(amt, 1, 6);
+        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
+      }
+      case WarpMode.CHAOS: {
+        const r = 3.7 + 0.3 * amt;
+        const logistic = r * phase * (1 - phase);
+        return clamp((1 - amt) * phase + amt * logistic, 0, 1);
+      }
+      case WarpMode.PRIMES: {
+        const isPrime = (n) => {
+          if (n < 2) return false;
+          if (n % 2 === 0) return n === 2;
+          for (let d = 3; d * d <= n; d += 2) if (n % d === 0) return false;
+          return true;
+        };
+        let { n } = this._toBits(amt, 3);
+        while (!isPrime(n)) n++;
+        return ffloor(phase * n) / n;
+      }
+      case WarpMode.BINARY: {
+        let { b } = this._toBits(amt, 3);
+        b = Math.round(b);
+        const n = 1 << b;
+        const idx = ffloor(phase * n);
+        const ridx = bitReverse(idx, b);
+        return ridx / n;
+      }
+      case WarpMode.MODULAR: {
+        const { n } = this._toBits(amt);
+        const depth = 0.5 * amt;
+        const jump = frac(phase * n) / n;
+        return frac(phase + depth * jump);
+      }
+      case WarpMode.BROWNIAN: {
+        const disp = 0.25 * amt * brownian(64 * phase, 4);
+        return frac(phase + disp);
+      }
+      case WarpMode.RECIPROCAL: {
+        const g = 2 + 4 * amt;
+        const num = phase * g;
+        const den = phase + (1 - phase) * g;
+        const y = den > 1e-12 ? num / den : 0;
+        return clamp(y, 0, 1);
+      }
+      case WarpMode.WORMHOLE: {
+        const gap = clamp(0.8 * amt, 0, 1);
+        const a = 0.5 * (1 - gap);
+        const b = 0.5 * (1 + gap);
+        if (phase < a) return (phase / a) * 0.5;
+        if (phase > b) return 0.5 * (1 + (phase - b) / (1 - b));
+        return 0.5;
+      }
+      case WarpMode.LOGISTIC: {
+        let x = phase;
+        const r = 3.6 + 0.4 * amt;
+        const iters = 1 + Math.round(2 * amt);
+        for (let i = 0; i < iters; i++) x = r * x * (1 - x);
+        return clamp(x, 0, 1);
+      }
+      case WarpMode.SIGMOID: {
+        const k = 1 + 10 * amt;
+        const x = phase - 0.5;
+        const y = 1 / (1 + Math.exp(-k * x));
+        const y0 = 1 / (1 + Math.exp(0.5 * k));
+        const y1 = 1 / (1 + Math.exp(-0.5 * k));
+        return (y - y0) / (y1 - y0);
+      }
+      case WarpMode.FRACTAL: {
+        const d = 0.5 * Math.sin(2 * Math.PI * phase) * amt;
+        return frac(phase + d);
+      }
+      case WarpMode.FLIP: {
+        return phase;
+      }
+      default:
+        return phase;
+    }
+  }
+
+  _sampleFrame(frame, phase) {
+    const pos = phase * (frame.length - 1);
+    const i = pos | 0;
+    const frac = pos - i;
+    const a = frame[i];
+    const b = frame[(i + 1) % frame.length];
+    return a + (b - a) * frac;
+  }
+
+  process(_inputs, outputs, parameters) {
+    if (currentTime >= parameters.end[0]) {
+      return false;
+    }
+    if (currentTime <= parameters.begin[0]) {
+      return true;
+    }
+    const outL = outputs[0][0];
+    const outR = outputs[0][1] || outputs[0][0];
+
+    if (!this.tables) {
+      outL.fill(0);
+      if (outR !== outL) outR.set(outL);
+      return true;
+    }
+
+    for (let i = 0; i < outL.length; i++) {
+      const detune = pv(parameters.detune, i);
+      const spread = pv(parameters.spread, i) * 0.5 + 0.5;
+      const tablePos = pv(parameters.position, i); //Math.sin(2 * Math.PI * this.lfoPhase);
+      // morph across frames
+      const idx = tablePos * (this.numFrames - 1);
+      const fIdx = idx | 0;
+      const frac = idx - fIdx;
+      const warpAmount = 0.5 * Math.sin(2 * Math.PI * this.lfoPhase) + 0.5; // pv(parameters.warp, i);
+      const warpMode = pv(parameters.warpMode, i);
+      const voices = pv(parameters.voices, i);
+      const gain1 = Math.sqrt(1 - spread);
+      const gain2 = Math.sqrt(spread);
+      let f = pv(parameters.frequency, i);
+      f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
+      for (let n = 0; n < voices; n++) {
+        const isOdd = (n & 1) == 1;
+        let gainL = gain1;
+        let gainR = gain2;
+        // invert right and left gain
+        if (isOdd) {
+          gainL = gain2;
+          gainR = gain1;
+        }
+        let fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
+        const dPhase = fVoice / sampleRate;
+        const level = this._chooseMip(dPhase);
+        const bank = this.tables[level];
+
+        // warp phase then sample
+        this.phase[n] = this.phase[n] ?? Math.random();
+        let ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
+        const s0 = this._sampleFrame(bank[fIdx], ph);
+        const s1 = this._sampleFrame(bank[Math.min(this.numFrames - 1, fIdx + 1)], ph);
+        let s = s0 + (s1 - s0) * frac;
+        if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
+          s = -s;
+        }
+        outL[i] += (s * gainL) / Math.sqrt(voices);
+        outR[i] += (s * gainR) / Math.sqrt(voices);
+        this.phase[n] = wrapPhase(this.phase[n] + dPhase);
+      }
+      this.lfoPhase += 1 / sampleRate;
+      if (this.lfoPhase >= 1) this.lfoPhase -= 1;
+    }
+    return true;
+  }
+}
+
+registerProcessor('wavetable-oscillator-processor', WavetableOscillatorProcessor);

From d1869c18ba526e8ca251fdcc3aaff048d8f9ba4c Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 28 Aug 2025 16:23:40 -0500
Subject: [PATCH 02/80] Remove internal LFO

---
 packages/superdough/wavetable.mjs | 2 +-
 packages/superdough/worklets.mjs  | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index d18f1fdff..9b9e325f7 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -232,7 +232,7 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
 
   const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
   node.connect(out);
-  let handle = { node: out, bufferSource: source };
+  let handle = { node: out, bufferSource: source, oscillator: worklet };
   let timeoutNode = webAudioTimeout(
     ac,
     () => {
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 7775803d9..ce0e7ac80 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1008,7 +1008,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         this.numFrames = this.tables[0].length;
       }
     };
-    this.lfoPhase = 0;
   }
 
   _chooseMip(dphi) {
@@ -1183,12 +1182,11 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     for (let i = 0; i < outL.length; i++) {
       const detune = pv(parameters.detune, i);
       const spread = pv(parameters.spread, i) * 0.5 + 0.5;
-      const tablePos = pv(parameters.position, i); //Math.sin(2 * Math.PI * this.lfoPhase);
-      // morph across frames
+      const tablePos = pv(parameters.position, i);
       const idx = tablePos * (this.numFrames - 1);
       const fIdx = idx | 0;
       const frac = idx - fIdx;
-      const warpAmount = 0.5 * Math.sin(2 * Math.PI * this.lfoPhase) + 0.5; // pv(parameters.warp, i);
+      const warpAmount = pv(parameters.warp, i);
       const warpMode = pv(parameters.warpMode, i);
       const voices = pv(parameters.voices, i);
       const gain1 = Math.sqrt(1 - spread);
@@ -1222,8 +1220,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         outR[i] += (s * gainR) / Math.sqrt(voices);
         this.phase[n] = wrapPhase(this.phase[n] + dPhase);
       }
-      this.lfoPhase += 1 / sampleRate;
-      if (this.lfoPhase >= 1) this.lfoPhase -= 1;
     }
     return true;
   }

From fe46e1da5372ddf3c86e023566e9984012fd070e Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 28 Aug 2025 16:28:33 -0500
Subject: [PATCH 03/80] Update docstring to include new warp modes; save sample
 server for a separate PR

---
 packages/core/controls.mjs         | 10 ++------
 packages/sampler/sample-server.mjs | 39 ++++++++++--------------------
 2 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index ba77f1a35..1099fe9ec 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -110,14 +110,8 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
 /**
  * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator.
  *
- * The current options are:
- * 0 = asym
- * 1 = mirror
- * 2 = bend+
- * 3 = bend-
- * 4 = bend+/-
- * 5 = sync
- * 6 = quantize
+ * The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit,
+ * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
  *
  * @name wtWarpMode
  * @param {number | Pattern} mode Warp mode: an integer
diff --git a/packages/sampler/sample-server.mjs b/packages/sampler/sample-server.mjs
index 2832741aa..08456add9 100644
--- a/packages/sampler/sample-server.mjs
+++ b/packages/sampler/sample-server.mjs
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 import cowsay from 'cowsay';
-import { createReadStream, existsSync, writeFileSync } from 'fs';
+import { createReadStream, existsSync } from 'fs';
 import { readdir } from 'fs/promises';
 import http from 'http';
-import { join, sep, resolve } from 'path';
+import { join, sep } from 'path';
 import os from 'os';
 
 // eslint-disable-next-line
@@ -36,19 +36,17 @@ async function getFilesInDirectory(directory) {
   return files;
 }
 
-async function getBanks(directory, flat = false) {
+async function getBanks(directory) {
   let files = await getFilesInDirectory(directory);
   let banks = {};
   directory = directory.split(sep).join('/');
   files = files.map((path) => {
     path = path.split(sep).join('/');
-    const subDir = path.replace(directory, '');
-    const subDirFlat = subDir.replaceAll('/', '_').slice(1); // remove initial underscore
-    const subDirFlatStem = subDirFlat.replace(/\.[^.]+$/, ''); // remove extension
-    let bank = flat ? subDirFlatStem : subDir.split('/')[0];
+    const [bank] = path.split('/').slice(-2);
     banks[bank] = banks[bank] || [];
-    banks[bank].push(subDir);
-    return subDir;
+    const relativeUrl = path.replace(directory, '');
+    banks[bank].push(relativeUrl);
+    return relativeUrl;
   });
   banks._base = `http://localhost:5432`;
   return { banks, files };
@@ -56,25 +54,14 @@ async function getBanks(directory, flat = false) {
 
 const args = process.argv.slice(2);
 
-function getArgValue(flag) {
-  const i = args.indexOf(flag);
-  if (i !== -1) {
-    const nextIsFlag = args[i + 1]?.startsWith('--') ?? true;
-    if (nextIsFlag) return true;
-    return args[i + 1];
-  }
-}
-
 // eslint-disable-next-line
-let directory = getArgValue('--dir') || process.cwd();
-directory = resolve(directory);
+const directory = process.cwd();
 
 if (args.includes('--json')) {
-  const { banks } = await getBanks(directory, getArgValue('--flat'));
+  const { banks, files } = await getBanks(directory);
   const json = JSON.stringify(banks);
-  const outFile = resolve(directory, 'strudel.json');
-  writeFileSync(outFile, json, 'utf8');
-  console.log(`Wrote json to ${outFile}`);
+  console.log(json);
+  process.exit(0);
 }
 
 console.log(
@@ -87,7 +74,7 @@ console.log(
 
 const server = http.createServer(async (req, res) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
-  const { banks, files } = await getBanks(directory, getArgValue('--flat'));
+  const { banks, files } = await getBanks(directory);
   if (req.url === '/') {
     res.setHeader('Content-Type', 'application/json');
     return res.end(JSON.stringify(banks));
@@ -95,7 +82,7 @@ const server = http.createServer(async (req, res) => {
   let subpath = decodeURIComponent(req.url);
   const filePath = join(directory, subpath.split('/').join(sep));
 
-  // console.log('GET:', filePath);
+  //console.log('GET:', filePath);
   const isFound = existsSync(filePath);
   if (!isFound) {
     res.statusCode = 404;

From bb982e6b9b9a0a80a334fcdf11248e4d9d12a0c9 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 3 Sep 2025 21:55:48 -0500
Subject: [PATCH 04/80] First pass at modes

---
 packages/core/controls.mjs                    | 35 +++++++-
 packages/superdough/helpers.mjs               |  4 +
 packages/superdough/superdough.mjs            |  6 +-
 packages/superdough/worklets.mjs              | 89 +++++++++++++++++--
 .../src/repl/components/panel/SettingsTab.jsx |  2 +-
 5 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 58a30652c..01679529c 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -1575,7 +1575,7 @@ export const { roomsize, size, sz, rsize } = registerControl('roomsize', 'size',
 export const { shape } = registerControl(['shape', 'shapevol']);
 /**
  * Wave shaping distortion. CAUTION: it can get loud.
- * Second option in optional array syntax (ex: ".9:.5") applies a postgain to the output.
+ * Second option in optional array syntax (ex: ".9:.5") applies a postgain to the output. Third option sets the waveshaping type.
  * Most useful values are usually between 0 and 10 (depending on source gain). If you are feeling adventurous, you can turn it up to 11 and beyond ;)
  *
  * @name distort
@@ -1585,9 +1585,40 @@ export const { shape } = registerControl(['shape', 'shapevol']);
  * s("bd sd [~ bd] sd,hh*8").distort("<0 2 3 10:.5>")
  * @example
  * note("d1!8").s("sine").penv(36).pdecay(.12).decay(.23).distort("8:.4")
+ * @example
+ * s("bd*4").bank("tr909").distort("4:0.5:fold")
  *
  */
-export const { distort, dist } = registerControl(['distort', 'distortvol'], 'dist');
+export const { distort, dist } = registerControl(['distort', 'distortvol', 'distorttype'], 'dist');
+
+/**
+ * Postgain for waveshaping distortion.
+ *
+ * @name distortvol
+ * @synonyms distvol
+ * @param {number | Pattern} type
+ * @example
+ * s("bd*4").bank("tr909").distort(2).distortvol(0.8)
+ */
+export const { distortvol } = registerControl('distortvol', 'distvol');
+
+/**
+ * Type of waveshaping distortion to apply.
+ *
+ * @name distorttype
+ * @synonyms disttype
+ * @param {number | string | Pattern} type
+ * @example
+ * s("bd*4").bank("tr909").distort(2).distorttype("<0 1 2>")
+ *
+ * @example
+ * s("sine").note("F1*2").release(1)
+ *   .penv(24).pdecay(0.05)
+ *   .distort(70)
+ *   .distorttype("<fold decimate scurve hard soft diode asym>")
+ */
+export const { distorttype } = registerControl('distorttype', 'disttype');
+
 /**
  * Dynamics Compressor. The params are `compressor("threshold:ratio:knee:attack:release")`
  * More info [here](https://developer.mozilla.org/en-US/docs/Web/API/DynamicsCompressorNode?retiredLocale=de#instance_properties)
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 81bec9399..def49c4d1 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -307,3 +307,7 @@ export function applyFM(param, value, begin) {
   }
   return { stop };
 }
+
+export const getDistortion = (distort, postgain, algorithm) => {
+  return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain, algorithm });
+};
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index a518f49b6..98306115c 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -9,7 +9,7 @@ import './reverb.mjs';
 import './vowel.mjs';
 import { clamp, nanFallback, _mod, cycleToSeconds, secondsToCycle } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getWorklet, webAudioTimeout } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getDistortion, getWorklet, webAudioTimeout } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger, errorLogger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
@@ -608,6 +608,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     shapevol = getDefaultValue('shapevol'),
     distort,
     distortvol = getDefaultValue('distortvol'),
+    distorttype,
     pan,
     vowel,
     delay = getDefaultValue('delay'),
@@ -782,8 +783,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // effects
   coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
   crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
-  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
-  distort !== undefined && chain.push(getWorklet(ac, 'distort-processor', { distort, postgain: distortvol }));
+  distort !== undefined && chain.push(getDistortion(distort, distortvol, distorttype));
 
   if (tremolosync != null) {
     tremolo = cps * tremolosync;
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 2406d56dc..0eb2bc72f 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -7,6 +7,9 @@ import FFT from './fft.js';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
+const ffloor = (x) => x | 0;
+const pv = (arr, n) => arr[n] ?? arr[0];
+const mix = (a, b, t) => (1 - t) * a + t * b;
 
 // Restrict phase to the range [0, maxPhase) via wrapping
 function wrapPhase(phase, maxPhase = 1) {
@@ -341,11 +344,85 @@ class LadderProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('ladder-processor', LadderProcessor);
 
+// Saturation curves
+
+const __squash = (x) => x / (1 + x); // [0, inf) to [0, 1)
+
+const _scurve = (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x));
+const _soft = (x, k) => Math.tanh(x * (1 + k));
+const _hard = (x, k) => clamp((1 + k) * x, -1, 1);
+const _sine = (x, k) => Math.sin(x * (1 + k));
+
+const _fold = (x, k) => {
+  let y = (1 + k) * x;
+  while (y > 1 || y < -1) {
+    y = y > 1 ? 2 - y : -2 - y;
+  }
+  return y;
+};
+
+const _sineFold = (x, k) => Math.sin((Math.PI / 2) * _fold(x, k));
+
+const _pow = (x, k) => {
+  const t = __squash(k);
+  const p = 1 / (1 + 0.5 * t); // tame k
+  return _soft(Math.sign(x) * Math.pow(Math.abs(x), p), 0.5 * k);
+};
+
+const _diode = (x, k, asym = false) => {
+  const g = 1 + k; // gain
+  const t = __squash(k);
+  const bias = 0.15 * t;
+  const pos = _soft(x + bias, k);
+  const neg = _soft(asym ? bias : -x + bias, k);
+  const y = pos - neg;
+  // We divide by the derivative at 0 so that the distortion is roughly
+  // the identity map near 0 => small values are preserved and undistorted
+  const sech = 1 / Math.cosh(g * bias);
+  const sech2 = sech * sech; // derivative of tanh is sech^2
+  const denom = Math.max(1e-8, (asym ? 1 : 2) * g * sech2); // g from chain rule; 2 if both pos/neg have x
+  return _soft(y / denom, k);
+};
+
+const _asym = (x, k) => _diode(x, k, true);
+
+const _cubic = (x, k) => {
+  const t = __squash(k);
+  const cubic = (x - (t / 3) * x * x * x) / (1 - t / 3); // normalized to go from (-1, 1)
+  return _soft(cubic, k);
+};
+
+export const saturationAlgos = {
+  scurve: _scurve,
+  soft: _soft,
+  hard: _hard,
+  sine: _sine,
+  fold: _fold,
+  sinefold: _sineFold,
+  pow: _pow,
+  cubic: _cubic,
+  diode: _diode,
+  asym: _asym,
+};
+const _algoNames = Object.freeze(Object.keys(saturationAlgos));
+
+const _getAlgorithm = (algo) => {
+  let algoName = typeof algo === 'string' ? algo : _algoNames[algo % _algoNames.length];
+  if (!_algoNames.includes(algoName)) {
+    algoName = _algoNames[0];
+    logger(`[superdough] Could not find waveshaping algorithm ${algo}.
+      Available options are ${_algoNames.join(', ')}.
+      Defaulting to ${algoName}.`);
+  }
+  return saturationAlgos[algoName];
+};
+
 class DistortProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
     return [
       { name: 'distort', defaultValue: 0 },
       { name: 'postgain', defaultValue: 1 },
+      { name: 'algorithm', defaultValue: 0, min: 0, max: _algoNames.length - 1 },
     ];
   }
 
@@ -363,13 +440,13 @@ class DistortProcessor extends AudioWorkletProcessor {
       return false;
     }
     this.started = hasInput;
-
-    const shape = Math.expm1(parameters.distort[0]);
-    const postgain = Math.max(0.001, Math.min(1, parameters.postgain[0]));
-
     for (let n = 0; n < blockSize; n++) {
-      for (let i = 0; i < input.length; i++) {
-        output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain;
+      const postgain = clamp(pv(parameters.postgain, n), 0.001, 1);
+      const shape = Math.expm1(pv(parameters.distort, n));
+      const algorithm = _getAlgorithm(pv(parameters.algorithm, n));
+      for (let ch = 0; ch < input.length; ch++) {
+        const x = input[ch][n];
+        output[ch][n] = postgain * algorithm(x, shape);
       }
     }
     return true;
diff --git a/website/src/repl/components/panel/SettingsTab.jsx b/website/src/repl/components/panel/SettingsTab.jsx
index 8f02ca8b8..26c9ae287 100644
--- a/website/src/repl/components/panel/SettingsTab.jsx
+++ b/website/src/repl/components/panel/SettingsTab.jsx
@@ -312,7 +312,7 @@ export function SettingsTab({ started }) {
             confirmDialog('Sure?').then((r) => {
               if (r) {
                 const { userPatterns } = settingsMap.get(); // keep current patterns
-                settingsMap.set({...defaultSettings, userPatterns});
+                settingsMap.set({ ...defaultSettings, userPatterns });
               }
             });
           }}

From 42ab65abdb6d55e8227f39c6318652519efa3ef8 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 4 Sep 2025 11:47:01 -0500
Subject: [PATCH 05/80] Move things around to allow selection by name and avoid
 circular imports; fixed chebyshev

---
 packages/superdough/audioContext.mjs |  18 +++++
 packages/superdough/dspworklet.mjs   |   2 +-
 packages/superdough/helpers.mjs      | 112 ++++++++++++++++++++++++++-
 packages/superdough/index.mjs        |   1 +
 packages/superdough/noise.mjs        |   2 +-
 packages/superdough/sampler.mjs      |   3 +-
 packages/superdough/superdough.mjs   |  20 +----
 packages/superdough/synth.mjs        |   3 +-
 packages/superdough/util.mjs         |   2 +
 packages/superdough/worklets.mjs     |  80 +------------------
 packages/superdough/zzfx.mjs         |   3 +-
 packages/superdough/zzfx_fork.mjs    |   2 +-
 12 files changed, 142 insertions(+), 106 deletions(-)
 create mode 100644 packages/superdough/audioContext.mjs

diff --git a/packages/superdough/audioContext.mjs b/packages/superdough/audioContext.mjs
new file mode 100644
index 000000000..9a3c71167
--- /dev/null
+++ b/packages/superdough/audioContext.mjs
@@ -0,0 +1,18 @@
+let audioContext;
+
+export const setDefaultAudioContext = () => {
+  audioContext = new AudioContext();
+  return audioContext;
+};
+
+export const getAudioContext = () => {
+  if (!audioContext) {
+    return setDefaultAudioContext();
+  }
+
+  return audioContext;
+};
+
+export function getAudioContextCurrentTime() {
+  return getAudioContext().currentTime;
+}
\ No newline at end of file
diff --git a/packages/superdough/dspworklet.mjs b/packages/superdough/dspworklet.mjs
index 5b02ad298..aac08061e 100644
--- a/packages/superdough/dspworklet.mjs
+++ b/packages/superdough/dspworklet.mjs
@@ -1,4 +1,4 @@
-import { getAudioContext } from './superdough.mjs';
+import { getAudioContext } from './audioContext.mjs';
 
 let worklet;
 export async function dspWorklet(ac, code) {
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index def49c4d1..b5d83e7bc 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -1,5 +1,5 @@
-import { getAudioContext } from './superdough.mjs';
-import { clamp, nanFallback } from './util.mjs';
+import { getAudioContext } from './audioContext.mjs';
+import { clamp, ffloor, nanFallback } from './util.mjs';
 import { getNoiseBuffer } from './noise.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
@@ -308,6 +308,110 @@ export function applyFM(param, value, begin) {
   return { stop };
 }
 
-export const getDistortion = (distort, postgain, algorithm) => {
-  return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain, algorithm });
+// Saturation curves
+
+const __squash = (x) => x / (1 + x); // [0, inf) to [0, 1)
+
+const _scurve = (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x));
+const _soft = (x, k) => Math.tanh(x * (1 + k));
+const _hard = (x, k) => clamp((1 + k) * x, -1, 1);
+const _sine = (x, k) => Math.sin(x * (1 + k));
+
+const _fold = (x, k) => {
+  let y = (1 + k) * x;
+  while (y > 1 || y < -1) {
+    y = y > 1 ? 2 - y : -2 - y;
+  }
+  return y;
+};
+
+const _sineFold = (x, k) => Math.sin((Math.PI / 2) * _fold(x, k));
+
+const _pow = (x, k) => {
+  const t = __squash(k);
+  const p = 1 / (1 + 0.5 * t); // tame k
+  return _soft(Math.sign(x) * Math.pow(Math.abs(x), p), 0.5 * k);
+};
+
+const _cubic = (x, k) => {
+  const t = __squash(k);
+  const cubic = (x - (t / 3) * x * x * x) / (1 - t / 3); // normalized to go from (-1, 1)
+  return _soft(cubic, k);
+};
+
+const _diode = (x, k, asym = false) => {
+  const g = 1 + k; // gain
+  const t = __squash(k);
+  const bias = 0.15 * t;
+  const pos = _soft(x + bias, k);
+  const neg = _soft(asym ? bias : -x + bias, k);
+  const y = pos - neg;
+  // We divide by the derivative at 0 so that the distortion is roughly
+  // the identity map near 0 => small values are preserved and undistorted
+  const sech = 1 / Math.cosh(g * bias);
+  const sech2 = sech * sech; // derivative of tanh is sech^2
+  const denom = Math.max(1e-8, (asym ? 1 : 2) * g * sech2); // g from chain rule; 2 if both pos/neg have x
+  return _soft(y / denom, k);
+};
+
+const _asym = (x, k) => _diode(x, k, true);
+
+const _chebyshev = (x, k) => {
+  const kl = Math.log1p(k);
+  let tnm1 = 1;
+  let tnm2 = x;
+  let tn;
+  let y = 0;
+  const iterations = 1 + ffloor(Math.min(16 * kl, 255));
+  for (let i = 1; i < iterations; i++) {
+    if (i < 2) {
+      // Already set inital conditions
+      y += i == 0 ? tnm1 : tnm2;
+      continue;
+    }
+    tn = 2 * x * tnm1 - tnm2; // https://en.wikipedia.org/wiki/Chebyshev_polynomials#Recurrence_definition
+    tnm2 = tnm1;
+    tnm1 = tn;
+    if (i % 2 === 0) {
+      y += tn;
+    }
+  }
+  // Soft clip
+  return _soft(y, 0);
+};
+
+export const distortionAlgorithms = {
+  scurve: _scurve,
+  soft: _soft,
+  hard: _hard,
+  sine: _sine,
+  fold: _fold,
+  sinefold: _sineFold,
+  pow: _pow,
+  cubic: _cubic,
+  diode: _diode,
+  asym: _asym,
+  chebyshev: _chebyshev,
+};
+const _algoNames = Object.freeze(Object.keys(distortionAlgorithms));
+
+export const getDistortionAlgorithm = (algo) => {
+  let index = algo;
+  if (typeof algo === 'string') {
+    index = _algoNames.indexOf(algo);
+    if (index === -1) {
+      logger(`[superdough] Could not find waveshaping algorithm ${algo}.
+        Available options are ${_algoNames.join(', ')}.
+        Defaulting to ${_algoNames[0]}.`);
+      index = 0;
+    }
+  }
+  const name = _algoNames[index % _algoNames.length]; // allow for wrapping if algo was a number
+  const algorithm = distortionAlgorithms[name];
+  return { algorithm, index };
+};
+
+export const getDistortion = (distort, postgain, algorithm) => {
+  const { _algorithm, index } = getDistortionAlgorithm(algorithm);
+  return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain, algorithm: index });
 };
diff --git a/packages/superdough/index.mjs b/packages/superdough/index.mjs
index fd49fe338..184fc078c 100644
--- a/packages/superdough/index.mjs
+++ b/packages/superdough/index.mjs
@@ -11,3 +11,4 @@ export * from './synth.mjs';
 export * from './zzfx.mjs';
 export * from './logger.mjs';
 export * from './dspworklet.mjs';
+export * from './audioContext.mjs';
diff --git a/packages/superdough/noise.mjs b/packages/superdough/noise.mjs
index 5411f2f2f..816dd252b 100644
--- a/packages/superdough/noise.mjs
+++ b/packages/superdough/noise.mjs
@@ -1,5 +1,5 @@
 import { drywet } from './helpers.mjs';
-import { getAudioContext } from './superdough.mjs';
+import { getAudioContext } from './audioContext.mjs';
 
 let noiseCache = {};
 
diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 18d1b7797..7d69aef02 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -1,5 +1,6 @@
 import { noteToMidi, valueToMidi, getSoundIndex } from './util.mjs';
-import { getAudioContext, registerSound } from './index.mjs';
+import { registerSound } from './index.mjs';
+import { getAudioContext } from './audioContext.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 98306115c..10d8ed9f4 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -13,6 +13,7 @@ import { createFilter, gainNode, getCompressor, getDistortion, getWorklet, webAu
 import { map } from 'nanostores';
 import { logger, errorLogger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
+import { getAudioContext } from './audioContext.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
 const DEFAULT_AUDIO_DEVICE_NAME = 'System Standard';
@@ -193,25 +194,6 @@ export function setVersionDefaults(version) {
 
 export const resetLoadedSounds = () => soundMap.set({});
 
-let audioContext;
-
-export const setDefaultAudioContext = () => {
-  audioContext = new AudioContext();
-  return audioContext;
-};
-
-export const getAudioContext = () => {
-  if (!audioContext) {
-    return setDefaultAudioContext();
-  }
-
-  return audioContext;
-};
-
-export function getAudioContextCurrentTime() {
-  return getAudioContext().currentTime;
-}
-
 let workletsLoading;
 function loadWorklets() {
   if (!workletsLoading) {
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index 71138ae41..5f303753a 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -1,5 +1,6 @@
 import { clamp, midiToFreq, noteToMidi } from './util.mjs';
-import { registerSound, getAudioContext, soundMap, getLfo } from './superdough.mjs';
+import { registerSound, soundMap, getLfo } from './superdough.mjs';
+import { getAudioContext } from './audioContext.mjs';
 import {
   applyFM,
   gainNode,
diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
index f4d59024e..c3d511fd4 100644
--- a/packages/superdough/util.mjs
+++ b/packages/superdough/util.mjs
@@ -76,3 +76,5 @@ export function cycleToSeconds(cycle, cps) {
 export function secondsToCycle(t, cps) {
   return t * cps;
 }
+
+export const ffloor = (x) => x | 0; // fast floor for positive numbers
\ No newline at end of file
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 0eb2bc72f..ae03e9603 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -4,12 +4,11 @@
 
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
+import { getDistortionAlgorithm  } from './helpers.mjs';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
-const ffloor = (x) => x | 0;
 const pv = (arr, n) => arr[n] ?? arr[0];
-const mix = (a, b, t) => (1 - t) * a + t * b;
 
 // Restrict phase to the range [0, maxPhase) via wrapping
 function wrapPhase(phase, maxPhase = 1) {
@@ -344,85 +343,12 @@ class LadderProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('ladder-processor', LadderProcessor);
 
-// Saturation curves
-
-const __squash = (x) => x / (1 + x); // [0, inf) to [0, 1)
-
-const _scurve = (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x));
-const _soft = (x, k) => Math.tanh(x * (1 + k));
-const _hard = (x, k) => clamp((1 + k) * x, -1, 1);
-const _sine = (x, k) => Math.sin(x * (1 + k));
-
-const _fold = (x, k) => {
-  let y = (1 + k) * x;
-  while (y > 1 || y < -1) {
-    y = y > 1 ? 2 - y : -2 - y;
-  }
-  return y;
-};
-
-const _sineFold = (x, k) => Math.sin((Math.PI / 2) * _fold(x, k));
-
-const _pow = (x, k) => {
-  const t = __squash(k);
-  const p = 1 / (1 + 0.5 * t); // tame k
-  return _soft(Math.sign(x) * Math.pow(Math.abs(x), p), 0.5 * k);
-};
-
-const _diode = (x, k, asym = false) => {
-  const g = 1 + k; // gain
-  const t = __squash(k);
-  const bias = 0.15 * t;
-  const pos = _soft(x + bias, k);
-  const neg = _soft(asym ? bias : -x + bias, k);
-  const y = pos - neg;
-  // We divide by the derivative at 0 so that the distortion is roughly
-  // the identity map near 0 => small values are preserved and undistorted
-  const sech = 1 / Math.cosh(g * bias);
-  const sech2 = sech * sech; // derivative of tanh is sech^2
-  const denom = Math.max(1e-8, (asym ? 1 : 2) * g * sech2); // g from chain rule; 2 if both pos/neg have x
-  return _soft(y / denom, k);
-};
-
-const _asym = (x, k) => _diode(x, k, true);
-
-const _cubic = (x, k) => {
-  const t = __squash(k);
-  const cubic = (x - (t / 3) * x * x * x) / (1 - t / 3); // normalized to go from (-1, 1)
-  return _soft(cubic, k);
-};
-
-export const saturationAlgos = {
-  scurve: _scurve,
-  soft: _soft,
-  hard: _hard,
-  sine: _sine,
-  fold: _fold,
-  sinefold: _sineFold,
-  pow: _pow,
-  cubic: _cubic,
-  diode: _diode,
-  asym: _asym,
-};
-const _algoNames = Object.freeze(Object.keys(saturationAlgos));
-
-const _getAlgorithm = (algo) => {
-  let algoName = typeof algo === 'string' ? algo : _algoNames[algo % _algoNames.length];
-  if (!_algoNames.includes(algoName)) {
-    algoName = _algoNames[0];
-    logger(`[superdough] Could not find waveshaping algorithm ${algo}.
-      Available options are ${_algoNames.join(', ')}.
-      Defaulting to ${algoName}.`);
-  }
-  return saturationAlgos[algoName];
-};
-
 class DistortProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
     return [
       { name: 'distort', defaultValue: 0 },
       { name: 'postgain', defaultValue: 1 },
-      { name: 'algorithm', defaultValue: 0, min: 0, max: _algoNames.length - 1 },
+      { name: 'algorithm', defaultValue: 0, min: 0 },
     ];
   }
 
@@ -440,10 +366,10 @@ class DistortProcessor extends AudioWorkletProcessor {
       return false;
     }
     this.started = hasInput;
+    const { algorithm } = getDistortionAlgorithm(pv(parameters.algorithm, 0)); // do not allow audio rate algo changes
     for (let n = 0; n < blockSize; n++) {
       const postgain = clamp(pv(parameters.postgain, n), 0.001, 1);
       const shape = Math.expm1(pv(parameters.distort, n));
-      const algorithm = _getAlgorithm(pv(parameters.algorithm, n));
       for (let ch = 0; ch < input.length; ch++) {
         const x = input[ch][n];
         output[ch][n] = postgain * algorithm(x, shape);
diff --git a/packages/superdough/zzfx.mjs b/packages/superdough/zzfx.mjs
index a6af82609..32db0395a 100644
--- a/packages/superdough/zzfx.mjs
+++ b/packages/superdough/zzfx.mjs
@@ -1,6 +1,7 @@
 //import { ZZFX } from 'zzfx';
 import { midiToFreq, noteToMidi } from './util.mjs';
-import { registerSound, getAudioContext } from './superdough.mjs';
+import { registerSound } from './superdough.mjs';
+import { getAudioContext } from './audioContext.mjs';
 import { buildSamples } from './zzfx_fork.mjs';
 
 export const getZZFX = (value, t) => {
diff --git a/packages/superdough/zzfx_fork.mjs b/packages/superdough/zzfx_fork.mjs
index 7235d1bf8..f3ee6a051 100644
--- a/packages/superdough/zzfx_fork.mjs
+++ b/packages/superdough/zzfx_fork.mjs
@@ -1,4 +1,4 @@
-import { getAudioContext } from './superdough.mjs';
+import { getAudioContext } from './audioContext.mjs';
 
 // https://github.com/KilledByAPixel/ZzFX/blob/master/ZzFX.js#L85C5-L180C6
 // changes: replaced this.volume with 1 + using sampleRate from getAudioContext()

From 9b1c23d49f6cdddc792f74a6af06991d9bb6c951 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 4 Sep 2025 20:05:28 -0500
Subject: [PATCH 06/80] Some tuning experimentally and adding back chebyshev

---
 packages/superdough/helpers.mjs | 38 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index b5d83e7bc..28c14f79d 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -315,10 +315,9 @@ const __squash = (x) => x / (1 + x); // [0, inf) to [0, 1)
 const _scurve = (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x));
 const _soft = (x, k) => Math.tanh(x * (1 + k));
 const _hard = (x, k) => clamp((1 + k) * x, -1, 1);
-const _sine = (x, k) => Math.sin(x * (1 + k));
 
 const _fold = (x, k) => {
-  let y = (1 + k) * x;
+  let y = (1 + 0.5 * k) * x;
   while (y > 1 || y < -1) {
     y = y > 1 ? 2 - y : -2 - y;
   }
@@ -327,29 +326,23 @@ const _fold = (x, k) => {
 
 const _sineFold = (x, k) => Math.sin((Math.PI / 2) * _fold(x, k));
 
-const _pow = (x, k) => {
-  const t = __squash(k);
-  const p = 1 / (1 + 0.5 * t); // tame k
-  return _soft(Math.sign(x) * Math.pow(Math.abs(x), p), 0.5 * k);
-};
-
 const _cubic = (x, k) => {
-  const t = __squash(k);
+  const t = __squash(Math.log1p(k));
   const cubic = (x - (t / 3) * x * x * x) / (1 - t / 3); // normalized to go from (-1, 1)
   return _soft(cubic, k);
 };
 
 const _diode = (x, k, asym = false) => {
-  const g = 1 + k; // gain
-  const t = __squash(k);
-  const bias = 0.15 * t;
-  const pos = _soft(x + bias, k);
-  const neg = _soft(asym ? bias : -x + bias, k);
+  const g = 1 + 2 * k; // gain
+  const t = __squash(Math.log1p(k));
+  const bias = 0.07 * t;
+  const pos = _soft(x + bias, 2 * k);
+  const neg = _soft(asym ? bias : -x + bias, 2 * k);
   const y = pos - neg;
   // We divide by the derivative at 0 so that the distortion is roughly
   // the identity map near 0 => small values are preserved and undistorted
   const sech = 1 / Math.cosh(g * bias);
-  const sech2 = sech * sech; // derivative of tanh is sech^2
+  const sech2 = sech * sech; // derivative of soft (i.e. tanh) is sech^2
   const denom = Math.max(1e-8, (asym ? 1 : 2) * g * sech2); // g from chain rule; 2 if both pos/neg have x
   return _soft(y / denom, k);
 };
@@ -357,13 +350,12 @@ const _diode = (x, k, asym = false) => {
 const _asym = (x, k) => _diode(x, k, true);
 
 const _chebyshev = (x, k) => {
-  const kl = Math.log1p(k);
+  const kl = 10 * Math.log1p(k);
   let tnm1 = 1;
   let tnm2 = x;
   let tn;
   let y = 0;
-  const iterations = 1 + ffloor(Math.min(16 * kl, 255));
-  for (let i = 1; i < iterations; i++) {
+  for (let i = 1; i < 64; i++) {
     if (i < 2) {
       // Already set inital conditions
       y += i == 0 ? tnm1 : tnm2;
@@ -373,24 +365,22 @@ const _chebyshev = (x, k) => {
     tnm2 = tnm1;
     tnm1 = tn;
     if (i % 2 === 0) {
-      y += tn;
+      y += Math.min(1.3 * kl / i, 2) * tn;
     }
   }
   // Soft clip
-  return _soft(y, 0);
+  return _soft(y, kl / 20);
 };
 
 export const distortionAlgorithms = {
   scurve: _scurve,
   soft: _soft,
   hard: _hard,
-  sine: _sine,
-  fold: _fold,
-  sinefold: _sineFold,
-  pow: _pow,
   cubic: _cubic,
   diode: _diode,
   asym: _asym,
+  fold: _fold,
+  sinefold: _sineFold,
   chebyshev: _chebyshev,
 };
 const _algoNames = Object.freeze(Object.keys(distortionAlgorithms));

From 46a45b4596902e734cada6dfadf3742cd8b445f9 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 4 Sep 2025 20:51:06 -0500
Subject: [PATCH 07/80] Some missing cleanup

---
 packages/superdough/superdough.mjs                | 11 ++++-------
 packages/superdough/worklets.mjs                  |  1 -
 website/src/repl/components/panel/SettingsTab.jsx |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 8ee3ee4c3..d436a816a 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -686,13 +686,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   let sourceNode;
   if (source) {
     sourceNode = source(t, value, hapDuration, cps);
-  } else {
-    const soundSource = wt ?? s;
-    const sound = getSound(soundSource);
-    if (!sound) {
-      throw new Error(`sound ${soundSource} not found! Is it loaded?`);
-    }
-    const { onTrigger } = sound;
+  } else if (getSound(s)) {
+    const { onTrigger } = getSound(s);
     const onEnded = () => {
       audioNodes.forEach((n) => n?.disconnect());
       activeSoundSources.delete(chainID);
@@ -703,6 +698,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       sourceNode = soundHandle.node;
       activeSoundSources.set(chainID, soundHandle);
     }
+  } else {
+    throw new Error(`sound ${s} not found! Is it loaded?`);
   }
   if (!sourceNode) {
     // if onTrigger does not return anything, we will just silently skip
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index ce0e7ac80..b0c0e8e2d 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -909,7 +909,6 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 
 registerProcessor('byte-beat-processor', ByteBeatProcessor);
 
-
 export const WarpMode = Object.freeze({
   NONE: 0,
   ASYM: 1,
diff --git a/website/src/repl/components/panel/SettingsTab.jsx b/website/src/repl/components/panel/SettingsTab.jsx
index 8f02ca8b8..26c9ae287 100644
--- a/website/src/repl/components/panel/SettingsTab.jsx
+++ b/website/src/repl/components/panel/SettingsTab.jsx
@@ -312,7 +312,7 @@ export function SettingsTab({ started }) {
             confirmDialog('Sure?').then((r) => {
               if (r) {
                 const { userPatterns } = settingsMap.get(); // keep current patterns
-                settingsMap.set({...defaultSettings, userPatterns});
+                settingsMap.set({ ...defaultSettings, userPatterns });
               }
             });
           }}

From 51b150b8298ba2839ef787d7bb58b17d03e995c1 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 10 Sep 2025 21:27:56 -0500
Subject: [PATCH 08/80] Optimize folding for audio rate

---
 packages/superdough/helpers.mjs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 28c14f79d..b56065856 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -311,17 +311,17 @@ export function applyFM(param, value, begin) {
 // Saturation curves
 
 const __squash = (x) => x / (1 + x); // [0, inf) to [0, 1)
+const _mod = (n, m) => ((n % m) + m) % m;
 
 const _scurve = (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x));
 const _soft = (x, k) => Math.tanh(x * (1 + k));
 const _hard = (x, k) => clamp((1 + k) * x, -1, 1);
 
 const _fold = (x, k) => {
+  // Closed form folding for audio rate
   let y = (1 + 0.5 * k) * x;
-  while (y > 1 || y < -1) {
-    y = y > 1 ? 2 - y : -2 - y;
-  }
-  return y;
+  const window = _mod(y + 1, 4);
+  return 1 - Math.abs(window - 2);
 };
 
 const _sineFold = (x, k) => Math.sin((Math.PI / 2) * _fold(x, k));

From 9848740e180c920384ef6cba01d70ac481b66df3 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 10 Sep 2025 21:39:02 -0500
Subject: [PATCH 09/80] Formatting and tests

---
 packages/core/controls.mjs                |  6 +-
 packages/superdough/audioContext.mjs      |  2 +-
 packages/superdough/helpers.mjs           |  5 +-
 packages/superdough/util.mjs              |  2 +-
 packages/superdough/worklets.mjs          |  2 +-
 test/__snapshots__/examples.test.mjs.snap | 76 +++++++++++++++++++++++
 6 files changed, 85 insertions(+), 8 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 01679529c..47626fda9 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -1586,7 +1586,7 @@ export const { shape } = registerControl(['shape', 'shapevol']);
  * @example
  * note("d1!8").s("sine").penv(36).pdecay(.12).decay(.23).distort("8:.4")
  * @example
- * s("bd*4").bank("tr909").distort("4:0.5:fold")
+ * s("bd:4*4").bank("tr808").distort("3:0.5:diode")
  *
  */
 export const { distort, dist } = registerControl(['distort', 'distortvol', 'distorttype'], 'dist');
@@ -1614,8 +1614,8 @@ export const { distortvol } = registerControl('distortvol', 'distvol');
  * @example
  * s("sine").note("F1*2").release(1)
  *   .penv(24).pdecay(0.05)
- *   .distort(70)
- *   .distorttype("<fold decimate scurve hard soft diode asym>")
+ *   .distort(rand.range(1, 8))
+ *   .distorttype("<fold chebyshev scurve diode asym sinefold>")
  */
 export const { distorttype } = registerControl('distorttype', 'disttype');
 
diff --git a/packages/superdough/audioContext.mjs b/packages/superdough/audioContext.mjs
index 9a3c71167..71e01d57d 100644
--- a/packages/superdough/audioContext.mjs
+++ b/packages/superdough/audioContext.mjs
@@ -15,4 +15,4 @@ export const getAudioContext = () => {
 
 export function getAudioContextCurrentTime() {
   return getAudioContext().currentTime;
-}
\ No newline at end of file
+}
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index b56065856..9ee660ae2 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -1,6 +1,7 @@
 import { getAudioContext } from './audioContext.mjs';
-import { clamp, ffloor, nanFallback } from './util.mjs';
+import { clamp, nanFallback } from './util.mjs';
 import { getNoiseBuffer } from './noise.mjs';
+import { logger } from './logger.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
 
@@ -365,7 +366,7 @@ const _chebyshev = (x, k) => {
     tnm2 = tnm1;
     tnm1 = tn;
     if (i % 2 === 0) {
-      y += Math.min(1.3 * kl / i, 2) * tn;
+      y += Math.min((1.3 * kl) / i, 2) * tn;
     }
   }
   // Soft clip
diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
index c3d511fd4..2477e3413 100644
--- a/packages/superdough/util.mjs
+++ b/packages/superdough/util.mjs
@@ -77,4 +77,4 @@ export function secondsToCycle(t, cps) {
   return t * cps;
 }
 
-export const ffloor = (x) => x | 0; // fast floor for positive numbers
\ No newline at end of file
+export const ffloor = (x) => x | 0; // fast floor for positive numbers
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index ae03e9603..e593db17e 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -4,7 +4,7 @@
 
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
-import { getDistortionAlgorithm  } from './helpers.mjs';
+import { getDistortionAlgorithm } from './helpers.mjs';
 
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index 41207620f..e70a5d494 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -2775,6 +2775,82 @@ exports[`runs examples > example "distort" example index 1 1`] = `
 ]
 `;
 
+exports[`runs examples > example "distort" example index 2 1`] = `
+[
+  "[ 0/1 → 1/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 1/4 → 1/2 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 1/2 → 3/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 3/4 → 1/1 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 1/1 → 5/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 5/4 → 3/2 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 3/2 → 7/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 7/4 → 2/1 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 2/1 → 9/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 9/4 → 5/2 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 5/2 → 11/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 11/4 → 3/1 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 3/1 → 13/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 13/4 → 7/2 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 7/2 → 15/4 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+  "[ 15/4 → 4/1 | s:bd n:4 bank:tr808 distort:3 distortvol:0.5 distorttype:diode ]",
+]
+`;
+
+exports[`runs examples > example "distorttype" example index 0 1`] = `
+[
+  "[ 0/1 → 1/4 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 1/4 → 1/2 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 1/2 → 3/4 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 3/4 → 1/1 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 1/1 → 5/4 | s:bd bank:tr909 distort:2 distorttype:1 ]",
+  "[ 5/4 → 3/2 | s:bd bank:tr909 distort:2 distorttype:1 ]",
+  "[ 3/2 → 7/4 | s:bd bank:tr909 distort:2 distorttype:1 ]",
+  "[ 7/4 → 2/1 | s:bd bank:tr909 distort:2 distorttype:1 ]",
+  "[ 2/1 → 9/4 | s:bd bank:tr909 distort:2 distorttype:2 ]",
+  "[ 9/4 → 5/2 | s:bd bank:tr909 distort:2 distorttype:2 ]",
+  "[ 5/2 → 11/4 | s:bd bank:tr909 distort:2 distorttype:2 ]",
+  "[ 11/4 → 3/1 | s:bd bank:tr909 distort:2 distorttype:2 ]",
+  "[ 3/1 → 13/4 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 13/4 → 7/2 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 7/2 → 15/4 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+  "[ 15/4 → 4/1 | s:bd bank:tr909 distort:2 distorttype:0 ]",
+]
+`;
+
+exports[`runs examples > example "distorttype" example index 1 1`] = `
+[
+  "[ (0/1 → 1/2) ⇝ 1/1 | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:1 distorttype:fold ]",
+  "[ 0/1 ⇜ (1/2 → 1/1) | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:1 distorttype:fold ]",
+  "[ (1/1 → 3/2) ⇝ 2/1 | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:4.6367951557040215 distorttype:chebyshev ]",
+  "[ 1/1 ⇜ (3/2 → 2/1) | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:4.6367951557040215 distorttype:chebyshev ]",
+  "[ (2/1 → 5/2) ⇝ 3/1 | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:7.716689839959145 distorttype:scurve ]",
+  "[ 2/1 ⇜ (5/2 → 3/1) | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:7.716689839959145 distorttype:scurve ]",
+  "[ (3/1 → 7/2) ⇝ 4/1 | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:2.5210237745195627 distorttype:diode ]",
+  "[ 3/1 ⇜ (7/2 → 4/1) | s:sine note:F1 release:1 penv:24 pdecay:0.05 distort:2.5210237745195627 distorttype:diode ]",
+]
+`;
+
+exports[`runs examples > example "distortvol" example index 0 1`] = `
+[
+  "[ 0/1 → 1/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 1/4 → 1/2 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 1/2 → 3/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 3/4 → 1/1 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 1/1 → 5/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 5/4 → 3/2 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 3/2 → 7/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 7/4 → 2/1 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 2/1 → 9/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 9/4 → 5/2 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 5/2 → 11/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 11/4 → 3/1 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 3/1 → 13/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 13/4 → 7/2 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 7/2 → 15/4 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+  "[ 15/4 → 4/1 | s:bd bank:tr909 distort:2 distortvol:0.8 ]",
+]
+`;
+
 exports[`runs examples > example "djf" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | n:0 s:superzow octave:3 djf:0.5 ]",

From 69b034349a02a9db8c0406f6a530e00403a0037f Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Sat, 13 Sep 2025 14:30:05 -0500
Subject: [PATCH 10/80] Codeformat

---
 website/src/pages/learn/xen.mdx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/website/src/pages/learn/xen.mdx b/website/src/pages/learn/xen.mdx
index 32e2c0b43..b8b27ac7f 100644
--- a/website/src/pages/learn/xen.mdx
+++ b/website/src/pages/learn/xen.mdx
@@ -16,10 +16,7 @@ These functions allow the use of scales other than your typical chromatic 12 bas
 
 Here's an example of how to configure a basic hexany scale:
 
-<MiniRepl
-  client:idle
-  tune={`"0 1 2 3 4 5".tune("hexany15").mul("220").freq()`}
-/>
+<MiniRepl client:idle tune={`"0 1 2 3 4 5".tune("hexany15").mul("220").freq()`} />
 
 Try other scales like `hexany1`, `iraq`, `gumbeng`, `gunkali`, or `tranh3`
 
@@ -67,6 +64,7 @@ Another helpful trick when exploring new tunings is to strum them.
 Many have a much more enchanting sound that was chosen over many generations of musicians for being strummed.
 
 Take the `sanza` tuning:
+
 <MiniRepl
   client:idle
   tune={`"4 5 6 7 8 9".tune("sanza")
@@ -77,10 +75,7 @@ Take the `sanza` tuning:
 Notes 7 and 9 will clash quite a bit if you arp them normally. Many tunings will have this sort of sound, and it can feel distracting on its own.
 See how close they are on the pitch wheel?
 
-<MiniRepl
-  client:idle
-  tune={`"[7 9]!3".tune("sanza").mul(getFreq('c3')).freq()._pitchwheel()`}
-/>
+<MiniRepl client:idle tune={`"[7 9]!3".tune("sanza").mul(getFreq('c3')).freq()._pitchwheel()`} />
 
 This quality is often due to how the tunings were formed with instruments that were played differently than a piano.
 As such, some tunings are much better strummed, with the subtle clash of the detuned notes actually making the sound much more magical:

From 2cba1dcb317fea1046a8a95f673ad888e1960723 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 15 Sep 2025 21:46:37 -0400
Subject: [PATCH 11/80] working

---
 packages/core/signal.mjs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/core/signal.mjs b/packages/core/signal.mjs
index 6bd6fde67..f736ce71f 100644
--- a/packages/core/signal.mjs
+++ b/packages/core/signal.mjs
@@ -16,7 +16,7 @@ export function steady(value) {
 }
 
 export const signal = (func) => {
-  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin))];
+  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin.valueOf()))];
   return new Pattern(query);
 };
 
@@ -152,7 +152,10 @@ export const itri2 = fastcat(isaw2, saw2);
  *
  * @return {Pattern}
  */
-export const time = signal(id);
+export const time = signal((x) => {
+  console.info(typeof x)
+return  x
+});
 
 /**
  *  The mouse's x position value ranges from 0 to 1.

From 7dfd7dbcdc4500cf69d4a7767ba74f0adc42ffa7 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 15 Sep 2025 21:47:40 -0400
Subject: [PATCH 12/80] rmconsole

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

diff --git a/packages/core/signal.mjs b/packages/core/signal.mjs
index f736ce71f..2646ccf7c 100644
--- a/packages/core/signal.mjs
+++ b/packages/core/signal.mjs
@@ -152,10 +152,7 @@ export const itri2 = fastcat(isaw2, saw2);
  *
  * @return {Pattern}
  */
-export const time = signal((x) => {
-  console.info(typeof x)
-return  x
-});
+export const time = signal(id);
 
 /**
  *  The mouse's x position value ranges from 0 to 1.

From 74e27ca94f977b2586616ccb023a6a6f96edbedb Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 15 Sep 2025 21:57:56 -0400
Subject: [PATCH 13/80] coerce in correct place

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

diff --git a/packages/core/signal.mjs b/packages/core/signal.mjs
index 2646ccf7c..b246cb9e3 100644
--- a/packages/core/signal.mjs
+++ b/packages/core/signal.mjs
@@ -16,7 +16,7 @@ export function steady(value) {
 }
 
 export const signal = (func) => {
-  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin.valueOf()))];
+  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin))];
   return new Pattern(query);
 };
 
@@ -152,7 +152,9 @@ export const itri2 = fastcat(isaw2, saw2);
  *
  * @return {Pattern}
  */
-export const time = signal(id);
+export const time = signal(x => {
+  return x.valueOf()
+});
 
 /**
  *  The mouse's x position value ranges from 0 to 1.

From 4cc453c640bda94df291b3cb562f5d4d9b75f576 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 15 Sep 2025 22:09:05 -0400
Subject: [PATCH 14/80] fix test

---
 packages/core/signal.mjs            | 4 ++--
 packages/core/test/pattern.test.mjs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/signal.mjs b/packages/core/signal.mjs
index b246cb9e3..79e45da7d 100644
--- a/packages/core/signal.mjs
+++ b/packages/core/signal.mjs
@@ -152,8 +152,8 @@ export const itri2 = fastcat(isaw2, saw2);
  *
  * @return {Pattern}
  */
-export const time = signal(x => {
-  return x.valueOf()
+export const time = signal((x) => {
+  return x.valueOf();
 });
 
 /**
diff --git a/packages/core/test/pattern.test.mjs b/packages/core/test/pattern.test.mjs
index 1df5c8776..3b6619b56 100644
--- a/packages/core/test/pattern.test.mjs
+++ b/packages/core/test/pattern.test.mjs
@@ -877,7 +877,7 @@ describe('Pattern', () => {
           .squeezeJoin()
           .queryArc(3, 4)
           .map((x) => x.value),
-      ).toStrictEqual([Fraction(3)]);
+      ).toStrictEqual([3]);
     });
   });
   describe('ply', () => {

From 9cdba1a50ee806bd56215d2635ec1cad1338a204 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 16 Sep 2025 11:36:21 -0400
Subject: [PATCH 15/80] Working

---
 packages/core/pattern.mjs          | 4 +++-
 packages/core/signal.mjs           | 4 +---
 packages/superdough/superdough.mjs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index 262b92bb3..2991cffea 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -6,6 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import TimeSpan from './timespan.mjs';
 import Fraction, { lcm } from './fraction.mjs';
+import FractionClass from 'fraction.js';
 import Hap from './hap.mjs';
 import State from './state.mjs';
 import { unionWithObj } from './value.mjs';
@@ -26,6 +27,7 @@ import {
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
 import { logger } from './logger.mjs';
+import fraction from './fraction.mjs';
 
 let stringParser;
 
@@ -999,7 +1001,7 @@ addToPrototype('weaveWith', function (t, ...funcs) {
 // compose matrix functions
 
 function _nonArrayObject(x) {
-  return !Array.isArray(x) && typeof x === 'object';
+  return !Array.isArray(x) && typeof x === 'object' && !(x instanceof FractionClass);
 }
 function _composeOp(a, b, func) {
   if (_nonArrayObject(a) || _nonArrayObject(b)) {
diff --git a/packages/core/signal.mjs b/packages/core/signal.mjs
index 79e45da7d..6bd6fde67 100644
--- a/packages/core/signal.mjs
+++ b/packages/core/signal.mjs
@@ -152,9 +152,7 @@ export const itri2 = fastcat(isaw2, saw2);
  *
  * @return {Pattern}
  */
-export const time = signal((x) => {
-  return x.valueOf();
-});
+export const time = signal(id);
 
 /**
  *  The mouse's x position value ranges from 0 to 1.
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index f1f308a7d..b1df93916 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -465,7 +465,7 @@ function duckOrbit(audioContext, targetOrbit, t, onsettime = 0, attacktime = 0.1
         gainParam.cancelScheduledValues(now);
         gainParam.setValueAtTime(currVal, now);
 
-        const t0 = Math.max(t, now); // guard against now > t
+        const t0 = now; // guard against now > t
         const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
         gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
         gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);

From 89b7eac789e221097a55d5ee20904d5c14b7c3ab Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 16 Sep 2025 11:52:36 -0400
Subject: [PATCH 16/80] fix test

---
 packages/core/fraction.mjs          | 2 ++
 packages/core/pattern.mjs           | 6 ++----
 packages/core/test/pattern.test.mjs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/fraction.mjs b/packages/core/fraction.mjs
index 2e3bc68ea..076fbadf6 100644
--- a/packages/core/fraction.mjs
+++ b/packages/core/fraction.mjs
@@ -126,6 +126,8 @@ export const lcm = (...fractions) => {
   );
 };
 
+export const isFraction = (x) => x instanceof Fraction;
+
 fraction._original = Fraction;
 
 export default fraction;
diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index 2991cffea..196248eba 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -5,8 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import TimeSpan from './timespan.mjs';
-import Fraction, { lcm } from './fraction.mjs';
-import FractionClass from 'fraction.js';
+import Fraction, {isFraction, lcm } from './fraction.mjs';
 import Hap from './hap.mjs';
 import State from './state.mjs';
 import { unionWithObj } from './value.mjs';
@@ -27,7 +26,6 @@ import {
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
 import { logger } from './logger.mjs';
-import fraction from './fraction.mjs';
 
 let stringParser;
 
@@ -1001,7 +999,7 @@ addToPrototype('weaveWith', function (t, ...funcs) {
 // compose matrix functions
 
 function _nonArrayObject(x) {
-  return !Array.isArray(x) && typeof x === 'object' && !(x instanceof FractionClass);
+  return !Array.isArray(x) && typeof x === 'object' && !isFraction(x);
 }
 function _composeOp(a, b, func) {
   if (_nonArrayObject(a) || _nonArrayObject(b)) {
diff --git a/packages/core/test/pattern.test.mjs b/packages/core/test/pattern.test.mjs
index 3b6619b56..1df5c8776 100644
--- a/packages/core/test/pattern.test.mjs
+++ b/packages/core/test/pattern.test.mjs
@@ -877,7 +877,7 @@ describe('Pattern', () => {
           .squeezeJoin()
           .queryArc(3, 4)
           .map((x) => x.value),
-      ).toStrictEqual([3]);
+      ).toStrictEqual([Fraction(3)]);
     });
   });
   describe('ply', () => {

From f2b2f9f9591e5c37667be04b15a35f593aff3cf1 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 16 Sep 2025 11:53:19 -0400
Subject: [PATCH 17/80] format

---
 packages/core/pattern.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index 196248eba..d0be3f599 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import TimeSpan from './timespan.mjs';
-import Fraction, {isFraction, lcm } from './fraction.mjs';
+import Fraction, { isFraction, lcm } from './fraction.mjs';
 import Hap from './hap.mjs';
 import State from './state.mjs';
 import { unionWithObj } from './value.mjs';

From a68c7847531ff94faf0a9f0e048643117703d606 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 16 Sep 2025 11:55:31 -0400
Subject: [PATCH 18/80] rm unessecary change

---
 packages/superdough/superdough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index b1df93916..f1f308a7d 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -465,7 +465,7 @@ function duckOrbit(audioContext, targetOrbit, t, onsettime = 0, attacktime = 0.1
         gainParam.cancelScheduledValues(now);
         gainParam.setValueAtTime(currVal, now);
 
-        const t0 = now; // guard against now > t
+        const t0 = Math.max(t, now); // guard against now > t
         const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
         gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
         gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);

From 8833d623f71f89df51b79a4f8467456f72daa278 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 21 Sep 2025 16:06:28 +0200
Subject: [PATCH 19/80] fix: all function in mondo

---
 packages/mondough/mondough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mondough/mondough.mjs b/packages/mondough/mondough.mjs
index e409d5a3b..669183279 100644
--- a/packages/mondough/mondough.mjs
+++ b/packages/mondough/mondough.mjs
@@ -85,7 +85,7 @@ function evaluator(node, scope) {
   let pat;
   if (type === 'plain' && typeof variable !== 'undefined') {
     // some function names are not patternable, so we skip reification here
-    if (['!', 'extend', '@', 'expand', 'square', 'angle'].includes(value)) {
+    if (['!', 'extend', '@', 'expand', 'square', 'angle', 'all'].includes(value)) {
       return variable;
     }
     pat = reify(variable);

From 86248328cc2be957da71566aeb671f69a10ccabe Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 21 Sep 2025 16:09:10 +0200
Subject: [PATCH 20/80] fix: mondo setcps / setcpm

---
 packages/core/repl.mjs         | 17 +++++++++++++++--
 packages/mondough/mondough.mjs |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/core/repl.mjs b/packages/core/repl.mjs
index 47231af4d..23c5b25e0 100644
--- a/packages/core/repl.mjs
+++ b/packages/core/repl.mjs
@@ -85,7 +85,17 @@ export function repl({
   const start = () => scheduler.start();
   const pause = () => scheduler.pause();
   const toggle = () => scheduler.toggle();
-  const setCps = (cps) => scheduler.setCps(cps);
+  const setCps = (cps) => {
+    scheduler.setCps(unpure(cps));
+    return silence;
+  };
+
+  function unpure(pat) {
+    if (pat._Pattern) {
+      return pat.__pure;
+    }
+    return pat;
+  }
 
   /**
    * Changes the global tempo to the given cycles per minute
@@ -97,7 +107,10 @@ export function repl({
    * setcpm(140/4) // =140 bpm in 4/4
    * $: s("bd*4,[- sd]*2").bank('tr707')
    */
-  const setCpm = (cpm) => scheduler.setCps(cpm / 60);
+  const setCpm = (cpm) => {
+    scheduler.setCps(unpure(cpm) / 60);
+    return silence;
+  };
 
   // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..
 
diff --git a/packages/mondough/mondough.mjs b/packages/mondough/mondough.mjs
index 669183279..b7ee83787 100644
--- a/packages/mondough/mondough.mjs
+++ b/packages/mondough/mondough.mjs
@@ -85,7 +85,7 @@ function evaluator(node, scope) {
   let pat;
   if (type === 'plain' && typeof variable !== 'undefined') {
     // some function names are not patternable, so we skip reification here
-    if (['!', 'extend', '@', 'expand', 'square', 'angle', 'all'].includes(value)) {
+    if (['!', 'extend', '@', 'expand', 'square', 'angle', 'all', 'setcpm', 'setcps'].includes(value)) {
       return variable;
     }
     pat = reify(variable);

From 452827630b2ea1949674e645835a960bb1ae1be1 Mon Sep 17 00:00:00 2001
From: Felix Roos <flix91@gmail.com>
Date: Sun, 21 Sep 2025 16:13:09 +0200
Subject: [PATCH 21/80] move unpure up

---
 packages/core/repl.mjs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/core/repl.mjs b/packages/core/repl.mjs
index 23c5b25e0..53562f216 100644
--- a/packages/core/repl.mjs
+++ b/packages/core/repl.mjs
@@ -74,6 +74,14 @@ export function repl({
     return silence;
   };
 
+  // helper to get a patternified pure value out
+  function unpure(pat) {
+    if (pat._Pattern) {
+      return pat.__pure;
+    }
+    return pat;
+  }
+
   const setPattern = async (pattern, autostart = true) => {
     pattern = editPattern?.(pattern) || pattern;
     await scheduler.setPattern(pattern, autostart);
@@ -90,13 +98,6 @@ export function repl({
     return silence;
   };
 
-  function unpure(pat) {
-    if (pat._Pattern) {
-      return pat.__pure;
-    }
-    return pat;
-  }
-
   /**
    * Changes the global tempo to the given cycles per minute
    *

From c5bd2a7487a8da8ee61bbaedfd0d278e29eba75e Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 21 Sep 2025 23:54:04 -0400
Subject: [PATCH 22/80] working

---
 packages/core/controls.mjs               |  12 ++
 packages/superdough/feedbackdelay.mjs    |   3 +
 packages/superdough/helpers.mjs          |   7 +
 packages/superdough/superdough.mjs       | 199 +++--------------------
 packages/superdough/superdoughoutput.mjs | 192 ++++++++++++++++++++++
 5 files changed, 238 insertions(+), 175 deletions(-)
 create mode 100644 packages/superdough/superdoughoutput.mjs

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 044cfa96d..f961e4fa4 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -402,6 +402,18 @@ export const { bandq, bpq } = registerControl('bandq', 'bpq');
  *
  */
 export const { begin } = registerControl('begin');
+/**
+ * A pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
+ *
+ * @memberof Pattern
+ * @name bufferHold
+ * @param {number | Pattern} amount between 0 and 1, where 1 is the length of the sample
+ * @example
+ * samples({ rave: 'rave/AREUREADY.wav' }, 'github:tidalcycles/dirt-samples')
+ * s("rave").begin("<0 .25 .5 .75>").fast(2)
+ *
+ */
+export const { bufferHold } = registerControl('bufferHold');
 /**
  * The same as .begin, but cuts off the end off each sample.
  *
diff --git a/packages/superdough/feedbackdelay.mjs b/packages/superdough/feedbackdelay.mjs
index c182d6558..13beeb1cf 100644
--- a/packages/superdough/feedbackdelay.mjs
+++ b/packages/superdough/feedbackdelay.mjs
@@ -23,6 +23,9 @@ if (typeof DelayNode !== 'undefined') {
     start(t) {
       this.delayGain.gain.setValueAtTime(this.delayGain.gain.value, t + this.delayTime.value);
     }
+    stop(t) {
+      this.delayGain.gain.setValueAtTime(0, t);
+    }
   }
 
   AudioContext.prototype.createFeedbackDelay = function (wet, time, feedback) {
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 69e7e8560..5b2fa1a40 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -10,6 +10,13 @@ export function gainNode(value) {
   return node;
 }
 
+export function effectSend(input, effect, wet) {
+  const send = gainNode(wet);
+  input.connect(send);
+  send.connect(effect);
+  return send;
+}
+
 const getSlope = (y1, y2, x1, x2) => {
   const denom = x2 - x1;
   if (denom === 0) {
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index f1f308a7d..0d1845b91 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -7,12 +7,13 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { clamp, nanFallback, _mod, cycleToSeconds, secondsToCycle } from './util.mjs';
+import { nanFallback, _mod, cycleToSeconds } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getWorklet, webAudioTimeout } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getWorklet, effectSend } from './helpers.mjs';
 import { map } from 'nanostores';
-import { logger, errorLogger } from './logger.mjs';
+import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
+import { SuperdoughAudioController } from './superdoughoutput.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
 const DEFAULT_AUDIO_DEVICE_NAME = 'System Standard';
@@ -301,65 +302,16 @@ export async function initAudioOnFirstClick(options) {
   return audioReady;
 }
 
-const maxfeedback = 0.98;
-
-let channelMerger, destinationGain;
-//update the output channel configuration to match user's audio device
-export function initializeAudioOutput() {
-  const audioContext = getAudioContext();
-  const maxChannelCount = audioContext.destination.maxChannelCount;
-  audioContext.destination.channelCount = maxChannelCount;
-  channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
-  destinationGain = new GainNode(audioContext);
-  channelMerger.connect(destinationGain);
-  destinationGain.connect(audioContext.destination);
+let controller;
+function getSuperdoughAudioController() {
+  if (controller == null) {
+    controller = new SuperdoughAudioController(getAudioContext());
+  }
+  return controller;
 }
-
-// input: AudioNode, channels: ?Array<int>
-export const connectToDestination = (input, channels = [0, 1]) => {
-  const ctx = getAudioContext();
-  if (channelMerger == null) {
-    initializeAudioOutput();
-  }
-  //This upmix can be removed if correct channel counts are set throughout the app,
-  // and then strudel could theoretically support surround sound audio files
-  const stereoMix = new StereoPannerNode(ctx);
-  input.connect(stereoMix);
-
-  const splitter = new ChannelSplitterNode(ctx, {
-    numberOfOutputs: stereoMix.channelCount,
-  });
-  stereoMix.connect(splitter);
-  channels.forEach((ch, i) => {
-    splitter.connect(channelMerger, i % stereoMix.channelCount, ch % ctx.destination.channelCount);
-  });
-};
-
-export const panic = () => {
-  if (destinationGain == null) {
-    return;
-  }
-  destinationGain.gain.linearRampToValueAtTime(0, getAudioContext().currentTime + 0.01);
-  destinationGain = null;
-  channelMerger == null;
-};
-
-function getDelay(orbit, delaytime, delayfeedback, t) {
-  if (delayfeedback > maxfeedback) {
-    //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
-  }
-  delayfeedback = clamp(delayfeedback, 0, 0.98);
-  let delayNode = orbits[orbit].delayNode;
-  if (delayNode === undefined) {
-    const ac = getAudioContext();
-    delayNode = ac.createFeedbackDelay(1, delaytime, delayfeedback);
-    delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
-    connectToOrbit(delayNode, orbit);
-    orbits[orbit].delayNode = delayNode;
-  }
-  delayNode.delayTime.value !== delaytime && delayNode.delayTime.setValueAtTime(delaytime, t);
-  delayNode.feedback.value !== delayfeedback && delayNode.feedback.setValueAtTime(delayfeedback, t);
-  return delayNode;
+export function connectToDestination(input, channels) {
+  const controller = getSuperdoughAudioController();
+  controller.output.connectToDestination(input, channels);
 }
 
 export function getLfo(audioContext, begin, end, properties = {}) {
@@ -415,97 +367,6 @@ function getFilterType(ftype) {
   return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }
 
-// type orbit {
-//   output: GainNode,
-//   reverbNode: ConvolverNode
-//   delayNode: FeedbackDelayNode
-// }
-let orbits = {};
-function connectToOrbit(node, orbit) {
-  if (orbits[orbit] == null) {
-    errorLogger(new Error('target orbit does not exist'), 'superdough');
-  }
-  node.connect(orbits[orbit].output);
-}
-
-function setOrbit(audioContext, orbit, channels) {
-  if (orbits[orbit] == null) {
-    orbits[orbit] = {
-      // Setup output node through which all audio filters prior to hitting
-      // the destination (and thus allows for global volume automation)
-      output: new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' }),
-    };
-    connectToDestination(orbits[orbit].output, channels);
-  }
-}
-
-function duckOrbit(audioContext, targetOrbit, t, onsettime = 0, attacktime = 0.1, duckdepth = 1) {
-  const targetArr = [targetOrbit].flat();
-  const onsetArr = [onsettime].flat();
-  const attackArr = [attacktime].flat();
-  const depthArr = [duckdepth].flat();
-
-  targetArr.forEach((target, idx) => {
-    if (orbits[target] == null) {
-      errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-      return;
-    }
-    const onset = onsetArr[idx] ?? onsetArr[0];
-    const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
-    const depth = depthArr[idx] ?? depthArr[0];
-    const gainParam = orbits[target].output.gain;
-    webAudioTimeout(
-      audioContext,
-      () => {
-        const now = audioContext.currentTime;
-
-        // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
-        // on browsers which lack that method
-        const currVal = gainParam.value;
-        gainParam.cancelScheduledValues(now);
-        gainParam.setValueAtTime(currVal, now);
-
-        const t0 = Math.max(t, now); // guard against now > t
-        const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
-        gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
-        gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
-      },
-      0,
-      t - 0.01,
-    );
-  });
-}
-
-let hasChanged = (now, before) => now !== undefined && now !== before;
-function getReverb(orbit, duration, fade, lp, dim, ir, irspeed, irbegin) {
-  // If no reverb has been created for a given orbit, create one
-  let reverbNode = orbits[orbit].reverbNode;
-  if (reverbNode === undefined) {
-    const ac = getAudioContext();
-    reverbNode = ac.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
-    connectToOrbit(reverbNode, orbit);
-    orbits[orbit].reverbNode = reverbNode;
-  }
-
-  if (
-    hasChanged(duration, reverbNode.duration) ||
-    hasChanged(fade, reverbNode.fade) ||
-    hasChanged(lp, reverbNode.lp) ||
-    hasChanged(dim, reverbNode.dim) ||
-    hasChanged(irspeed, reverbNode.irspeed) ||
-    hasChanged(irbegin, reverbNode.irbegin) ||
-    reverbNode.ir !== ir
-  ) {
-    // only regenerate when something has changed
-    // avoids endless regeneration on things like
-    // stack(s("a"), s("b").rsize(8)).room(.5)
-    // this only works when args may stay undefined until here
-    // setting default values breaks this
-    reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
-  }
-  return reverbNode;
-}
-
 export let analysers = {},
   analysersData = {};
 
@@ -538,15 +399,8 @@ export function getAnalyzerData(type = 'time', id = 1) {
   return analysersData[id];
 }
 
-function effectSend(input, effect, wet) {
-  const send = gainNode(wet);
-  input.connect(send);
-  send.connect(effect);
-  return send;
-}
-
 export function resetGlobalEffects() {
-  orbits = {};
+  controller.reset();
   analysers = {};
   analysersData = {};
 }
@@ -561,6 +415,7 @@ function mapChannelNumbers(channels) {
 export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5) => {
   // new: t is always expected to be the absolute target onset time
   const ac = getAudioContext();
+  const audioController = getSuperdoughAudioController();
 
   let { stretch } = value;
   if (stretch != null) {
@@ -679,10 +534,9 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   );
 
   const channels = value.channels != null ? mapChannelNumbers(value.channels) : orbitChannels;
-  setOrbit(ac, orbit, channels, t, cycle, cps);
-
+  const orbitBus = audioController.getOrbit(orbit, channels);
   if (duckorbit != null) {
-    duckOrbit(ac, duckorbit, t, duckonset, duckattack, duckdepth);
+    orbitBus.duck(duckorbit, t, duckonset, duckattack, duckdepth);
   }
 
   gain = applyGainCurve(nanFallback(gain, 1));
@@ -872,14 +726,11 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   chain.push(post);
 
   // delay
-  let delaySend;
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
-    const delayNode = getDelay(orbit, delaytime, delayfeedback, t);
-    delaySend = effectSend(post, delayNode, delay);
-    audioNodes.push(delaySend);
+    orbitBus.getDelay(delaytime, delayfeedback, t);
+    orbitBus.sendDelay(post, delay);
   }
   // reverb
-  let reverbSend;
   if (room > 0) {
     let roomIR;
     if (ir !== undefined) {
@@ -892,25 +743,23 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       }
       roomIR = await loadBuffer(url, ac, ir, 0);
     }
-    const reverbNode = getReverb(orbit, roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
-    reverbSend = effectSend(post, reverbNode, room);
-    audioNodes.push(reverbSend);
+    orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
+    orbitBus.sendReverb(post, room);
   }
 
   // analyser
-  let analyserSend;
   if (analyze) {
     const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
-    analyserSend = effectSend(post, analyserNode, 1);
+    const analyserSend = effectSend(post, analyserNode, 1);
     audioNodes.push(analyserSend);
   }
   if (dry != null) {
     dry = applyGainCurve(dry);
     const dryGain = new GainNode(ac, { gain: dry });
     chain.push(dryGain);
-    connectToOrbit(dryGain, orbit);
+    orbitBus.connectToOutput(dryGain);
   } else {
-    connectToOrbit(post, orbit);
+    orbitBus.connectToOutput(post);
   }
 
   // connect chain elements together
diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
new file mode 100644
index 000000000..cb391ead7
--- /dev/null
+++ b/packages/superdough/superdoughoutput.mjs
@@ -0,0 +1,192 @@
+import { effectSend, webAudioTimeout } from './helpers.mjs';
+import { errorLogger } from './logger.mjs';
+
+let hasChanged = (now, before) => now !== undefined && now !== before;
+
+export class Orbit {
+  reverbNode;
+  delayNode;
+  output;
+  summingNode;
+  audioContext;
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+    this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+    this.summingNode.connect(this.output);
+  }
+
+  disconnect() {
+    this.output.disconnect();
+    this.summingNode.disconnect();
+    this.delayNode?.disconnect();
+    this.reverbNode?.disconnect();
+  }
+
+  getDelay(delaytime = 0, feedback = 0.5, t) {
+    const maxfeedback = 0.98;
+    if (feedback > maxfeedback) {
+      //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
+    }
+    feedback = clamp(feedback, 0, 0.98);
+    if (this.delayNode == null) {
+      this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
+      this.delayNode.connect(this.summingNode);
+      this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
+    }
+    this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
+    this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
+    return this.delayNode;
+  }
+
+  getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
+    // If no reverb has been created for a given orbit, create one
+    if (this.reverbNode == null) {
+      this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
+      this.reverbNode.connect(this.summingNode);
+    }
+
+    if (
+      hasChanged(duration, this.reverbNode.duration) ||
+      hasChanged(fade, this.reverbNode.fade) ||
+      hasChanged(lp, this.reverbNode.lp) ||
+      hasChanged(dim, this.reverbNode.dim) ||
+      hasChanged(irspeed, this.reverbNode.irspeed) ||
+      hasChanged(irbegin, this.reverbNode.irbegin) ||
+      this.reverbNode.ir !== ir
+    ) {
+      // only regenerate when something has changed
+      // avoids endless regeneration on things like
+      // stack(s("a"), s("b").rsize(8)).room(.5)
+      // this only works when args may stay undefined until here
+      // setting default values breaks this
+      this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
+    }
+    return this.reverbNode;
+  }
+  sendReverb(node, amount) {
+    effectSend(node, this.reverbNode, amount);
+  }
+
+  sendDelay(node, amount) {
+    effectSend(node, this.delayNode, amount);
+  }
+
+  duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
+    const onset = onsettime;
+    const attack = Math.max(attacktime, 0.002);
+    const gainParam = this.output.gain;
+    webAudioTimeout(
+      this.audioContext,
+      () => {
+        const now = this.audioContext.currentTime;
+
+        // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
+        // on browsers which lack that method
+        const currVal = gainParam.value;
+        gainParam.cancelScheduledValues(now);
+        gainParam.setValueAtTime(currVal, now);
+
+        const t0 = Math.max(t, now); // guard against now > t
+        const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
+        gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
+        gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
+      },
+      0,
+      t - 0.01,
+    );
+  }
+
+  connectToOutput(node) {
+    node.connect(this.summingNode);
+  }
+}
+
+export class SuperdoughOutput {
+  channelMerger;
+  destinationGain;
+
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.initializeAudio();
+  }
+
+  initializeAudio() {
+    const audioContext = this.audioContext;
+    const maxChannelCount = audioContext.destination.maxChannelCount;
+    this.audioContext.destination.channelCount = maxChannelCount;
+    this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
+    this.destinationGain = new GainNode(audioContext);
+    this.channelMerger.connect(this.destinationGain);
+    this.destinationGain.connect(audioContext.destination);
+  }
+
+  reset() {
+    this.channelMerger.disconnect();
+    this.destinationGain.disconnect();
+    this.destinationGain = null;
+    this.channelMerger = null;
+    this.nodes = {};
+    this.initializeAudio();
+  }
+  connectToDestination = (input, channels = [0, 1]) => {
+    //This upmix can be removed if correct channel counts are set throughout the app,
+    // and then strudel could theoretically support surround sound audio files
+    const stereoMix = new StereoPannerNode(this.audioContext);
+    input.connect(stereoMix);
+
+    const splitter = new ChannelSplitterNode(this.audioContext, {
+      numberOfOutputs: stereoMix.channelCount,
+    });
+    stereoMix.connect(splitter);
+    channels.forEach((ch, i) => {
+      splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
+    });
+  };
+}
+
+export class SuperdoughAudioController {
+  audioContext;
+  output;
+  nodes = {};
+
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.output = new SuperdoughOutput(audioContext);
+  }
+
+  reset() {
+    Array.from(this.nodes).forEach((node) => {
+      node.disconnect();
+    });
+    this.output.reset();
+  }
+
+  duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
+    const targetArr = [targetOrbits].flat();
+    const onsetArr = [onsettime].flat();
+    const attackArr = [attacktime].flat();
+    const depthArr = [depth].flat();
+
+    targetArr.forEach((target, idx) => {
+      const orbit = this.nodes[target];
+
+      if (orbit == null) {
+        errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
+        return;
+      }
+      const onset = onsetArr[idx] ?? onsetArr[0];
+      const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
+      const depth = depthArr[idx] ?? depthArr[0];
+      orbit.duck({ t, onsettime: onset, attacktime: attack, depth });
+    });
+  }
+
+  getOrbit(orbitNum, channels) {
+    if (this.nodes[orbitNum] == null) {
+      this.nodes[orbitNum] = new Orbit(this.audioContext);
+      this.output.connectToDestination(this.nodes[orbitNum].output, channels);
+    }
+    return this.nodes[orbitNum];
+  }
+}

From beafd9c7001c5976ae936fc669f3f522b547c435 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 22 Sep 2025 00:07:06 -0400
Subject: [PATCH 23/80] format

---
 packages/superdough/superdough.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 0d1845b91..922fbbe43 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -400,7 +400,7 @@ export function getAnalyzerData(type = 'time', id = 1) {
 }
 
 export function resetGlobalEffects() {
-  controller.reset();
+  controller?.reset();
   analysers = {};
   analysersData = {};
 }

From 82893ffc226bb47df9269d270845f206391109ba Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 22 Sep 2025 00:11:02 -0400
Subject: [PATCH 24/80] fix import

---
 packages/superdough/superdoughoutput.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index cb391ead7..df1a29ab2 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -1,5 +1,6 @@
 import { effectSend, webAudioTimeout } from './helpers.mjs';
 import { errorLogger } from './logger.mjs';
+import {clamp} from './util.mjs'
 
 let hasChanged = (now, before) => now !== undefined && now !== before;
 

From da926805b37dc28a2cce4185b890f77350b7e2ac Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 22 Sep 2025 00:12:48 -0400
Subject: [PATCH 25/80] rm dead code

---
 packages/core/controls.mjs               | 12 ------------
 packages/superdough/superdough.mjs       |  1 -
 packages/superdough/superdoughoutput.mjs |  2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index f961e4fa4..044cfa96d 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -402,18 +402,6 @@ export const { bandq, bpq } = registerControl('bandq', 'bpq');
  *
  */
 export const { begin } = registerControl('begin');
-/**
- * A pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
- *
- * @memberof Pattern
- * @name bufferHold
- * @param {number | Pattern} amount between 0 and 1, where 1 is the length of the sample
- * @example
- * samples({ rave: 'rave/AREUREADY.wav' }, 'github:tidalcycles/dirt-samples')
- * s("rave").begin("<0 .25 .5 .75>").fast(2)
- *
- */
-export const { bufferHold } = registerControl('bufferHold');
 /**
  * The same as .begin, but cuts off the end off each sample.
  *
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 922fbbe43..72c167adf 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -727,7 +727,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
 
   // delay
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
-    orbitBus.getDelay(delaytime, delayfeedback, t);
     orbitBus.sendDelay(post, delay);
   }
   // reverb
diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index df1a29ab2..29113e469 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -1,6 +1,6 @@
 import { effectSend, webAudioTimeout } from './helpers.mjs';
 import { errorLogger } from './logger.mjs';
-import {clamp} from './util.mjs'
+import { clamp } from './util.mjs';
 
 let hasChanged = (now, before) => now !== undefined && now !== before;
 

From fdcdc3aaa0e82ff1c6c69a4604cf7091fc463a10 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 22 Sep 2025 00:13:59 -0400
Subject: [PATCH 26/80] rm deadcode

---
 packages/superdough/feedbackdelay.mjs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/superdough/feedbackdelay.mjs b/packages/superdough/feedbackdelay.mjs
index 13beeb1cf..c182d6558 100644
--- a/packages/superdough/feedbackdelay.mjs
+++ b/packages/superdough/feedbackdelay.mjs
@@ -23,9 +23,6 @@ if (typeof DelayNode !== 'undefined') {
     start(t) {
       this.delayGain.gain.setValueAtTime(this.delayGain.gain.value, t + this.delayTime.value);
     }
-    stop(t) {
-      this.delayGain.gain.setValueAtTime(0, t);
-    }
   }
 
   AudioContext.prototype.createFeedbackDelay = function (wet, time, feedback) {

From 1eb9dc73fa6259c29aafbfb4d39972a8fbf72c97 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Mon, 22 Sep 2025 00:34:57 -0400
Subject: [PATCH 27/80] fix duck

---
 packages/superdough/superdough.mjs       | 3 ++-
 packages/superdough/superdoughoutput.mjs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 72c167adf..f22e82d7b 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -536,7 +536,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   const channels = value.channels != null ? mapChannelNumbers(value.channels) : orbitChannels;
   const orbitBus = audioController.getOrbit(orbit, channels);
   if (duckorbit != null) {
-    orbitBus.duck(duckorbit, t, duckonset, duckattack, duckdepth);
+    audioController.duck(duckorbit, t, duckonset, duckattack, duckdepth);
   }
 
   gain = applyGainCurve(nanFallback(gain, 1));
@@ -727,6 +727,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
 
   // delay
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+    orbitBus.getDelay(delaytime, delayfeedback, t);
     orbitBus.sendDelay(post, delay);
   }
   // reverb
diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index 29113e469..57c2e8563 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -179,7 +179,8 @@ export class SuperdoughAudioController {
       const onset = onsetArr[idx] ?? onsetArr[0];
       const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
       const depth = depthArr[idx] ?? depthArr[0];
-      orbit.duck({ t, onsettime: onset, attacktime: attack, depth });
+
+      orbit.duck(t, onset, attack, depth);
     });
   }
 

From 0633954e2498cacb28fb69a6770d0854f589a0a8 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 24 Sep 2025 00:23:05 -0700
Subject: [PATCH 28/80] working

---
 packages/superdough/superdough.mjs       |   5 +
 packages/superdough/superdoughoutput.mjs | 346 ++++++++++++-----------
 packages/superdough/worklets.mjs         |  75 +++++
 3 files changed, 259 insertions(+), 167 deletions(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index f22e82d7b..1d3028e80 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -458,6 +458,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     duckonset,
     duckattack,
     duckdepth,
+    djf,
     // filters
     fanchor = getDefaultValue('fanchor'),
     drive = 0.69,
@@ -747,6 +748,10 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     orbitBus.sendReverb(post, room);
   }
 
+  if (djf != null) {
+    orbitBus.getDjf(djf, t)
+  }
+
   // analyser
   if (analyze) {
     const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index 57c2e8563..38760d041 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -1,194 +1,206 @@
-import { effectSend, webAudioTimeout } from './helpers.mjs';
+import { effectSend, getWorklet, webAudioTimeout } from './helpers.mjs';
 import { errorLogger } from './logger.mjs';
 import { clamp } from './util.mjs';
 
 let hasChanged = (now, before) => now !== undefined && now !== before;
 
 export class Orbit {
-  reverbNode;
-  delayNode;
-  output;
-  summingNode;
-  audioContext;
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-    this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-    this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-    this.summingNode.connect(this.output);
-  }
-
-  disconnect() {
-    this.output.disconnect();
-    this.summingNode.disconnect();
-    this.delayNode?.disconnect();
-    this.reverbNode?.disconnect();
-  }
-
-  getDelay(delaytime = 0, feedback = 0.5, t) {
-    const maxfeedback = 0.98;
-    if (feedback > maxfeedback) {
-      //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
-    }
-    feedback = clamp(feedback, 0, 0.98);
-    if (this.delayNode == null) {
-      this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
-      this.delayNode.connect(this.summingNode);
-      this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
-    }
-    this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
-    this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
-    return this.delayNode;
-  }
-
-  getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
-    // If no reverb has been created for a given orbit, create one
-    if (this.reverbNode == null) {
-      this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
-      this.reverbNode.connect(this.summingNode);
+    reverbNode;
+    delayNode;
+    output;
+    summingNode;
+    djfNode;
+    audioContext;
+    constructor(audioContext) {
+        this.audioContext = audioContext;
+        this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+        this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+        this.summingNode.connect(this.output);
     }
 
-    if (
-      hasChanged(duration, this.reverbNode.duration) ||
-      hasChanged(fade, this.reverbNode.fade) ||
-      hasChanged(lp, this.reverbNode.lp) ||
-      hasChanged(dim, this.reverbNode.dim) ||
-      hasChanged(irspeed, this.reverbNode.irspeed) ||
-      hasChanged(irbegin, this.reverbNode.irbegin) ||
-      this.reverbNode.ir !== ir
-    ) {
-      // only regenerate when something has changed
-      // avoids endless regeneration on things like
-      // stack(s("a"), s("b").rsize(8)).room(.5)
-      // this only works when args may stay undefined until here
-      // setting default values breaks this
-      this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
+    disconnect() {
+        this.output.disconnect();
+        this.summingNode.disconnect();
+        this.delayNode?.disconnect();
+        this.reverbNode?.disconnect();
     }
-    return this.reverbNode;
-  }
-  sendReverb(node, amount) {
-    effectSend(node, this.reverbNode, amount);
-  }
 
-  sendDelay(node, amount) {
-    effectSend(node, this.delayNode, amount);
-  }
+    getDjf(value, t = 0) {
+      if (this.djfNode == null){
+        this.djfNode = getWorklet(this.audioContext, 'djf-processor', {value})
+        this.summingNode.disconnect()
+        this.summingNode.connect(this.djfNode)
+        this.djfNode.connect(this.output)
+      }
+      const val = this.djfNode.parameters.get('value')
+      val.setValueAtTime(value, t)
+    }
+    
+    getDelay(delaytime = 0, feedback = 0.5, t) {
+        const maxfeedback = 0.98;
+        if (feedback > maxfeedback) {
+            //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
+        }
+        feedback = clamp(feedback, 0, 0.98);
+        if (this.delayNode == null) {
+            this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
+            this.delayNode.connect(this.summingNode);
+            this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
+        }
+        this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
+        this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
+        return this.delayNode;
+    }
 
-  duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
-    const onset = onsettime;
-    const attack = Math.max(attacktime, 0.002);
-    const gainParam = this.output.gain;
-    webAudioTimeout(
-      this.audioContext,
-      () => {
-        const now = this.audioContext.currentTime;
+    getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
+        // If no reverb has been created for a given orbit, create one
+        if (this.reverbNode == null) {
+            this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
+            this.reverbNode.connect(this.summingNode);
+        }
 
-        // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
-        // on browsers which lack that method
-        const currVal = gainParam.value;
-        gainParam.cancelScheduledValues(now);
-        gainParam.setValueAtTime(currVal, now);
+        if (
+            hasChanged(duration, this.reverbNode.duration) ||
+            hasChanged(fade, this.reverbNode.fade) ||
+            hasChanged(lp, this.reverbNode.lp) ||
+            hasChanged(dim, this.reverbNode.dim) ||
+            hasChanged(irspeed, this.reverbNode.irspeed) ||
+            hasChanged(irbegin, this.reverbNode.irbegin) ||
+            this.reverbNode.ir !== ir
+        ) {
+            // only regenerate when something has changed
+            // avoids endless regeneration on things like
+            // stack(s("a"), s("b").rsize(8)).room(.5)
+            // this only works when args may stay undefined until here
+            // setting default values breaks this
+            this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
+        }
+        return this.reverbNode;
+    }
+    sendReverb(node, amount) {
+        effectSend(node, this.reverbNode, amount);
+    }
 
-        const t0 = Math.max(t, now); // guard against now > t
-        const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
-        gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
-        gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
-      },
-      0,
-      t - 0.01,
-    );
-  }
+    sendDelay(node, amount) {
+        effectSend(node, this.delayNode, amount);
+    }
 
-  connectToOutput(node) {
-    node.connect(this.summingNode);
-  }
+    duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
+        const onset = onsettime;
+        const attack = Math.max(attacktime, 0.002);
+        const gainParam = this.output.gain;
+        webAudioTimeout(
+            this.audioContext,
+            () => {
+                const now = this.audioContext.currentTime;
+
+                // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
+                // on browsers which lack that method
+                const currVal = gainParam.value;
+                gainParam.cancelScheduledValues(now);
+                gainParam.setValueAtTime(currVal, now);
+
+                const t0 = Math.max(t, now); // guard against now > t
+                const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
+                gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
+                gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
+            },
+            0,
+            t - 0.01,
+        );
+    }
+
+    connectToOutput(node) {
+        node.connect(this.summingNode);
+    }
 }
 
 export class SuperdoughOutput {
-  channelMerger;
-  destinationGain;
+    channelMerger;
+    destinationGain;
 
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-    this.initializeAudio();
-  }
+    constructor(audioContext) {
+        this.audioContext = audioContext;
+        this.initializeAudio();
+    }
 
-  initializeAudio() {
-    const audioContext = this.audioContext;
-    const maxChannelCount = audioContext.destination.maxChannelCount;
-    this.audioContext.destination.channelCount = maxChannelCount;
-    this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
-    this.destinationGain = new GainNode(audioContext);
-    this.channelMerger.connect(this.destinationGain);
-    this.destinationGain.connect(audioContext.destination);
-  }
+    initializeAudio() {
+        const audioContext = this.audioContext;
+        const maxChannelCount = audioContext.destination.maxChannelCount;
+        this.audioContext.destination.channelCount = maxChannelCount;
+        this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
+        this.destinationGain = new GainNode(audioContext);
+        this.channelMerger.connect(this.destinationGain);
+        this.destinationGain.connect(audioContext.destination);
+    }
 
-  reset() {
-    this.channelMerger.disconnect();
-    this.destinationGain.disconnect();
-    this.destinationGain = null;
-    this.channelMerger = null;
-    this.nodes = {};
-    this.initializeAudio();
-  }
-  connectToDestination = (input, channels = [0, 1]) => {
-    //This upmix can be removed if correct channel counts are set throughout the app,
-    // and then strudel could theoretically support surround sound audio files
-    const stereoMix = new StereoPannerNode(this.audioContext);
-    input.connect(stereoMix);
+    reset() {
+        this.channelMerger.disconnect();
+        this.destinationGain.disconnect();
+        this.destinationGain = null;
+        this.channelMerger = null;
+        this.nodes = {};
+        this.initializeAudio();
+    }
+    connectToDestination = (input, channels = [0, 1]) => {
+        //This upmix can be removed if correct channel counts are set throughout the app,
+        // and then strudel could theoretically support surround sound audio files
+        const stereoMix = new StereoPannerNode(this.audioContext);
+        input.connect(stereoMix);
 
-    const splitter = new ChannelSplitterNode(this.audioContext, {
-      numberOfOutputs: stereoMix.channelCount,
-    });
-    stereoMix.connect(splitter);
-    channels.forEach((ch, i) => {
-      splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
-    });
-  };
+        const splitter = new ChannelSplitterNode(this.audioContext, {
+            numberOfOutputs: stereoMix.channelCount,
+        });
+        stereoMix.connect(splitter);
+        channels.forEach((ch, i) => {
+            splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
+        });
+    };
 }
 
 export class SuperdoughAudioController {
-  audioContext;
-  output;
-  nodes = {};
+    audioContext;
+    output;
+    nodes = {};
 
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-    this.output = new SuperdoughOutput(audioContext);
-  }
-
-  reset() {
-    Array.from(this.nodes).forEach((node) => {
-      node.disconnect();
-    });
-    this.output.reset();
-  }
-
-  duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
-    const targetArr = [targetOrbits].flat();
-    const onsetArr = [onsettime].flat();
-    const attackArr = [attacktime].flat();
-    const depthArr = [depth].flat();
-
-    targetArr.forEach((target, idx) => {
-      const orbit = this.nodes[target];
-
-      if (orbit == null) {
-        errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-        return;
-      }
-      const onset = onsetArr[idx] ?? onsetArr[0];
-      const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
-      const depth = depthArr[idx] ?? depthArr[0];
-
-      orbit.duck(t, onset, attack, depth);
-    });
-  }
-
-  getOrbit(orbitNum, channels) {
-    if (this.nodes[orbitNum] == null) {
-      this.nodes[orbitNum] = new Orbit(this.audioContext);
-      this.output.connectToDestination(this.nodes[orbitNum].output, channels);
+    constructor(audioContext) {
+        this.audioContext = audioContext;
+        this.output = new SuperdoughOutput(audioContext);
+    }
+
+    reset() {
+        Array.from(this.nodes).forEach((node) => {
+            node.disconnect();
+        });
+        this.output.reset();
+    }
+
+    duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
+        const targetArr = [targetOrbits].flat();
+        const onsetArr = [onsettime].flat();
+        const attackArr = [attacktime].flat();
+        const depthArr = [depth].flat();
+
+        targetArr.forEach((target, idx) => {
+            const orbit = this.nodes[target];
+
+            if (orbit == null) {
+                errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
+                return;
+            }
+            const onset = onsetArr[idx] ?? onsetArr[0];
+            const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
+            const depth = depthArr[idx] ?? depthArr[0];
+
+            orbit.duck(t, onset, attack, depth);
+        });
+    }
+
+    getOrbit(orbitNum, channels) {
+        if (this.nodes[orbitNum] == null) {
+            this.nodes[orbitNum] = new Orbit(this.audioContext);
+            this.output.connectToDestination(this.nodes[orbitNum].output, channels);
+        }
+        return this.nodes[orbitNum];
     }
-    return this.nodes[orbitNum];
-  }
 }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 2406d56dc..06e81f38c 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -271,6 +271,81 @@ class ShapeProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('shape-processor', ShapeProcessor);
 
+class TwoPoleFilter {
+  s0 = 0;
+  s1 = 0;
+  update(s, cutoff, resonance = 0) {
+    // Out of bound values can produce NaNs
+    resonance = clamp(resonance, 0, 1)
+    cutoff = clamp(cutoff, 0, sampleRate / 2 - 1)
+    const c = clamp(2 * Math.sin(cutoff * (_PI / sampleRate)), 0, 1.14);
+    const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
+    const mrc = 1 - r * c;
+    this.s0 = mrc * this.s0 - c * this.s1 + c * s; // bpf
+    this.s1 = mrc * this.s1 + c * this.s0; // lpf
+    return this.s1; // return lpf by default
+  }
+}
+
+class DJFProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [
+      { name: 'value', defaultValue: 0.5 },
+    ];
+  }
+
+  constructor() {
+    super();
+    this.filters = [new TwoPoleFilter(), new TwoPoleFilter()]
+  }
+
+  process(inputs, outputs, parameters) {
+    const input = inputs[0];
+    const output = outputs[0];
+
+    const hasInput = !(input[0] === undefined);
+    this.started = hasInput;
+
+    const value = clamp(parameters.value[0], 0, 1);
+    let filterType = 'none'
+    let cutoff
+    let v = 1;
+    if (value > 0.5) {
+      filterType = 'hipass'
+      v = (value - .5) * 2
+    } else if (value < 0.5) {
+      filterType = 'lopass'
+      v = value * 2
+    }
+    cutoff = Math.pow((v * 11), 4)
+
+    // let cutoff = parameters.frequency[0];
+
+    for (let i = 0; i < input.length; i++) {
+      for (let n = 0; n < blockSize; n++) {
+        if (filterType == 'none') {
+          output[i][n] = input[i][n]
+        } else {
+          this.filters[i].update(input[i][n], cutoff, 0.2)
+          if (filterType === 'lopass') {
+            output[i][n] = this.filters[i].s1
+          } else if (filterType === 'hipass') {
+            output[i][n] = input[i][n] - this.filters[i].s1
+          } else {
+            output[i][n] = input[i][n]
+          }
+        }
+
+
+
+
+      }
+    }
+    return true;
+  }
+}
+registerProcessor('djf-processor', DJFProcessor);
+
 function fast_tanh(x) {
   const x2 = x * x;
   return (x * (27.0 + x2)) / (27.0 + 9.0 * x2);

From 28c94efaa9d036fd361e3cc8708e1465e39a1432 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 24 Sep 2025 00:24:25 -0700
Subject: [PATCH 29/80] format

---
 packages/superdough/superdough.mjs       |   2 +-
 packages/superdough/superdoughoutput.mjs | 356 +++++++++++------------
 packages/superdough/worklets.mjs         |  38 +--
 3 files changed, 195 insertions(+), 201 deletions(-)

diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 1d3028e80..63ed7d30b 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -749,7 +749,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   }
 
   if (djf != null) {
-    orbitBus.getDjf(djf, t)
+    orbitBus.getDjf(djf, t);
   }
 
   // analyser
diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index 38760d041..9ef7bcbf3 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -5,202 +5,202 @@ import { clamp } from './util.mjs';
 let hasChanged = (now, before) => now !== undefined && now !== before;
 
 export class Orbit {
-    reverbNode;
-    delayNode;
-    output;
-    summingNode;
-    djfNode;
-    audioContext;
-    constructor(audioContext) {
-        this.audioContext = audioContext;
-        this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-        this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-        this.summingNode.connect(this.output);
+  reverbNode;
+  delayNode;
+  output;
+  summingNode;
+  djfNode;
+  audioContext;
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+    this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+    this.summingNode.connect(this.output);
+  }
+
+  disconnect() {
+    this.output.disconnect();
+    this.summingNode.disconnect();
+    this.delayNode?.disconnect();
+    this.reverbNode?.disconnect();
+  }
+
+  getDjf(value, t = 0) {
+    if (this.djfNode == null) {
+      this.djfNode = getWorklet(this.audioContext, 'djf-processor', { value });
+      this.summingNode.disconnect();
+      this.summingNode.connect(this.djfNode);
+      this.djfNode.connect(this.output);
+    }
+    const val = this.djfNode.parameters.get('value');
+    val.setValueAtTime(value, t);
+  }
+
+  getDelay(delaytime = 0, feedback = 0.5, t) {
+    const maxfeedback = 0.98;
+    if (feedback > maxfeedback) {
+      //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
+    }
+    feedback = clamp(feedback, 0, 0.98);
+    if (this.delayNode == null) {
+      this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
+      this.delayNode.connect(this.summingNode);
+      this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
+    }
+    this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
+    this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
+    return this.delayNode;
+  }
+
+  getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
+    // If no reverb has been created for a given orbit, create one
+    if (this.reverbNode == null) {
+      this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
+      this.reverbNode.connect(this.summingNode);
     }
 
-    disconnect() {
-        this.output.disconnect();
-        this.summingNode.disconnect();
-        this.delayNode?.disconnect();
-        this.reverbNode?.disconnect();
+    if (
+      hasChanged(duration, this.reverbNode.duration) ||
+      hasChanged(fade, this.reverbNode.fade) ||
+      hasChanged(lp, this.reverbNode.lp) ||
+      hasChanged(dim, this.reverbNode.dim) ||
+      hasChanged(irspeed, this.reverbNode.irspeed) ||
+      hasChanged(irbegin, this.reverbNode.irbegin) ||
+      this.reverbNode.ir !== ir
+    ) {
+      // only regenerate when something has changed
+      // avoids endless regeneration on things like
+      // stack(s("a"), s("b").rsize(8)).room(.5)
+      // this only works when args may stay undefined until here
+      // setting default values breaks this
+      this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
     }
+    return this.reverbNode;
+  }
+  sendReverb(node, amount) {
+    effectSend(node, this.reverbNode, amount);
+  }
 
-    getDjf(value, t = 0) {
-      if (this.djfNode == null){
-        this.djfNode = getWorklet(this.audioContext, 'djf-processor', {value})
-        this.summingNode.disconnect()
-        this.summingNode.connect(this.djfNode)
-        this.djfNode.connect(this.output)
-      }
-      const val = this.djfNode.parameters.get('value')
-      val.setValueAtTime(value, t)
-    }
-    
-    getDelay(delaytime = 0, feedback = 0.5, t) {
-        const maxfeedback = 0.98;
-        if (feedback > maxfeedback) {
-            //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
-        }
-        feedback = clamp(feedback, 0, 0.98);
-        if (this.delayNode == null) {
-            this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
-            this.delayNode.connect(this.summingNode);
-            this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
-        }
-        this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
-        this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
-        return this.delayNode;
-    }
+  sendDelay(node, amount) {
+    effectSend(node, this.delayNode, amount);
+  }
 
-    getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
-        // If no reverb has been created for a given orbit, create one
-        if (this.reverbNode == null) {
-            this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
-            this.reverbNode.connect(this.summingNode);
-        }
+  duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
+    const onset = onsettime;
+    const attack = Math.max(attacktime, 0.002);
+    const gainParam = this.output.gain;
+    webAudioTimeout(
+      this.audioContext,
+      () => {
+        const now = this.audioContext.currentTime;
 
-        if (
-            hasChanged(duration, this.reverbNode.duration) ||
-            hasChanged(fade, this.reverbNode.fade) ||
-            hasChanged(lp, this.reverbNode.lp) ||
-            hasChanged(dim, this.reverbNode.dim) ||
-            hasChanged(irspeed, this.reverbNode.irspeed) ||
-            hasChanged(irbegin, this.reverbNode.irbegin) ||
-            this.reverbNode.ir !== ir
-        ) {
-            // only regenerate when something has changed
-            // avoids endless regeneration on things like
-            // stack(s("a"), s("b").rsize(8)).room(.5)
-            // this only works when args may stay undefined until here
-            // setting default values breaks this
-            this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
-        }
-        return this.reverbNode;
-    }
-    sendReverb(node, amount) {
-        effectSend(node, this.reverbNode, amount);
-    }
+        // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
+        // on browsers which lack that method
+        const currVal = gainParam.value;
+        gainParam.cancelScheduledValues(now);
+        gainParam.setValueAtTime(currVal, now);
 
-    sendDelay(node, amount) {
-        effectSend(node, this.delayNode, amount);
-    }
+        const t0 = Math.max(t, now); // guard against now > t
+        const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
+        gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
+        gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
+      },
+      0,
+      t - 0.01,
+    );
+  }
 
-    duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
-        const onset = onsettime;
-        const attack = Math.max(attacktime, 0.002);
-        const gainParam = this.output.gain;
-        webAudioTimeout(
-            this.audioContext,
-            () => {
-                const now = this.audioContext.currentTime;
-
-                // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
-                // on browsers which lack that method
-                const currVal = gainParam.value;
-                gainParam.cancelScheduledValues(now);
-                gainParam.setValueAtTime(currVal, now);
-
-                const t0 = Math.max(t, now); // guard against now > t
-                const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
-                gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
-                gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
-            },
-            0,
-            t - 0.01,
-        );
-    }
-
-    connectToOutput(node) {
-        node.connect(this.summingNode);
-    }
+  connectToOutput(node) {
+    node.connect(this.summingNode);
+  }
 }
 
 export class SuperdoughOutput {
-    channelMerger;
-    destinationGain;
+  channelMerger;
+  destinationGain;
 
-    constructor(audioContext) {
-        this.audioContext = audioContext;
-        this.initializeAudio();
-    }
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.initializeAudio();
+  }
 
-    initializeAudio() {
-        const audioContext = this.audioContext;
-        const maxChannelCount = audioContext.destination.maxChannelCount;
-        this.audioContext.destination.channelCount = maxChannelCount;
-        this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
-        this.destinationGain = new GainNode(audioContext);
-        this.channelMerger.connect(this.destinationGain);
-        this.destinationGain.connect(audioContext.destination);
-    }
+  initializeAudio() {
+    const audioContext = this.audioContext;
+    const maxChannelCount = audioContext.destination.maxChannelCount;
+    this.audioContext.destination.channelCount = maxChannelCount;
+    this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
+    this.destinationGain = new GainNode(audioContext);
+    this.channelMerger.connect(this.destinationGain);
+    this.destinationGain.connect(audioContext.destination);
+  }
 
-    reset() {
-        this.channelMerger.disconnect();
-        this.destinationGain.disconnect();
-        this.destinationGain = null;
-        this.channelMerger = null;
-        this.nodes = {};
-        this.initializeAudio();
-    }
-    connectToDestination = (input, channels = [0, 1]) => {
-        //This upmix can be removed if correct channel counts are set throughout the app,
-        // and then strudel could theoretically support surround sound audio files
-        const stereoMix = new StereoPannerNode(this.audioContext);
-        input.connect(stereoMix);
+  reset() {
+    this.channelMerger.disconnect();
+    this.destinationGain.disconnect();
+    this.destinationGain = null;
+    this.channelMerger = null;
+    this.nodes = {};
+    this.initializeAudio();
+  }
+  connectToDestination = (input, channels = [0, 1]) => {
+    //This upmix can be removed if correct channel counts are set throughout the app,
+    // and then strudel could theoretically support surround sound audio files
+    const stereoMix = new StereoPannerNode(this.audioContext);
+    input.connect(stereoMix);
 
-        const splitter = new ChannelSplitterNode(this.audioContext, {
-            numberOfOutputs: stereoMix.channelCount,
-        });
-        stereoMix.connect(splitter);
-        channels.forEach((ch, i) => {
-            splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
-        });
-    };
+    const splitter = new ChannelSplitterNode(this.audioContext, {
+      numberOfOutputs: stereoMix.channelCount,
+    });
+    stereoMix.connect(splitter);
+    channels.forEach((ch, i) => {
+      splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
+    });
+  };
 }
 
 export class SuperdoughAudioController {
-    audioContext;
-    output;
-    nodes = {};
+  audioContext;
+  output;
+  nodes = {};
 
-    constructor(audioContext) {
-        this.audioContext = audioContext;
-        this.output = new SuperdoughOutput(audioContext);
-    }
-
-    reset() {
-        Array.from(this.nodes).forEach((node) => {
-            node.disconnect();
-        });
-        this.output.reset();
-    }
-
-    duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
-        const targetArr = [targetOrbits].flat();
-        const onsetArr = [onsettime].flat();
-        const attackArr = [attacktime].flat();
-        const depthArr = [depth].flat();
-
-        targetArr.forEach((target, idx) => {
-            const orbit = this.nodes[target];
-
-            if (orbit == null) {
-                errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-                return;
-            }
-            const onset = onsetArr[idx] ?? onsetArr[0];
-            const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
-            const depth = depthArr[idx] ?? depthArr[0];
-
-            orbit.duck(t, onset, attack, depth);
-        });
-    }
-
-    getOrbit(orbitNum, channels) {
-        if (this.nodes[orbitNum] == null) {
-            this.nodes[orbitNum] = new Orbit(this.audioContext);
-            this.output.connectToDestination(this.nodes[orbitNum].output, channels);
-        }
-        return this.nodes[orbitNum];
+  constructor(audioContext) {
+    this.audioContext = audioContext;
+    this.output = new SuperdoughOutput(audioContext);
+  }
+
+  reset() {
+    Array.from(this.nodes).forEach((node) => {
+      node.disconnect();
+    });
+    this.output.reset();
+  }
+
+  duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
+    const targetArr = [targetOrbits].flat();
+    const onsetArr = [onsettime].flat();
+    const attackArr = [attacktime].flat();
+    const depthArr = [depth].flat();
+
+    targetArr.forEach((target, idx) => {
+      const orbit = this.nodes[target];
+
+      if (orbit == null) {
+        errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
+        return;
+      }
+      const onset = onsetArr[idx] ?? onsetArr[0];
+      const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
+      const depth = depthArr[idx] ?? depthArr[0];
+
+      orbit.duck(t, onset, attack, depth);
+    });
+  }
+
+  getOrbit(orbitNum, channels) {
+    if (this.nodes[orbitNum] == null) {
+      this.nodes[orbitNum] = new Orbit(this.audioContext);
+      this.output.connectToDestination(this.nodes[orbitNum].output, channels);
     }
+    return this.nodes[orbitNum];
+  }
 }
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 06e81f38c..4d25617fb 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -276,8 +276,8 @@ class TwoPoleFilter {
   s1 = 0;
   update(s, cutoff, resonance = 0) {
     // Out of bound values can produce NaNs
-    resonance = clamp(resonance, 0, 1)
-    cutoff = clamp(cutoff, 0, sampleRate / 2 - 1)
+    resonance = clamp(resonance, 0, 1);
+    cutoff = clamp(cutoff, 0, sampleRate / 2 - 1);
     const c = clamp(2 * Math.sin(cutoff * (_PI / sampleRate)), 0, 1.14);
     const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
     const mrc = 1 - r * c;
@@ -289,14 +289,12 @@ class TwoPoleFilter {
 
 class DJFProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
-    return [
-      { name: 'value', defaultValue: 0.5 },
-    ];
+    return [{ name: 'value', defaultValue: 0.5 }];
   }
 
   constructor() {
     super();
-    this.filters = [new TwoPoleFilter(), new TwoPoleFilter()]
+    this.filters = [new TwoPoleFilter(), new TwoPoleFilter()];
   }
 
   process(inputs, outputs, parameters) {
@@ -307,38 +305,34 @@ class DJFProcessor extends AudioWorkletProcessor {
     this.started = hasInput;
 
     const value = clamp(parameters.value[0], 0, 1);
-    let filterType = 'none'
-    let cutoff
+    let filterType = 'none';
+    let cutoff;
     let v = 1;
     if (value > 0.5) {
-      filterType = 'hipass'
-      v = (value - .5) * 2
+      filterType = 'hipass';
+      v = (value - 0.5) * 2;
     } else if (value < 0.5) {
-      filterType = 'lopass'
-      v = value * 2
+      filterType = 'lopass';
+      v = value * 2;
     }
-    cutoff = Math.pow((v * 11), 4)
+    cutoff = Math.pow(v * 11, 4);
 
     // let cutoff = parameters.frequency[0];
 
     for (let i = 0; i < input.length; i++) {
       for (let n = 0; n < blockSize; n++) {
         if (filterType == 'none') {
-          output[i][n] = input[i][n]
+          output[i][n] = input[i][n];
         } else {
-          this.filters[i].update(input[i][n], cutoff, 0.2)
+          this.filters[i].update(input[i][n], cutoff, 0.2);
           if (filterType === 'lopass') {
-            output[i][n] = this.filters[i].s1
+            output[i][n] = this.filters[i].s1;
           } else if (filterType === 'hipass') {
-            output[i][n] = input[i][n] - this.filters[i].s1
+            output[i][n] = input[i][n] - this.filters[i].s1;
           } else {
-            output[i][n] = input[i][n]
+            output[i][n] = input[i][n];
           }
         }
-
-
-
-
       }
     }
     return true;

From f0669ce3bad299bf52de86b49f0eee1a146e96a1 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 24 Sep 2025 17:32:03 -0700
Subject: [PATCH 30/80] Move algorithm into constructor

---
 packages/superdough/helpers.mjs  | 9 +++++++--
 packages/superdough/worklets.mjs | 7 +++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 9ee660ae2..8b92bd4e4 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -403,6 +403,11 @@ export const getDistortionAlgorithm = (algo) => {
 };
 
 export const getDistortion = (distort, postgain, algorithm) => {
-  const { _algorithm, index } = getDistortionAlgorithm(algorithm);
-  return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain, algorithm: index });
+  const { index } = getDistortionAlgorithm(algorithm);
+  return getWorklet(
+    getAudioContext(),
+    'distort-processor',
+    { distort, postgain },
+    { processorOptions: { algorithm: index } },
+  );
 };
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index e593db17e..f1d95e449 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -348,13 +348,13 @@ class DistortProcessor extends AudioWorkletProcessor {
     return [
       { name: 'distort', defaultValue: 0 },
       { name: 'postgain', defaultValue: 1 },
-      { name: 'algorithm', defaultValue: 0, min: 0 },
     ];
   }
 
-  constructor() {
+  constructor({ processorOptions }) {
     super();
     this.started = false;
+    this.algorithm = getDistortionAlgorithm(processorOptions.algorithm).algorithm;
   }
 
   process(inputs, outputs, parameters) {
@@ -366,13 +366,12 @@ class DistortProcessor extends AudioWorkletProcessor {
       return false;
     }
     this.started = hasInput;
-    const { algorithm } = getDistortionAlgorithm(pv(parameters.algorithm, 0)); // do not allow audio rate algo changes
     for (let n = 0; n < blockSize; n++) {
       const postgain = clamp(pv(parameters.postgain, n), 0.001, 1);
       const shape = Math.expm1(pv(parameters.distort, n));
       for (let ch = 0; ch < input.length; ch++) {
         const x = input[ch][n];
-        output[ch][n] = postgain * algorithm(x, shape);
+        output[ch][n] = postgain * this.algorithm(x, shape);
       }
     }
     return true;

From da81ba00fb056f77c23ceccab29e92ad78892fd6 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 24 Sep 2025 20:32:45 -0700
Subject: [PATCH 31/80] adjust control range

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

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 4d25617fb..fa0fa5345 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -308,10 +308,10 @@ class DJFProcessor extends AudioWorkletProcessor {
     let filterType = 'none';
     let cutoff;
     let v = 1;
-    if (value > 0.5) {
+    if (value > 0.52) {
       filterType = 'hipass';
       v = (value - 0.5) * 2;
-    } else if (value < 0.5) {
+    } else if (value < 0.48) {
       filterType = 'lopass';
       v = value * 2;
     }

From c474b8c92e882ca739fa95d7004aaacf8816e435 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Wed, 24 Sep 2025 20:33:51 -0700
Subject: [PATCH 32/80] rm comment

---
 packages/superdough/worklets.mjs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index fa0fa5345..2a675bba1 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -317,8 +317,6 @@ class DJFProcessor extends AudioWorkletProcessor {
     }
     cutoff = Math.pow(v * 11, 4);
 
-    // let cutoff = parameters.frequency[0];
-
     for (let i = 0; i < input.length; i++) {
       for (let n = 0; n < blockSize; n++) {
         if (filterType == 'none') {

From d3d9f23c3c2a0ae5ab2d4f1e3c479a83f11f40de Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 24 Sep 2025 22:06:53 -0700
Subject: [PATCH 33/80] Remove unnecessary defaulting

---
 packages/superdough/wavetable.mjs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 9b9e325f7..ccf319201 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -186,13 +186,11 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
   const ac = getAudioContext();
   let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
   let sourceDesc, holdEnd, envEnd;
-  let { unison = 5, spread = 0.6, detune, wtPos, wtWarp, wtWarpMode } = value;
+  let { unison, spread, detune, wtPos, wtWarp, wtWarpMode } = value;
   if (typeof wtWarpMode === 'string') {
     wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
   }
-  detune = detune ?? 0.18;
   const frequency = getFrequencyFromValue(value);
-  const voices = clamp(unison, 1, 100);
   let { tableUrl, label } = getTableInfo(value, bank);
   const payload = await loadWavetableFrames(tableUrl, label, frameLen);
   holdEnd = t + duration;
@@ -208,7 +206,7 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
       position: wtPos,
       warp: wtWarp,
       warpMode: wtWarpMode,
-      voices,
+      voices: unison,
       spread,
     },
     { outputChannelCount: [2] },

From b3537a9acb6cbf3480de7afbf93c7921969dfd25 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 24 Sep 2025 22:17:30 -0700
Subject: [PATCH 34/80] Some cleanup

---
 packages/superdough/helpers.mjs  | 11 ++---------
 packages/superdough/worklets.mjs |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 8b92bd4e4..5ef132d00 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -398,16 +398,9 @@ export const getDistortionAlgorithm = (algo) => {
     }
   }
   const name = _algoNames[index % _algoNames.length]; // allow for wrapping if algo was a number
-  const algorithm = distortionAlgorithms[name];
-  return { algorithm, index };
+  return distortionAlgorithms[name];
 };
 
 export const getDistortion = (distort, postgain, algorithm) => {
-  const { index } = getDistortionAlgorithm(algorithm);
-  return getWorklet(
-    getAudioContext(),
-    'distort-processor',
-    { distort, postgain },
-    { processorOptions: { algorithm: index } },
-  );
+  return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain }, { processorOptions: { algorithm } });
 };
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index f1d95e449..5ab326226 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -354,7 +354,7 @@ class DistortProcessor extends AudioWorkletProcessor {
   constructor({ processorOptions }) {
     super();
     this.started = false;
-    this.algorithm = getDistortionAlgorithm(processorOptions.algorithm).algorithm;
+    this.algorithm = getDistortionAlgorithm(processorOptions.algorithm);
   }
 
   process(inputs, outputs, parameters) {

From e3741ae8faad7f1b9c160a6949c71a0ff3b03ee2 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 25 Sep 2025 00:05:50 -0700
Subject: [PATCH 35/80] Add control over phase randomization and fix a bug with
 supersaw

---
 packages/core/controls.mjs         | 10 ++++++++++
 packages/superdough/superdough.mjs |  1 -
 packages/superdough/wavetable.mjs  | 13 +++++++------
 packages/superdough/worklets.mjs   |  8 +++++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 7bf554577..89583b475 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -120,6 +120,16 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
  */
 export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', 'wavetableWarpMode');
 
+/**
+ * Amount of randomness of the initial phase of the wavetable oscillator.
+ *
+ * @name wtPhaseRand
+ * @param {number | Pattern} mode Warp mode: an integer
+ * @synonyms wavetableWarpMode
+ *
+ */
+export const { wtPhaseRand, wavetablePhaseRand } = registerControl('wtPhaseRand', 'wavetablePhaseRand');
+
 /**
  * Define a custom webaudio node to use as a sound source.
  *
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index b2b5c8d67..f1f308a7d 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -594,7 +594,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     tremolophase = 0,
     tremoloshape,
     s = getDefaultValue('s'),
-    wt,
     bank,
     source,
     gain = getDefaultValue('gain'),
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index ccf319201..044b651e7 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -186,7 +186,7 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
   const ac = getAudioContext();
   let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
   let sourceDesc, holdEnd, envEnd;
-  let { unison, spread, detune, wtPos, wtWarp, wtWarpMode } = value;
+  let { wtWarpMode } = value;
   if (typeof wtWarpMode === 'string') {
     wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
   }
@@ -202,12 +202,13 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
       begin: t,
       end: envEnd,
       frequency,
-      detune,
-      position: wtPos,
-      warp: wtWarp,
+      detune: value.detune,
+      position: value.wtPos,
+      warp: value.wtWarp,
       warpMode: wtWarpMode,
-      voices: unison,
-      spread,
+      voices: value.unison,
+      spread: value.spread,
+      phaserand: value.wtPhaseRand,
     },
     { outputChannelCount: [2] },
   );
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index b0c0e8e2d..44b82f624 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -474,10 +474,10 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
           gainR = gain1;
         }
         // Individual voice detuning
-        freq = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
+        const voiceFreq = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
         // We must wrap this here because it is passed into sawblep below which
         // has domain [0, 1]
-        const dt = mod(freq / sampleRate, 1);
+        const dt = mod(voiceFreq / sampleRate, 1);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
@@ -988,6 +988,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'warpMode', defaultValue: 0 },
       { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
       { name: 'spread', defaultValue: 0, minValue: 0, maxValue: 1 },
+      { name: 'phaserand', defaultValue: 1, minValue: 0, maxValue: 1 },
     ];
   }
 
@@ -1188,6 +1189,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const warpAmount = pv(parameters.warp, i);
       const warpMode = pv(parameters.warpMode, i);
       const voices = pv(parameters.voices, i);
+      const phaseRand = pv(parameters.phaserand, i);
       const gain1 = Math.sqrt(1 - spread);
       const gain2 = Math.sqrt(spread);
       let f = pv(parameters.frequency, i);
@@ -1207,7 +1209,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         const bank = this.tables[level];
 
         // warp phase then sample
-        this.phase[n] = this.phase[n] ?? Math.random();
+        this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
         let ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
         const s0 = this._sampleFrame(bank[fIdx], ph);
         const s1 = this._sampleFrame(bank[Math.min(this.numFrames - 1, fIdx + 1)], ph);

From bd8d207a3d7271fde88f578f36f1901e8bef0008 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 25 Sep 2025 00:17:13 -0700
Subject: [PATCH 36/80] Typo

---
 packages/core/controls.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 89583b475..989097d69 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -114,7 +114,7 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
  * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
  *
  * @name wtWarpMode
- * @param {number | Pattern} mode Warp mode: an integer
+ * @param {number | Pattern} mode Warp mode
  * @synonyms wavetableWarpMode
  *
  */
@@ -124,8 +124,8 @@ export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', '
  * Amount of randomness of the initial phase of the wavetable oscillator.
  *
  * @name wtPhaseRand
- * @param {number | Pattern} mode Warp mode: an integer
- * @synonyms wavetableWarpMode
+ * @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random)
+ * @synonyms wavetablePhaseRand
  *
  */
 export const { wtPhaseRand, wavetablePhaseRand } = registerControl('wtPhaseRand', 'wavetablePhaseRand');

From 96981c3c1d8ddc1e837c48ee8e4c3c883e6066e7 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 25 Sep 2025 00:36:28 -0700
Subject: [PATCH 37/80] A bit more cleanup

---
 packages/core/controls.mjs        |  2 +-
 packages/superdough/wavetable.mjs | 31 ++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 989097d69..9b5519704 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -114,7 +114,7 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
  * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
  *
  * @name wtWarpMode
- * @param {number | Pattern} mode Warp mode
+ * @param {number | string | Pattern} mode Warp mode
  * @synonyms wavetableWarpMode
  *
  */
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 044b651e7..feb5098b0 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -182,20 +182,19 @@ export const tables = async (url, frameLen, json) => {
 };
 
 async function onTriggerSynth(t, value, onended, bank, frameLen) {
-  let { s, n = 0, duration } = value;
+  const { s, n = 0, duration } = value;
   const ac = getAudioContext();
-  let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
-  let sourceDesc, holdEnd, envEnd;
+  const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
   let { wtWarpMode } = value;
   if (typeof wtWarpMode === 'string') {
     wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
   }
   const frequency = getFrequencyFromValue(value);
-  let { tableUrl, label } = getTableInfo(value, bank);
+  const { tableUrl, label } = getTableInfo(value, bank);
   const payload = await loadWavetableFrames(tableUrl, label, frameLen);
-  holdEnd = t + duration;
-  envEnd = holdEnd + release + 0.01;
-  const worklet = getWorklet(
+  const holdEnd = t + duration;
+  const envEnd = holdEnd + release;
+  const source = getWorklet(
     ac,
     'wavetable-oscillator-processor',
     {
@@ -212,34 +211,24 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
     },
     { outputChannelCount: [2] },
   );
-  worklet.port.postMessage({ type: 'tables', payload });
-  sourceDesc = { source: worklet };
-  const { source } = sourceDesc;
+  source.port.postMessage({ type: 'tables', payload });
   if (ac.currentTime > t) {
     logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
     return;
   }
-  if (!source) {
-    logger(`[wavetable] could not load "${s}:${n}"`, 'error');
-    return;
-  }
-  let vibratoOscillator = getVibratoOscillator(source.detune, value, t);
+  const vibratoOscillator = getVibratoOscillator(source.detune, value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
   getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
   getPitchEnvelope(source.detune, value, t, holdEnd);
-
-  const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
-  node.connect(out);
-  let handle = { node: out, bufferSource: source, oscillator: worklet };
-  let timeoutNode = webAudioTimeout(
+  const handle = { node, source };
+  const timeoutNode = webAudioTimeout(
     ac,
     () => {
       source.disconnect();
       destroyAudioWorkletNode(source);
       vibratoOscillator?.stop();
       node.disconnect();
-      out.disconnect();
       onended();
     },
     t,

From f8f42565ae36839b63b37e85d2a7be5a1d7b322c Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 25 Sep 2025 00:40:25 -0700
Subject: [PATCH 38/80] Typo - add back slight delay in cleanup

---
 packages/superdough/wavetable.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index feb5098b0..5805685d7 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -193,7 +193,7 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
   const { tableUrl, label } = getTableInfo(value, bank);
   const payload = await loadWavetableFrames(tableUrl, label, frameLen);
   const holdEnd = t + duration;
-  const envEnd = holdEnd + release;
+  const envEnd = holdEnd + release + 0.01;
   const source = getWorklet(
     ac,
     'wavetable-oscillator-processor',

From 8b2c35b7a3217a57fdc954ba3eca5d4592720520 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 25 Sep 2025 01:10:41 -0700
Subject: [PATCH 39/80] Cleanup

---
 packages/superdough/wavetable.mjs | 22 ++++++++++------------
 packages/superdough/worklets.mjs  |  8 ++++----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 5805685d7..c628549e7 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -1,5 +1,5 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { clamp, getSoundIndex, valueToMidi } from './util.mjs';
+import { getSoundIndex, valueToMidi } from './util.mjs';
 import {
   destroyAudioWorkletNode,
   getADSRValues,
@@ -86,28 +86,27 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-export function getTableInfo(hapValue, bank) {
-  const { wt, n = 0 } = hapValue;
+export function getTableInfo(hapValue, tableUrls) {
+  const { s, n = 0 } = hapValue;
   let midi = valueToMidi(hapValue, 36);
   let transpose = midi - 36; // C3 is middle C;
-  const index = getSoundIndex(n, bank.length);
-  const tableUrl = bank[index];
-  const label = `${wt}:${index}`;
+  const index = getSoundIndex(n, tableUrls.length);
+  const tableUrl = tableUrls[index];
+  const label = `${s}:${index}`;
   return { transpose, tableUrl, index, midi, label };
 }
 
-const loadBuffer = (url, ac, wt, n = 0) => {
-  const label = wt ? `table "${wt}:${n}"` : 'table';
+const loadBuffer = (url, ac, label) => {
   url = url.replace('#', '%23');
   if (!loadCache[url]) {
-    logger(`[wavetable] load ${label}..`, 'load-table', { url });
+    logger(`[wavetable] load table ${label}..`, 'load-table', { url });
     const timestamp = Date.now();
     loadCache[url] = fetch(url)
       .then((res) => res.arrayBuffer())
       .then(async (res) => {
         const took = Date.now() - timestamp;
         const size = humanFileSize(res.byteLength);
-        logger(`[wavetable] load ${label}... done! loaded ${size} in ${took}ms`, 'loaded-table', { url });
+        logger(`[wavetable] load table ${label}... done! loaded ${size} in ${took}ms`, 'loaded-table', { url });
         const decoded = await ac.decodeAudioData(res);
         return decoded;
       });
@@ -151,7 +150,7 @@ const _processTables = (json, baseUrl, frameLen) => {
 };
 
 /**
- * Loads a collection of wavetables to use with `wt`
+ * Loads a collection of wavetables to use with `s`
  *
  * @name tables
  */
@@ -167,7 +166,6 @@ export const tables = async (url, frameLen, json) => {
     // not a browser
     return;
   }
-  const base = url.split('/').slice(0, -1).join('/');
   if (typeof fetch === 'undefined') {
     // skip fetch when in node / testing
     return;
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 44b82f624..daf19e537 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -474,10 +474,10 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
           gainR = gain1;
         }
         // Individual voice detuning
-        const voiceFreq = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
+        const freqVoice = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
         // We must wrap this here because it is passed into sawblep below which
         // has domain [0, 1]
-        const dt = mod(voiceFreq / sampleRate, 1);
+        const dt = mod(freqVoice / sampleRate, 1);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
@@ -1203,14 +1203,14 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
           gainL = gain2;
           gainR = gain1;
         }
-        let fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
+        const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
         const dPhase = fVoice / sampleRate;
         const level = this._chooseMip(dPhase);
         const bank = this.tables[level];
 
         // warp phase then sample
         this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
-        let ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
+        const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
         const s0 = this._sampleFrame(bank[fIdx], ph);
         const s1 = this._sampleFrame(bank[Math.min(this.numFrames - 1, fIdx + 1)], ph);
         let s = s0 + (s1 - s0) * frac;

From dfc4a0818c551b8978fa537da05557a4edfc4f43 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Thu, 25 Sep 2025 23:39:08 -0700
Subject: [PATCH 40/80] res adjust

---
 packages/superdough/worklets.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 9592dd7df..af8a4a633 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -322,10 +322,10 @@ class DJFProcessor extends AudioWorkletProcessor {
     let filterType = 'none';
     let cutoff;
     let v = 1;
-    if (value > 0.52) {
+    if (value > 0.51) {
       filterType = 'hipass';
       v = (value - 0.5) * 2;
-    } else if (value < 0.48) {
+    } else if (value < 0.49) {
       filterType = 'lopass';
       v = value * 2;
     }
@@ -336,7 +336,7 @@ class DJFProcessor extends AudioWorkletProcessor {
         if (filterType == 'none') {
           output[i][n] = input[i][n];
         } else {
-          this.filters[i].update(input[i][n], cutoff, 0.2);
+          this.filters[i].update(input[i][n], cutoff, 0.1);
           if (filterType === 'lopass') {
             output[i][n] = this.filters[i].s1;
           } else if (filterType === 'hipass') {

From 266cb614a87a6fbe7b7d8e32c211adcf6923339c Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Thu, 25 Sep 2025 23:44:32 -0700
Subject: [PATCH 41/80] add better example

---
 packages/core/controls.mjs                |  2 +-
 test/__snapshots__/examples.test.mjs.snap | 52 ++++++++++++++---------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 9b5519704..2565b73bb 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -1171,7 +1171,7 @@ export const { resonance, lpq } = registerControl('resonance', 'lpq');
  * @name djf
  * @param {number | Pattern} cutoff below 0.5 is low pass filter, above is high pass filter
  * @example
- * n("0 3 7 [10,24]").s('superzow').octave(3).djf("<.5 .25 .5 .75>").osc()
+ * n(irand(16).seg(8)).scale("d:phrygian").s("supersaw").djf("<.5 .3 .2 .75>")
  *
  */
 export const { djf } = registerControl('djf');
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index f91503ca2..a05975580 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -2831,26 +2831,38 @@ exports[`runs examples > example "distort" example index 1 1`] = `
 
 exports[`runs examples > example "djf" example index 0 1`] = `
 [
-  "[ 0/1 → 1/4 | n:0 s:superzow octave:3 djf:0.5 ]",
-  "[ 1/4 → 1/2 | n:3 s:superzow octave:3 djf:0.5 ]",
-  "[ 1/2 → 3/4 | n:7 s:superzow octave:3 djf:0.5 ]",
-  "[ 3/4 → 1/1 | n:10 s:superzow octave:3 djf:0.5 ]",
-  "[ 3/4 → 1/1 | n:24 s:superzow octave:3 djf:0.5 ]",
-  "[ 1/1 → 5/4 | n:0 s:superzow octave:3 djf:0.25 ]",
-  "[ 5/4 → 3/2 | n:3 s:superzow octave:3 djf:0.25 ]",
-  "[ 3/2 → 7/4 | n:7 s:superzow octave:3 djf:0.25 ]",
-  "[ 7/4 → 2/1 | n:10 s:superzow octave:3 djf:0.25 ]",
-  "[ 7/4 → 2/1 | n:24 s:superzow octave:3 djf:0.25 ]",
-  "[ 2/1 → 9/4 | n:0 s:superzow octave:3 djf:0.5 ]",
-  "[ 9/4 → 5/2 | n:3 s:superzow octave:3 djf:0.5 ]",
-  "[ 5/2 → 11/4 | n:7 s:superzow octave:3 djf:0.5 ]",
-  "[ 11/4 → 3/1 | n:10 s:superzow octave:3 djf:0.5 ]",
-  "[ 11/4 → 3/1 | n:24 s:superzow octave:3 djf:0.5 ]",
-  "[ 3/1 → 13/4 | n:0 s:superzow octave:3 djf:0.75 ]",
-  "[ 13/4 → 7/2 | n:3 s:superzow octave:3 djf:0.75 ]",
-  "[ 7/2 → 15/4 | n:7 s:superzow octave:3 djf:0.75 ]",
-  "[ 15/4 → 4/1 | n:10 s:superzow octave:3 djf:0.75 ]",
-  "[ 15/4 → 4/1 | n:24 s:superzow octave:3 djf:0.75 ]",
+  "[ 0/1 → 1/8 | note:D3 s:supersaw djf:0.5 ]",
+  "[ 1/8 → 1/4 | note:G4 s:supersaw djf:0.5 ]",
+  "[ 1/4 → 3/8 | note:Bb3 s:supersaw djf:0.5 ]",
+  "[ 3/8 → 1/2 | note:C4 s:supersaw djf:0.5 ]",
+  "[ 1/2 → 5/8 | note:A3 s:supersaw djf:0.5 ]",
+  "[ 5/8 → 3/4 | note:F3 s:supersaw djf:0.5 ]",
+  "[ 3/4 → 7/8 | note:G3 s:supersaw djf:0.5 ]",
+  "[ 7/8 → 1/1 | note:C4 s:supersaw djf:0.5 ]",
+  "[ 1/1 → 9/8 | note:Eb4 s:supersaw djf:0.3 ]",
+  "[ 9/8 → 5/4 | note:G4 s:supersaw djf:0.3 ]",
+  "[ 5/4 → 11/8 | note:A4 s:supersaw djf:0.3 ]",
+  "[ 11/8 → 3/2 | note:F3 s:supersaw djf:0.3 ]",
+  "[ 3/2 → 13/8 | note:F4 s:supersaw djf:0.3 ]",
+  "[ 13/8 → 7/4 | note:D4 s:supersaw djf:0.3 ]",
+  "[ 7/4 → 15/8 | note:G3 s:supersaw djf:0.3 ]",
+  "[ 15/8 → 2/1 | note:F4 s:supersaw djf:0.3 ]",
+  "[ 2/1 → 17/8 | note:Eb5 s:supersaw djf:0.2 ]",
+  "[ 17/8 → 9/4 | note:D5 s:supersaw djf:0.2 ]",
+  "[ 9/4 → 19/8 | note:Bb3 s:supersaw djf:0.2 ]",
+  "[ 19/8 → 5/2 | note:C5 s:supersaw djf:0.2 ]",
+  "[ 5/2 → 21/8 | note:D4 s:supersaw djf:0.2 ]",
+  "[ 21/8 → 11/4 | note:F3 s:supersaw djf:0.2 ]",
+  "[ 11/4 → 23/8 | note:G4 s:supersaw djf:0.2 ]",
+  "[ 23/8 → 3/1 | note:D3 s:supersaw djf:0.2 ]",
+  "[ 3/1 → 25/8 | note:G3 s:supersaw djf:0.75 ]",
+  "[ 25/8 → 13/4 | note:Bb3 s:supersaw djf:0.75 ]",
+  "[ 13/4 → 27/8 | note:Eb5 s:supersaw djf:0.75 ]",
+  "[ 27/8 → 7/2 | note:C4 s:supersaw djf:0.75 ]",
+  "[ 7/2 → 29/8 | note:C4 s:supersaw djf:0.75 ]",
+  "[ 29/8 → 15/4 | note:Eb5 s:supersaw djf:0.75 ]",
+  "[ 15/4 → 31/8 | note:Bb4 s:supersaw djf:0.75 ]",
+  "[ 31/8 → 4/1 | note:A4 s:supersaw djf:0.75 ]",
 ]
 `;
 

From 2b3b6389431f9b38f0d26da37f0eac202c38f39f Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Fri, 26 Sep 2025 21:47:45 -0500
Subject: [PATCH 42/80] sample source for WT

---
 packages/superdough/sampler.mjs   | 38 ++++++++++++++++++++++---------
 packages/superdough/util.mjs      |  1 +
 packages/superdough/wavetable.mjs | 17 ++++++++------
 packages/superdough/worklets.mjs  |  5 ++--
 website/src/repl/idbutils.mjs     | 11 +++------
 5 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 9188c17c3..0e9633d4d 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -1,5 +1,5 @@
 import { noteToMidi, valueToMidi, getSoundIndex } from './util.mjs';
-import { getAudioContext, registerSound } from './index.mjs';
+import { getAudioContext, registerSound, registerWaveTable } from './index.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
@@ -79,14 +79,14 @@ export const getSampleBufferSource = async (hapValue, bank, resolveUrl) => {
   bufferSource.buffer = buffer;
   bufferSource.playbackRate.value = playbackRate;
 
-  const { s, loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
+  const { loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
 
   // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
   // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
   // the midway point through a 10-second audio buffer is still 5."
   const offset = begin * bufferSource.buffer.duration;
 
-  const loop = s.startsWith('wt_') ? 1 : hapValue.loop;
+  const loop = hapValue.loop;
   if (loop) {
     bufferSource.loop = true;
     bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
@@ -267,16 +267,13 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
     return samples(json, baseUrl || base, options);
   }
   const { prebake, tag } = options;
+
+
   processSampleMap(
     sampleMap,
-    (key, bank) =>
-      registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
-        type: 'sample',
-        samples: bank,
-        baseUrl,
-        prebake,
-        tag,
-      }),
+    (key, bank) => {
+      registerSample(key, bank, { baseUrl, prebake, tag })
+    },
     baseUrl,
   );
 };
@@ -366,3 +363,22 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
 
   return handle;
 }
+
+
+function registerSample(key, bank, params) {
+  registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
+    type: 'sample',
+    samples: bank,
+    ...params
+  })
+}
+
+export function registerSampleSource(key, bank, params) {
+  const isWavetable = key.startsWith('wt_');
+  if (isWavetable) {
+    registerWaveTable(key,bank, params)
+  } else {
+    registerSample(key, bank, params)
+  }
+ 
+}
\ No newline at end of file
diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
index 764ebb43e..80dd31a9d 100644
--- a/packages/superdough/util.mjs
+++ b/packages/superdough/util.mjs
@@ -76,3 +76,4 @@ export function cycleToSeconds(cycle, cps) {
 export function secondsToCycle(t, cps) {
   return t * cps;
 }
+
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index c628549e7..067656045 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -140,15 +140,18 @@ const _processTables = (json, baseUrl, frameLen) => {
       baseUrl = githubPath(baseUrl, '');
     }
     value = value.map((v) => baseUrl + v);
-    registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, value, frameLen), {
-      type: 'wavetable',
-      tables: value,
-      baseUrl,
-      frameLen,
-    });
+    registerWaveTable(key,value, {baseUrl, frameLen})
   });
 };
 
+export function registerWaveTable(key,  bank, params) {
+  registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, bank, params?.frameLen ?? 2048), {
+    type: 'wavetable',
+    tables: bank,
+    ...params
+  });
+}
+
 /**
  * Loads a collection of wavetables to use with `s`
  *
@@ -179,7 +182,7 @@ export const tables = async (url, frameLen, json) => {
     });
 };
 
-async function onTriggerSynth(t, value, onended, bank, frameLen) {
+export async function onTriggerSynth(t, value, onended, bank, frameLen) {
   const { s, n = 0, duration } = value;
   const ac = getAudioContext();
   const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index af8a4a633..14093d098 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1239,6 +1239,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     }
     const outL = outputs[0][0];
     const outR = outputs[0][1] || outputs[0][0];
+    const gainAdjustment = .15;
 
     if (!this.tables) {
       outL.fill(0);
@@ -1284,8 +1285,8 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;
         }
-        outL[i] += (s * gainL) / Math.sqrt(voices);
-        outR[i] += (s * gainR) / Math.sqrt(voices);
+        outL[i] += ((s * gainL) / Math.sqrt(voices)) * gainAdjustment;
+        outR[i] += ((s * gainR) / Math.sqrt(voices)) * gainAdjustment;
         this.phase[n] = wrapPhase(this.phase[n] + dPhase);
       }
     }
diff --git a/website/src/repl/idbutils.mjs b/website/src/repl/idbutils.mjs
index f26ee0479..5ac604559 100644
--- a/website/src/repl/idbutils.mjs
+++ b/website/src/repl/idbutils.mjs
@@ -1,4 +1,4 @@
-import { registerSound, onTriggerSample } from '@strudel/webaudio';
+import { registerSampleSource } from '@strudel/webaudio';
 import { isAudioFile } from './files.mjs';
 import { logger } from '@strudel/core';
 
@@ -76,13 +76,8 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
               })
               .map((title) => titlePathMap.get(title));
 
-            registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
-              type: 'sample',
-              samples: value,
-              baseUrl: undefined,
-              prebake: false,
-              tag: undefined,
-            });
+            registerSampleSource(key,value, {prebake: false})
+              
           });
 
           logger('imported sounds registered!', 'success');

From 97beaec25ae69d5ec146df1dfa77eaddd0d4fbed Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Fri, 26 Sep 2025 20:46:10 -0700
Subject: [PATCH 43/80] Added examples, fixed samplerate issue on import, added
 to settings tab, fixed spread, added default wavetables, change default
 phaserand to 0

---
 packages/core/controls.mjs                    |  10 +-
 packages/superdough/wavetable.mjs             |  90 +++++++---
 packages/superdough/worklets.mjs              |  23 +--
 test/__snapshots__/examples.test.mjs.snap     | 159 ++++++++++++++++++
 website/public/uzu-wavetables.json            |  54 ++++++
 .../src/repl/components/panel/SoundsTab.jsx   |   6 +-
 website/src/repl/prebake.mjs                  |   6 +-
 website/src/settings.mjs                      |   1 +
 8 files changed, 311 insertions(+), 38 deletions(-)
 create mode 100644 website/public/uzu-wavetables.json

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 9b5519704..3e5e9e63c 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -93,7 +93,8 @@ export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
  * @name wtPos
  * @param {number | Pattern} position Position in the wavetable from 0 to 1
  * @synonyms wavetablePosition
- *
+ * @example
+ * s("squelch").seg(8).note("F1").wtPos("0 0.25 0.5 0.75 1")
  */
 export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition');
 
@@ -103,7 +104,9 @@ export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetableP
  * @name wtWarp
  * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
  * @synonyms wavetableWarp
- *
+ * @example
+ * s("basique").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
+ *   .wtWarpMode("spin")
  */
 export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp');
 
@@ -116,6 +119,9 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
  * @name wtWarpMode
  * @param {number | string | Pattern} mode Warp mode
  * @synonyms wavetableWarpMode
+ * @example
+ * s("morgana").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
+ *   .wtWarpMode("<asym bendp spin logistic sync wormhole brownian>*2")
  *
  */
 export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', 'wavetableWarpMode');
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index c628549e7..14706f925 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -39,8 +39,7 @@ export const WarpMode = Object.freeze({
 });
 
 async function loadWavetableFrames(url, label, frameLen = 256) {
-  const ac = getAudioContext();
-  const buf = await loadBuffer(url, ac, label);
+  const buf = await loadBuffer(url, label);
   const ch0 = buf.getChannelData(0);
   const total = ch0.length;
   const numFrames = Math.floor(total / frameLen);
@@ -96,7 +95,37 @@ export function getTableInfo(hapValue, tableUrls) {
   return { transpose, tableUrl, index, midi, label };
 }
 
-const loadBuffer = (url, ac, label) => {
+// Extract the sample rate of a .wav file
+function parseWavSampleRate(arrBuf) {
+  const dv = new DataView(arrBuf);
+  // Header is "RIFF<chunk size (4 bytes)>WAVE", so 12 bytes
+  let p = 12;
+  // Look through chunks for the format header
+  // (they will always have an 8 byte header (id and size) followed by a payload)
+  while (p + 8 <= dv.byteLength) {
+    // Parse id
+    const id = String.fromCharCode(dv.getUint8(p), dv.getUint8(p + 1), dv.getUint8(p + 2), dv.getUint8(p + 3));
+    // Parse chunk size
+    const size = dv.getUint32(p + 4, true);
+    if (id === 'fmt ') {
+      // The format chunk contains the sample rate after
+      // 8 bytes of header, 2 bytes of format tag, 2 bytes of num channels
+      // (for a total of 12)
+      return dv.getUint32(p + 12, true);
+    }
+    // Advance to next chunk
+    p += 8 + size + (size & 1);
+  }
+  return null;
+}
+
+async function decodeAtNativeRate(arr) {
+  const sr = parseWavSampleRate(arr) || 44100;
+  const tempAC = new OfflineAudioContext(1, 1, sr);
+  return await tempAC.decodeAudioData(arr);
+}
+
+const loadBuffer = (url, label) => {
   url = url.replace('#', '%23');
   if (!loadCache[url]) {
     logger(`[wavetable] load table ${label}..`, 'load-table', { url });
@@ -107,7 +136,7 @@ const loadBuffer = (url, ac, label) => {
         const took = Date.now() - timestamp;
         const size = humanFileSize(res.byteLength);
         logger(`[wavetable] load table ${label}... done! loaded ${size} in ${took}ms`, 'loaded-table', { url });
-        const decoded = await ac.decodeAudioData(res);
+        const decoded = await decodeAtNativeRate(res);
         return decoded;
       });
   }
@@ -127,25 +156,40 @@ function githubPath(base, subpath = '') {
   return `https://raw.githubusercontent.com/${path}/${subpath}`;
 }
 
-const _processTables = (json, baseUrl, frameLen) => {
-  return Object.entries(json).forEach(([key, value]) => {
-    if (typeof value === 'string') {
-      value = [value];
+const _processTables = (json, baseUrl, frameLen, options = {}) => {
+  baseUrl = json._base || baseUrl;
+  return Object.entries(json).forEach(([key, tables]) => {
+    if (key === '_base') return false;
+    if (typeof tables === 'string') {
+      tables = [tables];
     }
-    if (typeof value !== 'object') {
+    if (typeof tables !== 'object') {
       throw new Error('wrong json format for ' + key);
     }
-    baseUrl = value._base || baseUrl;
-    if (baseUrl.startsWith('github:')) {
-      baseUrl = githubPath(baseUrl, '');
+    let resolvedUrl = baseUrl;
+    if (resolvedUrl.startsWith('github:')) {
+      resolvedUrl = githubPath(resolvedUrl, '');
+    }
+    tables = tables
+      .map((t) => resolvedUrl + t)
+      .filter((t) => {
+        if (!t.toLowerCase().endsWith('.wav')) {
+          logger(`[wavetable] skipping ${t} -- wavetables must be ".wav" format`);
+          return false;
+        }
+        return true;
+      });
+    if (tables.length) {
+      const { prebake, tag } = options;
+      registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, tables, frameLen), {
+        type: 'wavetable',
+        tables,
+        baseUrl,
+        frameLen,
+        prebake,
+        tag,
+      });
     }
-    value = value.map((v) => baseUrl + v);
-    registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, value, frameLen), {
-      type: 'wavetable',
-      tables: value,
-      baseUrl,
-      frameLen,
-    });
   });
 };
 
@@ -154,7 +198,7 @@ const _processTables = (json, baseUrl, frameLen) => {
  *
  * @name tables
  */
-export const tables = async (url, frameLen, json) => {
+export const tables = async (url, frameLen, json, options = {}) => {
   if (json !== undefined) return _processTables(json, url, frameLen);
   if (url.startsWith('github:')) {
     url = githubPath(url, 'strudel.json');
@@ -172,14 +216,14 @@ export const tables = async (url, frameLen, json) => {
   }
   return fetch(url)
     .then((res) => res.json())
-    .then((json) => _processTables(json, url, frameLen))
+    .then((json) => _processTables(json, url, frameLen, options))
     .catch((error) => {
       console.error(error);
       throw new Error(`error loading "${url}"`);
     });
 };
 
-async function onTriggerSynth(t, value, onended, bank, frameLen) {
+async function onTriggerSynth(t, value, onended, tables, frameLen) {
   const { s, n = 0, duration } = value;
   const ac = getAudioContext();
   const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
@@ -188,7 +232,7 @@ async function onTriggerSynth(t, value, onended, bank, frameLen) {
     wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
   }
   const frequency = getFrequencyFromValue(value);
-  const { tableUrl, label } = getTableInfo(value, bank);
+  const { tableUrl, label } = getTableInfo(value, tables);
   const payload = await loadWavetableFrames(tableUrl, label, frameLen);
   const holdEnd = t + duration;
   const envEnd = holdEnd + release + 0.01;
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index daf19e537..dbfb78f81 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -988,7 +988,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'warpMode', defaultValue: 0 },
       { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
       { name: 'spread', defaultValue: 0, minValue: 0, maxValue: 1 },
-      { name: 'phaserand', defaultValue: 1, minValue: 0, maxValue: 1 },
+      { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
     ];
   }
 
@@ -1155,10 +1155,10 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
   }
 
   _sampleFrame(frame, phase) {
-    const pos = phase * (frame.length - 1);
+    const pos = phase * frame.length;
     const i = pos | 0;
     const frac = pos - i;
-    const a = frame[i];
+    const a = frame[i % frame.length];
     const b = frame[(i + 1) % frame.length];
     return a + (b - a) * frac;
   }
@@ -1181,7 +1181,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 
     for (let i = 0; i < outL.length; i++) {
       const detune = pv(parameters.detune, i);
-      const spread = pv(parameters.spread, i) * 0.5 + 0.5;
       const tablePos = pv(parameters.position, i);
       const idx = tablePos * (this.numFrames - 1);
       const fIdx = idx | 0;
@@ -1189,11 +1188,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const warpAmount = pv(parameters.warp, i);
       const warpMode = pv(parameters.warpMode, i);
       const voices = pv(parameters.voices, i);
+      const spread = voices > 1 ? pv(parameters.spread, i) : 0;
       const phaseRand = pv(parameters.phaserand, i);
-      const gain1 = Math.sqrt(1 - spread);
-      const gain2 = Math.sqrt(spread);
+      const gain1 = Math.sqrt(0.5 - 0.5 * spread);
+      const gain2 = Math.sqrt(0.5 + 0.5 * spread);
       let f = pv(parameters.frequency, i);
       f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
+      const normalizer = 0.3 / Math.sqrt(voices);
       for (let n = 0; n < voices; n++) {
         const isOdd = (n & 1) == 1;
         let gainL = gain1;
@@ -1206,19 +1207,19 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
         const dPhase = fVoice / sampleRate;
         const level = this._chooseMip(dPhase);
-        const bank = this.tables[level];
+        const table = this.tables[level];
 
         // warp phase then sample
         this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
         const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
-        const s0 = this._sampleFrame(bank[fIdx], ph);
-        const s1 = this._sampleFrame(bank[Math.min(this.numFrames - 1, fIdx + 1)], ph);
+        const s0 = this._sampleFrame(table[fIdx], ph);
+        const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
         let s = s0 + (s1 - s0) * frac;
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;
         }
-        outL[i] += (s * gainL) / Math.sqrt(voices);
-        outR[i] += (s * gainR) / Math.sqrt(voices);
+        outL[i] += s * gainL * normalizer;
+        outR[i] += s * gainR * normalizer;
         this.phase[n] = wrapPhase(this.phase[n] + dPhase);
       }
     }
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index f91503ca2..3305def11 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -11981,6 +11981,165 @@ exports[`runs examples > example "withValue" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "wtPos" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:squelch note:F1 wtPos:0 ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:squelch note:F1 wtPos:0 ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 1/4 → 3/8 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:squelch note:F1 wtPos:0.5 ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:squelch note:F1 wtPos:0.5 ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 5/8 → 3/4 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:squelch note:F1 wtPos:1 ]",
+  "[ 7/8 → 1/1 | s:squelch note:F1 wtPos:1 ]",
+  "[ 1/1 → 9/8 | s:squelch note:F1 wtPos:0 ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:squelch note:F1 wtPos:0 ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 5/4 → 11/8 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:squelch note:F1 wtPos:0.5 ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:squelch note:F1 wtPos:0.5 ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 13/8 → 7/4 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:squelch note:F1 wtPos:1 ]",
+  "[ 15/8 → 2/1 | s:squelch note:F1 wtPos:1 ]",
+  "[ 2/1 → 17/8 | s:squelch note:F1 wtPos:0 ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:squelch note:F1 wtPos:0 ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 9/4 → 19/8 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:squelch note:F1 wtPos:0.5 ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:squelch note:F1 wtPos:0.5 ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 21/8 → 11/4 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:squelch note:F1 wtPos:1 ]",
+  "[ 23/8 → 3/1 | s:squelch note:F1 wtPos:1 ]",
+  "[ 3/1 → 25/8 | s:squelch note:F1 wtPos:0 ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:squelch note:F1 wtPos:0 ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 13/4 → 27/8 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:squelch note:F1 wtPos:0.25 ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:squelch note:F1 wtPos:0.5 ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:squelch note:F1 wtPos:0.5 ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 29/8 → 15/4 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:squelch note:F1 wtPos:0.75 ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:squelch note:F1 wtPos:1 ]",
+  "[ 31/8 → 4/1 | s:squelch note:F1 wtPos:1 ]",
+]
+`;
+
+exports[`runs examples > example "wtWarp" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 1/4 → 3/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 5/8 → 3/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 7/8 → 1/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 1/1 → 9/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 5/4 → 11/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 13/8 → 7/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 15/8 → 2/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 2/1 → 17/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 9/4 → 19/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 21/8 → 11/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 23/8 → 3/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 3/1 → 25/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 13/4 → 27/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 29/8 → 15/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+  "[ 31/8 → 4/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
+]
+`;
+
+exports[`runs examples > example "wtWarpMode" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:asym ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:asym ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
+  "[ 1/4 → 3/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:asym ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:bendp ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
+  "[ 5/8 → 3/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:bendp ]",
+  "[ 7/8 → 1/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:bendp ]",
+  "[ 1/1 → 9/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:spin ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 5/4 → 11/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:spin ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:logistic ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
+  "[ 13/8 → 7/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:logistic ]",
+  "[ 15/8 → 2/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:logistic ]",
+  "[ 2/1 → 17/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:sync ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:sync ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
+  "[ 9/4 → 19/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:sync ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:wormhole ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
+  "[ 21/8 → 11/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:wormhole ]",
+  "[ 23/8 → 3/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:wormhole ]",
+  "[ 3/1 → 25/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:brownian ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:brownian ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
+  "[ 13/4 → 27/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:brownian ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:asym ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
+  "[ 29/8 → 15/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:asym ]",
+  "[ 31/8 → 4/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:asym ]",
+]
+`;
+
 exports[`runs examples > example "xfade" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:hh gain:0 ]",
diff --git a/website/public/uzu-wavetables.json b/website/public/uzu-wavetables.json
new file mode 100644
index 000000000..4497791f0
--- /dev/null
+++ b/website/public/uzu-wavetables.json
@@ -0,0 +1,54 @@
+{
+    "_base": "http://localhost:5432",
+    "Bad Day": [
+        "/Bad Day.wav"
+    ],
+    "Basique": [
+        "/Basique.wav"
+    ],
+    "Crickets": [
+        "/Crickets.wav"
+    ],
+    "Curses": [
+        "/Curses.wav"
+    ],
+    "Earl Grey": [
+        "/Earl Grey.wav"
+    ],
+    "Echoes": [
+        "/Echoes.wav"
+    ],
+    "Glimmer": [
+        "/Glimmer.wav"
+    ],
+    "Majick": [
+        "/Majick.wav"
+    ],
+    "Meditation": [
+        "/Meditation.wav"
+    ],
+    "Morgana": [
+        "/Morgana.wav"
+    ],
+    "Red Alert": [
+        "/Red Alert.wav"
+    ],
+    "Sad Piano": [
+        "/Sad Piano.wav"
+    ],
+    "Shook": [
+        "/Shook.wav"
+    ],
+    "Sludge": [
+        "/Sludge.wav"
+    ],
+    "Squelch": [
+        "/Squelch.wav"
+    ],
+    "Summers Day": [
+        "/Summers Day.wav"
+    ],
+    "Wasp": [
+        "/Wasp.wav"
+    ]
+}
\ No newline at end of file
diff --git a/website/src/repl/components/panel/SoundsTab.jsx b/website/src/repl/components/panel/SoundsTab.jsx
index 0484da02d..ff64fc18e 100644
--- a/website/src/repl/components/panel/SoundsTab.jsx
+++ b/website/src/repl/components/panel/SoundsTab.jsx
@@ -44,6 +44,9 @@ export function SoundsTab() {
     if (soundsFilter === soundFilterType.SYNTHS) {
       return filtered.filter(([_, { data }]) => ['synth', 'soundfont'].includes(data.type));
     }
+    if (soundsFilter === soundFilterType.WAVETABLES) {
+      return filtered.filter(([_, { data }]) => data.type === 'wavetable');
+    }
     //TODO: tidy this up, it does not need to be saved in settings
     if (soundsFilter === 'importSounds') {
       return [];
@@ -74,6 +77,7 @@ export function SoundsTab() {
             samples: 'samples',
             drums: 'drum-machines',
             synths: 'Synths',
+            wavetables: 'Wavetables',
             user: 'User',
             importSounds: 'import-sounds',
           }}
@@ -125,7 +129,7 @@ export function SoundsTab() {
             >
               {' '}
               {name}
-              {data?.type === 'sample' ? `(${getSamples(data.samples)})` : ''}
+              {data?.type === 'sample' || data?.type === 'wavetable' ? `(${getSamples(data.samples)})` : ''}
               {data?.type === 'soundfont' ? `(${data.fonts.length})` : ''}
             </span>
           );
diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs
index fac6f5bb6..855798fdd 100644
--- a/website/src/repl/prebake.mjs
+++ b/website/src/repl/prebake.mjs
@@ -1,5 +1,5 @@
 import { Pattern, noteToMidi, valueToMidi } from '@strudel/core';
-import { aliasBank, registerSynthSounds, registerZZFXSounds, samples } from '@strudel/webaudio';
+import { aliasBank, registerSynthSounds, registerZZFXSounds, samples, tables } from '@strudel/webaudio';
 import { registerSamplesFromDB } from './idbutils.mjs';
 import './piano.mjs';
 import './files.mjs';
@@ -32,6 +32,10 @@ export async function prebake() {
       prebake: true,
       tag: 'drum-machines',
     }),
+    tables(`${baseNoTrailing}/uzu-wavetables.json`, 2048, undefined, {
+      prebake: true,
+      tag: 'wavetables',
+    }),
     samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
     samples(
       {
diff --git a/website/src/settings.mjs b/website/src/settings.mjs
index 9c3d78146..9365a6db5 100644
--- a/website/src/settings.mjs
+++ b/website/src/settings.mjs
@@ -13,6 +13,7 @@ export const soundFilterType = {
   DRUMS: 'drums',
   SAMPLES: 'samples',
   SYNTHS: 'synths',
+  WAVETABLES: 'wavetables',
   ALL: 'all',
 };
 

From 4bd103e61200fe888196807b7c43a9ff206cb38c Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sat, 27 Sep 2025 11:31:43 -0400
Subject: [PATCH 44/80] gain adj

---
 packages/superdough/worklets.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 14093d098..826e96104 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1049,7 +1049,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'begin', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
       { name: 'end', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
       { name: 'frequency', defaultValue: 220, minValue: 0.01, maxValue: 20000 },
-      { name: 'detune', defaultValue: 0 },
+      { name: 'detune', defaultValue: .18 },
       { name: 'position', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warpMode', defaultValue: 0 },

From a9957b45e5ce101fe3142d9dbeb6112cacc188a8 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sat, 27 Sep 2025 13:22:21 -0400
Subject: [PATCH 45/80] suppoert existing wt_ api

---
 packages/superdough/sampler.mjs    |  2 +-
 website/public/uzu-wavetables.json | 22 ++++++++++++++++++++++
 website/src/repl/prebake.mjs       |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 website/public/uzu-wavetables.json

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 0e9633d4d..ef4bdc542 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -272,7 +272,7 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
   processSampleMap(
     sampleMap,
     (key, bank) => {
-      registerSample(key, bank, { baseUrl, prebake, tag })
+      registerSampleSource(key, bank, { baseUrl, prebake, tag })
     },
     baseUrl,
   );
diff --git a/website/public/uzu-wavetables.json b/website/public/uzu-wavetables.json
new file mode 100644
index 000000000..be8a4e16e
--- /dev/null
+++ b/website/public/uzu-wavetables.json
@@ -0,0 +1,22 @@
+{
+    "_base": "https://raw.githubusercontent.com/tidalcycles/uzu-wavetables/main/",
+    "wt_digital": [
+        "wt_digital/wt_bad_day.wav",
+        "wt_digital/wt_basique.wav",
+        "wt_digital/wt_crickets.wav",
+        "wt_digital/wt_curses.wav",
+        "wt_digital/wt_earl_grey.wav",
+        "wt_digital/wt_echoes.wav",
+        "wt_digital/wt_glimmer.wav",
+        "wt_digital/wt_majick.wav",
+        "wt_digital/wt_meditation.wav",
+        "wt_digital/wt_morgana.wav",
+        "wt_digital/wt_red_alert.wav",
+        "wt_digital/wt_sad_piano.wav",
+        "wt_digital/wt_shook.wav",
+        "wt_digital/wt_sludge.wav",
+        "wt_digital/wt_squelch.wav",
+        "wt_digital/wt_summer.wav",
+        "wt_digital/wt_wasp.wav"
+    ]
+}
\ No newline at end of file
diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs
index fac6f5bb6..0b552b871 100644
--- a/website/src/repl/prebake.mjs
+++ b/website/src/repl/prebake.mjs
@@ -32,6 +32,9 @@ export async function prebake() {
       prebake: true,
       tag: 'drum-machines',
     }),
+    samples(`${baseNoTrailing}/uzu-wavetables.json`, undefined, {
+      prebake: true, 
+    }),
     samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
     samples(
       {

From a8918d55fb35cb66279c64f1721c7b8a5d0d693b Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Sat, 27 Sep 2025 10:45:30 -0700
Subject: [PATCH 46/80] Actually update normalizer

---
 packages/superdough/worklets.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 8c40c2763..dc0cf8077 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1261,7 +1261,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const gain2 = Math.sqrt(0.5 + 0.5 * spread);
       let f = pv(parameters.frequency, i);
       f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
-      const normalizer = 0.3 / Math.sqrt(voices);
+      const normalizer = 0.3 / voices;
       for (let n = 0; n < voices; n++) {
         const isOdd = (n & 1) == 1;
         let gainL = gain1;

From c5c05ebadc749824de9d77a9ad5640f519ac161f Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Sat, 27 Sep 2025 11:02:57 -0700
Subject: [PATCH 47/80] Clean up to align with other PR

---
 packages/core/controls.mjs                |   8 +-
 packages/superdough/worklets.mjs          |   2 +-
 test/__snapshots__/examples.test.mjs.snap | 159 ----------------------
 website/public/uzu-wavetables.json        |  54 --------
 website/src/repl/prebake.mjs              |   4 -
 5 files changed, 6 insertions(+), 221 deletions(-)
 delete mode 100644 website/public/uzu-wavetables.json

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 73e44473e..fef0e45e6 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -94,7 +94,7 @@ export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
  * @param {number | Pattern} position Position in the wavetable from 0 to 1
  * @synonyms wavetablePosition
  * @example
- * s("squelch").seg(8).note("F1").wtPos("0 0.25 0.5 0.75 1")
+ * s("squelch").bank("wt_digital").seg(8).note("F1").wtPos("0 0.25 0.5 0.75 1")
  */
 export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition');
 
@@ -105,7 +105,7 @@ export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetableP
  * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
  * @synonyms wavetableWarp
  * @example
- * s("basique").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
+ * s("basique").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
  *   .wtWarpMode("spin")
  */
 export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp');
@@ -120,7 +120,7 @@ export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWar
  * @param {number | string | Pattern} mode Warp mode
  * @synonyms wavetableWarpMode
  * @example
- * s("morgana").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
+ * s("morgana").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
  *   .wtWarpMode("<asym bendp spin logistic sync wormhole brownian>*2")
  *
  */
@@ -132,6 +132,8 @@ export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', '
  * @name wtPhaseRand
  * @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random)
  * @synonyms wavetablePhaseRand
+ * @example
+ * s("basique").bank("wt_digital").seg(16).wtPhaseRand("<0 1>")
  *
  */
 export const { wtPhaseRand, wavetablePhaseRand } = registerControl('wtPhaseRand', 'wavetablePhaseRand');
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index dc0cf8077..a83ad9e4f 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1054,7 +1054,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warpMode', defaultValue: 0 },
       { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
-      { name: 'spread', defaultValue: 0, minValue: 0, maxValue: 1 },
+      { name: 'spread', defaultValue: 0.18, minValue: 0, maxValue: 1 },
       { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
     ];
   }
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index c2135e108..a05975580 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -11993,165 +11993,6 @@ exports[`runs examples > example "withValue" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "wtPos" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:squelch note:F1 wtPos:0 ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:squelch note:F1 wtPos:0 ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 1/4 → 3/8 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:squelch note:F1 wtPos:0.5 ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:squelch note:F1 wtPos:0.5 ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 5/8 → 3/4 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:squelch note:F1 wtPos:1 ]",
-  "[ 7/8 → 1/1 | s:squelch note:F1 wtPos:1 ]",
-  "[ 1/1 → 9/8 | s:squelch note:F1 wtPos:0 ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:squelch note:F1 wtPos:0 ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 5/4 → 11/8 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:squelch note:F1 wtPos:0.5 ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:squelch note:F1 wtPos:0.5 ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 13/8 → 7/4 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:squelch note:F1 wtPos:1 ]",
-  "[ 15/8 → 2/1 | s:squelch note:F1 wtPos:1 ]",
-  "[ 2/1 → 17/8 | s:squelch note:F1 wtPos:0 ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:squelch note:F1 wtPos:0 ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 9/4 → 19/8 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:squelch note:F1 wtPos:0.5 ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:squelch note:F1 wtPos:0.5 ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 21/8 → 11/4 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:squelch note:F1 wtPos:1 ]",
-  "[ 23/8 → 3/1 | s:squelch note:F1 wtPos:1 ]",
-  "[ 3/1 → 25/8 | s:squelch note:F1 wtPos:0 ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:squelch note:F1 wtPos:0 ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 13/4 → 27/8 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:squelch note:F1 wtPos:0.25 ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:squelch note:F1 wtPos:0.5 ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:squelch note:F1 wtPos:0.5 ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 29/8 → 15/4 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:squelch note:F1 wtPos:0.75 ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:squelch note:F1 wtPos:1 ]",
-  "[ 31/8 → 4/1 | s:squelch note:F1 wtPos:1 ]",
-]
-`;
-
-exports[`runs examples > example "wtWarp" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 1/4 → 3/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 5/8 → 3/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 7/8 → 1/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 1/1 → 9/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 5/4 → 11/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 13/8 → 7/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 15/8 → 2/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 2/1 → 17/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 9/4 → 19/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 21/8 → 11/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 23/8 → 3/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 3/1 → 25/8 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:basique note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 13/4 → 27/8 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:basique note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:basique note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 29/8 → 15/4 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:basique note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 31/8 → 4/1 | s:basique note:F1 wtWarp:1 wtWarpMode:spin ]",
-]
-`;
-
-exports[`runs examples > example "wtWarpMode" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:asym ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:asym ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ 1/4 → 3/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:asym ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:bendp ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ 5/8 → 3/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:bendp ]",
-  "[ 7/8 → 1/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:bendp ]",
-  "[ 1/1 → 9/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 5/4 → 11/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:logistic ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ 13/8 → 7/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:logistic ]",
-  "[ 15/8 → 2/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:logistic ]",
-  "[ 2/1 → 17/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:sync ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:sync ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ 9/4 → 19/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:sync ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:wormhole ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ 21/8 → 11/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:wormhole ]",
-  "[ 23/8 → 3/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:wormhole ]",
-  "[ 3/1 → 25/8 | s:morgana note:F1 wtWarp:0 wtWarpMode:brownian ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:morgana note:F1 wtWarp:0 wtWarpMode:brownian ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ 13/4 → 27/8 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:morgana note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:morgana note:F1 wtWarp:0.5 wtWarpMode:brownian ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:morgana note:F1 wtWarp:0.5 wtWarpMode:asym ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ 29/8 → 15/4 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:morgana note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:morgana note:F1 wtWarp:1 wtWarpMode:asym ]",
-  "[ 31/8 → 4/1 | s:morgana note:F1 wtWarp:1 wtWarpMode:asym ]",
-]
-`;
-
 exports[`runs examples > example "xfade" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:hh gain:0 ]",
diff --git a/website/public/uzu-wavetables.json b/website/public/uzu-wavetables.json
deleted file mode 100644
index 4497791f0..000000000
--- a/website/public/uzu-wavetables.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "_base": "http://localhost:5432",
-    "Bad Day": [
-        "/Bad Day.wav"
-    ],
-    "Basique": [
-        "/Basique.wav"
-    ],
-    "Crickets": [
-        "/Crickets.wav"
-    ],
-    "Curses": [
-        "/Curses.wav"
-    ],
-    "Earl Grey": [
-        "/Earl Grey.wav"
-    ],
-    "Echoes": [
-        "/Echoes.wav"
-    ],
-    "Glimmer": [
-        "/Glimmer.wav"
-    ],
-    "Majick": [
-        "/Majick.wav"
-    ],
-    "Meditation": [
-        "/Meditation.wav"
-    ],
-    "Morgana": [
-        "/Morgana.wav"
-    ],
-    "Red Alert": [
-        "/Red Alert.wav"
-    ],
-    "Sad Piano": [
-        "/Sad Piano.wav"
-    ],
-    "Shook": [
-        "/Shook.wav"
-    ],
-    "Sludge": [
-        "/Sludge.wav"
-    ],
-    "Squelch": [
-        "/Squelch.wav"
-    ],
-    "Summers Day": [
-        "/Summers Day.wav"
-    ],
-    "Wasp": [
-        "/Wasp.wav"
-    ]
-}
\ No newline at end of file
diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs
index 855798fdd..79f30bfe0 100644
--- a/website/src/repl/prebake.mjs
+++ b/website/src/repl/prebake.mjs
@@ -32,10 +32,6 @@ export async function prebake() {
       prebake: true,
       tag: 'drum-machines',
     }),
-    tables(`${baseNoTrailing}/uzu-wavetables.json`, 2048, undefined, {
-      prebake: true,
-      tag: 'wavetables',
-    }),
     samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
     samples(
       {

From 8c3ee6db6bb042a2cf234aeea5cd3501fc2eb7e5 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Sat, 27 Sep 2025 11:07:04 -0700
Subject: [PATCH 48/80] Missed deletion

---
 website/src/repl/prebake.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs
index 79f30bfe0..fac6f5bb6 100644
--- a/website/src/repl/prebake.mjs
+++ b/website/src/repl/prebake.mjs
@@ -1,5 +1,5 @@
 import { Pattern, noteToMidi, valueToMidi } from '@strudel/core';
-import { aliasBank, registerSynthSounds, registerZZFXSounds, samples, tables } from '@strudel/webaudio';
+import { aliasBank, registerSynthSounds, registerZZFXSounds, samples } from '@strudel/webaudio';
 import { registerSamplesFromDB } from './idbutils.mjs';
 import './piano.mjs';
 import './files.mjs';

From 626a99ba5bbaa7032bf5ef62fe2c2d9849ed911a Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sat, 27 Sep 2025 15:22:54 -0400
Subject: [PATCH 49/80] supports old documented way of loading wavetables:

---
 packages/superdough/sampler.mjs   | 33 +++++--------------------------
 packages/superdough/util.mjs      | 29 ++++++++++++++++++++++++++-
 packages/superdough/wavetable.mjs | 20 +++++++------------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index ef4bdc542..02e1fb334 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -1,4 +1,4 @@
-import { noteToMidi, valueToMidi, getSoundIndex } from './util.mjs';
+import { noteToMidi, valueToMidi, getSoundIndex, getCommonSampleInfo } from './util.mjs';
 import { getAudioContext, registerSound, registerWaveTable } from './index.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
@@ -22,39 +22,16 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-// deduces relevant info for sample loading from hap.value and sample definition
-// it encapsulates the core sampler logic into a pure and synchronous function
-// hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
 export function getSampleInfo(hapValue, bank) {
-  const { s, n = 0, speed = 1.0 } = hapValue;
-  let midi = valueToMidi(hapValue, 36);
-  let transpose = midi - 36; // C3 is middle C;
-  let sampleUrl;
-  let index = 0;
-  if (Array.isArray(bank)) {
-    index = getSoundIndex(n, bank.length);
-    sampleUrl = bank[index];
-  } else {
-    const midiDiff = (noteA) => noteToMidi(noteA) - midi;
-    // object format will expect keys as notes
-    const closest = Object.keys(bank)
-      .filter((k) => !k.startsWith('_'))
-      .reduce(
-        (closest, key, j) => (!closest || Math.abs(midiDiff(key)) < Math.abs(midiDiff(closest)) ? key : closest),
-        null,
-      );
-    transpose = -midiDiff(closest); // semitones to repitch
-    index = getSoundIndex(n, bank[closest].length);
-    sampleUrl = bank[closest][index];
-  }
-  const label = `${s}:${index}`;
+  const {  speed = 1.0 } = hapValue;
+  const {transpose, url, index, midi, label} = getCommonSampleInfo(hapValue, bank)
   let playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
-  return { transpose, sampleUrl, index, midi, label, playbackRate };
+  return { transpose, url, index, midi, label, playbackRate };
 }
 
 // takes hapValue and returns buffer + playbackRate.
 export const getSampleBuffer = async (hapValue, bank, resolveUrl) => {
-  let { sampleUrl, label, playbackRate } = getSampleInfo(hapValue, bank);
+  let { url: sampleUrl, label, playbackRate } = getSampleInfo(hapValue, bank);
   if (resolveUrl) {
     sampleUrl = await resolveUrl(sampleUrl);
   }
diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
index 80dd31a9d..1886c55e5 100644
--- a/packages/superdough/util.mjs
+++ b/packages/superdough/util.mjs
@@ -76,4 +76,31 @@ export function cycleToSeconds(cycle, cps) {
 export function secondsToCycle(t, cps) {
   return t * cps;
 }
-
+// deduces relevant info for sample loading from hap.value and sample definition
+// it encapsulates the core sampler logic into a pure and synchronous function
+// hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
+export function getCommonSampleInfo(hapValue, bank) {
+  const { s, n = 0 } = hapValue;
+  let midi = valueToMidi(hapValue, 36);
+  let transpose = midi - 36; // C3 is middle C;
+  let url;
+  let index = 0;
+  if (Array.isArray(bank)) {
+    index = getSoundIndex(n, bank.length);
+    url = bank[index];
+  } else {
+    const midiDiff = (noteA) => noteToMidi(noteA) - midi;
+    // object format will expect keys as notes
+    const closest = Object.keys(bank)
+      .filter((k) => !k.startsWith('_'))
+      .reduce(
+        (closest, key, j) => (!closest || Math.abs(midiDiff(key)) < Math.abs(midiDiff(closest)) ? key : closest),
+        null,
+      );
+    transpose = -midiDiff(closest); // semitones to repitch
+    index = getSoundIndex(n, bank[closest].length);
+    url = bank[closest][index];
+  } 
+  const label = `${s}:${index}`;
+  return { transpose, url, index, midi, label };
+}
\ No newline at end of file
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 067656045..a7e708043 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -1,5 +1,5 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getSoundIndex, valueToMidi } from './util.mjs';
+import { getCommonSampleInfo, getSoundIndex, valueToMidi } from './util.mjs';
 import {
   destroyAudioWorkletNode,
   getADSRValues,
@@ -38,12 +38,12 @@ export const WarpMode = Object.freeze({
   FLIP: 21,
 });
 
-async function loadWavetableFrames(url, label, frameLen = 256) {
+async function loadWavetableFrames(url, label, frameLen = 2048) {
   const ac = getAudioContext();
   const buf = await loadBuffer(url, ac, label);
   const ch0 = buf.getChannelData(0);
   const total = ch0.length;
-  const numFrames = Math.floor(total / frameLen);
+  const numFrames = Math.max(1,Math.floor(total / frameLen));
   const frames = new Array(numFrames);
   for (let i = 0; i < numFrames; i++) {
     const start = i * frameLen;
@@ -86,14 +86,8 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-export function getTableInfo(hapValue, tableUrls) {
-  const { s, n = 0 } = hapValue;
-  let midi = valueToMidi(hapValue, 36);
-  let transpose = midi - 36; // C3 is middle C;
-  const index = getSoundIndex(n, tableUrls.length);
-  const tableUrl = tableUrls[index];
-  const label = `${s}:${index}`;
-  return { transpose, tableUrl, index, midi, label };
+export function getTableInfo(hapValue, urls) {
+  return getCommonSampleInfo(hapValue,urls)
 }
 
 const loadBuffer = (url, ac, label) => {
@@ -191,8 +185,8 @@ export async function onTriggerSynth(t, value, onended, bank, frameLen) {
     wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
   }
   const frequency = getFrequencyFromValue(value);
-  const { tableUrl, label } = getTableInfo(value, bank);
-  const payload = await loadWavetableFrames(tableUrl, label, frameLen);
+  const { url, label } = getTableInfo(value, bank);
+  const payload = await loadWavetableFrames(url, label, frameLen);
   const holdEnd = t + duration;
   const envEnd = holdEnd + release + 0.01;
   const source = getWorklet(

From 774372a339d929d8826187efc90afe5ae7e5e337 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sat, 27 Sep 2025 15:29:55 -0400
Subject: [PATCH 50/80] format

---
 packages/superdough/sampler.mjs   | 19 ++++++++-----------
 packages/superdough/util.mjs      |  4 ++--
 packages/superdough/wavetable.mjs | 10 +++++-----
 packages/superdough/worklets.mjs  |  4 ++--
 website/src/repl/idbutils.mjs     |  3 +--
 website/src/repl/prebake.mjs      |  2 +-
 6 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 02e1fb334..b195ba79c 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -23,8 +23,8 @@ function humanFileSize(bytes, si) {
 }
 
 export function getSampleInfo(hapValue, bank) {
-  const {  speed = 1.0 } = hapValue;
-  const {transpose, url, index, midi, label} = getCommonSampleInfo(hapValue, bank)
+  const { speed = 1.0 } = hapValue;
+  const { transpose, url, index, midi, label } = getCommonSampleInfo(hapValue, bank);
   let playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
   return { transpose, url, index, midi, label, playbackRate };
 }
@@ -245,11 +245,10 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
   }
   const { prebake, tag } = options;
 
-
   processSampleMap(
     sampleMap,
     (key, bank) => {
-      registerSampleSource(key, bank, { baseUrl, prebake, tag })
+      registerSampleSource(key, bank, { baseUrl, prebake, tag });
     },
     baseUrl,
   );
@@ -341,21 +340,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
   return handle;
 }
 
-
 function registerSample(key, bank, params) {
   registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
     type: 'sample',
     samples: bank,
-    ...params
-  })
+    ...params,
+  });
 }
 
 export function registerSampleSource(key, bank, params) {
   const isWavetable = key.startsWith('wt_');
   if (isWavetable) {
-    registerWaveTable(key,bank, params)
+    registerWaveTable(key, bank, params);
   } else {
-    registerSample(key, bank, params)
+    registerSample(key, bank, params);
   }
- 
-}
\ No newline at end of file
+}
diff --git a/packages/superdough/util.mjs b/packages/superdough/util.mjs
index 1886c55e5..0ba095175 100644
--- a/packages/superdough/util.mjs
+++ b/packages/superdough/util.mjs
@@ -100,7 +100,7 @@ export function getCommonSampleInfo(hapValue, bank) {
     transpose = -midiDiff(closest); // semitones to repitch
     index = getSoundIndex(n, bank[closest].length);
     url = bank[closest][index];
-  } 
+  }
   const label = `${s}:${index}`;
   return { transpose, url, index, midi, label };
-}
\ No newline at end of file
+}
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index a7e708043..c54f3a888 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -43,7 +43,7 @@ async function loadWavetableFrames(url, label, frameLen = 2048) {
   const buf = await loadBuffer(url, ac, label);
   const ch0 = buf.getChannelData(0);
   const total = ch0.length;
-  const numFrames = Math.max(1,Math.floor(total / frameLen));
+  const numFrames = Math.max(1, Math.floor(total / frameLen));
   const frames = new Array(numFrames);
   for (let i = 0; i < numFrames; i++) {
     const start = i * frameLen;
@@ -87,7 +87,7 @@ function humanFileSize(bytes, si) {
 }
 
 export function getTableInfo(hapValue, urls) {
-  return getCommonSampleInfo(hapValue,urls)
+  return getCommonSampleInfo(hapValue, urls);
 }
 
 const loadBuffer = (url, ac, label) => {
@@ -134,15 +134,15 @@ const _processTables = (json, baseUrl, frameLen) => {
       baseUrl = githubPath(baseUrl, '');
     }
     value = value.map((v) => baseUrl + v);
-    registerWaveTable(key,value, {baseUrl, frameLen})
+    registerWaveTable(key, value, { baseUrl, frameLen });
   });
 };
 
-export function registerWaveTable(key,  bank, params) {
+export function registerWaveTable(key, bank, params) {
   registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, bank, params?.frameLen ?? 2048), {
     type: 'wavetable',
     tables: bank,
-    ...params
+    ...params,
   });
 }
 
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 826e96104..91eb68634 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1049,7 +1049,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'begin', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
       { name: 'end', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
       { name: 'frequency', defaultValue: 220, minValue: 0.01, maxValue: 20000 },
-      { name: 'detune', defaultValue: .18 },
+      { name: 'detune', defaultValue: 0.18 },
       { name: 'position', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warpMode', defaultValue: 0 },
@@ -1239,7 +1239,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     }
     const outL = outputs[0][0];
     const outR = outputs[0][1] || outputs[0][0];
-    const gainAdjustment = .15;
+    const gainAdjustment = 0.3;
 
     if (!this.tables) {
       outL.fill(0);
diff --git a/website/src/repl/idbutils.mjs b/website/src/repl/idbutils.mjs
index 5ac604559..d87d649c2 100644
--- a/website/src/repl/idbutils.mjs
+++ b/website/src/repl/idbutils.mjs
@@ -76,8 +76,7 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
               })
               .map((title) => titlePathMap.get(title));
 
-            registerSampleSource(key,value, {prebake: false})
-              
+            registerSampleSource(key, value, { prebake: false });
           });
 
           logger('imported sounds registered!', 'success');
diff --git a/website/src/repl/prebake.mjs b/website/src/repl/prebake.mjs
index 0b552b871..1fbc84021 100644
--- a/website/src/repl/prebake.mjs
+++ b/website/src/repl/prebake.mjs
@@ -33,7 +33,7 @@ export async function prebake() {
       tag: 'drum-machines',
     }),
     samples(`${baseNoTrailing}/uzu-wavetables.json`, undefined, {
-      prebake: true, 
+      prebake: true,
     }),
     samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
     samples(

From 917d01c47d9ab245fb09ce121af657a184c52c1f Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Sat, 27 Sep 2025 12:48:37 -0700
Subject: [PATCH 51/80] Add LFOs and envelopes

---
 packages/core/controls.mjs         | 172 ++++++++++++++++++++++++++++-
 packages/superdough/helpers.mjs    |  30 +++++
 packages/superdough/superdough.mjs |  39 ++-----
 packages/superdough/synth.mjs      |   3 +-
 packages/superdough/wavetable.mjs  |  37 ++++++-
 5 files changed, 247 insertions(+), 34 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index fef0e45e6..23a1dfc3b 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -98,6 +98,90 @@ export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
  */
 export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition');
 
+/**
+ * Attack time of the wavetable oscillator's position envelope
+ *
+ * @name wtPosAttack
+ * @synonyms wtPosAtt
+ * @param {number | Pattern} time attack time in seconds
+ */
+export const { wtPosAttack, wtPosAtt } = registerControl('wtPosAttack', 'wtPosAtt');
+
+/**
+ * Decay time of the wavetable oscillator's position envelope
+ *
+ * @name wtPosDecay
+ * @synonyms wtPosDec
+ * @param {number | Pattern} time decay time in seconds
+ */
+export const { wtPosDecay, wtPosDec } = registerControl('wtPosDecay', 'wtPosDec');
+
+/**
+ * Sustain time of the wavetable oscillator's position envelope
+ *
+ * @name wtPosAttack
+ * @synonyms wtPosSus
+ * @param {number | Pattern} gain sustain level (0 to 1)
+ */
+export const { wtPosSustain, wtPosSus } = registerControl('wtPosSustain', 'wtPosSus');
+
+/**
+ * Release time of the wavetable oscillator's position envelope
+ *
+ * @name wtPosRelease
+ * @synonyms wtPosRel
+ * @param {number | Pattern} time release time in seconds
+ */
+export const { wtPosRelease, wtPosRel } = registerControl('wtPosRelease', 'wtPosRel');
+
+/**
+ * Rate of the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosRate
+ * @param {number | Pattern} rate rate in hertz
+ */
+export const { wtPosRate } = registerControl('wtPosRate');
+
+/**
+ * Depth of the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosDepth
+ * @param {number | Pattern} depth depth of modulation
+ */
+export const { wtPosDepth } = registerControl('wtPosDepth');
+
+/**
+ * Whether to sync the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosSynced
+ * @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
+ */
+export const { wtPosSynced } = registerControl('wtPosSynced');
+
+/**
+ * Shape of the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosShape
+ * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
+ */
+export const { wtPosShape } = registerControl('wtPosShape');
+
+/**
+ * DC offset of the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosDCOffset
+ * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
+ */
+export const { wtPosDCOffset } = registerControl('wtPosDCOffset');
+
+/**
+ * Skew of the LFO for the wavetable oscillator's position
+ *
+ * @name wtPosSkew
+ * @param {number | Pattern} skew How much to bend the LFO shape
+ */
+export const { wtPosSkew } = registerControl('wtPosSkew');
+
 /**
  * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator
  *
@@ -108,10 +192,94 @@ export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetableP
  * s("basique").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
  *   .wtWarpMode("spin")
  */
-export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp');
+export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp')
 
 /**
- * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator.
+ * Attack time of the wavetable oscillator's warp envelope
+ *
+ * @name wtWarpAttack
+ * @synonyms wtWarpAtt
+ * @param {number | Pattern} time attack time in seconds
+ */
+export const { wtWarpAttack, wtWarpAtt } = registerControl('wtWarpAttack', 'wtWarpAtt');
+
+/**
+ * Decay time of the wavetable oscillator's warp envelope
+ *
+ * @name wtWarpDecay
+ * @synonyms wtWarpDec
+ * @param {number | Pattern} time decay time in seconds
+ */
+export const { wtWarpDecay, wtWarpDec } = registerControl('wtWarpDecay', 'wtWarpDec');
+
+/**
+ * Sustain time of the wavetable oscillator's warp envelope
+ *
+ * @name wtWarpAttack
+ * @synonyms wtWarpSus
+ * @param {number | Pattern} gain sustain level (0 to 1)
+ */
+export const { wtWarpSustain, wtWarpSus } = registerControl('wtWarpSustain', 'wtWarpSus');
+
+/**
+ * Release time of the wavetable oscillator's warp envelope
+ *
+ * @name wtWarpRelease
+ * @synonyms wtWarpRel
+ * @param {number | Pattern} time release time in seconds
+ */
+export const { wtWarpRelease, wtWarpRel } = registerControl('wtWarpRelease', 'wtWarpRel');
+
+/**
+ * Rate of the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpRate
+ * @param {number | Pattern} rate rate in hertz
+ */
+export const { wtWarpRate } = registerControl('wtWarpRate');
+
+/**
+ * Depth of the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpDepth
+ * @param {number | Pattern} depth depth of modulation
+ */
+export const { wtWarpDepth } = registerControl('wtWarpDepth');
+
+/**
+ * Whether to sync the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpSynced
+ * @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
+ */
+export const { wtWarpSynced } = registerControl('wtWarpSynced');
+
+/**
+ * Shape of the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpShape
+ * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
+ */
+export const { wtWarpShape } = registerControl('wtWarpShape');
+
+/**
+ * DC offset of the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpDCOffset
+ * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
+ */
+export const { wtWarpDCOffset } = registerControl('wtWarpDCOffset');
+
+/**
+ * Skew of the LFO for the wavetable oscillator's warp
+ *
+ * @name wtWarpSkew
+ * @param {number | Pattern} skew How much to bend the LFO shape
+ */
+export const { wtWarpSkew } = registerControl('wtWarpSkew');
+
+/**
+ * Type of warp (alteration of the waveform) to apply to the wavetable oscillator.
  *
  * The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit,
  * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 4921d873e..d3b6ca6c7 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -97,6 +97,36 @@ export const getParamADSR = (
   param[ramp](min, end + release);
 };
 
+function getModulationShapeInput(val) {
+  if (typeof val === 'number') {
+    return val % 5;
+  }
+  return { tri: 0, triangle: 0, sine: 1, ramp: 2, saw: 3, square: 4 }[val] ?? 0;
+}
+
+export function getLfo(audioContext, begin, end, properties = {}) {
+  const { shape = 0, ...props } = properties;
+  const { dcoffset = -0.5, depth = 1 } = properties;
+  debugger;
+  const lfoprops = {
+    frequency: 1,
+    depth,
+    skew: 0.5,
+    phaseoffset: 0,
+    time: begin,
+    begin,
+    end,
+    shape: getModulationShapeInput(shape),
+    dcoffset,
+    min: dcoffset * depth,
+    max: dcoffset * depth + depth,
+    curve: 1,
+    ...props,
+  };
+
+  return getWorklet(audioContext, 'lfo-processor', lfoprops);
+}
+
 export function getCompressor(ac, threshold, ratio, knee, attack, release) {
   const options = {
     threshold: threshold ?? -3,
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 63ed7d30b..48264ec05 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -9,7 +9,7 @@ import './reverb.mjs';
 import './vowel.mjs';
 import { nanFallback, _mod, cycleToSeconds } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getWorklet, effectSend } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getLfo, getWorklet, effectSend } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
@@ -29,13 +29,6 @@ export function setMultiChannelOrbits(bool) {
   multiChannelOrbits = bool == true;
 }
 
-function getModulationShapeInput(val) {
-  if (typeof val === 'number') {
-    return val % 5;
-  }
-  return { tri: 0, triangle: 0, sine: 1, ramp: 2, saw: 3, square: 4 }[val] ?? 0;
-}
-
 export const soundMap = map();
 
 export function registerSound(key, onTrigger, data = {}) {
@@ -314,28 +307,6 @@ export function connectToDestination(input, channels) {
   controller.output.connectToDestination(input, channels);
 }
 
-export function getLfo(audioContext, begin, end, properties = {}) {
-  const { shape = 0, ...props } = properties;
-  const { dcoffset = -0.5, depth = 1 } = properties;
-  const lfoprops = {
-    frequency: 1,
-    depth,
-    skew: 0.5,
-    phaseoffset: 0,
-    time: begin,
-    begin,
-    end,
-    shape: getModulationShapeInput(shape),
-    dcoffset,
-    min: dcoffset * depth,
-    max: dcoffset * depth + depth,
-    curve: 1,
-    ...props,
-  };
-
-  return getWorklet(audioContext, 'lfo-processor', lfoprops);
-}
-
 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
   const ac = getAudioContext();
   const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
@@ -682,6 +653,14 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     tremolo = cps * tremolosync;
   }
 
+  if (value.wtPosSynced != null) {
+    value.wtPosRate /= cps;
+  }
+
+  if (value.wtWarpSynced != null) {
+    value.wtWarpRate /= cps;
+  }
+
   if (tremolo !== undefined) {
     // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
     // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index 5b1b4edf1..5dc5dc08a 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -1,11 +1,12 @@
 import { clamp } from './util.mjs';
-import { registerSound, getAudioContext, soundMap, getLfo } from './superdough.mjs';
+import { registerSound, getAudioContext, soundMap } from './superdough.mjs';
 import {
   applyFM,
   destroyAudioWorkletNode,
   gainNode,
   getADSRValues,
   getFrequencyFromValue,
+  getLfo,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 14706f925..dede7a2e5 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -4,6 +4,7 @@ import {
   destroyAudioWorkletNode,
   getADSRValues,
   getFrequencyFromValue,
+  getLfo,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
@@ -235,7 +236,8 @@ async function onTriggerSynth(t, value, onended, tables, frameLen) {
   const { tableUrl, label } = getTableInfo(value, tables);
   const payload = await loadWavetableFrames(tableUrl, label, frameLen);
   const holdEnd = t + duration;
-  const envEnd = holdEnd + release + 0.01;
+  const endWithRelease = holdEnd + release;
+  const envEnd = endWithRelease + 0.01;
   const source = getWorklet(
     ac,
     'wavetable-oscillator-processor',
@@ -258,6 +260,37 @@ async function onTriggerSynth(t, value, onended, tables, frameLen) {
     logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
     return;
   }
+  const posADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease];
+  const warpADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease];
+  const wtParams = source.parameters;
+  const positionParam = wtParams.get('position');
+  const warpParam = wtParams.get('warp');
+  if (posADSRParams.some((p) => p !== undefined)) {
+    const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams);
+    getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, 0, 1, t, holdEnd, 'linear');
+  } else {
+    const posLFO = getLfo(ac, t, endWithRelease, {
+      frequency: value.wtPosRate,
+      depth: value.wtPosDepth,
+      shape: value.wtPosShape,
+      skew: value.wtPosSkew,
+      dcoffset: value.wtPosDCOffset ?? 0,
+    });
+    posLFO.connect(positionParam);
+  }
+  if (posADSRParams.some((p) => p !== undefined)) {
+    const [wAttack, wDecay, wSustain, wRelease] = getADSRValues(warpADSRParams);
+    getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, 0, 1, t, holdEnd, 'linear');
+  } else {
+    const warpLFO = getLfo(ac, t, endWithRelease, {
+      frequency: value.wtWarpRate,
+      depth: value.wtWarpDepth,
+      shape: value.wtWarpShape,
+      skew: value.wtWarpSkew,
+      dcoffset: value.wtWarpDCOffset ?? 0,
+    });
+    warpLFO.connect(warpParam);
+  }
   const vibratoOscillator = getVibratoOscillator(source.detune, value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
@@ -271,6 +304,8 @@ async function onTriggerSynth(t, value, onended, tables, frameLen) {
       destroyAudioWorkletNode(source);
       vibratoOscillator?.stop();
       node.disconnect();
+      warpLFO.disconnect();
+      posLFO.disconnect();
       onended();
     },
     t,

From 23d4bfa9d9ec9b2f3bc7dd6469da113dfc794629 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 09:19:39 -0400
Subject: [PATCH 52/80] rename controls

---
 packages/core/controls.mjs         | 162 ++++++++++++++++-------------
 packages/superdough/superdough.mjs |   2 +-
 packages/superdough/wavetable.mjs  |  88 ++++++++++------
 3 files changed, 144 insertions(+), 108 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index b58465965..7e3c2a8e2 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -90,193 +90,191 @@ export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
 /**
  * Position in the wavetable of the wavetable oscillator
  *
- * @name wtPos
+ * @name wt
  * @param {number | Pattern} position Position in the wavetable from 0 to 1
  * @synonyms wavetablePosition
  * @example
- * s("squelch").bank("wt_digital").seg(8).note("F1").wtPos("0 0.25 0.5 0.75 1")
+ * s("squelch").bank("wt_digital").seg(8).note("F1").wt("0 0.25 0.5 0.75 1")
  */
-export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition');
+export const { wt, wavetablePosition } = registerControl('wt', 'wavetablePosition');
 
+/**
+ * Amount of envelope applied wavetable oscillator's position envelope
+ *
+ * @name wtenv
+ * @param {number | Pattern} amount between 0 and 1
+ */
+export const { wtenv } = registerControl('wtenv');
 /**
  * Attack time of the wavetable oscillator's position envelope
  *
- * @name wtPosAttack
- * @synonyms wtPosAtt
+ * @name wtattack
+ * @synonyms wtatt
  * @param {number | Pattern} time attack time in seconds
  */
-export const { wtPosAttack, wtPosAtt } = registerControl('wtPosAttack', 'wtPosAtt');
+export const { wtattack, wtatt } = registerControl('wtattack', 'wtatt');
 
 /**
  * Decay time of the wavetable oscillator's position envelope
  *
- * @name wtPosDecay
- * @synonyms wtPosDec
+ * @name wtdecay
+ * @synonyms wtdec
  * @param {number | Pattern} time decay time in seconds
  */
-export const { wtPosDecay, wtPosDec } = registerControl('wtPosDecay', 'wtPosDec');
+export const { wtdecay, wtdec } = registerControl('wtdecay', 'wtdec');
 
 /**
  * Sustain time of the wavetable oscillator's position envelope
  *
- * @name wtPosAttack
- * @synonyms wtPosSus
+ * @name wtsustain
+ * @synonyms wtsus
  * @param {number | Pattern} gain sustain level (0 to 1)
  */
-export const { wtPosSustain, wtPosSus } = registerControl('wtPosSustain', 'wtPosSus');
+export const { wtsustain, wtsus } = registerControl('wtsustain', 'wtsus');
 
 /**
  * Release time of the wavetable oscillator's position envelope
  *
- * @name wtPosRelease
- * @synonyms wtPosRel
+ * @name wtrelease
+ * @synonyms wtrel
  * @param {number | Pattern} time release time in seconds
  */
-export const { wtPosRelease, wtPosRel } = registerControl('wtPosRelease', 'wtPosRel');
+export const { wtrelease, wtrel } = registerControl('wtrelease', 'wtrel');
 
 /**
  * Rate of the LFO for the wavetable oscillator's position
  *
- * @name wtPosRate
+ * @name wtrate
  * @param {number | Pattern} rate rate in hertz
  */
-export const { wtPosRate } = registerControl('wtPosRate');
+export const { wtrate } = registerControl('wtrate');
+/**
+ * cycle synced rate of the LFO for the wavetable oscillator's position
+ *
+ * @name wtsync
+ * @param {number | Pattern} rate rate in cycles
+ */
+export const { wtsync } = registerControl('wtsync');
 
 /**
  * Depth of the LFO for the wavetable oscillator's position
  *
- * @name wtPosDepth
+ * @name wtdepth
  * @param {number | Pattern} depth depth of modulation
  */
-export const { wtPosDepth } = registerControl('wtPosDepth');
-
-/**
- * Whether to sync the LFO for the wavetable oscillator's position
- *
- * @name wtPosSynced
- * @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
- */
-export const { wtPosSynced } = registerControl('wtPosSynced');
+export const { wtdepth } = registerControl('wtdepth');
 
 /**
  * Shape of the LFO for the wavetable oscillator's position
  *
- * @name wtPosShape
+ * @name wtshape
  * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
  */
-export const { wtPosShape } = registerControl('wtPosShape');
+export const { wtshape } = registerControl('wtshape');
 
 /**
  * DC offset of the LFO for the wavetable oscillator's position
  *
- * @name wtPosDCOffset
+ * @name wtdc
  * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
  */
-export const { wtPosDCOffset } = registerControl('wtPosDCOffset');
+export const { wtdc } = registerControl('wtdc');
 
 /**
  * Skew of the LFO for the wavetable oscillator's position
  *
- * @name wtPosSkew
+ * @name wtskew
  * @param {number | Pattern} skew How much to bend the LFO shape
  */
-export const { wtPosSkew } = registerControl('wtPosSkew');
+export const { wtskew } = registerControl('wtskew');
 
 /**
  * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator
  *
- * @name wtWarp
+ * @name warp
  * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
  * @synonyms wavetableWarp
  * @example
- * s("basique").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
- *   .wtWarpMode("spin")
+ * s("basique").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
+ *   .warpmode("spin")
  */
-export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp');
+export const { warp, wavetableWarp } = registerControl('warp', 'wavetableWarp');
 
 /**
  * Attack time of the wavetable oscillator's warp envelope
  *
- * @name wtWarpAttack
- * @synonyms wtWarpAtt
+ * @name warpattack
+ * @synonyms warpatt
  * @param {number | Pattern} time attack time in seconds
  */
-export const { wtWarpAttack, wtWarpAtt } = registerControl('wtWarpAttack', 'wtWarpAtt');
+export const { warpattack, warpatt } = registerControl('warpattack', 'warpatt');
 
 /**
  * Decay time of the wavetable oscillator's warp envelope
  *
- * @name wtWarpDecay
- * @synonyms wtWarpDec
+ * @name warpdecay
+ * @synonyms warpdec
  * @param {number | Pattern} time decay time in seconds
  */
-export const { wtWarpDecay, wtWarpDec } = registerControl('wtWarpDecay', 'wtWarpDec');
+export const { warpdecay, warpdec } = registerControl('warpdecay', 'warpdec');
 
 /**
  * Sustain time of the wavetable oscillator's warp envelope
  *
- * @name wtWarpAttack
- * @synonyms wtWarpSus
+ * @name warpsustain
+ * @synonyms warpsus
  * @param {number | Pattern} gain sustain level (0 to 1)
  */
-export const { wtWarpSustain, wtWarpSus } = registerControl('wtWarpSustain', 'wtWarpSus');
+export const { warpsustain, warpsus } = registerControl('warpsustain', 'warpsus');
 
 /**
  * Release time of the wavetable oscillator's warp envelope
  *
- * @name wtWarpRelease
- * @synonyms wtWarpRel
+ * @name warprelease
+ * @synonyms warprel
  * @param {number | Pattern} time release time in seconds
  */
-export const { wtWarpRelease, wtWarpRel } = registerControl('wtWarpRelease', 'wtWarpRel');
+export const { warprelease, warprel } = registerControl('warprelease', 'warprel');
 
 /**
  * Rate of the LFO for the wavetable oscillator's warp
  *
- * @name wtWarpRate
+ * @name warprate
  * @param {number | Pattern} rate rate in hertz
  */
-export const { wtWarpRate } = registerControl('wtWarpRate');
+export const { warprate } = registerControl('warprate');
 
 /**
  * Depth of the LFO for the wavetable oscillator's warp
  *
- * @name wtWarpDepth
+ * @name warpdepth
  * @param {number | Pattern} depth depth of modulation
  */
-export const { wtWarpDepth } = registerControl('wtWarpDepth');
-
-/**
- * Whether to sync the LFO for the wavetable oscillator's warp
- *
- * @name wtWarpSynced
- * @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
- */
-export const { wtWarpSynced } = registerControl('wtWarpSynced');
+export const { warpdepth } = registerControl('warpdepth');
 
 /**
  * Shape of the LFO for the wavetable oscillator's warp
  *
- * @name wtWarpShape
+ * @name warpshape
  * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
  */
-export const { wtWarpShape } = registerControl('wtWarpShape');
+export const { warpshape } = registerControl('warpshape');
 
 /**
  * DC offset of the LFO for the wavetable oscillator's warp
  *
- * @name wtWarpDCOffset
+ * @name warpdc
  * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
  */
-export const { wtWarpDCOffset } = registerControl('wtWarpDCOffset');
+export const { warpdc } = registerControl('warpdc');
 
 /**
  * Skew of the LFO for the wavetable oscillator's warp
  *
- * @name wtWarpSkew
+ * @name warpskew
  * @param {number | Pattern} skew How much to bend the LFO shape
  */
-export const { wtWarpSkew } = registerControl('wtWarpSkew');
+export const { warpskew } = registerControl('warpskew');
 
 /**
  * Type of warp (alteration of the waveform) to apply to the wavetable oscillator.
@@ -284,27 +282,43 @@ export const { wtWarpSkew } = registerControl('wtWarpSkew');
  * The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit,
  * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
  *
- * @name wtWarpMode
+ * @name warpmode
  * @param {number | string | Pattern} mode Warp mode
  * @synonyms wavetableWarpMode
  * @example
- * s("morgana").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1")
- *   .wtWarpMode("<asym bendp spin logistic sync wormhole brownian>*2")
+ * s("morgana").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
+ *   .warpmode("<asym bendp spin logistic sync wormhole brownian>*2")
  *
  */
-export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', 'wavetableWarpMode');
+export const { warpmode, wavetableWarpMode } = registerControl('warpmode', 'wavetableWarpMode');
 
 /**
  * Amount of randomness of the initial phase of the wavetable oscillator.
  *
- * @name wtPhaseRand
+ * @name wtphaserand
  * @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random)
  * @synonyms wavetablePhaseRand
  * @example
- * s("basique").bank("wt_digital").seg(16).wtPhaseRand("<0 1>")
+ * s("basique").bank("wt_digital").seg(16).wtphaserand("<0 1>")
  *
  */
-export const { wtPhaseRand, wavetablePhaseRand } = registerControl('wtPhaseRand', 'wavetablePhaseRand');
+export const { wtphaserand, wavetablePhaseRand } = registerControl('wtphaserand', 'wavetablePhaseRand');
+
+/**
+ * Amount of envelope applied wavetable oscillator's position envelope
+ *
+ * @name warpenv
+ * @param {number | Pattern} amount between 0 and 1
+ */
+export const { warpenv } = registerControl('warpenv');
+
+/**
+ * cycle synced rate of the LFO for the wavetable warp position
+ *
+ * @name warpsync
+ * @param {number | Pattern} rate rate in cycles
+ */
+export const { warpsync } = registerControl('warpsync');
 
 /**
  * Define a custom webaudio node to use as a sound source.
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 48264ec05..52ed9bff8 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -555,7 +555,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       audioNodes.forEach((n) => n?.disconnect());
       activeSoundSources.delete(chainID);
     };
-    const soundHandle = await onTrigger(t, value, onEnded);
+    const soundHandle = await onTrigger(t, value, onEnded, cps);
 
     if (soundHandle) {
       sourceNode = soundHandle.node;
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 095bd079e..eddc2e3e8 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -14,7 +14,7 @@ import {
 import { logger } from './logger.mjs';
 
 const WT_MAX_MIP_LEVELS = 6;
-export const WarpMode = Object.freeze({
+export const Warpmode = Object.freeze({
   NONE: 0,
   ASYM: 1,
   MIRROR: 2,
@@ -177,11 +177,17 @@ const _processTables = (json, baseUrl, frameLen, options = {}) => {
 };
 
 export function registerWaveTable(key, tables, params) {
-  registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, tables, params?.frameLen ?? 2048), {
-    type: 'wavetable',
-    tables,
-    ...params,
-  });
+  registerSound(
+    key,
+    (t, hapValue, onended, cps) => {
+      return onTriggerSynth(t, hapValue, onended, tables, cps, params?.frameLen ?? 2048);
+    },
+    {
+      type: 'wavetable',
+      tables,
+      ...params,
+    },
+  );
 }
 
 /**
@@ -214,13 +220,13 @@ export const tables = async (url, frameLen, json, options = {}) => {
     });
 };
 
-export async function onTriggerSynth(t, value, onended, tables, frameLen) {
-  const { s, n = 0, duration } = value;
+export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
+  const { s, n = 0, duration, wtenv } = value;
   const ac = getAudioContext();
   const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
-  let { wtWarpMode } = value;
-  if (typeof wtWarpMode === 'string') {
-    wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE;
+  let { warpmode } = value;
+  if (typeof warpmode === 'string') {
+    warpmode = Warpmode[warpmode.toUpperCase()] ?? Warpmode.NONE;
   }
   const frequency = getFrequencyFromValue(value);
   const { url, label } = getCommonSampleInfo(value, tables);
@@ -236,12 +242,12 @@ export async function onTriggerSynth(t, value, onended, tables, frameLen) {
       end: envEnd,
       frequency,
       detune: value.detune,
-      position: value.wtPos,
-      warp: value.wtWarp,
-      warpMode: wtWarpMode,
+      position: value.wt,
+      warp: value.warp,
+      warpMode: warpmode,
       voices: value.unison,
       spread: value.spread,
-      phaserand: value.wtPhaseRand,
+      phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
     },
     { outputChannelCount: [2] },
   );
@@ -250,36 +256,52 @@ export async function onTriggerSynth(t, value, onended, tables, frameLen) {
     logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
     return;
   }
-  const posADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease];
-  const warpADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease];
+  const posADSRParams = [value.wtattack, value.wtdecay, value.wtsustain, value.wtrelease];
+  const warpADSRParams = [value.warpattack, value.warpdecay, value.warpsustain, value.warprelease];
   const wtParams = source.parameters;
   const positionParam = wtParams.get('position');
   const warpParam = wtParams.get('warp');
   let posLFO;
-  if (posADSRParams.some((p) => p !== undefined)) {
-    const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams);
-    getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, 0, 1, t, holdEnd, 'linear');
-  } else {
+  if ([wtenv, ...posADSRParams].some((p) => p !== undefined)) {
+    const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams, 'linear', [0, 0.5, 0, 0.1]);
+    const min = value.wt ?? 0;
+    const max = (wtenv ?? 0.5) + min;
+    getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, min, max, t, holdEnd, 'linear');
+  }
+  let wtrate = value.wtrate;
+  if (value.wtsync != null) {
+    wtrate = wtrate = cps * value.wtsync;
+  }
+  if ([wtrate, value.wtdepth, value.wtshape, value.wtskew, value.wtdc].some((p) => p != null)) {
     const posLFO = getLfo(ac, t, endWithRelease, {
-      frequency: value.wtPosRate,
-      depth: value.wtPosDepth,
-      shape: value.wtPosShape,
-      skew: value.wtPosSkew,
-      dcoffset: value.wtPosDCOffset ?? 0,
+      frequency: wtrate,
+      depth: value.wtdepth ?? 0.5,
+      shape: value.wtshape,
+      skew: value.wtskew,
+      dcoffset: value.wtdc ?? 0,
     });
     posLFO.connect(positionParam);
   }
   let warpLFO;
+
   if (posADSRParams.some((p) => p !== undefined)) {
     const [wAttack, wDecay, wSustain, wRelease] = getADSRValues(warpADSRParams);
-    getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, 0, 1, t, holdEnd, 'linear');
-  } else {
+    const min = value.warp ?? 0;
+    const max = (value.warpenv ?? 0.5) + min;
+    getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, min, max, t, holdEnd, 'linear', [0, 0.5, 0, 0.1]);
+  }
+  let warprate = value.warprate;
+  if (value.warpsync != null) {
+    console.info(value.warpsync);
+    warprate = warprate = cps * value.warpsync;
+  }
+  if ([warprate, value.warpdepth, value.warpshape, value.warpskew, value.warpdc].some((p) => p != null)) {
     const warpLFO = getLfo(ac, t, endWithRelease, {
-      frequency: value.wtWarpRate,
-      depth: value.wtWarpDepth,
-      shape: value.wtWarpShape,
-      skew: value.wtWarpSkew,
-      dcoffset: value.wtWarpDCOffset ?? 0,
+      frequency: warprate,
+      depth: value.warpdepth ?? 0.5,
+      shape: value.warpshape,
+      skew: value.warpskew,
+      dcoffset: value.warpdc ?? 0,
     });
     warpLFO.connect(warpParam);
   }

From c689874bb473a58e1b7031a385227af675c4af08 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 14:57:12 -0400
Subject: [PATCH 53/80] simplify modulators

---
 packages/superdough/helpers.mjs   | 35 +++++++++++++
 packages/superdough/wavetable.mjs | 84 ++++++++++++++++---------------
 2 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 859329b20..c6ebd1b89 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -153,6 +153,41 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };
 
+// helper utility for applying standard modulators to a parameter
+export function applyParameterModulators(audioContext, param, start, end, envelopeValues, lfoValues) {
+  let { amount,offset,defaultAmount = 1, curve = 'linear', values, holdEnd, defaultValues } = envelopeValues;
+  
+  if (amount == null) {
+    const hasADSRParams = values.some(p => p != null);
+    amount = hasADSRParams ? defaultAmount : 0;
+  }
+
+  const min = offset ?? 0;
+  const max = amount + min
+  const diff = Math.abs(max - min)
+  if (diff) {
+    const [attack, decay, sustain, release] = getADSRValues(values, curve, defaultValues);
+    getParamADSR(param, attack, decay, sustain, release, min, max, start, holdEnd, curve);
+  }
+  let lfo
+  let {defaultDepth = 1,depth, dcoffset, ...getLfoInputs} = lfoValues
+  
+  if (depth == null) {
+    const hasLFOParams = Object.values(getLfoInputs).some(v => v != null)
+    depth = hasLFOParams ? defaultDepth : 0;
+  }
+  if (depth) {
+    lfo = getLfo(audioContext, start, end, {
+      depth,
+      dcoffset,
+      ...getLfoInputs
+    });
+    lfo.connect(param);
+  }
+
+  return { lfo, disconnect: () => lfo?.disconnect() }
+}
+
 export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor, model, drive) {
   const curve = 'exponential';
   const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]);
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index eddc2e3e8..bcf4ea461 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -1,6 +1,7 @@
 import { getAudioContext, registerSound } from './index.mjs';
 import { getCommonSampleInfo } from './util.mjs';
 import {
+  applyParameterModulators,
   destroyAudioWorkletNode,
   getADSRValues,
   getFrequencyFromValue,
@@ -220,8 +221,10 @@ export const tables = async (url, frameLen, json, options = {}) => {
     });
 };
 
+
+
 export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
-  const { s, n = 0, duration, wtenv } = value;
+  const { s, n = 0, duration } = value;
   const ac = getAudioContext();
   const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
   let { warpmode } = value;
@@ -245,7 +248,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
       position: value.wt,
       warp: value.warp,
       warpMode: warpmode,
-      voices: value.unison,
+      voices: Math.max(value.unison ?? 1, 1),
       spread: value.spread,
       phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
     },
@@ -261,55 +264,54 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const wtParams = source.parameters;
   const positionParam = wtParams.get('position');
   const warpParam = wtParams.get('warp');
-  let posLFO;
-  if ([wtenv, ...posADSRParams].some((p) => p !== undefined)) {
-    const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams, 'linear', [0, 0.5, 0, 0.1]);
-    const min = value.wt ?? 0;
-    const max = (wtenv ?? 0.5) + min;
-    getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, min, max, t, holdEnd, 'linear');
-  }
+
   let wtrate = value.wtrate;
   if (value.wtsync != null) {
-    wtrate = wtrate = cps * value.wtsync;
+    wtrate = cps * value.wtsync;
   }
-  if ([wtrate, value.wtdepth, value.wtshape, value.wtskew, value.wtdc].some((p) => p != null)) {
-    const posLFO = getLfo(ac, t, endWithRelease, {
-      frequency: wtrate,
-      depth: value.wtdepth ?? 0.5,
-      shape: value.wtshape,
-      skew: value.wtskew,
-      dcoffset: value.wtdc ?? 0,
-    });
-    posLFO.connect(positionParam);
-  }
-  let warpLFO;
 
-  if (posADSRParams.some((p) => p !== undefined)) {
-    const [wAttack, wDecay, wSustain, wRelease] = getADSRValues(warpADSRParams);
-    const min = value.warp ?? 0;
-    const max = (value.warpenv ?? 0.5) + min;
-    getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, min, max, t, holdEnd, 'linear', [0, 0.5, 0, 0.1]);
-  }
+  const wtPosModulators = applyParameterModulators(ac, positionParam, t, endWithRelease, {
+    offset: value.wt,
+    amount: value.wtenv,
+    defaultAmount: 0.5,  
+    shape: 'linear',
+    values: posADSRParams,
+    holdEnd,
+    defaultValues: [0, 0.5, 0, 0.1],
+  }, {
+    frequency: wtrate,
+    depth: value.wtdepth,
+    defaultDepth: 0.5,
+    shape: value.wtshape,
+    skew: value.wtskew,
+    dcoffset: value.wtdc ?? 0,
+  });
+
   let warprate = value.warprate;
   if (value.warpsync != null) {
-    console.info(value.warpsync);
     warprate = warprate = cps * value.warpsync;
   }
-  if ([warprate, value.warpdepth, value.warpshape, value.warpskew, value.warpdc].some((p) => p != null)) {
-    const warpLFO = getLfo(ac, t, endWithRelease, {
-      frequency: warprate,
-      depth: value.warpdepth ?? 0.5,
-      shape: value.warpshape,
-      skew: value.warpskew,
-      dcoffset: value.warpdc ?? 0,
-    });
-    warpLFO.connect(warpParam);
-  }
+  const wtWarpModulators = applyParameterModulators(ac, warpParam, t, endWithRelease, {
+    offset: value.warp,
+    amount: value.warpenv,
+    defaultAmount: 0.5,  
+    shape: 'linear',
+    values: warpADSRParams,
+    holdEnd,
+    defaultValues: [0, 0.5, 0, 0.1],
+  }, {
+    frequency: warprate,
+    depth: value.warpdepth,
+    defaultDepth: 0.5,
+    shape: value.warpshape,
+    skew: value.warpskew,
+    dcoffset: value.warpdc ?? 0,
+  });
   const vibratoOscillator = getVibratoOscillator(source.detune, value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
   getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
-  getPitchEnvelope(source.detune, value, t, holdEnd);
+  getPitchEnvelope(source.parameters.get('detune'), value, t, holdEnd);
   const handle = { node, source };
   const timeoutNode = webAudioTimeout(
     ac,
@@ -318,8 +320,8 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
       destroyAudioWorkletNode(source);
       vibratoOscillator?.stop();
       node.disconnect();
-      posLFO?.disconnect();
-      warpLFO?.disconnect();
+      wtPosModulators?.disconnect();
+      wtWarpModulators?.disconnect();
       onended();
     },
     t,

From 54ebc97ddc3531c4d814e800887e22afc6308d09 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 15:07:35 -0400
Subject: [PATCH 54/80] fix tests

---
 packages/superdough/helpers.mjs           |  22 +-
 packages/superdough/wavetable.mjs         |  80 ++--
 packages/superdough/worklets.mjs          |   2 +-
 test/__snapshots__/examples.test.mjs.snap | 440 +++++++++++-----------
 4 files changed, 278 insertions(+), 266 deletions(-)

diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index c6ebd1b89..47bca330d 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -155,37 +155,37 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
 
 // helper utility for applying standard modulators to a parameter
 export function applyParameterModulators(audioContext, param, start, end, envelopeValues, lfoValues) {
-  let { amount,offset,defaultAmount = 1, curve = 'linear', values, holdEnd, defaultValues } = envelopeValues;
-  
+  let { amount, offset, defaultAmount = 1, curve = 'linear', values, holdEnd, defaultValues } = envelopeValues;
+
   if (amount == null) {
-    const hasADSRParams = values.some(p => p != null);
+    const hasADSRParams = values.some((p) => p != null);
     amount = hasADSRParams ? defaultAmount : 0;
   }
 
   const min = offset ?? 0;
-  const max = amount + min
-  const diff = Math.abs(max - min)
+  const max = amount + min;
+  const diff = Math.abs(max - min);
   if (diff) {
     const [attack, decay, sustain, release] = getADSRValues(values, curve, defaultValues);
     getParamADSR(param, attack, decay, sustain, release, min, max, start, holdEnd, curve);
   }
-  let lfo
-  let {defaultDepth = 1,depth, dcoffset, ...getLfoInputs} = lfoValues
-  
+  let lfo;
+  let { defaultDepth = 1, depth, dcoffset, ...getLfoInputs } = lfoValues;
+
   if (depth == null) {
-    const hasLFOParams = Object.values(getLfoInputs).some(v => v != null)
+    const hasLFOParams = Object.values(getLfoInputs).some((v) => v != null);
     depth = hasLFOParams ? defaultDepth : 0;
   }
   if (depth) {
     lfo = getLfo(audioContext, start, end, {
       depth,
       dcoffset,
-      ...getLfoInputs
+      ...getLfoInputs,
     });
     lfo.connect(param);
   }
 
-  return { lfo, disconnect: () => lfo?.disconnect() }
+  return { lfo, disconnect: () => lfo?.disconnect() };
 }
 
 export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor, model, drive) {
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index bcf4ea461..4a21cabe4 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -221,8 +221,6 @@ export const tables = async (url, frameLen, json, options = {}) => {
     });
 };
 
-
-
 export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const { s, n = 0, duration } = value;
   const ac = getAudioContext();
@@ -270,43 +268,57 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
     wtrate = cps * value.wtsync;
   }
 
-  const wtPosModulators = applyParameterModulators(ac, positionParam, t, endWithRelease, {
-    offset: value.wt,
-    amount: value.wtenv,
-    defaultAmount: 0.5,  
-    shape: 'linear',
-    values: posADSRParams,
-    holdEnd,
-    defaultValues: [0, 0.5, 0, 0.1],
-  }, {
-    frequency: wtrate,
-    depth: value.wtdepth,
-    defaultDepth: 0.5,
-    shape: value.wtshape,
-    skew: value.wtskew,
-    dcoffset: value.wtdc ?? 0,
-  });
+  const wtPosModulators = applyParameterModulators(
+    ac,
+    positionParam,
+    t,
+    endWithRelease,
+    {
+      offset: value.wt,
+      amount: value.wtenv,
+      defaultAmount: 0.5,
+      shape: 'linear',
+      values: posADSRParams,
+      holdEnd,
+      defaultValues: [0, 0.5, 0, 0.1],
+    },
+    {
+      frequency: wtrate,
+      depth: value.wtdepth,
+      defaultDepth: 0.5,
+      shape: value.wtshape,
+      skew: value.wtskew,
+      dcoffset: value.wtdc ?? 0,
+    },
+  );
 
   let warprate = value.warprate;
   if (value.warpsync != null) {
     warprate = warprate = cps * value.warpsync;
   }
-  const wtWarpModulators = applyParameterModulators(ac, warpParam, t, endWithRelease, {
-    offset: value.warp,
-    amount: value.warpenv,
-    defaultAmount: 0.5,  
-    shape: 'linear',
-    values: warpADSRParams,
-    holdEnd,
-    defaultValues: [0, 0.5, 0, 0.1],
-  }, {
-    frequency: warprate,
-    depth: value.warpdepth,
-    defaultDepth: 0.5,
-    shape: value.warpshape,
-    skew: value.warpskew,
-    dcoffset: value.warpdc ?? 0,
-  });
+  const wtWarpModulators = applyParameterModulators(
+    ac,
+    warpParam,
+    t,
+    endWithRelease,
+    {
+      offset: value.warp,
+      amount: value.warpenv,
+      defaultAmount: 0.5,
+      shape: 'linear',
+      values: warpADSRParams,
+      holdEnd,
+      defaultValues: [0, 0.5, 0, 0.1],
+    },
+    {
+      frequency: warprate,
+      depth: value.warpdepth,
+      defaultDepth: 0.5,
+      shape: value.warpshape,
+      skew: value.warpskew,
+      dcoffset: value.warpdc ?? 0,
+    },
+  );
   const vibratoOscillator = getVibratoOscillator(source.detune, value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 0a2d40d91..cea5a1ea5 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1054,7 +1054,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warpMode', defaultValue: 0 },
       { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
-      { name: 'spread', defaultValue: 0.18, minValue: 0, maxValue: 1 },
+      { name: 'spread', defaultValue: 0.4, minValue: 0, maxValue: 1 },
       { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
     ];
   }
diff --git a/test/__snapshots__/examples.test.mjs.snap b/test/__snapshots__/examples.test.mjs.snap
index bfa4ae40e..73278947d 100644
--- a/test/__snapshots__/examples.test.mjs.snap
+++ b/test/__snapshots__/examples.test.mjs.snap
@@ -11789,6 +11789,112 @@ exports[`runs examples > example "vowel" example index 1 1`] = `
 ]
 `;
 
+exports[`runs examples > example "warp" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 1/4 → 3/8 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 5/8 → 3/4 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 7/8 → 1/1 | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 1/1 → 9/8 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 5/4 → 11/8 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 13/8 → 7/4 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 15/8 → 2/1 | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 2/1 → 17/8 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 9/4 → 19/8 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 21/8 → 11/4 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 23/8 → 3/1 | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 3/1 → 25/8 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:basique bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 13/4 → 27/8 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:basique bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:basique bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 29/8 → 15/4 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:basique bank:wt_digital note:F1 warp:0.75 warpmode:spin ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+  "[ 31/8 → 4/1 | s:basique bank:wt_digital note:F1 warp:1 warpmode:spin ]",
+]
+`;
+
+exports[`runs examples > example "warpmode" example index 0 1`] = `
+[
+  "[ 0/1 → 1/8 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:asym ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:asym ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:asym ]",
+  "[ 1/4 → 3/8 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:asym ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:asym ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:asym ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:bendp ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:bendp ]",
+  "[ 5/8 → 3/4 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:bendp ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:bendp ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:morgana bank:wt_digital note:F1 warp:1 warpmode:bendp ]",
+  "[ 7/8 → 1/1 | s:morgana bank:wt_digital note:F1 warp:1 warpmode:bendp ]",
+  "[ 1/1 → 9/8 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:spin ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 5/4 → 11/8 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:spin ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:spin ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:logistic ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:logistic ]",
+  "[ 13/8 → 7/4 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:logistic ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:logistic ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:morgana bank:wt_digital note:F1 warp:1 warpmode:logistic ]",
+  "[ 15/8 → 2/1 | s:morgana bank:wt_digital note:F1 warp:1 warpmode:logistic ]",
+  "[ 2/1 → 17/8 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:sync ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:sync ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:sync ]",
+  "[ 9/4 → 19/8 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:sync ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:sync ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:sync ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:wormhole ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:wormhole ]",
+  "[ 21/8 → 11/4 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:wormhole ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:wormhole ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:morgana bank:wt_digital note:F1 warp:1 warpmode:wormhole ]",
+  "[ 23/8 → 3/1 | s:morgana bank:wt_digital note:F1 warp:1 warpmode:wormhole ]",
+  "[ 3/1 → 25/8 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:brownian ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:morgana bank:wt_digital note:F1 warp:0 warpmode:brownian ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:brownian ]",
+  "[ 13/4 → 27/8 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:brownian ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:morgana bank:wt_digital note:F1 warp:0.25 warpmode:brownian ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:brownian ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:morgana bank:wt_digital note:F1 warp:0.5 warpmode:asym ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:asym ]",
+  "[ 29/8 → 15/4 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:asym ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:morgana bank:wt_digital note:F1 warp:0.75 warpmode:asym ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:morgana bank:wt_digital note:F1 warp:1 warpmode:asym ]",
+  "[ 31/8 → 4/1 | s:morgana bank:wt_digital note:F1 warp:1 warpmode:asym ]",
+]
+`;
+
 exports[`runs examples > example "wchoose" example index 0 1`] = `
 [
   "[ 0/1 → 1/5 | note:c2 s:sine ]",
@@ -11993,231 +12099,125 @@ exports[`runs examples > example "withValue" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "wtPhaseRand" example index 0 1`] = `
+exports[`runs examples > example "wt" example index 0 1`] = `
 [
-  "[ 0/1 → 1/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 1/16 → 1/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 1/8 → 3/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 3/16 → 1/4 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 1/4 → 5/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 5/16 → 3/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 3/8 → 7/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 7/16 → 1/2 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 1/2 → 9/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 9/16 → 5/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 5/8 → 11/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 11/16 → 3/4 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 3/4 → 13/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 13/16 → 7/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 7/8 → 15/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 15/16 → 1/1 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 1/1 → 17/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 17/16 → 9/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 9/8 → 19/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 19/16 → 5/4 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 5/4 → 21/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 21/16 → 11/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 11/8 → 23/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 23/16 → 3/2 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 3/2 → 25/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 25/16 → 13/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 13/8 → 27/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 27/16 → 7/4 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 7/4 → 29/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 29/16 → 15/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 15/8 → 31/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 31/16 → 2/1 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 2/1 → 33/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 33/16 → 17/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 17/8 → 35/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 35/16 → 9/4 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 9/4 → 37/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 37/16 → 19/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 19/8 → 39/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 39/16 → 5/2 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 5/2 → 41/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 41/16 → 21/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 21/8 → 43/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 43/16 → 11/4 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 11/4 → 45/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 45/16 → 23/8 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 23/8 → 47/16 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 47/16 → 3/1 | s:basique bank:wt_digital wtPhaseRand:0 ]",
-  "[ 3/1 → 49/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 49/16 → 25/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 25/8 → 51/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 51/16 → 13/4 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 13/4 → 53/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 53/16 → 27/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 27/8 → 55/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 55/16 → 7/2 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 7/2 → 57/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 57/16 → 29/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 29/8 → 59/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 59/16 → 15/4 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 15/4 → 61/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 61/16 → 31/8 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 31/8 → 63/16 | s:basique bank:wt_digital wtPhaseRand:1 ]",
-  "[ 63/16 → 4/1 | s:basique bank:wt_digital wtPhaseRand:1 ]",
+  "[ 0/1 → 1/8 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ (1/8 → 1/5) ⇝ 1/4 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ 1/8 ⇜ (1/5 → 1/4) | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 1/4 → 3/8 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ (3/8 → 2/5) ⇝ 1/2 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 3/8 ⇜ (2/5 → 1/2) | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ (1/2 → 3/5) ⇝ 5/8 | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ 1/2 ⇜ (3/5 → 5/8) | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 5/8 → 3/4 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ (3/4 → 4/5) ⇝ 7/8 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 3/4 ⇜ (4/5 → 7/8) | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 7/8 → 1/1 | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 1/1 → 9/8 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ (9/8 → 6/5) ⇝ 5/4 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ 9/8 ⇜ (6/5 → 5/4) | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 5/4 → 11/8 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ (11/8 → 7/5) ⇝ 3/2 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 11/8 ⇜ (7/5 → 3/2) | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ (3/2 → 8/5) ⇝ 13/8 | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ 3/2 ⇜ (8/5 → 13/8) | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 13/8 → 7/4 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ (7/4 → 9/5) ⇝ 15/8 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 7/4 ⇜ (9/5 → 15/8) | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 15/8 → 2/1 | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 2/1 → 17/8 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ (17/8 → 11/5) ⇝ 9/4 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ 17/8 ⇜ (11/5 → 9/4) | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 9/4 → 19/8 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ (19/8 → 12/5) ⇝ 5/2 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 19/8 ⇜ (12/5 → 5/2) | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ (5/2 → 13/5) ⇝ 21/8 | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ 5/2 ⇜ (13/5 → 21/8) | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 21/8 → 11/4 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ (11/4 → 14/5) ⇝ 23/8 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 11/4 ⇜ (14/5 → 23/8) | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 23/8 → 3/1 | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 3/1 → 25/8 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ (25/8 → 16/5) ⇝ 13/4 | s:squelch bank:wt_digital note:F1 wt:0 ]",
+  "[ 25/8 ⇜ (16/5 → 13/4) | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 13/4 → 27/8 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ (27/8 → 17/5) ⇝ 7/2 | s:squelch bank:wt_digital note:F1 wt:0.25 ]",
+  "[ 27/8 ⇜ (17/5 → 7/2) | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ (7/2 → 18/5) ⇝ 29/8 | s:squelch bank:wt_digital note:F1 wt:0.5 ]",
+  "[ 7/2 ⇜ (18/5 → 29/8) | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 29/8 → 15/4 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ (15/4 → 19/5) ⇝ 31/8 | s:squelch bank:wt_digital note:F1 wt:0.75 ]",
+  "[ 15/4 ⇜ (19/5 → 31/8) | s:squelch bank:wt_digital note:F1 wt:1 ]",
+  "[ 31/8 → 4/1 | s:squelch bank:wt_digital note:F1 wt:1 ]",
 ]
 `;
 
-exports[`runs examples > example "wtPos" example index 0 1`] = `
+exports[`runs examples > example "wtphaserand" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 1/4 → 3/8 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 5/8 → 3/4 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 7/8 → 1/1 | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 1/1 → 9/8 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 5/4 → 11/8 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 13/8 → 7/4 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 15/8 → 2/1 | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 2/1 → 17/8 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 9/4 → 19/8 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 21/8 → 11/4 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 23/8 → 3/1 | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 3/1 → 25/8 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:squelch bank:wt_digital note:F1 wtPos:0 ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 13/4 → 27/8 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:squelch bank:wt_digital note:F1 wtPos:0.25 ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:squelch bank:wt_digital note:F1 wtPos:0.5 ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 29/8 → 15/4 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:squelch bank:wt_digital note:F1 wtPos:0.75 ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-  "[ 31/8 → 4/1 | s:squelch bank:wt_digital note:F1 wtPos:1 ]",
-]
-`;
-
-exports[`runs examples > example "wtWarp" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 1/4 → 3/8 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 5/8 → 3/4 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 7/8 → 1/1 | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 1/1 → 9/8 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 5/4 → 11/8 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 13/8 → 7/4 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 15/8 → 2/1 | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 2/1 → 17/8 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 9/4 → 19/8 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 21/8 → 11/4 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 23/8 → 3/1 | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 3/1 → 25/8 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:basique bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 13/4 → 27/8 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:basique bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:basique bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 29/8 → 15/4 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:basique bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:spin ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-  "[ 31/8 → 4/1 | s:basique bank:wt_digital note:F1 wtWarp:1 wtWarpMode:spin ]",
-]
-`;
-
-exports[`runs examples > example "wtWarpMode" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:asym ]",
-  "[ (1/8 → 1/5) ⇝ 1/4 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:asym ]",
-  "[ 1/8 ⇜ (1/5 → 1/4) | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ 1/4 → 3/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ (3/8 → 2/5) ⇝ 1/2 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:asym ]",
-  "[ 3/8 ⇜ (2/5 → 1/2) | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:asym ]",
-  "[ (1/2 → 3/5) ⇝ 5/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:bendp ]",
-  "[ 1/2 ⇜ (3/5 → 5/8) | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ 5/8 → 3/4 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ (3/4 → 4/5) ⇝ 7/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:bendp ]",
-  "[ 3/4 ⇜ (4/5 → 7/8) | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:bendp ]",
-  "[ 7/8 → 1/1 | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:bendp ]",
-  "[ 1/1 → 9/8 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ (9/8 → 6/5) ⇝ 5/4 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:spin ]",
-  "[ 9/8 ⇜ (6/5 → 5/4) | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 5/4 → 11/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ (11/8 → 7/5) ⇝ 3/2 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:spin ]",
-  "[ 11/8 ⇜ (7/5 → 3/2) | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:spin ]",
-  "[ (3/2 → 8/5) ⇝ 13/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:logistic ]",
-  "[ 3/2 ⇜ (8/5 → 13/8) | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ 13/8 → 7/4 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ (7/4 → 9/5) ⇝ 15/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:logistic ]",
-  "[ 7/4 ⇜ (9/5 → 15/8) | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:logistic ]",
-  "[ 15/8 → 2/1 | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:logistic ]",
-  "[ 2/1 → 17/8 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:sync ]",
-  "[ (17/8 → 11/5) ⇝ 9/4 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:sync ]",
-  "[ 17/8 ⇜ (11/5 → 9/4) | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ 9/4 → 19/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ (19/8 → 12/5) ⇝ 5/2 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:sync ]",
-  "[ 19/8 ⇜ (12/5 → 5/2) | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:sync ]",
-  "[ (5/2 → 13/5) ⇝ 21/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:wormhole ]",
-  "[ 5/2 ⇜ (13/5 → 21/8) | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ 21/8 → 11/4 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ (11/4 → 14/5) ⇝ 23/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:wormhole ]",
-  "[ 11/4 ⇜ (14/5 → 23/8) | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:wormhole ]",
-  "[ 23/8 → 3/1 | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:wormhole ]",
-  "[ 3/1 → 25/8 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:brownian ]",
-  "[ (25/8 → 16/5) ⇝ 13/4 | s:morgana bank:wt_digital note:F1 wtWarp:0 wtWarpMode:brownian ]",
-  "[ 25/8 ⇜ (16/5 → 13/4) | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ 13/4 → 27/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ (27/8 → 17/5) ⇝ 7/2 | s:morgana bank:wt_digital note:F1 wtWarp:0.25 wtWarpMode:brownian ]",
-  "[ 27/8 ⇜ (17/5 → 7/2) | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:brownian ]",
-  "[ (7/2 → 18/5) ⇝ 29/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.5 wtWarpMode:asym ]",
-  "[ 7/2 ⇜ (18/5 → 29/8) | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ 29/8 → 15/4 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ (15/4 → 19/5) ⇝ 31/8 | s:morgana bank:wt_digital note:F1 wtWarp:0.75 wtWarpMode:asym ]",
-  "[ 15/4 ⇜ (19/5 → 31/8) | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:asym ]",
-  "[ 31/8 → 4/1 | s:morgana bank:wt_digital note:F1 wtWarp:1 wtWarpMode:asym ]",
+  "[ 0/1 → 1/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 1/16 → 1/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 1/8 → 3/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 3/16 → 1/4 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 1/4 → 5/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 5/16 → 3/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 3/8 → 7/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 7/16 → 1/2 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 1/2 → 9/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 9/16 → 5/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 5/8 → 11/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 11/16 → 3/4 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 3/4 → 13/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 13/16 → 7/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 7/8 → 15/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 15/16 → 1/1 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 1/1 → 17/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 17/16 → 9/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 9/8 → 19/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 19/16 → 5/4 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 5/4 → 21/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 21/16 → 11/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 11/8 → 23/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 23/16 → 3/2 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 3/2 → 25/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 25/16 → 13/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 13/8 → 27/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 27/16 → 7/4 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 7/4 → 29/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 29/16 → 15/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 15/8 → 31/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 31/16 → 2/1 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 2/1 → 33/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 33/16 → 17/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 17/8 → 35/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 35/16 → 9/4 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 9/4 → 37/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 37/16 → 19/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 19/8 → 39/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 39/16 → 5/2 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 5/2 → 41/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 41/16 → 21/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 21/8 → 43/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 43/16 → 11/4 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 11/4 → 45/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 45/16 → 23/8 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 23/8 → 47/16 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 47/16 → 3/1 | s:basique bank:wt_digital wtphaserand:0 ]",
+  "[ 3/1 → 49/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 49/16 → 25/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 25/8 → 51/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 51/16 → 13/4 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 13/4 → 53/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 53/16 → 27/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 27/8 → 55/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 55/16 → 7/2 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 7/2 → 57/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 57/16 → 29/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 29/8 → 59/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 59/16 → 15/4 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 15/4 → 61/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 61/16 → 31/8 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 31/8 → 63/16 | s:basique bank:wt_digital wtphaserand:1 ]",
+  "[ 63/16 → 4/1 | s:basique bank:wt_digital wtphaserand:1 ]",
 ]
 `;
 

From bf3fe605d9a71543e9922f7983f03e2f89129be9 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 15:21:06 -0400
Subject: [PATCH 55/80] fix unison gain

---
 packages/superdough/worklets.mjs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index cea5a1ea5..7f5cbcf23 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1054,7 +1054,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
       { name: 'warpMode', defaultValue: 0 },
       { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
-      { name: 'spread', defaultValue: 0.4, minValue: 0, maxValue: 1 },
+      { name: 'spread', defaultValue: 0.7, minValue: 0, maxValue: 1 },
       { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
     ];
   }
@@ -1239,7 +1239,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     }
     const outL = outputs[0][0];
     const outR = outputs[0][1] || outputs[0][0];
-    const gainAdjustment = 0.3;
 
     if (!this.tables) {
       outL.fill(0);
@@ -1256,13 +1255,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const warpAmount = pv(parameters.warp, i);
       const warpMode = pv(parameters.warpMode, i);
       const voices = pv(parameters.voices, i);
-      const spread = voices > 1 ? pv(parameters.spread, i) : 0;
       const phaseRand = pv(parameters.phaserand, i);
+      const spread = voices > 1 ? pv(parameters.spread, i) : 0;
       const gain1 = Math.sqrt(0.5 - 0.5 * spread);
       const gain2 = Math.sqrt(0.5 + 0.5 * spread);
       let f = pv(parameters.frequency, i);
       f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
-      const normalizer = 0.3 / voices;
+      const normalizer = 0.3 / Math.sqrt(voices);
       for (let n = 0; n < voices; n++) {
         const isOdd = (n & 1) == 1;
         let gainL = gain1;

From d94f145649b3bf3ea77d49fe26246fc075b353e0 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 15:23:58 -0400
Subject: [PATCH 56/80] fix vib

---
 packages/superdough/wavetable.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 4a21cabe4..48b7e661c 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -319,7 +319,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
       dcoffset: value.warpdc ?? 0,
     },
   );
-  const vibratoOscillator = getVibratoOscillator(source.detune, value, t);
+  const vibratoOscillator = getVibratoOscillator(source.parameters.get('detune'), value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
   getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');

From 8d45016ccf4ca0d63e5d903a63c21e54f85e8785 Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 19:11:13 -0400
Subject: [PATCH 57/80] working

---
 website/public/uzu-wavetables.json | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/website/public/uzu-wavetables.json b/website/public/uzu-wavetables.json
index d9e0eeb90..b2d662d5d 100644
--- a/website/public/uzu-wavetables.json
+++ b/website/public/uzu-wavetables.json
@@ -5,35 +5,11 @@
         "wt_digital/wt_basique.wav",
         "wt_digital/wt_crickets.wav",
         "wt_digital/wt_curses.wav",
-        "wt_digital/wt_earl_grey.wav",
-        "wt_digital/wt_echoes.wav",
-        "wt_digital/wt_glimmer.wav",
-        "wt_digital/wt_majick.wav",
-        "wt_digital/wt_meditation.wav",
-        "wt_digital/wt_morgana.wav",
-        "wt_digital/wt_red_alert.wav",
-        "wt_digital/wt_sad_piano.wav",
-        "wt_digital/wt_shook.wav",
-        "wt_digital/wt_sludge.wav",
-        "wt_digital/wt_squelch.wav",
-        "wt_digital/wt_summer.wav",
-        "wt_digital/wt_wasp.wav"
+        "wt_digital/wt_echoes.wav"
     ],
     "wt_digital_bad_day": ["wt_digital/wt_bad_day.wav"],
     "wt_digital_basique": ["wt_digital/wt_basique.wav"],
     "wt_digital_crickets": ["wt_digital/wt_crickets.wav"],
     "wt_digital_curses": ["wt_digital/wt_curses.wav"],
-    "wt_digital_earl_grey": ["wt_digital/wt_earl_grey.wav"],
-    "wt_digital_echoes": ["wt_digital/wt_echoes.wav"],
-    "wt_digital_glimmer": ["wt_digital/wt_glimmer.wav"],
-    "wt_digital_majick": ["wt_digital/wt_majick.wav"],
-    "wt_digital_meditation": ["wt_digital/wt_meditation.wav"],
-    "wt_digital_morgana": ["wt_digital/wt_morgana.wav"],
-    "wt_digital_red_alert": ["wt_digital/wt_red_alert.wav"],
-    "wt_digital_sad_piano": ["wt_digital/wt_sad_piano.wav"],
-    "wt_digital_shook": ["wt_digital/wt_shook.wav"],
-    "wt_digital_sludge": ["wt_digital/wt_sludge.wav"],
-    "wt_digital_squelch": ["wt_digital/wt_squelch.wav"],
-    "wt_digital_summer": ["wt_digital/wt_summer.wav"],
-    "wt_digital_wasp": ["wt_digital/wt_wasp.wav"]
+    "wt_digital_echoes": ["wt_digital/wt_echoes.wav"]
 }
\ No newline at end of file

From 48718daea8c6e60a5430a639a09159b795cf2e9b Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Sun, 28 Sep 2025 19:57:19 -0400
Subject: [PATCH 58/80] add_vgame

---
 website/public/uzu-wavetables.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/website/public/uzu-wavetables.json b/website/public/uzu-wavetables.json
index b2d662d5d..375b1fad3 100644
--- a/website/public/uzu-wavetables.json
+++ b/website/public/uzu-wavetables.json
@@ -11,5 +11,18 @@
     "wt_digital_basique": ["wt_digital/wt_basique.wav"],
     "wt_digital_crickets": ["wt_digital/wt_crickets.wav"],
     "wt_digital_curses": ["wt_digital/wt_curses.wav"],
-    "wt_digital_echoes": ["wt_digital/wt_echoes.wav"]
+    "wt_digital_echoes": ["wt_digital/wt_echoes.wav"],
+    "wt_vgame": [
+        "wt_vgame/wt_vgame10.wav",
+        "wt_vgame/wt_vgame11.wav",
+        "wt_vgame/wt_vgame12.wav",
+        "wt_vgame/wt_vgame13.wav",
+        "wt_vgame/wt_vgame14.wav",
+        "wt_vgame/wt_vgame15.wav",
+        "wt_vgame/wt_vgame16.wav",
+        "wt_vgame/wt_vgame17.wav",
+        "wt_vgame/wt_vgame18.wav",
+        "wt_vgame/wt_vgame19.wav",
+        "wt_vgame/wt_vgame20.wav"
+    ]
 }
\ No newline at end of file

From 4de0c11f8c0834868ae346125d35e77134bf4d7d Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Mon, 29 Sep 2025 14:15:50 -0700
Subject: [PATCH 59/80] Remove mipmaps, fix clamping of parameters

---
 packages/superdough/wavetable.mjs | 32 +++++---------------
 packages/superdough/worklets.mjs  | 49 +++++++++++++------------------
 2 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 48b7e661c..505e6ac38 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -5,7 +5,6 @@ import {
   destroyAudioWorkletNode,
   getADSRValues,
   getFrequencyFromValue,
-  getLfo,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
@@ -14,7 +13,6 @@ import {
 } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
-const WT_MAX_MIP_LEVELS = 6;
 export const Warpmode = Object.freeze({
   NONE: 0,
   ASYM: 1,
@@ -50,25 +48,7 @@ async function loadWavetableFrames(url, label, frameLen = 2048) {
     const start = i * frameLen;
     frames[i] = ch0.subarray(start, start + frameLen);
   }
-
-  // build mipmaps
-  const mipmaps = [frames];
-  let levelFrames = frames;
-  for (let level = 1; level < WT_MAX_MIP_LEVELS; level++) {
-    const prevLen = levelFrames[0].length;
-    if (prevLen <= 32) break;
-    const nextLen = prevLen >> 1;
-    const next = levelFrames.map((src) => {
-      const out = new Float32Array(nextLen);
-      for (let j = 0; j < nextLen; j++) {
-        out[j] = (src[2 * j] + src[2 * j + 1]) / 2;
-      }
-      return out;
-    });
-    mipmaps.push(next);
-    levelFrames = next;
-  }
-  return { frames, mipmaps, frameLen, numFrames };
+  return { frames, frameLen, numFrames };
 }
 
 const loadCache = {};
@@ -222,7 +202,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
 };
 
 export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
-  const { s, n = 0, duration } = value;
+  const { s, n = 0, duration, clip } = value;
   const ac = getAudioContext();
   const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
   let { warpmode } = value;
@@ -232,7 +212,10 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const frequency = getFrequencyFromValue(value);
   const { url, label } = getCommonSampleInfo(value, tables);
   const payload = await loadWavetableFrames(url, label, frameLen);
-  const holdEnd = t + duration;
+  let holdEnd = t + duration;
+  if (clip !== undefined) {
+    holdEnd = Math.min(t + clip * duration, holdEnd);
+  }
   const endWithRelease = holdEnd + release;
   const envEnd = endWithRelease + 0.01;
   const source = getWorklet(
@@ -252,7 +235,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
     },
     { outputChannelCount: [2] },
   );
-  source.port.postMessage({ type: 'tables', payload });
+  source.port.postMessage({ type: 'table', payload });
   if (ac.currentTime > t) {
     logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
     return;
@@ -328,7 +311,6 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const timeoutNode = webAudioTimeout(
     ac,
     () => {
-      source.disconnect();
       destroyAudioWorkletNode(source);
       vibratoOscillator?.stop();
       node.disconnect();
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 7f5cbcf23..814c97f41 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -137,7 +137,7 @@ class LFOProcessor extends AudioWorkletProcessor {
     }
   }
 
-  process(inputs, outputs, parameters) {
+  process(_inputs, outputs, parameters) {
     const begin = parameters['begin'][0];
     if (currentTime >= parameters.end[0]) {
       return false;
@@ -510,7 +510,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
       },
     ];
   }
-  process(input, outputs, params) {
+  process(_input, outputs, params) {
     if (currentTime <= params.begin[0]) {
       return true;
     }
@@ -1061,7 +1061,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 
   constructor(options) {
     super(options);
-    this.tables = null;
+    this.frames = null;
     this.frameLen = 0;
     this.numFrames = 0;
     this.phase = [];
@@ -1069,23 +1069,14 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 
     this.port.onmessage = (e) => {
       const { type, payload } = e.data || {};
-      if (type === 'tables') {
-        this.tables = payload.mipmaps;
+      if (type === 'table') {
+        this.frames = payload.frames;
         this.frameLen = payload.frameLen;
-        this.numFrames = this.tables[0].length;
+        this.numFrames = this.frames.length;
       }
     };
   }
 
-  _chooseMip(dphi) {
-    const approxHarm = Math.min(64, 1 / Math.max(1e-6, dphi));
-    let level = 0;
-    while (level + 1 < (this.tables?.length || 1) && approxHarm < this.tables[level][0].length / 8) {
-      level++;
-    }
-    return level;
-  }
-
   _mirror(x) {
     return 1 - Math.abs(2 * x - 1);
   }
@@ -1222,11 +1213,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
   }
 
   _sampleFrame(frame, phase) {
-    const pos = phase * frame.length;
+    const len = frame.length;
+    const pos = phase * len;
     const i = pos | 0;
     const frac = pos - i;
-    const a = frame[i % frame.length];
-    const b = frame[(i + 1) % frame.length];
+    const a = frame[i];
+    const i1 = i + 1 < len ? i + 1 : 0; // fast wrap
+    const b = frame[i1];
     return a + (b - a) * frac;
   }
 
@@ -1240,23 +1233,23 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     const outL = outputs[0][0];
     const outR = outputs[0][1] || outputs[0][0];
 
-    if (!this.tables) {
+    if (!this.frames) {
       outL.fill(0);
       if (outR !== outL) outR.set(outL);
       return true;
     }
-
+    const invSR = 1 / sampleRate;
     for (let i = 0; i < outL.length; i++) {
       const detune = pv(parameters.detune, i);
-      const tablePos = pv(parameters.position, i);
+      const tablePos = clamp(pv(parameters.position, i), 0, 1);
       const idx = tablePos * (this.numFrames - 1);
       const fIdx = idx | 0;
       const frac = idx - fIdx;
-      const warpAmount = pv(parameters.warp, i);
+      const warpAmount = clamp(pv(parameters.warp, i), 0, 1);
       const warpMode = pv(parameters.warpMode, i);
       const voices = pv(parameters.voices, i);
-      const phaseRand = pv(parameters.phaserand, i);
-      const spread = voices > 1 ? pv(parameters.spread, i) : 0;
+      const phaseRand = clamp(pv(parameters.phaserand, i), 0, 1);
+      const spread = voices > 1 ? clamp(pv(parameters.spread, i), 0, 1) : 0;
       const gain1 = Math.sqrt(0.5 - 0.5 * spread);
       const gain2 = Math.sqrt(0.5 + 0.5 * spread);
       let f = pv(parameters.frequency, i);
@@ -1272,15 +1265,13 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
           gainR = gain1;
         }
         const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
-        const dPhase = fVoice / sampleRate;
-        const level = this._chooseMip(dPhase);
-        const table = this.tables[level];
+        const dPhase = fVoice * invSR;
 
         // warp phase then sample
         this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
         const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
-        const s0 = this._sampleFrame(table[fIdx], ph);
-        const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
+        const s0 = this._sampleFrame(this.frames[fIdx], ph);
+        const s1 = this._sampleFrame(this.frames[Math.min(this.numFrames - 1, fIdx + 1)], ph);
         let s = s0 + (s1 - s0) * frac;
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;

From bad498a1e512061c663bd42408968e9d5d348a0d Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Tue, 30 Sep 2025 16:21:28 -0700
Subject: [PATCH 60/80] Remove unused var

---
 packages/superdough/worklets.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 814c97f41..aa49ea32a 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1065,7 +1065,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     this.frameLen = 0;
     this.numFrames = 0;
     this.phase = [];
-    this.syncRatio = 1;
 
     this.port.onmessage = (e) => {
       const { type, payload } = e.data || {};

From cdc5e5f3f33d0fcf06d346120124d76c575dd22a Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 30 Sep 2025 19:45:30 -0400
Subject: [PATCH 61/80] working

---
 packages/superdough/superdoughoutput.mjs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index 9ef7bcbf3..221f80a26 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -135,12 +135,14 @@ export class SuperdoughOutput {
   }
 
   reset() {
+    this.disconnect()
+    this.initializeAudio();
+  }
+  disconnect() {
     this.channelMerger.disconnect();
     this.destinationGain.disconnect();
     this.destinationGain = null;
     this.channelMerger = null;
-    this.nodes = {};
-    this.initializeAudio();
   }
   connectToDestination = (input, channels = [0, 1]) => {
     //This upmix can be removed if correct channel counts are set throughout the app,
@@ -172,6 +174,7 @@ export class SuperdoughAudioController {
     Array.from(this.nodes).forEach((node) => {
       node.disconnect();
     });
+    this.nodes = {}
     this.output.reset();
   }
 

From 9f8143e062239658426c483f7ee9433ed839e3cd Mon Sep 17 00:00:00 2001
From: "Jade (Rose) Rowland" <jaderowlanddev@gmail.com>
Date: Tue, 30 Sep 2025 19:46:53 -0400
Subject: [PATCH 62/80] format

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

diff --git a/packages/superdough/superdoughoutput.mjs b/packages/superdough/superdoughoutput.mjs
index 221f80a26..afe91e71e 100644
--- a/packages/superdough/superdoughoutput.mjs
+++ b/packages/superdough/superdoughoutput.mjs
@@ -135,7 +135,7 @@ export class SuperdoughOutput {
   }
 
   reset() {
-    this.disconnect()
+    this.disconnect();
     this.initializeAudio();
   }
   disconnect() {
@@ -174,7 +174,7 @@ export class SuperdoughAudioController {
     Array.from(this.nodes).forEach((node) => {
       node.disconnect();
     });
-    this.nodes = {}
+    this.nodes = {};
     this.output.reset();
   }
 

From a2b8407fbb86477ae4e684481c1cb4915f64307b Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Tue, 30 Sep 2025 23:08:28 -0500
Subject: [PATCH 63/80] Add back mipmaps; add caching

---
 packages/superdough/wavetable.mjs | 33 +++++++++++++----------
 packages/superdough/worklets.mjs  | 45 +++++++++++++++++++++++++------
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 505e6ac38..44367f786 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -38,21 +38,25 @@ export const Warpmode = Object.freeze({
   FLIP: 21,
 });
 
-async function loadWavetableFrames(url, label, frameLen = 2048) {
-  const buf = await loadBuffer(url, label);
-  const ch0 = buf.getChannelData(0);
-  const total = ch0.length;
-  const numFrames = Math.max(1, Math.floor(total / frameLen));
-  const frames = new Array(numFrames);
-  for (let i = 0; i < numFrames; i++) {
-    const start = i * frameLen;
-    frames[i] = ch0.subarray(start, start + frameLen);
+const seenKeys = new Set();
+async function getPayload(url, label, frameLen = 2048) {
+  const key = `${url},${frameLen}`;
+  if (!seenKeys.has(key)) {
+    const buf = await loadBuffer(url, label);
+    const ch0 = buf.getChannelData(0);
+    const total = ch0.length;
+    const numFrames = Math.max(1, Math.floor(total / frameLen));
+    const frames = new Array(numFrames);
+    for (let i = 0; i < numFrames; i++) {
+      const start = i * frameLen;
+      frames[i] = ch0.subarray(start, start + frameLen);
+    }
+    seenKeys.add(key);
+    return { frames, frameLen, numFrames, key };
   }
-  return { frames, frameLen, numFrames };
+  return { frameLen, key }; // worklet will use the cached version
 }
 
-const loadCache = {};
-
 function humanFileSize(bytes, si) {
   var thresh = si ? 1000 : 1024;
   if (bytes < thresh) return bytes + ' B';
@@ -97,6 +101,7 @@ async function decodeAtNativeRate(arr) {
   return await tempAC.decodeAudioData(arr);
 }
 
+const loadCache = {};
 const loadBuffer = (url, label) => {
   url = url.replace('#', '%23');
   if (!loadCache[url]) {
@@ -211,7 +216,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   }
   const frequency = getFrequencyFromValue(value);
   const { url, label } = getCommonSampleInfo(value, tables);
-  const payload = await loadWavetableFrames(url, label, frameLen);
+  const payload = await getPayload(url, label, frameLen);
   let holdEnd = t + duration;
   if (clip !== undefined) {
     holdEnd = Math.min(t + clip * duration, holdEnd);
@@ -305,7 +310,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   const vibratoOscillator = getVibratoOscillator(source.parameters.get('detune'), value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
-  getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
+  getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3, t, holdEnd, 'linear');
   getPitchEnvelope(source.parameters.get('detune'), value, t, holdEnd);
   const handle = { node, source };
   const timeoutNode = webAudioTimeout(
diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index aa49ea32a..9b190a456 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1043,6 +1043,7 @@ function brownian(x, oct = 4) {
   return (sum / norm) * 2 - 1;
 }
 
+const tablesCache = {};
 class WavetableOscillatorProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
     return [
@@ -1061,7 +1062,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 
   constructor(options) {
     super(options);
-    this.frames = null;
     this.frameLen = 0;
     this.numFrames = 0;
     this.phase = [];
@@ -1069,9 +1069,28 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     this.port.onmessage = (e) => {
       const { type, payload } = e.data || {};
       if (type === 'table') {
-        this.frames = payload.frames;
+        const key = payload.key;
         this.frameLen = payload.frameLen;
-        this.numFrames = this.frames.length;
+        if (!tablesCache[key]) {
+          const tables = [payload.frames];
+          let table = tables[0];
+          for (let level = 1; level < 1; level++) {
+            const nextLen = table.length >> 1;
+            const nextTable = table.map((frame) => {
+              const avg = new Float32Array(nextLen);
+              for (let i = 0; i < nextLen; i++) {
+                avg[i] = (frame[2 * i] + frame[2 * i + 1]) / 2;
+              }
+              return avg;
+            });
+            tables.push(nextTable);
+            table = nextTable;
+            if (nextLen <= 32) break;
+          }
+          tablesCache[key] = tables;
+        }
+        this.tables = tablesCache[key];
+        this.numFrames = this.tables[0].length;
       }
     };
   }
@@ -1222,6 +1241,15 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     return a + (b - a) * frac;
   }
 
+  _chooseMip(dphi) {
+    const approxHarm = clamp(dphi, 1e-6, 64);
+    let level = 0;
+    while (level + 1 < (this.tables?.length || 1) && approxHarm < this.tables[level][0].length / 8) {
+      level++;
+    }
+    return level;
+  }
+
   process(_inputs, outputs, parameters) {
     if (currentTime >= parameters.end[0]) {
       return false;
@@ -1231,8 +1259,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     }
     const outL = outputs[0][0];
     const outR = outputs[0][1] || outputs[0][0];
-
-    if (!this.frames) {
+    if (!this.tables) {
       outL.fill(0);
       if (outR !== outL) outR.set(outL);
       return true;
@@ -1253,7 +1280,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const gain2 = Math.sqrt(0.5 + 0.5 * spread);
       let f = pv(parameters.frequency, i);
       f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
-      const normalizer = 0.3 / Math.sqrt(voices);
+      const normalizer = 1 / Math.sqrt(voices);
       for (let n = 0; n < voices; n++) {
         const isOdd = (n & 1) == 1;
         let gainL = gain1;
@@ -1265,12 +1292,14 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         }
         const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
         const dPhase = fVoice * invSR;
+        const level = this._chooseMip(dPhase);
+        const table = this.tables[level];
 
         // warp phase then sample
         this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
         const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
-        const s0 = this._sampleFrame(this.frames[fIdx], ph);
-        const s1 = this._sampleFrame(this.frames[Math.min(this.numFrames - 1, fIdx + 1)], ph);
+        const s0 = this._sampleFrame(table[fIdx], ph);
+        const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
         let s = s0 + (s1 - s0) * frac;
         if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
           s = -s;

From 3a7ec18d46f5e051796d9b0e92155e40665ba981 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Tue, 30 Sep 2025 23:19:55 -0500
Subject: [PATCH 64/80] Move invsr to constructor

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

diff --git a/packages/superdough/worklets.mjs b/packages/superdough/worklets.mjs
index 9b190a456..ccfaf5107 100644
--- a/packages/superdough/worklets.mjs
+++ b/packages/superdough/worklets.mjs
@@ -1065,6 +1065,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     this.frameLen = 0;
     this.numFrames = 0;
     this.phase = [];
+    this.invSR = 1 / sampleRate;
 
     this.port.onmessage = (e) => {
       const { type, payload } = e.data || {};
@@ -1264,7 +1265,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       if (outR !== outL) outR.set(outL);
       return true;
     }
-    const invSR = 1 / sampleRate;
     for (let i = 0; i < outL.length; i++) {
       const detune = pv(parameters.detune, i);
       const tablePos = clamp(pv(parameters.position, i), 0, 1);
@@ -1291,7 +1291,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
           gainR = gain1;
         }
         const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
-        const dPhase = fVoice * invSR;
+        const dPhase = fVoice * this.invSR;
         const level = this._chooseMip(dPhase);
         const table = this.tables[level];
 

From c5f1085bd9e8a0a061247eb2e165fde574809ea7 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Tue, 30 Sep 2025 23:51:59 -0500
Subject: [PATCH 65/80] WIP

---
 packages/core/pattern.mjs         | 18 ++++++++++++++++++
 packages/superdough/helpers.mjs   |  1 +
 packages/superdough/sampler.mjs   |  4 ++--
 packages/superdough/wavetable.mjs |  1 -
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index d0be3f599..dcee7f174 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -3536,3 +3536,21 @@ export const morph = (frompat, topat, bypat) => {
   bypat = reify(bypat);
   return frompat.innerBind((from) => topat.innerBind((to) => bypat.innerBind((by) => _morph(from, to, by))));
 };
+
+/**
+ * Wavefolding distortion
+ *
+ * @name fold
+ * @param {number | Pattern} distortion
+ *
+ */
+export const fold = register('fold', function (amt, vol = 1, pat) {
+  return pat.withvValue((v) => {
+    return {
+      ...v,
+      distortion: amt,
+      distortvol: vol,
+      distorttype: 'fold',
+    };
+  }).innerJoin();
+});
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index a471da9dd..6db3b04ab 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -475,6 +475,7 @@ export const getDistortionAlgorithm = (algo) => {
 };
 
 export const getDistortion = (distort, postgain, algorithm) => {
+  debugger;
   return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain }, { processorOptions: { algorithm } });
 };
 
diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 325b2e2a6..f229cd338 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -1,5 +1,5 @@
-import { noteToMidi, valueToMidi, getSoundIndex, getCommonSampleInfo } from './util.mjs';
-import { registerSound, registerWavetable } from './index.mjs';
+import { getCommonSampleInfo } from './util.mjs';
+import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 48b7e661c..c340efa8c 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -5,7 +5,6 @@ import {
   destroyAudioWorkletNode,
   getADSRValues,
   getFrequencyFromValue,
-  getLfo,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,

From a14bf4d97bc26a70a637464a0543d6861c5d9b69 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 1 Oct 2025 00:36:59 -0500
Subject: [PATCH 66/80] Add aliases for distort types

---
 packages/core/pattern.mjs          | 67 +++++++++++++++++++++++++-----
 packages/superdough/helpers.mjs    |  1 -
 packages/superdough/superdough.mjs |  3 +-
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index dcee7f174..96f7d687e 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -3537,6 +3537,41 @@ export const morph = (frompat, topat, bypat) => {
   return frompat.innerBind((from) => topat.innerBind((to) => bypat.innerBind((by) => _morph(from, to, by))));
 };
 
+/**
+ * Soft-clipping distortion
+ *
+ * @name soft
+ * @param {number | Pattern} distortion
+ *
+ */
+/**
+ * Hard-clipping distortion
+ *
+ * @name hard
+ * @param {number | Pattern} distortion
+ *
+ */
+/**
+ * Cubic polynomial distortion
+ *
+ * @name cubic
+ * @param {number | Pattern} distortion
+ *
+ */
+/**
+ * Diode-emulating distortion
+ *
+ * @name diode
+ * @param {number | Pattern} distortion
+ *
+ */
+/**
+ * Asymmetrical diode distortion
+ *
+ * @name asym
+ * @param {number | Pattern} distortion
+ *
+ */
 /**
  * Wavefolding distortion
  *
@@ -3544,13 +3579,25 @@ export const morph = (frompat, topat, bypat) => {
  * @param {number | Pattern} distortion
  *
  */
-export const fold = register('fold', function (amt, vol = 1, pat) {
-  return pat.withvValue((v) => {
-    return {
-      ...v,
-      distortion: amt,
-      distortvol: vol,
-      distorttype: 'fold',
-    };
-  }).innerJoin();
-});
+/**
+ * Wavefolding distortion composed with sinusoid
+ *
+ * @name sinefold
+ * @param {number | Pattern} distortion
+ *
+ */
+/**
+ * Distortion via Chebyshev polynomials
+ *
+ * @name chebyshev
+ * @param {number | Pattern} distortion
+ *
+ */
+
+const algoNames = ['scurve', 'soft', 'hard', 'cubic', 'diode', 'asym', 'fold', 'sinefold', 'chebyshev'];
+for (const name of algoNames) {
+  Pattern.prototype[name] = function (args) {
+    const argsPat = reify(args).fmap((v) => (Array.isArray(v) ? [...v, name] : [v, 1, name]));
+    return this.distort(argsPat);
+  };
+}
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index 6db3b04ab..a471da9dd 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -475,7 +475,6 @@ export const getDistortionAlgorithm = (algo) => {
 };
 
 export const getDistortion = (distort, postgain, algorithm) => {
-  debugger;
   return getWorklet(getAudioContext(), 'distort-processor', { distort, postgain }, { processorOptions: { algorithm } });
 };
 
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 8240b45b9..a37504b1d 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -155,6 +155,7 @@ let defaultDefaultValues = {
   phaserdepth: 0.75,
   shapevol: 1,
   distortvol: 1,
+  distorttype: 0,
   delay: 0,
   byteBeatExpression: '0',
   delayfeedback: 0.5,
@@ -455,7 +456,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     shapevol = getDefaultValue('shapevol'),
     distort,
     distortvol = getDefaultValue('distortvol'),
-    distorttype,
+    distorttype = getDefaultValue('distorttype'),
     pan,
     vowel,
     delay = getDefaultValue('delay'),

From c885d84785f73a4624d26bd75f608e58baa0206a Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 1 Oct 2025 00:39:44 -0500
Subject: [PATCH 67/80] Add comment

---
 packages/core/pattern.mjs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index 96f7d687e..e2e563e4f 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -3594,8 +3594,9 @@ export const morph = (frompat, topat, bypat) => {
  *
  */
 
-const algoNames = ['scurve', 'soft', 'hard', 'cubic', 'diode', 'asym', 'fold', 'sinefold', 'chebyshev'];
-for (const name of algoNames) {
+const distAlgoNames = ['scurve', 'soft', 'hard', 'cubic', 'diode', 'asym', 'fold', 'sinefold', 'chebyshev'];
+for (const name of distAlgoNames) {
+  // Add aliases for distortion algorithms
   Pattern.prototype[name] = function (args) {
     const argsPat = reify(args).fmap((v) => (Array.isArray(v) ? [...v, name] : [v, 1, name]));
     return this.distort(argsPat);

From 72298c5f037f43470d9be6929b1a099a2b3b4228 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Wed, 1 Oct 2025 00:45:26 -0500
Subject: [PATCH 68/80] Docstring cleanup

---
 packages/core/controls.mjs |  8 +++++---
 packages/core/pattern.mjs  | 25 ++++++++++++++++---------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages/core/controls.mjs b/packages/core/controls.mjs
index 5148e47e7..3475fc2f4 100644
--- a/packages/core/controls.mjs
+++ b/packages/core/controls.mjs
@@ -1892,7 +1892,9 @@ export const { shape } = registerControl(['shape', 'shapevol']);
  *
  * @name distort
  * @synonyms dist
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
+ * @param {number | string | Pattern} type type of distortion to apply
  * @example
  * s("bd sd [~ bd] sd,hh*8").distort("<0 2 3 10:.5>")
  * @example
@@ -1908,7 +1910,7 @@ export const { distort, dist } = registerControl(['distort', 'distortvol', 'dist
  *
  * @name distortvol
  * @synonyms distvol
- * @param {number | Pattern} type
+ * @param {number | Pattern} volume linear postgain of the distortion
  * @example
  * s("bd*4").bank("tr909").distort(2).distortvol(0.8)
  */
@@ -1919,7 +1921,7 @@ export const { distortvol } = registerControl('distortvol', 'distvol');
  *
  * @name distorttype
  * @synonyms disttype
- * @param {number | string | Pattern} type
+ * @param {number | string | Pattern} type type of distortion to apply
  * @example
  * s("bd*4").bank("tr909").distort(2).distorttype("<0 1 2>")
  *
diff --git a/packages/core/pattern.mjs b/packages/core/pattern.mjs
index e2e563e4f..a823e7bca 100644
--- a/packages/core/pattern.mjs
+++ b/packages/core/pattern.mjs
@@ -3541,59 +3541,66 @@ export const morph = (frompat, topat, bypat) => {
  * Soft-clipping distortion
  *
  * @name soft
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Hard-clipping distortion
  *
  * @name hard
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Cubic polynomial distortion
  *
  * @name cubic
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Diode-emulating distortion
  *
  * @name diode
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Asymmetrical diode distortion
  *
  * @name asym
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Wavefolding distortion
  *
  * @name fold
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Wavefolding distortion composed with sinusoid
  *
  * @name sinefold
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
 /**
  * Distortion via Chebyshev polynomials
  *
  * @name chebyshev
- * @param {number | Pattern} distortion
+ * @param {number | Pattern} distortion amount of distortion to apply
+ * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-
 const distAlgoNames = ['scurve', 'soft', 'hard', 'cubic', 'diode', 'asym', 'fold', 'sinefold', 'chebyshev'];
 for (const name of distAlgoNames) {
   // Add aliases for distortion algorithms

From 8cd497abb245361b4ad2cf469e46b8b13d14247c Mon Sep 17 00:00:00 2001
From: yaxu <yaxu@noreply.codeberg.org>
Date: Wed, 1 Oct 2025 12:54:58 +0200
Subject: [PATCH 69/80] Update
 website/src/pages/technical-manual/project-start.mdx

---
 .../src/pages/technical-manual/project-start.mdx  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/website/src/pages/technical-manual/project-start.mdx b/website/src/pages/technical-manual/project-start.mdx
index 4e6e37636..0866d3e43 100644
--- a/website/src/pages/technical-manual/project-start.mdx
+++ b/website/src/pages/technical-manual/project-start.mdx
@@ -7,6 +7,21 @@ layout: ../../layouts/MainLayout.astro
 
 This Guide shows you the different ways to get started with using Strudel in your own project.
 
+## Respect the license
+
+First, please take a moment to understand Strudel's free/open source license, 
+[AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.en.html).
+
+Here is a lay summary, but check the license for legal definitions and responsibilities.
+
+* You can distribute modified versions if you keep track of the changes and the date you made them.
+* You must license derivative work under the same license. 
+* Source code must be distributed along with web publication.
+
+Among other things, it means that when you share your work, the whole application must be shared under the same free/open source license, or one compatible with it. This is because we want Strudel to stay free/open source. In other words, you are not permitted to distribute integrations of Strudel with libraries or other code that does not have a compatible free/open source license. 
+
+This also applies to clones informed by reading Strudel's source code, as legally speaking, that counts as a 'derivative work'. Again, please [read the licence](https://www.gnu.org/licenses/agpl-3.0.en.html) for details.
+
 ## Embedding the Strudel REPL
 
 There are 3 quick ways to embed strudel in your website:

From 0ecacae71eddeb7f975b4614a58d3a59c0b67264 Mon Sep 17 00:00:00 2001
From: Alex McLean <alex@slab.org>
Date: Wed, 1 Oct 2025 12:02:09 +0100
Subject: [PATCH 70/80] format

---
 website/src/pages/technical-manual/project-start.mdx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/src/pages/technical-manual/project-start.mdx b/website/src/pages/technical-manual/project-start.mdx
index 0866d3e43..4a269d1b9 100644
--- a/website/src/pages/technical-manual/project-start.mdx
+++ b/website/src/pages/technical-manual/project-start.mdx
@@ -9,16 +9,16 @@ This Guide shows you the different ways to get started with using Strudel in you
 
 ## Respect the license
 
-First, please take a moment to understand Strudel's free/open source license, 
+First, please take a moment to understand Strudel's free/open source license,
 [AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.en.html).
 
 Here is a lay summary, but check the license for legal definitions and responsibilities.
 
-* You can distribute modified versions if you keep track of the changes and the date you made them.
-* You must license derivative work under the same license. 
-* Source code must be distributed along with web publication.
+- You can distribute modified versions if you keep track of the changes and the date you made them.
+- You must license derivative work under the same license.
+- Source code must be distributed along with web publication.
 
-Among other things, it means that when you share your work, the whole application must be shared under the same free/open source license, or one compatible with it. This is because we want Strudel to stay free/open source. In other words, you are not permitted to distribute integrations of Strudel with libraries or other code that does not have a compatible free/open source license. 
+Among other things, it means that when you share your work, the whole application must be shared under the same free/open source license, or one compatible with it. This is because we want Strudel to stay free/open source. In other words, you are not permitted to distribute integrations of Strudel with libraries or other code that does not have a compatible free/open source license.
 
 This also applies to clones informed by reading Strudel's source code, as legally speaking, that counts as a 'derivative work'. Again, please [read the licence](https://www.gnu.org/licenses/agpl-3.0.en.html) for details.
 

From b7d98dd3709b3837fba16a517aac565c7e732ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Volhejn?= <vaclav.volhejn@gmail.com>
Date: Wed, 1 Oct 2025 21:53:28 +0200
Subject: [PATCH 71/80] Fix case sensitivity for synonym search

---
 website/src/repl/components/panel/Reference.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/src/repl/components/panel/Reference.jsx b/website/src/repl/components/panel/Reference.jsx
index 6007667fa..505cf50d2 100644
--- a/website/src/repl/components/panel/Reference.jsx
+++ b/website/src/repl/components/panel/Reference.jsx
@@ -44,10 +44,10 @@ export function Reference() {
         return true;
       }
 
-      const lowCaseSearch = search.toLowerCase();
+      const lowerCaseSearch = search.toLowerCase();
       return (
-        entry.name.toLowerCase().includes(lowCaseSearch) ||
-        (entry.synonyms?.some((s) => s.includes(lowCaseSearch)) ?? false)
+        entry.name.toLowerCase().includes(lowerCaseSearch) ||
+        (entry.synonyms?.some((s) => s.toLowerCase().includes(lowerCaseSearch)) ?? false)
       );
     });
   }, [search]);

From f369de13d7116ce24f952251e6e955e193a14126 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 2 Oct 2025 22:45:48 -0500
Subject: [PATCH 72/80] Hook up FM to wavetables

---
 packages/superdough/wavetable.mjs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 44367f786..220b95896 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -308,6 +308,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
     },
   );
   const vibratoOscillator = getVibratoOscillator(source.parameters.get('detune'), value, t);
+  const fm = applyFM(source.parameters.get('frequency'), value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
   getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3, t, holdEnd, 'linear');
@@ -318,6 +319,7 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
     () => {
       destroyAudioWorkletNode(source);
       vibratoOscillator?.stop();
+      fm?.stop();
       node.disconnect();
       wtPosModulators?.disconnect();
       wtWarpModulators?.disconnect();

From d496919fe507caa6323ce5d33b553e2b2a15d974 Mon Sep 17 00:00:00 2001
From: Aria <weglossing@gmail.com>
Date: Thu, 2 Oct 2025 22:48:41 -0500
Subject: [PATCH 73/80] Import

---
 packages/superdough/wavetable.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index 220b95896..da6abcf76 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -1,6 +1,7 @@
 import { getAudioContext, registerSound } from './index.mjs';
 import { getCommonSampleInfo } from './util.mjs';
 import {
+  applyFM,
   applyParameterModulators,
   destroyAudioWorkletNode,
   getADSRValues,

From 0d0822598351fcb7b0050a2f452f0fada4375fee Mon Sep 17 00:00:00 2001
From: Jieren Chen <jieren.chen@fourthwall.com>
Date: Sun, 5 Oct 2025 13:53:00 -0400
Subject: [PATCH 74/80] change the trigger handler to match new hap

---
 packages/mqtt/mqtt.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mqtt/mqtt.mjs b/packages/mqtt/mqtt.mjs
index aef01bd93..d74de342d 100644
--- a/packages/mqtt/mqtt.mjs
+++ b/packages/mqtt/mqtt.mjs
@@ -82,7 +82,7 @@ Pattern.prototype.mqtt = function (
     cx.connect(props);
   }
   return this.withHap((hap) => {
-    const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
+    const onTrigger = (hap, currentTime, cps, targetTime) => {
       let msg_topic = topic;
       if (!cx || !cx.isConnected()) {
         return;

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 75/80] 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 76/80] 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 77/80] 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 78/80] 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 79/80] 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 });
   }
 }
 

From 72eaf96b4fb922fc4aa36ef92d90843f8395b62c Mon Sep 17 00:00:00 2001
From: Erik Fox <erikfox@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:30:36 -0400
Subject: [PATCH 80/80]  fix: repair REPL sample sources and URL concat (#1640)

---
 packages/repl/prebake.mjs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/repl/prebake.mjs b/packages/repl/prebake.mjs
index 3f421f985..26d875c2b 100644
--- a/packages/repl/prebake.mjs
+++ b/packages/repl/prebake.mjs
@@ -20,10 +20,13 @@ export async function prebake() {
     // import('@strudel/osc'),
   );
   // load samples
-  const ds = 'https://raw.githubusercontent.com/felixroos/dough-samples/main/';
+  const ds = 'https://raw.githubusercontent.com/felixroos/dough-samples/main';
 
   // TODO: move this onto the strudel repo
-  const ts = 'https://raw.githubusercontent.com/todepond/samples/main/';
+  const ts = 'https://raw.githubusercontent.com/todepond/samples/main';
+
+  const tc = 'https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main';
+
   await Promise.all([
     modulesLoading,
     registerSynthSounds(),
@@ -36,9 +39,9 @@ export async function prebake() {
     samples(`${ds}/tidal-drum-machines.json`),
     samples(`${ds}/piano.json`),
     samples(`${ds}/Dirt-Samples.json`),
-    samples(`${ds}/uzu-drumkit.json`),
     samples(`${ds}/vcsl.json`),
     samples(`${ds}/mridangam.json`),
+    samples(`${tc}/strudel.json`),
   ]);
 
   aliasBank(`${ts}/tidal-drum-machines-alias.json`);