From b8a4ddd38f2c51328779acc9b1a9b89b796b423a Mon Sep 17 00:00:00 2001 From: cflmy Date: Fri, 23 Oct 2026 23:40:35 +0800 Subject: [PATCH] release: bump to 2.1.1 (executable-knowledge spine) Ship BoundCall/NarrativeRef/generation CURRENT notes with Cargo, ext pack, README, debian, and release Highlights. Co-authored-by: Cursor --- .cursor/skills/marqdo/SKILL.md | 2 +- .github/workflows/release.yml | 6 +++--- CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++ Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 11 +++++----- crates/marqdo-wasm/Cargo.toml | 2 +- debian/changelog | 7 +++++++ ext/VERSION | 2 +- 9 files changed, 60 insertions(+), 14 deletions(-) diff --git a/.cursor/skills/marqdo/SKILL.md b/.cursor/skills/marqdo/SKILL.md index 1b098b7..ad2def4 100644 --- a/.cursor/skills/marqdo/SKILL.md +++ b/.cursor/skills/marqdo/SKILL.md @@ -63,7 +63,7 @@ Canonical design (repo): `doc/design/markdown-mapping.md`, `doc/design/keywords. Entry: load file (often `index.mq.md`) → collect defs → run `# main`. -## Occlusion syntax (v2.1.0) +## Occlusion syntax (v2.1.0+) · Executable knowledge (v2.1.1) Occlusion is the default syntax. Shipped source declares `markup: occlusion` (or `标记: 遮蔽`) explicitly so imports stay deterministic. Legacy `[key](collection)` requires `markup: classic` or the one-cycle CLI flag `--legacy-markup`; `MARQDO_MARKUP` does not change parsing. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d1ca25..c897d6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,9 +126,9 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights - - **v2.1.0**:文件级 Occlusion 默认语义——全仓迁移 · `migrate labels --mark` · `access` / `遍历` · 可执行知识语义投影 - - **v2.1.0**: File-scoped Occlusion by default — corpus migration, `migrate labels --mark`, `access` / `for`, executable-knowledge projections - - **v2.1.0 ext**:扩展包同步 2.1.0 / Ext pack 2.1.0 + - **v2.1.1**:可执行知识主链——BoundCall · NarrativeRef · 来源/适用期 · patch/extract · 整代 CURRENT + closure · 发票示例 113 + - **v2.1.1**: Executable-knowledge spine — BoundCall, NarrativeRef, sources, patch/extract, generation CURRENT + closure, invoice example 113 + - **v2.1.1 ext**:扩展包同步 2.1.1 / Ext pack 2.1.1 - **v1.5.2**:外联 v3 P0/P1——raw stdin + 每 cell 输入 · plan API · snapshot · `view capture` · Persist - **v1.5.2**: Foreign v3 P0/P1 — raw stdin + per-cell inputs, plan API, snapshot export/import/replay, `view capture`, Persist - **v1.5.2 ext**:扩展包同步 1.5.2 / Ext pack 1.5.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 45796f7..02b76e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,44 @@ marqdo ext add web ## Unreleased +### Added + +### Fixed + +### Changed + +## v2.1.1 — 2026-10-23 + +### Highlights + +**可执行知识主链落地(S0–S6)**:BoundCall 双后端共享解析、正文 NarrativeRef、来源/适用期、digest 保护补丁与纯表达式提取、整代 `CURRENT` 投影与闭包摘要;订单发票示例双后端输出 `113`;离线门禁含 100 单元语料与 CLI 冒烟。 + +```bash +git checkout v2.1.1 && cargo build --release +marqdo ext add web +marqdo run examples/executable-knowledge/docs/invoice-answer.mq.md +``` + +**核心表面 Δ**:**无增删关键词**——同模块 `Type.member` 纳入 BoundCall;语义投影新增 `bound_calls` / `dynamic_calls` / `hashes.closure` / NarrativeRef 步骤;不改变默认 Occlusion 链接读法。 + +### Added + +- **BoundCall / DynamicCall**:`sema::bind::resolve_for_exec`;Tree 与 Bytecode 静态路径对齐;`bound_calls.json` / `dynamic_calls.json`;同模块定义树路径绑定。 +- **NarrativeRef**:注释行 Markdown 链接 → `narrate` / `navigation` 步骤;围栏与行内代码不计步骤。 +- **来源与适用性**:frontmatter `sources` / `valid_until` → `evidence=sourced|expired|missing_source`;`artifact.bind policy=business`。 +- **局部编辑与提取**:MLSP `artifact.patch`(digest + wording 回滚);`artifact.extract_pure` 纯表达式预览。 +- **整代与闭包**:`generations//` + `CURRENT`;`hashes.closure` 随依赖变化;锁报告 `classes`。 +- **门禁**:`tests/executable_knowledge`(含 100 单元);CI `.github/workflows/executable-knowledge.yml`;项目扫描 depth/size/count 上限。 +- **示例**:`examples/executable-knowledge` 发票含税链可运行;负知识文档。 + +### Fixed + +- Bytecode 裸名解析不再跨 import scope 误连同名函数;同模块 `Type.member` 写入 path_index 供兄弟调用。 + +### Changed + +- Agent / reuse 发现结果标记 `discovery_only` + `bind_required` / `bind_targets`,不可把打分结果直接当可执行目标。 + ## v1.5.2 — 2026-10-18 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index d3164fe..5aef90f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "2.1.0" +version = "2.1.1" dependencies = [ "anyhow", "assert_cmd", @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "2.1.0" +version = "2.1.1" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 4139e34..ff59bc2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "2.1.0" +version = "2.1.1" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index b70c522..c43fbf0 100644 --- a/README.md +++ b/README.md @@ -281,9 +281,10 @@ marqdo catalog public -o .marqdo --- -## 现状(v2.1.0) +## 现状(v2.1.1) -- **链接语法(v2.1.0)**:`[描述](目标)` 描述不执行 · `()` 与 `**代码**` 同权(`加(1)` / `加一 号(31)`)· `access` 取元与 `遍历` 链接循环 · `marqdo labels` 两级检索 / `--baseline` 债务棘轮 · `migrate labels --mark` · 诊断 `label.*` · view 描述正文 + 代码片 + 桩徽章 · **可执行知识 [link-syntax.md](doc/design/link-syntax.md)**(项目索引、LinkInfo、链接图与 lock) · 扩展包同步 **2.1.0** +- **可执行知识主链(v2.1.1)**:BoundCall 双后端 · NarrativeRef · 来源/适用期 · `artifact.patch` / `extract_pure` · 整代 `CURRENT` + closure · 发票示例 `113` · 门禁 `tests/executable_knowledge`(含 100 单元)· 扩展包同步 **2.1.1** +- **链接语法(v2.1.0)**:`[描述](目标)` 描述不执行 · `()` 与 `**代码**` 同权(`加(1)` / `加一 号(31)`)· `access` 取元与 `遍历` 链接循环 · `marqdo labels` 两级检索 / `--baseline` 债务棘轮 · `migrate labels --mark` · 诊断 `label.*` · view 描述正文 + 代码片 + 桩徽章 · **可执行知识 [link-syntax.md](doc/design/link-syntax.md)**(项目索引、LinkInfo、链接图与 lock) - **外联 v3 P0/P1(v1.5.2)**:raw stdin + 每 cell 独立输入 · plan API · snapshot export/import/replay · `view capture` · Persist 按钮 · 扩展包同步 **1.5.2** - **view 静态/动态统一 + 外联值传递(v1.5.1)**:静态导出与 live view 共用 `foreign_doc` 执行路径 · 构建时运行注入 stdout · `foreign.session` 值传递 · cell stdin;扩展包同步 **1.5.0** - **裸自增升参(v1.4.6)**:首次粗体赋值左值即声明;`**n = n + 1**` 无反引号也升为必选形参。扩展包仍为 **1.4.5** @@ -319,7 +320,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.1.0) +### 如何使用最新 Marqdo(v2.1.1) **安装解释器(任选其一)** @@ -334,7 +335,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v2.1.0 # 或留在 main +git checkout v2.1.1 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -373,7 +374,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.1.0 +# https://github.com/cflmy/marqdo/releases/tag/v2.1.1 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index f9e84bb..ccdca74 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "2.1.0" +version = "2.1.1" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 1685bbf..c43e3a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +marqdo (2.1.1-1ppa1) noble; urgency=medium + + * Marqdo 2.1.1: executable-knowledge spine (BoundCall, NarrativeRef, + sources/applicability, generation CURRENT + closure digests). + + -- cflmy Fri, 23 Oct 2026 15:40:00 +0000 + marqdo (2.1.0-1ppa1) noble; urgency=medium * Marqdo 2.1.0: file-scoped Occlusion is the default syntax; migrated diff --git a/ext/VERSION b/ext/VERSION index 7ec1d6d..3e3c2f1 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -2.1.0 +2.1.1