moai-adk 0.32.8__py3-none-any.whl → 0.41.2__py3-none-any.whl

moai_adk/core/version_sync.py

@@ -5,11 +5,15 @@ Ensures version consistency across multiple configuration files and provides
 automatic synchronization capabilities.
 
 Key Features:
-- Version consistency validation across pyproject.toml, __init__.py, and config.json
+- Version consistency validation across pyproject.toml, __init__.py, and config
 - Automatic synchronization when inconsistencies detected
 - Cache invalidation for statusline version readers
 - Version change detection and notification system
 - Fallback strategies for version resolution
+
+Configuration sources (in priority order):
+1. Section YAML: .moai/config/sections/system.yaml (moai.version)
+2. Legacy: .moai/config/config.json (moai.version)
 """
 
 import json
@@ -28,7 +32,8 @@ class VersionSource(Enum):
     """Enum for version source tracking"""
 
     PYPROJECT_TOML = "pyproject_toml"
-    CONFIG_JSON = "config_json"
+    SECTION_YAML = "section_yaml"  # New: system.yaml
+    CONFIG_JSON = "config_json"  # Legacy fallback
     PACKAGE_METADATA = "package_metadata"
     FALLBACK = "fallback"
 
@@ -74,14 +79,17 @@ class VersionSynchronizer:
 
         self.working_dir = working_dir
         self.pyproject_path = working_dir / "pyproject.toml"
+        self.system_yaml_path = working_dir / ".moai" / "config" / "sections" / "system.yaml"
         self.config_path = working_dir / ".moai" / "config" / "config.json"
         self.init_path = working_dir / "src" / "moai_adk" / "__init__.py"
 
         # Version file paths in order of priority
         # Note: __init__.py reads version dynamically, so we don't synchronize it
+        # Priority: pyproject.toml > system.yaml (new) > config.json (legacy)
         self.version_files = [
             (self.pyproject_path, VersionSource.PYPROJECT_TOML),
-            (self.config_path, VersionSource.CONFIG_JSON),
+            (self.system_yaml_path, VersionSource.SECTION_YAML),  # New: section YAML
+            (self.config_path, VersionSource.CONFIG_JSON),  # Legacy fallback
         ]
 
         # Statusline cache directories to invalidate
@@ -200,6 +208,8 @@ class VersionSynchronizer:
 
             if source == VersionSource.PYPROJECT_TOML:
                 version = self._extract_from_pyproject(content)
+            elif source == VersionSource.SECTION_YAML:
+                version = self._extract_from_section_yaml(content)
             elif source == VersionSource.CONFIG_JSON:
                 version = self._extract_from_config(content)
             elif source == VersionSource.PACKAGE_METADATA:
@@ -226,8 +236,23 @@ class VersionSynchronizer:
         match = re.search(pattern, content, re.MULTILINE)
         return match.group(1) if match else None
 
+    def _extract_from_section_yaml(self, content: str) -> Optional[str]:
+        """Extract version from .moai/config/sections/system.yaml"""
+        try:
+            import yaml
+
+            yaml_data = yaml.safe_load(content)
+            moai_config = yaml_data.get("moai", {})
+            return moai_config.get("version")
+        except ImportError:
+            logger.warning("PyYAML not available for section YAML parsing")
+            return None
+        except Exception as e:
+            logger.error(f"Invalid YAML in system.yaml: {e}")
+            return None
+
     def _extract_from_config(self, content: str) -> Optional[str]:
-        """Extract version from .moai/config/config.json"""
+        """Extract version from .moai/config/config.json (legacy)"""
         try:
             config_data = json.loads(content)
             moai_config = config_data.get("moai", {})
@@ -270,8 +295,31 @@ class VersionSynchronizer:
 
     def _update_version_in_content(self, content: str, source: VersionSource, target_version: str) -> str:
         """Update version in content based on source type"""
-        if source == VersionSource.CONFIG_JSON:
-            # Update moai.version in JSON
+        if source == VersionSource.SECTION_YAML:
+            # Update moai.version in section YAML
+            try:
+                import yaml
+
+                yaml_data = yaml.safe_load(content) or {}
+                if "moai" not in yaml_data:
+                    yaml_data["moai"] = {}
+                yaml_data["moai"]["version"] = target_version
+                return yaml.safe_dump(
+                    yaml_data,
+                    default_flow_style=False,
+                    allow_unicode=True,
+                    sort_keys=False,
+                )
+            except ImportError:
+                logger.warning("PyYAML not available for section YAML update")
+                return content
+            except Exception:
+                # Fallback: regex replacement for version line
+                pattern = r'(version:\s*["\']?)[\d.]+(["\']?)'
+                return re.sub(pattern, f"\\g<1>{target_version}\\g<2>", content)
+
+        elif source == VersionSource.CONFIG_JSON:
+            # Update moai.version in JSON (legacy)
             try:
                 config_data = json.loads(content)
                 if "moai" not in config_data:

moai_adk/project/configuration.py

@@ -222,7 +222,7 @@ class SmartDefaultsEngine:
             "git_strategy.personal.push_to_remote": False,
             "git_strategy.team.auto_pr": False,
             "git_strategy.team.draft_pr": False,
-            "constitution.test_coverage_target": 90,
+            "constitution.test_coverage_target": 85,
             "constitution.enforce_tdd": True,
             "language.agent_prompt_language": "en",
             "project.description": "",

moai_adk/statusline/config.py

@@ -345,11 +345,14 @@ class StatuslineConfig:
         display_data = self.get("statusline.display", {})
         return DisplayConfig(
             model=display_data.get("model", True),
-            duration=display_data.get("duration", True),
-            directory=display_data.get("directory", True),
             version=display_data.get("version", True),
+            output_style=display_data.get("output_style", True),
+            memory_usage=display_data.get("memory_usage", True),
+            todo_count=display_data.get("todo_count", True),
             branch=display_data.get("branch", True),
             git_status=display_data.get("git_status", True),
+            duration=display_data.get("duration", True),
+            directory=display_data.get("directory", True),
             active_task=display_data.get("active_task", True),
             update_indicator=display_data.get("update_indicator", True),
         )

moai_adk/statusline/main.py

@@ -145,6 +145,59 @@ def safe_check_update(current_version: str) -> tuple[bool, Optional[str]]:
         return False, None
 
 
+def format_token_count(tokens: int) -> str:
+    """
+    Format token count for display (e.g., 15234 -> "15K").
+
+    Args:
+        tokens: Number of tokens
+
+    Returns:
+        Formatted string
+    """
+    if tokens >= 1000:
+        return f"{tokens // 1000}K"
+    return str(tokens)
+
+
+def extract_context_window(session_context: dict) -> str:
+    """
+    Extract and format context window usage from session context.
+
+    Args:
+        session_context: Context passed from Claude Code via stdin
+
+    Returns:
+        Formatted context window string (e.g., "15K/200K")
+    """
+    context_info = session_context.get("context_window", {})
+
+    if not context_info:
+        return ""
+
+    # Get context window size
+    context_size = context_info.get("context_window_size", 0)
+    if not context_size:
+        return ""
+
+    # Get current usage
+    current_usage = context_info.get("current_usage", {})
+    if current_usage:
+        # Calculate total current tokens
+        input_tokens = current_usage.get("input_tokens", 0)
+        cache_creation = current_usage.get("cache_creation_input_tokens", 0)
+        cache_read = current_usage.get("cache_read_input_tokens", 0)
+        current_tokens = input_tokens + cache_creation + cache_read
+    else:
+        # Fallback to total tokens
+        current_tokens = context_info.get("total_input_tokens", 0)
+
+    if current_tokens > 0:
+        return f"{format_token_count(current_tokens)}/{format_token_count(context_size)}"
+
+    return ""
+
+
 def build_statusline_data(session_context: dict, mode: str = "compact") -> str:
     """
     Build complete statusline string from all data sources.
@@ -157,6 +210,7 @@ def build_statusline_data(session_context: dict, mode: str = "compact") -> str:
     - MoAI-ADK version
     - Update checker
     - Output style
+    - Context window usage
 
     Args:
         session_context: Context passed from Claude Code via stdin
@@ -184,6 +238,9 @@ def build_statusline_data(session_context: dict, mode: str = "compact") -> str:
         # Extract output style from session context
         output_style = session_context.get("output_style", {}).get("name", "")
 
+        # Extract context window usage
+        context_window = extract_context_window(session_context)
+
         # Collect all information from local sources
         branch, git_status = safe_collect_git_info()
         duration = safe_collect_duration()
@@ -205,6 +262,7 @@ def build_statusline_data(session_context: dict, mode: str = "compact") -> str:
             output_style=output_style,
             update_available=update_available,
             latest_version=latest_version,
+            context_window=context_window,
         )
 
         # Render statusline with labeled sections

moai_adk/statusline/renderer.py

@@ -27,6 +27,7 @@ class StatuslineData:
     output_style: str = ""  # Output style name (e.g., "R2-D2", "Yoda")
     update_available: bool = False
     latest_version: str = ""
+    context_window: str = ""  # Context window usage (e.g., "15K/200K")
 
 
 class StatuslineRenderer:
@@ -66,7 +67,7 @@ class StatuslineRenderer:
 
     def _render_compact(self, data: StatuslineData) -> str:
         """
-        Render compact mode: [MODEL] [DURATION] | [DIR] | [VERSION] | [BRANCH] | [GIT] | [TASK]
+        Render compact mode: 🤖 Model | 🔅 Version | 💰 Context | 💬 Style | 📊 Changes | 🔀 Branch
         Constraint: <= 80 characters
 
         Args:
@@ -77,6 +78,8 @@ class StatuslineRenderer:
         """
         max_length = self._MODE_CONSTRAINTS["compact"]
         parts = self._build_compact_parts(data)
+
+        # Join all parts with separator (no brackets)
         result = self._format_config.separator.join(parts)
 
         # Adjust if too long
@@ -88,7 +91,7 @@ class StatuslineRenderer:
     def _build_compact_parts(self, data: StatuslineData) -> List[str]:
         """
         Build parts list for compact mode with labeled sections
-        New Format: 🤖 Model | 🔅 Claude Code Version | 🗿 MoAI Version | 💬 Style | 📊 Changes | 🔀 Branch
+        Format: 🤖 Model | 🔅 Version | 💰 Context | 💬 Style | 📊 Changes | 🔀 Branch
 
         Args:
             data: StatuslineData instance
@@ -102,16 +105,14 @@ class StatuslineRenderer:
         if self._display_config.model:
             parts.append(f"🤖 {data.model}")
 
-        # Add Claude Code version if available
-        if data.claude_version:
+        # Add Claude Code version if available and display enabled (Issue #248 fix)
+        if self._display_config.version and data.claude_version:
             claude_ver_str = data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
             parts.append(f"🔅 {claude_ver_str}")
 
-        # Add MoAI version if display enabled (system status)
-        if self._display_config.version:
-            # Add 'v' prefix if not already present
-            version_str = data.version if data.version.startswith("v") else f"v{data.version}"
-            parts.append(f"🗿 {version_str}")
+        # Add context window usage if available (💰 icon)
+        if data.context_window:
+            parts.append(f"💰 {data.context_window}")
 
         # Add output style if not empty
         if data.output_style:
@@ -125,6 +126,10 @@ class StatuslineRenderer:
         if self._display_config.branch:
             parts.append(f"🔀 {data.branch}")
 
+        # Add directory if display enabled and not empty (Issue #248 fix)
+        if self._display_config.directory and data.directory:
+            parts.append(f"📁 {data.directory}")
+
         # Add active_task if display enabled and not empty
         if self._display_config.active_task and data.active_task.strip():
             parts.append(data.active_task)
@@ -134,7 +139,7 @@ class StatuslineRenderer:
     def _fit_to_constraint(self, data: StatuslineData, max_length: int) -> str:
         """
         Fit statusline to character constraint by truncating
-        New Format: 🤖 Model | 🔅 Claude Code Version | 🗿 MoAI Version | 💬 Style | 📊 Changes | 🔀 Branch
+        Format: 🤖 Model | 🔅 Version | 💰 Context | 💬 Style | 📊 Changes | 🔀 Branch
 
         Args:
             data: StatuslineData instance
@@ -143,31 +148,27 @@ class StatuslineRenderer:
         Returns:
             Truncated statusline string
         """
-        # Try with truncated branch first
         truncated_branch = self._truncate_branch(data.branch, max_length=30)
-        version_str = data.version if data.version.startswith("v") else f"v{data.version}"
 
+        # Build parts list
         parts = [f"🤖 {data.model}"]
 
-        # Add Claude Code version if available
-        if data.claude_version:
+        # Issue #248 fix: Check display_config.version before rendering
+        if self._display_config.version and data.claude_version:
             claude_ver_str = data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
             parts.append(f"🔅 {claude_ver_str}")
 
-        parts.append(f"🗿 {version_str}")
+        if data.context_window:
+            parts.append(f"💰 {data.context_window}")
 
-        # Add output style if not empty
         if data.output_style:
             parts.append(f"💬 {data.output_style}")
 
-        # Add git status if display enabled and status not empty
         if self._display_config.git_status and data.git_status:
             parts.append(f"📊 {data.git_status}")
 
-        # Add Git info
         parts.append(f"🔀 {truncated_branch}")
 
-        # Only add active_task if it's not empty
         if data.active_task.strip():
             parts.append(data.active_task)
 
@@ -178,35 +179,26 @@ class StatuslineRenderer:
             truncated_branch = self._truncate_branch(data.branch, max_length=12)
             parts = [f"🤖 {data.model}"]
 
-            if data.claude_version:
+            # Issue #248 fix: Check display_config.version before rendering
+            if self._display_config.version and data.claude_version:
                 claude_ver_str = (
                     data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
                 )
                 parts.append(f"🔅 {claude_ver_str}")
-
-            parts.append(f"🗿 {version_str}")
-
-            if data.git_status:
-                parts.append(f"📊 {data.git_status}")
+            if data.context_window:
+                parts.append(f"💰 {data.context_window}")
             if data.output_style:
                 parts.append(f"💬 {data.output_style}")
+            if data.git_status:
+                parts.append(f"📊 {data.git_status}")
             parts.append(f"🔀 {truncated_branch}")
-            if data.active_task.strip():
-                parts.append(data.active_task)
             result = self._format_config.separator.join(parts)
 
-        # If still too long, remove output_style and active_task
+        # If still too long, remove output_style
         if len(result) > max_length:
             parts = [f"🤖 {data.model}"]
-
-            if data.claude_version:
-                claude_ver_str = (
-                    data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
-                )
-                parts.append(f"🔅 {claude_ver_str}")
-
-            parts.append(f"🗿 {version_str}")
-
+            if data.context_window:
+                parts.append(f"💰 {data.context_window}")
             if data.git_status:
                 parts.append(f"📊 {data.git_status}")
             parts.append(f"🔀 {truncated_branch}")
@@ -222,7 +214,7 @@ class StatuslineRenderer:
         """
         Render extended mode: Full path and detailed info with labels
         Constraint: <= 120 characters
-        New Format: 🤖 Model | 🔅 Claude Code Version | 🗿 MoAI Version | 💬 Style | 📊 Changes | 🔀 Branch
+        Format: 🤖 Model | 🔅 Version | 💰 Context | 💬 Style | 📊 Changes | 🔀 Branch
 
         Args:
             data: StatuslineData instance
@@ -231,66 +223,58 @@ class StatuslineRenderer:
             Formatted statusline string (max 120 chars)
         """
         branch = self._truncate_branch(data.branch, max_length=30)
-        version_str = data.version if data.version.startswith("v") else f"v{data.version}"
 
+        # Build parts list
         parts = []
 
-        # Add model if display enabled
         if self._display_config.model:
             parts.append(f"🤖 {data.model}")
 
-        # Add Claude Code version if available
-        if data.claude_version:
+        # Issue #248 fix: Check display_config.version before rendering
+        if self._display_config.version and data.claude_version:
             claude_ver_str = data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
             parts.append(f"🔅 {claude_ver_str}")
 
-        # Add MoAI version if display enabled
-        if self._display_config.version:
-            parts.append(f"🗿 {version_str}")
+        if data.context_window:
+            parts.append(f"💰 {data.context_window}")
 
-        # Add output style if not empty
         if data.output_style:
             parts.append(f"💬 {data.output_style}")
 
-        # Add git status if display enabled and status not empty
         if self._display_config.git_status and data.git_status:
             parts.append(f"📊 {data.git_status}")
 
-        # Add Git info (development context)
         if self._display_config.branch:
             parts.append(f"🔀 {branch}")
 
-        # Add active_task if display enabled and not empty
+        # Issue #248 fix: Add directory rendering
+        if self._display_config.directory and data.directory:
+            parts.append(f"📁 {data.directory}")
+
         if self._display_config.active_task and data.active_task.strip():
             parts.append(data.active_task)
 
         result = self._format_config.separator.join(parts)
 
-        # If exceeds limit, try truncating branch
+        # If exceeds limit, try truncating
         if len(result) > 120:
-            branch = self._truncate_branch(data.branch, max_length=30)
-            parts = [f"🤖 {data.model}"]
-
-            if data.claude_version:
+            branch = self._truncate_branch(data.branch, max_length=20)
+            parts = []
+            if self._display_config.model:
+                parts.append(f"🤖 {data.model}")
+            # Issue #248 fix: Check display_config.version before rendering
+            if self._display_config.version and data.claude_version:
                 claude_ver_str = (
                     data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
                 )
                 parts.append(f"🔅 {claude_ver_str}")
-
-            parts.append(f"🗿 {version_str}")
-
-            # Add git status if display enabled and not empty
-            if self._display_config.git_status and data.git_status:
-                parts.append(f"📊 {data.git_status}")
-
-            # Add output style if not empty
+            if data.context_window:
+                parts.append(f"💰 {data.context_window}")
             if data.output_style:
                 parts.append(f"💬 {data.output_style}")
-
+            if data.git_status:
+                parts.append(f"📊 {data.git_status}")
             parts.append(f"🔀 {branch}")
-
-            if data.active_task.strip():
-                parts.append(data.active_task)
             result = self._format_config.separator.join(parts)
 
         return result
@@ -299,7 +283,7 @@ class StatuslineRenderer:
         """
         Render minimal mode: Extreme space constraint with minimal labels
         Constraint: <= 40 characters
-        New Format: 🤖 Model | 🔅 Claude Code Ver | 🗿 MoAI Ver | Changes
+        Format: 🤖 Model | 💰 Context
 
         Args:
             data: StatuslineData instance
@@ -313,27 +297,15 @@ class StatuslineRenderer:
         if self._display_config.model:
             parts.append(f"🤖 {data.model}")
 
-        # Add Claude Code version if available (truncated for minimal)
-        if data.claude_version:
-            claude_ver_str = data.claude_version if data.claude_version.startswith("v") else f"v{data.claude_version}"
-            # For minimal mode, just show major.minor (e.g., "v2.0" from "v2.0.46")
-            if len(claude_ver_str.split(".")) > 2:
-                claude_ver_str = ".".join(claude_ver_str.split(".")[:2])
-            parts.append(f"🔅 {claude_ver_str}")
-
-        # Add MoAI version if display enabled
-        if self._display_config.version:
-            truncated_ver = self._truncate_version(data.version)
-            # Add 'v' prefix if not already present
-            version_str = truncated_ver if truncated_ver.startswith("v") else f"v{truncated_ver}"
-            parts.append(f"🗿 {version_str}")
+        # Add context window usage if available (💰 icon)
+        if data.context_window:
+            parts.append(f"💰 {data.context_window}")
 
         result = self._format_config.separator.join(parts)
 
-        # Add git_status if it fits (use abbreviated format for minimal)
-        # and if display is enabled and status not empty
+        # Add git_status if it fits
         if self._display_config.git_status and data.git_status:
-            status_label = f"Chg: {data.git_status}"
+            status_label = f"📊 {data.git_status}"
             if len(result) + len(status_label) + len(self._format_config.separator) <= 40:
                 result += f"{self._format_config.separator}{status_label}"