@shundoo-ai/dsh-cosmic 1.0.19 → 1.0.21

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/test/test_functional_group_resolution.py

@@ -360,7 +360,35 @@ def _add_receipt(unit_id: str = "ABCDEF1234", number: str | None = None) -> dict
     }
 
 
-def test_add_unit_name_only_omits_defaulted_fields_and_verifies_root() -> None:
+def test_add_unit_missing_code_stops_before_platform_write():
+    with mock.patch.object(cmd_apps, "_api_call") as write:
+        failure = cmd_apps.do_add_unit({}, "token", biz_app_id="APP-1", name="Group A")
+    assert failure["errorCode"] == "FUNCTIONAL_GROUP_CODE_REQUIRED"
+    assert failure["writeAttempted"] is False
+    write.assert_not_called()
+
+
+def test_add_unit_binds_app_root_and_validates_explicit_application(tmp_path):
+    runtime = tmp_path / "_runtime/cosmic-metadata"
+    runtime.mkdir(parents=True)
+    (tmp_path / "archive.json").write_text(json.dumps({"appCode": "uhyl_zlgl", "appId": "APP-1"}), encoding="utf-8")
+    (runtime / "workspace.json").write_text(json.dumps({"appNumber": "uhyl_zlgl", "bizAppId": "APP-1"}), encoding="utf-8")
+    assert cosmic_api._unit_app_target(str(tmp_path)) == ("APP-1", None)
+    with pytest.raises(RuntimeError, match="APP_TARGET_MISMATCH"):
+        cosmic_api._unit_app_target(str(tmp_path), "OTHER-APP")
+    receipt = _add_receipt("UNIT-1", "quality_master_data")
+    readback = _units_envelope([{"id": "UNIT-1", "number": "quality_master_data", "name": "基础数据"}])
+    with mock.patch.object(cmd_apps, "_api_call", return_value=receipt) as write, \
+         mock.patch.object(cmd_apps, "do_list_units", return_value=readback):
+        result = cosmic_api._dispatch_serve({}, "token", "addUnit", {
+            "appRoot": str(tmp_path), "name": "基础数据", "number": "quality_master_data", "seq": 2,
+        })
+    assert result["status"] is True
+    assert write.call_args.args[3] == {"bizAppId": "APP-1", "name": "基础数据",
+                                       "number": "quality_master_data", "description": "基础数据", "seq": 2}
+
+
+def test_add_unit_explicit_code_defaults_description_and_verifies_root() -> None:
     receipt = _add_receipt()
     readback = {
         "status": True,
@@ -380,12 +408,12 @@ def test_add_unit_name_only_omits_defaulted_fields_and_verifies_root() -> None:
         mock.patch.object(cmd_apps, "do_list_units", return_value=readback) as list_units,
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert api_call.call_args.args[2:] == (
         "app/unit/add",
-        {"bizAppId": "APP-1", "name": "Group A"},
+        {"bizAppId": "APP-1", "name": "Group A", "number": "lingee_abcdef1234", "description": "Group A", "seq": 2},
     )
     assert api_call.call_args.kwargs == {"method": "POST"}
     list_units.assert_called_once_with(
@@ -399,6 +427,45 @@ def test_add_unit_name_only_omits_defaulted_fields_and_verifies_root() -> None:
     }
 
 
+def test_add_unit_without_seq_appends_after_verified_existing_groups() -> None:
+    before = _units_envelope([{"id": "HOME", "name": "首页", "number": "MainPage", "seq": 1}])
+    after = _units_envelope([
+        {"id": "HOME", "name": "首页", "number": "MainPage", "seq": 1},
+        {"id": "ABCDEF1234", "name": "Group A", "number": "lingee_abcdef1234", "seq": 2},
+    ])
+    with (
+        mock.patch.object(cmd_apps, "_api_call", return_value=_add_receipt()) as write,
+        mock.patch.object(cmd_apps, "do_list_units", side_effect=[before, after]) as list_units,
+    ):
+        result = cmd_apps.do_add_unit({}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234")
+    assert result["status"] is True
+    assert write.call_args.args[3]["seq"] == 2
+    assert list_units.call_count == 2
+
+
+def test_add_unit_without_verified_sequence_stops_before_write() -> None:
+    with (
+        mock.patch.object(cmd_apps, "_api_call") as write,
+        mock.patch.object(cmd_apps, "do_list_units", return_value=_units_envelope([{"id": "HOME", "name": "首页"}])),
+    ):
+        result = cmd_apps.do_add_unit({}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234")
+    assert result["errorCode"] == "FUNCTIONAL_GROUP_SEQ_UNAVAILABLE"
+    assert result["writeAttempted"] is False
+    write.assert_not_called()
+
+
+def test_nested_add_unit_requires_a_sibling_sequence_before_write() -> None:
+    with (
+        mock.patch.object(cmd_apps, "_api_call") as write,
+        mock.patch.object(cmd_apps, "do_list_units") as list_units,
+    ):
+        result = cmd_apps.do_add_unit({}, "token", biz_app_id="APP-1", name="Child", number="child", parent_unit_id="PARENT")
+    assert result["errorCode"] == "FUNCTIONAL_GROUP_SEQ_UNAVAILABLE"
+    assert result["writeAttempted"] is False
+    write.assert_not_called()
+    list_units.assert_not_called()
+
+
 def test_add_unit_full_payload_is_preserved_and_verified() -> None:
     receipt = _add_receipt("UNIT-1", "group_a")
     readback = {
@@ -444,7 +511,7 @@ def test_add_unit_write_failure_does_not_read_back() -> None:
         mock.patch.object(cmd_apps, "do_list_units") as list_units,
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert result is failed
@@ -467,7 +534,7 @@ def test_add_unit_readback_failure_is_unknown_after_write(
         mock.patch.object(cmd_apps, "do_list_units", return_value=readback),
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert result["status"] is False
@@ -505,7 +572,7 @@ def test_add_unit_nested_child_is_not_accepted_as_first_level_readback() -> None
         mock.patch.object(cmd_apps, "do_list_units", return_value=readback),
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert result["errorCode"] == "ADD_UNIT_READBACK_MISMATCH"
@@ -528,7 +595,7 @@ def test_add_unit_duplicate_or_different_id_readback_fails_closed() -> None:
         mock.patch.object(cmd_apps, "do_list_units", return_value=duplicate),
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
     assert result["data"]["verification"]["reason"] == "candidate_count_mismatch"
 
@@ -546,7 +613,7 @@ def test_add_unit_duplicate_or_different_id_readback_fails_closed() -> None:
         mock.patch.object(cmd_apps, "do_list_units", return_value=different),
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
     assert result["data"]["verification"]["reason"] == "unit_id_mismatch"
     assert "unitId" not in result["data"]
@@ -560,7 +627,7 @@ def test_add_unit_readback_exception_fails_closed() -> None:
         ),
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert result["errorCode"] == "ADD_UNIT_READBACK_FAILED"
@@ -574,7 +641,7 @@ def test_add_unit_invalid_default_receipt_fails_before_readback() -> None:
         mock.patch.object(cmd_apps, "do_list_units") as list_units,
     ):
         result = cmd_apps.do_add_unit(
-            {}, "token", biz_app_id="APP-1", name="Group A"
+            {}, "token", biz_app_id="APP-1", name="Group A", number="lingee_abcdef1234", seq=2
         )
 
     assert result["errorCode"] == "ADD_UNIT_READBACK_MISMATCH"
@@ -582,11 +649,11 @@ def test_add_unit_invalid_default_receipt_fails_before_readback() -> None:
     list_units.assert_not_called()
 
 
-def test_add_unit_cli_accepts_name_only(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_add_unit_cli_accepts_explicit_code(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(
         sys,
         "argv",
-        ["cosmic_api.py", "addUnit", "--bizAppId", "APP-1", "--name", "Group A"],
+        ["cosmic_api.py", "addUnit", "--bizAppId", "APP-1", "--name", "Group A", "--number", "group_a"],
     )
     with (
         mock.patch.object(cosmic_api, "load_config", return_value={}),
@@ -604,7 +671,7 @@ def test_add_unit_cli_accepts_name_only(monkeypatch: pytest.MonkeyPatch) -> None
         biz_app_id="APP-1",
         biz_app_number=None,
         name="Group A",
-        number=None,
+        number="group_a",
         description=None,
         seq=None,
         parent_unit_id=None,
@@ -612,12 +679,12 @@ def test_add_unit_cli_accepts_name_only(monkeypatch: pytest.MonkeyPatch) -> None
     )
 
 
-def test_serve_add_unit_name_only_uses_shared_implementation() -> None:
+def test_serve_add_unit_uses_shared_implementation() -> None:
     with mock.patch.object(
         cosmic_api, "do_add_unit", return_value={"status": True}
     ) as add_unit:
         result = cosmic_api._dispatch_serve(
-            {}, "token", "addUnit", {"bizAppId": "APP-1", "name": "Group A"}
+            {}, "token", "addUnit", {"bizAppId": "APP-1", "name": "Group A", "number": "group_a"}
         )
 
     assert result == {"status": True}
@@ -627,7 +694,7 @@ def test_serve_add_unit_name_only_uses_shared_implementation() -> None:
         biz_app_id="APP-1",
         biz_app_number=None,
         name="Group A",
-        number=None,
+        number="group_a",
         description=None,
         seq=None,
         parent_unit_id=None,

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/test/test_identity_template_resolution.py

@@ -0,0 +1,103 @@
+import sys
+from pathlib import Path
+import pytest
+from types import SimpleNamespace
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+from _core import cmd_forms, cmd_properties
+import cosmic_api
+
+
+def test_key_rename_uses_single_setter_and_new_key_readback(monkeypatch):
+    calls = []
+    monkeypatch.setattr(cmd_properties, "do_get_property_schema", lambda *args:
+        {"status": True, "data": [{"propertyName": "Key", "editable": True,
+                                 "complexity": "simple", "editorType": "text"}]})
+    def write(cfg, token, form, key, properties):
+        calls.append(("write", key, properties))
+        return {"status": True, "data": {}}
+    def read(cfg, token, form, key, names):
+        calls.append(("read", key, names))
+        return {"status": True, "data": {"Key": key}}
+    monkeypatch.setattr(cmd_properties, "do_set_properties", write)
+    monkeypatch.setattr(cmd_properties, "do_get_properties", read)
+    result = cmd_properties.do_set_properties_verified({}, "", "form", "acme_old", {"Key": "acme_new"})
+    assert result["verification"]["verified"]
+    assert calls == [("write", "acme_old", {"Key": "acme_new"}), ("read", "acme_new", ["Key"])]
+
+
+def test_cli_key_rename_applies_developer_prefix_once(monkeypatch, tmp_path):
+    monkeypatch.setattr(cosmic_api, "_load_workspace_at",
+                        lambda root: {"isv": "uhyl", "standard": False})
+    args = SimpleNamespace(app_root=str(tmp_path))
+    assert cosmic_api._normalize_key_property(args, {"Key": "sample_description"})["Key"] == "uhyl_sample_description"
+    assert cosmic_api._normalize_key_property(args, {"Key": "uhyl_sample_description"})["Key"] == "uhyl_sample_description"
+
+
+def test_rename_element_key_migrates_rules_and_preserves_layout(monkeypatch, tmp_path):
+    args = SimpleNamespace(formNumber="form", element="申请说明",
+                           new_key="sample_description", app_root=str(tmp_path))
+    monkeypatch.setattr(cosmic_api, "_load_workspace_at",
+                        lambda root: {"isv": "uhyl", "standard": False})
+    monkeypatch.setattr(cosmic_api, "resolve_element_selector",
+                        lambda *args: "uhyl_apply_note")
+    before = {"key": "uhyl_apply_note", "name": "申请说明", "type": "TextField",
+              "parentKey": "head", "index": 4}
+    after = {**before, "key": "uhyl_sample_description"}
+    element_reads = iter([
+        {"status": True, "data": [before]},
+        {"status": True, "data": [after]},
+    ])
+    monkeypatch.setattr(cosmic_api, "do_list_elements", lambda *args: next(element_reads))
+    rule_before = {"ruleId": "r1", "ruleType": "formRule",
+                   "preCondition": "uhyl_apply_note = '加急'",
+                   "triggerField": "申请说明(uhyl_apply_note)"}
+    rule_after = {**rule_before, "preCondition": "uhyl_sample_description = '加急'",
+                  "triggerField": "申请说明(uhyl_sample_description)"}
+    rule_reads = iter([
+        {"status": True, "data": {"rules": [rule_before]}},
+        {"status": True, "data": {"rules": [rule_after]}},
+    ])
+    monkeypatch.setattr(cosmic_api, "do_list_rules", lambda *args: next(rule_reads))
+    writes = []
+    monkeypatch.setattr(cosmic_api, "do_set_properties_verified",
+                        lambda cfg, token, form, key, props:
+                        writes.append((key, props)) or
+                        {"status": True, "verification": {"verified": True}})
+    patches = []
+    monkeypatch.setattr(cosmic_api, "do_update_rule_verified",
+                        lambda cfg, token, form, patch:
+                        patches.append(patch) or
+                        {"status": True, "verification": {"verified": True}})
+    result = cosmic_api._rename_element_key({}, "", args)
+    assert result["verification"] == {
+        "verified": True, "preservationVerified": True,
+        "oldKeyAbsent": True, "newKeyPresent": True, "staleRuleIds": [],
+    }
+    assert writes == [("uhyl_apply_note", {"Key": "uhyl_sample_description"})]
+    assert patches == [{"ruleType": "formRule", "ruleId": "r1",
+                        "preCondition": "uhyl_sample_description = '加急'",
+                        "triggerField": "申请说明(uhyl_sample_description)"}]
+
+
+def test_template_code_and_name_use_same_live_identity():
+    rows = [{"number": "vendor_tpl", "name": "单据带组织模板", "modelType": "BillFormModel"}]
+    for selector in ("vendor_tpl", "单据带组织模板", "单据带组织模版"):
+        assert cmd_forms.resolve_template_selector(selector, rows, "BillFormModel") == "vendor_tpl"
+    assert cmd_forms.resolve_template_selector("单据带组织模版",
+        [dict(rows[0], name="单据（带组织）")], "BillFormModel") == "vendor_tpl"
+    with pytest.raises(ValueError, match="TEMPLATE_NAME_AMBIGUOUS"):
+        cmd_forms.resolve_template_selector("单据带组织模板", rows + [
+            dict(rows[0], number="other_tpl")], "BillFormModel")
+    with pytest.raises(ValueError, match="TEMPLATE_NOT_FOUND"):
+        cmd_forms.resolve_template_selector("单据带组织模板", rows, "BaseFormModel")
+
+
+def test_ascii_template_name_still_uses_live_directory(monkeypatch):
+    monkeypatch.setattr(cmd_forms, "do_get_template_list", lambda *args, **kwargs:
+                        [{"number": "vendor_tpl", "name": "OrganizationTemplate",
+                          "modelType": "BillFormModel"}])
+    assert cmd_forms.resolve_template_input({}, "", "OrganizationTemplate",
+                                            model_type="BillFormModel") == "vendor_tpl"
+    assert cmd_forms.resolve_template_input({}, "", "bos_billorgtpl",
+                                            model_type="BillFormModel") == "bos_billorgtpl"

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/test/test_report_plugin_contract.py

@@ -211,7 +211,7 @@ class CompileReportPluginContractTest(unittest.TestCase):
         )
         requirements = {row["requirement"] for row in contract["filterEnforcement"]}
         self.assertEqual(requirements, {"compare", "mustInput", "defaultValue"})
-        self.assertIn('getFilterItem("flt_date")', contract["filterEnforcement"][0]["java"])
+        self.assertIn('getFilterItems()', contract["filterEnforcement"][0]["java"])
 
     def test_every_filter_carries_its_comparison_as_a_requirement(self):
         """compare is not persisted at all, so query() is the only place it can be applied.
@@ -231,7 +231,33 @@ class CompileReportPluginContractTest(unittest.TestCase):
                     if row["requirement"] == "compare"]
         self.assertEqual([(row["filterKey"], row["value"]) for row in compares],
                          [("flt_date", "between"), ("flt_sup", "in")])
-        self.assertIn('getFilterItem("flt_sup")', compares[1]["java"])
+        self.assertIn('getValue("flt_sup")', compares[1]["java"])
+
+    def test_filter_contract_keeps_explicit_source_mapping_without_claiming_runtime_proof(self):
+        contract = report_ops.compile_report_plugin_contract({
+            "reportFilters": [{"fieldPath": "flt_sourcearea", "compare": "in"},
+                              {"fieldPath": "flt_date", "compare": "between"}],
+            "reportProperties": {"filterFieldConfig": [{"key": "flt_sourcearea",
+                "fieldName": "shfz_admindivision", "dataSourceId": "arrival-form-id"}]},
+        }, "test_report")
+        area, dates = contract["filterValueContracts"]
+        self.assertEqual(area["candidateValueKeys"], ["shfz_admindivision", "flt_sourcearea", "shfz_sourcearea"])
+        self.assertFalse(area["runtimeKeysVerified"])
+        self.assertEqual(area["sourceBinding"], {"fieldName": "shfz_admindivision", "dataSourceId": "arrival-form-id"})
+        self.assertEqual(dates["valueChannel"], "getFilterItems")
+        self.assertEqual(dates["rangeItemKeys"], {"start": "flt_date_startdate", "end": "flt_date_enddate"})
+        self.assertEqual(contract["permissionFilterChannel"], "getQFilters")
+
+    def test_compatibility_candidates_do_not_invent_a_project_namespace(self):
+        contract = report_ops.compile_report_plugin_contract({
+            "reportFilters": [{"fieldPath": "flt_supplier", "compare": "in"}],
+        }, "acme_report")
+        self.assertEqual(contract["filterValueContracts"][0]["candidateValueKeys"], ["flt_supplier"])
+        contract = report_ops.compile_report_plugin_contract({
+            "reportFilters": [{"fieldPath": "flt_area", "compare": "in"}],
+            "reportProperties": {"filterFieldConfig": [{"key": "flt_area", "fieldName": "acme_region"}]},
+        }, "acme_report")
+        self.assertEqual(contract["filterValueContracts"][0]["candidateValueKeys"], ["acme_region", "flt_area", "acme_area"])
 
     def test_default_valued_filter_properties_are_not_requirements(self):
         contract = _compile(

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/test/test_report_readback_derivation.py

@@ -108,6 +108,28 @@ class TestColumnsFromLayout(unittest.TestCase):
 
 
 class TestFiltersFromLayout(unittest.TestCase):
+    def test_fieldap_filters_read_actual_entity_types(self):
+        layout = _layout()
+        layout["children"][1]["children"][0]["children"] = [
+            {"key": key, "type": "FieldAp", "name": key}
+            for key in ("startdate", "orgscope", "resultms")
+        ] + [{"key": "label", "type": "LabelAp", "name": "Label"}]
+        schema_text = "### Entity: kdtest_rpt (Report) [ReportEntity]\n" + "\n".join([
+            "Field: startdate (Start Date) Type=DateField",
+            "Field: orgscope (Organizations) Type=MulBaseDataField",
+            "Field: resultms (Result) Type=ComboListField",
+            "Field: column_only (Column Only) Type=TextField",
+        ])
+        filters = _filters_from_layout(layout, schema_text)
+        self.assertEqual(["startdate", "orgscope", "resultms"], [row["fieldPath"] for row in filters])
+        self.assertEqual(["DateField", "MulBaseDataField", "ComboListField"], [row["fieldType"] for row in filters])
+        self.assertTrue(all(row["controlType"] == "FieldAp" for row in filters))
+
+    def test_fieldap_without_entity_evidence_does_not_guess_text(self):
+        layout = _layout()
+        layout["children"][1]["children"][0]["children"] = [{"key": "date", "type": "FieldAp", "name": "Date"}]
+        self.assertEqual([{"fieldPath": "date", "displayName": "Date", "controlType": "FieldAp"}], _filters_from_layout(layout))
+
     def test_filter_controls_are_derived_with_control_type(self):
         filters = _filters_from_layout(_layout())
         self.assertEqual(["biz_date", "sup_number"], [item["fieldPath"] for item in filters])

package/skills/cosmic-build/skills/cosmic-meta-api/scripts/test/test_report_typed_filters.py

@@ -0,0 +1,65 @@
+import sys
+from pathlib import Path
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+from _core import report_ops
+
+
+def request():
+    return report_ops.normalize_report_filters_input([{
+        "fieldPath": "flt_supplier", "displayName": "Supplier", "compare": "in",
+        "source": {"formNumber": "purchase", "fieldKey": "supplier"},
+    }])
+
+
+def test_source_is_typed_input_and_not_an_arbitrary_field_selector():
+    item = request()[0]
+    assert report_ops._build_filters_payload([item])[0]["source"] == item["source"]
+    with pytest.raises(ValueError):
+        report_ops.normalize_report_filters_input([{**item, "source": {"formNumber": "purchase", "fieldType": "TextField"}}])
+
+
+def test_legacy_platform_rejected_before_write_and_never_falls_back(monkeypatch):
+    writes = []
+    monkeypatch.setattr(report_ops, "_get_schema", lambda *args: {"data": {"schemaText": "legacy"}})
+    monkeypatch.setattr(report_ops, "_set_complex", lambda *args: writes.append(args))
+    with pytest.raises(RuntimeError, match="PLATFORM_UNSUPPORTED"):
+        report_ops.set_report_filters({}, "token", "report", request(), form_number="report")
+    assert writes == []
+
+
+def test_typed_source_uses_dedicated_route(monkeypatch):
+    calls = []
+    monkeypatch.setattr(report_ops, "_get_schema", lambda *args: {"data": {"fieldSchemas": [
+        {"fieldPath": "supplier", "fieldType": "BasedataField", "referenceEntityId": "bd_supplier"}]}})
+    monkeypatch.setattr(report_ops, "_assert_report_entity_writable", lambda *args, **kwargs: None)
+    monkeypatch.setattr(report_ops, "_set_complex", lambda *args: calls.append(args) or {"success": True})
+    report_ops.set_report_filters({}, "token", "report", request(), form_number="report")
+    assert calls[0][3] == "ReportFilters.typed"
+
+
+def test_readback_compares_fresh_source_reference_and_enum_configuration(monkeypatch):
+    source = {"fieldPath": "supplier", "fieldType": "BasedataField", "referenceEntityId": "bd_supplier", "displayProp": "name"}
+    monkeypatch.setattr(report_ops, "_get_schema", lambda *args: {"data": {"fieldSchemas": [source]}})
+    schema = {"readBackAvailable": True, "readBackSource": "formLayout", "typedFiltersReadBack": True,
+        "undecidableFilterProperties": ["compare", "defaultValue", "visible"],
+        "filterSourceExpectations": report_ops.report_filter_source_expectations({}, "token", request()),
+        "reportFilters": [{**source, "fieldPath": "flt_supplier", "displayName": "Supplier"}]}
+    assert report_ops.report_readback_verification("filters", request(), schema)["verified"]
+    schema["reportFilters"][0]["referenceEntityId"] = "wrong-reference"
+    assert not report_ops.report_readback_verification("filters", request(), schema)["verified"]
+    schema["reportFilters"][0]["referenceEntityId"] = "bd_supplier"
+    del schema["typedFiltersReadBack"]
+    assert not report_ops.report_readback_verification("filters", request(), schema)["verified"]
+
+
+def test_date_range_and_ambiguous_source_fail_closed(monkeypatch):
+    items = [{"fieldPath": "flt_date", "compare": "between", "source": {"formNumber": "purchase", "fieldKey": "date"}}]
+    monkeypatch.setattr(report_ops, "_get_schema", lambda *args: {"data": {"fieldSchemas": [
+        {"fieldPath": "date", "fieldType": "DateField", "timeZoneTransType": 0}]}})
+    assert report_ops.report_filter_source_expectations({}, "token", items)["flt_date"]["fieldType"] == "DateRangeField"
+    monkeypatch.setattr(report_ops, "_get_schema", lambda *args: {"data": {"fieldSchemas": [
+        {"fieldPath": "date", "fieldType": "TextField"}]}})
+    with pytest.raises(ValueError, match="RANGE_TYPE_UNSUPPORTED"):
+        report_ops.report_filter_source_expectations({}, "token", items)