tnfr 4.1.0__py3-none-any.whl → 4.5.0__py3-none-any.whl

tnfr/__init__.py

@@ -8,10 +8,10 @@ Ecuación nodal:
     ∂EPI/∂t = νf · ΔNFR(t)
 """
 
-__version__ = "4.1.0"
+__version__ = "4.5.0"
 
 # Re-exports de la API pública
-from .dynamics import step, run, set_delta_nfr_hook
+from .dynamics import step, run, set_delta_nfr_hook, validate_canon
 from .ontosim import preparar_red
 from .observers import attach_standard_observer, coherencia_global, orden_kuramoto
 from .gamma import GAMMA_REGISTRY, eval_gamma, kuramoto_R_psi
@@ -26,19 +26,40 @@ from .metrics import (
     register_metrics_callbacks,
     Tg_global, Tg_by_node,
     latency_series, glifogram_series,
-    glyph_top, glyph_dwell_stats,
+    glyph_top, glyph_dwell_stats, export_history,
 )
+from .operators import aplicar_remesh_red_topologico
 from .trace import register_trace
 from .program import play, seq, block, target, wait, THOL, TARGET, WAIT, ejemplo_canonico_basico
 from .cli import main as cli_main
 from .scenarios import build_graph
 from .presets import get_preset
 from .types import NodeState
+from .structural import (
+    create_nfr,
+    Operador,
+    Emision,
+    Recepcion,
+    Coherencia,
+    Disonancia,
+    Acoplamiento,
+    Resonancia,
+    Silencio,
+    Expansion,
+    Contraccion,
+    Autoorganizacion,
+    Mutacion,
+    Transicion,
+    Recursividad,
+    OPERADORES,
+    validate_sequence,
+    run_sequence,
+)
 
 
 __all__ = [
     "preparar_red",
-    "step", "run", "set_delta_nfr_hook",
+    "step", "run", "set_delta_nfr_hook", "validate_canon",
 
     "attach_standard_observer", "coherencia_global", "orden_kuramoto",
     "GAMMA_REGISTRY", "eval_gamma", "kuramoto_R_psi",
@@ -52,8 +73,17 @@ __all__ = [
     "Tg_global", "Tg_by_node",
     "latency_series", "glifogram_series",
     "glyph_top", "glyph_dwell_stats",
+    "export_history",
+    "aplicar_remesh_red_topologico",
     "play", "seq", "block", "target", "wait", "THOL", "TARGET", "WAIT",
     "cli_main", "build_graph", "get_preset", "NodeState",
     "ejemplo_canonico_basico",
+    "create_nfr",
+    "Operador", "Emision", "Recepcion", "Coherencia", "Disonancia",
+    "Acoplamiento", "Resonancia", "Silencio", "Expansion", "Contraccion",
+    "Autoorganizacion", "Mutacion", "Transicion", "Recursividad",
+    "OPERADORES", "validate_sequence", "run_sequence",
     "__version__",
 ]
+
+

tnfr/cli.py

@@ -18,13 +18,15 @@ from .metrics import (
     latency_series,
     glifogram_series,
     glyph_top,
+    export_history,
 )
 from .trace import register_trace
 from .program import play, seq, block, wait, target
-from .dynamics import step, _update_history, default_glyph_selector, parametric_glyph_selector
+from .dynamics import step, _update_history, default_glyph_selector, parametric_glyph_selector, validate_canon
 from .gamma import GAMMA_REGISTRY
 from .scenarios import build_graph
 from .presets import get_preset
+from .config import apply_config
 
 
 def _save_json(path: str, data: Any) -> None:
@@ -32,6 +34,24 @@ def _save_json(path: str, data: Any) -> None:
         json.dump(data, f, ensure_ascii=False, indent=2)
 
 
+def _str2bool(s: str) -> bool:
+    s = s.lower()
+    if s in {"true", "1", "yes", "y"}:
+        return True
+    if s in {"false", "0", "no", "n"}:
+        return False
+    raise argparse.ArgumentTypeError("expected true/false")
+
+
+def _args_to_dict(args: argparse.Namespace, prefix: str) -> Dict[str, Any]:
+    out: Dict[str, Any] = {}
+    pref = prefix.replace(".", "_")
+    for k, v in vars(args).items():
+        if k.startswith(pref) and v is not None:
+            out[k[len(pref):]] = v
+    return out
+
+
 def _load_sequence(path: str) -> List[Any]:
     with open(path, "r", encoding="utf-8") as f:
         text = f.read()
@@ -72,10 +92,29 @@ def _attach_callbacks(G: nx.Graph) -> None:
 
 def cmd_run(args: argparse.Namespace) -> int:
     G = build_graph(n=args.nodes, topology=args.topology, seed=args.seed)
+    if getattr(args, "config", None):
+        apply_config(G, args.config)
     _attach_callbacks(G)
-    G.graph.setdefault("GRAMMAR_CANON", DEFAULTS["GRAMMAR_CANON"]).update({"enabled": bool(args.grammar_canon)})
+    validate_canon(G)
+    if args.dt is not None:
+        G.graph["DT"] = float(args.dt)
+    if args.integrator is not None:
+        G.graph["INTEGRATOR_METHOD"] = str(args.integrator)
+    if getattr(args, "remesh_mode", None):
+        G.graph["REMESH_MODE"] = str(args.remesh_mode)
+    gcanon = dict(DEFAULTS["GRAMMAR_CANON"])
+    gcanon.update(_args_to_dict(args, prefix="grammar."))
+    if hasattr(args, "grammar_canon") and args.grammar_canon is not None:
+        gcanon["enabled"] = bool(args.grammar_canon)
+    G.graph.setdefault("GRAMMAR_CANON", {}).update(gcanon)
+    if args.glyph_hysteresis_window is not None:
+        G.graph["GLYPH_HYSTERESIS_WINDOW"] = int(args.glyph_hysteresis_window)
     G.graph["glyph_selector"] = default_glyph_selector if args.selector == "basic" else parametric_glyph_selector
-    G.graph["GAMMA"] = {"type": args.gamma}
+    G.graph["GAMMA"] = {
+        "type": args.gamma_type,
+        "beta": args.gamma_beta,
+        "R0": args.gamma_R0,
+    }
 
     if args.preset:
         program = get_preset(args.preset)
@@ -87,11 +126,28 @@ def cmd_run(args: argparse.Namespace) -> int:
 
     if args.save_history:
         _save_json(args.save_history, G.graph.get("history", {}))
+    if args.export_history_base:
+        export_history(G, args.export_history_base, fmt=args.export_format)
+
+    # Resúmenes rápidos (si están activados)
+    if G.graph.get("COHERENCE", DEFAULTS["COHERENCE"]).get("enabled", True):
+        Wstats = G.graph.get("history", {}).get(
+            G.graph.get("COHERENCE", DEFAULTS["COHERENCE"]).get("stats_history_key", "W_stats"), []
+        )
+        if Wstats:
+            print("[COHERENCE] último paso:", Wstats[-1])
+    if G.graph.get("DIAGNOSIS", DEFAULTS["DIAGNOSIS"]).get("enabled", True):
+        last_diag = G.graph.get("history", {}).get(
+            G.graph.get("DIAGNOSIS", DEFAULTS["DIAGNOSIS"]).get("history_key", "nodal_diag"), []
+        )
+        if last_diag:
+            sample = list(last_diag[-1].values())[:3]
+            print("[DIAGNOSIS] ejemplo:", sample)
 
     if args.summary:
         tg = Tg_global(G, normalize=True)
         lat = latency_series(G)
-        print("Top glifos por Tg:", glyph_top(G, k=5))
+        print("Top operadores por Tg:", glyph_top(G, k=5))
         if lat["value"]:
             print("Latencia media:", sum(lat["value"]) / max(1, len(lat["value"])) )
     return 0
@@ -99,10 +155,29 @@ def cmd_run(args: argparse.Namespace) -> int:
 
 def cmd_sequence(args: argparse.Namespace) -> int:
     G = build_graph(n=args.nodes, topology=args.topology, seed=args.seed)
+    if getattr(args, "config", None):
+        apply_config(G, args.config)
     _attach_callbacks(G)
-    G.graph.setdefault("GRAMMAR_CANON", DEFAULTS["GRAMMAR_CANON"]).update({"enabled": bool(args.grammar_canon)})
+    validate_canon(G)
+    if args.dt is not None:
+        G.graph["DT"] = float(args.dt)
+    if args.integrator is not None:
+        G.graph["INTEGRATOR_METHOD"] = str(args.integrator)
+    if getattr(args, "remesh_mode", None):
+        G.graph["REMESH_MODE"] = str(args.remesh_mode)
+    gcanon = dict(DEFAULTS["GRAMMAR_CANON"])
+    gcanon.update(_args_to_dict(args, prefix="grammar."))
+    if hasattr(args, "grammar_canon") and args.grammar_canon is not None:
+        gcanon["enabled"] = bool(args.grammar_canon)
+    G.graph.setdefault("GRAMMAR_CANON", {}).update(gcanon)
+    if args.glyph_hysteresis_window is not None:
+        G.graph["GLYPH_HYSTERESIS_WINDOW"] = int(args.glyph_hysteresis_window)
     G.graph["glyph_selector"] = default_glyph_selector if args.selector == "basic" else parametric_glyph_selector
-    G.graph["GAMMA"] = {"type": args.gamma}
+    G.graph["GAMMA"] = {
+        "type": args.gamma_type,
+        "beta": args.gamma_beta,
+        "R0": args.gamma_R0,
+    }
 
     if args.preset:
         program = get_preset(args.preset)
@@ -115,15 +190,30 @@ def cmd_sequence(args: argparse.Namespace) -> int:
 
     if args.save_history:
         _save_json(args.save_history, G.graph.get("history", {}))
+    if args.export_history_base:
+        export_history(G, args.export_history_base, fmt=args.export_format)
     return 0
 
 
 def cmd_metrics(args: argparse.Namespace) -> int:
     G = build_graph(n=args.nodes, topology=args.topology, seed=args.seed)
+    if getattr(args, "config", None):
+        apply_config(G, args.config)
     _attach_callbacks(G)
+    validate_canon(G)
+    if args.dt is not None:
+        G.graph["DT"] = float(args.dt)
+    if args.integrator is not None:
+        G.graph["INTEGRATOR_METHOD"] = str(args.integrator)
+    if getattr(args, "remesh_mode", None):
+        G.graph["REMESH_MODE"] = str(args.remesh_mode)
     G.graph.setdefault("GRAMMAR_CANON", DEFAULTS["GRAMMAR_CANON"]).update({"enabled": bool(args.grammar_canon)})
     G.graph["glyph_selector"] = default_glyph_selector if args.selector == "basic" else parametric_glyph_selector
-    G.graph["GAMMA"] = {"type": args.gamma}
+    G.graph["GAMMA"] = {
+        "type": args.gamma_type,
+        "beta": args.gamma_beta,
+        "R0": args.gamma_R0,
+    }
     for _ in range(int(args.steps or 200)):
         step(G)
 
@@ -155,11 +245,27 @@ def main(argv: Optional[List[str]] = None) -> int:
     p_run.add_argument("--steps", type=int, default=200)
     p_run.add_argument("--seed", type=int, default=1)
     p_run.add_argument("--preset", type=str, default=None)
+    p_run.add_argument("--config", type=str, default=None)
+    p_run.add_argument("--dt", type=float, default=None)
+    p_run.add_argument("--integrator", choices=["euler", "rk4"], default=None)
     p_run.add_argument("--save-history", dest="save_history", type=str, default=None)
+    p_run.add_argument("--export-history-base", dest="export_history_base", type=str, default=None)
+    p_run.add_argument("--export-format", dest="export_format", choices=["csv", "json"], default="json")
     p_run.add_argument("--summary", action="store_true")
+    p_run.add_argument("--remesh-mode", choices=["knn", "mst", "community"], default=None)
     p_run.add_argument("--no-canon", dest="grammar_canon", action="store_false", default=True, help="Desactiva gramática canónica")
+    p_run.add_argument("--grammar.enabled", dest="grammar_enabled", type=_str2bool, default=None)
+    p_run.add_argument("--grammar.zhir_requires_oz_window", dest="grammar_zhir_requires_oz_window", type=int, default=None)
+    p_run.add_argument("--grammar.zhir_dnfr_min", dest="grammar_zhir_dnfr_min", type=float, default=None)
+    p_run.add_argument("--grammar.thol_min_len", dest="grammar_thol_min_len", type=int, default=None)
+    p_run.add_argument("--grammar.thol_max_len", dest="grammar_thol_max_len", type=int, default=None)
+    p_run.add_argument("--grammar.thol_close_dnfr", dest="grammar_thol_close_dnfr", type=float, default=None)
+    p_run.add_argument("--grammar.si_high", dest="grammar_si_high", type=float, default=None)
+    p_run.add_argument("--glyph.hysteresis_window", dest="glyph_hysteresis_window", type=int, default=None)
     p_run.add_argument("--selector", choices=["basic", "param"], default="basic")
-    p_run.add_argument("--gamma", choices=list(GAMMA_REGISTRY.keys()), default="none")
+    p_run.add_argument("--gamma-type", choices=list(GAMMA_REGISTRY.keys()), default="none")
+    p_run.add_argument("--gamma-beta", type=float, default=0.0)
+    p_run.add_argument("--gamma-R0", type=float, default=0.0)
     p_run.set_defaults(func=cmd_run)
 
     p_seq = sub.add_parser("sequence", help="Ejecutar una secuencia (preset o YAML/JSON)")
@@ -168,7 +274,24 @@ def main(argv: Optional[List[str]] = None) -> int:
     p_seq.add_argument("--seed", type=int, default=1)
     p_seq.add_argument("--preset", type=str, default=None)
     p_seq.add_argument("--sequence-file", type=str, default=None)
+    p_seq.add_argument("--config", type=str, default=None)
+    p_seq.add_argument("--dt", type=float, default=None)
+    p_seq.add_argument("--integrator", choices=["euler", "rk4"], default=None)
     p_seq.add_argument("--save-history", dest="save_history", type=str, default=None)
+    p_seq.add_argument("--export-history-base", dest="export_history_base", type=str, default=None)
+    p_seq.add_argument("--export-format", dest="export_format", choices=["csv", "json"], default="json")
+    p_seq.add_argument("--remesh-mode", choices=["knn", "mst", "community"], default=None)
+    p_seq.add_argument("--gamma-type", choices=list(GAMMA_REGISTRY.keys()), default="none")
+    p_seq.add_argument("--gamma-beta", type=float, default=0.0)
+    p_seq.add_argument("--gamma-R0", type=float, default=0.0)
+    p_seq.add_argument("--grammar.enabled", dest="grammar_enabled", type=_str2bool, default=None)
+    p_seq.add_argument("--grammar.zhir_requires_oz_window", dest="grammar_zhir_requires_oz_window", type=int, default=None)
+    p_seq.add_argument("--grammar.zhir_dnfr_min", dest="grammar_zhir_dnfr_min", type=float, default=None)
+    p_seq.add_argument("--grammar.thol_min_len", dest="grammar_thol_min_len", type=int, default=None)
+    p_seq.add_argument("--grammar.thol_max_len", dest="grammar_thol_max_len", type=int, default=None)
+    p_seq.add_argument("--grammar.thol_close_dnfr", dest="grammar_thol_close_dnfr", type=float, default=None)
+    p_seq.add_argument("--grammar.si_high", dest="grammar_si_high", type=float, default=None)
+    p_seq.add_argument("--glyph.hysteresis_window", dest="glyph_hysteresis_window", type=int, default=None)
     p_seq.set_defaults(func=cmd_sequence)
 
     p_met = sub.add_parser("metrics", help="Correr breve y volcar métricas clave")
@@ -176,10 +299,16 @@ def main(argv: Optional[List[str]] = None) -> int:
     p_met.add_argument("--topology", choices=["ring", "complete", "erdos"], default="ring")
     p_met.add_argument("--steps", type=int, default=300)
     p_met.add_argument("--seed", type=int, default=1)
+    p_met.add_argument("--dt", type=float, default=None)
+    p_met.add_argument("--integrator", choices=["euler", "rk4"], default=None)
     p_met.add_argument("--no-canon", dest="grammar_canon", action="store_false", default=True, help="Desactiva gramática canónica")
     p_met.add_argument("--selector", choices=["basic", "param"], default="basic")
-    p_met.add_argument("--gamma", choices=list(GAMMA_REGISTRY.keys()), default="none")
+    p_met.add_argument("--gamma-type", choices=list(GAMMA_REGISTRY.keys()), default="none")
+    p_met.add_argument("--gamma-beta", type=float, default=0.0)
+    p_met.add_argument("--gamma-R0", type=float, default=0.0)
+    p_met.add_argument("--remesh-mode", choices=["knn", "mst", "community"], default=None)
     p_met.add_argument("--save", type=str, default=None)
+    p_met.add_argument("--config", type=str, default=None)
     p_met.set_defaults(func=cmd_metrics)
 
     args = p.parse_args(argv)

tnfr/config.py

@@ -0,0 +1,41 @@
+"""Carga e inyección de configuraciones externas.
+
+Permite definir parámetros en JSON o YAML y aplicarlos sobre ``G.graph``
+reutilizando :func:`tnfr.constants.inject_defaults`.
+"""
+
+from __future__ import annotations
+from typing import Any, Dict
+import json
+
+try:  # pragma: no cover - dependencia opcional
+    import yaml  # type: ignore
+except Exception:  # pragma: no cover
+    yaml = None
+
+from .constants import inject_defaults
+
+
+def load_config(path: str) -> Dict[str, Any]:
+    """Lee un archivo JSON/YAML y devuelve un ``dict`` con los parámetros."""
+    with open(path, "r", encoding="utf-8") as f:
+        text = f.read()
+    if path.endswith((".yaml", ".yml")):
+        if not yaml:  # pragma: no cover - fallo en entorno sin pyyaml
+            raise RuntimeError("pyyaml no está instalado")
+        data = yaml.safe_load(text)
+    else:
+        data = json.loads(text)
+    if not isinstance(data, dict):
+        raise ValueError("El archivo de configuración debe contener un objeto")
+    return data
+
+
+def apply_config(G, path: str) -> None:
+    """Inyecta parámetros desde ``path`` sobre ``G.graph``.
+
+    Se reutiliza :func:`inject_defaults` para mantener la semántica de los
+    *defaults* canónicos.
+    """
+    cfg = load_config(path)
+    inject_defaults(G, cfg, override=True)

tnfr/constants.py

@@ -11,8 +11,10 @@ from typing import Dict, Any
 # Parámetros canónicos
 # -------------------------
 DEFAULTS: Dict[str, Any] = {
-    # Discretización
-    "DT": 1.0,
+    # Discretización
+    "DT": 1.0,
+    "INTEGRATOR_METHOD": "euler",
+    "DT_MIN": 0.1,
 
     # Rango de EPI (estructura primaria)
     "EPI_MIN": -1.0,
@@ -43,9 +45,10 @@ DEFAULTS: Dict[str, Any] = {
     "INIT_VF_CLAMP_TO_LIMITS": True,
 
 
-    # Mezcla para ΔNFR (campo nodal)
-    # phase: dispersión de fase local; epi: gradiente de EPI; vf: desajuste de νf
-    "DNFR_WEIGHTS": {"phase": 0.34, "epi": 0.33, "vf": 0.33},
+    # Mezcla para ΔNFR (campo nodal)
+    # phase: dispersión de fase local; epi: gradiente de EPI; vf: desajuste de νf;
+    # topo: término topológico (p. ej., centralidad). Pesos se normalizan.
+    "DNFR_WEIGHTS": {"phase": 0.34, "epi": 0.33, "vf": 0.33, "topo": 0.0},
 
     # Índice de sentido Si = α·νf_norm + β·(1 - disp_fase) + γ·(1 - |ΔNFR|/max)
     "SI_WEIGHTS": {"alpha": 0.34, "beta": 0.33, "gamma": 0.33},
@@ -76,33 +79,54 @@ DEFAULTS: Dict[str, Any] = {
     "REMESH_COOLDOWN_VENTANA": 20,    # pasos mínimos entre RE’MESH
     "REMESH_COOLDOWN_TS": 0.0,        # cooldown adicional por tiempo simulado
     # Gating adicional basado en observadores (conmutador + ventana)
-    "REMESH_REQUIRE_STABILITY": False, # si True, exige ventana de estabilidad multi-métrica
-    "REMESH_STABILITY_WINDOW": 25,     # tamaño de ventana para evaluar estabilidad
-    "REMESH_MIN_PHASE_SYNC": 0.85,     # media mínima de sincronía de fase en ventana
-    "REMESH_MAX_GLYPH_DISR": 0.35,     # media máxima de carga glífica disruptiva en ventana
-    "REMESH_LOG_EVENTS": True,         # guarda eventos y metadatos del RE’MESH
-
-    # RE’MESH: memoria τ y mezcla α
-    "REMESH_TAU": 8,                  # pasos hacia atrás
+    "REMESH_REQUIRE_STABILITY": True,  # si True, exige ventana de estabilidad multi-métrica
+    "REMESH_STABILITY_WINDOW": 25,     # tamaño de ventana para evaluar estabilidad
+    "REMESH_MIN_PHASE_SYNC": 0.85,     # media mínima de sincronía de fase en ventana
+    "REMESH_MAX_GLYPH_DISR": 0.35,     # media máxima de carga glífica disruptiva en ventana
+    "REMESH_MIN_SIGMA_MAG": 0.50,      # magnitud mínima de σ en ventana
+    "REMESH_MIN_KURAMOTO_R": 0.80,    # R de Kuramoto mínimo en ventana
+    "REMESH_MIN_SI_HI_FRAC": 0.50,    # fracción mínima de nodos con Si alto
+    "REMESH_LOG_EVENTS": True,         # guarda eventos y metadatos del RE’MESH
+    "REMESH_MODE": "knn",            # modo de remallado topológico
+    "REMESH_COMMUNITY_K": 2,          # conexiones por comunidad
+
+    # RE’MESH: memoria τ y mezcla α (global/local)
+    "REMESH_TAU": 8,                  # compatibilidad: tau global por defecto
+    "REMESH_TAU_GLOBAL": 8,           # pasos hacia atrás (escala global)
+    "REMESH_TAU_LOCAL": 4,            # pasos hacia atrás (escala local)
     "REMESH_ALPHA": 0.5,              # mezcla con pasado
     "REMESH_ALPHA_HARD": False,       # si True ignora GLYPH_FACTORS['REMESH_alpha']
+
+    # Soporte y norma de la EPI
+    "EPI_SUPPORT_THR": 0.05,          # umbral para Supp(EPI)
+
+    # U'M — compatibilidad mínima para crear/reforzar enlaces funcionales
+    "UM_COMPAT_THRESHOLD": 0.75,
 
-    # Histéresis glífica
-    "GLYPH_HYSTERESIS_WINDOW": 7,
-
-    # Margen de histéresis del selector (cuánto "aguanta" sin cambiar glifo si está cerca de un umbral)
-    "GLYPH_SELECTOR_MARGIN": 0.05,
+    # Histéresis glífica
+    "GLYPH_HYSTERESIS_WINDOW": 7,
+
+    # Lags máximos sin emisión (A’L) y recepción (E’N)
+    "AL_MAX_LAG": 5,
+    "EN_MAX_LAG": 3,
+
+    # Margen de histéresis del selector (cuánto "aguanta" sin cambiar glifo si está cerca de un umbral)
+    "GLYPH_SELECTOR_MARGIN": 0.05,
 
-    # Ventana para estimar la carga glífica en history/plots
+    # Ventana para estimar la carga glífica en history/plots
     "GLYPH_LOAD_WINDOW": 50,
-
-    # Tamaño de ventana para coherencia promedio W̄
-    "WBAR_WINDOW": 25,  
-
-    # Factores suaves por glifo (operadores)
+
+    # Tamaño de ventana para coherencia promedio W̄
+    "WBAR_WINDOW": 25,
+
+    # Adaptación de frecuencia estructural por coherencia
+    "VF_ADAPT_TAU": 5,   # pasos estables antes de ajustar νf
+    "VF_ADAPT_MU": 0.1,  # velocidad de ajuste hacia la media vecinal
+
+    # Factores suaves por glifo (operadores)
     "GLYPH_FACTORS": {
-        "AL_boost": 0.05,   # A’L — pequeña emisión
-        "EN_mix": 0.25,     # E’N — mezcla con vecindad
+        "AL_boost": 0.05,   # A’L — pequeña emisión
+        "EN_mix": 0.25,     # E’N — mezcla con vecindad
         "IL_dnfr_factor": 0.7,  # I’L — reduce ΔNFR
         "OZ_dnfr_factor": 1.3,  # O’Z — aumenta ΔNFR
         "UM_theta_push": 0.25,  # U’M — empuje adicional de fase local
@@ -111,17 +135,19 @@ DEFAULTS: Dict[str, Any] = {
         "VAL_scale": 1.15,      # VA’L — expande EPI
         "NUL_scale": 0.85,      # NU’L — contrae EPI
         "THOL_accel": 0.10,     # T’HOL — acelera (seg. deriv.) si hay umbral
-        "ZHIR_theta_shift": 1.57079632679,  # Z’HIR — desplazamiento ~π/2
-        "NAV_jitter": 0.05,     # NA’V — pequeña inestabilidad creativa
-        "REMESH_alpha": 0.5,    # RE’MESH — mezcla si no se usa REMESH_ALPHA
-    },
+        "ZHIR_theta_shift": 1.57079632679,  # Z’HIR — desplazamiento ~π/2
+        "NAV_jitter": 0.05,     # NA’V — pequeña inestabilidad creativa
+        "NAV_eta": 0.5,         # NA’V — peso de convergencia hacia νf
+        "REMESH_alpha": 0.5,    # RE’MESH — mezcla si no se usa REMESH_ALPHA
+    },
 
     # Umbrales para el selector glífico por defecto
     "GLYPH_THRESHOLDS": {"hi": 0.66, "lo": 0.33, "dnfr": 1e-3},
 
     # Comportamiento NA’V
-    "NAV_RANDOM": True,   # si True, usa jitter aleatorio en [-j, j]; si False, jitter determinista por signo
-    "RANDOM_SEED": 0,     # semilla base para reproducibilidad del jitter
+    "NAV_RANDOM": True,   # si True, usa jitter aleatorio en [-j, j]; si False, jitter determinista por signo
+    "NAV_STRICT": False,  # si True, fuerza ΔNFR ← νf (sin mezcla)
+    "RANDOM_SEED": 0,     # semilla base para reproducibilidad del jitter
 
     # Modo ruido para O’Z
     "OZ_NOISE_MODE": False,  # si True, añade ruido aditivo en ΔNFR
@@ -169,6 +195,41 @@ DEFAULTS.setdefault("GRAMMAR_CANON", {
     "thol_close_dnfr": 0.15,        # si el campo calma, cerramos con SH’A/NU’L
     "si_high": 0.66,                # umbral para elegir NU’L vs SH’A al cerrar
 })
+
+# --- Coherencia (W) ---
+DEFAULTS.setdefault("COHERENCE", {
+    "enabled": True,
+    "scope": "neighbors",      # "neighbors" | "all"
+    "weights": {
+        "phase": 0.34,
+        "epi": 0.33,
+        "vf": 0.20,
+        "si": 0.13,
+    },
+    "self_on_diag": True,      # W_ii = 1.0
+    "store_mode": "sparse",   # "sparse" | "dense"
+    "threshold": 0.0,
+    "history_key": "W_sparse",
+    "Wi_history_key": "W_i",
+    "stats_history_key": "W_stats",
+})
+
+# --- Diagnóstico nodal ---
+DEFAULTS.setdefault("DIAGNOSIS", {
+    "enabled": True,
+    "window": 16,
+    "history_key": "nodal_diag",
+    "stable":     {"Rloc_hi": 0.80, "dnfr_lo": 0.20, "persist": 3},
+    "dissonance": {"Rloc_lo": 0.40, "dnfr_hi": 0.50, "persist": 3},
+    "transition": {"persist": 2},
+    "compute_symmetry": True,
+    "include_typology": False,
+    "advice": {
+        "stable":     ["Coherencia", "Acoplamiento", "Resonancia"],
+        "transition": ["Transición", "Resonancia", "Autoorganización"],
+        "dissonant":  ["Silencio", "Contracción", "Mutación"],
+    },
+})
 
 
 # -------------------------
@@ -177,11 +238,7 @@ DEFAULTS.setdefault("GRAMMAR_CANON", {
 
 def attach_defaults(G, override: bool = False) -> None:
     """Escribe DEFAULTS en G.graph (sin sobreescribir si override=False)."""
-    G.graph.setdefault("_tnfr_defaults_attached", False)
-    for k, v in DEFAULTS.items():
-        if override or k not in G.graph:
-            G.graph[k] = v
-    G.graph["_tnfr_defaults_attached"] = True
+    inject_defaults(G, DEFAULTS, override=override)
 
 
 def inject_defaults(G, defaults: Dict[str, Any] = DEFAULTS, override: bool = False) -> None:
@@ -210,7 +267,11 @@ def merge_overrides(G, **overrides) -> None:
 ALIAS_VF     = ("νf", "nu_f", "nu-f", "nu", "freq", "frequency")
 ALIAS_THETA  = ("θ", "theta", "fase", "phi", "phase")
 ALIAS_DNFR   = ("ΔNFR", "delta_nfr", "dnfr")
-ALIAS_EPI    = ("EPI", "psi", "PSI", "value")
-ALIAS_SI     = ("Si", "sense_index", "S_i", "sense", "meaning_index")
-ALIAS_dEPI   = ("dEPI_dt", "dpsi_dt", "dEPI", "velocity")
-ALIAS_D2EPI  = ("d2EPI_dt2", "d2psi_dt2", "d2EPI", "accel")
+ALIAS_EPI    = ("EPI", "psi", "PSI", "value")
+ALIAS_EPI_KIND = ("EPI_kind", "epi_kind", "source_glifo")
+ALIAS_SI     = ("Si", "sense_index", "S_i", "sense", "meaning_index")
+ALIAS_dEPI   = ("dEPI_dt", "dpsi_dt", "dEPI", "velocity")
+ALIAS_D2EPI  = ("d2EPI_dt2", "d2psi_dt2", "d2EPI", "accel")
+ALIAS_dVF    = ("dνf_dt", "dvf_dt", "dnu_dt", "dvf")
+ALIAS_D2VF   = ("d2νf_dt2", "d2vf_dt2", "d2nu_dt2", "B")
+ALIAS_dSI    = ("δSi", "delta_Si", "dSi")