ttyd-mux 0.3.0 → 0.4.0

package/dist/daemon/server.js

@@ -1,281 +1,33 @@
 import { createServer } from 'node:http';
-import { gzipSync } from 'node:zlib';
-import httpProxy from 'http-proxy';
-import WebSocket, { WebSocketServer } from 'ws';
-import { getFullPath, normalizeBasePath } from '../config/config.js';
-import { getDaemonState } from '../config/state.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { injectImeHelper } from './ime-helper.js';
-import { generateJsonResponse, generatePortalHtml } from './portal.js';
-import { allocatePort, listSessions, sessionNameFromDir, startSession, stopSession } from './session-manager.js';
-// Create proxy server for HTTP only
-const proxy = httpProxy.createProxyServer({
-    changeOrigin: true,
-    xfwd: true
-});
-// Handle proxy errors
-proxy.on('error', (err, _req, res) => {
-    console.error('Proxy error:', err.message);
-    if (res && 'writeHead' in res && typeof res.writeHead === 'function') {
-        const httpRes = res;
-        if (!httpRes.headersSent) {
-            httpRes.writeHead(502, { 'Content-Type': 'text/plain' });
-            httpRes.end('Bad Gateway');
-        }
-    }
-});
-// Handle selfHandleResponse for HTML injection
-proxy.on('proxyRes', (proxyRes, req, res) => {
-    const httpRes = res;
-    // Check if this is a self-handled HTML response
-    const contentType = proxyRes.headers['content-type'] ?? '';
-    if (!contentType.includes('text/html')) {
-        // Not HTML, just pipe through
-        httpRes.writeHead(proxyRes.statusCode ?? 200, proxyRes.headers);
-        proxyRes.pipe(httpRes);
-        return;
-    }
-    // Check if client supports gzip (stored in custom header before deletion)
-    const acceptEncoding = req.originalAcceptEncoding ?? '';
-    const supportsGzip = acceptEncoding.includes('gzip');
-    // Collect HTML body and inject IME helper
-    const chunks = [];
-    proxyRes.on('data', (chunk) => chunks.push(chunk));
-    proxyRes.on('end', () => {
-        const originalHtml = Buffer.concat(chunks).toString('utf-8');
-        const modifiedHtml = injectImeHelper(originalHtml);
-        // Update headers
-        const headers = { ...proxyRes.headers };
-        delete headers['content-encoding'];
-        if (supportsGzip) {
-            // Compress with gzip
-            const compressed = gzipSync(modifiedHtml);
-            headers['content-encoding'] = 'gzip';
-            headers['content-length'] = String(compressed.length);
-            httpRes.writeHead(proxyRes.statusCode ?? 200, headers);
-            httpRes.end(compressed);
-        }
-        else {
-            // Send uncompressed
-            headers['content-length'] = String(Buffer.byteLength(modifiedHtml));
-            httpRes.writeHead(proxyRes.statusCode ?? 200, headers);
-            httpRes.end(modifiedHtml);
-        }
-    });
-});
-export function findSessionForPath(config, path) {
-    const sessions = listSessions();
-    const basePath = normalizeBasePath(config.base_path);
-    for (const session of sessions) {
-        const sessionFullPath = `${basePath}${session.path}`;
-        if (path.startsWith(`${sessionFullPath}/`) || path === sessionFullPath) {
-            return session;
-        }
-    }
-    return null;
-}
-function sendJson(res, status, data) {
-    const body = generateJsonResponse(data);
-    res.writeHead(status, {
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(body)
-    });
-    res.end(body);
-}
-function handleApiRequest(config, req, res) {
-    const basePath = normalizeBasePath(config.base_path);
-    const url = req.url ?? '/';
-    const path = url.slice(basePath.length);
-    const method = req.method ?? 'GET';
-    // GET /api/status
-    if (path === '/api/status' && method === 'GET') {
-        const daemon = getDaemonState();
-        const sessions = listSessions().map((s) => ({
-            ...s,
-            fullPath: getFullPath(config, s.path)
-        }));
-        sendJson(res, 200, { daemon, sessions });
-        return;
-    }
-    // GET /api/sessions
-    if (path === '/api/sessions' && method === 'GET') {
-        const sessions = listSessions().map((s) => ({
-            ...s,
-            fullPath: getFullPath(config, s.path)
-        }));
-        sendJson(res, 200, sessions);
-        return;
-    }
-    // POST /api/sessions
-    if (path === '/api/sessions' && method === 'POST') {
-        let body = '';
-        req.on('data', (chunk) => {
-            body += chunk.toString();
-        });
-        req.on('end', () => {
-            try {
-                const parsed = JSON.parse(body);
-                const name = parsed.name ?? sessionNameFromDir(parsed.dir);
-                const sessionPath = parsed.path ?? `/${name}`;
-                const port = allocatePort(config);
-                const fullPath = getFullPath(config, sessionPath);
-                const options = {
-                    name,
-                    dir: parsed.dir,
-                    path: sessionPath,
-                    port,
-                    fullPath
-                };
-                const session = startSession(options);
-                sendJson(res, 201, { ...session, fullPath });
-            }
-            catch (error) {
-                sendJson(res, 400, { error: getErrorMessage(error) });
-            }
-        });
-        return;
-    }
-    // DELETE /api/sessions/:name
-    const deleteMatch = path.match(/^\/api\/sessions\/(.+)$/);
-    if (deleteMatch?.[1] && method === 'DELETE') {
-        const name = decodeURIComponent(deleteMatch[1]);
-        try {
-            stopSession(name);
-            sendJson(res, 200, { success: true });
-        }
-        catch (error) {
-            sendJson(res, 400, { error: getErrorMessage(error) });
-        }
-        return;
-    }
-    // POST /api/shutdown
-    if (path === '/api/shutdown' && method === 'POST') {
-        sendJson(res, 200, { success: true });
-        setTimeout(() => {
-            process.exit(0);
-        }, 100);
-        return;
-    }
-    // Not found
-    sendJson(res, 404, { error: 'API endpoint not found' });
-}
-function handleRequest(config, req, res) {
-    const url = req.url ?? '/';
-    const method = req.method ?? 'GET';
-    const basePath = normalizeBasePath(config.base_path);
-    // API routes
-    if (url.startsWith(`${basePath}/api/`)) {
-        handleApiRequest(config, req, res);
-        return;
-    }
-    // Portal page
-    if (url === basePath || url === `${basePath}/`) {
-        if (method === 'GET') {
-            const sessions = listSessions();
-            const html = generatePortalHtml(config, sessions);
-            res.writeHead(200, {
-                'Content-Type': 'text/html; charset=utf-8',
-                'Content-Length': Buffer.byteLength(html)
-            });
-            res.end(html);
-            return;
-        }
-    }
-    // Try to proxy to a session
-    const session = findSessionForPath(config, url);
-    if (session) {
-        const target = `http://localhost:${session.port}`;
-        // Store original Accept-Encoding before deletion (for gzip re-compression)
-        req.originalAcceptEncoding =
-            req.headers['accept-encoding'];
-        // Remove Accept-Encoding to get uncompressed response for HTML injection
-        delete req.headers['accept-encoding'];
-        // Always use selfHandleResponse to avoid conflicts with proxyRes handler
-        proxy.web(req, res, { target, selfHandleResponse: true });
-        return;
-    }
-    // Not found
-    res.writeHead(404, { 'Content-Type': 'text/plain' });
-    res.end('Not Found');
-}
-// Create WebSocket server (noServer mode for manual upgrade handling)
-const wss = new WebSocketServer({ noServer: true });
-function handleUpgrade(config, req, socket, head) {
-    const url = req.url ?? '/';
-    const session = findSessionForPath(config, url);
-    if (!session) {
-        socket.destroy();
-        return;
-    }
-    // Connect to backend WebSocket
-    const backendUrl = `ws://127.0.0.1:${session.port}${url}`;
-    const protocol = req.headers['sec-websocket-protocol'];
-    const backendWs = new WebSocket(backendUrl, protocol ? protocol.split(',').map((p) => p.trim()) : []);
-    backendWs.on('open', () => {
-        // Upgrade client connection once backend is ready
-        wss.handleUpgrade(req, socket, head, (clientWs) => {
-            let closed = false;
-            const cleanup = (initiator, code, reason) => {
-                if (closed)
-                    return;
-                closed = true;
-                // Close the other side with proper code
-                const closeCode = code ?? 1000;
-                const closeReason = reason?.toString() ?? '';
-                if (initiator === 'client') {
-                    if (backendWs.readyState === WebSocket.OPEN) {
-                        backendWs.close(closeCode, closeReason);
-                    }
-                    else {
-                        backendWs.terminate();
-                    }
-                }
-                else {
-                    if (clientWs.readyState === WebSocket.OPEN) {
-                        clientWs.close(closeCode, closeReason);
-                    }
-                    else {
-                        clientWs.terminate();
-                    }
-                }
-            };
-            // Forward messages bidirectionally
-            clientWs.on('message', (data, isBinary) => {
-                if (backendWs.readyState === WebSocket.OPEN) {
-                    backendWs.send(data, { binary: isBinary });
-                }
-            });
-            backendWs.on('message', (data, isBinary) => {
-                if (clientWs.readyState === WebSocket.OPEN) {
-                    clientWs.send(data, { binary: isBinary });
-                }
-            });
-            // Handle close events
-            clientWs.on('close', (code, reason) => cleanup('client', code, reason));
-            backendWs.on('close', (code, reason) => cleanup('backend', code, reason));
-            // Handle errors - terminate to ensure cleanup
-            clientWs.on('error', () => {
-                clientWs.terminate();
-                cleanup('client', 1006);
-            });
-            backendWs.on('error', () => {
-                backendWs.terminate();
-                cleanup('backend', 1006);
-            });
-        });
-    });
-    backendWs.on('error', (err) => {
-        console.error(`[WebSocket] Connection error: ${err.message}`);
-        backendWs.terminate();
-        socket.destroy();
-    });
+import { handleRequest } from './router.js';
+import { handleUpgrade } from './ws-proxy.js';
+// Dynamic import to avoid circular dependency and allow fallback
+let getConfigFunc = null;
+/**
+ * Set the config getter function (called by daemon on startup)
+ */
+export function setConfigGetter(getter) {
+    getConfigFunc = getter;
 }
-export function createDaemonServer(config) {
+/**
+ * Create the daemon HTTP server with WebSocket support
+ *
+ * Note: When ConfigManager is initialized (via setConfigGetter), the server
+ * uses the dynamic config for each request to support hot-reloading.
+ * Otherwise, it falls back to the initialConfig (for testing).
+ *
+ * @param initialConfig - Initial config (used as fallback when ConfigManager not initialized)
+ */
+export function createDaemonServer(initialConfig) {
     const server = createServer((req, res) => {
+        // Use dynamic config if available, otherwise fall back to initialConfig
+        const config = getConfigFunc ? getConfigFunc() : initialConfig;
         handleRequest(config, req, res);
     });
     // Handle WebSocket upgrades
     server.on('upgrade', (req, socket, head) => {
+        // Use dynamic config if available, otherwise fall back to initialConfig
+        const config = getConfigFunc ? getConfigFunc() : initialConfig;
         handleUpgrade(config, req, socket, head);
     });
     return server;

package/dist/daemon/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/daemon/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/daemon/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,YAAY,EAAE,MAAM,WAAW,CAAC;AAItD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,iEAAiE;AACjE,IAAI,aAAa,GAA0B,IAAI,CAAC;AAEhD;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAAoB;IAClD,aAAa,GAAG,MAAM,CAAC;AACzB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,aAAqB;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,wEAAwE;QACxE,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC/D,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,4BAA4B;IAC5B,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAoB,EAAE,MAAc,EAAE,IAAY,EAAE,EAAE;QAC1E,wEAAwE;QACxE,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;QAC/D,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/daemon/session-manager.d.ts

@@ -1,37 +1,71 @@
 import { EventEmitter } from 'node:events';
-import type { Config, SessionState } from '../config/types.js';
+import { type StateStore } from '../config/state-store.js';
+import type { Config, SessionState, TmuxMode } from '../config/types.js';
+import { type ProcessRunner } from '../utils/process-runner.js';
+import { type TmuxClient } from '../utils/tmux-client.js';
 export interface StartSessionOptions {
     name: string;
     dir: string;
     path: string;
     port: number;
     fullPath: string;
+    tmuxMode?: TmuxMode;
 }
 export interface SessionEvents {
     'session:start': (session: SessionState) => void;
     'session:stop': (name: string) => void;
     'session:exit': (name: string, code: number | null) => void;
 }
+/**
+ * Dependencies for SessionManager (for testing)
+ */
+export interface SessionManagerDeps {
+    stateStore: StateStore;
+    processRunner: ProcessRunner;
+    tmuxClient: TmuxClient;
+}
+/**
+ * Default dependencies using real implementations
+ */
+export declare const defaultSessionManagerDeps: SessionManagerDeps;
 /**
  * Session manager with EventEmitter for proactive process monitoring
  */
-declare class SessionManager extends EventEmitter {
+export declare class SessionManager extends EventEmitter {
     private runningProcesses;
-    startSession(options: StartSessionOptions): SessionState;
+    private deps;
+    constructor(deps?: SessionManagerDeps);
+    startSession(options: StartSessionOptions): Promise<SessionState>;
     stopSession(name: string): void;
     isProcessRunning(pid: number): boolean;
     listSessions(): SessionState[];
     stopAllSessions(): void;
+    /**
+     * Revalidate sessions after daemon restart.
+     * Checks if each session's ttyd process is still running.
+     * Removes dead sessions from state.
+     */
+    revalidateSessions(): {
+        valid: SessionState[];
+        removed: string[];
+    };
     private handleProcessExit;
     private cleanup;
 }
-declare const sessionManager: SessionManager;
-export declare function startSession(options: StartSessionOptions): SessionState;
-export declare function stopSession(name: string): void;
-export declare function isProcessRunning(pid: number): boolean;
-export declare function listSessions(): SessionState[];
-export declare function stopAllSessions(): void;
+/**
+ * Shared session manager instance
+ */
+export declare const sessionManager: SessionManager;
+/**
+ * Allocate next available port for a new session
+ */
 export declare function allocatePort(config: Config): number;
+/**
+ * Extract session name from directory path
+ */
 export declare function sessionNameFromDir(dir: string): string;
-export { sessionManager };
+/**
+ * Create a SessionManager with custom dependencies (for testing)
+ */
+export declare function createSessionManager(deps?: Partial<SessionManagerDeps>): SessionManager;
 //# sourceMappingURL=session-manager.d.ts.map

package/dist/daemon/session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/daemon/session-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAQ3C,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE/D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC7D;AAED;;GAEG;AACH,cAAM,cAAe,SAAQ,YAAY;IACvC,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY;IAkDxD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAkB/B,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAStC,YAAY,IAAI,YAAY,EAAE;IAgB9B,eAAe,IAAI,IAAI;IAWvB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,OAAO;CAIhB;AAGD,QAAA,MAAM,cAAc,gBAAuB,CAAC;AAG5C,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAEvE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,YAAY,IAAI,YAAY,EAAE,CAE7C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAEtC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGtD;AAGD,OAAO,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/daemon/session-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,wBAAwB,CAAC;AAI5E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAkBD,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC7D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,kBAIvC,CAAC;AAEF;;GAEG;AACH,qBAAa,cAAe,SAAQ,YAAY;IAC9C,OAAO,CAAC,gBAAgB,CAAmC;IAC3D,OAAO,CAAC,IAAI,CAAqB;gBAErB,IAAI,GAAE,kBAA8C;IAK1D,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IA6EvE,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAuB/B,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAItC,YAAY,IAAI,YAAY,EAAE;IAiB9B,eAAe,IAAI,IAAI;IAavB;;;;OAIG;IACH,kBAAkB,IAAI;QAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE;IAoBlE,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,OAAO;CAKhB;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,gBAAuB,CAAC;AAEnD;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGtD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAAG,cAAc,CAK3F"}

package/dist/daemon/session-manager.js

@@ -1,28 +1,79 @@
-import { spawn } from 'node:child_process';
 import { EventEmitter } from 'node:events';
-import { addSession, getAllSessions, getNextPort, getSession, removeSession } from '../config/state.js';
+import { defaultStateStore } from '../config/state-store.js';
+import { createLogger } from '../utils/logger.js';
+import { defaultProcessRunner } from '../utils/process-runner.js';
+import { defaultTmuxClient } from '../utils/tmux-client.js';
+const log = createLogger('session');
+/**
+ * Get tmux command arguments based on mode
+ */
+function getTmuxCommand(name, mode) {
+    switch (mode) {
+        case 'attach':
+            return ['tmux', 'attach-session', '-t', name];
+        case 'new':
+            return ['tmux', 'new-session', '-s', name];
+        default:
+            // For auto mode, session is pre-created by ensureSession
+            // Just attach to it
+            return ['tmux', 'attach-session', '-t', name];
+    }
+}
+/**
+ * Default dependencies using real implementations
+ */
+export const defaultSessionManagerDeps = {
+    stateStore: defaultStateStore,
+    processRunner: defaultProcessRunner,
+    tmuxClient: defaultTmuxClient
+};
 /**
  * Session manager with EventEmitter for proactive process monitoring
  */
-class SessionManager extends EventEmitter {
+export class SessionManager extends EventEmitter {
     runningProcesses = new Map();
-    startSession(options) {
-        const { name, dir, path, port, fullPath } = options;
+    deps;
+    constructor(deps = defaultSessionManagerDeps) {
+        super();
+        this.deps = deps;
+    }
+    async startSession(options) {
+        const { name, dir, path, port, fullPath, tmuxMode = 'auto' } = options;
+        const { stateStore, processRunner, tmuxClient } = this.deps;
+        log.info(`Starting session: ${name} (port=${port}, mode=${tmuxMode})`);
         // Check if already running
-        const existing = getSession(name);
-        if (existing && this.isProcessRunning(existing.pid)) {
-            throw new Error(`Session "${name}" is already running`);
+        const existing = stateStore.getSession(name);
+        if (existing && processRunner.isProcessRunning(existing.pid)) {
+            log.warn(`Session "${name}" is already running (pid=${existing.pid})`);
+            throw new Error(`Session "${name}" is already running on port ${existing.port}.\n  To view running sessions: ttyd-mux status\n  To stop this session: ttyd-mux down ${name}`);
+        }
+        // Check if port is available
+        const portAvailable = await processRunner.isPortAvailable(port);
+        if (!portAvailable) {
+            log.error(`Port ${port} is already in use`);
+            throw new Error(`Port ${port} is already in use by another process.\n  To find the process: lsof -i :${port}\n  To stop all sessions: ttyd-mux shutdown`);
         }
+        // For auto mode, ensure tmux session exists before starting ttyd
+        if (tmuxMode === 'auto') {
+            log.debug(`Ensuring tmux session exists: ${name}`);
+            tmuxClient.ensureSession(name, dir);
+        }
+        // Get tmux command based on mode
+        const tmuxCmd = getTmuxCommand(name, tmuxMode);
+        const ttydArgs = ['-W', '-p', String(port), '-b', fullPath, ...tmuxCmd];
+        log.debug(`ttyd command: ttyd ${ttydArgs.join(' ')}`);
         // Start ttyd process
-        const ttydProcess = spawn('ttyd', ['-W', '-p', String(port), '-b', fullPath, 'tmux', 'new', '-A', '-s', name], {
+        const ttydProcess = processRunner.spawn('ttyd', ttydArgs, {
             cwd: dir,
             detached: true,
             stdio: 'ignore'
         });
         ttydProcess.unref();
         if (!ttydProcess.pid) {
-            throw new Error(`Failed to start ttyd for session "${name}"`);
+            log.error(`Failed to start ttyd for session "${name}"`);
+            throw new Error(`Failed to start ttyd for session "${name}".\n  Possible causes:\n    - ttyd is not installed\n    - Directory "${dir}" does not exist\n    - Permission denied\n  Run 'ttyd-mux doctor' to check dependencies.`);
         }
+        log.info(`ttyd started: pid=${ttydProcess.pid}`);
         // Track the process
         this.runningProcesses.set(name, ttydProcess);
         // Proactive cleanup: listen for process exit
@@ -38,41 +89,40 @@ class SessionManager extends EventEmitter {
             dir,
             started_at: new Date().toISOString()
         };
-        addSession(session);
+        stateStore.addSession(session);
         this.emit('session:start', session);
         return session;
     }
     stopSession(name) {
-        const session = getSession(name);
+        const { stateStore, processRunner } = this.deps;
+        log.info(`Stopping session: ${name}`);
+        const session = stateStore.getSession(name);
         if (!session) {
-            throw new Error(`Session "${name}" not found`);
+            log.warn(`Session "${name}" not found`);
+            throw new Error(`Session "${name}" not found.\n  To view running sessions: ttyd-mux status`);
         }
         // Try to kill the process
         try {
-            process.kill(session.pid, 'SIGTERM');
+            processRunner.kill(session.pid, 'SIGTERM');
+            log.info(`Sent SIGTERM to pid ${session.pid}`);
         }
-        catch {
-            // Process might already be dead
+        catch (err) {
+            log.debug(`Process ${session.pid} might already be dead: ${err}`);
         }
         // Clean up
         this.cleanup(name);
         this.emit('session:stop', name);
     }
     isProcessRunning(pid) {
-        try {
-            process.kill(pid, 0);
-            return true;
-        }
-        catch {
-            return false;
-        }
+        return this.deps.processRunner.isProcessRunning(pid);
     }
     listSessions() {
-        const sessions = getAllSessions();
+        const { stateStore, processRunner } = this.deps;
+        const sessions = stateStore.getAllSessions();
         // Filter out dead sessions (lazy cleanup for sessions started before daemon)
         const activeSessions = [];
         for (const session of sessions) {
-            if (this.isProcessRunning(session.pid)) {
+            if (processRunner.isProcessRunning(session.pid)) {
                 activeSessions.push(session);
             }
             else {
@@ -82,50 +132,76 @@ class SessionManager extends EventEmitter {
         return activeSessions;
     }
     stopAllSessions() {
+        log.info('Stopping all sessions');
         const sessions = this.listSessions();
         for (const session of sessions) {
             try {
                 this.stopSession(session.name);
             }
-            catch {
-                // Ignore errors when stopping
+            catch (err) {
+                log.warn(`Error stopping session "${session.name}": ${err}`);
+            }
+        }
+        log.info(`Stopped ${sessions.length} sessions`);
+    }
+    /**
+     * Revalidate sessions after daemon restart.
+     * Checks if each session's ttyd process is still running.
+     * Removes dead sessions from state.
+     */
+    revalidateSessions() {
+        const { stateStore, processRunner } = this.deps;
+        const sessions = stateStore.getAllSessions();
+        const valid = [];
+        const removed = [];
+        for (const session of sessions) {
+            if (processRunner.isProcessRunning(session.pid)) {
+                valid.push(session);
+                log.debug(`Session "${session.name}" (pid=${session.pid}) is still running`);
+            }
+            else {
+                stateStore.removeSession(session.name);
+                removed.push(session.name);
+                log.info(`Session "${session.name}" (pid=${session.pid}) is dead, removed from state`);
             }
         }
+        return { valid, removed };
     }
     handleProcessExit(name, code) {
+        log.info(`Session "${name}" exited with code ${code}`);
         this.cleanup(name);
         this.emit('session:exit', name, code);
     }
     cleanup(name) {
+        log.debug(`Cleaning up session: ${name}`);
         this.runningProcesses.delete(name);
-        removeSession(name);
+        this.deps.stateStore.removeSession(name);
     }
 }
-// Singleton instance
-const sessionManager = new SessionManager();
-// Export singleton methods for backward compatibility
-export function startSession(options) {
-    return sessionManager.startSession(options);
-}
-export function stopSession(name) {
-    sessionManager.stopSession(name);
-}
-export function isProcessRunning(pid) {
-    return sessionManager.isProcessRunning(pid);
-}
-export function listSessions() {
-    return sessionManager.listSessions();
-}
-export function stopAllSessions() {
-    sessionManager.stopAllSessions();
-}
+/**
+ * Shared session manager instance
+ */
+export const sessionManager = new SessionManager();
+/**
+ * Allocate next available port for a new session
+ */
 export function allocatePort(config) {
-    return getNextPort(config.base_port);
+    return defaultStateStore.getNextPort(config.base_port);
 }
+/**
+ * Extract session name from directory path
+ */
 export function sessionNameFromDir(dir) {
     const parts = dir.split('/');
     return parts[parts.length - 1] || 'default';
 }
-// Export the manager instance for direct event access
-export { sessionManager };
+/**
+ * Create a SessionManager with custom dependencies (for testing)
+ */
+export function createSessionManager(deps = {}) {
+    return new SessionManager({
+        ...defaultSessionManagerDeps,
+        ...deps
+    });
+}
 //# sourceMappingURL=session-manager.js.map