ciris-server 0.5.2__tar.gz → 0.5.3__tar.gz

{ciris_server-0.5.2 → ciris_server-0.5.3}/Cargo.lock

@@ -995,7 +995,7 @@ dependencies = [
 
 [[package]]
 name = "ciris-server"
-version = "0.5.2"
+version = "0.5.3"
 dependencies = [
  "anyhow",
  "async-trait",

{ciris_server-0.5.2 → ciris_server-0.5.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ciris-server"
-version = "0.5.2"   # 0.1 = lens-only (agent ~2.9.7); 0.3 = +auth subsystem / one-wheel; 0.4 = +federation peering/identity (capacity scoring, consent:replication, register_federation_key gate, root-bootstrap, NodeCode); 0.4.1 = self-attested first-run root claim (#887); 0.4.2 = one-time claim PIN; 0.4.3 = CC-compliant ownership (infra:* responsible-party owner-binding, no agency, serve-only-until-owned); 0.4.4 = substrate-native user-signed owner-binding — 1-phase /v1/setup/root + the local node's /v1/setup/claim-remote (client is a node; crypto only in the substrate); 0.4.10 = Adapter seam (trait + AdapterContext + serve_with_adapter, mirrors CIRISAgent BaseAdapterProtocol — ciris-status = ciris-server + StatusAdapter); 0.4.11 = substrate floor edge v5.0.1 + persist v9.0.3 (wheel Requires-Dist metadata fix, #241/#242; Rust source unchanged); 0.4.12 = CEG-driven replication reconciler (consent objects are the topology; API writes CEG, runtime converges; runtime Initiator-add pending CIRISEdge#173); 0.4.13 = edge v5.1.0 runtime peer control → replication reconciler is fully no-restart (consent converges live; CIRISEdge#173 resolved); 0.4.14 = config-as-CEG foundation (config:v1 CEG schema + GraphConfig service + owner-gated /v1/config; 0.5 P1); 0.4.15 = config reconciler + migrated transport/scorer/replication-cadence/mode env→config:* (hot-applied; lens_store_min baked; 0.5 P2); 0.5 = config-as-CEG (graph config — ZERO env vars; ALL config is signed CEG objects, owner-authored, runtime-reconciled, replicated; the fabric IS the config); 0.5.1 = #27 fix — node key_id = fedcode::derive_key_id(label,pubkey) (FSD-003 label-fingerprint; keystore_alias stays raw, no re-key) + the WHEEL py_main now honors --home/--key-id (was run_default → bare label); cohort_scope consts; uuid helper; 0.5.2 = #32 fix — the wheel py_main reads Python sys.argv (not std::env::args, which under the console-script carried the interpreter+script path as a spurious positional → "unknown serve arg"); v0.5.1 wheel was unusable; 0.6 = +registry (~2.9.8/9); 1.0 = +node (~2.9.10). Patch forward on breakage.
+version = "0.5.3"   # 0.1 = lens-only (agent ~2.9.7); 0.3 = +auth subsystem / one-wheel; 0.4 = +federation peering/identity (capacity scoring, consent:replication, register_federation_key gate, root-bootstrap, NodeCode); 0.4.1 = self-attested first-run root claim (#887); 0.4.2 = one-time claim PIN; 0.4.3 = CC-compliant ownership (infra:* responsible-party owner-binding, no agency, serve-only-until-owned); 0.4.4 = substrate-native user-signed owner-binding — 1-phase /v1/setup/root + the local node's /v1/setup/claim-remote (client is a node; crypto only in the substrate); 0.4.10 = Adapter seam (trait + AdapterContext + serve_with_adapter, mirrors CIRISAgent BaseAdapterProtocol — ciris-status = ciris-server + StatusAdapter); 0.4.11 = substrate floor edge v5.0.1 + persist v9.0.3 (wheel Requires-Dist metadata fix, #241/#242; Rust source unchanged); 0.4.12 = CEG-driven replication reconciler (consent objects are the topology; API writes CEG, runtime converges; runtime Initiator-add pending CIRISEdge#173); 0.4.13 = edge v5.1.0 runtime peer control → replication reconciler is fully no-restart (consent converges live; CIRISEdge#173 resolved); 0.4.14 = config-as-CEG foundation (config:v1 CEG schema + GraphConfig service + owner-gated /v1/config; 0.5 P1); 0.4.15 = config reconciler + migrated transport/scorer/replication-cadence/mode env→config:* (hot-applied; lens_store_min baked; 0.5 P2); 0.5 = config-as-CEG (graph config — ZERO env vars; ALL config is signed CEG objects, owner-authored, runtime-reconciled, replicated; the fabric IS the config); 0.5.1 = #27 fix — node key_id = fedcode::derive_key_id(label,pubkey) (FSD-003 label-fingerprint; keystore_alias stays raw, no re-key) + the WHEEL py_main now honors --home/--key-id (was run_default → bare label); cohort_scope consts; uuid helper; 0.5.2 = #32 fix — the wheel py_main reads Python sys.argv (not std::env::args, which under the console-script carried the interpreter+script path as a spurious positional → "unknown serve arg"); v0.5.1 wheel was unusable; 0.5.3 = #34 fix — GET /v1/identity reports the derived wire key_id (was the keystore alias; now matches federation_keys + SignedKeyRecord); 0.6 = +registry (~2.9.8/9); 1.0 = +node (~2.9.10). Patch forward on breakage.
 edition = "2021"
 # MSRV floor is set by the substrate: ciris-verify v5.2.0 requires 1.86
 # (persist v6.0.1 is 1.83). Build with the higher of the two.

{ciris_server-0.5.2 → ciris_server-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ciris-server
-Version: 0.5.2
+Version: 0.5.3
 License-File: LICENSE
 Summary: The fabric node — the federation's headless cohabitation runtime (registry + lens [+ node] over one shared substrate), as the abi3 wheel CIRISAgent consumes. agent = fabric node + brain.
 Author-email: Eric Moore <eric@ciris.ai>

{ciris_server-0.5.2 → ciris_server-0.5.3}/src/compose.rs

@@ -272,7 +272,7 @@ pub async fn serve_with_adapter(cfg: ServerConfig, adapter: Arc<dyn Adapter>) ->
     // The node's identity aggregate (CEG §5.6.8.8.2) for GET /v1/identity —
     // assembled ONCE at boot from the federation signing key + the RNS transport
     // identity (both stable). Captured before edge.run() consumes the Edge.
-    let identity_json = local_identity_json(&engine, edge.local_transport_pubkey())
+    let identity_json = local_identity_json(&engine, edge.local_transport_pubkey(), &cfg.key_id)
         .await
         .context("assemble /v1/identity aggregate")?;
 
@@ -593,6 +593,7 @@ pub async fn serve_with_adapter(cfg: ServerConfig, adapter: Arc<dyn Adapter>) ->
 async fn local_identity_json(
     engine: &Engine,
     transport_pubkey: Option<[u8; 64]>,
+    wire_key_id: &str,
 ) -> Result<String> {
     use base64::Engine as _;
     let b64 = base64::engine::general_purpose::STANDARD;
@@ -604,7 +605,26 @@ async fn local_identity_json(
         .local_identity_aggregate(ret_x25519_b64, ret_ed25519_b64)
         .await
         .map_err(|e| anyhow::anyhow!("persist local_identity_aggregate: {e}"))?;
-    serde_json::to_string(&aggregate).context("serialize LocalIdentityAggregate")
+
+    // persist's aggregate reports `key_id`/`pqc_key_id` from the engine's
+    // configured local labels — which are the KEYSTORE alias (the raw `--key-id`),
+    // NOT the derived federation/wire identity. The `federation_keys` row and the
+    // `SignedKeyRecord` both carry the derived `key_id`, so override here so
+    // GET /v1/identity matches the canonical surfaces (CIRISServer#34). The
+    // federation registers the hybrid (Ed25519 + ML-DSA-65) under ONE key_id, so
+    // `pqc_key_id` is that same derived key_id (the keystore `{alias}-pqc` blob is
+    // an internal storage label, not the federation identity).
+    let mut v = serde_json::to_value(&aggregate).context("serialize LocalIdentityAggregate")?;
+    if let Some(obj) = v.as_object_mut() {
+        obj.insert("key_id".into(), serde_json::Value::String(wire_key_id.to_string()));
+        if obj.get("pqc_key_id").is_some_and(|p| !p.is_null()) {
+            obj.insert(
+                "pqc_key_id".into(),
+                serde_json::Value::String(wire_key_id.to_string()),
+            );
+        }
+    }
+    serde_json::to_string(&v).context("serialize identity aggregate JSON")
 }
 
 /// `GET /v1/identity` → the cached identity-aggregate JSON (stable for the