@qlucent/fishi 0.1.0 → 0.3.0

package/dist/index.js

@@ -10,6 +10,7 @@ import ora from "ora";
 import inquirer from "inquirer";
 import path3 from "path";
 import fs3 from "fs";
+import { detectConflicts, createBackup } from "@qlucent/fishi-core";
 
 // src/analyzers/detector.ts
 import fs from "fs";
@@ -956,14 +957,21 @@ async function initCommand(description, options) {
   console.log(chalk.gray("  Autonomous agent framework for Claude Code"));
   console.log("");
   if (fs3.existsSync(path3.join(targetDir, ".fishi"))) {
-    console.log(
-      chalk.yellow("  \u26A0 FISHI is already initialized in this directory.")
-    );
-    console.log(chalk.gray("  Run `fishi status` to see project state."));
-    console.log(
-      chalk.gray("  Run `fishi reset` to start over from a checkpoint.")
-    );
-    return;
+    if (options.interactive !== false) {
+      const { reinit } = await inquirer.prompt([{
+        type: "confirm",
+        name: "reinit",
+        message: "FISHI is already initialized in this directory. Re-initialize?",
+        default: false
+      }]);
+      if (!reinit) {
+        console.log(chalk.gray("  Run `fishi status` to see project state."));
+        return;
+      }
+    } else {
+      console.log(chalk.yellow("  \u26A0 FISHI already initialized. Run `fishi status` to see project state."));
+      return;
+    }
   }
   const spinner = ora("Analyzing project directory...").start();
   const detection = await detectProjectType(targetDir);
@@ -1054,6 +1062,50 @@ async function initCommand(description, options) {
       }
     }
   }
+  const conflictResult = detectConflicts(targetDir);
+  let resolutions;
+  if (conflictResult.hasConflicts) {
+    console.log("");
+    console.log(chalk.yellow(`  \u26A0 Found ${conflictResult.totalConflicts} existing file(s) that FISHI wants to create.`));
+    console.log("");
+    const backupSpinner = ora("Backing up existing files...").start();
+    const allConflictPaths = conflictResult.categories.flatMap((c) => c.conflicts.map((f) => f.path));
+    const backupPath = await createBackup(targetDir, allConflictPaths);
+    backupSpinner.succeed(`Backup created at ${path3.relative(targetDir, backupPath)}`);
+    console.log("");
+    resolutions = { categories: {}, files: {} };
+    if (options.interactive !== false) {
+      for (const cat of conflictResult.categories) {
+        if (cat.conflicts.length === 0) continue;
+        const conflictSummary = cat.conflicts.length === 1 ? `Found existing ${cat.label} (${cat.conflicts[0].size} bytes)` : `Found ${cat.conflicts.length} existing ${cat.label} files`;
+        const noMergeCategories = ["agents", "skills", "commands"];
+        const canMerge = !noMergeCategories.includes(cat.name);
+        const choices = canMerge ? [
+          { name: "Merge \u2014 add FISHI content alongside existing", value: "merge" },
+          { name: "Skip \u2014 leave existing files untouched", value: "skip" },
+          { name: "Replace \u2014 overwrite with FISHI version (backup saved)", value: "replace" }
+        ] : [
+          { name: "Skip \u2014 leave existing files untouched", value: "skip" },
+          { name: "Replace \u2014 overwrite with FISHI version (backup saved)", value: "replace" }
+        ];
+        const { action } = await inquirer.prompt([{
+          type: "list",
+          name: "action",
+          message: `${conflictSummary}. How should FISHI handle this?`,
+          choices,
+          default: canMerge ? "merge" : "skip"
+        }]);
+        resolutions.categories[cat.name] = action;
+      }
+    } else {
+      const defaultAction = options.mergeAll ? "merge" : options.replaceAll ? "replace" : "skip";
+      for (const cat of conflictResult.categories) {
+        if (cat.conflicts.length > 0) {
+          resolutions.categories[cat.name] = defaultAction;
+        }
+      }
+    }
+  }
   console.log("");
   const scaffoldSpinner = ora("Scaffolding FISHI framework...").start();
   try {
@@ -1082,7 +1134,10 @@ async function initCommand(description, options) {
       ...initOptions,
       projectName,
       projectType: detection.type,
-      brownfieldAnalysis: brownfieldData
+      brownfieldAnalysis: brownfieldData,
+      resolutions,
+      docsReadmeExists: conflictResult?.docsReadmeExists,
+      rootClaudeMdExists: conflictResult?.rootClaudeMdExists
     });
     if (brownfieldAnalysis) {
       const reportPath = path3.join(targetDir, ".fishi", "memory", "brownfield-analysis.md");
@@ -1598,12 +1653,12 @@ async function validateCommand() {
 var program = new Command();
 program.name("fishi").description(
   chalk6.cyan("\u{1F41F} FISHI") + " \u2014 Your AI Dev Team That Actually Ships\n   Autonomous agent framework for Claude Code"
-).version("0.1.0");
+).version("0.3.0");
 program.command("init").description("Initialize FISHI in the current directory").argument("[description]", "Project description (skip wizard with zero-config)").option("-l, --language <lang>", "Primary language (e.g., typescript, python)").option("-f, --framework <framework>", "Framework (e.g., nextjs, express, django)").option(
   "-c, --cost-mode <mode>",
   "Cost mode: performance | balanced | economy",
   "balanced"
-).option("--no-interactive", "Skip interactive wizard even without description").action(initCommand);
+).option("--no-interactive", "Skip interactive wizard even without description").option("--merge-all", "Merge all conflicting files (non-interactive brownfield)").option("--replace-all", "Replace all conflicting files (non-interactive brownfield)").action(initCommand);
 program.command("status").description("Show project status, active agents, and TaskBoard summary").action(statusCommand);
 program.command("mcp").description("Manage MCP server integrations").argument("<action>", "Action: add | list | remove").argument("[name]", "MCP server name").action(mcpCommand);
 program.command("reset").description("Rollback to a previous checkpoint").argument("[checkpoint]", "Checkpoint ID (defaults to latest)").action(resetCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlucent/fishi",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "FISHI — Your AI Dev Team That Actually Ships. Autonomous agent framework for Claude Code.",
   "license": "MIT",
   "type": "module",