@siduri-x/core 2.0.0 → 2.0.1

package/dist/schema-validator.test.js

@@ -31,7 +31,7 @@ describe('validateCompanionConfig', () => {
                         properties: {
                             provider: {
                                 type: 'string',
-                                enum: ['postgres', 'in-memory', 'none'],
+                                enum: ['sqlite', 'in-memory', 'none'],
                             },
                             maxConnections: { type: 'number' },
                         },
@@ -107,7 +107,7 @@ describe('validateCompanionConfig', () => {
             name: 'Test',
             organs: {
                 memory: {
-                    provider: 'postgres',
+                    provider: 'sqlite',
                     maxConnections: 'ten', // should be number
                 },
             },

package/dist/siduri-db.d.ts

@@ -17,10 +17,10 @@ export interface SelfDirective {
     companionId: string;
     priority: number;
     directive: string;
-    status: 'ACTIVE' | 'DISABLED' | 'SUPERSEDED';
-    category: 'behavioral' | 'guardrail' | 'relational';
+    status: 'PENDING' | 'ACTIVE' | 'DISABLED' | 'SUPERSEDED' | 'REJECTED' | 'REVOKED' | 'EXPIRED';
+    category: 'behavioral' | 'guardrail' | 'relational' | string;
     supersedesId?: string;
-    createdAt: string;
+    createdAt?: string;
 }
 export interface SelfRelationship {
     companionId: string;
@@ -77,12 +77,14 @@ export interface MemoryClaim {
     subject: string;
     predicate: string;
     value: string;
-    status: 'PENDING' | 'APPROVED' | 'REJECTED';
+    status: 'PENDING' | 'APPROVED' | 'REJECTED' | 'SESSION_ONLY' | 'SUPERSEDED' | 'REVOKED' | 'EXPIRED';
     confidence: number;
     validFrom?: string;
     validUntil?: string;
     evidence?: string[];
     assertedAt: string;
+    supersedes?: string;
+    sourceEventId?: string;
 }
 export interface SiduriDatabaseOptions {
     dbPath?: string;
@@ -98,7 +100,12 @@ export declare class SiduriDatabase {
     setPersonality(companionId: string, traits: PersonalityTraits): void;
     getActiveDirectives(companionId: string): SelfDirective[];
     commitDirective(directive: SelfDirective): void;
-    disableDirective(id: string): void;
+    getDirective(id: string, companionId?: string): SelfDirective | undefined;
+    approveDirective(id: string, companionId?: string): void;
+    rejectDirective(id: string, companionId?: string): void;
+    revokeDirective(id: string, companionId?: string): void;
+    expireDirective(id: string, companionId?: string): void;
+    disableDirective(id: string, companionId?: string): void;
     getRelationship(companionId: string, entityId: string): SelfRelationship | undefined;
     upsertRelationship(rel: SelfRelationship): void;
     getInventory(companionId: string, domain?: string): LifeInventoryItem[];
@@ -111,9 +118,21 @@ export declare class SiduriDatabase {
     upsertPreference(pref: LifePreference): void;
     recordEvent(event: EpisodicEvent): void;
     getRecentEvents(companionId: string, limit?: number): EpisodicEvent[];
-    proposeClaim(claim: Omit<MemoryClaim, 'status'>): MemoryClaim;
-    approveClaim(id: string): void;
-    rejectClaim(id: string): void;
+    getEvent(id: string): EpisodicEvent | undefined;
+    proposeClaim(claim: Omit<MemoryClaim, 'status' | 'confidence' | 'assertedAt'> & {
+        confidence?: number;
+        assertedAt?: string;
+        supersedes?: string;
+        sourceEventId?: string;
+    }): MemoryClaim;
+    approveClaim(id: string, companionId?: string): void;
+    rejectClaim(id: string, companionId?: string): void;
+    revokeClaim(id: string, companionId?: string): void;
+    expireClaim(id: string, companionId?: string): void;
+    markClaimSessionOnly(id: string, companionId?: string): void;
     searchClaims(companionId: string, query: string, limit?: number): MemoryClaim[];
+    getPendingClaims(companionId: string, limit?: number): MemoryClaim[];
     getApprovedClaims(companionId: string, limit?: number): MemoryClaim[];
+    getClaim(id: string): MemoryClaim | undefined;
+    resetMemory(companionId: string): void;
 }

package/dist/siduri-db.js

@@ -114,7 +114,9 @@ class SiduriDatabase {
         valid_from TEXT,
         valid_until TEXT,
         evidence TEXT,
-        asserted_at TEXT DEFAULT (datetime('now'))
+        asserted_at TEXT DEFAULT (datetime('now')),
+        supersedes TEXT,
+        source_event_id TEXT
       );
 
       -- FTS5 Virtual Table for Memory Claims
@@ -145,6 +147,18 @@ class SiduriDatabase {
       END;
     `;
         this.db.exec(schema);
+        try {
+            this.db.exec("ALTER TABLE memory_claims ADD COLUMN supersedes TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE memory_claims ADD COLUMN source_event_id TEXT");
+        }
+        catch {
+            // Column already exists
+        }
     }
     close() {
         this.db.close();
@@ -228,9 +242,106 @@ class SiduriDatabase {
     `);
         stmt.run(directive.id, directive.companionId, directive.priority, directive.directive, directive.status, directive.category, directive.supersedesId || null, directive.createdAt || new Date().toISOString());
     }
-    disableDirective(id) {
-        const stmt = this.db.prepare("UPDATE self_directives SET status = 'DISABLED' WHERE id = ?");
-        stmt.run(id);
+    getDirective(id, companionId) {
+        const stmt = companionId
+            ? this.db.prepare('SELECT * FROM self_directives WHERE id = ? AND companion_id = ?')
+            : this.db.prepare('SELECT * FROM self_directives WHERE id = ?');
+        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,
+        };
+    }
+    approveDirective(id, companionId) {
+        const findStmt = companionId
+            ? this.db.prepare("SELECT id, companion_id, status, supersedes_id FROM self_directives WHERE id = ? AND companion_id = ?")
+            : this.db.prepare("SELECT id, companion_id, status, supersedes_id FROM self_directives WHERE id = ?");
+        const row = (companionId ? findStmt.get(id, companionId) : findStmt.get(id));
+        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 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 = ?");
+                supersedeStmt.run(supersededId, effectiveCompanionId);
+            }
+            else {
+                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'");
+            stmt.run(id, companionId);
+        }
+        else {
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'ACTIVE' WHERE id = ? AND status = 'PENDING'");
+            stmt.run(id);
+        }
+    }
+    rejectDirective(id, companionId) {
+        const findStmt = companionId
+            ? this.db.prepare("SELECT id, companion_id, status FROM self_directives WHERE id = ? AND companion_id = ?")
+            : this.db.prepare("SELECT id, companion_id, status FROM self_directives WHERE id = ?");
+        const row = (companionId ? findStmt.get(id, companionId) : findStmt.get(id));
+        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 (companionId) {
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REJECTED' WHERE id = ? AND companion_id = ? AND status = 'PENDING'");
+            stmt.run(id, companionId);
+        }
+        else {
+            const stmt = this.db.prepare("UPDATE self_directives SET status = 'REJECTED' WHERE id = ? AND 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 = ?");
+            stmt.run(id, companionId);
+        }
+        else {
+            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 = ?");
+            stmt.run(id, companionId);
+        }
+        else {
+            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 = ?");
+            stmt.run(id, companionId);
+        }
+        else {
+            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 = ?');
@@ -380,33 +491,116 @@ class SiduriDatabase {
             payload: JSON.parse(row.payload)
         }));
     }
+    getEvent(id) {
+        const stmt = this.db.prepare('SELECT * FROM memory_events WHERE id = ?');
+        const row = stmt.get(id);
+        if (!row)
+            return undefined;
+        return {
+            id: row.id,
+            companionId: row.companion_id,
+            sourceType: row.source_type,
+            occurredAt: row.occurred_at,
+            payload: JSON.parse(row.payload)
+        };
+    }
     proposeClaim(claim) {
         const id = claim.id || crypto.randomUUID();
         const 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)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, coalesce(?, datetime('now')))
+      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, claim.confidence ?? 1.0, claim.validFrom || null, claim.validUntil || null, claim.evidence ? JSON.stringify(claim.evidence) : null, claim.assertedAt || null);
+        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);
         return {
             ...claim,
             id,
-            status
+            status,
+            confidence,
+            assertedAt,
+            supersedes: claim.supersedes,
+            sourceEventId: claim.sourceEventId,
         };
     }
-    approveClaim(id) {
-        const stmt = this.db.prepare("UPDATE memory_claims SET status = 'APPROVED' WHERE id = ?");
-        stmt.run(id);
+    approveClaim(id, companionId) {
+        const findClaim = companionId
+            ? this.db.prepare("SELECT id, status, supersedes FROM memory_claims WHERE id = ? AND companion_id = ?")
+            : this.db.prepare("SELECT id, status, supersedes FROM memory_claims WHERE id = ?");
+        const row = (companionId ? findClaim.get(id, companionId) : findClaim.get(id));
+        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 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 = ?");
+                supersedeStmt.run(supersededId, companionId);
+            }
+            else {
+                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'");
+            stmt.run(id, companionId);
+        }
+        else {
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'APPROVED' WHERE id = ? AND status = 'PENDING'");
+            stmt.run(id);
+        }
     }
-    rejectClaim(id) {
-        const stmt = this.db.prepare("UPDATE memory_claims SET status = 'REJECTED' WHERE id = ?");
-        stmt.run(id);
+    rejectClaim(id, companionId) {
+        if (companionId) {
+            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 = ?");
+            stmt.run(id);
+        }
+    }
+    revokeClaim(id, companionId) {
+        if (companionId) {
+            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 = ?");
+            stmt.run(id);
+        }
+    }
+    expireClaim(id, companionId) {
+        if (companionId) {
+            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 = ?");
+            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 = ?");
+            stmt.run(id, companionId);
+        }
+        else {
+            const stmt = this.db.prepare("UPDATE memory_claims SET status = 'SESSION_ONLY' WHERE id = ?");
+            stmt.run(id);
+        }
     }
     searchClaims(companionId, query, limit = 20) {
         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 memory_search MATCH ?
+      WHERE c.companion_id = ? AND c.status = 'APPROVED' AND memory_search MATCH ?
       ORDER BY rank
       LIMIT ?
     `);
@@ -421,7 +615,27 @@ class SiduriDatabase {
             validFrom: row.valid_from || undefined,
             validUntil: row.valid_until || undefined,
             evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at
+            assertedAt: row.asserted_at,
+            supersedes: row.supersedes || undefined,
+            sourceEventId: row.source_event_id || undefined,
+        }));
+    }
+    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,
         }));
     }
     getApprovedClaims(companionId, limit = 50) {
@@ -437,8 +651,37 @@ class SiduriDatabase {
             validFrom: row.valid_from || undefined,
             validUntil: row.valid_until || undefined,
             evidence: row.evidence ? JSON.parse(row.evidence) : undefined,
-            assertedAt: row.asserted_at
+            assertedAt: row.asserted_at,
+            supersedes: row.supersedes || undefined,
+            sourceEventId: row.source_event_id || undefined,
         }));
     }
+    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,
+        };
+    }
+    resetMemory(companionId) {
+        const deleteClaims = this.db.prepare("DELETE FROM memory_claims WHERE companion_id = ?");
+        deleteClaims.run(companionId);
+        const deleteEvents = this.db.prepare("DELETE FROM memory_events WHERE companion_id = ?");
+        deleteEvents.run(companionId);
+    }
 }
 exports.SiduriDatabase = SiduriDatabase;