wind-agent-cli 1.37.2

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

@@ -0,0 +1,310 @@
+import path from 'node:path';
+import { sessionsDb } from '../../../modules/database/index.js';
+import { providerModelsService } from '../../../modules/providers/index.js';
+import { chatRunRegistry } from '../../../modules/websocket/services/chat-run-registry.service.js';
+import { connectedClients, WS_OPEN_STATE } from '../../../modules/websocket/services/websocket-state.service.js';
+import { getGlobalImageAssetsDir, isImageAttachmentDescriptor, normalizeAttachmentDescriptors, } from '../../../shared/image-attachments.js';
+import { parseIncomingJsonObject } from '../../../shared/utils.js';
+/**
+ * Trust boundary for client-supplied image attachments: chat.send options come
+ * straight from the browser, and the provider runtimes read the referenced
+ * files off disk (Claude base64-encodes them into the prompt). Only images
+ * that live directly inside the global upload store (`~/.cloudcli/assets`,
+ * where POST /api/assets/images puts them) are allowed through — anything
+ * else (absolute paths elsewhere, traversal, subdirectories) is dropped.
+ *
+ * Exported for tests; `assetsRootOverride` exists only for them.
+ */
+export function filterAttachmentsToUploadStore(attachments, assetsRootOverride) {
+    const assetsRoot = path.resolve(assetsRootOverride ?? getGlobalImageAssetsDir());
+    return normalizeAttachmentDescriptors(attachments).filter((descriptor) => {
+        // Relative paths are anchored in the store; absolute ones must already be in it.
+        const resolved = path.resolve(assetsRoot, descriptor.path);
+        const relative = path.relative(assetsRoot, resolved);
+        const isDirectChild = relative.length > 0 &&
+            !relative.startsWith('..') &&
+            !path.isAbsolute(relative) &&
+            !relative.includes(path.sep) &&
+            !relative.includes('/');
+        if (!isDirectChild) {
+            console.warn(`[Chat] Dropping attachment outside the upload store: ${descriptor.path}`);
+        }
+        return isDirectChild;
+    });
+}
+/** Backward-compatible image filter consumed by existing websocket tests. */
+export function filterImagesToUploadStore(images, assetsRootOverride) {
+    return filterAttachmentsToUploadStore(images, assetsRootOverride);
+}
+/**
+ * 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;
+}
+function sendJson(ws, payload) {
+    if (ws.readyState === WS_OPEN_STATE) {
+        ws.send(JSON.stringify(payload));
+    }
+}
+/**
+ * Reports a protocol-level failure to the requesting client.
+ *
+ * Protocol errors deliberately use their own `kind` (instead of the provider
+ * `error` message kind) so the frontend can distinguish "your request was
+ * invalid" from "the model run produced an error" without inspecting text.
+ */
+function sendProtocolError(ws, code, error, sessionId) {
+    sendJson(ws, {
+        kind: 'protocol_error',
+        code,
+        error,
+        sessionId: sessionId ?? null,
+        timestamp: new Date().toISOString(),
+    });
+}
+function readRequiredSessionId(data) {
+    const sessionId = typeof data.sessionId === 'string' ? data.sessionId.trim() : '';
+    return sessionId.length > 0 ? sessionId : null;
+}
+/**
+ * Handles `chat.send`: resolves the session row (provider, project path, and
+ * provider-native id all come from the database — never from the client),
+ * registers the run, and dispatches to the provider runtime.
+ */
+async function handleChatSend(ws, userId, data, dependencies) {
+    const sessionId = readRequiredSessionId(data);
+    if (!sessionId) {
+        sendProtocolError(ws, 'SESSION_ID_REQUIRED', 'chat.send requires a sessionId.');
+        return;
+    }
+    const session = sessionsDb.getSessionById(sessionId);
+    if (!session) {
+        sendProtocolError(ws, 'SESSION_NOT_FOUND', `Session "${sessionId}" was not found. Create it via POST /api/providers/sessions first.`, sessionId);
+        return;
+    }
+    const provider = session.provider;
+    if (!dependencies.runtime.hasRuntime(provider)) {
+        sendProtocolError(ws, 'UNSUPPORTED_PROVIDER', `Provider "${provider}" is not available.`, sessionId);
+        return;
+    }
+    const run = chatRunRegistry.startRun({
+        appSessionId: sessionId,
+        provider,
+        providerSessionId: session.provider_session_id,
+        connection: ws,
+        userId,
+    });
+    if (!run) {
+        sendProtocolError(ws, 'RUN_IN_PROGRESS', `Session "${sessionId}" already has a run in progress.`, sessionId);
+        return;
+    }
+    const clientOptions = (data.options ?? {});
+    const command = typeof data.content === 'string' ? data.content : '';
+    // Record what this turn runs with so reopening the session later restores the
+    // same model and reasoning effort, and so the resume path has a
+    // session-scoped model answer to use.
+    if (typeof clientOptions.model === 'string' && clientOptions.model.trim()) {
+        providerModelsService.setSessionModel(provider, sessionId, clientOptions.model);
+    }
+    if (typeof clientOptions.effort === 'string' && clientOptions.effort.trim()) {
+        providerModelsService.setSessionEffort(provider, sessionId, clientOptions.effort);
+    }
+    const attachmentCandidates = [
+        ...normalizeAttachmentDescriptors(clientOptions.images),
+        ...normalizeAttachmentDescriptors(clientOptions.files),
+        ...normalizeAttachmentDescriptors(clientOptions.attachments),
+    ];
+    const verifiedAttachments = filterAttachmentsToUploadStore(attachmentCandidates);
+    const uniqueAttachments = verifiedAttachments.filter((descriptor, index, all) => all.findIndex((candidate) => candidate.path === descriptor.path) === index);
+    // The provider runtimes receive the stable app session id. When their
+    // CLI/SDK needs the provider-native id for resume, they resolve it from the
+    // session row themselves (sessionsService.resolveProviderSessionId).
+    // Brand-new sessions have no provider id yet, so the runtime starts fresh
+    // and announces one, which the gateway writer captures and maps back to the
+    // app session id.
+    const runtimeOptions = {
+        ...clientOptions,
+        // Attachments are re-validated server-side: only direct children of the
+        // global upload store may reach provider runtimes or their file tools.
+        attachments: uniqueAttachments,
+        images: uniqueAttachments.filter(isImageAttachmentDescriptor),
+        files: uniqueAttachments.filter((descriptor) => !isImageAttachmentDescriptor(descriptor)),
+        sessionId,
+        cwd: clientOptions.cwd ?? session.project_path ?? undefined,
+        projectPath: session.project_path ?? clientOptions.projectPath,
+    };
+    try {
+        await dependencies.runtime.run(provider, command, runtimeOptions, run.writer);
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.error(`[Chat] Provider runtime "${provider}" failed`, { sessionId, error: message });
+    }
+    finally {
+        // Safety net: a runtime that crashed (or resolved) without emitting its
+        // terminal `complete` would otherwise leave the session stuck in
+        // "processing" forever on every connected client. Scoped to THIS run —
+        // a queued message can start the session's next run before this promise
+        // settles, and the session-keyed completeRun would kill that new run.
+        chatRunRegistry.completeRunIfCurrent(run, { exitCode: 1 });
+    }
+}
+/**
+ * Handles `chat.abort`: cancels the run for one app session and emits the
+ * terminal `complete` on its behalf (runtimes skip their own complete for
+ * aborted runs, and the registry drops any duplicate).
+ */
+async function handleChatAbort(ws, data, dependencies) {
+    const sessionId = readRequiredSessionId(data);
+    if (!sessionId) {
+        sendProtocolError(ws, 'SESSION_ID_REQUIRED', 'chat.abort requires a sessionId.');
+        return;
+    }
+    const run = chatRunRegistry.getRun(sessionId);
+    if (!run || run.status !== 'running') {
+        sendProtocolError(ws, 'NO_ACTIVE_RUN', `Session "${sessionId}" has no active run.`, sessionId);
+        return;
+    }
+    const success = await dependencies.runtime.abort(run.provider, sessionId);
+    chatRunRegistry.completeRun(sessionId, {
+        exitCode: success ? 0 : 1,
+        aborted: true,
+    });
+}
+/**
+ * Handles `chat.subscribe`: for each requested session, reports whether a run
+ * is processing, re-attaches the live stream to this socket, replays missed
+ * events (seq > lastSeq), and includes pending permission requests.
+ *
+ * This single message replaces the old `check-session-status`,
+ * `get-pending-permissions`, and Claude-only writer reconnect flows.
+ */
+function handleChatSubscribe(ws, data, dependencies) {
+    const targets = Array.isArray(data.sessions) ? data.sessions : [];
+    for (const target of targets) {
+        if (!target || typeof target !== 'object') {
+            continue;
+        }
+        const sessionId = typeof target.sessionId === 'string'
+            ? target.sessionId.trim()
+            : '';
+        if (!sessionId) {
+            continue;
+        }
+        const lastSeqRaw = target.lastSeq;
+        const lastSeq = typeof lastSeqRaw === 'number' && Number.isFinite(lastSeqRaw)
+            ? Math.max(0, Math.floor(lastSeqRaw))
+            : 0;
+        const run = chatRunRegistry.getRun(sessionId);
+        const isProcessing = chatRunRegistry.isProcessing(sessionId);
+        // Future live events for this run should land on the socket that asked —
+        // this is what makes mid-stream page refreshes work for all providers.
+        if (isProcessing) {
+            chatRunRegistry.attachConnection(sessionId, ws);
+        }
+        // Pending approvals are tracked under the app session id inside the
+        // Claude runtime, so they can be looked up directly.
+        const pendingPermissions = dependencies.runtime.getPendingApprovalsForSession(sessionId);
+        sendJson(ws, {
+            kind: 'chat_subscribed',
+            sessionId,
+            isProcessing,
+            lastSeq: run?.lastSeq ?? 0,
+            pendingPermissions,
+            timestamp: new Date().toISOString(),
+        });
+        // Replay only for RUNNING runs, strictly after the ack. Completed runs
+        // are fully persisted to the provider transcript and served over REST —
+        // replaying them (e.g. after a page reload where the client's lastSeq is
+        // 0) would duplicate messages the history fetch already returned.
+        if (isProcessing) {
+            for (const event of chatRunRegistry.replayEvents(sessionId, lastSeq)) {
+                sendJson(ws, event);
+            }
+        }
+    }
+}
+/**
+ * Handles `chat.permission-response`: forwards a tool-approval decision to the
+ * pending approval resolver (Claude is the only provider with interactive
+ * approvals today, but the message is intentionally provider-neutral).
+ */
+function handlePermissionResponse(data, dependencies) {
+    if (typeof data.requestId !== 'string' || data.requestId.length === 0) {
+        return;
+    }
+    dependencies.runtime.resolveToolApproval(data.requestId, {
+        allow: Boolean(data.allow),
+        updatedInput: data.updatedInput,
+        message: typeof data.message === 'string' ? data.message : undefined,
+        rememberEntry: data.rememberEntry,
+    });
+}
+/**
+ * Handles authenticated chat websocket messages used by the main chat panel.
+ *
+ * Inbound protocol (client to server):
+ * - `chat.send`                { sessionId, content, options? }
+ * - `chat.abort`               { sessionId }
+ * - `chat.subscribe`           { sessions: [{ sessionId, lastSeq? }] }
+ * - `chat.permission-response` { requestId, allow, updatedInput?, message?, rememberEntry? }
+ *
+ * Outbound protocol (server to client): every frame is `kind`-based — either
+ * a provider `NormalizedMessage` (with `seq`) or a gateway event
+ * (`chat_subscribed`, `session_upserted`, `loading_progress`,
+ * `protocol_error`).
+ */
+export function handleChatConnection(ws, request, dependencies) {
+    console.log('[INFO] Chat WebSocket connected');
+    connectedClients.add(ws);
+    const userId = 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 = typeof data.type === 'string' ? data.type : '';
+            switch (messageType) {
+                case 'chat.send':
+                    await handleChatSend(ws, userId, data, dependencies);
+                    return;
+                case 'chat.abort':
+                    await handleChatAbort(ws, data, dependencies);
+                    return;
+                case 'chat.subscribe':
+                    handleChatSubscribe(ws, data, dependencies);
+                    return;
+                case 'chat.permission-response':
+                    handlePermissionResponse(data, dependencies);
+                    return;
+                default:
+                    sendProtocolError(ws, 'UNKNOWN_MESSAGE_TYPE', `Unknown message type "${messageType}".`);
+                    return;
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            console.error('[ERROR] Chat WebSocket error:', message);
+            sendProtocolError(ws, 'INTERNAL_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, isBinary) => {
+        if (clientWs.readyState === WebSocket.OPEN) {
+            clientWs.send(data, { binary: isBinary });
+        }
+    });
+    clientWs.on('message', (data, isBinary) => {
+        if (upstream.readyState === WebSocket.OPEN) {
+            upstream.send(data, { binary: isBinary });
+        }
+    });
+    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,QAAQ,EAAE,EAAE;QACxC,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxC,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,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"}