Compare commits
11 Commits
fix/879
...
feat/crisi
| Author | SHA1 | Date | |
|---|---|---|---|
| aa55191c79 | |||
| 51f4c84fbb | |||
| 4f37ee03e9 | |||
| c80af29cce | |||
| 7dff8a4b5e | |||
|
|
96af984005 | ||
| 27aa29f9c8 | |||
| 39cf447ee0 | |||
| fe5b9c8b75 | |||
| 871188ec12 | |||
| 9482403a23 |
@@ -6,3 +6,4 @@ rules:
|
||||
require_ci_to_merge: false # CI runner dead (issue #915)
|
||||
block_force_pushes: true
|
||||
block_deletions: true
|
||||
block_on_outdated_branch: true
|
||||
|
||||
1
.github/BRANCH_PROTECTION.md
vendored
1
.github/BRANCH_PROTECTION.md
vendored
@@ -12,6 +12,7 @@ All repositories must enforce these rules on the `main` branch:
|
||||
| Require CI to pass | ⚠ Conditional | Only where CI exists |
|
||||
| Block force push | ✅ Enabled | Protect commit history |
|
||||
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
|
||||
| Require branch up-to-date before merge | ✅ Enabled | Surface conflicts before merge and force contributors to rebase |
|
||||
|
||||
## Default Reviewer Assignments
|
||||
|
||||
|
||||
36
app.js
36
app.js
@@ -1,3 +1,4 @@
|
||||
import { CrisisDetector, CRISIS_LEVELS } from './js/crisis-detector.js';
|
||||
import ResonanceVisualizer from './nexus/components/resonance-visualizer.js';\nimport * as THREE from 'three';
|
||||
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
|
||||
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
|
||||
@@ -43,7 +44,8 @@ let portals = []; // Registry of active portals
|
||||
let visionPoints = []; // Registry of vision points
|
||||
let agents = []; // Registry of agent presences
|
||||
let activePortal = null; // Portal currently in proximity
|
||||
let activeVisionPoint = null; // Vision point currently in proximity
|
||||
let activeVisionPoint = null;
|
||||
const crisisDetector = new CrisisDetector(); // Vision point currently in proximity
|
||||
let portalOverlayActive = false;
|
||||
let visionOverlayActive = false;
|
||||
let atlasOverlayActive = false;
|
||||
@@ -714,6 +716,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();
|
||||
@@ -2140,13 +2146,25 @@ function setupControls() {
|
||||
}
|
||||
|
||||
function sendChatMessage(overrideText = null) {
|
||||
const input = document.getElementById('chat-input');
|
||||
const text = overrideText || input.value.trim();
|
||||
if (!text) return;
|
||||
|
||||
// Crisis Detection
|
||||
const crisis = crisisDetector.detect(text);
|
||||
if (crisis.level === CRISIS_LEVELS.CRITICAL || crisis.level === CRISIS_LEVELS.HIGH) {
|
||||
console.warn('CRISIS DETECTED:', crisis.level);
|
||||
document.getElementById('crisis-overlay').style.display = 'flex';
|
||||
// Log to symbolic engine for meta-reasoning
|
||||
if (typeof updateSymbolicLog === 'function') {
|
||||
updateSymbolicLog('CRISIS_INTERVENTION', { level: crisis.level, score: crisis.score });
|
||||
}
|
||||
}
|
||||
|
||||
// Mine chat message to MemPalace
|
||||
if (overrideText) {
|
||||
window.electronAPI.execPython(`mempalace add_drawer "${this.wing}" "chat" "${overrideText}"`);
|
||||
}
|
||||
const input = document.getElementById('chat-input');
|
||||
const text = overrideText || input.value.trim();
|
||||
if (!text) return;
|
||||
addChatMessage('user', text);
|
||||
if (!overrideText) input.value = '';
|
||||
setTimeout(() => {
|
||||
@@ -3557,6 +3575,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
|
||||
@@ -4080,4 +4102,8 @@ init().then(() => {
|
||||
});
|
||||
|
||||
// Memory optimization loop
|
||||
setInterval(() => { console.log('Running optimization...'); }, 60000);
|
||||
setInterval(() => { console.log('Running optimization...'); }, 60000);
|
||||
// Crisis Overlay Handler
|
||||
document.getElementById('crisis-close-btn').addEventListener('click', () => {
|
||||
document.getElementById('crisis-overlay').style.display = 'none';
|
||||
});
|
||||
|
||||
29
index.html
29
index.html
@@ -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'; }
|
||||
@@ -416,5 +418,32 @@ function renderFilterList() {
|
||||
function toggleRegion(category, visible) { SpatialMemory.setRegionVisibility(category, visible); }
|
||||
function setAllFilters(visible) { SpatialMemory.setAllRegionsVisible(visible); renderFilterList(); }
|
||||
</script>
|
||||
|
||||
<!-- Crisis Overlay (988) -->
|
||||
<div id="crisis-overlay" class="crisis-overlay" style="display:none;">
|
||||
<div class="crisis-overlay-content">
|
||||
<div class="crisis-header">
|
||||
<span class="crisis-icon">🚨</span>
|
||||
<span class="crisis-title">CRISIS INTERVENTION</span>
|
||||
</div>
|
||||
<h2>You are not alone.</h2>
|
||||
<p>Timmy is here, but he is an AI. If you are in immediate danger or feeling hopeless, please reach out to professional support.</p>
|
||||
<div class="crisis-resources">
|
||||
<div class="resource-item">
|
||||
<span class="resource-label">Suicide & Crisis Lifeline</span>
|
||||
<span class="resource-value">Call or Text 988</span>
|
||||
</div>
|
||||
<div class="resource-item">
|
||||
<span class="resource-label">Crisis Text Line</span>
|
||||
<span class="resource-value">Text HOME to 741741</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="crisis-actions">
|
||||
<button id="crisis-close-btn" class="crisis-btn">I AM SAFE</button>
|
||||
<a href="tel:988" class="crisis-btn crisis-btn-call">CALL 988 NOW</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
144
js/crisis-detector.js
Normal file
144
js/crisis-detector.js
Normal file
@@ -0,0 +1,144 @@
|
||||
|
||||
/**
|
||||
* CrisisDetector — Canonical Frontend Implementation
|
||||
*
|
||||
* Single source of truth for crisis keyword detection in the browser.
|
||||
* Consolidated from the-door/crisis/detect.py.
|
||||
*/
|
||||
|
||||
export const CRISIS_LEVELS = {
|
||||
NONE: 'NONE',
|
||||
LOW: 'LOW',
|
||||
MEDIUM: 'MEDIUM',
|
||||
HIGH: 'HIGH',
|
||||
CRITICAL: 'CRITICAL'
|
||||
};
|
||||
|
||||
const CRITICAL_INDICATORS = [
|
||||
/\bbetter off without me\b/i,
|
||||
/\bkill\s*(my)?self\b/i,
|
||||
/\bend\s*my\s*life\b/i,
|
||||
/\bsuicid(?:al|ed|e)\b/i,
|
||||
/\bnot\s+worth\s+living\b/i,
|
||||
/\bbetter\s+off\s+dead\b/i,
|
||||
/\bend\s+it\s+all\b/i,
|
||||
/\bno\s+reason\s+to\s+live\b/i,
|
||||
/\bdon'?t\s+want\s+to\s+live\b/i,
|
||||
/\bwant\s+to\s+die\b/i,
|
||||
/\bgoing\s+to\s+(?:kill\s+myself|die)\b/i,
|
||||
/\bplan\s+to\s+(?:end|kill|die)\b/i,
|
||||
/\btired\s+of\s+(?:living|life|existence)\b/i,
|
||||
/\bsaying\s+goodbye\s+(?:forever|permanently|one\s+last\s+time)\b/i,
|
||||
/\bwrote\s+a\s+suicide\s*(?:note|letter)\b/i,
|
||||
/\bgiving\s+away\s+(?:my|all\s+my)\s+(?:stuff|things|possessions?)\s+(?:to|because|—)\b/i,
|
||||
/\btied\s+(?:up|down)\s+my\s+(?:loose\s+)?ends/i
|
||||
];
|
||||
|
||||
const HIGH_INDICATORS = [
|
||||
/\bdespair\b/i,
|
||||
/\bhopeless(?:ly)?\s+(?:about\s+(?:my|this|everything|life)|inside|right\s+now)\b/i,
|
||||
/\bno(?!t)\s+(?:one|body|point|hope|way\s+out)\b/i,
|
||||
/\bno\s+future\s+(?:for\s+me|ahead|left)\b/i,
|
||||
/\beverything\s+is\s+(?:pointless|broken|ruined)\b/i,
|
||||
/\bcan'?t\s+take\s+this\s+anymore\b/i,
|
||||
/\bdon'?t\s+care\s+if\s+I\s+die\b/i,
|
||||
/\bwish\s+I\s+(?:was|were)\s+(?:dead|gone|never\s+born)\b/i,
|
||||
/\bdon'?t\s+matter\s+if\s+I\s+exist\b/i,
|
||||
/\bno\s+one\s+would\s+(?:care|miss)\b/i,
|
||||
/\bworld\s+would?\s+be\s+better\s+without\s+me\b/i,
|
||||
/\bin\s+so\s+much\s+(?:pain|agony|suffering|torment|anguish)\b/i,
|
||||
/\bcan'?t\s+see\s+any\s+(?:point|reason|hope|way)\b/i,
|
||||
/\bescape\s+from\s*this/i,
|
||||
/\bjust\s+want\s+it\s+to\s+stop\b/i,
|
||||
/\bnothing\s+left\s+(?:to\s+(?:live\s+for|hope\s+for|give)|inside)\b/i,
|
||||
/\bdisappeared\s+forever\b/i,
|
||||
/\bfeel(?:s|ing)?\s+(?:so\s+)?hopeless\b/i,
|
||||
/\beverything\s+is\s+hopeless\b/i,
|
||||
/\bcan'?t\s+(?:go\s+on|keep\s+going)\b/i,
|
||||
/\bgive(?:n)?\s*up\s+(?:on\s+)?(?:life|living|everything)\b/i,
|
||||
/\bgive(?:n)?\s*up\s+on\s+myself\b/i,
|
||||
/\bno\s*point\s+(?:in\s+)?living\b/i,
|
||||
/\bno\s*hope\s+(?:left|remaining)\b/i,
|
||||
/\bno\s*way\s*out\b/i,
|
||||
/\bfeel(?:s|ing)?\s+trapped\b/i,
|
||||
/\btrapped\s+in\s+this\s+(?:situation|life|pain|darkness|hell)\b/i,
|
||||
/\btrapped\s+and\s+can'?t\s+escape\b/i,
|
||||
/\bdesperate\s+(?:for\s+)?help\b/i,
|
||||
/\bfeel(?:s|ing)?\s+desperate\b/i
|
||||
];
|
||||
|
||||
const MEDIUM_INDICATORS = [
|
||||
/\bno\s+hope\b/i,
|
||||
/\bforgotten\b/i,
|
||||
/\balone\s+in\s+this\b/i,
|
||||
/\balways\s+alone\b/i,
|
||||
/\bnobody\s+(?:understands|cares)\b/i,
|
||||
/\bwish\s+I\s+could\b/i,
|
||||
/\bexhaust(?:ed|ion|ing)\b/i,
|
||||
/\bnumb\b/i,
|
||||
/\bempty\b/i,
|
||||
/\bworthless\b/i,
|
||||
/\buseless\b/i,
|
||||
/\bbroken\b/i,
|
||||
/\bdark(ness)?\b/i,
|
||||
/\bdepress(?:ed|ion)\b/i,
|
||||
/\bcrying\b/i,
|
||||
/\btears\b/i,
|
||||
/\bsad(ness)?\b/i,
|
||||
/\bmiserable\b/i,
|
||||
/\boverwhelm(?:ed|ing)\b/i,
|
||||
/\bfailing\b/i,
|
||||
/\bcannot\s+cope\b/i,
|
||||
/\blosing\s*(?:my)?\s*control\b/i,
|
||||
/\bdown\s*for\s*the\s*count\b/i,
|
||||
/\bsinking\b/i,
|
||||
/\bdrowning\b/i,
|
||||
/\bhopeless\b/i,
|
||||
/\blost\s+all\s+hope\b/i,
|
||||
/\bno\s+tomorrow\b/i
|
||||
];
|
||||
|
||||
export class CrisisDetector {
|
||||
constructor() {
|
||||
this.metrics = {
|
||||
scans: 0,
|
||||
detections: 0,
|
||||
lastLevel: CRISIS_LEVELS.NONE
|
||||
};
|
||||
}
|
||||
|
||||
detect(text) {
|
||||
this.metrics.scans++;
|
||||
if (!text) return { level: CRISIS_LEVELS.NONE, score: 0 };
|
||||
|
||||
const matches = {
|
||||
CRITICAL: CRITICAL_INDICATORS.filter(re => re.test(text)),
|
||||
HIGH: HIGH_INDICATORS.filter(re => re.test(text)),
|
||||
MEDIUM: MEDIUM_INDICATORS.filter(re => re.test(text))
|
||||
};
|
||||
|
||||
if (matches.CRITICAL.length > 0) {
|
||||
this.metrics.detections++;
|
||||
this.metrics.lastLevel = CRISIS_LEVELS.CRITICAL;
|
||||
return { level: CRISIS_LEVELS.CRITICAL, score: 1.0, indicators: matches.CRITICAL };
|
||||
}
|
||||
|
||||
if (matches.HIGH.length > 0) {
|
||||
this.metrics.detections++;
|
||||
this.metrics.lastLevel = CRISIS_LEVELS.HIGH;
|
||||
return { level: CRISIS_LEVELS.HIGH, score: 0.75, indicators: matches.HIGH };
|
||||
}
|
||||
|
||||
if (matches.MEDIUM.length >= 2) {
|
||||
this.metrics.detections++;
|
||||
this.metrics.lastLevel = CRISIS_LEVELS.MEDIUM;
|
||||
return { level: CRISIS_LEVELS.MEDIUM, score: 0.5, indicators: matches.MEDIUM };
|
||||
}
|
||||
|
||||
return { level: CRISIS_LEVELS.NONE, score: 0 };
|
||||
}
|
||||
|
||||
getMetrics() {
|
||||
return this.metrics;
|
||||
}
|
||||
}
|
||||
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;
|
||||
@@ -4,48 +4,61 @@ Sync branch protection rules from .gitea/branch-protection/*.yml to Gitea.
|
||||
Correctly uses the Gitea 1.25+ API (not GitHub-style).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
GITEA_URL = os.getenv("GITEA_URL", "https://forge.alexanderwhitestone.com")
|
||||
GITEA_TOKEN = os.getenv("GITEA_TOKEN", "")
|
||||
ORG = "Timmy_Foundation"
|
||||
CONFIG_DIR = ".gitea/branch-protection"
|
||||
PROJECT_ROOT = Path(__file__).resolve().parent.parent
|
||||
CONFIG_DIR = PROJECT_ROOT / ".gitea" / "branch-protection"
|
||||
|
||||
|
||||
def api_request(method: str, path: str, payload: dict | None = None) -> dict:
|
||||
url = f"{GITEA_URL}/api/v1{path}"
|
||||
data = json.dumps(payload).encode() if payload else None
|
||||
req = urllib.request.Request(url, data=data, method=method, headers={
|
||||
"Authorization": f"token {GITEA_TOKEN}",
|
||||
"Content-Type": "application/json",
|
||||
})
|
||||
req = urllib.request.Request(
|
||||
url,
|
||||
data=data,
|
||||
method=method,
|
||||
headers={
|
||||
"Authorization": f"token {GITEA_TOKEN}",
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
)
|
||||
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||
return json.loads(resp.read().decode())
|
||||
|
||||
|
||||
def apply_protection(repo: str, rules: dict) -> bool:
|
||||
branch = rules.pop("branch", "main")
|
||||
# Check if protection already exists
|
||||
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
|
||||
exists = any(r.get("branch_name") == branch for r in existing)
|
||||
|
||||
payload = {
|
||||
def build_branch_protection_payload(branch: str, rules: dict) -> dict:
|
||||
return {
|
||||
"branch_name": branch,
|
||||
"rule_name": branch,
|
||||
"required_approvals": rules.get("required_approvals", 1),
|
||||
"block_on_rejected_reviews": rules.get("block_on_rejected_reviews", True),
|
||||
"dismiss_stale_approvals": rules.get("dismiss_stale_approvals", True),
|
||||
"block_deletions": rules.get("block_deletions", True),
|
||||
"block_force_push": rules.get("block_force_push", True),
|
||||
"block_force_push": rules.get("block_force_push", rules.get("block_force_pushes", True)),
|
||||
"block_admin_merge_override": rules.get("block_admin_merge_override", True),
|
||||
"enable_status_check": rules.get("require_ci_to_merge", False),
|
||||
"status_check_contexts": rules.get("status_check_contexts", []),
|
||||
"block_on_outdated_branch": rules.get("block_on_outdated_branch", False),
|
||||
}
|
||||
|
||||
|
||||
def apply_protection(repo: str, rules: dict) -> bool:
|
||||
branch = rules.get("branch", "main")
|
||||
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
|
||||
exists = any(rule.get("branch_name") == branch for rule in existing)
|
||||
payload = build_branch_protection_payload(branch, rules)
|
||||
|
||||
try:
|
||||
if exists:
|
||||
api_request("PATCH", f"/repos/{ORG}/{repo}/branch_protections/{branch}", payload)
|
||||
@@ -53,8 +66,8 @@ def apply_protection(repo: str, rules: dict) -> bool:
|
||||
api_request("POST", f"/repos/{ORG}/{repo}/branch_protections", payload)
|
||||
print(f"✅ {repo}:{branch} synced")
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"❌ {repo}:{branch} failed: {e}")
|
||||
except Exception as exc:
|
||||
print(f"❌ {repo}:{branch} failed: {exc}")
|
||||
return False
|
||||
|
||||
|
||||
@@ -62,15 +75,18 @@ def main() -> int:
|
||||
if not GITEA_TOKEN:
|
||||
print("ERROR: GITEA_TOKEN not set")
|
||||
return 1
|
||||
if not CONFIG_DIR.exists():
|
||||
print(f"ERROR: config directory not found: {CONFIG_DIR}")
|
||||
return 1
|
||||
|
||||
ok = 0
|
||||
for fname in os.listdir(CONFIG_DIR):
|
||||
if not fname.endswith(".yml"):
|
||||
continue
|
||||
repo = fname[:-4]
|
||||
with open(os.path.join(CONFIG_DIR, fname)) as f:
|
||||
cfg = yaml.safe_load(f)
|
||||
if apply_protection(repo, cfg.get("rules", {})):
|
||||
for cfg_path in sorted(CONFIG_DIR.glob("*.yml")):
|
||||
repo = cfg_path.stem
|
||||
with cfg_path.open() as fh:
|
||||
cfg = yaml.safe_load(fh) or {}
|
||||
rules = cfg.get("rules", {})
|
||||
rules.setdefault("branch", cfg.get("branch", "main"))
|
||||
if apply_protection(repo, rules):
|
||||
ok += 1
|
||||
|
||||
print(f"\nSynced {ok} repo(s)")
|
||||
|
||||
92
style.css
92
style.css
@@ -2934,3 +2934,95 @@ body.operator-mode #mode-label {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* === CRISIS OVERLAY === */
|
||||
.crisis-overlay {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(255, 0, 0, 0.2);
|
||||
backdrop-filter: blur(20px);
|
||||
z-index: 9999;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
animation: crisis-pulse 2s infinite;
|
||||
}
|
||||
@keyframes crisis-pulse {
|
||||
0%, 100% { background: rgba(255, 0, 0, 0.2); }
|
||||
50% { background: rgba(255, 0, 0, 0.4); }
|
||||
}
|
||||
.crisis-overlay-content {
|
||||
background: #0a0a1a;
|
||||
border: 2px solid #ff4466;
|
||||
border-radius: 12px;
|
||||
padding: 40px;
|
||||
max-width: 500px;
|
||||
text-align: center;
|
||||
box-shadow: 0 0 100px rgba(255, 68, 102, 0.5);
|
||||
}
|
||||
.crisis-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 12px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.crisis-icon { font-size: 32px; }
|
||||
.crisis-title {
|
||||
font-family: var(--font-display);
|
||||
color: #ff4466;
|
||||
letter-spacing: 2px;
|
||||
font-weight: 800;
|
||||
}
|
||||
.crisis-overlay-content h2 {
|
||||
font-family: var(--font-display);
|
||||
font-size: 28px;
|
||||
margin-bottom: 16px;
|
||||
color: #fff;
|
||||
}
|
||||
.crisis-overlay-content p {
|
||||
color: #a0b8d0;
|
||||
line-height: 1.6;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.crisis-resources {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.resource-item {
|
||||
background: rgba(255, 68, 102, 0.1);
|
||||
padding: 12px;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
.resource-label { font-size: 12px; color: #ff4466; }
|
||||
.resource-value { font-weight: 700; color: #fff; }
|
||||
.crisis-actions {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
}
|
||||
.crisis-btn {
|
||||
flex: 1;
|
||||
padding: 12px;
|
||||
border: 1px solid #ff4466;
|
||||
background: transparent;
|
||||
color: #ff4466;
|
||||
font-family: var(--font-display);
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
border-radius: 6px;
|
||||
text-decoration: none;
|
||||
transition: all 0.2s;
|
||||
}
|
||||
.crisis-btn:hover {
|
||||
background: #ff4466;
|
||||
color: #fff;
|
||||
}
|
||||
.crisis-btn-call {
|
||||
background: #ff4466;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
45
tests/test_sync_branch_protection.py
Normal file
45
tests/test_sync_branch_protection.py
Normal file
@@ -0,0 +1,45 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
PROJECT_ROOT = Path(__file__).parent.parent
|
||||
|
||||
_spec = importlib.util.spec_from_file_location(
|
||||
"sync_branch_protection_test",
|
||||
PROJECT_ROOT / "scripts" / "sync_branch_protection.py",
|
||||
)
|
||||
_mod = importlib.util.module_from_spec(_spec)
|
||||
sys.modules["sync_branch_protection_test"] = _mod
|
||||
_spec.loader.exec_module(_mod)
|
||||
|
||||
build_branch_protection_payload = _mod.build_branch_protection_payload
|
||||
|
||||
|
||||
def test_build_branch_protection_payload_enables_rebase_before_merge():
|
||||
payload = build_branch_protection_payload(
|
||||
"main",
|
||||
{
|
||||
"required_approvals": 1,
|
||||
"dismiss_stale_approvals": True,
|
||||
"require_ci_to_merge": False,
|
||||
"block_deletions": True,
|
||||
"block_force_push": True,
|
||||
"block_on_outdated_branch": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert payload["branch_name"] == "main"
|
||||
assert payload["rule_name"] == "main"
|
||||
assert payload["block_on_outdated_branch"] is True
|
||||
assert payload["required_approvals"] == 1
|
||||
assert payload["enable_status_check"] is False
|
||||
|
||||
|
||||
def test_the_nexus_branch_protection_config_requires_up_to_date_branch():
|
||||
config = yaml.safe_load((PROJECT_ROOT / ".gitea" / "branch-protection" / "the-nexus.yml").read_text())
|
||||
rules = config["rules"]
|
||||
assert rules["block_on_outdated_branch"] is True
|
||||
Reference in New Issue
Block a user