thothctl 0.25.2__tar.gz → 0.25.4__tar.gz

{thothctl-0.25.2 → thothctl-0.25.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.25.2
+Version: 0.25.4
 Summary: A CLI for Developer Control Plane. Accelerate your cloud IaC deployments.
 Project-URL: SourceCode, https://github.com/thothforge/thothctl
 Project-URL: HomePage, https://github.com/thothforge/thothctl
@@ -24,7 +24,7 @@ Requires-Dist: inquirer>=3.3.0
 Requires-Dist: json2html>=1.3.0
 Requires-Dist: junit2html>=30.1.3
 Requires-Dist: junitparser>=2.0.0
-Requires-Dist: mcp>=1.9.4
+Requires-Dist: mcp>=2.0.0
 Requires-Dist: pre-commit>=3.7.1
 Requires-Dist: psutil
 Requires-Dist: pyfiglet>=1.0.2

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/concepts.md

@@ -8,6 +8,8 @@ ThothCTL integrates AI across the infrastructure lifecycle through three distinc
 
 The **AI SDLC** is the overarching framework — not a single command, but the governed lifecycle that all ThothCTL features plug into. It defines *when* and *how* AI assists at each phase of infrastructure development.
 
+> 📖 **For the complete phase-by-phase guide** (enforcement modes, CI/CD integration, configuration, and detailed examples), see the [DevSecOps SDLC Guide](use_cases/devsecops_sdlc.md).
+
 ```mermaid
 %%{init: {'theme':'base', 'themeVariables': { 'primaryColor':'#e3f2fd','primaryTextColor':'#1565c0','primaryBorderColor':'#1976d2','lineColor':'#42a5f5','secondaryColor':'#fff3e0','tertiaryColor':'#f3e5f5','fontSize':'14px'}}}%%
 graph LR
@@ -226,7 +228,133 @@ Define the development environment for IaC projects. For example, native OS like
 
 ## Project
 
-IaC project, could be around a use case, blueprint, starter template published in your Catalog or default setup. 
+IaC project, could be around a use case, blueprint, starter template published in your Catalog or default setup.
+
+## Scaffold vs Blueprint vs Template
+
+ThothCTL distinguishes three types of reusable project artifacts. Understanding the difference is critical for proper project lifecycle management.
+
+### Scaffold
+
+A **scaffold** is an **empty starting structure** — folders, placeholder files, and configuration boilerplate that a team fills in with their own code. It defines *where* things go, not *what* they do.
+
+| Property | Value |
+|----------|-------|
+| **Purpose** | Start a new project from scratch with correct structure |
+| **Contains business logic** | ❌ No — only empty files and folder conventions |
+| **Parameterized** | ✅ Template placeholders (`#{ProjectName}#`, `#{Region}#`) |
+| **Requires prerequisites** | ❌ None — self-contained starting point |
+| **ThothCTL command** | `thothctl init project --project-type <type>` |
+| **Example** | `terraform-scaffold`, `cdk-scaffold`, `cloudformation-scaffold` |
+
+```
+terraform-scaffold/               ← SCAFFOLD: empty structure
+├── .thothcf.toml                 # Project rules + naming conventions
+├── .pre-commit-config.yaml
+├── common/
+│   ├── common.hcl                # Boilerplate (provider config)
+│   └── variables.tf              # Empty variables file
+├── stacks/                       # Empty — YOU add stacks here
+├── modules/                      # Empty — YOU add modules here
+└── README.md                     # Instructions for the team
+```
+
+**Official Scaffolds:**
+
+| Scaffold | Use Case |
+|----------|----------|
+| [terraform-terragrunt-scaffold](https://github.com/thothforge/terraform_terragrunt_scaffold_project) | Multi-environment Terragrunt |
+| [terraform-scaffold](https://github.com/thothforge/terraform_project_scaffold) | Standard Terraform |
+| [terraform-module-scaffold](https://github.com/thothforge/terraform_module_scaffold) | Reusable modules |
+| [cdk-scaffold](https://github.com/thothforge/cdk_project_scaffold) | AWS CDK v2 (TypeScript/Python) |
+| [cloudformation-scaffold](https://github.com/thothforge/cloudformation_project_scaffold) | CloudFormation / SAM |
+
+---
+
+### Blueprint
+
+A **blueprint** is an **opinionated, pre-configured reference implementation** for a specific use case. It contains real constructs, working stacks, tests, CI/CD, and configuration-driven deployment. Users **configure and deploy** — they don't code from scratch.
+
+| Property | Value |
+|----------|-------|
+| **Purpose** | Deploy a proven architecture for a specific domain |
+| **Contains business logic** | ✅ Yes — working stacks, constructs, pipelines |
+| **Parameterized** | ✅ YAML-driven configuration (environments, accounts, regions) |
+| **Requires prerequisites** | ✅ Often needs IAM roles, networking, or other infra to exist |
+| **Has tests** | ✅ Unit tests, cdk-nag checks, snapshot tests |
+| **Has CI/CD** | ✅ Complete deployment pipeline |
+| **ThothCTL command** | `thothctl project convert --make-template` (to create from existing) |
+| **Example** | `cdkv2-devops-agent-blueprint`, `eks-platform-blueprint` |
+
+```
+cdkv2-devops-agent-blueprint/     ← BLUEPRINT: working implementation
+├── .thothcf.toml
+├── lib/
+│   ├── stacks/
+│   │   ├── foundation/           # Real stack — KMS, S3, IAM baselines
+│   │   ├── agent/                # Real stack — DevOps Agent Space
+│   │   ├── platform/             # Real stack — VPC, ECS
+│   │   └── application/          # Real stack — Lambda, DynamoDB
+│   └── constructs/               # Reusable L2/L3 constructs
+├── skills/                       # DevOps Agent skills (domain knowledge)
+├── project_configs/
+│   └── environment_options.yaml  # Configure accounts, regions, features
+├── test/                         # cdk-nag + snapshot + unit tests
+└── .github/workflows/deploy.yml  # Full CI/CD pipeline
+```
+
+**Key difference from a scaffold**: You **configure** a blueprint (edit YAML), you **code into** a scaffold (write IaC from scratch).
+
+---
+
+### Template
+
+A **template** is what you get when you run `thothctl project convert --make-template` on a working project. It's a **parameterized, reusable version** of a real project — with placeholders for project-specific values.
+
+| Property | Value |
+|----------|-------|
+| **Purpose** | Replicate proven patterns across teams |
+| **Created from** | An existing project or blueprint |
+| **Contains business logic** | ✅ Yes, but parameterized with `#{Placeholders}#` |
+| **Published to** | Git registry (GitHub/GitLab), Backstage catalog |
+| **ThothCTL command** | `thothctl project convert --make-template` (create) |
+| | `thothctl init project --template-url <git-url>` (consume) |
+
+**Lifecycle**: Project → `convert --make-template` → Template → `init project` → New Project
+
+---
+
+### Relationship Diagram
+
+```mermaid
+%%{init: {'theme':'base', 'themeVariables': { 'primaryColor':'#3b82f6','primaryTextColor':'#ffffff','lineColor':'#94a3b8','fontSize':'14px'}}}%%
+graph LR
+    S["🏗️ Scaffold<br/><small>Empty structure</small>"]:::scaffoldNode
+    B["📐 Blueprint<br/><small>Reference implementation</small>"]:::blueprintNode
+    T["📦 Template<br/><small>Parameterized reusable</small>"]:::templateNode
+    P["🚀 Project<br/><small>Your working code</small>"]:::projectNode
+
+    S -->|"init project"| P
+    B -->|"configure & deploy"| P
+    P -->|"convert --make-template"| T
+    T -->|"init project --template-url"| P
+    B -->|"convert --make-template"| T
+
+    classDef scaffoldNode fill:#f59e0b,stroke:#d97706,stroke-width:2px,color:#fff
+    classDef blueprintNode fill:#8b5cf6,stroke:#7c3aed,stroke-width:2px,color:#fff
+    classDef templateNode fill:#10b981,stroke:#059669,stroke-width:2px,color:#fff
+    classDef projectNode fill:#3b82f6,stroke:#2563eb,stroke-width:2px,color:#fff
+```
+
+### Quick Comparison
+
+| | Scaffold | Blueprint | Template |
+|---|---|---|---|
+| **Start coding?** | ✅ Write everything | ❌ Configure YAML | ✅ Fill placeholders |
+| **Has working code?** | ❌ Empty | ✅ Complete | ✅ Parameterized |
+| **Domain-specific?** | ❌ Generic | ✅ Specific use case | ✅ From a real project |
+| **Deploy immediately?** | ❌ Need to add code | ✅ After configuration | ✅ After init |
+| **Use when** | Starting fresh | Adopting proven architecture | Replicating patterns |
 
 ## Space
 

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/framework_architecture.md

@@ -125,6 +125,8 @@ ThothCTL aligns with IDP business objectives through five core principles:
 - [terraform-scaffold](https://github.com/thothforge/terraform_project_scaffold) - Standard Terraform projects
 - [terragrunt-scaffold](https://github.com/thothforge/terragrunt_project_scaffold) - Multi-environment Terragrunt
 - [terraform-module-scaffold](https://github.com/thothforge/terraform_module_scaffold) - Reusable modules
+- [cdk-scaffold](https://github.com/thothforge/cdk_project_scaffold) - AWS CDK v2 (TypeScript/Python)
+- [cloudformation-scaffold](https://github.com/thothforge/cloudformation_project_scaffold) - CloudFormation / SAM
 
 **Commands:** `thothctl init env`, `thothctl init space`, `thothctl init project`
 

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/roadmap_fdi.md

@@ -1,6 +1,21 @@
 # Roadmap: ThothCTL as a Framework-Defined Infrastructure (FdI) Platform
 
-## Vision
+!!! warning "Deprecated — Superseded by 2026 Roadmap"
+    This document reflects the **original FdI roadmap** (v0.16–v0.22 phases) and is no longer the active planning document.
+    
+    **The current roadmap is**: `thothctl_roadmap_2026.md` (in the ThothForge root, outside this docs site) — integrates PlatformCon 2026 insights, competitive analysis, and updated implementation status.
+    
+    Key differences:
+    
+    - Phase numbering has changed (this doc's Phase 1–4 ≠ the 2026 roadmap's Phase 1–6)
+    - The 2026 roadmap reflects what is actually implemented (Intent-to-IaC, Workflow Engine partially done)
+    - New priorities added: Agent Governance, MCP Gateway, Compliance Scoring, Context Lake
+    
+    This file is preserved for historical context only. Do not use it for planning.
+
+---
+
+## Vision (Historical)
 
 Transform ThothCTL from an IaC management CLI into an **IaC-native Framework-Defined Infrastructure platform** where business intent and application conventions automatically produce production-ready infrastructure code — without requiring developers to write Terraform manually.
 

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/software_architecture.md

@@ -693,6 +693,8 @@ Git-based templates for project creation.
 - [terraform-scaffold](https://github.com/thothforge/terraform-scaffold)
 - [terragrunt-scaffold](https://github.com/thothforge/terragrunt-scaffold)
 - [tofu-scaffold](https://github.com/thothforge/tofu-scaffold)
+- [cdk-scaffold](https://github.com/thothforge/cdk-scaffold) - AWS CDK v2
+- [cloudformation-scaffold](https://github.com/thothforge/cloudformation-scaffold) - CloudFormation / SAM
 
 **Scaffold Structure:**
 ```

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/use_cases/README.md

@@ -95,6 +95,8 @@ thothctl init project --project-name my-infra --reuse --space lab-github
 # - terraform-scaffold
 # - terragrunt-scaffold
 # - tofu-scaffold
+# - cdk-scaffold
+# - cloudformation-scaffold
 ```
 
 ### 3. DevSecOps Workflow

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/use_cases/ai_dlc.md

@@ -136,6 +136,8 @@ ThothCTL exposes these capabilities through MCP:
 | `get_version` | Get ThothCTL version | "What version of ThothCTL is installed?" |
 | `upgrade_thothctl` | Upgrade ThothCTL | "Upgrade ThothCTL to latest version" |
 
+> 📖 The `workflow_devsecops` tool orchestrates the full DevSecOps SDLC pipeline. For detailed phase descriptions, enforcement modes, and configuration, see the [DevSecOps SDLC Guide](devsecops_sdlc.md).
+
 ---
 
 ## Component 2: Scaffold Templates

{thothctl-0.25.2 → thothctl-0.25.4}/docs/framework/use_cases/tasks/workflow_implementation_plan.md

@@ -1,5 +1,12 @@
 # Implementation Plan: DevSecOps Workflow Abstraction
 
+!!! success "Implementation Complete"
+    This workflow has been fully implemented. The `thothctl workflow devsecops` command is available since v0.25.x.
+    For usage documentation, see the **[DevSecOps SDLC Guide](../devsecops_sdlc.md)** — the single source of truth for all DevSecOps workflow phases, commands, and configuration.
+    For command reference, see [workflow devsecops command](../../commands/workflow/workflow_devsecops.md).
+
+---
+
 ## Objective
 
 Provide two abstraction layers over the existing DevSecOps SDLC stages:
@@ -707,7 +714,7 @@ Decision matrix for project type → command variations:
 
 | # | Task | Type | Effort |
 |---|------|------|--------|
-| 24 | Workflow YAML config support (`.thothcf.toml` [workflow] section) | Feature | M |
+| 24 | Workflow YAML config support (`.thothcf.toml` \[workflow\] section) | Feature | M |
 | 25 | `--post-to-pr` support on workflow command | Feature | S |
 | 26 | JSON/SARIF output for workflow results | Feature | M |
 | 27 | GitHub Actions reusable workflow template | Docs | M |

{thothctl-0.25.2 → thothctl-0.25.4}/docs/toolkit_overview.md

@@ -137,7 +137,7 @@ thothctl workflow devsecops --phase deploy     # 🚀 Enforcement gate
 thothctl workflow devsecops --phase monitor    # 📊 Drift detection
 ```
 
-📖 [Workflow Documentation](framework/commands/workflow/workflow_devsecops.md)
+📖 [Workflow Documentation](framework/commands/workflow/workflow_devsecops.md) | [Complete DevSecOps SDLC Guide](framework/use_cases/devsecops_sdlc.md)
 
 ---
 
@@ -218,6 +218,8 @@ thothctl init project -p my-infra --reuse --space my-space
 | [terraform-terragrunt-scaffold](https://github.com/thothforge/terraform_terragrunt_scaffold_project) | Multi-environment Terragrunt |
 | [terraform-scaffold](https://github.com/thothforge/terraform_project_scaffold) | Standard Terraform |
 | [terraform-module-scaffold](https://github.com/thothforge/terraform_module_scaffold) | Reusable modules |
+| [cdk-scaffold](https://github.com/thothforge/cdk_project_scaffold) | AWS CDK v2 (TypeScript/Python) |
+| [cloudformation-scaffold](https://github.com/thothforge/cloudformation_project_scaffold) | CloudFormation / SAM |
 
 ---
 

{thothctl-0.25.2 → thothctl-0.25.4}/mkdocs.yaml

@@ -95,7 +95,7 @@ nav:
     - Software Architecture: framework/software_architecture.md
     - Policy as Code: framework/policy_as_code.md
     - Concepts: framework/concepts.md
-    - Infrastructure Composition: framework/infrasctructure_composition.md
+    - Infrastructure Composition: framework/infrastructure_composition.md
     - Space Configuration: framework/space_configuration.md
     - Cross-Platform Support: framework/cross_platform_support.md
   - Troubleshooting:

{thothctl-0.25.2 → thothctl-0.25.4}/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "psutil",
     "requests",
     "cryptography>=41.0.0",
-    "mcp>=1.9.4",
+    "mcp>=2.0.0",
     "fastapi>=0.104.0",
     "uvicorn>=0.24.0",
     # Windows-specific dependencies

{thothctl-0.25.2 → thothctl-0.25.4}/src/thothctl/commands/check/commands/iac.py

@@ -35,6 +35,7 @@ class CheckIaCCommand(ClickCommand):
             "cost-analysis",
             "drift",
             "stack-optimizer",
+            "rules",
         ]
 
     def validate(self, **kwargs) -> bool:
@@ -101,6 +102,10 @@ class CheckIaCCommand(ClickCommand):
             elif kwargs["check_type"] == "stack-optimizer":
                 result = self._run_stack_optimizer(directory=directory, **kwargs)
                 return result
+            elif kwargs["check_type"] == "rules":
+                self.ui.print_info("📏 Running organizational rules evaluation...")
+                result = self._run_rules_evaluation(directory=directory, **kwargs)
+                return result
 
             self.logger.debug("Check completed successfully")
             return True
@@ -2446,6 +2451,104 @@ new vis.Network(container, data, options);
         }
         return color_map.get(criticality, "white")
 
+    def _run_rules_evaluation(self, directory: str, **kwargs) -> bool:
+        """Run organizational rules evaluation using OPA/conftest.
+
+        Compiles .thothcf.toml [rules] into Rego policies, then delegates
+        evaluation to the existing OPA/conftest scanner. No custom evaluation
+        engine — OPA is the single policy framework.
+        """
+        try:
+            from ....services.check.rules_compiler import RulesCompiler
+            from ....services.scan.scanners.opa import OPAScanner
+
+            # Step 1: Compile TOML rules → Rego policies
+            compiler = RulesCompiler()
+            compiled_dir = compiler.compile(directory)
+
+            if not compiled_dir:
+                self.ui.print_warning(
+                    "No rules found in .thothcf.toml [rules] section. "
+                    "Add [[rules.naming]], [[rules.tagging]], "
+                    "[[rules.security]], or [[rules.architecture]] sections."
+                )
+                return True
+
+            self.ui.print_info(
+                f"📏 Compiled rules to Rego policies in {compiled_dir}"
+            )
+
+            # Step 2: Run conftest with the compiled policies
+            scanner = OPAScanner()
+            reports_dir = kwargs.get("reports_dir", "Reports")
+            result = scanner.scan(
+                directory=directory,
+                reports_dir=reports_dir,
+                options={
+                    "mode": "conftest",
+                    "policy_dir": compiled_dir,
+                },
+            )
+
+            # Step 3: Report results
+            exit_code = result.get("exit_code", 0)
+            report_path = result.get("json_report", "")
+
+            if exit_code == 0:
+                self.ui.print_success(
+                    "✅ All organizational rules passed!"
+                )
+                return True
+
+            # Parse conftest JSON output for structured display
+            if report_path and os.path.exists(report_path):
+                import json
+
+                with open(report_path, "r") as f:
+                    findings = json.load(f)
+
+                failures = []
+                warnings = []
+                for entry in findings:
+                    for failure in entry.get("failures", []):
+                        failures.append(failure.get("msg", ""))
+                    for warning in entry.get("warnings", []):
+                        warnings.append(warning.get("msg", ""))
+
+                if failures or warnings:
+                    table = Table(
+                        title="📏 Rule Violations",
+                        box=box.ROUNDED,
+                        show_lines=True,
+                    )
+                    table.add_column("Severity")
+                    table.add_column("Message")
+
+                    for msg in failures:
+                        table.add_row("[red]ERROR[/red]", msg)
+                    for msg in warnings:
+                        table.add_row("[yellow]WARN[/yellow]", msg)
+
+                    self.console.print(table)
+                    self.console.print(
+                        f"\n[bold]Summary:[/bold] "
+                        f"[red]{len(failures)} failure(s)[/red], "
+                        f"[yellow]{len(warnings)} warning(s)[/yellow]"
+                    )
+
+            if exit_code != 0:
+                self.ui.print_error(
+                    "❌ Rule evaluation failed — policy violations found."
+                )
+                return False
+
+            return True
+
+        except Exception as e:
+            self.logger.error(f"Rules evaluation failed: {e}")
+            self.ui.print_error(f"Failed to run rules evaluation: {str(e)}")
+            return False
+
     def _run_stack_optimizer(self, directory: str, **kwargs) -> bool:
         """Run stack optimizer to deduplicate overlapping terragrunt filters."""
         import sys
@@ -2539,7 +2642,7 @@ cli = CheckIaCCommand.as_click_command(
     click.option(
         "-type",
         "--check_type",
-        help="tfplan: analyze plans | deps: view dependencies | blast-radius: impact analysis | cost-analysis: estimate costs | drift: detect infrastructure drift | stack-optimizer: deduplicate overlapping stacks",
+        help="tfplan: analyze plans | deps: view dependencies | blast-radius: impact analysis | cost-analysis: estimate costs | drift: detect infrastructure drift | stack-optimizer: deduplicate overlapping stacks | rules: evaluate organizational rules",
         type=click.Choice(
             [
                 "tfplan",
@@ -2548,6 +2651,7 @@ cli = CheckIaCCommand.as_click_command(
                 "cost-analysis",
                 "drift",
                 "stack-optimizer",
+                "rules",
             ],
             case_sensitive=True,
         ),

{thothctl-0.25.2 → thothctl-0.25.4}/src/thothctl/commands/init/commands/project.py

@@ -130,6 +130,11 @@ class ProjectInitCommand(ClickCommand):
         # If space is provided, show info and get VCS provider
         vcs_provider = version_control_systems_service
         vcs_params = {}
+
+        # Auto-detect VCS from flags: --github-org implies github
+        if github_username and vcs_provider != "github":
+            vcs_provider = "github"
+
         if space:
             self.ui.print_info(f"🌌 Using space: {space}")
             space_vcs = get_space_vcs_provider(space)
@@ -140,7 +145,7 @@ class ProjectInitCommand(ClickCommand):
         # Pass the appropriate parameters based on VCS provider
         if vcs_provider == "azure_repos" and az_org_name:
             vcs_params["az_org_name"] = az_org_name
-        elif vcs_provider == "github" and github_username:
+        elif vcs_provider == "github":
             vcs_params["github_username"] = github_username
 
         # If reuse is enabled, first let user select template before creating project
@@ -417,65 +422,38 @@ class ProjectInitCommand(ClickCommand):
             token = None
             username = None
 
-            # Try to get credentials from space first
-            try:
-                credentials, _ = get_credentials_with_password(space, "vcs")
-
-                if credentials.get("type") == "github":
-                    token = credentials.get("token")
-                    username = credentials.get("username")
-                    self.ui.print_info(
-                        f"✅ Using GitHub credentials from space '{space}'"
-                    )
-                else:
-                    self.ui.print_warning(
-                        f"Space '{space}' has non-GitHub VCS credentials"
-                    )
+            # Try to get credentials from space first (only if space is set)
+            if space:
+                try:
+                    credentials, _ = get_credentials_with_password(space, "vcs")
 
-            except FileNotFoundError:
-                self.ui.print_info(f"No GitHub credentials found for space '{space}'")
+                    if credentials.get("type") == "github":
+                        token = credentials.get("token")
+                        username = credentials.get("username")
+                        self.ui.print_info(
+                            f"✅ Using GitHub credentials from space '{space}'"
+                        )
+                    else:
+                        self.ui.print_warning(
+                            f"Space '{space}' has non-GitHub VCS credentials"
+                        )
 
-                # Ask user if they want to set up credentials
-                if self.ui.confirm(
-                    "Would you like to set up GitHub credentials for this space?"
-                ):
-                    username = input("Enter GitHub username or organization name: ")
+                except FileNotFoundError:
                     self.ui.print_info(
-                        "You'll need a Personal Access Token with appropriate permissions"
-                    )
-                    token = getpass.getpass("Enter your GitHub Personal Access Token: ")
-
-                    # Create and save credentials
-                    credentials = {
-                        "type": "github",
-                        "username": username,
-                        "token": token,
-                    }
-
-                    encryption_password = getpass.getpass(
-                        "Enter a password to encrypt your credentials: "
+                        f"No GitHub credentials found for space '{space}'"
                     )
+            else:
+                self.ui.print_info(
+                    "No space configured. Enter GitHub credentials directly."
+                )
 
-                    try:
-                        save_credentials(
-                            space_name=space,
-                            credentials=credentials,
-                            credential_type="vcs",
-                            password=encryption_password,
-                        )
-                        self.ui.print_success(
-                            "🔒 GitHub credentials saved securely for future use"
-                        )
-                    except Exception as e:
-                        self.ui.print_error(f"Failed to save credentials: {e}")
-                        # Continue without saving, use credentials for this session only
-                else:
-                    # User declined to set up credentials, try with public access
-                    self.ui.print_info("Attempting to access public repositories...")
-                    username = input(
-                        "Enter GitHub username or organization name for public repositories: "
-                    )
-                    # token remains None for public access
+            # If no credentials from space, default to thothforge public org
+            if not username:
+                # Priority: --github-username flag > thothforge default
+                username = kwargs.get("github_username") or "thothforge"
+                self.ui.print_info(
+                    f"📦 Using GitHub template source: github.com/{username}"
+                )
 
             if not username:
                 self.ui.print_error("GitHub username is required")
@@ -664,9 +642,9 @@ cli = ProjectInitCommand.as_click_command(help="Initialize a new project")(
     click.option(
         "-vcss",
         "--version-control-systems-service",
-        default="azure_repos",
+        default="github",
         type=click.Choice(["azure_repos", "github", "gitlab"], case_sensitive=True),
-        help="The Version Control System Service for you IDP",
+        help="The Version Control System Service for your IDP (default: github)",
     ),
     click.option(
         "-reuse",
@@ -682,9 +660,10 @@ cli = ProjectInitCommand.as_click_command(help="Initialize a new project")(
         default=None,
     ),
     click.option(
-        "-gh-user",
-        "--github-username",
-        help="GitHub username or organization (for GitHub)",
+        "-gh-org",
+        "--github-org",
+        "github_username",
+        help="GitHub organization or username for templates (default: thothforge)",
         default=None,
     ),
     click.option(

{thothctl-0.25.2 → thothctl-0.25.4}/src/thothctl/core/integrations/github/get_github.py

@@ -58,9 +58,13 @@ def get_repos_patterns(
 
     repos = []
     for repo in repos_data:
+        # Normalize: treat hyphens and underscores as equivalent for matching
+        normalized_name = repo["name"].replace("-", "_")
         if any(
-            repo["name"].startswith(prefix) for prefix in allowed_pattern_prefixes
-        ) and any(repo["name"].endswith(suffix) for suffix in allowed_pattern_suffixes):
+            normalized_name.startswith(prefix) for prefix in allowed_pattern_prefixes
+        ) and any(
+            normalized_name.endswith(suffix) for suffix in allowed_pattern_suffixes
+        ):
             repos.append(
                 {
                     "Name": repo["name"],

{thothctl-0.25.2 → thothctl-0.25.4}/src/thothctl/core/integrations/pattern_names.py

@@ -3,8 +3,11 @@
 allowed_pattern_prefixes = [
     "terraform_",
     "cdkv2_",
+    "cdkv2-",
     "data_cdkv2_",
     "terragrunt_",
+    "cloudformation_",
+    "cloudformation-",
     "demo_",
 ]
 allowed_pattern_suffixes = [
@@ -13,4 +16,7 @@ allowed_pattern_suffixes = [
     "_template",
     "_blueprint",
     "_scaffold",
+    "-blueprint",
+    "-scaffold",
+    "-template",
 ]