@qlucent/fishi-core 0.2.0 → 0.4.0

package/dist/index.d.ts

@@ -452,6 +452,7 @@ interface ScaffoldOptions extends InitOptions {
     brownfieldAnalysis?: BrownfieldAnalysisData;
     resolutions?: FileResolutionMap;
     docsReadmeExists?: boolean;
+    rootClaudeMdExists?: boolean;
 }
 interface ScaffoldResult {
     agentCount: number;
@@ -476,6 +477,7 @@ interface ConflictMap {
     hasConflicts: boolean;
     totalConflicts: number;
     docsReadmeExists: boolean;
+    rootClaudeMdExists: boolean;
 }
 declare function detectConflicts(targetDir: string): ConflictMap;
 
@@ -489,6 +491,14 @@ interface BackupManifest {
 }
 declare function createBackup(targetDir: string, conflictingFiles: string[]): Promise<string>;
 
+/**
+ * Prepend FISHI content to the TOP of an existing CLAUDE.md (for root CLAUDE.md).
+ * FISHI rules go first so they have higher priority in Claude Code.
+ */
+declare function mergeClaudeMdTop(existing: string, fishiContent: string): string;
+/**
+ * Append FISHI content to the BOTTOM of an existing CLAUDE.md (for .claude/CLAUDE.md).
+ */
 declare function mergeClaudeMd(existing: string, fishiContent: string): string;
 interface HookEntry {
     matcher: string;
@@ -513,4 +523,4 @@ interface McpJson {
 declare function mergeMcpJson(existing: McpJson, fishi: McpJson): McpJson;
 declare function mergeGitignore(existing: string, fishiAdditions: string): string;
 
-export { type AgentDefinition, type AgentRole, type AgentTemplate, type BackupManifest, type BrownfieldAnalysisData, type ClaudeMdOptions, type CommandTemplate, type ConflictCategory, type ConflictMap, type ConflictResolution, type CostMode, type DetectionCheck, type DetectionResult, type DynamicAgentConfig, type ExecutionConfig, type FileConflict, type FileResolutionMap, type FishiConfig, type FishiYamlOptions, type GateConfig, type GateStatus, type GitConfig, type HookTemplate, type InitOptions, type McpConfig, type McpServerConfig, type ModelRoutingConfig, type ModelTier, type ProjectConfig, type ProjectType, type ProjectYamlOptions, type ScaffoldOptions, type ScaffoldResult, type SkillTemplate, type StateConfig, type TaskStatus, type TaskboardConfig, type TemplateContext, architectAgentTemplate, backendAgentTemplate, createBackup, detectConflicts, devLeadTemplate, devopsAgentTemplate, docsAgentTemplate, frontendAgentTemplate, fullstackAgentTemplate, generateScaffold, getAdaptiveTaskGraphSkill, getAgentCompleteHook, getAgentFactoryTemplate, getAgentRegistryTemplate, getApiDesignSkill, getAutoCheckpointHook, getBoardCommand, getBrainstormingSkill, getBrownfieldAnalysisSkill, getBrownfieldDiscoverySkill, getClaudeMdTemplate, getCodeGenSkill, getCoordinatorFactoryTemplate, getDebuggingSkill, getDeploymentSkill, getDocCheckerScript, getDocumentationSkill, getFishiYamlTemplate, getGateCommand, getGateManagerScript, getGitignoreAdditions, getInitCommand, getLearningsManagerScript, getMasterOrchestratorTemplate, getMcpJsonTemplate, getMemoryManagerScript, getModelRoutingReference, getPhaseRunnerScript, getPostEditHook, getPrdCommand, getPrdSkill, getProjectYamlTemplate, getResetCommand, getResumeCommand, getSafetyCheckHook, getSessionStartHook, getSettingsJsonTemplate, getSprintCommand, getStatusCommand, getTaskboardOpsSkill, getTaskboardUpdateHook, getTestingSkill, getTodoManagerScript, getValidateScaffoldScript, getWorktreeManagerScript, getWorktreeSetupHook, marketingAgentTemplate, mergeClaudeMd, mergeGitignore, mergeMcpJson, mergeSettingsJson, opsLeadTemplate, planningAgentTemplate, planningLeadTemplate, qualityLeadTemplate, researchAgentTemplate, securityAgentTemplate, testingAgentTemplate, uiuxAgentTemplate, writingAgentTemplate };
+export { type AgentDefinition, type AgentRole, type AgentTemplate, type BackupManifest, type BrownfieldAnalysisData, type ClaudeMdOptions, type CommandTemplate, type ConflictCategory, type ConflictMap, type ConflictResolution, type CostMode, type DetectionCheck, type DetectionResult, type DynamicAgentConfig, type ExecutionConfig, type FileConflict, type FileResolutionMap, type FishiConfig, type FishiYamlOptions, type GateConfig, type GateStatus, type GitConfig, type HookTemplate, type InitOptions, type McpConfig, type McpServerConfig, type ModelRoutingConfig, type ModelTier, type ProjectConfig, type ProjectType, type ProjectYamlOptions, type ScaffoldOptions, type ScaffoldResult, type SkillTemplate, type StateConfig, type TaskStatus, type TaskboardConfig, type TemplateContext, architectAgentTemplate, backendAgentTemplate, createBackup, detectConflicts, devLeadTemplate, devopsAgentTemplate, docsAgentTemplate, frontendAgentTemplate, fullstackAgentTemplate, generateScaffold, getAdaptiveTaskGraphSkill, getAgentCompleteHook, getAgentFactoryTemplate, getAgentRegistryTemplate, getApiDesignSkill, getAutoCheckpointHook, getBoardCommand, getBrainstormingSkill, getBrownfieldAnalysisSkill, getBrownfieldDiscoverySkill, getClaudeMdTemplate, getCodeGenSkill, getCoordinatorFactoryTemplate, getDebuggingSkill, getDeploymentSkill, getDocCheckerScript, getDocumentationSkill, getFishiYamlTemplate, getGateCommand, getGateManagerScript, getGitignoreAdditions, getInitCommand, getLearningsManagerScript, getMasterOrchestratorTemplate, getMcpJsonTemplate, getMemoryManagerScript, getModelRoutingReference, getPhaseRunnerScript, getPostEditHook, getPrdCommand, getPrdSkill, getProjectYamlTemplate, getResetCommand, getResumeCommand, getSafetyCheckHook, getSessionStartHook, getSettingsJsonTemplate, getSprintCommand, getStatusCommand, getTaskboardOpsSkill, getTaskboardUpdateHook, getTestingSkill, getTodoManagerScript, getValidateScaffoldScript, getWorktreeManagerScript, getWorktreeSetupHook, marketingAgentTemplate, mergeClaudeMd, mergeClaudeMdTop, mergeGitignore, mergeMcpJson, mergeSettingsJson, opsLeadTemplate, planningAgentTemplate, planningLeadTemplate, qualityLeadTemplate, researchAgentTemplate, securityAgentTemplate, testingAgentTemplate, uiuxAgentTemplate, writingAgentTemplate };

package/dist/index.js

@@ -10383,6 +10383,27 @@ import { join, dirname } from "path";
 // src/generators/merge-strategies.ts
 var FISHI_START = "<!-- FISHI:START \u2014 Auto-generated by FISHI. Do not edit between markers. -->";
 var FISHI_END = "<!-- FISHI:END -->";
+function mergeClaudeMdTop(existing, fishiContent) {
+  const section = `${FISHI_START}
+### FISHI Framework
+${fishiContent}
+${FISHI_END}
+---
+`;
+  const startIdx = existing.indexOf(FISHI_START);
+  const endIdx = existing.indexOf(FISHI_END);
+  if (startIdx !== -1 && endIdx !== -1) {
+    const sectionEnd = endIdx + FISHI_END.length;
+    let afterEnd = sectionEnd;
+    const afterContent = existing.slice(afterEnd);
+    const separatorMatch = afterContent.match(/^\n?---\n/);
+    if (separatorMatch) {
+      afterEnd += separatorMatch[0].length;
+    }
+    return section + existing.slice(afterEnd);
+  }
+  return section + "\n" + existing;
+}
 function mergeClaudeMd(existing, fishiContent) {
   const section = `
 ---
@@ -10613,7 +10634,20 @@ async function generateScaffold(targetDir, options) {
     framework: options.framework,
     brownfieldAnalysis: options.brownfieldAnalysis
   });
-  if (resolutions?.categories["claude-md"] === "merge") {
+  if (options.rootClaudeMdExists) {
+    const rootResolution = resolutions?.categories["root-claude-md"];
+    if (rootResolution === "merge") {
+      const existingMd = await fsReadFile(join(targetDir, "CLAUDE.md"), "utf-8");
+      const merged = mergeClaudeMdTop(existingMd, claudeMdContent);
+      const fullPath = join(targetDir, "CLAUDE.md");
+      await writeFile(fullPath, merged, "utf-8");
+      filesCreated++;
+    } else if (rootResolution === "replace") {
+      const fullPath = join(targetDir, "CLAUDE.md");
+      await writeFile(fullPath, claudeMdContent, "utf-8");
+      filesCreated++;
+    }
+  } else if (resolutions?.categories["claude-md"] === "merge") {
     const existingMd = await fsReadFile(join(targetDir, ".claude", "CLAUDE.md"), "utf-8");
     const merged = mergeClaudeMd(existingMd, claudeMdContent);
     await write(".claude/CLAUDE.md", merged, "claude-md");
@@ -10837,7 +10871,12 @@ var FISHI_FILES = {
 function detectConflicts(targetDir) {
   const categories = [];
   let totalConflicts = 0;
+  const rootClaudeMdExists = existsSync2(join2(targetDir, "CLAUDE.md"));
   for (const [name, def] of Object.entries(FISHI_FILES)) {
+    if (name === "claude-md" && rootClaudeMdExists) {
+      categories.push({ name, label: def.label, conflicts: [] });
+      continue;
+    }
     const conflicts = [];
     for (const relPath of def.files) {
       const fullPath = join2(targetDir, relPath);
@@ -10849,12 +10888,22 @@ function detectConflicts(targetDir) {
     categories.push({ name, label: def.label, conflicts });
     totalConflicts += conflicts.length;
   }
+  if (rootClaudeMdExists) {
+    const stat = statSync(join2(targetDir, "CLAUDE.md"));
+    categories.unshift({
+      name: "root-claude-md",
+      label: "CLAUDE.md (root)",
+      conflicts: [{ path: "CLAUDE.md", size: stat.size }]
+    });
+    totalConflicts += 1;
+  }
   const docsReadmeExists = existsSync2(join2(targetDir, "docs", "README.md"));
   return {
     categories,
     hasConflicts: totalConflicts > 0,
     totalConflicts,
-    docsReadmeExists
+    docsReadmeExists,
+    rootClaudeMdExists
   };
 }
 
@@ -10878,7 +10927,7 @@ async function createBackup(targetDir, conflictingFiles) {
       manifestFiles.push({ path: relPath, size: stat.size });
     }
   }
-  const fishiVersion = "0.2.0";
+  const fishiVersion = "0.4.0";
   const manifest = {
     timestamp: now.toISOString(),
     fishi_version: fishiVersion,
@@ -10949,6 +10998,7 @@ export {
   getWorktreeSetupHook,
   marketingAgentTemplate,
   mergeClaudeMd,
+  mergeClaudeMdTop,
   mergeGitignore,
   mergeMcpJson,
   mergeSettingsJson,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlucent/fishi-core",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Shared templates, types, and generators for the FISHI framework",
   "license": "MIT",
   "type": "module",