2026-04-10 20:49:41 +03:00
|
|
|
use std::fs;
|
|
|
|
|
|
chore(lance): bump 4.0.0 → 6.0.1 (DataFusion 52→53, Arrow 57→58) (#111)
* tests: add lance_surface_guards pre-flight pins for the v6 bump
Land 8 named guards in a new test file that pin Lance API surfaces
OmniGraph relies on. Each guard turns a silent-break risk (variant
rename, struct restructure, async-flip) into a red CI bar instead of
runtime drift.
Guards (mapped to the silent-break inventory from the v6 migration plan):
Runtime (#[tokio::test]):
1. lance_error_too_much_write_contention_variant_exists — pins the
variant referenced by db/manifest/publisher.rs::map_lance_publish_error.
2. manifest_location_field_shape — pins .path/.size/.e_tag/.naming_scheme
types and ManifestLocation accessor returning &Self (the access
pattern at db/manifest/metadata.rs:84-88).
6. write_params_default_does_not_set_storage_version — confirms our
explicit V2_2 pin remains load-bearing (blob v2 requirement).
Compile-only async fns (#[allow(...)] + unimplemented!() placeholders;
never run, but cargo build --tests enforces the API shape):
3. checkout_version + restore chain — pins the recovery rollback hammer
at db/manifest/recovery.rs:505-522.
4. DatasetBuilder::from_namespace().with_branch().with_version().load()
— pins the namespace builder chain at db/manifest/namespace.rs:162-174.
5. MergeInsertBuilder fluent chain — pins the manifest CAS at
db/manifest/publisher.rs:370-391, including the return shape
(Arc<Dataset>, MergeStats).
7. compact_files(&mut ds, CompactionOptions, None) — pins
db/omnigraph/optimize.rs:107.
8. DeleteResult { new_dataset, num_deleted_rows } — pins the inline
delete result shape (MR-A will repurpose this guard to the staged
two-phase variant once Lance #6658 migration lands).
This is commit 1 of the chore/lance-6.0.1 migration. Cargo bump
follows in commit 2 (will trigger the guards under v6 if any surface
drifted).
Per the migration plan at ~/.claude/plans/shimmering-percolating-duckling.md
(written this session). Two guards from the plan deferred to follow-up:
- manifest_cas_returns_row_level_contention_variant (full publisher
race integration test — needs harness scaffolding)
- table_version_metadata_byte_compatible_with_v4 (TableVersionMetadata
is pub(crate); requires test reach extension).
Verified on v4: cargo test -p omnigraph-engine --test lance_surface_guards
passes 3/3 runtime tests; cargo build -p omnigraph-engine --tests
compiles all 5 compile-only guards clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(deps): bump Lance 4.0.0 → 6.0.1, DataFusion 52 → 53, Arrow 57 → 58
The Cargo bump itself. Source is intentionally untouched — this commit
will not compile. The compile errors are the work-list for subsequent
commits on this branch.
Lance updates: lance + 7 sub-crates 4.0.0 → 6.0.1. Transitive churn:
+ lance-tokenizer v6.0.1 (vendored tokenizer per Lance PR #6512)
+ object_store 0.13.x (Lance 6 brings it transitively; our explicit
pin stays at 0.12.5 for now — revisit in stages if diamond bites)
- tantivy* crates (replaced by lance-tokenizer)
Compile error landscape on this commit (11 errors):
• 1× E0432: `lance_index::DatasetIndexExt` import (Lance PR #6280
moved it to lance::index). Sites: table_store.rs:20,
db/manifest.rs:37 (the second site was missed by the pre-flight
inventory).
• 8× E0599: `create_index_builder` / `load_indices` missing on
`lance::Dataset` — all downstream of the DatasetIndexExt move.
Once the import is corrected on table_store.rs and db/manifest.rs,
these resolve automatically.
• 2× E0063: missing field `is_only_declared` in `DescribeTableResponse`
initializer at db/manifest/namespace.rs:221, 364. New Lance
namespace field per the v5 namespace restructure (PR #6186).
Surface guards (lance_surface_guards.rs, commit d571fa8) all still
compile + the 3 runtime ones pass on v6 — none of the silent-break
surfaces drifted. That's the load-bearing observation: the publisher
CAS chain, ManifestLocation field shape, checkout_version/restore,
DatasetBuilder fluent chain, MergeInsertBuilder return shape,
WriteParams::default, compact_files signature, and DeleteResult
fields are all v6-stable.
Next commits address the 11 errors per the migration plan stages
3-8.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* imports: move DatasetIndexExt to lance::index (Lance PR #6280)
Lance 5.0 (PR #6280) moved `DatasetIndexExt` out of `lance-index` into
`lance::index`. `is_system_index` and `IndexType` stayed in `lance-index`.
Mechanical update of 6 import sites:
crates/omnigraph/src/table_store.rs:20 — split into two `use` lines
crates/omnigraph-server/tests/server.rs:10 — was traits::DatasetIndexExt
crates/omnigraph/tests/search.rs:6
crates/omnigraph/tests/branching.rs:7
crates/omnigraph/tests/failpoints.rs:467
crates/omnigraph-cli/tests/cli.rs:3 — was traits::DatasetIndexExt
All 9 E0599 cascading errors on .create_index_builder / .load_indices
resolve once the trait is back in scope.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* namespace: add is_only_declared field to DescribeTableResponse
Lance namespace 6.0.0 added `is_only_declared: Option<bool>` to
`DescribeTableResponse` (lance-namespace-reqwest-client 0.7+ via the
v5.0 namespace API restructure, Lance PR #6186). Set to `Some(false)`
because every table BranchManifestNamespace returns from describe_table
is materialized — the manifest snapshot only includes entries for
tables we've already opened via Dataset::open.
Two sites in db/manifest/namespace.rs (BranchManifestNamespace +
StagedTableNamespace impls of LanceNamespace::describe_table).
Closes the last two compile errors from the v6 bump in the engine lib.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* cargo: add lance to omnigraph-cli + omnigraph-server dev-deps
Stage 3 moved DatasetIndexExt imports from `lance-index` to `lance::index`
in the cli and server test crates. Both crates only had `lance-index`
in their dev-dependencies; add `lance` alongside so the new path
resolves.
This is the last compile-error fix from the v6 bump — `cargo build
--workspace --tests` is now green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* docs: refresh Lance alignment audit for v6.0.1; bump surveyed version
Per CLAUDE.md maintenance rule 2 (same-PR docs):
- docs/dev/lance.md: replace the v4.0.1 alignment audit stanza with
the v6.0.1 audit. Captures every v5/v6 finding from this PR (the
DatasetIndexExt move, DescribeTableResponse.is_only_declared,
MergeInsertBuilder return shape, ManifestLocation field shape,
LanceFileVersion::default flip, file-reader async, tokenizer
vendor, Lance #6658/#6666/#6877 status). Cross-references each
guard in tests/lance_surface_guards.rs.
- AGENTS.md: bump "Storage substrate: Lance 4.x" → "Lance 6.x".
Note: surveyed crate version stays at 0.4.2 — substrate version
bumps are independent of OmniGraph's release version.
- crates/omnigraph/src/storage_layer.rs: update the trait module-level
doc-comment to reflect that Lance #6658 closed 2026-05-14 and
delete_where two-phase migration is MR-A (the next follow-up).
#6666 stays open; create_vector_index inline residual stays.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* tests: silence clippy::diverging_sub_expression on compile-only guards
The five `_compile_*` async fns in lance_surface_guards.rs use
`let ds: Dataset = unimplemented!()` as a placeholder so type inference
can chase the method chain we want to pin, without ever running the
function. Clippy's `diverging_sub_expression` lint flags this pattern
because the RHS diverges; that's the entire point. Added to the
per-fn `#[allow(...)]` list, alongside dead_code / unreachable_code /
unused_variables / unused_mut already there.
No behavior change. cargo test -p omnigraph-engine --test
lance_surface_guards still 3/3 green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* docs: correct #6658 status — closed but API ships in Lance v7.x, not v6.0.1
The audit stanza in docs/dev/lance.md and the storage_layer.rs trait
doc-comment both implied the public DeleteBuilder::execute_uncommitted
API shipped with Lance 6.0.1. It did not. Issue #6658 closed
2026-05-14, but binary search across the release stream confirms:
v6.0.1 ❌ no pub async fn execute_uncommitted on DeleteBuilder
v6.1.0-rc.1 ❌
v7.0.0-beta.5 ❌
v7.0.0-beta.10 ✅ first appearance
v7.0.0-rc.1 ✅
So MR-A (delete two-phase migration) is gated on the Lance v7.x bump,
not on this PR. v7.0.0-rc.1 dropped 2026-05-21; GA likely within a
week.
No behavior change. Doc-only correction.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* ci(lib): bump recursion_limit to 256 — Lance 6 trait depth on Linux
Lance 6's heavier trait surface around futures/streams in storage_layer.rs's
staged-write API pushes the rustc trait-resolution recursion limit past
the default 128 on Linux builds. CI on PR #111 surfaced this in both
`Test Workspace` and `Test omnigraph-server --features aws`:
error: queries overflow the depth limit!
= help: consider increasing the recursion limit by adding a
`#![recursion_limit = "256"]` attribute to your crate (`omnigraph`)
= note: query depth increased by 130 when computing layout of
`{async block@crates/omnigraph/src/storage_layer.rs:697:5: 697:10}`
(The async block is `stage_create_btree_index`'s body — its return type
is several layers of `impl Future<Output=Result<StagedHandle>>` deep on
top of Lance's own builder return types.)
Local macOS builds happened to short-circuit before tripping the limit,
which is why this didn't surface during the v6 bump sequence. The fix
rustc itself suggests is one line at the crate root.
No behavior change. Revisit if a future Lance bump stops needing it.
Verified: `cargo build --locked -p omnigraph-server --features aws`
compiles clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-23 00:42:29 +01:00
|
|
|
use lance::index::DatasetIndexExt;
|
2026-04-10 20:49:41 +03:00
|
|
|
use omnigraph::db::{Omnigraph, ReadTarget};
|
|
|
|
|
use serde_json::Value;
|
|
|
|
|
use tempfile::tempdir;
|
|
|
|
|
|
|
|
|
|
mod support;
|
|
|
|
|
|
|
|
|
|
use support::*;
|
|
|
|
|
|
|
|
|
|
const POLICY_YAML: &str = r#"
|
|
|
|
|
version: 1
|
|
|
|
|
groups:
|
|
|
|
|
team: [act-andrew, act-bruno]
|
|
|
|
|
admins: [act-andrew]
|
|
|
|
|
protected_branches: [main]
|
|
|
|
|
rules:
|
|
|
|
|
- id: team-read
|
|
|
|
|
allow:
|
|
|
|
|
actors: { group: team }
|
|
|
|
|
actions: [read]
|
|
|
|
|
branch_scope: any
|
|
|
|
|
- id: team-write
|
|
|
|
|
allow:
|
|
|
|
|
actors: { group: team }
|
|
|
|
|
actions: [change]
|
|
|
|
|
branch_scope: unprotected
|
|
|
|
|
- id: admins-promote
|
|
|
|
|
allow:
|
|
|
|
|
actors: { group: admins }
|
2026-04-30 08:52:50 +02:00
|
|
|
actions: [branch_merge]
|
2026-04-10 20:49:41 +03:00
|
|
|
target_branch_scope: protected
|
|
|
|
|
"#;
|
|
|
|
|
|
|
|
|
|
const POLICY_TESTS_YAML: &str = r#"
|
|
|
|
|
version: 1
|
|
|
|
|
cases:
|
|
|
|
|
- id: allow-feature-write
|
|
|
|
|
actor: act-andrew
|
|
|
|
|
action: change
|
|
|
|
|
branch: feature
|
|
|
|
|
expect: allow
|
|
|
|
|
- id: deny-main-write
|
|
|
|
|
actor: act-bruno
|
|
|
|
|
action: change
|
|
|
|
|
branch: main
|
|
|
|
|
expect: deny
|
|
|
|
|
"#;
|
|
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
fn manifest_dataset_version(graph: &std::path::Path) -> u64 {
|
2026-04-10 20:49:41 +03:00
|
|
|
tokio::runtime::Runtime::new().unwrap().block_on(async {
|
2026-05-24 16:46:00 +01:00
|
|
|
Omnigraph::open(graph.to_string_lossy().as_ref())
|
2026-04-10 20:49:41 +03:00
|
|
|
.await
|
|
|
|
|
.unwrap()
|
|
|
|
|
.snapshot_of(ReadTarget::branch("main"))
|
|
|
|
|
.await
|
|
|
|
|
.unwrap()
|
|
|
|
|
.version()
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn write_policy_config_fixture(root: &std::path::Path) -> (std::path::PathBuf, std::path::PathBuf) {
|
|
|
|
|
let config = root.join("omnigraph.yaml");
|
|
|
|
|
let policy = root.join("policy.yaml");
|
|
|
|
|
fs::write(
|
|
|
|
|
&config,
|
|
|
|
|
r#"
|
|
|
|
|
project:
|
2026-05-24 16:46:00 +01:00
|
|
|
name: policy-test-graph
|
2026-04-10 20:49:41 +03:00
|
|
|
policy:
|
|
|
|
|
file: ./policy.yaml
|
|
|
|
|
"#,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
fs::write(&policy, POLICY_YAML).unwrap();
|
|
|
|
|
fs::write(root.join("policy.tests.yaml"), POLICY_TESTS_YAML).unwrap();
|
|
|
|
|
(config, policy)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn version_command_prints_current_cli_version() {
|
|
|
|
|
let output = output_success(cli().arg("version"));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
stdout.trim(),
|
|
|
|
|
format!("omnigraph {}", env!("CARGO_PKG_VERSION"))
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn short_version_flag_prints_current_cli_version() {
|
|
|
|
|
let output = output_success(cli().arg("-v"));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
stdout.trim(),
|
|
|
|
|
format!("omnigraph {}", env!("CARGO_PKG_VERSION"))
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn long_version_flag_prints_current_cli_version() {
|
|
|
|
|
let output = output_success(cli().arg("--version"));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
stdout.trim(),
|
|
|
|
|
format!("omnigraph {}", env!("CARGO_PKG_VERSION"))
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn embed_seed_fills_missing_and_preserves_existing_vectors_by_default() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let seed = write_seed_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.env("OMNIGRAPH_EMBEDDINGS_MOCK", "1")
|
|
|
|
|
.arg("embed")
|
|
|
|
|
.arg("--seed")
|
|
|
|
|
.arg(&seed)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["mode"], "fill_missing");
|
|
|
|
|
assert_eq!(payload["embedded_rows"], 1);
|
|
|
|
|
assert_eq!(payload["selected_rows"], 2);
|
|
|
|
|
|
|
|
|
|
let embedded = read_embedded_rows(temp.path().join("build/seed.embedded.jsonl"));
|
|
|
|
|
assert_eq!(
|
|
|
|
|
embedded[0]["data"]["embedding"].as_array().unwrap().len(),
|
|
|
|
|
4
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
embedded[1]["data"]["embedding"],
|
|
|
|
|
serde_json::json!([0.1, 0.2])
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn embed_clean_removes_selected_embeddings() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let seed = write_seed_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("embed")
|
|
|
|
|
.arg("--seed")
|
|
|
|
|
.arg(&seed)
|
|
|
|
|
.arg("--clean")
|
|
|
|
|
.arg("--select")
|
|
|
|
|
.arg("Decision:slug=dec-beta")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["mode"], "clean");
|
|
|
|
|
assert_eq!(payload["cleaned_rows"], 1);
|
|
|
|
|
|
|
|
|
|
let embedded = read_embedded_rows(temp.path().join("build/seed.embedded.jsonl"));
|
|
|
|
|
assert!(embedded[0]["data"].get("embedding").is_none());
|
|
|
|
|
assert!(embedded[1]["data"].get("embedding").is_none());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn embed_select_reembeds_only_matching_rows() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let seed = write_seed_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.env("OMNIGRAPH_EMBEDDINGS_MOCK", "1")
|
|
|
|
|
.arg("embed")
|
|
|
|
|
.arg("--seed")
|
|
|
|
|
.arg(&seed)
|
|
|
|
|
.arg("--select")
|
|
|
|
|
.arg("Decision:slug=dec-beta")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["mode"], "reembed_selected");
|
|
|
|
|
assert_eq!(payload["embedded_rows"], 1);
|
|
|
|
|
assert_eq!(payload["selected_rows"], 1);
|
|
|
|
|
|
|
|
|
|
let embedded = read_embedded_rows(temp.path().join("build/seed.embedded.jsonl"));
|
|
|
|
|
assert!(embedded[0]["data"].get("embedding").is_none());
|
|
|
|
|
assert_ne!(
|
|
|
|
|
embedded[1]["data"]["embedding"],
|
|
|
|
|
serde_json::json!([0.1, 0.2])
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
embedded[1]["data"]["embedding"].as_array().unwrap().len(),
|
|
|
|
|
4
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn embed_seed_preserves_non_entity_rows() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let seed = write_seed_fixture_with_edge(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.env("OMNIGRAPH_EMBEDDINGS_MOCK", "1")
|
|
|
|
|
.arg("embed")
|
|
|
|
|
.arg("--seed")
|
|
|
|
|
.arg(&seed)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["rows"], 3);
|
|
|
|
|
assert_eq!(payload["embedded_rows"], 1);
|
|
|
|
|
|
|
|
|
|
let embedded = read_embedded_rows(temp.path().join("build/seed.embedded.jsonl"));
|
|
|
|
|
assert_eq!(embedded.len(), 3);
|
|
|
|
|
assert_eq!(embedded[2]["edge"], "Triggered");
|
|
|
|
|
assert_eq!(embedded[2]["from"], "sig-alpha");
|
|
|
|
|
assert_eq!(embedded[2]["to"], "dec-alpha");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
2026-05-24 16:46:00 +01:00
|
|
|
fn init_creates_graph_successfully_on_missing_local_directory() {
|
2026-04-10 20:49:41 +03:00
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let schema = fixture("test.pg");
|
|
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let output = output_success(cli().arg("init").arg("--schema").arg(&schema).arg(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("initialized"));
|
2026-05-24 16:46:00 +01:00
|
|
|
assert!(graph.join("_schema.pg").exists());
|
|
|
|
|
assert!(graph.join("__manifest").exists());
|
2026-04-10 20:49:41 +03:00
|
|
|
assert!(temp.path().join("omnigraph.yaml").exists());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_plan_json_reports_supported_additive_change() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let schema_path = temp.path().join("next.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg")).unwrap().replace(
|
|
|
|
|
" age: I32?\n}",
|
|
|
|
|
" age: I32?\n nickname: String?\n}",
|
|
|
|
|
);
|
|
|
|
|
fs::write(&schema_path, next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("plan")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["supported"], true);
|
|
|
|
|
assert_eq!(payload["step_count"], 1);
|
|
|
|
|
assert_eq!(payload["steps"][0]["kind"], "add_property");
|
|
|
|
|
assert_eq!(payload["steps"][0]["type_kind"], "node");
|
|
|
|
|
assert_eq!(payload["steps"][0]["type_name"], "Person");
|
|
|
|
|
assert_eq!(payload["steps"][0]["property_name"], "nickname");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_plan_json_reports_unsupported_type_change() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let schema_path = temp.path().join("breaking.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let breaking_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace("age: I32?", "age: I64?");
|
|
|
|
|
fs::write(&schema_path, breaking_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("plan")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["supported"], false);
|
|
|
|
|
assert!(payload["steps"].as_array().unwrap().iter().any(|step| {
|
|
|
|
|
step["kind"] == "unsupported_change"
|
|
|
|
|
&& step["entity"]
|
|
|
|
|
.as_str()
|
|
|
|
|
.unwrap_or_default()
|
|
|
|
|
.contains("Person.age")
|
|
|
|
|
}));
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-12 04:01:14 +03:00
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_json_applies_supported_migration() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("next.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg")).unwrap().replace(
|
|
|
|
|
" age: I32?\n}",
|
|
|
|
|
" age: I32?\n nickname: String?\n}",
|
|
|
|
|
);
|
|
|
|
|
fs::write(&schema_path, next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["supported"], true);
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
assert_eq!(payload["step_count"], 1);
|
|
|
|
|
|
|
|
|
|
let db = tokio::runtime::Runtime::new()
|
|
|
|
|
.unwrap()
|
2026-05-24 16:46:00 +01:00
|
|
|
.block_on(Omnigraph::open(graph.to_string_lossy().as_ref()))
|
2026-04-12 04:01:14 +03:00
|
|
|
.unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
db.catalog().node_types["Person"]
|
|
|
|
|
.properties
|
|
|
|
|
.contains_key("nickname")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_human_reports_noop() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = fixture("test.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("applied: no"));
|
|
|
|
|
assert!(stdout.contains("no schema changes"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_json_renames_type_and_updates_snapshot() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("rename.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let renamed_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace("node Person {\n", "node Human @rename_from(\"Person\") {\n")
|
|
|
|
|
.replace("edge Knows: Person -> Person", "edge Knows: Human -> Human")
|
|
|
|
|
.replace(
|
|
|
|
|
"edge WorksAt: Person -> Company",
|
|
|
|
|
"edge WorksAt: Human -> Company",
|
|
|
|
|
);
|
|
|
|
|
fs::write(&schema_path, renamed_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
|
|
|
|
|
let db = tokio::runtime::Runtime::new()
|
|
|
|
|
.unwrap()
|
2026-05-24 16:46:00 +01:00
|
|
|
.block_on(Omnigraph::open(graph.to_string_lossy().as_ref()))
|
2026-04-12 04:01:14 +03:00
|
|
|
.unwrap();
|
|
|
|
|
let snapshot = tokio::runtime::Runtime::new()
|
|
|
|
|
.unwrap()
|
|
|
|
|
.block_on(db.snapshot_of(ReadTarget::branch("main")))
|
|
|
|
|
.unwrap();
|
|
|
|
|
assert!(snapshot.entry("node:Human").is_some());
|
|
|
|
|
assert!(snapshot.entry("node:Person").is_none());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_json_renames_property_and_updates_catalog() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("rename-property.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let renamed_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace("age: I32?", "years: I32? @rename_from(\"age\")");
|
|
|
|
|
fs::write(&schema_path, renamed_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
|
|
|
|
|
let db = tokio::runtime::Runtime::new()
|
|
|
|
|
.unwrap()
|
2026-05-24 16:46:00 +01:00
|
|
|
.block_on(Omnigraph::open(graph.to_string_lossy().as_ref()))
|
2026-04-12 04:01:14 +03:00
|
|
|
.unwrap();
|
|
|
|
|
let person = &db.catalog().node_types["Person"];
|
|
|
|
|
assert!(person.properties.contains_key("years"));
|
|
|
|
|
assert!(!person.properties.contains_key("age"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_json_adds_index_for_existing_property() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("index.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let before_index_count = tokio::runtime::Runtime::new().unwrap().block_on(async {
|
2026-05-24 16:46:00 +01:00
|
|
|
let db = Omnigraph::open(graph.to_string_lossy().as_ref())
|
2026-04-12 04:01:14 +03:00
|
|
|
.await
|
|
|
|
|
.unwrap();
|
|
|
|
|
let snapshot = db.snapshot_of(ReadTarget::branch("main")).await.unwrap();
|
|
|
|
|
let dataset = snapshot.open("node:Person").await.unwrap();
|
|
|
|
|
dataset.load_indices().await.unwrap().len()
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
let indexed_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace("name: String @key", "name: String @key @index");
|
|
|
|
|
fs::write(&schema_path, indexed_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
|
|
|
|
|
let after_index_count = tokio::runtime::Runtime::new().unwrap().block_on(async {
|
2026-05-24 16:46:00 +01:00
|
|
|
let db = Omnigraph::open(graph.to_string_lossy().as_ref())
|
2026-04-12 04:01:14 +03:00
|
|
|
.await
|
|
|
|
|
.unwrap();
|
|
|
|
|
let snapshot = db.snapshot_of(ReadTarget::branch("main")).await.unwrap();
|
|
|
|
|
let dataset = snapshot.open("node:Person").await.unwrap();
|
|
|
|
|
dataset.load_indices().await.unwrap().len()
|
|
|
|
|
});
|
|
|
|
|
assert!(after_index_count > before_index_count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_rejects_unsupported_plan() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("breaking.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
|
|
|
|
|
let breaking_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace("age: I32?", "age: I64?");
|
|
|
|
|
fs::write(&schema_path, breaking_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(stderr.contains("changing property type"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_rejects_when_non_main_branch_exists() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-12 04:01:14 +03:00
|
|
|
let schema_path = temp.path().join("next.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-12 04:01:14 +03:00
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-12 04:01:14 +03:00
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg")).unwrap().replace(
|
|
|
|
|
" age: I32?\n}",
|
|
|
|
|
" age: I32?\n nickname: String?\n}",
|
|
|
|
|
);
|
|
|
|
|
fs::write(&schema_path, next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-12 04:01:14 +03:00
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
2026-05-24 16:46:00 +01:00
|
|
|
assert!(stderr.contains("schema apply requires a graph with only main"));
|
2026-04-12 04:01:14 +03:00
|
|
|
}
|
|
|
|
|
|
2026-04-13 00:37:44 +03:00
|
|
|
#[test]
|
|
|
|
|
fn query_lint_json_with_schema_reports_warnings() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Policy {
|
|
|
|
|
slug: String @key
|
|
|
|
|
name: String?
|
|
|
|
|
effectiveTo: DateTime?
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query update_policy($slug: String, $name: String) {
|
|
|
|
|
update Policy set { name: $name } where slug = $slug
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["status"], "ok");
|
|
|
|
|
assert_eq!(payload["schema_source"]["kind"], "file");
|
|
|
|
|
assert_eq!(payload["queries_processed"], 1);
|
|
|
|
|
assert_eq!(payload["warnings"], 1);
|
|
|
|
|
assert_eq!(payload["findings"][0]["code"], "L201");
|
|
|
|
|
assert_eq!(
|
|
|
|
|
payload["findings"][0]["message"],
|
|
|
|
|
"Policy.effectiveTo exists in schema but no update query sets it"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn query_check_alias_matches_lint_output() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Person {
|
|
|
|
|
name: String
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let lint_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let check_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("check")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
assert_eq!(stdout_string(&lint_output), stdout_string(&check_output));
|
|
|
|
|
}
|
|
|
|
|
|
feat: inline query strings in CLI and HTTP server (#110)
* feat(MR-656): inline query strings in CLI and HTTP server
CLI:
- Add -e / --query-string <STRING> to omnigraph read and omnigraph change
- Exactly one of --query, --query-string, --alias is required (3-way XOR)
- Empty --query-string is rejected with a clear error
HTTP:
- New POST /query (read-only, clean field names: query/name/params/branch/snapshot)
- Mutations on /query are rejected with 400 -- use POST /change instead
- ChangeRequest fields polished: query (alias query_source), name (alias query_name)
- POST /read and POST /change remain byte-compatible for existing clients
Tests:
- cli.rs: -e happy-path on read/change, mutex error vs --query, empty -e rejected
- system_local.rs: inline -e read and -e change exercise the local flow
- system_remote.rs: inline -e read/change over HTTP plus direct /query 200/400
- server.rs: /query 200, /query 400 on mutation, /change legacy field alias
- openapi.rs: new /query path, QueryRequest schema, ChangeRequest field-name polish
Docs: cli.md (-e examples), cli-reference.md (read/change rows), server.md (/query)
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* feat(MR-656): rename read/change to query/mutate with deprecation signals
HTTP server:
- Add POST /mutate as canonical write endpoint (pairs with POST /query).
- Mark POST /read and POST /change as deprecated. Three-channel signal:
* OpenAPI: `deprecated: true` on the operation (every codegen flags
the generated SDK method).
* RFC 9745: response `Deprecation: true` header on every response.
* RFC 8288: response `Link: </successor>; rel="successor-version"`
pointing at /query and /mutate respectively.
- Share business logic across /mutate and /change via run_mutate(); the
/change wrapper is the only place that adds the deprecation headers.
- ChangeRequest field aliases (query_source/query_name) preserved.
- AliasCommand serde now accepts `query`/`mutate` alongside `read`/`change`.
CLI:
- Promote `omnigraph query` / `omnigraph mutate` to top-level canonical
subcommands (clap visible_alias keeps `omnigraph read` / `omnigraph
change` working forever).
- Promote `omnigraph lint` / `omnigraph check` to top-level (was nested
under `omnigraph query lint`, which is now a deprecated argv shim that
rewrites to the canonical form).
- Argv-level preprocessing prints a one-line deprecation warning to
stderr when any legacy spelling is used. Canonical names are silent.
Tests:
- Server: /mutate works, /change emits Deprecation+Link headers, /read
emits Deprecation+Link headers, /query carries no deprecation signal.
- OpenAPI: /read and /change flagged deprecated; /query and /mutate not.
- CLI: canonical `lint` matches deprecated `query lint` / `query check`
output; `read` / `change` print deprecation warnings.
Docs:
- cli.md: new canonical examples; "Deprecated names" migration table.
- cli-reference.md: top-level table updated; aliases.<name>.command
accepts both legacy and canonical spellings.
- server.md: endpoint inventory shows /query and /mutate as canonical
and /read and /change as deprecated; dedicated section explains the
three-channel deprecation signal.
- og-cheet-sheet.md: use new `omnigraph lint` / `omnigraph check`.
- openapi.json regenerated.
Migration is purely cosmetic — every deprecated form continues to work
indefinitely; only the spelling changes.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* fix(MR-656): address Devin Review findings on /query and /change
Two issues raised by Devin Review on PR #110:
1. `POST /query` mutation-rejection error pointed at the deprecated
`/change` endpoint instead of the canonical `/mutate`. Fixed in
three places: the runtime error message in `server_query`, the
utoipa 400-response description, and the handler doc comment. The
`QueryRequest` schema docstrings in `api.rs` got the same update so
the openapi.json bodies match. Server and openapi tests updated.
2. `execute_change_remote` serialized `ChangeRequest` directly, which
emits the new canonical field names `query` / `name` on the wire.
`#[serde(alias = "query_source")]` only affects deserialization, so
a newer CLI talking to an older server would have its `/change`
POST body fail with "missing field: query_source". Fixed by
extracting a `legacy_change_request_body` helper that hand-rolls
the JSON with the legacy keys (`query_source` / `query_name`), the
same byte-stable contract `execute_read_remote` already uses
against `/read`. Added two unit tests on the helper to lock the
wire shape in.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* docs(dev): RFC 001 — inline + stored queries, envelope, MCP
Tracked artifact consolidating the design across MR-656 (this branch),
MR-976 (Phase 1 envelope hardening parent, with MR-977/978/979/980
sub-issues), and MR-969 (stored queries + MCP).
Sections:
* Two paths, one engine — inline `/query` + `/mutate` (this PR) coexist
with stored `/queries/{name}` (MR-969). Same `run_query` / `run_mutate`
backend (the fold-in landed in the previous commit).
* Request envelope ("before") — Idempotency-Key, If-Match, X-Deadline,
X-Trace-Id, expect, dry_run, fields. Phase 1 ships the load-bearing
subset on `/mutate`.
* Response envelope ("after") — audit_id, snapshot_id, commit_id, stats,
warnings. Closes the provenance loop today's `ChangeOutput` leaves
open.
* `.gq` pragmas — `@description`, `@returns`, `@mcp`. Source-of-truth
for the stored-query agent contract; no separate YAML registry.
* Multi-graph MCP — per-graph `/graphs/{id}/mcp/tools` + `/mcp/invoke`.
Token binds to one graph by default; cross-graph agents loop.
* Cedar split — `read`/`change` for inline, `invoke_query` for stored.
Operators deny ad-hoc for agent groups while keeping curated tool
list open.
* Rejected alternatives — per-env override files, compiled bundles,
tool-name prefixing across graphs, body-field graph dispatch.
Index entry added under "Active Implementation Plans" so future agents
land on the RFC before touching queries / mutations / envelope code.
`scripts/check-agents-md.sh` clean (35 links, 34 docs).
* docs(server): clarify why run_query lacks AppState parameter
run_mutate takes state for workload admission; run_query doesn't because
reads aren't admission-gated today. Mark the asymmetry as intentional and
flag the two future events that would grow the signature: Phase 1's
`expect: { max_rows_scanned: N }` budget (MR-976) or per-actor admission
extending to stored-read invocations (MR-969). Prevents the natural
"make these symmetrical" follow-up.
* refactor(server): run_query / run_mutate take &ResolvedActor
Replace `Option<Extension<ResolvedActor>>` in the helpers with
`Option<&ResolvedActor>`. Saves MR-969's stored-query handler from
wrapping a bare actor in axum's `Extension(...)` before calling.
Handler signatures (`server_query`, `server_read`, `server_mutate`,
`server_change`) keep `Option<Extension<ResolvedActor>>` because that
is what axum injects, and unwrap at the call site with
`actor.as_ref().map(|Extension(actor)| actor)`.
Net: -13/+10 LOC, 89/0 server tests pass.
* docs(releases): v0.6.0 — describe inline + canonical-named queries (MR-656)
Extend the v0.6.0 release notes to cover the third piece of work landing
alongside the graph terminology rename and multi-graph server mode:
canonical-named `POST /query` and `POST /mutate` endpoints, the CLI's
new `-e/--query-string` flag, the top-level promotion of `lint` /
`check`, and the three-channel deprecation signal on `/read` and
`/change` (OpenAPI `deprecated: true` + RFC 9745 + RFC 8288).
Additions:
* Top blurb: "Two pieces" -> "Three pieces" with a bullet describing
the rename + inline flow.
* Breaking Changes: new "Query / mutation rename" subsection covering
the `ChangeRequest` field rename (with the back-compat serde aliases
and the CLI's `legacy_change_request_body` byte-stable wire helper)
and the `omnigraph query lint` -> `omnigraph lint` move.
* New: 5 bullets — the two endpoints, the CLI subcommands, the `-e`
flag, the deprecation signal channels, the widened `aliases.<name>.command`
vocabulary.
* User Impact: one bullet making explicit that the rename is cosmetic
on the client side and migration is voluntary.
* Documentation: pointers to the updated `server.md` / `cli.md` /
`cli-reference.md` and the new `docs/dev/rfc-001-queries-envelope-mcp.md`.
+15/-1 lines. `./scripts/check-agents-md.sh` clean.
* refactor(cli): demote `check` from visible_alias to deprecation shim
`omnigraph check` was a clap `visible_alias` on `lint`, advertised in
`--help` as an equivalent canonical name. Per MR-981 §6 (long-form
flags as canonical, short forms as visible aliases), visible aliases
on subcommand names hurt agent CX: agents emit either spelling
depending on training-data drift, and there's no length signal
pointing at the canonical name.
Changes:
* Remove `#[command(visible_alias = "check")]` from the `Lint` variant.
`omnigraph --help` now shows only `lint`.
* Add bare `check` to `rewrite_deprecated_argv` so `omnigraph check
<args>` still works — it rewrites to `omnigraph lint <args>` and
emits a one-line stderr deprecation warning, matching the existing
pattern for `read` / `change` / `query lint` / `query check`.
* Fix the nested `query check` shim to substitute `check` -> `lint` in
the rewritten argv (previously it relied on `check` being a
visible_alias to reach the `Lint` variant).
* New test `deprecated_check_top_level_rewrites_to_lint` covers: bare
`check` produces identical stdout to `lint`, emits the deprecation
warning, and `check` does NOT appear as an alias in `omnigraph
--help`.
* Release notes updated to reflect the deprecation-shim treatment and
cross-reference MR-981 §6 reasoning.
Cargo / Go users typing `check` still work indefinitely; one stderr
nudge per invocation teaches the canonical name. Agents see only
`lint` in `--help --json` so they emit one canonical form.
67/0 omnigraph-cli tests pass; 39 workspace test suites green.
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Ragnor Comerford <ragnor.comerford@gmail.com>
Co-authored-by: Ragnor Comerford <hello@ragnor.co>
2026-05-29 13:41:54 +02:00
|
|
|
/// `omnigraph lint` is the canonical top-level lint command after the
|
|
|
|
|
/// query/mutate rename. `omnigraph query lint` and `omnigraph query check`
|
|
|
|
|
/// are kept as deprecated argv shims (warning + rewrite). All three must
|
|
|
|
|
/// produce identical stdout output.
|
|
|
|
|
#[test]
|
|
|
|
|
fn lint_top_level_matches_deprecated_query_lint_output() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Person {
|
|
|
|
|
name: String
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let canonical = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let deprecated_lint = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let deprecated_check = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("check")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
assert_eq!(stdout_string(&canonical), stdout_string(&deprecated_lint));
|
|
|
|
|
assert_eq!(stdout_string(&canonical), stdout_string(&deprecated_check));
|
|
|
|
|
|
|
|
|
|
// Canonical form must NOT emit the deprecation warning.
|
|
|
|
|
let canonical_stderr = String::from_utf8(canonical.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
!canonical_stderr.contains("deprecated"),
|
|
|
|
|
"`omnigraph lint` is canonical and must not warn; got stderr: {canonical_stderr}"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Deprecated forms MUST emit the one-line warning, pointing at the
|
|
|
|
|
// new top-level `omnigraph lint`.
|
|
|
|
|
let lint_stderr = String::from_utf8(deprecated_lint.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
lint_stderr.contains("`omnigraph query lint` is deprecated")
|
|
|
|
|
&& lint_stderr.contains("`omnigraph lint`"),
|
|
|
|
|
"expected deprecation warning pointing at `omnigraph lint`; got: {lint_stderr}"
|
|
|
|
|
);
|
|
|
|
|
let check_stderr = String::from_utf8(deprecated_check.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
check_stderr.contains("`omnigraph query check` is deprecated")
|
|
|
|
|
&& check_stderr.contains("`omnigraph lint`"),
|
|
|
|
|
"expected deprecation warning pointing at `omnigraph lint`; got: {check_stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Bare `omnigraph check` is NOT a clap `visible_alias` on `lint` (MR-981 §6:
|
|
|
|
|
/// visible aliases give agents two canonical names to emit interchangeably).
|
|
|
|
|
/// It's an argv-level shim: rewrites to `omnigraph lint`, prints a one-line
|
|
|
|
|
/// stderr deprecation warning, and produces identical stdout to the canonical
|
|
|
|
|
/// invocation. Cargo/Go users typing `check` keep working; help text shows
|
|
|
|
|
/// only `lint`.
|
|
|
|
|
#[test]
|
|
|
|
|
fn deprecated_check_top_level_rewrites_to_lint() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Person {
|
|
|
|
|
name: String
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let canonical = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let deprecated_check = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("check")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
assert_eq!(stdout_string(&canonical), stdout_string(&deprecated_check));
|
|
|
|
|
|
|
|
|
|
let check_stderr = String::from_utf8(deprecated_check.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
check_stderr.contains("`omnigraph check` is deprecated")
|
|
|
|
|
&& check_stderr.contains("`omnigraph lint`"),
|
|
|
|
|
"expected `omnigraph check` deprecation warning pointing at `omnigraph lint`; got: {check_stderr}"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// `check` must NOT appear in the canonical `omnigraph --help` output —
|
|
|
|
|
// agents copy the surface from help text and would otherwise emit both
|
|
|
|
|
// names interchangeably.
|
|
|
|
|
let help = cli().arg("--help").output().unwrap();
|
|
|
|
|
let stdout = String::from_utf8(help.stdout).unwrap();
|
|
|
|
|
let check_aliased = stdout
|
|
|
|
|
.lines()
|
|
|
|
|
.any(|line| line.trim_start().starts_with("lint") && line.contains("check"));
|
|
|
|
|
assert!(
|
|
|
|
|
!check_aliased,
|
|
|
|
|
"`check` must not be advertised as a visible alias of `lint`; help output: {stdout}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// `omnigraph read` and `omnigraph change` are kept as visible clap
|
|
|
|
|
/// aliases for the new canonical `query` / `mutate` subcommands, plus an
|
|
|
|
|
/// argv-level deprecation warning. The warning is emitted to stderr; the
|
|
|
|
|
/// command otherwise behaves identically to the canonical form.
|
|
|
|
|
#[test]
|
|
|
|
|
fn deprecated_read_and_change_subcommands_emit_warnings() {
|
|
|
|
|
// Both subcommands require `--query`/`--query-string`/`--alias`, so
|
|
|
|
|
// invoking them with no args will exit non-zero. That's fine --
|
|
|
|
|
// we only care that the deprecation warning is printed before the
|
|
|
|
|
// argument-required error.
|
|
|
|
|
let output = cli().arg("read").output().unwrap();
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("`omnigraph read` is deprecated")
|
|
|
|
|
&& stderr.contains("`omnigraph query`"),
|
|
|
|
|
"expected `omnigraph read` deprecation warning; got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = cli().arg("change").output().unwrap();
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("`omnigraph change` is deprecated")
|
|
|
|
|
&& stderr.contains("`omnigraph mutate`"),
|
|
|
|
|
"expected `omnigraph change` deprecation warning; got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Sanity check the inverse: the canonical names must NOT print the
|
|
|
|
|
// deprecation banner.
|
|
|
|
|
let output = cli().arg("query").arg("--help").output().unwrap();
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
!stderr.contains("deprecated"),
|
|
|
|
|
"`omnigraph query` is canonical and must not warn; got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
let output = cli().arg("mutate").arg("--help").output().unwrap();
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
!stderr.contains("deprecated"),
|
|
|
|
|
"`omnigraph mutate` is canonical and must not warn; got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-13 00:37:44 +03:00
|
|
|
#[test]
|
2026-05-24 16:46:00 +01:00
|
|
|
fn query_lint_can_use_local_graph_via_positional_uri() {
|
2026-04-13 00:37:44 +03:00
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-13 00:37:44 +03:00
|
|
|
let query_path = temp.path().join("queries.gq");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-13 00:37:44 +03:00
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-13 00:37:44 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["status"], "ok");
|
2026-05-24 16:46:00 +01:00
|
|
|
assert_eq!(payload["schema_source"]["kind"], "graph");
|
2026-04-13 00:37:44 +03:00
|
|
|
assert_eq!(
|
|
|
|
|
payload["schema_source"]["uri"].as_str(),
|
2026-05-24 16:46:00 +01:00
|
|
|
Some(graph.to_string_lossy().as_ref())
|
2026-04-13 00:37:44 +03:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
2026-05-24 16:46:00 +01:00
|
|
|
fn query_lint_can_resolve_graph_and_query_from_config() {
|
2026-04-13 00:37:44 +03:00
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-13 00:37:44 +03:00
|
|
|
let config_path = temp.path().join("omnigraph.yaml");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-13 00:37:44 +03:00
|
|
|
write_query_file(
|
|
|
|
|
&temp.path().join("queries.gq"),
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
2026-05-24 16:46:00 +01:00
|
|
|
write_config(&config_path, &local_yaml_config(&graph));
|
2026-04-13 00:37:44 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg("queries.gq")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config_path)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["status"], "ok");
|
2026-05-24 16:46:00 +01:00
|
|
|
assert_eq!(payload["schema_source"]["kind"], "graph");
|
2026-04-13 00:37:44 +03:00
|
|
|
assert_eq!(
|
|
|
|
|
payload["schema_source"]["uri"].as_str(),
|
2026-05-24 16:46:00 +01:00
|
|
|
Some(graph.to_string_lossy().as_ref())
|
2026-04-13 00:37:44 +03:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn query_lint_rejects_http_targets_without_schema() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("http://127.0.0.1:8080"),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
2026-05-24 16:46:00 +01:00
|
|
|
stderr.contains("query lint is only supported against local graph URIs in this milestone")
|
2026-04-13 00:37:44 +03:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
2026-05-24 16:46:00 +01:00
|
|
|
fn query_lint_requires_schema_or_resolvable_graph_target() {
|
2026-04-13 00:37:44 +03:00
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query list_people() {
|
|
|
|
|
match { $p: Person }
|
|
|
|
|
return { $p.name }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
2026-05-24 16:46:00 +01:00
|
|
|
stderr.contains("query lint requires --schema <schema.pg> or a resolvable graph target")
|
2026-04-13 00:37:44 +03:00
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn query_lint_human_output_reports_warnings() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Policy {
|
|
|
|
|
slug: String @key
|
|
|
|
|
name: String?
|
|
|
|
|
effectiveTo: DateTime?
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query update_policy($slug: String, $name: String) {
|
|
|
|
|
update Policy set { name: $name } where slug = $slug
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("OK query `update_policy` (mutation)"));
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("WARN Policy.effectiveTo exists in schema but no update query sets it")
|
|
|
|
|
);
|
|
|
|
|
assert!(stdout.contains(
|
|
|
|
|
"INFO Lint complete: 1 queries processed (0 error(s), 1 warning(s), 0 info item(s))"
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn query_lint_human_output_reports_strict_validation_errors() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let schema_path = temp.path().join("schema.pg");
|
|
|
|
|
let query_path = temp.path().join("queries.gq");
|
|
|
|
|
write_file(
|
|
|
|
|
&schema_path,
|
|
|
|
|
r#"
|
|
|
|
|
node Policy {
|
|
|
|
|
slug: String @key
|
|
|
|
|
name: String?
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_query_file(
|
|
|
|
|
&query_path,
|
|
|
|
|
r#"
|
|
|
|
|
query bad_update($slug: String) {
|
|
|
|
|
update Policy set { priority_level: "high" } where slug = $slug
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("query")
|
|
|
|
|
.arg("lint")
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&query_path)
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("ERROR query `bad_update`:"));
|
|
|
|
|
assert!(stdout.contains("Policy"));
|
|
|
|
|
assert!(stdout.contains(
|
|
|
|
|
"INFO Lint complete: 1 queries processed (1 error(s), 0 warning(s), 0 info item(s))"
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-10 20:49:41 +03:00
|
|
|
#[test]
|
|
|
|
|
fn load_json_outputs_summary_for_main_branch() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
let data = fixture("test.jsonl");
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&data)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["branch"], "main");
|
|
|
|
|
assert_eq!(payload["mode"], "overwrite");
|
2026-04-11 19:01:48 +03:00
|
|
|
assert_eq!(payload["nodes_loaded"], 6);
|
|
|
|
|
assert_eq!(payload["edges_loaded"], 5);
|
|
|
|
|
assert_eq!(payload["node_types_loaded"], 2);
|
|
|
|
|
assert_eq!(payload["edge_types_loaded"], 2);
|
2026-04-10 20:49:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn load_into_feature_branch_with_merge_mode_succeeds() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let feature_data = temp.path().join("feature.jsonl");
|
|
|
|
|
write_jsonl(
|
|
|
|
|
&feature_data,
|
|
|
|
|
r#"{"type":"Person","data":{"name":"Alice","age":31}}"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&feature_data)
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--mode")
|
|
|
|
|
.arg("merge")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("branch feature"));
|
|
|
|
|
assert!(stdout.contains("with merge"));
|
2026-04-11 19:01:48 +03:00
|
|
|
assert!(stdout.contains("1 nodes across 1 node types"));
|
2026-04-10 20:49:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_json_outputs_rows_for_named_query() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
let queries = fixture("test.gq");
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&queries)
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Alice"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["query_name"], "get_person");
|
|
|
|
|
assert_eq!(payload["target"]["branch"], "main");
|
|
|
|
|
assert_eq!(payload["row_count"], 1);
|
|
|
|
|
assert_eq!(payload["rows"][0]["p.name"], "Alice");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn export_jsonl_outputs_source_rows_for_selected_branch_and_type() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let feature_data = temp.path().join("feature-export.jsonl");
|
|
|
|
|
write_jsonl(
|
|
|
|
|
&feature_data,
|
|
|
|
|
r#"{"type":"Person","data":{"name":"Eve","age":29}}"#,
|
|
|
|
|
);
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&feature_data)
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--mode")
|
|
|
|
|
.arg("append")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("export")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--type")
|
|
|
|
|
.arg("Person")
|
|
|
|
|
.arg("--jsonl"),
|
|
|
|
|
);
|
|
|
|
|
let rows = stdout_string(&output)
|
|
|
|
|
.lines()
|
|
|
|
|
.map(|line| serde_json::from_str::<Value>(line).unwrap())
|
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
assert_eq!(rows.len(), 5);
|
|
|
|
|
assert!(rows.iter().all(|row| row["type"] == "Person"));
|
|
|
|
|
assert!(rows.iter().all(|row| row.get("edge").is_none()));
|
|
|
|
|
assert!(
|
|
|
|
|
rows.iter()
|
|
|
|
|
.any(|row| row["data"]["name"].as_str() == Some("Eve"))
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn policy_validate_accepts_valid_policy_file() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let (config, _) = write_policy_config_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("policy")
|
|
|
|
|
.arg("validate")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("policy valid:"));
|
|
|
|
|
assert!(stdout.contains("policy.yaml"));
|
|
|
|
|
assert!(stdout.contains("[2 actors]"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn policy_validate_fails_for_invalid_policy_file() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
|
|
|
|
let policy = temp.path().join("policy.yaml");
|
|
|
|
|
fs::write(
|
|
|
|
|
&config,
|
|
|
|
|
r#"
|
|
|
|
|
project:
|
2026-05-24 16:46:00 +01:00
|
|
|
name: policy-test-graph
|
2026-04-10 20:49:41 +03:00
|
|
|
policy:
|
|
|
|
|
file: ./policy.yaml
|
|
|
|
|
"#,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
fs::write(
|
|
|
|
|
&policy,
|
|
|
|
|
r#"
|
|
|
|
|
version: 1
|
|
|
|
|
groups:
|
|
|
|
|
team: [act-andrew]
|
|
|
|
|
rules:
|
|
|
|
|
- id: duplicate
|
|
|
|
|
allow:
|
|
|
|
|
actors: { group: team }
|
|
|
|
|
actions: [read]
|
|
|
|
|
branch_scope: any
|
|
|
|
|
- id: duplicate
|
|
|
|
|
allow:
|
|
|
|
|
actors: { group: team }
|
|
|
|
|
actions: [export]
|
|
|
|
|
branch_scope: any
|
|
|
|
|
"#,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("policy")
|
|
|
|
|
.arg("validate")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(stderr.contains("duplicate policy rule id"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn policy_test_runs_declarative_cases() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let (config, _) = write_policy_config_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let output = output_success(cli().arg("policy").arg("test").arg("--config").arg(&config));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("policy tests passed: 2 cases"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn policy_explain_reports_decision_and_matched_rule() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let (config, _) = write_policy_config_fixture(temp.path());
|
|
|
|
|
|
|
|
|
|
let allow = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("policy")
|
|
|
|
|
.arg("explain")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--actor")
|
|
|
|
|
.arg("act-andrew")
|
|
|
|
|
.arg("--action")
|
|
|
|
|
.arg("change")
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
let allow_stdout = stdout_string(&allow);
|
|
|
|
|
assert!(allow_stdout.contains("decision: allow"));
|
|
|
|
|
assert!(allow_stdout.contains("matched_rule: team-write"));
|
|
|
|
|
|
|
|
|
|
let deny = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("policy")
|
|
|
|
|
.arg("explain")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--actor")
|
|
|
|
|
.arg("act-bruno")
|
|
|
|
|
.arg("--action")
|
|
|
|
|
.arg("change")
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("main"),
|
|
|
|
|
);
|
|
|
|
|
let deny_stdout = stdout_string(&deny);
|
|
|
|
|
assert!(deny_stdout.contains("decision: deny"));
|
|
|
|
|
assert!(deny_stdout.contains("message: policy denied action 'change' on branch 'main'"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_can_resolve_uri_from_config() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
|
|
|
|
write_config(&config, &local_yaml_config(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Alice"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["row_count"], 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_alias_from_yaml_config_runs_with_kv_output() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
|
|
|
|
let query = temp.path().join("aliases.gq");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
write_query_file(
|
|
|
|
|
&query,
|
|
|
|
|
&std::fs::read_to_string(fixture("test.gq")).unwrap(),
|
|
|
|
|
);
|
|
|
|
|
write_config(
|
|
|
|
|
&config,
|
|
|
|
|
&format!(
|
|
|
|
|
"{}aliases:\n owner:\n command: read\n query: aliases.gq\n name: get_person\n args: [name]\n format: kv\n",
|
2026-05-24 16:46:00 +01:00
|
|
|
local_yaml_config(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--alias")
|
|
|
|
|
.arg("owner")
|
|
|
|
|
.arg("Alice"),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("row 1"));
|
|
|
|
|
assert!(stdout.contains("p.name: Alice"));
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-11 19:01:48 +03:00
|
|
|
#[test]
|
|
|
|
|
fn read_alias_uses_alias_target_without_cli_default_and_accepts_url_like_arg() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-11 19:01:48 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
|
|
|
|
let query = temp.path().join("aliases.gq");
|
|
|
|
|
let data = temp.path().join("url-like.jsonl");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-11 19:01:48 +03:00
|
|
|
write_jsonl(
|
|
|
|
|
&data,
|
|
|
|
|
r#"{"type":"Person","data":{"name":"https://example.com","age":30}}"#,
|
|
|
|
|
);
|
2026-05-24 16:46:00 +01:00
|
|
|
output_success(cli().arg("load").arg("--data").arg(&data).arg(&graph));
|
2026-04-11 19:01:48 +03:00
|
|
|
write_query_file(
|
|
|
|
|
&query,
|
|
|
|
|
&std::fs::read_to_string(fixture("test.gq")).unwrap(),
|
|
|
|
|
);
|
|
|
|
|
write_config(
|
|
|
|
|
&config,
|
|
|
|
|
&format!(
|
2026-04-14 04:12:14 +03:00
|
|
|
"graphs:\n local:\n uri: '{}'\nquery:\n roots:\n - .\npolicy: {{}}\naliases:\n owner:\n command: read\n query: aliases.gq\n name: get_person\n args: [name]\n graph: local\n format: kv\n",
|
2026-05-24 16:46:00 +01:00
|
|
|
graph.to_string_lossy()
|
2026-04-11 19:01:48 +03:00
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--alias")
|
|
|
|
|
.arg("owner")
|
|
|
|
|
.arg("https://example.com"),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("row 1"));
|
|
|
|
|
assert!(stdout.contains("p.name: https://example.com"));
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-10 20:49:41 +03:00
|
|
|
#[test]
|
|
|
|
|
fn change_alias_from_yaml_config_persists_changes() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
|
|
|
|
let query = temp.path().join("mutations.gq");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
write_query_file(
|
|
|
|
|
&query,
|
|
|
|
|
r#"
|
|
|
|
|
query insert_person($name: String, $age: I32) {
|
|
|
|
|
insert Person { name: $name, age: $age }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
write_config(
|
|
|
|
|
&config,
|
|
|
|
|
&format!(
|
|
|
|
|
"{}aliases:\n add_person:\n command: change\n query: mutations.gq\n name: insert_person\n args: [name, age]\n",
|
2026-05-24 16:46:00 +01:00
|
|
|
local_yaml_config(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("change")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--alias")
|
|
|
|
|
.arg("add_person")
|
|
|
|
|
.arg("Eve")
|
|
|
|
|
.arg("29")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["affected_nodes"], 1);
|
|
|
|
|
|
|
|
|
|
let verify = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Eve"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let verify_payload: Value = serde_json::from_slice(&verify.stdout).unwrap();
|
|
|
|
|
assert_eq!(verify_payload["row_count"], 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_csv_format_outputs_header_and_row_values() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Alice"}"#)
|
|
|
|
|
.arg("--format")
|
|
|
|
|
.arg("csv"),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.lines().next().unwrap().contains("p.name"));
|
|
|
|
|
assert!(stdout.contains("Alice"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_jsonl_format_outputs_metadata_header_first() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Alice"}"#)
|
|
|
|
|
.arg("--format")
|
|
|
|
|
.arg("jsonl"),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
let mut lines = stdout.lines();
|
|
|
|
|
assert!(lines.next().unwrap().contains("\"kind\":\"metadata\""));
|
|
|
|
|
assert!(lines.next().unwrap().contains("\"p.name\":\"Alice\""));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn change_json_outputs_affected_counts_and_persists() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
let mutation_file = temp.path().join("mutations.gq");
|
|
|
|
|
write_query_file(
|
|
|
|
|
&mutation_file,
|
|
|
|
|
r#"
|
|
|
|
|
query insert_person($name: String, $age: I32) {
|
|
|
|
|
insert Person { name: $name, age: $age }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("change")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&mutation_file)
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Eve","age":29}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["branch"], "main");
|
|
|
|
|
assert_eq!(payload["query_name"], "insert_person");
|
|
|
|
|
assert_eq!(payload["affected_nodes"], 1);
|
|
|
|
|
assert_eq!(payload["affected_edges"], 0);
|
|
|
|
|
|
|
|
|
|
let verify = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("--name")
|
|
|
|
|
.arg("get_person")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Eve"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let verify_payload: Value = serde_json::from_slice(&verify.stdout).unwrap();
|
|
|
|
|
assert_eq!(verify_payload["row_count"], 1);
|
|
|
|
|
assert_eq!(verify_payload["rows"][0]["p.name"], "Eve");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn change_can_resolve_uri_and_branch_from_config() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
|
|
|
|
write_config(&config, &local_yaml_config(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let mutation_file = temp.path().join("config-mutations.gq");
|
|
|
|
|
write_query_file(
|
|
|
|
|
&mutation_file,
|
|
|
|
|
r#"
|
|
|
|
|
query insert_person($name: String, $age: I32) {
|
|
|
|
|
insert Person { name: $name, age: $age }
|
|
|
|
|
}
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("change")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(&mutation_file)
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Mia","age":30}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["branch"], "main");
|
|
|
|
|
assert_eq!(payload["affected_nodes"], 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_requires_name_for_multi_query_files() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq")),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(stderr.contains("multiple queries"));
|
|
|
|
|
}
|
|
|
|
|
|
feat: inline query strings in CLI and HTTP server (#110)
* feat(MR-656): inline query strings in CLI and HTTP server
CLI:
- Add -e / --query-string <STRING> to omnigraph read and omnigraph change
- Exactly one of --query, --query-string, --alias is required (3-way XOR)
- Empty --query-string is rejected with a clear error
HTTP:
- New POST /query (read-only, clean field names: query/name/params/branch/snapshot)
- Mutations on /query are rejected with 400 -- use POST /change instead
- ChangeRequest fields polished: query (alias query_source), name (alias query_name)
- POST /read and POST /change remain byte-compatible for existing clients
Tests:
- cli.rs: -e happy-path on read/change, mutex error vs --query, empty -e rejected
- system_local.rs: inline -e read and -e change exercise the local flow
- system_remote.rs: inline -e read/change over HTTP plus direct /query 200/400
- server.rs: /query 200, /query 400 on mutation, /change legacy field alias
- openapi.rs: new /query path, QueryRequest schema, ChangeRequest field-name polish
Docs: cli.md (-e examples), cli-reference.md (read/change rows), server.md (/query)
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* feat(MR-656): rename read/change to query/mutate with deprecation signals
HTTP server:
- Add POST /mutate as canonical write endpoint (pairs with POST /query).
- Mark POST /read and POST /change as deprecated. Three-channel signal:
* OpenAPI: `deprecated: true` on the operation (every codegen flags
the generated SDK method).
* RFC 9745: response `Deprecation: true` header on every response.
* RFC 8288: response `Link: </successor>; rel="successor-version"`
pointing at /query and /mutate respectively.
- Share business logic across /mutate and /change via run_mutate(); the
/change wrapper is the only place that adds the deprecation headers.
- ChangeRequest field aliases (query_source/query_name) preserved.
- AliasCommand serde now accepts `query`/`mutate` alongside `read`/`change`.
CLI:
- Promote `omnigraph query` / `omnigraph mutate` to top-level canonical
subcommands (clap visible_alias keeps `omnigraph read` / `omnigraph
change` working forever).
- Promote `omnigraph lint` / `omnigraph check` to top-level (was nested
under `omnigraph query lint`, which is now a deprecated argv shim that
rewrites to the canonical form).
- Argv-level preprocessing prints a one-line deprecation warning to
stderr when any legacy spelling is used. Canonical names are silent.
Tests:
- Server: /mutate works, /change emits Deprecation+Link headers, /read
emits Deprecation+Link headers, /query carries no deprecation signal.
- OpenAPI: /read and /change flagged deprecated; /query and /mutate not.
- CLI: canonical `lint` matches deprecated `query lint` / `query check`
output; `read` / `change` print deprecation warnings.
Docs:
- cli.md: new canonical examples; "Deprecated names" migration table.
- cli-reference.md: top-level table updated; aliases.<name>.command
accepts both legacy and canonical spellings.
- server.md: endpoint inventory shows /query and /mutate as canonical
and /read and /change as deprecated; dedicated section explains the
three-channel deprecation signal.
- og-cheet-sheet.md: use new `omnigraph lint` / `omnigraph check`.
- openapi.json regenerated.
Migration is purely cosmetic — every deprecated form continues to work
indefinitely; only the spelling changes.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* fix(MR-656): address Devin Review findings on /query and /change
Two issues raised by Devin Review on PR #110:
1. `POST /query` mutation-rejection error pointed at the deprecated
`/change` endpoint instead of the canonical `/mutate`. Fixed in
three places: the runtime error message in `server_query`, the
utoipa 400-response description, and the handler doc comment. The
`QueryRequest` schema docstrings in `api.rs` got the same update so
the openapi.json bodies match. Server and openapi tests updated.
2. `execute_change_remote` serialized `ChangeRequest` directly, which
emits the new canonical field names `query` / `name` on the wire.
`#[serde(alias = "query_source")]` only affects deserialization, so
a newer CLI talking to an older server would have its `/change`
POST body fail with "missing field: query_source". Fixed by
extracting a `legacy_change_request_body` helper that hand-rolls
the JSON with the legacy keys (`query_source` / `query_name`), the
same byte-stable contract `execute_read_remote` already uses
against `/read`. Added two unit tests on the helper to lock the
wire shape in.
Co-Authored-By: Ragnor Comerford <ragnor.comerford@gmail.com>
* docs(dev): RFC 001 — inline + stored queries, envelope, MCP
Tracked artifact consolidating the design across MR-656 (this branch),
MR-976 (Phase 1 envelope hardening parent, with MR-977/978/979/980
sub-issues), and MR-969 (stored queries + MCP).
Sections:
* Two paths, one engine — inline `/query` + `/mutate` (this PR) coexist
with stored `/queries/{name}` (MR-969). Same `run_query` / `run_mutate`
backend (the fold-in landed in the previous commit).
* Request envelope ("before") — Idempotency-Key, If-Match, X-Deadline,
X-Trace-Id, expect, dry_run, fields. Phase 1 ships the load-bearing
subset on `/mutate`.
* Response envelope ("after") — audit_id, snapshot_id, commit_id, stats,
warnings. Closes the provenance loop today's `ChangeOutput` leaves
open.
* `.gq` pragmas — `@description`, `@returns`, `@mcp`. Source-of-truth
for the stored-query agent contract; no separate YAML registry.
* Multi-graph MCP — per-graph `/graphs/{id}/mcp/tools` + `/mcp/invoke`.
Token binds to one graph by default; cross-graph agents loop.
* Cedar split — `read`/`change` for inline, `invoke_query` for stored.
Operators deny ad-hoc for agent groups while keeping curated tool
list open.
* Rejected alternatives — per-env override files, compiled bundles,
tool-name prefixing across graphs, body-field graph dispatch.
Index entry added under "Active Implementation Plans" so future agents
land on the RFC before touching queries / mutations / envelope code.
`scripts/check-agents-md.sh` clean (35 links, 34 docs).
* docs(server): clarify why run_query lacks AppState parameter
run_mutate takes state for workload admission; run_query doesn't because
reads aren't admission-gated today. Mark the asymmetry as intentional and
flag the two future events that would grow the signature: Phase 1's
`expect: { max_rows_scanned: N }` budget (MR-976) or per-actor admission
extending to stored-read invocations (MR-969). Prevents the natural
"make these symmetrical" follow-up.
* refactor(server): run_query / run_mutate take &ResolvedActor
Replace `Option<Extension<ResolvedActor>>` in the helpers with
`Option<&ResolvedActor>`. Saves MR-969's stored-query handler from
wrapping a bare actor in axum's `Extension(...)` before calling.
Handler signatures (`server_query`, `server_read`, `server_mutate`,
`server_change`) keep `Option<Extension<ResolvedActor>>` because that
is what axum injects, and unwrap at the call site with
`actor.as_ref().map(|Extension(actor)| actor)`.
Net: -13/+10 LOC, 89/0 server tests pass.
* docs(releases): v0.6.0 — describe inline + canonical-named queries (MR-656)
Extend the v0.6.0 release notes to cover the third piece of work landing
alongside the graph terminology rename and multi-graph server mode:
canonical-named `POST /query` and `POST /mutate` endpoints, the CLI's
new `-e/--query-string` flag, the top-level promotion of `lint` /
`check`, and the three-channel deprecation signal on `/read` and
`/change` (OpenAPI `deprecated: true` + RFC 9745 + RFC 8288).
Additions:
* Top blurb: "Two pieces" -> "Three pieces" with a bullet describing
the rename + inline flow.
* Breaking Changes: new "Query / mutation rename" subsection covering
the `ChangeRequest` field rename (with the back-compat serde aliases
and the CLI's `legacy_change_request_body` byte-stable wire helper)
and the `omnigraph query lint` -> `omnigraph lint` move.
* New: 5 bullets — the two endpoints, the CLI subcommands, the `-e`
flag, the deprecation signal channels, the widened `aliases.<name>.command`
vocabulary.
* User Impact: one bullet making explicit that the rename is cosmetic
on the client side and migration is voluntary.
* Documentation: pointers to the updated `server.md` / `cli.md` /
`cli-reference.md` and the new `docs/dev/rfc-001-queries-envelope-mcp.md`.
+15/-1 lines. `./scripts/check-agents-md.sh` clean.
* refactor(cli): demote `check` from visible_alias to deprecation shim
`omnigraph check` was a clap `visible_alias` on `lint`, advertised in
`--help` as an equivalent canonical name. Per MR-981 §6 (long-form
flags as canonical, short forms as visible aliases), visible aliases
on subcommand names hurt agent CX: agents emit either spelling
depending on training-data drift, and there's no length signal
pointing at the canonical name.
Changes:
* Remove `#[command(visible_alias = "check")]` from the `Lint` variant.
`omnigraph --help` now shows only `lint`.
* Add bare `check` to `rewrite_deprecated_argv` so `omnigraph check
<args>` still works — it rewrites to `omnigraph lint <args>` and
emits a one-line stderr deprecation warning, matching the existing
pattern for `read` / `change` / `query lint` / `query check`.
* Fix the nested `query check` shim to substitute `check` -> `lint` in
the rewritten argv (previously it relied on `check` being a
visible_alias to reach the `Lint` variant).
* New test `deprecated_check_top_level_rewrites_to_lint` covers: bare
`check` produces identical stdout to `lint`, emits the deprecation
warning, and `check` does NOT appear as an alias in `omnigraph
--help`.
* Release notes updated to reflect the deprecation-shim treatment and
cross-reference MR-981 §6 reasoning.
Cargo / Go users typing `check` still work indefinitely; one stderr
nudge per invocation teaches the canonical name. Agents see only
`lint` in `--help --json` so they emit one canonical form.
67/0 omnigraph-cli tests pass; 39 workspace test suites green.
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Ragnor Comerford <ragnor.comerford@gmail.com>
Co-authored-by: Ragnor Comerford <hello@ragnor.co>
2026-05-29 13:41:54 +02:00
|
|
|
#[test]
|
|
|
|
|
fn read_supports_inline_query_string() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let repo = graph_path(temp.path());
|
|
|
|
|
init_graph(&repo);
|
|
|
|
|
load_fixture(&repo);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg(&repo)
|
|
|
|
|
.arg("-e")
|
|
|
|
|
.arg("query find($name: String) { match { $p: Person { name: $name } } return { $p.name, $p.age } }")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Alice"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["query_name"], "find");
|
|
|
|
|
assert_eq!(payload["row_count"], 1);
|
|
|
|
|
assert_eq!(payload["rows"][0]["p.name"], "Alice");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn change_supports_inline_query_string() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let repo = graph_path(temp.path());
|
|
|
|
|
init_graph(&repo);
|
|
|
|
|
load_fixture(&repo);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("change")
|
|
|
|
|
.arg(&repo)
|
|
|
|
|
.arg("--query-string")
|
|
|
|
|
.arg("query add($name: String, $age: I32) { insert Person { name: $name, age: $age } }")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Inline","age":42}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["query_name"], "add");
|
|
|
|
|
assert_eq!(payload["affected_nodes"], 1);
|
|
|
|
|
|
|
|
|
|
let verify = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg(&repo)
|
|
|
|
|
.arg("-e")
|
|
|
|
|
.arg("query find($name: String) { match { $p: Person { name: $name } } return { $p.name } }")
|
|
|
|
|
.arg("--params")
|
|
|
|
|
.arg(r#"{"name":"Inline"}"#)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let verify_payload: Value = serde_json::from_slice(&verify.stdout).unwrap();
|
|
|
|
|
assert_eq!(verify_payload["row_count"], 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_rejects_query_string_combined_with_query() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let repo = graph_path(temp.path());
|
|
|
|
|
init_graph(&repo);
|
|
|
|
|
load_fixture(&repo);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("read")
|
|
|
|
|
.arg(&repo)
|
|
|
|
|
.arg("--query")
|
|
|
|
|
.arg(fixture("test.gq"))
|
|
|
|
|
.arg("-e")
|
|
|
|
|
.arg("query whatever() { match { $p: Person } return { $p.name } }"),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("cannot be used") || stderr.contains("conflict"),
|
|
|
|
|
"expected clap conflict error, got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn read_rejects_empty_query_string() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
|
|
|
|
let repo = graph_path(temp.path());
|
|
|
|
|
init_graph(&repo);
|
|
|
|
|
load_fixture(&repo);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(cli().arg("read").arg(&repo).arg("-e").arg(""));
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("must not be empty"),
|
|
|
|
|
"expected empty-string rejection, got: {stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-10 20:49:41 +03:00
|
|
|
#[test]
|
|
|
|
|
fn branch_create_json_outputs_source_and_name() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["from"], "main");
|
|
|
|
|
assert_eq!(payload["name"], "feature");
|
2026-05-24 16:46:00 +01:00
|
|
|
assert_eq!(payload["uri"], graph.to_string_lossy().as_ref());
|
2026-04-10 20:49:41 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn branch_list_outputs_sorted_branches() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("zeta"),
|
|
|
|
|
);
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("alpha"),
|
|
|
|
|
);
|
|
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let output = output_success(cli().arg("branch").arg("list").arg("--uri").arg(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
let lines = stdout
|
|
|
|
|
.lines()
|
|
|
|
|
.map(str::trim)
|
|
|
|
|
.filter(|line| !line.is_empty())
|
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
assert_eq!(lines, vec!["alpha", "main", "zeta"]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn branch_delete_json_outputs_name_and_removes_branch() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("delete")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["name"], "feature");
|
2026-05-24 16:46:00 +01:00
|
|
|
assert_eq!(payload["uri"], graph.to_string_lossy().as_ref());
|
2026-04-10 20:49:41 +03:00
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let listed = output_success(cli().arg("branch").arg("list").arg("--uri").arg(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let stdout = stdout_string(&listed);
|
|
|
|
|
let lines = stdout
|
|
|
|
|
.lines()
|
|
|
|
|
.map(str::trim)
|
|
|
|
|
.filter(|line| !line.is_empty())
|
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
assert_eq!(lines, vec!["main"]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn branch_delete_rejects_main() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("delete")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("main"),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(stderr.contains("cannot delete branch 'main'"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn branch_merge_defaults_target_to_main() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let feature_data = temp.path().join("feature.jsonl");
|
|
|
|
|
write_jsonl(
|
|
|
|
|
&feature_data,
|
|
|
|
|
r#"{"type":"Person","data":{"name":"Eve","age":29}}"#,
|
|
|
|
|
);
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&feature_data)
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--mode")
|
|
|
|
|
.arg("append")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let merge_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("merge")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let merge_payload: Value = serde_json::from_slice(&merge_output.stdout).unwrap();
|
|
|
|
|
assert_eq!(merge_payload["source"], "feature");
|
|
|
|
|
assert_eq!(merge_payload["target"], "main");
|
|
|
|
|
assert_eq!(merge_payload["outcome"], "fast_forward");
|
|
|
|
|
|
|
|
|
|
let snapshot_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("snapshot")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let snapshot: Value = serde_json::from_slice(&snapshot_output.stdout).unwrap();
|
|
|
|
|
let person_row_count = snapshot["tables"]
|
|
|
|
|
.as_array()
|
|
|
|
|
.unwrap()
|
|
|
|
|
.iter()
|
|
|
|
|
.find(|table| table["table_key"] == "node:Person")
|
|
|
|
|
.unwrap()["row_count"]
|
|
|
|
|
.as_u64()
|
|
|
|
|
.unwrap();
|
|
|
|
|
assert_eq!(person_row_count, 5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn branch_merge_supports_explicit_target() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("feature"),
|
|
|
|
|
);
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("create")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("--from")
|
|
|
|
|
.arg("main")
|
|
|
|
|
.arg("experiment"),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let feature_data = temp.path().join("feature-explicit.jsonl");
|
|
|
|
|
write_jsonl(
|
|
|
|
|
&feature_data,
|
|
|
|
|
r#"{"type":"Person","data":{"name":"Frank","age":41}}"#,
|
|
|
|
|
);
|
|
|
|
|
output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&feature_data)
|
|
|
|
|
.arg("--branch")
|
|
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--mode")
|
|
|
|
|
.arg("append")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let merge_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("merge")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("feature")
|
|
|
|
|
.arg("--into")
|
|
|
|
|
.arg("experiment")
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let merge_payload: Value = serde_json::from_slice(&merge_output.stdout).unwrap();
|
|
|
|
|
assert_eq!(merge_payload["target"], "experiment");
|
|
|
|
|
assert_eq!(merge_payload["outcome"], "fast_forward");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn snapshot_json_returns_manifest_version_and_tables() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let output = output_success(cli().arg("snapshot").arg(&graph).arg("--json"));
|
2026-04-10 20:49:41 +03:00
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["branch"], "main");
|
|
|
|
|
assert_eq!(
|
|
|
|
|
payload["manifest_version"].as_u64().unwrap(),
|
2026-05-24 16:46:00 +01:00
|
|
|
manifest_dataset_version(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
assert!(payload["tables"].as_array().unwrap().len() >= 4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn write_seed_fixture(root: &std::path::Path) -> std::path::PathBuf {
|
|
|
|
|
fs::create_dir_all(root.join("data")).unwrap();
|
|
|
|
|
fs::create_dir_all(root.join("build")).unwrap();
|
|
|
|
|
let raw_seed = root.join("data/seed.jsonl");
|
|
|
|
|
let seed = root.join("seed.yaml");
|
|
|
|
|
|
|
|
|
|
fs::write(
|
|
|
|
|
&raw_seed,
|
|
|
|
|
concat!(
|
|
|
|
|
"{\"type\":\"Decision\",\"data\":{\"slug\":\"dec-alpha\",\"intent\":\"Alpha ship\"}}\n",
|
|
|
|
|
"{\"type\":\"Decision\",\"data\":{\"slug\":\"dec-beta\",\"intent\":\"Beta ship\",\"embedding\":[0.1,0.2]}}\n"
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
fs::write(
|
|
|
|
|
&seed,
|
|
|
|
|
concat!(
|
|
|
|
|
"graph:\n",
|
|
|
|
|
" slug: mr-context-graph\n",
|
|
|
|
|
"sources:\n",
|
|
|
|
|
" raw_seed: ./data/seed.jsonl\n",
|
|
|
|
|
"artifacts:\n",
|
|
|
|
|
" embedded_seed: ./build/seed.embedded.jsonl\n",
|
|
|
|
|
"embeddings:\n",
|
|
|
|
|
" model: gemini-embedding-2-preview\n",
|
|
|
|
|
" dimension: 4\n",
|
|
|
|
|
" types:\n",
|
|
|
|
|
" Decision:\n",
|
|
|
|
|
" target: embedding\n",
|
|
|
|
|
" fields: [slug, intent]\n"
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
seed
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn write_seed_fixture_with_edge(root: &std::path::Path) -> std::path::PathBuf {
|
|
|
|
|
let seed = write_seed_fixture(root);
|
|
|
|
|
let raw_seed = root.join("data/seed.jsonl");
|
|
|
|
|
fs::write(
|
|
|
|
|
&raw_seed,
|
|
|
|
|
concat!(
|
|
|
|
|
"{\"type\":\"Decision\",\"data\":{\"slug\":\"dec-alpha\",\"intent\":\"Alpha ship\"}}\n",
|
|
|
|
|
"{\"type\":\"Decision\",\"data\":{\"slug\":\"dec-beta\",\"intent\":\"Beta ship\",\"embedding\":[0.1,0.2]}}\n",
|
|
|
|
|
"{\"edge\":\"Triggered\",\"from\":\"sig-alpha\",\"to\":\"dec-alpha\"}\n"
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
seed
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn read_embedded_rows(path: std::path::PathBuf) -> Vec<Value> {
|
|
|
|
|
fs::read_to_string(path)
|
|
|
|
|
.unwrap()
|
|
|
|
|
.lines()
|
|
|
|
|
.filter(|line| !line.trim().is_empty())
|
|
|
|
|
.map(|line| serde_json::from_str(line).unwrap())
|
|
|
|
|
.collect()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn snapshot_can_resolve_uri_from_config() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let config = temp.path().join("omnigraph.yaml");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
|
|
|
|
write_config(&config, &local_yaml_config(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("snapshot")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["branch"], "main");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn snapshot_human_output_includes_branch_and_table_summaries() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let output = output_success(cli().arg("snapshot").arg(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
|
|
|
|
|
assert!(stdout.contains("branch: main"));
|
|
|
|
|
assert!(stdout.contains("manifest_version:"));
|
|
|
|
|
assert!(stdout.contains("node:Person v"));
|
|
|
|
|
assert!(stdout.contains("edge:Knows v"));
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-11 19:01:48 +03:00
|
|
|
#[test]
|
|
|
|
|
fn commit_show_accepts_long_uri_flag() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-11 19:01:48 +03:00
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let list = output_success(cli().arg("commit").arg("list").arg(&graph).arg("--json"));
|
2026-04-11 19:01:48 +03:00
|
|
|
let list_payload: Value = serde_json::from_slice(&list.stdout).unwrap();
|
|
|
|
|
let commit_id = list_payload["commits"][0]["graph_commit_id"]
|
|
|
|
|
.as_str()
|
|
|
|
|
.unwrap()
|
|
|
|
|
.to_string();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("commit")
|
|
|
|
|
.arg("show")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-11 19:01:48 +03:00
|
|
|
.arg(&commit_id)
|
|
|
|
|
.arg("--json"),
|
|
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(payload["graph_commit_id"], commit_id);
|
|
|
|
|
assert!(payload["manifest_version"].as_u64().unwrap() >= 1);
|
|
|
|
|
}
|
|
|
|
|
|
2026-04-10 20:49:41 +03:00
|
|
|
#[test]
|
2026-05-24 16:46:00 +01:00
|
|
|
fn cli_fails_for_missing_graph() {
|
2026-04-10 20:49:41 +03:00
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
let output = output_failure(cli().arg("snapshot").arg(&graph));
|
2026-04-10 20:49:41 +03:00
|
|
|
let stderr = String::from_utf8(output.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("_schema.pg")
|
|
|
|
|
|| stderr.contains("No such file")
|
|
|
|
|
|| stderr.contains("not found")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn cli_fails_for_missing_schema_or_data_file() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
2026-04-10 20:49:41 +03:00
|
|
|
let missing_schema = temp.path().join("missing.pg");
|
|
|
|
|
let missing_data = temp.path().join("missing.jsonl");
|
|
|
|
|
|
|
|
|
|
let init_output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("init")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&missing_schema)
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
String::from_utf8(init_output.stderr)
|
|
|
|
|
.unwrap()
|
|
|
|
|
.contains("No such file")
|
|
|
|
|
);
|
|
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
let load_output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("load")
|
|
|
|
|
.arg("--data")
|
|
|
|
|
.arg(&missing_data)
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
2026-04-10 20:49:41 +03:00
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
String::from_utf8(load_output.stderr)
|
|
|
|
|
.unwrap()
|
|
|
|
|
.contains("No such file")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn cli_fails_for_invalid_merge_requests() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
|
|
|
|
load_fixture(&graph);
|
2026-04-10 20:49:41 +03:00
|
|
|
|
|
|
|
|
let missing_branch = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("merge")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("missing"),
|
|
|
|
|
);
|
|
|
|
|
let missing_branch_stderr = String::from_utf8(missing_branch.stderr).unwrap();
|
|
|
|
|
assert!(
|
|
|
|
|
missing_branch_stderr.contains("missing")
|
|
|
|
|
|| missing_branch_stderr.contains("head commit")
|
|
|
|
|
|| missing_branch_stderr.contains("not found")
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let same_branch = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("branch")
|
|
|
|
|
.arg("merge")
|
|
|
|
|
.arg("--uri")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph)
|
2026-04-10 20:49:41 +03:00
|
|
|
.arg("main")
|
|
|
|
|
.arg("--into")
|
|
|
|
|
.arg("main"),
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
String::from_utf8(same_branch.stderr)
|
|
|
|
|
.unwrap()
|
|
|
|
|
.contains("distinct source and target")
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2026-05-01 22:45:38 +02:00
|
|
|
// `omnigraph run list/show/publish/abort` subcommands removed
|
2026-04-30 08:52:50 +02:00
|
|
|
// alongside the run state machine. Direct-to-target writes leave nothing
|
|
|
|
|
// for these CLIs to manage. Audit history is now visible via
|
|
|
|
|
// `omnigraph commit list` reading the commit graph.
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
|
|
|
|
|
// ─── MR-694 PR B: --allow-data-loss flag end-to-end ──────────────────────
|
|
|
|
|
//
|
|
|
|
|
// The schema-lint chassis v1.2 (PR #100) shipped the `--allow-data-loss`
|
|
|
|
|
// flag at the CLI layer; the SDK suite verifies promotion to Hard mode
|
|
|
|
|
// via `apply_schema_with_options(.., SchemaApplyOptions { allow_data_loss })`.
|
|
|
|
|
// These CLI tests close the integration gap so a future change that
|
|
|
|
|
// drops the flag wiring in `main.rs` turns red.
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_allow_data_loss_flag_promotes_drops_to_hard() {
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
let schema_path = temp.path().join("drop-age.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
|
|
|
|
|
// Drop the nullable `age` column.
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace(" age: I32?\n", "");
|
|
|
|
|
fs::write(&schema_path, next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--allow-data-loss")
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
|
|
|
|
|
let drop_step = payload["steps"]
|
|
|
|
|
.as_array()
|
|
|
|
|
.unwrap()
|
|
|
|
|
.iter()
|
|
|
|
|
.find(|s| s["kind"] == "drop_property")
|
|
|
|
|
.expect("plan should include a drop_property step");
|
|
|
|
|
assert_eq!(
|
|
|
|
|
drop_step["mode"], "hard",
|
|
|
|
|
"--allow-data-loss should promote Soft → Hard; full step: {drop_step}",
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_apply_without_allow_data_loss_keeps_soft_drops() {
|
|
|
|
|
// Symmetric to the above: same schema change without the flag →
|
|
|
|
|
// drops stay Soft. Pins default semantics against accidental Hard
|
|
|
|
|
// promotion if a future refactor changes the option threading.
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
let schema_path = temp.path().join("drop-age-soft.pg");
|
2026-05-24 16:46:00 +01:00
|
|
|
init_graph(&graph);
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg"))
|
|
|
|
|
.unwrap()
|
|
|
|
|
.replace(" age: I32?\n", "");
|
|
|
|
|
fs::write(&schema_path, next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("apply")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
);
|
|
|
|
|
let payload: Value = serde_json::from_slice(&output.stdout).unwrap();
|
|
|
|
|
assert_eq!(payload["applied"], true);
|
|
|
|
|
|
|
|
|
|
let drop_step = payload["steps"]
|
|
|
|
|
.as_array()
|
|
|
|
|
.unwrap()
|
|
|
|
|
.iter()
|
|
|
|
|
.find(|s| s["kind"] == "drop_property")
|
|
|
|
|
.expect("plan should include a drop_property step");
|
|
|
|
|
assert_eq!(
|
|
|
|
|
drop_step["mode"], "soft",
|
|
|
|
|
"no flag should leave drops Soft; full step: {drop_step}",
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn schema_plan_parity_cli_and_sdk() {
|
|
|
|
|
// Same .pg through `Omnigraph::plan_schema_with_options` (SDK) and
|
|
|
|
|
// `omnigraph schema plan --json` (CLI). Asserts the steps array is
|
|
|
|
|
// byte-identical after JSON round-trip. HTTP doesn't expose a
|
|
|
|
|
// separate /schema/plan route — that side of parity is covered by
|
|
|
|
|
// the HTTP soft/hard drop tests, which exercise apply with
|
|
|
|
|
// identical fixtures.
|
|
|
|
|
let temp = tempdir().unwrap();
|
2026-05-24 16:46:00 +01:00
|
|
|
let graph = graph_path(temp.path());
|
|
|
|
|
init_graph(&graph);
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
let schema_path = temp.path().join("plan-parity.pg");
|
|
|
|
|
let next_schema = fs::read_to_string(fixture("test.pg")).unwrap().replace(
|
|
|
|
|
" age: I32?\n}",
|
|
|
|
|
" age: I32?\n nickname: String?\n}",
|
|
|
|
|
);
|
|
|
|
|
fs::write(&schema_path, &next_schema).unwrap();
|
|
|
|
|
|
|
|
|
|
// CLI side.
|
|
|
|
|
let cli_output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("schema")
|
|
|
|
|
.arg("plan")
|
|
|
|
|
.arg("--schema")
|
|
|
|
|
.arg(&schema_path)
|
|
|
|
|
.arg("--json")
|
2026-05-24 16:46:00 +01:00
|
|
|
.arg(&graph),
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
);
|
|
|
|
|
let cli_payload: Value = serde_json::from_slice(&cli_output.stdout).unwrap();
|
|
|
|
|
|
2026-05-24 16:46:00 +01:00
|
|
|
// SDK side: open graph, call plan_schema.
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
let plan = tokio::runtime::Runtime::new().unwrap().block_on(async {
|
2026-05-24 16:46:00 +01:00
|
|
|
let db = Omnigraph::open(graph.to_string_lossy().as_ref())
|
schema: HTTP allow_data_loss exposure + e2e drop coverage (MR-694 follow-up) (#107)
The schema-lint chassis v1.2 (PR #100) shipped `--allow-data-loss` on
the CLI, but `SchemaApplyRequest` had no equivalent field — Hard-mode
drops were CLI-only. This commit closes that feature gap and adds e2e
test coverage for drop modes across HTTP + CLI, plus data preservation
on additive apply, plus a CLI↔SDK plan-parity assertion.
Feature gap closed:
- `crates/omnigraph-server/src/api.rs` — added `allow_data_loss: bool`
(default false via `#[serde(default)]`) to `SchemaApplyRequest`.
Added `Default` derive so test usages can use `..Default::default()`.
- `crates/omnigraph-server/src/lib.rs` — `server_schema_apply` now
constructs `SchemaApplyOptions { allow_data_loss: request.allow_data_loss }`
and threads through to `apply_schema_as`.
- `crates/omnigraph-cli/src/main.rs` — remote-URI schema-apply path
used to bail with "--allow-data-loss not yet supported on remote";
now forwards the flag into the JSON payload so the CLI behaves
identically against local and remote URIs.
- `openapi.json` — regenerated; only diff is the new field on
`SchemaApplyRequest`.
Tests added (8 new):
* `crates/omnigraph-server/tests/server.rs` (+5):
- `schema_apply_route_soft_drops_property_via_http` — POST schema
removing nullable property, verify catalog reflects the drop AND
`snapshot_at_version(pre)` still has `age` in the field list
(time-travel reachability is the Soft contract).
- `schema_apply_route_soft_drops_node_type_via_http` — POST schema
removing `Company` node + cascading `WorksAt` edge.
- `schema_apply_route_hard_drops_property_with_allow_data_loss` —
POST with `allow_data_loss: true`, verify plan step reports
`mode: hard`.
- `schema_apply_route_keeps_drops_soft_without_flag` — same schema
without flag, verify `mode: soft`. Pins default semantics against
accidental Hard promotion.
- `schema_apply_route_additive_property_preserves_existing_rows` —
load fixture, POST adding nullable property, verify row count
preserved (SDK suite covers data preservation on drops + renames;
additive AddProperty wasn't pinned).
Plus helpers `schema_without_age` and `schema_without_company`.
* `crates/omnigraph-cli/tests/cli.rs` (+3):
- `schema_apply_allow_data_loss_flag_promotes_drops_to_hard` — CLI
`omnigraph schema apply --allow-data-loss --schema X.pg --json`,
verify plan step has `mode: hard`.
- `schema_apply_without_allow_data_loss_keeps_soft_drops` — without
flag, verify Soft.
- `schema_plan_parity_cli_and_sdk` — same `.pg` source through
`Omnigraph::plan_schema` (SDK) and `omnigraph schema plan --json`
(CLI), assert the steps array is byte-identical post-JSON. HTTP
has no `/schema/plan` endpoint; apply-side parity is implicitly
covered by the HTTP drop tests + CLI drop tests using identical
fixtures.
Docs:
- `docs/user/schema-language.md` — new "Destructive drops" section
documenting Soft vs Hard semantics and that `allow_data_loss` is
now honored uniformly across CLI / HTTP / SDK.
Verification: every new test passes; full `cargo test --workspace --locked`
green; `scripts/check-agents-md.sh` passes.
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-19 01:56:46 +03:00
|
|
|
.await
|
|
|
|
|
.unwrap();
|
|
|
|
|
db.plan_schema(&next_schema).await.unwrap()
|
|
|
|
|
});
|
|
|
|
|
let sdk_steps = serde_json::to_value(&plan.steps).unwrap();
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
cli_payload["steps"], sdk_steps,
|
|
|
|
|
"CLI plan steps must match SDK plan steps for identical input",
|
|
|
|
|
);
|
|
|
|
|
assert_eq!(cli_payload["supported"], plan.supported);
|
|
|
|
|
}
|
(feat): multi-graph server mode (#119)
* mr-668: add GraphId newtype + Cloud-mode forward identity stubs (PR 1/10)
PR 1 of the MR-668 multi-graph server work. Pure types, no runtime
behavior changes yet.
Ships the validated identity vocabulary that the rest of the implementation
will consume:
- `GraphId(String)` — `^[a-zA-Z0-9-]{1,64}$`, leading underscore rejected
(engine reserves every `_*` filename), reserved route names rejected
(`policies`, `healthz`, `openapi`, `openapi.json`, `graphs`). Validation
lives in `try_from` only; serde `Deserialize` re-runs it so JSON payloads
cannot bypass.
- `TenantId(String)` — same regex shape as GraphId. `None` in Cluster
mode; reserved for Cloud mode (RFC 0003) where it carries the OAuth
`org_id` claim.
- `GraphKey { tenant_id: Option<TenantId>, graph_id }` — the registry
HashMap key. `cluster()` constructor for the Cluster-mode default.
- `Scope` enum with `Full` variant — Cluster mode default; RFC 0004 will
extend with OAuth scopes (`graph:read`/`write`/`admin`/`*`).
- `AuthSource` enum with `Static` variant — Cluster mode default; RFC
0001 step 1 will add `Oidc`.
- `ResolvedActor { actor_id, tenant_id, scopes, source }` — replaces the
upcoming refactor of `AuthenticatedActor(Arc<str>)` in PR 4a.
Per MR-668 design decision 13: ship the Cloud-mode forward type shapes
now (no `TokenVerifier` trait yet — that's RFC 0001 step 1) so handler
signatures stay stable across the Cluster → Cloud trajectory. `Scope`
and `AuthSource` use `#[non_exhaustive]` so future variants don't break
caller matches.
Tests: 26 new (15 graph_id + 11 identity), all passing. No regression
in the existing 36 server library tests.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: Omnigraph::init error-path cleanup + three failpoints (PR 2a/10)
PR 2a of the MR-668 multi-graph server work. Bug fix: a partially-failed
`Omnigraph::init` previously left orphan schema files at the graph URI,
making the URI unusable for a retry (the next `init` would refuse because
`_schema.pg` already exists).
Changes:
1. `init_with_storage` now wraps the I/O phase. On any error from
`init_storage_phase`, calls `best_effort_cleanup_init_artifacts` to
remove the three schema files before returning the original error:
- `_schema.pg`
- `_schema.ir.json`
- `__schema_state.json`
Cleanup is best-effort: a failure to delete is logged via
`tracing::warn` but does NOT mask the init error.
2. Three failpoints added at the init phase boundaries:
- `init.after_schema_pg_written`
- `init.after_schema_contract_written`
- `init.after_coordinator_init`
3. Four new failpoint tests in `tests/failpoints.rs` pin the cleanup
behavior at each boundary plus the "original error wins over cleanup
error" contract. All 23 failpoint tests pass.
Coverage gap (documented in code comments):
Lance per-type datasets and `__manifest/` directory created by
`GraphCoordinator::init` are NOT cleaned up after a coordinator-init-phase
failure. Recursive directory deletion requires `StorageAdapter::delete_prefix`,
which was deferred along with `DELETE /graphs/{id}` (originally PR 2b). When
that primitive lands, the third failpoint test can be tightened to assert
the graph root is fully empty.
Tests: 4 new (init_failpoint_*), all 23 failpoint tests green. No
regression in the 105 engine library tests or 64 end_to_end tests.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: add GraphHandle + GraphRegistry data structure (PR 3/10)
PR 3 of the MR-668 multi-graph server work. Pure data structure — no
routing changes yet (that's PR 4a).
New file: `crates/omnigraph-server/src/registry.rs`
- `GraphHandle { key: GraphKey, uri: String, engine: Arc<Omnigraph>,
policy: Option<Arc<PolicyEngine>> }` — the per-graph state that the
routing middleware (PR 4a) will inject as a request extension.
- `RegistrySnapshot { graphs: HashMap<GraphKey, Arc<GraphHandle>> }` —
immutable snapshot; replaced atomically via `ArcSwap`.
- `GraphRegistry { snapshot: ArcSwap<_>, mutate: Mutex<()> }` — lock-free
reads, mutex-serialized mutations.
- `RegistryLookup { Ready(Arc<GraphHandle>) | Gone }` — two-valued, no
`Tombstoned` variant since DELETE is deferred in v0.7.0 scope.
- `InsertError { DuplicateKey | DuplicateUri }` — both rejection cases
for create-graph (maps to HTTP 409 in PR 7).
- Methods: `new`, `from_handles` (bulk startup-time init), `get`, `list`,
`len`, `insert`.
Race semantics pinned by three multi-thread tests:
- `concurrent_insert_same_key_exactly_one_succeeds` — N=8 spawned
inserts with the same key; exactly 1 returns Ok, 7 return DuplicateKey.
- `concurrent_insert_distinct_keys_all_succeed` — N=8 spawned inserts
with distinct keys; all succeed.
- `concurrent_reads_during_inserts_see_consistent_snapshots` — reader
loop concurrent with sequential writes; every listed handle's key
resolves via `get()` (no torn state).
Why no tombstones field: `DELETE /graphs/{id}` is deferred to bound
the scope of v0.7.0. Without a delete endpoint, there's no use for
tombstones — every key in the registry is `Ready`, and every key
not in the registry is `Gone`. When DELETE lands later, the
`Tombstoned` variant + `tombstones: HashSet<GraphKey>` slot in
additively without breaking caller signatures (the `Gone` variant
remains the "not currently active" case).
Why `tokio::sync::Mutex`: insert is async because PR 7's flow holds
this mutex across the atomic YAML rewrite step (file I/O). std::Mutex
would footgun across .await.
Dependency additions: `arc-swap = { workspace = true }`,
`thiserror = { workspace = true }` (used by InsertError).
Tests: 12 new (12 passing). 74 server lib tests total green
(62 from PR 1 + 12 new). Clippy clean on server crate.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: router restructure + handler refactor for multi-graph (PR 4a/10)
PR 4a of the MR-668 multi-graph server work. The heaviest single PR —
rewires every handler to extract `Arc<GraphHandle>` from a routing
middleware, replaces `AuthenticatedActor(Arc<str>)` with `ResolvedActor`
everywhere, and adds the `ServerMode` discriminator.
Behavior changes:
- **Single mode** (legacy `omnigraph-server <URI>`): flat routes
(`/snapshot`, `/read`, `/branches`, …) continue to work exactly as
v0.6.0. Internally, the registry holds a single handle keyed by the
sentinel `SINGLE_GRAPH_KEY_ID = "default"`; routing middleware injects
that handle on every request. No HTTP-visible change.
- **Multi mode** (new): routes nest under `/graphs/{graph_id}/...`.
Routing middleware extracts the graph id from the path, looks it up
in the registry, and injects the handle. 404 if not found.
(Multi-mode startup itself lands in PR 5; this PR provides the
router-side wiring.)
AppState refactor:
- `engine: Arc<Omnigraph>` and `policy_engine: Option<Arc<PolicyEngine>>`
fields removed — both now live inside `GraphHandle` in the registry.
- `mode: ServerMode { Single { uri } | Multi { config_path } }` added.
- `registry: Arc<GraphRegistry>` added.
- `server_policy: Option<Arc<PolicyEngine>>` added (placeholder for
management endpoints in PR 6b; unused today).
- Existing constructors (`new`, `new_with_bearer_token{s,_and_policy}`,
`new_with_workload`, `open*`) build a single-mode AppState
internally and remain source-compatible. Tests that constructed
AppState via these constructors continue to work.
- `with_policy_engine` post-construction setter — rebuilds the
single-mode handle with the policy attached. Engine-layer
enforcement is NOT reinstalled (matches the old single-field
semantics; `open_with_bearer_tokens_and_policy` is the path that
installs both layers).
- `new_multi` constructor added for PR 5's startup loop.
- `uri()` now returns `Option<&str>` (Some in single, None in multi).
Routing middleware:
- `resolve_graph_handle` injects `Arc<GraphHandle>` as a request
extension. Mode-aware: single returns the only handle; multi parses
`/graphs/{graph_id}/...` from the URI. Returns 404 in multi mode
when the graph id is unregistered. Records `graph_id` on the
current tracing span.
- `require_bearer_auth` updated to insert `ResolvedActor` (was
`AuthenticatedActor`).
Handler refactor — every protected handler:
- Gains `Extension(handle): Extension<Arc<GraphHandle>>` param.
- Replaces `state.engine` → `handle.engine`.
- Replaces `state.policy_engine()` → `handle.policy.as_deref()`.
- Replaces `state.uri()` → `handle.uri.as_str()` (or `.clone()`
where String is needed).
- Replaces `Arc::clone(&state.engine)` → `Arc::clone(&handle.engine)`
(the spawn-and-clone pattern in `server_export` — proof that a
long-running export survives the registry being mutated later).
authorize_request signature:
- Was: `(state: &AppState, actor: Option<&AuthenticatedActor>, request: PolicyRequest)`.
- Now: `(actor: Option<&ResolvedActor>, policy: Option<&PolicyEngine>, request: PolicyRequest)`.
- Per-graph callers pass `handle.policy.as_deref()`. The (future PR 6b)
management endpoints will pass `state.server_policy.as_deref()`.
MR-731 invariant preserved:
- The single chokepoint `request.actor_id = actor.actor_id.as_ref().to_string()`
inside `authorize_request` still overwrites any client-supplied
actor identity. Regression test
`actor_id_resolves_from_bearer_token_ignoring_client_supplied_headers`
at `tests/server.rs:1114-1216` passes unchanged.
Tests: 0 new (the registry race tests in PR 3 already cover the
data structure; this PR exercises them indirectly via the existing
test suite). 74 lib + 57 server integration + 60 openapi = 191 tests
green. Clippy clean.
LOC: +397 insertions, -153 deletions in `crates/omnigraph-server/src/lib.rs`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: OpenAPI multi-mode cluster filter (PR 4b/10)
PR 4b of the MR-668 multi-graph server work. In multi mode, the served
`/openapi.json` reports cluster routes (`/graphs/{graph_id}/...`) instead
of the legacy flat protected paths — matching what `build_app` actually
mounts (PR 4a's `Router::nest`). Single mode is unchanged.
Implementation:
- New `server_openapi` branch: when `state.mode()` is `Multi`, call
`nest_paths_under_cluster_prefix(&mut doc)` after `ApiDoc::openapi()`.
- The rewrite consumes `doc.paths.paths`, then for every path-item:
- If the path is in `ALWAYS_FLAT_PATHS` (`/healthz` for now), keep
it flat.
- Otherwise, prefix every operation_id with `cluster_` and reinsert
the item at `/graphs/{graph_id}<original_path>`.
- Single mode hits no extra work — the path map is untouched.
- The static `ApiDoc::openapi()` still emits the flat surface, so
in-process callers (the existing `openapi_json()` helper in tests)
see the unmodified spec.
Why cluster_ prefix on operation IDs: OpenAPI specs require unique
operation_ids across the document. With both flat (single-mode) and
cluster (multi-mode) surfaces ever co-existing in a generated SDK,
the prefix prevents collision. The current served doc only carries
one surface, so the prefix is forward-compat with potential future
dual-surface generation.
Tests: 6 new in `tests/openapi.rs`, all via the `/openapi.json` route
(not the static `ApiDoc::openapi()` helper):
- `multi_mode_openapi_lists_cluster_paths` — every protected path
appears as a cluster variant.
- `multi_mode_openapi_drops_flat_protected_paths` — flat protected
paths are absent.
- `multi_mode_openapi_keeps_healthz_flat` — `/healthz` survives.
- `multi_mode_openapi_prefixes_operation_ids_with_cluster` — every
cluster operation_id starts with `cluster_`.
- `multi_mode_operation_ids_are_unique` — no operation_id collisions.
- `single_mode_openapi_unchanged_by_cluster_filter` — single mode
still emits the legacy flat surface (regression).
New test helper `app_for_multi_mode(graph_ids)` exercises the new
`AppState::new_multi` constructor from PR 4a — first user of multi-mode
construction outside of unit tests.
Result: 66 openapi tests + 57 server integration tests + 74 lib tests
= 197 green. No regression in the existing OpenAPI drift check
(`openapi_spec_is_up_to_date` still validates the static flat surface
matches the committed openapi.json).
LOC: +67 in lib.rs (rewrite logic), +219 in tests/openapi.rs (test
suite + helper).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: multi-graph startup + mode inference (PR 5/10)
PR 5 of the MR-668 multi-graph server work. This is the first PR that
makes multi mode actually usable end-to-end: operators invoking
`omnigraph-server --config omnigraph.yaml` with a non-empty `graphs:`
map and no single-mode selector now get a running multi-graph server.
Mode inference (MR-668 decision 2, four-rule matrix in
`load_server_settings`):
1. CLI `<URI>` positional → Single
2. CLI `--target <name>` → Single (URI from graphs.<name>)
3. `server.graph` in config → Single (URI from graphs.<name>)
4. `--config` + non-empty `graphs:` + no single-mode selector
→ Multi (all entries in `graphs:`)
5. otherwise → error with migration hint
Rule 5's error message names every escape hatch so operators can fix
their invocation without grepping docs.
Config schema extensions:
- `TargetConfig.policy: PolicySettings` (per-graph Cedar policy file).
`#[serde(default)]` so existing single-graph YAMLs keep parsing.
- `ServerDefaults.policy: PolicySettings` (server-level Cedar policy
for management endpoints — loaded in PR 5, wired into `GET /graphs`
in PR 6b).
- `OmnigraphConfig::resolve_target_policy_file(name)` and
`resolve_server_policy_file()` helpers — both resolve relative to
the config file's `base_dir`.
Public types added to `omnigraph-server`:
- `ServerConfigMode { Single { uri, policy_file } | Multi { graphs,
config_path, server_policy_file } }`.
- `GraphStartupConfig { graph_id, uri, policy_file }` — one entry
per graph in multi mode.
`ServerConfig` shape change:
- WAS: `{ uri: String, bind, policy_file, allow_unauthenticated }`.
- NOW: `{ mode: ServerConfigMode, bind, allow_unauthenticated }`.
- Breaking for any code that constructs `ServerConfig` directly.
`main.rs` is unaffected (uses `load_server_settings`).
`serve()` now forks on `ServerConfig.mode`:
- Single: existing flow via `AppState::open_with_bearer_tokens_and_policy`.
- Multi: parallel open via `futures::stream::iter(graphs)
.map(open_single_graph).buffer_unordered(4).collect()`. Bound 4 is
a rule-of-thumb for I/O-bound work — at N≤10 this trades startup
latency for a small amount of concurrent S3/Lance open pressure.
Fail-fast: first open error aborts startup; in-flight opens drop
their engine via Arc (Lance datasets close cleanly).
New helper `open_single_graph(GraphStartupConfig)`:
- Validates `GraphId` per the regex in PR 1.
- `Omnigraph::open(uri).await` with descriptive error context.
- Loads per-graph policy file and re-applies it via
`Omnigraph::with_policy` (engine-layer enforcement, MR-722).
- Returns `Arc<GraphHandle>` ready for the registry.
Routing middleware bug fix:
- `Router::nest("/graphs/{graph_id}", inner)` rewrites
`request.uri().path()` to the inner suffix (e.g. `/snapshot`).
The previous middleware tried to parse `{graph_id}` from
`request.uri().path()` and got 400 instead of 200. Fixed by reading
from `axum::extract::OriginalUri` request extension, which preserves
the pre-rewrite URI.
- Caught by the two new tests
`cluster_routes_dispatch_per_graph_handle` and
`cluster_route_for_unknown_graph_returns_404`.
Tests (14 new, all passing):
- Four-rule matrix: one test per branch + the joint case
`mode_inference_cli_uri_overrides_graphs_map` + the empty-graphs-map
error case.
- Per-graph + server-level policy file path resolution.
- Reserved `GraphId` rejection at startup.
- End-to-end multi-graph routing: two graphs side by side, each
cluster route hits the right engine.
- Unknown graph id under cluster prefix → 404.
- Flat routes 404 in multi mode.
Inline `ServerConfig` test (`serve_refuses_to_start_in_state_1_without_unauthenticated`)
and three `server_settings_*` tests updated to the new `mode` shape.
Result: 211 server tests green (74 lib + 71 integration + 66 openapi),
MR-731 regression test still pinned and passing.
LOC: +45 config.rs, +281 lib.rs (net), +395 tests/server.rs.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: Cedar resource-model refactor (PR 6a/10)
PR 6a of the MR-668 multi-graph server work. Policy-crate-only refactor —
no HTTP handler changes, no operator-supplied policy.yaml changes. Sets
up the chassis that PR 6b's `GET /graphs` consumes.
Two new `PolicyAction` variants:
- `GraphCreate` — gates `POST /graphs` (deferred behavioral PR).
- `GraphList` — gates `GET /graphs` (lands in PR 6b).
Note: `GraphDelete` is intentionally NOT added in this PR. `DELETE
/graphs/{id}` is deferred from MR-668's v0.7.0 scope to bound complexity
(no `delete_prefix`, no tombstone, no `RegistryLookup::Tombstoned`).
Adding the Cedar action without a consumer would be the same kind of
"dead vocabulary" trap the `Admin` variant already documents.
New `PolicyResourceKind { Graph, Server }` enum, plus a
`PolicyAction::resource_kind()` method that classifies every action.
Per-graph actions (Read, Change, BranchCreate, …) bind to
`Omnigraph::Graph::"<graph_label>"`; server-scoped actions
(GraphCreate, GraphList) bind to the singleton
`Omnigraph::Server::"root"`. `Admin` stays classified as per-graph for
now — MR-724 will pick the final shape when the first consumer surface
ships.
Cedar schema string additions:
- `entity Server;`
- `action "graph_create" appliesTo { principal: Actor, resource: Server, ... }`
- `action "graph_list" appliesTo { principal: Actor, resource: Server, ... }`
Compiler updates:
- `compile_policy_source` picks the resource literal based on the
action's `resource_kind`. Existing graph-only policies generate
the same Cedar source as before — pinned by
`per_graph_rules_continue_to_work_alongside_server_rules`.
- `compile_entities` includes the `Server::"root"` entity only when
a rule references a server-scoped action. Keeps test assertions
for graph-only policies tight.
- `PolicyEngine::authorize` builds the right resource UID at
request time based on `request.action.resource_kind()`.
Validation rules added to `PolicyConfig::validate`:
- A rule may not mix server-scoped and per-graph actions (different
resource kinds need different `permit` clauses).
- Server-scoped actions cannot have `branch_scope` or
`target_branch_scope` — there's no branch context at the server
level.
Operator impact: zero. The Cedar schema `Omnigraph::Server` entity is
internally referenced by `compile_policy_source`; operator policy.yaml
files only declare actions in `rules[].allow.actions` and never
reference the resource entity directly. Decision 6's "internal rename
only; operator policies unaffected" contract is preserved and pinned
by `per_graph_rules_continue_to_work_alongside_server_rules`.
Tests: 5 new (11 policy tests total, up from 6):
- `graph_list_action_authorizes_against_server_resource`
- `graph_create_action_authorizes_against_server_resource`
- `server_scoped_rule_cannot_use_branch_scope`
- `rule_mixing_server_and_per_graph_actions_is_rejected`
- `per_graph_rules_continue_to_work_alongside_server_rules`
No regression: 145 server tests (74 lib + 71 integration) still green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: GET /graphs endpoint + per-graph policy wire-up (PR 6b/10)
PR 6b of the MR-668 multi-graph server work. First management endpoint —
`GET /graphs` lists every graph registered with the server, gated by the
server-level Cedar policy from PR 6a.
New API shapes (in `omnigraph-server::api`):
- `GraphInfo { graph_id, uri }` — one entry per registered graph.
- `GraphListResponse { graphs: Vec<GraphInfo> }` — sorted alphabetically
by `graph_id` for deterministic output.
Handler `server_graphs_list`:
- Mounted at `GET /graphs` in both modes.
- Single mode: returns 405 (resource exists in the API surface, just
not operational without a `graphs:` map). 405 chosen over 404 so
clients see "resource exists, wrong context" rather than "no such
resource".
- Multi mode: requires bearer auth (when configured); Cedar-gated by
`PolicyAction::GraphList` against `Omnigraph::Server::"root"`
(PR 6a's chassis). Returns the sorted registry list.
Cedar gate composition:
- When no `server.policy.file` is configured, the MR-723 default-deny
falls through: `GraphList` is not `Read`, so an authenticated actor
without a server policy gets 403. This is the right default — don't
expose the registry until the operator explicitly authorizes it.
- When a server policy is configured, Cedar evaluates the rule. The
test `get_graphs_with_server_policy_authorizes_per_cedar` pins the
admin-allow / viewer-deny split.
Routing:
- New `management` sub-router holding `/graphs` (auth-required, no
`resolve_graph_handle` middleware — operates on the registry, not
a single graph).
- Single mode merges flat protected routes + management.
- Multi mode merges nested `/graphs/{graph_id}/...` + management.
OpenAPI:
- `server_graphs_list` registered in `ApiDoc::paths(...)`.
- `EXPECTED_PATHS` in `tests/openapi.rs` gains `/graphs`.
- `openapi.json` regenerated (auto-tracked by
`openapi_spec_is_up_to_date` in CI).
Tests: 4 new in `tests/server.rs::multi_graph_startup`:
- `get_graphs_lists_registered_graphs_in_multi_mode`
- `get_graphs_returns_405_in_single_mode`
- `get_graphs_requires_bearer_auth_when_configured`
- `get_graphs_with_server_policy_authorizes_per_cedar`
What's NOT in this PR (deferred):
- Per-graph policy enforcement is wired through `handle.policy`
(PR 4a already did this); PR 6b doesn't add new per-graph
behavior beyond making sure the server policy lookup composes
cleanly alongside it.
- `POST /graphs` (PR 7) and `DELETE /graphs/{id}` (out of scope
for v0.7.0).
- CLI `omnigraph graphs list` (PR 8 will add).
Result: 215 server tests green (74 lib + 66 openapi + 75 integration),
11 policy tests green. MR-731 spoof regression preserved across all
this work.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: POST /graphs runtime create endpoint (PR 7/10)
PR 7 of the MR-668 multi-graph server work. Operators can now add a
graph to a running multi-graph server without restarting:
curl -X POST http://server/graphs \
-H "Content-Type: application/json" \
-d '{
"graph_id": "beta",
"uri": "/data/beta.omni",
"schema": { "source": "node Person { name: String @key }\n" },
"policy": { "file": "./policies/beta.yaml" }
}'
DELETE remains deferred (out of v0.7.0 scope per the trimmed plan —
no `delete_prefix`, no tombstones).
Body shape (decision 7):
- Nested `schema: { source: "..." }` (mirrors the `policy: { file }`
pattern; leaves room for future fields without breakage).
- Optional nested `policy: { file: "..." }` for per-graph Cedar.
- 32 MiB body limit (reuses `INGEST_REQUEST_BODY_LIMIT_BYTES`).
- Asymmetric with `SchemaApplyRequest` which keeps flat
`schema_source: String` — documented in api.rs.
Atomic YAML rewrite + drift detection:
- New `config::rewrite_atomic(path, new_config, expected_hash)`:
flock → re-read + hash check → serialize → write `.tmp` → fsync
→ rename → fsync parent dir. Returns the new hash for the caller
to update its in-memory baseline.
- New `config::hash_config_file(path)` — SHA-256 of the on-disk
bytes, used at startup and after each rewrite.
- New `RewriteAtomicError { Drift | Io | Serialize }` enum.
- `AppState.config_hash: Option<Arc<Mutex<[u8;32]>>>` carries the
in-memory baseline. Updated after every successful rewrite so
subsequent POSTs don't false-trigger drift.
- The mutex is `std::sync::Mutex` (brief critical section, no .await
inside). The flock itself serializes file access process-wide
AND across multiple server instances (defense in depth).
- All sync I/O runs inside `tokio::task::spawn_blocking` — flock
is sync.
Handler ordering (the load-bearing sequence):
1. Mode check: 405 in single mode.
2. Cedar authorize: `GraphCreate` against `Omnigraph::Server::"root"`.
3. Validate body: `GraphId::try_from` (regex + reserved-name), empty
schema/uri checks, per-graph policy file parse.
4. Pre-check registry for duplicate graph_id / duplicate uri (409).
5. `Omnigraph::init` the new engine.
6. Atomic YAML rewrite (drift detection inside).
7. Publish in registry (atomic re-check via `GraphRegistry::insert`).
Failure modes (documented in handler rustdoc):
- Init fails → orphan storage at `req.uri` (PR 2a cleans up schema
files; Lance datasets remain orphans until `delete_prefix` lands).
- YAML rewrite fails (drift, IO) → orphan storage; YAML unchanged.
- Registry insert fails (race) → YAML has entry but registry doesn't;
next restart opens it cleanly.
New dependency: `fs2 = "0.4"` (workspace + omnigraph-server). POSIX-only
file locking. Linux/macOS deployment supported; Windows out of scope.
Tests (10 new in `tests/server.rs::multi_graph_startup`):
- `post_graphs_creates_a_new_graph_end_to_end` — happy path, includes
YAML inspection to confirm the rewrite landed.
- `post_graphs_baseline_hash_updates_between_rewrites` — two POSTs in
a row both succeed (drift baseline updates correctly).
- `post_graphs_duplicate_graph_id_returns_409`
- `post_graphs_duplicate_uri_returns_409`
- `post_graphs_invalid_graph_id_returns_400` (reserved name)
- `post_graphs_empty_schema_source_returns_400`
- `post_graphs_returns_405_in_single_mode`
- `post_graphs_yaml_drift_detection_returns_503` — operator hand-edits
omnigraph.yaml; server refuses to clobber.
- `hash_config_file_is_deterministic_and_detects_changes`
- `rewrite_atomic_refuses_when_hash_drifts`
OpenAPI: `server_graphs_create` registered in `ApiDoc::paths(...)`;
openapi.json regenerated.
Result: 225 server tests green (74 lib + 66 openapi + 85 integration),
all MR-731 regressions still pinned.
LOC: ~580 lib.rs net (handler + helpers), ~120 config.rs (rewrite
machinery), +71 api.rs (request/response shapes), +332 tests/server.rs.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: CLI omnigraph graphs list/create (PR 8/10)
PR 8 of the MR-668 multi-graph server work. CLI parity for the
v0.7.0 management surface: operators can now manage graphs from
the command line against a running multi-graph server.
omnigraph graphs list --target dev --json
omnigraph graphs create \
--target dev \
--graph-id beta \
--graph-uri /data/beta.omni \
--schema schema.pg
DELETE is intentionally absent — server-side DELETE was deferred from
v0.7.0 scope, and shipping a client subcommand for a server endpoint
that doesn't exist would be dead vocabulary. The help output, the
subcommand enum, and the test that pins it (`graphs_subcommand_help_
lists_list_and_create`) all agree.
CLI architecture (modeled on `BranchCommand`):
- New `Command::Graphs { command: GraphsCommand }` top-level variant.
- `GraphsCommand { List, Create }` enum.
- List: GET `<base>/graphs`. Stdout is `<graph_id>\t<uri>` per line,
or JSON via `--json`.
- Create: reads `--schema <path>` from local disk, inlines as
`schema: { source: <file> }` in the POST body (nested per
MR-668 decision 7). Optional `--policy-file <path>` becomes
`policy: { file: <path> }`. Returns 201 → "created graph X at Y"
or JSON via `--json`.
- Both subcommands reject local URI targets with a clear
"remote multi-graph server URL" error.
New API type imports in the CLI: `GraphCreateRequest`,
`GraphCreateResponse`, `GraphListResponse`, `GraphSchemaSpec`,
`GraphPolicySpec` — all from `omnigraph-server::api`.
Tests:
- cli.rs (4 new, non-network):
* `graphs_subcommand_help_lists_list_and_create` — pins the
deferral of `delete` (catches scope creep).
* `graphs_list_against_local_uri_errors_with_remote_only_message`
* `graphs_create_against_local_uri_errors_with_remote_only_message`
* `graphs_create_with_missing_schema_file_errors` — pins the
IO context in the schema-read error path.
- system_remote.rs (1 new, `#[ignore]` like its peers):
* `graphs_list_and_create_against_multi_graph_server` — spawns a
multi-mode server, calls `graphs list` (sees `alpha`),
`graphs create` (adds `beta`), `graphs list` again (sees both),
and confirms the new graph is reachable via its cluster route.
CLI suite: 62 tests green (58 existing + 4 new). The new ignored
end-to-end test runs locally with `cargo test --ignored`.
LOC: +159 main.rs (enum + handlers), +88 cli.rs (unit tests),
+131 system_remote.rs (integration test).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: composite e2e tests, race fix, v0.7.0 release (PR 9/10)
PR 9 — the final integration PR for MR-668 multi-graph server work.
Closes the v0.7.0 release.
Composite lifecycle tests (closes gaps flagged in PR 7's coverage
review):
- `multi_graph_lifecycle_post_query_restart_persistence` — POST a
graph, query it via cluster route, reload the config from disk
and confirm `load_server_settings` sees the rewritten YAML.
Validates the "restart resolves orphans" failure-mode story.
- `per_graph_policy_enforced_on_post_created_graph` — POST a graph
with a per-graph policy attached, then send authenticated read
and change requests. Per-graph Cedar enforcement fires correctly
on a POST-created graph (engine-layer policy reinstalled via
`Omnigraph::with_policy` inside the create flow).
- `concurrent_post_graphs_distinct_ids_all_succeed` — 4 concurrent
POSTs with distinct graph_ids all return 201. Caught a real
race in `rewrite_atomic` (see below).
Race fix — `rewrite_atomic_with_modify`:
The first composite test surfaced a real bug. The old
`rewrite_atomic(path, new_config, expected_hash)` captured the
baseline hash OUTSIDE the flock, then called rewrite_atomic which
re-acquired it inside. Under concurrent writers:
- POST A: captures baseline H0, calls rewrite_atomic.
- POST B: captures baseline H0 too (before A's update lands).
- A: acquires flock, on-disk == H0, writes H1, releases.
- A: updates baseline H0 → H1.
- B: tries to acquire flock — waits.
- B: acquires flock. On-disk is now H1. Expected (captured
before A finished) is H0. MISMATCH → spurious Drift error.
Worse: even if the timing happens to align, B's `updated` config
was constructed from BYTES read before the flock. B writes a config
that doesn't include A's new graph — silent data loss.
The fix: new `config::rewrite_atomic_with_modify(path, baseline,
modify)` takes a closure. Inside the flock + baseline mutex:
1. Read on-disk bytes, hash, compare to baseline.
2. Parse on-disk YAML.
3. Call `modify(parsed)` to produce the new config — receives
fresh on-disk state, returns the modification.
4. Serialize + write + fsync + rename + update baseline.
Everything is read-modify-write under the same critical section.
Concurrent writers serialize cleanly. Test confirmed this is no
longer a race.
The old `rewrite_atomic(path, new_config, expected_hash)` API stays
for tests that don't need the read-modify-write shape; the POST
handler switches to the new shape.
Version bump v0.6.0 → v0.7.0:
- All 5 `crates/*/Cargo.toml` (compiler, engine, policy, cli, server)
plus their inter-crate `path` dep version constraints.
- `Cargo.lock` regenerated by `cargo build --workspace`.
- `AGENTS.md` "Version surveyed" line, capability matrix HTTP-server
row updated to mention multi-graph + cluster routes + atomic YAML
rewrite.
- `openapi.json` regenerated.
Docs:
- `docs/releases/v0.7.0.md` (new) — release notes with breaking
changes, new features, deferred items (DELETE, `delete_prefix`,
actor forwarding), and the single→multi migration recipe.
- `docs/user/server.md` — substantial section additions for the
two modes, mode inference, cluster endpoint table, management
endpoints, `omnigraph.yaml` ownership contract, `POST /graphs`
body shape + status codes.
- `docs/user/cli.md` — `omnigraph graphs list/create` section,
deferred-DELETE note.
- `docs/user/policy.md` — server-scoped Cedar actions
(`graph_create`, `graph_list`), per-graph vs server-level policy
composition, example server-level policy.
Workspace test pass: 573 tests green across all crates. Zero
failures. MR-731 spoof regression still pinned and passing across
the entire 10-PR series.
This commit closes MR-668. v0.7.0 is ready for tagging.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: remove POST /graphs and CLI graphs create (defer runtime graph mgmt)
The POST /graphs runtime-create endpoint shipped in PR 7/10 has three
unresolved high-severity bugs:
- flock-on-renamed-inode race: the YAML flock is taken on
omnigraph.yaml itself, then a temp file is renamed over it.
Cross-process writers end up locking different inodes — both
believing they hold exclusive access.
- duplicate-check outside the file lock: precheck runs against
the in-memory registry only; the locked closure does
config.graphs.insert(...) unconditionally. Concurrent same-id
POSTs can persist the loser in YAML while the in-memory registry
keeps the winner — they disagree after restart.
- best_effort_cleanup_init_artifacts deletes _schema.pg /
_schema.ir.json / __schema_state.json on any init failure. An
accidental re-init against an existing graph's URI destroys its
schema; subsequent open() fails at read_text(_schema.pg).
The correct fix is a Lance-style cluster catalog (reserve → init →
publish with recovery sidecars), parallel to the engine's existing
__manifest discipline. That work is out of scope for v0.7.0.
For now, disable runtime add/remove from the network and CLI surface.
Operators add graphs by editing omnigraph.yaml and restarting. The
GET /graphs read-only enumeration stays.
Removed:
- POST /graphs handler + router fragment + utoipa registration
- 13 post_graphs_* server tests + 3 composite POST tests +
multi_mode_app_with_real_config / post_graph helpers
- CLI omnigraph graphs create subcommand + its handler + cli.rs tests
- system_remote.rs combined list+create test trimmed to list-only
- YAML rewrite infra: rewrite_atomic[_with_modify], RewriteAtomicError,
staging_path, hash_config_file, AppState::config_hash field +
threading through new_multi and open_multi_graph_state
- fs2 dependency (verified absent from cargo tree)
- sha2/fs2 imports in config.rs (only the rewrite path used them)
- Cedar PolicyAction::GraphCreate variant + "graph_create" match arms
+ action def in Cedar schema + graph_create_action_authorizes_against_server_resource test
- GraphCreateRequest / GraphCreateResponse / GraphSchemaSpec /
GraphPolicySpec API types (only the POST handler / CLI imported them)
Kept:
- GET /graphs (read-only enumeration) and graph_list Cedar action
- omnigraph graphs list CLI subcommand
- All multi-graph startup, mode inference, cluster routes,
per-graph + server-level Cedar policies
- server_settings_drive_multi_graph_startup_end_to_end (the test
that covers operator-authored YAML + restart — the path that
survives)
- best_effort_cleanup_init_artifacts and the three init failpoints
(still reachable from CLI `omnigraph init`; preflight fix deferred
as a follow-up)
- GraphRegistry::insert and its concurrency tests — production
callers gone, but the method is the natural seam for the future
cluster-catalog work
Also fixed (transcript issue 4):
- ALWAYS_FLAT_PATHS now includes /graphs so multi-mode OpenAPI
advertises the management route correctly (was previously rewritten
to /graphs/{graph_id}/graphs)
- multi_mode_openapi_keeps_healthz_flat → renamed to
multi_mode_openapi_keeps_management_paths_flat, asserts both
/healthz and /graphs stay flat
- multi_mode_openapi_prefixes_operation_ids_with_cluster skips
/graphs in addition to /healthz
Doc fixes:
- docs/user/cli.md: graphs list example was --target http://...,
but --target is a config-graph-name lookup; corrected to --uri.
Removed the graphs create example.
- docs/user/server.md: dropped POST /graphs row, "omnigraph.yaml
ownership", and "POST /graphs body shape" sections. Added a
paragraph stating runtime add/remove is not exposed in v0.7.0.
- docs/user/policy.md: dropped graph_create action; reworded the
"Configuration" line to clarify that server-scoped rules (graph_list)
take neither branch_scope nor target_branch_scope.
- docs/releases/v0.7.0.md: rewrote release narrative — multi-graph
mode ships; runtime add/remove deferred.
- AGENTS.md: HTTP server bullet and capability matrix row updated to
reflect read-only GET /graphs and the operator-edit workflow.
- openapi.json regenerated; /graphs has only .get, no .post.
Diff: 17 files, +123 −1525 LOC.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: comment cleanup and policy format style
Strip "PR Na/Nb" sub-PR references throughout MR-668 surfaces — they
were useful during the 10-PR delivery sequence but rot now that the
work is in the tree. Keep the MR-668 umbrella references.
Also:
- Add explicit `when = when` and `resource_literal = resource_literal`
named args in `compile_policy_source`'s outer `format!` to match the
surrounding crate style (already explicit for `group` and `action`).
- Rename the best-effort cleanup tracing target from
"omnigraph::init" to "omnigraph::init::cleanup" so operators can
filter init-failure cleanup events separately from init's other
log lines.
No behavior change.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: drop actor_id from PolicyRequest; pass actor as separate arg
The MR-731 "server-authoritative actor identity" invariant was enforced
by an in-function chokepoint (`request.actor_id = actor.actor_id...`
overwrite inside `authorize_request`). That worked but relied on every
caller passing in a `PolicyRequest` and trusting the overwrite — a
comment-enforced invariant.
Move the invariant into the type system:
* `PolicyRequest` no longer carries `actor_id`. The struct now models
what a caller wants to do, not who they are.
* `PolicyEngine::authorize(actor_id: &str, request: &PolicyRequest)`
and `validate_request(actor_id, request)` take identity as a
separate argument. The same shape `PolicyChecker::check` already had
for the engine layer.
* `authorize_request` in the HTTP layer extracts `actor_id` from the
bearer-resolved `ResolvedActor` and passes it positionally — no
overwrite step that could be skipped.
* CLI `omnigraph policy explain` updated (the only other consumer
that built a `PolicyRequest`).
Public API break for the `omnigraph-policy` crate. Worth it: handlers
can no longer accidentally populate `actor_id` from a request body
field, and external consumers are forced by the compiler to source
actor identity from a trusted path.
The MR-731 chokepoint test
`actor_id_resolves_from_bearer_token_ignoring_client_supplied_headers`
still passes — the bearer-resolved actor is what reaches the engine.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: consolidate AppState single-mode constructors; delete with_policy_engine
The prior `with_policy_engine` constructor reused the engine `Arc`
from the existing handle (`engine: Arc::clone(&existing.engine)`)
without re-applying `Omnigraph::with_policy`. Combined with
`new_with_workload`, the documented composition pattern was
`AppState::new_with_workload(...).with_policy_engine(p)` — which
produced an `AppState` whose HTTP layer enforced Cedar but whose
underlying engine had no `PolicyChecker` installed. Any caller
reaching the engine via `state.registry().list()[i].engine` could
bypass policy entirely. The doc comment named this gap; the type
system didn't.
Make composition impossible to get wrong:
* Add `AppState::new_single(uri, db, tokens, Option<PolicyEngine>,
WorkloadController)` — canonical single-mode constructor that
takes every option together and routes through `build_single_mode`
(which applies `db.with_policy(checker)` to the engine itself).
* `new`, `new_with_bearer_token`, `new_with_bearer_tokens`,
`new_with_bearer_tokens_and_policy`, `new_with_workload` all become
thin wrappers around `new_single`.
* Delete `with_policy_engine`. There is no post-construction policy
install path any more; the single linear construction forces
HTTP-layer and engine-layer policy to install together or not at all.
Regression test `engine_layer_policy_fires_via_direct_arc_omnigraph_from_new_single`
constructs an `AppState::new_single` with a deny-all policy, pulls
the `Arc<Omnigraph>` from the registry handle (the same path an
embedded SDK consumer would take), and asserts a direct `mutate_as`
call returns `OmniError::Policy`. Pre-fix this test would have
succeeded the mutation.
Test caller in `ingest_per_actor_admission_cap_returns_429`
migrates from `.with_policy_engine(...)` to `new_single(...,
Some(policy_engine), workload)`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: derive any_per_graph_policy on RegistrySnapshot; simplify dup check
`AppState::requires_bearer_auth` walked the entire registry per
request (cloning Arcs into a `Vec`, then `.iter().any(|h| h.policy
.is_some())`) to decide whether the auth middleware should challenge.
The walk is unnecessary — the answer only changes when the registry
mutates, which is exactly the moment a new snapshot is constructed.
Move the flag onto the snapshot itself:
* `RegistrySnapshot { graphs, any_per_graph_policy: bool }`.
* `RegistrySnapshot::new(graphs)` is the only construction path —
it derives the flag from `graphs.values().any(|h| h.policy
.is_some())` so the cached value can't drift from the source data.
* `Default` delegates to `new(HashMap::new())`.
* `GraphRegistry::from_handles` and `insert` build snapshots via
`RegistrySnapshot::new(...)`.
* `GraphRegistry::snapshot_ref()` exposes the current snapshot
through an `arc_swap::Guard`; callers that need cached derived
state go through this accessor (callers that only want `graphs`
still use `list` / `get`).
`requires_bearer_auth` becomes one `ArcSwap::load` + bool read.
Also (drive-by, same file, same hunk): replace the dead
`if let Some(other) = seen_uris.get(...)` + `let _ = other;` pattern
in `from_handles` with a plain `seen_uris.contains_key(...)`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: fail-fast multi-graph startup with try_collect
The `open_multi_graph_state` doc comment claims "Fail-fast — the
first open error aborts startup; other in-flight opens are dropped"
but the code did
.buffer_unordered(4)
.collect::<Vec<_>>()
.await
.into_iter()
.collect::<Result<Vec<_>>>()?;
which drains every future in the stream before propagating the first
`Err`. With N S3-backed graphs and graph #2 failing fast, the caller
still waits for #1, #3, #4, … to either succeed or fail before
seeing the error.
Replace the four-line dance with `futures::TryStreamExt::try_collect`,
which short-circuits on the first `Err` and drops the rest. The
doc comment now matches behavior.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: drop unused State extractor from 7 read-only handlers
After the routing-middleware refactor moved the engine into the per-graph
`GraphHandle` (extracted via `Extension<Arc<GraphHandle>>`), seven
read-only handlers — `server_snapshot`, `server_read`, `server_export`,
`server_schema_get`, `server_branch_list`, `server_commit_list`,
`server_commit_show` — kept an unused `State(_state): State<AppState>`
extractor. Drop it. Each request avoids one `FromRequestParts` clone
of `AppState`'s Arcs.
Handlers that actually use state (workload admission for write paths,
`server_policy` for management endpoints) keep theirs.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: emit info! for graph routing decision
`tracing::Span::current().record("graph_id", ...)` in the routing
middleware silently no-ops here: no upstream `#[tracing::instrument]`
on the handlers declares a `graph_id` field, and `TraceLayer::new_for_http`
doesn't either. The recorded value never lands anywhere visible.
Replace with an explicit `info!(graph_id = %handle.key.graph_id,
"graph routed")` event so operators can grep logs and correlate
requests with the active graph. In single mode the value is the
sentinel `"default"`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: align GET /graphs 405 body code with HTTP status
The single-mode `GET /graphs` handler returned an `ApiError` built
via struct literal with `status: METHOD_NOT_ALLOWED, code: BadRequest`.
The body code disagreed with the HTTP status — clients deserializing
on `code` saw `bad_request`, clients deserializing on `status` saw
405. Same bug class as the earlier 503+Conflict mismatch on the
removed YAML drift path.
Close the class for this one remaining instance:
* Add `ErrorCode::MethodNotAllowed` to the API enum.
* Add `ApiError::method_not_allowed(msg)` — pairs the 405 status
with the matching code.
* Replace the struct literal in `server_graphs_list` with the
constructor.
* Regenerate `openapi.json` (adds `method_not_allowed` to the
ErrorCode schema enum).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: drop unused axum::handler::Handler import
The import landed in earlier work but no current call site uses it.
Emitted an `unused_imports` warning on every server build.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: drop unused fs2 workspace dependency
`fs2 = "0.4"` lingered in [workspace.dependencies] after the
POST /graphs flock-on-rename design was pulled. `cargo tree -i fs2`
reports no consumers in the workspace and the dep is not in
Cargo.lock. Removing the declaration closes the "phantom dep" class.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: AGENTS.md Cedar row no longer hardcodes action count
The "8 actions" claim drifted as soon as MR-668 added `graph_list`.
Bumping the count would just push the drift one PR forward; the
correct-by-design fix is to defer to the canonical list in
docs/user/policy.md and stop maintaining a duplicate count.
Closes the "doc hardcodes a count that drifts from the enum" class.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: cfg(test)-gate GraphRegistry::insert and its mutex
`insert` and the `mutate: Mutex<()>` that serializes it had no
runtime consumer in v0.7.0 — the only insertion path at startup
is `from_handles`, and runtime add/remove is deferred until a
managed cluster catalog ships. Leaving both `pub` and live made
them a "looks like API, isn't" footgun: a future change could
build on `insert` without re-establishing the concurrency contract
with an actual consumer in scope.
Gate both together (`#[cfg(test)]` on the method, the field, and
the `tokio::sync::Mutex` import) so the race-pinning tests still
compile but production cannot reach them. When a real consumer
ships, ungate both — they're a unit. Closes the "public API with
no runtime consumer drifts toward incorrect" class.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: drop vestigial PolicyEngine surface
* `validate_request` had zero callsites — pure surface for nothing.
* `deny`'s `_actor_id` and `_request` parameters were both unused
(the underscore prefix gave it away); the message is built by the
caller before `deny` ever sees the request. Trim both.
Closes the "public API that the type system can't justify" class
for the policy engine. No behavior change; every existing test
stays green because the deletions never had a runtime effect.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: regression test for init re-init footgun (red)
A second `Omnigraph::init` against an existing graph URI today
destroys the existing graph's schema artifacts. `init_storage_phase`
overwrites `_schema.pg` before any preflight, and on the inner
`GraphCoordinator::init` failure that follows,
`best_effort_cleanup_init_artifacts` deletes all three schema files.
The existing Lance datasets and `__manifest/` survive but the
schema metadata is gone — unrecoverable without operator surgery.
This test exercises that path and currently fails with
"_schema.pg must not be deleted by a failed re-init", confirming
the destructive cleanup branch fires. The fix in the next commit
makes the test pass by preflighting with `storage.exists()` and
returning a typed error before any write touches disk.
Per AGENTS.md rule 12, the test commit lands just before the fix
commit so the red → green pair is visible in `git log` and a
reviewer can check out this commit alone to reproduce.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: close init re-init footgun via InitOptions preflight (green)
`Omnigraph::init` is "create a new graph"; existing graphs need
an explicit overwrite. Today's behavior — silently overwrite
schema files, then on inner failure delete them via best-effort
cleanup — is destructive against an existing graph regardless of
which branch fires.
Correct-by-design fix:
* New `InitOptions { force: bool }` struct (default `force: false`).
* New `Omnigraph::init_with_options(uri, schema, options)`. The
old `Omnigraph::init(uri, schema)` is a thin shortcut that
passes `InitOptions::default()`.
* `init_with_storage` runs a `storage.exists()` preflight on the
three schema URIs BEFORE any parse, write, or coordinator call.
Any hit → typed `OmniError::AlreadyInitialized { uri }`. The
destructive code paths (the `write_text` overwrite and the
best-effort cleanup) are now unreachable in strict mode against
an existing graph.
* `force: true` skips the preflight; existing operators who
actually mean to overwrite opt in explicitly.
* CLI: `omnigraph init --force` maps to `InitOptions { force: true }`.
* HTTP: `OmniError::AlreadyInitialized` maps to 409 via
`ApiError::from_omni`. Not currently HTTP-reachable (POST /graphs
was pulled), but the wiring lands here so a future runtime
create endpoint has one canonical translation.
Closes the "init is destructive against existing state" class.
The regression test added in the previous commit
(`init_on_existing_graph_uri_does_not_destroy_existing_schema`)
turns green: the original schema files now survive a second
init attempt byte-for-byte, and the call errors cleanly with
`AlreadyInitialized`. The four existing
`init_failpoint_after_*_cleans_up_*` tests stay green — strict
mode's preflight passes on a fresh tempdir, and cleanup still
runs as before when a failpoint fires mid-write.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: split PolicyEngine::load into kind-typed loaders
Pre-fix, every caller of `PolicyEngine::load(path, graph_id)`
passed *some* `graph_id` argument — even when the policy was
server-scoped and Cedar's resolution would never touch a Graph
entity. The server-level loader at lib.rs passed the meaningless
sentinel `"server"`. A graph policy file containing a `graph_list`
rule compiled fine; a server policy file containing a `read` rule
compiled fine. Both silently no-op'd at request time because the
engine kind and the rule's resource kind disagreed.
Correct-by-design fix: replace `load` with two kind-typed loaders.
* `PolicyEngine::load_graph(path, graph_id)` — for per-graph
policy files. Rejects any rule whose action `resource_kind()`
is `Server`.
* `PolicyEngine::load_server(path)` — for server-level policy
files. Takes no `graph_id`: server-scoped actions resolve against
the singleton `Omnigraph::Server::"root"` entity, never a Graph.
Rejects any rule whose action `resource_kind()` is `Graph`.
The old `load` is hard-deleted in the same commit because every
in-tree consumer migrates here (no semver promise on the workspace
crate, no external pinners). New `PolicyEngineKind` enum types
the loader's intent; `validate_kind_alignment` is the load-time
check that closes the "wrong action, wrong file, silent no-op"
class — operators get a load-time error instead of confused-and-
silent behavior at request time.
Callsites migrated:
* server lib.rs:374 (single-mode per-graph) → load_graph
* server lib.rs:1065 (multi-mode server) → load_server
* server lib.rs:1103 (multi-mode per-graph) → load_graph
* CLI main.rs:732 (resolve_policy_engine) → load_graph
* tests/server.rs ×5 (4 graph, 1 server) → load_graph/load_server
* policy_engine_chassis.rs → load_graph
Four new in-source tests pin the contract: both rejection paths
and both positive paths.
Closes the "operator puts an action in the wrong file and the
rule silently never matches" class.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: introduce GraphRouting, retire single_mode_handle
Pre-fix, `AppState` always carried `Arc<GraphRegistry>` even when
serving one graph. Single mode populated the registry with one
handle keyed by the `SINGLE_GRAPH_KEY_ID = "default"` sentinel;
`single_mode_handle` walked the registry, asserted `len == 1`,
and returned the single element with a 500-class "programmer
error" branch on mismatch. Three smells in a row — magic key,
walk-and-assert, programmer-error guard — all because the
single-mode runtime was forced through a multi-mode abstraction.
Correct-by-design fix: type the routing.
* New `pub enum GraphRouting { Single { handle }, Multi { registry,
config_path } }` on `AppState`. The `Single` arm carries the handle
directly — no registry, no key, no walk.
* `resolve_graph_handle` middleware matches on `routing`. Single mode
returns the handle in O(1); multi mode does the same path-extract +
registry lookup as before. The 500-class programmer-error branch
is gone — the type system now makes the violated invariant
("single mode has exactly one handle") unrepresentable.
* `requires_bearer_auth` reads `handle.policy.is_some()` directly
in the Single arm; Multi arm still uses the cached
`any_per_graph_policy` flag.
`ServerMode` and the legacy `registry` field on `AppState` are still
populated for now — C-3 removes both once every reader is migrated.
The `SINGLE_GRAPH_KEY_ID` sentinel and `ServerMode` will also go
away in C-3.
Closes the "single mode forced through a multi-mode abstraction"
class. All 76 server integration tests stay green: handlers still
extract `Extension<Arc<GraphHandle>>` from the request, so the
middleware's internal change is invisible to them.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: remove ServerMode, registry field, and the SINGLE_GRAPH sentinel
C-1/C-2 introduced `GraphRouting` and pointed the middleware at it.
This commit removes the legacy shape that's now dead:
* `ServerMode` enum — deleted. Single mode's `uri` lives on
`handle.uri`; multi mode's `config_path` lives on the
`GraphRouting::Multi` arm.
* `AppState.mode: ServerMode` field — deleted.
* `AppState.registry: Arc<GraphRegistry>` field — deleted. Multi
mode's registry is on `GraphRouting::Multi { registry, .. }`;
single mode has no registry at all.
* `AppState::mode()`, `AppState::uri()`, `AppState::registry()`
accessors — deleted. New `AppState::routing() -> &GraphRouting`
is the single public entry point.
* `SINGLE_GRAPH_KEY_ID` constant — deleted. `GraphHandle.key` is
still required by the struct, but in single mode the key is now
only a tracing label (`"default"`, inlined with a comment naming
its sole remaining purpose). Single-mode flat routes never carry
a `{graph_id}` parameter, so the key is never compared against
user input, and there is no registry where it could be a map
key. C-1/C-2 already removed the registry walk that the sentinel
was named for.
Callers migrated:
* `build_app` (lib.rs:944) — matches on `state.routing()` instead
of `state.mode()`.
* `server_graphs_list` (lib.rs:1162) — destructures the Multi arm
to get the registry; Single arm short-circuits to 405.
* `server_openapi` (lib.rs:1217) — matches the Multi arm for the
cluster-prefix rewrite.
* `tests/server.rs:3735` — the B2 footgun regression test now
matches on `state.routing()` to extract the single-mode handle
(the test's earlier `state.registry().list().next()` shape was
the closest pre-fix analog to "embedded consumer reaches the
engine"; the new shape is more direct).
Closes the entire "single mode forced through a multi-mode
abstraction" class. After this commit:
* No magic sentinel as a routing key.
* No `single_mode_handle` walk-and-assert helper.
* No 500-class "programmer error" branch in the middleware.
* No two-field discriminant on `AppState` where one would do.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: regression test for nested-route path extraction (red)
`server_branch_delete` and `server_commit_show` use bare
`Path<String>` extractors. In single-mode flat routes
(`/branches/{branch}`, `/commits/{commit_id}`) this works — one
capture, one value. In multi-graph cluster routes
(`/graphs/{graph_id}/branches/{branch}`,
`/graphs/{graph_id}/commits/{commit_id}`) axum 0.8 propagates the
outer `{graph_id}` capture into the inner handler, so the
extractor sees two captures and 500s with
"Wrong number of path arguments. Expected 1 but got 2."
`cluster_routes_dispatch_per_graph_handle` only exercises
`/snapshot` (no Path extractor), so the regression slipped through.
This test closes that gap structurally: every cluster route with
an inner path param gets exercised here.
Currently fails with the exact symptom above. Fix in the next
commit makes it pass.
Per AGENTS.md rule 12, the red test commit lands just before the
fix so the pair is visible in `git log` and a reviewer can check
out this commit alone to reproduce.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: named-field path-param structs for nested cluster routes (green)
`Path<String>` deserializes one path-param value positionally.
Single-mode flat routes (`/branches/{branch}`,
`/commits/{commit_id}`) have one capture; multi-mode nested routes
(`/graphs/{graph_id}/branches/{branch}`,
`/graphs/{graph_id}/commits/{commit_id}`) have two — axum 0.8
propagates the outer capture into nested handlers. Same handler,
two different shapes; the multi-mode shape 500s with
"Wrong number of path arguments. Expected 1 but got 2."
Symptomatic fix: change to `Path<(String, String)>` and ignore the
first element. Breaks again the moment we add another nest layer
(e.g. tenant in Cloud mode).
Correct-by-design fix: named-field structs deserialized by name
from axum's path-param map. Each handler picks only the fields it
needs. Stable across single / multi / future-cloud nest depths
because deserialization is by field name, not position.
* New `BranchPath { branch: String }` (file-local to lib.rs)
* New `CommitPath { commit_id: String }`
* `server_branch_delete` extractor → `Path<BranchPath>`
* `server_commit_show` extractor → `Path<CommitPath>`
Closes the "handler path-extractor type is positional and breaks
when route nesting changes" class. Red test from the previous
commit turns green. All 77 server tests pass (single-mode branch
delete + commit show, plus new multi-mode coverage).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: centralize policy-requires-tokens check in the runtime classifier
Single-mode `open_with_bearer_tokens_and_policy` bailed at lib.rs:380
when policy was installed and no tokens. Multi-mode
`open_multi_graph_state` had no equivalent: the server started, every
request 401'd because no token could ever match, and the operator
spent time debugging a misconfiguration the single-mode path would
have caught at startup.
The doc/code contradiction made the gap easy to miss: the
`ServerRuntimeState::PolicyEnabled` docstring said tokens-or-not
was "unusual but valid — every request fails 401 without a bearer,
which is effectively 'locked'." The single-mode bail contradicted
that. In practice, silent-401-on-every-request is bug-shaped, not
feature-shaped (operators wanting deny-all should configure tokens
plus a deny-all Cedar rule to get meaningful 403s with
policy-decision logging).
Symptomatic fix: add a copy of the bail to multi-mode. Two copies
that can drift again the next time a startup path is added.
Correct-by-design fix: hoist the check into
`classify_server_runtime_state` so both modes get the same
enforcement from one source of truth. The classifier becomes the
single source of truth for "should we start?" and adding a startup
invariant there is now the natural extension point for any future
mode.
Classifier matrix is now complete:
| has_tokens | has_policy | allow_unauthenticated | Result |
|---|---|---|---|
| F | F | F | bail (existing) |
| F | F | T | Open (existing) |
| T | F | * | DefaultDeny (existing) |
| F | T | * | bail (NEW — closes the gap) |
| T | T | * | PolicyEnabled (existing) |
Changes:
* `classify_server_runtime_state` (lib.rs:870-890) gains the
`(false, true, _) => bail!(…)` arm with a clear message naming
the failure mode and the two valid resolutions.
* `open_with_bearer_tokens_and_policy` (lib.rs:369+) drops its
redundant local bail — the classifier rejected the invalid case
before construction was reached.
* `ServerRuntimeState::PolicyEnabled` docstring is rewritten:
drops the "(unusual but valid)" carve-out and states plainly
that PolicyEnabled requires tokens. Names the explicit
alternative (tokens + deny-all Cedar rule) for operators who
want the all-requests-denied behavior.
* `classify_policy_enabled_always_wins` test is renamed to
`classify_policy_enabled_requires_tokens` and the now-invalid
`(false, true, _)` assertion is removed (covered by the new
rejection test).
* New `classify_policy_without_tokens_is_rejected` test covers the
new arm.
* New `serve_refuses_to_start_with_policy_but_no_tokens_multi_mode`
integration test pins the multi-mode propagation path —
symmetric with the existing single-mode
`serve_refuses_to_start_in_state_1_without_unauthenticated`.
Closes the "single mode and multi mode startup branches can drift
on safety invariants" class.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: close coverage gaps surfaced by the test-coverage audit
The bot-review pass and the subsequent coverage audit surfaced two
material gaps in PR #119's test surface — both easy to close, both
worth closing before merge.
* **Gap 1 — cluster-route sweep.** The Bug-1 path-extractor
regression slipped through because
`cluster_routes_dispatch_per_graph_handle` only exercised
`/snapshot`. The other six protected cluster routes (`/read`,
`/change`, `/export`, `/schema`, `/schema/apply`, `/ingest`,
`/branches/merge`) were implicitly trusted to work without any
multi-mode integration test.
Add `all_protected_cluster_routes_resolve_to_their_handler`
(`tests/server.rs`) that hits each protected cluster route with
a minimal request and asserts the response is consistent with
the handler being reached — no 404 (router didn't match), no 500
with "Wrong number of path arguments" (Bug-1 class), no 500 with
"missing extension" (routing middleware didn't inject the handle).
Status code is a negative assertion because each handler's
happy-path inputs differ; what matters is "the request reached
the handler," not "the handler returned 200" — that's already
pinned by the single-mode tests.
* **Gap 2 — `--force` happy path.** The strict re-init regression
test (`init_on_existing_graph_uri_does_not_destroy_existing_schema`)
pins the error path; nothing pinned the `force: true` escape
hatch actually doing what its docstring claims.
Add `init_with_force_recovers_from_orphan_schema_files`
(`tests/lifecycle.rs`). Writes a bare `_schema.pg` to simulate
orphan files from a failed prior init, confirms strict mode
bails as expected, then confirms `init_with_options(force: true)`
succeeds and produces a functional graph.
Note: the test follows the documented semantics — force skips
the preflight only, it does NOT purge existing Lance state. An
earlier draft of the test (against full overwrite of an existing
populated graph) failed because `GraphCoordinator::init` errored
on the existing `__manifest`, which is exactly the limitation
the `InitOptions::force` docstring already calls out. Recursive
purge needs `StorageAdapter::delete_prefix` (tracked separately).
Coverage is now fully aligned with the PR's claims.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: regression test for GraphList open-mode bypass (red)
Cursor bot's review at commit 4120448 surfaced that
`server_graphs_list` returns 200 in Open mode (`--unauthenticated`,
no tokens, no policy), exposing the full graph registry — graph
IDs and URIs that may contain S3 bucket paths or internal
hostnames — to any unauthenticated caller.
Root cause: `authorize_request`'s no-policy fallback only denies
when `actor.is_some()`. In Open mode `actor: None`, so the
denial branch never fires and the call returns `Ok(())`. The
docstring on `server_graphs_list` claims the endpoint is
"Cedar-gated" and that we "don't leak the registry until the
operator explicitly authorizes it" — but Open mode has no Cedar
at all, so the docstring intent and the code disagree.
This commit renames the existing
`get_graphs_lists_registered_graphs_in_multi_mode` test to
`get_graphs_denied_in_open_mode_without_server_policy` and flips
the assertion from 200 → 403. Today this fails (server returns
200) — exactly the symptom the bot named. The fix in the next
commit tightens the no-policy fallback to deny server-scoped
actions unconditionally, regardless of mode.
Per AGENTS.md rule 12, the red test commit lands just before
the fix so the red → green pair is visible in `git log` and a
reviewer can check out this commit alone to reproduce.
Sort-order coverage that previously lived in the renamed test
moves to `get_graphs_with_server_policy_authorizes_per_cedar`
in the next commit, where the admin-200 response is operator-
authorized and a non-empty body is asserted.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: server-scoped actions always require explicit policy (green)
`server_graphs_list` returned 200 in Open mode (`--unauthenticated`,
no tokens, no policy) because `authorize_request`'s no-policy
fallback only denied when `actor.is_some()` AND action != Read.
In Open mode `actor: None`, so the denial branch never fired and
the call returned `Ok(())` — leaking the registry (graph IDs +
URIs that may contain S3 bucket paths or internal hostnames) to
any unauthenticated caller. The docstring on `server_graphs_list`
claimed it was "Cedar-gated" and that the server should "not leak
the registry until the operator explicitly authorizes it" —
docstring intent and code disagreed.
Symptomatic fix: special-case GraphList. Breaks the moment
another server-scoped action (`graph_create`, `graph_delete`) is
added.
Correct-by-design fix: tie authorization to the action's
`resource_kind()`. Server-scoped actions
(`PolicyResourceKind::Server`) always require explicit policy
authorization — there is no runtime state where they're served
by default. Per-graph actions keep the existing default-deny
logic (DefaultDeny denies non-Read for authenticated actors;
Open mode allows everything per the operator's `--unauthenticated`
opt-in for graph DATA, but not for server topology).
The fix uses the existing `PolicyResourceKind` enum that #119
already added — no new abstraction. Future server-scoped actions
(runtime `graph_create`/`graph_delete` when the cluster catalog
ships) automatically pick up the same enforcement without any
per-action handler change.
Changes:
* `crates/omnigraph-server/src/lib.rs:51` — re-export
`PolicyResourceKind` (the kind discriminator was already public
on the omnigraph-policy crate; needed in scope here).
* `crates/omnigraph-server/src/lib.rs:1457` — `authorize_request`'s
no-policy fallback gains a server-scoped-action check that fires
before the actor-based default-deny logic. Error message names
the failure mode and points at `server.policy.file`.
* `crates/omnigraph-server/tests/server.rs:5037` —
`get_graphs_with_server_policy_authorizes_per_cedar` extended
to register two graphs in non-alphabetical order and assert
the admin-200 response is sorted alphabetically. Restores the
sort-order coverage that lived in
`get_graphs_lists_registered_graphs_in_multi_mode` before the
red commit renamed it to assert denial.
Also bundles a small adjacent cleanup that the bot-review flagged:
* `crates/omnigraph-server/src/graph_id.rs:124` — drop the
unreachable `"openapi.json"` entry from `is_reserved`. The
regex `^[a-zA-Z0-9-]{1,64}$` rejects every dot-containing name
before `is_reserved` can run, so dotted entries in this list
were dead code that misled readers into thinking the list
needed to cover them. Comment now names the structural
exclusion. The `rejects_reserved_route_names` test loses its
`openapi.json` row (covered by `rejects_dots` via the regex).
Closes the "server-scoped management actions silently leak in
Open mode" class. Red test from the previous commit
(`get_graphs_denied_in_open_mode_without_server_policy`) turns
green; all 78 server integration tests + 76 lib tests pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: fold multi-graph work into v0.6.0 (no separate v0.7.0 release)
The branch had bumped workspace versions to 0.7.0 and added a
dedicated `docs/releases/v0.7.0.md` for the multi-graph work.
Per scope decision: ship the graph-rename and the multi-graph
mode in one v0.6.0 release.
Changes:
* Workspace versions bumped 0.7.0 → 0.6.0 in every crate manifest
(`omnigraph`, `omnigraph-compiler`, `omnigraph-policy`,
`omnigraph-server`, `omnigraph-cli`) and their internal
`path = ..., version = "..."` dependency constraints.
* `docs/releases/v0.7.0.md` content merged into
`docs/releases/v0.6.0.md`, retargeted to a single coherent
v0.6.0 release note covering both the graph terminology rename
and the multi-graph server mode. The original v0.7.0.md is
deleted.
* All `v0.7.0` / `0.7.0` doc and comment references throughout
`crates/`, `docs/`, `AGENTS.md`, and `openapi.json` retargeted
to `v0.6.0` / `0.6.0`. `Cargo.lock` regenerated to match.
* OpenAPI spec regenerated via `OMNIGRAPH_UPDATE_OPENAPI=1
cargo test -p omnigraph-server --test openapi
openapi_spec_is_up_to_date` — `"version": "0.6.0"` now.
Verification:
* `cargo build --workspace` — clean (6 pre-existing engine
warnings only).
* `cargo test --workspace --locked` — zero failures across all
39 test result groups.
* `bash scripts/check-agents-md.sh` — passes (34 links / 33 docs).
* `grep -rn "0\.7\.0\|v0\.7\.0" --include='*.rs' --include='*.md'
--include='*.json' --include='*.toml' .` returns no workspace
hits. The three remaining `0.7.0` strings in `Cargo.lock`
belong to unrelated 3rd-party crates (`pem-rfc7468`, `radium`,
`rand_xoshiro`).
The git tag and crates.io publish happen later — this commit
just consolidates the surface so the eventual release is one
coherent v0.6.0 covering all the work since v0.5.0.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* mr-668: sanitize internal refs from v0.6.0 release notes
cubic-dev-ai P2 comments flagged that the release notes carried
internal Linear ticket and RFC references (MR-668, MR-731,
MR-723, RFC 0003, RFC 0004). Per AGENTS.md maintenance rule 5,
"Release docs are public project history. Describe capabilities,
behavior changes, breaking changes, upgrade notes, and user
impact; do not reference private ticket systems, internal
codenames, or planning shorthand that an outside contributor
cannot inspect." The bot's comments are correct against our own
published contract — they were a docs-quality regression
introduced when I drafted these notes.
Replaced each internal reference with the public-facing concept
it stood for. The substantive content (capabilities, behavior,
guarantees) was already present alongside the refs; sanitization
just trimmed the bracketed ticket labels:
* Line 6: dropped `(MR-668)` from the multi-graph mode summary —
the descriptive name was already self-sufficient.
* Line 24: `MR-731 spoof defense` → `the bearer-derived-actor-
identity guarantee`; `Forward-compat for Cloud mode (RFC 0003)
and OAuth provider (RFC 0004)` → "forward-compat seams for
future multi-tenant and OAuth deployments; they're inert in
this release" — describes what the operator sees instead of
pointing at planning docs.
* Line 26: `MR-731's server-authoritative-actor invariant` →
"the server-authoritative-actor invariant: actor identity is
always sourced from the bearer-token match resolved at the
auth boundary" — the public-facing statement of the guarantee.
* Line 36: `(MR-723 default-deny otherwise rejects …)` →
"without a server policy the default-deny posture rejects …"
— same content, no ticket label.
* Line 121: `MR-731 spoof regression test` → "The bearer-auth-
derived-actor-identity regression test (client-supplied
identity headers are ignored; the server-resolved actor is the
only identity Cedar sees)" — describes what the test guards
instead of naming the originating ticket.
Verified: `grep -E 'MR-\d+|RFC[ -]?\d+' docs/releases/v0.6.0.md`
returns no matches; the rest of `docs/releases/` is also clean.
`scripts/check-agents-md.sh` passes.
Note: cubic-dev-ai also flagged `crates/omnigraph-cli/src/main.rs:276`
("doc comment incorrectly references v0.6.0 for a command that
only exists in v0.7.0"). That comment is based on a stale model
of the release surface — after folding v0.7.0 into v0.6.0 in
the previous commit, the multi-graph CLI surface IS in v0.6.0
and the comment is correct as written. No change needed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: close validated init and multi-graph gaps
* chore: address review cleanup comments
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 16:19:31 +02:00
|
|
|
|
|
|
|
|
// ─── MR-668 PR 8 — omnigraph graphs subcommand ─────────────────────────────
|
|
|
|
|
|
|
|
|
|
/// `omnigraph graphs --help` lists only the read-only `list`
|
|
|
|
|
/// subcommand. Runtime add (`create`) and remove (`delete`) are
|
|
|
|
|
/// deferred — operators add/remove graphs by editing `omnigraph.yaml`
|
|
|
|
|
/// and restarting. This test pins the deferral against accidental
|
|
|
|
|
/// re-introduction.
|
|
|
|
|
#[test]
|
|
|
|
|
fn graphs_subcommand_help_lists_list_only() {
|
|
|
|
|
let output = output_success(cli().arg("graphs").arg("--help"));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("list"),
|
|
|
|
|
"expected `list` subcommand in help output:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
let lowered = stdout.to_lowercase();
|
|
|
|
|
assert!(
|
|
|
|
|
!lowered.contains("create a new graph"),
|
|
|
|
|
"graph create should not be in v0.6.0 help; got:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
!lowered.contains("delete a graph"),
|
|
|
|
|
"graph delete should not be in v0.6.0 help; got:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// `omnigraph graphs list` against a local URI errors with a clear
|
|
|
|
|
/// message — the CLI only operates against remote multi-graph servers.
|
|
|
|
|
#[test]
|
|
|
|
|
fn graphs_list_against_local_uri_errors_with_remote_only_message() {
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("graphs")
|
|
|
|
|
.arg("list")
|
|
|
|
|
.arg("--uri")
|
|
|
|
|
.arg("/tmp/local"),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr).into_owned();
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("remote multi-graph server URL"),
|
|
|
|
|
"expected 'remote multi-graph server URL' rejection in stderr; got:\n{stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
Stored-query registry foundation + config/CLI RFC-002 (#128)
* MR-969: add stored-query registry config surface
Introduce the `queries:` block in omnigraph.yaml — an inline
`name -> entry` map of stored queries, per-graph
(`graphs.<id>.queries`) and top-level for single-graph mode, mirroring
how `policy` is wired in both modes. Each entry points at a `.gq` file
and carries optional MCP exposure settings (`expose`, `tool_name`),
defaulting to not-exposed.
Additive: absent `queries:` leaves current behavior unchanged.
- QueryEntry { file, mcp: McpSettings { expose, tool_name } }
- `queries` field on TargetConfig + OmnigraphConfig (serde default)
- query_entries() / target_query_entries() accessors
- resolve_query_file() — base_dir-relative `.gq` path resolution
- round-trip + absent-block tests
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Add stored-query registry loader and GraphHandle wiring
Add a `queries` module: QueryRegistry loads each declared `.gq` entry,
parses it, and selects the query whose symbol matches the manifest key,
asserting the two agree (key == `query <name>` symbol). Identity is the
query name; a key/symbol mismatch is a load-time error. Errors are
collected, not fail-fast, so a bad registry surfaces every broken entry
at once. Schema type-checking is deliberately left to a separate pass so
the loader stays callable without an open engine.
Thread an `Option<Arc<QueryRegistry>>` through GraphHandle alongside the
per-graph policy; the URI-canonicalizing clone propagates it. Production
openers default to None for now — the boot path loads and attaches the
registry in a later change.
- QueryRegistry::{from_specs, load, lookup, iter}; StoredQuery::is_mutation
- GraphHandle.queries field, propagated on canonical clone
- registry unit tests: identity match/mismatch, multi-query selection,
per-entry parse errors, error collection, mutation classification
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: add RFC-002 config & CLI architecture
Layered config (user-global ~/.config/omnigraph/ + per-project), a
unifying `target` abstraction resolving to (locus, graph, sub-state,
credential) with embedded-URI XOR remote-server loci, multi-server ×
multi-graph client targeting, credentials by-reference, and the
file-naming decision: project and server config are one artifact
(`omnigraph.yaml`); the only differently-named file is the user-global
`config.yaml`, split by scope not role. Includes the 12-factor bind
portability rule (prefer --bind/OMNIGRAPH_BIND over a committed
server.bind) and the defined-locally / invoked-remotely model for
stored queries. Derived from first principles working backwards from
what the engine enables; validated against kube/Helix/git/compose.
Linked from docs/dev/index.md. Proposed; phased rollout for the
MR-973/974/981 family.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Add check() to validate stored queries against the live schema
A pure check(registry, catalog) that type-checks every stored query via
the same typecheck_query_decl the engine runs for inline queries — no
parallel implementation. Failures are collected, not fail-fast, so an
operator sees every broken query (e.g. a type/property a migration
renamed or removed) in one pass. Breakages are fatal (the boot path will
refuse to start); warnings are advisory.
Pure over (registry, catalog) so it is callable both at boot (engine
catalog) and offline from the CLI without an open engine.
Advisory lint: an mcp.expose:true query that declares a Vector(N)
parameter warns — an LLM cannot supply a raw embedding vector; such a
query should take a String parameter and embed server-side. Warns
rather than rejects, since service-to-service callers may pass vectors.
- CheckReport { breakages, warnings }; has_breakages / is_clean
- tests: valid query, unknown type, unknown property, collect-not-fail-fast,
vector-param-exposed warns, unexposed silent
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Drop internal plan-label refs from stored-query config comments
Doc comments referenced sequencing labels ("C2") that mean nothing to a
reader; reword to describe the behavior directly. Comment-only.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: reconcile aliases with the role model in RFC-002
Place the existing client-only `aliases:` block in the client/server
role split: aliases are client-role (CLI, embedded, ungated) and may
live in both user-global and project config; `queries:` is server-role
(deployment manifest only). They overlap as "name -> .gq"; `queries:` is
the superset, and the end-state subsumes aliases (definition -> queries,
target/branch/format -> client invocation context, positional args ->
CLI sugar). v1 keeps aliases unchanged.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: make RFC-002 config global-first, project-optional
The global user config is the primary, self-sufficient default; the
CLI works from any directory with no project file (the kubectl/aws/gh
posture), a deliberate flip from today's project-anchored behavior.
The project omnigraph.yaml becomes an optional repo-scoped override and
the deployment manifest. Uniform schema, both layers optional; global
can hold any section including a personal server's graphs/queries.
Additive: project still overrides global; the flip adds a fallback
layer below the project file rather than removing it.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: justify XDG ~/.config/omnigraph over legacy ~/.omnigraph in RFC-002
Make the rationale explicit: XDG-first because OmniGraph is a client
that will cache remote catalogs and keep session state alongside
secrets, and XDG separates config / cache / state into distinct dirs
(clear cache without touching creds; backups skip cache) whereas a
single ~/.omnigraph/ mixes them. Honor ~/.omnigraph/ as a fallback for
the peer-group (aws/kube/docker/helix) expectation. Add XDG_CACHE_HOME
/ XDG_STATE_HOME to the override precedence.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: build RFC-002 credentials on the existing env-file mechanism
OmniGraph already has credentials-by-reference: bearer_token_env names
the env var, and auth.env_file is a git-ignored dotenv the CLI
auto-loads (real env vars win), resolved via resolve_remote_bearer_token.
The RFC's proposed credentials.yaml + token_env were redundant parallel
inventions. Reconcile: reuse bearer_token_env (extend to
servers.<name>) and auth.env_file (add a global ~/.config/omnigraph/.env
layered under the project .env.omni); OS keychain is an additive future
resolver. No new credentials.yaml. Updated summary, non-goals,
background, file-naming, credentials, example, login, migration, rollout.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: use single ~/.omnigraph dir (Helix-style), not XDG, in RFC-002
Reverse the earlier XDG-first call. The prior argument rested on a false
dichotomy (single-dir => mixed config/cache/state); in fact the peer
tools (aws, kube, helix) achieve separation via SUBDIRECTORIES inside
one ~/.tool/ dir (~/.aws/sso/cache/, ~/.kube/cache/), getting cache
hygiene AND one discoverable place. So everything goes under
~/.omnigraph/: config.yaml, credentials (dotenv, 0600), cache/, state/.
Lower cognitive load, matches what DB/cloud-CLI users expect, matches
Helix. OMNIGRAPH_HOME overrides; $XDG_CONFIG_HOME optionally honored but
~/.omnigraph/ is canonical. Updated all paths, the rationale paragraph,
the file-naming table (added a cache/state row), and env precedence.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: reconcile RFC-002 with shipped/planned CLI tickets
Align with reality found in existing tickets:
- Noun is graph/graphs, not target/targets (MR-603 done renamed the
config key targets->graphs, flag --graph). Use graphs:/--graph; an
entry is embedded (uri) XOR remote (server + remote graph name).
- ~/.omnigraph/ confirmed by MR-581 (og template pull, done) which
already quick-starts templates there.
- Templates already exist (MR-581/MR-531) — not invented here.
- The init family is already specced (init, quickstart MR-973, serve
MR-970, prune MR-972, mcp install MR-974, agent-mode MR-981); this
RFC only adds the user route (~/.omnigraph/config.yaml + login).
- aliases: -> operations: planned (MR-839).
- bearer_token_env gap tracked in MR-971.
- query lint/check already exist (MR-639) — registry validator must not
collide with the singular `query check`.
Add a Reconciliation section; fix the canonical example to graphs:/--graph.
Also: merge semantics refined (deep-merge settings, replace named
entries, replace lists, config view --resolved --show-origin).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: correct stale-ticket claims and fold init/bootstrap design into RFC-002
Verify against code, not ticket statuses (MR-581 is marked done but is
stale/unbuilt): no ~/.omnigraph usage, no template/serve/quickstart/
prune/login commands exist; config still uses aliases: (no operations:).
So ~/.omnigraph/ stands on peer-convention merits alone, and templates
are a design question, not a foothold. Add §7.5: the three-tier init
model (user route = login + ~/.omnigraph/config.yaml; thin project init;
fat quickstart + templates) with first-principles positions (split
init/login, in-place refuse-if-exists, interactive vs --auto/agent-mode,
--template flag, secrets-on-scaffold gitignore rule). This RFC owns only
the user route; the rest are sibling tickets (MR-973/970/972/974/981).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: breadboard + slice Shape A in RFC-002
Add the implementation breadboard (places P1-P5, affordances N1-N14 with
NEW markers, mermaid) and five vertical slices for the selected config/
CLI/init shape: V1 global layer + merge engine + config view; V2 remote
graphs + HTTP-client path + credential resolution; V3 omnigraph login;
V4 init-hardening + quickstart + templates (rides MR-970); V5 agent-mode
(MR-981). Rollout reordered to the slice sequence; spikes X1-X4 gate
their owning slice. V1-V2 close the substantive client->server gap.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Add InvokeQuery Cedar action (coarse, graph-scoped)
A per-graph, branch-scoped action that gates invoking a server-side
stored query by name. Coarse for now: an `invoke_query` allow rule
permits any stored query on the graph; a future, additive refinement
adds an optional per-query-name scope without changing rules written
against the coarse action. Enforcement is at the HTTP boundary; the
engine `_as` writers still enforce read/change per the query body, so a
stored mutation is double-gated (invoke_query to reach the tool, change
for the write). No call site yet — the invocation handler wires it in a
later change (same pattern as Admin/GraphList added ahead of consumers).
- variant + as_str/resource_kind(Graph)/FromStr/uses_branch_scope
- Cedar schema: invoke_query appliesTo Graph
- tests: per-graph allow/deny, branch-scope accepted
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Load and type-check stored queries at server boot, refusing breakage
At startup the server now loads each graph's stored-query registry,
type-checks every query against that graph's live schema, and refuses to
boot if any query references a type/property the schema doesn't have
(same posture as bad policy YAML) — so schema drift surfaces at the
deploy boundary, not silently at invocation. Non-blocking warnings are
logged. The validated registry is attached to the GraphHandle (the two
production sites previously held `queries: None`).
Loading (parse + key==symbol identity) happens at settings-build time
where the config is in scope; the schema type-check happens after each
engine opens (single mode in `open_single_with_queries`, multi mode in
`open_single_graph`). `open_with_bearer_tokens_and_policy` delegates
with an empty registry so its 18 test callers are unchanged; the public
`new_*` constructors are unchanged (only the private build path threads
the registry).
- ServerConfigMode::Single / GraphStartupConfig carry the loaded registry
- boot tests: valid registry boots; type-broken query refuses boot + names it
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Add `omnigraph queries validate` and `queries list` CLI
`queries validate` type-checks the stored-query registry against the
live schema offline — it opens the selected graph, runs the same
check() the server runs at boot, prints breakages/warnings (human or
--json), and exits non-zero on any breakage — so an operator can catch
a query broken by a schema change without restarting the server.
`queries list` prints each registered query's name, MCP exposure, and
typed params.
Named `validate` (not `check`) to avoid overlap with the existing
`omnigraph lint` — `query check`/`query lint` are already deprecated
argv-shims to `lint`. Registry entries resolve like the server: a named
graph uses its per-graph `queries:`; otherwise the top-level one.
- Queries subcommand group; reuses QueryRegistry::load + check from
omnigraph-server; local-only (needs the schema), mirrors lint
- tests: clean registry exits 0, broken query exits non-zero + names it,
list shows the query and its typed params
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Route registry selection through one shared query_entries_for
The "which queries: block applies for graph X" rule existed twice — the
server boot path and the CLI's registry_entries — and had already drifted:
the CLI carried an unreachable unwrap_or_else fallback the server lacked.
Add OmnigraphConfig::query_entries_for(graph: Option<&str>) as the single
definition (named graph -> its per-graph block; otherwise top-level) and
route all three sites through it: server single mode, server multi-graph
loop, and the CLI. The CLI's dead fallback arm is deleted; CLI and server
now resolve identically by construction.
No behavior change. Extends the config round-trip test to pin the selector,
including the unknown-name -> top-level fallback the deleted CLI arm covered.
* Funnel registry validation through one validate_and_attach gate
The check -> refuse-on-breakage -> log-warnings -> empty->None block was
copy-pasted across both open paths (single mode and the multi-graph
per-graph open), differing only by the graph label. A third opener could
attach a registry that was never schema-checked.
Extract validate_and_attach(queries, catalog, label) -> Option<Arc<..>> as
the single gate both paths call, so attaching an unchecked registry is no
longer expressible. The catalog handle is an owned Arc, so calling it
before the multi-mode policy match (which rebinds db) is borrow-clean.
No behavior change. Adds a direct unit test of the helper (empty / clean /
breakage incl. the graph label in the message) — covering the multi-graph
path's logic, which previously had no boot-refusal coverage.
* Resolve param types structurally in the MCP vector lint
The exposed-query advisory detected vector params with
type_name.starts_with("Vector(") — a second copy of the compiler's own
ScalarType::from_str_name vector parsing that could drift from it.
Key the lint off PropType::from_param_type_name + ScalarType::Vector(_)
instead, the one canonical resolver the type system already uses. Any
future param-suppliability lint now reads the structured type rather than
scanning the surface string.
Behavior-preserving: the grammar forbids list-of-vector params
(list_type = "[" base_type "]", and base_type excludes Vector), so the only
input where the structured and string checks could differ is unparseable.
Adds a guard test that an exposed String param does not false-trigger the
warning.
* Refuse duplicate MCP tool names across exposed stored queries
The effective MCP tool name (explicit tool_name, else the query name) is a
second identity namespace beside the registry key, but nothing enforced it
unique — two exposed queries could claim one catalog key, and each consumer
re-derived the name ad hoc.
Add StoredQuery::effective_tool_name() as the one definition, and a
load-time uniqueness pass in from_specs over exposed queries: a collision is
a collected LoadError naming the loser and the winner. Scoped to exposed
queries (unexposed have no MCP tool); deterministic over the BTreeMap so the
first-declared wins and the error order is stable.
New (rare) refusal: a config with colliding exposed tool names now fails
`omnigraph queries validate` offline and refuses server boot, the same
posture as a malformed registry. Release-note-worthy.
Test-first: duplicate_exposed_tool_name_is_a_load_error (red before the
pass, green after) + a CLI offline test; the unexposed sibling pins the
exposed-only scope; effective_tool_name asserts folded into the load test.
* docs: document the queries registry, CLI, and invoke_query action
The stored-query surface shipped without user docs. Add it, per the same-PR
maintenance contract:
- policy.md: invoke_query as per-graph action #10 (branch-scoped), with the
double-gating note; renumber graph_list; add it to the branch_scope list.
- cli-reference.md: the `queries validate | list` command, and the
`queries:` config block (per-graph + top-level) with mcp.expose/tool_name
and the tool-name uniqueness rule.
- server.md: boot-time stored-query type-check (refuse on breakage), noting
invocation over HTTP/MCP is not yet exposed.
* Add POST /queries/{name} stored-query invocation handler
Invoke a curated server-side stored query by name: source + name come from
the per-graph queries: registry, the client sends only runtime inputs
(params, branch, snapshot). Gated by the invoke_query Cedar action at the
boundary; the handler delegates to the existing run_query/run_mutate, whose
inner Read/Change enforce still runs — so a stored mutation is double-gated
(invoke_query to reach the tool, change for the write).
- InvokeStoredQueryRequest + an untagged InvokeStoredQueryResponse
{ Read(ReadOutput), Change(ChangeOutput) } → one Json<_> return type and a
oneOf 200 schema (a correct contract, not a wrong-but-simple one).
- Route lives in per_graph_protected → single-mode /queries/{name} and
multi-mode /graphs/{id}/queries/{name} for free.
- Deny == unknown: an invoke_query denial and a missing query both return the
same 404, so the catalog can't be probed by an unauthorized caller.
- OpenAPI regenerated; tests cover read, mutation double-gate (403 vs 200),
bad-param 400, and the identical-404 deny path.
Completes the MR-969 V1 invocation slice (registry + /queries/{name} + invoke_query).
* docs: stored-query invocation endpoint; flip the not-yet-exposed caveat
Now that POST /queries/{name} ships (C7), document it: add the endpoint to
server.md's inventory + an invocation section (body, untagged read/mutate
envelope, invoke_query gate, double-gated mutations, deny == 404), and flip
the startup note that said invocation was not yet exposed. In policy.md,
replace "no invocation call site yet" on the invoke_query action with a
pointer to the endpoint.
* Scope the stored-query 404-hiding claim to non-invoke_query callers
Review found the deny==404 catalog-hiding was overstated as a contract: it
holds only at the outer invoke_query gate. A caller that HOLDS invoke_query
but lacks read/change gets the inner gate's 403 for an existing query vs 404
for an unknown one — so existence is visible to grant-holders by design (the
intended double-gate). The handler docstring, OpenAPI 404 description, and
server.md all claimed the 404 was airtight against any denied actor.
Correct the wording in all three (no behavior change) and add the missing
symmetric test (invoke_query but no read -> 403 for an existing query, 404
for unknown) so the actual contract is pinned. Also document that in
default-deny mode (tokens, no policy) every invocation 404s until an
invoke_query rule is configured.
Nits: the from_specs collision comment said "first declared wins" but it is
lexicographically-first by name (BTreeMap); the effective_tool_name docstring
overclaimed the CLI display routes through it (it resolves the rule on its
own output DTO).
* Default mcp.expose to true (the manifest entry is the opt-in)
expose controls MCP-catalog membership only — it is not an authorization
gate (invocation is gated by invoke_query regardless). So requiring a
per-query mcp.expose: true was friction with no safety benefit: a
non-exposed query is still HTTP-invocable by name. Flip the default so
declaring a query in the manifest exposes it to the agent tool catalog by
default; expose: false is the escape hatch for service-only queries.
Both the absent-mcp path (Default impl) and the present-but-no-expose path
(serde default fn) now yield true. Doc comments + cli-reference updated; the
config round-trip test asserts the new default.
* Add GET /queries stored-query catalog endpoint
List a graph's mcp.expose stored queries as a typed tool catalog so a client
(the MCP server) can register them as tools without fetching .gq source.
Each entry carries name, MCP tool_name, description/instruction, a
read/mutate flag, and decomposed typed params (kind enum: string|bool|int|
bigint|float|date|datetime|blob|vector|list, plus item_kind for lists and
vector_dim) — so the consumer builds an input schema with a closed match and
never re-parses omnigraph type spelling. I64/U64 are bigint (string on the
wire): a JSON number loses precision past 2^53 and the engine already accepts
decimal strings.
Read-gated (works in default-deny; the catalog is graph-wide, authorized
against main). NOT Cedar-filtered per query yet — a reader can list a query
whose invoke_query they lack (documented gap until per-query authz lands);
invocation stays invoke_query-gated + deny==404.
- api: QueriesCatalogOutput / QueryCatalogEntry / ParamDescriptor / ParamKind
+ query_catalog_entry (reuses PropType::from_param_type_name; scalar_kind is
exhaustive, so a new ScalarType is a compile error here until catalogued).
- GET /queries route in per_graph_protected (→ /graphs/{id}/queries in multi
mode); OpenAPI regenerated; path allowlists updated.
- Tests: projection unit (every kind, list, vector, nullable, mutation,
empty) + handler (exposed-only filter, read-gate probe-oracle, empty
registry).
* docs: GET /queries stored-query catalog endpoint
Document the catalog: the endpoint table row (GET /queries, read-gated), a
catalog section (typed-param kind enum, bigint/date/datetime/blob-as-string,
graph-wide/branch-independent, mcp.expose default true, the read-gated
probe-oracle gap), and flip the startup note now that the catalog ships.
* Collect file-I/O and parse errors in QueryRegistry::load in one pass
load() early-returned on any unreadable .gq file, masking parse / identity /
tool-name-collision errors in the OTHER (readable) files — so an operator
fixed the missing file, restarted, and only then saw the next broken query.
Now it collects I/O errors but still runs from_specs on the readable specs
and returns the union, so every broken entry surfaces at once (matching the
collected-errors contract the rest of the registry already follows).
Safe: from_specs' tool-name collision check runs over loaded queries only, so
dropping an I/O-failed entry can only under-report a collision, never invent
one. I/O errors are ordered first (BTreeMap key order), then spec errors.
Adds a load-level test (tempdir: a valid, a missing, and a parse-broken .gq)
asserting all three surface in one Err — confirmed red before the fix.
* Make invoke_query graph-scoped (one branch authority)
invoke_query gates reaching the curated stored-query surface — a graph-level
capability. Per-branch/snapshot access is already enforced by the inner
read/change gate in run_query/run_mutate (authorized against the resolved
branch), so branch-scoping the outer gate was redundant AND wrong for snapshot
reads (it defaulted to main). Drop the branch dimension: remove InvokeQuery
from uses_branch_scope (it joins admin as graph-scoped) and authorize the
boundary gate with branch: None.
Lossless: an actor confined to branch X by their read/change rules can still
only invoke a stored query that touches X. A rule that sets branch_scope on
invoke_query is now rejected by validate() — write invoke_query in its own
rule.
Ripple (atomic): restructure the server invoke fixture so invoke_query sits in
its own branch_scope-free rule; invert invoke_query_is_branch_scoped ->
invoke_query_rejects_branch_scope; the per-graph authorize test uses
branch: None; docs (policy.md, server.md, the InvokeQuery doc). No wire/OpenAPI
change.
* Resolve graph config by identity, not server mode
Which policy/queries block applies for a graph was decided three different,
mode-dependent ways: single-mode boot used top-level even for a named graph;
multi-mode used per-graph (and silently ignored a top-level queries block); the
CLI used per-graph for a named target. So `queries validate --target prod`
could check a different registry than the single-mode server loaded, and a
named graph's per-graph policy/queries were silently shadowed.
Make config a function of graph IDENTITY: a graph served by NAME
(--target/server.graph, a graphs: entry) uses its own graphs.<name>.{policy,
queries}; a bare URI is anonymous and uses top-level. One rule, applied by
single-mode boot, multi-mode boot, and the CLI — so they can't diverge and the
CLI predicts the server exactly.
No silent ignore: serving a named graph while a top-level policy/queries block
is populated now refuses boot, naming the block (the multi-mode top-level-policy
bail, extended to queries and to single-mode-named). The CLI's `queries
validate` derives the schema URI and the registry from ONE selection, and a
positional URI forces anonymous (ignoring cli.graph) so the two can't come from
different graphs.
BREAKING (released behavior): single mode by name (--target/server.graph) with
top-level policy/queries previously used top-level; it now uses the per-graph
block and refuses boot if top-level is also populated. Bare-URI single mode is
unchanged. Loud, with migration text pointing at graphs.<name>.
- config: resolve_policy_file_for (policy sibling of query_entries_for, no
top-level fallback) + populated_top_level_blocks for the coherence check.
- characterization tests (single-mode named -> per-graph; named + top-level ->
bail; multi-mode top-level queries -> bail; CLI positional-URI -> top-level).
- docs: policy.md, server.md, cli-reference.md.
* docs: RFC-002 credentials keyed by server name (keychain/profile/env)
Reworks the RFC's credentials model: secrets are keyed by server name — OS
keychain `omnigraph:<server>` (preferred) -> a `[<server>]` profile in
`~/.omnigraph/credentials` -> `OMNIGRAPH_TOKEN[_<SERVER>]` env (CI), the
AWS/gh/kube model. `servers.<name>` is endpoint-only by default but may carry
an explicit, secret-free `auth: { token: { env|file|command|keychain } }`
source. The shipped `bearer_token_env` + `.env.omni` dotenv remain a legacy
compat path; no `credentials.yaml`.
* docs: RFC-002 — typed graph locator (storage/server/graph_id), not a uri string
Add §1.1: the resolved graph address is a typed GraphLocator
(Embedded{storage} | Remote{server, graph_id}), not a flat uri: String.
Diagnoses the string model's cost in the code today (~16 is_remote_uri forks,
TargetConfig can't express multi-server x multi-graph, the CLI bails on remote,
the ts SDK models baseUrl+graphId separately) and settles the YAML naming so
the key names the locus:
- storage: (embedded) — shipped uri: is a deprecated alias
- server: + graph_id: (remote) — graph_id defaults to the entry key
- storage xor server, reject both/neither (no silent ambiguity)
Kills the graphs:/graph: collision and the uri:-might-be-a-server ambiguity.
Updates the §1/§8 examples and the entry-shape notes to the new naming.
* Test: queries list must reject an unknown --target
queries list opens no graph URI, so unknown-graph validation does not ride
along on resolve_target_uri the way it does for every other command. The new
test reproduces the gap: with an unknown --target the command currently exits 0
and prints the (empty) top-level registry instead of erroring like the
URI-resolving commands do. Fails against current code; the fix follows.
* Validate the graph selection in queries list
Graph-existence validation was a side effect of URI resolution: every
URI-resolving command rejects an unknown --target via resolve_target_uri, but
queries list opens no URI, so query_entries_for(Some(unknown)) silently fell
back to the top-level registry and showed the wrong (or empty) catalog.
Make membership a property of the selection: add the fallible
resolve_graph_selection alongside the infallible query_entries_for (a known
name passes through, an unknown name errors with the same message as
resolve_target_uri, None stays anonymous), and validate the selection in
execute_queries_list. query_entries_for is unchanged — server boot's bare-URI
path still needs its None -> top-level arm.
* Surface policy-engine errors from stored-query invoke
The invoke handler mapped every authorize_request failure to 404 ('stored
query not found'), which collapsed the authorization decision (deny -> 403)
together with operational failures (no actor -> 401, Cedar evaluation error ->
500). A real policy-engine 500 was hidden as a missing query.
Separate the two concerns instead of sniffing the masked status. Extract
authorize() returning an Authz { Allowed, Denied(msg) } decision and reserve
Err for operational failures only; authorize_request becomes a thin wrapper
that maps Denied -> 403, so the 16 deny-as-403 callers are unchanged. The
invoke handler now matches the decision directly: a denial stays 404 (deny ==
missing, so the catalog can't be probed without the grant), while a 401/500
propagates with its true status.
500 is now a reachable outcome on POST /queries/{name}; document it in the
endpoint responses and regenerate openapi.json.
* Extract the named-graph/top-level coherence rule into one helper
The rule 'a named graph uses its own graphs.<name> block, so a populated
top-level block is a config error' lived inline in single-mode server boot.
Extract it to OmnigraphConfig::ensure_top_level_blocks_honored so the same
definition can be shared by the CLI selection gate (next commit) and the two
can't drift. Boot calls the helper; the message is reworded context-neutral
(drops 'serving') so it reads correctly from both boot and the CLI.
Behavior-preserving: multi-graph mode keeps its own unconditional check, and
single_mode_named_graph_rejects_top_level_blocks still passes.
* Test: queries validate/list must reject a named graph with a top-level block
Server boot refuses a config where a graph is selected by name yet a top-level
queries:/policy.file block is populated (the block would be silently ignored).
The CLI's queries validate/list resolve the same named selection but skip that
coherence check, so they give a false green / list the per-graph block. The new
test reproduces it: validate prints OK and list succeeds where boot would
refuse. Fails against current code; the fix follows.
* Enforce top-level coherence in the single CLI selection gate
queries validate validated graph membership only as a side effect of URI
resolution and queries list only via resolve_graph_selection's membership
check; neither applied the named-graph/top-level coherence rule server boot
enforces, so both gave a false green on a config boot refuses.
Fold ensure_top_level_blocks_honored into resolve_graph_selection so it is the
single gate that returns only valid + server-coherent selections, and route
resolve_selected_graph (queries validate) through it; queries list already
calls the gate. A named graph with a populated top-level block now errors in
both commands, matching boot. A positional URI stays anonymous (top-level
honored), so queries_validate_positional_uri_ignores_default_graph is
unaffected.
* docs: RFC-003 — MCP server surface for omnigraph-server
Detailed MCP-transport design for the stored-query/MCP work, building on the
shipped #128 registry. Corrects the draft against the branch head: the coarse
invoke_query gate + 404 denial-masking are already wired (server_invoke_query),
so per-query invoke_query scope (PolicyRequest has no query-name dimension yet)
is the real prerequisite; positions the doc as superseding rfc-001's MCP
transport (/mcp/tools+/mcp/invoke) and reconciles the shipped mcp.expose YAML
form and the schema-introspection non-goal; grounds the parity surface in the
actual omnigraph-ts package (13 tools with read/change ids, 2 resources).
* docs(config): clarify graph config boundaries
* fix(config): enforce graph-scoped policies and query validation
* fix(cli): require graph selection for scoped query registries
* fix(server): preserve named graph id in single mode policy
* fix(cli): share graph identity for policy resolution
* test(cli): cover policy tooling server graph selection
* fix(cli): honor server graph for policy tooling
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-01 22:50:31 +02:00
|
|
|
|
|
|
|
|
fn queries_test_config(graph_uri: &str, entry: &str, gq_file: &str) -> String {
|
|
|
|
|
format!(
|
|
|
|
|
"graphs:\n local:\n uri: '{}'\n queries:\n {entry}:\n file: ./{gq_file}\n\
|
|
|
|
|
cli:\n graph: local\npolicy: {{}}\n",
|
|
|
|
|
graph_uri.replace('\'', "''")
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_validate_exits_zero_on_clean_registry() {
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"find_person.gq",
|
|
|
|
|
"query find_person($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&queries_test_config(&graph.path().to_string_lossy(), "find_person", "find_person.gq"),
|
|
|
|
|
);
|
|
|
|
|
let output = output_success(cli().arg("queries").arg("validate").arg("--config").arg(&config));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(stdout.contains("OK"), "stdout:\n{stdout}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_validate_exits_nonzero_on_type_broken_query() {
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
// `Widget` is not in the fixture schema.
|
|
|
|
|
graph.write_query("ghost.gq", "query ghost() { match { $w: Widget } return { $w.name } }");
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&queries_test_config(&graph.path().to_string_lossy(), "ghost", "ghost.gq"),
|
|
|
|
|
);
|
|
|
|
|
let output = output_failure(cli().arg("queries").arg("validate").arg("--config").arg(&config));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("ghost"),
|
|
|
|
|
"validation should name the broken query; stdout:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_list_prints_registered_query() {
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"find_person.gq",
|
|
|
|
|
"query find_person($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
// Exposed with an explicit tool name so the list shows the MCP suffix.
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&format!(
|
|
|
|
|
concat!(
|
|
|
|
|
"graphs:\n",
|
|
|
|
|
" local:\n",
|
|
|
|
|
" uri: '{}'\n",
|
|
|
|
|
" queries:\n",
|
|
|
|
|
" find_person:\n",
|
|
|
|
|
" file: ./find_person.gq\n",
|
|
|
|
|
" mcp: {{ expose: true, tool_name: lookup_person }}\n",
|
|
|
|
|
"cli:\n",
|
|
|
|
|
" graph: local\n",
|
|
|
|
|
"policy: {{}}\n",
|
|
|
|
|
),
|
|
|
|
|
graph.path().to_string_lossy().replace('\'', "''")
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
let output = output_success(cli().arg("queries").arg("list").arg("--config").arg(&config));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(stdout.contains("find_person"), "stdout:\n{stdout}");
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("$name: String"),
|
|
|
|
|
"list should show typed params; stdout:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("[mcp: lookup_person]"),
|
|
|
|
|
"list should show the MCP tool name for exposed queries; stdout:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_list_requires_graph_selection_for_per_graph_only_registries() {
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"find_person.gq",
|
|
|
|
|
"query find_person($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&format!(
|
|
|
|
|
concat!(
|
|
|
|
|
"graphs:\n",
|
|
|
|
|
" local:\n",
|
|
|
|
|
" uri: '{}'\n",
|
|
|
|
|
" queries:\n",
|
|
|
|
|
" find_person:\n",
|
|
|
|
|
" file: ./find_person.gq\n",
|
|
|
|
|
"policy: {{}}\n",
|
|
|
|
|
),
|
|
|
|
|
graph.path().to_string_lossy().replace('\'', "''")
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_failure(cli().arg("queries").arg("list").arg("--config").arg(&config));
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("local") && stderr.contains("--target local"),
|
|
|
|
|
"error must name the graph and give a concrete selection hint; stderr:\n{stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_list_without_graph_selection_lists_top_level_registry() {
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"top_find.gq",
|
|
|
|
|
"query top_find($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
concat!(
|
|
|
|
|
"queries:\n",
|
|
|
|
|
" top_find:\n",
|
|
|
|
|
" file: ./top_find.gq\n",
|
|
|
|
|
"policy: {}\n",
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let output = output_success(cli().arg("queries").arg("list").arg("--config").arg(&config));
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(stdout.contains("top_find"), "stdout:\n{stdout}");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_list_unknown_target_errors() {
|
|
|
|
|
// `queries list` opens no graph URI, so unknown-graph validation can't ride
|
|
|
|
|
// along on URI resolution the way it does for every other command. An
|
|
|
|
|
// unknown `--target` must still error (naming the graph) instead of
|
|
|
|
|
// silently falling back to the top-level registry and showing the wrong
|
|
|
|
|
// (or empty) catalog.
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"find_person.gq",
|
|
|
|
|
"query find_person($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&queries_test_config(&graph.path().to_string_lossy(), "find_person", "find_person.gq"),
|
|
|
|
|
);
|
|
|
|
|
let output = output_failure(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("queries")
|
|
|
|
|
.arg("list")
|
|
|
|
|
.arg("--target")
|
|
|
|
|
.arg("nonexistent")
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config),
|
|
|
|
|
);
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("nonexistent"),
|
|
|
|
|
"error must name the unknown graph; stderr:\n{stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_commands_reject_named_graph_with_populated_top_level_block() {
|
|
|
|
|
// A named graph (here via `cli.graph`) uses its own `graphs.<name>` block,
|
|
|
|
|
// so a populated top-level `queries:` block would be silently ignored — a
|
|
|
|
|
// config the server REFUSES to boot. `queries validate`/`list` must reject
|
|
|
|
|
// it too (matching boot) instead of validating/listing the per-graph block
|
|
|
|
|
// and giving a false green.
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"find_person.gq",
|
|
|
|
|
"query find_person($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&format!(
|
|
|
|
|
concat!(
|
|
|
|
|
"graphs:\n",
|
|
|
|
|
" local:\n",
|
|
|
|
|
" uri: '{}'\n",
|
|
|
|
|
" queries:\n",
|
|
|
|
|
" find_person:\n",
|
|
|
|
|
" file: ./find_person.gq\n",
|
|
|
|
|
"cli:\n",
|
|
|
|
|
" graph: local\n",
|
|
|
|
|
"queries:\n", // populated top-level block: the coherence violation
|
|
|
|
|
" legacy:\n",
|
|
|
|
|
" file: ./legacy.gq\n",
|
|
|
|
|
"policy: {{}}\n",
|
|
|
|
|
),
|
|
|
|
|
graph.path().to_string_lossy().replace('\'', "''")
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
// Both resolve `local` from cli.graph (no positional URI), so both must
|
|
|
|
|
// error and name the graph + the ignored block — like server boot does.
|
|
|
|
|
for sub in ["validate", "list"] {
|
|
|
|
|
let output = output_failure(cli().arg("queries").arg(sub).arg("--config").arg(&config));
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("local") && stderr.contains("queries"),
|
|
|
|
|
"`queries {sub}` must reject a named graph with a populated top-level block; stderr:\n{stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_validate_exits_nonzero_on_duplicate_tool_name() {
|
|
|
|
|
// Two exposed queries claiming one MCP tool name is a load-time
|
|
|
|
|
// collision — `queries validate` must fail (offline, before the engine
|
|
|
|
|
// opens) and name both queries plus the contested tool.
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query("a.gq", "query a() { match { $p: Person } return { $p.name } }");
|
|
|
|
|
graph.write_query("b.gq", "query b() { match { $p: Person } return { $p.name } }");
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
&format!(
|
|
|
|
|
concat!(
|
|
|
|
|
"graphs:\n",
|
|
|
|
|
" local:\n",
|
|
|
|
|
" uri: '{}'\n",
|
|
|
|
|
" queries:\n",
|
|
|
|
|
" a:\n",
|
|
|
|
|
" file: ./a.gq\n",
|
|
|
|
|
" mcp: {{ expose: true, tool_name: dup }}\n",
|
|
|
|
|
" b:\n",
|
|
|
|
|
" file: ./b.gq\n",
|
|
|
|
|
" mcp: {{ expose: true, tool_name: dup }}\n",
|
|
|
|
|
"cli:\n",
|
|
|
|
|
" graph: local\n",
|
|
|
|
|
"policy: {{}}\n",
|
|
|
|
|
),
|
|
|
|
|
graph.path().to_string_lossy().replace('\'', "''")
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
let output = output_failure(cli().arg("queries").arg("validate").arg("--config").arg(&config));
|
|
|
|
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
assert!(
|
|
|
|
|
stderr.contains("dup") && stderr.contains("'a'") && stderr.contains("'b'"),
|
|
|
|
|
"duplicate tool name should be reported naming both queries; stderr:\n{stderr}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn queries_validate_positional_uri_ignores_default_graph() {
|
|
|
|
|
// A positional URI is anonymous → the schema AND the registry both come
|
|
|
|
|
// from top-level, even when `cli.graph` names a graph whose per-graph
|
|
|
|
|
// queries would fail. Pins that the URI and registry can't diverge.
|
|
|
|
|
let graph = SystemGraph::loaded();
|
|
|
|
|
graph.write_query(
|
|
|
|
|
"clean.gq",
|
|
|
|
|
"query clean($name: String) { match { $p: Person { name: $name } } return { $p.age } }",
|
|
|
|
|
);
|
|
|
|
|
// `Widget` is not in the fixture schema — the default graph's per-graph
|
|
|
|
|
// query would break validate if it were (wrongly) selected.
|
|
|
|
|
graph.write_query("broken.gq", "query broken() { match { $w: Widget } return { $w.name } }");
|
|
|
|
|
let config = graph.write_config(
|
|
|
|
|
"omnigraph.yaml",
|
|
|
|
|
concat!(
|
|
|
|
|
"cli:\n graph: prod\n",
|
|
|
|
|
"graphs:\n",
|
|
|
|
|
" prod:\n",
|
|
|
|
|
" uri: /nonexistent-prod.omni\n",
|
|
|
|
|
" queries:\n",
|
|
|
|
|
" broken:\n",
|
|
|
|
|
" file: ./broken.gq\n",
|
|
|
|
|
"queries:\n",
|
|
|
|
|
" clean:\n",
|
|
|
|
|
" file: ./clean.gq\n",
|
|
|
|
|
"policy: {}\n",
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
// Positional URI = the real loaded graph; selection is anonymous, so the
|
|
|
|
|
// CLEAN top-level registry validates (not prod's broken one).
|
|
|
|
|
let output = output_success(
|
|
|
|
|
cli()
|
|
|
|
|
.arg("queries")
|
|
|
|
|
.arg("validate")
|
|
|
|
|
.arg(graph.path())
|
|
|
|
|
.arg("--config")
|
|
|
|
|
.arg(&config),
|
|
|
|
|
);
|
|
|
|
|
let stdout = stdout_string(&output);
|
|
|
|
|
assert!(
|
|
|
|
|
stdout.contains("OK"),
|
|
|
|
|
"positional URI must validate the top-level registry, not the cli.graph default; stdout:\n{stdout}"
|
|
|
|
|
);
|
|
|
|
|
}
|