devflow-cli 6.3.1__py3-none-any.whl → 7.0.0__py3-none-any.whl

devflow_cli/__init__.py

@@ -1,6 +1,6 @@
 """devflow CLI — workflow de développement adaptatif."""
 
-VERSION = "6.3.1"
+VERSION = "7.0.0"
 
 SUPPORTED_AGENTS = ["claude-code", "codex", "cursor"]
 
@@ -9,7 +9,6 @@ ACTIVITY_LINEAR_MAPPING = {
     "prepare": "Plan",
     "risk-assessment": "Research",
     "spec": "Spec",
-    "research": "Research",
     "contracts": "Plan",
     "plan": "Plan",
     "tasks": "Tasks",
@@ -35,7 +34,6 @@ LINEAR_STATUS_ORDER = [
 ARTIFACTS = [
     "risk-assessment.md",
     "spec.md",
-    "research.md",
     "contracts.md",
     "plan.md",
     "tasks.md",

devflow_cli/cli.py

@@ -3,8 +3,11 @@
 from __future__ import annotations
 
 import typer
+from typer.core import TyperGroup
 
 from devflow_cli import VERSION
+from devflow_cli.core.contract_schemas import LegacySchemaError
+from devflow_cli.utils.console import fail
 from devflow_cli.utils.logging import setup_logging
 from devflow_cli.commands.init_cmd import init
 from devflow_cli.commands.check import check
@@ -25,10 +28,22 @@ from devflow_cli.commands.verify import verify
 from devflow_cli.commands.assess import assess
 from devflow_cli.commands.usage import usage
 
+class DevflowGroup(TyperGroup):
+    """Affiche un refus actionnable, sans trace, pour un fichier de feature 6.x."""
+
+    def invoke(self, ctx):
+        try:
+            return super().invoke(ctx)
+        except LegacySchemaError as exc:
+            fail(str(exc))
+            raise typer.Exit(1) from exc
+
+
 app = typer.Typer(
     name="devflow",
     help="Spec-Driven Development workflow CLI",
     no_args_is_help=True,
+    cls=DevflowGroup,
 )
 
 

devflow_cli/commands/adaptive.py

@@ -23,7 +23,6 @@ from devflow_cli.core.adaptive_workflow import (
     workflow_lock,
     write_adaptive_state,
 )
-from devflow_cli.core.omissions import omit_current_activity
 from devflow_cli.core.assessment import read_assessment
 from devflow_cli.core.activity_contracts import (
     build_activity_contract,
@@ -60,7 +59,7 @@ from devflow_cli.core.validation_approvals import (
     approve_plan_command,
     pending_plan_approval,
 )
-from devflow_cli.core.contract_schemas import diagnose_contract_file
+from devflow_cli.core.contract_schemas import LegacySchemaError, diagnose_contract_file
 from devflow_cli.core.operational import ExitCode, exit_code_for_run_reason
 from devflow_cli.adapters.agents import get_agent_adapter
 from devflow_cli.utils.console import console, fail, ok, warn
@@ -74,11 +73,12 @@ from devflow_cli.utils.paths import (
 
 app = typer.Typer(help="Machine d'etat des parcours adaptatifs")
 
+LEGACY_SCHEMA_EXIT_CODE = 1
+
 RESULT_VALIDATED_ACTIVITIES = frozenset({
     "prepare",
     "risk-assessment",
     "spec",
-    "research",
     "contracts",
     "plan",
     "tasks",
@@ -105,7 +105,17 @@ def _state(
     feature_dir: Path, *, json_output: bool = False, issue_id: str | None = None
 ):
     state_file = feature_dir / "workflow-state.json"
-    state = read_adaptive_state(state_file)
+    try:
+        state = read_adaptive_state(state_file)
+    except LegacySchemaError as exc:
+        if json_output:
+            _print_execution_json(
+                issue_id or feature_dir.name, None, False, "legacy-schema", str(exc),
+                None, LEGACY_SCHEMA_EXIT_CODE,
+            )
+        else:
+            fail(str(exc))
+        raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
     if state is None:
         diagnostic = diagnose_contract_file("workflow-state", state_file)
         detail = (
@@ -125,7 +135,11 @@ def _state(
 
 def _assessment(feature_dir: Path):
     assessment_file = feature_dir / "assessment.json"
-    assessment = read_assessment(assessment_file)
+    try:
+        assessment = read_assessment(assessment_file)
+    except LegacySchemaError as exc:
+        fail(str(exc))
+        raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
     if assessment is None:
         diagnostic = diagnose_contract_file("assessment", assessment_file)
         fail(
@@ -239,26 +253,6 @@ def evidence(
     warn("Source manuelle : cette preuve ne valide pas les gates du workflow.")
 
 
-@app.command("omit")
-def omit_adaptive(
-    feature: str = typer.Argument(..., help="ID ou dossier de la feature"),
-    activity: str = typer.Argument(..., help="research ou contracts, activite courante"),
-    by: str = typer.Option(..., "--by", help="Responsable de la decision"),
-    reason: str = typer.Option(..., "--reason", help="Justification explicite"),
-) -> None:
-    """Omet une activite critical recommandee par risk-assessment, avec audit."""
-    feature_dir = _feature(feature)
-    try:
-        _, next_activity = omit_current_activity(
-            feature_dir, activity, by=by, reason=reason
-        )
-    except (OSError, ValueError) as exc:
-        fail(f"Omission refusee : {exc}")
-        raise typer.Exit(int(ExitCode.BLOCKED)) from exc
-    safe_refresh_worklog(feature_dir)
-    ok(f"Activite '{activity}' omise avec justification. Prochaine : {next_activity}")
-
-
 @app.command("contract")
 def contract(
     feature: str = typer.Argument(..., help="ID ou dossier de la feature"),
@@ -344,7 +338,7 @@ def run_adaptive(
         )
         return
     if current_state.currentActivity not in {
-        "prepare", "risk-assessment", "spec", "research", "contracts", "plan",
+        "prepare", "risk-assessment", "spec", "contracts", "plan",
         "tasks", "preflight-evidence", "implement", "review", "rollback-check",
     }:
         detail = f"L'activite '{current_state.currentActivity}' ne necessite pas d'agent."
@@ -603,9 +597,6 @@ def review_adaptive(
     risk: Optional[list[str]] = typer.Option(
         None, "--risk", help="Risque restant (option repetable)"
     ),
-    ack_omission: Optional[list[str]] = typer.Option(
-        None, "--ack-omission", help="Activite omise explicitement revue (repetable)"
-    ),
 ) -> None:
     """Enregistre une revue humaine, validee comme la revue d'un agent."""
     feature_dir = _feature(feature)
@@ -624,7 +615,6 @@ def review_adaptive(
 
     result = record_human_review(
         feature_dir, feature_path, by, relative_report, outcome, list(risk or []),
-        list(ack_omission or []),
     )
     if result.advanced:
         ok(
@@ -706,6 +696,9 @@ def approve_adaptive_command(
             approval = approve_plan_command(
                 feature_dir, validation_id, reason, expected_command=item.command
             )
+    except LegacySchemaError as exc:
+        fail(str(exc))
+        raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
     except ValueError as exc:
         fail(f"Approbation refusee : {exc}")
         raise typer.Exit(int(ExitCode.INVALID_CONTRACT)) from exc
@@ -731,6 +724,9 @@ def waive_validation(
             waiver = create_validation_waiver(
                 feature_dir, validation_id, reason, author=author
             )
+        except LegacySchemaError as exc:
+            fail(str(exc))
+            raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
         except ValueError as exc:
             fail(str(exc))
             raise typer.Exit(int(ExitCode.BLOCKED)) from exc
@@ -917,6 +913,9 @@ def worklog(
     feature_dir = _feature(feature)
     try:
         output = refresh_worklog(feature_dir)
+    except LegacySchemaError as exc:
+        fail(str(exc))
+        raise typer.Exit(LEGACY_SCHEMA_EXIT_CODE) from exc
     except ValueError as exc:
         fail(str(exc))
         raise typer.Exit(int(ExitCode.INVALID_CONTRACT)) from exc
@@ -959,7 +958,7 @@ def _operational_status(
         ),
         "currentActivity": state.currentActivity,
         "completedActivities": list(state.completedActivities),
-        "omissions": dict(state.omissions),
+        "guardrails": state.guardrails,
         "progress": {
             "completed": len(state.completedActivities),
             "total": len(state.activities),
@@ -984,10 +983,9 @@ def _print_operational_status(payload: dict) -> None:
     console.print(f"Activite    : [bold]{payload['currentActivity']}[/bold]")
     progress = payload["progress"]
     console.print(f"Progression : {progress['completed']}/{progress['total']}")
-    if payload["omissions"]:
-        console.print("Omissions justifiees :")
-        for activity, entry in payload["omissions"].items():
-            console.print(f"  - {activity} : {entry['reason']} ({entry['by']})")
+    console.print(
+        f"Garde-fous  : {'actifs' if payload['guardrails'] else 'inactifs'}"
+    )
     console.print("Preuves :")
     for item in payload["evidence"]:
         source = f" / {item['source']}" if item["source"] else ""

devflow_cli/commands/assess.py

@@ -2,7 +2,9 @@
 
 from __future__ import annotations
 
+import json
 import re
+from pathlib import Path
 from typing import Literal
 
 import typer
@@ -14,10 +16,20 @@ from devflow_cli.core.assessment import (
     write_assessment,
 )
 from devflow_cli.core.adaptive_workflow import workflow_lock
+from devflow_cli.core.contract_schemas import check_schema_version
 from devflow_cli.utils.console import console, fail, ok
 from devflow_cli.utils.paths import resolve_feature_dir
 
 
+def _refuse_unsupported_version(path: Path) -> None:
+    """Refuse d'ecraser un assessment.json d'une autre version de devflow."""
+    try:
+        payload = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, UnicodeDecodeError, json.JSONDecodeError):
+        return
+    check_schema_version("assessment", path, payload)
+
+
 def assess(
     feature: str = typer.Argument(..., help="ID ou dossier de la feature"),
     scope: Literal["local", "multiple", "transversal"] = typer.Option(
@@ -36,7 +48,7 @@ def assess(
         False, "--data-security", help="Le changement touche aux donnees ou a la securite"
     ),
     summary: str = typer.Option("", help="Resume court de la demande"),
-    profile: Literal["quick", "standard", "deep", "critical"] | None = typer.Option(
+    profile: Literal["quick", "standard", "deep"] | None = typer.Option(
         None, help="Force un profil au lieu de la recommandation"
     ),
     issue_id: str | None = typer.Option(
@@ -52,7 +64,13 @@ def assess(
         fail(f"Feature '{feature}' introuvable.")
         raise typer.Exit(1)
 
-    existing_assessment = read_assessment(feature_dir / "assessment.json")
+    assessment_file = feature_dir / "assessment.json"
+    try:
+        _refuse_unsupported_version(assessment_file)
+        existing_assessment = read_assessment(assessment_file)
+    except ValueError as exc:
+        fail(str(exc))
+        raise typer.Exit(1) from exc
     canonical_issue_id = issue_id or (
         existing_assessment.issueId if existing_assessment is not None else None
     )
@@ -109,6 +127,12 @@ def assess(
     if assessment.selectedProfile != assessment.recommendedProfile:
         console.print(f"  Recommande : {assessment.recommendedProfile}")
     console.print(f"  Confiance : {assessment.confidence}")
+    if assessment.guardrails.active:
+        console.print(
+            f"  Garde-fous : actifs ({', '.join(assessment.guardrails.reasons)})"
+        )
+    else:
+        console.print("  Garde-fous : inactifs")
     for reason in assessment.reasons:
         console.print(f"  - {reason}")
     console.print(f"  Activites : {' -> '.join(assessment.activities)}")

devflow_cli/commands/status.py

@@ -10,21 +10,48 @@ import typer
 from devflow_cli import ARTIFACTS
 from devflow_cli.core.adaptive_workflow import read_adaptive_state
 from devflow_cli.core.assessment import read_assessment
+from devflow_cli.core.contract_schemas import LegacySchemaError
+from devflow_cli.core.manifest import stale_commands
 from devflow_cli.core.staleness import get_staleness
 from devflow_cli.utils.console import console, make_table, warn
-from devflow_cli.utils.paths import iter_feature_dirs, resolve_feature_dir
+from devflow_cli.utils.paths import (
+    get_claude_dir,
+    get_devflow_root,
+    iter_feature_dirs,
+    resolve_feature_dir,
+)
 
 
 def status(
     issue_id: Optional[str] = typer.Argument(None, help="ID de la feature (optionnel)"),
 ) -> None:
     """Lecture rapide du statut d'une feature ou liste toutes les features."""
+    _warn_stale_commands()
     if issue_id is None:
         _list_features()
     else:
         _show_feature(issue_id)
 
 
+def _warn_stale_commands() -> None:
+    """Signale les commandes /devflow installees d'une autre version, sans les modifier."""
+    try:
+        stale = stale_commands(get_devflow_root(), get_claude_dir())
+    except (OSError, AttributeError, ValueError) as exc:
+        warn(
+            "Commandes /devflow installees non verifiables "
+            f"({type(exc).__name__}). Lancer : devflow upgrade --dry-run"
+        )
+        return
+    if not stale:
+        return
+    paths = ", ".join(s.path for s in stale)
+    warn(
+        f"Commandes /devflow installees differentes de la CLI : {paths}. "
+        "Lancer : devflow upgrade"
+    )
+
+
 def _list_features() -> None:
     """Liste les espaces de feature et leur progression adaptative."""
     table = make_table(
@@ -40,6 +67,25 @@ def _list_features() -> None:
         workflow_file = feature_dir / "workflow-state.json"
         assessment_file = feature_dir / "assessment.json"
 
+        try:
+            legacy = None
+            if workflow_file.exists():
+                read_adaptive_state(workflow_file)
+            if assessment_file.exists():
+                read_assessment(assessment_file)
+        except LegacySchemaError as exc:
+            legacy = exc
+        if legacy is not None:
+            warn(str(legacy))
+            table.add_row(
+                feature_dir.name,
+                "-",
+                "[yellow]schema 6.x[/yellow]",
+                "-",
+                location,
+            )
+            continue
+
         if workflow_file.exists():
             state = read_adaptive_state(workflow_file)
             if state is None: