moai-adk 0.3.13__py3-none-any.whl → 0.4.1__py3-none-any.whl

moai_adk/core/template/merger.py

@@ -1,4 +1,4 @@
-# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003.md | Chain: TEMPLATE-001
+# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003/spec.md | Chain: TEMPLATE-001
 """Template file merger (SPEC-INIT-003 v0.3.0).
 
 Intelligently merges existing user files with new templates.
@@ -15,6 +15,11 @@ from typing import Any
 class TemplateMerger:
     """Encapsulate template merging logic."""
 
+    PROJECT_INFO_HEADERS = (
+        "## 프로젝트 정보",
+        "## Project Information",
+    )
+
     def __init__(self, target_path: Path) -> None:
         """Initialize the merger.
 
@@ -34,9 +39,9 @@ class TemplateMerger:
             template_path: Template CLAUDE.md.
             existing_path: Existing CLAUDE.md.
         """
-        # Extract the existing "## 프로젝트 정보" section
+        # Extract the existing project information section
         existing_content = existing_path.read_text(encoding="utf-8")
-        project_info_start = existing_content.find("## 프로젝트 정보")
+        project_info_start, _ = self._find_project_info_section(existing_content)
         project_info = ""
         if project_info_start != -1:
             # Extract until EOF
@@ -48,7 +53,7 @@ class TemplateMerger:
         # Merge when project info exists
         if project_info:
             # Remove the project info section from the template
-            template_project_start = template_content.find("## 프로젝트 정보")
+            template_project_start, _ = self._find_project_info_section(template_content)
             if template_project_start != -1:
                 template_content = template_content[:template_project_start].rstrip()
 
@@ -59,6 +64,14 @@ class TemplateMerger:
             # No project info; copy the template as-is
             shutil.copy2(template_path, existing_path)
 
+    def _find_project_info_section(self, content: str) -> tuple[int, str | None]:
+        """Find the project information header in the given content."""
+        for header in self.PROJECT_INFO_HEADERS:
+            index = content.find(header)
+            if index != -1:
+                return index, header
+        return -1, None
+
     def merge_gitignore(self, template_path: Path, existing_path: Path) -> None:
         """.gitignore merge.
 
@@ -115,3 +128,60 @@ class TemplateMerger:
         }
 
         return new_config
+
+    def merge_settings_json(self, template_path: Path, existing_path: Path, backup_path: Path | None = None) -> None:
+        """Smart merge for .claude/settings.json.
+
+        Rules:
+        - env: shallow merge (user variables preserved)
+        - permissions.allow: array merge (deduplicated)
+        - permissions.deny: template priority (security)
+        - hooks: template priority
+
+        Args:
+            template_path: Template settings.json.
+            existing_path: Existing settings.json.
+            backup_path: Backup settings.json (optional, for user settings extraction).
+        """
+        # Load template
+        template_data = json.loads(template_path.read_text(encoding="utf-8"))
+
+        # Load backup or existing for user settings
+        user_data: dict[str, Any] = {}
+        if backup_path and backup_path.exists():
+            user_data = json.loads(backup_path.read_text(encoding="utf-8"))
+        elif existing_path.exists():
+            user_data = json.loads(existing_path.read_text(encoding="utf-8"))
+
+        # Merge env (shallow merge, user variables preserved)
+        merged_env = {**template_data.get("env", {}), **user_data.get("env", {})}
+
+        # Merge permissions.allow (deduplicated array merge)
+        template_allow = set(template_data.get("permissions", {}).get("allow", []))
+        user_allow = set(user_data.get("permissions", {}).get("allow", []))
+        merged_allow = sorted(template_allow | user_allow)
+
+        # permissions.deny: template priority (security)
+        merged_deny = template_data.get("permissions", {}).get("deny", [])
+
+        # permissions.ask: template priority + user additions
+        template_ask = set(template_data.get("permissions", {}).get("ask", []))
+        user_ask = set(user_data.get("permissions", {}).get("ask", []))
+        merged_ask = sorted(template_ask | user_ask)
+
+        # Build final merged settings
+        merged = {
+            "env": merged_env,
+            "hooks": template_data.get("hooks", {}),  # Template priority
+            "permissions": {
+                "defaultMode": template_data.get("permissions", {}).get("defaultMode", "default"),
+                "allow": merged_allow,
+                "ask": merged_ask,
+                "deny": merged_deny
+            }
+        }
+
+        existing_path.write_text(
+            json.dumps(merged, indent=2, ensure_ascii=False) + "\n",
+            encoding="utf-8"
+        )

moai_adk/core/template/processor.py

@@ -1,4 +1,4 @@
-# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003.md | Chain: TEMPLATE-001
+# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003/spec.md | Chain: TEMPLATE-001
 """Template copy and backup processor (SPEC-INIT-003 v0.3.0: preserve user content)."""
 
 from __future__ import annotations
@@ -178,6 +178,7 @@ class TemplateProcessor:
 
         self._copy_claude(silent)
         self._copy_moai(silent)
+        self._copy_github(silent)
         self._copy_claude_md(silent)
         self._copy_gitignore(silent)
 
@@ -237,7 +238,7 @@ class TemplateProcessor:
         Strategy:
         - Alfred folders (commands/agents/hooks/output-styles/alfred) → copy wholesale (delete & overwrite)
           * Creates individual backup before deletion for safety
-          * Commands: 0-project.md, 1-spec.md, 2-build.md, 3-sync.md
+          * Commands: 0-project.md, 1-plan.md, 2-run.md, 3-sync.md
         - Other files/folders → copy individually (preserve existing)
         """
         src = self.template_root / ".claude"
@@ -256,7 +257,7 @@ class TemplateProcessor:
         # Alfred folders to copy wholesale (overwrite)
         alfred_folders = [
             "hooks/alfred",
-            "commands/alfred",  # Contains 0-project.md, 1-spec.md, 2-build.md, 3-sync.md
+            "commands/alfred",  # Contains 0-project.md, 1-plan.md, 2-run.md, 3-sync.md
             "output-styles/alfred",
             "agents/alfred",
         ]
@@ -267,9 +268,8 @@ class TemplateProcessor:
             dst_folder = dst / folder
 
             if src_folder.exists():
-                # Backup this folder before deletion (safety measure)
+                # Remove existing folder (backup is already handled by create_backup() in update.py)
                 if dst_folder.exists():
-                    self._backup_alfred_folder(dst_folder, folder)
                     shutil.rmtree(dst_folder)
 
                 # Create parent directory if needed
@@ -278,7 +278,7 @@ class TemplateProcessor:
                 if not silent:
                     console.print(f"   ✅ .claude/{folder}/ overwritten")
 
-        # 2. Copy other files/folders individually (FORCE OVERWRITE all files)
+        # 2. Copy other files/folders individually (smart merge for settings.json)
         all_warnings = []
         for item in src.iterdir():
             rel_path = item.relative_to(src)
@@ -289,9 +289,15 @@ class TemplateProcessor:
                 continue
 
             if item.is_file():
-                # FORCE OVERWRITE: Always copy files (no skip)
-                warnings = self._copy_file_with_substitution(item, dst_item)
-                all_warnings.extend(warnings)
+                # Smart merge for settings.json
+                if item.name == "settings.json":
+                    self._merge_settings_json(item, dst_item)
+                    if not silent:
+                        console.print("   🔄 settings.json merged (env variables preserved)")
+                else:
+                    # FORCE OVERWRITE: Always copy other files (no skip)
+                    warnings = self._copy_file_with_substitution(item, dst_item)
+                    all_warnings.extend(warnings)
             elif item.is_dir():
                 # FORCE OVERWRITE: Always copy directories (no skip)
                 self._copy_dir_with_substitution(item, dst_item)
@@ -351,8 +357,26 @@ class TemplateProcessor:
         if not silent:
             console.print("   ✅ .moai/ copy complete (variables substituted)")
 
+    def _copy_github(self, silent: bool = False) -> None:
+        """.github/ directory copy with variable substitution."""
+        src = self.template_root / ".github"
+        dst = self.target_path / ".github"
+
+        if not src.exists():
+            if not silent:
+                console.print("⚠️ .github/ template not found")
+            return
+
+        if dst.exists():
+            shutil.rmtree(dst)
+
+        self._copy_dir_with_substitution(src, dst)
+
+        if not silent:
+            console.print("   ✅ .github/ copy complete (variables substituted)")
+
     def _copy_claude_md(self, silent: bool = False) -> None:
-        """Copy CLAUDE.md with FORCE OVERWRITE."""
+        """Copy CLAUDE.md with smart merge (preserves \"## 프로젝트 정보\" section)."""
         src = self.template_root / "CLAUDE.md"
         dst = self.target_path / "CLAUDE.md"
 
@@ -361,10 +385,16 @@ class TemplateProcessor:
                 console.print("⚠️ CLAUDE.md template not found")
             return
 
-        # FORCE OVERWRITE: Always copy template (backup already created in Phase 1)
-        self._copy_file_with_substitution(src, dst)
-        if not silent:
-            console.print("   ✅ CLAUDE.md overwritten (backup available in .moai-backups/)")
+        # Smart merge: preserve existing "## 프로젝트 정보" section
+        if dst.exists():
+            self._merge_claude_md(src, dst)
+            if not silent:
+                console.print("   🔄 CLAUDE.md merged (프로젝트 정보 preserved)")
+        else:
+            # First time: just copy
+            self._copy_file_with_substitution(src, dst)
+            if not silent:
+                console.print("   ✅ CLAUDE.md created")
 
     def _merge_claude_md(self, src: Path, dst: Path) -> None:
         """Delegate the smart merge for CLAUDE.md.
@@ -375,6 +405,24 @@ class TemplateProcessor:
         """
         self.merger.merge_claude_md(src, dst)
 
+    def _merge_settings_json(self, src: Path, dst: Path) -> None:
+        """Delegate the smart merge for settings.json.
+
+        Args:
+            src: Template settings.json.
+            dst: Project settings.json.
+        """
+        # Find the latest backup for user settings extraction
+        backup_path = None
+        if self.backup.backup_dir.exists():
+            backups = sorted(self.backup.backup_dir.iterdir(), reverse=True)
+            if backups:
+                backup_settings = backups[0] / ".claude" / "settings.json"
+                if backup_settings.exists():
+                    backup_path = backup_settings
+
+        self.merger.merge_settings_json(src, dst, backup_path)
+
     def _copy_gitignore(self, silent: bool = False) -> None:
         """.gitignore copy (optional)."""
         src = self.template_root / ".gitignore"