Skip to content

fix: Windows support for process signals and session persistence #63

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

Open
thoraxe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Windows support for process signals and session persistence #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions src/agent-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,19 @@ class AgentBridge {
}

if (session.active && session.process) {
session.process.kill('SIGTERM');
session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
// On Windows, kill() without arguments terminates the process
// On Unix, we use SIGTERM followed by SIGKILL after timeout
const isWindows = process.platform === 'win32';
if (isWindows) {
session.process.kill();
} else {
session.process.kill('SIGTERM');
session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
}
}
} catch (error) {
console.warn(`Error stopping agent session ${sessionId}:`, error.message);
Expand Down
20 changes: 13 additions & 7 deletions src/claude-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,19 @@ class ClaudeBridge {
}

if (session.active && session.process) {
session.process.kill('SIGTERM');

session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
// On Windows, kill() without arguments terminates the process
// On Unix, we use SIGTERM followed by SIGKILL after timeout
const isWindows = process.platform === 'win32';
if (isWindows) {
session.process.kill();
} else {
session.process.kill('SIGTERM');
session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
}
}
} catch (error) {
console.warn(`Error stopping session ${sessionId}:`, error.message);
Expand Down
19 changes: 13 additions & 6 deletions src/codex-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,19 @@ class CodexBridge {
}

if (session.active && session.process) {
session.process.kill('SIGTERM');
session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
// On Windows, kill() without arguments terminates the process
// On Unix, we use SIGTERM followed by SIGKILL after timeout
const isWindows = process.platform === 'win32';
if (isWindows) {
session.process.kill();
} else {
session.process.kill('SIGTERM');
session.killTimeout = setTimeout(() => {
if (session.active && session.process) {
session.process.kill('SIGKILL');
}
}, 5000);
}
}
} catch (error) {
console.warn(`Error stopping codex session ${sessionId}:`, error.message);
Expand Down
39 changes: 31 additions & 8 deletions src/utils/session-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,34 @@ class SessionStore {
// Store sessions in user's home directory
this.storageDir = path.join(os.homedir(), '.claude-code-web');
this.sessionsFile = path.join(this.storageDir, 'sessions.json');
this.initializeStorage();
this.initialized = false;
this.initPromise = this.initializeStorage();
}

async initializeStorage() {
try {
// Create storage directory if it doesn't exist
await fs.mkdir(this.storageDir, { recursive: true });
this.initialized = true;
} catch (error) {
console.error('Failed to create storage directory:', error);
}
}

async ensureInitialized() {
if (!this.initialized) {
await this.initPromise;
}
}

async saveSessions(sessions) {
try {
// Ensure initialization is complete
await this.ensureInitialized();

// Ensure storage directory exists
await fs.mkdir(this.storageDir, { recursive: true });

// Convert Map to array for JSON serialization
const sessionsArray = Array.from(sessions.entries()).map(([id, session]) => ({
id,
Expand Down Expand Up @@ -53,13 +64,22 @@ class SessionStore {
sessions: sessionsArray
};

// Write to a temporary file first, then rename (atomic operation)
const jsonData = JSON.stringify(data, null, 2);

// Try atomic write (temp file + rename) first
const tempFile = `${this.sessionsFile}.tmp`;
await fs.writeFile(tempFile, JSON.stringify(data, null, 2));
// Ensure directory still exists before rename (handles race conditions)
await fs.mkdir(this.storageDir, { recursive: true });
await fs.rename(tempFile, this.sessionsFile);

try {
await fs.writeFile(tempFile, jsonData);
await fs.rename(tempFile, this.sessionsFile);
} catch (renameError) {
// Fallback for Windows: direct write if rename fails
// This can happen due to file locks or cross-device moves
try {
await fs.unlink(tempFile);
} catch (e) { /* ignore cleanup errors */ }
await fs.writeFile(this.sessionsFile, jsonData);
}

return true;
} catch (error) {
console.error('Failed to save sessions:', error.message);
Expand All @@ -69,6 +89,9 @@ class SessionStore {

async loadSessions() {
try {
// Ensure initialization is complete
await this.ensureInitialized();

// Check if sessions file exists
await fs.access(this.sessionsFile);

Expand Down