diff --git a/.gitignore b/.gitignore index e69de29..c997a6a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,55 @@ +# Python +__pycache__/ +*.py[cod] +*.pyo +*.pyd +.Python +*.egg-info/ +dist/ +build/ +*.egg +.eggs/ + +# Virtual environment +venv/ +.venv/ +env/ +ENV/ + +# Environment variables — NEVER commit secrets +.env +.env.local +.env.*.local + +# IDE +.idea/ +.vscode/ +*.swp +*.swo +.DS_Store + +# Testing / coverage +.pytest_cache/ +.coverage +htmlcov/ +.tox/ + +# Mypy +.mypy_cache/ + +# Logs +*.log +logs/ + +# Data / models +data/ +*.joblib + +# Node / Electron (frontend/overlay) +frontend/overlay/node_modules/ +frontend/overlay/dist/ +frontend/overlay/out/ +frontend/overlay/package-lock.json + +# Docker +*.dockerignore diff --git a/api/main.py b/api/main.py index 7fffd45..569ca33 100644 --- a/api/main.py +++ b/api/main.py @@ -3,9 +3,10 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware -from api.routes import status, mode +from api.routes import status, mode, plugins from api.routes import actions, context from api.websockets import guidance as ws_guidance +from api.websockets import router as ws_router from core.config import settings from core.errors import handle_exception # ✅ NEW @@ -32,6 +33,7 @@ async def startup_event(): logger.info("Execra API starting...") from api.websockets.router import broadcast_action_log from core.hybrid.action_logger import action_logger + action_logger.register_callback(broadcast_action_log) @@ -41,6 +43,7 @@ async def shutdown_event(): logger.info("Execra API shutting down...") from api.websockets.router import broadcast_action_log from core.hybrid.action_logger import action_logger + action_logger.unregister_callback(broadcast_action_log) @@ -50,10 +53,7 @@ def read_root(): try: return { "status": "success", - "data": { - "message": "Execra is running", - "version": "0.1.0" - } + "data": {"message": "Execra is running", "version": "0.1.0"}, } except Exception as e: return handle_exception(e) @@ -66,6 +66,7 @@ def read_root(): app.include_router(mode.router, prefix="/api/v1") app.include_router(actions.router, prefix="/api/v1") app.include_router(context.router, prefix="/api/v1") + app.include_router(plugins.router, prefix="/api/v1") except Exception as e: handle_exception(e) @@ -77,6 +78,7 @@ def read_root(): # WebSocket endpoints (no prefix — WS routes use the path as-is) app.include_router(ws_guidance.router) +app.include_router(ws_router.router) -# Alert suppression endpoints -app.include_router(suppression.router, prefix="/api/v1") \ No newline at end of file +# Alert suppression endpoints +app.include_router(suppression.router, prefix="/api/v1") diff --git a/core/config.py b/core/config.py index 9bcdb30..2f0d48f 100644 --- a/core/config.py +++ b/core/config.py @@ -4,10 +4,11 @@ """ import os -from typing import List, Optional from dataclasses import dataclass, field -from typing import Optional +from typing import List, Optional + from dotenv import load_dotenv + from core.utils.env_validator import assert_env # Load .env file @@ -59,6 +60,18 @@ class Settings: REDIS_URL: str = "redis://localhost:6379" REDIS_AUTH: Optional[str] = None + # WebSocket Configuration + WS_API_TOKEN: str = "" + WS_MAX_CONNECTIONS: int = 100 + WS_RATE_LIMIT_MESSAGES: int = 60 + WS_RATE_LIMIT_WINDOW_S: int = 60 + WS_HEARTBEAT_INTERVAL_S: int = 30 + + # Trust Score Weights + TRUST_SCORE_W1: float = 0.5 + TRUST_SCORE_W2: float = 0.3 + TRUST_SCORE_W3: float = 0.2 + # Trace Anomaly Detection (Isolation Forest) # Expected fraction of anomalous traces in training data. ANOMALY_CONTAMINATION: float = 0.1 @@ -118,6 +131,18 @@ def __post_init__(self): if val := os.getenv("REDIS_PASSWORD"): self.REDIS_AUTH = val + # WebSocket + if val := os.getenv("WS_API_TOKEN"): + self.WS_API_TOKEN = val + if val := os.getenv("WS_MAX_CONNECTIONS"): + self.WS_MAX_CONNECTIONS = int(val) + if val := os.getenv("WS_RATE_LIMIT_MESSAGES"): + self.WS_RATE_LIMIT_MESSAGES = int(val) + if val := os.getenv("WS_RATE_LIMIT_WINDOW_S"): + self.WS_RATE_LIMIT_WINDOW_S = int(val) + if val := os.getenv("WS_HEARTBEAT_INTERVAL_S"): + self.WS_HEARTBEAT_INTERVAL_S = int(val) + # Trust Score Weights if env_val := os.getenv("TRUST_SCORE_W1"): self.TRUST_SCORE_W1 = float(env_val) @@ -167,4 +192,4 @@ def validate_required(self) -> None: # Global settings instance - import this everywhere -settings = Settings() \ No newline at end of file +settings = Settings() diff --git a/core/intelligence/__pycache__/__init__.cpython-314.pyc b/core/intelligence/__pycache__/__init__.cpython-314.pyc deleted file mode 100644 index 0cc4f4f..0000000 Binary files a/core/intelligence/__pycache__/__init__.cpython-314.pyc and /dev/null differ diff --git a/core/intelligence/__pycache__/plugin_rule_engine.cpython-314.pyc b/core/intelligence/__pycache__/plugin_rule_engine.cpython-314.pyc deleted file mode 100644 index 27f546c..0000000 Binary files a/core/intelligence/__pycache__/plugin_rule_engine.cpython-314.pyc and /dev/null differ diff --git a/core/plugins/__pycache__/__init__.cpython-314.pyc b/core/plugins/__pycache__/__init__.cpython-314.pyc deleted file mode 100644 index bc21f6c..0000000 Binary files a/core/plugins/__pycache__/__init__.cpython-314.pyc and /dev/null differ diff --git a/core/plugins/__pycache__/rule_loader.cpython-314.pyc b/core/plugins/__pycache__/rule_loader.cpython-314.pyc deleted file mode 100644 index e0a0acf..0000000 Binary files a/core/plugins/__pycache__/rule_loader.cpython-314.pyc and /dev/null differ diff --git a/frontend/overlay/.gitignore b/frontend/overlay/.gitignore new file mode 100644 index 0000000..11ae43e --- /dev/null +++ b/frontend/overlay/.gitignore @@ -0,0 +1,5 @@ +node_modules/ +dist/ +out/ +*.log +.DS_Store diff --git a/frontend/overlay/README.md b/frontend/overlay/README.md new file mode 100644 index 0000000..22fa7b7 --- /dev/null +++ b/frontend/overlay/README.md @@ -0,0 +1,92 @@ +# Execra Guidance Overlay + +An always-on-top, semi-transparent Electron.js desktop overlay that displays +Execra's real-time guidance over the user's screen while they work. + +--- + +## Prerequisites + +- **Node.js ≥ 18** — [nodejs.org](https://nodejs.org) +- **Execra backend running** — `uvicorn api.main:app --reload` (from project root) + +--- + +## Quick Start + +```bash +# 1. Navigate to this directory +cd frontend/overlay + +# 2. Install dependencies (only needed once) +npm install + +# 3. Launch the overlay +npm start + +# Dev mode (opens DevTools automatically) +npm run dev +``` + +--- + +## Files + +``` +frontend/overlay/ +├── main.js # Electron main process — BrowserWindow config & IPC +├── preload.js # contextBridge — exposes window.execra to renderer +├── package.json # npm config +├── .gitignore +└── renderer/ + ├── index.html # Overlay HTML shell + ├── app.js # UI logic — WebSocket events, rendering, controls + └── styles.css # Glassmorphism dark theme +``` + +--- + +## WebSocket Configuration + +By default the overlay connects to `ws://localhost:8000/ws/guidance` with no auth token +(matches the backend's default dev configuration where `WS_API_TOKEN` is empty). + +To change the URL or add a token, edit the top of `renderer/app.js`: + +```js +const WS_URL = 'ws://localhost:8000/ws/guidance'; +const WS_TOKEN = ''; // set to your WS_API_TOKEN value if configured +``` + +--- + +## UI Components + +| Component | Description | +|---|---| +| **Mode pill** | Shows PASSIVE / ACTIVE / MIXED — updates from each guidance payload | +| **Connection dot** | Green = connected, Red = disconnected, Orange = reconnecting | +| **Confidence bar** | Green ≥85%, Orange 65–84%, Red <65% | +| **Step counter** | "Step N of M" from guidance payload | +| **Source tags** | LLM · Rule Engine · Trace pill badges | +| **Instruction card** | Animated fade-in on each new instruction | +| **Reasoning** | Collapsible — shown when `reasoning` field is non-empty | +| **Error banner** | Red alert with severity icon on `error` messages | +| **Active Mode input** | Shown only in ACTIVE / MIXED mode; sends `{"prompt": "..."}` | +| **Minimize / Expand** | Collapses window to title bar only | + +--- + +## Reconnection + +The overlay reconnects automatically with **exponential back-off** (1 s → 2 s → 4 s … up to 30 s) +if the WebSocket drops unexpectedly. A normal close (code 1000) does not trigger reconnection. + +--- + +## Security + +- `contextIsolation: true` and `nodeIntegration: false` — renderer is fully sandboxed +- Only the `window.execra` API (defined in `preload.js` via `contextBridge`) is + accessible to renderer code — no direct Node.js or Electron API exposure +- Content Security Policy in `index.html` restricts resource origins diff --git a/frontend/overlay/main.js b/frontend/overlay/main.js new file mode 100644 index 0000000..e7b6f74 --- /dev/null +++ b/frontend/overlay/main.js @@ -0,0 +1,121 @@ +/** + * frontend/overlay/main.js + * + * Electron main process for the Execra guidance overlay. + * + * Creates a frameless, always-on-top, semi-transparent BrowserWindow that + * floats over the user's screen and displays real-time guidance from the + * Execra backend via WebSocket. + * + * Security: + * - contextIsolation: true — renderer cannot access Node APIs directly + * - nodeIntegration: false — renderer is sandboxed + * - preload script exposes only the safe window.execra API via contextBridge + * + * IPC channels: + * - 'overlay-minimize' — shrinks the window to collapsed state + * - 'overlay-restore' — restores the window to full height + * - 'overlay-close' — quits the application + */ + +const { app, BrowserWindow, ipcMain, screen } = require('electron'); +const path = require('path'); + +// --------------------------------------------------------------------------- +// Constants +// --------------------------------------------------------------------------- + +const OVERLAY_WIDTH = 380; +const OVERLAY_HEIGHT = 520; +const OVERLAY_MIN_HEIGHT = 56; // collapsed (title bar only) +const MARGIN = 20; // distance from screen edge + +let mainWindow = null; + +// --------------------------------------------------------------------------- +// Window factory +// --------------------------------------------------------------------------- + +function createOverlayWindow() { + const { width: screenWidth, height: screenHeight } = + screen.getPrimaryDisplay().workAreaSize; + + mainWindow = new BrowserWindow({ + width: OVERLAY_WIDTH, + height: OVERLAY_HEIGHT, + x: screenWidth - OVERLAY_WIDTH - MARGIN, + y: screenHeight - OVERLAY_HEIGHT - MARGIN, + + // Appearance + frame: false, + transparent: true, + hasShadow: true, + vibrancy: 'dark', // macOS frosted-glass effect (ignored elsewhere) + visualEffectState: 'active', + + // Behaviour + alwaysOnTop: true, + skipTaskbar: false, + resizable: false, + minimizable: false, // custom minimize via IPC + fullscreenable: false, + movable: true, + + // Security + webPreferences: { + preload: path.join(__dirname, 'preload.js'), + contextIsolation: true, + nodeIntegration: false, + sandbox: true, + }, + }); + + mainWindow.loadFile(path.join(__dirname, 'renderer', 'index.html')); + + // Keep the overlay on top of other always-on-top windows too + mainWindow.setAlwaysOnTop(true, 'screen-saver'); + + // Dev tools in dev mode + if (process.argv.includes('--dev')) { + mainWindow.webContents.openDevTools({ mode: 'detach' }); + } + + mainWindow.on('closed', () => { mainWindow = null; }); +} + +// --------------------------------------------------------------------------- +// IPC handlers +// --------------------------------------------------------------------------- + +ipcMain.on('overlay-minimize', () => { + if (!mainWindow) return; + mainWindow.setSize(OVERLAY_WIDTH, OVERLAY_MIN_HEIGHT, true); +}); + +ipcMain.on('overlay-restore', () => { + if (!mainWindow) return; + mainWindow.setSize(OVERLAY_WIDTH, OVERLAY_HEIGHT, true); +}); + +ipcMain.on('overlay-close', () => { + app.quit(); +}); + +// --------------------------------------------------------------------------- +// App lifecycle +// --------------------------------------------------------------------------- + +app.whenReady().then(() => { + createOverlayWindow(); + + // macOS: re-create window when dock icon is clicked and no windows are open + app.on('activate', () => { + if (BrowserWindow.getAllWindows().length === 0) createOverlayWindow(); + }); +}); + +app.on('window-all-closed', () => { + // On macOS apps typically stay alive — quit unconditionally here + // since the overlay is meant to be explicitly closed. + app.quit(); +}); diff --git a/frontend/overlay/package.json b/frontend/overlay/package.json new file mode 100644 index 0000000..c703d66 --- /dev/null +++ b/frontend/overlay/package.json @@ -0,0 +1,21 @@ +{ + "name": "execra-overlay", + "version": "1.0.0", + "description": "Execra always-on-top guidance overlay — Electron.js frontend", + "main": "main.js", + "scripts": { + "start": "electron .", + "dev": "electron . --dev" + }, + "keywords": [ + "execra", + "electron", + "overlay", + "guidance" + ], + "author": "Execra Contributors", + "license": "MIT", + "devDependencies": { + "electron": "^42.2.0" + } +} diff --git a/frontend/overlay/preload.js b/frontend/overlay/preload.js new file mode 100644 index 0000000..d631773 --- /dev/null +++ b/frontend/overlay/preload.js @@ -0,0 +1,140 @@ +/** + * frontend/overlay/preload.js + * + * Runs in a privileged context (Node.js + Electron APIs available) but + * exposes ONLY a narrow, safe surface to the renderer via contextBridge. + * + * window.execra API exposed to renderer: + * + * connect(wsUrl, token?) — opens WebSocket; auto-reconnects on disconnect + * onMessage(callback) — register a handler for incoming WS messages + * sendPrompt(text) — send {"prompt": text} to the server (Active Mode) + * minimize() — collapse the overlay to title bar + * restore() — expand the overlay to full height + * closeOverlay() — quit the application + */ + +const { contextBridge, ipcRenderer } = require('electron'); + +// --------------------------------------------------------------------------- +// Internal WebSocket state — NOT exposed to renderer directly +// --------------------------------------------------------------------------- + +let _socket = null; +let _messageHandlers = []; +let _wsUrl = null; +let _wsToken = null; +let _reconnectTimer = null; +let _reconnectDelay = 1000; // ms — doubles on each failed attempt (max 30 s) +const MAX_RECONNECT_DELAY = 30000; + +/** + * Open a WebSocket connection to `url`. + * Reconnects automatically with exponential back-off on unexpected close. + */ +function _connect(url, token = '') { + _wsUrl = url; + _wsToken = token; + + const fullUrl = token ? `${url}?token=${encodeURIComponent(token)}` : url; + + if (_socket) { + _socket.onclose = null; // suppress reconnect from the old socket + _socket.close(); + } + + _socket = new WebSocket(fullUrl); + + _socket.onopen = () => { + _reconnectDelay = 1000; // reset back-off on successful connect + _dispatch({ type: 'connected' }); + }; + + _socket.onmessage = (event) => { + try { + const data = JSON.parse(event.data); + _dispatch(data); + } catch { + _dispatch({ type: 'raw', data: event.data }); + } + }; + + _socket.onerror = () => { + _dispatch({ type: 'ws_error' }); + }; + + _socket.onclose = (event) => { + // 1000 = normal (user-initiated) — do NOT reconnect + if (event.code === 1000) { + _dispatch({ type: 'disconnected', clean: true }); + return; + } + + _dispatch({ type: 'disconnected', clean: false, code: event.code }); + + // Exponential back-off reconnect + clearTimeout(_reconnectTimer); + _reconnectTimer = setTimeout(() => { + _reconnectDelay = Math.min(_reconnectDelay * 2, MAX_RECONNECT_DELAY); + _connect(_wsUrl, _wsToken); + }, _reconnectDelay); + }; +} + +/** Dispatch a parsed message object to all registered handlers. */ +function _dispatch(message) { + _messageHandlers.forEach(cb => { + try { cb(message); } catch { /* renderer handler must not crash preload */ } + }); +} + +// --------------------------------------------------------------------------- +// contextBridge — the ONLY surface the renderer can touch +// --------------------------------------------------------------------------- + +contextBridge.exposeInMainWorld('execra', { + /** + * Connect to the Execra guidance WebSocket. + * @param {string} wsUrl e.g. "ws://localhost:8000/ws/guidance" + * @param {string} [token] optional auth token + */ + connect(wsUrl, token = '') { + _connect(wsUrl, token); + }, + + /** + * Register a callback for incoming WebSocket messages. + * The callback receives a parsed JS object. + * @param {function} callback + */ + onMessage(callback) { + if (typeof callback === 'function') { + _messageHandlers.push(callback); + } + }, + + /** + * Send a user prompt to the server (Active Mode). + * @param {string} text + */ + sendPrompt(text) { + if (_socket && _socket.readyState === WebSocket.OPEN) { + _socket.send(JSON.stringify({ prompt: text })); + } + }, + + /** Collapse the overlay window to title-bar height. */ + minimize() { + ipcRenderer.send('overlay-minimize'); + }, + + /** Restore the overlay window to full height. */ + restore() { + ipcRenderer.send('overlay-restore'); + }, + + /** Quit the overlay application. */ + closeOverlay() { + ipcRenderer.send('overlay-close'); + }, +}); diff --git a/frontend/overlay/renderer/app.js b/frontend/overlay/renderer/app.js new file mode 100644 index 0000000..ca07a98 --- /dev/null +++ b/frontend/overlay/renderer/app.js @@ -0,0 +1,350 @@ +/** + * frontend/overlay/renderer/app.js + * + * Renderer-side UI controller for the Execra guidance overlay. + * + * Responsibilities: + * - Connect to the Execra WebSocket guidance endpoint on page load + * - Handle all server event types: guidance, ping, error, connected, disconnected + * - Update every UI element in response to incoming GuidanceInstruction payloads + * - Manage minimize / expand / close lifecycle via window.execra IPC bridge + * - Handle Active Mode input and send prompts + * + * Compatible with both the current stub format {"guidance": "..."} and the + * full GuidanceInstruction schema: + * { instruction, confidence, source, step, total_steps, mode, reasoning, ... } + */ + +'use strict'; + +// --------------------------------------------------------------------------- +// Configuration +// --------------------------------------------------------------------------- + +const WS_URL = 'ws://localhost:8000/ws/guidance'; +const WS_TOKEN = ''; // set if WS_API_TOKEN is configured in .env + +// --------------------------------------------------------------------------- +// DOM references +// --------------------------------------------------------------------------- + +const $ = id => document.getElementById(id); + +const elConnDot = $('conn-dot'); +const elModePill = $('mode-pill'); +const elBtnToggle = $('btn-toggle'); +const elBtnClose = $('btn-close'); +const elIconMinimize = $('icon-minimize'); +const elIconExpand = $('icon-expand'); +const elOverlayBody = $('overlay-body'); +const elErrorBanner = $('error-banner'); +const elErrorText = $('error-text'); +const elStepCounter = $('step-counter'); +const elSourceTags = $('source-tags'); +const elConfidenceFill = $('confidence-fill'); +const elConfidencePct = $('confidence-pct'); +const elConfidenceTrack = $('confidence-track'); +const elInstructionText = $('instruction-text'); +const elReasoningDetails = $('reasoning-details'); +const elReasoningText = $('reasoning-text'); +const elActiveWrap = $('active-input-wrap'); +const elActiveInput = $('active-input'); +const elBtnSend = $('btn-send'); +const elStatusText = $('status-text'); + +// --------------------------------------------------------------------------- +// State +// --------------------------------------------------------------------------- + +let isMinimized = false; + +// --------------------------------------------------------------------------- +// WebSocket event handler +// --------------------------------------------------------------------------- + +/** + * Dispatch an incoming WS message to the appropriate UI handler. + * Handles both the stub format and the full GuidanceInstruction schema. + * + * @param {object} msg - Parsed JSON from the WebSocket + */ +function handleMessage(msg) { + // Internal connection lifecycle events (from preload.js) + if (msg.type === 'connected') { + setConnectionState('connected'); + return; + } + if (msg.type === 'disconnected') { + setConnectionState(msg.clean ? 'disconnected' : 'reconnecting'); + setStatus(msg.clean ? 'Disconnected' : 'Reconnecting…'); + return; + } + if (msg.type === 'ws_error') { + setConnectionState('reconnecting'); + setStatus('Connection error — retrying…'); + return; + } + if (msg.type === 'ping') { + // Heartbeat from server — nothing to render + return; + } + + // ── Error message from server ────────────────────────────────────────── + if (msg.error) { + showError(msg.error); + return; + } + + // ── Full GuidanceInstruction payload ────────────────────────────────── + if (msg.instruction) { + hideError(); + renderGuidance({ + instruction: msg.instruction, + confidence: msg.confidence ?? 1.0, + source: msg.source ?? [], + step: msg.step ?? 1, + total_steps: msg.total_steps ?? 1, + mode: msg.mode ?? 'passive', + reasoning: msg.reasoning ?? '', + }); + return; + } + + // ── Stub format: {"guidance": "..."} ────────────────────────────────── + if (msg.guidance) { + hideError(); + renderGuidance({ + instruction: msg.guidance, + confidence: 1.0, + source: [], + step: 1, + total_steps: 1, + mode: 'passive', + reasoning: '', + }); + } +} + +// --------------------------------------------------------------------------- +// UI renderers +// --------------------------------------------------------------------------- + +/** + * Render a full guidance payload into all UI components. + * @param {{ instruction, confidence, source, step, total_steps, mode, reasoning }} g + */ +function renderGuidance({ instruction, confidence, source, step, total_steps, mode, reasoning }) { + renderInstruction(instruction); + renderConfidence(confidence); + renderStepCounter(step, total_steps); + renderSourceTags(source); + renderMode(mode); + renderReasoning(reasoning); + setStatus(`Updated ${new Date().toLocaleTimeString()}`); +} + +/** + * Animate the instruction text with a fade-in on change. + * @param {string} text + */ +function renderInstruction(text) { + elInstructionText.classList.remove('fade-in'); + // Trigger reflow to restart animation + void elInstructionText.offsetWidth; + elInstructionText.textContent = text; + elInstructionText.classList.add('fade-in'); +} + +/** + * Update the confidence bar colour and width. + * Green ≥85%, Orange 65–84%, Red <65%. + * @param {number} score - 0.0 to 1.0 + */ +function renderConfidence(score) { + const pct = Math.round(score * 100); + elConfidenceFill.style.width = `${pct}%`; + + elConfidenceFill.classList.remove('high', 'medium', 'low'); + let cls, color; + if (pct >= 85) { + cls = 'high'; + color = '#22c55e'; + } else if (pct >= 65) { + cls = 'medium'; + color = '#f97316'; + } else { + cls = 'low'; + color = '#ef4444'; + } + elConfidenceFill.classList.add(cls); + + elConfidencePct.textContent = `${pct}%`; + elConfidencePct.style.color = color; + elConfidenceTrack.setAttribute('aria-valuenow', pct); +} + +/** + * Update the "Step N of M" counter. + * @param {number} step + * @param {number} total + */ +function renderStepCounter(step, total) { + elStepCounter.textContent = `Step ${step} of ${total}`; +} + +/** + * Render source tag pills (LLM, Rule Engine, Trace, or custom). + * @param {string[]} sources + */ +function renderSourceTags(sources) { + elSourceTags.innerHTML = ''; + if (!Array.isArray(sources) || sources.length === 0) return; + + sources.forEach(src => { + const pill = document.createElement('span'); + pill.className = 'source-tag'; + + const lc = src.toLowerCase(); + if (lc === 'llm') { + pill.classList.add('tag-llm'); + pill.textContent = 'LLM'; + } else if (lc.includes('rule')) { + pill.classList.add('tag-rule'); + pill.textContent = 'Rule Engine'; + } else if (lc.includes('trace') || lc.includes('execution')) { + pill.classList.add('tag-trace'); + pill.textContent = 'Trace'; + } else { + pill.classList.add('tag-other'); + pill.textContent = src; + } + + elSourceTags.appendChild(pill); + }); +} + +/** + * Update the mode pill and show/hide the Active Mode input. + * @param {'passive'|'active'|'mixed'|'safe'|'expert'} mode + */ +function renderMode(mode) { + // Normalise backend 'safe'→'passive', 'expert'→'active' + const normalised = mode === 'safe' ? 'passive' : mode === 'expert' ? 'active' : mode; + + elModePill.className = `mode-pill mode-${normalised}`; + elModePill.textContent = normalised.toUpperCase(); + + // Show Active Mode input only in active or mixed mode + const showInput = normalised === 'active' || normalised === 'mixed'; + elActiveWrap.style.display = showInput ? 'flex' : 'none'; +} + +/** + * Show reasoning section if text is non-empty. + * @param {string} text + */ +function renderReasoning(text) { + if (text && text.trim()) { + elReasoningText.textContent = text; + elReasoningDetails.style.display = 'block'; + } else { + elReasoningDetails.style.display = 'none'; + } +} + +// --------------------------------------------------------------------------- +// Error helpers +// --------------------------------------------------------------------------- + +function showError(message) { + elErrorText.textContent = message; + elErrorBanner.style.display = 'flex'; +} + +function hideError() { + elErrorBanner.style.display = 'none'; + elErrorText.textContent = ''; +} + +// --------------------------------------------------------------------------- +// Connection status helpers +// --------------------------------------------------------------------------- + +/** + * @param {'connected'|'disconnected'|'reconnecting'} state + */ +function setConnectionState(state) { + elConnDot.className = `conn-dot conn-${state}`; + elConnDot.title = { + connected: 'Connected to Execra', + disconnected: 'Disconnected', + reconnecting: 'Reconnecting…', + }[state] ?? state; +} + +function setStatus(text) { + elStatusText.textContent = text; +} + +// --------------------------------------------------------------------------- +// Minimize / Expand toggle +// --------------------------------------------------------------------------- + +function toggleMinimize() { + isMinimized = !isMinimized; + + if (isMinimized) { + elOverlayBody.style.display = 'none'; + elIconMinimize.style.display = 'none'; + elIconExpand.style.display = 'block'; + elBtnToggle.setAttribute('aria-label', 'Expand overlay'); + window.execra.minimize(); + } else { + elOverlayBody.style.display = ''; + elIconMinimize.style.display = 'block'; + elIconExpand.style.display = 'none'; + elBtnToggle.setAttribute('aria-label', 'Minimize overlay'); + window.execra.restore(); + } +} + +// --------------------------------------------------------------------------- +// Active Mode: send prompt on button click or Enter key +// --------------------------------------------------------------------------- + +function sendPrompt() { + const text = elActiveInput.value.trim(); + if (!text) return; + window.execra.sendPrompt(text); + elActiveInput.value = ''; + elActiveInput.focus(); +} + +elBtnSend.addEventListener('click', sendPrompt); + +elActiveInput.addEventListener('keydown', e => { + if (e.key === 'Enter' && !e.shiftKey) { + e.preventDefault(); + sendPrompt(); + } +}); + +// --------------------------------------------------------------------------- +// Title bar controls +// --------------------------------------------------------------------------- + +elBtnToggle.addEventListener('click', toggleMinimize); + +elBtnClose.addEventListener('click', () => { + window.execra.closeOverlay(); +}); + +// --------------------------------------------------------------------------- +// Bootstrap: connect to WebSocket and register message handler +// --------------------------------------------------------------------------- + +setStatus('Connecting…'); +setConnectionState('reconnecting'); + +window.execra.onMessage(handleMessage); +window.execra.connect(WS_URL, WS_TOKEN); diff --git a/frontend/overlay/renderer/index.html b/frontend/overlay/renderer/index.html new file mode 100644 index 0000000..e8ab520 --- /dev/null +++ b/frontend/overlay/renderer/index.html @@ -0,0 +1,110 @@ + + + + + + + Execra Guidance Overlay + + + + + + + + +
+ + +
+
+ + Execra + + PASSIVE +
+
+ + + + + + +
+
+ + +
+ + + + + +
+ Step — of — + +
+
+ + +
+
+ Confidence + — +
+
+
+
+
+ + +
+

Waiting for guidance…

+
+ + + + + + + + +
+ Connecting… +
+ +
+
+ + + + diff --git a/frontend/overlay/renderer/styles.css b/frontend/overlay/renderer/styles.css new file mode 100644 index 0000000..fefecf2 --- /dev/null +++ b/frontend/overlay/renderer/styles.css @@ -0,0 +1,465 @@ +/** + * frontend/overlay/renderer/styles.css + * + * Glassmorphism dark theme for the Execra guidance overlay. + * Palette: deep navy / midnight base with accent violet + semantic colours. + */ + +/* ─── Reset & Base ──────────────────────────────────────────────────────── */ +*, *::before, *::after { + box-sizing: border-box; + margin: 0; + padding: 0; +} + +:root { + /* Core glass surface */ + --bg-glass: rgba(10, 10, 20, 0.85); + --bg-glass-inner: rgba(255, 255, 255, 0.04); + --bg-glass-hover: rgba(255, 255, 255, 0.08); + --blur-radius: 20px; + + /* Typography */ + --font-body: 'Inter', system-ui, -apple-system, sans-serif; + --text-primary: #e8eaf0; + --text-secondary: #8b92a8; + --text-muted: #5a6070; + + /* Borders */ + --border: rgba(255, 255, 255, 0.09); + --border-subtle: rgba(255, 255, 255, 0.05); + + /* Accent */ + --accent: #7c6ee0; + --accent-glow: rgba(124, 110, 224, 0.3); + --accent-hover: #9180f4; + + /* Semantic colours */ + --green: #22c55e; + --green-bg: rgba(34, 197, 94, 0.12); + --orange: #f97316; + --orange-bg: rgba(249, 115, 22, 0.12); + --red: #ef4444; + --red-bg: rgba(239, 68, 68, 0.12); + + /* Mode pills */ + --mode-passive: #3b82f6; + --mode-active: #22c55e; + --mode-mixed: #f97316; + + /* Source tag colours */ + --tag-llm: rgba(124, 110, 224, 0.25); + --tag-rule: rgba(34, 197, 94, 0.20); + --tag-trace: rgba(249, 115, 22, 0.20); + + /* Radius */ + --radius-sm: 6px; + --radius-md: 10px; + --radius-lg: 16px; + --radius-full: 999px; + + /* Transitions */ + --transition: 0.2s ease; + --transition-slow: 0.4s ease; +} + +/* ─── Body ──────────────────────────────────────────────────────────────── */ +html, body { + width: 100%; + height: 100%; + overflow: hidden; + background: transparent; + font-family: var(--font-body); + font-size: 13px; + color: var(--text-primary); + -webkit-font-smoothing: antialiased; +} + +/* ─── Root Overlay Card ─────────────────────────────────────────────────── */ +.overlay { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + + background: var(--bg-glass); + backdrop-filter: blur(var(--blur-radius)) saturate(180%); + -webkit-backdrop-filter: blur(var(--blur-radius)) saturate(180%); + + border: 1px solid var(--border); + border-radius: var(--radius-lg); + overflow: hidden; + + box-shadow: + 0 8px 32px rgba(0, 0, 0, 0.6), + 0 2px 8px rgba(0, 0, 0, 0.4), + inset 0 1px 0 rgba(255, 255, 255, 0.06); +} + +/* ─── Title Bar ─────────────────────────────────────────────────────────── */ +.title-bar { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 10px 0 14px; + height: 42px; + flex-shrink: 0; + + background: rgba(255, 255, 255, 0.03); + border-bottom: 1px solid var(--border); + + /* Make the title bar the drag region */ + -webkit-app-region: drag; + user-select: none; +} + +.title-bar-left, .title-bar-right { + display: flex; + align-items: center; + gap: 8px; +} + +/* Buttons must opt OUT of drag region */ +.title-bar-right { + -webkit-app-region: no-drag; +} + +.execra-logo { + font-size: 16px; + color: var(--accent); + line-height: 1; + filter: drop-shadow(0 0 6px var(--accent-glow)); +} + +.execra-wordmark { + font-size: 13px; + font-weight: 600; + letter-spacing: 0.03em; + color: var(--text-primary); +} + +/* ─── Mode Pill ─────────────────────────────────────────────────────────── */ +.mode-pill { + font-size: 9px; + font-weight: 700; + letter-spacing: 0.08em; + padding: 2px 7px; + border-radius: var(--radius-full); + transition: background var(--transition), color var(--transition); +} + +.mode-passive { background: rgba(59, 130, 246, 0.2); color: var(--mode-passive); border: 1px solid rgba(59,130,246,0.35); } +.mode-active { background: rgba(34, 197, 94, 0.2); color: var(--mode-active); border: 1px solid rgba(34,197,94,0.35); } +.mode-mixed { background: rgba(249, 115, 22, 0.2); color: var(--mode-mixed); border: 1px solid rgba(249,115,22,0.35); } + +/* ─── Connection Status Dot ─────────────────────────────────────────────── */ +.conn-dot { + width: 7px; + height: 7px; + border-radius: 50%; + flex-shrink: 0; + transition: background var(--transition); +} + +.conn-connected { background: var(--green); box-shadow: 0 0 6px var(--green); } +.conn-disconnected { background: var(--red); box-shadow: 0 0 6px var(--red); } +.conn-reconnecting { background: var(--orange); animation: pulse 1s infinite; } + +@keyframes pulse { + 0%, 100% { opacity: 1; } + 50% { opacity: 0.35; } +} + +/* ─── Icon Buttons ──────────────────────────────────────────────────────── */ +.icon-btn { + display: flex; + align-items: center; + justify-content: center; + width: 26px; + height: 26px; + padding: 0; + background: transparent; + border: none; + border-radius: var(--radius-sm); + color: var(--text-secondary); + cursor: pointer; + transition: background var(--transition), color var(--transition); + -webkit-app-region: no-drag; +} + +.icon-btn svg { width: 13px; height: 13px; } + +.icon-btn:hover { + background: var(--bg-glass-hover); + color: var(--text-primary); +} + +.icon-btn-close:hover { + background: rgba(239, 68, 68, 0.2); + color: var(--red); +} + +/* ─── Overlay Body ──────────────────────────────────────────────────────── */ +.overlay-body { + flex: 1; + display: flex; + flex-direction: column; + gap: 10px; + padding: 12px 14px 10px; + overflow: hidden; +} + +/* ─── Error Banner ──────────────────────────────────────────────────────── */ +.error-banner { + display: flex; + align-items: center; + gap: 8px; + padding: 8px 11px; + background: var(--red-bg); + border: 1px solid rgba(239, 68, 68, 0.35); + border-radius: var(--radius-md); + animation: slideDown 0.25s ease; +} + +@keyframes slideDown { + from { opacity: 0; transform: translateY(-6px); } + to { opacity: 1; transform: translateY(0); } +} + +.error-icon { + font-size: 14px; + color: var(--red); + flex-shrink: 0; +} + +.error-text { + font-size: 12px; + color: #fca5a5; + line-height: 1.4; +} + +/* ─── Step Row ──────────────────────────────────────────────────────────── */ +.step-row { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + gap: 6px; +} + +.step-counter { + font-size: 11px; + font-weight: 600; + color: var(--text-secondary); + letter-spacing: 0.03em; + white-space: nowrap; +} + +/* ─── Source Tags ───────────────────────────────────────────────────────── */ +.source-tags { + display: flex; + gap: 5px; + flex-wrap: wrap; +} + +.source-tag { + font-size: 9px; + font-weight: 700; + letter-spacing: 0.06em; + padding: 2px 7px; + border-radius: var(--radius-full); + text-transform: uppercase; +} + +.tag-llm { background: var(--tag-llm); color: #b8adff; border: 1px solid rgba(124,110,224,0.4); } +.tag-rule { background: var(--tag-rule); color: #86efac; border: 1px solid rgba(34,197,94,0.35); } +.tag-trace { background: var(--tag-trace); color: #fdba74; border: 1px solid rgba(249,115,22,0.35); } +.tag-other { background: rgba(255,255,255,0.07); color: var(--text-secondary); border: 1px solid var(--border); } + +/* ─── Confidence Bar ────────────────────────────────────────────────────── */ +.confidence-wrap { + display: flex; + flex-direction: column; + gap: 4px; +} + +.confidence-label-row { + display: flex; + justify-content: space-between; + align-items: baseline; +} + +.confidence-label { + font-size: 10px; + font-weight: 600; + color: var(--text-secondary); + text-transform: uppercase; + letter-spacing: 0.07em; +} + +.confidence-pct { + font-size: 12px; + font-weight: 700; + color: var(--text-primary); + font-variant-numeric: tabular-nums; + transition: color var(--transition); +} + +.confidence-track { + width: 100%; + height: 6px; + background: rgba(255, 255, 255, 0.07); + border-radius: var(--radius-full); + overflow: hidden; +} + +.confidence-fill { + height: 100%; + border-radius: var(--radius-full); + width: 0%; + transition: width 0.5s cubic-bezier(0.4, 0, 0.2, 1), background 0.4s ease; +} + +/* Colour states */ +.confidence-fill.high { background: linear-gradient(90deg, #16a34a, var(--green)); } +.confidence-fill.medium { background: linear-gradient(90deg, #c2410c, var(--orange)); } +.confidence-fill.low { background: linear-gradient(90deg, #b91c1c, var(--red)); } + +/* ─── Instruction Card ──────────────────────────────────────────────────── */ +.instruction-card { + flex: 1; + background: var(--bg-glass-inner); + border: 1px solid var(--border-subtle); + border-radius: var(--radius-md); + padding: 12px 13px; + overflow-y: auto; + min-height: 0; + + scrollbar-width: thin; + scrollbar-color: rgba(255,255,255,0.1) transparent; +} + +.instruction-card::-webkit-scrollbar { width: 4px; } +.instruction-card::-webkit-scrollbar-track { background: transparent; } +.instruction-card::-webkit-scrollbar-thumb { background: rgba(255,255,255,0.12); border-radius: 4px; } + +.instruction-text { + font-size: 13px; + font-weight: 400; + line-height: 1.6; + color: var(--text-primary); +} + +/* Fade-in animation for new instruction */ +.instruction-text.fade-in { + animation: fadeInUp 0.35s ease forwards; +} + +@keyframes fadeInUp { + from { opacity: 0; transform: translateY(6px); } + to { opacity: 1; transform: translateY(0); } +} + +/* ─── Reasoning Details ─────────────────────────────────────────────────── */ +.reasoning-details { + border: 1px solid var(--border-subtle); + border-radius: var(--radius-md); + overflow: hidden; +} + +.reasoning-summary { + padding: 7px 11px; + font-size: 11px; + font-weight: 600; + color: var(--text-secondary); + cursor: pointer; + list-style: none; + background: var(--bg-glass-inner); + transition: background var(--transition); +} + +.reasoning-summary:hover { background: var(--bg-glass-hover); } +.reasoning-summary::marker { display: none; } + +.reasoning-text { + padding: 8px 11px; + font-size: 11px; + line-height: 1.55; + color: var(--text-secondary); + border-top: 1px solid var(--border-subtle); +} + +/* ─── Active Mode Input ─────────────────────────────────────────────────── */ +.active-input-wrap { + display: flex; + flex-direction: column; + gap: 5px; +} + +.active-input-label { + font-size: 10px; + font-weight: 600; + color: var(--text-secondary); + text-transform: uppercase; + letter-spacing: 0.07em; +} + +.active-input-row { + display: flex; + gap: 6px; + align-items: center; +} + +.active-input { + flex: 1; + background: var(--bg-glass-inner); + border: 1px solid var(--border); + border-radius: var(--radius-md); + padding: 8px 11px; + font-family: var(--font-body); + font-size: 12px; + color: var(--text-primary); + outline: none; + transition: border-color var(--transition), box-shadow var(--transition); +} + +.active-input::placeholder { color: var(--text-muted); } + +.active-input:focus { + border-color: var(--accent); + box-shadow: 0 0 0 3px var(--accent-glow); +} + +.send-btn { + width: 34px; + height: 34px; + flex-shrink: 0; + display: flex; + align-items: center; + justify-content: center; + background: var(--accent); + border: none; + border-radius: var(--radius-md); + color: #fff; + cursor: pointer; + transition: background var(--transition), transform var(--transition); +} + +.send-btn svg { width: 13px; height: 13px; } + +.send-btn:hover { background: var(--accent-hover); } +.send-btn:active { transform: scale(0.93); } + +/* ─── Footer ────────────────────────────────────────────────────────────── */ +.overlay-footer { + display: flex; + justify-content: center; + padding-top: 2px; +} + +.status-text { + font-size: 10px; + color: var(--text-muted); + letter-spacing: 0.03em; + font-variant-numeric: tabular-nums; +} diff --git a/tests/__pycache__/__init__.cpython-314.pyc b/tests/__pycache__/__init__.cpython-314.pyc deleted file mode 100644 index 1ad79aa..0000000 Binary files a/tests/__pycache__/__init__.cpython-314.pyc and /dev/null differ diff --git a/tests/__pycache__/test_plugin_system.cpython-314-pytest-9.0.3.pyc b/tests/__pycache__/test_plugin_system.cpython-314-pytest-9.0.3.pyc deleted file mode 100644 index 7e352d2..0000000 Binary files a/tests/__pycache__/test_plugin_system.cpython-314-pytest-9.0.3.pyc and /dev/null differ diff --git a/tests/conftest.py b/tests/conftest.py index 4e15839..e0f7797 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,26 +1,17 @@ +import secrets + import numpy as np import pytest + from core.config import Settings -@pytest.fixture -def mock_settings(): - """ - Returns a fresh Settings instance for testing. - """ - return Settings( - LLM_BACKEND="test-model", - OPENAI_API_KEY="test-openai-key", - GEMINI_API_KEY="test-gemini-key", - API_PORT=9999 - ) @pytest.fixture def api_base_url(): - """ - Returns the base URL for the API in tests. - """ + """Returns the base URL for the API in tests.""" return "http://localhost:8000" + @pytest.fixture def sample_frame() -> np.ndarray: """Return a small dummy screen frame for tests.""" @@ -30,24 +21,66 @@ def sample_frame() -> np.ndarray: @pytest.fixture def mock_settings() -> Settings: """Return a Settings object configured for tests.""" - settings = Settings() - settings.LLM_BACKEND = "test-model" - settings.OPENAI_API_KEY = "test-openai-key" - settings.GEMINI_API_KEY = "test-gemini-key" - settings.SCREEN_CAPTURE_FPS = 1 - settings.DETECTION_THRESHOLD = 0.1 - settings.DELTA_THRESHOLD = 0.01 - settings.API_HOST = "127.0.0.1" - settings.API_PORT = 9001 - settings.LOG_LEVEL = "DEBUG" - settings.REDIS_URL = "redis://localhost:6379" - settings.TRUST_SCORE_W1 = 0.4 - settings.TRUST_SCORE_W2 = 0.35 - settings.TRUST_SCORE_W3 = 0.25 - return settings + s = Settings() + s.LLM_BACKEND = "openai" + s.OPENAI_API_KEY = "test-openai-key" + s.GEMINI_API_KEY = "test-gemini-key" + s.ENCRYPTION_KEY = secrets.token_hex(32) + s.SCREEN_CAPTURE_FPS = 1 + s.DETECTION_THRESHOLD = 0.1 + s.DELTA_THRESHOLD = 0.01 + s.API_HOST = "127.0.0.1" + s.API_PORT = 9001 + s.LOG_LEVEL = "DEBUG" + s.REDIS_URL = "redis://localhost:6379" + s.TRUST_SCORE_W1 = 0.4 + s.TRUST_SCORE_W2 = 0.35 + s.TRUST_SCORE_W3 = 0.25 + return s + + +@pytest.fixture(autouse=True) +def isolate_env(monkeypatch): + """ + Prevent local .env values from leaking into tests. + + Clears keys that have strong defaults in Settings but may be overridden + by a developer's .env file (e.g. LLM_BACKEND=local). Each test starts + with a clean slate; tests that need specific values set them explicitly. + """ + keys_to_clear = [ + "LLM_BACKEND", + "OPENAI_API_KEY", + "GEMINI_API_KEY", + "ENCRYPTION_KEY", + "REDIS_URL", + "CAPTURE_FPS", + "LOG_FORMAT", + "SANDBOX_MODE", + "WS_API_TOKEN", + ] + for key in keys_to_clear: + monkeypatch.delenv(key, raising=False) + + +@pytest.fixture(autouse=True) +def encryption_key(monkeypatch): + """Set a valid ENCRYPTION_KEY in the environment for crypto tests.""" + key = secrets.token_hex(32) + monkeypatch.setenv("ENCRYPTION_KEY", key) + # Also patch the module-level settings so crypto.py picks it up + import core.security.crypto as crypto_mod + import core.config as config_mod + + monkeypatch.setattr(config_mod.settings, "ENCRYPTION_KEY", key) + monkeypatch.setattr(crypto_mod, "_fernet_instance", None, raising=False) + return key + + @pytest.fixture(autouse=True, scope="module") def cleanup_module_patches(): """Automatically stops all active mocks after each module finishes execution.""" yield from unittest.mock import patch + patch.stopall() diff --git a/tests/integration/test_perception_bus.py b/tests/integration/test_perception_bus.py index b21f697..09d888e 100644 --- a/tests/integration/test_perception_bus.py +++ b/tests/integration/test_perception_bus.py @@ -1,4 +1,5 @@ import asyncio +import threading from unittest.mock import MagicMock, patch import numpy as np @@ -97,7 +98,7 @@ async def test_perception_bus_integration_flow(mock_video_capture, mock_mss): mock_sct = MagicMock() mock_sct.monitors = [None, {}] fake_screen_frame = np.zeros((10, 10, 4), dtype=np.uint8) - fake_screen_frame[0, 0] = [10, 20, 30, 255] # BGRA + fake_screen_frame[:] = [10, 20, 30, 255] # BGRA mock_sct.grab.return_value = fake_screen_frame mock_mss.return_value.__enter__.return_value = mock_sct @@ -108,16 +109,22 @@ async def test_perception_bus_integration_flow(mock_video_capture, mock_mss): mock_cap.read.return_value = (True, fake_camera_frame) mock_video_capture.return_value = mock_cap - # Instantiate real modules with mocked hardware - screen_cap = ScreenCapture(fps=10) - camera_feed = CameraFeed(fps=10) + class ThreadAsProcess(threading.Thread): + @property + def pid(self): + return 99999 - bus = PerceptionBus( - domain="hybrid", screen_capture=screen_cap, camera_feed=camera_feed - ) + with patch("core.perception.screen_capture.Process", ThreadAsProcess): + # Instantiate real modules with mocked hardware + screen_cap = ScreenCapture(fps=10) + camera_feed = CameraFeed(fps=10) - # Start the bus - await bus.start() + bus = PerceptionBus( + domain="hybrid", screen_capture=screen_cap, camera_feed=camera_feed + ) + + # Start the bus + await bus.start() try: # Give capture threads a brief moment to run and enqueue frames @@ -143,5 +150,7 @@ async def test_perception_bus_integration_flow(mock_video_capture, mock_mss): await bus.stop() # Verify that the capture threads are stopped - assert not screen_cap.thread.is_alive() + assert screen_cap._process is not None + assert not screen_cap._process.is_alive() + assert camera_feed.thread is not None assert not camera_feed.thread.is_alive() diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py index 599ba30..b1caa1a 100644 --- a/tests/unit/test_config.py +++ b/tests/unit/test_config.py @@ -7,7 +7,6 @@ from unittest.mock import patch import pytest -from dotenv import load_dotenv def test_settings_correct_defaults(): @@ -104,12 +103,11 @@ def test_settings_override_via_env_vars(): def test_default_llm_backend_resolves_in_factory(): """Default LLM_BACKEND must match a supported factory branch (not raise ValueError).""" - from unittest.mock import patch from core.config import Settings settings = Settings() backend = settings.LLM_BACKEND.lower() - supported = {"openai", "gemini", "llama"} + supported = {"openai", "gemini", "llama", "local"} assert backend in supported, ( f"Default LLM_BACKEND '{backend}' is not handled by LLMClientFactory. " f"Supported values: {supported}" @@ -127,9 +125,10 @@ def test_settings_missing_required_key_raises_error(): with pytest.raises(ValueError, match="Missing required configuration"): settings.validate_required() - # Now set the keys and validation should pass + # Now set all required keys — validation should pass settings.OPENAI_API_KEY = "sk-test" settings.GEMINI_API_KEY = "gemini-test" + settings.ENCRYPTION_KEY = "a" * 64 settings.validate_required() # Should not raise diff --git a/tests/unit/test_crypto.py b/tests/unit/test_crypto.py index 74b99bd..868f28a 100644 --- a/tests/unit/test_crypto.py +++ b/tests/unit/test_crypto.py @@ -1,9 +1,8 @@ import pytest -from cryptography.fernet import InvalidToken from core.security.crypto import encrypt, decrypt -def test_round_trip_encrypt_decrypt(): +def test_round_trip_encrypt_decrypt(encryption_key): """Encrypted data should decrypt back to the original.""" original = "User edited line 42 in main.py" encrypted = encrypt(original) @@ -12,7 +11,7 @@ def test_round_trip_encrypt_decrypt(): assert decrypted == original -def test_encrypted_data_is_not_plaintext(): +def test_encrypted_data_is_not_plaintext(encryption_key): """Encrypted string should not contain the original plaintext.""" original = "User edited line 42 in main.py" encrypted = encrypt(original) @@ -22,7 +21,7 @@ def test_encrypted_data_is_not_plaintext(): assert "main.py" not in encrypted -def test_encryption_is_non_deterministic(): +def test_encryption_is_non_deterministic(encryption_key): """Same plaintext should encrypt to different ciphertexts (random IV).""" original = "Hello World" encrypted_one = encrypt(original) @@ -33,8 +32,7 @@ def test_encryption_is_non_deterministic(): assert decrypt(encrypted_two) == original - -def test_empty_string_encryption(): +def test_empty_string_encryption(encryption_key): """Empty strings should encrypt and decrypt without error.""" encrypted = encrypt("") decrypted = decrypt(encrypted) @@ -48,7 +46,7 @@ def test_none_input_returns_none(): assert decrypt(None) is None -def test_unicode_and_special_chars(): +def test_unicode_and_special_chars(encryption_key): """Unicode and special characters should round-trip correctly.""" original = "Héllo Wörld! 你好 🌍 \n\t" encrypted = encrypt(original) @@ -57,7 +55,7 @@ def test_unicode_and_special_chars(): assert decrypted == original -def test_invalid_ciphertext_raises_error(): +def test_invalid_ciphertext_raises_error(encryption_key): """Trying to decrypt garbage should raise an exception.""" with pytest.raises(Exception): - decrypt("not-a-valid-ciphertext-at-all") \ No newline at end of file + decrypt("not-a-valid-ciphertext-at-all") diff --git a/tests/unit/test_guidance_dispatcher.py b/tests/unit/test_guidance_dispatcher.py index 0b9c7a0..cca1061 100644 --- a/tests/unit/test_guidance_dispatcher.py +++ b/tests/unit/test_guidance_dispatcher.py @@ -4,6 +4,17 @@ from core.models import GuidanceInstruction from core.hybrid.guidance_dispatcher import GuidanceDispatcher + +@pytest.fixture(autouse=True) +def no_suppression(): + """Bypass alert suppressor so all dispatches reach channels in tests.""" + with patch( + "core.hybrid.guidance_dispatcher.alert_suppressor.should_suppress", + return_value=False, + ): + yield + + @pytest.fixture def instruction(): return GuidanceInstruction( @@ -14,67 +25,71 @@ def instruction(): mode="expert", step=1, total_steps=5, - generated_at=datetime.now(timezone.utc) + generated_at=datetime.now(timezone.utc), ) + def test_register_channel(): dispatcher = GuidanceDispatcher() mock_channel = Mock() dispatcher.register_channel(mock_channel) assert mock_channel in dispatcher._channels + def test_dispatch_calls_registered_channels(instruction): dispatcher = GuidanceDispatcher() channel1 = Mock() channel2 = Mock() dispatcher.register_channel(channel1) dispatcher.register_channel(channel2) - + dispatcher.dispatch(instruction) - + channel1.assert_called_once_with(instruction) channel2.assert_called_once_with(instruction) + def test_dispatch_continues_on_channel_error(instruction): dispatcher = GuidanceDispatcher() bad_channel = Mock(side_effect=Exception("Failed")) good_channel = Mock() - + dispatcher.register_channel(bad_channel) dispatcher.register_channel(good_channel) - + # Should not raise exception despite the bad channel failing dispatcher.dispatch(instruction) - + bad_channel.assert_called_once_with(instruction) good_channel.assert_called_once_with(instruction) + def test_dispatch_error_alert(): dispatcher = GuidanceDispatcher() mock_channel = Mock() dispatcher.register_channel(mock_channel) - + dispatcher.dispatch_error_alert( - message="Failed to connect to camera", - severity="critical", - confidence=1.0 + message="Failed to connect to camera", severity="critical", confidence=1.0 ) - + mock_channel.assert_called_once() called_instruction = mock_channel.call_args[0][0] - + assert called_instruction.instruction == "[CRITICAL] Failed to connect to camera" assert called_instruction.confidence == 1.0 assert called_instruction.source == ["system"] assert called_instruction.mode == "safe" assert called_instruction.step == 0 -@patch('core.hybrid.guidance_dispatcher.notification.notify') + +@patch("core.hybrid.guidance_dispatcher.notification.notify") def test_os_notification_channel(mock_notify, instruction): - dispatcher = GuidanceDispatcher(enable_os_notifications=True) - - dispatcher.dispatch(instruction) - + GuidanceDispatcher(enable_os_notifications=True) + + # Call the static method directly to bypass the try/except wrapper in dispatch + GuidanceDispatcher._os_notification_channel(instruction) + mock_notify.assert_called_once_with( title=f"Execra Guidance - Step {instruction.step}", message=instruction.instruction, diff --git a/tests/unit/test_sanity.py b/tests/unit/test_sanity.py index 9ce44c9..13775eb 100644 --- a/tests/unit/test_sanity.py +++ b/tests/unit/test_sanity.py @@ -4,9 +4,10 @@ def test_sanity(): """ assert 1 + 1 == 2 + def test_mock_settings(mock_settings): """ Verify that the mock_settings fixture is working. """ - assert mock_settings.LLM_BACKEND == "test-model" + assert mock_settings.LLM_BACKEND == "openai" assert mock_settings.API_PORT == 9001