mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-06-12 00:42:06 +08:00
Replace the chat processing banner with a minimal activity indicator and
rebuild the state model underneath it. The old banner was driven by five
overlapping pieces of state (isLoading, canAbortSession, claudeStatus in the
chat, plus two app-level Sets updated in lockstep through four callbacks)
that had to be kept in sync imperatively. Because completion and status
events mutated the *viewed* session's flags regardless of which session they
belonged to, a background session finishing could hide the indicator for a
still-running session, returning to a finished session could briefly show a
stale banner, and a late status reply could override a newer request.
The fix is structural rather than patch-by-patch: a single
Map<sessionId, {statusText, canInterrupt, startedAt}> in useSessionProtection
is now the only source of truth for "this session is working". The indicator,
stop button, composer streaming state, and session protection are all derived
from the viewed session's entry on render, so there is no stale local copy to
restore or reset when switching sessions. A PENDING_SESSION_ID sentinel
covers the window before a new conversation receives its real session id.
Terminal events delete the entry atomically, which is why the indicator
disappears the instant the final chunk arrives. Stale check-session-status
replies are discarded via an ifStartedBefore guard (an idle reply older than
the entry's startedAt describes a previous request, not the current one).
The second half unifies the provider lifecycle contract, because the frontend
could not be made race-free while each provider terminated differently:
- cursor emitted complete twice per run (result line + process close), which
double-played the completion sound and let a late close-complete clear a
newer request's indicator
- aborts produced two completes (the abort-session reply plus the provider's
own non-aborted one), so cancelling a run played the celebration sound
- codex omitted exitCode; others attached ad-hoc fields (resultText, isError,
isNewSession) the client had to know about
- claude/codex failures ended with only an error event while gemini/cursor
also emit kind:'error' for mid-run stderr noise, so 'error' was ambiguous
between "the run died" and "a process wrote to stderr"
Every run now ends with exactly one complete built by createCompleteMessage()
({sessionId, actualSessionId, exitCode, success, aborted}); abort-session
sends it on behalf of cancelled runs and providers detect the abort and skip
their own. error is demoted to an informational row, so stderr noise no
longer kills the indicator mid-run, and the client celebrates only
success: true completes.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
354 lines
12 KiB
JavaScript
354 lines
12 KiB
JavaScript
import { spawn } from 'child_process';
|
|
import crossSpawn from 'cross-spawn';
|
|
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 } from './shared/utils.js';
|
|
|
|
// Use cross-spawn on Windows for better command execution
|
|
const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn;
|
|
|
|
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, resume, toolsSettings, skipPermissions, model, sessionSummary } = 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)
|
|
baseArgs.push('-p', command);
|
|
|
|
// 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');
|
|
console.log('Using -f flag (skip permissions)');
|
|
}
|
|
|
|
// 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');
|
|
}
|
|
|
|
console.log('Spawning Cursor CLI:', 'cursor-agent', args.join(' '));
|
|
console.log('Working directory:', workingDir);
|
|
console.log('Session info - Input sessionId:', sessionId, 'Resume:', resume);
|
|
|
|
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
|
|
};
|