d8dfun/claudecodeui
1
0
Fork 0
mirror of https://github.com/siteboon/claudecodeui.git synced 2026-01-23 01:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixing claude and cursor login defaulting to the previously opened shell

Browse Source
This commit is contained in:
simosmik
2025-12-17 12:18:40 +00:00
parent d822a96818
commit 6bf3696991
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/index.js
View File

@@ -827,9 +827,31 @@ function handleShellConnection(ws) {
const initialCommand = data.initialCommand;
const isPlainShell = data.isPlainShell || (!!initialCommand && !hasSession) || provider === 'plain-shell';
ptySessionKey = `${projectPath}_${sessionId || 'default'}`;
// Login commands (Claude/Cursor auth) should never reuse cached sessions
const isLoginCommand = initialCommand && (
initialCommand.includes('setup-token') ||
initialCommand.includes('cursor-agent login') ||
initialCommand.includes('auth login')
);
const existingSession = ptySessionsMap.get(ptySessionKey);
// Include command hash in session key so different commands get separate sessions
const commandSuffix = isPlainShell && initialCommand
? `_cmd_${Buffer.from(initialCommand).toString('base64').slice(0, 16)}`
: '';
ptySessionKey = `${projectPath}_${sessionId || 'default'}${commandSuffix}`;
// Kill any existing login session before starting fresh
if (isLoginCommand) {
const oldSession = ptySessionsMap.get(ptySessionKey);
if (oldSession) {
console.log('🧹 Cleaning up existing login session:', ptySessionKey);
if (oldSession.timeoutId) clearTimeout(oldSession.timeoutId);
if (oldSession.pty && oldSession.pty.kill) oldSession.pty.kill();
ptySessionsMap.delete(ptySessionKey);
}
}
const existingSession = isLoginCommand ? null : ptySessionsMap.get(ptySessionKey);
if (existingSession) {
console.log('♻️ Reconnecting to existing PTY session:', ptySessionKey);
shellProcess = existingSession.pty;

1
src/components/Onboarding.jsx
View File

@@ -575,6 +575,7 @@ const Onboarding = ({ onComplete }) => {
{/* Login Modal */}
{showLoginModal && (
<LoginModal
key={loginProvider}
isOpen={showLoginModal}
onClose={() => setShowLoginModal(false)}
provider={loginProvider}

1
src/components/Settings.jsx
View File

@@ -2149,6 +2149,7 @@ function Settings({ isOpen, onClose, projects = [], initialTab = 'tools' }) {
{/* Login Modal */}
<LoginModal
key={loginProvider}
isOpen={showLoginModal}
onClose={() => setShowLoginModal(false)}
provider={loginProvider}