Commit e745117
committed
Merge remote-tracking branch 'origgin/main'
# Conflicts:
# README.md
# cli/args.py
# control/process_manager.py
# core/adc.py
# core/bus.py
# core/control_server.py
# core/cortex/maps/base_decay_map.py
# core/cortex/maps/coldmap.py
# core/cortex/maps/excitationmap.py
# core/cortex/maps/heatmap.py
# core/cortex/maps/inhibitionmap.py
# core/cortex/maps/memorymap.py
# core/cortex/maps/trailmap.py
# core/cortex/void_walkers/base.py
# core/cortex/void_walkers/runner.py
# core/cortex/void_walkers/void_cold_scout.py
# core/cortex/void_walkers/void_cycle_scout.py
# core/cortex/void_walkers/void_excitation_scout.py
# core/cortex/void_walkers/void_frontier_scout.py
# core/cortex/void_walkers/void_heat_scout.py
# core/cortex/void_walkers/void_inhibition_scout.py
# core/cortex/void_walkers/void_memory_ray_scout.py
# core/cortex/void_walkers/void_ray_scout.py
# core/cortex/void_walkers/void_sentinel_scout.py
# core/engine/core_engine.py
# core/memory/field.py
# core/metrics.py
# core/neuroplasticity/gdsp.py
# core/neuroplasticity/revgsp.py
# core/proprioception/events.py
# core/proprioception/territory.py
# core/sie.py
# core/sparse_connectome.py
# core/void_b1.py
# docs/DOCS_ARCHITECTURE.md
# docs/DOCS_CONVENTIONS.md
# docs/contracts/runtime-boundary-policy.yml
# docs/contracts/source-authority.yml
# docs/pages/architecture/runtime-boundaries.md
# docs/roadmap/runtime-cleanup-guardrails/TODO.md
# docs/roadmap/sparse-neurogenesis/TODO.md
# docs/sources/README.md
# io/actuators/macros.py
# io/cognition/speaker.py
# io/lexicon/idf.py
# io/logging/rolling_jsonl.py
# io/utd.py
# io/ute.py
# nexus.py
# requirements.txt
# run_nexus.py
# runtime/emitters.py
# runtime/events_adapter.py
# runtime/helpers/redis_out.py
# runtime/helpers/smoke.py
# runtime/helpers/speak.py
# runtime/helpers/status_http.py
# runtime/loop/main.py
# runtime/orchestrator.py
# runtime/state.py
# runtime/stepper.py
# runtime/telemetry.py
# tests/control/test_process_manager_runs_root.py1 file changed
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
0 commit comments