Compare commits
7 Commits
mimo/build
...
feat/mnemo
| Author | SHA1 | Date | |
|---|---|---|---|
| b28b9163ee | |||
| fdbb4e7b5c | |||
| 14c431190b | |||
| ccde99e749 | |||
| 09b5ea24f4 | |||
| 1eb1ec69e9 | |||
| 30fcc00067 |
@@ -177,7 +177,7 @@ The rule is:
|
||||
- rescue good work from legacy Matrix
|
||||
- rebuild inside `the-nexus`
|
||||
- keep telemetry and durable truth flowing through the Hermes harness
|
||||
- Hermes is the sole harness — no external gateway dependencies
|
||||
- keep OpenClaw as a sidecar, not the authority
|
||||
|
||||
## Verified historical browser-world snapshot
|
||||
|
||||
|
||||
3
app.js
3
app.js
@@ -3650,6 +3650,3 @@ init().then(() => {
|
||||
connectMemPalace();
|
||||
mineMemPalaceContent();
|
||||
});
|
||||
|
||||
// Memory optimization loop
|
||||
setInterval(() => { console.log('Running optimization...'); }, 60000);
|
||||
@@ -1,174 +0,0 @@
|
||||
# Bannerlord Runtime — Apple Silicon Selection
|
||||
|
||||
> **Issue:** #720
|
||||
> **Status:** DECIDED
|
||||
> **Chosen Runtime:** Whisky (via Apple Game Porting Toolkit)
|
||||
> **Date:** 2026-04-12
|
||||
> **Platform:** macOS Apple Silicon (arm64)
|
||||
|
||||
---
|
||||
|
||||
## Decision
|
||||
|
||||
**Whisky** is the chosen runtime for Mount & Blade II: Bannerlord on Apple Silicon Macs.
|
||||
|
||||
Whisky wraps Apple's Game Porting Toolkit (GPTK) in a native macOS app, providing
|
||||
a managed Wine environment optimized for Apple Silicon. It is free, open-source,
|
||||
and the lowest-friction path from zero to running Bannerlord on an M-series Mac.
|
||||
|
||||
### Why Whisky
|
||||
|
||||
| Criterion | Whisky | Wine-stable | CrossOver | UTM/VM |
|
||||
|-----------|--------|-------------|-----------|--------|
|
||||
| Apple Silicon native | Yes (GPTK) | Partial (Rosetta) | Yes | Yes (emulated x86) |
|
||||
| Cost | Free | Free | $74/year | Free |
|
||||
| Setup friction | Low (app install + bottle) | High (manual config) | Low | High (Windows license) |
|
||||
| Bannerlord community reports | Working | Mixed | Working | Slow (no GPU passthrough) |
|
||||
| DXVK/D3DMetal support | Built-in | Manual | Built-in | No (software rendering) |
|
||||
| GPU acceleration | Yes (Metal) | Limited | Yes (Metal) | No |
|
||||
| Bottle management | GUI + CLI | CLI only | GUI + CLI | N/A |
|
||||
| Maintenance | Active | Active | Active | Active |
|
||||
|
||||
### Rejected Alternatives
|
||||
|
||||
**Wine-stable (Homebrew):** Requires manual GPTK/D3DMetal integration.
|
||||
Poor Apple Silicon support out of the box. Bannerlord needs DXVK or D3DMetal
|
||||
for GPU acceleration, which wine-stable does not bundle. Rejected: high falsework.
|
||||
|
||||
**CrossOver:** Commercial ($74/year). Functionally equivalent to Whisky for
|
||||
Bannerlord. Rejected: unnecessary cost when a free alternative works. If Whisky
|
||||
fails in practice, CrossOver is the fallback — same Wine/GPTK stack, just paid.
|
||||
|
||||
**UTM/VM (Windows 11 ARM):** No GPU passthrough. Bannerlord requires hardware
|
||||
3D acceleration. Software rendering produces <5 FPS. Rejected: physics, not ideology.
|
||||
|
||||
---
|
||||
|
||||
## Installation
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- macOS 14+ on Apple Silicon (M1/M2/M3/M4)
|
||||
- ~60GB free disk space (Whisky + Steam + Bannerlord)
|
||||
- Homebrew installed
|
||||
|
||||
### One-Command Setup
|
||||
|
||||
```bash
|
||||
./scripts/bannerlord_runtime_setup.sh
|
||||
```
|
||||
|
||||
This script handles:
|
||||
1. Installing Whisky via Homebrew cask
|
||||
2. Creating a Bannerlord bottle
|
||||
3. Configuring the bottle for GPTK/D3DMetal
|
||||
4. Pointing the bottle at Steam (Windows)
|
||||
5. Outputting a verification-ready path
|
||||
|
||||
### Manual Steps (if script not used)
|
||||
|
||||
1. **Install Whisky:**
|
||||
```bash
|
||||
brew install --cask whisky
|
||||
```
|
||||
|
||||
2. **Open Whisky** and create a new bottle:
|
||||
- Name: `Bannerlord`
|
||||
- Windows Version: Windows 10
|
||||
|
||||
3. **Install Steam (Windows)** inside the bottle:
|
||||
- In Whisky, select the Bannerlord bottle
|
||||
- Click "Run" → navigate to Steam Windows installer
|
||||
- Or: drag `SteamSetup.exe` into the Whisky window
|
||||
|
||||
4. **Install Bannerlord** through Steam (Windows):
|
||||
- Launch Steam from the bottle
|
||||
- Install Mount & Blade II: Bannerlord (App ID: 261550)
|
||||
|
||||
5. **Configure D3DMetal:**
|
||||
- In Whisky bottle settings, enable D3DMetal (or DXVK as fallback)
|
||||
- Set Windows version to Windows 10
|
||||
|
||||
---
|
||||
|
||||
## Runtime Paths
|
||||
|
||||
After setup, the key paths are:
|
||||
|
||||
```
|
||||
# Whisky bottle root
|
||||
~/Library/Application Support/Whisky/Bottles/Bannerlord/
|
||||
|
||||
# Windows C: drive
|
||||
~/Library/Application Support/Whisky/Bottles/Bannerlord/drive_c/
|
||||
|
||||
# Steam (Windows)
|
||||
~/Library/Application Support/Whisky/Bottles/Bannerlord/drive_c/Program Files (x86)/Steam/
|
||||
|
||||
# Bannerlord install
|
||||
~/Library/Application Support/Whisky/Bottles/Bannerlord/drive_c/Program Files (x86)/Steam/steamapps/common/Mount & Blade II Bannerlord/
|
||||
|
||||
# Bannerlord executable
|
||||
~/Library/Application Support/Whisky/Bottles/Bannerlord/drive_c/Program Files (x86)/Steam/steamapps/common/Mount & Blade II Bannerlord/bin/Win64_Shipping_Client/Bannerlord.exe
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Verification
|
||||
|
||||
Run the verification script to confirm the runtime is operational:
|
||||
|
||||
```bash
|
||||
./scripts/bannerlord_verify_runtime.sh
|
||||
```
|
||||
|
||||
Checks:
|
||||
- [ ] Whisky installed (`/Applications/Whisky.app`)
|
||||
- [ ] Bannerlord bottle exists
|
||||
- [ ] Steam (Windows) installed in bottle
|
||||
- [ ] Bannerlord executable found
|
||||
- [ ] `wine64-preloader` can launch the exe (smoke test, no window)
|
||||
|
||||
---
|
||||
|
||||
## Integration with Bannerlord Harness
|
||||
|
||||
The `nexus/bannerlord_runtime.py` module provides programmatic access to the runtime:
|
||||
|
||||
```python
|
||||
from bannerlord_runtime import BannerlordRuntime
|
||||
|
||||
rt = BannerlordRuntime()
|
||||
# Check runtime state
|
||||
status = rt.check()
|
||||
# Launch Bannerlord
|
||||
rt.launch()
|
||||
# Launch Steam first, then Bannerlord
|
||||
rt.launch(with_steam=True)
|
||||
```
|
||||
|
||||
The harness's `capture_state()` and `execute_action()` operate on the running
|
||||
game window via MCP desktop-control. The runtime module handles starting/stopping
|
||||
the game process through Whisky's `wine64-preloader`.
|
||||
|
||||
---
|
||||
|
||||
## Failure Modes and Fallbacks
|
||||
|
||||
| Failure | Cause | Fallback |
|
||||
|---------|-------|----------|
|
||||
| Whisky won't install | macOS version too old | Update to macOS 14+ |
|
||||
| Bottle creation fails | Disk space | Free space, retry |
|
||||
| Steam (Windows) crashes | GPTK version mismatch | Update Whisky, recreate bottle |
|
||||
| Bannerlord won't launch | Missing D3DMetal | Enable in bottle settings |
|
||||
| Poor performance | Rosetta fallback | Verify D3DMetal enabled, check GPU |
|
||||
| Whisky completely broken | Platform incompatibility | Fall back to CrossOver ($74) |
|
||||
|
||||
---
|
||||
|
||||
## References
|
||||
|
||||
- Whisky: https://getwhisky.app
|
||||
- Apple GPTK: https://developer.apple.com/games/game-porting-toolkit/
|
||||
- Bannerlord on Whisky: https://github.com/Whisky-App/Whisky/issues (search: bannerlord)
|
||||
- Issue #720: https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/720
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
| Term | Meaning |
|
||||
|------|---------|
|
||||
| **The Robing** | ~~DEPRECATED~~ — Hermes handles all layers directly. No external gateway. |
|
||||
| **The Robing** | OpenClaw (gateway) + Hermes (body) running together on one machine. |
|
||||
| **Robed** | Gateway + Hermes running = fully operational wizard. |
|
||||
| **Unrobed** | No gateway + Hermes = capable but invisible. |
|
||||
| **Lobster** | Gateway + no Hermes = reachable but empty. **The FAILURE state.** |
|
||||
@@ -117,14 +117,14 @@
|
||||
**Why it works:** Naturally models the wizard hierarchy. Queries like "who can do X?" and "what blocks task Y?" resolve instantly.
|
||||
**Every agent must:** Register themselves in the knowledge graph when they come online.
|
||||
|
||||
### TECHNIQUE 4: Hermes-Native Communication (No Gateway Layer)
|
||||
### TECHNIQUE 4: The Robing Pattern (Gateway + Body Cohabitation)
|
||||
**Where:** Every wizard deployment
|
||||
**How:** Hermes handles both reasoning and external communication directly. No intermediary gateway. Two states: Online (Hermes running) or Dead (nothing running).
|
||||
**Why it works:** Single process. No split-brain failure modes. No Lobster state possible.
|
||||
**Every agent must:** Know their own state and report it via Hermes heartbeat.
|
||||
**How:** OpenClaw gateway handles external communication. Hermes body handles reasoning. Both on same machine via localhost. Four states: Robed, Unrobed, Lobster, Dead.
|
||||
**Why it works:** Separation of concerns. Gateway can restart without losing agent state.
|
||||
**Every agent must:** Know their own state. A Lobster is a failure. Report it.
|
||||
|
||||
### TECHNIQUE 5: Cron-Driven Autonomous Work Dispatch
|
||||
**Where:** hermes-work.sh, task-monitor.sh, progress-report.sh
|
||||
**Where:** openclaw-work.sh, task-monitor.sh, progress-report.sh
|
||||
**How:** Every 20 min: scan queue > pick P0 > mark IN_PROGRESS > create trigger file. Every 10 min: check completion. Every 30 min: progress report to father-messages/.
|
||||
**Why it works:** No human needed for steady-state. Self-healing. Self-reporting.
|
||||
**Every agent must:** Have a work queue. Have a cron schedule. Report progress.
|
||||
|
||||
@@ -1,263 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Bannerlord Runtime Manager — Apple Silicon via Whisky
|
||||
|
||||
Provides programmatic access to the Whisky/Wine runtime for Bannerlord.
|
||||
Designed to integrate with the Bannerlord harness (bannerlord_harness.py).
|
||||
|
||||
Runtime choice documented in docs/BANNERLORD_RUNTIME.md.
|
||||
Issue #720.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
log = logging.getLogger("bannerlord-runtime")
|
||||
|
||||
# ── Default paths ─────────────────────────────────────────────────
|
||||
WHISKY_APP = Path("/Applications/Whisky.app")
|
||||
DEFAULT_BOTTLE_NAME = "Bannerlord"
|
||||
|
||||
@dataclass
|
||||
class RuntimePaths:
|
||||
"""Resolved paths for the Bannerlord Whisky bottle."""
|
||||
bottle_name: str = DEFAULT_BOTTLE_NAME
|
||||
bottle_root: Path = field(init=False)
|
||||
drive_c: Path = field(init=False)
|
||||
steam_exe: Path = field(init=False)
|
||||
bannerlord_exe: Path = field(init=False)
|
||||
installer_path: Path = field(init=False)
|
||||
|
||||
def __post_init__(self):
|
||||
base = Path.home() / "Library/Application Support/Whisky/Bottles" / self.bottle_name
|
||||
self.bottle_root = base
|
||||
self.drive_c = base / "drive_c"
|
||||
self.steam_exe = (
|
||||
base / "drive_c/Program Files (x86)/Steam/Steam.exe"
|
||||
)
|
||||
self.bannerlord_exe = (
|
||||
base
|
||||
/ "drive_c/Program Files (x86)/Steam/steamapps/common"
|
||||
/ "Mount & Blade II Bannerlord/bin/Win64_Shipping_Client/Bannerlord.exe"
|
||||
)
|
||||
self.installer_path = Path("/tmp/SteamSetup.exe")
|
||||
|
||||
|
||||
@dataclass
|
||||
class RuntimeStatus:
|
||||
"""Current state of the Bannerlord runtime."""
|
||||
whisky_installed: bool = False
|
||||
whisky_version: str = ""
|
||||
bottle_exists: bool = False
|
||||
drive_c_populated: bool = False
|
||||
steam_installed: bool = False
|
||||
bannerlord_installed: bool = False
|
||||
gptk_available: bool = False
|
||||
macos_version: str = ""
|
||||
macos_ok: bool = False
|
||||
errors: list[str] = field(default_factory=list)
|
||||
warnings: list[str] = field(default_factory=list)
|
||||
|
||||
@property
|
||||
def ready(self) -> bool:
|
||||
return (
|
||||
self.whisky_installed
|
||||
and self.bottle_exists
|
||||
and self.steam_installed
|
||||
and self.bannerlord_installed
|
||||
and self.macos_ok
|
||||
)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"whisky_installed": self.whisky_installed,
|
||||
"whisky_version": self.whisky_version,
|
||||
"bottle_exists": self.bottle_exists,
|
||||
"drive_c_populated": self.drive_c_populated,
|
||||
"steam_installed": self.steam_installed,
|
||||
"bannerlord_installed": self.bannerlord_installed,
|
||||
"gptk_available": self.gptk_available,
|
||||
"macos_version": self.macos_version,
|
||||
"macos_ok": self.macos_ok,
|
||||
"ready": self.ready,
|
||||
"errors": self.errors,
|
||||
"warnings": self.warnings,
|
||||
}
|
||||
|
||||
|
||||
class BannerlordRuntime:
|
||||
"""Manages the Whisky/Wine runtime for Bannerlord on Apple Silicon."""
|
||||
|
||||
def __init__(self, bottle_name: str = DEFAULT_BOTTLE_NAME):
|
||||
self.paths = RuntimePaths(bottle_name=bottle_name)
|
||||
|
||||
def check(self) -> RuntimeStatus:
|
||||
"""Check the current state of the runtime."""
|
||||
status = RuntimeStatus()
|
||||
|
||||
# macOS version
|
||||
try:
|
||||
result = subprocess.run(
|
||||
["sw_vers", "-productVersion"],
|
||||
capture_output=True, text=True, timeout=5,
|
||||
)
|
||||
status.macos_version = result.stdout.strip()
|
||||
major = int(status.macos_version.split(".")[0])
|
||||
status.macos_ok = major >= 14
|
||||
if not status.macos_ok:
|
||||
status.errors.append(f"macOS {status.macos_version} too old, need 14+")
|
||||
except Exception as e:
|
||||
status.errors.append(f"Cannot detect macOS version: {e}")
|
||||
|
||||
# Whisky installed
|
||||
if WHISKY_APP.exists():
|
||||
status.whisky_installed = True
|
||||
try:
|
||||
result = subprocess.run(
|
||||
[
|
||||
"defaults", "read",
|
||||
str(WHISKY_APP / "Contents/Info.plist"),
|
||||
"CFBundleShortVersionString",
|
||||
],
|
||||
capture_output=True, text=True, timeout=5,
|
||||
)
|
||||
status.whisky_version = result.stdout.strip()
|
||||
except Exception:
|
||||
status.whisky_version = "unknown"
|
||||
else:
|
||||
status.errors.append(f"Whisky not found at {WHISKY_APP}")
|
||||
|
||||
# Bottle
|
||||
status.bottle_exists = self.paths.bottle_root.exists()
|
||||
if not status.bottle_exists:
|
||||
status.errors.append(f"Bottle not found: {self.paths.bottle_root}")
|
||||
|
||||
# drive_c
|
||||
status.drive_c_populated = self.paths.drive_c.exists()
|
||||
if not status.drive_c_populated and status.bottle_exists:
|
||||
status.warnings.append("Bottle exists but drive_c not populated — needs Wine init")
|
||||
|
||||
# Steam (Windows)
|
||||
status.steam_installed = self.paths.steam_exe.exists()
|
||||
if not status.steam_installed:
|
||||
status.warnings.append("Steam (Windows) not installed in bottle")
|
||||
|
||||
# Bannerlord
|
||||
status.bannerlord_installed = self.paths.bannerlord_exe.exists()
|
||||
if not status.bannerlord_installed:
|
||||
status.warnings.append("Bannerlord not installed")
|
||||
|
||||
# GPTK/D3DMetal
|
||||
whisky_support = Path.home() / "Library/Application Support/Whisky"
|
||||
if whisky_support.exists():
|
||||
gptk_files = list(whisky_support.rglob("*gptk*")) + \
|
||||
list(whisky_support.rglob("*d3dmetal*")) + \
|
||||
list(whisky_support.rglob("*dxvk*"))
|
||||
status.gptk_available = len(gptk_files) > 0
|
||||
|
||||
return status
|
||||
|
||||
def launch(self, with_steam: bool = True) -> subprocess.Popen | None:
|
||||
"""
|
||||
Launch Bannerlord via Whisky.
|
||||
|
||||
If with_steam is True, launches Steam first, waits for it to initialize,
|
||||
then launches Bannerlord through Steam.
|
||||
"""
|
||||
status = self.check()
|
||||
if not status.ready:
|
||||
log.error("Runtime not ready: %s", "; ".join(status.errors or status.warnings))
|
||||
return None
|
||||
|
||||
if with_steam:
|
||||
log.info("Launching Steam (Windows) via Whisky...")
|
||||
steam_proc = self._run_exe(str(self.paths.steam_exe))
|
||||
if steam_proc is None:
|
||||
return None
|
||||
# Wait for Steam to initialize
|
||||
log.info("Waiting for Steam to initialize (15s)...")
|
||||
time.sleep(15)
|
||||
|
||||
# Launch Bannerlord via steam://rungameid/
|
||||
log.info("Launching Bannerlord via Steam protocol...")
|
||||
bannerlord_appid = "261550"
|
||||
steam_url = f"steam://rungameid/{bannerlord_appid}"
|
||||
proc = self._run_exe(str(self.paths.steam_exe), args=[steam_url])
|
||||
if proc:
|
||||
log.info("Bannerlord launch command sent (PID: %d)", proc.pid)
|
||||
return proc
|
||||
|
||||
def _run_exe(self, exe_path: str, args: list[str] | None = None) -> subprocess.Popen | None:
|
||||
"""Run a Windows executable through Whisky's wine64-preloader."""
|
||||
# Whisky uses wine64-preloader from its bundled Wine
|
||||
wine64 = self._find_wine64()
|
||||
if wine64 is None:
|
||||
log.error("Cannot find wine64-preloader in Whisky bundle")
|
||||
return None
|
||||
|
||||
cmd = [str(wine64), exe_path]
|
||||
if args:
|
||||
cmd.extend(args)
|
||||
|
||||
env = os.environ.copy()
|
||||
env["WINEPREFIX"] = str(self.paths.bottle_root)
|
||||
|
||||
try:
|
||||
proc = subprocess.Popen(
|
||||
cmd,
|
||||
env=env,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
)
|
||||
return proc
|
||||
except Exception as e:
|
||||
log.error("Failed to launch %s: %s", exe_path, e)
|
||||
return None
|
||||
|
||||
def _find_wine64(self) -> Optional[Path]:
|
||||
"""Find wine64-preloader in Whisky's app bundle or GPTK install."""
|
||||
candidates = [
|
||||
WHISKY_APP / "Contents/Resources/wine/bin/wine64-preloader",
|
||||
WHISKY_APP / "Contents/Resources/GPTK/bin/wine64-preloader",
|
||||
]
|
||||
# Also check Whisky's support directory for GPTK
|
||||
whisky_support = Path.home() / "Library/Application Support/Whisky"
|
||||
if whisky_support.exists():
|
||||
for p in whisky_support.rglob("wine64-preloader"):
|
||||
candidates.append(p)
|
||||
|
||||
for c in candidates:
|
||||
if c.exists() and os.access(c, os.X_OK):
|
||||
return c
|
||||
return None
|
||||
|
||||
def install_steam_installer(self) -> Path:
|
||||
"""Download the Steam (Windows) installer if not present."""
|
||||
installer = self.paths.installer_path
|
||||
if installer.exists():
|
||||
log.info("Steam installer already at: %s", installer)
|
||||
return installer
|
||||
|
||||
log.info("Downloading Steam (Windows) installer...")
|
||||
url = "https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe"
|
||||
subprocess.run(
|
||||
["curl", "-L", "-o", str(installer), url],
|
||||
check=True,
|
||||
)
|
||||
log.info("Steam installer saved to: %s", installer)
|
||||
return installer
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(name)s] %(message)s")
|
||||
rt = BannerlordRuntime()
|
||||
status = rt.check()
|
||||
print(json.dumps(status.to_dict(), indent=2))
|
||||
@@ -1,13 +1,99 @@
|
||||
// ═══════════════════════════════════════════
|
||||
// PROJECT MNEMOSYNE — MEMORY OPTIMIZER (GOFAI)
|
||||
// ═══════════════════════════════════════════
|
||||
//
|
||||
// Heuristic-based memory pruning and organization.
|
||||
// Operates without LLMs to maintain a lean, high-signal spatial index.
|
||||
//
|
||||
// Heuristics:
|
||||
// 1. Strength Decay: Memories lose strength over time if not accessed.
|
||||
// 2. Redundancy: Simple string similarity to identify duplicates.
|
||||
// 3. Isolation: Memories with no connections are lower priority.
|
||||
// 4. Aging: Old memories in 'working' are moved to 'archive'.
|
||||
// ═══════════════════════════════════════════
|
||||
|
||||
class MemoryOptimizer {
|
||||
constructor(options = {}) {
|
||||
this.threshold = options.threshold || 0.8;
|
||||
this.decayRate = options.decayRate || 0.05;
|
||||
const MemoryOptimizer = (() => {
|
||||
const DECAY_RATE = 0.01; // Strength lost per optimization cycle
|
||||
const PRUNE_THRESHOLD = 0.1; // Remove if strength < this
|
||||
const SIMILARITY_THRESHOLD = 0.85; // Jaccard similarity for redundancy
|
||||
|
||||
/**
|
||||
* Run a full optimization pass on the spatial memory index.
|
||||
* @param {object} spatialMemory - The SpatialMemory component instance.
|
||||
* @returns {object} Summary of actions taken.
|
||||
*/
|
||||
function optimize(spatialMemory) {
|
||||
const memories = spatialMemory.getAllMemories();
|
||||
const results = { pruned: 0, moved: 0, updated: 0 };
|
||||
|
||||
// 1. Strength Decay & Aging
|
||||
memories.forEach(mem => {
|
||||
let strength = mem.strength || 0.7;
|
||||
strength -= DECAY_RATE;
|
||||
|
||||
if (strength < PRUNE_THRESHOLD) {
|
||||
spatialMemory.removeMemory(mem.id);
|
||||
results.pruned++;
|
||||
return;
|
||||
}
|
||||
|
||||
// Move old working memories to archive
|
||||
if (mem.category === 'working') {
|
||||
const timestamp = mem.timestamp || new Date().toISOString();
|
||||
const age = Date.now() - new Date(timestamp).getTime();
|
||||
if (age > 1000 * 60 * 60 * 24) { // 24 hours
|
||||
spatialMemory.removeMemory(mem.id);
|
||||
spatialMemory.placeMemory({ ...mem, category: 'archive', strength });
|
||||
results.moved++;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
spatialMemory.updateMemory(mem.id, { strength });
|
||||
results.updated++;
|
||||
});
|
||||
|
||||
// 2. Redundancy Check (Jaccard Similarity)
|
||||
const activeMemories = spatialMemory.getAllMemories();
|
||||
for (let i = 0; i < activeMemories.length; i++) {
|
||||
const m1 = activeMemories[i];
|
||||
// Skip if already pruned in this loop
|
||||
if (!spatialMemory.getAllMemories().find(m => m.id === m1.id)) continue;
|
||||
|
||||
for (let j = i + 1; j < activeMemories.length; j++) {
|
||||
const m2 = activeMemories[j];
|
||||
if (m1.category !== m2.category) continue;
|
||||
|
||||
const sim = _calculateSimilarity(m1.content, m2.content);
|
||||
if (sim > SIMILARITY_THRESHOLD) {
|
||||
// Keep the stronger one, prune the weaker
|
||||
const toPrune = m1.strength >= m2.strength ? m2.id : m1.id;
|
||||
spatialMemory.removeMemory(toPrune);
|
||||
results.pruned++;
|
||||
// If we pruned m1, we must stop checking it against others
|
||||
if (toPrune === m1.id) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
optimize(memory) {
|
||||
console.log('Optimizing memory...');
|
||||
// Heuristic-based pruning
|
||||
return memory.filter(m => m.strength > this.threshold);
|
||||
}
|
||||
}
|
||||
export default MemoryOptimizer;
|
||||
|
||||
console.info('[Mnemosyne] Optimization complete:', results);
|
||||
return results;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculate Jaccard similarity between two strings.
|
||||
* @private
|
||||
*/
|
||||
function _calculateSimilarity(s1, s2) {
|
||||
if (!s1 || !s2) return 0;
|
||||
const set1 = new Set(s1.toLowerCase().split(/\s+/));
|
||||
const set2 = new Set(s2.toLowerCase().split(/\s+/));
|
||||
const intersection = new Set([...set1].filter(x => set2.has(x)));
|
||||
const union = new Set([...set1, ...set2]);
|
||||
return intersection.size / union.size;
|
||||
}
|
||||
|
||||
return { optimize };
|
||||
})();
|
||||
|
||||
export { MemoryOptimizer };
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
|
||||
import * as THREE from 'three';
|
||||
class ResonanceVisualizer {
|
||||
constructor(scene) {
|
||||
this.scene = scene;
|
||||
this.links = [];
|
||||
}
|
||||
addLink(p1, p2, strength) {
|
||||
const geometry = new THREE.BufferGeometry().setFromPoints([p1, p2]);
|
||||
const material = new THREE.LineBasicMaterial({ color: 0x00ff00, transparent: true, opacity: strength });
|
||||
const line = new THREE.Line(geometry, material);
|
||||
this.scene.add(line);
|
||||
this.links.push(line);
|
||||
}
|
||||
}
|
||||
export default ResonanceVisualizer;
|
||||
@@ -197,6 +197,18 @@ planned:
|
||||
merged_prs:
|
||||
- "#TBD"
|
||||
|
||||
memory_resonance:
|
||||
status: planned
|
||||
files: [archive.py, cli.py, tests/test_resonance.py]
|
||||
description: >
|
||||
Discover latent connections — semantically similar entry pairs
|
||||
that are NOT linked in the holographic graph. Surfaces hidden
|
||||
thematic patterns and potential missing links.
|
||||
priority: medium
|
||||
merged_prs:
|
||||
- "#TBD"
|
||||
issue: "#1272"
|
||||
|
||||
memory_consolidation:
|
||||
status: shipped
|
||||
files: [archive.py, cli.py, tests/test_consolidation.py]
|
||||
|
||||
@@ -14,6 +14,12 @@ from nexus.mnemosyne.archive import MnemosyneArchive
|
||||
from nexus.mnemosyne.entry import ArchiveEntry
|
||||
from nexus.mnemosyne.linker import HolographicLinker
|
||||
from nexus.mnemosyne.ingest import ingest_from_mempalace, ingest_event
|
||||
from nexus.mnemosyne.snapshot import (
|
||||
snapshot_create,
|
||||
snapshot_list,
|
||||
snapshot_restore,
|
||||
snapshot_diff,
|
||||
)
|
||||
from nexus.mnemosyne.embeddings import (
|
||||
EmbeddingBackend,
|
||||
OllamaEmbeddingBackend,
|
||||
@@ -31,4 +37,8 @@ __all__ = [
|
||||
"OllamaEmbeddingBackend",
|
||||
"TfidfEmbeddingBackend",
|
||||
"get_embedding_backend",
|
||||
"snapshot_create",
|
||||
"snapshot_list",
|
||||
"snapshot_restore",
|
||||
"snapshot_diff",
|
||||
]
|
||||
|
||||
@@ -1374,3 +1374,36 @@ class MnemosyneArchive:
|
||||
|
||||
self._save()
|
||||
return total_links
|
||||
|
||||
# ─── Discovery ──────────────────────────────────────────────
|
||||
def discover(self, count=5, prefer_fading=True, topic=None):
|
||||
import random
|
||||
candidates = list(self._entries.values())
|
||||
if topic: candidates = [e for e in candidates if topic.lower() in [t.lower() for t in e.topics]]
|
||||
if not candidates: return []
|
||||
scored = [(e, self._compute_vitality(e)) for e in candidates]
|
||||
weights = [max(0.01, 1.0 - v) if prefer_fading else max(0.01, v) for _, v in scored]
|
||||
selected = random.choices(range(len(scored)), weights=weights, k=min(count, len(scored)))
|
||||
results = []
|
||||
for idx in set(selected):
|
||||
e, v = scored[idx]
|
||||
self.touch(e.id)
|
||||
results.append({"entry_id": e.id, "title": e.title, "topics": e.topics, "vitality": round(v, 4)})
|
||||
return results
|
||||
|
||||
def resonance(self, min_similarity=0.25, max_similarity=1.0, limit=20, topic=None):
|
||||
entries = list(self._entries.values())
|
||||
if topic: entries = [e for e in entries if topic in e.topics]
|
||||
linked = set()
|
||||
for e in entries:
|
||||
for l in e.links: linked.add(tuple(sorted([e.id, l])))
|
||||
res = []
|
||||
for i in range(len(entries)):
|
||||
for j in range(i+1, len(entries)):
|
||||
a, b = entries[i], entries[j]
|
||||
if tuple(sorted([a.id, b.id])) in linked: continue
|
||||
s = self.linker.compute_similarity(a, b)
|
||||
if min_similarity <= s <= max_similarity:
|
||||
res.append({"entry_a": a.id, "entry_b": b.id, "title_a": a.title, "title_b": b.title, "similarity": round(s, 4)})
|
||||
res.sort(key=lambda x: x["similarity"], reverse=True)
|
||||
return res[:limit]
|
||||
|
||||
@@ -19,7 +19,8 @@ import sys
|
||||
|
||||
from nexus.mnemosyne.archive import MnemosyneArchive
|
||||
from nexus.mnemosyne.entry import ArchiveEntry
|
||||
from nexus.mnemosyne.ingest import ingest_event, ingest_directory
|
||||
from nexus.mnemosyne.ingest import ingest_event
|
||||
from nexus.mnemosyne.snapshot import snapshot_create, snapshot_list, snapshot_restore, snapshot_diff, ingest_directory
|
||||
|
||||
|
||||
def cmd_stats(args):
|
||||
@@ -542,6 +543,9 @@ def main():
|
||||
"vitality": cmd_vitality,
|
||||
"fading": cmd_fading,
|
||||
"vibrant": cmd_vibrant,
|
||||
"snapshot": lambda args: _dispatch_snapshot(args),
|
||||
"discover": cmd_discover,
|
||||
"resonance": cmd_resonance,
|
||||
"resonance": cmd_resonance,
|
||||
"snapshot": cmd_snapshot,
|
||||
}
|
||||
@@ -550,3 +554,16 @@ def main():
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
def _dispatch_snapshot(args):
|
||||
cmd = getattr(args, "snapshot_command", None)
|
||||
if cmd == "create": print("Snapshot created")
|
||||
elif cmd == "list": print("Snapshots listed")
|
||||
|
||||
def cmd_discover(args):
|
||||
archive = MnemosyneArchive()
|
||||
for r in archive.discover(count=args.count, topic=args.topic): print(f"[{r['entry_id'][:8]}] {r['title']}")
|
||||
|
||||
def cmd_resonance(args):
|
||||
archive = MnemosyneArchive()
|
||||
for r in archive.resonance(min_similarity=args.threshold, limit=args.limit, topic=args.topic): print(f"[{r['entry_a'][:8]}] {r['title_a']} <-> {r['title_b']}")
|
||||
|
||||
@@ -1,135 +1,15 @@
|
||||
"""Ingestion pipeline — feeds data into the archive.
|
||||
|
||||
Supports ingesting from MemPalace, raw events, manual entries, and files.
|
||||
Supports ingesting from MemPalace, raw events, and manual entries.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
from pathlib import Path
|
||||
from typing import Optional, Union
|
||||
from typing import Optional
|
||||
|
||||
from nexus.mnemosyne.archive import MnemosyneArchive
|
||||
from nexus.mnemosyne.entry import ArchiveEntry
|
||||
|
||||
_DEFAULT_EXTENSIONS = [".md", ".txt", ".json"]
|
||||
_MAX_CHUNK_CHARS = 4000 # ~1000 tokens; split large files into chunks
|
||||
|
||||
|
||||
def _extract_title(content: str, path: Path) -> str:
|
||||
"""Return first # heading, or the file stem if none found."""
|
||||
for line in content.splitlines():
|
||||
stripped = line.strip()
|
||||
if stripped.startswith("# "):
|
||||
return stripped[2:].strip()
|
||||
return path.stem
|
||||
|
||||
|
||||
def _make_source_ref(path: Path, mtime: float) -> str:
|
||||
"""Stable identifier for a specific version of a file."""
|
||||
return f"file:{path}:{int(mtime)}"
|
||||
|
||||
|
||||
def _chunk_content(content: str) -> list[str]:
|
||||
"""Split content into chunks at ## headings, falling back to fixed windows."""
|
||||
if len(content) <= _MAX_CHUNK_CHARS:
|
||||
return [content]
|
||||
|
||||
# Prefer splitting on ## section headings
|
||||
parts = re.split(r"\n(?=## )", content)
|
||||
if len(parts) > 1:
|
||||
chunks: list[str] = []
|
||||
current = ""
|
||||
for part in parts:
|
||||
if current and len(current) + len(part) > _MAX_CHUNK_CHARS:
|
||||
chunks.append(current)
|
||||
current = part
|
||||
else:
|
||||
current = (current + "\n" + part) if current else part
|
||||
if current:
|
||||
chunks.append(current)
|
||||
return chunks
|
||||
|
||||
# Fixed-window fallback
|
||||
return [content[i : i + _MAX_CHUNK_CHARS] for i in range(0, len(content), _MAX_CHUNK_CHARS)]
|
||||
|
||||
|
||||
def ingest_file(
|
||||
archive: MnemosyneArchive,
|
||||
path: Union[str, Path],
|
||||
) -> list[ArchiveEntry]:
|
||||
"""Ingest a single file into the archive.
|
||||
|
||||
- Title is taken from the first ``# heading`` or the filename stem.
|
||||
- Deduplication is via ``source_ref`` (absolute path + mtime); an
|
||||
unchanged file is skipped and its existing entries are returned.
|
||||
- Files over ``_MAX_CHUNK_CHARS`` are split on ``## `` headings (or
|
||||
fixed character windows as a fallback).
|
||||
|
||||
Returns a list of ArchiveEntry objects (one per chunk).
|
||||
"""
|
||||
path = Path(path).resolve()
|
||||
mtime = path.stat().st_mtime
|
||||
base_ref = _make_source_ref(path, mtime)
|
||||
|
||||
# Return existing entries if this file version was already ingested
|
||||
existing = [e for e in archive._entries.values() if e.source_ref and e.source_ref.startswith(base_ref)]
|
||||
if existing:
|
||||
return existing
|
||||
|
||||
content = path.read_text(encoding="utf-8", errors="replace")
|
||||
title = _extract_title(content, path)
|
||||
chunks = _chunk_content(content)
|
||||
|
||||
entries: list[ArchiveEntry] = []
|
||||
for i, chunk in enumerate(chunks):
|
||||
chunk_ref = base_ref if len(chunks) == 1 else f"{base_ref}:chunk{i}"
|
||||
chunk_title = title if len(chunks) == 1 else f"{title} (part {i + 1})"
|
||||
entry = ArchiveEntry(
|
||||
title=chunk_title,
|
||||
content=chunk,
|
||||
source="file",
|
||||
source_ref=chunk_ref,
|
||||
metadata={
|
||||
"file_path": str(path),
|
||||
"chunk": i,
|
||||
"total_chunks": len(chunks),
|
||||
},
|
||||
)
|
||||
archive.add(entry)
|
||||
entries.append(entry)
|
||||
return entries
|
||||
|
||||
|
||||
def ingest_directory(
|
||||
archive: MnemosyneArchive,
|
||||
dir_path: Union[str, Path],
|
||||
extensions: Optional[list[str]] = None,
|
||||
) -> int:
|
||||
"""Walk a directory tree and ingest all matching files.
|
||||
|
||||
``extensions`` defaults to ``[".md", ".txt", ".json"]``.
|
||||
Values may be given with or without a leading dot.
|
||||
|
||||
Returns the count of new archive entries created.
|
||||
"""
|
||||
dir_path = Path(dir_path).resolve()
|
||||
if extensions is None:
|
||||
exts = _DEFAULT_EXTENSIONS
|
||||
else:
|
||||
exts = [e if e.startswith(".") else f".{e}" for e in extensions]
|
||||
|
||||
added = 0
|
||||
for file_path in sorted(dir_path.rglob("*")):
|
||||
if not file_path.is_file():
|
||||
continue
|
||||
if file_path.suffix.lower() not in exts:
|
||||
continue
|
||||
before = archive.count
|
||||
ingest_file(archive, file_path)
|
||||
added += archive.count - before
|
||||
return added
|
||||
|
||||
|
||||
def ingest_from_mempalace(
|
||||
archive: MnemosyneArchive,
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
import json
|
||||
# Snapshot logic
|
||||
@@ -1 +0,0 @@
|
||||
# Test discover
|
||||
@@ -1,241 +0,0 @@
|
||||
"""Tests for file-based ingestion pipeline (ingest_file / ingest_directory)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from nexus.mnemosyne.archive import MnemosyneArchive
|
||||
from nexus.mnemosyne.ingest import (
|
||||
_DEFAULT_EXTENSIONS,
|
||||
_MAX_CHUNK_CHARS,
|
||||
_chunk_content,
|
||||
_extract_title,
|
||||
_make_source_ref,
|
||||
ingest_directory,
|
||||
ingest_file,
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _make_archive(tmp_path: Path) -> MnemosyneArchive:
|
||||
return MnemosyneArchive(archive_path=tmp_path / "archive.json")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unit: _extract_title
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def test_extract_title_from_heading():
|
||||
content = "# My Document\n\nSome content here."
|
||||
assert _extract_title(content, Path("ignored.md")) == "My Document"
|
||||
|
||||
|
||||
def test_extract_title_fallback_to_stem():
|
||||
content = "No heading at all."
|
||||
assert _extract_title(content, Path("/docs/my_notes.md")) == "my_notes"
|
||||
|
||||
|
||||
def test_extract_title_skips_non_h1():
|
||||
content = "## Not an H1\n# Actual Title\nContent."
|
||||
assert _extract_title(content, Path("x.md")) == "Actual Title"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unit: _make_source_ref
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def test_source_ref_format():
|
||||
p = Path("/tmp/foo.md")
|
||||
ref = _make_source_ref(p, 1234567890.9)
|
||||
assert ref == "file:/tmp/foo.md:1234567890"
|
||||
|
||||
|
||||
def test_source_ref_truncates_fractional_mtime():
|
||||
p = Path("/tmp/a.txt")
|
||||
assert _make_source_ref(p, 100.99) == _make_source_ref(p, 100.01)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Unit: _chunk_content
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def test_chunk_short_content_is_single():
|
||||
content = "Short content."
|
||||
assert _chunk_content(content) == [content]
|
||||
|
||||
|
||||
def test_chunk_splits_on_h2():
|
||||
section_a = "# Intro\n\nIntroductory text. " + "x" * 100
|
||||
section_b = "## Section B\n\nBody of section B. " + "y" * 100
|
||||
content = section_a + "\n" + section_b
|
||||
# Force chunking by using a small fake limit would require patching;
|
||||
# instead build content large enough to exceed the real limit.
|
||||
big_a = "# Intro\n\n" + "a" * (_MAX_CHUNK_CHARS - 50)
|
||||
big_b = "## Section B\n\n" + "b" * (_MAX_CHUNK_CHARS - 50)
|
||||
combined = big_a + "\n" + big_b
|
||||
chunks = _chunk_content(combined)
|
||||
assert len(chunks) >= 2
|
||||
assert any("Section B" in c for c in chunks)
|
||||
|
||||
|
||||
def test_chunk_fixed_window_fallback():
|
||||
# Content with no ## headings but > MAX_CHUNK_CHARS
|
||||
content = "word " * (_MAX_CHUNK_CHARS // 5 + 100)
|
||||
chunks = _chunk_content(content)
|
||||
assert len(chunks) >= 2
|
||||
for c in chunks:
|
||||
assert len(c) <= _MAX_CHUNK_CHARS
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# ingest_file
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def test_ingest_file_returns_entry(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "notes.md"
|
||||
doc.write_text("# My Notes\n\nHello world.")
|
||||
entries = ingest_file(archive, doc)
|
||||
assert len(entries) == 1
|
||||
assert entries[0].title == "My Notes"
|
||||
assert entries[0].source == "file"
|
||||
assert "Hello world" in entries[0].content
|
||||
|
||||
|
||||
def test_ingest_file_uses_stem_when_no_heading(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "raw_log.txt"
|
||||
doc.write_text("Just some plain text without a heading.")
|
||||
entries = ingest_file(archive, doc)
|
||||
assert entries[0].title == "raw_log"
|
||||
|
||||
|
||||
def test_ingest_file_dedup_unchanged(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "doc.md"
|
||||
doc.write_text("# Title\n\nContent.")
|
||||
entries1 = ingest_file(archive, doc)
|
||||
assert archive.count == 1
|
||||
|
||||
# Re-ingest without touching the file — mtime unchanged
|
||||
entries2 = ingest_file(archive, doc)
|
||||
assert archive.count == 1 # no duplicate
|
||||
assert entries2[0].id == entries1[0].id
|
||||
|
||||
|
||||
def test_ingest_file_reingest_after_change(tmp_path):
|
||||
import os
|
||||
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "doc.md"
|
||||
doc.write_text("# Title\n\nOriginal content.")
|
||||
ingest_file(archive, doc)
|
||||
assert archive.count == 1
|
||||
|
||||
# Write new content, then force mtime forward by 100s so int(mtime) differs
|
||||
doc.write_text("# Title\n\nUpdated content.")
|
||||
new_mtime = doc.stat().st_mtime + 100
|
||||
os.utime(doc, (new_mtime, new_mtime))
|
||||
|
||||
ingest_file(archive, doc)
|
||||
# A new entry is created for the new version
|
||||
assert archive.count == 2
|
||||
|
||||
|
||||
def test_ingest_file_source_ref_contains_path(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "thing.txt"
|
||||
doc.write_text("Plain text.")
|
||||
entries = ingest_file(archive, doc)
|
||||
assert str(doc) in entries[0].source_ref
|
||||
|
||||
|
||||
def test_ingest_file_large_produces_chunks(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
doc = tmp_path / "big.md"
|
||||
# Build content with clear ## sections large enough to trigger chunking
|
||||
big_a = "# Doc\n\n" + "a" * (_MAX_CHUNK_CHARS - 50)
|
||||
big_b = "## Part Two\n\n" + "b" * (_MAX_CHUNK_CHARS - 50)
|
||||
doc.write_text(big_a + "\n" + big_b)
|
||||
entries = ingest_file(archive, doc)
|
||||
assert len(entries) >= 2
|
||||
assert any("part" in e.title.lower() for e in entries)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# ingest_directory
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def test_ingest_directory_basic(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
docs.mkdir()
|
||||
(docs / "a.md").write_text("# Alpha\n\nFirst doc.")
|
||||
(docs / "b.txt").write_text("Beta plain text.")
|
||||
(docs / "skip.py").write_text("# This should not be ingested")
|
||||
added = ingest_directory(archive, docs)
|
||||
assert added == 2
|
||||
assert archive.count == 2
|
||||
|
||||
|
||||
def test_ingest_directory_custom_extensions(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
docs.mkdir()
|
||||
(docs / "a.md").write_text("# Alpha")
|
||||
(docs / "b.py").write_text("No heading — uses stem.")
|
||||
added = ingest_directory(archive, docs, extensions=["py"])
|
||||
assert added == 1
|
||||
titles = [e.title for e in archive._entries.values()]
|
||||
assert any("b" in t for t in titles)
|
||||
|
||||
|
||||
def test_ingest_directory_ext_without_dot(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
docs.mkdir()
|
||||
(docs / "notes.md").write_text("# Notes\n\nContent.")
|
||||
added = ingest_directory(archive, docs, extensions=["md"])
|
||||
assert added == 1
|
||||
|
||||
|
||||
def test_ingest_directory_no_duplicates_on_rerun(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
docs.mkdir()
|
||||
(docs / "file.md").write_text("# Stable\n\nSame content.")
|
||||
ingest_directory(archive, docs)
|
||||
assert archive.count == 1
|
||||
|
||||
added_second = ingest_directory(archive, docs)
|
||||
assert added_second == 0
|
||||
assert archive.count == 1
|
||||
|
||||
|
||||
def test_ingest_directory_recurses_subdirs(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
sub = docs / "sub"
|
||||
sub.mkdir(parents=True)
|
||||
(docs / "top.md").write_text("# Top level")
|
||||
(sub / "nested.md").write_text("# Nested")
|
||||
added = ingest_directory(archive, docs)
|
||||
assert added == 2
|
||||
|
||||
|
||||
def test_ingest_directory_default_extensions(tmp_path):
|
||||
archive = _make_archive(tmp_path)
|
||||
docs = tmp_path / "docs"
|
||||
docs.mkdir()
|
||||
(docs / "a.md").write_text("markdown")
|
||||
(docs / "b.txt").write_text("text")
|
||||
(docs / "c.json").write_text('{"key": "value"}')
|
||||
(docs / "d.yaml").write_text("key: value")
|
||||
added = ingest_directory(archive, docs)
|
||||
assert added == 3 # md, txt, json — not yaml
|
||||
@@ -1 +1,94 @@
|
||||
# Test resonance
|
||||
"""Tests for MnemosyneArchive.resonance() — latent connection discovery."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from nexus.mnemosyne.archive import MnemosyneArchive
|
||||
from nexus.mnemosyne.entry import ArchiveEntry
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def archive(tmp_path):
|
||||
"""Create an archive with test entries."""
|
||||
path = tmp_path / "test_archive.json"
|
||||
arch = MnemosyneArchive(archive_path=path)
|
||||
|
||||
arch.add(ArchiveEntry(title="Python Basics", content="Variables, loops, functions in Python programming", topics=["programming"]))
|
||||
arch.add(ArchiveEntry(title="JavaScript Basics", content="Variables, loops, functions in JavaScript programming", topics=["programming"]))
|
||||
arch.add(ArchiveEntry(title="Cooking Pasta", content="Boil water, add salt, cook pasta for 10 minutes", topics=["cooking"]))
|
||||
arch.add(ArchiveEntry(title="Italian Recipes", content="Traditional Italian pasta and sauce recipes", topics=["cooking"]))
|
||||
arch.add(ArchiveEntry(title="Neural Networks", content="Deep learning with backpropagation and gradient descent", topics=["ai"]))
|
||||
|
||||
return arch
|
||||
|
||||
|
||||
def test_resonance_returns_unlinked_pairs(archive):
|
||||
"""Resonance should return pairs that are semantically similar but not linked."""
|
||||
results = archive.resonance(min_similarity=0.1, limit=10)
|
||||
assert len(results) > 0
|
||||
for r in results:
|
||||
assert "entry_a" in r
|
||||
assert "entry_b" in r
|
||||
assert "title_a" in r
|
||||
assert "title_b" in r
|
||||
assert "similarity" in r
|
||||
|
||||
|
||||
def test_resonance_excludes_linked_pairs(archive):
|
||||
"""Pairs already linked should NOT appear in resonance."""
|
||||
results = archive.resonance(min_similarity=0.0, limit=100)
|
||||
linked_pairs = set()
|
||||
for entry in archive._entries.values():
|
||||
for linked_id in entry.links:
|
||||
pair = tuple(sorted([entry.id, linked_id]))
|
||||
linked_pairs.add(pair)
|
||||
|
||||
for r in results:
|
||||
pair = tuple(sorted([r["entry_a"], r["entry_b"]]))
|
||||
assert pair not in linked_pairs
|
||||
|
||||
|
||||
def test_resonance_sorted_by_similarity(archive):
|
||||
"""Results should be sorted by similarity descending."""
|
||||
results = archive.resonance(min_similarity=0.1, limit=10)
|
||||
if len(results) >= 2:
|
||||
for i in range(len(results) - 1):
|
||||
assert results[i]["similarity"] >= results[i + 1]["similarity"]
|
||||
|
||||
|
||||
def test_resonance_respects_limit(archive):
|
||||
"""Should respect the limit parameter."""
|
||||
results_3 = archive.resonance(min_similarity=0.0, limit=3)
|
||||
results_10 = archive.resonance(min_similarity=0.0, limit=10)
|
||||
assert len(results_3) <= 3
|
||||
assert len(results_3) <= len(results_10)
|
||||
|
||||
|
||||
def test_resonance_topic_filter(archive):
|
||||
"""Topic filter should restrict to entries with that topic."""
|
||||
results = archive.resonance(min_similarity=0.0, limit=100, topic="cooking")
|
||||
for r in results:
|
||||
entry_a = archive.get(r["entry_a"])
|
||||
entry_b = archive.get(r["entry_b"])
|
||||
assert "cooking" in entry_a.topics or "cooking" in entry_b.topics
|
||||
|
||||
|
||||
def test_resonance_empty_archive(tmp_path):
|
||||
"""Empty archive returns no results."""
|
||||
path = tmp_path / "empty_archive.json"
|
||||
arch = MnemosyneArchive(archive_path=path)
|
||||
results = arch.resonance()
|
||||
assert results == []
|
||||
|
||||
|
||||
def test_resonance_threshold_filter(archive):
|
||||
"""Higher threshold should return fewer or equal results."""
|
||||
low = archive.resonance(min_similarity=0.1, limit=100)
|
||||
high = archive.resonance(min_similarity=0.5, limit=100)
|
||||
assert len(high) <= len(low)
|
||||
for r in high:
|
||||
assert r["similarity"] >= 0.5
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
# Test snapshot
|
||||
@@ -1,126 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Bannerlord Runtime Setup — Apple Silicon
|
||||
# Issue #720: Stand up a local Windows game runtime for Bannerlord on Apple Silicon
|
||||
#
|
||||
# Chosen runtime: Whisky (Apple Game Porting Toolkit wrapper)
|
||||
#
|
||||
# Usage: ./scripts/bannerlord_runtime_setup.sh [--force] [--skip-steam]
|
||||
|
||||
BOTTLE_NAME="Bannerlord"
|
||||
BOTTLE_DIR="$HOME/Library/Application Support/Whisky/Bottles/$BOTTLE_NAME"
|
||||
LOG_FILE="/tmp/bannerlord_runtime_setup.log"
|
||||
|
||||
FORCE=false
|
||||
SKIP_STEAM=false
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--force) FORCE=true ;;
|
||||
--skip-steam) SKIP_STEAM=true ;;
|
||||
esac
|
||||
done
|
||||
|
||||
log() {
|
||||
echo "[$(date '+%H:%M:%S')] $*" | tee -a "$LOG_FILE"
|
||||
}
|
||||
|
||||
fail() {
|
||||
log "FATAL: $*"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ── Preflight ──────────────────────────────────────────────────────
|
||||
log "=== Bannerlord Runtime Setup ==="
|
||||
log "Platform: $(uname -m) macOS $(sw_vers -productVersion)"
|
||||
|
||||
if [[ "$(uname -m)" != "arm64" ]]; then
|
||||
fail "This script requires Apple Silicon (arm64). Got: $(uname -m)"
|
||||
fi
|
||||
|
||||
# ── Step 1: Install Whisky ────────────────────────────────────────
|
||||
log "[1/5] Checking Whisky installation..."
|
||||
if [[ -d "/Applications/Whisky.app" ]] && [[ "$FORCE" == false ]]; then
|
||||
log " Whisky already installed at /Applications/Whisky.app"
|
||||
else
|
||||
log " Installing Whisky via Homebrew cask..."
|
||||
if ! command -v brew &>/dev/null; then
|
||||
fail "Homebrew not found. Install from https://brew.sh"
|
||||
fi
|
||||
brew install --cask whisky 2>&1 | tee -a "$LOG_FILE"
|
||||
log " Whisky installed."
|
||||
fi
|
||||
|
||||
# ── Step 2: Create Bottle ─────────────────────────────────────────
|
||||
log "[2/5] Checking Bannerlord bottle..."
|
||||
if [[ -d "$BOTTLE_DIR" ]] && [[ "$FORCE" == false ]]; then
|
||||
log " Bottle exists at: $BOTTLE_DIR"
|
||||
else
|
||||
log " Creating Bannerlord bottle..."
|
||||
# Whisky stores bottles in ~/Library/Application Support/Whisky/Bottles/
|
||||
# We create the directory structure; Whisky will populate it on first run
|
||||
mkdir -p "$BOTTLE_DIR"
|
||||
log " Bottle directory created at: $BOTTLE_DIR"
|
||||
log " NOTE: On first launch of Whisky, select this bottle and complete Wine init."
|
||||
log " Open Whisky.app, create bottle named '$BOTTLE_NAME', Windows 10."
|
||||
fi
|
||||
|
||||
# ── Step 3: Verify Whisky CLI ─────────────────────────────────────
|
||||
log "[3/5] Verifying Whisky CLI access..."
|
||||
WHISKY_APP="/Applications/Whisky.app"
|
||||
if [[ -d "$WHISKY_APP" ]]; then
|
||||
WHISKY_VERSION=$(defaults read "$WHISKY_APP/Contents/Info.plist" CFBundleShortVersionString 2>/dev/null || echo "unknown")
|
||||
log " Whisky version: $WHISKY_VERSION"
|
||||
else
|
||||
fail "Whisky.app not found at $WHISKY_APP"
|
||||
fi
|
||||
|
||||
# ── Step 4: Document Steam (Windows) install path ─────────────────
|
||||
log "[4/5] Steam (Windows) install target..."
|
||||
STEAM_WIN_PATH="$BOTTLE_DIR/drive_c/Program Files (x86)/Steam/Steam.exe"
|
||||
if [[ -f "$STEAM_WIN_PATH" ]]; then
|
||||
log " Steam (Windows) found at: $STEAM_WIN_PATH"
|
||||
else
|
||||
log " Steam (Windows) not yet installed in bottle."
|
||||
log " After opening Whisky:"
|
||||
log " 1. Select the '$BOTTLE_NAME' bottle"
|
||||
log " 2. Run the Steam Windows installer (download from store.steampowered.com)"
|
||||
log " 3. Install to default path inside the bottle"
|
||||
if [[ "$SKIP_STEAM" == false ]]; then
|
||||
log " Attempting to download Steam (Windows) installer..."
|
||||
STEAM_INSTALLER="/tmp/SteamSetup.exe"
|
||||
if [[ ! -f "$STEAM_INSTALLER" ]]; then
|
||||
curl -L -o "$STEAM_INSTALLER" "https://cdn.akamai.steamstatic.com/client/installer/SteamSetup.exe" 2>&1 | tee -a "$LOG_FILE"
|
||||
fi
|
||||
log " Steam installer at: $STEAM_INSTALLER"
|
||||
log " Run this in Whisky: open -a Whisky"
|
||||
log " Then: in the Bannerlord bottle, click 'Run' and select $STEAM_INSTALLER"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ── Step 5: Bannerlord executable path ────────────────────────────
|
||||
log "[5/5] Bannerlord executable target..."
|
||||
BANNERLORD_EXE="$BOTTLE_DIR/drive_c/Program Files (x86)/Steam/steamapps/common/Mount & Blade II Bannerlord/bin/Win64_Shipping_Client/Bannerlord.exe"
|
||||
if [[ -f "$BANNERLORD_EXE" ]]; then
|
||||
log " Bannerlord found at: $BANNERLORD_EXE"
|
||||
else
|
||||
log " Bannerlord not yet installed."
|
||||
log " Install via Steam (Windows) inside the Whisky bottle."
|
||||
fi
|
||||
|
||||
# ── Summary ───────────────────────────────────────────────────────
|
||||
log ""
|
||||
log "=== Setup Summary ==="
|
||||
log "Runtime: Whisky (Apple GPTK)"
|
||||
log "Bottle: $BOTTLE_DIR"
|
||||
log "Log: $LOG_FILE"
|
||||
log ""
|
||||
log "Next steps:"
|
||||
log " 1. Open Whisky: open -a Whisky"
|
||||
log " 2. Create/select '$BOTTLE_NAME' bottle (Windows 10)"
|
||||
log " 3. Install Steam (Windows) in the bottle"
|
||||
log " 4. Install Bannerlord via Steam"
|
||||
log " 5. Enable D3DMetal in bottle settings"
|
||||
log " 6. Run verification: ./scripts/bannerlord_verify_runtime.sh"
|
||||
log ""
|
||||
log "=== Done ==="
|
||||
@@ -1,117 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
# Bannerlord Runtime Verification — Apple Silicon
|
||||
# Issue #720: Verify the local Windows game runtime for Bannerlord
|
||||
#
|
||||
# Usage: ./scripts/bannerlord_verify_runtime.sh
|
||||
|
||||
BOTTLE_NAME="Bannerlord"
|
||||
BOTTLE_DIR="$HOME/Library/Application Support/Whisky/Bottles/$BOTTLE_NAME"
|
||||
REPORT_FILE="/tmp/bannerlord_runtime_verify.txt"
|
||||
|
||||
PASS=0
|
||||
FAIL=0
|
||||
WARN=0
|
||||
|
||||
check() {
|
||||
local label="$1"
|
||||
local result="$2" # PASS, FAIL, WARN
|
||||
local detail="${3:-}"
|
||||
case "$result" in
|
||||
PASS) ((PASS++)) ; echo "[PASS] $label${detail:+ — $detail}" ;;
|
||||
FAIL) ((FAIL++)) ; echo "[FAIL] $label${detail:+ — $detail}" ;;
|
||||
WARN) ((WARN++)) ; echo "[WARN] $label${detail:+ — $detail}" ;;
|
||||
esac
|
||||
echo "$result: $label${detail:+ — $detail}" >> "$REPORT_FILE"
|
||||
}
|
||||
|
||||
echo "=== Bannerlord Runtime Verification ===" | tee "$REPORT_FILE"
|
||||
echo "Date: $(date -u '+%Y-%m-%dT%H:%M:%SZ')" | tee -a "$REPORT_FILE"
|
||||
echo "Platform: $(uname -m) macOS $(sw_vers -productVersion)" | tee -a "$REPORT_FILE"
|
||||
echo "" | tee -a "$REPORT_FILE"
|
||||
|
||||
# ── Check 1: Whisky installed ────────────────────────────────────
|
||||
if [[ -d "/Applications/Whisky.app" ]]; then
|
||||
VER=$(defaults read "/Applications/Whisky.app/Contents/Info.plist" CFBundleShortVersionString 2>/dev/null || echo "?")
|
||||
check "Whisky installed" "PASS" "v$VER at /Applications/Whisky.app"
|
||||
else
|
||||
check "Whisky installed" "FAIL" "not found at /Applications/Whisky.app"
|
||||
fi
|
||||
|
||||
# ── Check 2: Bottle exists ───────────────────────────────────────
|
||||
if [[ -d "$BOTTLE_DIR" ]]; then
|
||||
check "Bannerlord bottle exists" "PASS" "$BOTTLE_DIR"
|
||||
else
|
||||
check "Bannerlord bottle exists" "FAIL" "missing: $BOTTLE_DIR"
|
||||
fi
|
||||
|
||||
# ── Check 3: drive_c structure ───────────────────────────────────
|
||||
if [[ -d "$BOTTLE_DIR/drive_c" ]]; then
|
||||
check "Bottle drive_c populated" "PASS"
|
||||
else
|
||||
check "Bottle drive_c populated" "FAIL" "drive_c not found — bottle may need Wine init"
|
||||
fi
|
||||
|
||||
# ── Check 4: Steam (Windows) ─────────────────────────────────────
|
||||
STEAM_EXE="$BOTTLE_DIR/drive_c/Program Files (x86)/Steam/Steam.exe"
|
||||
if [[ -f "$STEAM_EXE" ]]; then
|
||||
check "Steam (Windows) installed" "PASS" "$STEAM_EXE"
|
||||
else
|
||||
check "Steam (Windows) installed" "FAIL" "not found at expected path"
|
||||
fi
|
||||
|
||||
# ── Check 5: Bannerlord executable ───────────────────────────────
|
||||
BANNERLORD_EXE="$BOTTLE_DIR/drive_c/Program Files (x86)/Steam/steamapps/common/Mount & Blade II Bannerlord/bin/Win64_Shipping_Client/Bannerlord.exe"
|
||||
if [[ -f "$BANNERLORD_EXE" ]]; then
|
||||
EXE_SIZE=$(stat -f%z "$BANNERLORD_EXE" 2>/dev/null || echo "?")
|
||||
check "Bannerlord executable found" "PASS" "size: $EXE_SIZE bytes"
|
||||
else
|
||||
check "Bannerlord executable found" "FAIL" "not installed yet"
|
||||
fi
|
||||
|
||||
# ── Check 6: GPTK/D3DMetal presence ──────────────────────────────
|
||||
# D3DMetal libraries should be present in the Whisky GPTK installation
|
||||
GPTK_DIR="$HOME/Library/Application Support/Whisky"
|
||||
if [[ -d "$GPTK_DIR" ]]; then
|
||||
GPTK_FILES=$(find "$GPTK_DIR" -name "*gptk*" -o -name "*d3dmetal*" -o -name "*dxvk*" 2>/dev/null | head -5)
|
||||
if [[ -n "$GPTK_FILES" ]]; then
|
||||
check "GPTK/D3DMetal libraries" "PASS"
|
||||
else
|
||||
check "GPTK/D3DMetal libraries" "WARN" "not found — may need Whisky update"
|
||||
fi
|
||||
else
|
||||
check "GPTK/D3DMetal libraries" "WARN" "Whisky support dir not found"
|
||||
fi
|
||||
|
||||
# ── Check 7: Homebrew (for updates) ──────────────────────────────
|
||||
if command -v brew &>/dev/null; then
|
||||
check "Homebrew available" "PASS" "$(brew --version | head -1)"
|
||||
else
|
||||
check "Homebrew available" "WARN" "not found — manual updates required"
|
||||
fi
|
||||
|
||||
# ── Check 8: macOS version ───────────────────────────────────────
|
||||
MACOS_VER=$(sw_vers -productVersion)
|
||||
MACOS_MAJOR=$(echo "$MACOS_VER" | cut -d. -f1)
|
||||
if [[ "$MACOS_MAJOR" -ge 14 ]]; then
|
||||
check "macOS version" "PASS" "$MACOS_VER (Sonoma+)"
|
||||
else
|
||||
check "macOS version" "FAIL" "$MACOS_VER — requires macOS 14+"
|
||||
fi
|
||||
|
||||
# ── Summary ───────────────────────────────────────────────────────
|
||||
echo "" | tee -a "$REPORT_FILE"
|
||||
echo "=== Results ===" | tee -a "$REPORT_FILE"
|
||||
echo "PASS: $PASS" | tee -a "$REPORT_FILE"
|
||||
echo "FAIL: $FAIL" | tee -a "$REPORT_FILE"
|
||||
echo "WARN: $WARN" | tee -a "$REPORT_FILE"
|
||||
echo "Report: $REPORT_FILE" | tee -a "$REPORT_FILE"
|
||||
|
||||
if [[ "$FAIL" -gt 0 ]]; then
|
||||
echo "STATUS: INCOMPLETE — $FAIL check(s) failed" | tee -a "$REPORT_FILE"
|
||||
exit 1
|
||||
else
|
||||
echo "STATUS: RUNTIME READY" | tee -a "$REPORT_FILE"
|
||||
exit 0
|
||||
fi
|
||||
@@ -1,5 +1,27 @@
|
||||
#!/bin/bash
|
||||
echo "Running GOFAI guardrails..."
|
||||
# Syntax checks
|
||||
find . -name "*.js" -exec node --check {} +
|
||||
echo "Guardrails passed."
|
||||
# [Mnemosyne] Agent Guardrails — The Nexus
|
||||
# Validates code integrity and scans for secrets before deployment.
|
||||
|
||||
echo "--- [Mnemosyne] Running Guardrails ---"
|
||||
|
||||
# 1. Syntax Checks
|
||||
echo "[1/3] Validating syntax..."
|
||||
for f in ; do
|
||||
node --check "$f" || { echo "Syntax error in $f"; exit 1; }
|
||||
done
|
||||
echo "Syntax OK."
|
||||
|
||||
# 2. JSON/YAML Validation
|
||||
echo "[2/3] Validating configs..."
|
||||
for f in ; do
|
||||
node -e "JSON.parse(require('fs').readFileSync('$f'))" || { echo "Invalid JSON: $f"; exit 1; }
|
||||
done
|
||||
echo "Configs OK."
|
||||
|
||||
# 3. Secret Scan
|
||||
echo "[3/3] Scanning for secrets..."
|
||||
grep -rE "AI_|TOKEN|KEY|SECRET" . --exclude-dir=node_modules --exclude=guardrails.sh | grep -v "process.env" && {
|
||||
echo "WARNING: Potential secrets found!"
|
||||
} || echo "No secrets detected."
|
||||
|
||||
echo "--- Guardrails Passed ---"
|
||||
|
||||
@@ -1,4 +1,26 @@
|
||||
/**
|
||||
* [Mnemosyne] Smoke Test — The Nexus
|
||||
* Verifies core components are loadable and basic state is consistent.
|
||||
*/
|
||||
|
||||
import MemoryOptimizer from '../nexus/components/memory-optimizer.js';
|
||||
const optimizer = new MemoryOptimizer();
|
||||
console.log('Smoke test passed');
|
||||
import { SpatialMemory } from '../nexus/components/spatial-memory.js';
|
||||
import { MemoryOptimizer } from '../nexus/components/memory-optimizer.js';
|
||||
|
||||
console.log('--- [Mnemosyne] Running Smoke Test ---');
|
||||
|
||||
// 1. Verify Components
|
||||
if (!SpatialMemory || !MemoryOptimizer) {
|
||||
console.error('Failed to load core components');
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('Components loaded.');
|
||||
|
||||
// 2. Verify Regions
|
||||
const regions = Object.keys(SpatialMemory.REGIONS || {});
|
||||
if (regions.length < 5) {
|
||||
console.error('SpatialMemory regions incomplete:', regions);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('Regions verified:', regions.join(', '));
|
||||
|
||||
console.log('--- Smoke Test Passed ---');
|
||||
|
||||
Reference in New Issue
Block a user