IncludeCPP 3.2.0__tar.gz → 3.2.2__tar.gz

{includecpp-3.2.0 → includecpp-3.2.2}/IncludeCPP.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.2.0
+Version: 3.2.2
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/includecpp/includecpp
 Author: IncludeCPP Team
@@ -470,6 +470,14 @@ Options:
 
 # Changelog
 
+## v3.2.2
+- Plugin command now detects comma-separated field declarations (e.g., `double x, y, z;` generates 3 FIELD entries)
+- Fixed `ai optimize` timeout for multi-file operations (increased to 5 minutes)
+- AI `ask` now extracts relevant CLI implementation when asking about commands/flags
+
+## v3.2.1
+- Fixed encoding error in `ai ask` output on Windows (GPT Unicode characters like non-breaking hyphen)
+
 ## v3.2.0
 - AI context limits: 3K (standard), 5K (`--think`), 10K (`--think2`), 25K (`--think3`) lines
 - AI now has full IncludeCPP knowledge (namespace requirements, .cp format, common errors)
@@ -508,4 +516,4 @@ Options:
 
 ---
 
-MIT License | v3.2.0 | [GitHub](https://github.com/liliassg/IncludeCPP)
+MIT License | v3.2.2 | [GitHub](https://github.com/liliassg/IncludeCPP)

{includecpp-3.2.0 → includecpp-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: IncludeCPP
-Version: 3.2.0
+Version: 3.2.2
 Summary: Professional C++ Python bindings with type-generic templates, pystubs and native threading
 Home-page: https://github.com/includecpp/includecpp
 Author: IncludeCPP Team
@@ -470,6 +470,14 @@ Options:
 
 # Changelog
 
+## v3.2.2
+- Plugin command now detects comma-separated field declarations (e.g., `double x, y, z;` generates 3 FIELD entries)
+- Fixed `ai optimize` timeout for multi-file operations (increased to 5 minutes)
+- AI `ask` now extracts relevant CLI implementation when asking about commands/flags
+
+## v3.2.1
+- Fixed encoding error in `ai ask` output on Windows (GPT Unicode characters like non-breaking hyphen)
+
 ## v3.2.0
 - AI context limits: 3K (standard), 5K (`--think`), 10K (`--think2`), 25K (`--think3`) lines
 - AI now has full IncludeCPP knowledge (namespace requirements, .cp format, common errors)
@@ -508,4 +516,4 @@ Options:
 
 ---
 
-MIT License | v3.2.0 | [GitHub](https://github.com/liliassg/IncludeCPP)
+MIT License | v3.2.2 | [GitHub](https://github.com/liliassg/IncludeCPP)

{includecpp-3.2.0 → includecpp-3.2.2}/README.md

@@ -433,6 +433,14 @@ Options:
 
 # Changelog
 
+## v3.2.2
+- Plugin command now detects comma-separated field declarations (e.g., `double x, y, z;` generates 3 FIELD entries)
+- Fixed `ai optimize` timeout for multi-file operations (increased to 5 minutes)
+- AI `ask` now extracts relevant CLI implementation when asking about commands/flags
+
+## v3.2.1
+- Fixed encoding error in `ai ask` output on Windows (GPT Unicode characters like non-breaking hyphen)
+
 ## v3.2.0
 - AI context limits: 3K (standard), 5K (`--think`), 10K (`--think2`), 25K (`--think3`) lines
 - AI now has full IncludeCPP knowledge (namespace requirements, .cp format, common errors)
@@ -471,4 +479,4 @@ Options:
 
 ---
 
-MIT License | v3.2.0 | [GitHub](https://github.com/liliassg/IncludeCPP)
+MIT License | v3.2.2 | [GitHub](https://github.com/liliassg/IncludeCPP)

{includecpp-3.2.0 → includecpp-3.2.2}/includecpp/__init__.py

@@ -1,7 +1,7 @@
 from .core.cpp_api import CppApi
 import warnings
 
-__version__ = "3.2.0"
+__version__ = "3.2.2"
 __all__ = ["CppApi"]
 
 # Module-level cache for C++ modules

{includecpp-3.2.0 → includecpp-3.2.2}/includecpp/cli/commands.py

@@ -50,11 +50,20 @@ def _safe_echo(text, **kwargs):
             ('┌', '+'), ('┐', '+'), ('└', '+'), ('┘', '+'),
             ('═', '-'), ('─', '-'), ('║', '|'), ('│', '|'),
             ('✗', '[X]'), ('•', '*'),
-            ('→', '->'), ('▶', '>'), ('◆', '*')
+            ('→', '->'), ('▶', '>'), ('◆', '*'),
+            ('\u2011', '-'), ('\u2010', '-'),
+            ('\u2013', '-'), ('\u2014', '--'),
+            ('\u2018', "'"), ('\u2019', "'"),
+            ('\u201c', '"'), ('\u201d', '"'),
+            ('\u2022', '*'), ('\u2026', '...'),
+            ('\u00a0', ' '),
         ]
         for uni, ascii_char in replacements:
             ascii_text = ascii_text.replace(uni, ascii_char)
-        click.secho(ascii_text, **kwargs)
+        try:
+            click.secho(ascii_text, **kwargs)
+        except UnicodeEncodeError:
+            click.secho(ascii_text.encode('ascii', errors='replace').decode('ascii'), **kwargs)
 
 def _render_readme_with_colors(readme_text):
     """Render README.md with color highlighting in terminal."""
@@ -2515,6 +2524,107 @@ def plugin(plugin_name, files, private):
 
         return methods, constructor_signatures, method_signatures
 
+    def extract_fields(public_section, class_name):
+        """Extract member variable declarations from public section.
+
+        v3.2.2: Handles comma-separated field declarations like:
+        double x, y, z;  ->  [('double', 'x'), ('double', 'y'), ('double', 'z')]
+        """
+        fields = []
+
+        # Pattern to match field declarations
+        # Matches: type name; OR type name1, name2, name3;
+        # Handles: int x; double x, y, z; std::vector<int> items; const float PI = 3.14;
+        field_pattern = re.compile(
+            r'^\s*'  # Start of line, optional whitespace
+            r'(?:static\s+)?'  # Optional static
+            r'(const\s+)?'  # Optional const (group 1)
+            r'([a-zA-Z_][\w:]*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?)'  # Type (group 2) - handles nested templates
+            r'(\s*[&*])?'  # Optional reference/pointer (group 3)
+            r'\s+'  # Required whitespace
+            r'([^;(=]+)'  # Names part - everything until ; ( or = (group 4)
+            r'\s*(?:=\s*[^;]+)?'  # Optional initializer
+            r'\s*;',  # Semicolon
+            re.MULTILINE
+        )
+
+        cpp_keywords = {
+            'return', 'new', 'delete', 'throw', 'if', 'else', 'for', 'while', 'switch',
+            'case', 'break', 'continue', 'class', 'struct', 'enum', 'typedef', 'using',
+            'namespace', 'template', 'typename', 'virtual', 'override', 'final', 'public',
+            'private', 'protected', 'friend', 'operator', 'sizeof', 'alignof', 'decltype',
+            'auto', 'register', 'extern', 'mutable', 'thread_local', 'constexpr', 'consteval',
+            'constinit', 'inline', 'volatile'
+        }
+
+        # Process line by line to handle function body context
+        lines = public_section.split('\n')
+        brace_depth = 0
+
+        for line in lines:
+            # Track brace depth to skip function bodies
+            brace_depth += line.count('{') - line.count('}')
+            if brace_depth > 0:
+                continue  # Inside a function body
+
+            # Skip lines that look like function declarations/definitions
+            stripped = line.strip()
+            if '(' in stripped and ')' in stripped:
+                continue
+
+            match = field_pattern.match(line)
+            if match:
+                is_const = match.group(1) is not None
+                base_type = match.group(2).strip()
+                ref_ptr = (match.group(3) or '').strip()
+                names_part = match.group(4).strip()
+
+                # Skip if type looks like a keyword or constructor
+                if base_type.lower() in cpp_keywords:
+                    continue
+                if base_type == class_name:
+                    continue  # Constructor, not a field
+
+                # Build full type
+                full_type = ''
+                if is_const:
+                    full_type = 'const '
+                full_type += base_type
+                if ref_ptr:
+                    full_type += ref_ptr
+
+                # Split comma-separated names: "x, y, z" -> ["x", "y", "z"]
+                # Handle cases like: "*ptr1, *ptr2" or "&ref1, &ref2"
+                name_parts = names_part.split(',')
+
+                for name in name_parts:
+                    name = name.strip()
+                    if not name:
+                        continue
+
+                    # Handle pointer/reference attached to variable name
+                    actual_type = full_type
+                    if name.startswith('*'):
+                        name = name[1:].strip()
+                        if '*' not in actual_type:
+                            actual_type += '*'
+                    elif name.startswith('&'):
+                        name = name[1:].strip()
+                        if '&' not in actual_type:
+                            actual_type += '&'
+
+                    # Remove array brackets if present
+                    if '[' in name:
+                        name = name[:name.find('[')]
+
+                    # Validate field name
+                    if name and re.match(r'^[a-zA-Z_]\w*$', name):
+                        # Skip if name is a keyword
+                        if name.lower() not in cpp_keywords:
+                            fields.append((actual_type, name))
+
+        return fields
+
     all_files = cpp_files + h_files
 
     for file in all_files:
@@ -2561,7 +2671,7 @@ def plugin(plugin_name, files, private):
             public_section = extract_public_section(class_body, is_struct)
 
             if class_name not in classes:
-                classes[class_name] = {'methods': set(), 'constructors': [], 'method_signatures': {}}
+                classes[class_name] = {'methods': set(), 'constructors': [], 'method_signatures': {}, 'fields': []}
 
             methods, constructor_sigs, method_sigs = extract_methods(public_section, class_name)
             classes[class_name]['methods'].update(methods)
@@ -2579,6 +2689,12 @@ def plugin(plugin_name, files, private):
                     classes[class_name]['constructors'].append(sig)
                     existing_ctors.add(sig)
 
+            # v3.2.2: Extract fields (including comma-separated declarations)
+            field_list = extract_fields(public_section, class_name)
+            for field_type, field_name in field_list:
+                if (field_type, field_name) not in classes[class_name]['fields']:
+                    classes[class_name]['fields'].append((field_type, field_name))
+
         # Find free functions (not inside class bodies)
         # First, remove all class bodies from content to avoid matching class methods
         content_no_classes = content
@@ -2709,6 +2825,11 @@ def plugin(plugin_name, files, private):
                     for method in sorted(cls_info['methods']):
                         f.write(f'        METHOD({method})\n')
 
+                # v3.2.2: Write fields
+                if cls_info.get('fields'):
+                    for field_type, field_name in cls_info['fields']:
+                        f.write(f'        FIELD({field_type}, {field_name})\n')
+
                 f.write(f'    }}\n')
 
             if classes and (public_functions or template_functions):
@@ -2732,6 +2853,9 @@ def plugin(plugin_name, files, private):
 
     click.secho(f"Generated plugin: {cp_file}", fg='green', bold=True)
     click.echo(f"Classes found: {len(classes)}")
+    total_fields = sum(len(c.get('fields', [])) for c in classes.values())
+    if total_fields:
+        click.echo(f"Fields found: {total_fields}")
     click.echo(f"Template functions: {len(template_functions)}")
     click.echo(f"Public functions: {len(public_functions)}")
     if private_set:
@@ -5002,10 +5126,7 @@ def ai_ask(question, module_name, files, all_modules, exclude, think_mode, think
         click.secho(f"AI Error: {response}", fg='red', err=True)
         return
     click.echo(f"\n{'='*60}")
-    try:
-        click.echo(response)
-    except UnicodeEncodeError:
-        click.echo(response.encode('utf-8', errors='replace').decode('utf-8'))
+    _safe_echo(response)
     click.echo(f"{'='*60}\n")
 
 

{includecpp-3.2.0 → includecpp-3.2.2}/includecpp/core/ai_integration.py

@@ -29,20 +29,36 @@ CONTEXT_LIMITS = {
 
 INCLUDECPP_CONTEXT = '''
 CRITICAL KNOWLEDGE FOR INCLUDECPP:
-- ALL C++ code MUST be inside `namespace includecpp { }` - this is REQUIRED, not optional
-- Plugin files (.cp) define bindings: SOURCE(file.cpp), HEADER(file.h), CLASS(), FUNC(), METHOD(), TEMPLATE_FUNC()
-- Build output: ~/.includecpp/builds/ (Windows: %APPDATA%/IncludeCPP/)
-- Common errors and fixes:
-  * "undefined reference" / "unresolved external" -> Code not in namespace includecpp { }, or missing FUNC() in .cp
-  * "no matching function" -> Wrong parameter types in .cp METHOD() definition
-  * "template instantiation" -> Missing TEMPLATE_FUNC() with TYPES() in .cp file
-  * "namespace includecpp not found" -> Source file missing namespace includecpp { } wrapper
-- Plugin file (.cp) format example:
-  SOURCE(module.cpp) module_name
-  PUBLIC:
-  module_name CLASS(MyClass) { METHOD(foo) CONSTRUCTOR() }
-  module_name FUNC(standalone_function)
-  module_name TEMPLATE_FUNC(generic_func) TYPES(int, float, double)
+
+1. NAMESPACE REQUIREMENT:
+   ALL C++ code MUST be inside `namespace includecpp { }` - this is REQUIRED, not optional.
+
+2. PLUGIN FILE (.cp) FORMAT:
+   SOURCE(file.cpp) module_name
+   PUBLIC:
+   module_name CLASS(MyClass) {
+       CONSTRUCTOR()
+       CONSTRUCTOR(int, double)
+       METHOD(foo)
+       METHOD_CONST(bar, const std::string&)
+       FIELD(double, x)
+   }
+   module_name FUNC(standalone_function)
+   module_name TEMPLATE_FUNC(generic_func) TYPES(int, float, double)
+   module_name STRUCT(Point) { FIELD(double, x) FIELD(double, y) }
+
+3. BUILD OUTPUT:
+   ~/.includecpp/builds/ (Windows: %APPDATA%/IncludeCPP/)
+
+4. COMMON ERRORS AND FIXES:
+   * "undefined reference" -> Code not in namespace includecpp { }, or missing FUNC() in .cp
+   * "no matching function" -> Wrong parameter types in .cp METHOD() definition
+   * "template instantiation" -> Missing TEMPLATE_FUNC() with TYPES() in .cp file
+   * "namespace includecpp not found" -> Source file missing namespace wrapper
+   * "no member named X" -> Method not in class public section, or missing METHOD() in .cp
+
+5. FIELD DECLARATIONS:
+   Comma-separated fields like `double x, y, z;` are parsed as separate fields.
 '''
 
 SYSTEM_PROMPT_OPTIMIZE = '''You are a C++ expert specializing in pybind11 bindings and the IncludeCPP framework.
@@ -313,12 +329,27 @@ REASON: <why>
 Be thorough. This is professional-grade analysis.'''
 
 
+CLI_KEYWORDS = {
+    'plugin': ['def plugin', '@cli.command', 'plugin_name', 'extract_fields', 'extract_methods'],
+    'rebuild': ['def rebuild', 'build_manager', '--fast', '--clean', '--auto-ai'],
+    'build': ['def build', 'build_manager'],
+    'auto': ['def auto', 'auto_plugins', '--all'],
+    'fix': ['def fix', 'fix_code', '--ai', 'ai_mgr'],
+    'init': ['def init', 'cpp.proj', 'plugins/', 'include/'],
+    'ai': ['@ai.command', 'ai_mgr', 'get_ai_manager', 'ai ask', 'ai edit', 'ai optimize'],
+    'settings': ['def settings', 'settings_ui', 'PyQt6'],
+    'flag': ['@click.option', 'is_flag', '--think', '--websearch', '--confirm'],
+    'command': ['@cli.command', '@click.argument', '@click.option'],
+}
+
+
 class AIManager:
     def __init__(self):
         self.secret_dir = Path.home() / '.includecpp'
         self.secret_path = self.secret_dir / '.secret'
         self.config = self._load_config()
         self._doc_cache = None
+        self._cli_cache = None
 
     def _get_documentation(self) -> str:
         if self._doc_cache:
@@ -359,6 +390,85 @@ class AIManager:
             return '\n\nBUILD CONTEXT (user\'s projects):\n' + '\n'.join(info_parts[:5])
         return ''
 
+    def _get_cli_context(self, question: str) -> str:
+        """Extract relevant CLI implementation context based on the question.
+
+        Only extracts code sections matching keywords from the question to save tokens.
+        """
+        question_lower = question.lower()
+
+        # Check if question is about CLI/commands
+        cli_terms = ['command', 'flag', 'option', 'cli', 'includecpp', '--', 'how to', 'usage']
+        if not any(term in question_lower for term in cli_terms):
+            return ''
+
+        # Find which CLI topics are relevant
+        relevant_keywords = set()
+        for topic, keywords in CLI_KEYWORDS.items():
+            if topic in question_lower:
+                relevant_keywords.update(keywords)
+
+        # Add generic command keywords if asking about flags/options
+        if '--' in question or 'flag' in question_lower or 'option' in question_lower:
+            relevant_keywords.update(CLI_KEYWORDS['flag'])
+
+        if not relevant_keywords:
+            return ''
+
+        # Load CLI source if not cached
+        if self._cli_cache is None:
+            try:
+                cli_path = Path(__file__).parent.parent / 'cli' / 'commands.py'
+                if cli_path.exists():
+                    self._cli_cache = cli_path.read_text(encoding='utf-8')
+            except:
+                return ''
+
+        if not self._cli_cache:
+            return ''
+
+        # Extract relevant sections (functions/decorators containing keywords)
+        lines = self._cli_cache.split('\n')
+        extracted = []
+        in_relevant_block = False
+        block_lines = []
+        indent_level = 0
+
+        for i, line in enumerate(lines):
+            stripped = line.strip()
+
+            # Check for function/decorator start
+            if stripped.startswith('@') or stripped.startswith('def '):
+                # Save previous block if relevant
+                if in_relevant_block and block_lines:
+                    extracted.extend(block_lines[:50])  # Max 50 lines per block
+                    extracted.append('    # ... (truncated)\n')
+
+                # Check if new block is relevant
+                in_relevant_block = any(kw in line for kw in relevant_keywords)
+                block_lines = [f'{i+1}: {line}'] if in_relevant_block else []
+                indent_level = len(line) - len(line.lstrip())
+
+            elif in_relevant_block:
+                # Continue block until dedent
+                current_indent = len(line) - len(line.lstrip()) if stripped else indent_level + 1
+                if stripped and current_indent <= indent_level and not stripped.startswith('@'):
+                    # Block ended
+                    if block_lines:
+                        extracted.extend(block_lines[:50])
+                        if len(block_lines) > 50:
+                            extracted.append('    # ... (truncated)\n')
+                    in_relevant_block = False
+                    block_lines = []
+                else:
+                    block_lines.append(f'{i+1}: {line}')
+
+        # Limit total context
+        if extracted:
+            context = '\n'.join(extracted[:200])  # Max 200 lines total
+            return f'\n\nCLI IMPLEMENTATION (relevant sections):\n```python\n{context}\n```'
+        return ''
+
     def _get_context_limit(self, think: bool = False, think_twice: bool = False,
                            think_three: bool = False) -> int:
         """Get the appropriate context limit based on thinking mode."""
@@ -646,7 +756,8 @@ class AIManager:
         self.config['daily_usage']['tokens'] = self.config['daily_usage'].get('tokens', 0) + tokens
         self._save_config()
 
-    def query(self, system_prompt: str, user_prompt: str, temperature: float = 0.3) -> Tuple[bool, str]:
+    def query(self, system_prompt: str, user_prompt: str, temperature: float = 0.3,
+              timeout: int = 180) -> Tuple[bool, str]:
         if not self.config.get('api_key'):
             return False, 'No API key configured'
         can_proceed, limit_warning = self._check_daily_limit()
@@ -672,7 +783,7 @@ class AIManager:
             data['max_tokens'] = token_limit
             data['temperature'] = temperature
         try:
-            response = requests.post(OPENAI_API_URL, headers=headers, json=data, timeout=120)
+            response = requests.post(OPENAI_API_URL, headers=headers, json=data, timeout=timeout)
             if response.status_code == 200:
                 result = response.json()
                 content = result['choices'][0]['message']['content']
@@ -724,7 +835,9 @@ class AIManager:
             prompt = f'Optimize the following C++ files for performance, safety, and pybind11 compatibility:\n{file_content}'
             system = SYSTEM_PROMPT_OPTIMIZE
         prompt = self._build_prompt_with_docs(prompt)
-        success, response = self.query(system, prompt)
+        # v3.2.2: Use longer timeout (5 min) for optimize operations with multiple files
+        timeout = 300 if len(files) > 1 else 180
+        success, response = self.query(system, prompt, timeout=timeout)
         if not success:
             return False, response, []
         changes = self._parse_file_changes(response)
@@ -889,6 +1002,10 @@ class AIManager:
             context_parts.append('\nPlugin definitions:')
             for path, content in plugins.items():
                 context_parts.append(f'\nPLUGIN: {path}\n```\n{content}\n```')
+        # v3.2.2: Add CLI context for questions about commands/flags
+        cli_context = self._get_cli_context(question)
+        if cli_context:
+            context_parts.append(cli_context)
         context = '\n'.join(context_parts)
         prompt = f'Question: {question}\n\n{context}'
         if think_three:

{includecpp-3.2.0 → includecpp-3.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "IncludeCPP"
-version = "3.2.0"
+version = "3.2.2"
 description = "Professional C++ Python bindings with type-generic templates, pystubs and native threading"
 readme = "README.md"
 requires-python = ">=3.8"