From a87c2154ff5b7b34d435115ea6f251673b081d15 Mon Sep 17 00:00:00 2001 From: cflmy Date: Fri, 6 Nov 2026 15:09:34 +0800 Subject: [PATCH] release: v2.4.0 oracle journal language values Expose foreign.oracle_journal/replay_check as values, bump CLI/ext/wasm to 2.4.0, and fix notebook OnceLock wait for MSRV 1.81 so EK can compile. Co-authored-by: Cursor --- .cursor/skills/marqdo/SKILL.md | 2 +- .github/workflows/release.yml | 3 +++ CHANGELOG.md | 23 +++++++++++++++++++++++ Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 9 +++++---- crates/marqdo-wasm/Cargo.toml | 2 +- debian/changelog | 7 +++++++ ext/VERSION | 2 +- src/view/notebook_api.rs | 8 +++++++- 10 files changed, 51 insertions(+), 11 deletions(-) diff --git a/.cursor/skills/marqdo/SKILL.md b/.cursor/skills/marqdo/SKILL.md index 6a46738..cf7a4bd 100644 --- a/.cursor/skills/marqdo/SKILL.md +++ b/.cursor/skills/marqdo/SKILL.md @@ -221,7 +221,7 @@ Design: [ext-quantum.md](../../doc/design/ext-quantum.md) · Q7: [ext-quantum-q7 - `invoke` returns a record (`ok`, `code`, `stdout`, `stderr`, `ms`, `timed_out`, `truncated`, `result`); pass `input` for JSON stdin and `output="json"` for a parsed result. - `call` is JSON-in / JSON-out; `call_many` fans out one program over a list with ordered results. -- `session_open` returns an opaque `handle` (not text; not JSON-serializable). `session_eval` / `set` / `get` borrow the handle; `session_close` consumes it (double-close / use-after-close fault). Prefer `replay_check` against the oracle journal when comparing recordings (`replay_snapshot` only re-runs). JSON integers outside \(\pm(2^{53}-1)\) and ragged table columns are refused (`doc/design/v-safe-json.md`, `foreign-strong-correspondence.md`). +- `session_open` returns an opaque `handle` (not text; not JSON-serializable). `session_eval` / `set` / `get` borrow the handle; `session_close` consumes it (double-close / use-after-close fault). Prefer `foreign.replay_check` / language-level `foreign.oracle_journal` when comparing recordings (`replay_snapshot` only re-runs). JSON integers outside \(\pm(2^{53}-1)\) and ragged table columns are refused (`doc/design/v-safe-json.md`, `foreign-strong-correspondence.md`, `oracle-journal-values.md`). - A view document opts into kernel state with `会话 = > foreign.session kernels=... cells=...`; the table names are free. `view` consumes only the `会话` handle and never scans source lines or reserved table names. Without `会话`, cells are stateless one-shot runs; no kernel is created. Clearing outputs calls `/api/session/clear` and keeps persistent kernel state. There is no separate notebook CLI mode or command, and no new Markdown marker exists. - The same source remains the authority; state crossing kernels is explicit, never implicitly mirrored. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b734a64..3f49619 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,9 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights + - **v2.4.0**:Oracle journal 作语言值——`foreign.oracle_journal`/`replay_check`;bytecode/frontend 硬化;MSRV 1.81 + - **v2.4.0**: Oracle journal as language values — foreign.oracle_journal/replay_check; bytecode/frontend hardening; MSRV 1.81 + - **v2.4.0 ext**:扩展包同步 2.4.0 / Ext pack 2.4.0 - **v2.3.0**:Foreign Strong——不透明 `handle`、仿射 close、`replay_check`/oracle journal、表 arity refuse、Ω∈V_safe - **v2.3.0**: Foreign Strong — opaque handle, affine close, replay_check/oracle journal, table arity refuse, Ω∈V_safe - **v2.3.0 ext**:扩展包同步 2.3.0 / Ext pack 2.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index c5566d1..b1e802a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,29 @@ ### Changed +## v2.4.0 — 2026-11-06 + +### Highlights + +**Oracle journal 作语言值**:`foreign.oracle_journal` / `foreign.replay_check` 把观测与纯比较暴露为普通 Marqdo 值(非仅 notebook API);handle/code 不得入 journal;`copy` 拒绝 code。Bytecode / frontend / foreign session 模块化与 applications 金样例;`verification/replay-policy` Lean 策略身份。CLI · wasm · ext **2.4.0**。 + +**核心表面 Δ(Core surface Δ)**:**无增删**(仍 19 个构造)——变更在 `lib/foreign` 宿主表面与实现结构,不增 Markdown 标记。 + +### Added + +- **`foreign.oracle_journal` / `foreign.replay_check`**:文档级观测列表与纯 journal 比较(`doc/design/oracle-journal-values.md`)。 +- **回归**:`foreign-oracle-{journal,names,failure}`、`foreign-{,session-}copy-code-refuse`、`tests/oracle_journal.rs`、applications 四场景、`verification/replay-policy`。 +- **文档**:`oracle-journal-values.md`;frontend-call / foreign-library 方向笔记。 + +### Fixed + +- **view notebook API**:`OnceLock` 初始化等待兼容 MSRV **1.81**(不再调用 ≥1.84 的 `wait`)。 +- JSON `float_roundtrip` 特征,减少外联浮点往返失真。 + +### Changed + +- Bytecode compile/VM、foreign_doc/session、sema resolution、notebook interrupt 路径拆模块(行为对齐既有 Strong 契约)。 + ## v2.3.0 — 2026-11-01 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index c97a904..e56fb75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "2.3.0" +version = "2.4.0" dependencies = [ "anyhow", "assert_cmd", @@ -611,7 +611,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "2.3.0" +version = "2.4.0" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index ceb68e7..c94fd80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "2.3.0" +version = "2.4.0" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index cccb701..c63a7a1 100644 --- a/README.md +++ b/README.md @@ -284,8 +284,9 @@ marqdo catalog public -o .marqdo --- -## 现状(v2.3.0) +## 现状(v2.4.0) +- **Oracle journal 语言值(v2.4.0)**:`foreign.oracle_journal` / `foreign.replay_check` 作普通值;handle/code 拒入 journal;bytecode/frontend 硬化;扩展包同步 **2.4.0** - **Foreign Strong(v2.3.0)**:会话 `handle`(不可过桥)· 仿射 close · `replay_check`/oracle journal · 表 arity refuse · Ω∈\(V_{\mathsf{safe}}\)。扩展包同步 **2.3.0** - **\(V_{\mathsf{safe}}\) JSON 整数(v2.2.2)**:外联与 `lib/json` 拒绝 `|n| > 2^{53}-1` 的 JSON 整数(对齐 Lean ForeignJSON);宽整数用十进制字符串 + Node `BigInt`。 - **view 大纲侧栏(v2.2.1)**:修复 occlusion 文档与中等宽度下 Functions / Variables 掉到正文下方的问题;静态 `view output` 同源。 @@ -332,7 +333,7 @@ marqdo catalog public -o .marqdo - **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md)) - 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md) -### 如何使用最新 Marqdo(v2.3.0) +### 如何使用最新 Marqdo(v2.4.0) **安装解释器(任选其一)** @@ -347,7 +348,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v2.3.0 # 或留在 main +git checkout v2.4.0 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -388,7 +389,7 @@ marqdo wasm build # → dist/wasm/ … 见 examples/browser-hello/ # 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip -# https://github.com/cflmy/marqdo/releases/tag/v2.3.0 +# https://github.com/cflmy/marqdo/releases/tag/v2.4.0 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index 6355304..6ebe5d7 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "2.3.0" +version = "2.4.0" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 50944d5..abbf0d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +marqdo (2.4.0-1ppa1) noble; urgency=medium + + * Marqdo 2.4.0: oracle journal as language values (foreign.oracle_journal / + replay_check), bytecode/frontend hardening, MSRV 1.81 OnceLock wait fix. + + -- Marqdo Maintainers Fri, 06 Nov 2026 15:15:00 +0800 + marqdo (2.3.0-1ppa1) noble; urgency=medium * Marqdo 2.3.0: Strong foreign session — opaque Handle, affine close, diff --git a/ext/VERSION b/ext/VERSION index 276cbf9..197c4d5 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -2.3.0 +2.4.0 diff --git a/src/view/notebook_api.rs b/src/view/notebook_api.rs index 4151c01..f4c0982 100644 --- a/src/view/notebook_api.rs +++ b/src/view/notebook_api.rs @@ -19,7 +19,13 @@ struct ApiSession { } impl ApiSession { fn mutex(&self) -> Result<&Mutex, String> { - self.document.wait().as_ref().map_err(Clone::clone) + // `OnceLock::wait` needs Rust ≥1.84; MSRV is 1.81 — poll until init. + loop { + match self.document.get() { + Some(slot) => return slot.as_ref().map_err(Clone::clone), + None => std::thread::yield_now(), + } + } } fn lock(&self) -> Result, String> { let guard = self.mutex()?.lock().map_err(|_| "session lock poisoned".to_string())?;