squish-memory 0.8.2 → 0.9.1

package/dist/db/adapter.d.ts

@@ -1,6 +1,2 @@
-export declare function createDb(): Promise<(import("drizzle-orm/node-postgres").NodePgDatabase<typeof import("../drizzle/schema.js")> & {
-    $client: import("pg").Pool;
-}) | (import("drizzle-orm/better-sqlite3").BetterSQLite3Database<typeof import("../drizzle/schema-sqlite.js")> & {
-    $client: import("better-sqlite3").Database;
-})>;
+export declare function createDb(): Promise<any>;
 //# sourceMappingURL=adapter.d.ts.map

package/dist/db/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../db/adapter.ts"],"names":[],"mappings":"AAIA,wBAAsB,QAAQ;;;;IAQ7B"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../db/adapter.ts"],"names":[],"mappings":"AAOA,wBAAsB,QAAQ,iBAM7B"}

package/dist/db/adapter.js

@@ -1,13 +1,13 @@
 import { config, getDataDir } from '../config.js';
 import { ensurePostgresSchema, ensureSqliteSchema } from './bootstrap.js';
 import { logger } from '../core/logger.js';
+// Runtime detection - check if running in Bun
+const isBun = typeof globalThis.Bun !== 'undefined';
 export async function createDb() {
     if (config.isTeamMode) {
-        // PostgreSQL mode
         return createPostgresDb();
     }
     else {
-        // SQLite mode
         return createSqliteDb();
     }
 }
@@ -23,21 +23,134 @@ async function createPostgresDb() {
     return drizzle(pool, { schema: schemaModule });
 }
 async function createSqliteDb() {
+    const dbPath = `${getDataDir()}/squish.db`;
+    // Try Bun's built-in SQLite first if running in Bun
+    if (isBun) {
+        try {
+            return await createBunSqliteDb(dbPath);
+        }
+        catch (error) {
+            logger.warn('Bun SQLite failed, trying better-sqlite3 fallback', { error: String(error) });
+        }
+    }
+    // Fallback to better-sqlite3 for Node.js
     try {
-        const DatabaseModule = await import('better-sqlite3');
-        const Database = DatabaseModule.default;
-        const { drizzle } = await import('drizzle-orm/better-sqlite3');
-        const schemaModule = await import('../drizzle/schema-sqlite.js');
-        const dbPath = `${getDataDir()}/squish.db`;
-        const sqlite = new Database(dbPath);
-        // Enable foreign keys
-        sqlite.pragma('foreign_keys = ON');
-        await ensureSqliteSchema(sqlite);
-        return drizzle(sqlite, { schema: schemaModule });
+        return await createBetterSqliteDb(dbPath);
     }
     catch (error) {
         logger.error('SQLite initialization failed', error);
         throw new Error(`SQLite database unavailable: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
 }
+async function createBunSqliteDb(dbPath) {
+    // Dynamic import for Bun runtime - wrapped to avoid TS issues
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore - bun:sqlite is only available in Bun runtime
+    const { Database } = await import('bun:sqlite');
+    const { drizzle } = await import('drizzle-orm/bun-sqlite');
+    const schemaModule = await import('../drizzle/schema-sqlite.js');
+    const sqlite = new Database(dbPath);
+    // Enable foreign keys
+    sqlite.run('PRAGMA foreign_keys = ON');
+    // Run full schema bootstrap from bootstrap.ts (includes ALL tables)
+    await ensureSqliteSchema(sqlite);
+    return drizzle(sqlite, { schema: schemaModule });
+}
+async function createBetterSqliteDb(dbPath) {
+    const DatabaseModule = await import('better-sqlite3');
+    const Database = DatabaseModule.default;
+    const { drizzle } = await import('drizzle-orm/better-sqlite3');
+    const schemaModule = await import('../drizzle/schema-sqlite.js');
+    const sqlite = new Database(dbPath);
+    // Enable foreign keys
+    sqlite.pragma('foreign_keys = ON');
+    await ensureSqliteSchema(sqlite);
+    return drizzle(sqlite, { schema: schemaModule });
+}
+// Bun-specific schema bootstrap
+function ensureSqliteSchemaForBun(sqlite) {
+    const createMemoriesTable = `
+    CREATE TABLE IF NOT EXISTS memories (
+      id TEXT PRIMARY KEY,
+      project_id TEXT,
+      type TEXT NOT NULL DEFAULT 'observation',
+      content TEXT NOT NULL,
+      summary TEXT,
+      tags TEXT,
+      metadata TEXT,
+      embedding BLOB,
+      embedding_json TEXT,
+      source TEXT DEFAULT 'mcp',
+      tier TEXT DEFAULT 'warm',
+      status TEXT DEFAULT 'active',
+      importance_score REAL DEFAULT 50,
+      relevance_score REAL,
+      coactivation_score INTEGER DEFAULT 0,
+      access_count INTEGER DEFAULT 0,
+      retrieval_count INTEGER DEFAULT 0,
+      echo_count INTEGER DEFAULT 0,
+      fizzle_count INTEGER DEFAULT 0,
+      is_pinned INTEGER DEFAULT 0,
+      is_protected INTEGER DEFAULT 0,
+      is_immutable INTEGER DEFAULT 0,
+      is_mergeable INTEGER DEFAULT 0,
+      is_merged INTEGER DEFAULT 0,
+      merged_into TEXT,
+      merged_at TEXT,
+      superseded_by TEXT,
+      superseded_at TEXT,
+      valid_from TEXT,
+      valid_to TEXT,
+      expired_at TEXT,
+      last_accessed_at TEXT,
+      last_retrieved_at TEXT,
+      last_echoed_at TEXT,
+      last_importance_recalc TEXT,
+      created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT DEFAULT CURRENT_TIMESTAMP
+    )
+  `;
+    const createProjectsTable = `
+    CREATE TABLE IF NOT EXISTS projects (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      path TEXT UNIQUE,
+      description TEXT,
+      metadata TEXT,
+      created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+      updated_at TEXT DEFAULT CURRENT_TIMESTAMP
+    )
+  `;
+    const createAssociationsTable = `
+    CREATE TABLE IF NOT EXISTS memory_associations (
+      id TEXT PRIMARY KEY,
+      from_memory_id TEXT NOT NULL,
+      to_memory_id TEXT NOT NULL,
+      association_type TEXT NOT NULL,
+      weight REAL DEFAULT 1,
+      coactivation_count INTEGER DEFAULT 1,
+      last_coactivated_at TEXT,
+      created_at TEXT DEFAULT CURRENT_TIMESTAMP,
+      UNIQUE(from_memory_id, to_memory_id)
+    )
+  `;
+    sqlite.run(createMemoriesTable);
+    sqlite.run(createProjectsTable);
+    sqlite.run(createAssociationsTable);
+    // FTS is optional - don't fail if it doesn't work
+    try {
+        sqlite.run(`
+      CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+        content,
+        summary,
+        content='memories',
+        content_rowid='rowid'
+      )
+    `);
+    }
+    catch (e) {
+        logger.debug('FTS5 table creation skipped', { error: e?.message || String(e) });
+    }
+    logger.info('SQLite schema initialized (Bun runtime)');
+}
 //# sourceMappingURL=adapter.js.map

package/dist/db/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../db/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,kBAAkB;QAClB,OAAO,gBAAgB,EAAE,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,cAAc;QACd,OAAO,cAAc,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAE1D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;QACpB,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;QAC1C,GAAG,EAAE,EAAE;KACR,CAAC,CAAC;IAEH,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,cAAc;IAC3B,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC;QACxC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QAC/D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAEjE,MAAM,MAAM,GAAG,GAAG,UAAU,EAAE,YAAY,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEpC,sBAAsB;QACtB,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAEnC,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAEjC,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;IAC9G,CAAC;AACH,CAAC"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../db/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,8CAA8C;AAC9C,MAAM,KAAK,GAAG,OAAQ,UAAkB,CAAC,GAAG,KAAK,WAAW,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,OAAO,gBAAgB,EAAE,CAAC;IAC5B,CAAC;SAAM,CAAC;QACN,OAAO,cAAc,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAE1D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;QACpB,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;QAC1C,GAAG,EAAE,EAAE;KACR,CAAC,CAAC;IAEH,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,cAAc;IAC3B,MAAM,MAAM,GAAG,GAAG,UAAU,EAAE,YAAY,CAAC;IAE3C,oDAAoD;IACpD,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC;YACH,OAAO,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,mDAAmD,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC;QACH,OAAO,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC;IAC9G,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,MAAc;IAC7C,8DAA8D;IAC9D,6DAA6D;IAC7D,2DAA2D;IAC3D,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEpC,sBAAsB;IACtB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAEvC,oEAAoE;IACpE,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,MAAc;IAChD,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAEjE,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEpC,sBAAsB;IACtB,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAEnC,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEjC,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,gCAAgC;AAChC,SAAS,wBAAwB,CAAC,MAAW;IAC3C,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwC3B,CAAC;IAEF,MAAM,mBAAmB,GAAG;;;;;;;;;;GAU3B,CAAC;IAEF,MAAM,uBAAuB,GAAG;;;;;;;;;;;;GAY/B,CAAC;IAEF,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAEpC,kDAAkD;IAClD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,CAAC;;;;;;;KAOV,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC"}

package/dist/db/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../db/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AA4b/B;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAWzD;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxE;AAiDD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../db/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AA6hB/B;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAWzD;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAMxE;AA+HD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE"}

package/dist/db/bootstrap.js

@@ -1,6 +1,11 @@
 import { existsSync, mkdirSync } from 'fs';
 import { logger } from '../core/logger.js';
 import { getDataDir } from '../config.js';
+/**
+ * Note on boolean columns:
+ * SQLite uses INTEGER 0/1 for boolean values (no native boolean type)
+ * PostgreSQL uses native BOOLEAN type
+ */
 const sqliteSchemaSql = `
 PRAGMA foreign_keys = ON;
 
@@ -90,6 +95,19 @@ CREATE INDEX IF NOT EXISTS memories_type_idx ON memories(type);
 CREATE INDEX IF NOT EXISTS memories_created_idx ON memories(created_at);
 CREATE INDEX IF NOT EXISTS memories_tags_idx ON memories(tags);
 
+CREATE TABLE IF NOT EXISTS memory_associations (
+  id TEXT PRIMARY KEY,
+  from_memory_id TEXT NOT NULL,
+  to_memory_id TEXT NOT NULL,
+  association_type TEXT NOT NULL,
+  weight REAL DEFAULT 1,
+  coactivation_count INTEGER DEFAULT 1,
+  metadata TEXT,
+  last_coactivated_at INTEGER,
+  created_at INTEGER DEFAULT (strftime('%s','now')) NOT NULL,
+  UNIQUE(from_memory_id, to_memory_id)
+);
+
 CREATE TABLE IF NOT EXISTS conversations (
   id TEXT PRIMARY KEY,
   project_id TEXT REFERENCES projects(id) ON DELETE CASCADE,
@@ -436,7 +454,85 @@ const postgresStatements = [
   );`,
     `CREATE INDEX IF NOT EXISTS relations_from_idx ON entity_relations(from_entity_id);`,
     `CREATE INDEX IF NOT EXISTS relations_to_idx ON entity_relations(to_entity_id);`,
-    `CREATE INDEX IF NOT EXISTS relations_type_idx ON entity_relations(type);`
+    `CREATE INDEX IF NOT EXISTS relations_type_idx ON entity_relations(type);`,
+    `CREATE TABLE IF NOT EXISTS core_memory (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    project_id UUID REFERENCES projects(id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+    section TEXT NOT NULL,
+    content TEXT NOT NULL DEFAULT '',
+    size_bytes INTEGER DEFAULT 0 NOT NULL,
+    version INTEGER DEFAULT 1 NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,
+    updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL
+  );`,
+    `CREATE INDEX IF NOT EXISTS core_memory_project_idx ON core_memory(project_id);`,
+    `CREATE INDEX IF NOT EXISTS core_memory_user_idx ON core_memory(user_id);`,
+    `CREATE INDEX IF NOT EXISTS core_memory_section_idx ON core_memory(section);`,
+    `CREATE TABLE IF NOT EXISTS context_sessions (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    session_id TEXT NOT NULL UNIQUE,
+    project_id UUID REFERENCES projects(id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+    loaded_memory_ids JSONB,
+    token_budget INTEGER DEFAULT 8000 NOT NULL,
+    tokens_used INTEGER DEFAULT 0 NOT NULL,
+    core_memory_tokens INTEGER DEFAULT 0 NOT NULL,
+    loaded_memories_tokens INTEGER DEFAULT 0 NOT NULL,
+    metadata JSONB,
+    created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,
+    updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL
+  );`,
+    `CREATE INDEX IF NOT EXISTS context_sessions_session_idx ON context_sessions(session_id);`,
+    `CREATE INDEX IF NOT EXISTS context_sessions_project_idx ON context_sessions(project_id);`,
+    `CREATE INDEX IF NOT EXISTS context_sessions_created_idx ON context_sessions(created_at);`,
+    `CREATE TABLE IF NOT EXISTS memory_merge_proposals (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+    source_memory_ids TEXT NOT NULL,
+    proposed_content TEXT NOT NULL,
+    proposed_summary TEXT,
+    proposed_tags TEXT[],
+    proposed_metadata JSONB,
+    detection_method TEXT NOT NULL,
+    similarity_score TEXT NOT NULL,
+    confidence_level TEXT NOT NULL,
+    merge_reason TEXT NOT NULL,
+    conflict_warnings JSONB,
+    status TEXT DEFAULT 'pending' NOT NULL,
+    reviewed_at TIMESTAMPTZ,
+    review_notes TEXT,
+    created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,
+    expires_at TIMESTAMPTZ
+  );`,
+    `CREATE INDEX IF NOT EXISTS memory_merge_proposals_project_status_idx ON memory_merge_proposals(project_id, status);`,
+    `CREATE INDEX IF NOT EXISTS memory_merge_proposals_created_at_idx ON memory_merge_proposals(created_at);`,
+    `CREATE TABLE IF NOT EXISTS memory_merge_history (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(id) ON DELETE SET NULL,
+    proposal_id UUID REFERENCES memory_merge_proposals(id) ON DELETE SET NULL,
+    source_memory_ids TEXT NOT NULL,
+    canonical_memory_id UUID NOT NULL REFERENCES memories(id) ON DELETE CASCADE,
+    source_memories_snapshot JSONB NOT NULL,
+    merge_strategy TEXT NOT NULL,
+    tokens_saved INTEGER,
+    is_reversed BOOLEAN DEFAULT FALSE,
+    reversed_at TIMESTAMPTZ,
+    reversed_by UUID,
+    merged_at TIMESTAMPTZ DEFAULT NOW() NOT NULL
+  );`,
+    `CREATE TABLE IF NOT EXISTS memory_hash_cache (
+    memory_id UUID PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
+    project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    simhash TEXT,
+    minhash TEXT,
+    content_hash TEXT NOT NULL,
+    last_updated TIMESTAMPTZ DEFAULT NOW() NOT NULL
+  );`,
+    `CREATE INDEX IF NOT EXISTS memory_hash_cache_project_id_idx ON memory_hash_cache(project_id);`,
+    `CREATE INDEX IF NOT EXISTS memory_hash_cache_simhash_idx ON memory_hash_cache(simhash);`
 ];
 /**
  * Ensure the data directory exists (.squish folder in project root)
@@ -489,6 +585,79 @@ async function runSqliteMigrations(sqlite) {
         { col: 'consolidated_into', sql: 'ALTER TABLE memories ADD COLUMN consolidated_into TEXT' },
         { col: 'consolidated_at', sql: 'ALTER TABLE memories ADD COLUMN consolidated_at INTEGER' },
         { col: 'is_consolidated', sql: 'ALTER TABLE memories ADD COLUMN is_consolidated INTEGER DEFAULT 0' },
+        { col: 'merged_at', sql: 'ALTER TABLE memories ADD COLUMN merged_at INTEGER' },
+        { col: 'sector', sql: 'ALTER TABLE memories ADD COLUMN sector TEXT DEFAULT "episodic"' },
+        { col: 'tier', sql: 'ALTER TABLE memories ADD COLUMN tier TEXT DEFAULT "hot"' },
+        { col: 'context_status', sql: 'ALTER TABLE memories ADD COLUMN context_status TEXT DEFAULT "out-of-context"' },
+        { col: 'decay_rate', sql: 'ALTER TABLE memories ADD COLUMN decay_rate INTEGER DEFAULT 30' },
+        { col: 'coactivation_score', sql: 'ALTER TABLE memories ADD COLUMN coactivation_score INTEGER DEFAULT 0' },
+        { col: 'last_decay_at', sql: 'ALTER TABLE memories ADD COLUMN last_decay_at INTEGER DEFAULT (strftime(\'%s\',\'now\'))' },
+        { col: 'agent_id', sql: 'ALTER TABLE memories ADD COLUMN agent_id TEXT' },
+        { col: 'agent_role', sql: 'ALTER TABLE memories ADD COLUMN agent_role TEXT' },
+        { col: 'retrieval_priority', sql: 'ALTER TABLE memories ADD COLUMN retrieval_priority INTEGER DEFAULT 50' },
+        // v0.9.0: New schema columns
+        { col: 'recorded_at', sql: 'ALTER TABLE memories ADD COLUMN recorded_at INTEGER DEFAULT (strftime(\'%s\',\'now\'))' },
+        { col: 'confidence', sql: 'ALTER TABLE memories ADD COLUMN confidence INTEGER DEFAULT 100' },
+        { col: 'is_private', sql: 'ALTER TABLE memories ADD COLUMN is_private INTEGER DEFAULT 0' },
+        { col: 'has_secrets', sql: 'ALTER TABLE memories ADD COLUMN has_secrets INTEGER DEFAULT 0' },
+        { col: 'valid_from', sql: 'ALTER TABLE memories ADD COLUMN valid_from INTEGER' },
+        { col: 'valid_to', sql: 'ALTER TABLE memories ADD COLUMN valid_to INTEGER' },
+        { col: 'superseded_by', sql: 'ALTER TABLE memories ADD COLUMN superseded_by TEXT' },
+        { col: 'version', sql: 'ALTER TABLE memories ADD COLUMN version INTEGER DEFAULT 1' },
+        { col: 'merge_source_ids', sql: 'ALTER TABLE memories ADD COLUMN merge_source_ids TEXT' },
+        { col: 'merge_version', sql: 'ALTER TABLE memories ADD COLUMN merge_version INTEGER DEFAULT 1' },
+        { col: 'user_id', sql: 'ALTER TABLE memories ADD COLUMN user_id TEXT' },
+        { col: 'confidence', sql: 'ALTER TABLE memories ADD COLUMN confidence INTEGER DEFAULT 100' },
+        { col: 'is_active', sql: 'ALTER TABLE memories ADD COLUMN is_active INTEGER DEFAULT 1' },
+        { col: 'expires_at', sql: 'ALTER TABLE memories ADD COLUMN expires_at INTEGER' },
+        { col: 'decay_rate', sql: 'ALTER TABLE memories ADD COLUMN decay_rate INTEGER DEFAULT 30' },
+        { col: 'coactivation_score', sql: 'ALTER TABLE memories ADD COLUMN coactivation_score INTEGER DEFAULT 0' },
+        { col: 'last_decay_at', sql: 'ALTER TABLE memories ADD COLUMN last_decay_at INTEGER' },
+        { col: 'agent_id', sql: 'ALTER TABLE memories ADD COLUMN agent_id TEXT' },
+        { col: 'agent_role', sql: 'ALTER TABLE memories ADD COLUMN agent_role TEXT' },
+        { col: 'retrieval_priority', sql: 'ALTER TABLE memories ADD COLUMN retrieval_priority INTEGER DEFAULT 50' },
+        // v0.8.0: Consolidation
+        { col: 'consolidated_into', sql: 'ALTER TABLE memories ADD COLUMN consolidated_into TEXT' },
+        { col: 'consolidated_at', sql: 'ALTER TABLE memories ADD COLUMN consolidated_at INTEGER' },
+        { col: 'is_consolidated', sql: 'ALTER TABLE memories ADD COLUMN is_consolidated INTEGER DEFAULT 0' },
+        { col: 'merged_at', sql: 'ALTER TABLE memories ADD COLUMN merged_at INTEGER' },
+        { col: 'sector', sql: 'ALTER TABLE memories ADD COLUMN sector TEXT DEFAULT "episodic"' },
+        { col: 'tier', sql: 'ALTER TABLE memories ADD COLUMN tier TEXT DEFAULT "hot"' },
+        { col: 'context_status', sql: 'ALTER TABLE memories ADD COLUMN context_status TEXT DEFAULT "out-of-context"' },
+        { col: 'decay_rate', sql: 'ALTER TABLE memories ADD COLUMN decay_rate INTEGER DEFAULT 30' },
+        { col: 'coactivation_score', sql: 'ALTER TABLE memories ADD COLUMN coactivation_score INTEGER DEFAULT 0' },
+        { col: 'last_decay_at', sql: 'ALTER TABLE memories ADD COLUMN last_decay_at INTEGER DEFAULT (strftime(\'%s\',\'now\'))' },
+        { col: 'agent_id', sql: 'ALTER TABLE memories ADD COLUMN agent_id TEXT' },
+        { col: 'agent_role', sql: 'ALTER TABLE memories ADD COLUMN agent_role TEXT' },
+        { col: 'visibility_scope', sql: 'ALTER TABLE memories ADD COLUMN visibility_scope TEXT DEFAULT "private"' },
+        { col: 'is_protected', sql: 'ALTER TABLE memories ADD COLUMN is_protected INTEGER DEFAULT 0' },
+        { col: 'is_pinned', sql: 'ALTER TABLE memories ADD COLUMN is_pinned INTEGER DEFAULT 0' },
+        { col: 'is_immutable', sql: 'ALTER TABLE memories ADD COLUMN is_immutable INTEGER DEFAULT 0' },
+        { col: 'write_scope', sql: 'ALTER TABLE memories ADD COLUMN write_scope TEXT' },
+        { col: 'read_scope', sql: 'ALTER TABLE memories ADD COLUMN read_scope TEXT' },
+        { col: 'triggered_by', sql: 'ALTER TABLE memories ADD COLUMN triggered_by TEXT' },
+        { col: 'capture_reason', sql: 'ALTER TABLE memories ADD COLUMN capture_reason TEXT' },
+        { col: 'last_used_at', sql: 'ALTER TABLE memories ADD COLUMN last_used_at INTEGER' },
+        { col: 'usage_count', sql: 'ALTER TABLE memories ADD COLUMN usage_count INTEGER DEFAULT 0' },
+        { col: 'valid_from', sql: 'ALTER TABLE memories ADD COLUMN valid_from INTEGER' },
+        { col: 'valid_to', sql: 'ALTER TABLE memories ADD COLUMN valid_to INTEGER' },
+        { col: 'superseded_by', sql: 'ALTER TABLE memories ADD COLUMN superseded_by TEXT' },
+        { col: 'version', sql: 'ALTER TABLE memories ADD COLUMN version INTEGER DEFAULT 1' },
+        { col: 'merge_source_ids', sql: 'ALTER TABLE memories ADD COLUMN merge_source_ids TEXT' },
+        { col: 'merge_version', sql: 'ALTER TABLE memories ADD COLUMN merge_version INTEGER DEFAULT 1' },
+        { col: 'user_id', sql: 'ALTER TABLE memories ADD COLUMN user_id TEXT' },
+        { col: 'confidence', sql: 'ALTER TABLE memories ADD COLUMN confidence INTEGER DEFAULT 100' },
+        { col: 'is_active', sql: 'ALTER TABLE memories ADD COLUMN is_active INTEGER DEFAULT 1' },
+        { col: 'expires_at', sql: 'ALTER TABLE memories ADD COLUMN expires_at INTEGER' },
+        { col: 'decay_rate', sql: 'ALTER TABLE memories ADD COLUMN decay_rate INTEGER DEFAULT 30' },
+        { col: 'coactivation_score', sql: 'ALTER TABLE memories ADD COLUMN coactivation_score INTEGER DEFAULT 0' },
+        { col: 'last_decay_at', sql: 'ALTER TABLE memories ADD COLUMN last_decay_at INTEGER' },
+        { col: 'agent_id', sql: 'ALTER TABLE memories ADD COLUMN agent_id TEXT' },
+        { col: 'agent_role', sql: 'ALTER TABLE memories ADD COLUMN agent_role TEXT' },
+        { col: 'retrieval_priority', sql: 'ALTER TABLE memories ADD COLUMN retrieval_priority INTEGER DEFAULT 50' },
+        { col: 'importance_score', sql: 'ALTER TABLE memories ADD COLUMN importance_score INTEGER DEFAULT 50' },
+        { col: 'importance_decay_rate', sql: 'ALTER TABLE memories ADD COLUMN importance_decay_rate INTEGER DEFAULT 30' },
+        { col: 'last_importance_recalc', sql: 'ALTER TABLE memories ADD COLUMN last_importance_recalc INTEGER' },
     ];
     for (const migration of migrations) {
         if (!existingColumns.has(migration.col)) {
@@ -497,8 +666,14 @@ async function runSqliteMigrations(sqlite) {
                 logger.info(`Migration: Added column ${migration.col} to memories table`);
             }
             catch (error) {
-                // Silent fail - column might already exist
-                logger.debug(`Migration skipped for ${migration.col}: ${error}`);
+                // Re-throw real errors - only ignore "duplicate column" errors
+                const msg = error instanceof Error ? error.message : String(error);
+                if (msg.includes('duplicate column name')) {
+                    logger.debug(`Migration skipped for ${migration.col}: column already exists`);
+                }
+                else {
+                    throw new Error(`Migration failed for column ${migration.col}: ${msg}`);
+                }
             }
         }
     }

package/dist/db/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../db/bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../db/bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/db/index.d.ts

@@ -1,10 +1,6 @@
 import { createDb } from './adapter.js';
 import { config } from '../config.js';
-export declare function getDb(): Promise<(import("drizzle-orm/node-postgres").NodePgDatabase<typeof import("../drizzle/schema.js")> & {
-    $client: import("pg").Pool;
-}) | (import("drizzle-orm/better-sqlite3").BetterSQLite3Database<typeof import("../drizzle/schema-sqlite.js")> & {
-    $client: import("better-sqlite3").Database;
-})>;
+export declare function getDb(): Promise<any>;
 export declare function checkDatabaseHealth(): Promise<boolean>;
 export { config };
 export { createDb };

package/dist/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,wBAAsB,KAAK;;;;IAc1B;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAkB5D;AAED,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,wBAAsB,KAAK,iBAc1B;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAoB5D;AAED,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/dist/db/index.js

@@ -21,10 +21,13 @@ export async function getDb() {
 export async function checkDatabaseHealth() {
     try {
         const database = await getDb();
-        // Try a simple query on any table
-        const tables = Object.values(database._.schema || {});
-        if (tables.length > 0) {
-            await database.select().from(tables[0]).limit(1);
+        // Try a simple query - use a raw query that's guaranteed to work
+        const dbClient = database.$client;
+        if (dbClient && typeof dbClient.query === 'function') {
+            await dbClient.query('SELECT 1');
+        }
+        else if (dbClient && typeof dbClient.prepare === 'function') {
+            dbClient.prepare('SELECT 1').get();
         }
         return true;
     }

package/dist/db/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,IAAI,EAAE,GAAgD,IAAI,CAAC;AAC3D,IAAI,OAAO,GAAkB,IAAI,CAAC;AAElC,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAAC;YACpF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,CAAC;QAC/B,kCAAkC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QACtD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAO,QAAgB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,sDAAsD;QACtD,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,+BAA+B,CAAC;YACxD,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC,CAAC,+DAA+D;QAC/E,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,IAAI,EAAE,GAAgD,IAAI,CAAC;AAC3D,IAAI,OAAO,GAAkB,IAAI,CAAC;AAElC,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,IAAI,CAAC;YACH,EAAE,GAAG,MAAM,QAAQ,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgC,CAAC;YACpF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,EAAE,CAAC;QAC/B,iEAAiE;QACjE,MAAM,QAAQ,GAAI,QAAgB,CAAC,OAAO,CAAC;QAC3C,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YACrD,MAAM,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YAC9D,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,sDAAsD;QACtD,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,+BAA+B,CAAC;YACxD,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC,CAAC,+DAA+D;QAC/E,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,CAAC"}