ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(operations): absorb service log sessions
Juan Denisbba20197203e
diff --git a/frontend/src/components/LogsDrawer.jsx b/frontend/src/components/LogsDrawer.jsxdeleted file mode 100644index 778ecdfa..00000000--- a/frontend/src/components/LogsDrawer.jsx+++ /dev/null@@ -1,197 +0,0 @@-import { useState, useEffect, useRef, useCallback } from 'react';-import { useLogsDrawer } from '../contexts/LogsDrawerContext';-import { Button } from '@/components/ui/button';-import { Switch } from '@/components/ui/switch';-import socketService from '../services/socket';-import api from '../services/api';-import { useTranslation } from 'react-i18next';--const MAX_LINES = 1000;-const MIN_HEIGHT = 120;-const DEFAULT_HEIGHT = 300;--const LogsDrawer = () => {- const { t } = useTranslation();- const { drawerState, service, closeDrawer, collapseDrawer, expandDrawer } = useLogsDrawer();- const [lines, setLines] = useState([]);- const [autoScroll, setAutoScroll] = useState(true);- const [height, setHeight] = useState(DEFAULT_HEIGHT);- const logRef = useRef(null);- const dragging = useRef(false);- const startY = useRef(0);- const startHeight = useRef(0);-- // Load initial logs and subscribe to real-time updates- useEffect(() => {- if (!service || drawerState === 'closed') return;-- setLines([]);- let cancelled = false;-- async function loadInitial() {- try {- let data;- if (service.appType === 'docker' && service.containerId) {- data = await api.getDockerAppLogs(service.containerId, 200);- } else if (service.logPath) {- data = await api.getLogs(service.logPath, 200);- }- if (!cancelled && data?.logs) {- const initial = data.logs.split('\n').filter(Boolean);- setLines(initial.slice(-MAX_LINES));- }- } catch { /* initial snapshot is best-effort; live stream still attaches */ }- }- loadInitial();-- socketService.connect();- if (service.logPath) {- socketService.subscribeLogs(service.logPath);- }-- const unsubscribe = socketService.on('log_line', (data) => {- if (cancelled) return;- const line = typeof data === 'string' ? data : data?.line || data?.message || JSON.stringify(data);- setLines(prev => {- const next = [...prev, line];- return next.length > MAX_LINES ? next.slice(-MAX_LINES) : next;- });- });-- return () => {- cancelled = true;- socketService.unsubscribeLogs();- unsubscribe();- };- }, [service, drawerState]);-- // Auto-scroll- useEffect(() => {- if (autoScroll && logRef.current && drawerState === 'expanded') {- logRef.current.scrollTop = logRef.current.scrollHeight;- }- }, [lines, autoScroll, drawerState]);-- // Resize drag handlers- const handleDragStart = useCallback((e) => {- e.preventDefault();- dragging.current = true;- startY.current = e.clientY;- startHeight.current = height;- document.addEventListener('mousemove', handleDragMove);- document.addEventListener('mouseup', handleDragEnd);- }, [height]);-- const handleDragMove = useCallback((e) => {- if (!dragging.current) return;- const diff = startY.current - e.clientY;- const newHeight = Math.max(MIN_HEIGHT, Math.min(window.innerHeight * 0.7, startHeight.current + diff));- setHeight(newHeight);- }, []);-- const handleDragEnd = useCallback(() => {- dragging.current = false;- document.removeEventListener('mousemove', handleDragMove);- document.removeEventListener('mouseup', handleDragEnd);- }, [handleDragMove]);-- function getLineClass(line) {- const lower = line.toLowerCase();- if (lower.includes('error') || lower.includes('critical') || lower.includes('fatal')) return 'logs-drawer__line--error';- if (lower.includes('warn')) return 'logs-drawer__line--warn';- return '';- }-- if (drawerState === 'closed' || !service) return null;-- const lastLine = lines.length > 0 ? lines[lines.length - 1] : 'Waiting for logs...';- const sourceLabel = service.logPath- || (service.containerId ? `docker · ${String(service.containerId).slice(0, 12)}` : null)- || service.appType- || 'live stream';-- if (drawerState === 'collapsed') {- return (- <div className="logs-drawer logs-drawer--collapsed" onClick={expandDrawer}>- <div className="logs-drawer__collapsed-bar">- <span className="logs-drawer__live-dot" />- <span className="logs-drawer__service-name">{service.name}</span>- <span className="logs-drawer__last-line">{lastLine}</span>- <div className="logs-drawer__collapsed-actions">- <Button- variant="ghost"- size="icon"- onClick={(e) => { e.stopPropagation(); closeDrawer(); }}- title={t('app.logsDrawer.close', 'Close')}- >- <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" fill="none" strokeWidth="2">- <line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/>- </svg>- </Button>- </div>- </div>- </div>- );- }-- return (- <div className="logs-drawer logs-drawer--expanded" style={{ height }}>- {/* Resize handle */}- <div className="logs-drawer__resize-handle" onMouseDown={handleDragStart} />-- {/* Header */}- <div className="logs-drawer__header">- <div className="logs-drawer__header-left">- <span className="logs-drawer__ico">- <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" fill="none" strokeWidth="2">- <polyline points="4 17 10 11 4 5"/><line x1="12" y1="19" x2="20" y2="19"/>- </svg>- </span>- <div className="logs-drawer__titles">- <span className="logs-drawer__service-name">{service.name}</span>- <span className="logs-drawer__source">{sourceLabel}</span>- </div>- </div>- <div className="logs-drawer__header-right">- <span className="logs-drawer__live">- <span className="logs-drawer__live-dot" />- {lines.length} lines- </span>- <label className="logs-drawer__toggle">- <Switch checked={autoScroll} onCheckedChange={setAutoScroll} />- <span>{t('app.logsDrawer.autoScroll', 'Auto-scroll')}</span>- </label>- <Button variant="ghost" size="icon" onClick={() => setLines([])} title={t('app.logsDrawer.clear', 'Clear')}>- <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" fill="none" strokeWidth="2">- <polyline points="3 6 5 6 21 6"/>- <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>- </svg>- </Button>- <Button variant="ghost" size="icon" onClick={collapseDrawer} title={t('app.logsDrawer.collapse', 'Collapse')}>- <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" fill="none" strokeWidth="2">- <polyline points="6 9 12 15 18 9"/>- </svg>- </Button>- <Button variant="ghost" size="icon" onClick={closeDrawer} title={t('app.logsDrawer.close2', 'Close')}>- <svg viewBox="0 0 24 24" width="14" height="14" stroke="currentColor" fill="none" strokeWidth="2">- <line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/>- </svg>- </Button>- </div>- </div>-- {/* Log content */}- <div className="logs-drawer__content" ref={logRef}>- {lines.length === 0 ? (- <div className="logs-drawer__empty">{t('app.logsDrawer.waitingForLogs', 'Waiting for logs...')}</div>- ) : (- lines.map((line, i) => (- <div key={i} className={`logs-drawer__line ${getLineClass(line)}`}>{line}</div>- ))- )}- </div>- </div>- );-};--export default LogsDrawer;diff --git a/frontend/src/components/OperationsDock.jsx b/frontend/src/components/OperationsDock.jsxindex 70901dd2..ae703c1c 100644--- a/frontend/src/components/OperationsDock.jsx+++ b/frontend/src/components/OperationsDock.jsx@@ -70,6 +70,47 @@ function OperationProgress({ operation, t }) {);}+function ServiceLogDetail({ session, lines, error, onClear, onClose, logRef, t }) {+ const source = session.logPath+ || (session.containerId != null ? `docker · ${String(session.containerId).slice(0, 12)}` : null)+ || session.appType;+ return (+ <div className="operations-dock__detail">+ <div className="operations-dock__detail-head">+ <div>+ <span className="operations-dock__eyebrow">{t('app.operationsDock.serviceLogs', 'Service log session')}</span>+ <h3>{session.name}</h3>+ </div>+ <Pill kind="green">{t('app.operationsDock.live', 'Live')}</Pill>+ </div>+ <div className="operations-dock__meta">+ <span><SquareTerminal size={13} /> {source}</span>+ <span>{t('app.operationsDock.lineCount', '{{count}} lines', { count: lines.length })}</span>+ </div>+ {error && (+ <div className="operations-dock__error">+ <AlertTriangle size={15} /><span>{error}</span>+ </div>+ )}+ <div className="operations-dock__logs" ref={logRef}>+ {lines.length === 0 ? (+ <span className="operations-dock__logs-empty">{t('app.logsDrawer.waitingForLogs', 'Waiting for logs...')}</span>+ ) : lines.slice(-250).map((line, index) => (+ <div key={index} className="operations-dock__log-line">{line}</div>+ ))}+ </div>+ <footer className="operations-dock__footer operations-dock__footer--end">+ <Button type="button" variant="ghost" size="sm" onClick={onClear}>+ {t('app.logsDrawer.clear', 'Clear')}+ </Button>+ <Button type="button" variant="outline" size="sm" onClick={onClose}>+ {t('app.logsDrawer.close', 'Close')}+ </Button>+ </footer>+ </div>+ );+}+export default function OperationsDock() {const { t } = useTranslation();const toast = useToast();@@ -82,6 +123,11 @@ export default function OperationsDock() {selectedLines,selectedTransport,selectedStreamError,+ logSession,+ serviceLines,+ serviceStreamError,+ clearServiceLines,+ closeLogSession,unreadKeys,unreadCount,collapsed,@@ -101,9 +147,10 @@ export default function OperationsDock() {setCollapsed(true);return;}- if (!selectedOperation && activeOperations[0]) openOperation(activeOperations[0]);+ if (logSession) setCollapsed(false);+ else if (!selectedOperation && activeOperations[0]) openOperation(activeOperations[0]);else setCollapsed(false);- }, [collapsed, selectedOperation, activeOperations, openOperation, setCollapsed]);+ }, [collapsed, logSession, selectedOperation, activeOperations, openOperation, setCollapsed]);useShortcut({id: 'operations-dock-toggle',@@ -125,7 +172,7 @@ export default function OperationsDock() {useEffect(() => {if (logRef.current) logRef.current.scrollTop = logRef.current.scrollHeight;- }, [selectedLines]);+ }, [selectedLines, serviceLines]);const rows = useMemo(() => {if (view === 'attention') return attentionOperations;@@ -278,7 +325,17 @@ export default function OperationsDock() {})}</div>- {selectedOperation ? (+ {logSession ? (+ <ServiceLogDetail+ session={logSession}+ lines={serviceLines}+ error={serviceStreamError}+ onClear={clearServiceLines}+ onClose={closeLogSession}+ logRef={logRef}+ t={t}+ />+ ) : selectedOperation ? (<div className="operations-dock__detail"><div className="operations-dock__detail-head"><div>diff --git a/frontend/src/components/service-detail/LogsTab.jsx b/frontend/src/components/service-detail/LogsTab.jsxindex 50b80933..2d1bb3ed 100644--- a/frontend/src/components/service-detail/LogsTab.jsx+++ b/frontend/src/components/service-detail/LogsTab.jsx@@ -250,7 +250,7 @@ const LogsTab = ({ app }) => {logPath: app.log_path,appType: app.app_type,})}- title={t('app.logsTab.pinToDrawer', 'Pin to drawer')}+ title={t('app.logsTab.pinToDrawer', 'Open in Operations dock')}><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2"><line x1="12" y1="17" x2="12" y2="22"/>diff --git a/frontend/src/contexts/LogsDrawerContext.jsx b/frontend/src/contexts/LogsDrawerContext.jsxindex 1a2fd222..d9132f81 100644--- a/frontend/src/contexts/LogsDrawerContext.jsx+++ b/frontend/src/contexts/LogsDrawerContext.jsx@@ -1,46 +1,30 @@-import { createContext, useContext, useState, useCallback } from 'react';--const LogsDrawerContext = createContext(null);+import { useOperations } from './OperationsContext';+// Compatibility shell for existing callers and extension SDK consumers.+// Log sessions now live in OperationsProvider; no second drawer is rendered.export function LogsDrawerProvider({ children }) {- const [drawerState, setDrawerState] = useState('closed'); // 'closed' | 'collapsed' | 'expanded'- const [service, setService] = useState(null); // { name, containerId, logPath, appType }-- const openDrawer = useCallback((serviceInfo) => {- setService(serviceInfo);- setDrawerState('expanded');- }, []);-- const closeDrawer = useCallback(() => {- setDrawerState('closed');- setService(null);- }, []);-- const toggleDrawer = useCallback(() => {- setDrawerState(prev => {- if (prev === 'closed') return 'expanded';- if (prev === 'expanded') return 'collapsed';- return 'expanded';- });- }, []);-- const collapseDrawer = useCallback(() => {- setDrawerState('collapsed');- }, []);-- const expandDrawer = useCallback(() => {- setDrawerState('expanded');- }, []);-- return (- <LogsDrawerContext.Provider value={{ drawerState, service, openDrawer, closeDrawer, toggleDrawer, collapseDrawer, expandDrawer }}>- {children}- </LogsDrawerContext.Provider>- );+ return children;}+// eslint-disable-next-line react-refresh/only-export-componentsexport function useLogsDrawer() {- const ctx = useContext(LogsDrawerContext);- if (!ctx) throw new Error('useLogsDrawer must be used within LogsDrawerProvider');- return ctx;+ const {+ logSession,+ collapsed,+ openLogSession,+ closeLogSession,+ setCollapsed,+ } = useOperations();++ return {+ drawerState: !logSession ? 'closed' : collapsed ? 'collapsed' : 'expanded',+ service: logSession,+ openDrawer: openLogSession,+ closeDrawer: closeLogSession,+ toggleDrawer: () => {+ if (logSession) setCollapsed((current) => !current);+ },+ collapseDrawer: () => setCollapsed(true),+ expandDrawer: () => setCollapsed(false),+ };}diff --git a/frontend/src/contexts/OperationsContext.jsx b/frontend/src/contexts/OperationsContext.jsxindex 029a15f9..20404454 100644--- a/frontend/src/contexts/OperationsContext.jsx+++ b/frontend/src/contexts/OperationsContext.jsx@@ -10,6 +10,7 @@ import {import { usePolling } from '../hooks/usePolling';import useRunStream from '../hooks/useRunStream';+import useServiceLogStream from '../hooks/useServiceLogStream';import { SOCKET_EVENTS } from '../constants/events';import api from '../services/api';import {@@ -35,6 +36,7 @@ export function OperationsProvider({ children }) {const [collapsed, setCollapsed] = useState(true);const [unreadKeys, setUnreadKeys] = useState(() => new Set());const [loading, setLoading] = useState(true);+ const [logSession, setLogSession] = useState(null);const selectedKeyRef = useRef(selectedKey);const operationsRef = useRef(operations);selectedKeyRef.current = selectedKey;@@ -90,6 +92,7 @@ export function OperationsProvider({ children }) {setSelectedKey(null);setCollapsed(true);setLoading(true);+ setLogSession(null);}, [user?.id]);const activeOperations = useMemo(@@ -118,6 +121,9 @@ export function OperationsProvider({ children }) {enabled: !collapsed && !!selectedRunKind && selectedRunId != null,initialRun: initialSelectedRun,});+ const serviceStream = useServiceLogStream(logSession, {+ enabled: !collapsed && !!logSession,+ });const markRead = useCallback((key) => {setUnreadKeys((current) => {@@ -130,11 +136,23 @@ export function OperationsProvider({ children }) {const openOperation = useCallback((operation) => {const key = typeof operation === 'string' ? operation : operationKey(operation);+ setLogSession(null);setSelectedKey(key);setCollapsed(false);markRead(key);}, [markRead]);+ const openLogSession = useCallback((session) => {+ setSelectedKey(null);+ setLogSession(session);+ setCollapsed(false);+ }, []);++ const closeLogSession = useCallback(() => {+ setLogSession(null);+ setCollapsed(true);+ }, []);+const value = useMemo(() => ({operations,activeOperations,@@ -145,6 +163,10 @@ export function OperationsProvider({ children }) {selectedTransport: selectedStream.transport,selectedStreamError: selectedStream.error,refreshSelected: selectedStream.refetch,+ logSession,+ serviceLines: serviceStream.lines,+ serviceStreamError: serviceStream.error,+ clearServiceLines: serviceStream.clear,selectedKey,collapsed,unreadKeys,@@ -152,6 +174,8 @@ export function OperationsProvider({ children }) {loading,refresh,openOperation,+ openLogSession,+ closeLogSession,selectOperation: setSelectedKey,setCollapsed,markRead,@@ -165,12 +189,18 @@ export function OperationsProvider({ children }) {selectedStream.transport,selectedStream.error,selectedStream.refetch,+ logSession,+ serviceStream.lines,+ serviceStream.error,+ serviceStream.clear,selectedKey,collapsed,unreadKeys,loading,refresh,openOperation,+ openLogSession,+ closeLogSession,markRead,]);diff --git a/frontend/src/hooks/serviceLogStream.js b/frontend/src/hooks/serviceLogStream.jsnew file mode 100644index 00000000..f00bdf43--- /dev/null+++ b/frontend/src/hooks/serviceLogStream.js@@ -0,0 +1,13 @@+export const MAX_SERVICE_LOG_LINES = 1000;++export function normalizeServiceLogSnapshot(logs) {+ if (Array.isArray(logs)) return logs.map((line) => String(line)).filter(Boolean);+ if (typeof logs !== 'string') return [];+ return logs.split('\n').filter(Boolean);+}++export function appendServiceLogLines(previous, incoming, limit = MAX_SERVICE_LOG_LINES) {+ const nextLines = Array.isArray(incoming) ? incoming : [incoming];+ const combined = previous.concat(nextLines.filter((line) => line != null).map(String));+ return combined.length > limit ? combined.slice(-limit) : combined;+}diff --git a/frontend/src/hooks/useServiceLogStream.js b/frontend/src/hooks/useServiceLogStream.jsnew file mode 100644index 00000000..02b16914--- /dev/null+++ b/frontend/src/hooks/useServiceLogStream.js@@ -0,0 +1,89 @@+import { useCallback, useEffect, useState } from 'react';++import { SOCKET_EVENTS } from '../constants/events';+import api from '../services/api';+import socketService from '../services/socket';+import {+ appendServiceLogLines,+ MAX_SERVICE_LOG_LINES,+ normalizeServiceLogSnapshot,+} from './serviceLogStream';++export default function useServiceLogStream(session, { enabled = true } = {}) {+ const [lines, setLines] = useState([]);+ const [error, setError] = useState(null);++ const clear = useCallback(() => setLines([]), []);++ useEffect(() => {+ if (!session || !enabled) return undefined;+ let cancelled = false;+ setLines([]);+ setError(null);++ const isContainer = session.appType === 'docker' && session.containerId != null;+ const loadSnapshot = async () => {+ try {+ let response;+ if (isContainer) response = await api.getDockerAppLogs(session.containerId, 200);+ else if (session.logPath) response = await api.getLogs(session.logPath, 200);+ if (!cancelled) {+ setLines(normalizeServiceLogSnapshot(response?.logs).slice(-MAX_SERVICE_LOG_LINES));+ setError(null);+ }+ } catch (nextError) {+ if (!cancelled) setError(nextError?.data?.error || nextError?.message || null);+ }+ };++ const subscribe = () => {+ loadSnapshot();+ if (isContainer) {+ socketService.subscribeContainerLogs(session.containerId, {+ service: session.service,+ tail: 200,+ });+ } else if (session.logPath) {+ socketService.subscribeLogs(session.logPath);+ }+ };++ socketService.connect();+ if (socketService.socket?.connected) subscribe();+ const offConnect = socketService.on(SOCKET_EVENTS.CONNECTED, subscribe);+ const offFileLine = socketService.on(SOCKET_EVENTS.LOG_LINE, (payload) => {+ if (isContainer || cancelled) return;+ const line = typeof payload === 'string'+ ? payload+ : payload?.line || payload?.message || JSON.stringify(payload);+ setLines((previous) => appendServiceLogLines(previous, line));+ });+ const offContainerLine = socketService.on(SOCKET_EVENTS.CONTAINER_LOG, (payload) => {+ if (!isContainer || cancelled || String(payload?.app_id) !== String(session.containerId)) return;+ setLines((previous) => appendServiceLogLines(previous, payload?.line));+ });+ const offContainerError = socketService.on(SOCKET_EVENTS.CONTAINER_LOG_ERROR, (payload) => {+ if (isContainer && String(payload?.app_id) === String(session.containerId)) {+ setError(payload?.message || null);+ }+ });+ const offContainerEnded = socketService.on(SOCKET_EVENTS.CONTAINER_LOG_ENDED, (payload) => {+ if (isContainer && String(payload?.app_id) === String(session.containerId) && payload?.message) {+ setLines((previous) => appendServiceLogLines(previous, payload.message));+ }+ });++ return () => {+ cancelled = true;+ offConnect();+ offFileLine();+ offContainerLine();+ offContainerError();+ offContainerEnded();+ if (isContainer) socketService.unsubscribeContainerLogs();+ else if (session.logPath) socketService.unsubscribeLogs();+ };+ }, [session, enabled]);++ return { lines, error, clear };+}diff --git a/frontend/src/i18n/locales/ar.json b/frontend/src/i18n/locales/ar.jsonindex 30aa5425..c4639d68 100644--- a/frontend/src/i18n/locales/ar.json+++ b/frontend/src/i18n/locales/ar.json@@ -3844,11 +3844,8 @@"user": "مستخدم"},"logsDrawer": {- "autoScroll": "التمرير التلقائي","clear": "واضح","close": "يغلق",- "close2": "يغلق",- "collapse": "ينهار","waitingForLogs": "في انتظار السجلات..."},"logsTab": {diff --git a/frontend/src/i18n/locales/bn.json b/frontend/src/i18n/locales/bn.jsonindex 2f539b47..b08c8b7e 100644--- a/frontend/src/i18n/locales/bn.json+++ b/frontend/src/i18n/locales/bn.json@@ -3844,11 +3844,8 @@"user": "ব্যবহারকারী"},"logsDrawer": {- "autoScroll": "অটো-স্ক্রোল","clear": "পরিষ্কার","close": "বন্ধ",- "close2": "বন্ধ",- "collapse": "সঙ্কুচিত","waitingForLogs": "লগের জন্য অপেক্ষা করা হচ্ছে..."},"logsTab": {diff --git a/frontend/src/i18n/locales/de.json b/frontend/src/i18n/locales/de.jsonindex 670b2973..092a5097 100644--- a/frontend/src/i18n/locales/de.json+++ b/frontend/src/i18n/locales/de.json@@ -3844,11 +3844,8 @@"user": "Benutzer"},"logsDrawer": {- "autoScroll": "Automatisches Scrollen","clear": "Klar","close": "Schließen",- "close2": "Schließen",- "collapse": "Zusammenbruch","waitingForLogs": "Warten auf Protokolle..."},"logsTab": {diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.jsonindex 2a9e4fce..fad16434 100644--- a/frontend/src/i18n/locales/en.json+++ b/frontend/src/i18n/locales/en.json@@ -3844,11 +3844,8 @@"user": "User"},"logsDrawer": {- "autoScroll": "Auto-scroll","clear": "Clear","close": "Close",- "close2": "Close",- "collapse": "Collapse","waitingForLogs": "Waiting for logs..."},"logsTab": {@@ -3868,7 +3865,7 @@"gunicornSystemdLogs": "Gunicorn/systemd Logs","live": "Live","loadingLogs": "Loading logs...",- "pinToDrawer": "Pin to drawer",+ "pinToDrawer": "Open in Operations dock","refresh": "Refresh","searchLogs": "Search logs..."},@@ -4551,6 +4548,7 @@"cancelTitle": "Cancel operation?","collapse": "Collapse Operations dock","history": "History",+ "lineCount": "{{count}} lines","live": "Live","needsAttention": "Needs attention","noActive": "No operations are running",@@ -4562,6 +4560,7 @@"progress": "Progress","retryQueued": "Retry queued","selectOperation": "Select an operation to inspect progress and logs",+ "serviceLogs": "Service log session","shortcutLabel": "Toggle Operations dock","title": "Operations","unreadCount": "{{count}} unread",diff --git a/frontend/src/i18n/locales/es.json b/frontend/src/i18n/locales/es.jsonindex 8fa2ead8..7cdd3dce 100644--- a/frontend/src/i18n/locales/es.json+++ b/frontend/src/i18n/locales/es.json@@ -3844,11 +3844,8 @@"user": "Usuario"},"logsDrawer": {- "autoScroll": "Desplazamiento automático","clear": "Limpiar","close": "Cerrar",- "close2": "Cerrar",- "collapse": "Contraer","waitingForLogs": "Esperando registros..."},"logsTab": {diff --git a/frontend/src/i18n/locales/fr.json b/frontend/src/i18n/locales/fr.jsonindex 894caaba..de62dc0a 100644--- a/frontend/src/i18n/locales/fr.json+++ b/frontend/src/i18n/locales/fr.json@@ -3844,11 +3844,8 @@"user": "Utilisateur"},"logsDrawer": {- "autoScroll": "Défilement automatique","clear": "Clair","close": "Fermer",- "close2": "Fermer",- "collapse": "Effondrement","waitingForLogs": "En attente des logs..."},"logsTab": {diff --git a/frontend/src/i18n/locales/id.json b/frontend/src/i18n/locales/id.jsonindex 8f2d49ee..2b4b595d 100644--- a/frontend/src/i18n/locales/id.json+++ b/frontend/src/i18n/locales/id.json@@ -3844,11 +3844,8 @@"user": "Pengguna"},"logsDrawer": {- "autoScroll": "Gulir otomatis","clear": "Jernih","close": "Menutup",- "close2": "Menutup",- "collapse": "Runtuh","waitingForLogs": "Menunggu log..."},"logsTab": {diff --git a/frontend/src/i18n/locales/it.json b/frontend/src/i18n/locales/it.jsonindex c26fb3e1..535bfdfa 100644--- a/frontend/src/i18n/locales/it.json+++ b/frontend/src/i18n/locales/it.json@@ -3844,11 +3844,8 @@"user": "Utente"},"logsDrawer": {- "autoScroll": "Scorrimento automatico","clear": "Chiaro","close": "Vicino",- "close2": "Vicino",- "collapse": "Crollo","waitingForLogs": "In attesa dei log..."},"logsTab": {diff --git a/frontend/src/i18n/locales/ko.json b/frontend/src/i18n/locales/ko.jsonindex 9939c477..9adbde79 100644--- a/frontend/src/i18n/locales/ko.json+++ b/frontend/src/i18n/locales/ko.json@@ -3844,11 +3844,8 @@"user": "사용자"},"logsDrawer": {- "autoScroll": "자동 스크롤","clear": "지우기","close": "닫기",- "close2": "닫기",- "collapse": "접기","waitingForLogs": "로그를 기다리는 중..."},"logsTab": {diff --git a/frontend/src/i18n/locales/pl.json b/frontend/src/i18n/locales/pl.jsonindex d3f7f17e..743acce2 100644--- a/frontend/src/i18n/locales/pl.json+++ b/frontend/src/i18n/locales/pl.json@@ -3844,11 +3844,8 @@"user": "Użytkownik"},"logsDrawer": {- "autoScroll": "Automatyczne przewijanie","clear": "Jasne","close": "Zamknąć",- "close2": "Zamknąć",- "collapse": "Zawalić się","waitingForLogs": "Czekam na logi..."},"logsTab": {diff --git a/frontend/src/i18n/locales/pt.json b/frontend/src/i18n/locales/pt.jsonindex d6048da4..a6724a6c 100644--- a/frontend/src/i18n/locales/pt.json+++ b/frontend/src/i18n/locales/pt.json@@ -3844,11 +3844,8 @@"user": "Usuário"},"logsDrawer": {- "autoScroll": "Rolagem automática","clear": "Limpar","close": "Fechar",- "close2": "Fechar",- "collapse": "Recolher","waitingForLogs": "Aguardando registros..."},"logsTab": {diff --git a/frontend/src/i18n/locales/ru.json b/frontend/src/i18n/locales/ru.jsonindex 933068dc..b9e6cf4e 100644--- a/frontend/src/i18n/locales/ru.json+++ b/frontend/src/i18n/locales/ru.json@@ -3844,11 +3844,8 @@"user": "Пользователь"},"logsDrawer": {- "autoScroll": "Автопрокрутка","clear": "Очистить","close": "Закрыть",- "close2": "Закрыть",- "collapse": "Свернуть","waitingForLogs": "Жду логов..."},"logsTab": {diff --git a/frontend/src/i18n/locales/th.json b/frontend/src/i18n/locales/th.jsonindex 26488916..bad43e33 100644--- a/frontend/src/i18n/locales/th.json+++ b/frontend/src/i18n/locales/th.json@@ -3844,11 +3844,8 @@"user": "ผู้ใช้"},"logsDrawer": {- "autoScroll": "เลื่อนอัตโนมัติ","clear": "ชัดเจน","close": "ปิด",- "close2": "ปิด",- "collapse": "ทรุด","waitingForLogs": "กำลังรอบันทึก..."},"logsTab": {diff --git a/frontend/src/i18n/locales/tr.json b/frontend/src/i18n/locales/tr.jsonindex 5234ef01..d9fad838 100644--- a/frontend/src/i18n/locales/tr.json+++ b/frontend/src/i18n/locales/tr.json@@ -3844,11 +3844,8 @@"user": "Kullanıcı"},"logsDrawer": {- "autoScroll": "Otomatik kaydırma","clear": "Temizlemek","close": "Kapalı",- "close2": "Kapalı",- "collapse": "Yıkılmak","waitingForLogs": "Günlükleri bekliyorum..."},"logsTab": {diff --git a/frontend/src/i18n/locales/vi.json b/frontend/src/i18n/locales/vi.jsonindex 5fbab57a..e6944ded 100644--- a/frontend/src/i18n/locales/vi.json+++ b/frontend/src/i18n/locales/vi.json@@ -3844,11 +3844,8 @@"user": "người dùng"},"logsDrawer": {- "autoScroll": "Tự động cuộn","clear": "Thông thoáng","close": "Đóng",- "close2": "Đóng",- "collapse": "Sụp đổ","waitingForLogs": "Đang chờ nhật ký..."},"logsTab": {diff --git a/frontend/src/i18n/locales/zh-Hans.json b/frontend/src/i18n/locales/zh-Hans.jsonindex ad365697..8272411c 100644--- a/frontend/src/i18n/locales/zh-Hans.json+++ b/frontend/src/i18n/locales/zh-Hans.json@@ -3844,11 +3844,8 @@"user": "用户"},"logsDrawer": {- "autoScroll": "自动滚动","clear": "清除","close": "关闭",- "close2": "关闭",- "collapse": "收起","waitingForLogs": "等待日志..."},"logsTab": {diff --git a/frontend/src/i18n/locales/zh-Hant.json b/frontend/src/i18n/locales/zh-Hant.jsonindex c857d2b5..6e8de197 100644--- a/frontend/src/i18n/locales/zh-Hant.json+++ b/frontend/src/i18n/locales/zh-Hant.json@@ -3844,11 +3844,8 @@"user": "使用者"},"logsDrawer": {- "autoScroll": "自動捲動","clear": "清除","close": "關閉",- "close2": "關閉",- "collapse": "坍塌","waitingForLogs": "等待日誌..."},"logsTab": {diff --git a/frontend/src/layouts/DashboardLayout.jsx b/frontend/src/layouts/DashboardLayout.jsxindex d3d07350..d19789ac 100644--- a/frontend/src/layouts/DashboardLayout.jsx+++ b/frontend/src/layouts/DashboardLayout.jsx@@ -3,7 +3,6 @@ import { Outlet, useLocation } from 'react-router-dom';import Sidebar from '../components/Sidebar';import MobileTopBar from '../components/MobileTopBar';import CommandPalette from '../components/CommandPalette';-import LogsDrawer from '../components/LogsDrawer';import { LogsDrawerProvider } from '../contexts/LogsDrawerContext';import { AIProvider } from '../contexts/AIContext';import AIAssistant from '../components/ai/AIAssistant';@@ -125,7 +124,6 @@ const DashboardLayout = () => {</ErrorBoundary></main><CommandPalette open={paletteOpen} onClose={() => setPaletteOpen(false)} />- <LogsDrawer /><OperationsDock /><AIAssistant /><PluginLoader api={api} />diff --git a/frontend/src/services/__tests__/serviceLogStream.test.mjs b/frontend/src/services/__tests__/serviceLogStream.test.mjsnew file mode 100644index 00000000..b6b63882--- /dev/null+++ b/frontend/src/services/__tests__/serviceLogStream.test.mjs@@ -0,0 +1,16 @@+import assert from 'node:assert/strict';+import test from 'node:test';++import {+ appendServiceLogLines,+ normalizeServiceLogSnapshot,+} from '../../hooks/serviceLogStream.js';++test('normalizes REST log snapshots from strings and arrays', () => {+ assert.deepEqual(normalizeServiceLogSnapshot('first\nsecond\n'), ['first', 'second']);+ assert.deepEqual(normalizeServiceLogSnapshot(['first', 2, '']), ['first', '2']);+});++test('bounds service log sessions to their newest lines', () => {+ assert.deepEqual(appendServiceLogLines(['one', 'two'], ['three', 'four'], 3), ['two', 'three', 'four']);+});diff --git a/frontend/src/services/socket.js b/frontend/src/services/socket.jsindex 67f94be4..bf26fd6b 100644--- a/frontend/src/services/socket.js+++ b/frontend/src/services/socket.js@@ -82,6 +82,18 @@ class SocketService {this.socket.on(SOCKET_EVENTS.RUN_STATUS, (data) => {this.emit(SOCKET_EVENTS.RUN_STATUS, data);});++ this.socket.on(SOCKET_EVENTS.CONTAINER_LOG, (data) => {+ this.emit(SOCKET_EVENTS.CONTAINER_LOG, data);+ });++ this.socket.on(SOCKET_EVENTS.CONTAINER_LOG_ERROR, (data) => {+ this.emit(SOCKET_EVENTS.CONTAINER_LOG_ERROR, data);+ });++ this.socket.on(SOCKET_EVENTS.CONTAINER_LOG_ENDED, (data) => {+ this.emit(SOCKET_EVENTS.CONTAINER_LOG_ENDED, data);+ });}disconnect() {@@ -139,6 +151,20 @@ class SocketService {}}+ subscribeContainerLogs(appId, options = {}) {+ if (this.socket?.connected && appId != null) {+ this.socket.emit('subscribe_container_logs', {+ app_id: appId,+ tail: options.tail || 200,+ ...(options.service ? { service: options.service } : {}),+ });+ }+ }++ unsubscribeContainerLogs() {+ if (this.socket?.connected) this.socket.emit('unsubscribe_container_logs');+ }+on(event, callback) {if (!this.listeners.has(event)) {this.listeners.set(event, new Set());diff --git a/frontend/src/styles/components/_logs-drawer.scss b/frontend/src/styles/components/_logs-drawer.scssindex c3fe92d6..2df3a7f9 100644--- a/frontend/src/styles/components/_logs-drawer.scss+++ b/frontend/src/styles/components/_logs-drawer.scss@@ -1,216 +1,3 @@-// ============================================-// INFRA OVERLAYS (redesign map §4 #21)-// Bottom-dock logs drawer + SSH remote-terminal overlay.-// The logs drawer STAYS a bottom dock (open product decision §6.3).-// ============================================--@keyframes sk-overlay-blink {- 0%, 100% { opacity: 1; }- 50% { opacity: 0.3; }-}--// ---------------------------------------------// PERSISTENT LOGS DRAWER (bottom dock)-// ---------------------------------------------.logs-drawer {- position: fixed;- bottom: 0;- left: $sidebar-width;- right: 0;- z-index: $z-fixed;- background: var(--surface);- border-top: 1px solid var(--border-strong);- display: flex;- flex-direction: column;-- // Sidebar is off-canvas on mobile — dock spans the full width.- @media (max-width: $breakpoint-md) {- left: 0;- }-- &--collapsed {- height: 36px;- cursor: pointer;- transition: background $transition-fast;-- &:hover {- background: var(--surface-hover);- }- }-- &--expanded {- // Up-facing variant of --shadow-lg (token shadows cast downward).- box-shadow: 0 -16px 48px -12px rgba(0, 0, 0, 0.5);- }-- // Resize drag handle- &__resize-handle {- height: 4px;- cursor: ns-resize;- background: transparent;- transition: background $transition-fast;- flex-shrink: 0;-- &:hover,- &:active {- background: var(--accent);- }- }-- // Collapsed bar- &__collapsed-bar {- display: flex;- align-items: center;- gap: $space-3;- padding: 0 $space-4;- height: 36px;- min-width: 0;- overflow: hidden;- }-- &__collapsed-actions {- margin-left: auto;- flex-shrink: 0;- }-- // Header (expanded)- &__header {- display: flex;- align-items: center;- justify-content: space-between;- gap: $space-3;- padding: $space-2 $space-4;- border-bottom: 1px solid var(--border-soft);- flex-shrink: 0;- }-- &__header-left {- display: flex;- align-items: center;- gap: $space-3;- min-width: 0;- }-- &__header-right {- display: flex;- align-items: center;- gap: $space-2;- flex-shrink: 0;- }-- // Icon tile (drawer-head idiom)- &__ico {- width: 28px;- height: 28px;- border-radius: 8px;- display: grid;- place-items: center;- @include status-variant(var(--cyan), var(--cyan-bg));- flex-shrink: 0;- }-- &__titles {- display: flex;- flex-direction: column;- min-width: 0;- }-- &__service-name {- font-size: 13px;- font-weight: $font-weight-semibold;- color: var(--text);- white-space: nowrap;- }-- // Mono sub — the log source (path / container)- &__source {- font-family: var(--mono);- font-size: 10.5px;- color: var(--text-faint);- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;- }-- // Live indicator + line count (mono, demo log-foot idiom)- &__live {- display: inline-flex;- align-items: center;- gap: 7px;- font-family: var(--mono);- font-size: 11px;- color: var(--text-faint);- white-space: nowrap;- }-- &__live-dot {- width: 7px;- height: 7px;- border-radius: 50%;- background: var(--green);- box-shadow: 0 0 7px var(--green);- animation: sk-overlay-blink 1.4s infinite;- flex-shrink: 0;- }-- &__last-line {- flex: 1;- font-family: var(--mono);- font-size: 11px;- color: var(--text-faint);- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;- }-- &__toggle {- display: flex;- align-items: center;- gap: 7px;- font-family: var(--mono);- font-size: 10.5px;- font-weight: $font-weight-semibold;- letter-spacing: 0.08em;- text-transform: uppercase;- color: var(--text-faint);- cursor: pointer;- user-select: none;- }-- // Log content area — code well- &__content {- flex: 1;- overflow-y: auto;- padding: $space-2 $space-4;- font-family: var(--mono);- font-size: $font-size-sm;- line-height: 1.7;- background: var(--bg-code);- scrollbar-width: thin;- }-- &__empty {- font-family: var(--mono);- color: var(--text-faint);- padding: $space-4;- text-align: center;- }-- &__line {- color: var(--text-dim);- white-space: pre-wrap;- word-break: break-all;-- &--error {- color: var(--red);- }-- &--warn {- color: var(--amber);- }- }-}-// --------------------------------------------// REMOTE TERMINAL (SSH overlay — xterm host)// All rules scoped under the container so the generic class namesdiff --git a/frontend/src/styles/components/_operations-dock.scss b/frontend/src/styles/components/_operations-dock.scssindex 4248f65c..ac7756cc 100644--- a/frontend/src/styles/components/_operations-dock.scss+++ b/frontend/src/styles/components/_operations-dock.scss@@ -246,6 +246,7 @@&__log-line.is-warning { color: var(--amber); }&__footer { justify-content: space-between; gap: $space-2; }+ &__footer--end { justify-content: flex-end; }&__footer-links { min-width: 0; gap: $space-1; }&__footer-links .btn { max-width: 190px; gap: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }&__footer-actions { gap: $space-2; }