ardfw 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardfw",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Agentics Framework CLI - Multi-agent system for Claude Code and OpenCode",
   "bin": {
     "ardfw": "tools/ard-npx-wrapper.js",

package/tools/cli/lib/installer.js

@@ -64,29 +64,20 @@ export default class Installer {
 
     // Check for existing _ard directory
     const ardPath = path.join(this.projectRoot, PATHS.ARD_DIR);
-    if (fs.existsSync(ardPath)) {
-      if (overwrite) {
-        // Overwrite mode: remove existing _ard directory and IDE directories
-        await fs.remove(ardPath);
-        // Also remove IDE directories if they exist
-        const claudePath = path.join(this.projectRoot, '.claude');
-        const opencodePath = path.join(this.projectRoot, '.opencode');
-        if (fs.existsSync(claudePath)) await fs.remove(claudePath);
-        if (fs.existsSync(opencodePath)) await fs.remove(opencodePath);
-      } else {
-        // Backup mode: create _ard_backup (with counter if needed)
-        await this._backupExistingArd();
-      }
+    if (fs.existsSync(ardPath) && !overwrite) {
+      // Backup mode: create _ard_backup (with counter if needed)
+      await this._backupExistingArd();
     }
+    // If overwrite mode: we keep existing _ard and just overwrite overlapping files
 
     // 1. Create _ard directory structure
     await this._createArdDirectory();
 
-    // 2. Copy project_config template
-    await this._copyProjectConfig();
+    // 2. Copy project_config template (overwrite overlapping files if overwrite mode)
+    await this._copyProjectConfig({ overwrite });
 
-    // 3. Create config.yaml
-    await this._createConfigYaml(projectName, enableClaude, enableOpenCode);
+    // 3. Create config.yaml (overwrite if overwrite mode)
+    await this._createConfigYaml(projectName, enableClaude, enableOpenCode, overwrite);
 
     // 4. Create artifacts directory
     await this._createArtifactsDirectory();
@@ -97,11 +88,11 @@ export default class Installer {
 
     // 6. Create IDE symlinks and workflow symlinks
     if (enableClaude) {
-      await this._createIdeSymlinks('claude');
+      await this._createIdeSymlinks('claude', overwrite);
       await this._createWorkflowSymlinks('claude');
     }
     if (enableOpenCode) {
-      await this._createIdeSymlinks('opencode');
+      await this._createIdeSymlinks('opencode', overwrite);
       await this._createWorkflowSymlinks('opencode');
     }
 
@@ -167,7 +158,7 @@ export default class Installer {
     }
 
     await fs.copy(srcPath, destPath, {
-      overwrite: !options.merge, // Don't overwrite in merge mode
+      overwrite: options.overwrite || false, // Only overwrite if explicitly requested
       errorOnExist: false,
     });
   }
@@ -210,11 +201,11 @@ export default class Installer {
     await fs.writeFile(path.join(destPath, 'skills/.gitkeep'), '');
   }
 
-  async _createConfigYaml(projectName, enableClaude, enableOpenCode) {
+  async _createConfigYaml(projectName, enableClaude, enableOpenCode, overwrite = false) {
     const configPath = path.join(this.projectRoot, PATHS.CONFIG_YAML);
 
-    // Don't overwrite existing config
-    if (fs.existsSync(configPath)) {
+    // Don't overwrite existing config unless overwrite is set
+    if (fs.existsSync(configPath) && !overwrite) {
       return;
     }
 
@@ -406,7 +397,7 @@ export default class Installer {
     }
   }
 
-  async _createIdeSymlinks(ideId) {
+  async _createIdeSymlinks(ideId, overwrite = false) {
     const ideConfig = IDE_CONFIGS[ideId];
     const idePath = path.join(this.projectRoot, ideConfig.linkName);
 
@@ -414,13 +405,19 @@ export default class Installer {
     if (fs.existsSync(idePath)) {
       const stat = fs.lstatSync(idePath);
       if (!stat.isSymbolicLink()) {
-        throw new Error(
-          `${ideConfig.linkName} exists and is not a symlink. ` +
-            `Please remove or rename it before installing.`
-        );
+        if (overwrite) {
+          // Overwrite mode: remove existing directory
+          await fs.remove(idePath);
+        } else {
+          throw new Error(
+            `${ideConfig.linkName} exists and is not a symlink. ` +
+              `Please remove or rename it before installing, or use --overwrite.`
+          );
+        }
+      } else {
+        // Remove existing symlink
+        await fs.remove(idePath);
       }
-      // Remove existing symlink
-      await fs.remove(idePath);
     }
 
     // Create IDE directory
@@ -432,6 +429,11 @@ export default class Installer {
       const targetName = mapping.targets[ideId];
       const targetPath = path.join(idePath, targetName);
 
+      // Remove existing target if overwrite mode
+      if (overwrite && fs.existsSync(targetPath)) {
+        await fs.remove(targetPath);
+      }
+
       // Create symlink
       const symlinkType = mapping.isDir ? 'dir' : 'file';
       await fs.symlink(sourcePath, targetPath, symlinkType);