36b0929fae
* 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>
136 lines
3.8 KiB
TypeScript
136 lines
3.8 KiB
TypeScript
#!/usr/bin/env bun
|
|
|
|
import { Database } from 'bun:sqlite';
|
|
import { existsSync } from 'fs';
|
|
import { homedir } from 'os';
|
|
import { join } from 'path';
|
|
|
|
interface CountRow { count: number }
|
|
interface StatusRow { status: string; count: number }
|
|
|
|
function resolveDbPath(): string {
|
|
const dataDir = process.env.CLAUDE_MEM_DATA_DIR || join(homedir(), '.claude-mem');
|
|
return join(dataDir, 'claude-mem.db');
|
|
}
|
|
|
|
async function prompt(question: string): Promise<string> {
|
|
if (!process.stdin.isTTY) {
|
|
console.log(question + '(no TTY, use --force flag for non-interactive mode)');
|
|
return 'n';
|
|
}
|
|
return new Promise((resolve) => {
|
|
process.stdout.write(question);
|
|
process.stdin.setRawMode(false);
|
|
process.stdin.resume();
|
|
process.stdin.once('data', (data) => {
|
|
process.stdin.pause();
|
|
resolve(data.toString().trim());
|
|
});
|
|
});
|
|
}
|
|
|
|
async function main() {
|
|
const args = process.argv.slice(2);
|
|
|
|
if (args.includes('--help') || args.includes('-h')) {
|
|
console.log(`
|
|
Claude-Mem Queue Clearer
|
|
|
|
Clear orphaned messages from the pending_messages SQLite table.
|
|
|
|
Usage:
|
|
bun scripts/clear-pending-queue.ts [options]
|
|
|
|
Options:
|
|
--help, -h Show this help message
|
|
--all Clear ALL messages (pending and processing)
|
|
--force Clear without prompting for confirmation
|
|
|
|
Examples:
|
|
# Clear processing messages interactively
|
|
bun scripts/clear-pending-queue.ts
|
|
|
|
# Clear ALL messages without confirmation
|
|
bun scripts/clear-pending-queue.ts --all --force
|
|
|
|
Notes:
|
|
Operates directly on ~/.claude-mem/claude-mem.db (or \$CLAUDE_MEM_DATA_DIR).
|
|
Uses SQLite WAL mode so it is safe to run while the worker is running.
|
|
`);
|
|
process.exit(0);
|
|
}
|
|
|
|
const force = args.includes('--force');
|
|
const clearAll = args.includes('--all');
|
|
|
|
console.log(clearAll
|
|
? '\n=== Claude-Mem Queue Clearer (ALL) ===\n'
|
|
: '\n=== Claude-Mem Queue Clearer (Processing) ===\n');
|
|
|
|
const dbPath = resolveDbPath();
|
|
if (!existsSync(dbPath)) {
|
|
console.log(`No database found at ${dbPath}. Nothing to clear.\n`);
|
|
process.exit(0);
|
|
}
|
|
|
|
const db = new Database(dbPath);
|
|
db.run('PRAGMA journal_mode = WAL');
|
|
|
|
const counts = db.prepare(
|
|
'SELECT status, COUNT(*) as count FROM pending_messages GROUP BY status'
|
|
).all() as StatusRow[];
|
|
|
|
const total = counts.reduce((sum, row) => sum + row.count, 0);
|
|
const processing = counts.find(r => r.status === 'processing')?.count ?? 0;
|
|
|
|
console.log('Queue Summary:');
|
|
for (const status of ['pending', 'processing'] as const) {
|
|
const row = counts.find(r => r.status === status);
|
|
console.log(` ${status.padEnd(11)} ${row?.count ?? 0}`);
|
|
}
|
|
console.log('');
|
|
|
|
const willClear = clearAll ? total : processing;
|
|
if (willClear === 0) {
|
|
console.log(clearAll
|
|
? 'No messages in queue. Nothing to clear.\n'
|
|
: 'No processing messages in queue. Nothing to clear.\n');
|
|
db.close();
|
|
process.exit(0);
|
|
}
|
|
|
|
if (!force) {
|
|
const answer = await prompt(
|
|
clearAll
|
|
? `Clear ${willClear} messages (pending and processing)? [y/N]: `
|
|
: `Clear ${willClear} processing messages? [y/N]: `
|
|
);
|
|
if (answer.toLowerCase() !== 'y') {
|
|
console.log('\nCancelled. Run with --force to skip confirmation.\n');
|
|
db.close();
|
|
process.exit(0);
|
|
}
|
|
console.log('');
|
|
}
|
|
|
|
const stmt = clearAll
|
|
? db.prepare("DELETE FROM pending_messages WHERE status IN ('pending', 'processing')")
|
|
: db.prepare("DELETE FROM pending_messages WHERE status = 'processing'");
|
|
const cleared = stmt.run().changes;
|
|
|
|
const remaining = (db.prepare(
|
|
'SELECT COUNT(*) as count FROM pending_messages'
|
|
).get() as CountRow).count;
|
|
|
|
console.log('Clearing Result:');
|
|
console.log(` Messages cleared: ${cleared}`);
|
|
console.log(` Remaining: ${remaining}\n`);
|
|
|
|
db.close();
|
|
}
|
|
|
|
main().catch(err => {
|
|
console.error('Error:', err.message);
|
|
process.exit(1);
|
|
});
|