@vxnus/siduri 2.0.41 → 2.1.0

package/README.md

@@ -1,11 +1,11 @@
-# @vxnus/siduri
+# Siduri CLI (`siduri`)
 
 Experimental CLI for creating, diagnosing, and managing standalone Siduri companions powered by the `@siduri-x/*` organ ecosystem.
 
 Requires Node.js >=22.16.0.
 
 ```bash
-npx @vxnus/siduri create my-companion
+npx siduri create my-companion
 ```
 
 ## Prerequisites
@@ -29,7 +29,7 @@ npx @vxnus/siduri create my-companion
 ### 1. Create a Standalone Companion
 
 ```bash
-npx @vxnus/siduri create [directory]
+npx siduri create [directory]
 ```
 
 The interactive wizard allows you to name your companion, configure organ providers and models, and inspect Knowledge manifests. It generates:
@@ -48,7 +48,7 @@ my-companion/
 ### 2. Run Diagnostics
 
 ```bash
-npx @vxnus/siduri doctor [directory]
+npx siduri doctor [directory]
 ```
 
 Inspects active configuration, checks required/optional environment variables, and executes health probes.
@@ -56,10 +56,19 @@ Inspects active configuration, checks required/optional environment variables, a
 ### 3. Database Management
 
 ```bash
-npx @vxnus/siduri db push [directory]
+npx siduri db push [directory]
+npx siduri db reset [directory]
 ```
 
-Inspects the instance storage configuration. Under the SQLite unified foundation, schema initialization and table creation are handled natively and automatically at boot.
+SQLite manages migrations and schemas automatically in-process.
+
+### 4. Instance Reset
+
+```bash
+npx siduri reset [directory]
+```
+
+Clears SQLite databases and cached state to return the companion to Blank Slate.
 
 ## Local Development
 

package/dist/builtin-manifests.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUILTIN_ORGAN_MANIFESTS = void 0;
 exports.BUILTIN_ORGAN_MANIFESTS = [
     {
-        name: '@siduri-x/self',
+        name: '@sidurijs/self',
         organType: 'behavior',
         version: '2.0.12',
         displayName: 'Self & Persona (Identity & Directives)',
@@ -43,11 +43,11 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/body',
+        name: '@sidurijs/body',
         organType: 'body',
-        version: '2.0.1',
-        displayName: 'Body (Live2D & Avatar State)',
-        description: 'Renderer-agnostic avatar expression and embodiment event adapter',
+        version: '2.1.0',
+        displayName: 'Body (Live2D & VRM Avatar State)',
+        description: 'Renderer-agnostic avatar expression and embodiment event adapter supporting Live2D (.model3.json) and VRM (.vrm)',
         entrypoint: './dist/index.js',
         factory: 'NeutralBodyOrgan',
         configKey: 'body',
@@ -57,17 +57,45 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
             properties: {
                 provider: {
                     type: 'string',
-                    enum: ['live2d', 'none']
+                    enum: ['live2d', 'vrm', 'none']
+                },
+                format: {
+                    type: 'string',
+                    enum: ['live2d', 'vrm', 'auto'],
+                    default: 'auto'
                 },
                 initialExpression: {
                     type: 'string',
                     default: 'neutral'
                 },
                 modelPath: {
-                    type: 'string'
+                    type: 'string',
+                    description: 'Path to local Live2D Cubism (.model3.json) or VRM (.vrm) model file'
                 },
                 modelUrl: {
-                    type: 'string'
+                    type: 'string',
+                    description: 'Relative web or remote HTTP URL to Live2D Cubism (.model3.json) or VRM (.vrm) model file'
+                },
+                vrm: {
+                    type: 'object',
+                    properties: {
+                        specVersion: {
+                            type: 'string',
+                            enum: ['0.x', '1.0', 'auto'],
+                            default: 'auto'
+                        },
+                        lookAtMode: {
+                            type: 'string',
+                            enum: ['camera', 'cursor', 'head', 'none'],
+                            default: 'camera'
+                        },
+                        defaultPose: {
+                            type: 'string'
+                        },
+                        expressionMapping: {
+                            type: 'object'
+                        }
+                    }
                 }
             }
         },
@@ -77,7 +105,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/brain',
+        name: '@sidurijs/brain',
         organType: 'brain',
         version: '2.0.13',
         displayName: 'Brain (Cognition & Planning)',
@@ -133,7 +161,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: 'probeBrainHealth'
     },
     {
-        name: '@siduri-x/ear',
+        name: '@sidurijs/ear',
         organType: 'ear',
         version: '2.0.3',
         displayName: 'Ear (Perception Ingress)',
@@ -164,7 +192,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/hands',
+        name: '@sidurijs/hands',
         organType: 'hands',
         version: '2.0.2',
         displayName: 'Hands (MCP Tool Execution)',
@@ -218,7 +246,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: 'probeHandsHealth'
     },
     {
-        name: '@siduri-x/knowledge',
+        name: '@sidurijs/knowledge',
         organType: 'knowledge',
         version: '2.0.6',
         displayName: 'Knowledge (Sovereign Life DB & Knowledge Packs)',
@@ -296,7 +324,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/memory',
+        name: '@sidurijs/memory',
         organType: 'memory',
         version: '2.0.5',
         displayName: 'Memory (Long-term Recall & State)',
@@ -326,7 +354,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/observation',
+        name: '@sidurijs/observation',
         organType: 'observation',
         version: '2.0.1',
         displayName: 'Observation (Screen Perception & Frame Ingest)',
@@ -344,7 +372,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/vision',
+        name: '@sidurijs/vision',
         organType: 'vision',
         version: '2.0.1',
         displayName: 'Vision (Visual Perception & OCR)',
@@ -391,7 +419,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: 'probeVisionHealth'
     },
     {
-        name: '@siduri-x/voice',
+        name: '@sidurijs/voice',
         organType: 'voice',
         version: '2.0.2',
         displayName: 'Voice (Speech Synthesis & Voice Conversion)',
@@ -466,7 +494,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
         healthCheck: null
     },
     {
-        name: '@siduri-x/mouth',
+        name: '@sidurijs/mouth',
         organType: 'mouth',
         version: '2.0.2',
         displayName: 'Mouth (Communication & UI Delivery)',

package/dist/clean-machine-smoke.test.js

@@ -14,18 +14,18 @@ describe('Phase 5: Clean-Machine Distribution & Packaging Smoke Suite', () => {
     const cleanMachineRoot = node_path_1.default.resolve(__dirname, '../temp-clean-machine-smoke');
     const getPkgVer = (dir) => JSON.parse(node_fs_1.default.readFileSync(node_path_1.default.resolve(repoRoot, dir, 'package.json'), 'utf8')).version;
     const ALL_CANONICAL_PACKAGES = [
-        { filter: '@siduri-x/core', dir: 'packages/core', tarName: `siduri-x-core-${getPkgVer('packages/core')}.tgz`, isOrgan: false },
-        { filter: '@siduri-x/brain', dir: 'packages/organs/brain', tarName: `siduri-x-brain-${getPkgVer('packages/organs/brain')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/memory', dir: 'packages/memory', tarName: `siduri-x-memory-${getPkgVer('packages/memory')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/knowledge', dir: 'packages/knowledge', tarName: `siduri-x-knowledge-${getPkgVer('packages/knowledge')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/self', dir: 'packages/self', tarName: `siduri-x-self-${getPkgVer('packages/self')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/ear', dir: 'packages/organs/ear', tarName: `siduri-x-ear-${getPkgVer('packages/organs/ear')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/vision', dir: 'packages/organs/vision', tarName: `siduri-x-vision-${getPkgVer('packages/organs/vision')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/hands', dir: 'packages/organs/hands', tarName: `siduri-x-hands-${getPkgVer('packages/organs/hands')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/body', dir: 'packages/organs/body', tarName: `siduri-x-body-${getPkgVer('packages/organs/body')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/voice', dir: 'packages/organs/voice', tarName: `siduri-x-voice-${getPkgVer('packages/organs/voice')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/observation', dir: 'packages/organs/observation', tarName: `siduri-x-observation-${getPkgVer('packages/organs/observation')}.tgz`, isOrgan: true },
-        { filter: '@siduri-x/mouth', dir: 'packages/organs/mouth', tarName: `siduri-x-mouth-${getPkgVer('packages/organs/mouth')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/core', dir: 'packages/core', tarName: `sidurijs-core-${getPkgVer('packages/core')}.tgz`, isOrgan: false },
+        { filter: '@sidurijs/brain', dir: 'packages/organs/brain', tarName: `sidurijs-brain-${getPkgVer('packages/organs/brain')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/memory', dir: 'packages/memory', tarName: `sidurijs-memory-${getPkgVer('packages/memory')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/knowledge', dir: 'packages/knowledge', tarName: `sidurijs-knowledge-${getPkgVer('packages/knowledge')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/self', dir: 'packages/self', tarName: `sidurijs-self-${getPkgVer('packages/self')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/ear', dir: 'packages/organs/ear', tarName: `sidurijs-ear-${getPkgVer('packages/organs/ear')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/vision', dir: 'packages/organs/vision', tarName: `sidurijs-vision-${getPkgVer('packages/organs/vision')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/hands', dir: 'packages/organs/hands', tarName: `sidurijs-hands-${getPkgVer('packages/organs/hands')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/body', dir: 'packages/organs/body', tarName: `sidurijs-body-${getPkgVer('packages/organs/body')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/voice', dir: 'packages/organs/voice', tarName: `sidurijs-voice-${getPkgVer('packages/organs/voice')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/observation', dir: 'packages/organs/observation', tarName: `sidurijs-observation-${getPkgVer('packages/organs/observation')}.tgz`, isOrgan: true },
+        { filter: '@sidurijs/mouth', dir: 'packages/organs/mouth', tarName: `sidurijs-mouth-${getPkgVer('packages/organs/mouth')}.tgz`, isOrgan: true },
         { filter: '@vxnus/siduri', dir: 'cli', tarName: `vxnus-siduri-${getPkgVer('cli')}.tgz`, isOrgan: false },
     ];
     const getTarPath = (pkgName) => {
@@ -99,8 +99,8 @@ describe('Phase 5: Clean-Machine Distribution & Packaging Smoke Suite', () => {
             });
             const pkgObj = JSON.parse(files['package.json']);
             pkgObj.dependencies = {
-                '@siduri-x/core': `file:${getTarPath('@siduri-x/core')}`,
-                '@siduri-x/brain': `file:${getTarPath('@siduri-x/brain')}`,
+                '@sidurijs/core': `file:${getTarPath('@sidurijs/core')}`,
+                '@sidurijs/brain': `file:${getTarPath('@sidurijs/brain')}`,
             };
             pkgObj.devDependencies = {
                 '@vxnus/siduri': `file:${getTarPath('@vxnus/siduri')}`,
@@ -112,8 +112,8 @@ describe('Phase 5: Clean-Machine Distribution & Packaging Smoke Suite', () => {
             node_fs_1.default.writeFileSync(node_path_1.default.join(instanceDir, 'README.md'), files['README.md']);
             node_fs_1.default.writeFileSync(node_path_1.default.join(instanceDir, 'src/index.js'), files['src/index.js']);
             (0, node_child_process_1.execSync)('npm install --no-audit --no-fund', { cwd: instanceDir, stdio: 'pipe' });
-            expect(node_fs_1.default.existsSync(node_path_1.default.join(instanceDir, 'node_modules/@siduri-x/memory'))).toBe(false);
-            expect(node_fs_1.default.existsSync(node_path_1.default.join(instanceDir, 'node_modules/@siduri-x/hands'))).toBe(false);
+            expect(node_fs_1.default.existsSync(node_path_1.default.join(instanceDir, 'node_modules/@sidurijs/memory'))).toBe(false);
+            expect(node_fs_1.default.existsSync(node_path_1.default.join(instanceDir, 'node_modules/@sidurijs/hands'))).toBe(false);
             const doctorPass = (0, node_child_process_1.execSync)(`node ${node_path_1.default.resolve(repoRoot, 'cli/dist/index.js')} doctor`, {
                 cwd: instanceDir,
                 env: { ...process.env, OPENROUTER_API_KEY: 'test-key-clean' },
@@ -135,9 +135,9 @@ describe('Phase 5: Clean-Machine Distribution & Packaging Smoke Suite', () => {
             });
             const pkgObj = JSON.parse(files['package.json']);
             pkgObj.dependencies = {
-                '@siduri-x/core': `file:${getTarPath('@siduri-x/core')}`,
-                '@siduri-x/brain': `file:${getTarPath('@siduri-x/brain')}`,
-                '@siduri-x/hands': `file:${getTarPath('@siduri-x/hands')}`,
+                '@sidurijs/core': `file:${getTarPath('@sidurijs/core')}`,
+                '@sidurijs/brain': `file:${getTarPath('@sidurijs/brain')}`,
+                '@sidurijs/hands': `file:${getTarPath('@sidurijs/hands')}`,
             };
             pkgObj.devDependencies = {
                 '@vxnus/siduri': `file:${getTarPath('@vxnus/siduri')}`,

package/dist/configurators/body.js

@@ -5,13 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureBody = configureBody;
 const inquirer_1 = __importDefault(require("inquirer"));
+const colors_1 = require("../colors");
 async function configureBody(_context) {
     const { provider } = await inquirer_1.default.prompt({
         type: 'list',
         name: 'provider',
         message: 'Body avatar provider?',
         choices: [
-            { name: 'Live2D Cubism (Interactive avatar motion & expression state)', value: 'live2d' },
+            { name: 'Live2D Cubism (Interactive 2D avatar motion & expression state)', value: 'live2d' },
+            { name: 'VRM 3D Humanoid (Interactive 3D avatar, VRoid / glTF)', value: 'vrm' },
             { name: 'None (Headless / No visual body)', value: 'none' },
         ],
     });
@@ -21,6 +23,59 @@ async function configureBody(_context) {
             summary: { Provider: 'None (Headless)' },
         };
     }
+    if (provider === 'vrm') {
+        const { modelSource, lookAtMode } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'modelSource',
+                message: 'VRM Model path / URL (.vrm):',
+                default: './assets/body/default/model.vrm',
+            },
+            {
+                type: 'list',
+                name: 'lookAtMode',
+                message: 'VRM Camera LookAt target behavior:',
+                choices: [
+                    { name: 'Camera (Look towards viewer)', value: 'camera' },
+                    { name: 'Cursor (Track mouse / touch cursor)', value: 'cursor' },
+                    { name: 'Head (Restricted head-only tracking)', value: 'head' },
+                    { name: 'None (Fixed gaze)', value: 'none' },
+                ],
+                default: 'camera',
+            },
+        ]);
+        const modelPath = modelSource.trim() || './assets/body/default/model.vrm';
+        const isHttpOrAbsolute = modelPath.startsWith('http://') || modelPath.startsWith('https://') || modelPath.startsWith('/');
+        const webModelUrl = isHttpOrAbsolute
+            ? modelPath
+            : modelPath.startsWith('./')
+                ? modelPath.slice(1)
+                : `/${modelPath}`;
+        return {
+            config: {
+                provider: 'vrm',
+                format: 'vrm',
+                modelPath,
+                modelUrl: webModelUrl,
+                initialExpression: 'neutral',
+                vrm: {
+                    specVersion: 'auto',
+                    lookAtMode: lookAtMode,
+                },
+            },
+            summary: {
+                Provider: 'VRM (3D Avatar)',
+                'Model Path': modelPath,
+                'LookAt Mode': lookAtMode,
+            },
+        };
+    }
+    // provider === 'live2d'
+    console.log(`\n  ${colors_1.colors.yellow}⚠ Live2D Cubism Licensing & Runtime Notice:${colors_1.colors.reset}`);
+    console.log(`  • ${colors_1.colors.dim}Proprietary Core:${colors_1.colors.reset}   Live2D Cubism Core is proprietary software of Live2D Inc.`);
+    console.log(`  • ${colors_1.colors.dim}Indie / Small Biz:${colors_1.colors.reset}  Free & royalty-free for entities with annual revenue < 10M JPY (~$67k USD).`);
+    console.log(`  • ${colors_1.colors.dim}Commercial License:${colors_1.colors.reset} Entities exceeding this threshold require a Publication License from Live2D Inc.`);
+    console.log(`  • ${colors_1.colors.dim}Runtime Download:${colors_1.colors.reset}   Clients fetch live2dcubismcore.min.js directly from Live2D CDN at runtime.\n`);
     const { modelSource } = await inquirer_1.default.prompt([
         {
             type: 'input',
@@ -39,6 +94,7 @@ async function configureBody(_context) {
     return {
         config: {
             provider: 'live2d',
+            format: 'live2d',
             modelPath,
             modelUrl: webModelUrl,
             initialExpression: 'neutral',

package/dist/configurators.test.js

@@ -316,6 +316,29 @@ describe('Guided Manifest-Driven Configuration UX Specification Tests', () => {
             expect(result.config.modelUrl).toBe('/assets/body/default/model.model3.json');
             expect(result.summary?.['Model Path']).toBe('./assets/body/default/model.model3.json');
         });
+        test('Body configurator configures VRM 3D avatar with lookAt mode', async () => {
+            inquirer_1.default.prompt
+                .mockResolvedValueOnce({ provider: 'vrm' })
+                .mockResolvedValueOnce({
+                modelSource: './assets/body/vroid/model.vrm',
+                lookAtMode: 'cursor',
+            });
+            const result = await (0, body_1.configureBody)({ companionName: 'VRoidCompanion', manifest: bodyManifest });
+            expect(result.config.provider).toBe('vrm');
+            expect(result.config.format).toBe('vrm');
+            expect(result.config.modelPath).toBe('./assets/body/vroid/model.vrm');
+            expect(result.config.modelUrl).toBe('/assets/body/vroid/model.vrm');
+            expect(result.config.vrm?.lookAtMode).toBe('cursor');
+            expect(result.summary?.Provider).toBe('VRM (3D Avatar)');
+            expect(result.summary?.['LookAt Mode']).toBe('cursor');
+        });
+        test('Body configurator disables body when none is selected', async () => {
+            inquirer_1.default.prompt
+                .mockResolvedValueOnce({ provider: 'none' });
+            const result = await (0, body_1.configureBody)({ companionName: 'HeadlessCompanion', manifest: bodyManifest });
+            expect(result.config.provider).toBe('none');
+            expect(result.summary?.Provider).toBe('None (Headless)');
+        });
         test('Hands configurator configures MCP tool execution timeout', async () => {
             inquirer_1.default.prompt
                 .mockResolvedValueOnce({ provider: 'mcp' })
@@ -432,10 +455,10 @@ describe('Guided Manifest-Driven Configuration UX Specification Tests', () => {
             expect(config.organs.knowledge.packId).toBe('@vxnus/e-teyvat');
             expect(config.organs.voice.speakerId).toBe(2);
             // Verify explicit imports in src/index.js
-            expect(files['src/index.js']).toContain("import { OpenRouterBrain } from '@siduri-x/brain'");
-            expect(files['src/index.js']).toContain("import { SqliteMemoryStore } from '@siduri-x/memory'");
-            expect(files['src/index.js']).toContain("import { UnifiedKnowledgeOrgan } from '@siduri-x/knowledge'");
-            expect(files['src/index.js']).toContain("import { VoiceAdapter } from '@siduri-x/voice'");
+            expect(files['src/index.js']).toContain("import { OpenRouterBrain } from '@sidurijs/brain'");
+            expect(files['src/index.js']).toContain("import { SqliteMemoryStore } from '@sidurijs/memory'");
+            expect(files['src/index.js']).toContain("import { UnifiedKnowledgeOrgan } from '@sidurijs/knowledge'");
+            expect(files['src/index.js']).toContain("import { VoiceAdapter } from '@sidurijs/voice'");
         });
     });
 });

package/dist/discovery.js

@@ -73,7 +73,7 @@ class OrganRegistry {
                 // Continue scanning other roots
             }
         }
-        // Always merge canonical built-in @siduri-x/* organ manifests as fallback for ones that weren't found
+        // Always merge canonical built-in @sidurijs/* organ manifests as fallback for ones that weren't found
         for (const builtinManifest of builtin_manifests_1.BUILTIN_ORGAN_MANIFESTS) {
             if (!registry.get(builtinManifest.organType)) {
                 registry.register(builtinManifest);

package/dist/discovery.test.js

@@ -39,10 +39,10 @@ describe('Discovery & Dynamic Composition System Tests (Phase 3)', () => {
         });
         const pkg = JSON.parse(files['package.json']);
         expect(Object.keys(pkg.dependencies).sort()).toEqual([
-            '@siduri-x/brain',
-            '@siduri-x/core',
-            '@siduri-x/hands',
-            '@siduri-x/vision',
+            '@sidurijs/brain',
+            '@sidurijs/core',
+            '@sidurijs/hands',
+            '@sidurijs/vision',
         ]);
         const schema = JSON.parse(files['siduri.schema.json']);
         expect(Object.keys(schema.properties.organs.properties).sort()).toEqual(['brain', 'hands', 'vision']);

package/dist/doctor.js

@@ -83,7 +83,7 @@ async function runDoctor(options = {}) {
                 name: `Manifest resolution: ${organKey}`,
                 status: 'FAIL',
                 message: `Could not resolve package manifest for configured organ '${organKey}'.`,
-                remediation: `Ensure @siduri-x/${organKey} is installed in package.json and npm install has been run.`,
+                remediation: `Ensure @sidurijs/${organKey} is installed in package.json and npm install has been run.`,
             });
         }
         else {

package/dist/generator.js

@@ -74,8 +74,8 @@ function getDefaultConfigForManifest(manifest) {
 function generateInstanceFiles(options) {
     const instanceName = options.name || 'my-siduri';
     const instanceId = options.id || 'default';
-    const coreVersion = options.coreVersion || '^2.0.16';
-    const cliVersion = options.cliVersion || '^2.0.40';
+    const coreVersion = options.coreVersion || '^1.0.0';
+    const cliVersion = options.cliVersion || '^2.1.0';
     const canonicalOrder = ['brain', 'memory', 'knowledge', 'behavior', 'voice', 'body', 'mouth', 'hands', 'vision', 'ear', 'observation'];
     const manifests = [...options.selectedManifests].sort((a, b) => {
         const idxA = canonicalOrder.indexOf(a.organType);
@@ -87,24 +87,24 @@ function generateInstanceFiles(options) {
     const hasBody = manifests.some((m) => m.organType === 'body');
     const hasMouth = manifests.some((m) => m.organType === 'mouth');
     const hasVision = manifests.some((m) => m.organType === 'vision');
-    const voiceConfig = options.organConfigs?.voice || options.organConfigs?.['@siduri-x/voice'];
+    const voiceConfig = options.organConfigs?.voice || options.organConfigs?.['@sidurijs/voice'];
     const isVoicevox = hasVoice && (!voiceConfig || voiceConfig.provider === 'voicevox');
     // 1. package.json
     const dependencies = {};
     if (options.localPath) {
         const repoPath = options.localPath.replace(/\\/g, '/');
-        dependencies['@siduri-x/core'] = `file:${repoPath}/packages/core`;
+        dependencies['@sidurijs/core'] = `file:${repoPath}/packages/core`;
         for (const m of manifests) {
-            const organRel = ['@siduri-x/memory', '@siduri-x/knowledge', '@siduri-x/self'].includes(m.name)
-                ? `packages/${m.name.slice('@siduri-x/'.length)}`
-                : `packages/organs/${m.name.slice('@siduri-x/'.length)}`;
+            const organRel = ['@sidurijs/memory', '@sidurijs/knowledge', '@sidurijs/self'].includes(m.name)
+                ? `packages/${m.name.slice('@sidurijs/'.length)}`
+                : `packages/organs/${m.name.slice('@sidurijs/'.length)}`;
             dependencies[m.name] = `file:${repoPath}/${organRel}`;
         }
     }
     else {
-        dependencies['@siduri-x/core'] = coreVersion;
+        dependencies['@sidurijs/core'] = coreVersion;
         for (const m of manifests) {
-            dependencies[m.name] = `^${m.version || '2.0.1'}`;
+            dependencies[m.name] = `^${m.version || '1.0.0'}`;
         }
     }
     const scripts = {
@@ -187,11 +187,11 @@ function generateInstanceFiles(options) {
         `import { readFile, stat, readdir } from 'node:fs/promises';`,
         `import path from 'node:path';`,
         `import { fileURLToPath } from 'node:url';`,
-        `import { SiduriRuntime, dispatchCompanionChat, validateCompanionConfig } from '@siduri-x/core';`,
+        `import { SiduriRuntime, dispatchCompanionChat, validateCompanionConfig } from '@sidurijs/core';`,
     ];
     for (const m of manifests) {
-        if (m.name === '@siduri-x/self') {
-            importLines.push(`import { ActiveSelfCompiler, SqliteSelfRepository, SelfPackageParser, scanDirective, compilePersonaDocument } from '@siduri-x/self';`);
+        if (m.name === '@sidurijs/self') {
+            importLines.push(`import { ActiveSelfCompiler, SqliteSelfRepository, SelfPackageParser, scanDirective, compilePersonaDocument } from '@sidurijs/self';`);
         }
         else {
             importLines.push(`import { ${m.factory} } from '${m.name}';`);
@@ -200,7 +200,7 @@ function generateInstanceFiles(options) {
     const instantiationLines = [];
     const organMapEntries = [];
     for (const m of manifests) {
-        if (m.name === '@siduri-x/self') {
+        if (m.name === '@sidurijs/self') {
             instantiationLines.push(`const self = new SqliteSelfRepository({ dbPath: path.resolve(rootDir, 'siduri.sqlite') });`);
             instantiationLines.push(`const behavior = new ActiveSelfCompiler(config.organs.behavior);`);
             // NOTE: .self file is NOT auto-installed on startup.
@@ -209,15 +209,15 @@ function generateInstanceFiles(options) {
             organMapEntries.push(`  behavior,`);
             organMapEntries.push(`  self,`);
         }
-        else if (m.name === '@siduri-x/memory') {
+        else if (m.name === '@sidurijs/memory') {
             instantiationLines.push(`const memory = new ${m.factory}({ ...config.organs.${m.configKey}, dbPath: path.resolve(rootDir, config.organs.${m.configKey}?.dbPath || 'siduri.sqlite') });`);
             organMapEntries.push(`  ${m.configKey},`);
         }
-        else if (m.name === '@siduri-x/knowledge') {
+        else if (m.name === '@sidurijs/knowledge') {
             instantiationLines.push(`const knowledge = new ${m.factory}({ ...config.organs.${m.configKey}, dbPath: path.resolve(rootDir, config.organs.${m.configKey}?.dbPath || 'siduri.sqlite') });`);
             organMapEntries.push(`  ${m.configKey},`);
         }
-        else if (m.name === '@siduri-x/observation') {
+        else if (m.name === '@sidurijs/observation') {
             const visionArg = hasVision ? 'vision' : '{ analyze: async () => JSON.stringify({ readings: [] }) }';
             instantiationLines.push(`const observation = new ${m.factory}(${visionArg});`);
             organMapEntries.push(`  ${m.configKey},`);
@@ -714,7 +714,7 @@ function generateInstanceFiles(options) {
         `    return;`,
         `  }`,
         '',
-        `  // API: Chat interaction (routed through canonical dispatchCompanionChat from @siduri-x/core)`,
+        `  // API: Chat interaction (routed through canonical dispatchCompanionChat from @sidurijs/core)`,
         `  if ((pathname === '/chat' || pathname === '/api/chat') && req.method === 'POST') {`,
         `    let body = '';`,
         `    req.on('data', (chunk) => { body += chunk; });`,
@@ -1035,13 +1035,13 @@ function generateInstanceFiles(options) {
         createAssetsDirs.push('assets/voice/default');
         readmeLines.push('', '### Voice & RVC Models', 'Place your character RVC voice models into `./assets/voice/default/`:', '- `default.pth` (Target voice weights)', '- `default.index` (Feature index file)');
     }
-    const knowledgeConfig = options.organConfigs?.knowledge || options.organConfigs?.['@siduri-x/knowledge'];
+    const knowledgeConfig = options.organConfigs?.knowledge || options.organConfigs?.['@sidurijs/knowledge'];
     if (manifests.some((m) => m.organType === 'knowledge') && knowledgeConfig?.packPath) {
         const cleanPackDir = String(knowledgeConfig.packPath).replace(/^\.\//, '');
         createAssetsDirs.push(cleanPackDir);
         readmeLines.push('', '### Knowledge Pack Assets', `Local knowledge pack files reside in \`./${cleanPackDir}/\`.`);
     }
-    const behaviorConfig = options.organConfigs?.behavior || options.organConfigs?.['@siduri-x/self'];
+    const behaviorConfig = options.organConfigs?.behavior || options.organConfigs?.['@sidurijs/self'];
     let selfPersonaFile = null;
     if (manifests.some((m) => m.organType === 'behavior')) {
         createAssetsDirs.push('assets/self');