@xenonbyte/req-2-plan 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xenonbyte/req-2-plan",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Requirement-to-PLAN workflow CLI and agent integration installer.",
   "bin": {
     "r2p": "bin/r2p.js"

package/tools/workflow_cli/agent_templates/claude/commands/r2p-start.md

@@ -3,7 +3,7 @@ description: Start a new requirement-to-PLAN workflow run
 ---
 Run `{{R2P_BIN_DIR}}/r2p-start` with the requirement as a positional argument.
 
-Usage: `{{R2P_BIN_DIR}}/r2p-start [--separate] ("<raw requirement>" | --file <path>)`
+Usage: `{{R2P_BIN_DIR}}/r2p-start [--separate] [--repo-path <dir>] ("<raw requirement>" | --file <path>)`
 
 To start from a requirement document, pass `--file <path>` instead of inline text — r2p reads the file contents as the requirement (the path itself is never stored as the requirement): `{{R2P_BIN_DIR}}/r2p-start [--separate] --file ./requirement.md`. `--file` and a positional requirement are mutually exclusive.
 

package/tools/workflow_cli/agent_templates/codex/skills/r2p-start/SKILL.md

@@ -7,7 +7,7 @@ description: Start a new requirement-to-PLAN workflow run from a raw requirement
 
 Run `{{R2P_BIN_DIR}}/r2p-start` with the requirement as a positional argument.
 
-Usage: `{{R2P_BIN_DIR}}/r2p-start [--separate] ("<raw requirement>" | --file <path>)`
+Usage: `{{R2P_BIN_DIR}}/r2p-start [--separate] [--repo-path <dir>] ("<raw requirement>" | --file <path>)`
 
 To start from a requirement document, pass `--file <path>` instead of inline text — r2p reads the file contents as the requirement (the path itself is never stored as the requirement): `{{R2P_BIN_DIR}}/r2p-start [--separate] --file ./requirement.md`. `--file` and a positional requirement are mutually exclusive.
 

package/tools/workflow_cli/context_pack.py

@@ -6,6 +6,11 @@ import os
 from dataclasses import asdict, dataclass, field
 from pathlib import Path
 
+try:
+    import tomllib  # Python 3.11+
+except ImportError:  # pragma: no cover - older interpreters: pyproject parsing degrades to a no-op
+    tomllib = None
+
 from tools.workflow_cli.repo_baseline import SKIP_DIRS, scan_repo_baseline
 
 _CONFIG_NAMES = {
@@ -27,6 +32,53 @@ class ProjectContextPack:
     source_dirs: list = field(default_factory=list)
 
 
+def _append_npm_dependencies(pack: ProjectContextPack, dependencies: object, *, dev: bool = False) -> None:
+    if not isinstance(dependencies, dict):
+        return
+    for name, version in dependencies.items():
+        if not isinstance(name, str) or not isinstance(version, str):
+            continue
+        dep = {"name": name, "version": version, "ecosystem": "npm"}
+        if dev:
+            dep["dev"] = True
+        pack.dependencies.append(dep)
+
+
+def _append_pyproject_facts(pack: ProjectContextPack, repo_path: Path) -> None:
+    """Collect PEP 621 [project] dependencies and a pytest signal from pyproject.toml.
+
+    Poetry/PDM private tables are out of scope; without tomllib (Python < 3.11)
+    this is a no-op, matching the pack's best-effort scan semantics."""
+    pyproject = repo_path / "pyproject.toml"
+    if tomllib is None or not pyproject.exists():
+        return
+    try:
+        data = tomllib.loads(pyproject.read_text(encoding="utf-8"))
+    except (tomllib.TOMLDecodeError, OSError, UnicodeDecodeError):
+        return
+    project = data.get("project")
+    project = project if isinstance(project, dict) else {}
+    raw_deps = project.get("dependencies")
+    specs = [s for s in raw_deps if isinstance(s, str)] if isinstance(raw_deps, list) else []
+    optional = project.get("optional-dependencies")
+    optional_specs: list[str] = []
+    if isinstance(optional, dict):
+        for group in optional.values():
+            if isinstance(group, list):
+                optional_specs.extend(s for s in group if isinstance(s, str))
+    if (specs or optional_specs) and "pip" not in pack.package_managers:
+        pack.package_managers.append("pip")
+    for spec in specs:
+        pack.dependencies.append({"name": spec, "version": "", "ecosystem": "pip"})
+    for spec in optional_specs:
+        pack.dependencies.append({"name": spec, "version": "", "ecosystem": "pip", "dev": True})
+    tool = data.get("tool")
+    has_pytest_config = isinstance(tool, dict) and isinstance(tool.get("pytest"), dict)
+    mentions_pytest = any(s.lower().startswith("pytest") for s in specs + optional_specs)
+    if (has_pytest_config or mentions_pytest) and "python -m pytest" not in pack.test_commands:
+        pack.test_commands.append("python -m pytest")
+
+
 def build_context_pack(repo_path: Path) -> ProjectContextPack:
     repo_path = Path(repo_path).resolve()
     baseline = scan_repo_baseline(repo_path)
@@ -41,15 +93,8 @@ def build_context_pack(repo_path: Path) -> ProjectContextPack:
             scripts = data.get("scripts")
             if isinstance(scripts, dict) and scripts.get("test"):
                 pack.test_commands.append("npm test")
-            dependencies = data.get("dependencies")
-            if isinstance(dependencies, dict):
-                for name, ver in dependencies.items():
-                    pack.dependencies.append({"name": name, "version": ver, "ecosystem": "npm"})
-            dev_dependencies = data.get("devDependencies")
-            if isinstance(dev_dependencies, dict):
-                for name, ver in dev_dependencies.items():
-                    pack.dependencies.append(
-                        {"name": name, "version": ver, "ecosystem": "npm", "dev": True})
+            _append_npm_dependencies(pack, data.get("dependencies"))
+            _append_npm_dependencies(pack, data.get("devDependencies"), dev=True)
         except (ValueError, OSError):
             pass
 
@@ -63,6 +108,8 @@ def build_context_pack(repo_path: Path) -> ProjectContextPack:
         if not pack.test_commands:
             pack.test_commands.append("python -m pytest")
 
+    _append_pyproject_facts(pack, repo_path)
+
     for root, dirs, files in os.walk(repo_path):
         dirs[:] = [d for d in dirs if d not in SKIP_DIRS and not d.startswith(".")]
         rel_root = Path(root).relative_to(repo_path)
@@ -84,6 +131,25 @@ def to_json(pack: ProjectContextPack) -> str:
     return json.dumps(asdict(pack), indent=2, ensure_ascii=False)
 
 
+_DEP_DISPLAY_CAP = 20
+
+
+def _dependencies_markdown(dependencies: list) -> str:
+    """Itemize dependencies (name, version, ecosystem, dev flag), capped to keep the seed small."""
+    if not dependencies:
+        return "- dependencies (0): none\n"
+    lines = [f"- dependencies ({len(dependencies)}):\n"]
+    for dep in dependencies[:_DEP_DISPLAY_CAP]:
+        label = " ".join(part for part in (dep.get("name", ""), dep.get("version", "")) if part)
+        ecosystem = dep.get("ecosystem", "")
+        suffix = f"{ecosystem}, dev" if dep.get("dev") else ecosystem
+        lines.append(f"  - {label} ({suffix})\n")
+    hidden = len(dependencies) - _DEP_DISPLAY_CAP
+    if hidden > 0:
+        lines.append(f"  - … and {hidden} more\n")
+    return "".join(lines)
+
+
 def to_markdown(pack: ProjectContextPack) -> str:
     return (
         "# Project Context Pack\n\n"
@@ -93,7 +159,7 @@ def to_markdown(pack: ProjectContextPack) -> str:
         f"- test_commands: {pack.test_commands or 'none'}\n"
         f"- entrypoints: {pack.entrypoints or 'none'}\n"
         f"- config_files: {pack.config_files or 'none'}\n"
-        f"- dependencies: {len(pack.dependencies)} found\n"
+        f"{_dependencies_markdown(pack.dependencies)}"
         f"- source_dirs: {pack.source_dirs}\n"
     )
 

package/tools/workflow_cli/gates.py

@@ -290,14 +290,6 @@ def _find_next_plan_task_field_start(task_body: str, after: int) -> int | None:
     return None
 
 
-def _plan_task_field_value(task_body: str, field: str) -> str:
-    found = _find_plan_task_field(task_body, field)
-    if found is None:
-        return ""
-    match, _ = found
-    return match.group(1).strip()
-
-
 def _iter_plan_task_bodies(content: str):
     return heading_bounded_bodies(content, _PLAN_TASK_RE.match)
 
@@ -439,13 +431,14 @@ def _check_plan_context_pack(run_dir: Path) -> list[str]:
 
 def _check_plan_file_refs(run_dir: Path, content: str) -> list[str]:
     """Hard-check Files paths against the Context Pack repo_root. create-type tasks
-    are exempt; the part after '::' (a symbol) is advisory and not checked (no AST pack yet)."""
+    must target paths that do not exist yet (R19); the part after '::' (a symbol) is
+    advisory and not checked (no AST pack yet)."""
     repo_root = _context_pack_repo_root(run_dir)
     if repo_root is None:
         return []  # no usable ground truth; standard tier blocks via _check_plan_context_pack
     issues: list[str] = []
     for body in _iter_plan_task_bodies(content):
-        skip_missing_path = _normalized_change_type(_task_change_type(body)) == "create"
+        is_create = _normalized_change_type(_task_change_type(body)) == "create"
         files_field = _plan_task_field_body(body, "Files")
         for path_part in _plan_task_file_paths(files_field):
             path = Path(path_part)
@@ -461,11 +454,18 @@ def _check_plan_file_refs(run_dir: Path, content: str) -> list[str]:
                 )
                 continue
             if not resolved.exists():
-                if not skip_missing_path:
+                if not is_create:
                     issues.append(
                         f"PLAN-TASK Files references missing path {path_part!r} "
                         "(mark the task 'Change Type: create' if it is a new file)."
                     )
+            elif is_create:
+                # R19: create must not silently mean "overwrite an existing file".
+                issues.append(
+                    f"PLAN-TASK Files references path {path_part!r} that already exists "
+                    "under 'Change Type: create'; use 'modify' for existing files or "
+                    "split the task."
+                )
     return issues
 
 
@@ -496,8 +496,10 @@ def _check_spec_refs_valid(run_dir: Path, content: str) -> list[str]:
 
 
 # R10: Change Type is a closed operation-kind enum; 'new' is a legacy alias.
-_CHANGE_TYPE_VALUES = frozenset({"create", "modify", "delete"})
+_FILE_CHANGE_TYPES = frozenset({"create", "modify", "delete"})
+_CHANGE_TYPE_VALUES = _FILE_CHANGE_TYPES | {"non_code"}
 _CHANGE_TYPE_ALIASES = {"new": "create"}
+_TDD_APPLICABLE_VALUES = frozenset({"yes", "no"})
 
 
 def _normalized_change_type(raw: str) -> str:
@@ -510,6 +512,11 @@ def _task_change_type(body: str) -> str:
     return " ".join(_plan_task_field_body(body, "Change Type").split())
 
 
+def _task_tdd_applicable(body: str) -> str:
+    """Whitespace-normalized TDD Applicable field body (same line + continuation lines)."""
+    return " ".join(_plan_task_field_body(body, "TDD Applicable").split())
+
+
 def _check_plan_task_fields(content: str) -> list[str]:
     issues: list[str] = []
     numbers: list[int] = []
@@ -523,10 +530,32 @@ def _check_plan_task_fields(content: str) -> list[str]:
             if not _plan_task_field_body(body, field).strip():
                 issues.append(f"{label} is missing a non-empty '{field}:' field.")
         raw_change_type = _task_change_type(body)
-        if raw_change_type and _normalized_change_type(raw_change_type) not in _CHANGE_TYPE_VALUES:
+        change_type = _normalized_change_type(raw_change_type)
+        if raw_change_type and change_type not in _CHANGE_TYPE_VALUES:
             issues.append(
                 f"{label} has invalid 'Change Type: {raw_change_type}'; "
-                "allowed: create|modify|delete (alias: new = create)."
+                "allowed: create|modify|delete|non_code (alias: new = create)."
+            )
+        # R16: Change Type and Files must agree — file-op types need a real
+        # path; non_code is the only legal shape for no-file tasks.
+        files_body = _plan_task_field_body(body, "Files")
+        if files_body.strip():
+            file_paths = _plan_task_file_paths(files_body)
+            if change_type in _FILE_CHANGE_TYPES and not file_paths:
+                issues.append(
+                    f"{label} has 'Change Type: {raw_change_type}' but 'Files:' lists "
+                    "no real file path; use 'Change Type: non_code' for tasks that "
+                    "touch no files."
+                )
+            elif change_type == "non_code" and file_paths:
+                issues.append(
+                    f"{label} has 'Change Type: non_code' but 'Files:' lists a file path; "
+                    "use create|modify|delete for file-touching tasks."
+                )
+        raw_tdd = _task_tdd_applicable(body)
+        if raw_tdd and raw_tdd.lower() not in _TDD_APPLICABLE_VALUES:
+            issues.append(
+                f"{label} has invalid 'TDD Applicable: {raw_tdd}'; allowed: yes|no."
             )
     if numbers:
         if len(set(numbers)) != len(numbers):
@@ -575,8 +604,7 @@ def _plan_tasks_missing_code(content: str) -> bool:
         return False
     for body in bodies:
         skeleton = _plan_task_field_body(body, "Skeleton")
-        tdd_applicable = _plan_task_field_value(body, "TDD Applicable")
-        if tdd_applicable.lower() == "yes" and not _has_complete_code_fence(skeleton):
+        if _task_tdd_applicable(body).lower() == "yes" and not _has_complete_code_fence(skeleton):
             return True
     return False
 

package/tools/workflow_cli/version.py

@@ -1 +1 @@
-R2P_VERSION = "0.4.1"
+R2P_VERSION = "0.4.3"