moai-adk 0.15.1__py3-none-any.whl → 0.25.4__py3-none-any.whl

moai_adk/core/template/merger.py

@@ -1,4 +1,3 @@
-# @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.
@@ -50,7 +49,9 @@ class TemplateMerger:
         # Merge when project info exists
         if project_info:
             # Remove the project info section from the template
-            template_project_start, _ = self._find_project_info_section(template_content)
+            template_project_start, _ = self._find_project_info_section(
+                template_content
+            )
             if template_project_start != -1:
                 template_content = template_content[:template_project_start].rstrip()
 
@@ -104,7 +105,7 @@ class TemplateMerger:
         Returns:
             Merged configuration dictionary.
         """
-        config_path = self.target_path / ".moai" / "config.json"
+        config_path = self.target_path / ".moai" / "config" / "config.json"
 
         # Load existing config if present
         existing_config: dict[str, Any] = {}
@@ -114,19 +115,17 @@ class TemplateMerger:
 
         # Build new config while preferring existing values
         new_config: dict[str, str] = {
-            "projectName": existing_config.get(
-                "projectName", self.target_path.name
-            ),
+            "projectName": existing_config.get("projectName", self.target_path.name),
             "mode": existing_config.get("mode", "personal"),
             "locale": existing_config.get("locale", "ko"),
-            "language": existing_config.get(
-                "language", detected_language or "generic"
-            ),
+            "language": existing_config.get("language", detected_language or "generic"),
         }
 
         return new_config
 
-    def merge_settings_json(self, template_path: Path, existing_path: Path, backup_path: Path | None = None) -> None:
+    def merge_settings_json(
+        self, template_path: Path, existing_path: Path, backup_path: Path | None = None
+    ) -> None:
         """Smart merge for .claude/settings.json.
 
         Rules:
@@ -166,19 +165,77 @@ class TemplateMerger:
         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
-            }
+        # Start with full template (include all fields from template)
+        merged = template_data.copy()
+
+        # Override with merged values
+        merged["env"] = merged_env
+        merged["permissions"] = {
+            "defaultMode": template_data.get("permissions", {}).get(
+                "defaultMode", "default"
+            ),
+            "allow": merged_allow,
+            "ask": merged_ask,
+            "deny": merged_deny,
         }
 
+        # Preserve user customizations for specific fields (if exist in backup/existing)
+        preserve_fields = ["outputStyle", "spinnerTipsEnabled"]
+        for field in preserve_fields:
+            if field in user_data:
+                merged[field] = user_data[field]
+
         existing_path.write_text(
-            json.dumps(merged, indent=2, ensure_ascii=False) + "\n",
-            encoding="utf-8"
+            json.dumps(merged, indent=2, ensure_ascii=False) + "\n", encoding="utf-8"
         )
+
+    def merge_github_workflows(self, template_dir: Path, existing_dir: Path) -> None:
+        """Smart merge for .github/workflows/ directory.
+
+        Rules:
+        - Preserve existing user workflows (never delete)
+        - Add/update only MoAI-ADK managed workflows (moai-*.yml)
+        - Copy other template directories (ISSUE_TEMPLATE/, PULL_REQUEST_TEMPLATE.md)
+
+        Args:
+            template_dir: Template .github directory.
+            existing_dir: Existing .github directory.
+        """
+        import shutil
+
+        # Ensure workflows directory exists
+        workflows_dir = existing_dir / "workflows"
+        workflows_dir.mkdir(exist_ok=True)
+
+        # Track existing user workflows for preservation
+        user_workflows = set()
+        if workflows_dir.exists():
+            for workflow_file in workflows_dir.glob("*.yml"):
+                user_workflows.add(workflow_file.name)
+
+        # Copy template contents with smart merge for workflows
+        for item in template_dir.rglob("*"):
+            if item.is_file():
+                rel_path = item.relative_to(template_dir)
+                dst_item = existing_dir / rel_path
+
+                # Handle workflow files specially
+                if rel_path.parent.name == "workflows" and rel_path.name.endswith(
+                    ".yml"
+                ):
+                    # Only update MoAI-ADK managed workflows (moai-*.yml)
+                    if rel_path.name.startswith("moai-"):
+                        dst_item.parent.mkdir(parents=True, exist_ok=True)
+                        shutil.copy2(item, dst_item)
+                    # Skip non-moai workflows to preserve user custom workflows
+                    continue
+
+                # Copy non-workflow files normally
+                dst_item.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(item, dst_item)
+
+            elif item.is_dir():
+                # Create directories as needed
+                rel_path = item.relative_to(template_dir)
+                dst_item = existing_dir / rel_path
+                dst_item.mkdir(parents=True, exist_ok=True)