feat: v0.10.4 — collaborative editing protocol + CRDT sync hardening

.githooks/pre-commit

@@ -17,5 +17,12 @@ if ! cargo clippy --workspace --all-targets --exclude mae-gui --exclude mae-test
     exit 1
 fi
 
+# 3. Code-map freshness check
+echo "Checking code-map freshness..."
+if ! make code-map-check 2>/dev/null; then
+    echo "❌ Code-map is stale. Run 'make code-map' to regenerate."
+    exit 1
+fi
+
 echo "✅ Pre-commit checks passed."
 exit 0

.github/workflows/badges.yml

@@ -16,10 +16,13 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
 
+      - name: Install GUI dependencies
+        run: sudo apt-get update && sudo apt-get install -y clang libfontconfig1-dev libfreetype6-dev
+
       - name: Count tests
         id: tests
         run: |
-          OUTPUT=$(cargo test --workspace --exclude mae-gui --exclude mae-test-fixtures 2>&1)
+          OUTPUT=$(cargo test --workspace --exclude mae-test-fixtures 2>&1)
           TOTAL=$(echo "$OUTPUT" | grep -oP '\d+ passed' | awk '{s+=$1} END {print s}')
           FORMATTED=$(printf "%'d" "$TOTAL")
           echo "count=$FORMATTED" >> $GITHUB_OUTPUT

.github/workflows/ci.yml

@@ -30,21 +30,23 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           components: clippy, rustfmt
 
+      - name: Install GUI dependencies
+        if: matrix.step != 'fmt'
+        run: sudo apt-get update && sudo apt-get install -y clang libfontconfig1-dev libfreetype6-dev
+
       - uses: Swatinem/rust-cache@v2
 
       - name: cargo check
         if: matrix.step == 'check'
-        run: cargo check --workspace --all-targets --exclude mae-gui --exclude mae-test-fixtures
-
+        run: cargo check --workspace --all-targets
       - name: cargo test
         if: matrix.step == 'test'
         run: |
-          cargo test --workspace --exclude mae-gui --exclude mae-test-fixtures
-          cargo test --doc --workspace --exclude mae-gui --exclude mae-test-fixtures
-
+          cargo test --workspace
+          cargo test --doc --workspace
       - name: cargo clippy
         if: matrix.step == 'clippy'
-        run: cargo clippy --workspace --all-targets --exclude mae-gui --exclude mae-test-fixtures -- -D warnings
+        run: cargo clippy --workspace --all-targets -- -D warnings
 
       - name: cargo fmt
         if: matrix.step == 'fmt'
@@ -57,21 +59,38 @@ jobs:
       - uses: actions/checkout@v6
       - uses: EmbarkStudios/cargo-deny-action@v2
 
-  # E2E smoke test: build TUI binary and validate init.scm loads without errors.
-  e2e:
-    name: e2e / check-config
+  server-client:
+    name: Server-Client Integration
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
-      - name: Build TUI binary
-        run: cargo build --release --workspace --exclude mae-gui --exclude mae-test-fixtures
-      - name: Validate init.scm
-        run: ./target/release/mae --check-config
-
-  gui-build:
-    name: gui / build
+      - name: Multi-client integration tests
+        run: cargo test --package mae-mcp --lib -- --test-threads=1
+        timeout-minutes: 5
+      - name: KB WAL integration tests
+        run: cargo test --package mae-kb --lib -- wal changelog sync --test-threads=1
+        timeout-minutes: 3
+      - name: File safety tests
+        run: cargo test --package mae-core --lib -- content_hash file_lock --test-threads=1
+        timeout-minutes: 3
+      - name: State server tests
+        run: cargo test --package mae-state-server -- --test-threads=1 --nocapture
+        timeout-minutes: 5
+        env:
+          RUST_LOG: "mae_state_server=debug,mae_sync=debug,warn"
+      - name: Collab bridge integration tests
+        run: cargo test --package mae --test collab_bridge_integration -- --test-threads=1 --nocapture
+        timeout-minutes: 5
+        env:
+          RUST_LOG: "mae_state_server=debug,mae_sync=debug,warn"
+      - name: State server check-config
+        run: cargo run --package mae-state-server -- --check-config
+        timeout-minutes: 1
+
+  gui:
+    name: gui / release binary
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -82,46 +101,62 @@ jobs:
       - name: Build GUI binary
         run: cargo build --release --features gui --package mae
 
-  container-smoke:
-    name: container / smoke
+  containers:
+    name: container / smoke + new-user
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - name: Build and smoke-test container
         run: docker compose run --rm --build smoke
-
-  container-new-user:
-    name: container / new-user
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
       - name: Validate new-user flow in clean container
         run: docker compose run --rm --build new-user
 
-  e2e-package-install:
-    name: e2e / package install
+  # Consolidated E2E: check-config + package install + Scheme tests
+  # Single binary build, sequential validation steps.
+  e2e:
+    name: e2e / scheme + packages
     runs-on: ubuntu-latest
-    needs: check
+    needs: [check]
     steps:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
+      - name: Install GUI dependencies
+        run: sudo apt-get update && sudo apt-get install -y clang libfontconfig1-dev libfreetype6-dev
       - uses: Swatinem/rust-cache@v2
-      - name: Build TUI binary
-        run: cargo build --release --workspace --exclude mae-gui --exclude mae-test-fixtures
-      - name: Declare test package in init.scm
+      - name: Build binary
+        run: cargo build --release --workspace
+      - name: Create Steel home directory
+        run: mkdir -p ~/.local/share/steel
+      - name: Validate init.scm
+        run: ./target/release/mae --check-config
+      - name: Editor tests
+        run: ./target/release/mae --test tests/editor/
+      - name: CRDT tests
+        run: ./target/release/mae --test tests/crdt/
+      - name: Package install
         run: |
           mkdir -p ~/.config/mae
           cat > ~/.config/mae/init.scm <<'SCHEME'
           (package! "splash-themes" :source "github:cuttlefisch/mae-splash-themes")
           SCHEME
-      - name: Run mae sync
-        run: ./target/release/mae sync
-      - name: Verify package installed
-        run: test -f ~/.config/mae/packages/splash-themes/module.toml
-      - name: Validate config loads
-        run: ./target/release/mae --check-config
-      - name: Verify lockfile
-        run: test -f ~/.config/mae/packages.lock
+          ./target/release/mae sync
+          test -f ~/.config/mae/packages/splash-themes/module.toml
+          ./target/release/mae --check-config
+          test -f ~/.config/mae/packages.lock
+
+  collab-e2e:
+    name: collab / docker e2e
+    # DISABLED: Docker E2E requires Scheme async/yield for reliable cross-container
+    # coordination. Protocol correctness is covered by collab_e2e.rs (28 tests),
+    # CRDT Scheme tests (142), and collab-local Scheme tests (85).
+    # Re-enable after Phase 13 Scheme runtime.
+    if: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Run collab E2E
+        run: make docker-collab-test
+        timeout-minutes: 15
 
   code-map:
     name: code-map freshness

.github/workflows/release.yml

@@ -29,18 +29,23 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build static binary
-        run: cargo build --release --target x86_64-unknown-linux-musl --package mae
+        run: |
+          cargo build --release --target x86_64-unknown-linux-musl --package mae
+          cargo build --release --target x86_64-unknown-linux-musl --package mae-state-server
 
       - name: Prepare artifact
         run: |
           mkdir -p dist
           cp target/x86_64-unknown-linux-musl/release/mae dist/mae-linux-x86_64
-          chmod +x dist/mae-linux-x86_64
+          cp target/x86_64-unknown-linux-musl/release/mae-state-server dist/mae-state-server-linux-x86_64
+          chmod +x dist/mae-linux-x86_64 dist/mae-state-server-linux-x86_64
 
       - uses: actions/upload-artifact@v7
         with:
           name: mae-linux-x86_64
-          path: dist/mae-linux-x86_64
+          path: |
+            dist/mae-linux-x86_64
+            dist/mae-state-server-linux-x86_64
 
   build-linux-gui:
     name: Build linux-x86_64-gui
@@ -121,6 +126,7 @@ jobs:
           body_path: CHANGELOG-release.md
           files: |
             dist/mae-linux-x86_64
+            dist/mae-state-server-linux-x86_64
             dist/mae-linux-x86_64-gui
             dist/mae-macos-aarch64
           fail_on_unmatched_files: true

.gitignore

@@ -16,6 +16,9 @@ README.org
 .mae/
 **/.mae/
 
+# MAE advisory file locks (multi-editor contention)
+*.mae.lock
+
 # Test artifacts
 test_sandbox/
 

ARCHITECTURE.md

@@ -64,14 +64,14 @@ It replaces scattered `match buf.kind` blocks with polymorphic dispatch:
 `BufferView` (`buffer_view.rs`) stores mode-specific state on `Buffer`:
 
 - `Conversation(Box<Conversation>)`
-- `Help(Box<HelpView>)`
+- `Kb(Box<KbView>)`
 - `Debug(Box<DebugView>)`
 - `GitStatus(Box<GitStatusView>)`
 - `Visual(Box<VisualBuffer>)`
 - `FileTree(Box<FileTree>)`
 - `None`
 
-Accessor methods: `buf.conversation()`, `buf.help_view()`, `buf.git_status_view()`, etc.
+Accessor methods: `buf.conversation()`, `buf.kb_view()`, `buf.git_status_view()`, etc.
 Replaces 6 `Option<T>` fields that were always mutually exclusive.
 
 ## Keymap Inheritance