@siduri-x/core 2.0.3 → 2.0.5

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,7 @@ class SiduriDatabase {
         companion_id TEXT PRIMARY KEY,
         name TEXT NOT NULL,
         archetype TEXT,
+        role TEXT,
         origin TEXT,
         ethos TEXT,
         version TEXT NOT NULL,
@@ -41,7 +48,7 @@ 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,
@@ -123,7 +130,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,
@@ -209,6 +216,12 @@ class SiduriDatabase {
         catch {
             // Column already exists
         }
+        try {
+            this.db.exec("ALTER TABLE self_identity ADD COLUMN role TEXT");
+        }
+        catch {
+            // Column already exists
+        }
     }
     close() {
         this.db.close();
@@ -225,6 +238,7 @@ class SiduriDatabase {
             companionId: row.companion_id,
             name: row.name,
             archetype: row.archetype || undefined,
+            role: row.role || row.archetype || undefined,
             origin: row.origin || undefined,
             ethos: row.ethos || undefined,
             version: row.version,
@@ -232,18 +246,21 @@ class SiduriDatabase {
         };
     }
     setIdentity(identity) {
+        const role = identity.role || identity.archetype || null;
+        const archetype = identity.archetype || identity.role || null;
         const stmt = this.db.prepare(`
-      INSERT INTO self_identity (companion_id, name, archetype, origin, ethos, version, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, datetime('now'))
+      INSERT INTO self_identity (companion_id, name, archetype, role, origin, ethos, version, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, datetime('now'))
       ON CONFLICT(companion_id) DO UPDATE SET
         name = excluded.name,
         archetype = excluded.archetype,
+        role = excluded.role,
         origin = excluded.origin,
         ethos = excluded.ethos,
         version = excluded.version,
         updated_at = datetime('now')
     `);
-        stmt.run(identity.companionId, identity.name, identity.archetype || null, identity.origin || null, identity.ethos || null, identity.version);
+        stmt.run(identity.companionId, identity.name, archetype, role, identity.origin || null, identity.ethos || null, identity.version);
     }
     getPersonality(companionId) {
         const stmt = this.db.prepare('SELECT * FROM self_personality WHERE companion_id = ?');
@@ -272,30 +289,49 @@ 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, scope_actor, supersedes_id, created_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+      ON CONFLICT(id) DO UPDATE SET
+        companion_id = excluded.companion_id,
+        priority = excluded.priority,
+        directive = excluded.directive,
+        status = excluded.status,
+        category = excluded.category,
+        scope_actor = excluded.scope_actor,
+        supersedes_id = excluded.supersedes_id
     `);
-        stmt.run(directive.id, directive.companionId, directive.priority !== undefined ? directive.priority : 50, directive.directive, directive.status, directive.category || 'behavioral', directive.scopeActor || null, 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
@@ -304,17 +340,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,
-            scopeActor: row.scope_actor || undefined,
-            supersedesId: row.supersedes_id || undefined,
-            createdAt: row.created_at,
-        };
+        return this.rowToSelfDirective(row);
     }
     approveDirective(id, companionId) {
         const findStmt = companionId
@@ -324,28 +350,31 @@ 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') {
+            if (normalizeStatus(row.status) === 'active') {
+                return;
+            }
+            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);
         }
     }
@@ -357,51 +386,53 @@ 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);
         }
     }
     getRelationship(companionId, entityId) {
-        const stmt = this.db.prepare('SELECT * FROM self_relationships WHERE companion_id = ? AND entity_id = ?');
-        const row = stmt.get(companionId, entityId);
+        const stripped = entityId.startsWith('actor:') ? entityId.slice(6) : entityId;
+        const prefixed = entityId.startsWith('actor:') ? entityId : `actor:${entityId}`;
+        const stmt = this.db.prepare('SELECT * FROM self_relationships WHERE companion_id = ? AND (entity_id = ? OR entity_id = ? OR entity_id = ?)');
+        const row = stmt.get(companionId, entityId, stripped, prefixed);
         if (!row)
             return undefined;
         return {
@@ -603,20 +634,37 @@ 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(`
       INSERT INTO memory_claims (id, companion_id, subject, predicate, value, status, confidence, valid_from, valid_until, evidence, asserted_at, supersedes, source_event_id)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, coalesce(?, datetime('now')), ?, ?)
     `);
-        stmt.run(id, claim.companionId, claim.subject, claim.predicate, claim.value, status, confidence, claim.validFrom || null, claim.validUntil || null, claim.evidence ? JSON.stringify(claim.evidence) : null, assertedAt || null, claim.supersedes || null, claim.sourceEventId || null);
+        stmt.run(id, claim.companionId || 'default', claim.subject, claim.predicate, claim.value, status, confidence, claim.validFrom || null, claim.validUntil || null, claim.evidence ? JSON.stringify(claim.evidence) : null, assertedAt || null, claim.supersedes || null, claim.sourceEventId || null);
         return {
             ...claim,
             id,
-            status,
+            status: status,
             confidence,
             assertedAt,
             supersedes: claim.supersedes,
@@ -631,67 +679,158 @@ 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') {
+            if (normalizeStatus(row.status) === 'approved') {
+                return;
+            }
+            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);
         }
+        // Canonically promote approved claim to Self domain state (identity, role, relationships)
+        const approvedClaim = this.getClaim(id);
+        if (approvedClaim) {
+            this.promoteClaimToSelf(approvedClaim);
+        }
+    }
+    /**
+     * Canonically promotes a Claim into Self domain tables.
+     */
+    promoteClaimToSelf(claim) {
+        const companionId = claim.companionId || 'default';
+        const subject = (claim.subject || '').toLowerCase();
+        const predicate = (claim.predicate || '').toLowerCase();
+        const value = claim.value || '';
+        if (!value)
+            return;
+        // 1. Identity mutations: companion identity/role/origin/name/ethos
+        if (subject.startsWith('companion:') ||
+            subject === 'companion' ||
+            subject === 'siduri' ||
+            subject === 'self') {
+            const existing = this.getIdentity(companionId) || {
+                companionId,
+                name: 'Siduri',
+                version: '1.0.0',
+                updatedAt: new Date().toISOString(),
+            };
+            if (predicate === 'role' || predicate === 'archetype') {
+                existing.archetype = value;
+                existing.role = value;
+                this.setIdentity(existing);
+                this.commitDirective({
+                    id: `dir-role-${claim.id || Date.now()}`,
+                    companionId,
+                    priority: 70,
+                    directive: `Acknowledge role as ${value}`,
+                    status: 'active',
+                    category: 'relational',
+                    createdAt: new Date().toISOString(),
+                });
+            }
+            else if (predicate === 'origin' || predicate === 'created_by') {
+                existing.origin = value;
+                this.setIdentity(existing);
+            }
+            else if (predicate === 'name') {
+                existing.name = value;
+                this.setIdentity(existing);
+            }
+            else if (predicate === 'ethos') {
+                existing.ethos = value;
+                this.setIdentity(existing);
+            }
+            return;
+        }
+        // 2. Relationship mutations: creator or user stated relationship
+        if (claim.claimType === 'relationship' ||
+            predicate === 'stated_relationship' ||
+            predicate === 'relationship' ||
+            predicate === 'relationship_to_siduri') {
+            const rawSubject = (claim.subject || 'actor:user').replace(/^actor:actor:/, 'actor:');
+            const isCreator = value.toLowerCase() === 'creator';
+            this.upsertRelationship({
+                companionId,
+                entityId: rawSubject,
+                entityType: 'human',
+                role: value,
+                stance: isCreator ? 'familiar_loyal' : 'neutral',
+                trustScore: isCreator ? 1.0 : 0.8,
+                familiarity: isCreator ? 0.9 : 0.5,
+                interactionConventions: isCreator
+                    ? ['Direct communication', 'Highest administrative trust']
+                    : [],
+            });
+            return;
+        }
+        // 3. Behavioral rule claim
+        if (predicate === 'behavioral_rule' || predicate === 'rule') {
+            this.commitDirective({
+                id: `dir-rule-${claim.id || Date.now()}`,
+                companionId,
+                priority: 60,
+                directive: value,
+                status: 'active',
+                category: 'behavioral',
+                createdAt: new Date().toISOString(),
+            });
+        }
     }
     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);
         }
     }
@@ -699,82 +838,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 = ?");