feat(package): lock v3 package-instance graph and strict sync (B-02 B-03 B-04)

- lock the full transitive closure with per-instance alias edges, root
  manifest digest, full content digests and structured path/git sources
- reject v1/v2 locks; validate ids, digests, edges, reachability and sources
- resolve every locked edge by (parent instance, alias) and fail closed on
  missing locks/edges/records, digest or source drift and root drift
- require a lock for run/check/inspect when dependencies exist and map lock
  errors to exit 1
- make sync strict in both modes, never rewrite the lock, and materialize the
  whole closure with env.json schema 2
- verify Git cache markers, require full commit hashes and confirm HEAD
- stop add/remove from patching the lock; regenerate example locks
- update package-format.md and STATUS for S1
This commit is contained in:
cflmy committed 2026-11-20 12:55:30 +08:00
1 parent cd90f38ce1
commit 6fed396d20
8 files changed
+1243 -275

No files matched your search

+56 -52
View File
@@ -144,7 +144,11 @@ fn load_project(file: Option<&Path>, json: bool) -> Result<LoadedProject, i32> {
} else {
eprintln!("error: {error}");
}
Err(2)
if error.contains("marqdo.lock") || error.contains("lockfile") {
Err(1)
} else {
Err(2)
}
}
}
}
@@ -1081,15 +1085,21 @@ pub fn lock(json: bool) -> i32 {
return 2;
}
};
let lockfile = match build_lockfile(&root, &manifest) {
Ok(lockfile) => lockfile,
Err(error) => {
eprintln!("error: {error}");
return 1;
}
};
let graph =
match marqdo_package::PackageResolver::new(root.clone(), Some(manifest.clone()), None)
.with_fetch(true)
.with_unlocked(true)
.resolve_lock_graph()
{
Ok(graph) => graph,
Err(error) => {
eprintln!("error: {error}");
return 1;
}
};
let lockfile = graph.lock;
let path = root.join(marqdo_package::LOCK_FILE);
if let Err(error) = std::fs::write(&path, lockfile.to_yaml()) {
if let Err(error) = write_atomic(&path, lockfile.to_yaml().as_bytes()) {
eprintln!("error: cannot write {}: {error}", path.display());
return 1;
}
@@ -1140,23 +1150,14 @@ pub fn sync(locked: bool, json: bool) -> i32 {
return 1;
}
};
let expected = match build_lockfile(&root, &manifest) {
Ok(lockfile) => lockfile,
Err(error) => {
eprintln!("error: {error}");
return 1;
}
};
if locked && expected != lockfile {
eprintln!(
"error: lockfile is out of date or dependency contents changed; run `marqdo lock`"
);
if let Err(error) = lockfile.validate_root(&manifest) {
eprintln!("error: {error}");
return 1;
}
let resolver =
marqdo_package::PackageResolver::new(root, Some(manifest.clone()), Some(lockfile))
.with_fetch(true);
if let Err(error) = resolver.materialize_env(&manifest, &expected) {
marqdo_package::PackageResolver::new(root, Some(manifest.clone()), Some(lockfile.clone()))
.with_fetch(!locked);
if let Err(error) = resolver.materialize_env(&lockfile) {
eprintln!("error: cannot materialize project environment: {error}");
return 1;
}
@@ -1165,12 +1166,12 @@ pub fn sync(locked: bool, json: bool) -> i32 {
"command": "sync",
"success": true,
"locked": locked,
"packages": expected.packages,
"packages": lockfile.packages,
}));
} else {
println!(
"synchronized {} package(s){} into {}",
expected.packages.len(),
lockfile.packages.len(),
if locked { " (locked)" } else { "" },
resolver.env_root().display()
);
@@ -1189,27 +1190,34 @@ fn discover_project_root() -> Result<PathBuf, String> {
})
}
fn build_lockfile(
root: &Path,
manifest: &marqdo_package::Manifest,
) -> Result<marqdo_package::LockFile, String> {
let resolver =
marqdo_package::PackageResolver::new(root, Some(manifest.clone()), None).with_fetch(true);
let mut packages = Vec::new();
for name in manifest.dependencies.keys() {
let resolved = resolver.resolve_alias(name)?;
packages.push(marqdo_package::LockedPackage {
name: name.clone(),
instance_id: resolved.package.instance_id,
source: resolved.package.origin.source(),
sha256: resolved.package.content_digest,
});
fn write_atomic(path: &Path, contents: &[u8]) -> Result<(), String> {
let file_name = path
.file_name()
.map(|name| name.to_string_lossy().to_string())
.unwrap_or_else(|| "marqdo.lock".to_string());
let temp = path.with_file_name(format!(
".{file_name}.tmp-{}-{}",
std::process::id(),
std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.map(|duration| duration.as_nanos())
.unwrap_or(0)
));
let result = (|| -> Result<(), String> {
let mut file = std::fs::File::create(&temp)
.map_err(|error| format!("cannot create {}: {error}", temp.display()))?;
std::io::Write::write_all(&mut file, contents)
.map_err(|error| format!("cannot write {}: {error}", temp.display()))?;
file.sync_all()
.map_err(|error| format!("cannot sync {}: {error}", temp.display()))?;
std::fs::rename(&temp, path)
.map_err(|error| format!("cannot publish {}: {error}", path.display()))?;
Ok(())
})();
if result.is_err() {
let _ = std::fs::remove_file(&temp);
}
packages.sort_by(|a, b| a.name.cmp(&b.name));
Ok(marqdo_package::LockFile {
lock_version: 2,
packages,
})
result
}
/// `marqdo add <name> --path <dir> [--git URL --rev SHA]`.
@@ -1295,13 +1303,8 @@ pub fn remove(name: &str, json: bool) -> i32 {
eprintln!("error: cannot write {}: {error}", manifest_path.display());
return 1;
}
// Keep the lockfile consistent by removing the stale entry if present.
let lock_path = root.join(marqdo_package::LOCK_FILE);
if let Ok(lock) = marqdo_package::LockFile::load(&lock_path) {
let mut updated = lock.clone();
updated.packages.retain(|package| package.name != name);
let _ = std::fs::write(&lock_path, updated.to_yaml());
}
// The lock is a graph, not a per-name list: regenerating it here would
// require resolving the new manifest. Leave it stale and tell the user.
if json {
output::print_json(&json!({
"command": "remove",
@@ -1310,6 +1313,7 @@ pub fn remove(name: &str, json: bool) -> i32 {
}));
} else {
println!("removed dependency `{name}`");
println!("run `marqdo lock` to refresh {}", marqdo_package::LOCK_FILE);
}
0
}
+17 -1
View File
@@ -146,8 +146,24 @@ pub fn load(entry: &Path) -> Result<LoadedProject, String> {
None
};
let lock = if root.join(LOCK_FILE).is_file() {
Some(LockFile::load(&root.join(LOCK_FILE))?)
let lock = LockFile::load(&root.join(LOCK_FILE))
.map_err(|error| format!("{LOCK_FILE}: {error}"))?;
if let Some(manifest) = &manifest {
lock.validate_root(manifest)
.map_err(|error| format!("{LOCK_FILE}: {error}"))?;
}
Some(lock)
} else {
if manifest
.as_ref()
.map(|manifest| !manifest.dependencies.is_empty())
.unwrap_or(false)
{
return Err(
"marqdo.lock is missing; run `marqdo lock` before checking or running this project"
.to_string(),
);
}
None
};
let resolver = PackageResolver::new(root.clone(), manifest, lock);
+147 -3
View File
@@ -97,6 +97,13 @@ fn transitive_path_dependency_resolves_from_its_own_manifest() {
&root.join("index.mq.md"),
"---\nimport:\n a: \"@a\"\n---\n\n## main\n\n> 打印(a.outer())\n",
);
let lock = cli(root, &["lock"]);
assert_eq!(
lock.status.code(),
Some(0),
"{}",
String::from_utf8_lossy(&lock.stderr)
);
let output = cli(root, &["run", "index.mq.md"]);
assert_eq!(
output.status.code(),
@@ -160,9 +167,11 @@ fn pinned_git_dependency_locks_syncs_and_runs() {
String::from_utf8_lossy(&lock.stderr)
);
let lock_text = std::fs::read_to_string(root.join("marqdo.lock")).unwrap();
assert!(lock_text.contains("lock_version: 2"));
assert!(lock_text.contains("lock_version: 3"));
assert!(lock_text.contains("root_dependencies:"));
assert!(lock_text.contains("instance_id: dep:remote@0.3.0#"));
assert!(lock_text.contains("source: git:"));
assert!(lock_text.contains("kind: git"));
assert!(lock_text.contains("content_digest: "));
let sync = cli(&root, &["sync", "--locked"]);
assert_eq!(
@@ -202,6 +211,141 @@ fn check_does_not_fetch_a_missing_git_revision() {
let output = cli(root, &["check", "index.mq.md"]);
assert_eq!(output.status.code(), Some(1));
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(stderr.contains("not cached") || stderr.contains("cannot open dependency"));
assert!(stderr.contains("marqdo.lock is missing"), "{stderr}");
assert!(!root.join(".marqdo/cache/git").exists());
}
#[test]
fn run_and_check_require_a_lock_when_dependencies_exist() {
let dir = TempDir::new("no-lock");
let root = dir.path();
write(
&root.join("marqdo.yaml"),
"project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n",
);
write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n");
write(
&root.join("index.mq.md"),
"---\nimport:\n dep: \"@dep\"\n---\n\n## main\n\n*1*\n",
);
for command in ["check", "run"] {
let output = cli(root, &[command, "index.mq.md"]);
assert_eq!(output.status.code(), Some(1), "{command}");
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(stderr.contains("marqdo.lock is missing"), "{stderr}");
}
}
#[test]
fn sync_is_strict_and_never_rewrites_the_lock() {
let dir = TempDir::new("strict-sync");
let root = dir.path();
write(
&root.join("marqdo.yaml"),
"project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n",
);
write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n");
write(&root.join("index.mq.md"), "## main\n\n*1*\n");
let lock = cli(root, &["lock"]);
assert_eq!(lock.status.code(), Some(0));
let original = std::fs::read(root.join("marqdo.lock")).unwrap();
write(&root.join("dep/index.mq.md"), "## value\n\n*2*\n");
let stale = cli(root, &["sync"]);
assert_eq!(stale.status.code(), Some(1), "plain sync must be strict");
let stderr = String::from_utf8_lossy(&stale.stderr);
assert!(stderr.contains("lockfile is out of date"), "{stderr}");
assert_eq!(
std::fs::read(root.join("marqdo.lock")).unwrap(),
original,
"sync must never rewrite the lock"
);
let relock = cli(root, &["lock"]);
assert_eq!(relock.status.code(), Some(0));
let after_relock = std::fs::read(root.join("marqdo.lock")).unwrap();
let synced = cli(root, &["sync"]);
assert_eq!(synced.status.code(), Some(0));
assert_eq!(
std::fs::read(root.join("marqdo.lock")).unwrap(),
after_relock
);
}
#[test]
fn lock_records_transitive_closure_and_sync_materializes_it() {
let dir = TempDir::new("closure");
let root = dir.path();
write(
&root.join("marqdo.yaml"),
"project:\n name: root\n version: 0.1.0\ndependencies:\n a:\n path: ./deps/a\n",
);
write(
&root.join("deps/a/marqdo.yaml"),
"project:\n name: a\n version: 0.1.0\ndependencies:\n b:\n path: ./b\n",
);
write(&root.join("deps/a/index.mq.md"), "## a\n\n*1*\n");
write(
&root.join("deps/a/b/marqdo.yaml"),
"project:\n name: b\n version: 0.1.0\n",
);
write(&root.join("deps/a/b/index.mq.md"), "## b\n\n*2*\n");
write(&root.join("index.mq.md"), "## main\n\n*1*\n");
let lock = cli(root, &["lock"]);
assert_eq!(lock.status.code(), Some(0));
let lock_text = std::fs::read_to_string(root.join("marqdo.lock")).unwrap();
assert!(lock_text.contains("name: a"), "{lock_text}");
assert!(lock_text.contains("name: b"), "{lock_text}");
assert!(lock_text.contains("b: dep:b"), "{lock_text}");
let sync = cli(root, &["sync", "--locked"]);
assert_eq!(
sync.status.code(),
Some(0),
"{}",
String::from_utf8_lossy(&sync.stderr)
);
let env: serde_json::Value =
serde_json::from_str(&std::fs::read_to_string(root.join(".marqdo/env/env.json")).unwrap())
.unwrap();
assert_eq!(env["schema_version"], 2);
assert_eq!(
env["packages"].as_array().map(|packages| packages.len()),
Some(2)
);
assert!(env["lock_digest"].as_str().unwrap().len() == 64);
}
#[test]
fn deleted_lock_edge_fails_check_and_run() {
let dir = TempDir::new("missing-edge");
let root = dir.path();
write(
&root.join("marqdo.yaml"),
"project:\n name: root\n version: 0.1.0\ndependencies:\n dep:\n path: ./dep\n",
);
write(&root.join("dep/index.mq.md"), "## value\n\n*1*\n");
write(
&root.join("index.mq.md"),
"---\nimport:\n dep: \"@dep\"\n---\n\n## main\n\n*1*\n",
);
assert_eq!(cli(root, &["lock"]).status.code(), Some(0));
let lock = std::fs::read_to_string(root.join("marqdo.lock")).unwrap();
let head = &lock[..lock.find("root_dependencies:").unwrap()];
write(
&root.join("marqdo.lock"),
&format!("{head}root_dependencies: {{}}\n"),
);
for command in ["check", "run"] {
let output = cli(root, &[command, "index.mq.md"]);
assert_eq!(output.status.code(), Some(1), "{command}");
let stderr = String::from_utf8_lossy(&output.stderr);
assert!(
stderr.contains("not recorded in marqdo.lock")
|| stderr.contains("not reachable from root_dependencies"),
"{stderr}"
);
}
}