cybersemics · Antonov548 · May 30, 2026 · May 31, 2026 · May 31, 2026 · May 31, 2026
diff --git a/.env.development b/.env.development
@@ -16,3 +16,6 @@ CAPACITOR_SERVER_URL=https://localhost:3000
 
 # AI SERVER
 VITE_AI_URL=http://localhost:3111/ai
+
+# TREECRDT SYNC (optional) — direct ws/wss or http(s) discovery bootstrap; doc id matches thoughtspace (tsid)
+# VITE_TREECRDT_SYNC_BASE_URL=
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -103,6 +103,9 @@ jobs:
     name: BrowserStack
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request_target' || github.event.pull_request.changed_files > 0
+    env:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
 
     # The repo-wide gate — see the concurrency comment at the top of the file for why it sits at the
     # job level (it must coexist with the per-PR workflow-level group; a workflow gets only one
@@ -202,9 +205,11 @@ jobs:
           cache: 'yarn'
 
       - name: Install npm dependencies
+        if: env.BROWSERSTACK_USERNAME != '' && env.BROWSERSTACK_ACCESS_KEY != ''
         uses: ./.github/actions/install
 
       - name: Build
+        if: env.BROWSERSTACK_USERNAME != '' && env.BROWSERSTACK_ACCESS_KEY != ''
         run: yarn build
 
       - name: Generate tunnel token
@@ -215,6 +220,7 @@ jobs:
           echo "TUNNEL_TOKEN=$TOKEN" >> "$GITHUB_ENV"
 
       - name: Serve
+        if: env.BROWSERSTACK_USERNAME != '' && env.BROWSERSTACK_ACCESS_KEY != ''
         env:
           HAS_TOKEN_GATE: ${{ steps.server_mode.outputs.has_token_gate }}
         run: |
@@ -248,7 +254,12 @@ jobs:
             sleep 1
           done
 
+      - name: Skip BrowserStack
+        if: env.BROWSERSTACK_USERNAME == '' || env.BROWSERSTACK_ACCESS_KEY == ''
+        run: echo "Skipping BrowserStack because credentials are not configured."
+
       - name: Test iOS on BrowserStack
+        if: env.BROWSERSTACK_USERNAME != '' && env.BROWSERSTACK_ACCESS_KEY != ''
         run: yarn test:ios
         env:
           BROWSERSTACK_USERNAME: ${{secrets.BROWSERSTACK_USERNAME}}

diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,9 @@ desktop/gen/schemas
 # diff images output from failed Puppeteer snapshot tests
 __diff_output__
 
+# wa-sqlite assets (generated by treecrdt vite plugin)
+public/wa-sqlite
+
 ## PandaCSS
 styled-system
 styled-system-studio

diff --git a/docs/folder-structure.md b/docs/folder-structure.md
@@ -8,12 +8,12 @@ The main directory structure is organized as follows. Tests are located in a sub
 - [`/src/actions`](../src/actions) — Redux reducers and action-creators are co-located. Prefer reducers when possible, as they are pure functions that are more easily testable and composable. Only define an action creator if it requires a side effect. Use [`util/reducerFlow`](../src/util/reducerFlow.ts) to compose reducers.
 - [`/src/commands`](../src/commands) — Keyboard, gesture, and toolbar commands (formerly `shortcuts`). One file per command, plus an `index.ts` barrel. See [commands.md](commands.md) for the architecture.
 - [`/src/components`](../src/components) — React components.
-- [`/src/data-providers`](../src/data-providers) — Storage and sync backends implementing the [`DataProvider`](../src/data-providers/DataProvider.ts) interface. The live implementation is YJS in [`yjs/thoughtspace.ts`](../src/data-providers/yjs/thoughtspace.ts). See [persistence.md](persistence.md).
+- [`/src/data-providers`](../src/data-providers) — Storage and sync backends implementing the [`DataProvider`](../src/data-providers/DataProvider.ts) interface. The live implementation is TreeCRDT in [`treecrdt/thoughtspace.ts`](../src/data-providers/treecrdt/thoughtspace.ts). See [persistence.md](persistence.md).
 - [`/src/device`](../src/device) — Device/DOM-level helpers for selection, scrolling, clipboard, focus, and platform detection. The selection wrapper [`device/selection.ts`](../src/device/selection.ts) is the single point of access to `window.getSelection()` (enforced by lint). See [cursor-and-caret.md](cursor-and-caret.md).
 - [`/src/e2e`](../src/e2e) — End-to-end test setup, including Puppeteer and iOS environments. See [testing.md](testing.md).
 - [`/src/hooks`](../src/hooks) — React hooks.
-- [`/src/recipes`](../src/recipes) — Panda CSS recipes that define styled component variants. Prefer inline CSS (`css({ ... })`); only add a recipe here when the styles have variants or are shared by multiple components.
-- [`/src/redux-enhancers`](../src/redux-enhancers) — Redux enhancers (e.g. the [`pushQueue`](../src/redux-enhancers/pushQueue.ts) that flushes state mutations to YJS).
+- [`/src/recipes`](../src/recipes) — Panda CSS recipes that define styled component variants. New components should use these or inline styles.
+- [`/src/redux-enhancers`](../src/redux-enhancers) — Redux enhancers (e.g. the [`pushQueue`](../src/redux-enhancers/pushQueue.ts) that flushes state mutations to thoughtspace persistence).
 - [`/src/redux-middleware`](../src/redux-middleware) — Redux middleware (e.g. the [`pullQueue`](../src/redux-middleware/pullQueue.ts) that loads thoughts on demand, or [`clearSelection`](../src/redux-middleware/clearSelection.ts) that clears the browser caret on cursor changes).
 - [`/src/selectors`](../src/selectors) — Pure functions that compute (and often memoize) slices from the Redux state. See [data-model.md](data-model.md) for the canonical traversal selectors.
 - [`/src/stores`](../src/stores) — Lightweight non-Redux ministores for ephemeral UI state. Examples: [`editingValue`](../src/stores/editingValue.ts) (the in-progress thought text), [`viewport`](../src/stores/viewport.ts), [`scrollTop`](../src/stores/scrollTop.ts), [`gesture`](../src/stores/gesture.ts), [`syncStatus`](../src/stores/syncStatus.ts), [`selectionRangeStore`](../src/stores/selectionRangeStore.ts).
@@ -42,7 +42,7 @@ The main directory structure is organized as follows. Tests are located in a sub
 | Non-Redux UI state | [`stores/`](../src/stores) |
 | Browser DOM / selection / scroll APIs | [`device/`](../src/device) |
 | User-triggered command | [`commands/`](../src/commands) |
-| Yjs persistence engine | [`data-providers/yjs/thoughtspace.ts`](../src/data-providers/yjs/thoughtspace.ts) |
+| TreeCRDT persistence engine | [`data-providers/treecrdt/thoughtspace.ts`](../src/data-providers/treecrdt/thoughtspace.ts) |
 | Layout positioning math | [`hooks/usePositionedThoughts.ts`](../src/hooks/usePositionedThoughts.ts) |
 | Visible-thoughts traversal | [`selectors/linearizeTree.ts`](../src/selectors/linearizeTree.ts) |
 | Pure helper (no React, no Redux) | [`util/`](../src/util) |

diff --git a/docs/glossary.md b/docs/glossary.md
@@ -58,7 +58,7 @@ A flat reference of project-specific terms used in code and docs. For deeper con
 
 ## D
 
-**DataProvider** — The single interface ([`DataProvider.ts`](../src/data-providers/DataProvider.ts)) for storage backends. `db` in [`yjs/thoughtspace.ts`](../src/data-providers/yjs/thoughtspace.ts) is the live implementation.
+**DataProvider** — The single interface ([`DataProvider.ts`](../src/data-providers/DataProvider.ts)) for storage backends. The active implementation is exported through [`data-providers/thoughtspace.ts`](../src/data-providers/thoughtspace.ts).
 
 **dbQueue / freeQueue** — Two halves of the push-queue split. `dbQueue` writes batches with `local || remote` set; `freeQueue` releases entries from the in-memory cache. See [persistence.md → Push queue](persistence.md#push-queue-redux--yjs).
 
@@ -192,7 +192,7 @@ A flat reference of project-specific terms used in code and docs. For deeper con
 
 **updatedBy** — `clientId` of the writer. Stamped on every Thought and Lexeme write so observers can filter out self-originated change events.
 
-**updateThoughts** — Both an action ([`actions/updateThoughts.ts`](../src/actions/updateThoughts.ts)) that mutates Redux and queues a push, and the `DataProvider` entry point ([`yjs/thoughtspace.ts`](../src/data-providers/yjs/thoughtspace.ts)) that writes to Yjs. The action calls into the provider via the push queue.
+**updateThoughts** — The action ([`actions/updateThoughts.ts`](../src/actions/updateThoughts.ts)) that mutates Redux and queues a push. The push queue persists those batches through the active data provider's `updateThoughts`.
 
 ## V
 

diff --git a/docs/persistence.md b/docs/persistence.md
@@ -11,7 +11,7 @@ Two queues bridge Redux and the local Yjs store:
 - **Push queue** ([`redux-enhancers/pushQueue.ts`](../src/redux-enhancers/pushQueue.ts)) drains `state.pushQueue` after every action and writes to Yjs.
 - **Pull queue** ([`redux-middleware/pullQueue.ts`](../src/redux-middleware/pullQueue.ts)) tracks visible thoughts and pulls any pending ones from Yjs.
 
-The single point of integration with Yjs is the [`DataProvider`](../src/data-providers/DataProvider.ts) interface, implemented as `db` in [`data-providers/yjs/thoughtspace.ts`](../src/data-providers/yjs/thoughtspace.ts).
+The single point of integration with persistence is the [`DataProvider`](../src/data-providers/DataProvider.ts) interface, implemented by the active thoughtspace backend.
 
 ## In-memory state (Redux)
 
@@ -89,7 +89,7 @@ If IDB returns `AbortError` (the app was closed mid-sync), replication retries a
 
 - [`updateThought`](../src/data-providers/yjs/thoughtspace.ts) writes a single thought into its parent Y.Doc. If the thought has changed parents, it deletes the entry from the old parent Doc, updates the docKey in `docKeys` and in the Lexeme's `cx-${id}` map, and writes to the new parent. (These three writes span three Docs and are not atomic — there's a known risk of partial-failure inconsistency, called out in a code comment.) `childrenMap` is merged key-by-key as a nested `Y.Map<ThoughtId>`; other fields are written only if the value changed, to avoid emitting redundant CRDT updates.
 - [`updateLexeme`](../src/data-providers/yjs/thoughtspace.ts) adds and removes contexts via `cx-${id}` keys.
-- [`updateThoughts`](../src/data-providers/yjs/thoughtspace.ts) is the public `DataProvider` entry point. It groups updates and deletes, then submits both groups to a `TaskQueue` with **concurrency 16** ([`util/taskQueue.ts`](../src/util/taskQueue.ts)). Updates run before deletes within a single batch.
+- `DataProvider.updateThoughts` is the public persistence entry point for push-queue thought and lexeme batches.
 
 All update paths await `IndexeddbPersistence.whenSynced` (i.e. they resolve when the write hits IDB), but do not wait on the websocket.
 
@@ -126,7 +126,7 @@ In effect, on `main` Yjs is used as a local-only document store. Local IndexedDB
 
 [`redux-enhancers/pushQueue.ts`](../src/redux-enhancers/pushQueue.ts) is a Redux store enhancer that runs after every reducer. It drains `state.pushQueue` (a list of `PushBatch` objects pushed there by [`updateThoughts`](../src/actions/updateThoughts.ts) and friends) and partitions it into:
 
-- **`dbQueue`** — batches with `local || remote` set. Applied sequentially via `db.updateThoughts({ thoughtIndexUpdates, lexemeIndexUpdates, lexemeIndexUpdatesOld, schemaVersion })`. After each batch resolves, any `idbSynced` callback on the batch is invoked.
+- **`dbQueue`** — batches with `local || remote` set. Applied sequentially through `thoughtspaceRuntime.persistPushQueueBatches`, which calls the active data provider's `updateThoughts`. After provider persistence finishes, any `idbSynced` callback on the original batch is invoked.
 - **`freeQueue`** — state-only batches whose `null` thought/lexeme entries indicate they should be released from the in-memory cache. Triggers `db.freeThought` / `db.freeLexeme`.
 
 The enhancer also caches a small set of critical settings (`CACHED_SETTINGS` in [`constants.ts`](../src/constants.ts)) into `localStorage` so that things like the Tutorial setting are available during the first paint before Yjs hydrates. The corresponding read path is [`selectors/getSetting.ts`](../src/selectors/getSetting.ts).
@@ -135,10 +135,10 @@ Once Redux dispatches a thought update, the data flow is therefore:
 
 ```
 reducer → state.pushQueue → pushQueue enhancer
-       → db.updateThoughts (thoughtspace.ts)
-       → updateQueue (TaskQueue, concurrency 16)
-       → Y.Doc.transact + IndexeddbPersistence
-       → idbSynced callback resolves
+      → thoughtspaceRuntime.persistPushQueueBatches
+      → DataProvider.updateThoughts
+      → active provider persistence
+      → idbSynced callback is invoked
 ```
 
 ## Pull queue (Yjs → Redux)

diff --git a/docs/testing.md b/docs/testing.md
@@ -560,7 +560,7 @@ The helpers in [`../src/test-helpers/`](../src/test-helpers) cover store setup a
 - **Read-by-value helpers.** [`getAllChildrenByContext`](../src/test-helpers/getAllChildrenByContext.ts), [`getChildrenRankedByContext`](../src/test-helpers/getChildrenRankedByContext.ts), [`getAllChildrenAsThoughtsByContext`](../src/test-helpers/getAllChildrenAsThoughtsByContext.ts), [`attributeByContext`](../src/test-helpers/attributeByContext.ts), [`contextToThought`](../src/test-helpers/contextToThought.ts).
 - [`expectPathToEqual`](../src/test-helpers/expectPathToEqual.ts) — Jest matcher that compares paths by their thought *values* rather than ids, so test failures are readable.
 - [`checkDataIntegrity`](../src/test-helpers/checkDataIntegrity.ts) — assertions that catch parent/child mismatches, missing Lexemes, and orphaned thoughts. Useful as a final assertion in mutation-heavy tests.
-- [`dataProviderTest`](../src/test-helpers/dataProviderTest.ts) — the alternate `DataProvider` implementation used by tests that exercise the storage layer without going through Yjs. (See [persistence.md](persistence.md) for the live YJS provider.)
+- [`dataProviderTest`](../src/test-helpers/dataProviderTest.ts) — shared assertions for storage providers that implement the data provider interface.
 
 ### `src/e2e/puppeteer/helpers/` — for Puppeteer tests
 

diff --git a/eslint.config.js b/eslint.config.js
@@ -106,6 +106,7 @@ export default [
       '**/docs/*',
       '**/functions/*',
       '**/scripts/*',
+      'public/wa-sqlite/**',
     ],
   },
   {

diff --git a/package.json b/package.json
@@ -81,7 +81,6 @@
   "resolutions": {
     "@pandacss/node@npm:0.47.0": "patch:@pandacss/node@npm%3A0.47.0#~/.yarn/patches/@pandacss-node-npm-0.47.0.patch",
     "page-lifecycle": "https://codeload.github.com/magic-akari/page-lifecycle/tar.gz/50b50421bdeab3d211a57e81a277f699638373b0",
-    "y-indexeddb": "https://codeload.github.com/raineorshine/y-indexeddb/tar.gz/60b960009085b1a988b5064ee35703229231531f",
     "use-latest": "^1.3.0",
     "use-isomorphic-layout-effect": "^1.2.1"
   },
@@ -105,6 +104,15 @@
     "@redux-devtools/extension": "^4.0.0",
     "@stylistic/eslint-plugin-ts": "^4.4.1",
     "@tauri-apps/api": "^2.11.1",
+    "@treecrdt/auth": "0.1.2",
+    "@treecrdt/discovery": "0.1.0",
+    "@treecrdt/interface": "0.2.0",
+    "@treecrdt/riblt-wasm": "0.1.0",
+    "@treecrdt/sync": "0.1.2",
+    "@treecrdt/sync-protocol": "0.1.2",
+    "@treecrdt/sync-server-core": "0.1.2",
+    "@treecrdt/sync-sqlite": "0.1.2",
+    "@treecrdt/wa-sqlite": "0.4.0",
     "axios": "^1.19.0",
     "clipboard": "^2.0.11",
     "dnd-core": "^16.0.1",
@@ -160,10 +168,7 @@
     "workbox-strategies": "^7.4.1",
     "workbox-window": "^7.4.1",
     "xhtml-purifier": "^0.4.3",
-    "y-indexeddb": "⚠️ OVERRIDDEN BY 'resolutions' - Source: https://github.com/raineorshine/y-indexeddb#y-indexeddb-multiplex | Tarball: https://codeload.github.com/raineorshine/y-indexeddb/tar.gz/60b960009085b1a988b5064ee35703229231531f | Configured in: package.json#resolutions",
-    "y-protocols": "^1.0.7",
-    "yallist": "^5.0.0",
-    "yjs": "^13.6.31"
+    "yallist": "^5.0.0"
   },
   "devDependencies": {
     "@babel/core": "^8.0.1",

diff --git a/scripts/add-context.js b/scripts/add-context.js
@@ -4,8 +4,8 @@ const fs = require('fs')
 const path = require('path')
 const murmurHash3 = require('murmurhash3js')
 
-const EM_TOKEN = '__EM__'
-const HOME_TOKEN = '__ROOT__'
+const EM_TOKEN = '00000000000000000000000000000002'
+const HOME_TOKEN = '00000000000000000000000000000000'
 const SEPARATOR_TOKEN = '__SEP__'
 const appendContext = (context, child) => unroot([...context, child])
 const escapeRegEx = s => s.replace(/[-[\]{}()*+?.\\^$|#\s]/g, '\\$&')

diff --git a/scripts/deleteContext.js b/scripts/deleteContext.js
@@ -14,7 +14,7 @@ if (!file || context.length === 0) {
 const thoughtIndices = JSON.parse(fs.readFileSync(file, 'utf8'))
 const { thoughtIndex, lexemeIndex } = thoughtIndices
 
-const thought = contextToThought(thoughtIndices, thoughtIndex.__ROOT__, context)
+const thought = contextToThought(thoughtIndices, thoughtIndex['00000000000000000000000000000000'], context)
 if (!thought) {
   console.error(`${context} not found`)
   process.exit(1)

diff --git a/scripts/deleteRootLeaves.js b/scripts/deleteRootLeaves.js
@@ -14,7 +14,7 @@ if (!file) {
 const thoughtIndices = JSON.parse(fs.readFileSync(file, 'utf8'))
 const { thoughtIndex, lexemeIndex } = thoughtIndices
 
-const rootChildren = getChildrenByContext(thoughtIndex, thoughtIndex.__ROOT__, context)
+const rootChildren = getChildrenByContext(thoughtIndex, thoughtIndex['00000000000000000000000000000000'], context)
 
 // delete all leaves in the root
 rootChildren.forEach(rootChild => {

diff --git a/scripts/getChildren.js b/scripts/getChildren.js
@@ -12,7 +12,7 @@ if (!file) {
 
 const { thoughtIndex, lexemeIndex } = JSON.parse(fs.readFileSync(file, 'utf8'))
 
-const children = getChildrenByContext({ thoughtIndex }, thoughtIndex.__ROOT__, context)
+const children = getChildrenByContext({ thoughtIndex }, thoughtIndex['00000000000000000000000000000000'], context)
 const values = children.map(child => `${child.id} ${child.value} (${Object.keys(child.childrenMap).length})`)
 if (context.length > 0) {
   console.log(context.join('/'))

diff --git a/scripts/repair.js b/scripts/repair.js
@@ -24,7 +24,7 @@ let repair = (maxDepth = 100) => {
   let inconsistentRanks = 0
   let duplicateThoughtContextIds = 0
 
-  const HOME_TOKEN = '__ROOT__'
+  const HOME_TOKEN = '00000000000000000000000000000000'
 
   /** Generate a timestamp of now. */
   const timestamp = () => new Date().toISOString()
@@ -200,7 +200,7 @@ let repair = (maxDepth = 100) => {
   }
 
   // start recursion
-  generateUpdates(['__ROOT__'])
+  generateUpdates(['00000000000000000000000000000000'])
 
   console.info('')
   console.info(`Duplicate child ranks: ${duplicateRanks}`)

diff --git a/scripts/schema8-to-text.js b/scripts/schema8-to-text.js
@@ -17,10 +17,10 @@ if (!path) {
 
 const input = fs.readFileSync(path, 'utf-8')
 const state = JSON.parse(input)
-const root = state.thoughtIndex.__ROOT__
+const root = state.thoughtIndex['00000000000000000000000000000000']
 
 const traverse = (thought, { indent = 0 } = {}) => {
-  const isRoot = thought.id === '__ROOT__'
+  const isRoot = thought.id === '00000000000000000000000000000000'
   if (!isRoot) {
     console.info(`${repeat(' ', indent)}- ${thought.value}`)
   }

diff --git a/scripts/src/repair.ts b/scripts/src/repair.ts
@@ -22,10 +22,10 @@ import normalizeThought from '../lib/normalizeThought.js'
 import migrate from './migrate.js'
 import Database from './types/Database.js'
 
-const ROOT_PARENT_ID = '__ROOT_PARENT_ID__' as ThoughtId
-const ABSOLUTE_TOKEN = '__ABSOLUTE__' as ThoughtId
-const EM_TOKEN = '__EM__' as ThoughtId
-const HOME_TOKEN = '__ROOT__' as ThoughtId
+const ROOT_PARENT_ID = '00000000000000000000000000000001' as ThoughtId
+const ABSOLUTE_TOKEN = '00000000000000000000000000000003' as ThoughtId
+const EM_TOKEN = '00000000000000000000000000000002' as ThoughtId
+const HOME_TOKEN = '00000000000000000000000000000000' as ThoughtId
 const HOME_PATH = [HOME_TOKEN] as Path
 
 let childrenInMultipleThoughts = 0
@@ -145,9 +145,10 @@ const moveThought = (thought: ThoughtDb, parentId: ThoughtId) => {
 
 const moveThoughtToOrphanage = (thought: ThoughtDb) => {
   // create orphanage if it doesn't exist
-  if (!db.thoughtIndex.orphanage) {
-    db.thoughtIndex.orphanage = {
-      id: 'orphanage' as ThoughtId,
+  const ORPHANAGE_ID = '00000000000000000000000000aaaa00' as ThoughtId
+  if (!db.thoughtIndex[ORPHANAGE_ID]) {
+    db.thoughtIndex[ORPHANAGE_ID] = {
+      id: ORPHANAGE_ID,
       value: 'ORPHANAGE',
       rank: Math.random(),
       children: {},
@@ -157,23 +158,23 @@ const moveThoughtToOrphanage = (thought: ThoughtDb) => {
     }
 
     // add orphanage to root children
-    db.thoughtIndex.__ROOT__.children!.orphanage = {
-      ..._.omit(db.thoughtIndex.orphanage, 'children'),
+    db.thoughtIndex[HOME_TOKEN].children![ORPHANAGE_ID] = {
+      ..._.omit(db.thoughtIndex[ORPHANAGE_ID], 'children'),
       childrenMap: {},
     }
 
     // add orphanage Lexeme
     const lexemeKey = hashThought('ORPHANAGE')
     db.lexemeIndex[lexemeKey] = {
-      id: 'orphanage',
-      contexts: { ['orphanage' as ThoughtId]: true },
+      id: ORPHANAGE_ID,
+      contexts: { [ORPHANAGE_ID]: true },
       lemma: 'orphanage',
       created: timestamp(),
       lastUpdated: timestamp(),
     }
   }
 
-  moveThought(thought, 'orphanage' as ThoughtId)
+  moveThought(thought, ORPHANAGE_ID)
 }
 
 console.info('Reading db')