@comfanion/workflow 4.36.4 → 4.36.6

package/bin/cli.js

@@ -8,6 +8,24 @@ import fs from 'fs-extra';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { execSync } from 'child_process';
+import yaml from 'js-yaml';
+
+/**
+ * Deep merge two objects. User values override defaults.
+ * Arrays are replaced, not merged.
+ */
+function deepMerge(defaults, user) {
+  const result = { ...defaults };
+  for (const key of Object.keys(user)) {
+    if (user[key] !== null && typeof user[key] === 'object' && !Array.isArray(user[key]) &&
+        defaults[key] !== null && typeof defaults[key] === 'object' && !Array.isArray(defaults[key])) {
+      result[key] = deepMerge(defaults[key], user[key]);
+    } else {
+      result[key] = user[key];
+    }
+  }
+  return result;
+}
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_DIR = path.join(__dirname, '..');
@@ -260,6 +278,8 @@ program
       let hadVectorizer = false;
       let hadVectors = false;
       
+      let existingConfigContent = null;
+      
       if (await fs.pathExists(targetDir)) {
         const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
         const backupDir = path.join(process.cwd(), `.opencode.backup-${timestamp}`);
@@ -268,6 +288,12 @@ program
         hadVectorizer = await fs.pathExists(vectorizerNodeModules);
         hadVectors = await fs.pathExists(vectorsDir);
         
+        // Read existing config.yaml for merge
+        const existingConfigPath = path.join(targetDir, 'config.yaml');
+        if (await fs.pathExists(existingConfigPath)) {
+          existingConfigContent = await fs.readFile(existingConfigPath, 'utf8');
+        }
+        
         // Preserve vectorizer node_modules (100MB+, don't backup)
         if (hadVectorizer) {
           spinner.text = 'Preserving vectorizer dependencies...';
@@ -323,18 +349,37 @@ program
       const configPath = path.join(targetDir, 'config.yaml');
       let configContent = await fs.readFile(configPath, 'utf8');
       
+      // If we had existing config, merge it (preserve user customizations)
+      if (existingConfigContent) {
+        try {
+          const newConfig = yaml.load(configContent) || {};
+          const existingConfig = yaml.load(existingConfigContent) || {};
+          const mergedConfig = deepMerge(newConfig, existingConfig);
+          configContent = yaml.dump(mergedConfig, {
+            indent: 2,
+            lineWidth: 120,
+            noRefs: true,
+            sortKeys: false
+          });
+          console.log(chalk.green('  ✅ Merged existing config settings'));
+        } catch (e) {
+          // Merge failed, continue with new config + user values
+        }
+      }
+      
+      // Apply user's answers from prompts
       configContent = configContent
-        .replace(/user_name: ".*"/, `user_name: "${config.user_name}"`)
-        .replace(/communication_language: ".*"/, `communication_language: "${config.communication_language}"`)
-        .replace(/project_name: ".*"/, `project_name: "${config.project_name}"`)
+        .replace(/user_name: .*/, `user_name: "${config.user_name}"`)
+        .replace(/communication_language: .*/, `communication_language: "${config.communication_language}"`)
+        .replace(/project_name: .*/, `project_name: "${config.project_name}"`)
         .replace(/methodology: (tdd|stub)/, `methodology: ${config.methodology}`);
       
       // Jira config
       if (config.jira_enabled) {
         configContent = configContent
           .replace(/enabled: false\s+# Jira/, `enabled: true  # Jira`)
-          .replace(/base_url: ".*"/, `base_url: "${config.jira_url}"`)
-          .replace(/project_key: ".*"/, `project_key: "${config.jira_project}"`);
+          .replace(/base_url: .*/, `base_url: "${config.jira_url}"`)
+          .replace(/project_key: .*/, `project_key: "${config.jira_project}"`);
       }
       
       // Vectorizer config
@@ -572,10 +617,34 @@ program
         await fs.move(tempVectors, path.join(targetDir, 'vectors'), { overwrite: true });
       }
       
-      // Restore user's config.yaml completely - only add missing sections
-      spinner.text = 'Restoring config.yaml...';
-      await fs.writeFile(configPath, configBackup);
-      console.log(chalk.green('  ✅ config.yaml preserved'));
+      // Merge config.yaml: new defaults + user overrides
+      spinner.text = 'Merging config.yaml...';
+      try {
+        const newConfigPath = path.join(targetDir, 'config.yaml');
+        const newConfigContent = await fs.readFile(newConfigPath, 'utf8');
+        
+        // Parse both configs
+        const newConfig = yaml.load(newConfigContent) || {};
+        const userConfig = yaml.load(configBackup) || {};
+        
+        // Deep merge: defaults from new config, overridden by user values
+        const mergedConfig = deepMerge(newConfig, userConfig);
+        
+        // Dump back to YAML with nice formatting
+        const mergedContent = yaml.dump(mergedConfig, {
+          indent: 2,
+          lineWidth: 120,
+          noRefs: true,
+          sortKeys: false
+        });
+        
+        await fs.writeFile(configPath, mergedContent);
+        console.log(chalk.green('  ✅ config.yaml merged (your settings preserved, new options added)'));
+      } catch (e) {
+        // Fallback: just restore user's config if merge fails
+        await fs.writeFile(configPath, configBackup);
+        console.log(chalk.yellow('  ⚠️ config.yaml restored (merge failed, using your original)'));
+      }
       
       // Install plugin dependencies
       spinner.text = 'Installing plugin dependencies...';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfanion/workflow",
-  "version": "4.36.4",
+  "version": "4.36.6",
   "description": "Initialize OpenCode Workflow system for AI-assisted development with semantic code search",
   "type": "module",
   "bin": {
@@ -50,6 +50,7 @@
     "glob": "^10.5.0",
     "ignore": "^5.3.0",
     "inquirer": "^9.2.0",
+    "js-yaml": "^4.1.1",
     "ora": "^7.0.0"
   }
 }

package/src/build-info.json

@@ -1,6 +1,6 @@
 {
   "version": "3.0.0",
-  "buildDate": "2026-01-24T14:59:22.208Z",
+  "buildDate": "2026-01-24T15:05:07.173Z",
   "files": [
     "config.yaml",
     "FLOW.yaml",