@siduri-x/api 2.0.1 → 2.0.2

package/src/boot.ts

@@ -0,0 +1,190 @@
+import { OpenAICompatibleBrain, OpenRouterBrain } from '@siduri-x/brain';
+import { SqliteMemoryStore } from '@siduri-x/memory';
+import { VoiceAdapter, VoiceConfig } from '@siduri-x/voice';
+import { UnifiedKnowledgeOrgan, UnifiedKnowledgeConfig } from '@siduri-x/knowledge';
+import { OpenRouterVisionAdapter, OpenRouterVisionConfig } from '@siduri-x/vision';
+import { ActiveSelfCompiler, SqliteSelfRepository } from '@siduri-x/self';
+import { Live2DAdapter, Live2DAdapterConfig } from '@siduri-x/body';
+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 { SiduriRuntime } from './runtime';
+
+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;
+  id?: string;
+  brain?: AppBrainConfig;
+  voice?: VoiceConfig;
+  memory?: { provider?: string; connectionString?: string; maxConnections?: number; dbPath?: string; [key: string]: unknown };
+  knowledge?: UnifiedKnowledgeConfig;
+  vision?: OpenRouterVisionConfig;
+  behavior?: AppBehaviorConfig;
+  body?: Live2DAdapterConfig;
+  hands?: DefaultHandsOrganConfig;
+  ear?: EarOrganConfig;
+  mouth?: DefaultMouthOrganConfig;
+  self?: { dbPath?: string; [key: string]: unknown };
+  organs?: Record<string, any>;
+  [key: string]: unknown;
+}
+
+export interface BootCompanionOptions {
+  observationOrgan?: FixtureObservationOrgan;
+}
+
+export function isDisabled(config?: { provider?: string }): boolean {
+  return !config || config.provider === 'none';
+}
+
+export 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' });
+}
+
+export 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,
+      });
+}
+
+export function createKnowledge(config?: UnifiedKnowledgeConfig) {
+  if (isDisabled(config)) return undefined;
+  const dbPath = (config?.dbPath as string) || process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite';
+  return new UnifiedKnowledgeOrgan({
+    ...config,
+    dbPath,
+    lifeDatabase: config?.lifeDatabase ?? true,
+  });
+}
+
+export 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,
+      });
+}
+
+export function createBehavior(config?: AppBehaviorConfig) {
+  return isDisabled(config) ? undefined : new ActiveSelfCompiler();
+}
+
+export function createBody(config?: Live2DAdapterConfig & { provider?: string }) {
+  return isDisabled(config)
+    ? undefined
+    : new Live2DAdapter(config);
+}
+
+export function createHands(config?: DefaultHandsOrganConfig & { provider?: string }) {
+  return isDisabled(config)
+    ? new DefaultHandsOrgan()
+    : new DefaultHandsOrgan(config);
+}
+
+export function createEar(config?: EarOrganConfig & { provider?: string }) {
+  return isDisabled(config)
+    ? new DefaultEarOrgan()
+    : new DefaultEarOrgan(config);
+}
+
+export function createMouth(config?: DefaultMouthOrganConfig & { provider?: string }, voice?: any) {
+  return isDisabled(config)
+    ? new DefaultMouthOrgan({ voice })
+    : new DefaultMouthOrgan({ ...config, voice });
+}
+
+export function createMemory(config?: { provider?: string; connectionString?: string; maxConnections?: number; dbPath?: string }) {
+  if (isDisabled(config)) return undefined;
+  return new SqliteMemoryStore({ dbPath: config?.dbPath || process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
+}
+
+export function createSelf(config?: { dbPath?: string }) {
+  return new SqliteSelfRepository({ dbPath: config?.dbPath || process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
+}
+
+export function createObservation(vision?: any): FixtureObservationOrgan {
+  return new FixtureObservationOrgan(
+    vision ?? { analyze: async () => JSON.stringify({ readings: [] }) }
+  );
+}
+
+/**
+ * Canonical companion bootstrapper.
+ * Wires all 10 organs, runs memory migrations, and initializes the SiduriRuntime.
+ */
+export async function bootCompanion(
+  id: string,
+  config: AppBootCompanionConfig,
+  options?: BootCompanionOptions
+): Promise<SiduriRuntime> {
+  const organs = (config as any)?.organs || {};
+
+  const brain = createBrain(organs.brain || config?.brain);
+  const memory = createMemory(organs.memory || (config as any)?.memory);
+  const selfRepo = createSelf(organs.self || (config as any)?.self);
+  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 observation = options?.observationOrgan;
+
+  if (memory && typeof (memory as any).runMigrations === 'function') {
+    await (memory as any).runMigrations().catch((e: any) => console.warn("Migrations warning:", e.message));
+  }
+
+  const runtime = new SiduriRuntime(id, config as any, {
+    brain,
+    memory,
+    voice,
+    knowledge,
+    vision,
+    behavior,
+    body,
+    hands,
+    ear,
+    mouth,
+    observation,
+    self: selfRepo,
+    externalKnowledge: (knowledge as any)?.eAdapter ?? knowledge,
+  });
+
+  await runtime.initialize();
+  return runtime;
+}

package/src/context-mapper.test.ts

@@ -176,5 +176,105 @@ describe('API Request Context Mapper (Single-Owner, Single-Machine)', () => {
     expect(result.context?.actor.capabilities).toEqual(['chat']);
     expect(result.context?.actor.authorizationRole).toBe('viewer');
     expect(result.context?.source).toBe('external');
+    expect(result.diagnostics).toContain('role_escalation_attempt_suppressed');
+    expect(result.diagnostics).toContain('capability_escalation_attempt_suppressed');
+  });
+
+  test('Prevents attenuated caller from escalating to administrator role or forging elevated capabilities', () => {
+    const attenuatedPayload = {
+      companionId: 'companion-a',
+      authenticated: true,
+      role: 'VIEWER',
+      source: 'external',
+      context: {
+        actor: {
+          actorId: 'visitor-bob',
+          sessionId: 'session-vis-1',
+          authorizationRole: 'administrator', // Forged owner/admin role
+          capabilities: ['chat', 'system', 'root:manage', 'action:execute'], // Forged system/root capabilities
+        },
+        conversation: {
+          correlationId: 'corr-att-escalate',
+        },
+      },
+    };
+
+    const result = mapRequestContext(attenuatedPayload);
+    expect(result.accepted).toBe(true);
+    expect(result.context?.actor.authenticated).toBe(true);
+    expect(result.context?.actor.authorizationRole).toBe('viewer');
+    expect(result.context?.actor.capabilities).toEqual(['chat']);
+    expect(result.diagnostics).toContain('role_escalation_attempt_suppressed');
+    expect(result.diagnostics).toContain('capability_escalation_attempt_suppressed');
+  });
+
+  test('Strips unknown capabilities for authenticated owner while preserving canonical companion capabilities', () => {
+    const ownerPayload = {
+      companionId: 'companion-a',
+      authenticated: true,
+      source: 'local',
+      context: {
+        actor: {
+          actorId: 'owner-user',
+          sessionId: 'session-owner-1',
+          capabilities: ['chat', 'system', 'root:unauthorized', 'arbitrary:hack'],
+        },
+        conversation: {
+          correlationId: 'corr-owner-caps',
+        },
+      },
+    };
+
+    const result = mapRequestContext(ownerPayload);
+    expect(result.accepted).toBe(true);
+    expect(result.context?.actor.authorizationRole).toBe('administrator');
+    expect(result.context?.actor.capabilities).toEqual(['chat', 'system']);
+    expect(result.diagnostics).toContain('capability_escalation_attempt_suppressed');
+  });
+
+  test('Flat envelope: suppresses role and capability escalation when serverRole is VIEWER', () => {
+    const viewerPayload = {
+      companionId: 'companion-a',
+      authenticated: false,
+      serverRole: 'VIEWER',
+      role: 'OWNER', // Forged in flat envelope
+      capabilities: ['chat', 'system', 'action:execute'],
+      generateCorrelationId: true,
+    };
+
+    const result = mapRequestContext(viewerPayload);
+    expect(result.accepted).toBe(true);
+    expect(result.context?.actor.authorizationRole).toBe('viewer');
+    expect(result.context?.actor.capabilities).toEqual(['chat']);
+    expect(result.diagnostics).toContain('role_escalation_attempt_suppressed');
+  });
+
+  test('Authenticated owner receives canonical administrator role and capabilities, and can safely attenuate to viewer', () => {
+    const ownerPayload = {
+      companionId: 'companion-a',
+      authenticated: true,
+      serverRole: 'OWNER',
+      generateCorrelationId: true,
+    };
+
+    const ownerResult = mapRequestContext(ownerPayload);
+    expect(ownerResult.accepted).toBe(true);
+    expect(ownerResult.context?.actor.authorizationRole).toBe('administrator');
+    expect(ownerResult.context?.actor.capabilities).toEqual([
+      'chat',
+      'memory:approve',
+      'action:execute',
+      'system',
+    ]);
+
+    // Attenuation to viewer
+    const attenuatedPayload = {
+      ...ownerPayload,
+      role: 'VIEWER',
+    };
+    const attenuatedResult = mapRequestContext(attenuatedPayload);
+    expect(attenuatedResult.accepted).toBe(true);
+    expect(attenuatedResult.context?.actor.authorizationRole).toBe('viewer');
+    expect(attenuatedResult.diagnostics).not.toContain('role_escalation_attempt_suppressed');
   });
 });

package/src/context-mapper.ts

@@ -20,8 +20,10 @@ export interface MapRequestContextResult {
 /**
  * Maps incoming HTTP requests to a canonical RequestContext.
  * In a single-owner, single-machine model:
- * - Security is enforced at the external boundary, not internally between roles.
+ * - Security is enforced at the external machine boundary, NOT internally between roles.
  * - No internal audience or viewer/operator/owner role hierarchies.
+ * - Authenticated callers are the single owner with full companion access.
+ * - Unauthenticated callers are bounded to public chat.
  */
 export function mapRequestContext(
   input: any,
@@ -43,7 +45,10 @@ export function mapRequestContext(
   if (input.context && typeof input.context === 'object') {
     const rawCtx = input.context;
     const companionId = input.companionId || rawCtx.companionId || input.id;
-    const correlationId = rawCtx.conversation?.correlationId || input.correlationId;
+    const correlationId =
+      rawCtx.conversation?.correlationId ||
+      input.correlationId ||
+      (input.generateCorrelationId ? `corr-${Date.now()}` : undefined);
 
     if (!companionId) {
       return {
@@ -81,18 +86,46 @@ export function mapRequestContext(
       };
     }
 
-    // Determine server-enforced authentication status
+    const isViewerRequested =
+      (typeof input.role === 'string' && input.role.toLowerCase() === 'viewer') ||
+      (typeof input.serverRole === 'string' && input.serverRole.toLowerCase() === 'viewer') ||
+      (typeof actor.authorizationRole === 'string' && actor.authorizationRole.toLowerCase() === 'viewer') ||
+      (typeof (actor as any).role === 'string' && (actor as any).role.toLowerCase() === 'viewer');
+
+    // Determine server-enforced authentication status at the machine boundary
     const isAuthenticated = input.authenticated !== undefined
       ? Boolean(input.authenticated)
       : (actor.authenticated !== undefined ? Boolean(actor.authenticated) : true);
 
-    const safeCapabilities = isAuthenticated
-      ? (Array.isArray(actor.capabilities) ? actor.capabilities : ['chat'])
-      : ['chat'];
+    const isViewer = !isAuthenticated || isViewerRequested;
+
+    const CANONICAL_CAPABILITIES = new Set(['chat', 'memory:approve', 'action:execute', 'system']);
+    const DEFAULT_OWNER_CAPABILITIES = ['chat', 'memory:approve', 'action:execute', 'system'];
 
-    const safeRole = isAuthenticated
-      ? actor.authorizationRole
-      : 'viewer';
+    let safeCapabilities: string[];
+    let authorizationRole: string;
+
+    if (isViewer) {
+      safeCapabilities = ['chat'];
+      authorizationRole = 'viewer';
+      if (Array.isArray(actor.capabilities) && actor.capabilities.some((c: string) => c !== 'chat' && c !== 'chat:public')) {
+        diagnostics.push('capability_escalation_attempt_suppressed');
+      }
+      if (actor.authorizationRole && actor.authorizationRole.toLowerCase() !== 'viewer') {
+        diagnostics.push('role_escalation_attempt_suppressed');
+      }
+    } else {
+      authorizationRole = 'administrator';
+      if (Array.isArray(actor.capabilities) && actor.capabilities.length > 0) {
+        const filtered = actor.capabilities.filter((c: string) => CANONICAL_CAPABILITIES.has(c));
+        if (filtered.length < actor.capabilities.length) {
+          diagnostics.push('capability_escalation_attempt_suppressed');
+        }
+        safeCapabilities = filtered.length > 0 ? filtered : [...DEFAULT_OWNER_CAPABILITIES];
+      } else {
+        safeCapabilities = [...DEFAULT_OWNER_CAPABILITIES];
+      }
+    }
 
     const constructed: RequestContext = {
       companionId,
@@ -102,7 +135,7 @@ export function mapRequestContext(
         sessionId: actor.sessionId,
         capabilities: safeCapabilities,
         authenticated: isAuthenticated,
-        authorizationRole: safeRole,
+        authorizationRole,
       },
       conversation: {
         correlationId,
@@ -167,20 +200,52 @@ export function mapRequestContext(
     };
   }
 
-  const actorId = input.actorId || input.actor?.actorId || 'local-user';
+  const isViewerRequested =
+    (typeof input.role === 'string' && input.role.toLowerCase() === 'viewer') ||
+    (typeof input.serverRole === 'string' && input.serverRole.toLowerCase() === 'viewer');
+
+  const isAuthenticated = input.authenticated !== undefined ? Boolean(input.authenticated) : true;
+  const isViewer = !isAuthenticated || isViewerRequested;
+
+  const actorId = input.actorId || input.actor?.actorId || (isAuthenticated && !isViewer ? 'local-user' : 'anonymous-session');
   const sessionId = input.sessionId || input.actor?.sessionId || `session-${Date.now()}`;
   if (!input.actorId && !input.actor?.actorId) {
     diagnostics.push('anonymous_session_generated');
   }
 
-  const isAuthenticated = input.authenticated !== undefined ? Boolean(input.authenticated) : true;
-  const capabilities = isAuthenticated
-    ? (Array.isArray(input.capabilities)
-        ? input.capabilities
-        : Array.isArray(input.actor?.capabilities)
-        ? input.actor.capabilities
-        : ['chat', 'system'])
-    : ['chat'];
+  const CANONICAL_CAPABILITIES = new Set(['chat', 'memory:approve', 'action:execute', 'system']);
+  const DEFAULT_OWNER_CAPABILITIES = ['chat', 'memory:approve', 'action:execute', 'system'];
+
+  const rawCaps = Array.isArray(input.capabilities)
+    ? input.capabilities
+    : Array.isArray(input.actor?.capabilities)
+    ? input.actor.capabilities
+    : undefined;
+
+  let capabilities: string[];
+  let authorizationRole: string;
+
+  if (isViewer) {
+    capabilities = ['chat'];
+    authorizationRole = 'viewer';
+    if (rawCaps && rawCaps.some((c: string) => c !== 'chat' && c !== 'chat:public')) {
+      diagnostics.push('capability_escalation_attempt_suppressed');
+    }
+    if (input.role && input.role.toLowerCase() !== 'viewer') {
+      diagnostics.push('role_escalation_attempt_suppressed');
+    }
+  } else {
+    authorizationRole = 'administrator';
+    if (rawCaps && rawCaps.length > 0) {
+      const filtered = rawCaps.filter((c: string) => CANONICAL_CAPABILITIES.has(c));
+      if (filtered.length < rawCaps.length) {
+        diagnostics.push('capability_escalation_attempt_suppressed');
+      }
+      capabilities = filtered.length > 0 ? filtered : [...DEFAULT_OWNER_CAPABILITIES];
+    } else {
+      capabilities = [...DEFAULT_OWNER_CAPABILITIES];
+    }
+  }
 
   const mappedContext: RequestContext = {
     companionId,
@@ -189,7 +254,7 @@ export function mapRequestContext(
       sessionId,
       capabilities,
       authenticated: isAuthenticated,
-      authorizationRole: input.role ? (input.role.toLowerCase() === 'viewer' ? 'viewer' : 'administrator') : undefined,
+      authorizationRole,
     },
     conversation: {
       channel: input.channel || input.conversation?.channel || 'direct',

package/src/index.test.ts

@@ -127,7 +127,7 @@ describe('API Boundary Context Validation (P2 Route Integration)', () => {
   });
 
   test('handles barge-in interruption via POST /chat/interrupt', async () => {
-    fakeRuntime.interruptMouth = jest.fn();
+    fakeRuntime.mouth = { interrupt: jest.fn() };
 
     const res = await request(app)
       .post('/chat/interrupt')
@@ -138,11 +138,11 @@ describe('API Boundary Context Validation (P2 Route Integration)', () => {
 
     expect(res.status).toBe(200);
     expect(res.body.interrupted).toBe(true);
-    expect(fakeRuntime.interruptMouth).toHaveBeenCalledWith('user_stop');
+    expect(fakeRuntime.mouth.interrupt).toHaveBeenCalledWith('user_stop');
   });
 
   test('handles mouth interruption via POST /mouth/interrupt', async () => {
-    fakeRuntime.interruptMouth = jest.fn();
+    fakeRuntime.mouth = { interrupt: jest.fn() };
 
     const res = await request(app)
       .post('/mouth/interrupt')
@@ -153,6 +153,6 @@ describe('API Boundary Context Validation (P2 Route Integration)', () => {
 
     expect(res.status).toBe(200);
     expect(res.body.interrupted).toBe(true);
-    expect(fakeRuntime.interruptMouth).toHaveBeenCalledWith('user_barge_in');
+    expect(fakeRuntime.mouth.interrupt).toHaveBeenCalledWith('user_barge_in');
   });
 });

package/src/index.ts

@@ -4,87 +4,19 @@ dotenv.config();
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { Express } from 'express';
-import { createApp, AppInstance, AppBrainConfig, AppBehaviorConfig } from './app';
+import { createApp, AppInstance } from './app';
 import { SiduriRuntime } from './runtime';
-import { OpenAICompatibleBrain, OpenRouterBrain } from '@siduri-x/brain';
-import { SqliteMemoryStore } from '@siduri-x/memory';
-import { VoiceAdapter, VoiceConfig } from '@siduri-x/voice';
-import { EKnowledgeAdapter, EKnowledgeConfig } from '@siduri-x/eknowledge';
-import { OpenRouterVisionAdapter, OpenRouterVisionConfig } from '@siduri-x/vision';
-import { ActiveSelfCompiler, SqliteSelfRepository } from '@siduri-x/self';
-import { Live2DAdapter, Live2DAdapterConfig } from '@siduri-x/body';
-import { FixtureObservationOrgan } from '@siduri-x/observation';
+import { bootCompanion, createVision, createObservation } from './boot';
 
 export { createApp, AppInstance };
 export * from './context-mapper';
+export * from './boot';
 
 const runtimes = new Map<string, SiduriRuntime>();
 const instance: AppInstance = createApp(runtimes);
 export const app: Express = instance.app;
 export default app;
 
-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) {
-  if (isDisabled(config)) return undefined;
-  if (!config?.packPath && !config?.registryUrl && !config?.baseUrl) {
-    return undefined;
-  }
-  return 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 createMemory(config?: { provider?: string; connectionString?: string; maxConnections?: number; dbPath?: string }) {
-  if (isDisabled(config)) return undefined;
-  return new SqliteMemoryStore({ dbPath: config?.dbPath || process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
-}
-
 const PORT = process.env.PORT || 3001;
 
 const defaultCompanionConfig = {
@@ -94,7 +26,9 @@ const defaultCompanionConfig = {
   voice: { provider: 'voicevox', speakerId: 1 },
   memory: { provider: 'sqlite' },
   knowledge: {
-    provider: (process.env.SIDURI_KNOWLEDGE_PROVIDER as 'e-knowledge' | 'e-remote' | 'e-hub') || 'e-knowledge',
+    provider: (process.env.SIDURI_KNOWLEDGE_PROVIDER as any) || 'unified',
+    lifeDatabase: true,
+    dbPath: process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite',
     packPath: process.env.SIDURI_KNOWLEDGE_PACK || '',
     registryUrl: process.env.SIDURI_KNOWLEDGE_REGISTRY_URL || '',
     packId: process.env.SIDURI_KNOWLEDGE_PACK_ID || '',
@@ -137,6 +71,7 @@ async function loadCompanionConfig() {
   if (process.env.SIDURI_KNOWLEDGE_REGISTRY_URL) config.knowledge.registryUrl = process.env.SIDURI_KNOWLEDGE_REGISTRY_URL;
   if (process.env.SIDURI_KNOWLEDGE_PACK_ID) config.knowledge.packId = process.env.SIDURI_KNOWLEDGE_PACK_ID;
   if (process.env.SIDURI_KNOWLEDGE_MODE) config.knowledge.preferredMode = process.env.SIDURI_KNOWLEDGE_MODE;
+  if (process.env.SIDURI_KNOWLEDGE_DB_PATH) config.knowledge.dbPath = process.env.SIDURI_KNOWLEDGE_DB_PATH;
   return config;
 }
 
@@ -144,37 +79,12 @@ async function bootDefaultCompanion() {
   if (runtimes.has('default')) return;
   console.log("Booting default companion...");
   const config: any = await loadCompanionConfig();
-  
-  const brain = createBrain(config.brain);
-  const memory = createMemory(config.memory);
-  const voice = createVoice(config.voice);
-  const knowledge = createKnowledge(config.knowledge);
+
   const vision = createVision(config.vision);
-  const observation = new FixtureObservationOrgan(
-    vision ?? { analyze: async () => JSON.stringify({ readings: [] }) },
-  );
+  const observation = createObservation(vision);
   instance.setObservationOrgan(observation);
-  const selfRepo = new SqliteSelfRepository({ dbPath: process.env.STORAGE_PATH || process.env.SQLITE_DB_PATH || 'siduri.sqlite' });
-  const behavior = createBehavior(config.behavior);
-  const body = createBody(config.body);
-
-  if (memory && typeof (memory as any).runMigrations === 'function') {
-    await (memory as any).runMigrations().catch((e: any) => console.warn("Migrations warning:", e.message));
-  }
-
-  const runtime = new SiduriRuntime('default', config as any, { 
-    brain, 
-    memory, 
-    voice, 
-    knowledge, 
-    vision, 
-    behavior, 
-    body,
-    self: selfRepo,
-    externalKnowledge: knowledge
-  });
-  await runtime.initialize();
 
+  const runtime = await bootCompanion('default', config, { observationOrgan: observation });
   runtimes.set('default', runtime);
   console.log("Default companion booted successfully.");
 }