diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f33d1b2..894570c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,8 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights + - **v1.3.3**:view 文档面 Structure——叙述保真 · 标记面 · 调用/循环帧 · `#mq-view-trace` · 静态站同源 + - **v1.3.3**: Browse document-surface Structure — narration, markers, call/loop frames, `#mq-view-trace`, static site parity - **v1.3.0**:Engineering Knowledge Compiler——L0–L4 · `reuse`/`find`/`duplicate` · Agent preflight(REUSE→ADAPT→CREATE) - **v1.3.0**: Engineering Knowledge Compiler — L0–L4 catalog, reuse/find/duplicate, Agent preflight (REUSE→ADAPT→CREATE) - **v1.2.0**:Web Artifact(ADR 0007)——Document/Endpoint · `web.serve`/`render`/`inspect` · `ext/data|security|net` · 移除 `compose_*`/`configure` diff --git a/CHANGELOG.md b/CHANGELOG.md index 13b547d..889c5ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,34 @@ ### Changed +## v1.3.3 — 2026-10-15 + +### Highlights + +**view 文档面 Structure**:Browse 保真叙述与标记面(变量/语句/返回无源码定界符);表/循环/分支结构块;语句后绑定值、分支命中臂、函数多调用与循环迭代下拉(默认末帧);`#mq-view-trace` AI JSON。静态 `marqdo view output` 与 live view **同源渲染**(含用户站 `public/` → gh-pages)。 + +```bash +git checkout v1.3.3 && cargo build --release +marqdo view tests/view/document-annot-demo.mq.md --no-open +marqdo view output public -o public +# Ubuntu: sudo apt update && sudo apt install marqdo +marqdo ext add web # CDN latest → 1.3.3 +``` + +**核心表面 Δ(Core surface Δ)**:**无增删**——19 个核心构造不变。本版为 **Runtime / Tooling**(view 文档面 + 帧选择),不触碰语言标记。 + +### Added +- **Browse Structure 文档面**(`src/view/document.rs` · `annot.rs`):叙述保真、标记面、GFM 表 / `doc-loop` / `doc-branch`、CSS L-leader 标注带。 +- **StmtEvent / CallFrame / LoopFrame** 静默轨迹:post-stmt 绑定、分支 `call_id`、循环 `分 = 分数表[i] · value`;调用/迭代 picker(源码常显,只滤 chip)。 +- **`ViewExecutionReport`** JSON(`#mq-view-trace` · `/api/view-trace` · SSE `trace_json`)。 +- 设计:[view-document-annotations.md](doc/design/view-document-annotations.md) · [view-execution-trace.md](doc/design/view-execution-trace.md) · [view-frame-selection.md](doc/design/view-frame-selection.md);样例 `tests/view/document-annot-demo.mq.md`。 + +### Fixed +- 多调用分支 taken 混叠;调用切换误藏未执行臂源码;循环头重复 chip。 + +### Changed +- CLI / wasm / `ext/VERSION` **同步 1.3.3**;静态导出与 live view 共用 `build_file_view` → 文档面。 + ## Ext pack v1.3.2 — 2026-10-13 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index 62c8a5a..4cb3f8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "1.3.0" +version = "1.3.3" dependencies = [ "anyhow", "assert_cmd", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "1.3.0" +version = "1.3.3" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 3f22b83..139ea02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "1.3.0" +version = "1.3.3" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index bd9fdd4..48e330d 100644 --- a/README.md +++ b/README.md @@ -149,15 +149,16 @@ marqdo catalog public -o .marqdo --- -## 现状(v1.3.0) +## 现状(v1.3.3) +- **view 文档面(v1.3.3)**:Browse Structure 叙述保真 · 标记面 · 分支/循环帧下拉 · AI `#mq-view-trace` · 静态 `view output` / gh-pages 同源 · [view-document-annotations.md](doc/design/view-document-annotations.md) - **Engineering Knowledge(v1.3.0)**:EKC L0–L4 · `marqdo knowledge|find|reuse|duplicate|verify|…` · Agent `preflight` / REUSE→ADAPT→CREATE · [engineering-knowledge.md](doc/design/engineering-knowledge.md) - **Web Artifact(v1.2.0 · ADR 0007)**:Document/Endpoint 一等公民(`type: web|endpoint`)· facade `page`/`route`/`serve`/`render`/`inspect`/`use` · Resource 拆到 `ext/data`/`security`/`net` · 统一 View 表 · 破坏性移除 `compose_*`/`configure` - **AI 栈(v1.1.1)**:`ext/ai/llm` 语义 `ask`/`stream`/`collect` · Artifact Metadata Binding(`${env|arg|sys|secret}`)· Agent Skill Compilation + Adaptive Routing · MCP stdio 客户端 + resume 检查点 · 可选 `plugins/llm` Transport ABI - **AI 原生闭环(v1.1.0)**:核心表面守卫(19 构造,单边改动 CI 必红)· **渐进式契约**(文档内嵌 `参数`/`返回`/`字段` 表 + 四边界校验 + `marqdo check` 防漂移)· **MLSP for AI**(`marqdo mlsp`:`locate`/`syntax`/`validate`/`repair_targets`/`repair_apply`/`schema`,AI 按需查语法而非背诵)· **结构化诊断**(`run --json`,错误即数据);验证见 [perf-validation-report-2026-09-23.md](doc/roadmap/perf-validation-report-2026-09-23.md) - 映射与解释器:**v0.3 语法宪法**(`**` 代码 / `*` 返回 / 叙述声明);Phase I 树遍历 + 字节码后端;金样例在 `tests/` 与 `tests/markup-v03/` - **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md) -- **`marqdo view`**:文档浏览器(Structure + 函数大纲/搜索 + Execution + Variables 浮窗) +- **`marqdo view`**:文档浏览器(**文档面** Structure + 标注 / 调用·循环帧 + 函数大纲/搜索 + Execution + Variables 浮窗;`view output` 同构) - **`marqdo debug`**:独立调试页(断点 / 单步 / locals;默认端口 7430;页面 favicon / 品牌使用官方 Logo) - **`marqdo catalog` / `sync`**:OKF 风格 YAML + 模块概念页(默认挂钩 EKC) - **`marqdo knowledge` / `find` / `reuse` / `impact` / `conflicts` / `stale` / `duplicate` / `verify`**:Engineering Knowledge Compiler([engineering-knowledge.md](doc/design/engineering-knowledge.md)) @@ -176,7 +177,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(v1.3.0) +### 如何使用最新 Marqdo(v1.3.3) **安装解释器(任选其一)** @@ -191,7 +192,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v1.3.0 # 或留在 main +git checkout v1.3.3 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -230,7 +231,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/v1.3.0 +# https://github.com/cflmy/marqdo/releases/tag/v1.3.3 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index 935aa1d..34df868 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "1.3.0" +version = "1.3.3" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 3beb885..6a3764f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +marqdo (1.3.3-1ppa1) noble; urgency=medium + + * Marqdo 1.3.3: Browse document-surface Structure — narration-preserving + markers, branch/loop frame pickers, ViewExecutionReport JSON; static + view output / gh-pages share the same render path as live view. + + -- cflmy Wed, 15 Oct 2026 13:20:00 +0800 + marqdo (1.3.0-1ppa1) noble; urgency=medium * Marqdo 1.3.0: Engineering Knowledge Compiler (EKC) — L0–L4 catalog, diff --git a/ext/VERSION b/ext/VERSION index 1892b92..31e5c84 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -1.3.2 +1.3.3 diff --git a/public/features/03-view-and-docs.mq.md b/public/features/03-view-and-docs.mq.md index ba6e46f..0e19f4d 100644 --- a/public/features/03-view-and-docs.mq.md +++ b/public/features/03-view-and-docs.mq.md @@ -5,12 +5,14 @@ description: Local browse and static export from the interpreter # main -Milestone: `marqdo view` and `view output`. +Milestone: `marqdo view` and `view output` (v1.3.3 document surface). Local: `marqdo view public` Static export: `marqdo view output public -o public` -Executable user docs live under `public/`. Generated HTML (`index.html` / `pages/`) is for hosting; CI publishes to `gh-pages`. +Browse Structure keeps narration, highlights executable markers, and attaches +run results (values, taken branch arms, call/loop frames). The same render path +builds this user docs site; CI publishes to `gh-pages`. > print text=Docs site: generated by the Marqdo interpreter, not hand-written HTML. diff --git a/public/features/03-view与文档.mq.md b/public/features/03-view与文档.mq.md index 33c9fc7..00c8e61 100644 --- a/public/features/03-view与文档.mq.md +++ b/public/features/03-view与文档.mq.md @@ -5,12 +5,13 @@ description: 本地浏览与静态导出由解释器生成 # main -里程碑:`marqdo view` 与 `view output`。 +里程碑:`marqdo view` 与 `view output`(v1.3.3 文档面)。 本地浏览:`marqdo view public` 静态导出:`marqdo view output public -o public` -用户可执行文档在 `public/`;生成的 HTML(`index.html` / `pages/`)供静态托管,CI 发布到 `gh-pages`。 +Browse Structure 保真叙述、高亮可执行标记,并挂载运行结果(变量值、分支命中臂、调用/循环帧)。 +用户站与 live view 同源渲染;CI 发布到 `gh-pages`。 > 打印 内容=文档站:由 Marqdo 解释器生成,不是手写 HTML。