diff --git a/.github/workflows/extension-release.yml b/.github/workflows/extension-release.yml index 21cb812..d9240e3 100755 --- a/.github/workflows/extension-release.yml +++ b/.github/workflows/extension-release.yml @@ -32,11 +32,15 @@ jobs: cargo build --release -p marqdo -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg -p marqdo_plugin_llm -p marqdo_plugin_engineering bash scripts/build-web-plugin.sh - name: Build and validate the runner's exact pack bytes - shell: pwsh - run: ./target/release/marqdo.exe call skills/marqdo-release/packs.mq.md ci --effects plugin,fs.write,environment.read --fs-root . --require-ok --json + shell: bash + run: | + set -euo pipefail + ./target/release/marqdo.exe call skills/marqdo-release/packs.mq.md ci --effects plugin,fs.read,fs.write,environment.read --fs-root . --require-ok --json - name: Attach source and Windows native packs without replacement - shell: pwsh - run: ./target/release/marqdo.exe call skills/marqdo-release/packs.mq.md attach_ci --effects plugin,fs.read,environment.read --fs-root . --require-ok --json + shell: bash + run: | + set -euo pipefail + ./target/release/marqdo.exe call skills/marqdo-release/packs.mq.md attach_ci --effects plugin,fs.read,environment.read --fs-root . --require-ok --json linux: runs-on: ubuntu-latest @@ -59,6 +63,6 @@ jobs: cargo build --release -p marqdo -p marqdo_plugin_agent -p marqdo_plugin_quantum -p marqdo_plugin_linalg -p marqdo_plugin_llm -p marqdo_plugin_engineering bash scripts/build-web-plugin.sh - name: Build and validate the runner's exact pack bytes - run: target/release/marqdo call skills/marqdo-release/packs.mq.md ci --effects plugin,fs.write,environment.read --fs-root . --require-ok --json + run: target/release/marqdo call skills/marqdo-release/packs.mq.md ci --effects plugin,fs.read,fs.write,environment.read --fs-root . --require-ok --json - name: Attach Linux native pack without replacement run: target/release/marqdo call skills/marqdo-release/packs.mq.md attach_ci --effects plugin,fs.read,environment.read --fs-root . --require-ok --json diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e78f77..d4227e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,17 @@ ## Unreleased -## Ext pack v2.8.1 — 2026-11-18 +## Ext pack v2.8.2 — 2026-11-18 ### Highlights -**AI native durable workflow(CLI 仍为 v2.8.0)**:`ext/ai` 以插件侧步骤机交付持久化 -工作流(`workflow`/`flow`/`context`/`recovery`),含有界模型选择、作用域上下文、 -只读失败恢复、`inspect`/`list` 与可隔离 `resume_dir`。不改解释器栈挂起,不宣称 -外部写 exactly-once。详见 [双语发布说明](doc/releases/ext-2.8.1.md)。 +**AI native durable workflow + Windows pack CI fix(CLI 仍为 v2.8.0)**:能力同 2.8.1; +修复 Windows `packs.ci` 的 engineering root 解析(`root does not exist`),双平台 +可发布。`ext-v2.8.1` 已打标但未完成资产。详见 [双语发布说明](doc/releases/ext-2.8.2.md)。 ```bash -marqdo ext add agent # CDN latest → 2.8.1 -# 或:MARQDO_EXT_VERSION=2.8.1 marqdo ext add agent +marqdo ext add agent # CDN latest → 2.8.2 +# 或:MARQDO_EXT_VERSION=2.8.2 marqdo ext add agent ``` **核心表面 Δ(Core surface Δ)**:**无增删**——仅 Extension / Agent Runtime。 @@ -36,10 +35,12 @@ marqdo ext add agent # CDN latest → 2.8.1 `run --effects` flag, using `MARQDO_AGENT_PLUGIN` instead. - Atomic checkpoint/effect temp names no longer collide under parallel writes; resume tests no longer race on process-wide cwd. +- Windows `extension-release`:engineering root 使用 `path.join` / cwd 回退, + `packs.ci` 传入绝对 checkout,并授予 `fs.read`。 ### Changed -- 扩展包 SemVer **2.8.1**(`ext/VERSION`);与 CLI **v2.8.0** 可独立安装。 +- 扩展包 SemVer **2.8.2**(`ext/VERSION`);与 CLI **v2.8.0** 可独立安装。 - 分支已合并 v2.8.0 依赖锁后的 AI 工作流增量,不再从 2.7.1 基线分叉。 ## v2.8.0 — 2026-11-17 diff --git a/README.md b/README.md index 5f92763..86372a3 100755 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ marqdo view examples/procurement --no-open Agent Skills already support scripts; Marqdo's claim is **one document-native language surface** for authoring, inspecting, executing and reusing functions. This is **not** a claim of full formal verification, zero-delay execution, or OS-level isolation of all plugin/process behavior. -**Resources:** [Release v2.8.0](https://github.com/cflmy/marqdo/releases/tag/v2.8.0) · [Ext pack 2.8.1](https://github.com/cflmy/marqdo/releases/tag/ext-v2.8.1) · [Procurement example](examples/procurement/index.mq.md) · [Executable library authoring](doc/library-development.mq.md) · [Function calling](public/features/22-函数调用.mq.md) · [Link syntax](doc/design/link-syntax.md) · [Website](https://www.marqdo.com/) +**Resources:** [Release v2.8.0](https://github.com/cflmy/marqdo/releases/tag/v2.8.0) · [Ext pack 2.8.2](https://github.com/cflmy/marqdo/releases/tag/ext-v2.8.2) · [Procurement example](examples/procurement/index.mq.md) · [Executable library authoring](doc/library-development.mq.md) · [Function calling](public/features/22-函数调用.mq.md) · [Link syntax](doc/design/link-syntax.md) · [Website](https://www.marqdo.com/) --- @@ -128,11 +128,11 @@ Agent Skills already support scripts; Marqdo's claim is **one document-native la 当前 CLI **2.8.0** 新增 `marqdo prove`:知识文件的定理表编译为 Lean 4 并自动判定真假——没有 Lean 工具链也能离线符号执行(诚实降级,绝不冒充证明),有 Lean 时全链路证明并给出反例见证。参见[发布说明](doc/releases/v2.8.0.md)。 -独立拓展包 **2.8.1**(CLI 仍为 2.8.0):`ext/ai` 插件侧持久化工作流(选择 / 作用域上下文 / 只读失败恢复 / `inspect`)。`marqdo ext add agent` → CDN latest。参见[拓展包说明](doc/releases/ext-2.8.1.md)。 +独立拓展包 **2.8.2**(CLI 仍为 2.8.0):`ext/ai` 插件侧持久化工作流(选择 / 作用域上下文 / 只读失败恢复 / `inspect`)。`marqdo ext add agent` → CDN latest。参见[拓展包说明](doc/releases/ext-2.8.2.md)。 CLI **2.8.0** adds `marqdo prove`: theorem tables in knowledge files compile to Lean 4 and are judged automatically — offline symbolic execution without a toolchain (honest degradation, never impersonating a proof), full proofs with counterexample witnesses when Lean is available. -Ext pack **2.8.1** (CLI remains 2.8.0): plugin-only durable AI workflows with bounded choice, scoped context, failed-only read-only recovery and `inspect`. +Ext pack **2.8.2** (CLI remains 2.8.0): plugin-only durable AI workflows with bounded choice, scoped context, failed-only read-only recovery and `inspect`. ## 核心优势:可执行知识(Executable Knowledge) diff --git a/doc/releases/ext-2.8.2.md b/doc/releases/ext-2.8.2.md new file mode 100644 index 0000000..36e551c --- /dev/null +++ b/doc/releases/ext-2.8.2.md @@ -0,0 +1,58 @@ +# Ext pack v2.8.2 发布说明 · Release Notes(AI native flow) + +## 1. 一句话 + +独立拓展包 **2.8.2**(CLI 仍为 **2.8.0**):在 2.8.1 的 AI 持久化工作流之上,修复 Windows +`extension-release` 打包根路径(`root does not exist`),使双平台 ZIP 可发布。 +`ext-v2.8.1` 标签保留但未形成完整 Release 资产。 + +Independent extension pack **2.8.2** (CLI remains **2.8.0**): AI durable workflows from +2.8.1, plus a Windows `extension-release` checkout-root fix (`root does not exist`) so +both-platform ZIPs can publish. Tag `ext-v2.8.1` remains but did not complete assets. + +## 2. 亮点(Highlights) + +| | | +|---|---| +| 持久步骤机 | `plugins/agent` `workflow`:`open/next/commit/cancel/retry_*`,CheckpointV2,逐步提交边界 | +| 作者面 | `ext/ai/workflow` · `flow` · `context` · `recovery`;`tick` 单步执行,等待输入不阻塞解释器线程 | +| 选择解析 | 精确 / 编号 / 标签 / 短中英句 / JSON 信封;歧义与未知路径失败关闭 | +| 作用域上下文 | Markdown 感知的 file/class/function 摘录;歧义拒绝;不把整库 import 塞进提示 | +| 安全并行恢复 | 保留成功兄弟结果;仅重试已分类为只读的失败子任务;写/未知效应不自动派发 | +| 可观测性 | `inspect`/`list` 只读进度;测试与调用方可传入 host-relative `resume_dir` | + +设计契约:[native-agent-flow-v3.md](../design/native-agent-flow-v3.md)。 + +## 3. 安装(Install) + +```bash +marqdo ext add agent # CDN / Releases → 2.8.2 +# 或:MARQDO_EXT_VERSION=2.8.2 marqdo ext add agent +marqdo ext add llm +``` + +产物:`marqdo-2.8.2-ext.zip` 与双平台 native ZIP(含 agent / llm 等既有原生库)。 + +## 4. 验证(Validation) + +```bash +cargo test -p marqdo_plugin_agent --locked +cargo run --locked -- check ext/ai/flow.mq.md +cargo run --locked -- check ext/ai/context.mq.md +cargo run --locked -- check ext/ai/recovery.mq.md +cargo run --locked -- check ext/ai/workflow.mq.md +cargo run --locked -- run tests/ext/ai-native-flow.mq.md +cargo run --locked -- run tests/ext/ai-native-workflow.mq.md +``` + +CI:`.github/workflows/native-ai-flow.yml` 与 `extension-release.yml`(`ext-v2.8.2`)。 + +## 5. 已知限制(Known limitations) + +- 输入闸门保存的是**步骤边界**,不是任意字节码解释器帧;回复后须显式进入下一 Marqdo 函数。 +- 作用域选择依赖 Markdown 标题约定,不是编译器已解析的 AST 符号表。 +- 调用方提供的 principal/session/source revision 须由已认证宿主证明,不能来自模型文本。 +- 并行复用 `subtask.run_many`;跨进程子任务租约与已在跑外部进程的取消传播仍待专项注入验证。 +- 实时大模型与目标 1B 本地模型评测仍开放;写效应自动重试仍被拒绝,直至 EffectLedger 对账完成。 + +**核心表面 Δ**:无增删——19 个核心构造不变;本包为 Extension / Agent Runtime。 diff --git a/ext/VERSION b/ext/VERSION index dbe5900..1817afe 100755 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -2.8.1 +2.8.2 diff --git a/ext/engineering/index.mq.md b/ext/engineering/index.mq.md index f3f73df..1e96cdd 100755 --- a/ext/engineering/index.mq.md +++ b/ext/engineering/index.mq.md @@ -71,7 +71,7 @@ authentication is resolved inside the plugin from existing stores. We **loaded = [Load this package's native boundary](_load())** and **base = [Read the granted runtime working root](sys.cwd())** and **resolved_root = root**. 1. not [The requested root is already absolute](paths.is_absolute(path=`root`)) - We **resolved_root = base + "/" + root** so process and native filesystem locations agree. + We **resolved_root = [Join the runtime cwd with the relative grant](paths.join(a=`base`, b=`root`))** so Windows and Unix separators stay native. `request_data` = diff --git a/plugins/engineering/src/lib.rs b/plugins/engineering/src/lib.rs index f0c5ffc..50ac2ff 100755 --- a/plugins/engineering/src/lib.rs +++ b/plugins/engineering/src/lib.rs @@ -32,10 +32,16 @@ fn read_bounded(mut r: impl Read, max: u64) -> Result, String> { if b.len() as u64 > max { return Err("bounded input limit exceeded".into()); } Ok(b) } +fn strip_verbatim(path: &Path) -> &Path { + path.strip_prefix(r"\\?\").unwrap_or(path) +} + fn scoped(root: &Path, relative: &str) -> Result { let p = root.join(relative).canonicalize().map_err(|_| "path does not exist")?; - if !p.starts_with(root) { return Err("artifact path escapes the selected root".into()); } - Ok(p) + if p.starts_with(root) || strip_verbatim(&p).starts_with(strip_verbatim(root)) { + return Ok(p); + } + Err("artifact path escapes the selected root".into()) } fn homes(root: &Path) -> Vec { let mut out = Vec::new(); @@ -498,8 +504,24 @@ fn gzip_text(p: &Value) -> Answer { Ok(json!(String::from_utf8(plain).map_err(|_| "gzip text is not UTF-8")?)) } +fn resolve_root(request: &Value) -> Result { + let raw = request.get("root").and_then(Value::as_str).unwrap_or("."); + let selected = PathBuf::from(raw); + if let Ok(path) = selected.canonicalize() { + return Ok(path); + } + // Relative grants must still resolve when the caller only passed "." and the + // process cwd is the intended checkout (Windows runners are sensitive here). + if raw == "." || raw.is_empty() { + return std::env::current_dir() + .and_then(|p| p.canonicalize()) + .map_err(|e| format!("root does not exist ({raw}: {e})")); + } + Err(format!("root does not exist ({raw})")) +} + fn dispatch(request:&Value)->Answer { - let root=PathBuf::from(request.get("root").and_then(Value::as_str).unwrap_or(".")).canonicalize().map_err(|_|"root does not exist")?; + let root=resolve_root(request)?; let op=field(request,"operation")?; let empty=json!({});let p=request.get("payload").unwrap_or(&empty); match op { diff --git a/skills/marqdo-release/packs.mq.md b/skills/marqdo-release/packs.mq.md index a10f1b7..6189b11 100755 --- a/skills/marqdo-release/packs.mq.md +++ b/skills/marqdo-release/packs.mq.md @@ -102,7 +102,8 @@ We **destination = [Resolve the new archive inside the granted root](fs.resolve( | `destination` | | `entry` | -Return *[Encode only the explicitly staged format subtree](engineering.checked(argv=`argv`, cwd=`stage`, timeout_ms=300000, max_output=65536))*. +We **checkout = [Use the absolute runtime checkout as the plugin root](sys.cwd())**. +Return *[Encode only the explicitly staged format subtree](engineering.checked(argv=`argv`, cwd=`stage`, timeout_ms=300000, max_output=65536, root=`checkout`))*. ## _receipt