docs: defer stdlib extraction; add local credential and Woodpecker setup
CI / fmt + clippy + test (Linux x86_64) (push) Waiting to run
CI / schema instance validation + consumers (push) Waiting to run
CI / runtime contract (macos-latest) (push) Waiting to run
CI / runtime contract (windows-latest) (push) Waiting to run
ci/woodpecker/push/woodpecker Pipeline was canceled
CI / fmt + clippy + test (Linux x86_64) (push) Waiting to run
CI / schema instance validation + consumers (push) Waiting to run
CI / runtime contract (macos-latest) (push) Waiting to run
CI / runtime contract (windows-latest) (push) Waiting to run
ci/woodpecker/push/woodpecker Pipeline was canceled
- Add ADR-0039: keep stdlib in-repo while architecture is small; extraction is a future trigger-driven option, not a pending gate. Update ADR-0028, STATUS, architecture index, package/P2/completion evidence. - Add .woodpecker.yml (fmt/clippy/test + release build) for ci.cflmy.cn. - Add docs/development-credentials.md and ignore .secrets/ plus .env.local; real credentials stay in the ignored local file and are never committed. Gate: fmt, clippy -D warnings, 440 tests passed.
This commit is contained in:
1 parent
e3638f5720
commit
328f1a8db3
10 files changed
+167
-20
No files matched your search
@@ -20,3 +20,7 @@ dist/
|
|||||||
|
|
||||||
# Local VM/QEMU tooling and disk images
|
# Local VM/QEMU tooling and disk images
|
||||||
.tools/
|
.tools/
|
||||||
|
|
||||||
|
# Local-only credentials and environment files
|
||||||
|
.secrets/
|
||||||
|
.env.local
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Woodpecker CI pipeline for the Rust workspace.
|
||||||
|
# The strict security lane needs a disposable VM/self-hosted runner and is
|
||||||
|
# intentionally not part of this docker pipeline; see docs/security-vm.md.
|
||||||
|
when:
|
||||||
|
event: [push, pull_request]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
test:
|
||||||
|
image: rust:1.100-bookworm
|
||||||
|
commands:
|
||||||
|
- rustup component add clippy
|
||||||
|
- cargo fmt --all -- --check
|
||||||
|
- cargo clippy --workspace --all-targets -- -D warnings
|
||||||
|
- cargo test --workspace --locked
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: rust:1.100-bookworm
|
||||||
|
depends_on: [test]
|
||||||
|
commands:
|
||||||
|
- cargo build --release --locked -p marqdo-cli
|
||||||
|
artifacts:
|
||||||
|
- target/release/marqdo
|
||||||
+5
-4
@@ -175,9 +175,10 @@ This is still a **local VM lane**, not a self-hosted GitHub Actions security URL
|
|||||||
running a `std:io` project and that tampering is rejected. `打印/print` is
|
running a `std:io` project and that tampering is rejected. `打印/print` is
|
||||||
routed to the bundled stdlib (Compat-C, ADR-0030/0031); there is no legacy
|
routed to the bundled stdlib (Compat-C, ADR-0030/0031); there is no legacy
|
||||||
host formatter. `tools/pack-stdlib.py` additionally emits a byte-deterministic
|
host formatter. `tools/pack-stdlib.py` additionally emits a byte-deterministic
|
||||||
offline archive + descriptor for the future external repository
|
offline archive + descriptor as an extraction-ready artifact
|
||||||
([evidence](evidence/2026-11-20-stdlib-package.md)); publication/signing is
|
([evidence](evidence/2026-11-20-stdlib-package.md)). The stdlib intentionally
|
||||||
still external.
|
stays in this repository for now (ADR-0039); extraction is a future option
|
||||||
|
when size/release cadence requires it, not a pending gate.
|
||||||
- Resource streams (RFC-CM CM-A06, ADR-0025): opaque host-issued `Resource`
|
- Resource streams (RFC-CM CM-A06, ADR-0025): opaque host-issued `Resource`
|
||||||
handles with `resource.open/read/write/close`; bytes move only through
|
handles with `resource.open/read/write/close`; bytes move only through
|
||||||
`Memory`; stdout write is capability/output-budget checked and project-file
|
`Memory`; stdout write is capability/output-budget checked and project-file
|
||||||
@@ -221,7 +222,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 |
|
| 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) |
|
| 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); 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. |
|
| 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). |
|
||||||
| 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. |
|
| 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. |
|
| 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. |
|
| 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. |
|
||||||
|
|||||||
@@ -21,8 +21,9 @@ standard library that ordinary projects can use offline needs:
|
|||||||
|
|
||||||
The RFC requires the official distribution to carry a tested stdlib version
|
The RFC requires the official distribution to carry a tested stdlib version
|
||||||
offline, while allowing independent releases. This ADR freezes the **bundled
|
offline, while allowing independent releases. This ADR freezes the **bundled
|
||||||
first slice**; it does not create the external `cflmy/marqdo-stdlib`
|
first slice**. A separate `marqdo-stdlib` repository is intentionally deferred
|
||||||
repository or a public publishing workflow.
|
by ADR-0039: the bundle stays in this repository while the architecture is
|
||||||
|
small and clear; the deterministic package remains extraction-ready.
|
||||||
|
|
||||||
## Decision
|
## Decision
|
||||||
|
|
||||||
@@ -115,8 +116,8 @@ version and the CLI's compatibility table before release.
|
|||||||
|
|
||||||
## Non-goals
|
## Non-goals
|
||||||
|
|
||||||
* Creating/publishing the external `cflmy/marqdo-stdlib` repository or a
|
* Creating/publishing a separate `cflmy/marqdo-stdlib` repository now; see
|
||||||
package registry entry.
|
ADR-0039 for the deliberate deferral and future extraction triggers.
|
||||||
* Automatic download/update, Git fetching, or manifest-driven stdlib
|
* Automatic download/update, Git fetching, or manifest-driven stdlib
|
||||||
installation.
|
installation.
|
||||||
* A second plugin/provider system or a second module search path.
|
* A second plugin/provider system or a second module search path.
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
# ADR-0039: Stdlib extraction is intentionally deferred
|
||||||
|
|
||||||
|
Status: **Accepted**
|
||||||
|
Date: 2026-11-20
|
||||||
|
Relates to: `docs/MARQDO_COMPUTE_CORE_STDLIB_MIGRATION_RFC_0002.md`
|
||||||
|
(CM-A10, P2/P3), ADR-0028
|
||||||
|
Supersedes: the assumption in ADR-0028/CM-A10 evidence that a separate
|
||||||
|
`marqdo-stdlib` repository must be created as the next step.
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
The RFC and the first CM-A10 slice anticipated a separate `marqdo-stdlib`
|
||||||
|
repository so the standard library could be versioned and released independently
|
||||||
|
from the CLI. After implementing the bundled tree, `std:` imports, digest
|
||||||
|
identity, frozen-binary closure, table/HTTP modules and the deterministic
|
||||||
|
offline package, the current architecture is clear and the bundle is still
|
||||||
|
small. A separate repository would add release, version-mapping, signing and
|
||||||
|
cross-repo CI overhead without a present consumer that needs an independent
|
||||||
|
release cadence.
|
||||||
|
|
||||||
|
This decision **does not delete** the extraction work or the packaging artifact;
|
||||||
|
it changes the sequencing/intent.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
1. **Current policy: one repository.** `stdlib/` stays in `marqdo-cli` as the
|
||||||
|
official, verified bundle. `std:` imports, the SHA-256 tree digest,
|
||||||
|
module-instance ids and `project.stdlib` Analysis identity are unchanged.
|
||||||
|
2. **Extraction remains an explicit future option.** The deterministic package
|
||||||
|
(`tools/pack-stdlib.py`), `marqdo.stdlib-package` descriptor and version
|
||||||
|
mapping remain maintained as the extraction-ready artifact.
|
||||||
|
3. **No current release work is blocked on a separate repo.** Documentation,
|
||||||
|
STATUS and evidence must not describe "publish the external stdlib repo" as
|
||||||
|
a pending P2/CM-A10 gate; it is an intentionally deferred follow-up.
|
||||||
|
4. **Extraction triggers** (any one requires a new ADR before splitting):
|
||||||
|
* the bundle grows enough that CLI release cadence and stdlib cadence
|
||||||
|
conflict;
|
||||||
|
* a non-CLI consumer needs an independent stdlib release/SemVer line;
|
||||||
|
* multiple implementations or a provider/package ecosystem need version
|
||||||
|
skew management;
|
||||||
|
* the stdlib needs a different review/ownership boundary or signing policy.
|
||||||
|
5. **Compatibility if extraction happens:** keep `std:` import spelling,
|
||||||
|
module ids, digest algorithm and Analysis `project.stdlib` shape; publish a
|
||||||
|
version mapping and enforce the same frozen-binary/tamper gates.
|
||||||
|
|
||||||
|
## Non-goals
|
||||||
|
|
||||||
|
* Deleting the packaging script or historical CM-A10 evidence.
|
||||||
|
* Changing `std:` semantics, bundle digest or module ids now.
|
||||||
|
* Creating a package registry, signing infrastructure or cross-repo CI while
|
||||||
|
there is no independent consumer.
|
||||||
|
* Declaring the stdlib frozen forever; the trigger list above is intentional.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
* The repository remains the single source of truth and the dev loop stays
|
||||||
|
simple.
|
||||||
|
* "Not external" is no longer reported as a missing gate or blocker.
|
||||||
|
* A future split can reuse the deterministic archive and digest contract
|
||||||
|
without redoing the bundling design.
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
Docs/STATUS/evidence reference this ADR; `cargo test --workspace --locked`
|
||||||
|
continues to exercise the bundled `std:` imports, digest and frozen-CLI lane.
|
||||||
@@ -6,7 +6,7 @@ normative RFC text stays at its reviewable path under `docs/`.
|
|||||||
| Document | Status | Implemented part |
|
| Document | Status | Implemented part |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| [RFC-CM-0001: compute machine, addressable memory and system boundary](../MARQDO_COMPUTE_MACHINE_RFC_0001.md) | Draft / design input | R1 (P1): `Memory` value, `memory.new/size/grow`, byte read/write, Memory-index assignment, budgets, wire/host rejection. Implemented per [ADR-0022](../adr/0022-addressable-memory-and-place-assignment.md); see [STATUS §5](../STATUS.md). |
|
| [RFC-CM-0001: compute machine, addressable memory and system boundary](../MARQDO_COMPUTE_MACHINE_RFC_0001.md) | Draft / design input | R1 (P1): `Memory` value, `memory.new/size/grow`, byte read/write, Memory-index assignment, budgets, wire/host rejection. Implemented per [ADR-0022](../adr/0022-addressable-memory-and-place-assignment.md); see [STATUS §5](../STATUS.md). |
|
||||||
| [RFC-CM-0002: minimal core, stdlib self-hosting and system capability migration](../MARQDO_COMPUTE_CORE_STDLIB_MIGRATION_RFC_0002.md) | Draft / design input | P0/P1, a **partial P2**, and a **partial P3** first slice (ADR-0025/0026: stdout write, granted project-file read and buffered project-file write via `resource.*`; strict permits only the stdio console channel; ADR-0027/0030/0031 Compat-C print via bundled stdlib, no legacy host formatter). P2: fixtures 48–50 (`.mq.md` bump allocator, u32 codec, linked list/traversal, failed-allocation atomicity), CM-A04 structure primitives for List/Map/Text/Table (ADR-0023, fixtures 51–54), and a `.mq.md` first-fit free-list allocator with block splitting, address-adjacent coalescing and `Result` maps (ADR-0024, fixture 55), plus a `Memory`-backed binary tree with recursive insert/in-order traversal (fixture 56), a `.mq.md` CSV row splitter (fixture 57), an open-addressing hash table with linear probing (fixture 58), a `.mq.md` UTF-8 encoder and validating decoder (`utf8.truncated`/`invalid_continuation`/`invalid_scalar`) (fixtures 59–60), a `Memory`-backed graph adjacency list (fixture 61), a recursive JSON parser/formatter for arrays, objects, strings with escapes, ints/floats/booleans/null and error Results (fixture 62), a `Memory`-backed stack bytecode VM with PUSH/ADD/MUL/JMP/JZ/HALT (fixture 63), big-endian 16/32/64-bit plus LEB128 integer codecs (fixture 64), a `.mq.md` table sort rebuilding the table without mutating the input (fixture 65), a table join built from `table.row/columns/cell` (fixture 67), and a quoted/escaped CSV row parser (fixture 68), table group (fixture 69) and an Int matrix multiply (fixture 70). No separate external stdlib repo, network/generic providers, P4 physical storage migration, P5 providers or P6 performance work. |
|
| [RFC-CM-0002: minimal core, stdlib self-hosting and system capability migration](../MARQDO_COMPUTE_CORE_STDLIB_MIGRATION_RFC_0002.md) | Draft / design input | P0/P1, a **partial P2**, and a **partial P3** first slice (ADR-0025/0026: stdout write, granted project-file read and buffered project-file write via `resource.*`; strict permits only the stdio console channel; ADR-0027/0030/0031 Compat-C print via bundled stdlib, no legacy host formatter). P2: fixtures 48–50 (`.mq.md` bump allocator, u32 codec, linked list/traversal, failed-allocation atomicity), CM-A04 structure primitives for List/Map/Text/Table (ADR-0023, fixtures 51–54), and a `.mq.md` first-fit free-list allocator with block splitting, address-adjacent coalescing and `Result` maps (ADR-0024, fixture 55), plus a `Memory`-backed binary tree with recursive insert/in-order traversal (fixture 56), a `.mq.md` CSV row splitter (fixture 57), an open-addressing hash table with linear probing (fixture 58), a `.mq.md` UTF-8 encoder and validating decoder (`utf8.truncated`/`invalid_continuation`/`invalid_scalar`) (fixtures 59–60), a `Memory`-backed graph adjacency list (fixture 61), a recursive JSON parser/formatter for arrays, objects, strings with escapes, ints/floats/booleans/null and error Results (fixture 62), a `Memory`-backed stack bytecode VM with PUSH/ADD/MUL/JMP/JZ/HALT (fixture 63), big-endian 16/32/64-bit plus LEB128 integer codecs (fixture 64), a `.mq.md` table sort rebuilding the table without mutating the input (fixture 65), a table join built from `table.row/columns/cell` (fixture 67), and a quoted/escaped CSV row parser (fixture 68), table group (fixture 69) and an Int matrix multiply (fixture 70). The stdlib intentionally remains in this repository for now (ADR-0039); no separate external repo, network/generic providers, P4 physical storage migration, P5 providers or P6 performance work. |
|
||||||
|
|
||||||
The RFCs are architecture constraints, not evidence that a feature exists. The
|
The RFCs are architecture constraints, not evidence that a feature exists. The
|
||||||
implementation status lives in `docs/STATUS.md`; frozen behavior is in
|
implementation status lives in `docs/STATUS.md`; frozen behavior is in
|
||||||
@@ -35,6 +35,7 @@ implementation status lives in `docs/STATUS.md`; frozen behavior is in
|
|||||||
| CM-A09 C ABI ResourceProvider v1 | [0036](../adr/0036-c-abi-resource-provider.md) | Accepted (trusted native adapter) |
|
| CM-A09 C ABI ResourceProvider v1 | [0036](../adr/0036-c-abi-resource-provider.md) | Accepted (trusted native adapter) |
|
||||||
| CM-A09 provider package manifest v1 | [0037](../adr/0037-provider-package-manifest.md) | Accepted (host-side install) |
|
| CM-A09 provider package manifest v1 | [0037](../adr/0037-provider-package-manifest.md) | Accepted (host-side install) |
|
||||||
| CM-A09 C ABI provider worker binding v1 | [0038](../adr/0038-c-abi-provider-worker-binding.md) | Accepted (trusted helper) |
|
| CM-A09 C ABI provider worker binding v1 | [0038](../adr/0038-c-abi-provider-worker-binding.md) | Accepted (trusted helper) |
|
||||||
|
| Stdlib extraction deferral | [0039](../adr/0039-stdlib-extraction-intent.md) | Accepted (in-repo for now) |
|
||||||
| Table physical storage (T1/T2/T3), C/Worker provider transport, strict file/network resources | — | Not decided; do not implement by implication |
|
| 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
|
## What a future phase must not do
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
# Local development credentials
|
||||||
|
|
||||||
|
Credentials are **not committed**. They live in the git-ignored `.secrets/`
|
||||||
|
directory (or the untracked `.env.local`) so local development can use the
|
||||||
|
private Git and Woodpecker instances without rotating secrets through the
|
||||||
|
repository.
|
||||||
|
|
||||||
|
## Where to put them
|
||||||
|
|
||||||
|
`.secrets/dev.env` (ignored, mode 600) should define:
|
||||||
|
|
||||||
|
```dotenv
|
||||||
|
MARQDO_GIT_REMOTE=https://git.cflmy.cn/cflmy/marqdo-cli.git
|
||||||
|
MARQDO_GIT_USERNAME=<username>
|
||||||
|
MARQDO_GIT_TOKEN=<git access token>
|
||||||
|
MARQDO_WOODPECKER_URL=https://ci.cflmy.cn
|
||||||
|
MARQDO_WOODPECKER_TOKEN=<Woodpecker API token>
|
||||||
|
MARQDO_CI_SECRET=<optional CI secret>
|
||||||
|
```
|
||||||
|
|
||||||
|
Do not put real values in this document, tests, CI YAML or commit messages.
|
||||||
|
The repository's `.gitignore` excludes `.secrets/` and `.env.local`.
|
||||||
|
|
||||||
|
## Git push
|
||||||
|
|
||||||
|
` .secrets/git-askpass.sh ` returns the username/token for HTTPS prompts:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
set -a; . ./.secrets/dev.env; set +a
|
||||||
|
GIT_ASKPASS="$PWD/.secrets/git-askpass.sh" git push origin master
|
||||||
|
```
|
||||||
|
|
||||||
|
Never embed the token in a remote URL stored in `.git/config`, shell history or
|
||||||
|
a CI file.
|
||||||
|
|
||||||
|
## Woodpecker API
|
||||||
|
|
||||||
|
```bash
|
||||||
|
set -a; . ./.secrets/dev.env; set +a
|
||||||
|
curl -fsS -H "Authorization: Bearer $MARQDO_WOODPECKER_TOKEN" \
|
||||||
|
"$MARQDO_WOODPECKER_URL/api/user/repos"
|
||||||
|
```
|
||||||
|
|
||||||
|
CI itself is defined in `.woodpecker.yml`; the token is only for local API
|
||||||
|
queries/triggering, not for the pipeline. Configure any privileged secrets in
|
||||||
|
the Woodpecker repository settings, never in this repository.
|
||||||
|
|
||||||
|
## What is tracked
|
||||||
|
|
||||||
|
- `.woodpecker.yml` — public CI pipeline definition.
|
||||||
|
- this document — names/usage only, no values.
|
||||||
|
- `.secrets/` and `.env.local` — ignored local files.
|
||||||
@@ -63,7 +63,7 @@ the fixed CLI hash and stdlib tamper rejection (ADR-0028).
|
|||||||
|
|
||||||
## Remaining (not a C01–C12 gap)
|
## Remaining (not a C01–C12 gap)
|
||||||
|
|
||||||
* Publication of `marqdo-stdlib` as a separate external repository with a
|
* The stdlib is intentionally in-repo for now (ADR-0039); a separate
|
||||||
signed version mapping; the bundled tree, digest and offline layout are
|
repository with a signed version mapping is a future extraction option, not
|
||||||
already tested in-repo.
|
a P2 gate. The bundled tree, digest and offline layout are tested in-repo.
|
||||||
* No GitHub CI URL / Windows/macOS lanes from this host.
|
* No GitHub CI URL / Windows/macOS lanes from this host.
|
||||||
@@ -19,7 +19,7 @@ checked-in evidence. It also states exactly what remains external.
|
|||||||
| CM-A07 Compat-B/C print migration | **PASS** | ADR-0030/0031; `print_routing.rs`, `conformance_semantics`, `HostOp::Print` removed |
|
| CM-A07 Compat-B/C print migration | **PASS** | ADR-0030/0031; `print_routing.rs`, `conformance_semantics`, `HostOp::Print` removed |
|
||||||
| CM-A08 Table semantics | **PASS local** | ADR-0032; `stdlib/data/table.mq.md`, `stdlib_table.rs`, fixture 72 cross-storage, `转GFM` |
|
| CM-A08 Table semantics | **PASS local** | ADR-0032; `stdlib/data/table.mq.md`, `stdlib_table.rs`, fixture 72 cross-storage, `转GFM` |
|
||||||
| CM-A09 provider ABI | **PASS local** | ADR-0033 in-process, ADR-0035 worker helper, ADR-0036 C ABI, ADR-0037 package manifest, ADR-0038 C ABI worker binding; host/provider tests |
|
| CM-A09 provider ABI | **PASS local** | ADR-0033 in-process, ADR-0035 worker helper, ADR-0036 C ABI, ADR-0037 package manifest, ADR-0038 C ABI worker binding; host/provider tests |
|
||||||
| CM-A10 offline stdlib packaging | **PASS local** | bundled tree + digest + Analysis identity + frozen binary; deterministic offline archive; external repository publication remains external |
|
| CM-A10 offline stdlib packaging | **PASS local** | bundled tree + digest + Analysis identity + frozen binary; deterministic offline archive; stdlib stays in-repo by design (ADR-0039) |
|
||||||
| CM-A11 strict resource verification | **PASS (VM)** | strict lane at `70d916d`: 7/7 adversarial, Compat-C print, file/TCP/provider refusal, `--allow-net` rejection, forged marker; [evidence](2026-11-20-strict-resource-cm-a11.md) |
|
| CM-A11 strict resource verification | **PASS (VM)** | strict lane at `70d916d`: 7/7 adversarial, Compat-C print, file/TCP/provider refusal, `--allow-net` rejection, forged marker; [evidence](2026-11-20-strict-resource-cm-a11.md) |
|
||||||
| P4 table logical/physical | **PASS local** | row-store vs columnar fixture 72; GFM render; no Rust table algorithm |
|
| P4 table logical/physical | **PASS local** | row-store vs columnar fixture 72; GFM render; no Rust table algorithm |
|
||||||
| P5 provider/TCP/HTTP | **PASS local** | in-process/worker/C provider, IP-literal TCP, `.mq.md` HTTP framing + loopback HTTP over TCP |
|
| P5 provider/TCP/HTTP | **PASS local** | in-process/worker/C provider, IP-literal TCP, `.mq.md` HTTP framing + loopback HTTP over TCP |
|
||||||
@@ -44,9 +44,10 @@ evidence, `12be02e` P4/P5 gates, `01f6fe4` worker provider, `b22a89e` C ABI,
|
|||||||
1. **No GitHub credentials / remote CI URL.** Windows/macOS native lanes and a
|
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
|
self-hosted G-C CI URL cannot be produced from this host. Strict evidence is
|
||||||
local VM evidence, not CI-signed.
|
local VM evidence, not CI-signed.
|
||||||
2. **No separate external `marqdo-stdlib` repository publication.** The
|
2. **The stdlib is intentionally in-repo for now** (ADR-0039). The
|
||||||
deterministic offline package and digest contract exist; publishing/signing
|
deterministic offline package and digest contract are extraction-ready;
|
||||||
the external repo is outside this host.
|
creating/publishing a separate repository is deferred until a documented
|
||||||
|
trigger (size, independent cadence, multi-consumer versioning) occurs.
|
||||||
3. **Existing plugin-Worker ABI provider binding** is not implemented; provider
|
3. **Existing plugin-Worker ABI provider binding** is not implemented; provider
|
||||||
ABI is delivered via ADR-0033/0035/0036/0037/0038.
|
ABI is delivered via ADR-0033/0035/0036/0037/0038.
|
||||||
4. **P6 optimizer/backends** are not implemented; only a reproducible baseline
|
4. **P6 optimizer/backends** are not implemented; only a reproducible baseline
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Repository: `marqdo-cli`
|
|||||||
Baseline: `e985da2` plus this step's changes.
|
Baseline: `e985da2` plus this step's changes.
|
||||||
Related: [ADR-0028](../adr/0028-bundled-stdlib-and-std-imports.md),
|
Related: [ADR-0028](../adr/0028-bundled-stdlib-and-std-imports.md),
|
||||||
[STATUS §5](../STATUS.md).
|
[STATUS §5](../STATUS.md).
|
||||||
Scope: packaging artifact for the future external repository; no CLI command.
|
Scope: packaging artifact for an optional future extraction; no CLI command.
|
||||||
|
|
||||||
## Artifact
|
## Artifact
|
||||||
|
|
||||||
@@ -33,9 +33,9 @@ reproducible inputs.
|
|||||||
|
|
||||||
## Boundary
|
## Boundary
|
||||||
|
|
||||||
This does **not** publish the separate `marqdo-stdlib` repository or sign a
|
This does **not** publish a separate `marqdo-stdlib` repository. ADR-0039
|
||||||
release; no GitHub credentials/remote is available from this host. It gives the
|
intentionally keeps the stdlib in this repository for now; the archive is
|
||||||
future external repository a deterministic archive layout and digest contract.
|
maintained as extraction-ready output for a later, trigger-driven split.
|
||||||
|
|
||||||
The in-repo CLI still uses the bundled `stdlib/` tree with digest verification
|
The in-repo CLI still uses the bundled `stdlib/` tree with digest verification
|
||||||
and the frozen-binary closure test (ADR-0028); this archive is not loaded by
|
and the frozen-binary closure test (ADR-0028); this archive is not loaded by
|
||||||
|
|||||||
Reference in new issue
Block a user