@vxnus/siduri 2.0.37 → 2.0.38

package/dist/builtin-manifests.js

@@ -5,7 +5,7 @@ exports.BUILTIN_ORGAN_MANIFESTS = [
     {
         name: '@siduri-x/self',
         organType: 'behavior',
-        version: '2.0.7',
+        version: '2.0.11',
         displayName: 'Self & Persona (Identity & Directives)',
         description: 'Autonomous persona compiler, relational stances, and .self asset loader',
         entrypoint: './dist/index.js',

package/dist/generator.js

@@ -75,7 +75,7 @@ function generateInstanceFiles(options) {
     const instanceName = options.name || 'my-siduri';
     const instanceId = options.id || 'default';
     const coreVersion = options.coreVersion || '^2.0.15';
-    const cliVersion = options.cliVersion || '^2.0.37';
+    const cliVersion = options.cliVersion || '^2.0.38';
     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);
@@ -191,7 +191,7 @@ function generateInstanceFiles(options) {
     ];
     for (const m of manifests) {
         if (m.name === '@siduri-x/self') {
-            importLines.push(`import { ActiveSelfCompiler, SqliteSelfRepository, SelfPackageParser } from '@siduri-x/self';`);
+            importLines.push(`import { ActiveSelfCompiler, SqliteSelfRepository, SelfPackageParser, scanDirective } from '@siduri-x/self';`);
         }
         else {
             importLines.push(`import { ${m.factory} } from '${m.name}';`);
@@ -346,6 +346,191 @@ function generateInstanceFiles(options) {
         `    return;`,
         `  }`,
         '',
+        `  // API: Teach Mode detected-self`,
+        `  if (pathname === '/teach/detected-self' && req.method === 'GET') {`,
+        `    res.writeHead(200, { 'Content-Type': 'application/json' });`,
+        `    if (typeof SelfPackageParser === 'undefined') {`,
+        `      res.end(JSON.stringify({ detected: false }));`,
+        `      return;`,
+        `    }`,
+        `    try {`,
+        `      const companionId = parsedUrl.searchParams.get('companionId') || config.id || 'default';`,
+        `      const explicitPath = parsedUrl.searchParams.get('path');`,
+        `      const envPath = process.env.SIDURI_SELF_PATH || process.env.SELF_PATH;`,
+        `      const configPath = config.organs?.behavior?.selfPath;`,
+        `      const candidates = [];`,
+        `      if (explicitPath) candidates.push(path.resolve(rootDir, explicitPath));`,
+        `      if (envPath) candidates.push(path.resolve(rootDir, envPath));`,
+        `      if (configPath) candidates.push(path.resolve(rootDir, configPath));`,
+        `      candidates.push(path.resolve(rootDir, 'assets', 'self', companionId + '.self'));`,
+        `      candidates.push(path.resolve(rootDir, 'assets', 'self', 'default.self'));`,
+        `      candidates.push(path.resolve(rootDir, companionId + '.self'));`,
+        '',
+        `      const searchDirs = [`,
+        `        path.resolve(rootDir, 'assets', 'self'),`,
+        `        path.resolve(rootDir, 'assets'),`,
+        `        path.resolve(rootDir),`,
+        `      ];`,
+        '',
+        `      let matchedFilePath = null;`,
+        `      for (const candidate of candidates) {`,
+        `        try {`,
+        `          const s = await stat(candidate);`,
+        `          if (s.isFile()) {`,
+        `            matchedFilePath = candidate;`,
+        `            break;`,
+        `          }`,
+        `        } catch {}`,
+        `      }`,
+        '',
+        `      if (!matchedFilePath) {`,
+        `        for (const dir of searchDirs) {`,
+        `          try {`,
+        `            const entries = await readdir(dir);`,
+        `            const selfFiles = entries.filter((f) => f.endsWith('.self'));`,
+        `            if (selfFiles.length > 0) {`,
+        `              const companionSelf = selfFiles.find((f) => f === companionId + '.self');`,
+        `              matchedFilePath = path.join(dir, companionSelf || selfFiles[0]);`,
+        `              break;`,
+        `            }`,
+        `          } catch {}`,
+        `        }`,
+        `      }`,
+        '',
+        `      if (!matchedFilePath) {`,
+        `        res.end(JSON.stringify({ detected: false }));`,
+        `        return;`,
+        `      }`,
+        '',
+        `      const content = await readFile(matchedFilePath, 'utf8');`,
+        `      const parsed = SelfPackageParser.parse(content);`,
+        `      let alreadyInstalled = false;`,
+        `      if (typeof self?.getIdentity === 'function') {`,
+        `        try {`,
+        `          const existingIdentity = await self.getIdentity(companionId);`,
+        `          const existingDirectives = await self.getActiveDirectives(companionId);`,
+        `          if (`,
+        `            existingIdentity &&`,
+        `            parsed.manifest?.identity?.name &&`,
+        `            existingIdentity.name.toLowerCase() === parsed.manifest.identity.name.toLowerCase() &&`,
+        `            existingDirectives.length > 0`,
+        `          ) {`,
+        `            alreadyInstalled = true;`,
+        `          }`,
+        `        } catch {}`,
+        `      }`,
+        '',
+        `      res.end(JSON.stringify({`,
+        `        detected: true,`,
+        `        filename: path.basename(matchedFilePath),`,
+        `        path: path.relative(rootDir, matchedFilePath),`,
+        `        content,`,
+        `        parsed,`,
+        `        alreadyInstalled,`,
+        `      }));`,
+        `    } catch (err) {`,
+        `      res.end(JSON.stringify({ detected: false, error: err.message }));`,
+        `    }`,
+        `    return;`,
+        `  }`,
+        '',
+        `  // API: Teach Mode upload-self`,
+        `  if (pathname === '/teach/upload-self' && req.method === 'POST') {`,
+        `    let body = '';`,
+        `    req.on('data', (chunk) => { body += chunk; });`,
+        `    req.on('end', async () => {`,
+        `      if (typeof SelfPackageParser === 'undefined') {`,
+        `        res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify({ error: 'Self organ is not configured' }));`,
+        `        return;`,
+        `      }`,
+        `      try {`,
+        `        const { content } = JSON.parse(body || '{}');`,
+        `        if (!content) {`,
+        `          res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `          res.end(JSON.stringify({ error: 'Missing content' }));`,
+        `          return;`,
+        `        }`,
+        `        const parsed = SelfPackageParser.parse(content);`,
+        `        res.writeHead(200, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify(parsed));`,
+        `      } catch (err) {`,
+        `        res.writeHead(500, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify({ error: err.message }));`,
+        `      }`,
+        `    });`,
+        `    return;`,
+        `  }`,
+        '',
+        `  // API: Teach Mode install-self`,
+        `  if (pathname === '/teach/install-self' && req.method === 'POST') {`,
+        `    let body = '';`,
+        `    req.on('data', (chunk) => { body += chunk; });`,
+        `    req.on('end', async () => {`,
+        `      if (typeof self === 'undefined' || typeof self?.setIdentity !== 'function') {`,
+        `        res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify({ error: 'Self organ is not configured' }));`,
+        `        return;`,
+        `      }`,
+        `      try {`,
+        `        const { companionId, manifest, approvedDirectiveIds } = JSON.parse(body || '{}');`,
+        `        const cid = companionId || config.id || 'default';`,
+        `        if (!manifest || !Array.isArray(approvedDirectiveIds)) {`,
+        `          res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `          res.end(JSON.stringify({ error: 'Missing required fields' }));`,
+        `          return;`,
+        `        }`,
+        `        if (!manifest.identity || !manifest.identity.name) {`,
+        `          res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `          res.end(JSON.stringify({ error: 'Invalid manifest: missing identity.name' }));`,
+        `          return;`,
+        `        }`,
+        `        const directivesToCommit = manifest.directives?.filter((d) => approvedDirectiveIds.includes(d.id)) || [];`,
+        `        for (const d of directivesToCommit) {`,
+        `          if (!d || typeof d.directive !== 'string') {`,
+        `            res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `            res.end(JSON.stringify({ error: 'Invalid directive entry: missing directive string' }));`,
+        `            return;`,
+        `          }`,
+        `          const scan = typeof scanDirective === 'function' ? scanDirective(d.directive) : { safe: true };`,
+        `          if (!scan.safe) {`,
+        `            res.writeHead(400, { 'Content-Type': 'application/json' });`,
+        `            res.end(JSON.stringify({ error: 'Safety check failed for directive: ' + scan.reason, directiveId: d.id, reason: scan.reason }));`,
+        `            return;`,
+        `          }`,
+        `        }`,
+        '',
+        `        await self.setIdentity({`,
+        `          companionId: cid,`,
+        `          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 (directivesToCommit.length > 0 && typeof self.commitDirectives === 'function') {`,
+        `          await self.commitDirectives(cid, directivesToCommit.map((d) => ({`,
+        `            id: d.id,`,
+        `            companionId: cid,`,
+        `            directive: d.directive,`,
+        `            category: d.category || 'behavioral',`,
+        `            status: 'active',`,
+        `            priority: d.priority || 50,`,
+        `            createdAt: new Date().toISOString(),`,
+        `          })));`,
+        `        }`,
+        '',
+        `        res.writeHead(200, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify({ success: true, companionId: cid, installedDirectives: directivesToCommit.length }));`,
+        `      } catch (err) {`,
+        `        res.writeHead(500, { 'Content-Type': 'application/json' });`,
+        `        res.end(JSON.stringify({ error: err.message }));`,
+        `      }`,
+        `    });`,
+        `    return;`,
+        `  }`,
+        '',
         `  // API: Voice & Observation health probes`,
         `  if (pathname === '/voice/health' && req.method === 'GET') {`,
         `    res.writeHead(200, { 'Content-Type': 'application/json' });`,
@@ -878,7 +1063,7 @@ function generateInstanceFiles(options) {
                 `license: "MIT"`,
                 ``,
                 `identity:`,
-                `  name: "${(behaviorConfig.name || behaviorConfig.companionName || '').replace(/"/g, '\\"')}"`,
+                `  name: "${(behaviorConfig.name || behaviorConfig.companionName || options.name || '').replace(/"/g, '\\"')}"`,
                 `  archetype: "${(behaviorConfig.archetype || 'Knowledge Assistant & Research Partner').replace(/"/g, '\\"')}"`,
                 `  origin: "Constructed companion"`,
                 `  ethos: "${(behaviorConfig.ethos || 'Direct technical candor, thoughtful, concise, and loyal').replace(/"/g, '\\"')}"`,

package/dist/generator.test.js

@@ -64,6 +64,18 @@ describe('Instance Generator Composition Invariants (Phase 3)', () => {
             environment: [{ name: 'VOICEVOX_URL', default: 'http://localhost:50021' }],
             services: [{ name: 'VOICEVOX', kind: 'http_service' }],
         },
+        self: {
+            name: '@siduri-x/self',
+            organType: 'behavior',
+            version: '1.0.0',
+            displayName: 'Self (Active Persona & Directives)',
+            entrypoint: './dist/index.js',
+            factory: 'ActiveSelfCompiler',
+            configKey: 'behavior',
+            configSchema: { type: 'object', properties: { provider: { type: 'string' } } },
+            environment: [],
+            services: [],
+        },
     };
     test('Composition A: Brain only', () => {
         const files = (0, generator_1.generateInstanceFiles)({
@@ -207,4 +219,34 @@ describe('Instance Generator Composition Invariants (Phase 3)', () => {
         expect(chatSlice).toContain("channel: 'direct'");
         expect(chatStreamSlice).toContain("channel: 'direct'");
     });
+    test('Composition F: Brain + Self persona manifest & Teach Mode endpoints', () => {
+        const files = (0, generator_1.generateInstanceFiles)({
+            name: 'BrattyCompanion',
+            selectedManifests: [MOCK_MANIFESTS.brain, MOCK_MANIFESTS.self],
+            organConfigs: {
+                behavior: {
+                    provider: 'active_self',
+                    mode: 'custom',
+                    archetype: 'Bratty little sister',
+                    ethos: 'bratty, warmth, smug',
+                    directive: 'Speak as bratty little sister, calling me onii-chan',
+                    selfPath: './assets/self/default.self',
+                },
+            },
+        });
+        // 1. Assets directory and .self file created in memory
+        expect(files.createAssetsDirs).toContain('assets/self');
+        expect(files['assets/self/default.self']).toBeDefined();
+        expect(files['assets/self/default.self']).toContain('archetype: "Bratty little sister"');
+        expect(files['assets/self/default.self']).toContain('ethos: "bratty, warmth, smug"');
+        expect(files['assets/self/default.self']).toContain('Speak as bratty little sister, calling me onii-chan');
+        expect(files['assets/self/default.self']).toContain('name: "BrattyCompanion"');
+        // 2. src/index.js imports scanDirective
+        const srcIndexJs = files['src/index.js'];
+        expect(srcIndexJs).toContain("import { ActiveSelfCompiler, SqliteSelfRepository, SelfPackageParser, scanDirective } from '@siduri-x/self';");
+        // 3. Teach Mode endpoints are generated
+        expect(srcIndexJs).toContain("pathname === '/teach/detected-self'");
+        expect(srcIndexJs).toContain("pathname === '/teach/upload-self'");
+        expect(srcIndexJs).toContain("pathname === '/teach/install-self'");
+    });
 });

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { OrganManifest } from './manifest';
-export declare const CLI_VERSION = "2.0.37";
+export declare const CLI_VERSION = "2.0.38";
 import { colors } from './colors';
 export { colors };
 export declare function printHeader(): void;

package/dist/index.js

@@ -61,7 +61,7 @@ const doctor_1 = require("./doctor");
 const db_1 = require("./db");
 const configurators_1 = require("./configurators");
 const execFile = (0, node_util_1.promisify)(node_child_process_1.execFile);
-exports.CLI_VERSION = '2.0.37';
+exports.CLI_VERSION = '2.0.38';
 const colors_1 = require("./colors");
 Object.defineProperty(exports, "colors", { enumerable: true, get: function () { return colors_1.colors; } });
 function printHeader() {
@@ -320,6 +320,25 @@ async function runCreateWizard(targetDir, options) {
     else if (files.createAssetsBodyDir) {
         await (0, promises_1.mkdir)(node_path_1.default.join(projectDir, 'assets/body'), { recursive: true });
     }
+    // Write all additional generated files (such as assets/self/default.self or other assets)
+    const handledKeys = new Set([
+        'package.json',
+        'siduri.config.json',
+        'siduri.schema.json',
+        '.env.example',
+        'README.md',
+        'src/index.js',
+        'public/index.html',
+        'createAssetsDirs',
+        'createAssetsBodyDir',
+    ]);
+    for (const [relPath, content] of Object.entries(files)) {
+        if (handledKeys.has(relPath) || typeof content !== 'string')
+            continue;
+        const destPath = node_path_1.default.join(projectDir, relPath);
+        await (0, promises_1.mkdir)(node_path_1.default.dirname(destPath), { recursive: true });
+        await (0, promises_1.writeFile)(destPath, content, 'utf8');
+    }
     // If local knowledge archive is configured with a download URL, automatically fetch and unpack it
     const knowledgeConfig = organConfigs.knowledge || organConfigs['@siduri-x/knowledge'];
     if (knowledgeConfig?.pack?.mode === 'local' && knowledgeConfig?.pack?.archiveUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vxnus/siduri",
-  "version": "2.0.37",
+  "version": "2.0.38",
   "description": "Experimental CLI for installing and configuring Siduri companions",
   "license": "Apache-2.0",
   "repository": {