Files
claude-mem/tests/services/sqlite/PendingMessageStore.test.ts
T
Alex Newman 36b0929fae Server-beta: Postgres storage + independent runtime + BullMQ queue (Phases 1–3) (#2351)
* Add server beta runtime foundation

* Address server beta review findings

* Resolve server beta review comments

* Tighten server beta review follow-ups

* Harden server beta auth and search

* Avoid unnecessary FTS rebuilds

* Block scoped keys from creating projects

* Release BullMQ claims best effort on close

* Address server beta review blockers

* Reset BullMQ claims best effort

* Add Postgres observation storage foundation

* feat(server-beta): add independent runtime service

Introduce src/server/runtime/ as a self-contained server-beta runtime
that owns its lifecycle, Postgres bootstrap, and HTTP boundary without
depending on WorkerService.

ServerBetaService wraps the existing Server class, exposes
/healthz and /v1/info with runtime="server-beta", and persists state
to dedicated paths (.server-beta.pid|.port|.runtime.json). The four
boundary managers (queue, generation worker, provider registry, event
broadcaster) are intentionally disabled in this phase and report their
status through /v1/info; later phases activate them.

Adds plans/2026-05-07-finish-bullmq-branch-ship-plan.md to track the
remaining work for this branch.

Phase 2 of plans/2026-05-07-server-beta-independent-bullmq-observation-runtime.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(server-beta): route CLI lifecycle and bundle separate runtime

scripts/build-hooks.js now produces plugin/scripts/server-beta-service.cjs
as a separate Node CJS bundle, alongside the existing worker-service
bundle. The server-beta runtime is now installable independently.

src/npx-cli/commands/server.ts routes start|stop|restart|status to the
server-beta lifecycle instead of the legacy worker. The worker keeps its
own start|stop|restart|status under the worker namespace; the two
runtimes can be operated independently.

src/services/worker-service.ts adds a server-* command parser branch
that delegates to the sibling server-beta-service.cjs bundle so
direct worker-service invocations still route to the right runtime.

tests/npx-cli-server-namespace.test.ts updated to expect server-beta
lifecycle routing.

Includes rebuilt plugin/scripts/*.cjs bundles produced by
build-and-sync.

Phase 2 of plans/2026-05-07-server-beta-independent-bullmq-observation-runtime.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(server-beta): add BullMQ job queue primitives

Introduce src/server/jobs/ as the queue-side primitives that Phase 3 of
the server-beta runtime needs to operate.

types.ts defines a discriminated union over the four job kinds (event,
event-batch, summary, reindex) and maps each to a per-kind BullMQ queue
name and deterministic-ID prefix.

job-id.ts builds deterministic, colon-free BullMQ jobIds from
(kind, team, project, source). The colon ban exists because BullMQ uses
':' as a Redis key separator internally; embedding ':' in jobIds
breaks scan and state lookups.

ServerJobQueue.ts is a thin wrapper over BullMQ Queue + Worker that
enforces autorun:false, default concurrency 1, and an attached error
listener — all per BullMQ docs requirements. Test seams accept queue
and worker factories so unit tests do not need Redis.

outbox.ts publishes through the Postgres ObservationGenerationJob
repository as canonical history. enqueueOutbox writes the row first,
then publishes to BullMQ; if BullMQ throws, the row is transitioned to
failed and a failed event is appended. reconcileOnStartup re-enqueues
queued + processing rows after a restart, replacing terminal BullMQ
jobs that may still be holding the deterministic ID slot. markCompleted
and markFailed wrap transitionStatus and append the matching event row.

Includes 20 unit tests covering deterministic ID stability, colon-free
output, queue lifecycle, error-listener attachment, double-start
refusal, idempotent enqueue, BullMQ failure rollback, startup
reconciliation, max-attempts skipping, and completion / failure /
retry transitions.

Phase 3 commit 1 of plans/2026-05-07-server-beta-independent-bullmq-observation-runtime.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* feat(server-beta): activate queue boundary in runtime service

Wire ActiveServerBetaQueueManager into the server-beta runtime graph.
The active manager owns one ServerJobQueue per generation kind (event,
event-batch, summary, reindex) and surfaces lane metadata through
boundary health.

Selection is opt-in and fail-fast: if CLAUDE_MEM_QUEUE_ENGINE is set to
bullmq the active manager is constructed (and any Redis/config error
throws — no silent fallback to SQLite, per Phase 3 anti-pattern guard).
For any other engine the disabled boundary remains so worker-era and
test setups stay compatible.

Widens ServerBetaBoundaryHealth.status to a discriminated union
('disabled' | 'active' | 'errored') with optional details. The disabled
adapter still emits status='disabled', which keeps the existing
server-beta-service test green.

ServerBetaService receives the manager through a new optional
queueManager field on CreateServerBetaServiceOptions so test graphs
and Phase 4 wiring can inject custom managers.

Adds tests/server/runtime/active-queue-manager.test.ts covering bullmq
guard, active health shape, per-kind queue access, close behavior, and
post-close errored health.

Phase 3 commit 2 of plans/2026-05-07-server-beta-independent-bullmq-observation-runtime.md.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

* fix(server-beta): cap /v1/events/batch at 500 events

Prevents unbounded array DoS surface flagged in PR review.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-08 01:20:07 -07:00

416 lines
17 KiB
TypeScript

import { describe, test, expect, beforeEach, afterEach } from 'bun:test';
import type { Database } from 'bun:sqlite';
import { ClaudeMemDatabase } from '../../../src/services/sqlite/Database.js';
import { SessionStore } from '../../../src/services/sqlite/SessionStore.js';
import { PendingMessageStore } from '../../../src/services/sqlite/PendingMessageStore.js';
import { createSDKSession } from '../../../src/services/sqlite/Sessions.js';
import type { PendingMessage } from '../../../src/services/worker-types.js';
function getColumnNames(db: Database, table: string): string[] {
const quotedTable = `"${table.replace(/"/g, '""')}"`;
return (db.prepare(`PRAGMA table_info(${quotedTable})`).all() as { name: string }[])
.map(column => column.name);
}
function getIndexNames(db: Database, table: string): string[] {
const quotedTable = `"${table.replace(/"/g, '""')}"`;
return (db.prepare(`PRAGMA index_list(${quotedTable})`).all() as { name: string }[])
.map(index => index.name);
}
function rebuildPendingMessagesWithoutToolUseId(db: Database): void {
db.run('DROP INDEX IF EXISTS ux_pending_session_tool');
db.run('DROP INDEX IF EXISTS idx_pending_messages_worker_pid');
db.run('DROP TABLE IF EXISTS pending_messages_without_tool_use_id');
db.run(`
CREATE TABLE pending_messages_without_tool_use_id (
id INTEGER PRIMARY KEY AUTOINCREMENT,
session_db_id INTEGER NOT NULL,
content_session_id TEXT NOT NULL,
message_type TEXT NOT NULL CHECK(message_type IN ('observation', 'summarize')),
tool_name TEXT,
tool_input TEXT,
tool_response TEXT,
cwd TEXT,
last_user_message TEXT,
last_assistant_message TEXT,
prompt_number INTEGER,
status TEXT NOT NULL DEFAULT 'pending' CHECK(status IN ('pending', 'processing')),
created_at_epoch INTEGER NOT NULL,
agent_type TEXT,
agent_id TEXT,
FOREIGN KEY (session_db_id) REFERENCES sdk_sessions(id) ON DELETE CASCADE
)
`);
db.run(`
INSERT INTO pending_messages_without_tool_use_id (
id, session_db_id, content_session_id, message_type, tool_name,
tool_input, tool_response, cwd, last_user_message,
last_assistant_message, prompt_number, status, created_at_epoch,
agent_type, agent_id
)
SELECT
id, session_db_id, content_session_id, message_type, tool_name,
tool_input, tool_response, cwd, last_user_message,
last_assistant_message, prompt_number, status, created_at_epoch,
agent_type, agent_id
FROM pending_messages
`);
db.run('DROP TABLE pending_messages');
db.run('ALTER TABLE pending_messages_without_tool_use_id RENAME TO pending_messages');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_session ON pending_messages(session_db_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_status ON pending_messages(status)');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_claude_session ON pending_messages(content_session_id)');
}
function rebuildLegacyPendingMessagesWithDeadColumns(db: Database): void {
db.run('DROP INDEX IF EXISTS ux_pending_session_tool');
db.run('DROP INDEX IF EXISTS idx_pending_messages_worker_pid');
db.run('DROP TABLE pending_messages');
db.run(`
CREATE TABLE pending_messages (
id INTEGER PRIMARY KEY AUTOINCREMENT,
session_db_id INTEGER NOT NULL,
content_session_id TEXT NOT NULL,
message_type TEXT NOT NULL,
tool_name TEXT,
tool_input TEXT,
tool_response TEXT,
cwd TEXT,
last_user_message TEXT,
last_assistant_message TEXT,
prompt_number INTEGER,
status TEXT NOT NULL DEFAULT 'pending',
retry_count INTEGER NOT NULL DEFAULT 0,
failed_at_epoch INTEGER,
completed_at_epoch INTEGER,
created_at_epoch INTEGER NOT NULL,
agent_type TEXT,
agent_id TEXT,
tool_use_id TEXT,
worker_pid INTEGER,
FOREIGN KEY (session_db_id) REFERENCES sdk_sessions(id) ON DELETE CASCADE
)
`);
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_session ON pending_messages(session_db_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_status ON pending_messages(status)');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_claude_session ON pending_messages(content_session_id)');
db.run('CREATE INDEX IF NOT EXISTS idx_pending_messages_worker_pid ON pending_messages(worker_pid)');
}
function createPendingMessage(overrides: Partial<PendingMessage> = {}): PendingMessage {
return {
type: 'observation',
tool_name: 'TestTool',
tool_input: { test: 'input' },
tool_response: { test: 'response' },
prompt_number: 1,
...overrides,
};
}
describe('PendingMessageStore current schema guardrails', () => {
test('SessionStore repairs missing tool_use_id even when schema_versions says pending migrations already ran', () => {
const initialStore = new SessionStore(':memory:');
const db = initialStore.db;
rebuildPendingMessagesWithoutToolUseId(db);
const repairedStore = new SessionStore(db);
try {
const columns = getColumnNames(db, 'pending_messages');
expect(columns).toContain('tool_use_id');
expect(columns).not.toContain('worker_pid');
const sessionDbId = repairedStore.createSDKSession('content-shape-repair', 'test-project', 'initial prompt');
const pendingStore = new PendingMessageStore(db, () => {});
pendingStore.enqueue(sessionDbId, 'content-shape-repair', createPendingMessage({ toolUseId: 'tool-1' }));
pendingStore.enqueue(sessionDbId, 'content-shape-repair', createPendingMessage({ toolUseId: 'tool-1' }));
const count = db.prepare(`
SELECT COUNT(*) AS count
FROM pending_messages
WHERE content_session_id = ?
`).get('content-shape-repair') as { count: number };
expect(count.count).toBe(1);
} finally {
repairedStore.close();
}
});
test('SessionStore removes stale duplicate rows before creating the tool_use_id unique index', () => {
const initialStore = new SessionStore(':memory:');
const db = initialStore.db;
const sessionDbId = initialStore.createSDKSession('content-stale-dedupe', 'test-project', 'initial prompt');
rebuildLegacyPendingMessagesWithDeadColumns(db);
db.prepare('INSERT OR IGNORE INTO schema_versions (version, applied_at) VALUES (?, ?)').run(31, new Date().toISOString());
db.prepare('INSERT OR IGNORE INTO schema_versions (version, applied_at) VALUES (?, ?)').run(32, new Date().toISOString());
db.prepare(`
INSERT INTO pending_messages (
id, session_db_id, content_session_id, message_type, status,
created_at_epoch, tool_use_id, completed_at_epoch
)
VALUES (?, ?, ?, 'observation', ?, ?, ?, ?)
`).run(1, sessionDbId, 'content-stale-dedupe', 'completed', 1000, 'tool-stale', 1100);
db.prepare(`
INSERT INTO pending_messages (
id, session_db_id, content_session_id, message_type, status,
created_at_epoch, tool_use_id
)
VALUES (?, ?, ?, 'observation', ?, ?, ?)
`).run(2, sessionDbId, 'content-stale-dedupe', 'pending', 1200, 'tool-stale');
const repairedStore = new SessionStore(db);
try {
const rows = db.prepare(`
SELECT id, status, tool_use_id
FROM pending_messages
WHERE content_session_id = ?
`).all('content-stale-dedupe') as { id: number; status: string; tool_use_id: string }[];
expect(rows).toEqual([{ id: 2, status: 'pending', tool_use_id: 'tool-stale' }]);
expect(getColumnNames(db, 'pending_messages')).not.toContain('completed_at_epoch');
expect(getColumnNames(db, 'pending_messages')).not.toContain('worker_pid');
expect(getIndexNames(db, 'pending_messages')).toContain('ux_pending_session_tool');
} finally {
repairedStore.close();
}
});
test('SessionStore preserves processing duplicate rows during tool_use_id dedupe', () => {
const initialStore = new SessionStore(':memory:');
const db = initialStore.db;
const sessionDbId = initialStore.createSDKSession('content-processing-dedupe', 'test-project', 'initial prompt');
rebuildLegacyPendingMessagesWithDeadColumns(db);
db.prepare('INSERT OR IGNORE INTO schema_versions (version, applied_at) VALUES (?, ?)').run(31, new Date().toISOString());
db.prepare('INSERT OR IGNORE INTO schema_versions (version, applied_at) VALUES (?, ?)').run(32, new Date().toISOString());
db.prepare(`
INSERT INTO pending_messages (
id, session_db_id, content_session_id, message_type, status,
created_at_epoch, tool_use_id
)
VALUES (?, ?, ?, 'observation', ?, ?, ?)
`).run(1, sessionDbId, 'content-processing-dedupe', 'pending', 1000, 'tool-in-flight');
db.prepare(`
INSERT INTO pending_messages (
id, session_db_id, content_session_id, message_type, status,
created_at_epoch, tool_use_id
)
VALUES (?, ?, ?, 'observation', ?, ?, ?)
`).run(2, sessionDbId, 'content-processing-dedupe', 'processing', 1100, 'tool-in-flight');
const repairedStore = new SessionStore(db);
try {
const rows = db.prepare(`
SELECT id, status, tool_use_id
FROM pending_messages
WHERE content_session_id = ?
`).all('content-processing-dedupe') as { id: number; status: string; tool_use_id: string }[];
expect(rows).toEqual([{ id: 2, status: 'processing', tool_use_id: 'tool-in-flight' }]);
} finally {
repairedStore.close();
}
});
test('SessionStore does not stamp dead-column cleanup when a drop fails', () => {
const initialStore = new SessionStore(':memory:');
const db = initialStore.db;
const sessionDbId = initialStore.createSDKSession('content-drop-failure', 'test-project', 'initial prompt');
rebuildLegacyPendingMessagesWithDeadColumns(db);
db.prepare('DELETE FROM schema_versions WHERE version IN (31, 32)').run();
db.prepare(`
INSERT INTO pending_messages (
id, session_db_id, content_session_id, message_type, status,
created_at_epoch, tool_use_id, completed_at_epoch
)
VALUES (?, ?, ?, 'observation', 'completed', ?, ?, ?)
`).run(1, sessionDbId, 'content-drop-failure', 1000, 'tool-completed', 1100);
const originalRun = db.run.bind(db);
(db as any).run = (query: string, ...bindings: unknown[]) => {
if (query.includes('ALTER TABLE pending_messages DROP COLUMN completed_at_epoch')) {
throw new Error('simulated drop failure');
}
return originalRun(query, ...bindings);
};
const repairedStore = new SessionStore(db);
try {
const version31 = db
.prepare('SELECT version FROM schema_versions WHERE version = ?')
.get(31);
expect(version31).toBeNull();
expect(getColumnNames(db, 'pending_messages')).toContain('completed_at_epoch');
const rowCount = db.prepare(`
SELECT COUNT(*) AS count
FROM pending_messages
WHERE content_session_id = ? AND status = 'completed'
`).get('content-drop-failure') as { count: number };
expect(rowCount.count).toBe(1);
} finally {
(db as any).run = originalRun;
repairedStore.close();
}
});
test('SessionStore keeps null tool_use_id rows because summaries and legacy rows may not have tool ids', () => {
const store = new SessionStore(':memory:');
const db = store.db;
const sessionDbId = store.createSDKSession('content-null-tool', 'test-project', 'initial prompt');
try {
db.prepare(`
INSERT INTO pending_messages (
session_db_id, content_session_id, message_type, status, created_at_epoch, tool_use_id
)
VALUES (?, ?, 'summarize', 'pending', ?, NULL)
`).run(sessionDbId, 'content-null-tool', 1000);
db.prepare(`
INSERT INTO pending_messages (
session_db_id, content_session_id, message_type, status, created_at_epoch, tool_use_id
)
VALUES (?, ?, 'summarize', 'pending', ?, NULL)
`).run(sessionDbId, 'content-null-tool', 1001);
const rows = db.prepare(`
SELECT COUNT(*) AS count
FROM pending_messages
WHERE content_session_id = ? AND tool_use_id IS NULL
`).get('content-null-tool') as { count: number };
expect(rows.count).toBe(2);
} finally {
store.close();
}
});
test('fresh SessionStore pending_messages shape does not require worker_pid for enqueue and claim', () => {
const store = new SessionStore(':memory:');
try {
const db = store.db;
const columns = getColumnNames(db, 'pending_messages');
const indexes = getIndexNames(db, 'pending_messages');
expect(columns).toContain('tool_use_id');
expect(columns).not.toContain('worker_pid');
expect(indexes).not.toContain('idx_pending_messages_worker_pid');
const sessionDbId = store.createSDKSession('content-claim-current', 'test-project', 'initial prompt');
const pendingStore = new PendingMessageStore(db, () => {});
const messageId = pendingStore.enqueue(
sessionDbId,
'content-claim-current',
createPendingMessage({ toolUseId: 'tool-claim' })
);
const claimed = pendingStore.claimNextMessage(sessionDbId) as ({ id: number; tool_use_id: string | null } | null);
expect(claimed).not.toBeNull();
expect(claimed!.id).toBe(messageId);
expect(claimed!.tool_use_id).toBe('tool-claim');
} finally {
store.close();
}
});
});
describe('PendingMessageStore', () => {
let db: Database;
let store: PendingMessageStore;
let sessionDbId: number;
const CONTENT_SESSION_ID = 'test-queue-store';
beforeEach(() => {
db = new ClaudeMemDatabase(':memory:').db;
store = new PendingMessageStore(db);
sessionDbId = createSDKSession(db, CONTENT_SESSION_ID, 'test-project', 'Test prompt');
});
afterEach(() => {
db.close();
});
function enqueueMessage(overrides: Partial<PendingMessage> = {}): number {
return store.enqueue(sessionDbId, CONTENT_SESSION_ID, createPendingMessage(overrides));
}
test('claimNextMessage claims pending messages in FIFO order', () => {
const firstId = enqueueMessage({ tool_name: 'First' });
const secondId = enqueueMessage({ tool_name: 'Second' });
const first = store.claimNextMessage(sessionDbId);
const second = store.claimNextMessage(sessionDbId);
expect(first?.id).toBe(firstId);
expect(second?.id).toBe(secondId);
expect(first?.status).toBe('processing');
expect(second?.status).toBe('processing');
});
test('claimNextMessage ignores already processing messages until reset', () => {
const firstId = enqueueMessage({ tool_name: 'First' });
const secondId = enqueueMessage({ tool_name: 'Second' });
expect(store.claimNextMessage(sessionDbId)?.id).toBe(firstId);
expect(store.claimNextMessage(sessionDbId)?.id).toBe(secondId);
expect(store.claimNextMessage(sessionDbId)).toBeNull();
expect(store.resetProcessingToPending(sessionDbId)).toBe(2);
expect(store.claimNextMessage(sessionDbId)?.id).toBe(firstId);
});
test('resetProcessingToPending only affects the specified session', () => {
const session2Id = createSDKSession(db, 'other-session', 'test-project', 'Test');
const session1MessageId = enqueueMessage();
const session2MessageId = store.enqueue(session2Id, 'other-session', {
type: 'observation',
tool_name: 'OtherTool',
});
expect(store.claimNextMessage(sessionDbId)?.id).toBe(session1MessageId);
expect(store.claimNextMessage(session2Id)?.id).toBe(session2MessageId);
expect(store.resetProcessingToPending(sessionDbId)).toBe(1);
const session1Msg = db.query('SELECT status FROM pending_messages WHERE id = ?').get(session1MessageId) as { status: string };
const session2Msg = db.query('SELECT status FROM pending_messages WHERE id = ?').get(session2MessageId) as { status: string };
expect(session1Msg.status).toBe('pending');
expect(session2Msg.status).toBe('processing');
});
test('clearPendingForSession removes pending and processing rows', () => {
const firstId = enqueueMessage({ tool_name: 'First' });
enqueueMessage({ tool_name: 'Second' });
expect(store.claimNextMessage(sessionDbId)?.id).toBe(firstId);
expect(store.getPendingCount(sessionDbId)).toBe(2);
expect(store.clearPendingForSession(sessionDbId)).toBe(2);
expect(store.getPendingCount(sessionDbId)).toBe(0);
});
test('deduplicates by content session and tool use id', () => {
const firstId = enqueueMessage({ toolUseId: 'tool-1' });
const duplicateId = enqueueMessage({ toolUseId: 'tool-1' });
expect(firstId).toBeGreaterThan(0);
expect(duplicateId).toBe(0);
expect(store.getPendingCount(sessionDbId)).toBe(1);
});
test('queue depth helpers count pending and processing rows across sessions', () => {
const session2Id = createSDKSession(db, 'other-depth-session', 'test-project', 'Test');
enqueueMessage();
store.enqueue(session2Id, 'other-depth-session', { type: 'summarize' });
store.claimNextMessage(sessionDbId);
expect(store.getPendingCount(sessionDbId)).toBe(1);
expect(store.getPendingCount(session2Id)).toBe(1);
expect(store.getTotalQueueDepth()).toBe(2);
expect(store.hasAnyPendingWork()).toBe(true);
expect(store.getSessionsWithPendingMessages()).toEqual([sessionDbId, session2Id]);
});
});