diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62a5c88..ac2703d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,10 +53,17 @@ jobs: $source = "marqdo-$ver-source.zip" $vsix = "marqdo-$ver.vsix" $public = "marqdo-$ver-public.zip" + $extZip = "marqdo-$ver-ext.zip" Copy-Item target/release/marqdo.exe "dist/$exe" git archive --format=zip -o "dist/$source" HEAD ./target/release/marqdo view output public -o public Compress-Archive -Path public/* -DestinationPath "dist/$public" -Force + $stageExt = "dist/stage-ext" + if (Test-Path $stageExt) { Remove-Item $stageExt -Recurse -Force } + New-Item -ItemType Directory -Force -Path $stageExt | Out-Null + Copy-Item ext "$stageExt/ext" -Recurse + if (Test-Path "dist/$extZip") { Remove-Item "dist/$extZip" -Force } + Compress-Archive -Path "$stageExt/*" -DestinationPath "dist/$extZip" -Force $stage = "dist/stage-bundle" if (Test-Path $stage) { Remove-Item $stage -Recurse -Force } New-Item -ItemType Directory -Force -Path $stage | Out-Null @@ -76,6 +83,7 @@ jobs: echo "VSIX=$vsix" >> $env:GITHUB_ENV echo "SOURCE=$source" >> $env:GITHUB_ENV echo "PUBLIC=$public" >> $env:GITHUB_ENV + echo "EXT=$extZip" >> $env:GITHUB_ENV - name: Upload release assets uses: softprops/action-gh-release@v2 @@ -83,11 +91,13 @@ jobs: body: | ## Marqdo ${{ github.ref_name }} - ### Highlights - - **Embedded stdlib** (v0.1.2+): `lib/*.mq.md` built into the binary - - **writeback** + **subtask** stdlibs - - **`marqdo version --check`** - - VSIX built from branch **`vscode-extension`** (not tracked on `main`) + ### Highlights — extension libraries + - Official **`ext/`** packages: `llm`, `agent`, `web`, `quantum` (not stdlib) + - Install: `marqdo ext list` / `marqdo ext add llm|agent|web|quantum` + - Native plugins: `cargo build --release -p marqdo_plugin_*` then `ext add` + - Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [ext-cli.md](https://github.com/cflmy/marqdo/blob/main/doc/design/ext-cli.md) + + Also: embedded stdlib, writeback/subtask, Variables modal in `view`, VSIX from branch **`vscode-extension`**. ### Downloads @@ -96,15 +106,17 @@ jobs: | `marqdo-*-windows-msvc.exe` | CLI with **embedded** official stdlib | | `marqdo-*-windows-msvc.zip` | `marqdo.exe` + `lib/` (optional disk override) | | `marqdo-*-stdlib.zip` | `lib/` only | + | `marqdo-*-ext.zip` | Official `ext/` L1 sources (for `MARQDO_EXT_SOURCE` / local `./ext`) | | `marqdo-*-source.zip` | Source snapshot (`git archive`) | | `marqdo-*.vsix` | VS Code / Cursor extension | | `marqdo-*-public.zip` | Static user docs site | - Extension workflow: [doc/design/vscode-extension-commit.md](https://github.com/cflmy/marqdo/blob/main/doc/design/vscode-extension-commit.md) + Extension workflow: [vscode-extension-commit.md](https://github.com/cflmy/marqdo/blob/main/doc/design/vscode-extension-commit.md) files: | dist/${{ env.EXE }} dist/${{ env.ZIP }} dist/${{ env.STDLIB }} + dist/${{ env.EXT }} dist/${{ env.VSIX }} dist/${{ env.SOURCE }} dist/${{ env.PUBLIC }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 404ea9c..3153d87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,63 @@ # Changelog +## v0.2.0 — 2026-08-12 + +### Highlights — official extension libraries + +This release centers on **`ext/`**: optional packages that are **not** part of the embedded stdlib. Install them with the CLI; native plugins (`.so` / `.dll`) ship beside L1 Markdown APIs. + +**How to get extensions** + +```bash +# List what the installer knows about +marqdo ext list + +# Install from the repo's ./ext (or MARQDO_EXT_SOURCE), into ~/.marqdo/ext (or MARQDO_EXT) +marqdo ext add llm +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum + +# Chinese ids work the same (大模型 / 智能体 / 网页 / 量子) +marqdo ext add 量子 + +marqdo ext remove quantum +``` + +Native plugins (agent / web / quantum) must be built once, then `ext add` copies them into `MARQDO_EXT/native/`: + +```bash +cargo build --release -p marqdo_plugin_agent +cargo build --release -p marqdo_plugin_web +cargo build --release -p marqdo_plugin_quantum +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum +``` + +Runtime also resolves plugins from `CARGO_TARGET_DIR`, `target/`, next to the `marqdo` binary, or `MARQDO_*_PLUGIN` env vars. Design: [ext-cli.md](doc/design/ext-cli.md) · [ext-abi.md](doc/design/ext-abi.md). + +| Package | What you get | +|---------|----------------| +| **llm** | OpenAI-compatible chat — [ext-llm.md](doc/design/ext-llm.md) | +| **agent** | Agent layout / orchestration helpers + native plugin — [ext-agent.md](doc/design/ext-agent.md) | +| **web** | HTTP + SQLite site helpers + native plugin — [ext-web.md](doc/design/ext-web.md) | +| **quantum** | State-vector circuits, draw, noise, formula `matrix=` custom gates — [ext-quantum.md](doc/design/ext-quantum.md) | + +User-facing intro: [`public/features/05-extensions.mq.md`](public/features/05-extensions.mq.md) / [`05-扩展.mq.md`](public/features/05-扩展.mq.md). + +### Added +- Full **ext CLI** catalog: `llm`, `agent`, `web`, `quantum` (EN/ZH ids). +- **Quantum (Q0–Q6)**: gates, `run`/`steps`, draw (circuit/probs/bloch), heatmaps, teaching noise incl. amplitude damping, **custom gates from `$$` / `matrix=`**. +- **Web** extension (listen / render / SQLite) with L1 EN/ZH. +- **Agent** native plugin path + installer copy into `native/`. +- View **Variables** panel: previews + click-to-open rich modal (matrices / KaTeX). +- Formula matrix parse (`pmatrix` / `[[…]]`) for executable gate matrices. + +### Changed +- Release notes and docs emphasize extensions vs embedded stdlib. +- Highlight.js CDN path for view pages; Variables panel script escaping fixed. + ## v0.1.2 — 2026-08-07 ### Added diff --git a/Cargo.lock b/Cargo.lock index c5be92b..d36da4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -677,7 +677,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "0.1.2" +version = "0.2.0" dependencies = [ "anyhow", "assert_cmd", diff --git a/Cargo.toml b/Cargo.toml index d10a5c3..9dc4d1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "0.1.2" +version = "0.2.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 93913a7..c0020f0 100644 --- a/README.md +++ b/README.md @@ -97,17 +97,17 @@ marqdo catalog public -o .marqdo --- -## 现状(v0.1.2) +## 现状(v0.2.0) - 映射与解释器:Phase I 树遍历 + 字节码后端可用;金样例在 `tests/` - **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md) -- **`marqdo view`**:文档浏览器(Structure + 函数大纲/搜索 + Execution + Source) +- **`marqdo view`**:文档浏览器(Structure + 函数大纲/搜索 + Execution + Variables 浮窗) - **`marqdo debug`**:独立调试页(断点 / 单步 / locals;默认端口 7430;页面 favicon / 品牌使用官方 Logo) - **`marqdo catalog` / `sync`**:OKF 风格 YAML + 模块概念页 - **`marqdo version --check`**:与 GitHub 最新 release 对比 - 标准库:**内置于二进制**(v0.1.2+);磁盘 `lib/` 或 `MARQDO_LIB` 可覆盖。模块含文本、文件、系统、时间、JSON、网络、数学、外联、插件、**自写回**、**子任务** -- **官方扩展 `ext/`**(非 stdlib):[`ext/llm`](doc/design/ext-llm.md);[`ext/agent`](doc/design/ext-agent.md) 智能体开发框架。安装:`marqdo ext list` / `add llm|agent` / `remove`(见 [ext-cli.md](doc/design/ext-cli.md);默认 `~/.marqdo/ext` 或 `MARQDO_EXT`) -- **原生插件 ABI v1**:[`include/marqdo_abi.h`](include/marqdo_abi.h) · [ext-abi.md](doc/design/ext-abi.md);demo `plugins/demo` +- **官方扩展库 `ext/`**(本版重点,**非** stdlib):`llm` · `agent` · `web` · `quantum`。安装:`marqdo ext list` / `add …` / `remove`(见 [ext-cli.md](doc/design/ext-cli.md);默认 `~/.marqdo/ext` 或 `MARQDO_EXT`)。原生插件先 `cargo build -p marqdo_plugin_*` 再 `ext add`。设计:[ext-llm](doc/design/ext-llm.md) · [ext-agent](doc/design/ext-agent.md) · [ext-web](doc/design/ext-web.md) · [ext-quantum](doc/design/ext-quantum.md) +- **原生插件 ABI**:[`include/marqdo_abi.h`](include/marqdo_abi.h) · [ext-abi.md](doc/design/ext-abi.md);`plugins/{demo,agent,web,quantum}` - **用户静态站**:`public/` → `view output` → CI 发布 [gh-pages](https://cflmy.github.io/marqdo/) - **VS Code 扩展**:分支 **`vscode-extension`**(`main` 不跟踪源码;见 [vscode-extension-commit.md](doc/design/vscode-extension-commit.md));Release 附带 `.vsix` - 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) @@ -122,7 +122,7 @@ cargo run -- view output public -o public powershell -File ./scripts/build-public.ps1 ``` -**发布包(GitHub Releases)**:自 **v0.1.2** 起,单独 `.exe` **已内置**官方 `lib/`(`> lib/…` 可直接导入)。仍提供带 `lib/` 的 zip 便于覆盖或离线分发;`ext/` 与原生插件 `.dll` 仍须单独安装。`marqdo version --check` 可查看是否有新版本。OpenAI 兼容聊天见 [ext-llm.md](doc/design/ext-llm.md)。智能体布局见 [ext-agent.md](doc/design/ext-agent.md)。 +**发布包(GitHub Releases)**:单独二进制 **已内置**官方 `lib/`(`> lib/…` 可直接导入)。仍提供带 `lib/` 的 zip 便于覆盖或离线分发。**扩展库**用 `marqdo ext add llm|agent|web|quantum` 安装(见 [CHANGELOG](CHANGELOG.md) 与 [ext-cli.md](doc/design/ext-cli.md));原生 `.so`/`.dll` 需本地编译或从带 `native/` 的安装目录解析。`marqdo version --check` 可查看是否有新版本。 文档:用户站 [public/](public/) · 设计 [doc/](doc/) · OKF / catalog [catalog-cli.md](doc/design/catalog-cli.md) · 调试 [view-debug.md](doc/design/view-debug.md) diff --git a/public/features/05-extensions.mq.md b/public/features/05-extensions.mq.md index 1be312c..cd4ce8c 100644 --- a/public/features/05-extensions.mq.md +++ b/public/features/05-extensions.mq.md @@ -7,9 +7,31 @@ description: Optional packages — not stdlib ext/ holds official optional extensions. They are not part of lib/. Resolve via MARQDO_EXT, ./ext, or ext/ next to the binary. -- ext/llm — OpenAI-compatible chat object. Design: doc/design/ext-llm.md -- ext/agent — agent development framework (layout helpers today; compose with ext/llm for model-backed orchestration). Design: doc/design/ext-agent.md -- ext/quantum — state-vector circuits, `steps=` tables, `draw kind=circuit|probs|bloch`, named `gate` + `matches_matrix`, teaching `noise`, `barrier`/`measure`/`append`/`state`. Design: doc/design/ext-quantum.md · Q5: doc/design/ext-quantum-q5.md +Install (v0.2+): + +```text +marqdo ext list +marqdo ext add llm +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum +``` + +For packages with a native plugin, build first then add: + +```text +cargo build --release -p marqdo_plugin_agent +cargo build --release -p marqdo_plugin_web +cargo build --release -p marqdo_plugin_quantum +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum +``` + +- ext/llm — OpenAI-compatible chat. Design: doc/design/ext-llm.md +- ext/agent — agent framework + native plugin. Design: doc/design/ext-agent.md +- ext/web — HTTP / SQLite site helpers + native plugin. Design: doc/design/ext-web.md +- ext/quantum — circuits, draw, noise, formula `matrix=` custom gates. Design: doc/design/ext-quantum.md - Installer: marqdo ext list / add / remove — doc/design/ext-cli.md - Native plugins: lib/plugin + include/marqdo_abi.h — doc/design/ext-abi.md diff --git a/public/features/05-扩展.mq.md b/public/features/05-扩展.mq.md index 689ba01..ec29e55 100644 --- a/public/features/05-扩展.mq.md +++ b/public/features/05-扩展.mq.md @@ -7,9 +7,31 @@ description: 可选包 — 不是标准库 ext/ 存放官方可选扩展,不属于 lib/。解析顺序:MARQDO_EXT、./ext、或可执行文件旁的 ext/。 -- ext/llm(ext/大模型)— OpenAI 兼容聊天。设计:doc/design/ext-llm.md -- ext/agent(ext/智能体)— 智能体开发框架(当前含布局助手;与大模型组合做编排见路线)。设计:doc/design/ext-agent.md -- ext/quantum(ext/量子)— 态向量电路、`步骤=` 表、`绘图 种类=circuit|probs|bloch`、具名「门」与「匹配矩阵」、教学「噪声」、`屏障`/`测量`/`追加`/`态`。设计:doc/design/ext-quantum.md · Q5:doc/design/ext-quantum-q5.md +安装(v0.2+): + +```text +marqdo ext list +marqdo ext add llm +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum +``` + +带原生插件的包需先编译再 add: + +```text +cargo build --release -p marqdo_plugin_agent +cargo build --release -p marqdo_plugin_web +cargo build --release -p marqdo_plugin_quantum +marqdo ext add agent +marqdo ext add web +marqdo ext add quantum +``` + +- ext/llm(大模型)— OpenAI 兼容聊天。设计:doc/design/ext-llm.md +- ext/agent(智能体)— 智能体框架 + 原生插件。设计:doc/design/ext-agent.md +- ext/web(网页)— HTTP / SQLite 站点助手 + 原生插件。设计:doc/design/ext-web.md +- ext/quantum(量子)— 电路、绘图、噪声、公式 `矩阵=` 自定义门。设计:doc/design/ext-quantum.md - 安装器:marqdo ext list / add / remove — doc/design/ext-cli.md - 通用原生插件:lib/plugin + include/marqdo_abi.h — doc/design/ext-abi.md