merge main

Merge branch 'main' into glossing-glossing/distortion-modes
2026-08-11 00:13:06 -04:00 · 2025-10-13 01:13:12 -04:00 · 2025-10-13 01:10:02 -04:00
68 changed files with 345 additions and 1490 deletions
@@ -1,37 +0,0 @@
 name: Build and Deploy to beta (warm.strudel.cc)
 on: [workflow_dispatch]
 # Allow one concurrent deployment
 concurrency:
  group: "pages"
  cancel-in-progress: true
 jobs:
  build:
    runs-on: docker
    env:
      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
    steps:
      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v4
        with:
          version: 9.12.2
      - uses: actions/setup-node@v4
        with:
          node-version: 20
          # cache: "pnpm"
      - name: Install Dependencies
        run: pnpm install
      - name: Build
        run: pnpm build
      - name: Deploy
        run: |
          eval $(ssh-agent -s)
          echo "$SSH_PRIVATE_KEY" | ssh-add -
          apt update && apt install -y rsync
          mkdir ~/.ssh
          ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/warm.strudel.cc
@@ -1,4 +1,4 @@
-name: Build and Deploy to live (strudel.cc)
+name: Build and Deploy
 on: [workflow_dispatch]
@@ -34,4 +34,4 @@ jobs:
          apt update && apt install -y rsync
          mkdir ~/.ssh
          ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/strudel.cc
+          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy
@@ -45,20 +45,6 @@ tidal-drum-machines
 webaudiofontdata
 src-tauri/target
 ### BEGIN Visual Studio Code ###
 # Blanket, recursive exclude for .vscode directory and files
 .vscode/**/*
 # Unexclude specific files and directories within .vscode
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
 ### END Visual Studio Code ###
 # BEGIN JetBrains -> END JetBrains
 # for JetBrains IDE users, e.g. WebStorm. Source: https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
@@ -1,11 +1,6 @@
 import jsdoc from '../../doc.json';
 import { autocompletion } from '@codemirror/autocomplete';
 import { h } from './html';
 //TODO: fix tonal scale import
 // import { Scale } from '@tonaljs/tonal';
 // import { soundMap } from '@strudel/webaudio';
 let soundMap = undefined;
 import { complex } from '@strudel/tonal';
 const escapeHtml = (str) => {
  const div = document.createElement('div');
@@ -80,53 +75,6 @@ const isValidDoc = (doc) => {
 const hasExcludedTags = (doc) =>
  ['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag));
 export function bankCompletions() {
  // TODO: FIX IMPORT
  const soundDict = soundMap?.get() ?? {};
  const banks = new Set();
  for (const key of Object.keys(soundDict)) {
    const [bank, suffix] = key.split('_');
    if (suffix && bank) banks.add(bank);
  }
  return Array.from(banks)
    .sort()
    .map((name) => ({ label: name, type: 'bank' }));
 }
 // Attempt to get all scale names from Tonal TODO: FIX IMPORT
 let scaleCompletions = [];
 // try {
 //   scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' }));
 // } catch (e) {
 //   console.warn('[autocomplete] Could not load scale names from Tonal:', e);
 // }
 // Valid mode values for voicing
 const modeCompletions = [
  { label: 'below', type: 'mode' },
  { label: 'above', type: 'mode' },
  { label: 'duck', type: 'mode' },
  { label: 'root', type: 'mode' },
 ];
 // Valid chord symbols from ireal dictionary plus empty string for major triads
 const chordSymbols = ['', ...Object.keys(complex)].sort();
 const chordSymbolCompletions = chordSymbols.map((symbol) => {
  if (symbol === '') {
    return {
      label: 'major',
      apply: '',
      type: 'chord-symbol',
    };
  }
  return {
    label: symbol,
    apply: symbol,
    type: 'chord-symbol',
  };
 });
 export const getSynonymDoc = (doc, synonym) => {
  const synonyms = doc.synonyms || [];
  const docLabel = getDocLabel(doc);
@@ -165,299 +113,19 @@ const jsdocCompletions = (() => {
  return completions;
 })();
 // --- Handler functions for each context ---
 const pitchNames = [
  'C',
  'C#',
  'Db',
  'D',
  'D#',
  'Eb',
  'E',
  'E#',
  'Fb',
  'F',
  'F#',
  'Gb',
  'G',
  'G#',
  'Ab',
  'A',
  'A#',
  'Bb',
  'B',
  'B#',
  'Cb',
 ];
 // Cached regex patterns for scaleHandler
 const SCALE_NO_QUOTES_REGEX = /scale\(\s*$/;
 const SCALE_AFTER_COLON_REGEX = /scale\(\s*['"][^'"]*:[^'"]*$/;
 const SCALE_PRE_COLON_REGEX = /scale\(\s*['"][^'"]*$/;
 const SCALE_PITCH_MATCH_REGEX = /([A-Ga-g][#b]*)?$/;
 const SCALE_SPACES_TO_COLON_REGEX = /\s+/g;
 function scaleHandler(context) {
  // First check for scale context without quotes - block with empty completions
  let scaleNoQuotesContext = context.matchBefore(SCALE_NO_QUOTES_REGEX);
  if (scaleNoQuotesContext) {
    return {
      from: scaleNoQuotesContext.to,
      options: [],
    };
  }
  // Check for after-colon context first (more specific)
  let scaleAfterColonContext = context.matchBefore(SCALE_AFTER_COLON_REGEX);
  if (scaleAfterColonContext) {
    const text = scaleAfterColonContext.text;
    const colonIdx = text.lastIndexOf(':');
    if (colonIdx !== -1) {
      const fragment = text.slice(colonIdx + 1);
      const filteredScales = scaleCompletions.filter((s) => s.label.startsWith(fragment));
      const options = filteredScales.map((s) => ({
        ...s,
        apply: s.label.replace(SCALE_SPACES_TO_COLON_REGEX, ':'),
      }));
      const from = scaleAfterColonContext.from + colonIdx + 1;
      return {
        from,
        options,
      };
    }
  }
  // Then check for pre-colon context
  let scalePreColonContext = context.matchBefore(SCALE_PRE_COLON_REGEX);
  if (scalePreColonContext) {
    if (!scalePreColonContext.text.includes(':')) {
      if (context.explicit) {
        const text = scalePreColonContext.text;
        const match = text.match(SCALE_PITCH_MATCH_REGEX);
        const fragment = match ? match[0] : '';
        const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
        const from = scalePreColonContext.to - fragment.length;
        const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
        return { from, options };
      } else {
        return { from: scalePreColonContext.to, options: [] };
      }
    }
  }
  return null;
 }
 // Cached regex patterns for soundHandler
 const SOUND_NO_QUOTES_REGEX = /(s|sound)\(\s*$/;
 const SOUND_WITH_QUOTES_REGEX = /(s|sound)\(\s*['"][^'"]*$/;
 const SOUND_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w]*)$/;
 function soundHandler(context) {
  // First check for sound context without quotes - block with empty completions
  let soundNoQuotesContext = context.matchBefore(SOUND_NO_QUOTES_REGEX);
  if (soundNoQuotesContext) {
    return {
      from: soundNoQuotesContext.to,
      options: [],
    };
  }
  // Then check for sound context with quotes - provide completions
  let soundContext = context.matchBefore(SOUND_WITH_QUOTES_REGEX);
  if (!soundContext) return null;
  const text = soundContext.text;
  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
  if (quoteIdx === -1) return null;
  const inside = text.slice(quoteIdx + 1);
  const fragMatch = inside.match(SOUND_FRAGMENT_MATCH_REGEX);
  const fragment = fragMatch ? fragMatch[1] : inside;
  const soundNames = Object.keys(soundMap?.get() ?? {}).sort();
  const filteredSounds = soundNames.filter((name) => name.includes(fragment));
  let options = filteredSounds.map((name) => ({ label: name, type: 'sound' }));
  const from = soundContext.to - fragment.length;
  return {
    from,
    options,
  };
 }
 // Cached regex patterns for bankHandler
 const BANK_NO_QUOTES_REGEX = /bank\(\s*$/;
 const BANK_WITH_QUOTES_REGEX = /bank\(\s*['"][^'"]*$/;
 function bankHandler(context) {
  // First check for bank context without quotes - block with empty completions
  let bankNoQuotesContext = context.matchBefore(BANK_NO_QUOTES_REGEX);
  if (bankNoQuotesContext) {
    return {
      from: bankNoQuotesContext.to,
      options: [],
    };
  }
  // Then check for bank context with quotes - provide completions
  let bankMatch = context.matchBefore(BANK_WITH_QUOTES_REGEX);
  if (!bankMatch) return null;
  const text = bankMatch.text;
  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
  if (quoteIdx === -1) return null;
  const inside = text.slice(quoteIdx + 1);
  const fragment = inside;
  let banks = bankCompletions();
  const filteredBanks = banks.filter((b) => b.label.startsWith(fragment));
  const from = bankMatch.to - fragment.length;
  return {
    from,
    options: filteredBanks,
  };
 }
 // Cached regex patterns for modeHandler
 const MODE_NO_QUOTES_REGEX = /mode\(\s*$/;
 const MODE_AFTER_COLON_REGEX = /mode\(\s*['"][^'"]*:[^'"]*$/;
 const MODE_PRE_COLON_REGEX = /mode\(\s*['"][^'"]*$/;
 const MODE_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w:]*)$/;
 function modeHandler(context) {
  // First check for mode context without quotes - block with empty completions
  let modeNoQuotesContext = context.matchBefore(MODE_NO_QUOTES_REGEX);
  if (modeNoQuotesContext) {
    return {
      from: modeNoQuotesContext.to,
      options: [],
    };
  }
  // Check for after-colon context first (more specific)
  let modeAfterColonContext = context.matchBefore(MODE_AFTER_COLON_REGEX);
  if (modeAfterColonContext) {
    const text = modeAfterColonContext.text;
    const colonIdx = text.lastIndexOf(':');
    if (colonIdx !== -1) {
      const fragment = text.slice(colonIdx + 1);
      // For anchor after colon, we can suggest pitch names
      const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
      const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
      const from = modeAfterColonContext.from + colonIdx + 1;
      return {
        from,
        options,
      };
    }
  }
  // Then check for pre-colon context
  let modeContext = context.matchBefore(MODE_PRE_COLON_REGEX);
  if (!modeContext) return null;
  const text = modeContext.text;
  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
  if (quoteIdx === -1) return null;
  const inside = text.slice(quoteIdx + 1);
  const fragMatch = inside.match(MODE_FRAGMENT_MATCH_REGEX);
  const fragment = fragMatch ? fragMatch[1] : inside;
  const filteredModes = modeCompletions.filter((m) => m.label.startsWith(fragment));
  const from = modeContext.to - fragment.length;
  return {
    from,
    options: filteredModes,
  };
 }
 // Cached regex patterns for chordHandler
 const CHORD_NO_QUOTES_REGEX = /chord\(\s*$/;
 const CHORD_WITH_QUOTES_REGEX = /chord\(\s*['"][^'"]*$/;
 const CHORD_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w#b+^:-]*)$/;
 function chordHandler(context) {
  // First check for chord context without quotes - block with empty completions
  let chordNoQuotesContext = context.matchBefore(CHORD_NO_QUOTES_REGEX);
  if (chordNoQuotesContext) {
    return {
      from: chordNoQuotesContext.to,
      options: [],
    };
  }
  // Then check for chord context with quotes - provide completions
  let chordContext = context.matchBefore(CHORD_WITH_QUOTES_REGEX);
  if (!chordContext) return null;
  const text = chordContext.text;
  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
  if (quoteIdx === -1) return null;
  const inside = text.slice(quoteIdx + 1);
  // Use same fragment matching as sound/mode for expressions like "<G Am>"
  const fragMatch = inside.match(CHORD_FRAGMENT_MATCH_REGEX);
  const fragment = fragMatch ? fragMatch[1] : inside;
  // Check if fragment contains any pitch name at start (for root + symbol)
  let rootMatch = null;
  let symbolFragment = fragment;
  for (const pitch of pitchNames) {
    if (fragment.toLowerCase().startsWith(pitch.toLowerCase())) {
      rootMatch = pitch;
      symbolFragment = fragment.slice(pitch.length);
      break;
    }
  }
  if (rootMatch) {
    // We have a root, now complete chord symbols
    const filteredSymbols = chordSymbolCompletions.filter((s) =>
      s.label.toLowerCase().startsWith(symbolFragment.toLowerCase()),
    );
    // Create completions that replace the entire chord, not just the symbol part
    const options = filteredSymbols;
    const from = chordContext.to - symbolFragment.length;
    return { from, options };
  } else {
    // No root yet, complete with pitch names
    const filteredPitches = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
    const options = filteredPitches.map((p) => ({ label: p, type: 'pitch' }));
    const from = chordContext.to - fragment.length;
    return { from, options };
  }
 }
 // Cached regex patterns for fallbackHandler
 const FALLBACK_WORD_REGEX = /\w*/;
 function fallbackHandler(context) {
  const word = context.matchBefore(FALLBACK_WORD_REGEX);
  if (word && word.from === word.to && !context.explicit) return null;
  if (word) {
    return {
      from: word.from,
      options: jsdocCompletions,
    };
  }
  return null;
 }
 const handlers = [
  soundHandler,
  bankHandler,
  chordHandler,
  scaleHandler,
  modeHandler,
  // this handler *must* be last
  fallbackHandler,
 ];
 export const strudelAutocomplete = (context) => {
-  for (const handler of handlers) {
+  const word = context.matchBefore(/\w*/);
-    const result = handler(context);
+  if (word.from === word.to && !context.explicit) return null;
-    if (result) {
+
-      return result;
+  return {
-    }
+    from: word.from,
-  }
+    options: jsdocCompletions,
-  return null;
+    /*     options: [
      { label: 'match', type: 'keyword' },
      { label: 'hello', type: 'variable', info: '(World)' },
      { label: 'magic', type: 'text', apply: '⠁⭒*.✩.*⭒⠁', detail: 'macro' },
    ], */
  };
 };
 export const isAutoCompletionEnabled = (enabled) =>
@@ -1,31 +1,30 @@
 import { closeBrackets } from '@codemirror/autocomplete';
-import { indentWithTab, toggleLineComment } from '@codemirror/commands';
+export { toggleComment, toggleBlockComment, toggleLineComment, toggleBlockCommentByLine } from '@codemirror/commands';
 // import { search, highlightSelectionMatches } from '@codemirror/search';
 import { indentWithTab } from '@codemirror/commands';
 import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
-import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
 import {
  drawSelection,
  EditorView,
  highlightActiveLine,
  highlightActiveLineGutter,
  highlightActiveLine,
  keymap,
  lineNumbers,
  drawSelection,
 } from '@codemirror/view';
-import { persistentAtom } from '@nanostores/persistent';
+import { repl, registerControl } from '@strudel/core';
-import { logger, registerControl, repl } from '@strudel/core';
+import { Drawer, cleanupDraw } from '@strudel/draw';
 import { cleanupDraw, Drawer } from '@strudel/draw';
 import { isAutoCompletionEnabled } from './autocomplete.mjs';
-import { basicSetup } from './basicSetup.mjs';
+import { isTooltipEnabled } from './tooltip.mjs';
 import { flash, isFlashEnabled } from './flash.mjs';
 import { highlightMiniLocations, isPatternHighlightingEnabled, updateMiniLocations } from './highlight.mjs';
 import { keybindings } from './keybindings.mjs';
 import { initTheme, activateTheme, theme } from './themes.mjs';
 import { sliderPlugin, updateSliderWidgets } from './slider.mjs';
-import { activateTheme, initTheme, theme } from './themes.mjs';
+import { widgetPlugin, updateWidgets } from './widget.mjs';
-import { isTooltipEnabled } from './tooltip.mjs';
+import { persistentAtom } from '@nanostores/persistent';
-import { updateWidgets, widgetPlugin } from './widget.mjs';
+import { basicSetup } from './basicSetup.mjs';
 export { toggleBlockComment, toggleBlockCommentByLine, toggleComment, toggleLineComment } from '@codemirror/commands';
 const extensions = {
  isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
@@ -95,8 +94,8 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
      }),
      sliderPlugin,
      widgetPlugin,
-      // indentOnInput(), // works without. already brought with javascript
+      // indentOnInput(), // works without. already brought with javascript extension?
-      // extension? bracketMatching(), // does not do anything
+      // bracketMatching(), // does not do anything
      syntaxHighlighting(defaultHighlightStyle),
      EditorView.updateListener.of((v) => onChange(v)),
      drawSelection({ cursorBlinkRate: 0 }),
@@ -120,13 +119,13 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
            run: () => onStop?.(),
          },
          /* {
-            key: 'Ctrl-Shift-.',
+          key: 'Ctrl-Shift-.',
-            run: () => (onPanic ? onPanic() : onStop?.()),
+          run: () => (onPanic ? onPanic() : onStop?.()),
-          },
+        },
-          {
+        {
-            key: 'Ctrl-Shift-Enter',
+          key: 'Ctrl-Shift-Enter',
-            run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
+          run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
-          }, */
+        }, */
        ]),
      ),
    ],
@@ -207,8 +206,7 @@ export class StrudelMirror {
        updateWidgets(this.editor, widgets);
        updateMiniLocations(this.editor, this.miniLocations);
        replOptions?.afterEval?.(options);
-        // if no painters are set (.onPaint was not called), then we only need
+        // if no painters are set (.onPaint was not called), then we only need the present moment (for highlighting)
        // the present moment (for highlighting)
        const drawTime = options.pattern.getPainters().length ? this.drawTime : [0, 0];
        this.drawer.setDrawTime(drawTime);
        // invalidate drawer after we've set the appropriate drawTime
@@ -247,33 +245,6 @@ export class StrudelMirror {
      }
    };
    document.addEventListener('start-repl', this.onStartRepl);
    // Handle global evaluation requests (e.g., from Vim :w)
    this.onEvaluateRequest = (e) => {
      try {
        // Evaluate current editor on repl-evaluate
        logger('[repl] evaluate via event');
        this.evaluate();
        e?.cancelable && e.preventDefault?.();
      } catch (err) {
        console.error('Error handling repl-evaluate event', err);
      }
    };
    document.addEventListener('repl-evaluate', this.onEvaluateRequest);
    document.addEventListener('repl-stop', this.onStopRequest);
    // Toggle comments requested from Vim (gc)
    this.onToggleComment = (e) => {
      try {
        // Honor selections; toggleLineComment handles both selections and
        // single line
        toggleLineComment(this.editor);
        e?.cancelable && e.preventDefault?.();
      } catch (err) {
        console.error('Error handling repl-toggle-comment event', err);
      }
    };
    document.addEventListener('repl-toggle-comment', this.onToggleComment);
  }
  draw(haps, time, painters) {
    painters?.forEach((painter) => painter(this.drawContext, time, haps, this.drawTime));
@@ -300,16 +271,6 @@ export class StrudelMirror {
  async stop() {
    this.repl.scheduler.stop();
  }
  // Listen for global stop requests (e.g., from Vim :q)
  onStopRequest = (e) => {
    try {
      this.stop();
      e?.cancelable && e.preventDefault?.();
    } catch (err) {
      console.error('Error handling repl-stop event', err);
    }
  };
  async toggle() {
    if (this.repl.scheduler.started) {
      this.repl.stop();
@@ -385,18 +346,11 @@ export class StrudelMirror {
    }
  }
  setCode(code) {
-    const changes = {
+    const changes = { from: 0, to: this.editor.state.doc.length, insert: code };
      from: 0,
      to: this.editor.state.doc.length,
      insert: code,
    };
    this.editor.dispatch({ changes });
  }
  clear() {
    this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl);
    this.onEvaluateRequest && document.removeEventListener('repl-evaluate', this.onEvaluateRequest);
    this.onStopRequest && document.removeEventListener('repl-stop', this.onStopRequest);
    this.onToggleComment && document.removeEventListener('repl-toggle-comment', this.onToggleComment);
  }
  getCursorLocation() {
    return this.editor.state.selection.main.head;
@@ -1,12 +1,11 @@
 import { defaultKeymap } from '@codemirror/commands';
 import { Prec } from '@codemirror/state';
 import { keymap, ViewPlugin } from '@codemirror/view';
 // import { searchKeymap } from '@codemirror/search';
 import { emacs } from '@replit/codemirror-emacs';
-import { vim, Vim } from '@replit/codemirror-vim';
+import { vim } from '@replit/codemirror-vim';
 // import { vim } from './vim_test.mjs';
 import { vscodeKeymap } from '@replit/codemirror-vscode-keymap';
-import { logger } from '@strudel/core';
+import { defaultKeymap } from '@codemirror/commands';
 const vscodePlugin = ViewPlugin.fromClass(
  class {
@@ -20,110 +19,6 @@ const vscodePlugin = ViewPlugin.fromClass(
 );
 const vscodeExtension = (options) => [vscodePlugin].concat(options ?? []);
 // Map Vim :w to trigger the same action as evaluation. We dispatch a custom
 // event 'repl-evaluate' that the editor listens for, and also simulate
 // Ctrl+Enter/Alt+Enter as a fallback. We log to the Strudel logger so it
 // appears in the Console panel.
 try {
  if (Vim && typeof Vim.defineEx === 'function') {
    // Map gc to toggle line comments by dispatching a custom event that our
    // CodeMirror integration listens to. This avoids depending on Vim's
    // internal actions and works with current selections/visual mode.
    try {
      Vim.defineAction('strudelToggleComment', (cm) => {
        const view = cm?.view || cm;
        try {
          const ev = new CustomEvent('repl-toggle-comment', { detail: { source: 'vim', view }, cancelable: true });
          document.dispatchEvent(ev);
        } catch (e) {
          console.error('strudelToggleComment dispatch failed', e);
        }
      });
      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'normal' });
      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'visual' });
    } catch (e) {
      console.error('Vim gc mapping failed', e);
    }
    // :q to pause/stop
    Vim.defineEx('quit', 'q', (cm) => {
      try {
        const view = cm?.view || cm;
        // First try dispatching our custom stop event, then fallback to Alt+.
        let handled = false;
        try {
          const ev = new CustomEvent('repl-stop', { detail: { source: 'vim', view }, cancelable: true });
          handled = document.dispatchEvent(ev) === false;
        } catch (e) {
          console.error('Error dispatching repl-stop event', e);
        }
        if (!handled) {
          const altDot = new KeyboardEvent('keydown', {
            key: '.',
            code: 'Period',
            altKey: true,
            bubbles: true,
            cancelable: true,
          });
          view?.dom?.dispatchEvent?.(altDot);
        }
      } catch (e) {
        console.error('Error dispatching :q stop event', e);
      }
    });
    // :w to evaluate
    Vim.defineEx('write', 'w', (cm) => {
      const view = cm?.view || cm; // CM6 Vim passes either an object with view or the view itself
      try {
        view?.focus?.();
        // Let the app know this came from Vim :w
        try {
          logger('[vim] :w — evaluating code');
        } catch (e) {
          console.error('Error logging Vim :w evaluation', e);
        }
        // Dispatch a dedicated evaluate event first
        let handled = false;
        try {
          const ev = new CustomEvent('repl-evaluate', { detail: { source: 'vim', view }, cancelable: true });
          handled = document.dispatchEvent(ev) === false; // false means preventDefault was called
        } catch (e) {
          console.error('Error dispatching repl-evaluate event', e);
        }
        if (handled) {
          return;
        }
        // Try Ctrl+Enter first if not handled by custom event
        const ctrlEnter = new KeyboardEvent('keydown', {
          key: 'Enter',
          code: 'Enter',
          ctrlKey: true,
          bubbles: true,
          cancelable: true,
        });
        view?.dom?.dispatchEvent?.(ctrlEnter);
        // If not handled (no handler called preventDefault), try Alt+Enter as
        // fallback
        if (!ctrlEnter.defaultPrevented) {
          const altEnter = new KeyboardEvent('keydown', {
            key: 'Enter',
            code: 'Enter',
            altKey: true,
            bubbles: true,
            cancelable: true,
          });
          view?.dom?.dispatchEvent?.(altEnter);
        }
      } catch (e) {
        console.error('Error dispatching :w evaluation event', e);
      }
    });
  }
 } catch (e) {
  console.error('Vim ex command setup failed (defineEx missing or Vim unavailable)', e);
 }
 const keymaps = {
  vim,
  emacs,
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -46,11 +46,8 @@
    "@replit/codemirror-vscode-keymap": "^6.0.2",
    "@strudel/core": "workspace:*",
    "@strudel/draw": "workspace:*",
    "@strudel/tonal": "workspace:*",
    "@strudel/transpiler": "workspace:*",
-    "@tonaljs/tonal": "^4.10.0",
+    "nanostores": "^0.11.3"
    "nanostores": "^0.11.3",
    "superdough": "workspace:*"
  },
  "devDependencies": {
    "vite": "^6.0.11"
@@ -1750,64 +1750,17 @@ export const { semitone } = registerControl('semitone');
 // TODO: synth param
 export const { voice } = registerControl('voice');
 // voicings // https://codeberg.org/uzu/strudel/issues/506
-/**
+// chord to voice, like C Eb Fm7 G7. the symbols can be defined via addVoicings
 * The chord to voice
 * @name chord
 * @param {string | Pattern} symbols chord symbols to voice e.g., C, Eb, Fm7, G7. The symbols can be defined via addVoicings
 * @example
 * chord("<Am C D F Am E Am E>").voicing()
 **/
 export const { chord } = registerControl('chord');
-/**
+// which dictionary to use for the voicings
 * Which dictionary to use for the voicings. This falls back to the default dictionary if not provided
 *
 * @name dictionary
 * @param {string} dictionaryName which dictionary (having been defined with `addVoicings`) to use
 * @example
 * addVoicings('house', {
 '': ['7 12 16', '0 7 16', '4 7 12'],
 'm': ['0 3 7']
 })
 chord("<Am C D F Am E Am E>")
 .dict('house').anchor(66)
 .voicing().room(.5)
 **/
 export const { dictionary, dict } = registerControl('dictionary', 'dict');
-/** The top note to align the voicing to. Defaults to c5
+// the top note to align the voicing to, defaults to c5
 *
 * @name anchor
 * @param {string | Pattern} anchorNote the note to align the voicings to
 * @example
 * anchor("<c4 g4 c5 g5>").chord("C").voicing()
 **/
 export const { anchor } = registerControl('anchor');
-/**
+// how the voicing is offset from the anchored position
 * Sets how the voicing is offset from the anchored position
 *
 * @name offset
 * @param {number | Pattern} shift the amount to shift the voicing up or down
 * @example
 * chord("<Am C D F Am E Am E>").offset("<0 1 2 3 4 5>") // alter the voicing each time
 **/
 export const { offset } = registerControl('offset');
-/**
+// how many octaves are voicing steps spread apart, defaults to 1
 *  How many octaves are voicing steps spread apart, defaults to 1
 *
 *  @name octaves
 *  @param {number | Pattern} count the number of octaves
 *  @example
 *  chord("<Am C D F Am E Am E>").octaves("<2 4>").voicing()
 **/
 export const { octaves } = registerControl('octaves');
-/**
+// below = anchor note will be removed from the voicing, useful for melody harmonization
 * Remove anchor note from the voicing. Useful for melody harmonization
 *
 * @name mode
 * @param {string | Pattern} modeName one of {below | above | duck | root}
 * @example
 * mode("<below above duck root>").chord("C").voicing()
 *
 **/
 export const { mode } = registerControl(['mode', 'anchor']);
 /**
@@ -2367,24 +2320,6 @@ export const { miditouch } = registerControl('miditouch');
 // TODO: what is this?
 export const { polyTouch } = registerControl('polyTouch');
 /**
 * The host to send open sound control messages to. Requires running the OSC bridge.
 * @name oschost
 * @param {string | Pattern} oschost e.g. 'localhost'
 * @example
 * note("c4").oschost('127.0.0.1').oscport(57120).osc();
 */
 export const { oschost } = registerControl('oschost');
 /**
 * The port to send open sound control messages to. Requires running the OSC bridge.
 * @name oscport
 * @param {number | Pattern} oscport e.g. 57120
 * @example
 * note("c4").oschost('127.0.0.1').oscport(57120).osc();
 */
 export const { oscport } = registerControl('oscport');
 export const getControlName = (alias) => {
  if (controlAlias.has(alias)) {
    return controlAlias.get(alias);
@@ -35,18 +35,18 @@ const right = function (n, x) {
  return result;
 };
-const _bjorklund = function (n, x) {
+const _bjork = function (n, x) {
  const [ons, offs] = n;
-  return Math.min(ons, offs) <= 1 ? [n, x] : _bjorklund(...(ons > offs ? left(n, x) : right(n, x)));
+  return Math.min(ons, offs) <= 1 ? [n, x] : _bjork(...(ons > offs ? left(n, x) : right(n, x)));
 };
-export const bjorklund = function (ons, steps) {
+export const bjork = function (ons, steps) {
  const inverted = ons < 0;
  const absOns = Math.abs(ons);
  const offs = steps - absOns;
  const ones = Array(absOns).fill([1]);
  const zeros = Array(offs).fill([0]);
-  const result = _bjorklund([absOns, offs], [ones, zeros]);
+  const result = _bjork([absOns, offs], [ones, zeros]);
  const pattern = flatten(result[1][0]).concat(flatten(result[1][1]));
  return inverted ? pattern.map((x) => 1 - x) : pattern;
 };
@@ -128,7 +128,7 @@ export const bjorklund = function (ons, steps) {
 */
 const _euclidRot = function (pulses, steps, rotation) {
-  const b = bjorklund(pulses, steps);
+  const b = bjork(pulses, steps);
  if (rotation) {
    return rotate(b, -rotation);
  }
@@ -139,7 +139,7 @@ export const euclid = register('euclid', function (pulses, steps, pat) {
  return pat.struct(_euclidRot(pulses, steps, 0));
 });
-export const bjork = register('bjork', function (euc, pat) {
+export const e = register('e', function (euc, pat) {
  if (!Array.isArray(euc)) {
    euc = [euc];
  }
@@ -216,6 +216,6 @@ export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, s
 * .pan(sine.slow(8))
 */
 export const { euclidish, eish } = register(['euclidish', 'eish'], function (pulses, steps, perc, pat) {
-  const morphed = _morph(bjorklund(pulses, steps), new Array(pulses).fill(1), perc);
+  const morphed = _morph(bjork(pulses, steps), new Array(pulses).fill(1), perc);
  return pat.struct(morphed).setSteps(steps);
 });
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/core",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -2574,8 +2574,8 @@ export const { chunkBack, chunkback } = register(
 * @returns Pattern
 * @example
 * "<0 8> 1 2 3 4 5 6 7"
 * .scale("C2:major").note()
 * .fastChunk(4, x => x.color('red')).slow(2)
 * .scale("C2:major").note()
 */
 export const { fastchunk, fastChunk } = register(
  ['fastchunk', 'fastChunk'],
@@ -2998,24 +2998,6 @@ export const extend = stepRegister('extend', function (factor, pat) {
  return pat.fast(factor).expand(factor);
 });
 /**
 * *Experimental*
 *
 * `replicate` is similar to `fast` in that it increases its density, but it also increases the step count
 * accordingly. So `stepcat("a b".replicate(2), "c d")` would be the same as `"a b a b c d"`, whereas
 * `stepcat("a b".fast(2), "c d")` would be the same as `"[a b] [a b] c d"`.
 *
 * TODO: find out how this function differs from extend
 * @example
 * stepcat(
 *   sound("bd bd - cp").replicate(2),
 *   sound("bd - sd -")
 * ).pace(8)
 */
 export const replicate = stepRegister('replicate', function (factor, pat) {
  return pat.repeatCycles(factor).fast(factor).expand(factor);
 });
 /**
 * *Experimental*
 *
@@ -1,14 +1,14 @@
-import { bjorklund } from '../euclid.mjs';
+import { bjork } from '../euclid.mjs';
 import { describe, expect, it } from 'vitest';
 import { fastcat } from '../pattern.mjs';
-describe('bjorklund', () => {
+describe('bjork', () => {
-  it('should apply bjorklundlund to ons and steps', () => {
+  it('should apply bjorklund to ons and steps', () => {
-    expect(bjorklund(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
+    expect(bjork(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
-    expect(bjorklund(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
+    expect(bjork(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
-    expect(bjorklund(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
+    expect(bjork(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
-    expect(bjorklund(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
+    expect(bjork(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
-    expect(bjorklund(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
+    expect(bjork(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
  });
 });
@@ -7,8 +7,8 @@ This program is free software: you can redistribute it and/or modify it under th
 import { logger } from './logger.mjs';
 // returns true if the given string is a note
-export const isNoteWithOctave = (name) => /^[a-gA-G][#bsf]*[0-9]*$/.test(name);
+export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
-export const isNote = (name) => /^[a-gA-G][#bsf]*-?[0-9]*$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bsf]*-?[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
  if (typeof note !== 'string') {
    return [];
@@ -23,10 +23,6 @@ export const tokenizeNote = (note) => {
 const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
 const accs = { '#': 1, b: -1, s: 1, f: -1 };
 export const getAccidentalsOffset = (accidentals) => {
  return accidentals?.split('').reduce((o, char) => o + accs[char], 0) || 0;
 };
 // turns the given note into its midi number representation
 export const noteToMidi = (note, defaultOctave = 3) => {
  const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
@@ -34,7 +30,7 @@ export const noteToMidi = (note, defaultOctave = 3) => {
    throw new Error('not a note: "' + note + '"');
  }
  const chroma = chromas[pc.toLowerCase()];
-  const offset = getAccidentalsOffset(acc);
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
  return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const midiToFreq = (n) => {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/csound",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -84,18 +84,9 @@ Pattern.prototype.onPaint = function (painter) {
      state.controls.painters = [];
    }
    state.controls.painters.push(painter);
    return state;
  });
 };
 // TODO - Why isn't this pure deep copy not working?
 // Pattern.prototype.onPaint = function (painter) {
 //   return this.withState((state) => {
 //     const painters = state.controls.painters ? [...state.controls.painters, painter] : [painter];
 //     return new State(state.span, { ...state.controls, painters });
 //   });
 // };
 Pattern.prototype.getPainters = function () {
  let painters = [];
  this.queryArc(0, 0, { painters });
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/draw",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Helpers for drawing with Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -40,12 +40,6 @@ const pattern = sequence([
 - D-Pad
  - `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)
  - Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight`(or `tglU`, `tglD`, `tglL`, `tglR`)
 - Stick Buttons
  - `l3`, `r3` (or `ls`, `rs`)
  - Toggle versions: `tglL3`, `tglR3` (or `tglLS`, `tglRS`)
 - System Buttons
  - `start`, `back` (or uppercase `START`, `BACK`)
  - Toggle versions: `tglStart`, `tglBack` (or `tglSTART`, `tglBACK`)
 ### Analog Sticks
 - Left Stick
@@ -29,10 +29,6 @@ The gamepad module provides access to buttons and analog sticks as normalized si
 |                  | Toggle versions: `tglLB`, `tglRB`, `tglLT`, `tglRT`                                            |
 | D-Pad            | `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)                             |
 |                  | Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight` (or `tglU`, `tglD`, `tglL`, `tglR`) |
 | Stick Buttons    | `l3`, 'r3' (or `ls`, `rs`)                                                                     |
 |                  | Toggle versions: `tglL3`, 'tglR3' (or `tglLs`, `tglRs`)                                        |
 | System Buttons   | `start`, `back` (or uppercase `START`, `BACK`)                                                 |
 |                  | Toggle versions: `tglStart`, `tglBack` (or `tglSTART`, `tglBACK`)                              |
 ### Analog Sticks
@@ -14,10 +14,6 @@ export const buttonMap = {
  rt: 7,
  back: 8,
  start: 9,
  l3: 10,
  ls: 10,
  r3: 11,
  rs: 11,
  u: 12,
  up: 12,
  d: 13,
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/gamepad",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Gamepad Inputs for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/hydra",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Hydra integration for strudel",
  "main": "hydra.mjs",
  "type": "module",
@@ -5,10 +5,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 import * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, logger, ref } from '@strudel/core';
+import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
 import { scheduleAtTime } from '../superdough/helpers.mjs';
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
@@ -191,7 +190,7 @@ function mapCC(mapping, value) {
 }
 // sends a cc message to the given device on the given channel
-function sendCC(ccn, ccv, device, midichan, targetTime) {
+function sendCC(ccn, ccv, device, midichan, timeOffsetString) {
  if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
    throw new Error('expected ccv to be a number between 0 and 1');
  }
@@ -199,23 +198,19 @@ function sendCC(ccn, ccv, device, midichan, targetTime) {
    throw new Error('expected ccn to be a number or a string');
  }
  const scaled = Math.round(ccv * 127);
-  scheduleAtTime(() => {
+  device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
    device.sendControlChange(ccn, scaled, midichan);
  }, targetTime);
 }
 // sends a program change message to the given device on the given channel
-function sendProgramChange(progNum, device, midichan, targetTime) {
+function sendProgramChange(progNum, device, midichan, timeOffsetString) {
  if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
    throw new Error('expected progNum (program change) to be a number between 0 and 127');
  }
-  scheduleAtTime(() => {
+  device.sendProgramChange(progNum, midichan, { time: timeOffsetString });
    device.sendProgramChange(progNum, midichan);
  }, targetTime);
 }
 // sends a sysex message to the given device on the given channel
-function sendSysex(sysexid, sysexdata, device, targetTime) {
+function sendSysex(sysexid, sysexdata, device, timeOffsetString) {
  if (Array.isArray(sysexid)) {
    if (!sysexid.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
      throw new Error('all sysexid bytes must be integers between 0 and 255');
@@ -230,13 +225,11 @@ function sendSysex(sysexid, sysexdata, device, targetTime) {
  if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
    throw new Error('all sysex bytes must be integers between 0 and 255');
  }
-  scheduleAtTime(() => {
+  device.sendSysex(sysexid, sysexdata, { time: timeOffsetString });
    device.sendSysex(sysexid, sysexdata);
  }, targetTime);
 }
 // sends a NRPN message to the given device on the given channel
-function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
+function sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString) {
  if (Array.isArray(nrpnn)) {
    if (!nrpnn.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
      throw new Error('all nrpnn bytes must be integers between 0 and 255');
@@ -244,34 +237,28 @@ function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
  } else if (!Number.isInteger(nrpv) || nrpv < 0 || nrpv > 255) {
    throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
  }
-  scheduleAtTime(() => {
+
-    device.sendNRPN(nrpnn, nrpv, midichan);
+  device.sendNRPN(nrpnn, nrpv, midichan, { time: timeOffsetString });
  }, targetTime);
 }
 // sends a pitch bend message to the given device on the given channel
-function sendPitchBend(midibend, device, midichan, targetTime) {
+function sendPitchBend(midibend, device, midichan, timeOffsetString) {
  if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
    throw new Error('expected midibend to be a number between -1 and 1');
  }
-  scheduleAtTime(() => {
+  device.sendPitchBend(midibend, midichan, { time: timeOffsetString });
    device.sendPitchBend(midibend, midichan);
  }, targetTime);
 }
 // sends a channel aftertouch message to the given device on the given channel
-function sendAftertouch(miditouch, device, midichan, targetTime) {
+function sendAftertouch(miditouch, device, midichan, timeOffsetString) {
  if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
    throw new Error('expected miditouch to be a number between 0 and 1');
  }
-
+  device.sendChannelAftertouch(miditouch, midichan, { time: timeOffsetString });
  scheduleAtTime(() => {
    device.sendChannelAftertouch(miditouch, midichan);
  }, targetTime);
 }
 // sends a note message to the given device on the given channel
-function sendNote(note, velocity, duration, device, midichan, targetTime) {
+function sendNote(note, velocity, duration, device, midichan, timeOffsetString) {
  if (note == null || note === '') {
    throw new Error('note cannot be null or empty');
  }
@@ -281,12 +268,12 @@ function sendNote(note, velocity, duration, device, midichan, targetTime) {
  if (duration != null && (typeof duration !== 'number' || duration < 0)) {
    throw new Error('duration must be a positive number');
  }
  const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
  const midiNote = new Note(midiNumber, { attack: velocity, duration });
-
+  device.playNote(midiNote, midichan, {
-  scheduleAtTime(() => {
+    time: timeOffsetString,
-    device.playNote(midiNote, midichan);
+  });
  }, targetTime);
 }
 /**
@@ -322,6 +309,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
  let midiConfig = {
    // Default configuration values
    isController: false, // Disable sending notes for midi controllers
    latencyMs: 34, // Default latency to get audio engine to line up in ms
    noteOffsetMs: 10, // Default note-off offset to prevent glitching in ms
    midichannel: 1, // Default MIDI channel
    velocity: 0.9, // Default velocity
@@ -345,13 +333,18 @@ Pattern.prototype.midi = function (midiport, options = {}) {
      logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
  });
-  return this.onTrigger((hap, _currentTime, cps, targetTime) => {
+  return this.onTrigger((hap, currentTime, cps, targetTime) => {
    if (!WebMidi.enabled) {
      logger('Midi not enabled');
      return;
    }
    hap.ensureObjectValue();
    //magic number to get audio engine to line up, can probably be calculated somehow
    const latencyMs = midiConfig.latencyMs;
    // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
    const timeOffsetString = `+${getEventOffsetMs(targetTime, currentTime) + latencyMs}`;
    // midi event values from hap with configurable defaults
    let {
      note,
@@ -387,7 +380,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
    // if midimap is set, send a cc messages from defined controls
    if (midicontrolMap.has(midimap)) {
      const ccs = mapCC(midicontrolMap.get(midimap), hap.value);
-      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, targetTime));
+      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeOffsetString));
    } else if (midimap !== 'default') {
      // Add warning when a non-existent midimap is specified
      logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
@@ -399,12 +392,12 @@ Pattern.prototype.midi = function (midiport, options = {}) {
      // try to prevent glitching by subtracting noteOffsetMs from the duration length
      const duration = (hap.duration.valueOf() / cps) * 1000 - midiConfig.noteOffsetMs;
-      sendNote(note, velocity, duration, device, midichan, targetTime);
+      sendNote(note, velocity, duration, device, midichan, timeOffsetString);
    }
    // Handle program change
    if (progNum !== undefined) {
-      sendProgramChange(progNum, device, midichan, targetTime);
+      sendProgramChange(progNum, device, midichan, timeOffsetString);
    }
    // Handle sysex
@@ -414,63 +407,53 @@ Pattern.prototype.midi = function (midiport, options = {}) {
    // if sysexid is an array the first byte is 0x00
    if (sysexid !== undefined && sysexdata !== undefined) {
-      sendSysex(sysexid, sysexdata, device, targetTime);
+      sendSysex(sysexid, sysexdata, device, timeOffsetString);
    }
    // Handle control change
    if (ccv !== undefined && ccn !== undefined) {
-      sendCC(ccn, ccv, device, midichan, targetTime);
+      sendCC(ccn, ccv, device, midichan, timeOffsetString);
    }
    // Handle NRPN non-registered parameter number
    if (nrpnn !== undefined && nrpv !== undefined) {
-      sendNRPN(nrpnn, nrpv, device, midichan, targetTime);
+      sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString);
    }
    // Handle midibend
    if (midibend !== undefined) {
-      sendPitchBend(midibend, device, midichan, targetTime);
+      sendPitchBend(midibend, device, midichan, timeOffsetString);
    }
    // Handle miditouch
    if (miditouch !== undefined) {
-      sendAftertouch(miditouch, device, midichan, targetTime);
+      sendAftertouch(miditouch, device, midichan, timeOffsetString);
    }
    // Handle midicmd
    if (hap.whole.begin + 0 === 0) {
      // we need to start here because we have the timing info
-      scheduleAtTime(() => {
+      device.sendStart({ time: timeOffsetString });
        device.sendStart();
      }, targetTime);
    }
    if (['clock', 'midiClock'].includes(midicmd)) {
-      scheduleAtTime(() => {
+      device.sendClock({ time: timeOffsetString });
        device.sendClock();
      }, targetTime);
    } else if (['start'].includes(midicmd)) {
-      scheduleAtTime(() => {
+      device.sendStart({ time: timeOffsetString });
        device.sendStart();
      }, targetTime);
    } else if (['stop'].includes(midicmd)) {
-      scheduleAtTime(() => {
+      device.sendStop({ time: timeOffsetString });
        device.sendStop();
      }, targetTime);
    } else if (['continue'].includes(midicmd)) {
-      scheduleAtTime(() => {
+      device.sendContinue({ time: timeOffsetString });
        device.sendContinue();
      }, targetTime);
    } else if (Array.isArray(midicmd)) {
      if (midicmd[0] === 'progNum') {
-        sendProgramChange(midicmd[1], device, midichan, targetTime);
+        sendProgramChange(midicmd[1], device, midichan, timeOffsetString);
      } else if (midicmd[0] === 'cc') {
        if (midicmd.length === 2) {
-          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, targetTime);
+          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeOffsetString);
        }
      } else if (midicmd[0] === 'sysex') {
        if (midicmd.length === 3) {
          const [_, id, data] = midicmd;
-          sendSysex(id, data, device, targetTime);
+          sendSysex(id, data, device, timeOffsetString);
        }
      }
    }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/midi",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mini",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -21,14 +21,13 @@ export class MondoParser {
    close_curly: /^\}/,
    number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
    // TODO: better error handling when "-" is used as rest, e.g "s [- bd]"
-    op: /^[*/:!@%?+\-&]|^\.{2}/, // * / : ! @ % ? ..
+    op: /^[*/:!@%?+-]|^\.{2}/, // * / : ! @ % ? ..
    // dollar: /^\$/,
    pipe: /^#/,
    stack: /^[,$]/,
    or: /^[|]/,
    plain: /^[a-zA-Z0-9-~_^#]+/,
  };
  op_precedence = [['*', '/', ':', '!', '@', '%', '?', '+', '-', '..'], ['&']];
  // matches next token
  next_token(code, offset = 0) {
    for (let type in this.token_types) {
@@ -151,9 +150,9 @@ export class MondoParser {
    }
    return children;
  }
-  desugar_ops(children, types) {
+  desugar_ops(children) {
    while (true) {
-      let opIndex = children.findIndex((child) => child.type === 'op' && types.includes(child.value));
+      let opIndex = children.findIndex((child) => child.type === 'op');
      if (opIndex === -1) break;
      const op = { type: 'plain', value: children[opIndex].value };
      if (opIndex === children.length - 1) {
@@ -264,10 +263,8 @@ export class MondoParser {
          // the type we've removed before splitting needs to be added back
          children = [{ type: 'plain', value: type }, ...children];
        }
-        // for each precendence group, call desugar_ops once
+        children = this.desugar_ops(children);
-        this.op_precedence.forEach((ops) => {
+        // children = this.desugar_pipes(children, (children) => this.desugar_dollars(children));
          children = this.desugar_ops(children, ops);
        });
        children = this.desugar_pipes(children);
        return children;
      }),
@@ -117,7 +117,6 @@ describe('mondo sugar', () => {
  it('should desugar x:y', () => expect(desguar('x:y')).toEqual('(: y x)'));
  it('should desugar x:y:z', () => expect(desguar('x:y:z')).toEqual('(: z (: y x))'));
  it('should desugar x:y*x', () => expect(desguar('bd:0*2')).toEqual('(* 2 (: 0 bd))'));
  it('should desugar x&y:z', () => expect(desguar('bd&3:8')).toEqual('(& (: 8 3) bd)'));
  it('should desugar a..b', () => expect(desguar('0..2')).toEqual('(.. 2 0)'));
  /* it('should desugar x $ y', () => expect(desguar('x $ y')).toEqual('(x y)'));
  it('should desugar x $ y z', () => expect(desguar('x $ y z')).toEqual('(x (y z))'));
@@ -5,13 +5,12 @@ import {
  slow,
  seq,
  stepcat,
-  replicate,
+  extend,
  expand,
  pace,
  chooseIn,
  degradeBy,
  silence,
  bjork,
 } from '@strudel/core';
 import { registerLanguage } from '@strudel/transpiler';
 import { MondoRunner } from 'mondolang';
@@ -37,11 +36,10 @@ lib.square = (...args) => stepcat(...args).setSteps(1);
 lib.angle = (...args) => stepcat(...args).pace(1);
 lib['*'] = fast;
 lib['/'] = slow;
-lib['!'] = replicate;
+lib['!'] = extend;
 lib['@'] = expand;
 lib['%'] = pace;
 lib['?'] = degradeBy; // todo: default 0.5 not working..
 lib['&'] = bjork;
 lib[':'] = tail;
 lib['..'] = range;
 lib['def'] = () => silence;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mondo",
-  "version": "1.1.5",
+  "version": "1.1.4",
  "description": "mondo notation for strudel",
  "main": "mondough.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/motion",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "DeviceMotion API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mqtt",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "MQTT API for strudel",
  "main": "mqtt.mjs",
  "type": "module",
@@ -4,6 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import OSC from 'osc-js';
 import { logger, parseNumeral, register, isNote, noteToMidi, ClockCollator } from '@strudel/core';
 let connection; // Promise<OSC>
@@ -11,18 +13,19 @@ function connect() {
  if (!connection) {
    // make sure this runs only once
    connection = new Promise((resolve, reject) => {
-      const ws = new WebSocket('ws://localhost:8080');
+      const osc = new OSC();
-      ws.addEventListener('open', (event) => {
+      osc.open();
-        logger(`[osc] websocket connected`);
+      osc.on('open', () => {
-        resolve(ws);
+        const url = osc.options?.plugin?.socket?.url;
        logger(`[osc] connected${url ? ` to ${url}` : ''}`);
        resolve(osc);
      });
-      ws.addEventListener('close', (event) => {
+      osc.on('close', () => {
        logger(`[osc] websocket closed`);
        connection = undefined; // allows new connection afterwards
        console.log('[osc] disconnected');
        reject('OSC connection closed');
      });
-      ws.addEventListener('error', (err) => reject(err));
+      osc.on('error', (err) => reject(err));
    }).catch((err) => {
      connection = undefined;
      throw new Error('Could not connect to OSC server. Is it running?');
@@ -58,19 +61,15 @@ export function parseControlsFromHap(hap, cps) {
 const collator = new ClockCollator({});
 export async function oscTrigger(hap, currentTime, cps = 1, targetTime) {
-  const ws = await connect();
+  const osc = await connect();
  const controls = parseControlsFromHap(hap, cps);
  const keyvals = Object.entries(controls).flat();
  const ts = collator.calculateTimestamp(currentTime, targetTime) * 1000;
  const msg = { address: '/dirt/play', args: keyvals, timestamp: ts };
-  if ('oschost' in hap.value) {
+  const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000);
-    msg['host'] = hap.value['oschost'];
+  const message = new OSC.Message('/dirt/play', ...keyvals);
-  }
+  const bundle = new OSC.Bundle([message], ts);
-  if ('oscport' in hap.value) {
+  bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
-    msg['port'] = hap.value['oscport'];
+  osc.send(bundle);
  }
  ws.send(JSON.stringify(msg));
 }
 /**
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/osc",
-  "version": "1.3.0",
+  "version": "1.2.10",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "bin": "./server.js",
@@ -38,8 +38,7 @@
  "homepage": "https://codeberg.org/uzu/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*",
-    "osc": "^2.4.5",
+    "osc-js": "^2.4.1"
    "ws": "^8.18.3"
  },
  "devDependencies": {
    "pkg": "^5.8.1",
@@ -6,59 +6,70 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-// import OSC from 'osc-js';
+import OSC from 'osc-js';
-import { WebSocketServer } from 'ws';
+const args = process.argv.slice(2);
-import osc from 'osc';
+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];
  }
 }
-const WS_PORT = 8080; // WebSocket server port
+let udpClientPort = Number(getArgValue('--port')) || 57120;
-const OSC_REMOTE_IP = '127.0.0.1';
+let debug = Number(getArgValue('--debug')) || 0;
 const OSC_REMOTE_PORT = 57120;
-const udpPort = new osc.UDPPort({
+const config = {
-  localAddress: '0.0.0.0',
+  receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client
-  localPort: 0,
+  udpServer: {
-  remoteAddress: OSC_REMOTE_IP,
+    host: 'localhost', // @param {string} Hostname of udp server to bind to
-  remotePort: OSC_REMOTE_PORT,
+    port: 57121, // @param {number} Port of udp client for messaging
-});
+    // enabling the following line will receive tidal messages:
    // port: 57120, // @param {number} Port of udp client for messaging
    exclusive: false, // @param {boolean} Exclusive flag
  },
  udpClient: {
    host: 'localhost', // @param {string} Hostname of udp client for messaging
    port: udpClientPort, // @param {number} Port of udp client for messaging
  },
  wsServer: {
    host: 'localhost', // @param {string} Hostname of WebSocket server
    port: 8080, // @param {number} Port of WebSocket server
  },
 };
-udpPort.open();
+const osc = new OSC({ plugin: new OSC.BridgePlugin(config) });
 console.log(`[Sending OSC] ${OSC_REMOTE_IP}:${OSC_REMOTE_PORT}`);
-udpPort.on('error', (e) => {
+if (debug) {
-  console.log('Error: ', e);
+  osc.on('*', (message) => {
-});
+    const { address, args } = message;
-
+    let str = '';
-const wss = new WebSocketServer({ port: WS_PORT });
+    for (let i = 0; i < args.length; i += 2) {
-console.log(`[Listening WS] ws://localhost:${WS_PORT}`);
+      str += `${args[i]}: ${args[i + 1]} `;
 wss.on('connection', (ws) => {
  console.log('New WebSocket connection');
  ws.on('message', (message) => {
    let osc_host = '127.0.0.1';
    let osc_port = 57120;
    try {
      const data = JSON.parse(message);
      if ('host' in data) {
        osc_host = data['host'];
      }
      if ('port' in data) {
        osc_port = data['port'];
      }
      let msg = { address: data['address'], args: data['args'] };
      if ('timestamp' in data) {
        msg = { timeTag: osc.timeTag(0, data['timestamp']), packets: [msg] };
      }
      udpPort.send(msg, osc_host, osc_port);
    } catch (err) {
      console.error('Error parsing message:', err);
    }
    console.log(`${address} ${str}`);
  });
 }
-  ws.on('close', () => {
+osc.on('error', (message) => {
-    console.log('WebSocket connection closed');
+  if (message.toString().includes('EADDRINUSE')) {
-  });
+    console.log(`------ ERROR -------
 a server is already running on port 57121! to stop it:
 1. run "lsof -ti :57121 | xargs kill -9" (macos / linux)
 2. re-run the osc server
 `);
  } else {
    console.log(message);
  }
 });
 osc.open();
 console.log('osc client running on port', config.udpClient.port);
 console.log('osc server running on port', config.udpServer.port);
 console.log('websocket server running on port', config.wsServer.port);
 if (debug) {
  console.log('debug logs enabled. incoming messages will appear below');
 }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/repl",
-  "version": "1.2.7",
+  "version": "1.2.6",
  "description": "Strudel REPL as a Web Component",
  "module": "index.mjs",
  "publishConfig": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/serial",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Webserial API for strudel",
  "main": "serial.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/soundfonts",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Soundsfont support for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -153,7 +153,6 @@ samples('github:tidalcycles/dirt-samples')
 The format is `github:<user>/<repo>/<branch>`.
 If `<repo>` and `<branch>` are not specified, they will default to `samples` and `main` respectively.
 It expects a `strudel.json` file to be present at the root of the given repository, which declares the sample paths in the repo.
 The format is also expected to be the same as explained above.
@@ -280,11 +280,6 @@ export function getVibratoOscillator(param, value, t) {
    return vibratoOscillator;
  }
 }
 export function scheduleAtTime(callback, targetTime, audioContext = getAudioContext()) {
  const currentTime = audioContext.currentTime;
  webAudioTimeout(audioContext, callback, currentTime, targetTime);
 }
 // ConstantSource inherits AudioScheduledSourceNode, which has scheduling abilities
 // a bit of a hack, but it works very well :)
 export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
@@ -1,6 +1,6 @@
 {
  "name": "superdough",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
  "main": "index.mjs",
  "type": "module",
@@ -121,18 +121,13 @@ function githubPath(base, subpath = '') {
  if (!base.startsWith('github:')) {
    throw new Error('expected "github:" at the start of pseudoUrl');
  }
-  let path = base.slice('github:'.length);
+  let [_, path] = base.split('github:');
  path = path.endsWith('/') ? path.slice(0, -1) : path;
-
+  if (path.split('/').length === 2) {
-  let components = path.split('/');
+    // assume main as default branch if none set
-  let user = components[0];
+    path += '/main';
-  let repo = components.length >= 2 ? components[1] : 'samples';
+  }
-  let branch = components.length >= 3 ? components[2] : 'main';
+  return `https://raw.githubusercontent.com/${path}/${subpath}`;
  let other = components.slice(3);
  other.push(subpath ? subpath : '');
  other = other.join('/');
  return `https://raw.githubusercontent.com/${user}/${repo}/${branch}/${other}`;
 }
 export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '') => {
@@ -630,7 +630,6 @@ 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(getDistortion(distort, distortvol, distorttype));
  if (tremolosync != null) {
@@ -16,17 +16,13 @@ export const tokenizeNote = (note) => {
 const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
 const accs = { '#': 1, b: -1, s: 1, f: -1 };
 export const getAccidentalsOffset = (accidentals) => {
  return accidentals?.split('').reduce((o, char) => o + accs[char], 0) || 0;
 };
 export const noteToMidi = (note, defaultOctave = 3) => {
  const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
  if (!pc) {
    throw new Error('not a note: "' + note + '"');
  }
  const chroma = chromas[pc.toLowerCase()];
-  const offset = getAccidentalsOffset(acc);
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
  return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const midiToFreq = (n) => {
@@ -231,12 +231,12 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
      begin: t,
      end: envEnd,
      frequency,
-      freqspread: value.detune,
+      detune: value.detune,
      position: value.wt,
      warp: value.warp,
      warpMode: warpmode,
      voices: Math.max(value.unison ?? 1, 1),
-      panspread: value.spread,
+      spread: value.spread,
      phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
    },
    { outputChannelCount: [2] },
@@ -1050,15 +1050,14 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
    return [
      { name: 'begin', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
      { name: 'end', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
-      { name: 'frequency', defaultValue: 440, min: Number.EPSILON },
+      { name: 'frequency', defaultValue: 220, minValue: 0.01, maxValue: 20000 },
-      { name: 'detune', defaultValue: 0 },
+      { name: 'detune', defaultValue: 0.18 },
-      { name: 'freqspread', defaultValue: 0.18, min: 0 },
+      { name: 'position', defaultValue: 0, minValue: 0, maxValue: 1 },
-      { name: 'position', defaultValue: 0, min: 0, max: 1 },
+      { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
      { name: 'warp', defaultValue: 0, min: 0, max: 1 },
      { name: 'warpMode', defaultValue: 0 },
-      { name: 'voices', defaultValue: 1, min: 1 },
+      { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
-      { name: 'panspread', defaultValue: 0.7, min: 0, max: 1 },
+      { name: 'spread', defaultValue: 0.7, minValue: 0, maxValue: 1 },
-      { name: 'phaserand', defaultValue: 0, min: 0, max: 1 },
+      { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
    ];
  }
@@ -1236,12 +1235,10 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
  _sampleFrame(frame, phase) {
    const len = frame.length;
    const pos = phase * len;
-    let i = pos | 0;
+    const i = pos | 0;
    if (i >= len) i = 0; // fast wrap
    const frac = pos - i;
    const a = frame[i];
-    let i1 = i + 1;
+    const i1 = i + 1 < len ? i + 1 : 0; // fast wrap
    if (i1 >= len) i1 = 0;
    const b = frame[i1];
    return a + (b - a) * frac;
  }
@@ -1271,7 +1268,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
    }
    for (let i = 0; i < outL.length; i++) {
      const detune = pv(parameters.detune, i);
      const freqspread = pv(parameters.freqspread, i);
      const tablePos = clamp(pv(parameters.position, i), 0, 1);
      const idx = tablePos * (this.numFrames - 1);
      const fIdx = idx | 0;
@@ -1280,9 +1276,9 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
      const warpMode = pv(parameters.warpMode, i);
      const voices = pv(parameters.voices, i);
      const phaseRand = clamp(pv(parameters.phaserand, i), 0, 1);
-      const panspread = voices > 1 ? clamp(pv(parameters.panspread, i), 0, 1) : 0;
+      const spread = voices > 1 ? clamp(pv(parameters.spread, i), 0, 1) : 0;
-      const gain1 = Math.sqrt(0.5 - 0.5 * panspread);
+      const gain1 = Math.sqrt(0.5 - 0.5 * spread);
-      const gain2 = Math.sqrt(0.5 + 0.5 * panspread);
+      const gain2 = Math.sqrt(0.5 + 0.5 * spread);
      let f = pv(parameters.frequency, i);
      f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
      const normalizer = 1 / Math.sqrt(voices);
@@ -1295,7 +1291,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
          gainL = gain2;
          gainR = gain1;
        }
-        const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, freqspread, n)); // voice detune
+        const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
        const dPhase = fVoice * this.invSR;
        const level = this._chooseMip(dPhase);
        const table = this.tables[level];
@@ -1,6 +1,6 @@
 {
  "name": "supradough",
-  "version": "1.2.4",
+  "version": "1.2.3",
  "description": "platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.",
  "main": "index.mjs",
  "type": "module",
@@ -32,5 +32,6 @@
    "vite": "^6.0.11",
    "vite-plugin-bundle-audioworklet": "workspace:*",
    "wav-encoder": "^1.3.0"
-  }
+  },
  "dependencies": {}
 }
@@ -1,9 +1,9 @@
 import './tonal.mjs';
 import './voicings.mjs';
 import './ireal.mjs';
 export * from './tonal.mjs';
 export * from './voicings.mjs';
-export * from './ireal.mjs';
+
 import './ireal.mjs';
 export const packageName = '@strudel/tonal';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/tonal",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Tonal functions for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -61,6 +61,13 @@ describe('tonal', () => {
          .firstCycleValues.map((h) => h.note),
      ).toEqual(['B2', 'Eb3', 'A2', 'G3', 'F3']);
    });
    it('produces silence for mixed sharps and flats', () => {
      expect(
        n(seq('0b#', '1#b', '2#b#'))
          .scale('C major')
          .firstCycleValues.map((h) => h.note),
      ).toEqual([]);
    });
    it('snaps notes (upwards) to scale', () => {
      const inputNotes = ['Cb', 'Eb', 'G', 'A#', 'Bb'];
      const expectedNotes = ['B2', 'E3', 'G3', 'B3', 'B3'];
@@ -5,8 +5,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 import { Note, Interval, Scale } from '@tonaljs/tonal';
-import { register, _mod, logger, isNote, noteToMidi, removeUndefineds, getAccidentalsOffset } from '@strudel/core';
+import { register, _mod, silence, logger, pure, isNote } from '@strudel/core';
 import { stepInNamedScale, nearestNumberIndex } from './tonleiter.mjs';
 import { noteToMidi } from '../core/util.mjs';
 const octavesInterval = (octaves) => (octaves <= 0 ? -1 : 1) + octaves * 7 + 'P';
@@ -184,15 +185,17 @@ function _convertStepToNumberAndOffset(step) {
    step = String(step);
    // Check to see if the step matches the expected format:
    // - A number (possibly negative)
-    // - Some number of sharps or flats
+    // - Some number of sharps or flats (but not both)
-    const match = /^(-?\d+)([#bsf]*)$/.exec(step);
+    const match = /^(-?\d+)(#+|b+)?$/.exec(step);
    if (!match) {
      throw new Error(`invalid scale step "${step}", expected number or integer with optional # b suffixes`);
    }
    asNumber = Number(match[1]);
-    const accidentals = match[2] || '';
+    // These decorations will determine the semitone offset based on the number of
-    offset = getAccidentalsOffset(accidentals);
+    // sharps or flats
    const decorations = match[2] || '';
    offset = decorations[0] === '#' ? decorations.length : -decorations.length;
  }
  return [asNumber, offset];
 }
@@ -223,7 +226,7 @@ function _getNearestScaleNote(scaleName, note, preferHigher = true) {
 * Turns numbers into notes in the scale (zero indexed) or quantizes notes to a scale.
 *
 * When describing notes via numbers, note that negative numbers can be used to wrap backwards
- * in the scale as well as sharps or flats to produce notes outside of the scale.
+ * in the scale as well as sharps or flats (but not both) to produce notes outside of the scale.
 *
 * Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
 *
@@ -251,6 +254,7 @@ function _getNearestScaleNote(scaleName, note, preferHigher = true) {
 * @example
 * note("C1*16").transpose(irand(36)).scale('Cb2 major').scaleTranspose(3)
 */
 export const scale = register(
  'scale',
  function (scale, pat) {
@@ -258,47 +262,44 @@ export const scale = register(
    if (Array.isArray(scale)) {
      scale = scale.flat().join(' ');
    }
-    return pat.withHaps((haps) => {
+    return (
-      haps = haps.map((hap) => {
+      pat
-        let hVal = hap.value;
+        .fmap((value) => {
-        const isObject = typeof hVal === 'object';
+          const isObject = typeof value === 'object';
-        // If hVal is a pure value, place it on `n` so that we interpret it as a scale degree
+          // The case where the note has been defined via `n` or `pure`
-        hVal = isObject ? hVal : { n: hVal };
+          if (!isObject || (isObject && ('n' in value || 'value' in value))) {
-        const { note, n, value, ...otherValues } = hVal;
+            const step = isObject ? (value.n ?? value.value) : value;
-        const noteOrStep = note ?? n ?? value;
+            delete value.n; // remove n so it won't cause trouble
-        if (noteOrStep === undefined) {
+            if (isNote(step)) {
-          logger(
+              // legacy..
-            `[tonal] Invalid value format for 'scale'. Value must contain n, note, or value but received keys [${Object.keys(hVal).join(', ')}]`,
+              return pure(step);
            'error',
          );
          return hap; // pass the value through unchanged
        }
        let scaleNote;
        if (isNote(noteOrStep)) {
          // Note case (quantize to scale)
          scaleNote = _getNearestScaleNote(scale, noteOrStep);
          hap.value = { ...otherValues, note: scaleNote };
        } else {
          // Step case (convert to note in scale)
          try {
            const [number, offset] = _convertStepToNumberAndOffset(noteOrStep);
            if (otherValues.anchor) {
              scaleNote = stepInNamedScale(number, scale, otherValues.anchor);
            } else {
              scaleNote = scaleStep(number, scale);
            }
-            if (offset != 0) scaleNote = Note.transpose(scaleNote, Interval.fromSemitones(offset));
+            try {
-          } catch (err) {
+              const [number, offset] = _convertStepToNumberAndOffset(step);
-            logger(`[tonal] ${err.message}`, 'error');
+              let note;
-            return; // will be removed
+              if (isObject && value.anchor) {
                note = stepInNamedScale(number, scale, value.anchor);
              } else {
                note = scaleStep(number, scale);
              }
              if (offset != 0) note = Note.transpose(note, Interval.fromSemitones(offset));
              value = pure(isObject ? { ...value, note } : note);
            } catch (err) {
              logger(`[tonal] ${err.message}`, 'error');
              return silence;
            }
            return value;
          }
-        }
+          // The case where the note has been defined via `note`
-        hap.value = isObject ? { ...otherValues, note: scaleNote } : scaleNote;
+          else {
-        // Tag with scale for downsteam scale-aware operations
+            const note = _getNearestScaleNote(scale, value.note);
-        return hap.setContext({ ...hap.context, scale });
+            return pure(isObject ? { ...value, note } : note);
-      });
+          }
-      return removeUndefineds(haps);
+        })
-    });
+        .outerJoin()
        // legacy:
        .withHap((hap) => hap.setContext({ ...hap.context, scale }))
    );
  },
  true,
  true, // preserve step count
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/transpiler",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/web",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
  "module": "web.mjs",
  "publishConfig": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/webaudio",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Web Audio helpers for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/xen",
-  "version": "1.2.5",
+  "version": "1.2.4",
  "description": "Xenharmonic API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -41,6 +41,7 @@ Tune.prototype.tonicize = function(newTonic) {
 	this.tonic = newTonic
 }
 /* Return data in the mode you are in (freq, ratio, or midi) */
 Tune.prototype.note = function(input,octave){
@@ -41,7 +41,7 @@ importers:
        version: 2.2.7
      '@vitest/coverage-v8':
        specifier: 3.0.4
-        version: 3.0.4(vitest@3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0))
+        version: 3.0.4(vitest@3.0.4)
      '@vitest/ui':
        specifier: ^3.0.4
        version: 3.0.4(vitest@3.0.4)
@@ -212,21 +212,12 @@ importers:
      '@strudel/draw':
        specifier: workspace:*
        version: link:../draw
      '@strudel/tonal':
        specifier: workspace:*
        version: link:../tonal
      '@strudel/transpiler':
        specifier: workspace:*
        version: link:../transpiler
      '@tonaljs/tonal':
        specifier: ^4.10.0
        version: 4.10.0
      nanostores:
        specifier: ^0.11.3
        version: 0.11.3
      superdough:
        specifier: workspace:*
        version: link:../superdough
    devDependencies:
      vite:
        specifier: ^6.0.11
@@ -415,12 +406,9 @@ importers:
      '@strudel/core':
        specifier: workspace:*
        version: link:../core
-      osc:
+      osc-js:
-        specifier: ^2.4.5
+        specifier: ^2.4.1
-        version: 2.4.5
+        version: 2.4.1
      ws:
        specifier: ^8.18.3
        version: 8.18.3
    devDependencies:
      pkg:
        specifier: ^5.8.1
@@ -2432,70 +2420,6 @@ packages:
  '@rtsao/scc@1.1.0':
    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
  '@serialport/binding-mock@10.2.2':
    resolution: {integrity: sha512-HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw==}
    engines: {node: '>=12.0.0'}
  '@serialport/bindings-cpp@12.0.1':
    resolution: {integrity: sha512-r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg==}
    engines: {node: '>=16.0.0'}
  '@serialport/bindings-interface@1.2.2':
    resolution: {integrity: sha512-CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA==}
    engines: {node: ^12.22 || ^14.13 || >=16}
  '@serialport/parser-byte-length@12.0.0':
    resolution: {integrity: sha512-0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-cctalk@12.0.0':
    resolution: {integrity: sha512-0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-delimiter@11.0.0':
    resolution: {integrity: sha512-aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-delimiter@12.0.0':
    resolution: {integrity: sha512-gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-inter-byte-timeout@12.0.0':
    resolution: {integrity: sha512-GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-packet-length@12.0.0':
    resolution: {integrity: sha512-p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ==}
    engines: {node: '>=8.6.0'}
  '@serialport/parser-readline@11.0.0':
    resolution: {integrity: sha512-rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-readline@12.0.0':
    resolution: {integrity: sha512-O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-ready@12.0.0':
    resolution: {integrity: sha512-ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-regex@12.0.0':
    resolution: {integrity: sha512-dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-slip-encoder@12.0.0':
    resolution: {integrity: sha512-0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA==}
    engines: {node: '>=12.0.0'}
  '@serialport/parser-spacepacket@12.0.0':
    resolution: {integrity: sha512-dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q==}
    engines: {node: '>=12.0.0'}
  '@serialport/stream@12.0.0':
    resolution: {integrity: sha512-9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q==}
    engines: {node: '>=12.0.0'}
  '@shikijs/core@1.29.1':
    resolution: {integrity: sha512-Mo1gGGkuOYjDu5H8YwzmOuly9vNr8KDVkqj9xiKhhhFS8jisAtDSEWB9hzqRHLVQgFdA310e8XRJcW4tYhRB2A==}
@@ -3748,15 +3672,6 @@ packages:
      supports-color:
        optional: true
  debug@4.3.4:
    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
    engines: {node: '>=6.0'}
    peerDependencies:
      supports-color: '*'
    peerDependenciesMeta:
      supports-color:
        optional: true
  debug@4.4.0:
    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
    engines: {node: '>=6.0'}
@@ -5366,9 +5281,6 @@ packages:
    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
    engines: {node: '>=10'}
  long@4.0.0:
    resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
  longest-streak@3.1.0:
    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
@@ -5752,9 +5664,6 @@ packages:
  ms@2.0.0:
    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
  ms@2.1.2:
    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
  ms@2.1.3:
    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
@@ -5813,9 +5722,6 @@ packages:
    resolution: {integrity: sha512-z8iYzQGBu35ZkTQ9mtR8RqugJZ9RCLn8fv3d7LsgDBzOijGQP3RdKTX4LA7LXw03ZhU5z0l4xfhIMgSES31+cg==}
    engines: {node: '>=10'}
  node-addon-api@7.0.0:
    resolution: {integrity: sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==}
  node-addon-api@8.3.0:
    resolution: {integrity: sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==}
    engines: {node: ^18 || ^20 || >= 21}
@@ -5854,10 +5760,6 @@ packages:
    resolution: {integrity: sha512-yqkmYrMbK1wPrfz7mgeYvA4tBperLg9FQ4S3Sau3nSAkpOA0x0zC8nQ1siBwozy1f4SE8vq2n1WKv99r+PCa1Q==}
    engines: {node: '>= 0.6.0'}
  node-gyp-build@4.6.0:
    resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==}
    hasBin: true
  node-gyp-build@4.8.4:
    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
    hasBin: true
@@ -6016,8 +5918,8 @@ packages:
    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
    engines: {node: '>=0.10.0'}
-  osc@2.4.5:
+  osc-js@2.4.1:
-    resolution: {integrity: sha512-Nc4/qcl+vA/CMxiKS1xrYgzjfnyB3W94gZnrkn3eTzihlndbEml6+wj1YQNKBI4r+qrw3obCcEoU7SVH/OxpxA==}
+    resolution: {integrity: sha512-QlSeRKJclL47FNvO1MUCAAp9frmCF9zcYbnf6R9HpcklAst8ZyX3ISsk1v/Vghr/5GmXn0bhVjFXF9h+hfnl4Q==}
  own-keys@1.0.1:
    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
@@ -6778,10 +6680,6 @@ packages:
  serialize-javascript@4.0.0:
    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
  serialport@12.0.0:
    resolution: {integrity: sha512-AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA==}
    engines: {node: '>=16.0.0'}
  set-blocking@2.0.0:
    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
@@ -6869,9 +6767,6 @@ packages:
    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
    engines: {node: '>=8'}
  slip@1.0.2:
    resolution: {integrity: sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==}
  smart-buffer@4.2.0:
    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -7747,9 +7642,6 @@ packages:
    resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==}
    engines: {node: '>=18'}
  wolfy87-eventemitter@5.2.9:
    resolution: {integrity: sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==}
  word-wrap@1.2.5:
    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
    engines: {node: '>=0.10.0'}
@@ -7872,18 +7764,6 @@ packages:
      utf-8-validate:
        optional: true
  ws@8.18.3:
    resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
    engines: {node: '>=10.0.0'}
    peerDependencies:
      bufferutil: ^4.0.1
      utf-8-validate: '>=5.0.2'
    peerDependenciesMeta:
      bufferutil:
        optional: true
      utf-8-validate:
        optional: true
  xmlcreate@2.0.4:
    resolution: {integrity: sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==}
@@ -9880,76 +9760,6 @@ snapshots:
  '@rtsao/scc@1.1.0': {}
  '@serialport/binding-mock@10.2.2':
    dependencies:
      '@serialport/bindings-interface': 1.2.2
      debug: 4.4.0
    transitivePeerDependencies:
      - supports-color
    optional: true
  '@serialport/bindings-cpp@12.0.1':
    dependencies:
      '@serialport/bindings-interface': 1.2.2
      '@serialport/parser-readline': 11.0.0
      debug: 4.3.4
      node-addon-api: 7.0.0
      node-gyp-build: 4.6.0
    transitivePeerDependencies:
      - supports-color
    optional: true
  '@serialport/bindings-interface@1.2.2':
    optional: true
  '@serialport/parser-byte-length@12.0.0':
    optional: true
  '@serialport/parser-cctalk@12.0.0':
    optional: true
  '@serialport/parser-delimiter@11.0.0':
    optional: true
  '@serialport/parser-delimiter@12.0.0':
    optional: true
  '@serialport/parser-inter-byte-timeout@12.0.0':
    optional: true
  '@serialport/parser-packet-length@12.0.0':
    optional: true
  '@serialport/parser-readline@11.0.0':
    dependencies:
      '@serialport/parser-delimiter': 11.0.0
    optional: true
  '@serialport/parser-readline@12.0.0':
    dependencies:
      '@serialport/parser-delimiter': 12.0.0
    optional: true
  '@serialport/parser-ready@12.0.0':
    optional: true
  '@serialport/parser-regex@12.0.0':
    optional: true
  '@serialport/parser-slip-encoder@12.0.0':
    optional: true
  '@serialport/parser-spacepacket@12.0.0':
    optional: true
  '@serialport/stream@12.0.0':
    dependencies:
      '@serialport/bindings-interface': 1.2.2
      debug: 4.3.4
    transitivePeerDependencies:
      - supports-color
    optional: true
  '@shikijs/core@1.29.1':
    dependencies:
      '@shikijs/engine-javascript': 1.29.1
@@ -10554,7 +10364,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color
-  '@vitest/coverage-v8@3.0.4(vitest@3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0))':
+  '@vitest/coverage-v8@3.0.4(vitest@3.0.4)':
    dependencies:
      '@ampproject/remapping': 2.3.0
      '@bcoe/v8-coverage': 1.0.2
@@ -11462,11 +11272,6 @@ snapshots:
    dependencies:
      ms: 2.1.3
  debug@4.3.4:
    dependencies:
      ms: 2.1.2
    optional: true
  debug@4.4.0:
    dependencies:
      ms: 2.1.3
@@ -13336,8 +13141,6 @@ snapshots:
      chalk: 4.1.2
      is-unicode-supported: 0.1.0
  long@4.0.0: {}
  longest-streak@3.1.0: {}
  loupe@3.1.2: {}
@@ -14015,9 +13818,6 @@ snapshots:
  ms@2.0.0: {}
  ms@2.1.2:
    optional: true
  ms@2.1.3: {}
  multimatch@5.0.0:
@@ -14067,9 +13867,6 @@ snapshots:
    dependencies:
      semver: 7.6.3
  node-addon-api@7.0.0:
    optional: true
  node-addon-api@8.3.0: {}
  node-domexception@1.0.0: {}
@@ -14096,9 +13893,6 @@ snapshots:
  node-getopt@0.3.2: {}
  node-gyp-build@4.6.0:
    optional: true
  node-gyp-build@4.8.4: {}
  node-gyp@10.3.1:
@@ -14350,17 +14144,11 @@ snapshots:
  os-tmpdir@1.0.2: {}
-  osc@2.4.5:
+  osc-js@2.4.1:
    dependencies:
      long: 4.0.0
      slip: 1.0.2
      wolfy87-eventemitter: 5.2.9
      ws: 8.18.0
    optionalDependencies:
      serialport: 12.0.0
    transitivePeerDependencies:
      - bufferutil
      - supports-color
      - utf-8-validate
  own-keys@1.0.1:
@@ -15255,26 +15043,6 @@ snapshots:
    dependencies:
      randombytes: 2.1.0
  serialport@12.0.0:
    dependencies:
      '@serialport/binding-mock': 10.2.2
      '@serialport/bindings-cpp': 12.0.1
      '@serialport/parser-byte-length': 12.0.0
      '@serialport/parser-cctalk': 12.0.0
      '@serialport/parser-delimiter': 12.0.0
      '@serialport/parser-inter-byte-timeout': 12.0.0
      '@serialport/parser-packet-length': 12.0.0
      '@serialport/parser-readline': 12.0.0
      '@serialport/parser-ready': 12.0.0
      '@serialport/parser-regex': 12.0.0
      '@serialport/parser-slip-encoder': 12.0.0
      '@serialport/parser-spacepacket': 12.0.0
      '@serialport/stream': 12.0.0
      debug: 4.3.4
    transitivePeerDependencies:
      - supports-color
    optional: true
  set-blocking@2.0.0: {}
  set-function-length@1.2.2:
@@ -15417,8 +15185,6 @@ snapshots:
  slash@3.0.0: {}
  slip@1.0.2: {}
  smart-buffer@4.2.0: {}
  socks-proxy-agent@8.0.5:
@@ -16328,8 +16094,6 @@ snapshots:
    dependencies:
      string-width: 7.2.0
  wolfy87-eventemitter@5.2.9: {}
  word-wrap@1.2.5: {}
  wordwrap@0.0.3: {}
@@ -16529,8 +16293,6 @@ snapshots:
  ws@8.18.0: {}
  ws@8.18.3: {}
  xmlcreate@2.0.4: {}
  xtend@4.0.2: {}
@@ -840,31 +840,6 @@ exports[`runs examples > example "amp" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "anchor" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:E2 ]",
  "[ 0/1 → 1/1 | note:C3 ]",
  "[ 0/1 → 1/1 | note:E3 ]",
  "[ 0/1 → 1/1 | note:G3 ]",
  "[ 0/1 → 1/1 | note:C4 ]",
  "[ 1/1 → 2/1 | note:C3 ]",
  "[ 1/1 → 2/1 | note:G3 ]",
  "[ 1/1 → 2/1 | note:C4 ]",
  "[ 1/1 → 2/1 | note:E4 ]",
  "[ 1/1 → 2/1 | note:G4 ]",
  "[ 2/1 → 3/1 | note:E3 ]",
  "[ 2/1 → 3/1 | note:C4 ]",
  "[ 2/1 → 3/1 | note:E4 ]",
  "[ 2/1 → 3/1 | note:G4 ]",
  "[ 2/1 → 3/1 | note:C5 ]",
  "[ 3/1 → 4/1 | note:C4 ]",
  "[ 3/1 → 4/1 | note:G4 ]",
  "[ 3/1 → 4/1 | note:C5 ]",
  "[ 3/1 → 4/1 | note:E5 ]",
  "[ 3/1 → 4/1 | note:G5 ]",
 ]
 `;
 exports[`runs examples > example "apply" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:C3 ]",
@@ -1872,31 +1847,6 @@ exports[`runs examples > example "chop" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "chord" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:A3 ]",
  "[ 0/1 → 1/1 | note:C4 ]",
  "[ 0/1 → 1/1 | note:E4 ]",
  "[ 0/1 → 1/1 | note:A4 ]",
  "[ 0/1 → 1/1 | note:C5 ]",
  "[ 1/1 → 2/1 | note:E3 ]",
  "[ 1/1 → 2/1 | note:C4 ]",
  "[ 1/1 → 2/1 | note:E4 ]",
  "[ 1/1 → 2/1 | note:G4 ]",
  "[ 1/1 → 2/1 | note:C5 ]",
  "[ 2/1 → 3/1 | note:D3 ]",
  "[ 2/1 → 3/1 | note:A3 ]",
  "[ 2/1 → 3/1 | note:D4 ]",
  "[ 2/1 → 3/1 | note:Gb4 ]",
  "[ 2/1 → 3/1 | note:A4 ]",
  "[ 3/1 → 4/1 | note:F3 ]",
  "[ 3/1 → 4/1 | note:C4 ]",
  "[ 3/1 → 4/1 | note:F4 ]",
  "[ 3/1 → 4/1 | note:A4 ]",
  "[ 3/1 → 4/1 | note:C5 ]",
 ]
 `;
 exports[`runs examples > example "chorus" example index 0 1`] = `
 [
  "[ 0/1 → 1/4 | note:d s:sawtooth chorus:0.5 ]",
@@ -2789,23 +2739,6 @@ exports[`runs examples > example "detune" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "dictionary" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:A3 room:0.5 ]",
  "[ 0/1 → 1/1 | note:C4 room:0.5 ]",
  "[ 0/1 → 1/1 | note:E4 room:0.5 ]",
  "[ 1/1 → 2/1 | note:G3 room:0.5 ]",
  "[ 1/1 → 2/1 | note:C4 room:0.5 ]",
  "[ 1/1 → 2/1 | note:E4 room:0.5 ]",
  "[ 2/1 → 3/1 | note:A3 room:0.5 ]",
  "[ 2/1 → 3/1 | note:D4 room:0.5 ]",
  "[ 2/1 → 3/1 | note:Gb4 room:0.5 ]",
  "[ 3/1 → 4/1 | note:A3 room:0.5 ]",
  "[ 3/1 → 4/1 | note:C4 room:0.5 ]",
  "[ 3/1 → 4/1 | note:F4 room:0.5 ]",
 ]
 `;
 exports[`runs examples > example "distort" example index 0 1`] = `
 [
  "[ 0/1 → 1/8 | s:hh distort:0 ]",
@@ -3905,8 +3838,8 @@ exports[`runs examples > example "fast" example index 0 1`] = `
 exports[`runs examples > example "fastChunk" example index 0 1`] = `
 [
-  "[ 0/1 → 1/4 | note:C2 color:red ]",
+  "[ 0/1 → 1/4 | color:red note:0 ]",
-  "[ 1/4 → 1/2 | note:D2 color:red ]",
+  "[ 1/4 → 1/2 | color:red note:1 ]",
  "[ 1/2 → 3/4 | note:E2 ]",
  "[ 3/4 → 1/1 | note:F2 ]",
  "[ 1/1 → 5/4 | note:G2 ]",
@@ -3915,8 +3848,8 @@ exports[`runs examples > example "fastChunk" example index 0 1`] = `
  "[ 7/4 → 2/1 | note:C3 ]",
  "[ 2/1 → 9/4 | note:D3 ]",
  "[ 9/4 → 5/2 | note:D2 ]",
-  "[ 5/2 → 11/4 | note:E2 color:red ]",
+  "[ 5/2 → 11/4 | color:red note:2 ]",
-  "[ 11/4 → 3/1 | note:F2 color:red ]",
+  "[ 11/4 → 3/1 | color:red note:3 ]",
  "[ 3/1 → 13/4 | note:G2 ]",
  "[ 13/4 → 7/2 | note:A2 ]",
  "[ 7/2 → 15/4 | note:B2 ]",
@@ -6563,28 +6496,6 @@ exports[`runs examples > example "miditouch" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "mode" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:E3 ]",
  "[ 0/1 → 1/1 | note:C4 ]",
  "[ 0/1 → 1/1 | note:E4 ]",
  "[ 0/1 → 1/1 | note:G4 ]",
  "[ 0/1 → 1/1 | note:C5 ]",
  "[ 1/1 → 2/1 | note:C5 ]",
  "[ 1/1 → 2/1 | note:G5 ]",
  "[ 1/1 → 2/1 | note:C6 ]",
  "[ 1/1 → 2/1 | note:E6 ]",
  "[ 2/1 → 3/1 | note:E3 ]",
  "[ 2/1 → 3/1 | note:C4 ]",
  "[ 2/1 → 3/1 | note:E4 ]",
  "[ 2/1 → 3/1 | note:G4 ]",
  "[ 3/1 → 4/1 | note:C5 ]",
  "[ 3/1 → 4/1 | note:G5 ]",
  "[ 3/1 → 4/1 | note:C6 ]",
  "[ 3/1 → 4/1 | note:E6 ]",
 ]
 `;
 exports[`runs examples > example "morph" example index 0 1`] = `
 [
  "[ 0/1 → 1/8 | s:hh ]",
@@ -6903,31 +6814,6 @@ exports[`runs examples > example "octave" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "octaves" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:A3 ]",
  "[ 0/1 → 1/1 | note:C4 ]",
  "[ 0/1 → 1/1 | note:E4 ]",
  "[ 0/1 → 1/1 | note:A4 ]",
  "[ 0/1 → 1/1 | note:C5 ]",
  "[ 1/1 → 2/1 | note:E3 ]",
  "[ 1/1 → 2/1 | note:C4 ]",
  "[ 1/1 → 2/1 | note:E4 ]",
  "[ 1/1 → 2/1 | note:G4 ]",
  "[ 1/1 → 2/1 | note:C5 ]",
  "[ 2/1 → 3/1 | note:D3 ]",
  "[ 2/1 → 3/1 | note:A3 ]",
  "[ 2/1 → 3/1 | note:D4 ]",
  "[ 2/1 → 3/1 | note:Gb4 ]",
  "[ 2/1 → 3/1 | note:A4 ]",
  "[ 3/1 → 4/1 | note:F3 ]",
  "[ 3/1 → 4/1 | note:C4 ]",
  "[ 3/1 → 4/1 | note:F4 ]",
  "[ 3/1 → 4/1 | note:A4 ]",
  "[ 3/1 → 4/1 | note:C5 ]",
 ]
 `;
 exports[`runs examples > example "off" example index 0 1`] = `
 [
  "[ -5/24 ⇜ (0/1 → 1/8) | note:62 ]",
@@ -6961,15 +6847,6 @@ exports[`runs examples > example "off" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "offset" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | chord:Am offset:0 ]",
  "[ 1/1 → 2/1 | chord:C offset:1 ]",
  "[ 2/1 → 3/1 | chord:D offset:2 ]",
  "[ 3/1 → 4/1 | chord:F offset:3 ]",
 ]
 `;
 exports[`runs examples > example "often" example index 0 1`] = `
 [
  "[ 0/1 → 1/8 | s:hh speed:0.5 ]",
@@ -7081,24 +6958,6 @@ exports[`runs examples > example "orbit" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "oschost" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 1/1 → 2/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 2/1 → 3/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 3/1 → 4/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
 ]
 `;
 exports[`runs examples > example "oscport" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 1/1 → 2/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 2/1 → 3/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
  "[ 3/1 → 4/1 | note:c4 oschost:127.0.0.1 oscport:57120 ]",
 ]
 `;
 exports[`runs examples > example "outside" example index 0 1`] = `
 [
  "[ 0/1 → 1/1 | note:A3 ]",
@@ -8448,33 +8307,6 @@ exports[`runs examples > example "repeatCycles" example index 0 1`] = `
 ]
 `;
 exports[`runs examples > example "replicate" example index 0 1`] = `
 [
  "[ 0/1 → 1/8 | s:bd ]",
  "[ 1/8 → 1/4 | s:bd ]",
  "[ 3/8 → 1/2 | s:cp ]",
  "[ 1/2 → 5/8 | s:bd ]",
  "[ 5/8 → 3/4 | s:bd ]",
  "[ 7/8 → 1/1 | s:cp ]",
  "[ 1/1 → 9/8 | s:bd ]",
  "[ 5/4 → 11/8 | s:sd ]",
  "[ 3/2 → 13/8 | s:bd ]",
  "[ 13/8 → 7/4 | s:bd ]",
  "[ 15/8 → 2/1 | s:cp ]",
  "[ 2/1 → 17/8 | s:bd ]",
  "[ 17/8 → 9/4 | s:bd ]",
  "[ 19/8 → 5/2 | s:cp ]",
  "[ 5/2 → 21/8 | s:bd ]",
  "[ 11/4 → 23/8 | s:sd ]",
  "[ 3/1 → 25/8 | s:bd ]",
  "[ 25/8 → 13/4 | s:bd ]",
  "[ 27/8 → 7/2 | s:cp ]",
  "[ 7/2 → 29/8 | s:bd ]",
  "[ 29/8 → 15/4 | s:bd ]",
  "[ 31/8 → 4/1 | s:cp ]",
 ]
 `;
 exports[`runs examples > example "reset" example index 0 1`] = `
 [
  "[ 0/1 → 1/8 | s:hh ]",
@@ -60,23 +60,6 @@ Strudel makes heavy use of chained functions. Here is a more sophisticated examp
 .room(0.5)`}
 />
 ## Write your own chained function
 You can write your own chained function using `register`. Here's the above chain but registered as a reusable, chained function.
 <MiniRepl
  client:idle
  tune={`const effectChain = register('effectChain', (pat) => pat
    .s("sawtooth")
    .cutoff(500)
    //.delay(0.5)
    .room(0.5)
  )
 note("a3 c#4 e4 a4").effectChain()`}
 />
 Try adding `.rev()` after `effectChain()` to hear further effects added.
 # Comments
 The `//` in the example above is a line comment, resulting in the `delay` function being ignored.
@@ -381,7 +381,7 @@ Sampler effects are functions that can be used to change the behaviour of sample
 ### scrub
-<JsDoc client:idle name="Pattern.scrub" h={0} />
+<JsDoc client:idle name="Pattern.scrub" h={0} />{' '}
 ### speed
@@ -157,7 +157,7 @@ It has 20 parameters in total, here is a snippet that uses all:
  .pitchJump(0) // +/- pitch change after pitchJumpTime
  .pitchJumpTime(0) // >0 time after pitchJump is applied
  .lfo(0) // >0 resets slide + pitchJump + sets tremolo speed
-  .tremolo(0.5) // 0-1 lfo volume modulation amount
+  .tremolo(0) // 0-1 lfo volume modulation amount
  //.duration(.2) // overwrite strudel event duration
  //.gain(1) // change volume
  ._scope() // vizualise waveform (not zzfx related)
@@ -117,10 +117,6 @@ Here's an example AST for `c3 [e3 g3]`
 which translates to `seq(c3, seq(e3, g3))`
 ## Vim Keybindings
 See the separate page on Vim shortcuts for a quick reference: [/technical-manual/vim](/technical-manual/vim)
 ## Scheduling Events
 After an instance of `Pattern` is obtained from the user code,
@@ -1,37 +0,0 @@
 ---
 title: Vim Shortcuts
 layout: ../../layouts/MainLayout.astro
 ---
 # Vim Shortcuts in the REPL
 When the REPL editor (CodeMirror) is configured to use Vim keybindings, the following commands are available:
 - :w — Evaluate the current code
  - Triggers the same evaluation as Ctrl+Enter / Alt+Enter
  - You'll see messages in the Console panel such as:
    - [vim] :w — evaluating code
    - [repl] evaluate via event
    - [eval] code updated
 - :q — Stop/pause playback
  - Triggers the same stop action as Alt+.
  - Useful to quickly stop scheduling without leaving Vim mode
 - gc — Toggle line comments for the current selection(s)
  - Works in normal and visual mode
  - If there's a selection, all selected lines are toggled
 Notes
 - Behavior respects the current language mode in the editor for comment syntax.
 - If multiple REPL editors are open, commands target the active editor. The implementation dispatches custom events handled by the editor.
 - If you don't see the Console panel, open the right panel in the REPL UI.
 Troubleshooting
 - If :w logs but evaluation doesn't apply, ensure Vim keybindings are active and try again. You can also use Ctrl+Enter as a fallback.
 - For :q / gc, ensure focus is inside the editor. If an error occurs, reload the page to reset editor state and try again.
@@ -79,11 +79,13 @@ const updateCodeWindow = (context, patternData, reset = false) => {
  context.handleUpdate(patternData, reset);
 };
 const autoResetPatternOnChange = !isUdels();
 function UserPatterns({ context }) {
  const activePattern = useActivePattern();
  const viewingPatternStore = useViewingPatternData();
  const viewingPatternData = parseJSON(viewingPatternStore);
-  const { userPatterns, patternFilter, patternAutoStart } = useSettings();
+  const { userPatterns, patternFilter } = useSettings();
  const viewingPatternID = viewingPatternData?.id;
  return (
    <div className="flex flex-col gap-2 flex-grow overflow-hidden h-full pb-2 ">
@@ -133,13 +135,13 @@ function UserPatterns({ context }) {
      <div className="overflow-auto h-full bg-background p-2 rounded-md">
        {/* {patternFilter === patternFilterName.user && ( */}
        <PatternButtons
-          onClick={(id) => {
+          onClick={(id) =>
-            updateCodeWindow(context, { ...userPatterns[id], collection: userPattern.collection }, patternAutoStart);
+            updateCodeWindow(
-
+              context,
-            if (context.started && activePattern === id) {
+              { ...userPatterns[id], collection: userPattern.collection },
-              context.handleEvaluate();
+              autoResetPatternOnChange,
-            }
+            )
-          }}
+          }
          patterns={userPatterns}
          started={context.started}
          activePattern={activePattern}
@@ -186,14 +188,17 @@ function FeaturedPatterns({ context }) {
  const examplePatterns = useExamplePatterns();
  const collections = examplePatterns.collections;
  const patterns = collections.get(patternFilterName.featured);
  const { patternAutoStart } = useSettings();
  return (
    <PatternPageWithPagination
      patterns={patterns}
      context={context}
      initialPage={featuredPageNum}
      patternOnClick={(id) => {
-        updateCodeWindow(context, { ...patterns[id], collection: patternFilterName.featured }, patternAutoStart);
+        updateCodeWindow(
          context,
          { ...patterns[id], collection: patternFilterName.featured },
          autoResetPatternOnChange,
        );
      }}
      paginationOnChange={async (pageNum) => {
        await loadAndSetFeaturedPatterns(pageNum - 1);
@@ -208,14 +213,13 @@ function LatestPatterns({ context }) {
  const examplePatterns = useExamplePatterns();
  const collections = examplePatterns.collections;
  const patterns = collections.get(patternFilterName.public);
  const { patternAutoStart } = useSettings();
  return (
    <PatternPageWithPagination
      patterns={patterns}
      context={context}
      initialPage={latestPageNum}
      patternOnClick={(id) => {
-        updateCodeWindow(context, { ...patterns[id], collection: patternFilterName.public }, patternAutoStart);
+        updateCodeWindow(context, { ...patterns[id], collection: patternFilterName.public }, autoResetPatternOnChange);
      }}
      paginationOnChange={async (pageNum) => {
        await loadAndSetPublicPatterns(pageNum - 1);
@@ -112,13 +112,12 @@ export function SettingsTab({ started }) {
    multiChannelOrbits,
    isTabIndentationEnabled,
    isMultiCursorEnabled,
    patternAutoStart,
  } = useSettings();
  const shouldAlwaysSync = isUdels();
  const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
  return (
    <div className="text-foreground p-4 space-y-4 w-full" style={{ fontFamily }}>
-      {canChangeAudioDevice && (
+      
        <FormItem label="Audio Output Device">
          <AudioDeviceSelector
            isDisabled={started}
@@ -133,7 +132,6 @@ export function SettingsTab({ started }) {
            }}
          />
        </FormItem>
      )}
      <FormItem label="Audio Engine Target">
        <AudioEngineTargetSelector
          target={audioEngineTarget}
@@ -305,11 +303,6 @@ export function SettingsTab({ started }) {
          onChange={(cbEvent) => settingsMap.setKey('isCSSAnimationDisabled', cbEvent.target.checked)}
          value={isCSSAnimationDisabled}
        />
        <Checkbox
          label="Auto-start pattern on pattern change"
          onChange={(cbEvent) => settingsMap.setKey('patternAutoStart', cbEvent.target.checked)}
          value={patternAutoStart}
        />
      </FormItem>
      <FormItem label="Zen Mode">Try clicking the logo in the top left!</FormItem>
      <FormItem label="Reset Settings">
@@ -62,9 +62,11 @@ export function SoundsTab() {
  // stop current sound on mouseup
  useEvent('mouseup', () => {
-    const ref = trigRef.current;
+    const t = trigRef.current;
    trigRef.current = undefined;
-    ref?.stop?.(getAudioContext().currentTime + 0.01);
+    t?.then((ref) => {
      ref?.stop(getAudioContext().currentTime + 0.01);
    });
  });
  return (
    <div id="sounds-tab" className="px-4 flex gap-2 flex-col w-full h-full text-foreground">
@@ -122,19 +124,12 @@ export function SoundsTab() {
                  duration: 0.5,
                };
                soundPreviewIdx++;
                const time = ctx.currentTime + 0.05;
                const onended = () => trigRef.current?.node?.disconnect();
-                try {
+                trigRef.current = Promise.resolve(onTrigger(time, params, onended));
-                  // Pre-load the sample by calling onTrigger with a future time
+                trigRef.current.then((ref) => {
-                  // This triggers the loading but schedules playback for later
+                  connectToDestination(ref?.node);
-                  const time = ctx.currentTime + 0.5; // Give 500ms for loading
+                });
                  const ref = await onTrigger(time, params, onended);
                  trigRef.current = ref;
                  if (ref?.node) {
                    connectToDestination(ref.node);
                  }
                } catch (err) {
                  console.warn('Failed to trigger sound:', err);
                }
              }}
            >
              {' '}
@@ -92,7 +92,11 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
 async function blobToDataUrl(blob) {
  return new Promise((resolve) => {
-    resolve(URL.createObjectURL(blob));
+    var reader = new FileReader();
    reader.onload = function (event) {
      resolve(event.target.result);
    };
    reader.readAsDataURL(blob);
  });
 }
@@ -6,7 +6,6 @@ import './files.mjs';
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
 const baseCDN = 'https://strudel.b-cdn.net';
 export async function prebake() {
  // https://archive.org/details/SalamanderGrandPianoV3
@@ -20,23 +19,23 @@ export async function prebake() {
    // => getting "window is not defined", as soon as "@strudel/soundfonts" is imported statically
    // seems to be a problem with soundfont2
    import('@strudel/soundfonts').then(({ registerSoundfonts }) => registerSoundfonts()),
-    samples(`${baseCDN}/piano.json`, `${baseCDN}/piano/`, { prebake: true }),
+    samples(`${baseNoTrailing}/piano.json`, undefined, { prebake: true }),
    // https://github.com/sgossner/VCSL/
    // https://api.github.com/repositories/126427031/contents/
    // LICENSE: CC0 general-purpose
-    samples(`${baseCDN}/vcsl.json`, `${baseCDN}/VCSL/`, { prebake: true }),
+    samples(`${baseNoTrailing}/vcsl.json`, 'github:sgossner/VCSL/master/', { prebake: true }),
-    samples(`${baseCDN}/tidal-drum-machines.json`, `${baseCDN}/tidal-drum-machines/machines/`, {
+    samples(`${baseNoTrailing}/tidal-drum-machines.json`, 'github:ritchse/tidal-drum-machines/main/machines/', {
      prebake: true,
      tag: 'drum-machines',
    }),
-    samples(`${baseCDN}/uzu-drumkit.json`, `${baseCDN}/uzu-drumkit/`, {
+    samples(`${baseNoTrailing}/uzu-drumkit.json`, undefined, {
      prebake: true,
      tag: 'drum-machines',
    }),
-    samples(`${baseCDN}/uzu-wavetables.json`, `${baseCDN}/uzu-wavetables/`, {
+    samples(`${baseNoTrailing}/uzu-wavetables.json`, undefined, {
      prebake: true,
    }),
-    samples(`${baseCDN}/mridangam.json`, `${baseCDN}/mrid/`, { prebake: true, tag: 'drum-machines' }),
+    samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
    samples(
      {
        casio: ['casio/high.wav', 'casio/low.wav', 'casio/noise.wav'],
@@ -146,14 +145,14 @@ export async function prebake() {
          'num/20.wav',
        ],
      },
-      `${baseCDN}/Dirt-Samples/`,
+      'github:tidalcycles/dirt-samples',
      {
        prebake: true,
      },
    ),
  ]);
-  aliasBank(`${baseCDN}/tidal-drum-machines-alias.json`);
+  aliasBank(`${baseNoTrailing}/tidal-drum-machines-alias.json`);
 }
 const maxPan = noteToMidi('C8');
@@ -96,11 +96,6 @@ export function useSettings() {
    isPanelOpen: parseBoolean(state.isPanelOpen),
    userPatterns: userPatterns,
    multiChannelOrbits: parseBoolean(state.multiChannelOrbits),
    patternAutoStart: isUdels()
      ? false
      : state.patternAutoStart === undefined
        ? true
        : parseBoolean(state.patternAutoStart),
  };
 }
Author	SHA1	Message	Date
Jade (Rose) Rowland	93eff7e70f	merge main	2025-10-13 01:13:12 -04:00
Jade (Rose) Rowland	8ce1b98e72	Merge branch 'main' into glossing-glossing/distortion-modes	2025-10-13 01:10:02 -04:00