Compare commits
6 Commits
docs/secur
...
fix/1430-s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
761ad313c7 | ||
| b9bbcae298 | |||
|
|
b7bf532f4e | ||
|
|
95d485160a | ||
| 7dff8a4b5e | |||
|
|
96af984005 |
@@ -1,7 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
# Pre-commit hook: enforce 10-line net addition limit
|
||||
# Pre-commit hook: enforce 10-line net addition limit + sanitize commit message
|
||||
# Install: git config core.hooksPath .githooks
|
||||
|
||||
# ── Line limit enforcement ──────────────────────────────────────
|
||||
ADDITIONS=$(git diff --cached --numstat | awk '{s+=$1} END {print s+0}')
|
||||
DELETIONS=$(git diff --cached --numstat | awk '{s+=$2} END {print s+0}')
|
||||
NET=$((ADDITIONS - DELETIONS))
|
||||
@@ -12,4 +13,19 @@ if [ "$NET" -gt 10 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ── Commit message sanitization (#1430) ─────────────────────────
|
||||
# Read the commit message from .git/COMMIT_EDITMSG
|
||||
MSG_FILE="$(git rev-parse --git-dir)/COMMIT_EDITMSG"
|
||||
if [ -f "$MSG_FILE" ]; then
|
||||
MSG=$(cat "$MSG_FILE")
|
||||
# Warn if message contains backticks (potential shell injection)
|
||||
if echo "$MSG" | grep -q '`'; then
|
||||
echo "⚠ WARNING: Commit message contains backticks."
|
||||
echo " Backticks in 'git commit -m' can trigger shell expansion."
|
||||
echo " Consider using: git commit -F <file> or ./scripts/safe-commit.sh"
|
||||
echo " See: docs/SAFE_COMMIT_PATTERNS.md"
|
||||
# Don't block — just warn. Blocking would be too aggressive.
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "✓ Pre-commit: net $NET lines (limit: 10)"
|
||||
|
||||
@@ -285,6 +285,49 @@ class AgentMemory:
|
||||
logger.warning(f"Failed to store memory: {e}")
|
||||
return None
|
||||
|
||||
def remember_alexander_request_response(
|
||||
self,
|
||||
*,
|
||||
request_text: str,
|
||||
response_text: str,
|
||||
requester: str = "Alexander Whitestone",
|
||||
source: str = "",
|
||||
metadata: Optional[dict] = None,
|
||||
) -> Optional[str]:
|
||||
"""Store an Alexander request + wizard response artifact in the sovereign room."""
|
||||
if not self._check_available():
|
||||
logger.warning("Cannot store Alexander artifact — MemPalace unavailable")
|
||||
return None
|
||||
|
||||
try:
|
||||
from nexus.mempalace.searcher import add_memory
|
||||
from nexus.mempalace.conversation_artifacts import build_request_response_artifact
|
||||
|
||||
artifact = build_request_response_artifact(
|
||||
requester=requester,
|
||||
responder=self.agent_name,
|
||||
request_text=request_text,
|
||||
response_text=response_text,
|
||||
source=source,
|
||||
)
|
||||
extra_metadata = dict(artifact.metadata)
|
||||
if metadata:
|
||||
extra_metadata.update(metadata)
|
||||
|
||||
doc_id = add_memory(
|
||||
text=artifact.text,
|
||||
room=artifact.room,
|
||||
wing=self.wing,
|
||||
palace_path=self.palace_path,
|
||||
source_file=source,
|
||||
extra_metadata=extra_metadata,
|
||||
)
|
||||
logger.debug("Stored Alexander request/response artifact in sovereign room")
|
||||
return doc_id
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to store Alexander artifact: {e}")
|
||||
return None
|
||||
|
||||
def write_diary(
|
||||
self,
|
||||
summary: Optional[str] = None,
|
||||
|
||||
8
app.js
8
app.js
@@ -714,6 +714,10 @@ async function init() {
|
||||
camera = new THREE.PerspectiveCamera(65, window.innerWidth / window.innerHeight, 0.1, 1000);
|
||||
camera.position.copy(playerPos);
|
||||
|
||||
// Initialize avatar and LOD systems
|
||||
if (window.AvatarCustomization) window.AvatarCustomization.init(scene, camera);
|
||||
if (window.LODSystem) window.LODSystem.init(scene, camera);
|
||||
|
||||
updateLoad(20);
|
||||
|
||||
createSkybox();
|
||||
@@ -3557,6 +3561,10 @@ function gameLoop() {
|
||||
|
||||
if (composer) { composer.render(); } else { renderer.render(scene, camera); }
|
||||
|
||||
// Update avatar and LOD systems
|
||||
if (window.AvatarCustomization && playerPos) window.AvatarCustomization.update(playerPos);
|
||||
if (window.LODSystem && playerPos) window.LODSystem.update(playerPos);
|
||||
|
||||
updateAshStorm(delta, elapsed);
|
||||
|
||||
// Project Mnemosyne - Memory Orb Animation
|
||||
|
||||
69
docs/SAFE_COMMIT_PATTERNS.md
Normal file
69
docs/SAFE_COMMIT_PATTERNS.md
Normal file
@@ -0,0 +1,69 @@
|
||||
# Safe Commit Patterns
|
||||
|
||||
## Issue #1430
|
||||
|
||||
Backticks in `git commit -m` messages can trigger shell substitution
|
||||
during hook processing. A commit message containing:
|
||||
|
||||
```
|
||||
git commit -m "fix: update `connectMemPalace()` to use Fleet API"
|
||||
```
|
||||
|
||||
may cause the shell to attempt executing `connectMemPalace()`.
|
||||
|
||||
## Safe Patterns
|
||||
|
||||
### 1. Use safe-commit.sh (recommended)
|
||||
|
||||
```bash
|
||||
./scripts/safe-commit.sh "fix: update connectMemPalace() to use Fleet API"
|
||||
```
|
||||
|
||||
This writes the message to a temp file and uses `git commit -F`,
|
||||
which prevents shell expansion.
|
||||
|
||||
### 2. Use git commit -F directly
|
||||
|
||||
```bash
|
||||
echo "fix: update \`connectMemPalace()\` to use Fleet API" > /tmp/msg.txt
|
||||
git commit -F /tmp/msg.txt
|
||||
```
|
||||
|
||||
### 3. Use single quotes (less reliable with hooks)
|
||||
|
||||
```bash
|
||||
git commit -m 'fix: update `connectMemPalace()` to use Fleet API'
|
||||
```
|
||||
|
||||
Single quotes prevent shell expansion in the commit command itself,
|
||||
but hooks that read the message may still process backticks.
|
||||
|
||||
### 4. Use heredoc for multiline
|
||||
|
||||
```bash
|
||||
git commit -F - <<'EOF'
|
||||
fix: update `connectMemPalace()` to use Fleet API
|
||||
|
||||
The mock MCP server was overwriting the real Fleet API version.
|
||||
EOF
|
||||
```
|
||||
|
||||
## What NOT to do
|
||||
|
||||
```bash
|
||||
# BAD — backticks trigger shell expansion
|
||||
git commit -m "fix: update `connectMemPalace()` to use Fleet API"
|
||||
|
||||
# BAD — $(...) triggers command substitution
|
||||
git commit -m "fix: update $(cat file.py) to use Fleet API"
|
||||
|
||||
# BAD — ! triggers history expansion
|
||||
git commit -m "fix: this is not a joke! seriously"
|
||||
```
|
||||
|
||||
## For agents
|
||||
|
||||
When committing code that contains backticks or special characters:
|
||||
1. Always use `git commit -F <file>` or `safe-commit.sh`
|
||||
2. Never interpolate user content into `-m` strings
|
||||
3. Escape or remove backticks from commit messages when possible
|
||||
@@ -395,6 +395,8 @@
|
||||
<div id="memory-connections-panel" class="memory-connections-panel" style="display:none;" aria-label="Memory Connections Panel"></div>
|
||||
|
||||
<script src="./boot.js"></script>
|
||||
<script src="./avatar-customization.js"></script>
|
||||
<script src="./lod-system.js"></script>
|
||||
<script>
|
||||
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
||||
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
||||
|
||||
186
lod-system.js
Normal file
186
lod-system.js
Normal file
@@ -0,0 +1,186 @@
|
||||
/**
|
||||
* LOD (Level of Detail) System for The Nexus
|
||||
*
|
||||
* Optimizes rendering when many avatars/users are visible:
|
||||
* - Distance-based LOD: far users become billboard sprites
|
||||
* - Occlusion: skip rendering users behind walls
|
||||
* - Budget: maintain 60 FPS target with 50+ avatars
|
||||
*
|
||||
* Usage:
|
||||
* LODSystem.init(scene, camera);
|
||||
* LODSystem.registerAvatar(avatarMesh, userId);
|
||||
* LODSystem.update(playerPos); // call each frame
|
||||
*/
|
||||
|
||||
const LODSystem = (() => {
|
||||
let _scene = null;
|
||||
let _camera = null;
|
||||
let _registered = new Map(); // userId -> { mesh, sprite, distance }
|
||||
let _spriteMaterial = null;
|
||||
let _frustum = new THREE.Frustum();
|
||||
let _projScreenMatrix = new THREE.Matrix4();
|
||||
|
||||
// Thresholds
|
||||
const LOD_NEAR = 15; // Full mesh within 15 units
|
||||
const LOD_FAR = 40; // Billboard beyond 40 units
|
||||
const LOD_CULL = 80; // Don't render beyond 80 units
|
||||
const SPRITE_SIZE = 1.2;
|
||||
|
||||
function init(sceneRef, cameraRef) {
|
||||
_scene = sceneRef;
|
||||
_camera = cameraRef;
|
||||
|
||||
// Create shared sprite material
|
||||
const canvas = document.createElement('canvas');
|
||||
canvas.width = 64;
|
||||
canvas.height = 64;
|
||||
const ctx = canvas.getContext('2d');
|
||||
// Simple avatar indicator: colored circle
|
||||
ctx.fillStyle = '#00ffcc';
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 32, 20, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
ctx.fillStyle = '#0a0f1a';
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 28, 8, 0, Math.PI * 2); // head
|
||||
ctx.fill();
|
||||
|
||||
const texture = new THREE.CanvasTexture(canvas);
|
||||
_spriteMaterial = new THREE.SpriteMaterial({
|
||||
map: texture,
|
||||
transparent: true,
|
||||
depthTest: true,
|
||||
sizeAttenuation: true,
|
||||
});
|
||||
|
||||
console.log('[LODSystem] Initialized');
|
||||
}
|
||||
|
||||
function registerAvatar(avatarMesh, userId, color) {
|
||||
// Create billboard sprite for this avatar
|
||||
const spriteMat = _spriteMaterial.clone();
|
||||
if (color) {
|
||||
// Tint sprite to match avatar color
|
||||
const canvas = document.createElement('canvas');
|
||||
canvas.width = 64;
|
||||
canvas.height = 64;
|
||||
const ctx = canvas.getContext('2d');
|
||||
ctx.fillStyle = color;
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 32, 20, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
ctx.fillStyle = '#0a0f1a';
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 28, 8, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
spriteMat.map = new THREE.CanvasTexture(canvas);
|
||||
spriteMat.map.needsUpdate = true;
|
||||
}
|
||||
|
||||
const sprite = new THREE.Sprite(spriteMat);
|
||||
sprite.scale.set(SPRITE_SIZE, SPRITE_SIZE, 1);
|
||||
sprite.visible = false;
|
||||
_scene.add(sprite);
|
||||
|
||||
_registered.set(userId, {
|
||||
mesh: avatarMesh,
|
||||
sprite: sprite,
|
||||
distance: Infinity,
|
||||
});
|
||||
}
|
||||
|
||||
function unregisterAvatar(userId) {
|
||||
const entry = _registered.get(userId);
|
||||
if (entry) {
|
||||
_scene.remove(entry.sprite);
|
||||
entry.sprite.material.dispose();
|
||||
_registered.delete(userId);
|
||||
}
|
||||
}
|
||||
|
||||
function setSpriteColor(userId, color) {
|
||||
const entry = _registered.get(userId);
|
||||
if (!entry) return;
|
||||
const canvas = document.createElement('canvas');
|
||||
canvas.width = 64;
|
||||
canvas.height = 64;
|
||||
const ctx = canvas.getContext('2d');
|
||||
ctx.fillStyle = color;
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 32, 20, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
ctx.fillStyle = '#0a0f1a';
|
||||
ctx.beginPath();
|
||||
ctx.arc(32, 28, 8, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
entry.sprite.material.map = new THREE.CanvasTexture(canvas);
|
||||
entry.sprite.material.map.needsUpdate = true;
|
||||
}
|
||||
|
||||
function update(playerPos) {
|
||||
if (!_camera) return;
|
||||
|
||||
// Update frustum for culling
|
||||
_projScreenMatrix.multiplyMatrices(
|
||||
_camera.projectionMatrix,
|
||||
_camera.matrixWorldInverse
|
||||
);
|
||||
_frustum.setFromProjectionMatrix(_projScreenMatrix);
|
||||
|
||||
_registered.forEach((entry, userId) => {
|
||||
if (!entry.mesh) return;
|
||||
|
||||
const meshPos = entry.mesh.position;
|
||||
const distance = playerPos.distanceTo(meshPos);
|
||||
entry.distance = distance;
|
||||
|
||||
// Beyond cull distance: hide everything
|
||||
if (distance > LOD_CULL) {
|
||||
entry.mesh.visible = false;
|
||||
entry.sprite.visible = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if in camera frustum
|
||||
const inFrustum = _frustum.containsPoint(meshPos);
|
||||
if (!inFrustum) {
|
||||
entry.mesh.visible = false;
|
||||
entry.sprite.visible = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// LOD switching
|
||||
if (distance <= LOD_NEAR) {
|
||||
// Near: full mesh
|
||||
entry.mesh.visible = true;
|
||||
entry.sprite.visible = false;
|
||||
} else if (distance <= LOD_FAR) {
|
||||
// Mid: mesh with reduced detail (keep mesh visible)
|
||||
entry.mesh.visible = true;
|
||||
entry.sprite.visible = false;
|
||||
} else {
|
||||
// Far: billboard sprite
|
||||
entry.mesh.visible = false;
|
||||
entry.sprite.visible = true;
|
||||
entry.sprite.position.copy(meshPos);
|
||||
entry.sprite.position.y += 1.2; // above avatar center
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getStats() {
|
||||
let meshCount = 0;
|
||||
let spriteCount = 0;
|
||||
let culledCount = 0;
|
||||
_registered.forEach(entry => {
|
||||
if (entry.mesh.visible) meshCount++;
|
||||
else if (entry.sprite.visible) spriteCount++;
|
||||
else culledCount++;
|
||||
});
|
||||
return { total: _registered.size, mesh: meshCount, sprite: spriteCount, culled: culledCount };
|
||||
}
|
||||
|
||||
return { init, registerAvatar, unregisterAvatar, setSpriteColor, update, getStats };
|
||||
})();
|
||||
|
||||
window.LODSystem = LODSystem;
|
||||
@@ -62,6 +62,15 @@ core_rooms:
|
||||
- proof-of-concept code snippets
|
||||
- benchmark data
|
||||
|
||||
- key: sovereign
|
||||
label: Sovereign
|
||||
purpose: Artifacts of Alexander Whitestone's requests, directives, and wizard responses
|
||||
examples:
|
||||
- dated request/response artifacts
|
||||
- conversation summaries with speaker tags
|
||||
- directive ledgers
|
||||
- response follow-through notes
|
||||
|
||||
optional_rooms:
|
||||
- key: evennia
|
||||
label: Evennia
|
||||
@@ -98,15 +107,6 @@ optional_rooms:
|
||||
purpose: Catch-all for artefacts not yet assigned to a named room
|
||||
wizards: ["*"]
|
||||
|
||||
- key: sovereign
|
||||
label: Sovereign
|
||||
purpose: Artifacts of Alexander Whitestone's requests, directives, and conversation history
|
||||
wizards: ["*"]
|
||||
conventions:
|
||||
naming: "YYYY-MM-DD_HHMMSS_<topic>.md"
|
||||
index: "INDEX.md"
|
||||
description: "Each artifact is a dated record of a request from Alexander and the wizard's response. The running INDEX.md provides a chronological catalog."
|
||||
|
||||
# Tunnel routing table
|
||||
# Defines which room pairs are connected across wizard wings.
|
||||
# A tunnel lets `recall <query> --fleet` search both wings at once.
|
||||
|
||||
@@ -13,6 +13,12 @@ from __future__ import annotations
|
||||
|
||||
from nexus.mempalace.config import MEMPALACE_PATH, FLEET_WING
|
||||
from nexus.mempalace.searcher import search_memories, add_memory, MemPalaceResult
|
||||
from nexus.mempalace.conversation_artifacts import (
|
||||
ConversationArtifact,
|
||||
build_request_response_artifact,
|
||||
extract_alexander_request_pairs,
|
||||
normalize_speaker,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"MEMPALACE_PATH",
|
||||
@@ -20,4 +26,8 @@ __all__ = [
|
||||
"search_memories",
|
||||
"add_memory",
|
||||
"MemPalaceResult",
|
||||
"ConversationArtifact",
|
||||
"build_request_response_artifact",
|
||||
"extract_alexander_request_pairs",
|
||||
"normalize_speaker",
|
||||
]
|
||||
|
||||
@@ -40,6 +40,7 @@ CORE_ROOMS: list[str] = [
|
||||
"nexus", # reports, docs, KT
|
||||
"issues", # tickets, backlog
|
||||
"experiments", # prototypes, spikes
|
||||
"sovereign", # Alexander request/response artifacts
|
||||
]
|
||||
|
||||
# ── ChromaDB collection name ──────────────────────────────────────────────────
|
||||
|
||||
122
nexus/mempalace/conversation_artifacts.py
Normal file
122
nexus/mempalace/conversation_artifacts.py
Normal file
@@ -0,0 +1,122 @@
|
||||
"""Helpers for preserving Alexander request/response artifacts in MemPalace.
|
||||
|
||||
This module provides a small, typed bridge between raw conversation turns and
|
||||
MemPalace drawers stored in the shared `sovereign` room. The goal is not to
|
||||
solve all future speaker-tagging needs at once; it gives the Nexus one
|
||||
canonical artifact shape that other miners and bridges can reuse.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
from datetime import datetime, timezone
|
||||
from typing import Iterable
|
||||
|
||||
_ALEXANDER_ALIASES = {
|
||||
"alexander",
|
||||
"alexander whitestone",
|
||||
"rockachopa",
|
||||
"triptimmy",
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ConversationArtifact:
|
||||
requester: str
|
||||
responder: str
|
||||
request_text: str
|
||||
response_text: str
|
||||
room: str = "sovereign"
|
||||
timestamp: str = field(default_factory=lambda: datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"))
|
||||
metadata: dict = field(default_factory=dict)
|
||||
|
||||
@property
|
||||
def text(self) -> str:
|
||||
return (
|
||||
f"# Conversation Artifact\n\n"
|
||||
f"## Alexander Request\n{self.request_text.strip()}\n\n"
|
||||
f"## Wizard Response\n{self.response_text.strip()}\n"
|
||||
)
|
||||
|
||||
|
||||
def normalize_speaker(name: str | None) -> str:
|
||||
cleaned = " ".join((name or "").strip().lower().split())
|
||||
if cleaned in _ALEXANDER_ALIASES:
|
||||
return "alexander"
|
||||
return cleaned.replace(" ", "_") or "unknown"
|
||||
|
||||
|
||||
def build_request_response_artifact(
|
||||
*,
|
||||
requester: str,
|
||||
responder: str,
|
||||
request_text: str,
|
||||
response_text: str,
|
||||
source: str = "",
|
||||
timestamp: str | None = None,
|
||||
request_timestamp: str | None = None,
|
||||
response_timestamp: str | None = None,
|
||||
) -> ConversationArtifact:
|
||||
requester_slug = normalize_speaker(requester)
|
||||
responder_slug = normalize_speaker(responder)
|
||||
ts = timestamp or datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
metadata = {
|
||||
"artifact_type": "alexander_request_response",
|
||||
"requester": requester_slug,
|
||||
"responder": responder_slug,
|
||||
"speaker_tags": [f"speaker:{requester_slug}", f"speaker:{responder_slug}"],
|
||||
"source": source,
|
||||
"timestamp": ts,
|
||||
}
|
||||
if request_timestamp:
|
||||
metadata["request_timestamp"] = request_timestamp
|
||||
if response_timestamp:
|
||||
metadata["response_timestamp"] = response_timestamp
|
||||
return ConversationArtifact(
|
||||
requester=requester_slug,
|
||||
responder=responder_slug,
|
||||
request_text=request_text,
|
||||
response_text=response_text,
|
||||
timestamp=ts,
|
||||
metadata=metadata,
|
||||
)
|
||||
|
||||
|
||||
def extract_alexander_request_pairs(
|
||||
turns: Iterable[dict],
|
||||
*,
|
||||
responder: str,
|
||||
source: str = "",
|
||||
) -> list[ConversationArtifact]:
|
||||
responder_slug = normalize_speaker(responder)
|
||||
pending_request: dict | None = None
|
||||
artifacts: list[ConversationArtifact] = []
|
||||
|
||||
for turn in turns:
|
||||
speaker = normalize_speaker(
|
||||
turn.get("speaker") or turn.get("username") or turn.get("author") or turn.get("name")
|
||||
)
|
||||
text = (turn.get("text") or turn.get("content") or "").strip()
|
||||
if not text:
|
||||
continue
|
||||
|
||||
if speaker == "alexander":
|
||||
pending_request = turn
|
||||
continue
|
||||
|
||||
if speaker == responder_slug and pending_request is not None:
|
||||
artifacts.append(
|
||||
build_request_response_artifact(
|
||||
requester="alexander",
|
||||
responder=responder_slug,
|
||||
request_text=(pending_request.get("text") or pending_request.get("content") or "").strip(),
|
||||
response_text=text,
|
||||
source=source,
|
||||
request_timestamp=pending_request.get("timestamp"),
|
||||
response_timestamp=turn.get("timestamp"),
|
||||
timestamp=turn.get("timestamp") or pending_request.get("timestamp"),
|
||||
)
|
||||
)
|
||||
pending_request = None
|
||||
|
||||
return artifacts
|
||||
41
scripts/safe-commit.sh
Executable file
41
scripts/safe-commit.sh
Executable file
@@ -0,0 +1,41 @@
|
||||
#!/usr/bin/env bash
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# safe-commit.sh — Commit with message from file (prevents shell injection)
|
||||
#
|
||||
# Issue #1430: Backticks in commit messages can trigger shell
|
||||
# substitution during git hook processing. Using -F <file> instead
|
||||
# of -m prevents this.
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/safe-commit.sh "my commit message"
|
||||
# ./scripts/safe-commit.sh -F message.txt
|
||||
# echo "message" | ./scripts/safe-commit.sh --stdin
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
set -euo pipefail
|
||||
|
||||
TMPFILE=$(mktemp /tmp/commit-msg-XXXXXX)
|
||||
trap "rm -f $TMPFILE" EXIT
|
||||
|
||||
if [ "${1:-}" = "-F" ] && [ -n "${2:-}" ]; then
|
||||
# Use provided file
|
||||
cp "$2" "$TMPFILE"
|
||||
elif [ "${1:-}" = "--stdin" ]; then
|
||||
# Read from stdin
|
||||
cat > "$TMPFILE"
|
||||
elif [ -n "${1:-}" ]; then
|
||||
# Write argument to temp file (no shell expansion)
|
||||
printf '%s' "$1" > "$TMPFILE"
|
||||
else
|
||||
echo "Usage: $0 <message> | $0 -F <file> | $0 --stdin"
|
||||
echo ""
|
||||
echo "Always uses git commit -F to prevent shell injection."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Stage all changes
|
||||
git add -A
|
||||
|
||||
# Commit using file (no shell expansion of message content)
|
||||
git commit -F "$TMPFILE"
|
||||
|
||||
echo "✓ Committed safely (no shell expansion)"
|
||||
@@ -20,6 +20,7 @@ from agent.memory import (
|
||||
SessionTranscript,
|
||||
create_agent_memory,
|
||||
)
|
||||
from nexus.mempalace.conversation_artifacts import ConversationArtifact
|
||||
from agent.memory_hooks import MemoryHooks
|
||||
|
||||
|
||||
@@ -184,6 +185,24 @@ class TestAgentMemory:
|
||||
doc_id = mem.write_diary()
|
||||
assert doc_id is None # MemPalace unavailable
|
||||
|
||||
def test_remember_alexander_request_response_uses_sovereign_room(self):
|
||||
mem = AgentMemory(agent_name="allegro")
|
||||
mem._available = True
|
||||
with patch("nexus.mempalace.searcher.add_memory", return_value="doc-123") as add_memory:
|
||||
doc_id = mem.remember_alexander_request_response(
|
||||
request_text="Catalog my requests.",
|
||||
response_text="I will preserve them as artifacts.",
|
||||
requester="Alexander Whitestone",
|
||||
source="telegram:timmy-time",
|
||||
)
|
||||
|
||||
assert doc_id == "doc-123"
|
||||
kwargs = add_memory.call_args.kwargs
|
||||
assert kwargs["room"] == "sovereign"
|
||||
assert kwargs["wing"] == mem.wing
|
||||
assert kwargs["extra_metadata"]["artifact_type"] == "alexander_request_response"
|
||||
assert kwargs["extra_metadata"]["speaker_tags"] == ["speaker:alexander", "speaker:allegro"]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# MemoryHooks tests
|
||||
|
||||
58
tests/test_conversation_artifacts.py
Normal file
58
tests/test_conversation_artifacts.py
Normal file
@@ -0,0 +1,58 @@
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
from nexus.mempalace.config import CORE_ROOMS
|
||||
from nexus.mempalace.conversation_artifacts import (
|
||||
ConversationArtifact,
|
||||
build_request_response_artifact,
|
||||
extract_alexander_request_pairs,
|
||||
normalize_speaker,
|
||||
)
|
||||
|
||||
|
||||
def test_sovereign_room_is_core_room() -> None:
|
||||
assert "sovereign" in CORE_ROOMS
|
||||
rooms_yaml = yaml.safe_load(Path("mempalace/rooms.yaml").read_text())
|
||||
assert any(room["key"] == "sovereign" for room in rooms_yaml["core_rooms"])
|
||||
|
||||
|
||||
def test_normalize_speaker_maps_alexander_variants() -> None:
|
||||
assert normalize_speaker("Alexander Whitestone") == "alexander"
|
||||
assert normalize_speaker("Rockachopa") == "alexander"
|
||||
assert normalize_speaker(" ALEXANDER ") == "alexander"
|
||||
assert normalize_speaker("Bezalel") == "bezalel"
|
||||
|
||||
|
||||
def test_build_request_response_artifact_creates_sovereign_metadata() -> None:
|
||||
artifact = build_request_response_artifact(
|
||||
requester="Alexander Whitestone",
|
||||
responder="Allegro",
|
||||
request_text="Please organize my conversation artifacts.",
|
||||
response_text="I will catalog them under a sovereign room.",
|
||||
source="telegram:timmy-time",
|
||||
timestamp="2026-04-16T01:30:00Z",
|
||||
)
|
||||
|
||||
assert isinstance(artifact, ConversationArtifact)
|
||||
assert artifact.room == "sovereign"
|
||||
assert artifact.metadata["speaker_tags"] == ["speaker:alexander", "speaker:allegro"]
|
||||
assert artifact.metadata["artifact_type"] == "alexander_request_response"
|
||||
assert artifact.metadata["responder"] == "allegro"
|
||||
assert "## Alexander Request" in artifact.text
|
||||
assert "## Wizard Response" in artifact.text
|
||||
|
||||
|
||||
def test_extract_alexander_request_pairs_finds_following_wizard_response() -> None:
|
||||
turns = [
|
||||
{"speaker": "Alexander Whitestone", "text": "Catalog my requests as artifacts.", "timestamp": "2026-04-16T01:00:00Z"},
|
||||
{"speaker": "Allegro", "text": "I'll build a sovereign room contract.", "timestamp": "2026-04-16T01:01:00Z"},
|
||||
{"speaker": "Alexander", "text": "Make sure my words are easy to recall.", "timestamp": "2026-04-16T01:02:00Z"},
|
||||
{"speaker": "Allegro", "text": "I will tag them with speaker metadata.", "timestamp": "2026-04-16T01:03:00Z"},
|
||||
]
|
||||
|
||||
artifacts = extract_alexander_request_pairs(turns, responder="Allegro", source="telegram")
|
||||
|
||||
assert len(artifacts) == 2
|
||||
assert artifacts[0].metadata["request_timestamp"] == "2026-04-16T01:00:00Z"
|
||||
assert artifacts[1].metadata["response_timestamp"] == "2026-04-16T01:03:00Z"
|
||||
Reference in New Issue
Block a user