V2 object layer: read V_eta's new statement names, and the old ones

V_eta renamed the statement family on 2026-10-08 (did-schema
V_eta_tenets.md, T2 amendment): subject_statement/assertion/interaction/
observation/manipulation/calculation drop subject_, the edge subject_id
becomes entity_id, data_type becomes value. The readers accept both, so a
dataset written before the rename still reads: ndi.v2.vetaName and
vetaAliases name the pairs; blockOf, edgeIds, classChain and directParents
fall back; isaQuery, entityQuery, fieldQuery and termQuery search both.
ndi.data_type becomes ndi.value. The Haley import asks the schema by the
new name; ndi.migrate's second pass is not changed (its CI is pinned to the
pre-#73 schema).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxKLA8Tbf9cpvDe7fuVeKf

Author: claude

src/ndi/+ndi/+file/+navigator/bodies.m

@@ -123,7 +123,7 @@
                 channels = S.database_search(ndi.query('', 'isa', 'acquisition_channels', '') & ...
                     ndi.query('', 'depends_on', 'acquisition_system_id', systems{a}.id()) & inSession);
                 for c = 1:numel(channels)
-                    statements = S.database_search(ndi.query('', 'isa', 'subject_statement', '') & ...
+                    statements = S.database_search(ndi.v2.isaQuery('statement') & ...
                         ndi.query('', 'depends_on', 'acquisition_channels_id', channels{c}.id()) & inSession);
                     for t = 1:numel(statements)
                         st = statements{t};
@@ -208,16 +208,17 @@
         function pm = statementProbemap(~, st, sysName)
             p = st.document_properties;
             type = '';
-            if isfield(p, 'subject_interaction') && isfield(p.subject_interaction, 'method') ...
-                    && isstruct(p.subject_interaction.method) && isfield(p.subject_interaction.method, 'name')
-                type = char(p.subject_interaction.method.name);
+            m = ndi.v2.blockOf(p, 'interaction', 'method', []);
+            if isstruct(m) && isfield(m, 'name')
+                type = char(m.name);
             end
             if isempty(type)
                 error('NDI:navigator:bodies:noMethod', ...
                     ['Recording statement %s has no `method`, which names the probe ' ...
                      'type (e.g. brightfield-imaging).'], st.id());
             end
-            subject = st.dependency_value('subject_id');
+            subject = ndi.v2.edgeIds(p, 'entity_id');
+            if isempty(subject), subject = ''; else, subject = subject{1}; end
             pm = ndi.epoch.epochprobemap_daqsystem(sysName, 1, type, [sysName ':image1'], subject);
         end
     end

src/ndi/+ndi/+setup/+V2/schemaHasField.m

@@ -14,8 +14,17 @@
 end
 tf = false;
 p = getenv('DID_SCHEMA_PATH');
-f = fullfile(p, [className '.json']);
-if isempty(p) || ~isfile(f)
+% a class renamed 2026-10-08 is looked up under whichever name the schema
+% in use has (ndi.v2.vetaAliases: 'statement' or 'subject_statement')
+names = ndi.v2.vetaAliases(className);
+f = '';
+for k = 1:numel(names)
+    if ~isempty(p) && isfile(fullfile(p, [names{k} '.json']))
+        f = fullfile(p, [names{k} '.json']);
+        break;
+    end
+end
+if isempty(f)
     return;
 end
 d = jsondecode(fileread(f));

src/ndi/+ndi/+setup/+conv/+haley/assertionDocuments.m

@@ -60,7 +60,7 @@
     strains(list{k}.key) = list{k};
 end
 eachMember = struct();
-if ndi.setup.V2.schemaHasField('subject_statement', 'distributive')
+if ndi.setup.V2.schemaHasField('statement', 'distributive')
     eachMember.distributive = true;
 end
 

src/ndi/+ndi/+setup/+conv/+haley/manipulationDocuments.m

@@ -96,7 +96,7 @@
 refs = getOr(options.Relations, 'timeReferenceIds', containers.Map());
 spans = getOr(options.Relations, 'assaySpans', containers.Map());
 eachMember = struct();
-if ndi.setup.V2.schemaHasField('subject_statement', 'distributive')
+if ndi.setup.V2.schemaHasField('statement', 'distributive')
     eachMember.distributive = true;
 end
 

src/ndi/+ndi/+v2/blockOf.m

@@ -3,7 +3,12 @@
 
 if nargin < 4, default = []; end
 v = default;
-if isfield(p, block) && isstruct(p.(block)) && isfield(p.(block), field)
-    v = p.(block).(field);
+% a block renamed 2026-10-08 is read under either name (ndi.v2.vetaAliases)
+names = ndi.v2.vetaAliases(block);
+for k = 1:numel(names)
+    if isfield(p, names{k}) && isstruct(p.(names{k})) && isfield(p.(names{k}), field)
+        v = p.(names{k}).(field);
+        return;
+    end
 end
 end

src/ndi/+ndi/+v2/classChain.m

@@ -11,7 +11,7 @@
 name = char(p.document_class.class_name);
 chain = {name};
 try
-    chain = [{name}, reshape(did2.schema.cache.shared().superclasses(name), 1, [])];
+    chain = ndi.v2.vetaName([{name}, reshape(did2.schema.cache.shared().superclasses(name), 1, [])]);
     return;
 catch
 end
@@ -24,4 +24,5 @@
         end
     end
 end
+chain = ndi.v2.vetaName(chain);   % names as of 2026-10-08 (ndi.v2.vetaName)
 end

src/ndi/+ndi/+v2/directParents.m

@@ -8,6 +8,17 @@
 try
     s = did2.schema.cache.shared().getClass(className);
 catch
+    s = [];
+end
+if isempty(s)
+    % a class renamed 2026-10-08, asked for by the name the schema in use lacks
+    alias = setdiff(ndi.v2.vetaAliases(className), {char(className)});
+    try
+        if ~isempty(alias), s = did2.schema.cache.shared().getClass(alias{1}); end
+    catch
+    end
+end
+if isempty(s)
     return;
 end
 if ~isfield(s, 'document_class') || ~isfield(s.document_class, 'superclasses')
@@ -20,4 +31,5 @@
         parents{end+1} = char(sc{k}.class_name); %#ok<AGROW>
     end
 end
+parents = ndi.v2.vetaName(parents);   % names as of 2026-10-08
 end

src/ndi/+ndi/+v2/edgeIds.m

@@ -24,4 +24,8 @@
     v = char(v);
     if ~isempty(v), ids{end+1} = v; end %#ok<AGROW>
 end
+if isempty(ids) && strcmp(name, 'entity_id')
+    % a statement written before 2026-10-08 names what it is about `subject_id`
+    ids = ndi.v2.edgeIds(p, 'subject_id');
+end
 end

src/ndi/+ndi/+v2/entityQuery.m

@@ -0,0 +1,10 @@
+function q = entityQuery(id)
+%ENTITYQUERY Statements about the entity ID: its `entity_id` (or, written before 2026-10-08, `subject_id`) edge.
+%
+%   Q = ndi.v2.entityQuery(ID) is ndi.query('', 'depends_on', 'entity_id', ID)
+%   OR the same for `subject_id`, the edge's name until 2026-10-08.
+%
+%   See also ndi.v2.isaQuery, ndi.v2.vetaAliases.
+
+q = ndi.query('', 'depends_on', 'entity_id', id) | ndi.query('', 'depends_on', 'subject_id', id);
+end

src/ndi/+ndi/+v2/fieldQuery.m

@@ -0,0 +1,18 @@
+function q = fieldQuery(path, op, value)
+%FIELDQUERY A field query on a V_eta block under its current or its old name.
+%
+%   Q = ndi.v2.fieldQuery('statement.variable.name', 'exact_string', V) is the
+%   ndi.query on that path OR on 'subject_statement.variable.name', the
+%   block's name until 2026-10-08 (ndi.v2.vetaAliases on the first segment).
+%
+%   See also ndi.v2.termQuery, ndi.v2.isaQuery.
+
+parts = strsplit(char(path), '.');
+names = ndi.v2.vetaAliases(parts{1});
+q = [];
+for k = 1:numel(names)
+    p = strjoin([names(k), parts(2:end)], '.');
+    one = ndi.query(p, op, value, '');
+    if isempty(q), q = one; else, q = q | one; end
+end
+end