@cloudcli-ai/cloudcli 1.30.0 → 1.31.0

package/dist-server/server/modules/websocket/services/chat-websocket.service.js

@@ -0,0 +1,188 @@
+import { connectedClients } from '../../../modules/websocket/services/websocket-state.service.js';
+import { WebSocketWriter } from '../../../modules/websocket/services/websocket-writer.service.js';
+import { createNormalizedMessage, parseIncomingJsonObject } from '../../../shared/utils.js';
+const DEFAULT_PROVIDER = 'claude';
+/**
+ * Normalizes potentially invalid provider names coming from websocket payloads.
+ */
+function readProvider(value) {
+    if (value === 'claude' || value === 'cursor' || value === 'codex' || value === 'gemini') {
+        return value;
+    }
+    return DEFAULT_PROVIDER;
+}
+/**
+ * Extracts the authenticated request user id in the formats currently produced
+ * by platform and OSS auth code paths.
+ */
+function readRequestUserId(request) {
+    const user = request?.user;
+    if (!user) {
+        return null;
+    }
+    if (typeof user.id === 'string' || typeof user.id === 'number') {
+        return user.id;
+    }
+    if (typeof user.userId === 'string' || typeof user.userId === 'number') {
+        return user.userId;
+    }
+    return null;
+}
+/**
+ * Handles authenticated chat websocket messages used by the main chat panel.
+ */
+export function handleChatConnection(ws, request, dependencies) {
+    console.log('[INFO] Chat WebSocket connected');
+    connectedClients.add(ws);
+    const writer = new WebSocketWriter(ws, readRequestUserId(request));
+    ws.on('message', async (rawMessage) => {
+        try {
+            const parsed = parseIncomingJsonObject(rawMessage);
+            if (!parsed) {
+                throw new Error('Invalid websocket payload');
+            }
+            const data = parsed;
+            const messageType = data.type;
+            if (!messageType) {
+                throw new Error('Message type is required');
+            }
+            if (messageType === 'claude-command') {
+                await dependencies.queryClaudeSDK(data.command ?? '', data.options, writer);
+                return;
+            }
+            if (messageType === 'cursor-command') {
+                await dependencies.spawnCursor(data.command ?? '', data.options, writer);
+                return;
+            }
+            if (messageType === 'codex-command') {
+                await dependencies.queryCodex(data.command ?? '', data.options, writer);
+                return;
+            }
+            if (messageType === 'gemini-command') {
+                await dependencies.spawnGemini(data.command ?? '', data.options, writer);
+                return;
+            }
+            if (messageType === 'cursor-resume') {
+                await dependencies.spawnCursor('', {
+                    sessionId: data.sessionId,
+                    resume: true,
+                    cwd: data.options?.cwd,
+                }, writer);
+                return;
+            }
+            if (messageType === 'abort-session') {
+                const provider = readProvider(data.provider);
+                const sessionId = typeof data.sessionId === 'string' ? data.sessionId : '';
+                let success = false;
+                if (provider === 'cursor') {
+                    success = dependencies.abortCursorSession(sessionId);
+                }
+                else if (provider === 'codex') {
+                    success = dependencies.abortCodexSession(sessionId);
+                }
+                else if (provider === 'gemini') {
+                    success = dependencies.abortGeminiSession(sessionId);
+                }
+                else {
+                    success = await dependencies.abortClaudeSDKSession(sessionId);
+                }
+                writer.send(createNormalizedMessage({
+                    kind: 'complete',
+                    exitCode: success ? 0 : 1,
+                    aborted: true,
+                    success,
+                    sessionId,
+                    provider,
+                }));
+                return;
+            }
+            if (messageType === 'claude-permission-response') {
+                if (typeof data.requestId === 'string' && data.requestId.length > 0) {
+                    dependencies.resolveToolApproval(data.requestId, {
+                        allow: Boolean(data.allow),
+                        updatedInput: data.updatedInput,
+                        message: typeof data.message === 'string' ? data.message : undefined,
+                        rememberEntry: data.rememberEntry,
+                    });
+                }
+                return;
+            }
+            if (messageType === 'cursor-abort') {
+                const sessionId = typeof data.sessionId === 'string' ? data.sessionId : '';
+                const success = dependencies.abortCursorSession(sessionId);
+                writer.send(createNormalizedMessage({
+                    kind: 'complete',
+                    exitCode: success ? 0 : 1,
+                    aborted: true,
+                    success,
+                    sessionId,
+                    provider: 'cursor',
+                }));
+                return;
+            }
+            if (messageType === 'check-session-status') {
+                const provider = readProvider(data.provider);
+                const sessionId = typeof data.sessionId === 'string' ? data.sessionId : '';
+                let isActive = false;
+                if (provider === 'cursor') {
+                    isActive = dependencies.isCursorSessionActive(sessionId);
+                }
+                else if (provider === 'codex') {
+                    isActive = dependencies.isCodexSessionActive(sessionId);
+                }
+                else if (provider === 'gemini') {
+                    isActive = dependencies.isGeminiSessionActive(sessionId);
+                }
+                else {
+                    isActive = dependencies.isClaudeSDKSessionActive(sessionId);
+                    if (isActive) {
+                        dependencies.reconnectSessionWriter(sessionId, ws);
+                    }
+                }
+                writer.send({
+                    type: 'session-status',
+                    sessionId,
+                    provider,
+                    isProcessing: isActive,
+                });
+                return;
+            }
+            if (messageType === 'get-pending-permissions') {
+                const sessionId = typeof data.sessionId === 'string' ? data.sessionId : '';
+                if (sessionId && dependencies.isClaudeSDKSessionActive(sessionId)) {
+                    const pending = dependencies.getPendingApprovalsForSession(sessionId);
+                    writer.send({
+                        type: 'pending-permissions-response',
+                        sessionId,
+                        data: pending,
+                    });
+                }
+                return;
+            }
+            if (messageType === 'get-active-sessions') {
+                writer.send({
+                    type: 'active-sessions',
+                    sessions: {
+                        claude: dependencies.getActiveClaudeSDKSessions(),
+                        cursor: dependencies.getActiveCursorSessions(),
+                        codex: dependencies.getActiveCodexSessions(),
+                        gemini: dependencies.getActiveGeminiSessions(),
+                    },
+                });
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            console.error('[ERROR] Chat WebSocket error:', message);
+            writer.send({
+                type: 'error',
+                error: message,
+            });
+        }
+    });
+    ws.on('close', () => {
+        console.log('[INFO] Chat client disconnected');
+        connectedClients.delete(ws);
+    });
+}
+//# sourceMappingURL=chat-websocket.service.js.map

package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chat-websocket.service.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/services/chat-websocket.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/websocket/services/plugin-websocket-proxy.service.js

@@ -0,0 +1,52 @@
+import { WebSocket } from 'ws';
+/**
+ * Proxies an authenticated client websocket to a plugin websocket endpoint.
+ */
+export function handlePluginWsProxy(clientWs, pathname, getPluginPort) {
+    const pluginName = pathname.replace('/plugin-ws/', '');
+    if (!pluginName || /[^a-zA-Z0-9_-]/.test(pluginName)) {
+        clientWs.close(4400, 'Invalid plugin name');
+        return;
+    }
+    const port = getPluginPort(pluginName);
+    if (!port) {
+        clientWs.close(4404, 'Plugin not running');
+        return;
+    }
+    const upstream = new WebSocket(`ws://127.0.0.1:${port}/ws`);
+    upstream.on('open', () => {
+        console.log(`[Plugins] WS proxy connected to "${pluginName}" on port ${port}`);
+    });
+    upstream.on('message', (data) => {
+        if (clientWs.readyState === WebSocket.OPEN) {
+            clientWs.send(data);
+        }
+    });
+    clientWs.on('message', (data) => {
+        if (upstream.readyState === WebSocket.OPEN) {
+            upstream.send(data);
+        }
+    });
+    upstream.on('close', () => {
+        if (clientWs.readyState === WebSocket.OPEN) {
+            clientWs.close();
+        }
+    });
+    clientWs.on('close', () => {
+        if (upstream.readyState === WebSocket.OPEN) {
+            upstream.close();
+        }
+    });
+    upstream.on('error', (error) => {
+        console.error(`[Plugins] WS proxy error for "${pluginName}":`, error.message);
+        if (clientWs.readyState === WebSocket.OPEN) {
+            clientWs.close(4502, 'Upstream error');
+        }
+    });
+    clientWs.on('error', () => {
+        if (upstream.readyState === WebSocket.OPEN) {
+            upstream.close();
+        }
+    });
+}
+//# sourceMappingURL=plugin-websocket-proxy.service.js.map

package/dist-server/server/modules/websocket/services/plugin-websocket-proxy.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-websocket-proxy.service.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/services/plugin-websocket-proxy.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAmB,EACnB,QAAgB,EAChB,aAAoD;IAEpD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACrD,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAC5C,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,kBAAkB,IAAI,KAAK,CAAC,CAAC;IAE5D,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,oCAAoC,UAAU,aAAa,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9B,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACxB,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACxB,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,CAAC,KAAK,CAAC,iCAAiC,UAAU,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9E,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACzC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACxB,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist-server/server/modules/websocket/services/shell-websocket.service.js

@@ -0,0 +1,334 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import pty from 'node-pty';
+import { WebSocket } from 'ws';
+import { parseIncomingJsonObject } from '../../../shared/utils.js';
+const ptySessionsMap = new Map();
+const PTY_SESSION_TIMEOUT = 30 * 60 * 1000;
+const SHELL_URL_PARSE_BUFFER_LIMIT = 32768;
+/**
+ * Reads a string field from untyped payloads and falls back when absent.
+ */
+function readString(value, fallback = '') {
+    return typeof value === 'string' ? value : fallback;
+}
+/**
+ * Reads a boolean field from untyped payloads and falls back when absent.
+ */
+function readBoolean(value, fallback = false) {
+    return typeof value === 'boolean' ? value : fallback;
+}
+/**
+ * Reads a finite number field from untyped payloads and falls back when absent.
+ */
+function readNumber(value, fallback) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : fallback;
+}
+/**
+ * Parses incoming websocket shell messages and keeps processing safe when
+ * malformed payloads are received.
+ */
+function parseShellMessage(rawMessage) {
+    const payload = parseIncomingJsonObject(rawMessage);
+    if (!payload) {
+        return null;
+    }
+    return payload;
+}
+/**
+ * Resolves provider command line for plain shell and agent-backed shell modes.
+ */
+function buildShellCommand(message, dependencies) {
+    const hasSession = readBoolean(message.hasSession);
+    const sessionId = readString(message.sessionId);
+    const initialCommand = readString(message.initialCommand);
+    const provider = readString(message.provider, 'claude');
+    const safeSessionIdPattern = /^[a-zA-Z0-9_.\-:]+$/;
+    const isPlainShell = readBoolean(message.isPlainShell) ||
+        (!!initialCommand && !hasSession) ||
+        provider === 'plain-shell';
+    if (isPlainShell) {
+        return initialCommand;
+    }
+    if (provider === 'cursor') {
+        if (hasSession && sessionId) {
+            return `cursor-agent --resume="${sessionId}"`;
+        }
+        return 'cursor-agent';
+    }
+    if (provider === 'codex') {
+        if (hasSession && sessionId) {
+            if (os.platform() === 'win32') {
+                return `codex resume "${sessionId}"; if ($LASTEXITCODE -ne 0) { codex }`;
+            }
+            return `codex resume "${sessionId}" || codex`;
+        }
+        return 'codex';
+    }
+    if (provider === 'gemini') {
+        const command = initialCommand || 'gemini';
+        let resumeId = sessionId;
+        if (hasSession && sessionId) {
+            try {
+                const existingSession = dependencies.getSessionById(sessionId);
+                if (existingSession && existingSession.cliSessionId) {
+                    resumeId = existingSession.cliSessionId;
+                    if (!safeSessionIdPattern.test(resumeId)) {
+                        resumeId = '';
+                    }
+                }
+            }
+            catch (error) {
+                console.error('Failed to get Gemini CLI session ID:', error);
+            }
+        }
+        if (hasSession && resumeId) {
+            return `${command} --resume "${resumeId}"`;
+        }
+        return command;
+    }
+    const command = initialCommand || 'claude';
+    if (hasSession && sessionId) {
+        if (os.platform() === 'win32') {
+            return `claude --resume "${sessionId}"; if ($LASTEXITCODE -ne 0) { claude }`;
+        }
+        return `claude --resume "${sessionId}" || claude`;
+    }
+    return command;
+}
+/**
+ * Handles websocket connections used by the standalone shell terminal UI.
+ */
+export function handleShellConnection(ws, dependencies) {
+    console.log('[INFO] Shell websocket connected');
+    let shellProcess = null;
+    let ptySessionKey = null;
+    let urlDetectionBuffer = '';
+    const announcedAuthUrls = new Set();
+    ws.on('message', async (rawMessage) => {
+        try {
+            const data = parseShellMessage(rawMessage);
+            if (!data?.type) {
+                throw new Error('Invalid websocket payload');
+            }
+            if (data.type === 'init') {
+                const projectPath = readString(data.projectPath, process.cwd());
+                const sessionId = readString(data.sessionId) || null;
+                const hasSession = readBoolean(data.hasSession);
+                const provider = readString(data.provider, 'claude');
+                const initialCommand = readString(data.initialCommand);
+                const isPlainShell = readBoolean(data.isPlainShell) ||
+                    (!!initialCommand && !hasSession) ||
+                    provider === 'plain-shell';
+                urlDetectionBuffer = '';
+                announcedAuthUrls.clear();
+                const isLoginCommand = !!initialCommand &&
+                    (initialCommand.includes('setup-token') ||
+                        initialCommand.includes('cursor-agent login') ||
+                        initialCommand.includes('auth login'));
+                const commandSuffix = isPlainShell && initialCommand
+                    ? `_cmd_${Buffer.from(initialCommand).toString('base64').slice(0, 16)}`
+                    : '';
+                ptySessionKey = `${projectPath}_${sessionId ?? 'default'}${commandSuffix}`;
+                if (isLoginCommand) {
+                    const oldSession = ptySessionsMap.get(ptySessionKey);
+                    if (oldSession) {
+                        if (oldSession.timeoutId) {
+                            clearTimeout(oldSession.timeoutId);
+                        }
+                        oldSession.pty.kill();
+                        ptySessionsMap.delete(ptySessionKey);
+                    }
+                }
+                const existingSession = isLoginCommand ? null : ptySessionsMap.get(ptySessionKey);
+                if (existingSession) {
+                    shellProcess = existingSession.pty;
+                    if (existingSession.timeoutId) {
+                        clearTimeout(existingSession.timeoutId);
+                    }
+                    ws.send(JSON.stringify({
+                        type: 'output',
+                        data: '\x1b[36m[Reconnected to existing session]\x1b[0m\r\n',
+                    }));
+                    if (existingSession.buffer.length > 0) {
+                        existingSession.buffer.forEach((bufferedData) => {
+                            ws.send(JSON.stringify({
+                                type: 'output',
+                                data: bufferedData,
+                            }));
+                        });
+                    }
+                    existingSession.ws = ws;
+                    return;
+                }
+                const resolvedProjectPath = path.resolve(projectPath);
+                try {
+                    const stats = fs.statSync(resolvedProjectPath);
+                    if (!stats.isDirectory()) {
+                        throw new Error('Not a directory');
+                    }
+                }
+                catch {
+                    ws.send(JSON.stringify({ type: 'error', message: 'Invalid project path' }));
+                    return;
+                }
+                const safeSessionIdPattern = /^[a-zA-Z0-9_.\-:]+$/;
+                if (sessionId && !safeSessionIdPattern.test(sessionId)) {
+                    ws.send(JSON.stringify({ type: 'error', message: 'Invalid session ID' }));
+                    return;
+                }
+                const shellCommand = buildShellCommand(data, dependencies);
+                const shell = os.platform() === 'win32' ? 'powershell.exe' : 'bash';
+                const shellArgs = os.platform() === 'win32' ? ['-Command', shellCommand] : ['-c', shellCommand];
+                const termCols = readNumber(data.cols, 80);
+                const termRows = readNumber(data.rows, 24);
+                shellProcess = pty.spawn(shell, shellArgs, {
+                    name: 'xterm-256color',
+                    cols: termCols,
+                    rows: termRows,
+                    cwd: resolvedProjectPath,
+                    env: {
+                        ...process.env,
+                        TERM: 'xterm-256color',
+                        COLORTERM: 'truecolor',
+                        FORCE_COLOR: '3',
+                    },
+                });
+                ptySessionsMap.set(ptySessionKey, {
+                    pty: shellProcess,
+                    ws,
+                    buffer: [],
+                    timeoutId: null,
+                    projectPath,
+                    sessionId,
+                });
+                shellProcess.onData((chunk) => {
+                    if (!ptySessionKey) {
+                        return;
+                    }
+                    const session = ptySessionsMap.get(ptySessionKey);
+                    if (!session) {
+                        return;
+                    }
+                    if (session.buffer.length < 5000) {
+                        session.buffer.push(chunk);
+                    }
+                    else {
+                        session.buffer.shift();
+                        session.buffer.push(chunk);
+                    }
+                    if (session.ws && session.ws.readyState === WebSocket.OPEN) {
+                        let outputData = chunk;
+                        const cleanChunk = dependencies.stripAnsiSequences(chunk);
+                        urlDetectionBuffer = `${urlDetectionBuffer}${cleanChunk}`.slice(-SHELL_URL_PARSE_BUFFER_LIMIT);
+                        outputData = outputData.replace(/OPEN_URL:\s*(https?:\/\/[^\s\x1b\x07]+)/g, '[INFO] Opening in browser: $1');
+                        const emitAuthUrl = (detectedUrl, autoOpen = false) => {
+                            const normalizedUrl = dependencies.normalizeDetectedUrl(detectedUrl);
+                            if (!normalizedUrl) {
+                                return;
+                            }
+                            const isNewUrl = !announcedAuthUrls.has(normalizedUrl);
+                            if (isNewUrl) {
+                                announcedAuthUrls.add(normalizedUrl);
+                                session.ws?.send(JSON.stringify({
+                                    type: 'auth_url',
+                                    url: normalizedUrl,
+                                    autoOpen,
+                                }));
+                            }
+                        };
+                        const normalizedDetectedUrls = dependencies.extractUrlsFromText(urlDetectionBuffer)
+                            .map((url) => dependencies.normalizeDetectedUrl(url))
+                            .filter((url) => Boolean(url));
+                        const dedupedDetectedUrls = Array.from(new Set(normalizedDetectedUrls)).filter((url, _, urls) => !urls.some((otherUrl) => otherUrl !== url && otherUrl.startsWith(url)));
+                        dedupedDetectedUrls.forEach((url) => emitAuthUrl(url, false));
+                        if (dependencies.shouldAutoOpenUrlFromOutput(cleanChunk) &&
+                            dedupedDetectedUrls.length > 0) {
+                            const bestUrl = dedupedDetectedUrls.reduce((longest, current) => current.length > longest.length ? current : longest);
+                            emitAuthUrl(bestUrl, true);
+                        }
+                        session.ws.send(JSON.stringify({
+                            type: 'output',
+                            data: outputData,
+                        }));
+                    }
+                });
+                shellProcess.onExit((exitCode) => {
+                    if (!ptySessionKey) {
+                        return;
+                    }
+                    const session = ptySessionsMap.get(ptySessionKey);
+                    if (session && session.ws && session.ws.readyState === WebSocket.OPEN) {
+                        session.ws.send(JSON.stringify({
+                            type: 'output',
+                            data: `\r\n\x1b[33mProcess exited with code ${exitCode.exitCode}${exitCode.signal != null ? ` (${exitCode.signal})` : ''}\x1b[0m\r\n`,
+                        }));
+                    }
+                    if (session?.timeoutId) {
+                        clearTimeout(session.timeoutId);
+                    }
+                    ptySessionsMap.delete(ptySessionKey);
+                    shellProcess = null;
+                });
+                let welcomeMsg = `\x1b[36mStarting terminal in: ${projectPath}\x1b[0m\r\n`;
+                if (!isPlainShell) {
+                    const providerName = provider === 'cursor'
+                        ? 'Cursor'
+                        : provider === 'codex'
+                            ? 'Codex'
+                            : provider === 'gemini'
+                                ? 'Gemini'
+                                : 'Claude';
+                    welcomeMsg = hasSession
+                        ? `\x1b[36mResuming ${providerName} session ${sessionId} in: ${projectPath}\x1b[0m\r\n`
+                        : `\x1b[36mStarting new ${providerName} session in: ${projectPath}\x1b[0m\r\n`;
+                }
+                ws.send(JSON.stringify({
+                    type: 'output',
+                    data: welcomeMsg,
+                }));
+                return;
+            }
+            if (data.type === 'input') {
+                if (shellProcess) {
+                    shellProcess.write(readString(data.data));
+                }
+                return;
+            }
+            if (data.type === 'resize') {
+                if (shellProcess) {
+                    shellProcess.resize(readNumber(data.cols, 80), readNumber(data.rows, 24));
+                }
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            console.error('[ERROR] Shell WebSocket error:', message);
+            if (ws.readyState === WebSocket.OPEN) {
+                ws.send(JSON.stringify({
+                    type: 'output',
+                    data: `\r\n\x1b[31mError: ${message}\x1b[0m\r\n`,
+                }));
+            }
+        }
+    });
+    ws.on('close', () => {
+        if (!ptySessionKey) {
+            return;
+        }
+        const session = ptySessionsMap.get(ptySessionKey);
+        if (!session) {
+            return;
+        }
+        session.ws = null;
+        session.timeoutId = setTimeout(() => {
+            session.pty.kill();
+            ptySessionsMap.delete(ptySessionKey);
+        }, PTY_SESSION_TIMEOUT);
+    });
+    ws.on('error', (error) => {
+        console.error('[ERROR] Shell WebSocket error:', error);
+    });
+}
+//# sourceMappingURL=shell-websocket.service.js.map

package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-websocket.service.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/services/shell-websocket.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/websocket/services/websocket-auth.service.js

@@ -0,0 +1,32 @@
+/**
+ * Authenticates websocket upgrade requests before the `connection` handler runs.
+ */
+export function verifyWebSocketClient(info, dependencies) {
+    const request = info.req;
+    console.log('WebSocket connection attempt to:', request.url);
+    // Platform mode: use the first DB user and skip token checks.
+    if (dependencies.isPlatform) {
+        const user = dependencies.authenticateWebSocket(null);
+        if (!user) {
+            console.log('[WARN] Platform mode: No user found in database');
+            return false;
+        }
+        request.user = user;
+        console.log('[OK] Platform mode WebSocket authenticated for user:', user.username);
+        return true;
+    }
+    // OSS mode: read JWT from query string first, then Authorization header.
+    const upgradeUrl = new URL(request.url ?? '/', 'http://localhost');
+    const token = upgradeUrl.searchParams.get('token') ??
+        request.headers.authorization?.split(' ')[1] ??
+        null;
+    const user = dependencies.authenticateWebSocket(token);
+    if (!user) {
+        console.log('[WARN] WebSocket authentication failed');
+        return false;
+    }
+    request.user = user;
+    console.log('[OK] WebSocket authenticated for user:', user.username);
+    return true;
+}
+//# sourceMappingURL=websocket-auth.service.js.map

package/dist-server/server/modules/websocket/services/websocket-auth.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-auth.service.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/services/websocket-auth.service.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAA4E,EAC5E,YAAuC;IAEvC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAoC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,kCAAkC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAE7D,8DAA8D;IAC9D,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,sDAAsD,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yEAAyE;IACzE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,EAAE,kBAAkB,CAAC,CAAC;IACnE,MAAM,KAAK,GACT,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC;QACpC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC;IAEP,MAAM,IAAI,GAAG,YAAY,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrE,OAAO,IAAI,CAAC;AACd,CAAC"}