Skip to content

fix(ACS-175): Resolve integrations freeze and improve rate limit handling #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aslaker merged 10 commits into from
Jan 12, 2026
Merged

fix(ACS-175): Resolve integrations freeze and improve rate limit handling #839

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b03e446
fix(ACS-175): Resolve integrations freeze and improve rate limit hand…
MikeeBuilds Jan 8, 2026
b20c1bb
Merge branch 'develop' into fix/acs-175-integrations-freeze
AndyMik90 Jan 8, 2026
27ae640
fix(i18n): replace hardcoded toast strings with translation keys
MikeeBuilds Jan 8, 2026
56a6bed
fix: replace console.log with debugLog in IntegrationSettings
MikeeBuilds Jan 8, 2026
a37e072
fix: replace console.log with debugLog in main process files
MikeeBuilds Jan 8, 2026
f9fdd8d
Merge branch 'develop' into fix/acs-175-integrations-freeze
aslaker Jan 9, 2026
8328066
fix: address Auto Claude PR review findings - console.error→debugErro…
MikeeBuilds Jan 9, 2026
da9b707
fix: address Auto Claude PR review findings - race condition + consol…
MikeeBuilds Jan 10, 2026
e033f51
Merge branch 'develop' into fix/acs-175-integrations-freeze
aslaker Jan 11, 2026
0f1a7ec
Merge branch 'develop' into fix/acs-175-integrations-freeze
aslaker Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions apps/frontend/src/main/ipc-handlers/terminal-handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function registerTerminalHandlers(
(_, id: string, cwd?: string) => {
// Use async version to avoid blocking main process during CLI detection
terminalManager.invokeClaudeAsync(id, cwd).catch((error) => {
console.error('[terminal-handlers] Failed to invoke Claude:', error);
debugError('[terminal-handlers] Failed to invoke Claude:', error);
});
}
);
Expand Down Expand Up @@ -312,12 +312,17 @@ export function registerTerminalHandlers(
ipcMain.handle(
IPC_CHANNELS.CLAUDE_PROFILE_INITIALIZE,
async (_, profileId: string): Promise<IPCResult> => {
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Handler called for profileId:', profileId);
try {
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Getting profile manager...');
const profileManager = getClaudeProfileManager();
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Getting profile...');
const profile = profileManager.getProfile(profileId);
if (!profile) {
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Profile not found!');
return { success: false, error: 'Profile not found' };
}
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Profile found:', profile.name);

// Ensure the config directory exists for non-default profiles
if (!profile.isDefault && profile.configDir) {
Expand All @@ -333,6 +338,7 @@ export function registerTerminalHandlers(
const terminalId = `claude-login-${profileId}-${Date.now()}`;
const homeDir = process.env.HOME || process.env.USERPROFILE || '/tmp';

debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Creating terminal:', terminalId);
debugLog('[IPC] Initializing Claude profile:', {
profileId,
profileName: profile.name,
Expand All @@ -341,7 +347,9 @@ export function registerTerminalHandlers(
});

// Create a new terminal for the login process
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Calling terminalManager.create...');
const createResult = await terminalManager.create({ id: terminalId, cwd: homeDir });
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Terminal created:', createResult.success);

// If terminal creation failed, return the error
if (!createResult.success) {
Expand All @@ -352,17 +360,18 @@ export function registerTerminalHandlers(
}

// Wait a moment for the terminal to initialize
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Waiting 500ms for terminal init...');
await new Promise(resolve => setTimeout(resolve, 500));
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Wait complete');

// Build the login command with the profile's config dir
// Use platform-specific syntax and escaping for environment variables
// Use full path to claude CLI - no need to modify PATH since we have the absolute path
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Getting Claude CLI invocation...');
let loginCommand: string;
const { command: claudeCmd, env: claudeEnv } = await getClaudeCliInvocationAsync();
const pathPrefix = claudeEnv.PATH
? (process.platform === 'win32'
? `set "PATH=${escapeShellArgWindows(claudeEnv.PATH)}" && `
: `export PATH=${escapeShellArg(claudeEnv.PATH)} && `)
: '';
const { command: claudeCmd } = await getClaudeCliInvocationAsync();
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Got Claude CLI:', claudeCmd);

// Use the full path directly - escaping only needed for paths with spaces
const shellClaudeCmd = process.platform === 'win32'
? `"${escapeShellArgWindows(claudeCmd)}"`
: escapeShellArg(claudeCmd);
Expand All @@ -372,24 +381,30 @@ export function registerTerminalHandlers(
// SECURITY: Use Windows-specific escaping for cmd.exe
const escapedConfigDir = escapeShellArgWindows(profile.configDir);
// Windows cmd.exe syntax: set "VAR=value" with %VAR% for expansion
loginCommand = `${pathPrefix}set "CLAUDE_CONFIG_DIR=${escapedConfigDir}" && echo Config dir: %CLAUDE_CONFIG_DIR% && ${shellClaudeCmd} setup-token`;
loginCommand = `set "CLAUDE_CONFIG_DIR=${escapedConfigDir}" && echo Config dir: %CLAUDE_CONFIG_DIR% && ${shellClaudeCmd} setup-token`;
} else {
// SECURITY: Use POSIX escaping for bash/zsh
const escapedConfigDir = escapeShellArg(profile.configDir);
// Unix/Mac bash/zsh syntax: export VAR=value with $VAR for expansion
loginCommand = `${pathPrefix}export CLAUDE_CONFIG_DIR=${escapedConfigDir} && echo "Config dir: $CLAUDE_CONFIG_DIR" && ${shellClaudeCmd} setup-token`;
loginCommand = `export CLAUDE_CONFIG_DIR=${escapedConfigDir} && echo "Config dir: $CLAUDE_CONFIG_DIR" && ${shellClaudeCmd} setup-token`;
}
} else {
loginCommand = `${pathPrefix}${shellClaudeCmd} setup-token`;
// Simple command for default profile - just run setup-token
loginCommand = `${shellClaudeCmd} setup-token`;
}

debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Built login command, length:', loginCommand.length);
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Login command:', loginCommand);
debugLog('[IPC] Sending login command to terminal:', loginCommand);

// Write the login command to the terminal
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Writing command to terminal...');
terminalManager.write(terminalId, `${loginCommand}\r`);
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Command written successfully');

// Notify the renderer that an auth terminal was created
// This allows the UI to display the terminal so users can see the OAuth flow
debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Notifying renderer of auth terminal...');
const mainWindow = getMainWindow();
if (mainWindow) {
mainWindow.webContents.send(IPC_CHANNELS.TERMINAL_AUTH_CREATED, {
Expand All @@ -399,6 +414,7 @@ export function registerTerminalHandlers(
});
}

debugLog('[IPC:CLAUDE_PROFILE_INITIALIZE] Returning success!');
return {
success: true,
data: {
Expand All @@ -407,7 +423,7 @@ export function registerTerminalHandlers(
}
};
} catch (error) {
debugError('[IPC] Failed to initialize Claude profile:', error);
debugError('[IPC:CLAUDE_PROFILE_INITIALIZE] EXCEPTION:', error);
return {
success: false,
error: error instanceof Error ? error.message : 'Failed to initialize Claude profile'
Expand Down Expand Up @@ -640,7 +656,7 @@ export function registerTerminalHandlers(
(_, id: string, sessionId?: string) => {
// Use async version to avoid blocking main process during CLI detection
terminalManager.resumeClaudeAsync(id, sessionId).catch((error) => {
console.error('[terminal-handlers] Failed to resume Claude:', error);
debugError('[terminal-handlers] Failed to resume Claude:', error);
});
}
);
Expand All @@ -651,7 +667,7 @@ export function registerTerminalHandlers(
IPC_CHANNELS.TERMINAL_ACTIVATE_DEFERRED_RESUME,
(_, id: string) => {
terminalManager.activateDeferredResume(id).catch((error) => {
console.error('[terminal-handlers] Failed to activate deferred Claude resume:', error);
debugError('[terminal-handlers] Failed to activate deferred Claude resume:', error);
});
}
);
Expand Down
63 changes: 60 additions & 3 deletions apps/frontend/src/main/terminal/pty-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type { TerminalProcess, WindowGetter } from './types';
import { IPC_CHANNELS } from '../../shared/constants';
import { getClaudeProfileManager } from '../claude-profile-manager';
import { readSettingsFile } from '../settings-utils';
import { debugLog, debugError } from '../../shared/utils/debug-logger';
import type { SupportedTerminal } from '../../shared/types/settings';

/**
Expand Down Expand Up @@ -84,7 +85,7 @@ export function spawnPtyProcess(

const shellArgs = process.platform === 'win32' ? [] : ['-l'];

console.warn('[PtyManager] Spawning shell:', shell, shellArgs, '(preferred:', preferredTerminal || 'system', ')');
debugLog('[PtyManager] Spawning shell:', shell, shellArgs, '(preferred:', preferredTerminal || 'system', ')');

// Create a clean environment without DEBUG to prevent Claude Code from
// enabling debug mode when the Electron app is run in development mode.
Expand Down Expand Up @@ -137,7 +138,7 @@ export function setupPtyHandlers(

// Handle terminal exit
ptyProcess.onExit(({ exitCode }) => {
console.warn('[PtyManager] Terminal exited:', id, 'code:', exitCode);
debugLog('[PtyManager] Terminal exited:', id, 'code:', exitCode);

const win = getWindow();
if (win) {
Expand All @@ -151,11 +152,67 @@ export function setupPtyHandlers(
});
}

/**
* Constants for chunked write behavior
* CHUNKED_WRITE_THRESHOLD: Data larger than this (bytes) will be written in chunks
* CHUNK_SIZE: Size of each chunk - smaller chunks yield to event loop more frequently
*/
const CHUNKED_WRITE_THRESHOLD = 1000;
const CHUNK_SIZE = 100;

Comment on lines +155 to +162
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Search for CHUNK_SIZE and chunked write related references
echo "=== Searching for CHUNK_SIZE and chunked write references ==="
rg -n "CHUNK_SIZE|chunked.*write|CHUNKED_WRITE" --type=ts --type=tsx --type=md -C 2

Repository: AndyMik90/Auto-Claude

Length of output: 171

🏁 Script executed:

#!/bin/bash
# Check for performance tests or benchmarks
echo "=== Looking for performance tests or benchmarks ==="
fd -e test.ts -e test.tsx -e spec.ts -e bench.ts | xargs rg -l "chunk|pty|terminal|write" 2>/dev/null || echo "No test files found with those patterns"

Repository: AndyMik90/Auto-Claude

Length of output: 3092

🏁 Script executed:

#!/bin/bash
# Get the full context of pty-manager.ts around the constants and their usage
echo "=== Examining pty-manager.ts file size ==="
wc -l apps/frontend/src/main/terminal/pty-manager.ts

Repository: AndyMik90/Auto-Claude

Length of output: 158

🏁 Script executed:

#!/bin/bash
# Read the pty-manager.ts file to understand context and usage
echo "=== Reading pty-manager.ts ==="
cat -n apps/frontend/src/main/terminal/pty-manager.ts

Repository: AndyMik90/Auto-Claude

Length of output: 9408

🏁 Script executed:

#!/bin/bash
# Simpler search for CHUNK_SIZE and related constants
echo "=== Searching for CHUNK_SIZE usage ==="
rg -n "CHUNK_SIZE|CHUNKED_WRITE_THRESHOLD|setImmediate" apps/frontend/src/main/terminal/ -C 3

Repository: AndyMik90/Auto-Claude

Length of output: 4038

The chunked write approach is sound, though the rationale for specific chunk size could be clearer.

The constants are well-extracted and documented. However, the logic is intentionally designed to yield to the event loop via setImmediate between chunks—this is not a latency concern but the intended behavior to prevent blocking. CHUNK_SIZE of 100 bytes is conservative by design for this purpose, and the 1000-byte threshold ensures small writes bypass chunking entirely. While performance testing could validate whether the chunk size is optimal for actual throughput, it is not necessary for correctness, as the current values are reasonable for a terminal I/O operation.

🤖 Prompt for AI Agents 
In @apps/frontend/src/main/terminal/pty-manager.ts around lines 155 - 162,
Update the block comment above CHUNKED_WRITE_THRESHOLD and CHUNK_SIZE to
explicitly state that chunking uses setImmediate between chunks to intentionally
yield to the event loop (to avoid blocking), that CHUNK_SIZE = 100 is a
conservative value chosen for yielding rather than latency/throughput
optimization, and that CHUNKED_WRITE_THRESHOLD = 1000 ensures small writes
bypass chunking; note that performance tuning is optional and not required for
correctness.

/**
* Write data to a PTY process
* Uses setImmediate to prevent blocking the event loop on large writes
*/
export function writeToPty(terminal: TerminalProcess, data: string): void {
terminal.pty.write(data);
debugLog('[PtyManager:writeToPty] About to write to pty, data length:', data.length);

// For large commands, write in chunks to prevent blocking
if (data.length > CHUNKED_WRITE_THRESHOLD) {
debugLog('[PtyManager:writeToPty] Large write detected, using chunked write');
let offset = 0;
let chunkNum = 0;

const writeChunk = () => {
Copy link
Collaborator

@aslaker aslaker Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥

Copy link
Collaborator

@aslaker aslaker Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MikeeBuilds @AndyMik90 I think we are good on this for a while, but we may want to think ahead to see what something like Tauri would look like for a Cloud version. Much better multi-threading with Rust that would allow us to avoid some of these blocking scenarios.

// Check if terminal is still valid before writing
if (!terminal.pty) {
debugError('[PtyManager:writeToPty] Terminal PTY no longer valid, aborting chunked write');
return;
}

if (offset >= data.length) {
debugLog('[PtyManager:writeToPty] Chunked write completed, total chunks:', chunkNum);
return;
}

const chunk = data.slice(offset, offset + CHUNK_SIZE);
chunkNum++;
debugLog('[PtyManager:writeToPty] Writing chunk', chunkNum, 'offset:', offset, 'size:', chunk.length);
try {
terminal.pty.write(chunk);
debugLog('[PtyManager:writeToPty] Chunk', chunkNum, 'written');
offset += CHUNK_SIZE;
// Use setImmediate to yield to the event loop between chunks
setImmediate(writeChunk);
} catch (error) {
debugError('[PtyManager:writeToPty] Chunked write FAILED at chunk', chunkNum, 'offset', offset, ':', error);
// Don't rethrow - match non-chunked behavior for consistency (fire-and-forget semantics)
}
};

// Start the chunked write after yielding
debugLog('[PtyManager:writeToPty] Scheduling first chunk...');
setImmediate(writeChunk);
debugLog('[PtyManager:writeToPty] First chunk scheduled, returning');
} else {
try {
terminal.pty.write(data);
debugLog('[PtyManager:writeToPty] Write completed successfully');
} catch (error) {
debugError('[PtyManager:writeToPty] Write FAILED:', error);
// Don't rethrow - fire-and-forget terminal write semantics
}
}
}

/**
Expand Down
10 changes: 8 additions & 2 deletions apps/frontend/src/main/terminal/terminal-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import * as SessionHandler from './session-handler';
import * as TerminalLifecycle from './terminal-lifecycle';
import * as TerminalEventHandler from './terminal-event-handler';
import * as ClaudeIntegration from './claude-integration-handler';
import { debugLog, debugError } from '../../shared/utils/debug-logger';

export class TerminalManager {
private terminals: Map<string, TerminalProcess> = new Map();
Expand Down Expand Up @@ -84,7 +85,7 @@ export class TerminalManager {
onResumeNeeded: (terminalId, sessionId) => {
// Use async version to avoid blocking main process
this.resumeClaudeAsync(terminalId, sessionId).catch((error) => {
console.error('[terminal-manager] Failed to resume Claude session:', error);
debugError('[terminal-manager] Failed to resume Claude session:', error);
});
}
},
Expand Down Expand Up @@ -120,9 +121,14 @@ export class TerminalManager {
* Send input to a terminal
*/
write(id: string, data: string): void {
debugLog('[TerminalManager:write] Writing to terminal:', id, 'data length:', data.length);
const terminal = this.terminals.get(id);
if (terminal) {
debugLog('[TerminalManager:write] Terminal found, calling writeToPty...');
PtyManager.writeToPty(terminal, data);
debugLog('[TerminalManager:write] writeToPty completed');
} else {
debugError('[TerminalManager:write] Terminal NOT found:', id);
}
}

Expand Down Expand Up @@ -311,7 +317,7 @@ export class TerminalManager {
onResumeNeeded: (terminalId, sessionId) => {
// Use async version to avoid blocking main process
this.resumeClaudeAsync(terminalId, sessionId).catch((error) => {
console.error('[terminal-manager] Failed to resume Claude session:', error);
debugError('[terminal-manager] Failed to resume Claude session:', error);
});
}
},
Expand Down
28 changes: 17 additions & 11 deletions apps/frontend/src/renderer/components/RateLimitModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ import { Label } from './ui/label';
import { Input } from './ui/input';
import { useRateLimitStore } from '../stores/rate-limit-store';
import { useClaudeProfileStore, loadClaudeProfiles, switchTerminalToProfile } from '../stores/claude-profile-store';
import { useToast } from '../hooks/use-toast';

const CLAUDE_UPGRADE_URL = 'https://claude.ai/upgrade';

export function RateLimitModal() {
const { t } = useTranslation('common');
const { isModalOpen, rateLimitInfo, hideRateLimitModal, clearPendingRateLimit } = useRateLimitStore();
const { profiles, activeProfileId, isSwitching } = useClaudeProfileStore();
const { toast } = useToast();
const [selectedProfileId, setSelectedProfileId] = useState<string | null>(null);
const [autoSwitchEnabled, setAutoSwitchEnabled] = useState(false);
const [isLoadingSettings, setIsLoadingSettings] = useState(false);
Expand Down Expand Up @@ -116,22 +118,26 @@ export function RateLimitModal() {
// Close the modal so user can see the terminal
hideRateLimitModal();

// Alert the user about the terminal
alert(
`A terminal has been opened to authenticate "${profileName}".\n\n` +
`Steps to complete:\n` +
`1. Check the "Agent Terminals" section in the sidebar\n` +
`2. Complete the OAuth login in your browser\n` +
`3. The token will be saved automatically\n\n` +
`Once done, return here and the account will be available.`
);
// Notify the user about the terminal (non-blocking)
toast({
title: t('rateLimit.toast.authenticating', { profileName }),
description: t('rateLimit.toast.checkTerminal'),
});
} else {
alert(`Failed to start authentication: ${initResult.error || 'Please try again.'}`);
toast({
variant: 'destructive',
title: t('rateLimit.toast.authStartFailed'),
description: initResult.error || t('rateLimit.toast.tryAgain'),
});
}
}
} catch (err) {
console.error('Failed to add profile:', err);
alert('Failed to add profile. Please try again.');
toast({
variant: 'destructive',
title: t('rateLimit.toast.addProfileFailed'),
description: t('rateLimit.toast.tryAgain'),
});
} finally {
setIsAddingProfile(false);
}
Expand Down
Loading
Loading