Skip to content

Commit 216adfb

Browse files
authored
Merge pull request #49 from dhawal-ss/integrate/quizzical-maxwell
Merge quizzical-maxwell: voice engine, custom emoji, design refresh, navigation rework
2 parents 67e1883 + 8ae19bc commit 216adfb

429 files changed

Lines changed: 31677 additions & 6779 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ jobs:
160160
working-directory: mesh
161161
run: npm run check:ipc-contract
162162

163+
- name: Check renderer and native agree on command arguments
164+
working-directory: mesh
165+
run: npm run check:ipc-arguments
166+
163167
- name: Check design token source of truth
164168
working-directory: mesh
165169
run: npm run check:design-tokens

.github/workflows/developer-preview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
npm run check:public-services
3838
npm run check:public-site
3939
npm run check:ipc-contract
40+
npm run check:ipc-arguments
4041
npm run check:ipc-types
4142
npm test -- --maxWorkers=4
4243

.github/workflows/release-beta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
-ValidationOnly
168168
fi
169169
pwsh -NoProfile -File ./infra/matrixrtc/test-evidence-validation.ps1
170-
pwsh -NoProfile -File ./scripts/matrixrtc-preflight.ps1
170+
pwsh -NoProfile -File ./scripts/matrixrtc-preflight.ps1 -RequireCompose
171171
node --test ./scripts/check-external-acceptance.test.mjs
172172
node ./scripts/check-external-acceptance.mjs
173173
pwsh -NoProfile -File ./scripts/operator-smoke.ps1 -Milestone R2 -EnvironmentFile ./infra/operator-smoke/r2.env.example

.github/workflows/security-r3-voice.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
shell: pwsh
2727
run: |
2828
./infra/matrixrtc/test-evidence-validation.ps1
29-
./scripts/matrixrtc-preflight.ps1
29+
./scripts/matrixrtc-preflight.ps1 -RequireCompose
3030
./scripts/operator-smoke.ps1 -Milestone R3
3131
3232
container-supply-chain-r3:

.github/workflows/security.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,11 @@ jobs:
7676
with:
7777
fetch-depth: 0
7878
- uses: dtolnay/rust-toolchain@d0befba8b9ddf874327619e84c39b094edd58b66 # 1.93.0
79-
- name: Install pinned Rust advisory scanner
79+
- name: Install pinned Rust security and policy tools
8080
run: |
8181
cargo install cargo-audit --version 0.22.2 --locked
82+
cargo install cargo-deny --version 0.20.2 --locked
83+
cargo install cargo-geiger --version 0.13.0 --locked
8284
- name: Report raw Rust advisory status without suppressing legacy findings
8385
continue-on-error: true
8486
run: |
@@ -89,11 +91,39 @@ jobs:
8991
run: |
9092
./scripts/check-matrix-release-dependencies.ps1 `
9193
-ReportPath release/rust-dependency-report.json
92-
- name: Upload Rust dependency policy evidence
94+
- name: Enforce Matrix voice license and source policy
95+
working-directory: mesh/src-tauri
96+
run: cargo deny --locked check licenses sources
97+
- name: Record Matrix voice unsafe-code inventory
98+
working-directory: mesh/src-tauri
99+
# cargo-geiger 0.13.0 (the latest release; 0.12.0 reproduces identically)
100+
# bundles cargo 0.86.0 as a library, whose internal clean/download-batching
101+
# panics on this project's matrix-voice dependency graph:
102+
# "assertion failed: self.pending_ids.insert(id)" in
103+
# cargo::core::package::Downloads::start, called from cargo_geiger's own
104+
# pre-scan cargo_clean::clean step. Confirmed independent of this repo's
105+
# code: cargo check/build/test for matrix-voice all pass clean, and the
106+
# crash reproduces locally with no CI-specific factors involved. No newer
107+
# cargo-geiger exists to fix it. continue-on-error so this known upstream
108+
# tool bug doesn't block merges; every other step in this job (secret
109+
# scanning, SBOM, license/source policy, other feature scans) still
110+
# blocks normally. Matches the existing continue-on-error precedent on
111+
# the cargo audit step above.
112+
continue-on-error: true
113+
run: >-
114+
cargo geiger
115+
--no-default-features
116+
--features matrix-voice
117+
--locked
118+
--output-format Json
119+
> ../release/cargo-geiger-matrix-voice.json
120+
- name: Upload Rust dependency and unsafe-code evidence
93121
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
94122
with:
95123
name: rust-dependency-policy-${{ github.sha }}
96-
path: mesh/release/rust-dependency-report.json
124+
path: |
125+
mesh/release/rust-dependency-report.json
126+
mesh/release/cargo-geiger-matrix-voice.json
97127
if-no-files-found: error
98128
retention-days: 30
99129
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0

SECURITY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,12 @@ draft prerelease. Public promotion is a separate owner-controlled decision and
3535
requires signed Windows artifacts, checksums, SBOMs, provenance, legal approval,
3636
updater/rollback review, and public download verification. Passing local or
3737
disposable CI tests is not production acceptance.
38+
39+
## Desktop content policy
40+
41+
Release windows enable Tauri content protection and both desktop policies deny
42+
objects, document base URLs, form submissions, and framing. The remaining
43+
`style-src 'unsafe-inline'` exception is intentional for the current React and
44+
Tauri renderer: removing it requires replacing runtime inline style values and
45+
visually revalidating every supported state. It permits CSS declarations, not
46+
scripts, and must not be broadened to `script-src`.

0 commit comments

Comments
 (0)