feat(host): add trusted C ABI ResourceProvider v1
- Add the frozen marqdo_resource_provider.h ABI (version + open/read/write/ close/last_error) and a libloading-based host adapter with version/symbol checks and callsite-attached host errors (ADR-0036). - Add StdHost::register_c_resource_provider using the same kind/name validation and project-mode name grant as the in-process/worker providers. - Compile a C shared-library test provider; cover round-trip and fail-closed missing-library behavior. Trusted native code, not a sandbox; plugin-Worker binding remains open. - Update ADRs/spec/status/README/changelog and evidence. Gate: fmt, clippy -D warnings, 435 tests passed.
This commit is contained in:
1 parent
01f6fe46a7
commit
b22a89e7b4
15 files changed
+577
-2
No files matched your search
+7
-1
@@ -136,6 +136,9 @@ This is still a **local VM lane**, not a self-hosted GitHub Actions security URL
|
||||
PluginHandle `plugin/export` are read-only observation members (host id
|
||||
private); `stdlib/format.mq.md` reproduces builtin `打印`/`repr` for all 15
|
||||
value types, including Formula/Code/FunctionRef and Code UTF-8 byte length.
|
||||
- C ABI ResourceProvider v1 (CM-A09, ADR-0036): trusted shared libraries expose
|
||||
open/read/write/close through the frozen header; version/load failures are
|
||||
fail-closed; project-mode + name grant only. Plugin-Worker binding remains open.
|
||||
- Worker resource provider transport (CM-A09, ADR-0035): host-managed helper
|
||||
process with framed JSON, ping/open/read/write/close; project-mode + name
|
||||
grant; trusted, not a sandbox; C ABI binding still open.
|
||||
@@ -215,7 +218,7 @@ behavior. This table records only what is in this tree now.
|
||||
| P2 Marqdo-written allocator/data structures + minimal structure observation | **PASS (local pure lane); external stdlib repo publication pending** | `.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). Remaining outside C01–C12: publication as a separate external stdlib repository, and no remote CI URL. |
|
||||
| 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 C-Worker transport 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) and ADR-0035 host-managed worker provider transport (framed JSON helper, ping/open/read/write/close, trusted-only) are tested. External DNS/TLS/UDP, host HTTP, provider packages and the C ABI provider binding remain out of scope. |
|
||||
| P5 third-party Provider / TCP / HTTP | **PASS (local gate); external network/CI and C-Worker transport 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) are tested. External DNS/TLS/UDP, host HTTP, provider packages and the C ABI provider binding remain out of scope. |
|
||||
| P6 performance / native backends | **BASELINE ONLY** | reproducible profile harness `tools/perf/bench.py` and [`p6-profile`](evidence/2026-11-20-p6-profile.md) for 7 workloads; no bytecode/JIT/columnar numeric backend or equivalence/optimization gate yet |
|
||||
|
||||
The P1 memory domain is pure computation: it needs no grant and is available in
|
||||
@@ -261,6 +264,9 @@ user-written allocator is explicitly **not** claimed.
|
||||
echo tests.
|
||||
- [`evidence/2026-11-20-table-cross-storage.md`](evidence/2026-11-20-table-cross-storage.md)
|
||||
— P4 row-store Table vs `.mq.md` columnar store equivalence for sort/filter.
|
||||
- [`evidence/2026-11-20-c-provider.md`](evidence/2026-11-20-c-provider.md)
|
||||
— ADR-0036 C ABI ResourceProvider v1, compiled C adapter round-trip and
|
||||
fail-closed load/version checks.
|
||||
- [`evidence/2026-11-20-worker-provider.md`](evidence/2026-11-20-worker-provider.md)
|
||||
— ADR-0035 trusted worker resource-provider transport, framed-JSON helper
|
||||
round-trip and grant/mode/error tests.
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
# ADR-0036: C ABI ResourceProvider v1
|
||||
|
||||
Status: **Accepted (trusted native adapter; plugin-Worker binding still open)**
|
||||
Date: 2026-11-20
|
||||
Relates to: `docs/MARQDO_COMPUTE_CORE_STDLIB_MIGRATION_RFC_0002.md`
|
||||
(CM-A09, CM-A11, P5), ADR-0033, ADR-0035
|
||||
Header: `crates/marqdo-host/include/marqdo_resource_provider.h`
|
||||
Specs: `spec/evaluation.md`, `spec/security.md`
|
||||
Evidence: `docs/evidence/2026-11-20-c-provider.md`
|
||||
|
||||
## Context
|
||||
|
||||
ADR-0033 provides an in-process provider trait and ADR-0035 a host-managed
|
||||
helper process with framed JSON. CM-A09 also needs a **C ABI** so native
|
||||
adapters can expose resource endpoints without linking Rust or changing the
|
||||
runtime. This ADR freezes the first C ABI version for trusted native adapters.
|
||||
|
||||
## Decision
|
||||
|
||||
### 1. Version and symbols
|
||||
|
||||
```c
|
||||
#define MARQDO_RESOURCE_PROVIDER_ABI_VERSION 1u
|
||||
|
||||
uint32_t marqdo_resource_provider_abi_version(void);
|
||||
int32_t marqdo_resource_open(const char *kind, const char *descriptor,
|
||||
const char *rights_csv, uint64_t *out_token);
|
||||
int32_t marqdo_resource_read(uint64_t token, uint8_t *buffer,
|
||||
uint32_t capacity, uint32_t *out_read,
|
||||
int32_t *out_eof);
|
||||
int32_t marqdo_resource_write(uint64_t token, const uint8_t *bytes,
|
||||
uint32_t length, uint32_t *out_written);
|
||||
int32_t marqdo_resource_close(uint64_t token);
|
||||
int32_t marqdo_resource_last_error(char *buffer, uint32_t capacity);
|
||||
```
|
||||
|
||||
* The host loads the library, requires ABI version 1 and resolves the symbols
|
||||
at registration; missing symbols/version mismatch fail closed with
|
||||
`resource.unsupported`/`kernel.unavailable`.
|
||||
* Return `0` on success, nonzero on failure; failure text comes from
|
||||
`last_error` and is surfaced as a structured host error with the callsite
|
||||
span.
|
||||
* `rights_csv` is a comma-separated list. Provider tokens are private to the
|
||||
adapter; the host still issues the language-visible `ResourceHandle`.
|
||||
* Buffers are borrowed for the call only; the adapter must not retain host
|
||||
pointers. The host caps frame/buffer sizes by the existing resource limits.
|
||||
|
||||
### 2. Registration and authorization
|
||||
|
||||
* `StdHost::register_c_resource_provider(name, kinds, library_path)` is a host
|
||||
embedding API; it uses the same name/kind validation as ADR-0033 and the same
|
||||
provider-name grant at `resource.open`.
|
||||
* Project mode only; pure/strict refuse provider kinds. Strict stays
|
||||
fail-closed (CM-A11).
|
||||
* The C library runs in the host address space with host privileges. It is
|
||||
**trusted**, not sandboxed; the untrusted-plugin path remains the separate
|
||||
plugin Worker transport. Registration is not reachable from `.mq.md`.
|
||||
|
||||
### 3. Remaining CM-A09 work
|
||||
|
||||
* Plugin-Worker binding for `ResourceProvider` through the existing plugin ABI
|
||||
(buffer handoff/ownership/version negotiation).
|
||||
* Provider package installation, signatures and discovery.
|
||||
* Untrusted-provider isolation and strict-mode provider support.
|
||||
* ABI version negotiation beyond rejecting non-v1 libraries (future ADR).
|
||||
|
||||
## Consequences
|
||||
|
||||
* Native adapters can expose new resource kinds through `resource.*` without
|
||||
parser/`Value`/runtime/`HostOp` changes.
|
||||
* ABI mistakes are fail-closed at registration or surfaced as host errors; no
|
||||
fallback transport is attempted.
|
||||
* The header is small and stable enough for a future SDK/package workflow.
|
||||
|
||||
## Verification
|
||||
|
||||
`docs/evidence/2026-11-20-c-provider.md` records a compiled C test provider
|
||||
(`cc -shared`), version/load checks, open/read/write/close round-trip, missing
|
||||
library fail-closed and the full workspace gate.
|
||||
@@ -31,6 +31,8 @@ implementation status lives in `docs/STATUS.md`; frozen behavior is in
|
||||
| CM-A08 table logical value / stdlib algorithms / T0 storage | [0032](../adr/0032-table-logical-value-and-stdlib-algorithms.md) | Accepted |
|
||||
| CM-A09 in-process ResourceProvider v1 | [0033](../adr/0033-in-process-resource-provider-v1.md) | Accepted (trusted in-process slice) |
|
||||
| P5 blocking TCP resource endpoint v1 | [0034](../adr/0034-tcp-resource-endpoint.md) | Accepted (IP-literal, no DNS/TLS) |
|
||||
| CM-A09 worker resource-provider transport v1 | [0035](../adr/0035-worker-resource-provider-transport.md) | Accepted (trusted helper) |
|
||||
| CM-A09 C ABI ResourceProvider v1 | [0036](../adr/0036-c-abi-resource-provider.md) | Accepted (trusted native adapter) |
|
||||
| Table physical storage (T1/T2/T3), C/Worker provider transport, strict file/network resources | — | Not decided; do not implement by implication |
|
||||
|
||||
## What a future phase must not do
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
# RFC-CM CM-A09 evidence: C ABI ResourceProvider v1
|
||||
|
||||
Date: 2026-11-20 (Asia/Shanghai)
|
||||
Repository: `marqdo-cli`
|
||||
Baseline: `12be02e` plus this step's changes.
|
||||
Decision record: [ADR-0036](../adr/0036-c-abi-resource-provider.md)
|
||||
Header: [`marqdo_resource_provider.h`](../../crates/marqdo-host/include/marqdo_resource_provider.h)
|
||||
Related: [in-process provider](2026-11-20-provider-abi-cm-a09.md),
|
||||
[worker provider](2026-11-20-worker-provider.md), [STATUS §5](../STATUS.md).
|
||||
Scope: trusted native C ABI adapter; plugin-Worker binding still open.
|
||||
|
||||
## ABI
|
||||
|
||||
```c
|
||||
marqdo_resource_provider_abi_version() -> uint32_t (must be 1)
|
||||
marqdo_resource_open(kind, descriptor, rights_csv, *token) -> i32
|
||||
marqdo_resource_read(token, buffer, capacity, *read, *eof) -> i32
|
||||
marqdo_resource_write(token, bytes, length, *written) -> i32
|
||||
marqdo_resource_close(token) -> i32
|
||||
marqdo_resource_last_error(buffer, capacity) -> i32
|
||||
```
|
||||
|
||||
The host resolves these symbols at registration, rejects non-v1 libraries and
|
||||
missing symbols, attaches callsite spans to errors, and never lets a provider
|
||||
token enter a language `Value`, wire frame or trace.
|
||||
|
||||
## Test
|
||||
|
||||
`crates/marqdo-host/tests/c_provider.rs` (`#[cfg(unix)]`):
|
||||
|
||||
1. builds a C shared library with `cc -shared -fPIC` (skips if `cc` is absent);
|
||||
2. registers it as provider `cabi` for kind `cabi.sensor` with a project-mode
|
||||
grant;
|
||||
3. `resource.open/read/write/close` round-trips `c-`/`abi`, `write=3`, second
|
||||
close `resource.closed`;
|
||||
4. a missing library path fails with `kernel.unavailable`.
|
||||
|
||||
No Rust runtime/`HostOp`/parser change was needed; language code still sees the
|
||||
same `resource.*` surface.
|
||||
|
||||
## Security boundary
|
||||
|
||||
The C library is loaded in-process with host privileges. It is trusted native
|
||||
code and explicitly **not** a sandbox. Pure/strict refuse provider kinds; strict
|
||||
remains fail-closed. Untrusted plugin loading remains the separate plugin Worker
|
||||
transport.
|
||||
|
||||
## Not done
|
||||
|
||||
* Plugin-Worker resource-provider binding through the existing plugin ABI.
|
||||
* Provider package installation/signatures/discovery.
|
||||
* ABI version negotiation beyond v1 rejection.
|
||||
* Untrusted-provider isolation or strict-mode providers.
|
||||
* Windows shared-library build/lane.
|
||||
Reference in new issue
Block a user