@siduri-x/core 2.0.4 → 2.0.6

package/dist/siduri-db.js

@@ -26,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,
@@ -58,6 +59,8 @@ class SiduriDatabase {
         companion_id TEXT NOT NULL,
         entity_id TEXT NOT NULL,
         entity_type TEXT NOT NULL DEFAULT 'human',
+        name TEXT,
+        affiliation TEXT,
         role TEXT DEFAULT 'user',
         stance TEXT DEFAULT 'neutral',
         trust_score REAL DEFAULT 0.5,
@@ -215,6 +218,24 @@ class SiduriDatabase {
         catch {
             // Column already exists
         }
+        try {
+            this.db.exec("ALTER TABLE self_identity ADD COLUMN role TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_relationships ADD COLUMN name TEXT");
+        }
+        catch {
+            // Column already exists
+        }
+        try {
+            this.db.exec("ALTER TABLE self_relationships ADD COLUMN affiliation TEXT");
+        }
+        catch {
+            // Column already exists
+        }
     }
     close() {
         this.db.close();
@@ -231,6 +252,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,
@@ -238,18 +260,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 = ?');
@@ -311,6 +336,14 @@ class SiduriDatabase {
         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, normalizeStatus(directive.status, 'active'), directive.category || 'behavioral', directive.scopeActor || null, directive.supersedesId || null, directive.createdAt || new Date().toISOString());
     }
@@ -332,6 +365,9 @@ class SiduriDatabase {
             return;
         }
         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
@@ -407,14 +443,18 @@ class SiduriDatabase {
         }
     }
     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 {
             companionId: row.companion_id,
             entityId: row.entity_id,
             entityType: row.entity_type || 'human',
+            name: row.name || undefined,
+            affiliation: row.affiliation || undefined,
             role: row.role || 'user',
             stance: row.stance || 'neutral',
             trustScore: row.trust_score !== undefined && row.trust_score !== null ? row.trust_score : 0.5,
@@ -429,6 +469,8 @@ class SiduriDatabase {
             companionId: row.companion_id,
             entityId: row.entity_id,
             entityType: row.entity_type || 'human',
+            name: row.name || undefined,
+            affiliation: row.affiliation || undefined,
             role: row.role || 'user',
             stance: row.stance || 'neutral',
             trustScore: row.trust_score !== undefined && row.trust_score !== null ? row.trust_score : 0.5,
@@ -439,18 +481,20 @@ class SiduriDatabase {
     }
     upsertRelationship(rel) {
         const stmt = this.db.prepare(`
-      INSERT INTO self_relationships (companion_id, entity_id, entity_type, role, stance, trust_score, familiarity, interaction_conventions, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, datetime('now'))
+      INSERT INTO self_relationships (companion_id, entity_id, entity_type, name, affiliation, 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,
+        name = COALESCE(excluded.name, self_relationships.name),
+        affiliation = COALESCE(excluded.affiliation, self_relationships.affiliation),
+        role = COALESCE(excluded.role, self_relationships.role),
+        stance = COALESCE(excluded.stance, self_relationships.stance),
         trust_score = excluded.trust_score,
         familiarity = excluded.familiarity,
         interaction_conventions = excluded.interaction_conventions,
         updated_at = datetime('now')
     `);
-        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 || []));
+        stmt.run(rel.companionId, rel.entityId, rel.entityType || 'human', rel.name || null, rel.affiliation || null, 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');
@@ -636,7 +680,7 @@ class SiduriDatabase {
       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,
@@ -656,6 +700,9 @@ class SiduriDatabase {
             return;
         }
         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
@@ -678,6 +725,120 @@ class SiduriDatabase {
             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, name, or affiliation
+        if (claim.claimType === 'relationship' ||
+            predicate === 'stated_relationship' ||
+            predicate === 'relationship' ||
+            predicate === 'relationship_to_siduri' ||
+            (predicate === 'name' && (subject.startsWith('actor:') || subject === 'user' || subject === 'primary_user')) ||
+            predicate === 'preferred_address' ||
+            predicate === 'affiliation') {
+            const rawSubject = (claim.subject || 'actor:user').replace(/^actor:actor:/, 'actor:');
+            const isCreator = value.toLowerCase() === 'creator';
+            const isName = predicate === 'name' || predicate === 'preferred_address';
+            const isAffil = predicate === 'affiliation';
+            const existingRel = this.getRelationship(companionId, rawSubject);
+            const role = isCreator ? value : (existingRel?.role || (isName || isAffil ? existingRel?.role : value));
+            const name = isName ? value : existingRel?.name;
+            const affiliation = isAffil ? value : existingRel?.affiliation;
+            const stance = isCreator ? 'familiar_loyal' : (existingRel?.stance || 'neutral');
+            const trustScore = isCreator ? 1.0 : (existingRel?.trustScore ?? 0.8);
+            const familiarity = isCreator ? 0.9 : (existingRel?.familiarity ?? 0.5);
+            const interactionConventions = isCreator
+                ? Array.from(new Set([...(existingRel?.interactionConventions || []), 'Direct communication', 'Highest administrative trust']))
+                : (existingRel?.interactionConventions || []);
+            this.upsertRelationship({
+                companionId,
+                entityId: rawSubject,
+                entityType: 'human',
+                name,
+                affiliation,
+                role,
+                stance,
+                trustScore,
+                familiarity,
+                interactionConventions,
+            });
+            if (isName) {
+                this.commitDirective({
+                    id: `dir-name-${claim.id || Date.now()}`,
+                    companionId,
+                    priority: 75,
+                    directive: `Address ${rawSubject} as ${value}`,
+                    status: 'active',
+                    category: 'relational',
+                    createdAt: new Date().toISOString(),
+                });
+            }
+            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) {

package/dist/siduri-db.test.js

@@ -730,7 +730,8 @@ describe('SiduriDatabase', () => {
                 status: 'active',
                 category: 'behavioral',
             });
-            expect(() => db.approveDirective('dir-active-1')).toThrow(/invalid transition from status 'active' to 'active'/i);
+            // Approving an already-active directive is now idempotent (no-op, does not throw)
+            expect(() => db.approveDirective('dir-active-1')).not.toThrow();
             // 3. Rejecting an already ACTIVE directive throws
             expect(() => db.rejectDirective('dir-active-1')).toThrow(/invalid transition from status 'active' to 'rejected'/i);
         });

package/dist/teaching.d.ts

@@ -4,12 +4,11 @@ export interface ExtractedTeaching {
     behaviorProposals: BehaviorProposal[];
 }
 /**
- * Deterministically extracts teaching candidates from user messages according to single-owner model.
+ * Deterministic teaching extraction placeholder.
  *
- * Rules:
- * - Scoped to the requesting actor context (subject: `actor:${actorId}`), NEVER `primary_user`.
- * - Candidates are pending proposals only, never active/approved.
- * - In a single-owner companion, preferences apply across the companion instance without audience partitioning.
- * - Companion identity is isolated.
+ * In Siduri-X, conversational memory and behavioral proposals are generated
+ * directly by the Brain LLM via structured cognitive planning (e.g. `submitResponsePlan`).
+ * Deterministic regex matching has been removed in favor of pure LLM comprehension,
+ * as all candidates are quarantined in 'pending' status until explicitly approved by the user.
  */
-export declare function extractDeterministicTeaching(message: string, context?: RequestContext, sourceEventId?: string): ExtractedTeaching;
+export declare function extractDeterministicTeaching(_message: string, _context?: RequestContext, _sourceEventId?: string): ExtractedTeaching;

package/dist/teaching.js

@@ -1,132 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractDeterministicTeaching = extractDeterministicTeaching;
-function cleanValue(value, limit = 160) {
-    return value.replace(/\s+/g, ' ').replace(/^[ .,!?:;"']+|[ .,!?:;"']+$/g, '').slice(0, limit);
-}
 /**
- * Deterministically extracts teaching candidates from user messages according to single-owner model.
+ * Deterministic teaching extraction placeholder.
  *
- * Rules:
- * - Scoped to the requesting actor context (subject: `actor:${actorId}`), NEVER `primary_user`.
- * - Candidates are pending proposals only, never active/approved.
- * - In a single-owner companion, preferences apply across the companion instance without audience partitioning.
- * - Companion identity is isolated.
+ * In Siduri-X, conversational memory and behavioral proposals are generated
+ * directly by the Brain LLM via structured cognitive planning (e.g. `submitResponsePlan`).
+ * Deterministic regex matching has been removed in favor of pure LLM comprehension,
+ * as all candidates are quarantined in 'pending' status until explicitly approved by the user.
  */
-function extractDeterministicTeaching(message, context, sourceEventId) {
-    const text = cleanValue(message, 1000);
-    const claims = [];
-    const behaviorProposals = [];
-    if (!text) {
-        return { claims, behaviorProposals };
-    }
-    const actorId = context?.actor?.actorId;
-    const actorSubject = actorId ? `actor:${actorId}` : 'actor:anonymous';
-    const companionId = context?.companionId || 'default';
-    const sensitivity = context?.conversation?.channel === 'public' ? 'public' : 'private';
-    // 1. Companion's Name: "your name is X" / "you are called X"
-    const companionNameMatch = text.match(/\b(?:your name is|you are called)\s+(.+?)(?=\s+and\s+(?:i\b|my\b|you\b)|[.;,]|$)/i);
-    if (companionNameMatch) {
-        const name = cleanValue(companionNameMatch[1], 80);
-        claims.push({
-            subject: `companion:${companionId}`,
-            predicate: 'name',
-            value: name,
-            content: `The companion's name is ${name}.`,
-            claimType: 'semantic',
-            provenance: 'deterministic_teaching',
-            sensitivity: 'public',
-            sourceEventId,
-        });
-        behaviorProposals.push({
-            directive: `Acknowledge configured name as ${name}`,
-            priority: 70,
-            subject: `companion:${companionId}`,
-            predicate: 'name',
-            value: name,
-            memoryClass: 'identity',
-            sourceEventId,
-        });
-    }
-    // 2. Actor's Name: "my name is X"
-    const myNameMatch = text.match(/\bmy name is\s+(.+?)(?=\s+and\s+(?:i\b|my\b|you\b)|[.;,]|$)/i);
-    if (myNameMatch && !/\b(?:private|public|everywhere)\b/i.test(text)) {
-        const name = cleanValue(myNameMatch[1], 80);
-        claims.push({
-            subject: actorSubject,
-            predicate: 'name',
-            value: name,
-            content: `The actor's name is ${name}.`,
-            claimType: 'preference',
-            provenance: 'deterministic_teaching',
-            sensitivity,
-            sourceEventId,
-        });
-    }
-    // 3. Preferred Address / Call me X: "call me X"
-    const callMeMatch = text.match(/\b(?:(?:from now on|only),?\s*)?call me\s+(.+?)(?:\s+(?:in private|privately|in public|publicly|everywhere|in direct conversations))?(?=\s+and\s+(?:i\b|my\b|you\b)|[.;,]|$)/i);
-    if (callMeMatch) {
-        const address = cleanValue(callMeMatch[1], 80);
-        const directiveInstruction = `Address ${actorSubject} as ${address}`;
-        claims.push({
-            subject: actorSubject,
-            predicate: 'preferred_address',
-            value: address,
-            content: `The actor's preferred address is ${address}.`,
-            claimType: 'relationship',
-            provenance: 'deterministic_teaching',
-            sensitivity,
-            sourceEventId,
-        });
-        behaviorProposals.push({
-            directive: directiveInstruction,
-            priority: 80,
-            subject: actorSubject,
-            predicate: 'preferred_address',
-            value: address,
-            memoryClass: 'behavioral',
-            sourceEventId,
-        });
-    }
-    // 4. Stated relationship: "I am your X" / "I'm your creator"
-    const relMatch = text.match(/\b(?:i am|i'm)\s+your\s+([A-Za-z0-9_\s-]+?)(?=\s+and\s+(?:i\b|my\b|you\b)|[.;,]|$)/i);
-    if (relMatch) {
-        const relationship = cleanValue(relMatch[1], 60);
-        claims.push({
-            subject: actorSubject,
-            predicate: 'stated_relationship',
-            value: relationship,
-            content: `The actor stated their relationship as ${relationship}.`,
-            claimType: 'relationship',
-            provenance: 'deterministic_teaching',
-            sensitivity: 'private',
-            sourceEventId,
-        });
-        behaviorProposals.push({
-            directive: `Recognize ${actorSubject} stated relationship as ${relationship}`,
-            priority: 75,
-            subject: actorSubject,
-            predicate: 'stated_relationship',
-            value: relationship,
-            memoryClass: 'relationship',
-            sourceEventId,
-        });
-    }
-    // 5. Explicit Domain / Preference fact: "my preferred X is Y" / "my X is Y"
-    const prefMatch = text.match(/\bmy\s+preferred\s+([A-Za-z0-9_]+)\s+is\s+(.+?)(?=\s+and\s+(?:i\b|my\b|you\b)|[.;,]|$)/i);
-    if (prefMatch) {
-        const predicate = cleanValue(prefMatch[1], 40);
-        const val = cleanValue(prefMatch[2], 100);
-        claims.push({
-            subject: actorSubject,
-            predicate: `preferred_${predicate}`,
-            value: val,
-            content: `The actor's preferred ${predicate} is ${val}.`,
-            claimType: 'preference',
-            provenance: 'deterministic_teaching',
-            sensitivity,
-            sourceEventId,
-        });
-    }
-    return { claims, behaviorProposals };
+function extractDeterministicTeaching(_message, _context, _sourceEventId) {
+    return { claims: [], behaviorProposals: [] };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siduri-x/core",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Core runtime types, evidence protocol, action dispatcher, capability validation, and SiduriRuntime protocol",
   "license": "Apache-2.0",
   "repository": {