claude-code-generator 0.1.0__tar.gz → 0.2.1__tar.gz

{claude_code_generator-0.1.0/src/claude_code_generator.egg-info → claude_code_generator-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-generator
-Version: 0.1.0
+Version: 0.2.1
 Summary: Orchestrator CLI that drives Claude Code end-to-end to generate whole projects from a requirements.md file.
 Author: Silvio Baratto
 License: MIT
@@ -31,7 +31,7 @@ Dynamic: license-file
 
 # code-generator
 
-A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Three commands — `init`, `generate`, `review` — plus `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
+A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Five commands — `init`, `optimize`, `generate`, `review`, `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
 
 > **Max subscription only.** This tool uses **exclusively** the Claude Max subscription. It strips every environment variable that could route a call through the API and aborts on startup if any are still present. There is no path to API credit billing — see [Safety constraints](#safety-constraints) below.
 
@@ -68,6 +68,20 @@ code-generator init --template fastapi
 $EDITOR .code-generator/requirements.md
 ```
 
+### `code-generator optimize [--dry-run] [--force]`
+
+Pre-flight rewrite of `.code-generator/requirements.md` into the canonical structure the orchestrator expects: `# Title` → `## Description` → `## Tech Stack` → `## Goals` → `## Scope` (numbered `### N.` subsections with per-section `Acceptance criteria` checklists) → `## Non-goals` → `## Constraints` → `## Global acceptance criteria`.
+
+Runs a single Opus 4.6 session with a dedicated prompt, preserves the original intent verbatim when ambiguous (never invents new scope), and writes the rewrite back to disk atomically. The pre-optimize original is saved to `.code-generator/requirements.backup-<UTC-timestamp>.md` so you can always `diff` and recover. The command is stateless — it never reads or writes `state.json` and never calls `gh`.
+
+Short-circuits and exits 0 if the file is already canonical. Use `--force` to re-optimize anyway. Use `--dry-run` to print the proposed rewrite to stdout without touching the file or creating a backup.
+
+```bash
+code-generator optimize --dry-run    # preview
+code-generator optimize              # commit the rewrite
+code-generator generate              # then run the pipeline
+```
+
 ### `code-generator generate [flags]`
 
 Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0→7 phase pipeline:
@@ -80,7 +94,9 @@ Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0
 | 3-4 | Implementation, fresh SDK session per issue (TDD) | Sonnet 4.6 |
 | 5 | Closure + cross-module review | Opus 4.6 |
 | 6 | Test suite, max 3 retries on failure | Sonnet 4.6 |
-| 7 | Commit message + git add/commit/push | Haiku 4.5 |
+| 7 | Commit message + git add/commit/push | Opus 4.6 |
+
+Every phase logs a completion summary with token counts (`in`, `cache_read`, `cache_write`, `out`) and persists them to `state.json`.
 
 Flags:
 
@@ -102,7 +118,7 @@ Run a standalone Opus 4.6 review of the current codebase against the design prin
 
 ### `code-generator status`
 
-Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), and the last error.
+Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), per-cycle token consumption columns (`in | cache_read | cache_write | out`), wall-clock elapsed time, and any `last_error` highlighted in red.
 
 ## Safety constraints
 
@@ -115,7 +131,7 @@ The tool enforces eight non-negotiables (see `CLAUDE.md` for the full list):
 5. **Wait-and-resume rate-limit handling.** Rate limits are not retried with exponential backoff — the tool sleeps until `resets_at + 60s` and resumes the same session. Backoff (10→20→40→80→120s) only applies to non-rate-limit transient errors.
 6. **Fresh SDK session per issue.** The implementation phase never reuses conversational context across issues — each issue is a `/clear`-equivalent fresh session.
 7. **Atomic state writes.** `.code-generator/state.json` is updated via `tmp → os.replace(tmp, STATE)` so a crash mid-write cannot corrupt it.
-8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5; Sonnet 4.6 for phases 3/4/6; Haiku 4.5 for phase 7's commit message.
+8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5/7; Sonnet 4.6 for phases 3/4/6.
 
 ## Troubleshooting
 
@@ -151,9 +167,9 @@ src/code_generator/
 │   ├── phase3_4_implement.py # TDD loop, fresh session per issue
 │   ├── phase5_closure.py     # closure + fix-issue feedback loop
 │   ├── phase6_test.py        # test runner, max 3 retries
-│   ├── phase7_commit.py      # Haiku commit message + push with rebase retry
+│   ├── phase7_commit.py      # Opus commit message + push with rebase retry
 │   └── cycle_loop.py         # multi-cycle driver
-└── commands/             # init, status, generate, review (Typer commands)
+└── commands/             # init, optimize, status, generate, review (Typer commands)
 ```
 
 ## Development

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1}/README.md

@@ -1,6 +1,6 @@
 # code-generator
 
-A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Three commands — `init`, `generate`, `review` — plus `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
+A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Five commands — `init`, `optimize`, `generate`, `review`, `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
 
 > **Max subscription only.** This tool uses **exclusively** the Claude Max subscription. It strips every environment variable that could route a call through the API and aborts on startup if any are still present. There is no path to API credit billing — see [Safety constraints](#safety-constraints) below.
 
@@ -37,6 +37,20 @@ code-generator init --template fastapi
 $EDITOR .code-generator/requirements.md
 ```
 
+### `code-generator optimize [--dry-run] [--force]`
+
+Pre-flight rewrite of `.code-generator/requirements.md` into the canonical structure the orchestrator expects: `# Title` → `## Description` → `## Tech Stack` → `## Goals` → `## Scope` (numbered `### N.` subsections with per-section `Acceptance criteria` checklists) → `## Non-goals` → `## Constraints` → `## Global acceptance criteria`.
+
+Runs a single Opus 4.6 session with a dedicated prompt, preserves the original intent verbatim when ambiguous (never invents new scope), and writes the rewrite back to disk atomically. The pre-optimize original is saved to `.code-generator/requirements.backup-<UTC-timestamp>.md` so you can always `diff` and recover. The command is stateless — it never reads or writes `state.json` and never calls `gh`.
+
+Short-circuits and exits 0 if the file is already canonical. Use `--force` to re-optimize anyway. Use `--dry-run` to print the proposed rewrite to stdout without touching the file or creating a backup.
+
+```bash
+code-generator optimize --dry-run    # preview
+code-generator optimize              # commit the rewrite
+code-generator generate              # then run the pipeline
+```
+
 ### `code-generator generate [flags]`
 
 Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0→7 phase pipeline:
@@ -49,7 +63,9 @@ Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0
 | 3-4 | Implementation, fresh SDK session per issue (TDD) | Sonnet 4.6 |
 | 5 | Closure + cross-module review | Opus 4.6 |
 | 6 | Test suite, max 3 retries on failure | Sonnet 4.6 |
-| 7 | Commit message + git add/commit/push | Haiku 4.5 |
+| 7 | Commit message + git add/commit/push | Opus 4.6 |
+
+Every phase logs a completion summary with token counts (`in`, `cache_read`, `cache_write`, `out`) and persists them to `state.json`.
 
 Flags:
 
@@ -71,7 +87,7 @@ Run a standalone Opus 4.6 review of the current codebase against the design prin
 
 ### `code-generator status`
 
-Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), and the last error.
+Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), per-cycle token consumption columns (`in | cache_read | cache_write | out`), wall-clock elapsed time, and any `last_error` highlighted in red.
 
 ## Safety constraints
 
@@ -84,7 +100,7 @@ The tool enforces eight non-negotiables (see `CLAUDE.md` for the full list):
 5. **Wait-and-resume rate-limit handling.** Rate limits are not retried with exponential backoff — the tool sleeps until `resets_at + 60s` and resumes the same session. Backoff (10→20→40→80→120s) only applies to non-rate-limit transient errors.
 6. **Fresh SDK session per issue.** The implementation phase never reuses conversational context across issues — each issue is a `/clear`-equivalent fresh session.
 7. **Atomic state writes.** `.code-generator/state.json` is updated via `tmp → os.replace(tmp, STATE)` so a crash mid-write cannot corrupt it.
-8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5; Sonnet 4.6 for phases 3/4/6; Haiku 4.5 for phase 7's commit message.
+8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5/7; Sonnet 4.6 for phases 3/4/6.
 
 ## Troubleshooting
 
@@ -120,9 +136,9 @@ src/code_generator/
 │   ├── phase3_4_implement.py # TDD loop, fresh session per issue
 │   ├── phase5_closure.py     # closure + fix-issue feedback loop
 │   ├── phase6_test.py        # test runner, max 3 retries
-│   ├── phase7_commit.py      # Haiku commit message + push with rebase retry
+│   ├── phase7_commit.py      # Opus commit message + push with rebase retry
 │   └── cycle_loop.py         # multi-cycle driver
-└── commands/             # init, status, generate, review (Typer commands)
+└── commands/             # init, optimize, status, generate, review (Typer commands)
 ```
 
 ## Development

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "claude-code-generator"
-version = "0.1.0"
+version = "0.2.1"
 description = "Orchestrator CLI that drives Claude Code end-to-end to generate whole projects from a requirements.md file."
 readme = "README.md"
 license = { text = "MIT" }
@@ -69,3 +69,7 @@ ignore = []
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 asyncio_mode = "auto"
+
+[tool.pyright]
+# Test mocks intentionally use unused parameters to match the production interface signature.
+reportUnusedParameter = "none"

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1/src/claude_code_generator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-generator
-Version: 0.1.0
+Version: 0.2.1
 Summary: Orchestrator CLI that drives Claude Code end-to-end to generate whole projects from a requirements.md file.
 Author: Silvio Baratto
 License: MIT
@@ -31,7 +31,7 @@ Dynamic: license-file
 
 # code-generator
 
-A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Three commands — `init`, `generate`, `review` — plus `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
+A Python CLI that orchestrates Claude Code end-to-end to generate a whole project from a `requirements.md` file. Five commands — `init`, `optimize`, `generate`, `review`, `status`. Works for any project type: Python CLI, FastAPI, Angular, NestJS, full-stack, finance, BAML/LLM.
 
 > **Max subscription only.** This tool uses **exclusively** the Claude Max subscription. It strips every environment variable that could route a call through the API and aborts on startup if any are still present. There is no path to API credit billing — see [Safety constraints](#safety-constraints) below.
 
@@ -68,6 +68,20 @@ code-generator init --template fastapi
 $EDITOR .code-generator/requirements.md
 ```
 
+### `code-generator optimize [--dry-run] [--force]`
+
+Pre-flight rewrite of `.code-generator/requirements.md` into the canonical structure the orchestrator expects: `# Title` → `## Description` → `## Tech Stack` → `## Goals` → `## Scope` (numbered `### N.` subsections with per-section `Acceptance criteria` checklists) → `## Non-goals` → `## Constraints` → `## Global acceptance criteria`.
+
+Runs a single Opus 4.6 session with a dedicated prompt, preserves the original intent verbatim when ambiguous (never invents new scope), and writes the rewrite back to disk atomically. The pre-optimize original is saved to `.code-generator/requirements.backup-<UTC-timestamp>.md` so you can always `diff` and recover. The command is stateless — it never reads or writes `state.json` and never calls `gh`.
+
+Short-circuits and exits 0 if the file is already canonical. Use `--force` to re-optimize anyway. Use `--dry-run` to print the proposed rewrite to stdout without touching the file or creating a backup.
+
+```bash
+code-generator optimize --dry-run    # preview
+code-generator optimize              # commit the rewrite
+code-generator generate              # then run the pipeline
+```
+
 ### `code-generator generate [flags]`
 
 Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0→7 phase pipeline:
@@ -80,7 +94,9 @@ Read `.code-generator/requirements.md` and orchestrate Claude Code through the 0
 | 3-4 | Implementation, fresh SDK session per issue (TDD) | Sonnet 4.6 |
 | 5 | Closure + cross-module review | Opus 4.6 |
 | 6 | Test suite, max 3 retries on failure | Sonnet 4.6 |
-| 7 | Commit message + git add/commit/push | Haiku 4.5 |
+| 7 | Commit message + git add/commit/push | Opus 4.6 |
+
+Every phase logs a completion summary with token counts (`in`, `cache_read`, `cache_write`, `out`) and persists them to `state.json`.
 
 Flags:
 
@@ -102,7 +118,7 @@ Run a standalone Opus 4.6 review of the current codebase against the design prin
 
 ### `code-generator status`
 
-Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), and the last error.
+Print a Rich table with the current mode, current cycle, current phase, open/closed issue counts, the rate-limit pause state (with minutes remaining if paused), per-cycle token consumption columns (`in | cache_read | cache_write | out`), wall-clock elapsed time, and any `last_error` highlighted in red.
 
 ## Safety constraints
 
@@ -115,7 +131,7 @@ The tool enforces eight non-negotiables (see `CLAUDE.md` for the full list):
 5. **Wait-and-resume rate-limit handling.** Rate limits are not retried with exponential backoff — the tool sleeps until `resets_at + 60s` and resumes the same session. Backoff (10→20→40→80→120s) only applies to non-rate-limit transient errors.
 6. **Fresh SDK session per issue.** The implementation phase never reuses conversational context across issues — each issue is a `/clear`-equivalent fresh session.
 7. **Atomic state writes.** `.code-generator/state.json` is updated via `tmp → os.replace(tmp, STATE)` so a crash mid-write cannot corrupt it.
-8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5; Sonnet 4.6 for phases 3/4/6; Haiku 4.5 for phase 7's commit message.
+8. **Fixed model per phase.** Opus 4.6 for phases 0/1/2/5/7; Sonnet 4.6 for phases 3/4/6.
 
 ## Troubleshooting
 
@@ -151,9 +167,9 @@ src/code_generator/
 │   ├── phase3_4_implement.py # TDD loop, fresh session per issue
 │   ├── phase5_closure.py     # closure + fix-issue feedback loop
 │   ├── phase6_test.py        # test runner, max 3 retries
-│   ├── phase7_commit.py      # Haiku commit message + push with rebase retry
+│   ├── phase7_commit.py      # Opus commit message + push with rebase retry
 │   └── cycle_loop.py         # multi-cycle driver
-└── commands/             # init, status, generate, review (Typer commands)
+└── commands/             # init, optimize, status, generate, review (Typer commands)
 ```
 
 ## Development

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1}/src/claude_code_generator.egg-info/SOURCES.txt

@@ -10,16 +10,28 @@ src/claude_code_generator.egg-info/top_level.txt
 src/code_generator/__init__.py
 src/code_generator/agents.py
 src/code_generator/cli.py
+src/code_generator/effort.py
 src/code_generator/env.py
-src/code_generator/gh.py
+src/code_generator/git_ops.py
 src/code_generator/logging_setup.py
+src/code_generator/requirements_structure.py
 src/code_generator/state.py
 src/code_generator/commands/__init__.py
+src/code_generator/commands/_detect.py
+src/code_generator/commands/_dispatch.py
+src/code_generator/commands/_resume.py
 src/code_generator/commands/generate.py
 src/code_generator/commands/init.py
+src/code_generator/commands/optimize.py
 src/code_generator/commands/review.py
 src/code_generator/commands/status.py
+src/code_generator/gh/__init__.py
+src/code_generator/gh/core.py
+src/code_generator/gh/issues.py
+src/code_generator/gh/labels.py
+src/code_generator/gh/milestones.py
 src/code_generator/orchestrator/__init__.py
+src/code_generator/orchestrator/_comments.py
 src/code_generator/orchestrator/cycle_loop.py
 src/code_generator/orchestrator/phase0_complexity.py
 src/code_generator/orchestrator/phase1_plan.py
@@ -29,6 +41,7 @@ src/code_generator/orchestrator/phase5_closure.py
 src/code_generator/orchestrator/phase6_test.py
 src/code_generator/orchestrator/phase7_commit.py
 src/code_generator/prompts/__init__.py
+src/code_generator/prompts/prompt-optimize-requirements.md
 src/code_generator/prompts/prompt-phase-0-complexity.md
 src/code_generator/prompts/prompt-phase-1-planning.md
 src/code_generator/prompts/prompt-phase-2-issue-review.md
@@ -38,10 +51,15 @@ src/code_generator/prompts/prompt-phase-6-test.md
 src/code_generator/prompts/prompt-phase-7-commit.md
 src/code_generator/prompts/prompt-review.md
 src/code_generator/runner/__init__.py
+src/code_generator/runner/message_parsing.py
+src/code_generator/runner/options.py
+src/code_generator/runner/protocol.py
 src/code_generator/runner/rate_limit.py
 src/code_generator/runner/retry.py
 src/code_generator/runner/sdk_runner.py
 src/code_generator/runner/subprocess_runner.py
+src/code_generator/runner/types.py
+src/code_generator/runner/utils.py
 src/code_generator/templates/__init__.py
 src/code_generator/templates/angular.md
 src/code_generator/templates/base.md
@@ -51,13 +69,26 @@ src/code_generator/templates/fullstack.md
 src/code_generator/templates/nestjs.md
 src/code_generator/templates/python-cli.md
 tests/test_agents.py
+tests/test_comments.py
+tests/test_commit_message.py
 tests/test_cycle_loop.py
+tests/test_cycle_loop_multicycle.py
+tests/test_delta_planning.py
+tests/test_detect.py
+tests/test_effort.py
 tests/test_env.py
 tests/test_generate.py
 tests/test_generate_resume.py
 tests/test_gh.py
+tests/test_gh_labels.py
+tests/test_gh_milestones.py
+tests/test_gh_submodules.py
+tests/test_git_ops.py
 tests/test_init.py
 tests/test_logging_setup.py
+tests/test_message_parsing.py
+tests/test_optimize.py
+tests/test_options.py
 tests/test_phase0.py
 tests/test_phase1.py
 tests/test_phase2.py
@@ -65,10 +96,16 @@ tests/test_phase3_4.py
 tests/test_phase5.py
 tests/test_phase6.py
 tests/test_phase7.py
+tests/test_phase_token_logging.py
 tests/test_prompts.py
 tests/test_rate_limit.py
+tests/test_requirements_structure.py
 tests/test_retry.py
 tests/test_review.py
+tests/test_runner_protocol.py
+tests/test_runner_protocol_annotations.py
+tests/test_runner_types.py
+tests/test_runner_utils.py
 tests/test_sdk_runner.py
 tests/test_state.py
 tests/test_status.py

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1}/src/code_generator/__init__.py

@@ -1,3 +1,3 @@
 """code-generator: orchestrator CLI for end-to-end project generation."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.1"

{claude_code_generator-0.1.0 → claude_code_generator-0.2.1}/src/code_generator/cli.py

@@ -11,6 +11,7 @@ import typer
 import code_generator
 from code_generator.commands.generate import generate_command
 from code_generator.commands.init import init_command
+from code_generator.commands.optimize import optimize_command
 from code_generator.commands.review import review_command
 from code_generator.commands.status import status_command
 
@@ -46,4 +47,5 @@ def root(
 app.command(name="init")(init_command)
 app.command(name="status")(status_command)
 app.command(name="generate")(generate_command)
+app.command(name="optimize")(optimize_command)
 app.command(name="review")(review_command)

claude_code_generator-0.2.1/src/code_generator/commands/_detect.py

@@ -0,0 +1,59 @@
+"""Re-run detection for the generate command.
+
+Compares the current requirements.md hash against the stored hash in state to
+decide the correct execution path on startup.
+
+The sole exported function is a pure function (no I/O) so it is trivially
+unit-testable.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from code_generator import state as state_module
+
+RunMode = Literal["first-run", "resume", "no-op", "delta"]
+
+__all__ = ["RunMode", "detect_run_mode"]
+
+
+def _run_is_complete(state: state_module.State) -> bool:
+    """Return True when the generation run is fully complete.
+
+    Single mode: complete when phase == 7 (final commit phase).
+    Multi-cycle mode: complete when every cycle has status "completed"
+    and at least one cycle exists.
+    """
+    if state.mode == "multi-cycle":
+        return len(state.cycles) > 0 and all(c.status == "completed" for c in state.cycles)
+    return state.phase == 7
+
+
+def detect_run_mode(state: state_module.State, current_hash: str) -> RunMode:
+    """Determine how the generate command should proceed given existing state.
+
+    This is a pure function: it reads ``state`` and ``current_hash`` and
+    returns a decision literal.  It never performs I/O.
+
+    Decision rules (evaluated in order):
+    1. No stored hash → ``"first-run"`` (treat as a brand-new run)
+    2. Hashes differ  → ``"delta"``     (requirements changed)
+    3. Run complete   → ``"no-op"``     (nothing left to do)
+    4. Otherwise      → ``"resume"``    (same requirements, incomplete run)
+
+    Args:
+        state: Loaded root state (may have requirements_hash=None for old runs).
+        current_hash: SHA-256 hex digest of the current requirements.md.
+
+    Returns:
+        One of ``"first-run"``, ``"resume"``, ``"no-op"``, or ``"delta"``.
+    """
+    if state.requirements_hash is None:
+        return "first-run"
+    if state.requirements_hash != current_hash:
+        return "delta"
+    if _run_is_complete(state):
+        return "no-op"
+    return "resume"