claude-code-generator 0.2.0__tar.gz → 0.2.2__tar.gz

{claude_code_generator-0.2.0/src/claude_code_generator.egg-info → claude_code_generator-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-generator
-Version: 0.2.0
+Version: 0.2.2
 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:
@@ -155,7 +169,7 @@ src/code_generator/
 │   ├── phase6_test.py        # test runner, max 3 retries
 │   ├── 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.2.0 → claude_code_generator-0.2.2}/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:
@@ -124,7 +138,7 @@ src/code_generator/
 │   ├── phase6_test.py        # test runner, max 3 retries
 │   ├── 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.2.0 → claude_code_generator-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "claude-code-generator"
-version = "0.2.0"
+version = "0.2.2"
 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" }

{claude_code_generator-0.2.0 → claude_code_generator-0.2.2/src/claude_code_generator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-generator
-Version: 0.2.0
+Version: 0.2.2
 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:
@@ -155,7 +169,7 @@ src/code_generator/
 │   ├── phase6_test.py        # test runner, max 3 retries
 │   ├── 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.2.0 → claude_code_generator-0.2.2}/src/code_generator/__init__.py

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

{claude_code_generator-0.2.0 → claude_code_generator-0.2.2}/src/code_generator/commands/_dispatch.py

@@ -25,6 +25,56 @@ _logger = logging.getLogger(__name__)
 __all__ = ["dispatch_async", "dispatch_orchestrator"]
 
 
+def _reset_failed_cycles_for_continue(
+    st: state_module.State,
+    *,
+    target_cycle: int | None,
+    state_path: Path,
+) -> None:
+    """Reset ``failed`` cycles back to ``open`` on ``--continue``.
+
+    When a cycle crashes mid-run, ``cycle_loop.run_multi_cycle`` marks it as
+    ``status="failed"`` and persists the exception in ``state.last_error``.
+    The next ``--continue`` must treat these as retryable, otherwise the user
+    has to hand-edit ``state.json`` every time a cycle crashes — which
+    defeats the whole point of ``--continue``.
+
+    When ``target_cycle`` is set (``--cycle N``), only that cycle is reset.
+    Otherwise every failed cycle is reset. ``state.last_error`` and
+    ``state.rate_limit_type`` are cleared on any successful reset so the
+    status line stops showing red for a resolved failure.
+
+    Args:
+        st: Root state (mutated in place).
+        target_cycle: When set, only reset this cycle id; otherwise reset all.
+        state_path: Path to ``state.json`` for atomic persistence.
+    """
+    from code_generator import state as _state_module
+
+    reset_ids: list[int] = []
+    for c in st.cycles:
+        if c.status != "failed":
+            continue
+        if target_cycle is not None and c.id != target_cycle:
+            continue
+        c.status = "open"
+        reset_ids.append(c.id)
+
+    if not reset_ids:
+        return
+
+    if getattr(st, "last_error", None):
+        st.last_error = None
+    if getattr(st, "rate_limit_type", None):
+        st.rate_limit_type = None
+
+    _state_module.save_state(state_path, st)
+    _logger.info(
+        "--continue: reset failed cycles to open: %s",
+        ", ".join(str(i) for i in reset_ids),
+    )
+
+
 async def _apply_delta_plan(
     st: state_module.State,
     project_dir: Path,
@@ -250,6 +300,14 @@ def dispatch_orchestrator(
     start_cycle: int | None = None
 
     if continue_:
+        # A cycle that crashed mid-run is marked "failed" by the exception
+        # handler in cycle_loop.run_multi_cycle. Without this reset, `--continue`
+        # would skip it forever because `_eligible_cycles` only returns "open"
+        # cycles. Semantically, `--continue` means "retry from where we
+        # crashed", so flip any failed cycle back to "open" and clear the
+        # stale error. Explicit --cycle N also benefits: reset just the target.
+        _reset_failed_cycles_for_continue(st, target_cycle=cycle, state_path=state_path)
+
         # Resume from the *next* phase/cycle after the last completed one.
         if effective_mode == "multi-cycle":
             start_cycle, start_phase = resolve_continue_multi_cycle(st)

{claude_code_generator-0.2.0 → claude_code_generator-0.2.2}/src/code_generator/orchestrator/phase2_review.py

@@ -18,7 +18,7 @@ from code_generator.orchestrator._comments import fetch_formatted_comments
 from code_generator.prompts import load_prompt
 from code_generator.runner import rate_limit, retry
 from code_generator.runner.options import make_agent_options
-from code_generator.runner.types import TokenUsage
+from code_generator.runner.types import MaxTurnsExceeded, TokenUsage
 from code_generator.state import get_issues, save_state
 
 if TYPE_CHECKING:
@@ -84,7 +84,7 @@ async def run(
             effort=effort_level,
             allowed_tools=["Read", "Bash", "Glob", "Grep"],
             cwd=str(project_dir),
-            max_turns=15,
+            max_turns=40,
         )
 
         breaker = retry.CircuitBreaker(max_failures=3)
@@ -103,6 +103,21 @@ async def run(
                 breaker=breaker,
             )
             issue_usage = result.usage if result is not None else TokenUsage()
+        except MaxTurnsExceeded:
+            reviewed = False
+            logger.error(
+                "Phase 2: issue #%d hit max_turns ceiling"
+                " — no retry (deterministic failure), tagging for manual review.",
+                issue.number,
+            )
+            try:
+                gh.add_label(issue.number, "needs-manual-review")
+            except gh.GhError as exc:
+                logger.warning(
+                    "Could not add needs-manual-review label to #%d: %s",
+                    issue.number,
+                    exc,
+                )
         except retry.CircuitOpen:
             reviewed = False
             logger.error(

{claude_code_generator-0.2.0 → claude_code_generator-0.2.2}/tests/test_generate_resume.py

@@ -1337,3 +1337,129 @@ class TestNoOpDetection:
 
         st_after = state_module.load_state(cg / "state.json")
         assert st_after.requirements_hash == new_hash
+
+
+# ---------------------------------------------------------------------------
+# --continue resets failed cycles back to open (retry-on-continue)
+# ---------------------------------------------------------------------------
+
+
+class TestContinueResetsFailedCycles:
+    """Regression guard: `--continue` must retry cycles marked `status=failed`.
+
+    When a cycle crashes mid-run, `cycle_loop.run_multi_cycle` sets
+    `cycle.status = "failed"` and persists `state.last_error`. Without the
+    reset, `_eligible_cycles` filters out failed cycles and `--continue`
+    prints "all eligible cycles complete" without actually running anything.
+    """
+
+    def test_continue_resets_failed_cycle_to_open(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """--continue flips cycles[0].status from 'failed' back to 'open' and clears last_error."""
+        monkeypatch.chdir(tmp_path)
+
+        cg = tmp_path / ".code-generator"
+        cg.mkdir(parents=True, exist_ok=True)
+        st = state_module.State(
+            mode="multi-cycle",  # type: ignore[arg-type]
+            started_at="2026-01-01T00:00:00Z",
+            updated_at="2026-01-01T00:00:00Z",
+            current_cycle=1,
+            phase=None,
+            cycles=[
+                _make_cycle(cycle_id=1, phase=1, status="failed"),
+                _make_cycle(cycle_id=2, phase=0, status="open"),
+            ],
+        )
+        st.last_error = "SDK session exhausted max_turns budget"
+        state_module.save_state(cg / "state.json", st)
+
+        captured: list[dict] = []
+
+        async def mock_multi(state, *_args, start_cycle=None, start_phase=1, **_kwargs):
+            captured.append({"start_cycle": start_cycle, "start_phase": start_phase})
+            return state
+
+        from code_generator.orchestrator import cycle_loop
+
+        monkeypatch.setattr(cycle_loop, "run_multi_cycle", mock_multi)
+        _mock_phase0_single(monkeypatch)
+
+        result = runner.invoke(app, ["generate", "--continue"])
+        assert result.exit_code == 0, result.output
+
+        st_after = state_module.load_state(cg / "state.json")
+        assert st_after.cycles[0].status == "open"
+        assert st_after.last_error is None
+        assert captured == [{"start_cycle": 1, "start_phase": 2}]
+
+    def test_continue_resets_only_target_cycle_when_cycle_flag_set(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """--continue --cycle 2 resets cycle 2 only, leaves cycle 1 failed."""
+        monkeypatch.chdir(tmp_path)
+
+        cg = tmp_path / ".code-generator"
+        cg.mkdir(parents=True, exist_ok=True)
+        st = state_module.State(
+            mode="multi-cycle",  # type: ignore[arg-type]
+            started_at="2026-01-01T00:00:00Z",
+            updated_at="2026-01-01T00:00:00Z",
+            current_cycle=2,
+            phase=None,
+            cycles=[
+                _make_cycle(cycle_id=1, phase=3, status="failed"),
+                _make_cycle(cycle_id=2, phase=4, status="failed"),
+            ],
+        )
+        state_module.save_state(cg / "state.json", st)
+
+        async def mock_multi(*_args, **_kwargs):
+            return None
+
+        from code_generator.orchestrator import cycle_loop
+
+        monkeypatch.setattr(cycle_loop, "run_multi_cycle", mock_multi)
+        _mock_phase0_single(monkeypatch)
+
+        result = runner.invoke(
+            app, ["generate", "--continue", "--cycle", "2", "--mode", "multi-cycle"]
+        )
+        assert result.exit_code == 0, result.output
+
+        st_after = state_module.load_state(cg / "state.json")
+        assert st_after.cycles[0].status == "failed"
+        assert st_after.cycles[1].status == "open"
+
+    def test_continue_without_failed_cycles_is_noop_on_reset(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        """--continue on a state with no failed cycles does not mutate status."""
+        monkeypatch.chdir(tmp_path)
+
+        cg = tmp_path / ".code-generator"
+        cg.mkdir(parents=True, exist_ok=True)
+        st = state_module.State(
+            mode="multi-cycle",  # type: ignore[arg-type]
+            started_at="2026-01-01T00:00:00Z",
+            updated_at="2026-01-01T00:00:00Z",
+            current_cycle=1,
+            phase=None,
+            cycles=[_make_cycle(cycle_id=1, phase=3, status="open")],
+        )
+        state_module.save_state(cg / "state.json", st)
+
+        async def mock_multi(*_args, **_kwargs):
+            return None
+
+        from code_generator.orchestrator import cycle_loop
+
+        monkeypatch.setattr(cycle_loop, "run_multi_cycle", mock_multi)
+        _mock_phase0_single(monkeypatch)
+
+        result = runner.invoke(app, ["generate", "--continue"])
+        assert result.exit_code == 0, result.output
+
+        st_after = state_module.load_state(cg / "state.json")
+        assert st_after.cycles[0].status == "open"