@siduri-x/core 2.0.2 → 2.0.4

package/dist/siduri-db.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SiduriDatabase = void 0;
+exports.normalizeStatus = normalizeStatus;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const crypto = require('crypto');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { DatabaseSync } = require('node:sqlite');
+function normalizeStatus(status, defaultStatus = 'pending') {
+    if (!status)
+        return defaultStatus;
+    return status.toLowerCase().replace(/_/g, '-');
+}
 class SiduriDatabase {
     db;
     constructor(options = {}) {
@@ -20,6 +26,8 @@ class SiduriDatabase {
         companion_id TEXT PRIMARY KEY,
         name TEXT NOT NULL,
         archetype TEXT,
+        origin TEXT,
+        ethos TEXT,
         version TEXT NOT NULL,
         updated_at TEXT DEFAULT (datetime('now'))
       );
@@ -39,8 +47,9 @@ class SiduriDatabase {
         companion_id TEXT NOT NULL,
         priority INTEGER DEFAULT 50,
         directive TEXT NOT NULL,
-        status TEXT DEFAULT 'ACTIVE',
+        status TEXT DEFAULT 'active',
         category TEXT DEFAULT 'behavioral',
+        scope_actor TEXT,
         supersedes_id TEXT,
         created_at TEXT DEFAULT (datetime('now'))
       );
@@ -48,13 +57,24 @@ class SiduriDatabase {
       CREATE TABLE IF NOT EXISTS self_relationships (
         companion_id TEXT NOT NULL,
         entity_id TEXT NOT NULL,
-        entity_type TEXT NOT NULL,
+        entity_type TEXT NOT NULL DEFAULT 'human',
+        role TEXT DEFAULT 'user',
+        stance TEXT DEFAULT 'neutral',
         trust_score REAL DEFAULT 0.5,
         familiarity REAL DEFAULT 0.5,
         interaction_conventions TEXT,
+        updated_at TEXT DEFAULT (datetime('now')),
         PRIMARY KEY(companion_id, entity_id)
       );
 
+      CREATE TABLE IF NOT EXISTS self_exemplars (
+        id TEXT PRIMARY KEY,
+        companion_id TEXT NOT NULL,
+        user_prompt TEXT NOT NULL,
+        companion_response TEXT NOT NULL,
+        created_at TEXT DEFAULT (datetime('now'))
+      );
+
       -- Knowledge Tables
       CREATE TABLE IF NOT EXISTS life_inventory (
         id TEXT PRIMARY KEY,
@@ -109,7 +129,7 @@ class SiduriDatabase {
         subject TEXT NOT NULL,
         predicate TEXT NOT NULL,
         value TEXT NOT NULL,
-        status TEXT DEFAULT 'PENDING',
+        status TEXT DEFAULT 'pending',
         confidence REAL DEFAULT 1.0,
         valid_from TEXT,
         valid_until TEXT,
@@ -159,6 +179,42 @@ class SiduriDatabase {
         catch {
             // Column already exists
         }
+        try {
+            this.db.exec("ALTER TABLE self_identity ADD COLUMN origin TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_identity ADD COLUMN ethos TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_directives ADD COLUMN scope_actor TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_relationships ADD COLUMN role TEXT DEFAULT 'user'");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_relationships ADD COLUMN stance TEXT DEFAULT 'neutral'");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_relationships ADD COLUMN updated_at TEXT");
+        }
+        catch {
+            // Column already exists
+        }
     }
     close() {
         this.db.close();
@@ -175,21 +231,25 @@ class SiduriDatabase {
             companionId: row.companion_id,
             name: row.name,
             archetype: row.archetype || undefined,
+            origin: row.origin || undefined,
+            ethos: row.ethos || undefined,
             version: row.version,
             updatedAt: row.updated_at
         };
     }
     setIdentity(identity) {
         const stmt = this.db.prepare(`
-      INSERT INTO self_identity (companion_id, name, archetype, version, updated_at)
-      VALUES (?, ?, ?, ?, datetime('now'))
+      INSERT INTO self_identity (companion_id, name, archetype, origin, ethos, version, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, datetime('now'))
       ON CONFLICT(companion_id) DO UPDATE SET
         name = excluded.name,
         archetype = excluded.archetype,
+        origin = excluded.origin,
+        ethos = excluded.ethos,
         version = excluded.version,
         updated_at = datetime('now')
     `);
-        stmt.run(identity.companionId, identity.name, identity.archetype || null, identity.version);
+        stmt.run(identity.companionId, identity.name, identity.archetype || null, identity.origin || null, identity.ethos || null, identity.version);
     }
     getPersonality(companionId) {
         const stmt = this.db.prepare('SELECT * FROM self_personality WHERE companion_id = ?');
@@ -218,29 +278,41 @@ class SiduriDatabase {
     `);
         stmt.run(companionId, traits.warmth, traits.formality, traits.sarcasm, traits.verbosity, traits.curiosity);
     }
-    getActiveDirectives(companionId) {
-        const stmt = this.db.prepare(`
-      SELECT * FROM self_directives 
-      WHERE companion_id = ? AND status = 'ACTIVE'
-      ORDER BY priority DESC, created_at ASC
-    `);
-        return stmt.all(companionId).map((row) => ({
+    rowToSelfDirective(row) {
+        return {
             id: row.id,
             companionId: row.companion_id,
             priority: row.priority,
             directive: row.directive,
-            status: row.status,
+            status: normalizeStatus(row.status, 'active'),
             category: row.category,
+            scopeActor: row.scope_actor || undefined,
             supersedesId: row.supersedes_id || undefined,
-            createdAt: row.created_at
-        }));
+            createdAt: row.created_at,
+        };
+    }
+    getActiveDirectives(companionId) {
+        const stmt = this.db.prepare(`
+      SELECT * FROM self_directives 
+      WHERE companion_id = ? AND LOWER(status) = 'active'
+      ORDER BY priority DESC, created_at ASC
+    `);
+        return stmt.all(companionId).map((row) => this.rowToSelfDirective(row));
+    }
+    getAllDirectives(companionId) {
+        const stmt = this.db.prepare(`
+      SELECT * FROM self_directives 
+      WHERE companion_id = ?
+      ORDER BY priority DESC, created_at ASC
+    `);
+        return stmt.all(companionId).map((row) => this.rowToSelfDirective(row));
     }
     commitDirective(directive) {
         const stmt = this.db.prepare(`
-      INSERT INTO self_directives (id, companion_id, priority, directive, status, category, supersedes_id, created_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+      INSERT INTO self_directives (id, companion_id, priority, directive, status, category, scope_actor, supersedes_id, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
-        stmt.run(directive.id, directive.companionId, directive.priority, directive.directive, directive.status, directive.category, directive.supersedesId || null, directive.createdAt || new Date().toISOString());
+        stmt.run(directive.id, directive.companionId, directive.priority !== undefined ? directive.priority : 50, directive.directive, normalizeStatus(directive.status, 'active'), directive.category || 'behavioral', directive.scopeActor || null, directive.supersedesId || null, directive.createdAt || new Date().toISOString());
     }
     getDirective(id, companionId) {
         const stmt = companionId
@@ -249,16 +321,7 @@ class SiduriDatabase {
         const row = (companionId ? stmt.get(id, companionId) : stmt.get(id));
         if (!row)
             return undefined;
-        return {
-            id: row.id,
-            companionId: row.companion_id,
-            priority: row.priority,
-            directive: row.directive,
-            status: row.status,
-            category: row.category,
-            supersedesId: row.supersedes_id || undefined,
-            createdAt: row.created_at,
-        };
+        return this.rowToSelfDirective(row);
     }
     approveDirective(id, companionId) {
         const findStmt = companionId
@@ -268,28 +331,28 @@ class SiduriDatabase {
         if (!row) {
             return;
         }
-        if (row.status !== 'PENDING') {
-            throw new Error(`Cannot approve directive '${id}': invalid transition from status '${row.status}' to 'ACTIVE' (only PENDING directives can be approved)`);
+        if (normalizeStatus(row.status) !== 'pending') {
+            throw new Error(`Cannot approve directive '${id}': invalid transition from status '${row.status}' to 'active' (only pending directives can be approved)`);
         }
-        // If this directive supersedes an earlier directive, transition that prior directive to SUPERSEDED
+        // If this directive supersedes an earlier directive, transition that prior directive to superseded
         if (row.supersedes_id) {
             const supersededId = row.supersedes_id;
             const effectiveCompanionId = companionId || row.companion_id;
             if (effectiveCompanionId) {
-                const supersedeStmt = this.db.prepare("UPDATE self_directives SET status = 'SUPERSEDED' WHERE id = ? AND companion_id = ?");
+                const supersedeStmt = this.db.prepare("UPDATE self_directives SET status = 'superseded' WHERE id = ? AND companion_id = ?");
                 supersedeStmt.run(supersededId, effectiveCompanionId);
             }
             else {
-                const supersedeStmt = this.db.prepare("UPDATE self_directives SET status = 'SUPERSEDED' WHERE id = ?");
+                const supersedeStmt = this.db.prepare("UPDATE self_directives SET status = 'superseded' WHERE id = ?");
                 supersedeStmt.run(supersededId);
             }
         }
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'ACTIVE' WHERE id = ? AND companion_id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'active' WHERE id = ? AND companion_id = ? AND LOWER(status) = 'pending'");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'ACTIVE' WHERE id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'active' WHERE id = ? AND LOWER(status) = 'pending'");
             stmt.run(id);
         }
     }
@@ -301,45 +364,45 @@ class SiduriDatabase {
         if (!row) {
             return;
         }
-        if (row.status !== 'PENDING') {
-            throw new Error(`Cannot reject directive '${id}': invalid transition from status '${row.status}' to 'REJECTED' (only PENDING directives can be rejected)`);
+        if (normalizeStatus(row.status) !== 'pending') {
+            throw new Error(`Cannot reject directive '${id}': invalid transition from status '${row.status}' to 'rejected' (only pending directives can be rejected)`);
         }
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REJECTED' WHERE id = ? AND companion_id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'rejected' WHERE id = ? AND companion_id = ? AND LOWER(status) = 'pending'");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REJECTED' WHERE id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'rejected' WHERE id = ? AND LOWER(status) = 'pending'");
             stmt.run(id);
         }
     }
     revokeDirective(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REVOKED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'revoked' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REVOKED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'revoked' WHERE id = ?");
             stmt.run(id);
         }
     }
     expireDirective(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'EXPIRED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'expired' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'EXPIRED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'expired' WHERE id = ?");
             stmt.run(id);
         }
     }
     disableDirective(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'DISABLED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'disabled' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE self_directives SET status = 'DISABLED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'disabled' WHERE id = ?");
             stmt.run(id);
         }
     }
@@ -351,23 +414,66 @@ class SiduriDatabase {
         return {
             companionId: row.companion_id,
             entityId: row.entity_id,
-            entityType: row.entity_type,
-            trustScore: row.trust_score,
-            familiarity: row.familiarity,
-            interactionConventions: row.interaction_conventions ? JSON.parse(row.interaction_conventions) : []
+            entityType: row.entity_type || 'human',
+            role: row.role || 'user',
+            stance: row.stance || 'neutral',
+            trustScore: row.trust_score !== undefined && row.trust_score !== null ? row.trust_score : 0.5,
+            familiarity: row.familiarity !== undefined && row.familiarity !== null ? row.familiarity : 0.5,
+            interactionConventions: row.interaction_conventions ? JSON.parse(row.interaction_conventions) : [],
+            updatedAt: row.updated_at || undefined,
         };
     }
+    getRelationships(companionId) {
+        const stmt = this.db.prepare('SELECT * FROM self_relationships WHERE companion_id = ? ORDER BY entity_id ASC');
+        return stmt.all(companionId).map((row) => ({
+            companionId: row.companion_id,
+            entityId: row.entity_id,
+            entityType: row.entity_type || 'human',
+            role: row.role || 'user',
+            stance: row.stance || 'neutral',
+            trustScore: row.trust_score !== undefined && row.trust_score !== null ? row.trust_score : 0.5,
+            familiarity: row.familiarity !== undefined && row.familiarity !== null ? row.familiarity : 0.5,
+            interactionConventions: row.interaction_conventions ? JSON.parse(row.interaction_conventions) : [],
+            updatedAt: row.updated_at || undefined,
+        }));
+    }
     upsertRelationship(rel) {
         const stmt = this.db.prepare(`
-      INSERT INTO self_relationships (companion_id, entity_id, entity_type, trust_score, familiarity, interaction_conventions)
-      VALUES (?, ?, ?, ?, ?, ?)
+      INSERT INTO self_relationships (companion_id, entity_id, entity_type, role, stance, trust_score, familiarity, interaction_conventions, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, datetime('now'))
       ON CONFLICT(companion_id, entity_id) DO UPDATE SET
         entity_type = excluded.entity_type,
+        role = excluded.role,
+        stance = excluded.stance,
         trust_score = excluded.trust_score,
         familiarity = excluded.familiarity,
-        interaction_conventions = excluded.interaction_conventions
+        interaction_conventions = excluded.interaction_conventions,
+        updated_at = datetime('now')
     `);
-        stmt.run(rel.companionId, rel.entityId, rel.entityType, rel.trustScore, rel.familiarity, JSON.stringify(rel.interactionConventions || []));
+        stmt.run(rel.companionId, rel.entityId, rel.entityType || 'human', rel.role || 'user', rel.stance || 'neutral', rel.trustScore !== undefined && rel.trustScore !== null ? rel.trustScore : 0.5, rel.familiarity !== undefined && rel.familiarity !== null ? rel.familiarity : 0.5, JSON.stringify(rel.interactionConventions || []));
+    }
+    getExemplars(companionId) {
+        const stmt = this.db.prepare('SELECT * FROM self_exemplars WHERE companion_id = ? ORDER BY created_at ASC');
+        return stmt.all(companionId).map((row) => ({
+            id: row.id,
+            companionId: row.companion_id,
+            user: row.user_prompt,
+            assistant: row.companion_response,
+            createdAt: row.created_at,
+        }));
+    }
+    setExemplars(companionId, exemplars) {
+        const delStmt = this.db.prepare('DELETE FROM self_exemplars WHERE companion_id = ?');
+        delStmt.run(companionId);
+        const insertStmt = this.db.prepare(`
+      INSERT INTO self_exemplars (id, companion_id, user_prompt, companion_response, created_at)
+      VALUES (?, ?, ?, ?, datetime('now'))
+    `);
+        for (let i = 0; i < exemplars.length; i++) {
+            const ex = exemplars[i];
+            const id = ex.id || `ex-${i + 1}-${Date.now()}`;
+            insertStmt.run(id, companionId, ex.user, ex.assistant);
+        }
     }
     // ==========================================
     // Knowledge / Life DB Methods
@@ -504,9 +610,26 @@ class SiduriDatabase {
             payload: JSON.parse(row.payload)
         };
     }
+    rowToMemoryClaim(row) {
+        return {
+            id: row.id,
+            companionId: row.companion_id,
+            subject: row.subject,
+            predicate: row.predicate,
+            value: row.value,
+            status: normalizeStatus(row.status, 'pending'),
+            confidence: row.confidence,
+            validFrom: row.valid_from || undefined,
+            validUntil: row.valid_until || undefined,
+            evidence: row.evidence ? (typeof row.evidence === 'string' ? JSON.parse(row.evidence) : row.evidence) : undefined,
+            assertedAt: row.asserted_at,
+            supersedes: row.supersedes || undefined,
+            sourceEventId: row.source_event_id || undefined,
+        };
+    }
     proposeClaim(claim) {
         const id = claim.id || crypto.randomUUID();
-        const status = 'PENDING';
+        const status = normalizeStatus(claim.status, 'pending');
         const confidence = claim.confidence ?? 1.0;
         const assertedAt = claim.assertedAt || new Date().toISOString();
         const stmt = this.db.prepare(`
@@ -517,7 +640,7 @@ class SiduriDatabase {
         return {
             ...claim,
             id,
-            status,
+            status: status,
             confidence,
             assertedAt,
             supersedes: claim.supersedes,
@@ -532,67 +655,67 @@ class SiduriDatabase {
         if (!row) {
             return;
         }
-        if (row.status !== 'PENDING') {
-            throw new Error(`Cannot approve claim '${id}': invalid transition from status '${row.status}' to 'APPROVED' (only PENDING claims can be approved)`);
+        if (normalizeStatus(row.status) !== 'pending') {
+            throw new Error(`Cannot approve claim '${id}': invalid transition from status '${row.status}' to 'approved' (only pending claims can be approved)`);
         }
-        // If this claim supersedes an earlier claim, transition that prior claim to SUPERSEDED
+        // If this claim supersedes an earlier claim, transition that prior claim to superseded
         if (row.supersedes) {
             const supersededId = row.supersedes;
             if (companionId) {
-                const supersedeStmt = this.db.prepare("UPDATE memory_claims SET status = 'SUPERSEDED' WHERE id = ? AND companion_id = ?");
+                const supersedeStmt = this.db.prepare("UPDATE memory_claims SET status = 'superseded' WHERE id = ? AND companion_id = ?");
                 supersedeStmt.run(supersededId, companionId);
             }
             else {
-                const supersedeStmt = this.db.prepare("UPDATE memory_claims SET status = 'SUPERSEDED' WHERE id = ?");
+                const supersedeStmt = this.db.prepare("UPDATE memory_claims SET status = 'superseded' WHERE id = ?");
                 supersedeStmt.run(supersededId);
             }
         }
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'APPROVED' WHERE id = ? AND companion_id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'approved' WHERE id = ? AND companion_id = ? AND LOWER(status) = 'pending'");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'APPROVED' WHERE id = ? AND status = 'PENDING'");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'approved' WHERE id = ? AND LOWER(status) = 'pending'");
             stmt.run(id);
         }
     }
     rejectClaim(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'REJECTED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'rejected' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'REJECTED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'rejected' WHERE id = ?");
             stmt.run(id);
         }
     }
     revokeClaim(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'REVOKED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'revoked' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'REVOKED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'revoked' WHERE id = ?");
             stmt.run(id);
         }
     }
     expireClaim(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'EXPIRED' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'expired' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'EXPIRED' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'expired' WHERE id = ?");
             stmt.run(id);
         }
     }
     markClaimSessionOnly(id, companionId) {
         if (companionId) {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'SESSION_ONLY' WHERE id = ? AND companion_id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'session-only' WHERE id = ? AND companion_id = ?");
             stmt.run(id, companionId);
         }
         else {
-            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'SESSION_ONLY' WHERE id = ?");
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'session-only' WHERE id = ?");
             stmt.run(id);
         }
     }
@@ -600,82 +723,33 @@ class SiduriDatabase {
         const stmt = this.db.prepare(`
       SELECT c.* FROM memory_claims c
       JOIN memory_search s ON c.rowid = s.rowid
-      WHERE c.companion_id = ? AND c.status = 'APPROVED' AND memory_search MATCH ?
+      WHERE c.companion_id = ? AND LOWER(c.status) = 'approved' AND memory_search MATCH ?
       ORDER BY rank
       LIMIT ?
     `);
-        return stmt.all(companionId, query, limit).map((row) => ({
-            id: row.id,
-            companionId: row.companion_id,
-            subject: row.subject,
-            predicate: row.predicate,
-            value: row.value,
-            status: row.status,
-            confidence: row.confidence,
-            validFrom: row.valid_from || undefined,
-            validUntil: row.valid_until || undefined,
-            evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at,
-            supersedes: row.supersedes || undefined,
-            sourceEventId: row.source_event_id || undefined,
-        }));
+        return stmt.all(companionId, query, limit).map((row) => this.rowToMemoryClaim(row));
     }
     getPendingClaims(companionId, limit = 50) {
-        const stmt = this.db.prepare("SELECT * FROM memory_claims WHERE companion_id = ? AND status = 'PENDING' ORDER BY asserted_at DESC LIMIT ?");
-        return stmt.all(companionId, limit).map((row) => ({
-            id: row.id,
-            companionId: row.companion_id,
-            subject: row.subject,
-            predicate: row.predicate,
-            value: row.value,
-            status: row.status,
-            confidence: row.confidence,
-            validFrom: row.valid_from || undefined,
-            validUntil: row.valid_until || undefined,
-            evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at,
-            supersedes: row.supersedes || undefined,
-            sourceEventId: row.source_event_id || undefined,
-        }));
+        const stmt = this.db.prepare("SELECT * FROM memory_claims WHERE companion_id = ? AND LOWER(status) = 'pending' ORDER BY asserted_at DESC LIMIT ?");
+        return stmt.all(companionId, limit).map((row) => this.rowToMemoryClaim(row));
     }
     getApprovedClaims(companionId, limit = 50) {
-        const stmt = this.db.prepare("SELECT * FROM memory_claims WHERE companion_id = ? AND status = 'APPROVED' ORDER BY asserted_at DESC LIMIT ?");
-        return stmt.all(companionId, limit).map((row) => ({
-            id: row.id,
-            companionId: row.companion_id,
-            subject: row.subject,
-            predicate: row.predicate,
-            value: row.value,
-            status: row.status,
-            confidence: row.confidence,
-            validFrom: row.valid_from || undefined,
-            validUntil: row.valid_until || undefined,
-            evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at,
-            supersedes: row.supersedes || undefined,
-            sourceEventId: row.source_event_id || undefined,
-        }));
+        const stmt = this.db.prepare("SELECT * FROM memory_claims WHERE companion_id = ? AND LOWER(status) = 'approved' ORDER BY asserted_at DESC LIMIT ?");
+        return stmt.all(companionId, limit).map((row) => this.rowToMemoryClaim(row));
+    }
+    getAllClaims(companionId, limit = 100) {
+        const stmt = companionId
+            ? this.db.prepare("SELECT * FROM memory_claims WHERE companion_id = ? ORDER BY asserted_at DESC LIMIT ?")
+            : this.db.prepare("SELECT * FROM memory_claims ORDER BY asserted_at DESC LIMIT ?");
+        const rows = companionId ? stmt.all(companionId, limit) : stmt.all(limit);
+        return rows.map((row) => this.rowToMemoryClaim(row));
     }
     getClaim(id) {
         const stmt = this.db.prepare("SELECT * FROM memory_claims WHERE id = ?");
         const row = stmt.get(id);
         if (!row)
             return undefined;
-        return {
-            id: row.id,
-            companionId: row.companion_id,
-            subject: row.subject,
-            predicate: row.predicate,
-            value: row.value,
-            status: row.status,
-            confidence: row.confidence,
-            validFrom: row.valid_from || undefined,
-            validUntil: row.valid_until || undefined,
-            evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at,
-            supersedes: row.supersedes || undefined,
-            sourceEventId: row.source_event_id || undefined,
-        };
+        return this.rowToMemoryClaim(row);
     }
     resetMemory(companionId) {
         const deleteClaims = this.db.prepare("DELETE FROM memory_claims WHERE companion_id = ?");