Specify R6 data contracts and verify coupled REST migration

crates/oa-server/src/routes.rs

@@ -231,7 +231,7 @@ fn parse_source(body: &[u8]) -> ApiResult<oa_core::persistence::DecodeResult> {
 }
 
 fn import_json(body: &[u8]) -> ApiResult<oa_core::persistence::DecodeResult> {
-    // Format is chosen by HTTP. The shared decoder owns explicit schema-1 and schema-2 migration.
+    // Format is chosen by HTTP. The shared decoder owns supported older-schema migration.
     let _: Value = json_body(body)?;
     oa_core::persistence::decode_with_report_limited(body, MODEL_LIMITS).map_err(
         |error| match error {
@@ -525,7 +525,7 @@ async fn put_source_project(
             StatusCode::OK,
             json!({
                 "revision": stored.revision, "changed": changed, "issues": diagnostics,
-                "source_project": stored.source_project
+                "source_project": stored.source_project, "migration": stored.migration
             }),
         ))
     })
@@ -947,14 +947,16 @@ async fn validate_candidate(
                     // Advisory locations refer to submitted bytes, before Apply
                     // would insert missing persistent identities.
                     let diagnostics: Vec<_> = source_project::lint_bundle(&source_project, SOURCE_LIMITS).into_iter().map(source_issue).collect();
-                    if !diagnostics.iter().any(|issue| issue.severity == "error") {
-                        PreparedProject::from_bundle(source_project)?;
-                    }
-                    Ok(diagnostics)
+                    let migration = if !diagnostics.iter().any(|issue| issue.severity == "error") {
+                        PreparedProject::from_bundle(source_project)?.migration().cloned()
+                    } else {
+                        None
+                    };
+                    Ok((diagnostics, migration))
                 });
-                let diagnostics = result.unwrap_or_else(candidate_issues);
+                let (diagnostics, migration) = result.unwrap_or_else(|error| (candidate_issues(error), None));
                 let valid = !diagnostics.iter().any(|issue| issue.severity == "error");
-                return Ok(response(stored, StatusCode::OK, json!({"revision":stored.revision,"valid":valid,"issues":diagnostics,"migration":null})));
+                return Ok(response(stored, StatusCode::OK, json!({"revision":stored.revision,"valid":valid,"issues":diagnostics,"migration":migration})));
             }
             _ => return Err(ApiError::bad_request("Validation requires one matching format/payload: json with model, arcadia with source, or source-project with source_project.")),
         };

crates/oa-server/src/store.rs

@@ -128,9 +128,10 @@ impl PreparedProject {
     fn from_compiled(compiled: CompiledSourceProject) -> ApiResult<Self> {
         check_model_size(&compiled.decoded.project)?;
         check_source_size(&compiled.bundle)?;
+        let migration = compiled.decoded.migration.clone();
         Ok(Self {
             compiled,
-            migration: None,
+            migration,
         })
     }
 
@@ -173,6 +174,10 @@ impl PreparedProject {
         &self.compiled.bundle
     }
 
+    pub(crate) fn migration(&self) -> Option<&MigrationReport> {
+        self.migration.as_ref()
+    }
+
     pub(crate) fn source_issues(&self) -> Vec<crate::error::IssueDto> {
         self.compiled
             .diagnostics
@@ -329,7 +334,12 @@ impl Store {
             let prepared = if let Some(bundle) = envelope.source_project {
                 let prepared = PreparedProject::from_bundle(bundle.clone())
                     .map_err(|error| corrupt(error.detail))?;
-                if prepared.bundle() != &bundle || prepared.model() != &decoded.project {
+                // Explicit source upgrades may change tokens and generate new
+                // records. They must still agree with independently migrated
+                // JSON. Current-format unstabilized/inconsistent pairs reject.
+                if (prepared.bundle() != &bundle && prepared.migration.is_none())
+                    || prepared.model() != &decoded.project
+                {
                     return Err(corrupt(
                         "Stored source and model disagree, or source lacks stable identities."
                             .into(),
@@ -347,7 +357,7 @@ impl Store {
                 revision: envelope.revision,
                 model: decoded.project,
                 source_project: prepared.compiled.bundle,
-                migration: decoded.migration,
+                migration: decoded.migration.or(prepared.migration),
             };
             if stored.resource_id != filename_id || stored.revision == 0 {
                 return Err(corrupt(