claude-memory-layer 1.0.0 → 1.0.1

package/dist/cli/index.js

@@ -16,7 +16,6 @@ import * as fs from "fs";
 import * as crypto2 from "crypto";
 
 // src/core/event-store.ts
-import { Database } from "duckdb";
 import { randomUUID } from "crypto";
 
 // src/core/canonical-key.ts
@@ -42,11 +41,92 @@ function makeDedupeKey(content, sessionId) {
   return `${sessionId}:${contentHash}`;
 }
 
+// src/core/db-wrapper.ts
+import duckdb from "duckdb";
+function convertBigInts(obj) {
+  if (obj === null || obj === void 0)
+    return obj;
+  if (typeof obj === "bigint")
+    return Number(obj);
+  if (obj instanceof Date)
+    return obj;
+  if (Array.isArray(obj))
+    return obj.map(convertBigInts);
+  if (typeof obj === "object") {
+    const result = {};
+    for (const [key, value] of Object.entries(obj)) {
+      result[key] = convertBigInts(value);
+    }
+    return result;
+  }
+  return obj;
+}
+function toDate(value) {
+  if (value instanceof Date)
+    return value;
+  if (typeof value === "string")
+    return new Date(value);
+  if (typeof value === "number")
+    return new Date(value);
+  return new Date(String(value));
+}
+function createDatabase(path3) {
+  return new duckdb.Database(path3);
+}
+function dbRun(db, sql, params = []) {
+  return new Promise((resolve2, reject) => {
+    if (params.length === 0) {
+      db.run(sql, (err) => {
+        if (err)
+          reject(err);
+        else
+          resolve2();
+      });
+    } else {
+      db.run(sql, ...params, (err) => {
+        if (err)
+          reject(err);
+        else
+          resolve2();
+      });
+    }
+  });
+}
+function dbAll(db, sql, params = []) {
+  return new Promise((resolve2, reject) => {
+    if (params.length === 0) {
+      db.all(sql, (err, rows) => {
+        if (err)
+          reject(err);
+        else
+          resolve2(convertBigInts(rows || []));
+      });
+    } else {
+      db.all(sql, ...params, (err, rows) => {
+        if (err)
+          reject(err);
+        else
+          resolve2(convertBigInts(rows || []));
+      });
+    }
+  });
+}
+function dbClose(db) {
+  return new Promise((resolve2, reject) => {
+    db.close((err) => {
+      if (err)
+        reject(err);
+      else
+        resolve2();
+    });
+  });
+}
+
 // src/core/event-store.ts
 var EventStore = class {
   constructor(dbPath) {
     this.dbPath = dbPath;
-    this.db = new Database(dbPath);
+    this.db = createDatabase(dbPath);
   }
   db;
   initialized = false;
@@ -56,7 +136,7 @@ var EventStore = class {
   async initialize() {
     if (this.initialized)
       return;
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS events (
         id VARCHAR PRIMARY KEY,
         event_type VARCHAR NOT NULL,
@@ -68,14 +148,14 @@ var EventStore = class {
         metadata JSON
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS event_dedup (
         dedupe_key VARCHAR PRIMARY KEY,
         event_id VARCHAR NOT NULL,
         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS sessions (
         id VARCHAR PRIMARY KEY,
         started_at TIMESTAMP NOT NULL,
@@ -85,7 +165,7 @@ var EventStore = class {
         tags JSON
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS insights (
         id VARCHAR PRIMARY KEY,
         insight_type VARCHAR NOT NULL,
@@ -97,7 +177,7 @@ var EventStore = class {
         last_updated TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS embedding_outbox (
         id VARCHAR PRIMARY KEY,
         event_id VARCHAR NOT NULL,
@@ -109,7 +189,7 @@ var EventStore = class {
         error_message TEXT
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS projection_offsets (
         projection_name VARCHAR PRIMARY KEY,
         last_event_id VARCHAR,
@@ -117,14 +197,14 @@ var EventStore = class {
         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS memory_levels (
         event_id VARCHAR PRIMARY KEY,
         level VARCHAR NOT NULL DEFAULT 'L0',
         promoted_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS entries (
         entry_id VARCHAR PRIMARY KEY,
         created_ts TIMESTAMP NOT NULL,
@@ -140,7 +220,7 @@ var EventStore = class {
         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS entities (
         entity_id VARCHAR PRIMARY KEY,
         entity_type VARCHAR NOT NULL,
@@ -155,7 +235,7 @@ var EventStore = class {
         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS entity_aliases (
         entity_type VARCHAR NOT NULL,
         canonical_key VARCHAR NOT NULL,
@@ -165,7 +245,7 @@ var EventStore = class {
         PRIMARY KEY(entity_type, canonical_key)
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS edges (
         edge_id VARCHAR PRIMARY KEY,
         src_type VARCHAR NOT NULL,
@@ -177,7 +257,7 @@ var EventStore = class {
         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS vector_outbox (
         job_id VARCHAR PRIMARY KEY,
         item_kind VARCHAR NOT NULL,
@@ -191,7 +271,7 @@ var EventStore = class {
         UNIQUE(item_kind, item_id, embedding_version)
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS build_runs (
         build_id VARCHAR PRIMARY KEY,
         started_at TIMESTAMP NOT NULL,
@@ -206,7 +286,7 @@ var EventStore = class {
         error VARCHAR
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS pipeline_metrics (
         id VARCHAR PRIMARY KEY,
         ts TIMESTAMP NOT NULL,
@@ -217,7 +297,7 @@ var EventStore = class {
         session_id VARCHAR
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS working_set (
         id VARCHAR PRIMARY KEY,
         event_id VARCHAR NOT NULL,
@@ -227,7 +307,7 @@ var EventStore = class {
         expires_at TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS consolidated_memories (
         memory_id VARCHAR PRIMARY KEY,
         summary TEXT NOT NULL,
@@ -239,7 +319,7 @@ var EventStore = class {
         access_count INTEGER DEFAULT 0
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS continuity_log (
         log_id VARCHAR PRIMARY KEY,
         from_context_id VARCHAR,
@@ -249,26 +329,26 @@ var EventStore = class {
         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`
+    await dbRun(this.db, `
       CREATE TABLE IF NOT EXISTS endless_config (
         key VARCHAR PRIMARY KEY,
         value JSON,
         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       )
     `);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_entries_type ON entries(entry_type)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_entries_stage ON entries(stage)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_entries_canonical ON entries(canonical_key)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_entities_type_key ON entities(entity_type, canonical_key)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_entities_status ON entities(status)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_edges_src ON edges(src_id, rel_type)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_edges_dst ON edges(dst_id, rel_type)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_edges_rel ON edges(rel_type)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_outbox_status ON vector_outbox(status)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_working_set_expires ON working_set(expires_at)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_working_set_relevance ON working_set(relevance_score DESC)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_consolidated_confidence ON consolidated_memories(confidence DESC)`);
-    await this.db.run(`CREATE INDEX IF NOT EXISTS idx_continuity_created ON continuity_log(created_at)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_entries_type ON entries(entry_type)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_entries_stage ON entries(stage)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_entries_canonical ON entries(canonical_key)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_entities_type_key ON entities(entity_type, canonical_key)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_entities_status ON entities(status)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_edges_src ON edges(src_id, rel_type)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_edges_dst ON edges(dst_id, rel_type)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_edges_rel ON edges(rel_type)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_outbox_status ON vector_outbox(status)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_working_set_expires ON working_set(expires_at)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_working_set_relevance ON working_set(relevance_score DESC)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_consolidated_confidence ON consolidated_memories(confidence DESC)`);
+    await dbRun(this.db, `CREATE INDEX IF NOT EXISTS idx_continuity_created ON continuity_log(created_at)`);
     this.initialized = true;
   }
   /**
@@ -279,7 +359,8 @@ var EventStore = class {
     await this.initialize();
     const canonicalKey = makeCanonicalKey(input.content);
     const dedupeKey = makeDedupeKey(input.content, input.sessionId);
-    const existing = await this.db.all(
+    const existing = await dbAll(
+      this.db,
       `SELECT event_id FROM event_dedup WHERE dedupe_key = ?`,
       [dedupeKey]
     );
@@ -293,7 +374,8 @@ var EventStore = class {
     const id = randomUUID();
     const timestamp = input.timestamp.toISOString();
     try {
-      await this.db.run(
+      await dbRun(
+        this.db,
         `INSERT INTO events (id, event_type, session_id, timestamp, content, canonical_key, dedupe_key, metadata)
          VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
         [
@@ -307,11 +389,13 @@ var EventStore = class {
           JSON.stringify(input.metadata || {})
         ]
       );
-      await this.db.run(
+      await dbRun(
+        this.db,
         `INSERT INTO event_dedup (dedupe_key, event_id) VALUES (?, ?)`,
         [dedupeKey, id]
       );
-      await this.db.run(
+      await dbRun(
+        this.db,
         `INSERT INTO memory_levels (event_id, level) VALUES (?, 'L0')`,
         [id]
       );
@@ -328,7 +412,8 @@ var EventStore = class {
    */
   async getSessionEvents(sessionId) {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM events WHERE session_id = ? ORDER BY timestamp ASC`,
       [sessionId]
     );
@@ -339,7 +424,8 @@ var EventStore = class {
    */
   async getRecentEvents(limit = 100) {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM events ORDER BY timestamp DESC LIMIT ?`,
       [limit]
     );
@@ -350,7 +436,8 @@ var EventStore = class {
    */
   async getEvent(id) {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM events WHERE id = ?`,
       [id]
     );
@@ -363,12 +450,14 @@ var EventStore = class {
    */
   async upsertSession(session) {
     await this.initialize();
-    const existing = await this.db.all(
+    const existing = await dbAll(
+      this.db,
       `SELECT id FROM sessions WHERE id = ?`,
       [session.id]
     );
     if (existing.length === 0) {
-      await this.db.run(
+      await dbRun(
+        this.db,
         `INSERT INTO sessions (id, started_at, project_path, tags)
          VALUES (?, ?, ?, ?)`,
         [
@@ -395,7 +484,8 @@ var EventStore = class {
       }
       if (updates.length > 0) {
         values.push(session.id);
-        await this.db.run(
+        await dbRun(
+          this.db,
           `UPDATE sessions SET ${updates.join(", ")} WHERE id = ?`,
           values
         );
@@ -407,7 +497,8 @@ var EventStore = class {
    */
   async getSession(id) {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM sessions WHERE id = ?`,
       [id]
     );
@@ -416,8 +507,8 @@ var EventStore = class {
     const row = rows[0];
     return {
       id: row.id,
-      startedAt: new Date(row.started_at),
-      endedAt: row.ended_at ? new Date(row.ended_at) : void 0,
+      startedAt: toDate(row.started_at),
+      endedAt: row.ended_at ? toDate(row.ended_at) : void 0,
       projectPath: row.project_path,
       summary: row.summary,
       tags: row.tags ? JSON.parse(row.tags) : void 0
@@ -429,7 +520,8 @@ var EventStore = class {
   async enqueueForEmbedding(eventId, content) {
     await this.initialize();
     const id = randomUUID();
-    await this.db.run(
+    await dbRun(
+      this.db,
       `INSERT INTO embedding_outbox (id, event_id, content, status, retry_count)
        VALUES (?, ?, ?, 'pending', 0)`,
       [id, eventId, content]
@@ -441,25 +533,30 @@ var EventStore = class {
    */
   async getPendingOutboxItems(limit = 32) {
     await this.initialize();
-    const rows = await this.db.all(
-      `UPDATE embedding_outbox
-       SET status = 'processing'
-       WHERE id IN (
-         SELECT id FROM embedding_outbox
-         WHERE status = 'pending'
-         ORDER BY created_at
-         LIMIT ?
-       )
-       RETURNING *`,
+    const pending = await dbAll(
+      this.db,
+      `SELECT * FROM embedding_outbox
+       WHERE status = 'pending'
+       ORDER BY created_at
+       LIMIT ?`,
       [limit]
     );
-    return rows.map((row) => ({
+    if (pending.length === 0)
+      return [];
+    const ids = pending.map((r) => r.id);
+    const placeholders = ids.map(() => "?").join(",");
+    await dbRun(
+      this.db,
+      `UPDATE embedding_outbox SET status = 'processing' WHERE id IN (${placeholders})`,
+      ids
+    );
+    return pending.map((row) => ({
       id: row.id,
       eventId: row.event_id,
       content: row.content,
-      status: row.status,
+      status: "processing",
       retryCount: row.retry_count,
-      createdAt: new Date(row.created_at),
+      createdAt: toDate(row.created_at),
       errorMessage: row.error_message
     }));
   }
@@ -470,7 +567,8 @@ var EventStore = class {
     if (ids.length === 0)
       return;
     const placeholders = ids.map(() => "?").join(",");
-    await this.db.run(
+    await dbRun(
+      this.db,
       `DELETE FROM embedding_outbox WHERE id IN (${placeholders})`,
       ids
     );
@@ -482,7 +580,8 @@ var EventStore = class {
     if (ids.length === 0)
       return;
     const placeholders = ids.map(() => "?").join(",");
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE embedding_outbox
        SET status = CASE WHEN retry_count >= 3 THEN 'failed' ELSE 'pending' END,
            retry_count = retry_count + 1,
@@ -496,7 +595,8 @@ var EventStore = class {
    */
   async updateMemoryLevel(eventId, level) {
     await this.initialize();
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE memory_levels SET level = ?, promoted_at = CURRENT_TIMESTAMP WHERE event_id = ?`,
       [level, eventId]
     );
@@ -506,7 +606,8 @@ var EventStore = class {
    */
   async getLevelStats() {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT level, COUNT(*) as count FROM memory_levels GROUP BY level`
     );
     return rows;
@@ -525,7 +626,8 @@ var EventStore = class {
    */
   async getEndlessConfig(key) {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT value FROM endless_config WHERE key = ?`,
       [key]
     );
@@ -538,7 +640,8 @@ var EventStore = class {
    */
   async setEndlessConfig(key, value) {
     await this.initialize();
-    await this.db.run(
+    await dbRun(
+      this.db,
       `INSERT OR REPLACE INTO endless_config (key, value, updated_at)
        VALUES (?, ?, CURRENT_TIMESTAMP)`,
       [key, JSON.stringify(value)]
@@ -549,13 +652,14 @@ var EventStore = class {
    */
   async getAllSessions() {
     await this.initialize();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM sessions ORDER BY started_at DESC`
     );
     return rows.map((row) => ({
       id: row.id,
-      startedAt: new Date(row.started_at),
-      endedAt: row.ended_at ? new Date(row.ended_at) : void 0,
+      startedAt: toDate(row.started_at),
+      endedAt: row.ended_at ? toDate(row.ended_at) : void 0,
       projectPath: row.project_path,
       summary: row.summary,
       tags: row.tags ? JSON.parse(row.tags) : void 0
@@ -565,7 +669,7 @@ var EventStore = class {
    * Close database connection
    */
   async close() {
-    await this.db.close();
+    await dbClose(this.db);
   }
   /**
    * Convert database row to MemoryEvent
@@ -575,7 +679,7 @@ var EventStore = class {
       id: row.id,
       eventType: row.event_type,
       sessionId: row.session_id,
-      timestamp: new Date(row.timestamp),
+      timestamp: toDate(row.timestamp),
       content: row.content,
       canonicalKey: row.canonical_key,
       dedupeKey: row.dedupe_key,
@@ -668,23 +772,28 @@ var VectorStore = class {
       return [];
     }
     const { limit = 5, minScore = 0.7, sessionId } = options;
-    let query = this.table.search(queryVector).limit(limit * 2);
+    let query = this.table.search(queryVector).distanceType("cosine").limit(limit * 2);
     if (sessionId) {
       query = query.where(`sessionId = '${sessionId}'`);
     }
     const results = await query.toArray();
     return results.filter((r) => {
-      const score = 1 - (r._distance || 0);
+      const distance = r._distance || 0;
+      const score = 1 - distance / 2;
       return score >= minScore;
-    }).slice(0, limit).map((r) => ({
-      id: r.id,
-      eventId: r.eventId,
-      content: r.content,
-      score: 1 - (r._distance || 0),
-      sessionId: r.sessionId,
-      eventType: r.eventType,
-      timestamp: r.timestamp
-    }));
+    }).slice(0, limit).map((r) => {
+      const distance = r._distance || 0;
+      const score = 1 - distance / 2;
+      return {
+        id: r.id,
+        eventId: r.eventId,
+        content: r.content,
+        score,
+        sessionId: r.sessionId,
+        eventType: r.eventType,
+        timestamp: r.timestamp
+      };
+    });
   }
   /**
    * Delete vector by event ID
@@ -1510,7 +1619,8 @@ var WorkingSetStore = class {
     const expiresAt = new Date(
       Date.now() + this.config.workingSet.timeWindowHours * 60 * 60 * 1e3
     );
-    await this.db.run(
+    await dbRun(
+      this.db,
       `INSERT OR REPLACE INTO working_set (id, event_id, added_at, relevance_score, topics, expires_at)
        VALUES (?, ?, CURRENT_TIMESTAMP, ?, ?, ?)`,
       [
@@ -1528,7 +1638,8 @@ var WorkingSetStore = class {
    */
   async get() {
     await this.cleanup();
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT ws.*, e.*
        FROM working_set ws
        JOIN events e ON ws.event_id = e.id
@@ -1540,7 +1651,7 @@ var WorkingSetStore = class {
       id: row.id,
       eventType: row.event_type,
       sessionId: row.session_id,
-      timestamp: new Date(row.timestamp),
+      timestamp: toDate(row.timestamp),
       content: row.content,
       canonicalKey: row.canonical_key,
       dedupeKey: row.dedupe_key,
@@ -1556,23 +1667,25 @@ var WorkingSetStore = class {
    * Get working set items (metadata only)
    */
   async getItems() {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM working_set ORDER BY relevance_score DESC, added_at DESC`
     );
     return rows.map((row) => ({
       id: row.id,
       eventId: row.event_id,
-      addedAt: new Date(row.added_at),
+      addedAt: toDate(row.added_at),
       relevanceScore: row.relevance_score,
       topics: row.topics ? JSON.parse(row.topics) : void 0,
-      expiresAt: new Date(row.expires_at)
+      expiresAt: toDate(row.expires_at)
     }));
   }
   /**
    * Update relevance score for an event
    */
   async updateRelevance(eventId, score) {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE working_set SET relevance_score = ? WHERE event_id = ?`,
       [score, eventId]
     );
@@ -1584,7 +1697,8 @@ var WorkingSetStore = class {
     if (eventIds.length === 0)
       return;
     const placeholders = eventIds.map(() => "?").join(",");
-    await this.db.run(
+    await dbRun(
+      this.db,
       `DELETE FROM working_set WHERE event_id IN (${placeholders})`,
       eventIds
     );
@@ -1593,7 +1707,8 @@ var WorkingSetStore = class {
    * Get the count of items in working set
    */
   async count() {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT COUNT(*) as count FROM working_set`
     );
     return result[0]?.count || 0;
@@ -1602,13 +1717,14 @@ var WorkingSetStore = class {
    * Clear the entire working set
    */
   async clear() {
-    await this.db.run(`DELETE FROM working_set`);
+    await dbRun(this.db, `DELETE FROM working_set`);
   }
   /**
    * Check if an event is in the working set
    */
   async contains(eventId) {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT COUNT(*) as count FROM working_set WHERE event_id = ?`,
       [eventId]
     );
@@ -1621,7 +1737,8 @@ var WorkingSetStore = class {
     const newExpiresAt = new Date(
       Date.now() + this.config.workingSet.timeWindowHours * 60 * 60 * 1e3
     );
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE working_set SET expires_at = ? WHERE event_id = ?`,
       [newExpiresAt.toISOString(), eventId]
     );
@@ -1630,7 +1747,8 @@ var WorkingSetStore = class {
    * Clean up expired items
    */
   async cleanup() {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `DELETE FROM working_set WHERE expires_at < datetime('now')`
     );
   }
@@ -1640,7 +1758,8 @@ var WorkingSetStore = class {
    */
   async enforceLimit() {
     const maxEvents = this.config.workingSet.maxEvents;
-    const keepIds = await this.db.all(
+    const keepIds = await dbAll(
+      this.db,
       `SELECT id FROM working_set
        ORDER BY relevance_score DESC, added_at DESC
        LIMIT ?`,
@@ -1650,7 +1769,8 @@ var WorkingSetStore = class {
       return;
     const keepIdList = keepIds.map((r) => r.id);
     const placeholders = keepIdList.map(() => "?").join(",");
-    await this.db.run(
+    await dbRun(
+      this.db,
       `DELETE FROM working_set WHERE id NOT IN (${placeholders})`,
       keepIdList
     );
@@ -1659,7 +1779,8 @@ var WorkingSetStore = class {
    * Calculate continuity score based on recent context transitions
    */
   async calculateContinuityScore() {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT AVG(continuity_score) as avg_score
        FROM continuity_log
        WHERE created_at > datetime('now', '-1 hour')`
@@ -1670,7 +1791,8 @@ var WorkingSetStore = class {
    * Get topics from current working set for context matching
    */
   async getActiveTopics() {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT topics FROM working_set WHERE topics IS NOT NULL`
     );
     const allTopics = /* @__PURE__ */ new Set();
@@ -1699,7 +1821,8 @@ var ConsolidatedStore = class {
    */
   async create(input) {
     const memoryId = randomUUID3();
-    await this.db.run(
+    await dbRun(
+      this.db,
       `INSERT INTO consolidated_memories
         (memory_id, summary, topics, source_events, confidence, created_at)
        VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP)`,
@@ -1717,7 +1840,8 @@ var ConsolidatedStore = class {
    * Get a consolidated memory by ID
    */
   async get(memoryId) {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories WHERE memory_id = ?`,
       [memoryId]
     );
@@ -1730,7 +1854,8 @@ var ConsolidatedStore = class {
    */
   async search(query, options) {
     const topK = options?.topK || 5;
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories
        WHERE summary LIKE ?
        ORDER BY confidence DESC
@@ -1746,7 +1871,8 @@ var ConsolidatedStore = class {
     const topK = options?.topK || 5;
     const topicConditions = topics.map(() => `topics LIKE ?`).join(" OR ");
     const topicParams = topics.map((t) => `%"${t}"%`);
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories
        WHERE ${topicConditions}
        ORDER BY confidence DESC
@@ -1760,7 +1886,8 @@ var ConsolidatedStore = class {
    */
   async getAll(options) {
     const limit = options?.limit || 100;
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories
        ORDER BY confidence DESC, created_at DESC
        LIMIT ?`,
@@ -1774,7 +1901,8 @@ var ConsolidatedStore = class {
   async getRecent(options) {
     const limit = options?.limit || 10;
     const hours = options?.hours || 24;
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories
        WHERE created_at > datetime('now', '-${hours} hours')
        ORDER BY created_at DESC
@@ -1787,7 +1915,8 @@ var ConsolidatedStore = class {
    * Mark a memory as accessed (tracks usage for importance scoring)
    */
   async markAccessed(memoryId) {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE consolidated_memories
        SET accessed_at = CURRENT_TIMESTAMP,
            access_count = access_count + 1
@@ -1799,7 +1928,8 @@ var ConsolidatedStore = class {
    * Update confidence score for a memory
    */
   async updateConfidence(memoryId, confidence) {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `UPDATE consolidated_memories
        SET confidence = ?
        WHERE memory_id = ?`,
@@ -1810,7 +1940,8 @@ var ConsolidatedStore = class {
    * Delete a consolidated memory
    */
   async delete(memoryId) {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `DELETE FROM consolidated_memories WHERE memory_id = ?`,
       [memoryId]
     );
@@ -1819,7 +1950,8 @@ var ConsolidatedStore = class {
    * Get count of consolidated memories
    */
   async count() {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT COUNT(*) as count FROM consolidated_memories`
     );
     return result[0]?.count || 0;
@@ -1828,7 +1960,8 @@ var ConsolidatedStore = class {
    * Get most accessed memories (for importance scoring)
    */
   async getMostAccessed(limit = 10) {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM consolidated_memories
        WHERE access_count > 0
        ORDER BY access_count DESC
@@ -1842,11 +1975,13 @@ var ConsolidatedStore = class {
    */
   async getStats() {
     const total = await this.count();
-    const avgResult = await this.db.all(
+    const avgResult = await dbAll(
+      this.db,
       `SELECT AVG(confidence) as avg FROM consolidated_memories`
     );
     const averageConfidence = avgResult[0]?.avg || 0;
-    const recentResult = await this.db.all(
+    const recentResult = await dbAll(
+      this.db,
       `SELECT COUNT(*) as count FROM consolidated_memories
        WHERE created_at > datetime('now', '-24 hours')`
     );
@@ -1870,7 +2005,8 @@ var ConsolidatedStore = class {
    */
   async isAlreadyConsolidated(eventIds) {
     for (const eventId of eventIds) {
-      const result = await this.db.all(
+      const result = await dbAll(
+        this.db,
         `SELECT COUNT(*) as count FROM consolidated_memories
          WHERE source_events LIKE ?`,
         [`%"${eventId}"%`]
@@ -1884,7 +2020,8 @@ var ConsolidatedStore = class {
    * Get the last consolidation time
    */
   async getLastConsolidationTime() {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT created_at FROM consolidated_memories
        ORDER BY created_at DESC
        LIMIT 1`
@@ -1903,8 +2040,8 @@ var ConsolidatedStore = class {
       topics: JSON.parse(row.topics || "[]"),
       sourceEvents: JSON.parse(row.source_events || "[]"),
       confidence: row.confidence,
-      createdAt: new Date(row.created_at),
-      accessedAt: row.accessed_at ? new Date(row.accessed_at) : void 0,
+      createdAt: toDate(row.created_at),
+      accessedAt: row.accessed_at ? toDate(row.accessed_at) : void 0,
       accessCount: row.access_count || 0
     };
   }
@@ -2270,7 +2407,8 @@ var ContinuityManager = class {
    * Get recent continuity logs
    */
   async getRecentLogs(limit = 10) {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT * FROM continuity_log
        ORDER BY created_at DESC
        LIMIT ?`,
@@ -2282,14 +2420,15 @@ var ContinuityManager = class {
       toContextId: row.to_context_id,
       continuityScore: row.continuity_score,
       transitionType: row.transition_type,
-      createdAt: new Date(row.created_at)
+      createdAt: toDate(row.created_at)
     }));
   }
   /**
    * Get average continuity score over time period
    */
   async getAverageScore(hours = 1) {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `SELECT AVG(continuity_score) as avg_score
        FROM continuity_log
        WHERE created_at > datetime('now', '-${hours} hours')`
@@ -2300,7 +2439,8 @@ var ContinuityManager = class {
    * Get transition type distribution
    */
   async getTransitionStats(hours = 24) {
-    const rows = await this.db.all(
+    const rows = await dbAll(
+      this.db,
       `SELECT transition_type, COUNT(*) as count
        FROM continuity_log
        WHERE created_at > datetime('now', '-${hours} hours')
@@ -2320,7 +2460,8 @@ var ContinuityManager = class {
    * Clear old continuity logs
    */
   async cleanup(olderThanDays = 7) {
-    const result = await this.db.all(
+    const result = await dbAll(
+      this.db,
       `DELETE FROM continuity_log
        WHERE created_at < datetime('now', '-${olderThanDays} days')
        RETURNING COUNT(*) as changes`
@@ -2355,7 +2496,8 @@ var ContinuityManager = class {
    * Log a context transition
    */
   async logTransition(current, previous, score, type) {
-    await this.db.run(
+    await dbRun(
+      this.db,
       `INSERT INTO continuity_log
         (log_id, from_context_id, to_context_id, continuity_score, transition_type, created_at)
        VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP)`,
@@ -2468,6 +2610,23 @@ function createContinuityManager(eventStore, config) {
 }
 
 // src/services/memory-service.ts
+function normalizePath(projectPath) {
+  const expanded = projectPath.startsWith("~") ? path.join(os.homedir(), projectPath.slice(1)) : projectPath;
+  try {
+    return fs.realpathSync(expanded);
+  } catch {
+    return path.resolve(expanded);
+  }
+}
+function hashProjectPath(projectPath) {
+  const normalizedPath = normalizePath(projectPath);
+  return crypto2.createHash("sha256").update(normalizedPath).digest("hex").slice(0, 8);
+}
+function getProjectStoragePath(projectPath) {
+  const hash = hashProjectPath(projectPath);
+  return path.join(os.homedir(), ".claude-code", "memory", "projects", hash);
+}
+var REGISTRY_PATH = path.join(os.homedir(), ".claude-code", "memory", "session-registry.json");
 var MemoryService = class {
   eventStore;
   vectorStore;
@@ -2915,14 +3074,23 @@ var MemoryService = class {
     return p;
   }
 };
-var defaultService = null;
+var serviceCache = /* @__PURE__ */ new Map();
+var GLOBAL_KEY = "__global__";
 function getDefaultMemoryService() {
-  if (!defaultService) {
-    defaultService = new MemoryService({
+  if (!serviceCache.has(GLOBAL_KEY)) {
+    serviceCache.set(GLOBAL_KEY, new MemoryService({
       storagePath: "~/.claude-code/memory"
-    });
+    }));
+  }
+  return serviceCache.get(GLOBAL_KEY);
+}
+function getMemoryServiceForProject(projectPath) {
+  const hash = hashProjectPath(projectPath);
+  if (!serviceCache.has(hash)) {
+    const storagePath = getProjectStoragePath(projectPath);
+    serviceCache.set(hash, new MemoryService({ storagePath }));
   }
-  return defaultService;
+  return serviceCache.get(hash);
 }
 
 // src/services/session-history-importer.ts
@@ -3166,8 +3334,9 @@ function createSessionHistoryImporter(memoryService) {
 // src/cli/index.ts
 var program = new Command();
 program.name("code-memory").description("Claude Code Memory Plugin CLI").version("1.0.0");
-program.command("search <query>").description("Search memories using semantic search").option("-k, --top-k <number>", "Number of results", "5").option("-s, --min-score <number>", "Minimum similarity score", "0.7").option("--session <id>", "Filter by session ID").action(async (query, options) => {
-  const service = getDefaultMemoryService();
+program.command("search <query>").description("Search memories using semantic search").option("-k, --top-k <number>", "Number of results", "5").option("-s, --min-score <number>", "Minimum similarity score", "0.7").option("--session <id>", "Filter by session ID").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (query, options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     const result = await service.retrieveMemories(query, {
       topK: parseInt(options.topK),
@@ -3193,8 +3362,9 @@ program.command("search <query>").description("Search memories using semantic se
     process.exit(1);
   }
 });
-program.command("history").description("View conversation history").option("-l, --limit <number>", "Number of events", "20").option("--session <id>", "Filter by session ID").option("--type <type>", "Filter by event type").action(async (options) => {
-  const service = getDefaultMemoryService();
+program.command("history").description("View conversation history").option("-l, --limit <number>", "Number of events", "20").option("--session <id>", "Filter by session ID").option("--type <type>", "Filter by event type").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     let events;
     if (options.session) {
@@ -3222,8 +3392,9 @@ program.command("history").description("View conversation history").option("-l,
     process.exit(1);
   }
 });
-program.command("stats").description("View memory statistics").action(async () => {
-  const service = getDefaultMemoryService();
+program.command("stats").description("View memory statistics").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     const stats = await service.getStats();
     console.log("\n\u{1F4CA} Memory Statistics\n");
@@ -3240,8 +3411,9 @@ program.command("stats").description("View memory statistics").action(async () =
     process.exit(1);
   }
 });
-program.command("forget [eventId]").description("Remove memories from storage").option("--session <id>", "Forget all events from a session").option("--before <date>", "Forget events before date (YYYY-MM-DD)").option("--confirm", "Skip confirmation").action(async (eventId, options) => {
-  const service = getDefaultMemoryService();
+program.command("forget [eventId]").description("Remove memories from storage").option("--session <id>", "Forget all events from a session").option("--before <date>", "Forget events before date (YYYY-MM-DD)").option("--confirm", "Skip confirmation").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (eventId, options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     if (!eventId && !options.session && !options.before) {
       console.error("Please specify an event ID, --session, or --before option");
@@ -3260,8 +3432,9 @@ program.command("forget [eventId]").description("Remove memories from storage").
     process.exit(1);
   }
 });
-program.command("process").description("Process pending embeddings").action(async () => {
-  const service = getDefaultMemoryService();
+program.command("process").description("Process pending embeddings").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     console.log("\u23F3 Processing pending embeddings...");
     const count = await service.processPendingEmbeddings();
@@ -3273,17 +3446,19 @@ program.command("process").description("Process pending embeddings").action(asyn
   }
 });
 program.command("import").description("Import existing Claude Code conversation history").option("-p, --project <path>", "Import from specific project path").option("-s, --session <file>", "Import specific session file (JSONL)").option("-a, --all", "Import all sessions from all projects").option("-l, --limit <number>", "Limit messages per session").option("-v, --verbose", "Show detailed progress").action(async (options) => {
-  const service = getDefaultMemoryService();
+  const targetProjectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(targetProjectPath);
   const importer = createSessionHistoryImporter(service);
   try {
     await service.initialize();
     let result;
     if (options.session) {
       console.log(`
-\u{1F4E5} Importing session: ${options.session}
+\u{1F4E5} Importing session: ${options.session}`);
+      console.log(`   Target project: ${targetProjectPath}
 `);
       result = await importer.importSessionFile(options.session, {
-        projectPath: options.project,
+        projectPath: targetProjectPath,
         limit: options.limit ? parseInt(options.limit) : void 0,
         verbose: options.verbose
       });
@@ -3296,11 +3471,36 @@ program.command("import").description("Import existing Claude Code conversation
         verbose: options.verbose
       });
     } else if (options.all) {
-      console.log("\n\u{1F4E5} Importing all sessions from all projects\n");
-      result = await importer.importAll({
+      console.log("\n\u{1F4E5} Importing all sessions from all projects");
+      console.log("   \u26A0\uFE0F  Using global storage (use -p for project-specific)\n");
+      const globalService = getDefaultMemoryService();
+      const globalImporter = createSessionHistoryImporter(globalService);
+      await globalService.initialize();
+      result = await globalImporter.importAll({
         limit: options.limit ? parseInt(options.limit) : void 0,
         verbose: options.verbose
       });
+      console.log("\n\u23F3 Processing embeddings...");
+      const embedCount2 = await globalService.processPendingEmbeddings();
+      console.log("\n\u2705 Import Complete\n");
+      console.log(`Sessions processed: ${result.totalSessions}`);
+      console.log(`Total messages: ${result.totalMessages}`);
+      console.log(`Imported prompts: ${result.importedPrompts}`);
+      console.log(`Imported responses: ${result.importedResponses}`);
+      console.log(`Skipped duplicates: ${result.skippedDuplicates}`);
+      console.log(`Embeddings processed: ${embedCount2}`);
+      if (result.errors.length > 0) {
+        console.log(`
+\u26A0\uFE0F  Errors (${result.errors.length}):`);
+        for (const error of result.errors.slice(0, 5)) {
+          console.log(`  - ${error}`);
+        }
+        if (result.errors.length > 5) {
+          console.log(`  ... and ${result.errors.length - 5} more`);
+        }
+      }
+      await globalService.shutdown();
+      return;
     } else {
       const cwd = process.cwd();
       console.log(`
@@ -3364,8 +3564,9 @@ program.command("list").description("List available Claude Code sessions").optio
   }
 });
 var endlessCmd = program.command("endless").description("Manage Endless Mode (biomimetic continuous memory)");
-endlessCmd.command("enable").description("Enable Endless Mode").action(async () => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("enable").description("Enable Endless Mode").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     await service.setMode("endless");
@@ -3383,8 +3584,9 @@ endlessCmd.command("enable").description("Enable Endless Mode").action(async ()
     process.exit(1);
   }
 });
-endlessCmd.command("disable").description("Disable Endless Mode (return to Session Mode)").action(async () => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("disable").description("Disable Endless Mode (return to Session Mode)").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     await service.setMode("session");
@@ -3397,8 +3599,9 @@ endlessCmd.command("disable").description("Disable Endless Mode (return to Sessi
     process.exit(1);
   }
 });
-endlessCmd.command("status").description("Show Endless Mode status").action(async () => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("status").description("Show Endless Mode status").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     const status = await service.getEndlessModeStatus();
@@ -3430,8 +3633,9 @@ ${modeIcon} ${modeName}
     process.exit(1);
   }
 });
-endlessCmd.command("consolidate").description("Manually trigger memory consolidation").action(async () => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("consolidate").description("Manually trigger memory consolidation").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     if (!service.isEndlessModeActive()) {
@@ -3454,8 +3658,9 @@ endlessCmd.command("consolidate").description("Manually trigger memory consolida
     process.exit(1);
   }
 });
-endlessCmd.command("working-set").alias("ws").description("View current working set").option("-l, --limit <number>", "Number of events to show", "10").action(async (options) => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("working-set").alias("ws").description("View current working set").option("-l, --limit <number>", "Number of events to show", "10").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     if (!service.isEndlessModeActive()) {
@@ -3493,8 +3698,9 @@ endlessCmd.command("working-set").alias("ws").description("View current working
     process.exit(1);
   }
 });
-endlessCmd.command("memories").description("View consolidated memories").option("-l, --limit <number>", "Number of memories to show", "10").option("-q, --query <text>", "Search consolidated memories").action(async (options) => {
-  const service = getDefaultMemoryService();
+endlessCmd.command("memories").description("View consolidated memories").option("-l, --limit <number>", "Number of memories to show", "10").option("-q, --query <text>", "Search consolidated memories").option("-p, --project <path>", "Project path (defaults to cwd)").action(async (options) => {
+  const projectPath = options.project || process.cwd();
+  const service = getMemoryServiceForProject(projectPath);
   try {
     await service.initialize();
     let memories;