diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1d35f8..030c7ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -126,6 +126,8 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights + - **v1.4.4**:LLM 传输软失败 + `ext/ai` 表优先——`status=error` 不 abort · 去 json.set 胶水 + - **v1.4.4**: Soft LLM transport errors + table-first ext/ai — structured status=error, no json.set glue - **v1.4.2**:Agent/LLM 优化 O1–O5——sandbox trial · promote proof · step_route/EFI/cost · lint · quarantine - **v1.4.2**: Agent/LLM optimize O1–O5 — sandbox trial, promote proof, step_route/EFI/cost, lint, quarantine - **v1.4.1**:view 标注连线——SVG mid→mid(underline 底中 → chip 顶中)· 帧 chip id 对齐 · L→R 密度 diff --git a/CHANGELOG.md b/CHANGELOG.md index b1958d1..3d914fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,33 @@ ### Fixed -- **LLM / Agent 传输软失败**:上游连接拒绝、超时或 HTTP≠200 时,`host_http_post` / `llm` 插件 / `ext/ai/llm/openai` 不再硬中断;`llm.ask` · `agent.step` · `agent.run` 返回 `finish|status=error` + `error`。金样 `tests/ext/agent-llm-transport-soft.mq.md`。说明:[doc/research/agent-llm-transport-soft-2026-10.md](doc/research/agent-llm-transport-soft-2026-10.md)。 -- **`agent.run`**:`cache == soft-hit` 改为引号比较(裸 `soft-hit` 被解析为减法,软失败路径上才暴露)。 -- **`ext/ai` 去 json 胶水**:`agent.mq.md` / `智能体.mq.md` / `llm/openai.mq.md` 结果 map 与事件构建改为 GFM 表 + `table.put` / `table.append` / `table.empty_*`(`json.set`/`json.append` 清零)。SKILL 正面示例:`.cursor/skills/marqdo-dev` §2 · `marqdo/examples.md` §6e。 +### Changed + +## v1.4.4 — 2026-10-16 + +### Highlights + +**LLM 传输软失败 + `ext/ai` 表优先重构**:上游连接拒绝/超时/HTTP≠200 时,Runtime 返回结构化 `finish|status=error`(不再硬中断 VM);`agent` / `智能体` / `llm/openai` 去掉 `json.set`/`json.append` 袋胶水。含 CLI host · `plugins/llm` · Ext pack **1.4.4**。 + +```bash +git checkout v1.4.4 && cargo build --release +cargo build --release -p marqdo_plugin_llm +marqdo run tests/ext/agent-llm-transport-soft.mq.md +marqdo ext add agent # CDN → 1.4.4 +``` + +**核心表面 Δ(Core surface Δ)**:**无增删**——HTTP 宿主软失败契约 + Extension 风格重构;不改 MQ 关键词 / 表几何。 + +### Fixed + +- **LLM / Agent 传输软失败**:`host_http_post` / SSE · `plugins/llm` · `ext/ai/llm/openai` 结构化 `finish=error`;`agent.step` / `plan` / `run` 收成 `status=error`。金样 `tests/ext/agent-llm-transport-soft.mq.md`。说明:[doc/research/agent-llm-transport-soft-2026-10.md](doc/research/agent-llm-transport-soft-2026-10.md)。 +- **`agent.run`**:`cache == "soft-hit"` 引号比较(裸 `soft-hit` 曾被解析为减法)。 ### Changed +- **`ext/ai` 去 json 胶水**:结果 map / 事件用 GFM 表 + `table.put` / `table.append` / `table.empty_*`。SKILL 正面示例:`.cursor/skills/marqdo-dev` §2 · `marqdo/examples.md` §6e。 +- CLI / Ext / wasm SemVer **1.4.4**。 + ## Ext pack v1.4.3 — 2026-10-16 ### Highlights diff --git a/Cargo.lock b/Cargo.lock index 4c3babe..e71bd70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "1.4.2" +version = "1.4.4" dependencies = [ "anyhow", "assert_cmd", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "1.4.2" +version = "1.4.4" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index f7a9f87..edf30f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "1.4.2" +version = "1.4.4" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index e28547a..713ee01 100644 --- a/README.md +++ b/README.md @@ -149,9 +149,10 @@ marqdo catalog public -o .marqdo --- -## 现状(v1.4.2 · Ext pack **1.4.3**) +## 现状(v1.4.4) -- **Ext pack 1.4.3**:修复 `agent.run` cold EFI(`` `self`.preflight `` + miss resolve `llm_free`);`marqdo ext add agent` → CDN latest · [agent-run-efi-resolve-bugs-2026-10.md](doc/research/agent-run-efi-resolve-bugs-2026-10.md) +- **LLM 传输软失败 + `ext/ai` 表优先(v1.4.4)**:上游不可达 → `status=error`(不 abort);`agent`/`llm` 去 `json.set` 胶水 · [agent-llm-transport-soft-2026-10.md](doc/research/agent-llm-transport-soft-2026-10.md) +- **Ext pack 1.4.3**:修复 `agent.run` cold EFI(`` `self`.preflight `` + miss resolve `llm_free`);已并入 **1.4.4** · [agent-run-efi-resolve-bugs-2026-10.md](doc/research/agent-run-efi-resolve-bugs-2026-10.md) - **Agent/LLM 优化 O1–O5(v1.4.2)**:`ext/ai/sandbox` CoW · `agent.trial` / `sandbox=` · promote sandbox proof · `step_route` / EFI / cost · style lint · quarantine · [ext-ai-optimize.md](doc/roadmap/ext-ai-optimize.md) - **view 标注连线(v1.4.1)**:underline→chip SVG mid→mid(底边中点→轨道→短竖线→顶边中点)· 帧 chip 共用 id · L→R 密度 · [view-prose-annot-gaps.md](doc/design/view-prose-annot-gaps.md) - **叙述统一 / 公式 meta / 图片自写回(v1.4.0)**:`% marqdo: var=` 块公式绑定 · 臂/循环体叙述与 foreach 中英糖 · `![marqdo-out](…)` 图片自写回 · view 推断形参实值 · [fence-meta-and-control-prose.md](doc/design/fence-meta-and-control-prose.md) · [stdlib-writeback.md](doc/design/stdlib-writeback.md) @@ -181,7 +182,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.4.2) +### 如何使用最新 Marqdo(v1.4.4) **安装解释器(任选其一)** @@ -196,7 +197,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v1.4.2 # 或留在 main +git checkout v1.4.4 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -235,7 +236,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.4.2 +# https://github.com/cflmy/marqdo/releases/tag/v1.4.4 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index ea200a7..c7ce52e 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "1.4.2" +version = "1.4.4" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index fb2d11b..253ef5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +marqdo (1.4.4-1ppa1) noble; urgency=medium + + * Marqdo 1.4.4: Soft LLM transport errors (structured status=error); + ext/ai table-first refactor (no json.set glue). + + -- cflmy Fri, 16 Oct 2026 14:40:00 +0800 + marqdo (1.4.2-1ppa1) noble; urgency=medium * Marqdo 1.4.2: Agent/LLM optimize O1–O5 — sandbox trial opt-in, diff --git a/ext/VERSION b/ext/VERSION index 428b770..1c99cf0 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -1.4.3 +1.4.4