mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-09 07:25:43 +08:00
* fix: don't overlap thinking banner over conversation * feat: support message queue and add attention indicator * fix(shell): use c to copy for claude * fix: strip timestamp tags from cursor * fix: select project when loading session from direct URL * feat: support attached images for all providers * feat(opencode): support permission options * fix: resolve source control and chat UX bugs - make staging real in the git panel: new /stage and /unstage endpoints, /status now reports the actual index via porcelain -z (handles renames, conflicts, and paths with spaces), and Stage/Unstage All run real git commands instead of toggling client-side state - add branch search to the header dropdown and Branches tab - persist the chosen permission mode per provider so a brand-new chat keeps it once the session id arrives, instead of reverting to default - replace cmdk's fuzzy model search with strict token matching so "chatgpt" no longer surfaces unrelated models - unit tests for the git status parser * feat(git): commit graph in history view and cross-spawn everywhere - render a VSCode-style commit graph in the source control history: lane-assignment algorithm, SVG strip with colored rails, merge and branch curves, commit dots, and branch/tag badges per commit - /commits returns parents and ref decorations across all branches (--branches --remotes --tags --topo-order) using unit-separator fields so pipes in commit subjects can't break parsing - collect stats via a single --shortstat pass instead of one `git show --stat` call per commit; raise the history limit to 50 - replace child_process spawn with cross-spawn in all runtimes, routes, and services: it resolves .cmd shims and PATHEXT on Windows (fixing taskmaster's npx invocations) and delegates to native spawn elsewhere, removing the per-file win32 ternaries - unit tests for the log parser and lane assignment * fix: remove gemini support since google discontinued it * fix: address code review findings - validate chat image attachments server-side: only files inside the ~/.cloudcli/assets upload store may reach provider file reads - harden asset serving with nosniff and attachment disposition for SVGs to prevent stored XSS - show the timestamp on image-only user messages - serialize git stage/unstage calls and defer the status re-sync so rapid toggles can't interleave or flicker - use a literal hex fallback for commit ref badges (alpha suffix on a var() string produced invalid CSS) - stop binding a URL session to a guening project instead - add the missing attentionRequiredIndicator key to all sidebar locales - clean up dangling conjunctions left the de/ru/tr/ja/zh-CN/zh-TW READMEs * fix: address code scanning findings - enforce a second image trust boundary in the provider builders: buildClaudeUserContent/buildCodexInputItems only accept files inside the upload store or the run's working directory (CodeQL path injection) - drop an always-true selectedProject check in handleSubmit - remove the unused resume option from spawnCursor * fix: use CodeQL-recognized containment check for image reads Replace the path.relative guard in isPathInsideDirectory with the resolve + startsWith(root + sep) idiom so the path-injection barrier is visible to code scanning; behavior is unchanged. * fix(security): canonicalize Claude image attachment reads Resolve image attachment paths with realpath before reading so symlinks inside allowed roots cannot escape to arbitrary files. Preserve support for symlinked project/upload roots and add focused coverage for both cases. * fix: show agent subtask * fix(sessions): title app-created sessions from the first user message App-created sessions (started by sending a message from cloudcli) were titled with placeholder names — "Untitled Codex Session" from the disk indexer and, briefly, "New session" from the empty canonical upsert — before a later sync finally settled on the right text, causing the sidebar title to flicker. - Codex/OpenCode synchronizers now title app-created sessions (distinct app id mapped to a provider id) from the first user message, while sessions found purely by indexing keep their existing setup. Claude keeps its AI-generated titles; Cursor already used the first message. - Decode OpenCode's JSON-string-literal prompts so titles no longer surface wrapped in quotes; hoist unwrapJsonStringLiteral into shared/utils since it's now used by both the reader and synchronizer. - Guard the sidebar upsert merge so an empty summary can never blank out a title that is already set. - Add codex/opencode synchronizer tests for the app-created vs indexed naming paths. * fix(chat): make message queuing reliable across sessions and turn boundaries Queued messages had four related defects: - A queued message flashed and then vanished at flush time: concurrent transcript refreshes (the `complete` handler racing the watcher-triggered update) could resolve out of order, letting a stale response overwrite newer server messages after the optimistic row was pruned. Session slots now carry a monotonic fetch ticket and discard stale fetch/refresh/ fetchMore responses. - Switching sessions flushed the previous session's queued draft into the newly viewed one (sending it with the wrong provider's settings, e.g. a Claude model into a Codex session). The composer flush is now scoped to its session, and a draft restored into an idle session sends after a short grace period so a live-run ack can cancel it. - The thinking banner never appeared for a queued turn: the chat handler's session-keyed completeRun safety net could fire after a queued message had already started the session's next run, emitting a spurious `complete` that killed it. The safety net is now scoped to its own run via completeRunIfCurrent (with a regression test). - Queued messages only sent while their session was being viewed. Drafts now persist their send options (model, effort, permissions) at queue time, and a new app-level useQueuedMessageAutoSend hook dispatches a non-viewed session's queued message as soon as its run completes, using the storage key as the claim ticket to prevent double sends.
410 lines
14 KiB
TypeScript
410 lines
14 KiB
TypeScript
import path from 'node:path';
|
|
|
|
import type { WebSocket } from 'ws';
|
|
|
|
import { sessionsDb } from '@/modules/database/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, normalizeImageDescriptors } from '@/shared/image-attachments.js';
|
|
import type {
|
|
AnyRecord,
|
|
AuthenticatedWebSocketRequest,
|
|
LLMProvider,
|
|
} from '@/shared/types.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 filterImagesToUploadStore(images: unknown, assetsRootOverride?: string): AnyRecord[] {
|
|
const assetsRoot = path.resolve(assetsRootOverride ?? getGlobalImageAssetsDir());
|
|
|
|
return normalizeImageDescriptors(images).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 image outside the upload store: ${descriptor.path}`);
|
|
}
|
|
return isDirectChild;
|
|
});
|
|
}
|
|
|
|
/**
|
|
* One provider runtime entry point. All five runtimes share this signature,
|
|
* which lets the chat handler dispatch through a provider-keyed map instead
|
|
* of provider-specific branches.
|
|
*/
|
|
type ProviderSpawnFn = (
|
|
command: string,
|
|
options: AnyRecord,
|
|
writer: unknown
|
|
) => Promise<unknown>;
|
|
|
|
type ChatWebSocketDependencies = {
|
|
/** Provider runtimes keyed by provider id. */
|
|
spawnFns: Record<LLMProvider, ProviderSpawnFn>;
|
|
/**
|
|
* Abort functions keyed by provider id. They are addressed with the
|
|
* provider-native session id (that is how runtimes key their process maps).
|
|
* The Claude abort is async; the rest are sync — both shapes are accepted.
|
|
*/
|
|
abortFns: Record<LLMProvider, (providerSessionId: string) => boolean | Promise<boolean>>;
|
|
resolveToolApproval: (
|
|
requestId: string,
|
|
payload: {
|
|
allow: boolean;
|
|
updatedInput?: unknown;
|
|
message?: string;
|
|
rememberEntry?: unknown;
|
|
}
|
|
) => void;
|
|
/** Claude-only today: pending tool approvals included in `chat_subscribed`. */
|
|
getPendingApprovalsForSession: (providerSessionId: string) => unknown[];
|
|
};
|
|
|
|
/**
|
|
* Extracts the authenticated request user id in the formats currently produced
|
|
* by platform and OSS auth code paths.
|
|
*/
|
|
function readRequestUserId(
|
|
request: AuthenticatedWebSocketRequest | undefined
|
|
): string | number | null {
|
|
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: WebSocket, payload: unknown): void {
|
|
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: WebSocket,
|
|
code: string,
|
|
error: string,
|
|
sessionId?: string
|
|
): void {
|
|
sendJson(ws, {
|
|
kind: 'protocol_error',
|
|
code,
|
|
error,
|
|
sessionId: sessionId ?? null,
|
|
timestamp: new Date().toISOString(),
|
|
});
|
|
}
|
|
|
|
function readRequiredSessionId(data: AnyRecord): string | null {
|
|
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: WebSocket,
|
|
userId: string | number | null,
|
|
data: AnyRecord,
|
|
dependencies: ChatWebSocketDependencies
|
|
): Promise<void> {
|
|
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 as LLMProvider;
|
|
const spawnFn = dependencies.spawnFns[provider];
|
|
if (!spawnFn) {
|
|
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 ?? {}) as AnyRecord;
|
|
const command = typeof data.content === 'string' ? data.content : '';
|
|
|
|
// The provider runtimes receive the provider-native session id (that is the
|
|
// id their CLI/SDK understands for resume). 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: AnyRecord = {
|
|
...clientOptions,
|
|
// Image attachments are re-validated server-side: only files inside the
|
|
// global upload store may reach the provider runtimes' file reads.
|
|
images: filterImagesToUploadStore(clientOptions.images),
|
|
sessionId: session.provider_session_id ?? undefined,
|
|
resume: Boolean(session.provider_session_id),
|
|
cwd: clientOptions.cwd ?? session.project_path ?? undefined,
|
|
projectPath: session.project_path ?? clientOptions.projectPath,
|
|
};
|
|
|
|
try {
|
|
await spawnFn(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: WebSocket,
|
|
data: AnyRecord,
|
|
dependencies: ChatWebSocketDependencies
|
|
): Promise<void> {
|
|
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 abortFn = dependencies.abortFns[run.provider];
|
|
let success = false;
|
|
if (abortFn && run.providerSessionId) {
|
|
success = Boolean(await abortFn(run.providerSessionId));
|
|
}
|
|
|
|
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: WebSocket,
|
|
data: AnyRecord,
|
|
dependencies: ChatWebSocketDependencies
|
|
): void {
|
|
const targets = Array.isArray(data.sessions) ? data.sessions : [];
|
|
|
|
for (const target of targets) {
|
|
if (!target || typeof target !== 'object') {
|
|
continue;
|
|
}
|
|
|
|
const sessionId = typeof (target as AnyRecord).sessionId === 'string'
|
|
? ((target as AnyRecord).sessionId as string).trim()
|
|
: '';
|
|
if (!sessionId) {
|
|
continue;
|
|
}
|
|
|
|
const lastSeqRaw = (target as AnyRecord).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 provider-native id inside the
|
|
// Claude runtime; remap their sessionId so the client only sees app ids.
|
|
const pendingPermissions = (run?.providerSessionId
|
|
? dependencies.getPendingApprovalsForSession(run.providerSessionId)
|
|
: []
|
|
).map((approval) =>
|
|
approval && typeof approval === 'object'
|
|
? { ...(approval as AnyRecord), sessionId }
|
|
: approval,
|
|
);
|
|
|
|
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: AnyRecord, dependencies: ChatWebSocketDependencies): void {
|
|
if (typeof data.requestId !== 'string' || data.requestId.length === 0) {
|
|
return;
|
|
}
|
|
|
|
dependencies.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: WebSocket,
|
|
request: AuthenticatedWebSocketRequest,
|
|
dependencies: ChatWebSocketDependencies
|
|
): void {
|
|
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 as AnyRecord;
|
|
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);
|
|
});
|
|
}
|