@siduri-x/api 2.0.1 → 2.0.3

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @siduri-x/api@2.0.1 build /home/zagin/Projects/vxnus-studio/projects/siduri-x/apps/api
+> @siduri-x/api@2.0.3 build /home/zagin/Projects/vxnus-studio/projects/siduri-x/apps/api
 > tsc
 

package/.turbo/turbo-test.log

@@ -1,9 +1,9 @@
 
-> @siduri-x/api@2.0.1 test /home/zagin/Projects/vxnus-studio/projects/siduri-x/apps/api
+> @siduri-x/api@2.0.3 test /home/zagin/Projects/vxnus-studio/projects/siduri-x/apps/api
 > jest --config jest.config.json
 
-PASS src/context-mapper.test.ts (10.14 s)
-PASS src/runtime.test.ts (10.545 s)
+PASS src/context-mapper.test.ts (17.122 s)
+PASS src/runtime.test.ts (17.986 s)
   ● Console
 
     console.error
@@ -20,21 +20,24 @@ PASS src/runtime.test.ts (10.545 s)
       at ../../packages/core/dist/context-retriever.js:23:25
           at async Promise.all (index 0)
       at retrieveRuntimeContext (../../packages/core/dist/context-retriever.js:19:78)
-      at SiduriRuntime.processPerception (../../packages/core/dist/runtime.js:253:34)
+      at contextRetrievalStage (../../packages/core/dist/perception-pipeline.js:66:30)
+      at PerceptionPipeline.execute (../../packages/core/dist/perception-pipeline.js:21:34)
       at Object.<anonymous> (src/runtime.test.ts:74:22)
 
-PASS src/index.test.ts (10.888 s)
-PASS src/auth.test.ts
+PASS src/t5-experience.test.ts (19.901 s)
+PASS src/t4-gating.test.ts (19.152 s)
+PASS src/index.test.ts (19.326 s)
+PASS src/teach-mode.test.ts (20.058 s)
+PASS src/t7-release.test.ts
 PASS src/smoke.test.ts
-PASS src/t4-gating.test.ts (11.522 s)
+PASS src/auth.test.ts
+PASS src/t6-security.test.ts (19.898 s)
+PASS src/boot.test.ts
 PASS src/b0-b6.test.ts
-PASS src/t5-experience.test.ts (11.592 s)
-PASS src/t7-release.test.ts (11.335 s)
-PASS src/teach-mode.test.ts
-PASS src/t6-security.test.ts (12.22 s)
+PASS src/knowledge.test.ts
 
-Test Suites: 11 passed, 11 total
-Tests:       72 passed, 72 total
+Test Suites: 13 passed, 13 total
+Tests:       90 passed, 90 total
 Snapshots:   0 total
-Time:        15.203 s, estimated 16 s
+Time:        23.887 s
 Ran all test suites.

package/dist/app.d.ts

@@ -1,40 +1,8 @@
 import { Express } from 'express';
 import { SiduriRuntime } from './runtime';
-import { VoiceConfig } from '@siduri-x/voice';
-import { EKnowledgeConfig } from '@siduri-x/eknowledge';
-import { OpenRouterVisionConfig } from '@siduri-x/vision';
-import { Live2DAdapterConfig } from '@siduri-x/body';
 import { FixtureObservationOrgan } from '@siduri-x/observation';
-import { DefaultHandsOrganConfig } from '@siduri-x/hands';
-import { EarOrganConfig } from '@siduri-x/ear';
-import { DefaultMouthOrganConfig } from '@siduri-x/mouth';
-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;
     runtimes: Map<string, SiduriRuntime>;

package/dist/app.js

@@ -3,123 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bootCompanion = void 0;
 exports.createApp = createApp;
 const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const cors_2 = require("./cors");
 const runtime_1 = require("./runtime");
-const brain_1 = require("@siduri-x/brain");
-const memory_1 = require("@siduri-x/memory");
-const voice_1 = require("@siduri-x/voice");
-const eknowledge_1 = require("@siduri-x/eknowledge");
-const vision_1 = require("@siduri-x/vision");
 const self_1 = require("@siduri-x/self");
-const body_1 = require("@siduri-x/body");
-const hands_1 = require("@siduri-x/hands");
-const ear_1 = require("@siduri-x/ear");
-const mouth_1 = require("@siduri-x/mouth");
 const auth_1 = require("./auth");
 const context_mapper_1 = require("./context-mapper");
+const boot_1 = require("./boot");
+Object.defineProperty(exports, "bootCompanion", { enumerable: true, get: function () { return boot_1.bootCompanion; } });
 function createApp(runtimes = new Map()) {
     const app = (0, express_1.default)();
     app.use((0, cors_1.default)((0, cors_2.createCorsOptions)()));
     app.use(express_1.default.json());
     let observationOrgan;
-    function createBrain(config) {
-        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 brain_1.OpenAICompatibleBrain({
-                apiKey,
-                model: config?.model || 'local-model',
-                baseUrl: config?.baseUrl || 'http://127.0.0.1:1234/v1',
-            });
-        }
-        return new brain_1.OpenRouterBrain({ apiKey, model: config?.model || 'gpt-4o-mini' });
-    }
-    function isDisabled(config) {
-        return !config || config.provider === 'none';
-    }
-    function createVoice(config) {
-        return isDisabled(config)
-            ? undefined
-            : new voice_1.VoiceAdapter({
-                provider: config?.provider || 'voicevox',
-                baseUrl: config?.baseUrl || process.env.VOICEVOX_URL || 'http://localhost:50021',
-                speakerId: config?.speakerId || 1,
-                ...config,
-            });
-    }
-    function createKnowledge(config) {
-        return isDisabled(config) ? undefined : new eknowledge_1.EKnowledgeAdapter(config || {});
-    }
-    function createVision(config) {
-        return isDisabled(config)
-            ? undefined
-            : new vision_1.OpenRouterVisionAdapter({
-                apiKey: config?.apiKey || process.env.OPENROUTER_API_KEY || '',
-                model: config?.model || 'gpt-4-vision',
-                ...config,
-            });
-    }
-    function createBehavior(config) {
-        return isDisabled(config) ? undefined : new self_1.ActiveSelfCompiler();
-    }
-    function createBody(config) {
-        return isDisabled(config)
-            ? undefined
-            : new body_1.Live2DAdapter(config);
-    }
-    function createHands(config) {
-        return isDisabled(config)
-            ? new hands_1.DefaultHandsOrgan()
-            : new hands_1.DefaultHandsOrgan(config);
-    }
-    function createEar(config) {
-        return isDisabled(config)
-            ? new ear_1.DefaultEarOrgan()
-            : new ear_1.DefaultEarOrgan(config);
-    }
-    function createMouth(config, voice) {
-        return isDisabled(config)
-            ? new mouth_1.DefaultMouthOrgan({ voice })
-            : new mouth_1.DefaultMouthOrgan({ ...config, voice });
-    }
     app.post('/boot', auth_1.requireAuth, async (req, res) => {
         try {
             const { id, config } = req.body;
             if (runtimes.has(id)) {
                 return res.status(400).json({ error: "Already booted" });
             }
-            const organs = config?.organs || {};
-            const brain = createBrain(organs.brain || config?.brain);
-            const memory = new memory_1.SqliteMemoryStore({ dbPath: process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
-            const selfRepo = new self_1.SqliteSelfRepository({ dbPath: process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
-            const voice = createVoice(organs.voice || config?.voice);
-            const knowledge = createKnowledge(organs.knowledge || config?.knowledge);
-            const vision = createVision(organs.vision || config?.vision);
-            const behavior = createBehavior(organs.behavior || config?.behavior);
-            const body = createBody(organs.body || config?.body);
-            const hands = createHands(organs.hands || config?.hands);
-            const ear = createEar(organs.ear || config?.ear);
-            const mouth = createMouth(organs.mouth || config?.mouth, voice);
-            const runtime = new runtime_1.SiduriRuntime(id, config, {
-                brain,
-                memory,
-                voice,
-                knowledge,
-                vision,
-                behavior,
-                body,
-                hands,
-                ear,
-                mouth,
-                observation: observationOrgan,
-                self: selfRepo,
-                externalKnowledge: knowledge,
-            });
-            await runtime.initialize();
+            const runtime = await (0, boot_1.bootCompanion)(id, config, { observationOrgan });
             runtimes.set(id, runtime);
             res.json({ success: true, id });
         }
@@ -208,12 +114,31 @@ function createApp(runtimes = new Map()) {
                     companionId,
                     name: manifest.identity.name,
                     archetype: manifest.identity.archetype,
+                    origin: manifest.identity.origin,
+                    ethos: manifest.identity.ethos,
                     version: manifest.version || '1.0.0',
                     updatedAt: new Date().toISOString(),
                 });
                 if (manifest.personality) {
                     await repo.setPersonality(companionId, manifest.personality);
                 }
+                if (Array.isArray(manifest.relationships)) {
+                    for (const rel of manifest.relationships) {
+                        if (rel && rel.entityId) {
+                            await repo.updateRelationship(companionId, {
+                                companionId,
+                                entityId: rel.entityId,
+                                entityType: 'human',
+                                role: rel.role || 'user',
+                                stance: rel.stance || 'neutral',
+                                interactionConventions: rel.conventions || [],
+                            });
+                        }
+                    }
+                }
+                if (Array.isArray(manifest.dialogueExamples) && repo.setExemplars) {
+                    await repo.setExemplars(companionId, manifest.dialogueExamples);
+                }
                 if (directivesToCommit.length > 0) {
                     await repo.commitDirectives(companionId, directivesToCommit);
                 }
@@ -231,12 +156,18 @@ function createApp(runtimes = new Map()) {
     app.post('/chat', auth_1.attachIdentity, async (req, res) => {
         const { id, message, history } = req.body;
         const identity = req.identity;
-        // Single-owner companion model: map request context directly
+        const local = (0, auth_1.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');
+        // Single-owner companion model: map request context directly with server identity enforcement
         const mappingResult = (0, context_mapper_1.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,
         });
         if (!mappingResult.accepted) {
@@ -268,11 +199,17 @@ function createApp(runtimes = new Map()) {
     app.post('/chat/stream', auth_1.attachIdentity, async (req, res) => {
         const { id, message, history } = req.body;
         const identity = req.identity;
+        const local = (0, auth_1.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 = (0, context_mapper_1.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,
         });
         if (!mappingResult.accepted) {
@@ -292,8 +229,8 @@ function createApp(runtimes = new Map()) {
         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);
@@ -307,7 +244,7 @@ function createApp(runtimes = new Map()) {
                 medium: 'web',
                 signal: abortController.signal,
             });
-            res.write(`event: staged\ndata: ${JSON.stringify({ response_id: response.response_id, correlation_id: response.correlation_id, status: response.status })}\n\n`);
+            res.write(`event: staged\ndata: ${JSON.stringify({ response_id: response.response_id, correlation_id: response.correlation_id, status: response.status, mode: response.metadata?.mode })}\n\n`);
             const avatarEvent = response.metadata?.events?.find((e) => (e.kind === 'avatar' || e.kind === 'body') && (e.approval === 'APPROVED' || !e.approval));
             if (avatarEvent) {
                 res.write(`event: avatar\ndata: ${JSON.stringify(avatarEvent)}\n\n`);
@@ -360,11 +297,15 @@ function createApp(runtimes = new Map()) {
         const runtime = companionId ? runtimes.get(companionId) : undefined;
         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 });
     });
@@ -373,11 +314,15 @@ function createApp(runtimes = new Map()) {
         const runtime = companionId ? runtimes.get(companionId) : undefined;
         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 });
     });
@@ -390,7 +335,7 @@ function createApp(runtimes = new Map()) {
         if (!runtime.memory)
             return res.json({ proposals: [] });
         try {
-            const proposals = await runtime.getPendingClaims();
+            const proposals = await runtime.memory.getPendingClaims();
             res.json({ proposals });
         }
         catch (e) {
@@ -405,7 +350,7 @@ function createApp(runtimes = new Map()) {
         if (!runtime.memory)
             return res.json({ items: [] });
         try {
-            const items = await runtime.getClaims();
+            const items = await runtime.memory.getClaims();
             res.json({ items });
         }
         catch (e) {
@@ -420,7 +365,7 @@ function createApp(runtimes = new Map()) {
         if (!runtime.memory)
             return res.json({ claims: [] });
         try {
-            const claims = await runtime.getClaims();
+            const claims = await runtime.memory.getClaims();
             res.json({ claims });
         }
         catch (e) {
@@ -435,13 +380,101 @@ function createApp(runtimes = new Map()) {
         if (!runtime.memory)
             return res.json({ directives: [] });
         try {
-            const directives = await runtime.getDirectives();
+            const directives = await runtime.memory.getDirectives();
             res.json({ directives });
         }
         catch (e) {
             res.status(500).json({ error: e.message });
         }
     });
+    // KNOWLEDGE / LIFE DB GETTERS
+    app.get('/knowledge/life', auth_1.requireAuth, async (req, res) => {
+        const id = req.query.id || 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 || '';
+        if (!runtime.knowledge || typeof runtime.knowledge.queryLifeContext !== 'function') {
+            return res.json({ matchedInventory: [], recentFinances: [], upcomingSchedule: [], preferences: [], formattedContext: '' });
+        }
+        try {
+            const result = await runtime.knowledge.queryLifeContext(id, query);
+            res.json(result);
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
+    app.get('/knowledge/inventory', auth_1.requireAuth, async (req, res) => {
+        const id = req.query.id || 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;
+        if (!runtime.knowledge || !runtime.knowledge.inventory) {
+            return res.json({ items: [] });
+        }
+        try {
+            const items = await runtime.knowledge.inventory.getItems(id, domain);
+            res.json({ items });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
+    app.get('/knowledge/finance', auth_1.requireAuth, async (req, res) => {
+        const id = req.query.id || 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.finance) {
+            return res.json({ summary: null, entries: [] });
+        }
+        try {
+            const limit = Number(req.query.limit || 20);
+            const [summary, entries] = await Promise.all([
+                runtime.knowledge.finance.getSummary(id),
+                runtime.knowledge.finance.getEntries(id, limit),
+            ]);
+            res.json({ summary, entries });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
+    app.get('/knowledge/schedule', auth_1.requireAuth, async (req, res) => {
+        const id = req.query.id || 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.schedule) {
+            return res.json({ items: [] });
+        }
+        try {
+            const items = await runtime.knowledge.schedule.getUpcoming(id);
+            res.json({ items });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
+    app.get('/knowledge/preferences', auth_1.requireAuth, async (req, res) => {
+        const id = req.query.id || 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;
+        if (!runtime.knowledge || !runtime.knowledge.preferences) {
+            return res.json({ preferences: [] });
+        }
+        try {
+            const preferences = await runtime.knowledge.preferences.getPreferences(id, category);
+            res.json({ preferences });
+        }
+        catch (e) {
+            res.status(500).json({ error: e.message });
+        }
+    });
     // MEMORY MUTATIONS - PROPOSALS
     app.post('/memory/proposals/update', auth_1.requireAuth, async (req, res) => {
         const id = req.body.companionId || Array.from(runtimes.keys())[0];
@@ -456,7 +489,7 @@ function createApp(runtimes = new Map()) {
             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) {
@@ -471,7 +504,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -486,7 +519,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -502,7 +535,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -517,7 +550,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -532,7 +565,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -547,7 +580,7 @@ function createApp(runtimes = new Map()) {
         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) {
@@ -565,7 +598,7 @@ function createApp(runtimes = new Map()) {
                 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) {
@@ -577,7 +610,7 @@ function createApp(runtimes = new Map()) {
             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: {
@@ -611,13 +644,13 @@ function createApp(runtimes = new Map()) {
             let responseId = req.body?.responseId;
             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;
                 }
@@ -625,7 +658,7 @@ function createApp(runtimes = new Map()) {
             if (!responseId) {
                 return res.status(400).json({ approved: false, error: 'UNKNOWN_APPROVAL_ID' });
             }
-            const result = runtime.approveResponse({
+            const result = runtime.gating.approveResponse({
                 responseId,
                 companionId,
                 correlationId: correlationId || '',
@@ -634,7 +667,7 @@ function createApp(runtimes = new Map()) {
                 return res.status(400).json({ approved: false, error: result.reason });
             }
             // Now evaluated as approved
-            const evaluation = runtime.evaluateGate(result.plan);
+            const evaluation = runtime.gating.evaluateGate(result.plan);
             res.json({
                 approved: true,
                 status: evaluation.disposition,
@@ -651,13 +684,13 @@ function createApp(runtimes = new Map()) {
             let responseId = req.body?.responseId;
             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;
                 }
@@ -665,7 +698,7 @@ function createApp(runtimes = new Map()) {
             if (!responseId) {
                 return res.status(400).json({ rejected: false, error: 'UNKNOWN_APPROVAL_ID' });
             }
-            const result = runtime.rejectResponse({
+            const result = runtime.gating.rejectResponse({
                 responseId,
                 companionId,
                 correlationId: correlationId || '',