refactor(goal): CLI interface improvements

tom-sapletta-com · tom-sapletta-com · commit 66fdf3dfa9de · 2026-02-25T10:03:03.000+01:00
changes:
  - file: cli.py
    area: cli
    modified: [main]
  - file: function_logic.py
    area: core
    added: [generate_toon_schema]
    modified: [generate_toon, FunctionLogicGenerator]

dependencies:
  flow: "cli→function_logic"
  - cli.py -&gt; function_logic.py

stats:
  lines: "+3560/-3516 (net +44)"
  files: 3
  complexity: "Large structural change (normalized)"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [1.0.37] - 2026-02-25
+
+### Summary
+
+refactor(goal): CLI interface improvements
+
+### Other
+
+- update code2logic/cli.py
+- update code2logic/function_logic.py
+- update project.functions.toon
+
+
 ## [1.0.36] - 2026-02-25
 
 ### Summary
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.36
+1.0.37
diff --git a/code2logic/__init__.py b/code2logic/__init__.py
@@ -18,7 +18,7 @@
     >>> print(output)
 """
 
-__version__ = "1.0.36"
+__version__ = "1.0.37"
 __author__ = "Softreck"
 __email__ = "info@softreck.dev"
 __license__ = "MIT"
diff --git a/code2logic/cli.py b/code2logic/cli.py
@@ -1042,17 +1042,31 @@ def _maybe_print_pretty_help() -> bool:
         else:
             logic_out = logic_gen.generate(project, detail=args.detail)
 
+        # Generate function-logic schema if requested and format is TOON
+        func_schema = None
+        if args.with_schema and lower.endswith('.toon'):
+            func_schema = logic_gen.generate_toon_schema()
+
         if use_stdout:
             # Write to stdout with section marker
             print(f"\n=== FUNCTION_LOGIC ===")
             print(logic_out)
+            if func_schema:
+                print(f"\n=== FUNCTION_LOGIC_SCHEMA ===")
+                print(func_schema)
         elif output_dir:
             # Write to file in output directory
             os.makedirs(output_dir, exist_ok=True)
             with open(logic_path, 'w', encoding='utf-8') as f:
                 f.write(logic_out)
             if args.verbose:
                 log.success(f"Function logic written to: {logic_path}")
+            if func_schema:
+                schema_path = logic_path.replace('.toon', '-schema.json')
+                with open(schema_path, 'w', encoding='utf-8') as f:
+                    f.write(func_schema)
+                if args.verbose:
+                    log.success(f"Function logic schema written to: {schema_path}")
 
     gen_time = time.time() - gen_start
 
diff --git a/code2logic/function_logic.py b/code2logic/function_logic.py
@@ -72,16 +72,24 @@ def generate_toon(
         delim = toon.delimiter
         dm = toon.delim_marker
 
+        # Pre-filter: only modules with at least one function/method
+        all_modules = list(project.modules or [])
+        modules_with_items = [(m, self._module_items(m)) for m in all_modules]
+        modules_with_items = [(m, items) for m, items in modules_with_items if items]
+
         lines: List[str] = []
+
+        # Format header — helps LLM understand the structure
+        lines.append(f"# {project.name} function-logic | {len(modules_with_items)} modules")
+        lines.append("# Convention: name with . = method, ~name = async, cc:N shown only when >1")
+
         lines.append(f"project: {toon._quote(project.name)}")
         if getattr(project, 'generated_at', None):
             lines.append(f"generated: {toon._quote(project.generated_at)}")
 
-        modules = list(project.modules or [])
-        lines.append(f"modules[{len(modules)}]{{path{dm}lang{dm}items}}:")
+        lines.append(f"modules[{len(modules_with_items)}]{{path{dm}lang{dm}items}}:")
         prev_dir: str | None = None
-        for m in modules:
-            items = self._module_items(m)
+        for m, items in modules_with_items:
             if no_repeat_name:
                 compressed_path, prev_dir = toon._compress_module_path(m.path, prev_dir)
                 path_out = compressed_path
@@ -93,19 +101,15 @@ def generate_toon(
         lines.append("function_details:")
 
         prev_dir = None
-        for m in modules:
-            items = self._module_items(m)
-            if not items:
-                continue
-
+        for m, items in modules_with_items:
             if no_repeat_details:
                 compressed_path, prev_dir = toon._compress_module_path(m.path, prev_dir)
                 details_key = compressed_path
             else:
                 details_key = m.path
             lines.append(f"  {toon._quote(details_key)}:")
 
-            header = f"line{dm}name{dm}kind{dm}sig{dm}async{dm}cc"
+            header = f"line{dm}name{dm}sig"
             if detail in ('standard', 'full'):
                 header += f"{dm}does"
             if detail == 'full':
@@ -115,15 +119,20 @@ def generate_toon(
 
             for kind, qname, func in items:
                 sig = self._build_sig(func, include_async_prefix=False, language=m.language)
-                is_async = 'true' if getattr(func, 'is_async', False) else 'false'
                 start_line = str(getattr(func, 'start_line', 0) or 0)
+
+                # Encode async as ~ prefix, cc as suffix (only when >1)
+                display_name = qname
+                if getattr(func, 'is_async', False):
+                    display_name = f"~{qname}"
+                cc = getattr(func, 'complexity', 1) or 1
+                if cc > 1:
+                    display_name = f"{display_name} cc:{cc}"
+
                 row = [
                     start_line,
-                    toon._quote(qname),
-                    toon._quote(kind),
+                    toon._quote(display_name),
                     toon._quote(sig),
-                    is_async,
-                    str(getattr(func, 'complexity', 1) or 1),
                 ]
 
                 if detail in ('standard', 'full'):
@@ -142,6 +151,73 @@ def generate_toon(
 
         return "\n".join(lines).rstrip() + "\n"
 
+    def generate_toon_schema(self) -> str:
+        """Generate JSON Schema describing the function-logic TOON format."""
+        import json
+
+        schema = {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "title": "Code2Logic Function-Logic TOON Schema",
+            "description": (
+                "Schema for project.functions.toon — compact function/method index. "
+                "Conventions: name containing '.' = method (Class.method), "
+                "~prefix = async, 'cc:N' suffix = cyclomatic complexity (only when >1)."
+            ),
+            "type": "object",
+            "properties": {
+                "project": {"type": "string", "description": "Project name"},
+                "generated": {"type": "string", "description": "ISO timestamp"},
+                "modules": {
+                    "type": "array",
+                    "description": "Modules with at least one function/method. Rows: path,lang,items. Use ./file for same-dir compression (--no-repeat-module).",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "path": {"type": "string", "description": "Relative path or ./basename if same dir as previous"},
+                            "lang": {"type": "string", "description": "Short language code (py, js, ts, ...)"},
+                            "items": {"type": "integer", "description": "Number of functions+methods in module"}
+                        }
+                    }
+                },
+                "function_details": {
+                    "type": "object",
+                    "description": "Per-module function tables. Keys are module paths (or ./basename with --no-repeat-details).",
+                    "patternProperties": {
+                        ".*": {
+                            "type": "object",
+                            "properties": {
+                                "functions": {
+                                    "type": "array",
+                                    "description": "Tabular rows: line,name,sig[,does][,decorators,calls,raises]",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "line": {"type": "integer", "description": "Start line number"},
+                                            "name": {
+                                                "type": "string",
+                                                "description": (
+                                                    "Function or method name. "
+                                                    "Contains '.' if method (e.g. Class.method). "
+                                                    "Prefixed with ~ if async. "
+                                                    "Suffixed with ' cc:N' if cyclomatic complexity > 1."
+                                                )
+                                            },
+                                            "sig": {"type": "string", "description": "Signature: (params) [-> return_type]"},
+                                            "does": {"type": "string", "description": "Intent/purpose (standard+full detail)"},
+                                            "decorators": {"type": "string", "description": "Pipe-separated decorators (full detail)"},
+                                            "calls": {"type": "string", "description": "Pipe-separated function calls (full detail)"},
+                                            "raises": {"type": "string", "description": "Pipe-separated exceptions (full detail)"}
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return json.dumps(schema, indent=2, ensure_ascii=False)
+
     def _build_data(self, project: ProjectInfo, detail: str) -> dict:
         modules_data = []
         for m in project.modules or []:
diff --git a/logic2code/__init__.py b/logic2code/__init__.py
@@ -14,5 +14,5 @@
 from .generator import CodeGenerator, GeneratorConfig, GenerationResult
 from .renderers import PythonRenderer
 
-__version__ = '1.0.36'
+__version__ = '1.0.37'
 __all__ = ['CodeGenerator', 'GeneratorConfig', 'GenerationResult', 'PythonRenderer']
diff --git a/logic2test/__init__.py b/logic2test/__init__.py
@@ -15,5 +15,5 @@
 from .parsers import LogicParser
 from .templates import TestTemplate
 
-__version__ = '1.0.36'
+__version__ = '1.0.37'
 __all__ = ['TestGenerator', 'GeneratorConfig', 'GenerationResult', 'LogicParser', 'TestTemplate']
diff --git a/lolm/__init__.py b/lolm/__init__.py
@@ -76,7 +76,7 @@
 )
 from .clients import LLMRateLimitError
 
-__version__ = '1.0.36'
+__version__ = '1.0.37'
 __all__ = [
     # Config
     'LLMConfig',
diff --git a/project.functions.toon b/project.functions.toon
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tests/samples/sample_reexport/__init__.py b/tests/samples/sample_reexport/__init__.py

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@`
`76`	`76`	`)`
`77`	`77`	`from .clients import LLMRateLimitError`
`78`	`78`
`79`		`-__version__ = '1.0.36'`
	`79`	`+__version__ = '1.0.37'`
`80`	`80`	`__all__ = [`
`81`	`81`	`# Config`
`82`	`82`	`'LLMConfig',`