@vxnus/siduri 2.0.35 → 2.0.36

package/dist/generator.js

@@ -76,7 +76,7 @@ function generateInstanceFiles(options) {
     const companionSlug = instanceName.toLowerCase().replace(/[^a-z0-9_-]/g, '') || 'default';
     const instanceId = options.id || 'default';
     const coreVersion = options.coreVersion || '^2.0.15';
-    const cliVersion = options.cliVersion || '^2.0.35';
+    const cliVersion = options.cliVersion || '^2.0.36';
     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);
@@ -210,7 +210,7 @@ function generateInstanceFiles(options) {
             instantiationLines.push(`  if (selfRaw) {`);
             instantiationLines.push(`    const parsedSelf = SelfPackageParser.parse(selfRaw);`);
             instantiationLines.push(`    if (parsedSelf.isValid && parsedSelf.manifest) {`);
-            instantiationLines.push(`      await self.setIdentity({ companionId: config.id || 'default', name: parsedSelf.manifest.identity?.name || config.name, archetype: parsedSelf.manifest.identity?.archetype, version: parsedSelf.manifest.version || '1.0.0', updatedAt: new Date().toISOString() });`);
+            instantiationLines.push(`      await self.setIdentity({ companionId: config.id || 'default', name: parsedSelf.manifest.identity?.name || '', archetype: parsedSelf.manifest.identity?.archetype, version: parsedSelf.manifest.version || '1.0.0', updatedAt: new Date().toISOString() });`);
             instantiationLines.push(`      if (parsedSelf.manifest.directives) {`);
             instantiationLines.push(`        await self.commitDirectives(config.id || 'default', parsedSelf.manifest.directives.map((d) => ({ id: d.id, companionId: config.id || 'default', directive: d.directive, category: (d.category || 'behavioral'), status: 'active', priority: d.priority || 50, createdAt: new Date().toISOString() })));`);
             instantiationLines.push(`      }`);
@@ -337,7 +337,7 @@ function generateInstanceFiles(options) {
         `    res.end(JSON.stringify({`,
         `      id: config.id,`,
         `      companionId: config.id,`,
-        `      name: identity?.name || config.name || 'Siduri',`,
+        `      name: identity?.name || undefined,`,
         `      archetype: identity?.archetype || identity?.role,`,
         `      origin: identity?.origin,`,
         `      ethos: identity?.ethos,`,
@@ -879,7 +879,7 @@ function generateInstanceFiles(options) {
                 `license: "MIT"`,
                 ``,
                 `identity:`,
-                `  name: "${instanceName}"`,
+                `  name: "${(behaviorConfig.name || behaviorConfig.companionName || '').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/index.d.ts

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 import { OrganManifest } from './manifest';
-export declare const CLI_VERSION = "2.0.35";
+export declare const CLI_VERSION = "2.0.36";
 import { colors } from './colors';
 export { colors };
 export declare function printHeader(): void;
 export declare function printSection(title: string): void;
 export declare function printSuccess(message: string): void;
 export declare function projectDirectoryName(value: string): string;
-export declare function formatReviewSummary(companionName: string, selectedManifests: OrganManifest[], organSummaries: Record<string, Record<string, unknown>>): string;
+export declare function validateProjectDirectory(value: string): true | string;
+export declare function formatReviewSummary(projectDirName: string, selectedManifests: OrganManifest[], organSummaries: Record<string, Record<string, unknown>>): string;
 export declare function withTask<T>(label: string, task: () => Promise<T>): Promise<T>;
 export declare function runCreateWizard(targetDir?: string, options?: {
     localPath?: string;

package/dist/index.js

@@ -42,6 +42,7 @@ exports.printHeader = printHeader;
 exports.printSection = printSection;
 exports.printSuccess = printSuccess;
 exports.projectDirectoryName = projectDirectoryName;
+exports.validateProjectDirectory = validateProjectDirectory;
 exports.formatReviewSummary = formatReviewSummary;
 exports.withTask = withTask;
 exports.runCreateWizard = runCreateWizard;
@@ -60,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.35';
+exports.CLI_VERSION = '2.0.36';
 const colors_1 = require("./colors");
 Object.defineProperty(exports, "colors", { enumerable: true, get: function () { return colors_1.colors; } });
 function printHeader() {
@@ -74,18 +75,27 @@ function printSuccess(message) {
     console.log(`${colors_1.colors.green}✓${colors_1.colors.reset} ${message}`);
 }
 function projectDirectoryName(value) {
-    const slug = value
-        .trim()
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-+|-+$/g, '');
-    return slug || 'siduri';
+    return (value || '').trim() || 'Companion';
 }
-function formatReviewSummary(companionName, selectedManifests, organSummaries) {
+function validateProjectDirectory(value) {
+    const trimmed = (value || '').trim();
+    if (!trimmed) {
+        return 'Please enter a project directory.';
+    }
+    if (/^\d+$/.test(trimmed) || !isNaN(Number(trimmed))) {
+        return 'Project directory cannot be a number.';
+    }
+    const resolved = node_path_1.default.resolve(process.cwd(), trimmed);
+    if (node_fs_1.default.existsSync(resolved)) {
+        return `Directory "${trimmed}" already exists in the current directory.`;
+    }
+    return true;
+}
+function formatReviewSummary(projectDirName, selectedManifests, organSummaries) {
     const lines = [];
-    lines.push(`\n${colors_1.colors.cyan}── Review ${companionName} ${'─'.repeat(Math.max(2, 42 - (companionName.length + 9)))}${colors_1.colors.reset}\n`);
-    lines.push(`  ${colors_1.colors.bold}Companion${colors_1.colors.reset}`);
-    lines.push(`    ${colors_1.colors.dim}Name:${colors_1.colors.reset}     ${companionName}\n`);
+    lines.push(`\n${colors_1.colors.cyan}── Review ${projectDirName} ${'─'.repeat(Math.max(2, 42 - (projectDirName.length + 9)))}${colors_1.colors.reset}\n`);
+    lines.push(`  ${colors_1.colors.bold}Project${colors_1.colors.reset}`);
+    lines.push(`    ${colors_1.colors.dim}Directory:${colors_1.colors.reset} ${projectDirName}\n`);
     for (const m of selectedManifests) {
         const isRequired = m.organType === 'brain';
         const tag = isRequired ? ` ${colors_1.colors.dim}· required${colors_1.colors.reset}` : '';
@@ -136,20 +146,42 @@ async function runCreateWizard(targetDir, options) {
     if (availableManifests.length === 0) {
         throw new Error('No @siduri-x/* organ packages found. Please ensure organs are installed or in workspace.');
     }
-    printSection('Companion Details');
-    const basicAnswers = await inquirer_1.default.prompt([
-        {
-            type: 'input',
-            name: 'name',
-            message: 'Companion name:',
-            default: 'Siduri',
-            validate: nonEmpty,
-        },
-    ]);
-    const companionName = basicAnswers.name;
-    const projectDir = targetDir ? node_path_1.default.resolve(process.cwd(), targetDir) : node_path_1.default.resolve(process.cwd(), projectDirectoryName(companionName));
+    printSection('Project Details');
+    let projectDirName;
+    if (targetDir) {
+        const check = validateProjectDirectory(targetDir);
+        if (check !== true) {
+            console.warn(`${colors_1.colors.yellow}!${colors_1.colors.reset} Provided directory "${targetDir}" is invalid: ${check}\n`);
+            const dirAnswers = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'directory',
+                    message: 'Project directory:',
+                    default: 'Companion',
+                    validate: validateProjectDirectory,
+                },
+            ]);
+            projectDirName = dirAnswers.directory.trim();
+        }
+        else {
+            projectDirName = targetDir.trim();
+        }
+    }
+    else {
+        const dirAnswers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'directory',
+                message: 'Project directory:',
+                default: 'Companion',
+                validate: validateProjectDirectory,
+            },
+        ]);
+        projectDirName = dirAnswers.directory.trim();
+    }
+    const projectDir = node_path_1.default.resolve(process.cwd(), projectDirName);
     printSection('Organ Configuration');
-    console.log(`${colors_1.colors.dim}Configuring capability organs for ${companionName} sequentially from cognition to physical embodiment.${colors_1.colors.reset}\n`);
+    console.log(`${colors_1.colors.dim}Configuring capability organs for ${projectDirName} sequentially from cognition to physical embodiment.${colors_1.colors.reset}\n`);
     // Canonical organ presentation order: Cognition -> Memory/State -> Identity -> Embodiment & Peripheral
     const canonicalOrder = ['brain', 'memory', 'knowledge', 'behavior', 'voice', 'body', 'mouth', 'hands', 'vision', 'ear', 'observation'];
     const orderedManifests = [...availableManifests].sort((a, b) => {
@@ -167,7 +199,7 @@ async function runCreateWizard(targetDir, options) {
         const sectionTitle = isRequired ? `${m.displayName.split(' ')[0] || m.organType} · required` : m.displayName.split(' ')[0] || m.organType;
         printSection(sectionTitle);
         const res = await (0, configurators_1.configureOrgan)(m, {
-            companionName,
+            companionName: projectDirName,
             existingConfig: organConfigs[m.configKey],
         });
         if (res.config?.provider === 'none') {
@@ -179,11 +211,11 @@ async function runCreateWizard(targetDir, options) {
     }
     // 2. Final Review and Edit Loop
     while (true) {
-        console.log(formatReviewSummary(companionName, selectedManifests, organSummaries));
+        console.log(formatReviewSummary(projectDirName, selectedManifests, organSummaries));
         const { reviewAction } = await inquirer_1.default.prompt({
             type: 'list',
             name: 'reviewAction',
-            message: `Create ${companionName} with this configuration?`,
+            message: `Create ${projectDirName} with this configuration?`,
             choices: [
                 { name: 'Yes, create', value: 'create' },
                 { name: 'Go back and edit', value: 'edit' },
@@ -224,7 +256,7 @@ async function runCreateWizard(targetDir, options) {
                 const sectionTitle = isRequired ? `${m.displayName.split(' ')[0] || m.organType} · required` : m.displayName.split(' ')[0] || m.organType;
                 printSection(sectionTitle);
                 const res = await (0, configurators_1.configureOrgan)(m, {
-                    companionName,
+                    companionName: projectDirName,
                     existingConfig: organConfigs[m.configKey],
                 });
                 if (res.config?.provider === 'none') {
@@ -251,7 +283,7 @@ async function runCreateWizard(targetDir, options) {
     }
     // 4. Generate Instance Files
     const files = (0, generator_1.generateInstanceFiles)({
-        name: companionName,
+        name: projectDirName,
         selectedManifests,
         organConfigs,
         localPath: options?.localPath,

package/dist/project-dir.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/project-dir.test.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('inquirer', () => ({
+    prompt: jest.fn(),
+    Separator: jest.fn((label) => ({ type: 'separator', line: label })),
+}));
+const index_1 = require("./index");
+describe('Project Directory Validation & Handling', () => {
+    test('rejects empty or whitespace-only directory names', () => {
+        expect((0, index_1.validateProjectDirectory)('')).toBe('Please enter a project directory.');
+        expect((0, index_1.validateProjectDirectory)('   ')).toBe('Please enter a project directory.');
+    });
+    test('rejects purely numeric directory names', () => {
+        expect((0, index_1.validateProjectDirectory)('123')).toBe('Project directory cannot be a number.');
+        expect((0, index_1.validateProjectDirectory)('0')).toBe('Project directory cannot be a number.');
+        expect((0, index_1.validateProjectDirectory)('42')).toBe('Project directory cannot be a number.');
+        expect((0, index_1.validateProjectDirectory)('999999')).toBe('Project directory cannot be a number.');
+    });
+    test('rejects directory names that already exist in cwd', () => {
+        // 'src' definitely exists in cli working directory
+        const result = (0, index_1.validateProjectDirectory)('src');
+        expect(result).toBe('Directory "src" already exists in the current directory.');
+    });
+    test('accepts valid non-kebab-case directory names', () => {
+        const nonExistentDir = 'CompanionTestDir_' + Date.now();
+        expect((0, index_1.validateProjectDirectory)(nonExistentDir)).toBe(true);
+        const privateCompanion = 'PrivateCompanion_' + Date.now();
+        expect((0, index_1.validateProjectDirectory)(privateCompanion)).toBe(true);
+    });
+    test('projectDirectoryName preserves casing without forcing kebab-case', () => {
+        expect((0, index_1.projectDirectoryName)('Companion')).toBe('Companion');
+        expect((0, index_1.projectDirectoryName)('PrivateCompanion')).toBe('PrivateCompanion');
+        expect((0, index_1.projectDirectoryName)('MySpecialCompanion')).toBe('MySpecialCompanion');
+        expect((0, index_1.projectDirectoryName)('   TrimmedCompanion   ')).toBe('TrimmedCompanion');
+        expect((0, index_1.projectDirectoryName)('')).toBe('Companion');
+    });
+});

package/dist/web-template.js

@@ -324,7 +324,7 @@ function generateWebHtml(instanceName, manifests) {
   <header>
     <div class="brand">
       <h1>◈ SIDURI</h1>
-      <span id="companion-display-name" style="font-weight: 600; color: #fff;">${instanceName}</span>
+      <span id="companion-display-name" style="font-weight: 600; color: #fff;">Companion</span>
       <div class="badges">
         ${organBadges}
       </div>
@@ -350,7 +350,7 @@ function generateWebHtml(instanceName, manifests) {
         <div class="chat-pane">
           <div id="messages" class="messages-container">
             <div class="message companion">
-              <div class="meta companion-meta">${instanceName}</div>
+              <div class="meta companion-meta">Companion</div>
               Hello! I am your Siduri companion. How can I help you today?
             </div>
           </div>
@@ -415,7 +415,7 @@ function generateWebHtml(instanceName, manifests) {
 
   <script>
     let currentClaims = [];
-    let companionName = '${instanceName}';
+    let companionName = 'Companion';
 
     function updateCompanionName(newName) {
       if (!newName || typeof newName !== 'string' || !newName.trim()) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vxnus/siduri",
-  "version": "2.0.35",
+  "version": "2.0.36",
   "description": "Experimental CLI for installing and configuring Siduri companions",
   "license": "Apache-2.0",
   "repository": {
@@ -23,6 +23,11 @@
     "siduri": "dist/index.js"
   },
   "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc && node ./scripts/copy-web-dist.cjs",
+    "dev": "tsc -w",
+    "test": "jest --config jest.config.json"
+  },
   "dependencies": {
     "@vxnus/e": "^0.1.5",
     "@vxnus/e-knowledge": "^0.1.5",
@@ -35,10 +40,5 @@
     "ts-jest": "^29.4.12",
     "typescript": "^5.9.3",
     "@types/inquirer": "^9.0.10"
-  },
-  "scripts": {
-    "build": "tsc && node ./scripts/copy-web-dist.cjs",
-    "dev": "tsc -w",
-    "test": "jest --config jest.config.json"
   }
-}
+}