mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-07-08 22:55:41 +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.
355 lines
13 KiB
JavaScript
355 lines
13 KiB
JavaScript
import crossSpawn from 'cross-spawn';
|
|
|
|
import { appendImagesInputTag } from './shared/image-attachments.js';
|
|
import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js';
|
|
import { sessionsService } from './modules/providers/services/sessions.service.js';
|
|
import { providerAuthService } from './modules/providers/services/provider-auth.service.js';
|
|
import { providerModelsService } from './modules/providers/services/provider-models.service.js';
|
|
import { createCompleteMessage, createNormalizedMessage, flattenPromptForWindowsShell } from './shared/utils.js';
|
|
|
|
// cross-spawn resolves .cmd shims/PATHEXT on Windows and delegates to
|
|
// child_process.spawn everywhere else.
|
|
const spawnFunction = crossSpawn;
|
|
|
|
let activeCursorProcesses = new Map(); // Track active processes by session ID
|
|
|
|
const WORKSPACE_TRUST_PATTERNS = [
|
|
/workspace trust required/i,
|
|
/do you trust the contents of this directory/i,
|
|
/working with untrusted contents/i,
|
|
/pass --trust,\s*--yolo,\s*or -f/i
|
|
];
|
|
|
|
function isWorkspaceTrustPrompt(text = '') {
|
|
if (!text || typeof text !== 'string') {
|
|
return false;
|
|
}
|
|
|
|
return WORKSPACE_TRUST_PATTERNS.some((pattern) => pattern.test(text));
|
|
}
|
|
|
|
async function spawnCursor(command, options = {}, ws) {
|
|
return new Promise(async (resolve, reject) => {
|
|
const { sessionId, projectPath, cwd, toolsSettings, skipPermissions, model, sessionSummary, images } = options;
|
|
const resolvedModel = await providerModelsService.resolveResumeModel('cursor', sessionId, model);
|
|
let capturedSessionId = sessionId; // Track session ID throughout the process
|
|
let sessionCreatedSent = false; // Track if we've already sent session-created event
|
|
let hasRetriedWithTrust = false;
|
|
let settled = false;
|
|
// The unified lifecycle contract requires exactly one terminal `complete`
|
|
// per run. Cursor surfaces completion twice (the `result` JSON line and
|
|
// the process close), so the first emission wins.
|
|
let completeSent = false;
|
|
|
|
// Use tools settings passed from frontend, or defaults
|
|
const settings = toolsSettings || {
|
|
allowedShellCommands: [],
|
|
skipPermissions: false
|
|
};
|
|
|
|
// Build Cursor CLI command
|
|
const baseArgs = [];
|
|
|
|
// Build flags allowing both resume and prompt together (reply in existing session)
|
|
// Treat presence of sessionId as intention to resume, regardless of resume flag
|
|
if (sessionId) {
|
|
baseArgs.push('--resume=' + sessionId);
|
|
}
|
|
|
|
if (command && command.trim()) {
|
|
// Provide a prompt (works for both new and resumed sessions). Image
|
|
// attachments ride along as an <images_input> path list appended to the
|
|
// prompt; the session history reader strips the tag back out for display.
|
|
// cursor-agent is a .cmd shim on Windows, so the whole argument must be
|
|
// newline-free or cmd.exe silently truncates it at the first newline.
|
|
baseArgs.push('-p', flattenPromptForWindowsShell(appendImagesInputTag(command, images)));
|
|
|
|
// Model overrides are applied to both new and resumed sessions so a
|
|
// session-scoped change request can take effect on the next turn.
|
|
if (resolvedModel) {
|
|
baseArgs.push('--model', resolvedModel);
|
|
}
|
|
|
|
// Request streaming JSON when we are providing a prompt
|
|
baseArgs.push('--output-format', 'stream-json');
|
|
}
|
|
|
|
// Add skip permissions flag if enabled
|
|
if (skipPermissions || settings.skipPermissions) {
|
|
baseArgs.push('-f');
|
|
}
|
|
|
|
// Use cwd (actual project directory) instead of projectPath
|
|
const workingDir = cwd || projectPath || process.cwd();
|
|
|
|
// Store process reference for potential abort
|
|
const processKey = capturedSessionId || Date.now().toString();
|
|
|
|
const settleOnce = (callback) => {
|
|
if (settled) {
|
|
return;
|
|
}
|
|
settled = true;
|
|
callback();
|
|
};
|
|
|
|
const runCursorProcess = (args, runReason = 'initial') => {
|
|
const isTrustRetry = runReason === 'trust-retry';
|
|
let runSawWorkspaceTrustPrompt = false;
|
|
let stdoutLineBuffer = '';
|
|
let terminalNotificationSent = false;
|
|
|
|
const notifyTerminalState = ({ code = null, error = null } = {}) => {
|
|
if (terminalNotificationSent) {
|
|
return;
|
|
}
|
|
|
|
terminalNotificationSent = true;
|
|
|
|
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
if (code === 0 && !error) {
|
|
notifyRunStopped({
|
|
userId: ws?.userId || null,
|
|
provider: 'cursor',
|
|
sessionId: finalSessionId,
|
|
sessionName: sessionSummary,
|
|
stopReason: 'completed'
|
|
});
|
|
return;
|
|
}
|
|
|
|
notifyRunFailed({
|
|
userId: ws?.userId || null,
|
|
provider: 'cursor',
|
|
sessionId: finalSessionId,
|
|
sessionName: sessionSummary,
|
|
error: error || `Cursor CLI exited with code ${code}`
|
|
});
|
|
};
|
|
|
|
if (isTrustRetry) {
|
|
console.log('Retrying Cursor CLI with --trust after workspace trust prompt');
|
|
}
|
|
|
|
const cursorProcess = spawnFunction('cursor-agent', args, {
|
|
cwd: workingDir,
|
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
env: { ...process.env } // Inherit all environment variables
|
|
});
|
|
|
|
activeCursorProcesses.set(processKey, cursorProcess);
|
|
|
|
const shouldSuppressForTrustRetry = (text) => {
|
|
if (hasRetriedWithTrust || args.includes('--trust')) {
|
|
return false;
|
|
}
|
|
if (!isWorkspaceTrustPrompt(text)) {
|
|
return false;
|
|
}
|
|
|
|
runSawWorkspaceTrustPrompt = true;
|
|
return true;
|
|
};
|
|
|
|
const processCursorOutputLine = (line) => {
|
|
if (!line || !line.trim()) {
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const response = JSON.parse(line);
|
|
|
|
// Handle different message types
|
|
switch (response.type) {
|
|
case 'system':
|
|
if (response.subtype === 'init') {
|
|
// Capture session ID
|
|
if (response.session_id && !capturedSessionId) {
|
|
capturedSessionId = response.session_id;
|
|
|
|
// Update process key with captured session ID
|
|
if (processKey !== capturedSessionId) {
|
|
activeCursorProcesses.delete(processKey);
|
|
activeCursorProcesses.set(capturedSessionId, cursorProcess);
|
|
}
|
|
|
|
// Set session ID on writer (for API endpoint compatibility)
|
|
if (ws.setSessionId && typeof ws.setSessionId === 'function') {
|
|
ws.setSessionId(capturedSessionId);
|
|
}
|
|
|
|
// Send session-created event only once for new sessions
|
|
if (!sessionId && !sessionCreatedSent) {
|
|
sessionCreatedSent = true;
|
|
ws.send(createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, model: response.model, cwd: response.cwd, sessionId: capturedSessionId, provider: 'cursor' }));
|
|
}
|
|
}
|
|
|
|
// System info — no longer needed by the frontend (session-lifecycle 'created' handles nav).
|
|
}
|
|
break;
|
|
|
|
case 'user':
|
|
// User messages are not displayed in the UI — skip.
|
|
break;
|
|
|
|
case 'assistant':
|
|
// Accumulate assistant message chunks
|
|
if (response.message && response.message.content && response.message.content.length > 0) {
|
|
const normalized = sessionsService.normalizeMessage('cursor', response, capturedSessionId || sessionId || null);
|
|
for (const msg of normalized) ws.send(msg);
|
|
}
|
|
break;
|
|
|
|
case 'result': {
|
|
// Session complete — terminal lifecycle event for this run
|
|
if (!completeSent) {
|
|
completeSent = true;
|
|
ws.send(createCompleteMessage({
|
|
provider: 'cursor',
|
|
sessionId: capturedSessionId || sessionId || null,
|
|
exitCode: response.subtype === 'success' ? 0 : 1,
|
|
}));
|
|
}
|
|
break;
|
|
}
|
|
|
|
default:
|
|
// Unknown message types — ignore.
|
|
}
|
|
} catch (parseError) {
|
|
if (shouldSuppressForTrustRetry(line)) {
|
|
return;
|
|
}
|
|
|
|
// If not JSON, send as stream delta via adapter
|
|
const normalized = sessionsService.normalizeMessage('cursor', line, capturedSessionId || sessionId || null);
|
|
for (const msg of normalized) ws.send(msg);
|
|
}
|
|
};
|
|
|
|
// Handle stdout (streaming JSON responses)
|
|
cursorProcess.stdout.on('data', (data) => {
|
|
const rawOutput = data.toString();
|
|
|
|
// Stream chunks can split JSON objects across packets; keep trailing partial line.
|
|
stdoutLineBuffer += rawOutput;
|
|
const completeLines = stdoutLineBuffer.split(/\r?\n/);
|
|
stdoutLineBuffer = completeLines.pop() || '';
|
|
|
|
completeLines.forEach((line) => {
|
|
processCursorOutputLine(line.trim());
|
|
});
|
|
});
|
|
|
|
// Handle stderr
|
|
cursorProcess.stderr.on('data', (data) => {
|
|
const stderrText = data.toString();
|
|
console.error('Cursor CLI stderr:', stderrText);
|
|
|
|
if (shouldSuppressForTrustRetry(stderrText)) {
|
|
return;
|
|
}
|
|
|
|
ws.send(createNormalizedMessage({ kind: 'error', content: stderrText, sessionId: capturedSessionId || sessionId || null, provider: 'cursor' }));
|
|
});
|
|
|
|
// Handle process completion
|
|
cursorProcess.on('close', async (code) => {
|
|
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
activeCursorProcesses.delete(finalSessionId);
|
|
|
|
// Flush any final unterminated stdout line before completion handling.
|
|
if (stdoutLineBuffer.trim()) {
|
|
processCursorOutputLine(stdoutLineBuffer.trim());
|
|
stdoutLineBuffer = '';
|
|
}
|
|
|
|
if (
|
|
runSawWorkspaceTrustPrompt &&
|
|
code !== 0 &&
|
|
!hasRetriedWithTrust &&
|
|
!args.includes('--trust')
|
|
) {
|
|
hasRetriedWithTrust = true;
|
|
runCursorProcess([...args, '--trust'], 'trust-retry');
|
|
return;
|
|
}
|
|
|
|
// Terminal complete — unless the `result` line already sent it, or the
|
|
// run was aborted (abort-session sent the aborted complete).
|
|
if (!completeSent && !cursorProcess.aborted) {
|
|
completeSent = true;
|
|
ws.send(createCompleteMessage({ provider: 'cursor', sessionId: finalSessionId, exitCode: code }));
|
|
}
|
|
|
|
if (code === 0) {
|
|
notifyTerminalState({ code });
|
|
settleOnce(() => resolve());
|
|
} else {
|
|
notifyTerminalState({ code });
|
|
settleOnce(() => reject(new Error(`Cursor CLI exited with code ${code}`)));
|
|
}
|
|
});
|
|
|
|
// Handle process errors
|
|
cursorProcess.on('error', async (error) => {
|
|
console.error('Cursor CLI process error:', error);
|
|
|
|
// Clean up process reference on error
|
|
const finalSessionId = capturedSessionId || sessionId || processKey;
|
|
activeCursorProcesses.delete(finalSessionId);
|
|
|
|
// Check if Cursor CLI is installed for a clearer error message
|
|
const installed = await providerAuthService.isProviderInstalled('cursor');
|
|
const errorContent = !installed
|
|
? 'Cursor CLI is not installed. Please install it from https://cursor.com'
|
|
: error.message;
|
|
|
|
ws.send(createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: capturedSessionId || sessionId || null, provider: 'cursor' }));
|
|
if (!completeSent && !cursorProcess.aborted) {
|
|
completeSent = true;
|
|
ws.send(createCompleteMessage({ provider: 'cursor', sessionId: capturedSessionId || sessionId || null, exitCode: 1 }));
|
|
}
|
|
notifyTerminalState({ error });
|
|
|
|
settleOnce(() => reject(error));
|
|
});
|
|
|
|
// Close stdin since Cursor doesn't need interactive input
|
|
cursorProcess.stdin.end();
|
|
};
|
|
|
|
runCursorProcess(baseArgs, 'initial');
|
|
});
|
|
}
|
|
|
|
function abortCursorSession(sessionId) {
|
|
const process = activeCursorProcesses.get(sessionId);
|
|
if (process) {
|
|
console.log(`Aborting Cursor session: ${sessionId}`);
|
|
// The abort handler sends the terminal complete (aborted: true); flag the
|
|
// process so its close handler does not emit a second one.
|
|
process.aborted = true;
|
|
process.kill('SIGTERM');
|
|
activeCursorProcesses.delete(sessionId);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function isCursorSessionActive(sessionId) {
|
|
return activeCursorProcesses.has(sessionId);
|
|
}
|
|
|
|
function getActiveCursorSessions() {
|
|
return Array.from(activeCursorProcesses.keys());
|
|
}
|
|
|
|
export {
|
|
spawnCursor,
|
|
abortCursorSession,
|
|
isCursorSessionActive,
|
|
getActiveCursorSessions
|
|
};
|