sl

flattening
2026-07-14 14:53:45 -04:00 · 2025-11-01 01:13:20 -04:00 · 2025-10-22 13:12:41 -04:00
230 changed files with 8807 additions and 18632 deletions
@@ -1,5 +0,0 @@
-{
-	"devToolbar": {
-		"enabled": false
-	}
-}
@@ -1,40 +0,0 @@
-name: Build and Deploy to beta (warm.strudel.cc)
-
-on:
-  push:
-    branches:
-      - main
-
-# 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 +0,0 @@
-22
@@ -4,13 +4,20 @@ Thanks for wanting to contribute!!! There are many ways you can add value to thi

 ## Move to codeberg

-Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. Please don't fork the project back to github.
+We are currently in the process of moving from github to codeberg -- not everything is working, please bear with us.
+
+To update your local clone, you can run this command:
+
+```
+git remote set-url origin git@codeberg.org:uzu/strudel.git
+```
+

 ## Communication Channels

-To get in touch with the community, either
+To get in touch with the contributors, either

- [join the Uzulang Discord Server](https://discord.com/invite/HGEdXmRkzT) and go to the strudel channels (Uzulangs are a family of live coding languages inspired by each other, including TidalCycles as well as Strudel)
+- [join the Tidal Discord Channel](https://discord.com/invite/HGEdXmRkzT) and go to the #strudel channel
 - Find related discussions on the [tidal club forum](https://club.tidalcycles.org/)

 ## Ask a Question
@@ -29,35 +36,22 @@ Use one of the Communication Channels listed above and drop us a line or two!
 ## Share Music

 If you made some music with strudel, you can give back some love and share what you've done!
+Your creation could also be part of the random selection in the REPL if you want.
 Use one of the Communication Channels listed above.
-(There used to be a random selection of contributed patterns in the REPL, but that is unfortunately disabled for now due to abuse)

 ## Improve the Docs

-If you find some weak spots in the [docs](https://strudel.cc/workshop/getting-started/), you can edit each file directly on codeberg. There are "Edit this page" links in the right sidebar that take you to the right place.
+If you find some weak spots in the [docs](https://strudel.cc/workshop/getting-started/),
+you can edit each file directly on codeburg. (we are currently fixing the "Edit this page" links in the right sidebar)

 ## Propose a Feature

-If you want a specific feature that is not part of strudel yet, feel free to use one of the communication channels above. Please bear in mind that this is a free/open source project, oriented around collaborative discussion. Maybe you even want to help with the implementation of that feature!
-
-## Contribute a feature
-
-Pull requests welcome! Consider starting with discussion or proof-of-concept first, rather than do loads of work on something and then find it doesn't fit the collective goals of the project, or something like that.
-
-At the time of writing we have a PR backlog, and generally prioritise bugfixes and contributions that have arisen through community discussion.
-
-### AI/LLM policy
-
-Strudel is a project handmade by humans, with thought and nuance. 
-
-If you have used LLMs (so called 'AI'), please detail that in the pull request. We are still developing our response to the onslaught of LLM technology, but for practical and legal reasons are currently not accepting wholly LLM-generated code. We are also not accepting PRs that add LLM features to strudel itself.
-
-There are #llm-chat and #llm-share channels on our discord. Please do not discuss or share LLM-related things outside of those channels.
+If you want a specific feature that is not part of strudel yet, feel free to use one of the communication channels above.
+Maybe you even want to help with the implementation of that feature!

 ## Report a Bug

 If you've found a bug, or some behaviour that does not seem right, you are welcome to file an [issue](https://codeberg.org/uzu/strudel/issues).
-
 Please check that it has not been reported before.

 ## Fix a Bug
@@ -124,7 +118,8 @@ There are also eslint extensions / plugins for most editors.

 ## Running all CI Checks

-When opening a PR, the CI runner will (once approved by a human) check the code style and eslint, as well as run all tests. You can run the same check with `pnpm check`.
+When opening a PR, the CI runner will automatically check the code style and eslint, as well as run all tests.
+You can run the same check with `pnpm check`

 ## Package Workflow

@@ -1,22 +1,19 @@
 # strudel

 Live coding patterns on the web
-
+https://strudel.cc/

 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
- Source: https://codeberg.org/uzu/strudel/
-  * Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. **Please don't fork the project back to github**.
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 - 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
 - 2 Years of Strudel Blog Post: <https://strudel.cc/blog/#year-2>

-
 ## Running Locally

 After cloning the project, you can run the REPL locally:

-1. Install [Node.js](https://nodejs.org/) 18 or newer
+1. Install [Node.js](https://nodejs.org/)
 2. Install [pnpm](https://pnpm.io/installation)
 3. Install dependencies by running the following command:
   ```bash
@@ -1,5 +1,4 @@
-<script src="https://unpkg.com/@strudel/repl@1.2.7"></script>
-<!-- <script src="../../packages/repl/dist/index.js"></script> -->
+<script src="https://unpkg.com/@strudel/repl@1.0.2"></script>
 <strudel-editor>
  <!--
 // @date 23-08-15
@@ -20,8 +20,5 @@
    "@strudel/tonal": "workspace:*",
    "@strudel/transpiler": "workspace:*",
    "@strudel/webaudio": "workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -14,8 +14,5 @@
  },
  "dependencies": {
    "@strudel/web": "workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -18,8 +18,5 @@
    "@strudel/transpiler": "workspace:*",
    "@strudel/webaudio": "workspace:*",
    "@strudel/tonal": "workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -13,8 +13,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -32,8 +32,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -12,13 +12,6 @@ function defineTags(dictionary) {
      doclet.synonyms = doclet.synonyms_text.split(/[ ,]+/);
    },
  });
-
-  dictionary.defineTag('tags', {
-    mustHaveValue: true,
-    onTagged: function (doclet, tag) {
-      doclet.tags = tag.value.split(/[ ,]+/);
-    },
-  });
 }

 module.exports = { defineTags: defineTags };
@@ -1,211 +0,0 @@
-0 silly argv {
-0 silly argv   _: [ 'version' ],
-0 silly argv   private: false,
-0 silly argv   lernaVersion: '8.1.9',
-0 silly argv   '$0': 'node_modules/lerna/dist/cli.js'
-0 silly argv }
-1 notice cli v8.1.9
-2 verbose packageConfigs Explicit "packages" configuration found in lerna.json. Resolving packages using the configured glob(s): ["packages/*"]
-3 verbose rootPath /Users/jaderose/Documents/Github/cstrudel/strudel
-4 info versioning independent
-5 silly isAnythingCommitted
-6 verbose isAnythingCommitted 1
-7 silly getCurrentBranch
-8 verbose currentBranch main
-9 silly remoteBranchExists
-10 silly isBehindUpstream
-11 silly isBehindUpstream main is behind origin/main by 0 commit(s) and ahead by 4
-12 silly hasTags
-13 verbose hasTags true
-14 silly git-describe.sync "@strudel/codemirror@1.2.7-4-ga3ac9646" => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-15 info Looking for changed packages since @strudel/codemirror@1.2.7
-16 silly checking diff packages/codemirror
-17 silly no diff found in @strudel/codemirror
-18 silly checking diff packages/core
-19 silly no diff found in @strudel/core
-20 silly checking diff packages/csound
-21 silly no diff found in @strudel/csound
-22 silly checking diff packages/desktopbridge
-23 silly no diff found in @strudel/desktopbridge
-24 silly checking diff packages/draw
-25 silly no diff found in @strudel/draw
-26 silly checking diff packages/embed
-27 silly no diff found in @strudel/embed
-28 silly checking diff packages/gamepad
-29 silly no diff found in @strudel/gamepad
-30 silly checking diff packages/hs2js
-31 silly no diff found in hs2js
-32 silly checking diff packages/hydra
-33 silly no diff found in @strudel/hydra
-34 silly checking diff packages/midi
-35 silly no diff found in @strudel/midi
-36 silly checking diff packages/mini
-37 silly no diff found in @strudel/mini
-38 silly checking diff packages/mondo
-39 silly no diff found in mondolang
-40 silly checking diff packages/mondough
-41 silly no diff found in @strudel/mondo
-42 silly checking diff packages/motion
-43 silly no diff found in @strudel/motion
-44 silly checking diff packages/mqtt
-45 silly no diff found in @strudel/mqtt
-46 silly checking diff packages/osc
-47 silly found diff in packages/osc/server.js
-48 verbose filtered diff [ 'packages/osc/server.js' ]
-49 silly checking diff packages/reference
-50 silly no diff found in @strudel/reference
-51 silly checking diff packages/repl
-52 silly no diff found in @strudel/repl
-53 silly checking diff packages/sampler
-54 silly no diff found in @strudel/sampler
-55 silly checking diff packages/serial
-56 silly no diff found in @strudel/serial
-57 silly checking diff packages/soundfonts
-58 silly no diff found in @strudel/soundfonts
-59 silly checking diff packages/superdough
-60 silly found diff in packages/superdough/package.json
-61 verbose filtered diff [ 'packages/superdough/package.json' ]
-62 silly checking diff packages/supradough
-63 silly found diff in packages/supradough/package.json
-64 verbose filtered diff [ 'packages/supradough/package.json' ]
-65 silly checking diff packages/tidal
-66 silly no diff found in @strudel/tidal
-67 silly checking diff packages/tonal
-68 silly no diff found in @strudel/tonal
-69 silly checking diff packages/transpiler
-70 silly no diff found in @strudel/transpiler
-71 silly checking diff packages/vite-plugin-bundle-audioworklet
-72 silly no diff found in vite-plugin-bundle-audioworklet
-73 silly checking diff packages/web
-74 silly no diff found in @strudel/web
-75 silly checking diff packages/webaudio
-76 silly found diff in packages/webaudio/package.json
-77 verbose filtered diff [ 'packages/webaudio/package.json' ]
-78 silly checking diff packages/xen
-79 silly no diff found in @strudel/xen
-80 verbose updated @strudel/codemirror
-81 verbose updated @strudel/csound
-82 verbose updated @strudel/midi
-83 verbose updated @strudel/osc
-84 verbose updated @strudel/repl
-85 verbose updated @strudel/soundfonts
-86 verbose updated superdough
-87 verbose updated supradough
-88 verbose updated @strudel/web
-89 verbose updated @strudel/webaudio
-90 verbose git-describe undefined => "@strudel/codemirror@1.2.7-4-ga3ac9646"
-91 silly git-describe parsed => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-92 info execute Skipping releases
-93 silly lifecycle No script for "preversion" in "@strudel/monorepo", continuing
-94 silly lifecycle No script for "preversion" in "@strudel/osc", continuing
-95 silly lifecycle No script for "preversion" in "superdough", continuing
-96 silly lifecycle No script for "preversion" in "supradough", continuing
-97 verbose version supradough has no lockfile. Skipping lockfile update.
-98 verbose version @strudel/osc has no lockfile. Skipping lockfile update.
-99 verbose version superdough has no lockfile. Skipping lockfile update.
-100 silly lifecycle No script for "version" in "supradough", continuing
-101 silly lifecycle No script for "version" in "superdough", continuing
-102 silly lifecycle No script for "preversion" in "@strudel/codemirror", continuing
-103 silly lifecycle No script for "preversion" in "@strudel/webaudio", continuing
-104 silly lifecycle No script for "version" in "@strudel/osc", continuing
-105 verbose version @strudel/webaudio has no lockfile. Skipping lockfile update.
-106 verbose version @strudel/codemirror has no lockfile. Skipping lockfile update.
-107 silly lifecycle No script for "version" in "@strudel/codemirror", continuing
-108 silly lifecycle No script for "version" in "@strudel/webaudio", continuing
-109 silly lifecycle No script for "preversion" in "@strudel/csound", continuing
-110 silly lifecycle No script for "preversion" in "@strudel/midi", continuing
-111 silly lifecycle No script for "preversion" in "@strudel/soundfonts", continuing
-112 silly lifecycle No script for "preversion" in "@strudel/web", continuing
-113 verbose version @strudel/csound has no lockfile. Skipping lockfile update.
-114 verbose version @strudel/midi has no lockfile. Skipping lockfile update.
-115 verbose version @strudel/soundfonts has no lockfile. Skipping lockfile update.
-116 verbose version @strudel/web has no lockfile. Skipping lockfile update.
-117 silly lifecycle No script for "version" in "@strudel/midi", continuing
-118 silly lifecycle No script for "version" in "@strudel/csound", continuing
-119 silly lifecycle No script for "version" in "@strudel/soundfonts", continuing
-120 silly lifecycle No script for "preversion" in "@strudel/repl", continuing
-121 verbose version @strudel/repl has no lockfile. Skipping lockfile update.
-122 silly lifecycle No script for "version" in "@strudel/web", continuing
-123 silly lifecycle No script for "version" in "@strudel/repl", continuing
-124 silly lifecycle No script for "version" in "@strudel/monorepo", continuing
-125 verbose version Updating root pnpm-lock.yaml
-126 silly version Skipped applying prettier to ignored file: packages/supradough/package.json
-127 silly version Skipped applying prettier to ignored file: packages/superdough/package.json
-128 silly version Skipped applying prettier to ignored file: packages/osc/package.json
-129 silly version Skipped applying prettier to ignored file: packages/codemirror/package.json
-130 silly version Skipped applying prettier to ignored file: packages/webaudio/package.json
-131 silly version Skipped applying prettier to ignored file: packages/midi/package.json
-132 silly version Skipped applying prettier to ignored file: packages/csound/package.json
-133 silly version Skipped applying prettier to ignored file: packages/soundfonts/package.json
-134 silly version Skipped applying prettier to ignored file: packages/web/package.json
-135 silly version Skipped applying prettier to ignored file: packages/repl/package.json
-136 silly version Skipped applying prettier to ignored file: pnpm-lock.yaml
-137 silly gitAdd [
-137 silly gitAdd   'packages/supradough/package.json',
-137 silly gitAdd   'packages/superdough/package.json',
-137 silly gitAdd   'packages/osc/package.json',
-137 silly gitAdd   'packages/codemirror/package.json',
-137 silly gitAdd   'packages/webaudio/package.json',
-137 silly gitAdd   'packages/midi/package.json',
-137 silly gitAdd   'packages/csound/package.json',
-137 silly gitAdd   'packages/soundfonts/package.json',
-137 silly gitAdd   'packages/web/package.json',
-137 silly gitAdd   'packages/repl/package.json',
-137 silly gitAdd   'pnpm-lock.yaml'
-137 silly gitAdd ]
-138 silly gitCommit Publish
-138 silly gitCommit
-138 silly gitCommit  - @strudel/codemirror@1.2.8
-138 silly gitCommit  - @strudel/csound@1.2.8
-138 silly gitCommit  - @strudel/midi@1.2.8
-138 silly gitCommit  - @strudel/osc@1.3.2
-138 silly gitCommit  - @strudel/repl@1.2.9
-138 silly gitCommit  - @strudel/soundfonts@1.2.8
-138 silly gitCommit  - superdough@1.2.5
-138 silly gitCommit  - supradough@1.2.4
-138 silly gitCommit  - @strudel/web@1.2.8
-138 silly gitCommit  - @strudel/webaudio@1.2.9
-139 verbose git [
-139 verbose git   'commit',
-139 verbose git   '-F',
-139 verbose git   '/private/var/folders/hc/yf_zr55547sbcpz5rj7q85sc0000gn/T/3c85b5d4-56ae-40e9-8df7-db2bc1048402/lerna-commit.txt'
-139 verbose git ]
-140 silly gitTag @strudel/codemirror@1.2.8 git tag %s -m %s
-141 verbose git [
-141 verbose git   'tag',
-141 verbose git   '@strudel/codemirror@1.2.8',
-141 verbose git   '-m',
-141 verbose git   '@strudel/codemirror@1.2.8'
-141 verbose git ]
-142 silly gitTag @strudel/csound@1.2.8 git tag %s -m %s
-143 verbose git [ 'tag', '@strudel/csound@1.2.8', '-m', '@strudel/csound@1.2.8' ]
-144 silly gitTag @strudel/midi@1.2.8 git tag %s -m %s
-145 verbose git [ 'tag', '@strudel/midi@1.2.8', '-m', '@strudel/midi@1.2.8' ]
-146 silly gitTag @strudel/osc@1.3.2 git tag %s -m %s
-147 verbose git [ 'tag', '@strudel/osc@1.3.2', '-m', '@strudel/osc@1.3.2' ]
-148 silly gitTag @strudel/repl@1.2.9 git tag %s -m %s
-149 verbose git [ 'tag', '@strudel/repl@1.2.9', '-m', '@strudel/repl@1.2.9' ]
-150 silly gitTag @strudel/soundfonts@1.2.8 git tag %s -m %s
-151 verbose git [
-151 verbose git   'tag',
-151 verbose git   '@strudel/soundfonts@1.2.8',
-151 verbose git   '-m',
-151 verbose git   '@strudel/soundfonts@1.2.8'
-151 verbose git ]
-152 silly gitTag superdough@1.2.5 git tag %s -m %s
-153 verbose git [ 'tag', 'superdough@1.2.5', '-m', 'superdough@1.2.5' ]
-154 silly gitTag supradough@1.2.4 git tag %s -m %s
-155 verbose git [ 'tag', 'supradough@1.2.4', '-m', 'supradough@1.2.4' ]
-156 silly gitTag @strudel/web@1.2.8 git tag %s -m %s
-157 verbose git [ 'tag', '@strudel/web@1.2.8', '-m', '@strudel/web@1.2.8' ]
-158 silly gitTag @strudel/webaudio@1.2.9 git tag %s -m %s
-159 verbose git [ 'tag', '@strudel/webaudio@1.2.9', '-m', '@strudel/webaudio@1.2.9' ]
-160 error Error: Command failed with exit code 128: git tag superdough@1.2.5 -m superdough@1.2.5
-160 error fatal: tag 'superdough@1.2.5' already exists
-160 error     at makeError (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/lib/error.js:59:11)
-160 error     at handlePromise (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/index.js:114:26)
-160 error     at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
-160 error     at async Promise.all (index 6)
-160 error     at async VersionCommand.gitCommitAndTagVersionForUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9957:11)
-160 error     at async VersionCommand.commitAndTagUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9933:18)
-160 error     at async Promise.all (index 0)
@@ -73,8 +73,5 @@
    "prettier": "^3.4.2",
    "vitest": "^3.0.4",
    "vite-plugin-bundle-audioworklet": "workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
-}
+}
@@ -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 result = handler(context);
-    if (result) {
-      return result;
-    }
-  }
-  return null;
+  const word = context.matchBefore(/\w*/);
+  if (word.from === word.to && !context.explicit) return null;
+
+  return {
+    from: word.from,
+    options: jsdocCompletions,
+    /*     options: [
+      { label: 'match', type: 'keyword' },
+      { label: 'hello', type: 'variable', info: '(World)' },
+      { label: 'magic', type: 'text', apply: '⠁⭒*.✩.*⭒⠁', detail: 'macro' },
+    ], */
+  };
 };

 export const isAutoCompletionEnabled = (enabled) =>
@@ -1,34 +1,32 @@
 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 { logger, registerControl, repl } from '@strudel/core';
-import { cleanupDraw, Drawer } from '@strudel/draw';
-
+import { repl, registerControl } from '@strudel/core';
+import { Drawer, cleanupDraw } 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 { isTooltipEnabled } from './tooltip.mjs';
-import { updateWidgets, widgetPlugin } from './widget.mjs';
-import { jumpToCharacter } from './labelJump.mjs';
+import { widgetPlugin, updateWidgets } from './widget.mjs';
+import { persistentAtom } from '@nanostores/persistent';
+import { basicSetup } from './basicSetup.mjs';

-export { toggleBlockComment, toggleBlockCommentByLine, toggleComment, toggleLineComment } from '@codemirror/commands';
-
-export const extensions = {
+const extensions = {
  isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
  isBracketMatchingEnabled: (on) => (on ? bracketMatching({ brackets: '()[]{}<>' }) : []),
  isBracketClosingEnabled: (on) => (on ? closeBrackets() : []),
@@ -49,7 +47,7 @@ export const extensions = {
        ]
      : [],
 };
-export const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));
+const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));

 export const defaultSettings = {
  keybindings: 'codemirror',
@@ -96,8 +94,8 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
      }),
      sliderPlugin,
      widgetPlugin,
-      // indentOnInput(), // works without. already brought with javascript
-      // extension? bracketMatching(), // does not do anything
+      // indentOnInput(), // works without. already brought with javascript extension?
+      // bracketMatching(), // does not do anything
      syntaxHighlighting(defaultHighlightStyle),
      EditorView.updateListener.of((v) => onChange(v)),
      drawSelection({ cursorBlinkRate: 0 }),
@@ -120,22 +118,14 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
            preventDefault: true,
            run: () => onStop?.(),
          },
-          {
-            key: 'Alt-w',
-            run: (view) => jumpToCharacter(view, '$', 1),
-          },
-          {
-            key: 'Alt-q',
-            run: (view) => jumpToCharacter(view, '$', -1),
-          },
          /* {
-            key: 'Ctrl-Shift-.',
-            run: () => (onPanic ? onPanic() : onStop?.()),
-          },
-          {
-            key: 'Ctrl-Shift-Enter',
-            run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
-          }, */
+          key: 'Ctrl-Shift-.',
+          run: () => (onPanic ? onPanic() : onStop?.()),
+        },
+        {
+          key: 'Ctrl-Shift-Enter',
+          run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
+        }, */
        ]),
      ),
    ],
@@ -216,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
-        // the present moment (for highlighting)
+        // if no painters are set (.onPaint was not called), then we only need 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
@@ -256,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));
@@ -302,23 +264,13 @@ export class StrudelMirror {
      console.warn('first frame could not be painted');
    }
  }
-  async evaluate(autostart = true) {
+  async evaluate() {
    this.flash();
-    await this.repl.evaluate(this.code, autostart);
+    await this.repl.evaluate(this.code);
  }
  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();
@@ -394,18 +346,11 @@ export class StrudelMirror {
    }
  }
  setCode(code) {
-    const changes = {
-      from: 0,
-      to: this.editor.state.doc.length,
-      insert: code,
-    };
+    const changes = { 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;
@@ -420,7 +365,7 @@ export class StrudelMirror {
  }
 }

-export function parseBooleans(value) {
+function parseBooleans(value) {
  return { true: true, false: false }[value] ?? value;
 }

@@ -434,7 +379,6 @@ function s4() {
 /**
 * Overrides the css of highlighted events. Make sure to use single quotes!
 * @name markcss
- * @tag visualization
 * @example
 * note("c a f e")
 * .markcss('text-decoration:underline')
@@ -4,4 +4,3 @@ export * from './flash.mjs';
 export * from './slider.mjs';
 export * from './themes.mjs';
 export * from './widget.mjs';
-export { Vim } from './keybindings.mjs';
@@ -1,12 +1,11 @@
-import { defaultKeymap } from '@codemirror/commands';
-import { Prec, EditorState } from '@codemirror/state';
+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,
@@ -131,13 +26,7 @@ const keymaps = {
  vscode: vscodeExtension,
 };

-export { Vim } from '@replit/codemirror-vim';
-
 export function keybindings(name) {
  const active = keymaps[name];
-  const extensions = active ? [Prec.high(active())] : [];
-  if (name === 'vim') {
-    extensions.push(EditorState.allowMultipleSelections.of(true));
-  }
-  return extensions;
+  return [active ? Prec.high(active()) : []];
 }
@@ -1,31 +0,0 @@
-import { EditorSelection } from '@codemirror/state';
-import { SearchCursor } from '@codemirror/search';
-
-export function jumpToCharacter(view, character, direction = 1) {
-  const { state, dispatch } = view;
-  const pos = state.selection.main.head;
-  const cursor = new SearchCursor(state.doc, character);
-
-  let characterPositions = [];
-  let jumpPos;
-  while (!cursor.next().done) {
-    characterPositions.push(cursor.value.to);
-  }
-  if (!characterPositions.length) {
-    return false;
-  }
-  if (direction > 0) {
-    jumpPos = characterPositions.find((x) => x > pos + 1) ?? characterPositions.at(0); // Loop back around for convenience
-  } else {
-    jumpPos = characterPositions.reverse().find((x) => x < pos + 1) ?? characterPositions.at(0);
-  }
-
-  if (jumpPos == null) {
-    return false;
-  }
-  dispatch({
-    selection: EditorSelection.cursor(jumpPos - 1),
-    scrollIntoView: true,
-  });
-  return true;
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.3.0",
+  "version": "1.2.5",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -46,16 +46,10 @@
    "@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",
-    "superdough": "workspace:*"
+    "nanostores": "^0.11.3"
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -117,7 +117,6 @@ export const sliderPlugin = ViewPlugin.fromClass(
 * Displays a slider widget to allow the user manipulate a value
 *
 * @name slider
- * @tags external_io, visualization
 * @param {number} value Initial value
 * @param {number} min Minimum value - optional, defaults to 0
 * @param {number} max Maximum value - optional, defaults to 1
@@ -198,7 +198,6 @@ export function activateTheme(name) {
  const themeSettings = settings[name] || settings.strudelTheme;
  // set css variables
  themeStyle.innerHTML = `:root {
-      color-scheme: ${themeSettings.light ? 'light' : 'dark'};
      ${Object.entries(themeSettings)
        // important to override fallback
        .map(([key, value]) => `--${key}: ${value} !important;`)
@@ -17,15 +17,13 @@ export const settings = {
  background: 'white',
  lineBackground: 'transparent',
  foreground: deepPurple,
-  muted: deepPurple + '50',
  caret: '#797977',
  selection: yellowPink,
  selectionMatch: '#2B323D',
-  gutterBackground: pinkAccent,
+  gutterBackground: grey,
  gutterForeground: lightGrey,
  gutterBorder: 'transparent',
  lineHighlight: pinkAccent,
-  light: true,
 };

 export default createTheme({
@@ -31,7 +31,6 @@ const palette = palettes['Sour Watermelon B'];
 export const settings = {
  background: palette[3],
  foreground: palette[1],
-  muted: palette[1] + '50',
  caret: palette[0],
  selection: palette[0],
  selectionMatch: palette[1],
@@ -8,7 +8,6 @@ export const settings = {
  background: '#282b2e',
  lineBackground: '#282b2e99',
  foreground: '#a9b7c6',
-  muted: '#a9b7c650',
  caret: '#00FF00',
  selection: '#343739',
  selectionMatch: '#343739',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#282b2e',
    foreground: '#a9b7c6',
-    muted: '#a9b7c650',
    caret: '#00FF00',
    selection: '#4e5254',
    selectionMatch: '#4e5254',
@@ -12,7 +12,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[1],
-  muted: hex[2],
  selection: hex[2],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -11,7 +11,6 @@ export const settings = {
  background: '#272C35',
  lineBackground: '#272C3599',
  foreground: 'hsl(220, 14%, 71%)',
-  muted: 'hsl(220, 14%, 41%)',
  caret: '#797977',
  selection: '#ffffff30',
  selectionMatch: '#2B323D',
@@ -26,7 +25,6 @@ export default createTheme({
  settings: {
    background: '#272C35',
    foreground: '#9d9b97',
-    muted: 'hsl(220, 14%, 41%)',
    caret: '#797977',
    selection: '#3d4c64',
    selectionMatch: '#3d4c64',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#21202e',
  lineBackground: '#21202e99',
  foreground: '#edecee',
-  muted: '#edecee50',
  caret: '#a277ff',
  selection: '#3d375e7f',
  selectionMatch: '#3d375e7f',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#21202e',
    foreground: '#edecee',
-    muted: '#edecee50',
    caret: '#a277ff',
    selection: '#5a51898f',
    selectionMatch: '#5a51898f',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#FFFFFF',
  lineBackground: '#FFFFFF99',
  foreground: '#000000',
-  muted: '#00000050',
  caret: '#FBAC52',
  selection: '#FFD420',
  selectionMatch: '#FFD420',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#FFFFFF',
    foreground: '#000000',
-    muted: '#00000050',
    caret: '#FBAC52',
    selection: '#FFD420',
    selectionMatch: '#FFD420',
@@ -2,8 +2,7 @@ import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: 'black',
-  foreground: 'white',
-  muted: '#ffffff50',
+  foreground: 'white', // whats that?
  caret: 'white',
  selection: '#ffffff20',
  selectionMatch: '#036dd626',
@@ -3,8 +3,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#051DB5',
  lineBackground: '#051DB550',
-  foreground: 'white',
-  muted: '#ffffff50',
+  foreground: 'white', // whats that?
  caret: 'white',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
@@ -11,7 +11,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[3],
  selection: hex[3],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -9,7 +9,6 @@ export const settings = {
  background: '#242424',
  lineBackground: '#24242499',
  foreground: '#f8f8f2',
-  muted: '#f8f8f250',
  caret: '#FFFFFF',
  selection: 'rgba(255, 255, 255, 0.1)',
  selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -24,7 +23,6 @@ export default createTheme({
  settings: {
    background: '#242424',
    foreground: '#f8f8f2',
-    muted: '#f8f8f250',
    caret: '#FFFFFF',
    selection: 'rgba(255, 255, 255, 0.1)',
    selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -11,7 +11,6 @@ export const settings = {
  background: '#282a36',
  lineBackground: '#282a3699',
  foreground: '#f8f8f2',
-  muted: '#f8f8f250',
  caret: '#f8f8f0',
  selection: 'rgba(255, 255, 255, 0.1)',
  selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -28,7 +27,6 @@ export default createTheme({
  settings: {
    background: '#282a36',
    foreground: '#f8f8f2',
-    muted: '#f8f8f250',
    caret: '#f8f8f0',
    selection: 'rgba(255, 255, 255, 0.1)',
    selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -10,7 +10,6 @@ export const settings = {
  background: '#2a2734',
  lineBackground: '#2a273499',
  foreground: '#eeebff',
-  muted: '#eeebff50',
  caret: '#ffad5c',
  selection: 'rgba(255, 255, 255, 0.1)',
  gutterBackground: '#2a2734',
@@ -23,7 +22,6 @@ export default createTheme({
  settings: {
    background: '#2a2734',
    foreground: '#6c6783',
-    muted: '#eeebff50',
    caret: '#ffad5c',
    selection: '#9a86fd',
    selectionMatch: '#9a86fd',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#000',
-  muted: '#00000050',
  caret: '#FFFFFF',
  selection: '#d7d4f0',
  selectionMatch: '#d7d4f0',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#000',
-    muted: '#00000050',
    caret: '#FFFFFF',
    selection: '#d7d4f0',
    selectionMatch: '#d7d4f0',
@@ -23,7 +23,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[10],
-  muted: hex[7],
  selection: hex[8],
  selectionMatch: hex[0],
  gutterBackground: hex[3],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#0d1117',
  lineBackground: '#0d111799',
  foreground: '#c9d1d9',
-  muted: '#c9d1d950',
  caret: '#c9d1d9',
  selection: '#003d73',
  selectionMatch: '#003d73',
@@ -17,7 +16,6 @@ export default createTheme({
  settings: {
    background: '#0d1117',
    foreground: '#c9d1d9',
-    muted: '#c9d1d950',
    caret: '#c9d1d9',
    selection: '#003d73',
    selectionMatch: '#003d73',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#24292e',
-  muted: '#24292e50',
  selection: '#BBDFFF',
  selectionMatch: '#BBDFFF',
  gutterBackground: '#fff',
@@ -18,7 +17,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#24292e',
-    muted: '#24292e50',
    selection: '#BBDFFF',
    selectionMatch: '#BBDFFF',
    gutterBackground: '#fff',
@@ -13,7 +13,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[2] + '50',
  selection: hex[4],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -10,7 +10,6 @@ export const settings = {
  background: '#282828',
  lineBackground: '#28282899',
  foreground: '#ebdbb2',
-  muted: '#ebdbb250',
  caret: '#ebdbb2',
  selection: '#bdae93',
  selectionMatch: '#bdae93',
@@ -24,7 +23,6 @@ export default createTheme({
  settings: {
    background: '#282828',
    foreground: '#ebdbb2',
-    muted: '#ebdbb250',
    caret: '#ebdbb2',
    selection: '#b99d555c',
    selectionMatch: '#b99d555c',
@@ -11,7 +11,6 @@ export const settings = {
  background: '#fbf1c7',
  lineBackground: '#fbf1c799',
  foreground: '#3c3836',
-  muted: '#3c383650',
  caret: '#af3a03',
  selection: '#ebdbb2',
  selectionMatch: '#bdae93',
@@ -26,7 +25,6 @@ export default createTheme({
  settings: {
    background: '#fbf1c7',
    foreground: '#3c3836',
-    muted: '#3c383650',
    caret: '#af3a03',
    selection: '#bdae9391',
    selectionMatch: '#bdae9391',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#212121',
  lineBackground: '#21212199',
  foreground: '#bdbdbd',
-  muted: '#bdbdbd50',
  caret: '#a0a4ae',
  selection: '#d7d4f0',
  selectionMatch: '#d7d4f0',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#212121',
    foreground: '#bdbdbd',
-    muted: '#bdbdbd50',
    caret: '#a0a4ae',
    selection: '#d7d4f063',
    selectionMatch: '#d7d4f063',
@@ -5,8 +5,7 @@ export const settings = {
  light: true,
  background: '#FAFAFA',
  lineBackground: '#FAFAFA99',
-  foreground: '#6182B8',
-  muted: '#6182B850',
+  foreground: '#90A4AE',
  caret: '#272727',
  selection: '#80CBC440',
  selectionMatch: '#FAFAFA',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#FAFAFA',
    foreground: '#90A4AE',
-    muted: '#6182B850',
    caret: '#272727',
    selection: '#80CBC440',
    selectionMatch: '#80CBC440',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#272822',
  lineBackground: '#27282299',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FFFFFF',
  selection: '#49483E',
  selectionMatch: '#49483E',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#272822',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FFFFFF',
    selection: '#49483E',
    selectionMatch: '#49483E',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#f2f1f8',
  lineBackground: '#f2f1f899',
  foreground: '#0c006b',
-  muted: '#0c006b50',
  caret: '#5c49e9',
  selection: '#d5d1f2',
  selectionMatch: '#d5d1f2',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#f2f1f8',
    foreground: '#0c006b',
-    muted: '#0c006b50',
    caret: '#5c49e9',
    selection: '#d5d1f2',
    selectionMatch: '#d5d1f2',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#2e3440',
  lineBackground: '#2e344099',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FFFFFF',
  selection: '#3b4252',
  selectionMatch: '#e5e9f0',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#2e3440',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FFFFFF',
    selection: '#00000073',
    selectionMatch: '#00000073',
@@ -13,7 +13,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[2] + '50',
  selection: hex[4],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#002b36',
  lineBackground: '#002b3699',
  foreground: '#93a1a1',
-  muted: '#93a1a150',
  caret: '#839496',
  selection: '#173541',
  selectionMatch: '#aafe661a',
@@ -46,7 +45,6 @@ export default createTheme({
  settings: {
    background: c.background,
    foreground: c.foreground,
-    muted: c.muted,
    caret: c.cursor,
    selection: c.selection,
    selectionMatch: c.selection,
@@ -8,7 +8,6 @@ export const settings = {
  background: '#fdf6e3',
  lineBackground: '#fdf6e399',
  foreground: '#657b83',
-  muted: '#657b8350',
  caret: '#586e75',
  selection: '#dfd9c8',
  selectionMatch: '#dfd9c8',
@@ -20,7 +19,6 @@ export const settings = {
 const c = {
  background: '#FDF6E3',
  foreground: '#657B83',
-  muted: '#657b8350',
  selection: '#EEE8D5',
  selectionMatch: '#EEE8D5',
  cursor: '#657B83',
@@ -13,7 +13,6 @@ export const settings = {
  background: '#000000',
  lineBackground: 'transparent',
  foreground: hex[4],
-  muted: hex[6],
  selection: hex[6],
  gutterBackground: hex[0],
  gutterForeground: hex[5],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#222',
  lineBackground: '#22222299',
  foreground: '#fff',
-  muted: '#8a919966',
  caret: '#ffcc00',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#303841',
  lineBackground: '#30384199',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FBAC52',
  selection: '#4C5964',
  selectionMatch: '#3A546E',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#303841',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FBAC52',
    selection: '#4C5964',
    selectionMatch: '#3A546E',
@@ -9,8 +9,7 @@ let colorD = '#f8fc55';

 export const settings = {
  background: '#000000',
-  foreground: colorA,
-  muted: colorA + '50',
+  foreground: colorA, // whats that?
  caret: colorC,
  selection: colorD,
  selectionMatch: colorA,
@@ -4,8 +4,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#24283b',
  lineBackground: '#24283b99',
-  foreground: '#f9f2f9',
-  muted: '#f9f2f950',
+  foreground: '#7982a9',
  caret: '#c0caf5',
  selection: '#6f7bb630',
  selectionMatch: '#1f2335',
@@ -19,8 +18,7 @@ export default createTheme({
  theme: 'dark',
  settings: {
    background: '#24283b',
-    foreground: '#f9f2f9',
-    muted: '#f9f2f950',
+    foreground: '#7982a9',
    caret: '#c0caf5',
    selection: '#6f7bb630',
    selectionMatch: '#343b5f',
@@ -4,8 +4,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#1a1b26',
  lineBackground: '#1a1b2699',
-  foreground: '#f8fcf9',
-  muted: '#f8fcf950',
+  foreground: '#787c99',
  caret: '#c0caf5',
  selection: '#515c7e40',
  selectionMatch: '#16161e',
@@ -19,8 +18,7 @@ export default createTheme({
  theme: 'dark',
  settings: {
    background: '#1a1b26',
-    foreground: '#f8fcf9',
-    muted: '#f8fcf950',
+    foreground: '#787c99',
    caret: '#c0caf5',
    selection: '#515c7e40',
    selectionMatch: '#16161e',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#e1e2e7',
  lineBackground: '#e1e2e799',
  foreground: '#3760bf',
-  muted: '#3760bf50',
  caret: '#3760bf',
  selection: '#99a7df',
  selectionMatch: '#99a7df',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#e1e2e7',
    foreground: '#3760bf',
-    muted: '#3760bf50',
    caret: '#3760bf',
    selection: '#99a7df',
    selectionMatch: '#99a7df',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#1e1e1e',
  lineBackground: '#1e1e1e99',
  foreground: '#fff',
-  muted: '#ffffff50',
  caret: '#c6c6c6',
  selection: '#6199ff2f',
  selectionMatch: '#72a1ff59',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#1e1e1e',
    foreground: '#fff',
-    muted: '#ffffff50',
    caret: '#c6c6c6',
    selection: '#6199ff2f',
    selectionMatch: '#72a1ff59',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#ffffff',
  lineBackground: '#ffffff50',
  foreground: '#383a42',
-  muted: '#383a4250',
  caret: '#000',
  selection: '#add6ff',
  selectionMatch: '#a8ac94',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#ffffff',
    foreground: '#383a42',
-    muted: '#383a4250',
    caret: '#000',
    selection: '#add6ff',
    selectionMatch: '#a8ac94',
@@ -2,8 +2,7 @@ import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: 'white',
-  foreground: 'black',
-  muted: '#00000050',
+  foreground: 'black', // whats that?
  caret: 'black',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#ffffff26',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#3D3D3D',
-  muted: '#3D3D3D50',
  selection: '#BBDFFF',
  selectionMatch: '#BBDFFF',
  gutterBackground: '#fff',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#3D3D3D',
-    muted: '#3D3D3D50',
    selection: '#BBDFFF',
    selectionMatch: '#BBDFFF',
    gutterBackground: '#fff',
@@ -1,49 +0,0 @@
-import { describe, bench } from 'vitest';
-
-import { calculateSteps, rand, useRNG } from '../index.mjs';
-
-const testingResolution = 128;
-
-const _generateRandomPattern = () => rand.iter(testingResolution).fast(testingResolution).firstCycle();
-
-describe('old random', () => {
-  calculateSteps(true);
-  bench(
-    '+tactus',
-    () => {
-      useRNG('legacy');
-      _generateRandomPattern();
-    },
-    {
-      time: 1000,
-      teardown() {
-        useRNG('legacy');
-      },
-    },
-  );
-
-  calculateSteps(false);
-  bench(
-    '-tactus',
-    () => {
-      useRNG('precise');
-      _generateRandomPattern();
-    },
-    {
-      time: 1000,
-      teardown() {
-        useRNG('legacy');
-      },
-    },
-  );
-});
-
-describe('random', () => {
-  calculateSteps(true);
-  bench('+tactus', _generateRandomPattern, { time: 1000 });
-
-  calculateSteps(false);
-  bench('-tactus', _generateRandomPattern, { time: 1000 });
-});
-
-calculateSteps(true);
@@ -15,7 +15,6 @@ import Fraction, { gcd } from './fraction.mjs';
 * - "-" hold previous value
 * - "." silence
 *
- * @tags visualization
 * @param {Pattern} pattern the pattern to use
 * @param {number} chars max number of characters (approximately)
 * @returns string
@@ -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;
 };
@@ -61,7 +61,6 @@ export const bjorklund = function (ons, steps) {
 *
 * @memberof Pattern
 * @name euclid
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @returns Pattern
@@ -74,7 +73,6 @@ export const bjorklund = function (ons, steps) {
 * Like `euclid`, but has an additional parameter for 'rotating' the resulting sequence.
 * @memberof Pattern
 * @name euclidRot
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
@@ -130,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);
  }
@@ -141,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];
  }
@@ -158,7 +156,6 @@ export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], fun
 * so there will be no gaps.
 * @name euclidLegato
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param rotation offset in steps
@@ -190,7 +187,6 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
 * the resulting sequence
 * @name euclidLegatoRot
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
@@ -212,7 +208,6 @@ export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, s
 * @name euclidish
 * @synonyms eish
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets
 * @param {number} steps the number of steps to fill
 * @param {number} groove exists between the extremes of 0 (straight euclidian) and 1 (straight pulse)
@@ -221,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,90 +0,0 @@
-/*
-stateful.mjs - File of shame for stateful, impure and otherwise illegal pattern methods
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
-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 { register, reify, Pattern } from './pattern.mjs';
-
-let timelines = {};
-
-export const reset_state = function () {
-  reset_timelines();
-};
-
-export const reset_timelines = function () {
-  timelines = {};
-};
-
-/***
- * Allows you to switch a pattern between different 'timelines'. This is particularly useful when
- * live coding, for example when you want to cue a pattern up to play from its start.
- *
- * Timelines are specified by number, so that if you had a pattern like
- * `n("<0 1 2 3>").s("num").timeline(1)` playing, then changed the '1'
- * to '2', it would always align '0' to the nearest cycle. You will likely want to trigger
- * an evaluation a little bit before the cycle starts, to avoid missing events.
- *
- * After the first use, a timeline will continue with the same 'offset'. That is, if you change
- * a pattern without changing its timeline number, it will stay on that timeline without resetting.
- *
- * Rather than incrementing a timeline to reset it, it's easier to negate it, e.g. by switching between `-2`
- * and `2`. This is because when you negate a timeline it will always reset.
- *
- * You can also pattern the timeline if you want, to create strange resetting patterns.
- * @param {number | Pattern} timeline The timeline that the pattern should play on.
- * @example
- * n("<0 1 2 3>(3,8)")
- *   .sound("num")
- *   // resets the timeline every two cycles, by negating the timeline.
- *   // in a lot of cases this will be edited by a human live coder
- *   // rather than patterned!
- *   .timeline("<2 -2>".slow(2))
- */
-
-export const timeline = register(
-  'timeline',
-  function (tpat, pat) {
-    tpat = reify(tpat);
-    const f = function (state) {
-      // Is this called from the scheduler? (rather than from e.g. the visualiser)
-      const scheduler = !!state.controls.cyclist;
-      const timehaps = tpat.query(state);
-      const result = [];
-      for (const timehap of timehaps) {
-        const tlid = timehap.value;
-        let offset;
-        if (tlid === 0) {
-          offset = 0;
-        } else if (tlid in timelines) {
-          offset = timelines[tlid];
-        } else {
-          const timearc = timehap.wholeOrPart();
-          if (!scheduler || state.span.begin.lt(timearc.midpoint())) {
-            offset = timearc.begin;
-          } else {
-            // Sync to end of timearc if we first see it over halfway into its
-            // timespan. Allows 'cuing up' next timeline when live coding.
-            offset = timearc.end;
-          }
-        }
-        if (scheduler) {
-          // update state
-          timelines[tlid] = offset;
-          if (tlid !== 0) {
-            delete timelines[-tlid];
-          }
-        }
-
-        const pathaps = pat
-          .late(offset)
-          .query(state.setSpan(timehap.part))
-          .map((h) => h.setContext(h.combineContext(timehap)));
-        result.push(...pathaps);
-      }
-      return result;
-    };
-    return new Pattern(f, pat._steps);
-  },
-  false,
-);
@@ -1,6 +1,6 @@
 /*
 index.mjs - <short description TODO>
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
 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/>.
 */

@@ -11,21 +11,20 @@ import createClock from './zyklus.mjs';
 import { logger } from './logger.mjs';
 export { Fraction, controls, createClock };
 export * from './controls.mjs';
-export * from './cyclist.mjs';
-export * from './evaluate.mjs';
 export * from './hap.mjs';
-export * from './impure.mjs';
-export * from './logger.mjs';
 export * from './pattern.mjs';
-export * from './pick.mjs';
-export * from './repl.mjs';
 export * from './signal.mjs';
-export * from './speak.mjs';
+export * from './pick.mjs';
 export * from './state.mjs';
-export * from './schedulerState.mjs';
 export * from './timespan.mjs';
-export * from './ui.mjs';
 export * from './util.mjs';
+export * from './speak.mjs';
+export * from './evaluate.mjs';
+export * from './repl.mjs';
+export * from './cyclist.mjs';
+export * from './logger.mjs';
+export * from './time.mjs';
+export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';
 // below won't work with runtime.mjs (json import fails)
 /* import * as p from './package.json';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/core",
-  "version": "1.2.6",
+  "version": "1.2.4",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -37,8 +37,5 @@
  "devDependencies": {
    "vite": "^6.0.11",
    "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -28,7 +28,6 @@ const _pick = function (lookup, pat, modulo = true) {

 /** * Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
 * Similar to `inhabit`, but maintains the structure of the original patterns.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -58,7 +57,6 @@ const __pick = register('pick', function (lookup, pat) {
 * it wraps around, rather than sticking at the maximum value.
 * For example, if you pick the fifth pattern of a list of three, you'll get the
 * second one.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -69,7 +67,6 @@ export const pickmod = register('pickmod', function (lookup, pat) {
 });

 /** * pickF lets you use a pattern of numbers to pick which function to apply to another pattern.
- * @tags combiners, functional
 * @param {Pattern} pat
 * @param {Pattern} lookup a pattern of indices
 * @param {function[]} funcs the array of functions from which to pull
@@ -78,7 +75,7 @@ export const pickmod = register('pickmod', function (lookup, pat) {
 * s("bd [rim hh]").pickF("<0 1 2>", [rev,jux(rev),fast(2)])
 * @example
 * note("<c2 d2>(3,8)").s("square")
- * .pickF("<0 2> 1", [jux(rev), fast(2), x=>x.lpf(800)])
+ *     .pickF("<0 2> 1", [jux(rev),fast(2),x=>x.lpf(800)])
 */
 export const pickF = register('pickF', function (lookup, funcs, pat) {
  return pat.apply(pick(lookup, funcs));
@@ -86,7 +83,6 @@ export const pickF = register('pickF', function (lookup, funcs, pat) {

 /** * The same as `pickF`, but if you pick a number greater than the size of the functions list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
 * @param {Pattern} lookup a pattern of indices
 * @param {function[]} funcs the array of functions from which to pull
@@ -97,7 +93,6 @@ export const pickmodF = register('pickmodF', function (lookup, funcs, pat) {
 });

 /** * Similar to `pick`, but it applies an outerJoin instead of an innerJoin.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -108,7 +103,6 @@ export const pickOut = register('pickOut', function (lookup, pat) {

 /** * The same as `pickOut`, but if you pick a number greater than the size of the list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -118,7 +112,6 @@ export const pickmodOut = register('pickmodOut', function (lookup, pat) {
 });

 /** * Similar to `pick`, but the choosen pattern is restarted when its index is triggered.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -129,7 +122,6 @@ export const pickRestart = register('pickRestart', function (lookup, pat) {

 /** * The same as `pickRestart`, but if you pick a number greater than the size of the list,
   * it wraps around, rather than sticking at the maximum value.
-   * @tags combiners
   * @param {Pattern} pat
   * @param {*} xs
   * @returns {Pattern}
@@ -146,7 +138,6 @@ export const pickmodRestart = register('pickmodRestart', function (lookup, pat)
 });

 /** * Similar to `pick`, but the choosen pattern is reset when its index is triggered.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -157,7 +148,6 @@ export const pickReset = register('pickReset', function (lookup, pat) {

 /** * The same as `pickReset`, but if you pick a number greater than the size of the list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -167,22 +157,19 @@ export const pickmodReset = register('pickmodReset', function (lookup, pat) {
 });

 /** Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
- * Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
- * @name inhabit
- * @tags combiners
- * @synonyms pickSqueeze
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- * @example
- * let a = s("bd(3,8)")
- * let b = s("cp sd")
- * "<a b [a,b]>".inhabit({ a, b })
- * @example
- * s("a@2 [a b] a"
- * .inhabit({a: "bd(3,8)", b: "sd sd"}))
- * .slow(4)
- */
+   * Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
+   * @name inhabit
+   * @synonyms pickSqueeze
+   * @param {Pattern} pat
+   * @param {*} xs
+   * @returns {Pattern}
+   * @example
+   * "<a b [a,b]>".inhabit({a: s("bd(3,8)"),
+                            b: s("cp sd")
+                           })
+   * @example
+   * s("a@2 [a b] a".inhabit({a: "bd(3,8)", b: "sd sd"})).slow(4)
+   */
 export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], function (lookup, pat) {
  return _pick(lookup, pat, false).squeezeJoin();
 });
@@ -193,7 +180,6 @@ export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], fun
 * second one.
 * @name inhabitmod
 * @synonyms pickmodSqueeze
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -206,7 +192,6 @@ export const { inhabitmod, pickmodSqueeze } = register(['inhabitmod', 'pickmodSq
 /**
 * Pick from the list of values (or patterns of values) via the index using the given
 * pattern of integers. The selected pattern will be compressed to fit the duration of the selecting event
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -2,16 +2,9 @@ import { NeoCyclist } from './neocyclist.mjs';
 import { Cyclist } from './cyclist.mjs';
 import { evaluate as _evaluate } from './evaluate.mjs';
 import { errorLogger, logger } from './logger.mjs';
-import {
-  setCpsFunc,
-  setIsStarted,
-  setPattern as exposeSchedulerPattern,
-  setTime,
-  setTriggerFunc,
-} from './schedulerState.mjs';
+import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
 import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
-import { reset_state } from './impure.mjs';

 export function repl({
  defaultOutput,
@@ -58,11 +51,7 @@ export function repl({
    getTime,
    onToggle: (started) => {
      updateState({ started });
-      setIsStarted(started);
      onToggle?.(started);
-      if (!started) {
-        reset_state();
-      }
    },
    setInterval,
    clearInterval,
@@ -72,8 +61,6 @@ export function repl({
  // NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
  const scheduler =
    sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
-  setTriggerFunc(schedulerOptions.onTrigger);
-  setCpsFunc(() => scheduler.cps);
  let pPatterns = {};
  let anonymousIndex = 0;
  let allTransform;
@@ -98,7 +85,6 @@ export function repl({
  const setPattern = async (pattern, autostart = true) => {
    pattern = editPattern?.(pattern) || pattern;
    await scheduler.setPattern(pattern, autostart);
-    exposeSchedulerPattern(pattern);
    return pattern;
  };
  setTime(() => scheduler.now()); // TODO: refactor?
@@ -116,7 +102,6 @@ export function repl({
   * Changes the global tempo to the given cycles per minute
   *
   * @name setcpm
-   * @tags temporal
   * @alias setCpm
   * @param {number} cpm cycles per minute
   * @example
@@ -130,9 +115,7 @@ export function repl({

  // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..

-  let allTransforms = [];
-  /**
-   * Applies a function to all the running patterns. Note that the patterns are groups together into a single `stack` before the function is applied. This is probably what you want, but see `each` for
+  /** Applies a function to all the running patterns. Note that the patterns are groups together into a single `stack` before the function is applied. This is probably what you want, but see `each` for
   * a version that applies the function to each pattern separately.
   * ```
   * $: sound("bd - cp sd")
@@ -144,21 +127,18 @@ export function repl({
   * $: sound("hh*8")
   * all(x => x.pianoroll())
   * ```
-   *
-   * @tags combiners
   */
+  let allTransforms = [];
  const all = function (transform) {
    allTransforms.push(transform);
    return silence;
  };
  /** Applies a function to each of the running patterns separately. This is intended for future use with upcoming 'stepwise' features. See `all` for a version that applies the function to all the patterns stacked together into a single pattern.
-   *
   * ```
   * $: sound("bd - cp sd")
   * $: sound("hh*8")
   * each(fast("<2 3>"))
   * ```
-   * @tags combiners
   */
  const each = function (transform) {
    eachTransform = transform;
@@ -172,9 +152,9 @@ export function repl({
        // allows muting a pattern x with x_ or _x
        return silence;
      }
-      if (id.includes('$')) {
+      if (id === '$') {
        // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
        anonymousIndex++;
      }
      pPatterns[id] = this;
@@ -235,19 +215,8 @@ export function repl({
      let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
      if (Object.keys(pPatterns).length) {
        let patterns = [];
-        let soloActive = false;
        for (const [key, value] of Object.entries(pPatterns)) {
-          // handle soloed patterns ex: S$: s("bd!4")
-          const isSolod = key.length > 1 && key.startsWith('S');
-          if (isSolod && soloActive === false) {
-            // first time we see a soloed pattern, clear existing patterns
-            patterns = [];
-            soloActive = true;
-          }
-          if (!soloActive || (soloActive && isSolod)) {
-            const valWithState = value.withState((state) => state.setControls({ id: key }));
-            patterns.push(valWithState);
-          }
+          patterns.push(value.withState((state) => state.setControls({ id: key })));
        }
        if (eachTransform) {
          // Explicit lambda so only element (not index and array) are passed
@@ -258,13 +227,14 @@ export function repl({
        pattern = eachTransform(pattern);
      }
      if (allTransforms.length) {
-        for (const transform of allTransforms) {
-          pattern = transform(pattern);
+        for (let i in allTransforms) {
+          pattern = allTransforms[i](pattern);
        }
      }

      if (!isPattern(pattern)) {
-        pattern = silence;
+        const message = `got "${typeof evaluated}" instead of pattern`;
+        throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
      }
      logger(`[eval] code updated`);
      pattern = await setPattern(pattern, autostart);
@@ -1,53 +0,0 @@
-/*
-schedulerState.mjs - Module to pipe out various parameters from the scheduler for global consumption
-Copyright (C) 2026 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/schedulerState.mjs>
-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/>.
-*/
-
-let time;
-let cpsFunc;
-let pattern;
-let triggerFunc;
-let isStarted;
-export function getTime() {
-  if (!time) {
-    throw new Error('no time set! use setTime to define a time source');
-  }
-  return time();
-}
-
-export function setTime(func) {
-  time = func;
-}
-
-export function setCpsFunc(func) {
-  cpsFunc = func;
-}
-
-export function getCps() {
-  return cpsFunc?.();
-}
-
-export function setPattern(pat) {
-  pattern = pat;
-}
-
-export function getPattern() {
-  return pattern;
-}
-
-export function setTriggerFunc(func) {
-  triggerFunc = func;
-}
-
-export function getTriggerFunc() {
-  return triggerFunc;
-}
-
-export function setIsStarted(val) {
-  isStarted = !!val;
-}
-
-export function getIsStarted() {
-  return isStarted;
-}
@@ -16,7 +16,7 @@ export function steady(value) {
 }

 export const signal = (func) => {
-  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin, state.controls))];
+  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin))];
  return new Pattern(query);
 };

@@ -24,7 +24,6 @@ export const signal = (func) => {
 *  A sawtooth signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
 * .clip(saw.slow(2))
@@ -39,7 +38,6 @@ export const saw = signal((t) => t % 1);
 *  A sawtooth signal between -1 and 1 (like `saw`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const saw2 = saw.toBipolar();

@@ -47,7 +45,6 @@ export const saw2 = saw.toBipolar();
 *  A sawtooth signal between 1 and 0 (like `saw`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
 * .clip(isaw.slow(2))
@@ -62,7 +59,6 @@ export const isaw = signal((t) => 1 - (t % 1));
 *  A sawtooth signal between 1 and -1 (like `saw2`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const isaw2 = isaw.toBipolar();

@@ -70,14 +66,12 @@ export const isaw2 = isaw.toBipolar();
 *  A sine signal between -1 and 1 (like `sine`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));

 /**
 *  A sine signal between 0 and 1.
 * @return {Pattern}
- * @tags generators
 * @example
 * n(sine.segment(16).range(0,15))
 * .scale("C:minor")
@@ -89,7 +83,6 @@ export const sine = sine2.fromBipolar();
 *  A cosine signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(stack(sine,cosine).segment(16).range(0,15))
 * .scale("C:minor")
@@ -101,14 +94,12 @@ export const cosine = sine._early(Fraction(1).div(4));
 *  A cosine signal between -1 and 1 (like `cosine`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const cosine2 = sine2._early(Fraction(1).div(4));

 /**
 *  A square signal between 0 and 1.
 * @return {Pattern}
- * @tags generators
 * @example
 * n(square.segment(4).range(0,7)).scale("C:minor")
 *
@@ -119,7 +110,6 @@ export const square = signal((t) => Math.floor((t * 2) % 2));
 *  A square signal between -1 and 1 (like `square`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const square2 = square.toBipolar();

@@ -127,7 +117,6 @@ export const square2 = square.toBipolar();
 *  A triangle signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(tri.segment(8).range(0,7)).scale("C:minor")
 *
@@ -138,7 +127,6 @@ export const tri = fastcat(saw, isaw);
 *  A triangle signal between -1 and 1 (like `tri`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const tri2 = fastcat(saw2, isaw2);

@@ -146,7 +134,6 @@ export const tri2 = fastcat(saw2, isaw2);
 *  An inverted triangle signal between 1 and 0 (like `tri`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(itri.segment(8).range(0,7)).scale("C:minor")
 *
@@ -157,7 +144,6 @@ export const itri = fastcat(isaw, saw);
 *  An inverted triangle signal between -1 and 1 (like `itri`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const itri2 = fastcat(isaw2, saw2);

@@ -165,7 +151,6 @@ export const itri2 = fastcat(isaw2, saw2);
 *  A signal representing the cycle time.
 *
 * @return {Pattern}
- * @tags generators
 */
 export const time = signal(id);

@@ -173,7 +158,6 @@ export const time = signal(id);
 *  The mouse's x position value ranges from 0 to 1.
 * @name mousex
 * @return {Pattern}
- * @tags external_io
 * @example
 * n(mousex.segment(4).range(0,7)).scale("C:minor")
 *
@@ -183,7 +167,6 @@ export const time = signal(id);
 *  The mouse's y position value ranges from 0 to 1.
 * @name mousey
 * @return {Pattern}
- * @tags external_io
 * @example
 * n(mousey.segment(4).range(0,7)).scale("C:minor")
 *
@@ -203,102 +186,41 @@ export const mouseY = signal(() => _mouseY);
 export const mousex = signal(() => _mouseX);
 export const mouseX = signal(() => _mouseX);

-// Random number generators
+// random signals

-// Produce "Avalanche effect" where flipping a single bit of x
-// results in all output bits flipping with probability 0.5
-// See e.g. https://github.com/aappleby/smhasher/blob/0ff96f7835817a27d0487325b6c16033e2992eb5/src/MurmurHash3.cpp#L68-L77
-const _murmurHashFinalizer = (x) => {
-  x |= 0;
-  x ^= x >>> 16;
-  x = Math.imul(x, 0x85ebca6b);
-  x ^= x >>> 13;
-  x = Math.imul(x, 0xc2b2ae35);
-  x ^= x >>> 16;
-  return x >>> 0; // unsigned
-};
-
-// Convert t to a 32 bit integer, preserving temporal resolution down to 1/2^29
-const _tToT = (t) => {
-  return Math.floor(t * 536870912);
-};
-
-// Used to decorrelate nearby T, i, and seed prior to hashing
-const _decorrelate = (T, i = 0, seed = 0) => {
-  const lowBits = (T >>> 0) >>> 0;
-  const highBits = Math.floor(T / 4294967296) >>> 0; // 2^32
-  let key = lowBits ^ Math.imul(highBits ^ 0x85ebca6b, 0xc2b2ae35);
-  key ^= Math.imul(i ^ 0x7f4a7c15, 0x9e3779b9);
-  key ^= Math.imul(seed ^ 0x165667b1, 0x27d4eb2d);
-  return key >>> 0;
-};
-
-const randAt = (T, i = 0, seed = 0) => {
-  return _murmurHashFinalizer(_decorrelate(T, i, seed)) / 4294967296; // 2^32
-};
-
-// n samples at time t
-const timeToRands = (t, n, seed = 0) => {
-  const T = _tToT(t);
-  if (n === 1) {
-    return randAt(T, 0, seed);
-  }
-  const out = new Array(n);
-  for (let i = 0; i < n; i++) out[i] = randAt(T, i, seed);
-  return out;
-};
-
-// Old random signals. Currently the default, but can also be chosen via
-// `useRNG('legacy')`
-
-// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
-const __xorwise = (x) => {
+const xorwise = (x) => {
  const a = (x << 13) ^ x;
  const b = (a >> 17) ^ a;
  return (b << 5) ^ b;
 };
-const __frac = (x) => x - Math.trunc(x);
-const __timeToIntSeed = (x) => __xorwise(Math.trunc(__frac(x / 300) * 536870912));
-const __intSeedToRand = (x) => (x % 536870912) / 536870912;
-const __timeToRandsPrime = (seed, n) => {
-  if (n === 1) {
-    return Math.abs(__intSeedToRand(seed));
-  }
+
+// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
+const _frac = (x) => x - Math.trunc(x);
+
+const timeToIntSeed = (x) => xorwise(Math.trunc(_frac(x / 300) * 536870912));
+
+const intSeedToRand = (x) => (x % 536870912) / 536870912;
+
+const timeToRand = (x) => Math.abs(intSeedToRand(timeToIntSeed(x)));
+
+const timeToRandsPrime = (seed, n) => {
  const result = [];
-  for (let i = 0; i < n; i++) {
-    result.push(__intSeedToRand(seed));
-    seed = __xorwise(seed);
+  // eslint-disable-next-line
+  for (let i = 0; i < n; ++i) {
+    result.push(intSeedToRand(seed));
+    seed = xorwise(seed);
  }
  return result;
 };
-const __timeToRands = (t, n) => __timeToRandsPrime(__timeToIntSeed(t), n);

-// End old random
-
-let RNG_MODE = 'legacy';
-export const getRandsAtTime = (t, n = 1, seed = 0) => {
-  return RNG_MODE === 'legacy' ? __timeToRands(t + seed, n) : timeToRands(t, n, seed);
-};
+const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);

 /**
- * Sets which random number generator to use. Historically Strudel would
- * use `useRNG('legacy')`, which remains the default. To use a new more statistically
- * precise RNG, try `useRNG('precise')`.
 *
- * @name useRNG
- * @tags generators, math
- * @param {string} mod - Mode. One of 'legacy', 'precise'
- * @example
- * useRNG('legacy')
- * // Repeats every 300 cycles
- * $: n(irand(50)).seg(16).scale("C:minor").ribbon(88, 32)
- * $: n(irand(50)).seg(16).scale("C:minor").ribbon(388, 32)
 */
-export const useRNG = (mode = 'legacy') => (RNG_MODE = mode);

 /**
 * A discrete pattern of numbers from 0 to n-1
- * @tags generators
 * @example
 * n(run(4)).scale("C4:pentatonic")
 * // n("0 1 2 3").scale("C4:pentatonic")
@@ -306,10 +228,9 @@ export const useRNG = (mode = 'legacy') => (RNG_MODE = mode);
 export const run = (n) => saw.range(0, n).round().segment(n);

 /**
- * Creates a binary pattern from a number.
+ * Creates a pattern from a binary number.
 *
 * @name binary
- * @tags generators
 * @param {number} n - input number to convert to binary
 * @example
 * "hh".s().struct(binary(5))
@@ -321,10 +242,9 @@ export const binary = (n) => {
 };

 /**
- * Creates a binary pattern from a number, padded to n bits long.
+ * Creates a pattern from a binary number, padded to n bits long.
 *
 * @name binaryN
- * @tags generators
 * @param {number} n - input number to convert to binary
 * @param {number} nBits - pattern length, defaults to 16
 * @example
@@ -338,58 +258,10 @@ export const binaryN = (n, nBits = 16) => {
  return reify(n).segment(nBits).brshift(bitPos).band(pure(1));
 };

-/**
- * Creates a binary list pattern from a number.
- *
- * @name binaryL
- * @tags generators
- * @param {number} n - input number to convert to binary
- * s("saw").seg(8)
- *   .partials(binaryL(irand(4096).add(1)))
- */
-export const binaryL = (n) => {
-  const nBits = reify(n).log2(0).floor().add(1);
-  return binaryNL(n, nBits);
-};
-
-/**
- * Creates a binary list pattern from a number, padded to n bits long.
- *
- * @name binaryNL
- * @tags generators
- * @param {number} n - input number to convert to binary
- * @param {number} nBits - pattern length, defaults to 16
- */
-export const binaryNL = (n, nBits = 16) => {
-  return reify(n)
-    .withValue((v) => (bits) => {
-      const bList = [];
-      for (let i = bits - 1; i >= 0; i--) {
-        bList.push((v >> i) & 1);
-      }
-      return bList;
-    })
-    .appLeft(reify(nBits));
-};
-
-/**
- * Creates a list of random numbers of the given length
- *
- * @name randL
- * @tags generators
- * @param {number} n Number of random numbers to sample
- * @example
- * s("saw").seg(16).n(irand(12)).scale("F1:minor")
- *   .partials(randL(8))
- */
-export const randL = (n) => {
-  return signal((t) => (nVal) => getRandsAtTime(t, nVal).map(Math.abs)).appLeft(reify(n));
-};
-
 export const randrun = (n) => {
-  return signal((t, controls) => {
+  return signal((t) => {
    // Without adding 0.5, the first cycle is always 0,1,2,3,...
-    const rands = getRandsAtTime(t.floor().add(0.5), n, controls.randSeed);
+    const rands = timeToRands(t.floor().add(0.5), n);
    const nums = rands
      .map((n, i) => [n, i])
      .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
@@ -408,7 +280,6 @@ const _rearrangeWith = (ipat, n, pat) => {
 * Slices a pattern into the given number of parts, then plays those parts in random order.
 * Each part will be played exactly once per cycle.
 * @name shuffle
- * @tags temporal
 * @example
 * note("c d e f").sound("piano").shuffle(4)
 * @example
@@ -422,7 +293,6 @@ export const shuffle = register('shuffle', (n, pat) => {
 * Slices a pattern into the given number of parts, then plays those parts at random. Similar to `shuffle`,
 * but parts might be played more than once, or not at all, per cycle.
 * @name scramble
- * @tags temporal
 * @example
 * note("c d e f").sound("piano").scramble(4)
 * @example
@@ -432,53 +302,18 @@ export const scramble = register('scramble', (n, pat) => {
  return _rearrangeWith(_irand(n)._segment(n), n, pat);
 });

-/**
- * Modify a pattern by applying a function to the `randomSeed` control if present
- *
- * @tags math
- * @param {Function} func Function from seed (or undefined) to seed (or undefined)
- * @param {Pattern} pat Pattern to update
- * @returns Pattern
- */
-export const withSeed = (func, pat) => {
-  return new Pattern((state) => {
-    let { randSeed, ...controls } = state.controls;
-    randSeed = func(randSeed);
-    return pat.query(state.setControls({ ...controls, randSeed }));
-  }, pat._steps);
-};
-
-/**
- * Change the seed for random signals. Normally, random signals depend on time,
- * so two patterns at the same time will have the same random values. Specifying
- * a new seed changes the signal output by `rand`. This also affects other functions
- * that use randomness, like `shuffle` and `sometimes`.
- *
- * @name seed
- * @tags math
- * @param {number} n A new seed. Can be any number.
- * @example
- * $: s("hh*4").degrade();
- * $: s("bd*4").degrade().seed(1); // Will degrade different events from the hi-hat
- */
-export const seed = register('seed', (n, pat) => {
-  return withSeed(() => n, pat);
-});
-
 /**
 * A continuous pattern of random numbers, between 0 and 1.
 *
 * @name rand
- * @tags generators
 * @example
 * // randomly change the cutoff
 * s("bd*4,hh*8").cutoff(rand.range(500,8000))
 *
 */
-export const rand = signal((t, controls) => getRandsAtTime(t, 1, controls.randSeed));
+export const rand = signal(timeToRand);
 /**
 * A continuous pattern of random numbers, between -1 and 1
- * @tags generators
 */
 export const rand2 = rand.toBipolar();

@@ -488,7 +323,6 @@ export const _brandBy = (p) => rand.fmap((x) => x < p);
 * A continuous pattern of 0 or 1 (binary random), with a probability for the value being 1
 *
 * @name brandBy
- * @tags generators
 * @param {number} probability - a number between 0 and 1
 * @example
 * s("hh*10").pan(brandBy(0.2))
@@ -499,7 +333,6 @@ export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
 * A continuous pattern of 0 or 1 (binary random)
 *
 * @name brand
- * @tags generators
 * @example
 * s("hh*10").pan(brand)
 */
@@ -511,7 +344,6 @@ export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
 * A continuous pattern of random integers, between 0 and n-1.
 *
 * @name irand
- * @tags generators
 * @param {number} n max value (exclusive)
 * @example
 * // randomly select scale notes from 0 - 7 (= C to C)
@@ -534,7 +366,6 @@ export const __chooseWith = (pat, xs) => {
 /**
 * Choose from the list of values (or patterns of values) using the given
 * pattern of numbers, which should be in the range of 0..1
- * @tags temporal
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -548,7 +379,6 @@ export const chooseWith = (pat, xs) => {
 /**
 * As with {chooseWith}, but the structure comes from the chosen values, rather
 * than the pattern you're using to choose with.
- * @tags temporal
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -559,7 +389,6 @@ export const chooseInWith = (pat, xs) => {

 /**
 * Chooses randomly from the given list of elements.
- * @tags temporal
 * @param  {...any} xs values / patterns to choose from.
 * @returns {Pattern} - a continuous pattern.
 * @example
@@ -575,7 +404,6 @@ export const chooseOut = choose;
 * Chooses from the given list of values (or patterns of values), according
 * to the pattern that the method is called on. The pattern should be in
 * the range 0 .. 1.
- * @tags temporal
 * @param  {...any} xs
 * @returns {Pattern}
 */
@@ -586,7 +414,6 @@ Pattern.prototype.choose = function (...xs) {
 /**
 * As with choose, but the pattern that this method is called on should be
 * in the range -1 .. 1
- * @tags temporal
 * @param  {...any} xs
 * @returns {Pattern}
 */
@@ -596,7 +423,6 @@ Pattern.prototype.choose2 = function (...xs) {

 /**
 * Picks one of the elements at random each cycle.
- * @tags temporal
 * @synonyms randcat
 * @returns {Pattern}
 * @example
@@ -639,7 +465,6 @@ const wchooseWith = (...args) => _wchooseWith(...args).outerJoin();

 /**
 * Chooses randomly from the given list of elements by giving a probability to each element
- * @tags temporal
 * @param {...any} pairs arrays of value and weight
 * @returns {Pattern} - a continuous pattern.
 * @example
@@ -649,13 +474,12 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);

 /**
 * Picks one of the elements at random each cycle by giving a probability to each element
- * @tags temporal
 * @synonyms wrandcat
 * @returns {Pattern}
 * @example
 * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
 * @example
- * wchooseCycles(["c c c",5], ["a a a",3], ["f f f",1]).fast(4).note()
+ * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
 * @example
 * // The probability can itself be a pattern
 * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()
@@ -664,56 +488,58 @@ export const wchooseCycles = (...pairs) => _wchooseWith(rand.segment(1), ...pair

 export const wrandcat = wchooseCycles;

-function _perlin(t, seed = 0) {
+function _perlin(t) {
  let ta = Math.floor(t);
  let tb = ta + 1;
  const smootherStep = (x) => 6.0 * x ** 5 - 15.0 * x ** 4 + 10.0 * x ** 3;
  const interp = (x) => (a) => (b) => a + smootherStep(x) * (b - a);
-  const ra = getRandsAtTime(ta, 1, seed);
-  const rb = getRandsAtTime(tb, 1, seed);
-  const v = interp(t - ta)(ra)(rb);
+  const v = interp(t - ta)(timeToRand(ta))(timeToRand(tb));
  return v;
 }
+export const perlinWith = (tpat) => {
+  return tpat.fmap(_perlin);
+};

-function _berlin(t, seed = 0) {
+function _berlin(t) {
  const prevRidgeStartIndex = Math.floor(t);
  const nextRidgeStartIndex = prevRidgeStartIndex + 1;

-  const prevRidgeBottomPoint = getRandsAtTime(prevRidgeStartIndex, 1, seed);
-  const height = getRandsAtTime(nextRidgeStartIndex, 1, seed);
-  const nextRidgeTopPoint = prevRidgeBottomPoint + height;
+  const prevRidgeBottomPoint = timeToRand(prevRidgeStartIndex);
+  const nextRidgeTopPoint = timeToRand(nextRidgeStartIndex) + prevRidgeBottomPoint;

  const currentPercent = (t - prevRidgeStartIndex) / (nextRidgeStartIndex - prevRidgeStartIndex);
  const interp = (a, b, t) => {
-    return a + t * (b - a);
+    return a + (b - a) * t;
  };
  return interp(prevRidgeBottomPoint, nextRidgeTopPoint, currentPercent) / 2;
 }

+export const berlinWith = (tpat) => {
+  return tpat.fmap(_berlin);
+};
+
 /**
 * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
 *
- * @tags generators
 * @name perlin
 * @example
 * // randomly change the cutoff
 * s("bd*4,hh*8").cutoff(perlin.range(500,8000))
 *
 */
-export const perlin = signal((t, controls) => _perlin(t, controls.randSeed));
+export const perlin = perlinWith(time.fmap((v) => Number(v)));

 /**
 * Generates a continuous pattern of [berlin noise](conceived by Jame Coyne and Jade Rowland as a joke but turned out to be surprisingly cool and useful,
 * like perlin noise but with sawtooth waves), in the range 0..1.
 *
- * @tags generators
 * @name berlin
 * @example
 * // ascending arpeggios
 * n("0!16".add(berlin.fast(4).mul(14))).scale("d:minor")
 *
 */
-export const berlin = signal((t, controls) => _berlin(t, controls.randSeed));
+export const berlin = berlinWith(time.fmap((v) => Number(v)));

 export const degradeByWith = register(
  'degradeByWith',
@@ -727,7 +553,6 @@ export const degradeByWith = register(
 * 0 = 0% chance of removal
 * 1 = 100% chance of removal
 *
- * @tags temporal
 * @name degradeBy
 * @memberof Pattern
 * @param {number} amount - a number between 0 and 1
@@ -753,7 +578,6 @@ export const degradeBy = register(
 *
 * Randomly removes 50% of events from the pattern. Shorthand for `.degradeBy(0.5)`
 *
- * @tags temporal
 * @name degrade
 * @memberof Pattern
 * @returns Pattern
@@ -770,7 +594,6 @@ export const degrade = register('degrade', (pat) => pat._degradeBy(0.5), true, t
 * 1 = 0% chance of removal
 * Events that would be removed by degradeBy are let through by undegradeBy and vice versa (see second example).
 *
- * @tags temporal
 * @name undegradeBy
 * @memberof Pattern
 * @param {number} amount - a number between 0 and 1
@@ -799,7 +622,6 @@ export const undegradeBy = register(
 * Inverse of `degrade`: Randomly removes 50% of events from the pattern. Shorthand for `.undegradeBy(0.5)`
 * Events that would be removed by degrade are let through by undegrade and vice versa (see second example).
 *
- * @tags temporal
 * @name undegrade
 * @memberof Pattern
 * @returns Pattern
@@ -818,7 +640,6 @@ export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5), t
 * Randomly applies the given function by the given probability.
 * Similar to `someCyclesBy`
 *
- * @tags temporal
 * @name sometimesBy
 * @memberof Pattern
 * @param {number | Pattern} probability - a number between 0 and 1
@@ -838,7 +659,6 @@ export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
 *
 * Applies the given function with a 50% chance
 *
- * @tags temporal
 * @name sometimes
 * @memberof Pattern
 * @param {function} function - the transformation to apply
@@ -860,7 +680,6 @@ export const sometimes = register('sometimes', function (func, pat) {
 * @param {number | Pattern} probability - a number between 0 and 1
 * @param {function} function - the transformation to apply
 * @returns Pattern
- * @tags temporal
 * @example
 * s("bd,hh*8").someCyclesBy(.3, x=>x.speed("0.5"))
 */
@@ -883,7 +702,6 @@ export const someCyclesBy = register('someCyclesBy', function (patx, func, pat)
 * @name someCycles
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("bd,hh*8").someCycles(x=>x.speed("0.5"))
 */
@@ -898,7 +716,6 @@ export const someCycles = register('someCycles', function (func, pat) {
 * @name often
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("hh*8").often(x=>x.speed("0.5"))
 */
@@ -913,7 +730,6 @@ export const often = register('often', function (func, pat) {
 * @name rarely
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("hh*8").rarely(x=>x.speed("0.5"))
 */
@@ -925,7 +741,6 @@ export const rarely = register('rarely', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0.1, fn)`
 *
- * @tags temporal
 * @name almostNever
 * @memberof Pattern
 * @returns Pattern
@@ -940,7 +755,6 @@ export const almostNever = register('almostNever', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0.9, fn)`
 *
- * @tags temporal
 * @name almostAlways
 * @memberof Pattern
 * @returns Pattern
@@ -955,7 +769,6 @@ export const almostAlways = register('almostAlways', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0, fn)` (never calls fn)
 *
- * @tags temporal
 * @name never
 * @memberof Pattern
 * @returns Pattern
@@ -970,7 +783,6 @@ export const never = register('never', function (_, pat) {
 *
 * Shorthand for `.sometimesBy(1, fn)` (always calls fn)
 *
- * @tags temporal
 * @name always
 * @memberof Pattern
 * @returns Pattern
@@ -999,7 +811,6 @@ export function _keyDown(keyname) {
 * Do something on a keypress, or array of keypresses
 * [Key name reference](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values)
 *
- * @tags external_io
 * @name whenKey
 * @memberof Pattern
 * @returns Pattern
@@ -1016,7 +827,6 @@ export const whenKey = register('whenKey', function (input, func, pat) {
 * returns true when a key or array of keys is held
 * [Key name reference](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values)
 *
- * @tags external_io
 * @name keyDown
 * @memberof Pattern
 * @returns Pattern
@@ -1027,54 +837,3 @@ export const whenKey = register('whenKey', function (input, func, pat) {
 export const keyDown = register('keyDown', function (pat) {
  return pat.fmap(_keyDown);
 });
-
-/**
- * A pattern measuring the duration of events,
- * in cycles per event. `cyclesPer` doesn't have structure itself, but takes structure, and therefore
- * event durations, from the pattern that it is combined with.
- * For example `cyclesPer.struct("1 1 [1 1] 1")` would give the same as `"0.25 0.25 [0.125 0.125] 0.25"`.
- * See also its reciprocal, `per`, also known as `perCycle`.
- *
- * @tags temporal
- * @example
- * // Shorter events are lower in pitch
- * sound("saw saw [saw saw] saw")
- *   .note(cyclesPer.range(50, 100))
- * @example
- * sound("bd sd [bd bd] sd*4 [- sd] [bd [bd bd]]")
- *   .note(cyclesPer.add(20))
- */
-export const cyclesPer = new Pattern(function (state) {
-  return [new Hap(undefined, state.span, state.span.duration)];
-});
-
-/**
- * A pattern measuring the 'shortness' of events, or in other words, the duration of pattern events,
- * in events per cycle. `per` doesn't have structure itself, but takes structure, and therefore
- * event durations, from the pattern that it is combined with.
- * For example `per.struct("1 1 [1 1] 1")` would give the same as `"4 4 [8 8] 4"`.
- * See also its reciprocal, `cyclesPer`.
- * @tags temporal
- * @synonyms perCycle
- * @example
- * // Shorter events are more distorted
- * n("0 0*2 0 0*2 0 [0 0 0]@2").sound("bd")
- *  .distort(per.div(2))
- */
-export const per = new Pattern(function (state) {
-  return [new Hap(undefined, state.span, Fraction(1).div(state.span.duration))];
-});
-
-export const perCycle = per;
-
-/**
- * Like `per` but measures the shortness of events according to an exponential curve. In
- * particular, where the event duration halves, the
- * returned value increases by one. `perx.struct("1 1 [1 [1 1]] 1")` would therefore be
- * the same as `"3 3 [4 [5 5]] 3"`.
- * @tags temporal
- */
-export const perx = new Pattern(function (state) {
-  const n = Fraction(1).div(state.span.duration);
-  return [new Hap(undefined, state.span, Math.log(n) / Math.log(2) + 1)];
-});
@@ -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', () => {
-  it('should apply bjorklundlund to ons and steps', () => {
-    expect(bjorklund(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(bjorklund(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(bjorklund(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
+describe('bjork', () => {
+  it('should apply bjorklund to ons and steps', () => {
+    expect(bjork(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
+    expect(bjork(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
+    expect(bjork(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
+    expect(bjork(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
+    expect(bjork(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
  });
 });

@@ -586,18 +586,6 @@ describe('Pattern', () => {
          .map((a) => a.value),
      ).toStrictEqual(['c', 'b', 'a']);
    });
-    it('Does not reverse the order of cycles', () => {
-      expect(fastcat('a', 'b', 'c', 'd').slow(2).rev().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
-        fastcat('b', 'a', 'd', 'c').firstCycle(),
-      );
-    });
-  });
-  describe('revv()', () => {
-    it('Does reverse the order of cycles', () => {
-      expect(fastcat('a', 'b', 'c', 'd').slow(2).revv().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
-        fastcat('d', 'c', 'b', 'a').firstCycle(),
-      );
-    });
  });
  describe('sequence()', () => {
    it('Can work like fastcat', () => {
@@ -740,6 +728,20 @@ describe('Pattern', () => {
      );
    });
  });
+  describe('signal()', () => {
+    it('Can make saw/saw2', () => {
+      expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+        sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
+      );
+
+      expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
+    });
+    it('Can make isaw/isaw2', () => {
+      expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
+
+      expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
+    });
+  });
  describe('_setContext()', () => {
    it('Can set the hap context', () => {
      expect(
@@ -1,61 +0,0 @@
-/*
-signal.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/pattern.test.mjs>
-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 Fraction from 'fraction.js';
-
-import { describe, it, expect, vi } from 'vitest';
-
-import { saw, saw2, isaw, isaw2, per, perx, cyclesPer } from '../signal.mjs';
-import { fastcat, sequence, State, TimeSpan, Hap } from '../index.mjs';
-
-const st = (begin, end) => new State(ts(begin, end));
-const ts = (begin, end) => new TimeSpan(Fraction(begin), Fraction(end));
-const hap = (whole, part, value, context = {}) => new Hap(whole, part, value, context);
-
-const third = Fraction(1, 3);
-const twothirds = Fraction(2, 3);
-
-const sameFirst = (a, b) => {
-  return expect(a.sortHapsByPart().firstCycle()).toStrictEqual(b.sortHapsByPart().firstCycle());
-};
-
-describe('signal()', () => {
-  it('Can make saw/saw2', () => {
-    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
-    );
-
-    expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
-  });
-  it('Can make isaw/isaw2', () => {
-    expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
-
-    expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
-  });
-});
-
-describe('cyclesPer', () => {
-  it('gives cycles per hap', () => {
-    sameFirst(
-      cyclesPer.struct(true, true, true, fastcat(true, true)),
-      sequence(0.25, 0.25, 0.25, fastcat(0.125, 0.125)).fmap(Fraction),
-    );
-  });
-});
-describe('per', () => {
-  it('gives haps per cycle', () => {
-    sameFirst(per.struct(true, true, true, fastcat(true, true)), sequence(4, 4, 4, fastcat(8, 8)).fmap(Fraction));
-  });
-});
-
-describe('perx', () => {
-  it('gives exponential haps per cycle', () => {
-    sameFirst(
-      perx.struct(true, true, true, fastcat(true, fastcat(true, true))),
-      sequence(3, 3, 3, fastcat(4, fastcat(5, 5))),
-    );
-  });
-});
@@ -0,0 +1,11 @@
+let time;
+export function getTime() {
+  if (!time) {
+    throw new Error('no time set! use setTime to define a time source');
+  }
+  return time();
+}
+
+export function setTime(func) {
+  time = func;
+}
@@ -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 isNote = (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 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) => {
@@ -135,8 +135,6 @@ export async function loadOrc(url) {
 *  p4 -- MIDI key number (as a real number, not an integer but in [0, 127].
 *  p5 -- MIDI velocity (as a real number, not an integer but in [0, 127].
 *  p6 -- Strudel controls, as a string.
- *
- * @tags external_io
 */
 export const csoundm = register('csoundm', (instrument, pat) => {
  let p1 = instrument;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/csound",
-  "version": "1.3.0",
+  "version": "1.2.5",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -38,8 +38,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -25,8 +25,5 @@
    "@strudel/core": "workspace:*",
    "@tauri-apps/api": "^2.2.0"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "engines": {
-    "node": ">=18.0.0"
-  }
+  "homepage": "https://codeberg.org/uzu/strudel#readme"
 }
@@ -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.6",
+  "version": "1.2.4",
  "description": "Helpers for drawing with Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -33,8 +33,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -42,7 +42,6 @@ const getValue = (e) => {
 *
 * @name pianoroll
 * @synonyms punchcard
- * @tags visualization
 * @param {Object} options Object containing all the optional following parameters as key value pairs:
 * @param {integer} cycles number of cycles to be displayed at the same time - defaults to 4
 * @param {number} playhead location of the active notes on the time axis - 0 to 1, defaults to 0.5
@@ -300,7 +299,6 @@ Pattern.prototype.punchcard = function (options) {
 * Supports all the same options as pianoroll.
 *
 * @name wordfall
- * @tags visualization
 */
 Pattern.prototype.wordfall = function (options) {
  return this.punchcard({ vertical: 1, labels: 1, stroke: 0, fillActive: 1, active: 'white', ...options });
@@ -116,7 +116,6 @@ export function pitchwheel({
 /**
 * Renders a pitch circle to visualize frequencies within one octave
 * @name pitchwheel
- * @tags visualization
 * @param {number} hapcircles
 * @param {number} circle
 * @param {number} edo
@@ -129,7 +129,6 @@ function drawSpiral(options) {
 * Displays a spiral visual.
 *
 * @name spiral
- * @tags visualization
 * @param {Object} options Object containing all the optional following parameters as key value pairs:
 * @param {number} stretch controls the rotations per cycle ratio, where 1 = 1 cycle / 360 degrees
 * @param {number} size the diameter of the spiral
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/embed",
-  "version": "1.1.2",
+  "version": "1.1.1",
  "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
  "main": "embed.js",
  "type": "module",
@@ -20,8 +20,5 @@
  "bugs": {
    "url": "https://codeberg.org/uzu/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "engines": {
-    "node": ">=18.0.0"
-  }
+  "homepage": "https://codeberg.org/uzu/strudel#readme"
 }
@@ -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.6",
+  "version": "1.2.4",
  "description": "Gamepad Inputs for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -33,8 +33,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -34,8 +34,5 @@
  "devDependencies": {
    "tree-sitter-haskell": "^0.23.1",
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -35,7 +35,6 @@ export async function initHydra(options = {}) {
      hydra.synth.s0.init({ src: canvas });
    }
  }
-  return hydra;
 }

 export function clearHydra() {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/hydra",
-  "version": "1.2.6",
+  "version": "1.2.4",
  "description": "Hydra integration for strudel",
  "main": "hydra.mjs",
  "type": "module",
@@ -40,8 +40,5 @@
  "devDependencies": {
    "pkg": "^5.8.1",
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -5,24 +5,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import * as _WebMidi from 'webmidi';
-import {
-  Hap,
-  Pattern,
-  TimeSpan,
-  getCps,
-  getIsStarted,
-  getPattern,
-  getTime,
-  getTriggerFunc,
-  isPattern,
-  logger,
-  ref,
-  reify,
-} from '@strudel/core';
+import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
-import { getAudioContext } from '@strudel/webaudio';
-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;
@@ -138,7 +123,6 @@ function githubPath(base, subpath = '') {

 /**
 * configures the default midimap, which is used when no "midimap" port is set
- * @tags external_io, midi
 * @example
 * defaultmidimap({ lpf: 74 })
 * $: note("c a f e").midi();
@@ -152,7 +136,6 @@ let loadCache = {};

 /**
 * Adds midimaps to the registry. Inside each midimap, control names (e.g. lpf) are mapped to cc numbers.
- * @tags external_io, midi
 * @example
 * midimaps({ mymap: { lpf: 74 } })
 * $: note("c a f e")
@@ -207,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');
  }
@@ -215,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);
-  }, targetTime);
+  device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
 }

 // 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);
-  }, targetTime);
+  device.sendProgramChange(progNum, midichan, { time: timeOffsetString });
 }

 // 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');
@@ -246,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);
-  }, targetTime);
+  device.sendSysex(sysexid, sysexdata, { time: timeOffsetString });
 }

 // 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');
@@ -260,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);
-  }, targetTime);
+
+  device.sendNRPN(nrpnn, nrpv, midichan, { time: timeOffsetString });
 }

 // 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);
-  }, targetTime);
+  device.sendPitchBend(midibend, midichan, { time: timeOffsetString });
 }

 // 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');
  }
-
-  scheduleAtTime(() => {
-    device.sendChannelAftertouch(miditouch, midichan);
-  }, targetTime);
+  device.sendChannelAftertouch(miditouch, midichan, { time: timeOffsetString });
 }

 // 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');
  }
@@ -297,17 +268,16 @@ 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 });
-
-  scheduleAtTime(() => {
-    device.playNote(midiNote, midichan);
-  }, targetTime);
+  device.playNote(midiNote, midichan, {
+    time: timeOffsetString,
+  });
 }

 /**
 * MIDI output: Opens a MIDI output port.
- * @tags external_io
 * @param {string | number} midiport MIDI device name or index defaulting to 0
 * @param {object} options Additional MIDI configuration options
 * @example
@@ -339,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
@@ -362,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,
@@ -404,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(', ')}`);
@@ -416,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
@@ -431,76 +407,74 @@ 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();
-      }, targetTime);
+      device.sendStart({ time: timeOffsetString });
    }
    if (['clock', 'midiClock'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendClock();
-      }, targetTime);
+      device.sendClock({ time: timeOffsetString });
    } else if (['start'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendStart();
-      }, targetTime);
+      device.sendStart({ time: timeOffsetString });
    } else if (['stop'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendStop();
-      }, targetTime);
+      device.sendStop({ time: timeOffsetString });
    } else if (['continue'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendContinue();
-      }, targetTime);
+      device.sendContinue({ time: timeOffsetString });
    } 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);
        }
      }
    }
  });
 };

+let listeners = {};
+const refs = {};
+
 /**
- * Initialize a midi device
+ * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
+ * @param {string | number} input MIDI device name or index defaulting to 0
+ * @returns {Function}
+ * @example
+ * let cc = await midin('IAC Driver Bus 1')
+ * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
 */
-async function _initialize(input) {
+export async function midin(input) {
  if (isPattern(input)) {
    throw new Error(
-      `[midi] Midi input cannot be a pattern. Make sure to pass device name with single quotes. Example: midin('${
+      `midin: does not accept Pattern as input. Make sure to pass device name with single quotes. Example: midin('${
        WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
      }')`,
    );
@@ -509,193 +483,29 @@ async function _initialize(input) {
  const device = getDevice(input, WebMidi.inputs);
  if (!device) {
    throw new Error(
-      `[midi] Midi device "${input}" not found.. connected devices: ${getMidiDeviceNamesString(WebMidi.inputs)}`,
+      `midiin: device "${input}" not found.. connected devices: ${getMidiDeviceNamesString(WebMidi.inputs)}`,
    );
  }
  if (initial) {
    const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
    logger(
-      `[midi] Midi enabled! Using "${device.name}". ${
+      `Midi enabled! Using "${device.name}". ${
        otherInputs?.length ? `Also available: ${getMidiDeviceNamesString(otherInputs)}` : ''
      }`,
    );
  }
-  return device;
-}
-
-/**
- * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
- *
- * The output is a function that accepts a midi cc value to query as well as (optionally) a midi channel
- *
- * @name midin
- * @tags external_io, midi
- * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {function(number, number=): Pattern} A function from (cc, channel?) to a pattern.
- *   When queried, the pattern will produces the most recently received midi value (normalized to 0 to 1)
- *   that came through that cc number (and channel, if provided)
- * @example
- * const cc = await midin('IAC Driver Bus 1')
- * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
- * @example
- * const allCC = await midin('IAC Driver Bus 1')
- * const cc = (ccNum) => allCC(ccNum, 2) // just channel 2
- * note("c a f e").s("saw")
- *   .when(cc(0).gt(0), x => x.postgain(0))
- */
-let listeners = {};
-const refs = {};
-const refsByChan = {};
-export async function midin(input) {
-  const device = await _initialize(input);
-  refs[input] ??= {};
-  refsByChan[input] ??= {};
-  const cc = (cc, chan) => {
-    if (chan !== undefined) {
-      return ref(() => refsByChan[input][cc]?.[chan] || 0);
-    }
-    return ref(() => refs[input][cc] || 0);
-  };
+  // ensure refs for this input are initialized
+  if (!refs[input]) {
+    refs[input] = {};
+  }
+  const cc = (cc) => ref(() => refs[input][cc] || 0);

  listeners[input] && device.removeListener('midimessage', listeners[input]);
  listeners[input] = (e) => {
-    const [ccNum, v] = e.dataBytes;
-    const chan = e.message.channel;
-    const scaled = v / 127;
-    refsByChan[input][ccNum] ??= {};
-    refsByChan[input][ccNum][chan] = scaled;
-    refs[input][ccNum] = scaled;
+    const cc = e.dataBytes[0];
+    const v = e.dataBytes[1];
+    refs[input] && (refs[input][cc] = v / 127);
  };
  device.addListener('midimessage', listeners[input]);
  return cc;
 }
-
-/**
- * MIDI keyboard: Opens a MIDI input port to receive MIDI keyboard messages.
- *
- * The note length is fixed as Superdough is not currently set up for undetermined
- * note durations
- *
- * @name midikeys
- * @tags external_io, midi
- * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {function((number | Pattern)=): Pattern} A function that produces a pattern.
- *   When queried, the pattern will produces the most recently played midi notes and velocities,
- *   lasting for the specified duration
- * @example
- * const kb = await midikeys('Arturia KeyStep 32')
- * kb().s("tri").lpf(80).lpe(6).lpd(0.1).room(2).delay(0.35)
- * @example
- * const kb = await midikeys('Arturia KeyStep 32')
- * kb("0.5 1")
- *   .s("saw")
- *   .add(note(rand.mul(0.3)))
- *   .lpf(1000).lpe(2).room(0.5)
- */
-const kHaps = {};
-const kListeners = {};
-
-function _triggerKeyboard(input, cps, now, latencyCycles) {
-  const pattern = getPattern();
-  const trigger = getTriggerFunc();
-  if (!pattern || !trigger) {
-    return false;
-  }
-  const t = now + latencyCycles;
-  const eps = 1e-6;
-  const haps = pattern.queryArc(t - eps, t + eps, { _cps: cps });
-  // Only keep haps coming from `midikeys`
-  const kbHaps = haps.filter((hap) => hap.value?.midikey?.startsWith(`${input}_`));
-  const ctxNow = getAudioContext().currentTime;
-  if (!kbHaps.length) {
-    return false;
-  }
-  kbHaps.forEach((hap) => {
-    if (!hap.hasOnset()) {
-      return;
-    }
-    const t = ctxNow + (hap.whole.begin - now) / cps;
-    const duration = hap.duration / cps;
-    trigger(hap, t - ctxNow, duration, cps, t);
-  });
-
-  return true;
-}
-export async function midikeys(input) {
-  const device = await _initialize(input);
-  if (!kHaps[input]) {
-    kHaps[input] = [];
-  }
-  kListeners[input] && device.removeListener('midimessage', kListeners[input]);
-  kListeners[input] = (e) => {
-    const { dataBytes, message } = e;
-    const noteon = message.command === 9;
-    let noteoff = message.command === 8;
-    // Don't enqueue or trigger midi notes if scheduler is not started
-    const notStarted = !getIsStarted();
-    // Ignore non-note messages (e.g. CC, pitchbend, modwheel, etc.)
-    const notANote = !noteon && !noteoff;
-    if (notStarted || notANote) {
-      return;
-    }
-    const [note, velocity] = dataBytes;
-    noteoff ||= noteon && velocity === 0; // handle devices which may use velocity = 0 to signal noteoff
-    const key = `${input}_${note}`;
-    const cps = getCps() ?? 0.5;
-    const triggerAvailable = !!(getPattern() && getTriggerFunc());
-    const latencySeconds = triggerAvailable ? 0.01 : 0.06; // avoid missing notes due to cyclist / trigger latency
-    const now = getTime();
-    const t = now + latencySeconds * cps;
-    const span = new TimeSpan(t, t);
-    let value = { midikey: key };
-    if (noteoff) {
-      /* TODO: It's a big effort, but we could modify superdough to allow for situations where
-      we don't know the hap duration in advance. This would mean, for example, that if the hap
-      is flagged as such a special note-on event, we have all effects be persistent & all ADSR
-      envelopes stop at the S stage [and store references to them by `midikey`]
-      If this is implemented, then getting full keyboard functionality should be as simple
-      as sending the corresponding note-off event below and triggering `release` on each of those
-      referenced effects/envelopes
-      
-      value = { ...value, noteoff: true };
-  
-      If this is achieved, we can remove the noteLength parameter
-      */
-      return;
-    } else {
-      value = { ...value, note: Math.round(note), velocity: velocity / 127 };
-    }
-    kHaps[input].push(new Hap(span, span, value, {}));
-    if (!noteoff && triggerAvailable) {
-      // If we have access to a trigger function, we call it to immediately
-      // dispatch to the audio engine, rather than waiting for cyclist to catch these haps
-      const triggered = _triggerKeyboard(input, cps, now, latencySeconds * cps);
-      if (triggered) {
-        kHaps[input] = [];
-      }
-    }
-  };
-  device.addListener('midimessage', kListeners[input]);
-  const kb = (noteLength = 0.5) => {
-    const nlPat = reify(noteLength);
-    const query = (state) => {
-      const haps = kHaps[input].flatMap((hap) => {
-        const lenHaps = nlPat.query(state.setSpan(hap.wholeOrPart()));
-        return lenHaps.map((lenHap) => {
-          const nl = lenHap.value ?? 0.5;
-          const whole = new TimeSpan(hap.whole.begin, hap.whole.begin.add(nl));
-          const part = new TimeSpan(hap.part.begin, hap.part.begin.add(nl));
-          const context = hap.combineContext(lenHap);
-          return new Hap(whole, part, hap.value, context);
-        });
-      });
-      if (state.controls.cyclist) {
-        // Notes have been sent; clear them
-        kHaps[input] = [];
-      }
-      return haps;
-    };
-    return new Pattern(query);
-  };
-  return kb;
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/midi",
-  "version": "1.3.0",
+  "version": "1.2.5",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -35,8 +35,5 @@
  },
  "devDependencies": {
    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mini",
-  "version": "1.2.6",
+  "version": "1.2.4",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -38,8 +38,5 @@
    "peggy": "^4.2.0",
    "vite": "^6.0.11",
    "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jade (Rose) Rowland	39013c09ef	sl	2025-11-01 01:13:20 -04:00
Jade (Rose) Rowland	9d425dfff6	flattening	2025-10-22 13:12:41 -04:00