@siduri-x/api 1.0.5 → 2.0.2

package/package.json

@@ -1,36 +1,40 @@
 {
   "name": "@siduri-x/api",
-  "version": "1.0.5",
+  "version": "2.0.2",
   "publishConfig": {
     "access": "public"
   },
   "main": "dist/index.js",
+  "engines": {
+    "node": ">=22.16.0"
+  },
   "dependencies": {
-    "cors": "^2.8.5",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
-    "@siduri-x/behavior": "1.0.6",
-    "@siduri-x/body": "1.0.4",
-    "@siduri-x/brain": "1.0.5",
-    "@siduri-x/core": "1.0.9",
-    "@siduri-x/ear": "1.0.3",
-    "@siduri-x/hands": "1.0.4",
-    "@siduri-x/knowledge": "1.0.2",
-    "@siduri-x/memory": "1.0.7",
-    "@siduri-x/observation": "1.0.3",
-    "@siduri-x/vision": "1.0.2",
-    "@siduri-x/voice": "1.0.6",
-    "@siduri-x/mouth": "1.0.0"
+    "cors": "^2.8.6",
+    "dotenv": "^17.4.2",
+    "express": "^5.2.1",
+    "@siduri-x/body": "2.0.1",
+    "@siduri-x/brain": "2.0.1",
+    "@siduri-x/core": "2.0.2",
+    "@siduri-x/ear": "2.0.1",
+    "@siduri-x/eknowledge": "2.0.1",
+    "@siduri-x/hands": "2.0.1",
+    "@siduri-x/knowledge": "2.0.1",
+    "@siduri-x/memory": "2.0.1",
+    "@siduri-x/mouth": "2.0.1",
+    "@siduri-x/observation": "2.0.1",
+    "@siduri-x/self": "2.0.1",
+    "@siduri-x/vision": "2.0.1",
+    "@siduri-x/voice": "2.0.1"
   },
   "devDependencies": {
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/jest": "^29.5.14",
-    "@types/supertest": "^6.0.2",
-    "jest": "^29.7.0",
-    "supertest": "^6.3.4",
+    "@types/cors": "^2.8.19",
+    "@types/express": "^5.0.6",
+    "@types/jest": "^30.0.0",
+    "@types/supertest": "^7.2.1",
+    "jest": "^30.5.1",
+    "supertest": "^7.2.2",
     "ts-jest": "^29.4.12",
-    "typescript": "^5.3.3"
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "build": "tsc",

package/src/app.ts

@@ -2,49 +2,25 @@ import express, { Express } from 'express';
 import cors from 'cors';
 import { createCorsOptions } from './cors';
 import { SiduriRuntime, dispatchCompanionChat } from './runtime';
-import { OpenAICompatibleBrain, OpenRouterBrain } from '@siduri-x/brain';
-import { PostgresMemoryOrgan } from '@siduri-x/memory';
-import { VoiceAdapter, VoiceConfig } from '@siduri-x/voice';
-import { EKnowledgeAdapter, EKnowledgeConfig } from '@siduri-x/knowledge';
-import { OpenRouterVisionAdapter, OpenRouterVisionConfig } from '@siduri-x/vision';
-import { ActiveSelfCompiler } from '@siduri-x/behavior';
-import { Live2DAdapter, Live2DAdapterConfig } from '@siduri-x/body';
+import { SelfPackageParser, SqliteSelfRepository, scanDirective } from '@siduri-x/self';
 import { FixtureObservationOrgan } from '@siduri-x/observation';
-import { DefaultHandsOrgan, DefaultHandsOrganConfig } from '@siduri-x/hands';
-import { DefaultEarOrgan, EarOrganConfig } from '@siduri-x/ear';
-import { DefaultMouthOrgan, DefaultMouthOrganConfig } from '@siduri-x/mouth';
-import { attachIdentity, requireAuth, Identity } from './auth';
+import { attachIdentity, requireAuth, Identity, isLocalRequest } from './auth';
 import { mapRequestContext } from './context-mapper';
-
-export interface AppBrainConfig {
-  provider?: 'openrouter' | 'openai-compatible' | string;
-  model?: string;
-  apiKey?: string;
-  apiKeyEnv?: string;
-  baseUrl?: string;
-  timeoutMs?: number;
-  [key: string]: unknown;
-}
-
-export interface AppBehaviorConfig {
-  provider?: 'active_self' | 'none' | string;
-  preset?: string;
-  [key: string]: unknown;
-}
-
-export interface AppBootCompanionConfig {
-  name: string;
-  brain?: AppBrainConfig;
-  voice?: VoiceConfig;
-  knowledge?: EKnowledgeConfig;
-  vision?: OpenRouterVisionConfig;
-  behavior?: AppBehaviorConfig;
-  body?: Live2DAdapterConfig;
-  hands?: DefaultHandsOrganConfig;
-  ear?: EarOrganConfig;
-  mouth?: DefaultMouthOrganConfig;
-  [key: string]: unknown;
-}
+import {
+  bootCompanion,
+  AppBrainConfig,
+  AppBehaviorConfig,
+  AppBootCompanionConfig,
+  BootCompanionOptions,
+} from './boot';
+
+export {
+  AppBrainConfig,
+  AppBehaviorConfig,
+  AppBootCompanionConfig,
+  BootCompanionOptions,
+  bootCompanion,
+};
 
 export interface AppInstance {
   app: Express;
@@ -59,77 +35,6 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
 
   let observationOrgan: FixtureObservationOrgan | undefined;
 
-  function createBrain(config?: AppBrainConfig) {
-    const provider = config?.provider || 'openrouter';
-    const defaultKeyEnv = provider === 'openai-compatible' ? 'OPENAI_COMPATIBLE_API_KEY' : 'OPENROUTER_API_KEY';
-    const apiKey = config?.apiKey || process.env[config?.apiKeyEnv || defaultKeyEnv] || '';
-    if (provider === 'openai-compatible') {
-      return new OpenAICompatibleBrain({
-        apiKey,
-        model: config?.model || 'local-model',
-        baseUrl: config?.baseUrl || 'http://127.0.0.1:1234/v1',
-      });
-    }
-    return new OpenRouterBrain({ apiKey, model: config?.model || 'gpt-4o-mini' });
-  }
-
-  function isDisabled(config?: { provider?: string }): boolean {
-    return !config || config.provider === 'none';
-  }
-
-  function createVoice(config?: VoiceConfig) {
-    return isDisabled(config)
-      ? undefined
-      : new VoiceAdapter({
-          provider: (config?.provider as any) || 'voicevox',
-          baseUrl: config?.baseUrl || process.env.VOICEVOX_URL || 'http://localhost:50021',
-          speakerId: config?.speakerId || 1,
-          ...config,
-        });
-  }
-
-  function createKnowledge(config?: EKnowledgeConfig) {
-    return isDisabled(config) ? undefined : new EKnowledgeAdapter(config || {});
-  }
-
-  function createVision(config?: OpenRouterVisionConfig & { provider?: string }) {
-    return isDisabled(config)
-      ? undefined
-      : new OpenRouterVisionAdapter({
-          apiKey: config?.apiKey || process.env.OPENROUTER_API_KEY || '',
-          model: config?.model || 'gpt-4-vision',
-          ...config,
-        });
-  }
-
-  function createBehavior(config?: AppBehaviorConfig) {
-    return isDisabled(config) ? undefined : new ActiveSelfCompiler();
-  }
-
-  function createBody(config?: Live2DAdapterConfig & { provider?: string }) {
-    return isDisabled(config)
-      ? undefined
-      : new Live2DAdapter(config);
-  }
-
-  function createHands(config?: DefaultHandsOrganConfig & { provider?: string }) {
-    return isDisabled(config)
-      ? new DefaultHandsOrgan()
-      : new DefaultHandsOrgan(config);
-  }
-
-  function createEar(config?: EarOrganConfig & { provider?: string }) {
-    return isDisabled(config)
-      ? new DefaultEarOrgan()
-      : new DefaultEarOrgan(config);
-  }
-
-  function createMouth(config?: DefaultMouthOrganConfig & { provider?: string }, voice?: any) {
-    return isDisabled(config)
-      ? new DefaultMouthOrgan({ voice })
-      : new DefaultMouthOrgan({ ...config, voice });
-  }
-
   app.post('/boot', requireAuth, async (req, res) => {
     try {
       const { id, config } = req.body;
@@ -137,32 +42,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
         return res.status(400).json({ error: "Already booted" });
       }
 
-      const brain = createBrain(config.brain);
-      const memory = new PostgresMemoryOrgan({ connectionString: process.env.DATABASE_URL || 'postgresql://postgres:postgres@localhost:5432/siduri' });
-      const voice = createVoice(config.voice);
-      const knowledge = createKnowledge(config.knowledge);
-      const vision = createVision(config.vision);
-      const behavior = createBehavior(config.behavior);
-      const body = createBody(config.body);
-      const hands = createHands(config.hands);
-      const ear = createEar(config.ear);
-      const mouth = createMouth(config.mouth, voice);
-
-      const runtime = new SiduriRuntime(id, config, {
-        brain,
-        memory,
-        voice,
-        knowledge,
-        vision,
-        behavior,
-        body,
-        hands,
-        ear,
-        mouth,
-        observation: observationOrgan,
-      });
-      await runtime.initialize();
-
+      const runtime = await bootCompanion(id, config, { observationOrgan });
       runtimes.set(id, runtime);
 
       res.json({ success: true, id });
@@ -211,17 +91,90 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
   });
   app.put('/me', requireAuth, (req, res) => res.json({ success: true }));
 
+  // TEACH MODE ENDPOINTS
+  app.post('/teach/upload-self', requireAuth, async (req, res) => {
+    try {
+      const { content } = req.body;
+      if (!content) return res.status(400).json({ error: "Missing content" });
+      const parsed = SelfPackageParser.parse(content);
+      res.json(parsed);
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
+  app.post('/teach/install-self', requireAuth, async (req, res) => {
+    try {
+      const { companionId, manifest, approvedDirectiveIds } = req.body;
+      if (!companionId || !manifest || !Array.isArray(approvedDirectiveIds)) {
+        return res.status(400).json({ error: "Missing required fields" });
+      }
+
+      if (!manifest.identity || !manifest.identity.name) {
+        return res.status(400).json({ error: "Invalid manifest: missing identity.name" });
+      }
+
+      const directivesToCommit = manifest.directives?.filter((d: any) => approvedDirectiveIds.includes(d.id)) || [];
+      for (const d of directivesToCommit) {
+        if (!d || typeof d.directive !== 'string') {
+          return res.status(400).json({ error: "Invalid directive entry: missing directive string" });
+        }
+        const scan = scanDirective(d.directive);
+        if (!scan.safe) {
+          return res.status(400).json({
+            error: `Safety check failed for directive: ${scan.reason}`,
+            directiveId: d.id,
+            reason: scan.reason,
+          });
+        }
+      }
+
+      const repo = new SqliteSelfRepository({ dbPath: process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
+
+      try {
+        await repo.setIdentity({
+          companionId,
+          name: manifest.identity.name,
+          archetype: manifest.identity.archetype,
+          version: manifest.version || '1.0.0',
+          updatedAt: new Date().toISOString(),
+        });
+
+        if (manifest.personality) {
+          await repo.setPersonality(companionId, manifest.personality);
+        }
+
+        if (directivesToCommit.length > 0) {
+          await repo.commitDirectives(companionId, directivesToCommit);
+        }
+      } finally {
+        repo.close();
+      }
+
+      res.json({ success: true });
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
   // CHAT (API context boundary validation)
   app.post('/chat', attachIdentity, async (req, res) => {
     const { id, message, history } = req.body;
     const identity = (req as any).identity as Identity;
+    const local = isLocalRequest(req);
+    const hasConfiguredToken = Boolean(process.env.AUTH_TOKEN || process.env.OPERATOR_TOKEN || process.env.OWNER_TOKEN);
+    const isLocalDirectOwner = local && !hasConfiguredToken;
 
-    // Single-owner companion model: map request context directly
+    const authenticated = identity?.authenticated || isLocalDirectOwner;
+    const serverRole = identity?.authenticated ? identity.role : (isLocalDirectOwner ? 'OWNER' : 'VIEWER');
+
+    // Single-owner companion model: map request context directly with server identity enforcement
     const mappingResult = mapRequestContext({
       ...req.body,
       id: id || req.body.companionId,
-      authenticated: identity?.authenticated ?? true,
-      source: identity?.source ?? 'local',
+      authenticated,
+      serverRole,
+      source: identity?.source ?? (local ? 'local' : 'external'),
       generateCorrelationId: true,
     });
 
@@ -255,12 +208,19 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
   app.post('/chat/stream', attachIdentity, async (req, res) => {
     const { id, message, history } = req.body;
     const identity = (req as any).identity as Identity;
+    const local = isLocalRequest(req);
+    const hasConfiguredToken = Boolean(process.env.AUTH_TOKEN || process.env.OPERATOR_TOKEN || process.env.OWNER_TOKEN);
+    const isLocalDirectOwner = local && !hasConfiguredToken;
+
+    const authenticated = identity?.authenticated || isLocalDirectOwner;
+    const serverRole = identity?.authenticated ? identity.role : (isLocalDirectOwner ? 'OWNER' : 'VIEWER');
 
     const mappingResult = mapRequestContext({
       ...req.body,
       id: id || req.body.companionId,
-      authenticated: identity?.authenticated ?? true,
-      source: identity?.source ?? 'local',
+      authenticated,
+      serverRole,
+      source: identity?.source ?? (local ? 'local' : 'external'),
       generateCorrelationId: true,
     });
 
@@ -283,8 +243,8 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     const abortController = new AbortController();
     const onClose = () => {
       abortController.abort('client_disconnect');
-      if (typeof runtime.interruptMouth === 'function') {
-        runtime.interruptMouth('client_disconnect');
+      if (runtime.mouth && typeof runtime.mouth.interrupt === 'function') {
+        runtime.mouth.interrupt('client_disconnect');
       }
     };
     req.on('close', onClose);
@@ -309,7 +269,9 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
         res.write(`event: avatar\ndata: ${JSON.stringify(avatarEvent)}\n\n`);
       }
 
-      const speechText = response.delivery?.text || response.response?.subtitle_en || response.response?.spoken_ja || '';
+      const maxStreamLen = Number(process.env.SIDURI_MAX_RESPONSE_CHARS || 8000);
+      const rawSpeechText = response.delivery?.text || response.response?.subtitle_en || response.response?.spoken_ja || '';
+      const speechText = rawSpeechText.slice(0, maxStreamLen);
       const utterance = {
         utteranceId: response.response_id || 'utt-stream',
         companionId,
@@ -355,12 +317,16 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     const reason = req.body?.reason || 'user_barge_in';
 
     if (runtime) {
-      runtime.interruptMouth(reason);
+      if (runtime.mouth && typeof runtime.mouth.interrupt === 'function') {
+        runtime.mouth.interrupt(reason);
+      }
       return res.json({ success: true, interrupted: true, companionId, reason });
     }
 
     for (const r of runtimes.values()) {
-      r.interruptMouth(reason);
+      if (r.mouth && typeof r.mouth.interrupt === 'function') {
+        r.mouth.interrupt(reason);
+      }
     }
     return res.json({ success: true, interrupted: true, reason });
   });
@@ -371,12 +337,16 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     const reason = req.body?.reason || 'user_barge_in';
 
     if (runtime) {
-      runtime.interruptMouth(reason);
+      if (runtime.mouth && typeof runtime.mouth.interrupt === 'function') {
+        runtime.mouth.interrupt(reason);
+      }
       return res.json({ success: true, interrupted: true, companionId, reason });
     }
 
     for (const r of runtimes.values()) {
-      r.interruptMouth(reason);
+      if (r.mouth && typeof r.mouth.interrupt === 'function') {
+        r.mouth.interrupt(reason);
+      }
     }
     return res.json({ success: true, interrupted: true, reason });
   });
@@ -388,7 +358,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.json({ proposals: [] });
     try {
-      const proposals = await runtime.getPendingClaims();
+      const proposals = await runtime.memory.getPendingClaims();
       res.json({ proposals });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -401,7 +371,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.json({ items: [] });
     try {
-      const items = await runtime.getClaims();
+      const items = await runtime.memory.getClaims();
       res.json({ items });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -414,7 +384,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.json({ claims: [] });
     try {
-      const claims = await runtime.getClaims();
+      const claims = await runtime.memory.getClaims();
       res.json({ claims });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -427,13 +397,96 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.json({ directives: [] });
     try {
-      const directives = await runtime.getDirectives();
+      const directives = await runtime.memory.getDirectives();
       res.json({ directives });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
     }
   });
 
+  // KNOWLEDGE / LIFE DB GETTERS
+  app.get('/knowledge/life', requireAuth, async (req, res) => {
+    const id = req.query.id as string || Array.from(runtimes.keys())[0];
+    const runtime = runtimes.get(id);
+    if (!runtime) return res.status(404).json({ error: "Companion not found" });
+    const query = (req.query.q as string) || '';
+    if (!runtime.knowledge || typeof (runtime.knowledge as any).queryLifeContext !== 'function') {
+      return res.json({ matchedInventory: [], recentFinances: [], upcomingSchedule: [], preferences: [], formattedContext: '' });
+    }
+    try {
+      const result = await (runtime.knowledge as any).queryLifeContext(id, query);
+      res.json(result);
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
+  app.get('/knowledge/inventory', requireAuth, async (req, res) => {
+    const id = req.query.id as string || Array.from(runtimes.keys())[0];
+    const runtime = runtimes.get(id);
+    if (!runtime) return res.status(404).json({ error: "Companion not found" });
+    const domain = req.query.domain as string | undefined;
+    if (!runtime.knowledge || !(runtime.knowledge as any).inventory) {
+      return res.json({ items: [] });
+    }
+    try {
+      const items = await (runtime.knowledge as any).inventory.getItems(id, domain);
+      res.json({ items });
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
+  app.get('/knowledge/finance', requireAuth, async (req, res) => {
+    const id = req.query.id as string || Array.from(runtimes.keys())[0];
+    const runtime = runtimes.get(id);
+    if (!runtime) return res.status(404).json({ error: "Companion not found" });
+    if (!runtime.knowledge || !(runtime.knowledge as any).finance) {
+      return res.json({ summary: null, entries: [] });
+    }
+    try {
+      const limit = Number(req.query.limit || 20);
+      const [summary, entries] = await Promise.all([
+        (runtime.knowledge as any).finance.getSummary(id),
+        (runtime.knowledge as any).finance.getEntries(id, limit),
+      ]);
+      res.json({ summary, entries });
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
+  app.get('/knowledge/schedule', requireAuth, async (req, res) => {
+    const id = req.query.id as string || Array.from(runtimes.keys())[0];
+    const runtime = runtimes.get(id);
+    if (!runtime) return res.status(404).json({ error: "Companion not found" });
+    if (!runtime.knowledge || !(runtime.knowledge as any).schedule) {
+      return res.json({ items: [] });
+    }
+    try {
+      const items = await (runtime.knowledge as any).schedule.getUpcoming(id);
+      res.json({ items });
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
+  app.get('/knowledge/preferences', requireAuth, async (req, res) => {
+    const id = req.query.id as string || Array.from(runtimes.keys())[0];
+    const runtime = runtimes.get(id);
+    if (!runtime) return res.status(404).json({ error: "Companion not found" });
+    const category = req.query.category as string | undefined;
+    if (!runtime.knowledge || !(runtime.knowledge as any).preferences) {
+      return res.json({ preferences: [] });
+    }
+    try {
+      const preferences = await (runtime.knowledge as any).preferences.getPreferences(id, category);
+      res.json({ preferences });
+    } catch (e: any) {
+      res.status(500).json({ error: e.message });
+    }
+  });
+
   // MEMORY MUTATIONS - PROPOSALS
   app.post('/memory/proposals/update', requireAuth, async (req, res) => {
     const id = req.body.companionId as string || Array.from(runtimes.keys())[0];
@@ -447,7 +500,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
       if (!claimId) {
         return res.status(400).json({ error: "Missing required claim id" });
       }
-      const updated = await runtime.updateClaim(claimId, req.body.updates || req.body);
+      const updated = await runtime.memory.updateClaim(claimId, req.body.updates || req.body);
       res.json({ success: true, claim: updated });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -460,7 +513,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.approveClaim(req.body.id);
+      await runtime.memory.approveClaim(req.body.id);
       res.json({ approved: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -473,7 +526,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.rejectClaim(req.body.id);
+      await runtime.memory.rejectClaim(req.body.id);
       res.json({ rejected: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -487,7 +540,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.approveDirective(req.body.id);
+      await runtime.memory.approveDirective(req.body.id);
       res.json({ approved: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -500,7 +553,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.rejectDirective(req.body.id);
+      await runtime.memory.rejectDirective(req.body.id);
       res.json({ rejected: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -513,7 +566,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.revokeDirective(req.body.id);
+      await runtime.memory.revokeDirective(req.body.id);
       res.json({ revoked: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -526,7 +579,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
     if (!runtime) return res.status(404).json({ error: "Companion not found" });
     if (!runtime.memory) return res.status(400).json({ error: "Memory organ not configured" });
     try {
-      await runtime.disableDirective(req.body.id);
+      await runtime.memory.disableDirective(req.body.id);
       res.json({ disabled: true });
     } catch (e: any) {
       res.status(500).json({ error: e.message });
@@ -543,7 +596,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
         return res.status(400).json({ error: "Memory organ does not support reset" });
       }
       try {
-        await runtime.resetMemory();
+        await runtime.memory.resetMemory();
         res.json({ reset: true });
       } catch (e: any) {
         res.status(500).json({ error: e.message });
@@ -554,7 +607,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
       const companionId = req.body?.companionId || Array.from(runtimes.keys())[0] || 'default';
       const runtime = runtimes.get(companionId);
       if (!runtime) return res.status(404).json({ accepted: false, error: 'Companion not found' });
-      const staged = runtime.stageResponse({
+      const staged = runtime.gating.stageResponse({
         requestContext: {
           companionId,
           actor: {
@@ -590,12 +643,12 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
       let correlationId = req.body?.correlation_id;
 
       if (!responseId && correlationId) {
-        const found = runtime.findStagedPlanByCorrelation(companionId, correlationId);
+        const found = runtime.gating.findStagedPlanByCorrelation(companionId, correlationId);
         if (found) {
           responseId = found.responseId;
         }
       } else if (responseId && !correlationId) {
-        const found = runtime.getStagedPlan(responseId);
+        const found = runtime.gating.getStagedPlan(responseId);
         if (found) {
           correlationId = found.correlationId;
         }
@@ -605,7 +658,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
         return res.status(400).json({ approved: false, error: 'UNKNOWN_APPROVAL_ID' });
       }
 
-      const result = runtime.approveResponse({
+      const result = runtime.gating.approveResponse({
         responseId,
         companionId,
         correlationId: correlationId || '',
@@ -616,7 +669,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
       }
 
       // Now evaluated as approved
-      const evaluation = runtime.evaluateGate(result.plan!);
+      const evaluation = runtime.gating.evaluateGate(result.plan!);
       res.json({
         approved: true,
         status: evaluation.disposition,
@@ -635,12 +688,12 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
       let correlationId = req.body?.correlation_id;
 
       if (!responseId && correlationId) {
-        const found = runtime.findStagedPlanByCorrelation(companionId, correlationId);
+        const found = runtime.gating.findStagedPlanByCorrelation(companionId, correlationId);
         if (found) {
           responseId = found.responseId;
         }
       } else if (responseId && !correlationId) {
-        const found = runtime.getStagedPlan(responseId);
+        const found = runtime.gating.getStagedPlan(responseId);
         if (found) {
           correlationId = found.correlationId;
         }
@@ -650,7 +703,7 @@ export function createApp(runtimes: Map<string, SiduriRuntime> = new Map()): App
         return res.status(400).json({ rejected: false, error: 'UNKNOWN_APPROVAL_ID' });
       }
 
-      const result = runtime.rejectResponse({
+      const result = runtime.gating.rejectResponse({
         responseId,
         companionId,
         correlationId: correlationId || '',