thothctl 0.30.0__tar.gz → 0.30.2__tar.gz

{thothctl-0.30.0 → thothctl-0.30.2}/CHANGELOG.md

@@ -5,6 +5,43 @@ All notable changes to ThothCTL are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.30.0] - 2026-09-22
+
+### Fixed
+
+- **Intent-to-IaC plan validation** — per-stack plan validation is now skipped for
+  terragrunt projects when no `stack_path` is given (previously it wrote stray `.tf`
+  files into the project root and ran `terragrunt plan` against `root.hcl`).
+  Single-mode validation now routes `full-project` mode to `validate_full_project`.
+- **HCL-aware block stripping** — `terraform {}` / `provider {}` removal now uses a
+  string/comment-aware brace scanner that correctly handles arbitrarily nested
+  blocks (e.g. `backend`, `assume_role`, `default_tags`) and braces inside strings
+  or comments, replacing the previous single-level regex.
+- Added a missing module logger in `generate iac` CLI (undefined `logger` in the
+  history-save error handler).
+
+### Added
+
+- **`--plan-filter` wiring** — the flag (plus `THOTH_PLAN_FILTER` env and
+  `[generation.plan].stack_filter`) is now honored end-to-end; `validate_full_project`
+  routes to `validate_filtered` when set.
+- **Real dependency-graph diagrams** — composition-mode architecture diagrams now
+  render actual `depends_on` edges and layer subgraphs (new `_build_stack_diagram`)
+  instead of inferred/hardcoded edges.
+- **Raw-response debugging** — the raw AI response is persisted to generation history
+  on parse failure (new `raw_response` column + idempotent migration) and surfaced in
+  the CLI.
+- Single-mode `--mode project` now resolves `#{...}#` placeholders (previously only
+  the composition path did).
+
+### Changed
+
+- Unified self-correction into a shared loop (with stagnation detection) used by both
+  single and composition paths; deduplicated stack file processing.
+- `generation_tokens` is now estimated consistently across single and composition modes.
+- Removed dead scaffold helpers; added a public `ScaffoldLoader.scaffold_dir` property;
+  warn when scaffold examples are unavailable (missing `gh` CLI).
+
 ## [0.29.0] - 2026-09-15
 
 ### Added

{thothctl-0.30.0 → thothctl-0.30.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thothctl
-Version: 0.30.0
+Version: 0.30.2
 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

{thothctl-0.30.0 → thothctl-0.30.2}/docs/framework/commands/mcp/mcp.md

@@ -82,7 +82,7 @@ thothctl mcp register
 This command will internally use the correct MCP registration syntax:
 
 ```bash
-q mcp add --name thothctl --command "thothctl mcp server"
+kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "--stdio"
 ```
 
 Register the MCP server running on a custom port:
@@ -209,7 +209,7 @@ This tool generates governed Infrastructure as Code from natural language. It su
 
 **Example via AI Assistant**:
 ```
-q chat "Generate a VPC with 3 private subnets and NAT gateway for production in us-east-1 using terraform-terragrunt composition full mode"
+kiro-cli chat "Generate a VPC with 3 private subnets and NAT gateway for production in us-east-1 using terraform-terragrunt composition full mode"
 ```
 
 ## Integration with AI Assistants
@@ -217,7 +217,7 @@ q chat "Generate a VPC with 3 private subnets and NAT gateway for production in
 After starting the MCP server and registering it with your AI assistant, you can interact with ThothCTL using natural language:
 
 ```bash
-q chat "List all ThothCTL projects"
+kiro-cli chat "List all ThothCTL projects"
 ```
 
 Example interactions:
@@ -264,57 +264,61 @@ This typically means one of the following:
 3. **Wrong command in registration**: Verify your registration command.
    ```bash
    # List your registered MCP servers
-   q mcp list
+   kiro-cli mcp list
    
    # Remove incorrect registration if needed
-   q mcp remove thothctl
+   kiro-cli mcp remove --name thothctl
    
    # Register correctly
-   q mcp add --name thothctl --command "thothctl mcp server"
+   kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "--stdio"
    ```
 
 4. **MCP configuration file is missing or corrupted**: Your AI assistant stores MCP server configurations in JSON files.
    
-   **Configuration file locations**:
-   - Global Configuration: `~/.aws/amazonq/mcp.json` - Applies to all workspaces
-   - Workspace Configuration: `.amazonq/mcp.json` - Specific to the current workspace
+   **Configuration file locations (Kiro CLI)**:
+   - Global Configuration: `~/.kiro/settings/mcp.json` - Applies to all workspaces
+   - Workspace Configuration: `.kiro/settings/mcp.json` - Specific to the current workspace (takes precedence over global)
+
+   For **Claude Desktop**, MCP servers are configured in:
+   - macOS: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - Windows: `%APPDATA%\Claude\claude_desktop_config.json`
    
    ```bash
-   # Check if the configuration files exist
-   ls -la ~/.aws/amazonq/mcp.json  # Global config (Linux/macOS)
-   ls -la .amazonq/mcp.json        # Workspace config (Linux/macOS)
+   # Check if the configuration files exist (Kiro CLI)
+   ls -la ~/.kiro/settings/mcp.json  # Global config (Linux/macOS)
+   ls -la .kiro/settings/mcp.json    # Workspace config (Linux/macOS)
    
    # View the current configuration
-   cat ~/.aws/amazonq/mcp.json     # Global config (Linux/macOS)
-   cat .amazonq/mcp.json           # Workspace config (Linux/macOS)
+   cat ~/.kiro/settings/mcp.json     # Global config (Linux/macOS)
+   cat .kiro/settings/mcp.json       # Workspace config (Linux/macOS)
    
-   # If missing or corrupted, recreate it
-   q mcp remove thothctl
-   q mcp add --name thothctl --command "thothctl mcp server"
+   # If missing or corrupted, recreate it (stdio is the default)
+   thothctl mcp register
+   # ...or register manually with the Kiro CLI (note the required --stdio flag)
+   kiro-cli mcp remove --name thothctl
+   kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "--stdio"
    ```
 
-   The MCP configuration file (`mcp.json`) should have the following structure:
+   The MCP configuration file (`mcp.json`) should have the following structure.
+   The `--stdio` flag is required — Kiro CLI and Claude talk to the server over
+   stdin/stdout, so stdio mode must be enabled explicitly. Without it,
+   `thothctl mcp server` starts in HTTP mode and the assistant cannot connect:
    ```json
    {
      "mcpServers": {
        "thothctl": {
          "command": "thothctl",
-         "args": ["mcp", "server"],
-         "env": {},
-         "timeout": 60000
+         "args": ["mcp", "server", "--stdio"]
        }
      }
    }
    ```
 
-   You can manually create or edit this file if needed, but it's recommended to use the `q mcp add` command to ensure proper formatting.
+   You can manually create or edit this file if needed, but it's recommended to use `thothctl mcp register` (or `kiro-cli mcp add`) to ensure proper formatting.
 
-5. **Detailed debugging**: Run with increased logging as suggested in the error message.
+5. **Detailed debugging**: Run with increased logging.
    ```bash
-   Q_LOG_LEVEL=trace q chat "List ThothCTL projects"
-   
-   # Then check the logs
-   cat $TMPDIR/qchat/latest.log
+   kiro-cli chat --verbose "List ThothCTL projects"
    ```
 
 #### Port Already in Use
@@ -334,8 +338,8 @@ thothctl mcp server -p 8081
 And update your registration accordingly:
 
 ```bash
-q mcp remove thothctl
-q mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "-p" --args "8081"
+kiro-cli mcp remove --name thothctl
+kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "-p" --args "8081"
 ```
 
 ## Architecture

{thothctl-0.30.0 → thothctl-0.30.2}/docs/framework/software_architecture.md

@@ -578,7 +578,7 @@ Model Context Protocol server for AI integration.
   "mcpServers": {
     "thothctl": {
       "command": "thothctl",
-      "args": ["mcp", "server"]
+      "args": ["mcp", "server", "--stdio"]
     }
   }
 }

{thothctl-0.30.0 → thothctl-0.30.2}/docs/mcp.md

@@ -36,16 +36,25 @@ This will start the MCP server on port 8080 (default).
 
 ### Registering with Kiro CLI
 
-To use ThothCTL with Kiro CLI or Claude, you need to register the MCP server:
+To use ThothCTL with Kiro CLI or Claude, you need to register the MCP server.
+The easiest way is the built-in command, which writes a stdio-mode config to
+`~/.kiro/settings/mcp.json` (or `.kiro/settings/mcp.json` with `--scope workspace`):
 
 ```bash
-kiro mcp add thothctl --command "thothctl mcp server"
+thothctl mcp register
+```
+
+Alternatively, register it directly with the Kiro CLI. Note the `--stdio` flag —
+it is required so the server speaks MCP over stdin/stdout instead of HTTP:
+
+```bash
+kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "--stdio"
 ```
 
 Once registered, you can interact with ThothCTL through Kiro CLI using natural language:
 
 ```bash
-kiro chat "List all ThothCTL projects using the MCP integration"
+kiro-cli chat "List all ThothCTL projects using the MCP integration"
 ```
 
 ### Checking Server Status
@@ -88,29 +97,41 @@ This typically means one of the following:
    ```
 
 3. **MCP configuration file is missing or corrupted**: Your AI assistant stores MCP server configurations in JSON files.
-   
-   **Configuration file locations**:
-   - Global Configuration: `~/.aws/amazonq/mcp.json` - Applies to all workspaces
-   - Workspace Configuration: `.amazonq/mcp.json` - Specific to the current workspace
-   
-   The MCP configuration file should have this structure:
+
+   **Configuration file locations (Kiro CLI)**:
+   - Global Configuration: `~/.kiro/settings/mcp.json` - Applies to all workspaces
+   - Workspace Configuration: `.kiro/settings/mcp.json` - Specific to the current workspace (takes precedence over global)
+
+   For **Claude Desktop**, MCP servers are configured in:
+   - macOS: `~/Library/Application Support/Claude/claude_desktop_config.json`
+   - Windows: `%APPDATA%\Claude\claude_desktop_config.json`
+
+   The MCP configuration file should have this structure. Note the `--stdio`
+   flag — Kiro CLI and Claude communicate with the server over stdin/stdout,
+   so stdio mode must be enabled explicitly (without it, `thothctl mcp server`
+   starts in HTTP mode and the assistant cannot connect):
    ```json
    {
      "mcpServers": {
        "thothctl": {
          "command": "thothctl",
-         "args": ["mcp", "server"],
-         "env": {},
-         "timeout": 60000
+         "args": ["mcp", "server", "--stdio"]
        }
      }
    }
    ```
 
-   To recreate the configuration:
+   To recreate the configuration, the simplest way is the built-in registration
+   command (stdio is the default and writes to `~/.kiro/settings/mcp.json`):
+   ```bash
+   thothctl mcp register              # global scope, stdio mode
+   thothctl mcp register --scope workspace   # writes .kiro/settings/mcp.json
+   ```
+
+   Or register it manually via the Kiro CLI:
    ```bash
-   q mcp remove thothctl
-   q mcp add --name thothctl --command "thothctl" --args "mcp" --args "server"
+   kiro-cli mcp remove --name thothctl
+   kiro-cli mcp add --name thothctl --command "thothctl" --args "mcp" --args "server" --args "--stdio"
    ```
 
 For more detailed troubleshooting, see the [MCP Command Documentation](./framework/commands/mcp/mcp.md#troubleshooting).

{thothctl-0.30.0 → thothctl-0.30.2}/docs/whats_new.md

@@ -1,5 +1,40 @@
 # What's New
 
+## v0.30.0 — Intent-to-IaC Hardening (September 2026)
+
+### Highlights
+
+!!! success "Accurate dependency-graph diagrams for multi-stack generation"
+    Composition-mode diagrams now render the real stack dependency graph
+    (from each stack's `depends_on`) grouped by layer — no more inferred edges.
+
+!!! success "Targeted plan validation with --plan-filter"
+    ```bash
+    thothctl generate iac -i "add an RDS stack" \
+      --composition incremental \
+      --plan-validation full-project \
+      --plan-filter "stacks/platform/data/*"
+    ```
+
+- **Safer plan validation** — per-stack plan validation no longer runs against the
+  terragrunt project root (`root.hcl`); single-stack + `full-project` mode is routed
+  correctly
+- **`--plan-filter` wired end-to-end** — also settable via `THOTH_PLAN_FILTER` or
+  `[generation.plan].stack_filter`
+- **HCL-aware block stripping** — `terraform {}` / `provider {}` blocks are removed
+  with a string/comment-aware scanner that handles nested blocks (`backend`,
+  `assume_role`, `default_tags`) reliably
+- **Single-mode placeholder resolution** — `--mode project` now resolves `#{...}#`
+  placeholders for single-stack generation too
+- **Raw-response debugging** — when the AI returns unparseable output, the raw
+  response is saved to generation history for troubleshooting
+- **Unified self-correction** — single and composition paths now share the same
+  validate → fix → re-validate loop with stagnation detection
+- Consistent `generation_tokens` metrics across modes; clearer warning when scaffold
+  examples are unavailable (missing `gh` CLI)
+
+---
+
 ## v0.28.0 — Security Platform Integrations (August 2026)
 
 ### Highlights

{thothctl-0.30.0 → thothctl-0.30.2}/src/thothctl/services/init/environment/install_tools.py

@@ -2,6 +2,7 @@
 
 import logging
 import os
+import subprocess
 import sys
 
 import inquirer
@@ -220,14 +221,42 @@ def install_pre_commit(version):
 
 
 def install_tflint():
-    """Install tflint tool."""
+    """Install tflint tool.
+
+    The upstream ``install_linux.sh`` script was removed from the repository,
+    so the previous ``curl | bash`` approach piped a GitHub "404: Not Found"
+    page into bash (producing ``bash: line 1: 404:: command not found``).
+
+    Instead, download the latest release archive directly and install the
+    binary, matching the method documented in the tflint README. ``curl -fL``
+    fails on HTTP errors so a 404 surfaces as a real error instead of being
+    executed, and ``set -euo pipefail`` aborts the pipeline on any failure.
+    """
     print(f"{Fore.MAGENTA}Installing tflint {Fore.RESET}")
-    _exit = os.system(
-        "sudo curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | sudo bash"
+
+    # Map Python machine arch to tflint release asset suffix.
+    machine = os.uname().machine.lower()
+    arch = "arm64" if machine in ("aarch64", "arm64") else "amd64"
+    asset = f"tflint_linux_{arch}.zip"
+    url = (
+        "https://github.com/terraform-linters/tflint/releases/latest/download/"
+        f"{asset}"
+    )
+
+    # Passed as a single argv element to bash -c, so there is no outer shell
+    # re-parsing and no nested-quote fragility. Cleanup is explicit (no trap).
+    script = (
+        "set -eu; "
+        'tmp="$(mktemp -d)"; '
+        f'curl -fsSL -o "$tmp/{asset}" "{url}" '
+        f'&& unzip -o "$tmp/{asset}" -d "$tmp" >/dev/null '
+        '&& sudo install -c -m 0755 "$tmp/tflint" /usr/local/bin/tflint; '
+        'rc=$?; rm -rf "$tmp"; exit $rc'
     )
+    result = subprocess.run(["bash", "-c", script])
 
     check_result(
-        result=_exit,
+        result=result.returncode,
         tool="tflint",
     )
 

{thothctl-0.30.0 → thothctl-0.30.2}/src/thothctl/version.py

@@ -1,3 +1,3 @@
 """Version module."""
 
-__version__ = "0.30.0"
+__version__ = "0.30.2"