30b142d318
This commit fixes the session ID confusion identified in PR #475: PROBLEM: - Using contentSessionId (user's Claude Code session) for SDK resume was wrong - Memory agent conversation should persist across the entire user session - Each SDK call was starting fresh, losing memory agent continuity SOLUTION: 1. Semantic Renaming (clarity): - claudeSessionId → contentSessionId (user's observed session) - sdkSessionId → memorySessionId (memory agent's session for resume) - Database migration 17 renames columns accordingly 2. Memory Session ID Capture: - SDKAgent captures session_id from first SDK message - Persists to database via updateMemorySessionId() - SessionManager loads memorySessionId on session init 3. Resume Logic Fixed: - Only resume if memorySessionId captured from previous interaction - Enables memory agent continuity across user prompts Files changed: 33 (types, database, agents, hooks, routes) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
403 lines
13 KiB
TypeScript
403 lines
13 KiB
TypeScript
import { Database } from './sqlite-compat.js';
|
|
import type { PendingMessage } from '../worker-types.js';
|
|
import { logger } from '../../utils/logger.js';
|
|
|
|
/**
|
|
* Persistent pending message record from database
|
|
*/
|
|
export interface PersistentPendingMessage {
|
|
id: number;
|
|
session_db_id: number;
|
|
content_session_id: string;
|
|
message_type: 'observation' | 'summarize';
|
|
tool_name: string | null;
|
|
tool_input: string | null;
|
|
tool_response: string | null;
|
|
cwd: string | null;
|
|
last_user_message: string | null;
|
|
last_assistant_message: string | null;
|
|
prompt_number: number | null;
|
|
status: 'pending' | 'processing' | 'processed' | 'failed';
|
|
retry_count: number;
|
|
created_at_epoch: number;
|
|
started_processing_at_epoch: number | null;
|
|
completed_at_epoch: number | null;
|
|
}
|
|
|
|
/**
|
|
* PendingMessageStore - Persistent work queue for SDK messages
|
|
*
|
|
* Messages are persisted before processing and marked complete after success.
|
|
* This enables recovery from SDK hangs and worker crashes.
|
|
*
|
|
* Lifecycle:
|
|
* 1. enqueue() - Message persisted with status 'pending'
|
|
* 2. markProcessing() - Status changes to 'processing' when yielded to SDK
|
|
* 3. markProcessed() - Status changes to 'processed' after successful SDK response
|
|
* 4. markFailed() - Status changes to 'failed' if max retries exceeded
|
|
*
|
|
* Recovery:
|
|
* - resetStuckMessages() - Moves 'processing' messages back to 'pending' if stuck
|
|
* - getSessionsWithPendingMessages() - Find sessions that need recovery on startup
|
|
*/
|
|
export class PendingMessageStore {
|
|
private db: Database;
|
|
private maxRetries: number;
|
|
|
|
constructor(db: Database, maxRetries: number = 3) {
|
|
this.db = db;
|
|
this.maxRetries = maxRetries;
|
|
}
|
|
|
|
/**
|
|
* Enqueue a new message (persist before processing)
|
|
* @returns The database ID of the persisted message
|
|
*/
|
|
enqueue(sessionDbId: number, contentSessionId: string, message: PendingMessage): number {
|
|
const now = Date.now();
|
|
const stmt = this.db.prepare(`
|
|
INSERT INTO pending_messages (
|
|
session_db_id, content_session_id, message_type,
|
|
tool_name, tool_input, tool_response, cwd,
|
|
last_user_message, last_assistant_message,
|
|
prompt_number, status, retry_count, created_at_epoch
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', 0, ?)
|
|
`);
|
|
|
|
const result = stmt.run(
|
|
sessionDbId,
|
|
contentSessionId,
|
|
message.type,
|
|
message.tool_name || null,
|
|
message.tool_input ? JSON.stringify(message.tool_input) : null,
|
|
message.tool_response ? JSON.stringify(message.tool_response) : null,
|
|
message.cwd || null,
|
|
message.last_user_message || null,
|
|
message.last_assistant_message || null,
|
|
message.prompt_number || null,
|
|
now
|
|
);
|
|
|
|
return result.lastInsertRowid as number;
|
|
}
|
|
|
|
/**
|
|
* Atomically claim the next pending message for processing
|
|
* Finds oldest pending -> marks processing -> returns it
|
|
* Uses a transaction to prevent race conditions
|
|
*/
|
|
claimNextMessage(sessionDbId: number): PersistentPendingMessage | null {
|
|
const now = Date.now();
|
|
|
|
const claimTx = this.db.transaction((sessionId: number, timestamp: number) => {
|
|
const peekStmt = this.db.prepare(`
|
|
SELECT * FROM pending_messages
|
|
WHERE session_db_id = ? AND status = 'pending'
|
|
ORDER BY id ASC
|
|
LIMIT 1
|
|
`);
|
|
const msg = peekStmt.get(sessionId) as PersistentPendingMessage | null;
|
|
|
|
if (msg) {
|
|
const updateStmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'processing', started_processing_at_epoch = ?
|
|
WHERE id = ?
|
|
`);
|
|
updateStmt.run(timestamp, msg.id);
|
|
|
|
// Return updated object
|
|
return {
|
|
...msg,
|
|
status: 'processing',
|
|
started_processing_at_epoch: timestamp
|
|
} as PersistentPendingMessage;
|
|
}
|
|
return null;
|
|
});
|
|
|
|
return claimTx(sessionDbId, now) as PersistentPendingMessage | null;
|
|
}
|
|
|
|
/**
|
|
* Get all pending messages for session (ordered by creation time)
|
|
*/
|
|
getAllPending(sessionDbId: number): PersistentPendingMessage[] {
|
|
const stmt = this.db.prepare(`
|
|
SELECT * FROM pending_messages
|
|
WHERE session_db_id = ? AND status = 'pending'
|
|
ORDER BY id ASC
|
|
`);
|
|
return stmt.all(sessionDbId) as PersistentPendingMessage[];
|
|
}
|
|
|
|
/**
|
|
* Get all queue messages (for UI display)
|
|
* Returns pending, processing, and failed messages (not processed - they're deleted)
|
|
* Joins with sdk_sessions to get project name
|
|
*/
|
|
getQueueMessages(): (PersistentPendingMessage & { project: string | null })[] {
|
|
const stmt = this.db.prepare(`
|
|
SELECT pm.*, ss.project
|
|
FROM pending_messages pm
|
|
LEFT JOIN sdk_sessions ss ON pm.content_session_id = ss.content_session_id
|
|
WHERE pm.status IN ('pending', 'processing', 'failed')
|
|
ORDER BY
|
|
CASE pm.status
|
|
WHEN 'failed' THEN 0
|
|
WHEN 'processing' THEN 1
|
|
WHEN 'pending' THEN 2
|
|
END,
|
|
pm.created_at_epoch ASC
|
|
`);
|
|
return stmt.all() as (PersistentPendingMessage & { project: string | null })[];
|
|
}
|
|
|
|
/**
|
|
* Get count of stuck messages (processing longer than threshold)
|
|
*/
|
|
getStuckCount(thresholdMs: number): number {
|
|
const cutoff = Date.now() - thresholdMs;
|
|
const stmt = this.db.prepare(`
|
|
SELECT COUNT(*) as count FROM pending_messages
|
|
WHERE status = 'processing' AND started_processing_at_epoch < ?
|
|
`);
|
|
const result = stmt.get(cutoff) as { count: number };
|
|
return result.count;
|
|
}
|
|
|
|
/**
|
|
* Retry a specific message (reset to pending)
|
|
* Works for pending (re-queue), processing (reset stuck), and failed messages
|
|
*/
|
|
retryMessage(messageId: number): boolean {
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'pending', started_processing_at_epoch = NULL
|
|
WHERE id = ? AND status IN ('pending', 'processing', 'failed')
|
|
`);
|
|
const result = stmt.run(messageId);
|
|
return result.changes > 0;
|
|
}
|
|
|
|
/**
|
|
* Reset all processing messages for a session to pending
|
|
* Used when force-restarting a stuck session
|
|
*/
|
|
resetProcessingToPending(sessionDbId: number): number {
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'pending', started_processing_at_epoch = NULL
|
|
WHERE session_db_id = ? AND status = 'processing'
|
|
`);
|
|
const result = stmt.run(sessionDbId);
|
|
return result.changes;
|
|
}
|
|
|
|
/**
|
|
* Abort a specific message (delete from queue)
|
|
*/
|
|
abortMessage(messageId: number): boolean {
|
|
const stmt = this.db.prepare('DELETE FROM pending_messages WHERE id = ?');
|
|
const result = stmt.run(messageId);
|
|
return result.changes > 0;
|
|
}
|
|
|
|
/**
|
|
* Retry all stuck messages at once
|
|
*/
|
|
retryAllStuck(thresholdMs: number): number {
|
|
const cutoff = Date.now() - thresholdMs;
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'pending', started_processing_at_epoch = NULL
|
|
WHERE status = 'processing' AND started_processing_at_epoch < ?
|
|
`);
|
|
const result = stmt.run(cutoff);
|
|
return result.changes;
|
|
}
|
|
|
|
/**
|
|
* Get recently processed messages (for UI feedback)
|
|
* Shows messages completed in the last N minutes so users can see their stuck items were processed
|
|
*/
|
|
getRecentlyProcessed(limit: number = 10, withinMinutes: number = 30): (PersistentPendingMessage & { project: string | null })[] {
|
|
const cutoff = Date.now() - (withinMinutes * 60 * 1000);
|
|
const stmt = this.db.prepare(`
|
|
SELECT pm.*, ss.project
|
|
FROM pending_messages pm
|
|
LEFT JOIN sdk_sessions ss ON pm.content_session_id = ss.content_session_id
|
|
WHERE pm.status = 'processed' AND pm.completed_at_epoch > ?
|
|
ORDER BY pm.completed_at_epoch DESC
|
|
LIMIT ?
|
|
`);
|
|
return stmt.all(cutoff, limit) as (PersistentPendingMessage & { project: string | null })[];
|
|
}
|
|
|
|
/**
|
|
* Mark message as being processed (status: pending -> processing)
|
|
*/
|
|
markProcessing(messageId: number): void {
|
|
const now = Date.now();
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'processing', started_processing_at_epoch = ?
|
|
WHERE id = ? AND status = 'pending'
|
|
`);
|
|
stmt.run(now, messageId);
|
|
}
|
|
|
|
/**
|
|
* Mark message as successfully processed (status: processing -> processed)
|
|
* Clears tool_input and tool_response to save space (observations are already saved)
|
|
*/
|
|
markProcessed(messageId: number): void {
|
|
const now = Date.now();
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET
|
|
status = 'processed',
|
|
completed_at_epoch = ?,
|
|
tool_input = NULL,
|
|
tool_response = NULL
|
|
WHERE id = ? AND status = 'processing'
|
|
`);
|
|
stmt.run(now, messageId);
|
|
}
|
|
|
|
/**
|
|
* Mark message as failed (status: processing -> failed or back to pending for retry)
|
|
* If retry_count < maxRetries, moves back to 'pending' for retry
|
|
* Otherwise marks as 'failed' permanently
|
|
*/
|
|
markFailed(messageId: number): void {
|
|
const now = Date.now();
|
|
|
|
// Get current retry count
|
|
const msg = this.db.prepare('SELECT retry_count FROM pending_messages WHERE id = ?').get(messageId) as { retry_count: number } | undefined;
|
|
|
|
if (!msg) return;
|
|
|
|
if (msg.retry_count < this.maxRetries) {
|
|
// Move back to pending for retry
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'pending', retry_count = retry_count + 1, started_processing_at_epoch = NULL
|
|
WHERE id = ?
|
|
`);
|
|
stmt.run(messageId);
|
|
} else {
|
|
// Max retries exceeded, mark as permanently failed
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'failed', completed_at_epoch = ?
|
|
WHERE id = ?
|
|
`);
|
|
stmt.run(now, messageId);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reset stuck messages (processing -> pending if stuck longer than threshold)
|
|
* @param thresholdMs Messages processing longer than this are considered stuck (0 = reset all)
|
|
* @returns Number of messages reset
|
|
*/
|
|
resetStuckMessages(thresholdMs: number): number {
|
|
const cutoff = thresholdMs === 0 ? Date.now() : Date.now() - thresholdMs;
|
|
|
|
const stmt = this.db.prepare(`
|
|
UPDATE pending_messages
|
|
SET status = 'pending', started_processing_at_epoch = NULL
|
|
WHERE status = 'processing' AND started_processing_at_epoch < ?
|
|
`);
|
|
|
|
const result = stmt.run(cutoff);
|
|
return result.changes;
|
|
}
|
|
|
|
/**
|
|
* Get count of pending messages for a session
|
|
*/
|
|
getPendingCount(sessionDbId: number): number {
|
|
const stmt = this.db.prepare(`
|
|
SELECT COUNT(*) as count FROM pending_messages
|
|
WHERE session_db_id = ? AND status IN ('pending', 'processing')
|
|
`);
|
|
const result = stmt.get(sessionDbId) as { count: number };
|
|
return result.count;
|
|
}
|
|
|
|
/**
|
|
* Check if any session has pending work
|
|
*/
|
|
hasAnyPendingWork(): boolean {
|
|
const stmt = this.db.prepare(`
|
|
SELECT COUNT(*) as count FROM pending_messages
|
|
WHERE status IN ('pending', 'processing')
|
|
`);
|
|
const result = stmt.get() as { count: number };
|
|
return result.count > 0;
|
|
}
|
|
|
|
/**
|
|
* Get all session IDs that have pending messages (for recovery on startup)
|
|
*/
|
|
getSessionsWithPendingMessages(): number[] {
|
|
const stmt = this.db.prepare(`
|
|
SELECT DISTINCT session_db_id FROM pending_messages
|
|
WHERE status IN ('pending', 'processing')
|
|
`);
|
|
const results = stmt.all() as { session_db_id: number }[];
|
|
return results.map(r => r.session_db_id);
|
|
}
|
|
|
|
/**
|
|
* Get session info for a pending message (for recovery)
|
|
*/
|
|
getSessionInfoForMessage(messageId: number): { sessionDbId: number; contentSessionId: string } | null {
|
|
const stmt = this.db.prepare(`
|
|
SELECT session_db_id, content_session_id FROM pending_messages WHERE id = ?
|
|
`);
|
|
const result = stmt.get(messageId) as { session_db_id: number; content_session_id: string } | undefined;
|
|
return result ? { sessionDbId: result.session_db_id, contentSessionId: result.content_session_id } : null;
|
|
}
|
|
|
|
/**
|
|
* Cleanup old processed messages (retention policy)
|
|
* Keeps the most recent N processed messages, deletes the rest
|
|
* @param retentionCount Number of processed messages to keep (default: 100)
|
|
* @returns Number of messages deleted
|
|
*/
|
|
cleanupProcessed(retentionCount: number = 100): number {
|
|
const stmt = this.db.prepare(`
|
|
DELETE FROM pending_messages
|
|
WHERE status = 'processed'
|
|
AND id NOT IN (
|
|
SELECT id FROM pending_messages
|
|
WHERE status = 'processed'
|
|
ORDER BY completed_at_epoch DESC
|
|
LIMIT ?
|
|
)
|
|
`);
|
|
|
|
const result = stmt.run(retentionCount);
|
|
return result.changes;
|
|
}
|
|
|
|
/**
|
|
* Convert a PersistentPendingMessage back to PendingMessage format
|
|
*/
|
|
toPendingMessage(persistent: PersistentPendingMessage): PendingMessage {
|
|
return {
|
|
type: persistent.message_type,
|
|
tool_name: persistent.tool_name || undefined,
|
|
tool_input: persistent.tool_input ? JSON.parse(persistent.tool_input) : undefined,
|
|
tool_response: persistent.tool_response ? JSON.parse(persistent.tool_response) : undefined,
|
|
prompt_number: persistent.prompt_number || undefined,
|
|
cwd: persistent.cwd || undefined,
|
|
last_user_message: persistent.last_user_message || undefined,
|
|
last_assistant_message: persistent.last_assistant_message || undefined
|
|
};
|
|
}
|
|
}
|