diff --git a/README.md b/README.md index 0e2af12..57ae1c5 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,11 @@ plugin ABI v2 are not claimed to work here. > convergence plan is > [`docs/NEXT_RELEASE_CI_CONVERGENCE.md`](docs/NEXT_RELEASE_CI_CONVERGENCE.md). +CI: the private remote [git.cflmy.cn/cflmy/marqdo-cli](https://git.cflmy.cn/cflmy/marqdo-cli) +uses Woodpecker at [ci.cflmy.cn](https://ci.cflmy.cn); [`.woodpecker.yml`](.woodpecker.yml) +runs fmt, clippy, workspace tests and a release build. The strict OS-isolation +lane still requires the disposable VM described in [docs/ci.md](docs/ci.md). + ## Build Requires Rust 1.82+. diff --git a/docs/STATUS.md b/docs/STATUS.md index 73522a3..5b546f3 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -26,9 +26,11 @@ and is **red**: - Schema instance validation + consumers: PASS. - Release candidate artifact: SKIPPED (upstream failure; tag/dispatch only). -This checkout has a Gitee remote and **no GitHub credentials**. No new remote -CI URL can be produced from this host. The evidence below is local/VM evidence -for the convergence commit, not a substitute for the native GitHub lanes. +This checkout's private remote is `https://git.cflmy.cn/cflmy/marqdo-cli` with +Woodpecker CI at `https://ci.cflmy.cn` (`.woodpecker.yml`). The Linux Docker +pipeline runs fmt/clippy/test/release-build. GitHub native lanes, Windows/macOS +runners and a CI-attached strict VM runner are still unavailable; the G-C +evidence below remains local VM evidence. Convergence code/security SHA: **`8af72620f12e2494a59830a23abb393768b610e9`** (the following docs commit only adds this report and release material; code is @@ -77,7 +79,7 @@ This is still a **local VM lane**, not a self-hosted GitHub Actions security URL | 7 | Independent Tool consumers | **Done locally** | `sample-view`/`sample-knowledge`/`sample-proof` E2E test | | 8 | lock v3 reproducibility | **Implemented; tamper test added** | `package_env` PASS | | 9 | Analysis/Trace/Tool/ABI/Foreign | **Implemented; supported-matrix bounded** | protocol tests, plugin/worker/foreign tests | -| 10 | Linux strict L1 | **VM PASS at 70d916d; no CI URL** | 7/7 + positive CLI + strict resource refusal | +| 10 | Linux strict L1 | **VM PASS at 70d916d; strict needs a dedicated CI runner** | 7/7 + positive CLI + strict resource refusal; general Linux Docker CI is green | | 11 | Linux strict L2 | **NOT IMPLEMENTED / UNSUPPORTED** | strict rejects Worker/Foreign/native ABI | | 12 | Windows Native/Worker ABI | **UNSUPPORTED** | no Windows ABI artifact/claim | | 13 | RC artifact | **Linux candidate only; no release** | clean-install + checksums; macOS not built here | @@ -193,11 +195,12 @@ This is still a **local VM lane**, not a self-hosted GitHub Actions security URL ## 4. Open blockers and limits -1. **No remote CI evidence for the convergence SHA.** Windows/macOS fixes and - the Linux EAGAIN contract are UNVERIFIED on GitHub. G1/G2/G3 remain FAIL - until a real run exists. -2. **G-C is VM-verified but not CI-signed.** No self-hosted security-lane URL - for 70d916d exists. +1. **No native GitHub/Windows/macOS CI evidence.** The private Woodpecker + Linux Docker pipeline (fmt/clippy/test/release-build) is green, but Windows + and macOS native lanes are still unavailable. G1/G2/G3 remain FAIL until a + real native run exists. +2. **G-C is VM-verified but not CI-signed.** The Woodpecker Docker pipeline is + not an OS-isolation lane; no self-hosted security runner exists yet. 3. Windows Native/Worker ABI is explicitly UNSUPPORTED (no Windows `cc` fixture lane, Unix-gated worker tests). 4. `fs.write`, `net.request`, `process`, `clock`, `random` are not executed @@ -222,7 +225,7 @@ behavior. This table records only what is in this tree now. |---|---|---| | P0 freeze (ADRs, spec deltas, baseline) | **P1 + partial P2 slice done** | ADR-0022 freezes CM-A01/CM-A02/CM-A03; ADR-0023 freezes CM-A04 (minimal List/Map/Text/Table observation and construction); ADR-0024 freezes CM-A05 (recoverable `Result` map convention); `spec/expression.ebnf`, `spec/evaluation.md`, `spec/value-wire.md`, `spec/analysis-v2.md`, `spec/security.md` updated; existing AST/value goldens unchanged | | P1 Memory + place assignment | **Implemented locally** | `Value::Memory`, run-scoped `MemoryStore` (64 KiB pages, 64 MiB total / 16 MiB region), `memory.new/size/grow`, `m[i]` read, `m[i] = byte`; semantic fixtures 45–47, runtime negatives 13–18, `examples/memory-buffer.mq.md`; evidence [`evidence/2026-11-20-memory-p1.md`](evidence/2026-11-20-memory-p1.md) | -| P2 Marqdo-written allocator/data structures + minimal structure observation | **PASS (local pure lane); stdlib remains in-repo by design** | `.mq.md`-only evidence: bump allocator with u32 codec, linked list, failed-allocation atomicity (48–50); CM-A04 structure primitives and a table filter (51–54, ADR-0023); a first-fit free-list allocator with block reuse, splitting, address-adjacent coalescing and `Result` maps (55, ADR-0024), a `Memory`-backed binary tree with recursive insert/in-order traversal (56), a `.mq.md` CSV row splitter (57), an open-addressing hash table with linear probing, update and `hash.full` (58), a `.mq.md` UTF-8 encoder over `Memory` (59), a validating UTF-8 decoder rejecting truncated, bad-continuation and surrogate/overlong input (60), a `Memory`-backed graph adjacency list (61), a recursive JSON parser for nested arrays/objects, strings with escapes, integers, booleans, null and error Results (62), a `Memory`-backed stack bytecode VM with PUSH/ADD/MUL/JMP/JZ/HALT (63), big-endian 16/32/64-bit plus LEB128 integer codecs (64), a `.mq.md` table sort rebuilding a new table from `table.row/columns/cell` (65), a table join (67), a quoted/escaped CSV row parser (68), table group (69), an Int matrix multiply (70), and a sparse-matrix multiply (73); the first-fit allocator also detects double free (`alloc.double_free`). Evidence: [`memory-p2-closure`](evidence/2026-11-20-memory-p2-closure.md), [`structure-api-p2`](evidence/2026-11-20-structure-api-p2.md), [`result-and-free-list-p2`](evidence/2026-11-20-result-and-free-list-p2.md). Local gate PASS: `crates/cli/tests/p2_closure.rs` runs 21 C01–C06/C11/C12 fixtures plus the stdlib table self-test in `--mode pure` (no foreign/plugin/import grants), scans sources for foreign/plugin/import shortcuts and compares value/stdout to goldens; evidence [`p2-closure-gate`](evidence/2026-11-20-p2-closure-gate.md). The bundled `stdlib/` tree, `std:` imports, digest verification, Analysis identity and frozen-CLI closure test are implemented (ADR-0028). The stdlib intentionally remains in-repo (ADR-0039); a separate repository is a future extraction option, not a gate. Remote CI URL is still pending (see §1). | +| P2 Marqdo-written allocator/data structures + minimal structure observation | **PASS (local pure lane); stdlib remains in-repo by design** | `.mq.md`-only evidence: bump allocator with u32 codec, linked list, failed-allocation atomicity (48–50); CM-A04 structure primitives and a table filter (51–54, ADR-0023); a first-fit free-list allocator with block reuse, splitting, address-adjacent coalescing and `Result` maps (55, ADR-0024), a `Memory`-backed binary tree with recursive insert/in-order traversal (56), a `.mq.md` CSV row splitter (57), an open-addressing hash table with linear probing, update and `hash.full` (58), a `.mq.md` UTF-8 encoder over `Memory` (59), a validating UTF-8 decoder rejecting truncated, bad-continuation and surrogate/overlong input (60), a `Memory`-backed graph adjacency list (61), a recursive JSON parser for nested arrays/objects, strings with escapes, integers, booleans, null and error Results (62), a `Memory`-backed stack bytecode VM with PUSH/ADD/MUL/JMP/JZ/HALT (63), big-endian 16/32/64-bit plus LEB128 integer codecs (64), a `.mq.md` table sort rebuilding a new table from `table.row/columns/cell` (65), a table join (67), a quoted/escaped CSV row parser (68), table group (69), an Int matrix multiply (70), and a sparse-matrix multiply (73); the first-fit allocator also detects double free (`alloc.double_free`). Evidence: [`memory-p2-closure`](evidence/2026-11-20-memory-p2-closure.md), [`structure-api-p2`](evidence/2026-11-20-structure-api-p2.md), [`result-and-free-list-p2`](evidence/2026-11-20-result-and-free-list-p2.md). Local gate PASS: `crates/cli/tests/p2_closure.rs` runs 21 C01–C06/C11/C12 fixtures plus the stdlib table self-test in `--mode pure` (no foreign/plugin/import grants), scans sources for foreign/plugin/import shortcuts and compares value/stdout to goldens; evidence [`p2-closure-gate`](evidence/2026-11-20-p2-closure-gate.md). The bundled `stdlib/` tree, `std:` imports, digest verification, Analysis identity and frozen-CLI closure test are implemented (ADR-0028). The stdlib intentionally remains in-repo (ADR-0039); a separate repository is a future extraction option, not a gate. Linux Docker CI is green; a strict security runner and Windows/macOS lanes are still pending. | | P3 Resource/Stream ABI | **PARTIAL** | ADR-0025/0026 CM-A06 slices: opaque `Resource`, `resource.open/read/write/close`, stdout write in pure/project, granted project-file read and buffered project-file write in project, EOF/closed/handle errors, wire/host rejection; strict permits only stdio/stdout and refuses file/network resources. Fixture 66 + CLI/host tests. CM-A07 **Compat-C** is implemented: when a program calls `打印/print`, the loader injects the bundled `stdlib/io.mq.md` and the runtime routes to `io.写值` (all 15 value types, UTF-8 via `Memory`, `resource.write(stdout)`); `HostOp::Print` and the legacy `Value::display()` print path are removed, and a missing bundle fails with `kernel.unavailable`. Strict permits only the existing stdio console channel. Providers are registered through ADR-0033 (in-process) and ADR-0035 (worker helper). Still missing: directories, C ABI provider binding, provider packages, strict provider support. | | P4 Table logical/physical migration | **PASS (local gate); T1/T2/T3 future** | ADR-0032/CM-A08: `Value::Table` semantics and GFM AST laziness unchanged; `stdlib/data/table.mq.md` provides select/filter/sort/append/set/join/group/`转GFM` as value-returning `.mq.md` functions with input immutability; zero Rust table algorithms were added. Cross-storage equivalence is pinned by fixture 72 (row Table vs `.mq.md` columnar store, identical headers/rows/cells). The optional T1/T2/T3 physical-storage/column-store migration was not required by the gate and is not implemented. | | P5 third-party Provider / TCP / HTTP | **PASS (local gate); external network/CI and plugin-Worker resource binding open** | C10: `stdlib/net/http.mq.md` + fixture 71 parse HTTP/1.1 status/headers/chunked bodies and build requests; `http_over_tcp.rs` runs a loopback HTTP exchange wholly in `.mq.md` over `resource.open("tcp",...)`. ADR-0034 IP-literal blocking TCP endpoint (exact IP grant, project-only, 5s timeouts) and ADR-0033 in-process `ResourceProvider` v1 (registration, protocol/kind checks, name grant, mock read/write provider) ADR-0035 host-managed worker provider transport (framed JSON helper, ping/open/read/write/close, trusted-only) and ADR-0036 trusted C ABI provider (shared-library symbols, version/load checks) ADR-0037 local provider-package manifest installation and ADR-0038 C ABI provider worker binding (separate trusted helper process) are tested. External DNS/TLS/UDP, host HTTP, provider packages/signatures and the plugin-Worker resource binding remain out of scope. | diff --git a/docs/ci.md b/docs/ci.md new file mode 100644 index 0000000..12b89ba --- /dev/null +++ b/docs/ci.md @@ -0,0 +1,51 @@ +# CI/CD + +## Current setup + +- Git remote: `https://git.cflmy.cn/cflmy/marqdo-cli.git` +- Woodpecker: `https://ci.cflmy.cn` +- Pipeline definition: [`.woodpecker.yml`](../.woodpecker.yml) +- Credentials are local-only and ignored; see + [development-credentials.md](development-credentials.md). Do not put tokens in + pipeline files or commit messages. + +The default Docker pipeline runs on push and pull request: + +```text +test: + rustup component add clippy rustfmt + apt install curl/ca-certificates + Node.js 22 + cargo fmt --all -- --check + cargo clippy --workspace --all-targets -- -D warnings + cargo test --workspace --locked + +build (depends on test): + cargo build --release --locked -p marqdo-cli +``` + +Node.js 22 is required because the optional foreign-kernel tests use ES-module +syntax; Debian bookworm's Node 18 fails those tests. + +## What this pipeline does not cover + +- **Strict security lane**: needs a disposable VM/self-hosted runner with + Bubblewrap/AppArmor namespace support. See [security-vm.md](security-vm.md). + The Docker pipeline is not an OS-isolation proof. +- **Windows/macOS native lanes**: no runners are configured. +- **Release publication/signing**: no release job is defined. + +## Local reproduction + +```bash +export PATH="$HOME/.cargo/bin:$PATH" +cargo fmt --all -- --check +cargo clippy --workspace --all-targets -- -D warnings +cargo test --workspace --locked +cargo build --release --locked -p marqdo-cli +``` + +## Local API/trigger + +The ignored `.secrets/dev.env` may contain a Woodpecker API token for local +queries/triggers. The token is not needed by the pipeline itself and must never +be committed. diff --git a/docs/evidence/2026-11-20-rfc-cm-completion-audit.md b/docs/evidence/2026-11-20-rfc-cm-completion-audit.md index 4ca68b4..cb9030b 100644 --- a/docs/evidence/2026-11-20-rfc-cm-completion-audit.md +++ b/docs/evidence/2026-11-20-rfc-cm-completion-audit.md @@ -41,9 +41,10 @@ evidence, `12be02e` P4/P5 gates, `01f6fe4` worker provider, `b22a89e` C ABI, ## External / future items (not available or not claimed) -1. **No GitHub credentials / remote CI URL.** Windows/macOS native lanes and a - self-hosted G-C CI URL cannot be produced from this host. Strict evidence is - local VM evidence, not CI-signed. +1. **Native CI lanes are still unavailable.** The private Woodpecker Linux + Docker pipeline is green; Windows/macOS runners and a self-hosted G-C + security runner are not configured. Strict evidence is local VM evidence, + not CI-signed. 2. **The stdlib is intentionally in-repo for now** (ADR-0039). The deterministic offline package and digest contract are extraction-ready; creating/publishing a separate repository is deferred until a documented