refactor(cli,host): split command entry points and provider/effects modules

This commit is contained in:
Marqdo Agent committed 2026-11-21 08:54:29 +08:00
1 parent 791819a725
commit 550e66b1e2
10 files changed
+708 -671

No files matched your search

+6 -6
View File
@@ -241,12 +241,12 @@ This is still a **local VM lane**, not a self-hosted GitHub Actions security URL
now sorts `.mq.md` by the same relative path key as the CLI. Source/test baseline
`0d40de7`; later docs-only commits keep code/test bytes identical. Evidence:
[`docs-and-test-migration`](evidence/2026-11-21-docs-and-test-migration.md).
- Module-boundary refactor (review RFC-CM P1): CLI sandbox/capability policy
moved to `crates/cli/src/commands/sandbox.rs`; host resource open dispatch to
`crates/marqdo-host/src/host/resource_ops.rs`; explicitly granted process
execution to `crates/marqdo-host/src/process.rs`. `commands.rs` still owns
run/check/inspect and `host.rs` still owns provider registration; this is a
partial, behavior-preserving split.
- Module-boundary refactor (review RFC-CM P1): CLI split into
`commands/{sandbox,run,check,inspect}.rs`; host split into
`host/{resource_ops,providers,effects}.rs` plus `process.rs`. `commands.rs`
still owns init/fmt/lock/sync/package/tool and `host.rs` still owns the
`Host::invoke` dispatch and capability checks; this is a behavior-preserving
split, not a new crate or backend.
- Minimal structure observation/construction (RFC-CM CM-A04, ADR-0023):
value-semantics `list.append/concat`, `map.keys/has/get/set/remove`,
Unicode scalar `text.codepoints`/`text.from_codepoint`, and non-negative
+5 -4
View File
@@ -62,9 +62,10 @@ Layer rules:
human/machine output. It is not a semantic policy centre.
5. Callable Plugin and Resource Provider share one registry/authorization/audit
mechanism, but keep different capability types.
6. CLI sandbox policy is `commands/sandbox.rs`; host open-path policy is
`host/resource_ops.rs`; process execution is `process.rs`. These are child
modules, not new crates or a second backend.
6. CLI policy/commands are `commands/{sandbox,run,check,inspect}.rs`; host
open-path/providers/effects are `host/{resource_ops,providers,effects}.rs`;
process execution is `process.rs`. These are child modules, not new crates
or a second backend.
## 3. Dependency direction and public contracts
@@ -127,7 +128,7 @@ that a phase is complete.
| P1 | `std:fs/file` read/write/copy and `resource.request` fs metadata/directory operations are implemented; append/seek/watch/recursive walk remain open | open |
| P1 | No file append/seek/watch/recursive directory walk | open; future Resource Operation extension |
| P1 | JSON/CSV product parsers are implemented; no streaming/multi-line CSV or depth-bounded JSON walker | open |
| P1 | CLI sandbox policy moved to `crates/cli/src/commands/sandbox.rs`; host resource open to `host/resource_ops.rs` and process to `process.rs`; `commands.rs`/`host.rs` still mix run/check/inspect and provider registration | partial refactor, behavior-preserving |
| P1 | CLI split into `commands/{sandbox,run,check,inspect}.rs`; host split into `host/{resource_ops,providers,effects}.rs` plus `process.rs`; `commands.rs` still owns init/fmt/lock/sync/package/tool and `host.rs` still owns `Host::invoke` dispatch | mostly split; package/tool/lock/sync and invoke dispatch remain |
| P2 | HTTP parsing is Unicode-codepoint oriented; a general byte body is not the only path | open; convert before a general network release |
| P2 | No DNS, TLS, listener or UDP provider | open |
| P2 | `std:path`, a regex subset, `std:datetime`, `std:clock`, `std:env` and `std:process` are implemented; no secure random or compression | open |
+14 -9
View File
@@ -1,7 +1,7 @@
# Evidence: CLI/Host responsibility split
Date: 2026-11-21 (Asia/Shanghai)
Source baseline: `3ef18fb496096d97e3c48ff661f0b2ad00cdcdc3`
Source baseline: `791819a72576f54e406e7dfbbe6ac635f9b1edd2`
Repository: `marqdo-cli`
RFC item: P1 module boundaries
@@ -9,14 +9,19 @@ RFC item: P1 module boundaries
| New module | Responsibility |
|---|---|
| `crates/cli/src/commands/sandbox.rs` | `SandboxSettings`, mode parsing, strict preflight and CLI-to-`Capabilities` mapping; `commands.rs` re-exports it |
| `crates/cli/src/commands/sandbox.rs` | `SandboxSettings`, mode parsing, strict preflight and CLI-to-`Capabilities` mapping |
| `crates/cli/src/commands/run.rs` | `execute` run-session assembly and `read_stdin` |
| `crates/cli/src/commands/check.rs` | `check` command |
| `crates/cli/src/commands/inspect.rs` | `inspect` command and `InspectFlags` |
| `crates/marqdo-host/src/host/resource_ops.rs` | `open_resource_stream` stdio/file/tcp/provider dispatch; child module of `host` |
| `crates/marqdo-host/src/host/providers.rs` | trusted in-process/worker/C-ABI/package provider registration |
| `crates/marqdo-host/src/host/effects.rs` | `next_seq` and `record_resource_effect` trace helpers |
| `crates/marqdo-host/src/process.rs` | explicitly granted `process.run` execution, timeout and output caps |
This is a **behavior-preserving** refactor: no public CLI flag, host trait
method, builtin, spec or stdlib API changed. No new crate was added. Provider
registration and `commands.rs` run/check/inspect still live in their original
files.
method, builtin, spec or stdlib API changed. No new crate was added.
`commands.rs` still owns init/fmt/lock/sync/package/tool and `host.rs` still
owns `Host::invoke` dispatch and capability checks.
## Commands
@@ -31,7 +36,7 @@ python3 tools/pack-stdlib.py PASS
## Not covered
`commands.rs` still contains run/check/inspect/package/tool command bodies
and `host.rs` still contains provider registration and capability dispatch.
A complete split needs a later behavior-preserving change; it is not claimed
here.
`commands.rs` still contains init/fmt/lock/sync/package/tool command bodies
and `host.rs` still contains `Host::invoke` dispatch, capability checks and
register entry points. A complete split needs a later behavior-preserving
change; it is not claimed here.