@comfanion/workflow 4.36.3 → 4.36.5

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, '..');
@@ -572,59 +590,35 @@ program
         await fs.move(tempVectors, path.join(targetDir, 'vectors'), { overwrite: true });
       }
       
-      // Restore user's config.yaml with new sections if missing
-      spinner.text = 'Restoring config.yaml...';
-      let mergedConfig = configBackup;
-      
-      // Extract user's custom exclude patterns before merge
-      const userExcludeMatch = configBackup.match(/exclude:\s*\n((?:\s+-\s+.+\n?)+)/);
-      const userExcludes = userExcludeMatch 
-        ? userExcludeMatch[1].match(/-\s+(.+)/g)?.map(m => m.replace(/^-\s+/, '').trim()) || []
-        : [];
-      
-      // Add vectorizer section if missing
-      if (!mergedConfig.includes('vectorizer:')) {
-        const newConfigPath = path.join(targetDir, 'config.yaml');
-        const newConfig = await fs.readFile(newConfigPath, 'utf8');
-        const vectorizerMatch = newConfig.match(/(# =+\n# VECTORIZER[\s\S]*?)(?=# =+\n# [A-Z])/);
-        if (vectorizerMatch) {
-          // Insert before LSP section or at end
-          const insertPoint = mergedConfig.indexOf('# =============================================================================\n# LSP');
-          if (insertPoint > 0) {
-            mergedConfig = mergedConfig.slice(0, insertPoint) + vectorizerMatch[1] + mergedConfig.slice(insertPoint);
-          } else {
-            mergedConfig += '\n' + vectorizerMatch[1];
-          }
-          console.log(chalk.green('  ✅ Added new vectorizer configuration section'));
-        }
-      }
-      
-      // Merge user's custom excludes into vectorizer section
-      if (userExcludes.length > 0) {
+      // Merge config.yaml: new defaults + user overrides
+      spinner.text = 'Merging config.yaml...';
+      try {
         const newConfigPath = path.join(targetDir, 'config.yaml');
-        const newConfig = await fs.readFile(newConfigPath, 'utf8');
-        const defaultExcludeMatch = newConfig.match(/exclude:\s*\n((?:\s+-\s+.+\n?)+)/);
-        const defaultExcludes = defaultExcludeMatch
-          ? defaultExcludeMatch[1].match(/-\s+(.+)/g)?.map(m => m.replace(/^-\s+/, '').trim()) || []
-          : [];
+        const newConfigContent = await fs.readFile(newConfigPath, 'utf8');
         
-        // Find excludes that user added (not in defaults)
-        const customExcludes = userExcludes.filter(e => !defaultExcludes.includes(e));
+        // Parse both configs
+        const newConfig = yaml.load(newConfigContent) || {};
+        const userConfig = yaml.load(configBackup) || {};
         
-        if (customExcludes.length > 0) {
-          // Add custom excludes to the merged config
-          const excludeInsertPoint = mergedConfig.match(/exclude:\s*\n((?:\s+-\s+.+\n?)+)/);
-          if (excludeInsertPoint) {
-            const insertAfter = excludeInsertPoint.index + excludeInsertPoint[0].length;
-            const customLines = customExcludes.map(e => `    - ${e}`).join('\n') + '\n';
-            mergedConfig = mergedConfig.slice(0, insertAfter) + customLines + mergedConfig.slice(insertAfter);
-            console.log(chalk.green(`  ✅ Preserved ${customExcludes.length} custom exclude patterns`));
-          }
-        }
+        // 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)'));
       }
       
-      await fs.writeFile(configPath, mergedConfig);
-      
       // Install plugin dependencies
       spinner.text = 'Installing plugin dependencies...';
       let pluginDepsInstalled = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfanion/workflow",
-  "version": "4.36.3",
+  "version": "4.36.5",
   "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:58:40.429Z",
+  "buildDate": "2026-01-24T15:01:58.449Z",
   "files": [
     "config.yaml",
     "FLOW.yaml",